--- margi2/video.c	2001/03/29 23:12:01	1.4
+++ margi2/video.c	2001/04/25 15:31:09	1.5
@@ -77,7 +77,7 @@ int DecoderStillImageDisplay(struct cvdv
 // Frees allocated frame buffers
 int DecoderKillFrameBuffers(struct cvdv_cards *card)
 {
-	printk(KERN_DEBUG LOGNAME ": -- DecoderKillFrameBuffers\n");
+	MDEBUG(1, ": -- DecoderKillFrameBuffers\n");
 	DecoderStopDecode(card);
 	DRAMFree(card, card->FrameStoreLuma1);
 	card->FrameStoreLuma1 = BLANK;
@@ -115,7 +115,7 @@ int DecoderSetFrameBuffers(struct cvdv_c
 	int FrameStoreLuma1, FrameStoreChroma1,
 	    FrameStoreLuma2, FrameStoreChroma2,
 	    FrameStoreLumaB, FrameStoreChromaB;
-	printk(KERN_DEBUG LOGNAME ": -- DecoderSetFrameBuffers\n");
+	MDEBUG(1, ": -- DecoderSetFrameBuffers\n");
 	DecoderStopDecode(card);
 	//DecoderStopChannel(card);
 	//lines=((CCIR601Lines(card->videomode)==625)?576:480);
@@ -197,7 +197,7 @@ void DecoderSetVideoPanic(struct cvdv_ca
 int DecoderClose(struct cvdv_cards *card)
 {
 	if (card->DecoderOpen) {
-		printk(KERN_DEBUG LOGNAME ": -- DecoderClose\n");
+		MDEBUG(1, ": -- DecoderClose\n");
 		DecoderStopDecode(card);
 		DecoderKillFrameBuffers(card);
 		card->DecoderOpen = 0;
@@ -221,8 +221,7 @@ int DecoderOpen(struct cvdv_cards *card,
 	 paspx, paspy,		// input picture pixel aspect ratio
 	 SIF;			// 0:Full (480/576 lines, MPEG-2), 1:SIF (half, 240/288 lines, MPEG-1) resolution
 
-	printk(KERN_DEBUG LOGNAME
-	       ": -- DecoderOpen x:%d y:%d asp:%d field:%d lt:%d rmm:%d\n",
+	MDEBUG(1, ": -- DecoderOpen x:%d y:%d asp:%d field:%d lt:%d rmm:%d\n",
 	       x, y, aspect, Field, Letterbox, RMM);
 	if ((x <= 0) || (y <= 0))
 		return 4;	// picture too small
@@ -454,13 +453,11 @@ int DecoderOpen(struct cvdv_cards *card,
 	// set the new mode
 	DecoderMaskByte(card, 0x114, 0x78, (mode & 0x0F) << 3);
 
-//printk(KERN_INFO LOGNAME ": Decoder Open: top/bottom/width / left/right/height  / main reads %d/%d/%d / %d/%d/%d / %d\n",top,bottom,width,left,right,height,((x+7)/8)&0x7F);
+	MDEBUG(3,": Decoder Open: top/bottom/width / left/right/height  / main reads %d/%d/%d / %d/%d/%d / %d\n",top,bottom,width,left,right,height,((x+7)/8)&0x7F);
 
 	// set the frame store buffers
 	if ((i = DecoderSetFrameBuffers(card, y, 0, RMM))) {
-		printk(KERN_ERR LOGNAME
-		       ": SetFrameBuffers failed for buffer at 0x%03X\n",
-		       i);
+		MDEBUG(0,": SetFrameBuffers failed for buffer at 0x%03X\n",i);
 		DecoderKillFrameBuffers(card);
 		return 2;
 	}