--- margi2/streams.c	2001/03/29 23:12:01	1.4
+++ margi2/streams.c	2001/04/25 15:31:09	1.5
@@ -29,7 +29,7 @@
 // Frees allocated channel buffers
 int DecoderKillChannelBuffers(struct cvdv_cards *card)
 {
-	printk(KERN_DEBUG LOGNAME ": -- DecoderKillChannelBuffers\n");
+	MDEBUG(1, ": -- DecoderKillChannelBuffers\n");
 	DecoderStopDecode(card);
 	DRAMFree(card, card->VideoES);
 	card->VideoES = BLANK;
@@ -70,7 +70,7 @@ int DecoderSetChannelBuffers(struct cvdv
   DecoderWriteByte(card,adr+3,((addr-1)>>8)&0x003F);\
 }
 	u32 addr;
-	printk(KERN_DEBUG LOGNAME ": -- DecoderSetChannelBuffers\n");
+	MDEBUG(1, ": -- DecoderSetChannelBuffers\n");
 	//DecoderStopDecode(card);
 	DecoderStopChannel(card);
 	VideoES >>= 1;		// change to word sizes
@@ -103,7 +103,7 @@ int DecoderSetChannelBuffers(struct cvdv
 		//DecoderSetByte(card,0x07B,0x10);  // navi pack counter enable
 		card->NaviPackAddress =
 		    (DecoderReadWord(card, 0x05C) & 0x3FFF) << 7;
-//printk(KERN_DEBUG LOGNAME ": navi bank init'ed: 0x%08X\n",card->NaviPackAddress);
+		MDEBUG(4, ": navi bank init'ed: 0x%08X\n",card->NaviPackAddress);
 	} else {
 		card->reg07B &= ~0x10;	// navi pack counter disable
 		DecoderWriteByte(card, 0x07B, card->reg07B);
@@ -119,7 +119,7 @@ int DecoderSetChannelBuffers(struct cvdv
 
 int DecoderUnPrepare(struct cvdv_cards *card)
 {
-	printk(KERN_ERR LOGNAME ": -- DecoderUnPrepare\n");
+	MDEBUG(0, ": -- DecoderUnPrepare\n");
 	//DecoderStopDecode(card);
 	DecoderStopChannel(card);
 	DecoderKillChannelBuffers(card);
@@ -156,7 +156,7 @@ void DecoderSelectAudioID(struct cvdv_ca
 {
 	int AID = card->setup.audioID;
 	int AExt = card->setup.audioIDext;
-	printk(KERN_DEBUG LOGNAME ": -- SelectAudio %d %d\n", AID, AExt);
+	MDEBUG(1, ": -- SelectAudio %d %d\n", AID, AExt);
 	DecoderWriteByte(card, 0x07C, AExt & 0x1F);	// Audio Stream Extension ID
 	card->reg08F = (card->reg08F & ~0x1F) | (AID & 0x1F);
 	DecoderWriteByte(card, 0x08F, card->reg08F);
@@ -175,7 +175,7 @@ void DecoderPrepareAudio(struct cvdv_car
 	int AID = card->setup.audioID;
 	int AExt = card->setup.audioIDext;
 	int IEC956 = card->setup.SPDIFmode;
-	printk(KERN_DEBUG LOGNAME ": -- PrepAudio %d %d %d %d %d\n",
+	MDEBUG(1, ": -- PrepAudio %d %d %d %d %d\n",
 	       AHeader, card->setup.audioselect, AID, AExt, IEC956);
 	switch (card->setup.audioselect) {
 	case audio_disable:
@@ -289,39 +289,45 @@ void DecoderPrepareVideo(struct cvdv_car
 int DecoderPrepareES(struct cvdv_cards *card)
 {
 	int i;
-	printk(KERN_DEBUG LOGNAME ": -- PrepareES\n");
+	MDEBUG(1, ": -- PrepareES\n");
 	//DecoderStopDecode(card);
 
 //  DecoderWriteByte(card,0x05,0x00);
 
 	DecoderMaskByte(card, 0x007, 0xCE, 0xC2 | (3 << 2));	// Stream Select: A/V Elementary Stream
-//printk(KERN_DEBUG LOGNAME ": Int - A VideoES w/r addr: %08X %08X\n",
-//  (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|(DecoderReadByte(card,0x062)<<16))<<2,
-//  (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|(DecoderReadByte(card,0x06E)<<16))<<2);
+	MDEBUG(3, ": Int - A VideoES w/r addr: %08X %08X\n",
+	       (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|
+		(DecoderReadByte(card,0x062)<<16))<<2,
+	       (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|
+		(DecoderReadByte(card,0x06E)<<16))<<2);
 	// set the decoding buffers
 	card->reg093 = (card->reg093 & ~0xFC);	// write no header
 	DecoderWriteByte(card, 0x093, card->reg093);
 	if ((i = DecoderSetChannelBuffers(card, 256000, 4096, 0, 0, 0, 0))) {
-		printk(KERN_ERR LOGNAME
-		       ": SetDecoderBuffers failed for buffer at 0x%03X\n",
-		       i);
+		MDEBUG(0, ": SetDecoderBuffers failed for buffer at 0x%03X\n", i);
 		DecoderKillChannelBuffers(card);
 		return 1;
 	}
-//printk(KERN_DEBUG LOGNAME ": Int - B VideoES w/r addr: %08X %08X\n",
-//  (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|(DecoderReadByte(card,0x062)<<16))<<2,
-//  (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|(DecoderReadByte(card,0x06E)<<16))<<2);
-
-//printk(KERN_DEBUG LOGNAME ": Int - C VideoES w/r addr: %08X %08X\n",
-//  (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|(DecoderReadByte(card,0x062)<<16))<<2,
-//  (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|(DecoderReadByte(card,0x06E)<<16))<<2);
+	MDEBUG(3, ": Int - B VideoES w/r addr: %08X %08X\n",
+	       (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|
+		(DecoderReadByte(card,0x062)<<16))<<2,
+	       (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|
+		(DecoderReadByte(card,0x06E)<<16))<<2);
+
+	MDEBUG(3, ": Int - C VideoES w/r addr: %08X %08X\n",
+	       (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|
+		(DecoderReadByte(card,0x062)<<16))<<2,
+	       (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|
+		(DecoderReadByte(card,0x06E)<<16))<<2);
 
 //  DecoderStartChannel(card);   
 //  DecoderStartDecode(card);
 
-//printk(KERN_DEBUG LOGNAME ": Int - D VideoES w/r addr: %08X %08X\n",
-//  (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|(DecoderReadByte(card,0x062)<<16))<<2,
-//  (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|(DecoderReadByte(card,0x06E)<<16))<<2);
+	MDEBUG(3, ": Int - D VideoES w/r addr: %08X %08X\n",
+	       (DecoderReadByte(card,0x060)|(DecoderReadByte(card,0x061)<<8)|
+		(DecoderReadByte(card,0x062)<<16))<<2,
+	       (DecoderReadByte(card,0x06C)|(DecoderReadByte(card,0x06D)<<8)|
+		(DecoderReadByte(card,0x06E)<<16))<<2);
 
 	DecoderPrepare(card);
 
@@ -344,7 +350,7 @@ int DecoderPreparePES(struct cvdv_cards
 	int SysHeader = 0;
 	int DSIHeader = 0;
 
-	printk(KERN_DEBUG LOGNAME ": -- PreparePES\n");
+	MDEBUG(1, ": -- PreparePES\n");
 	DecoderMaskByte(card, 0x007, 0xCE, 0xC2 | (0 << 2));	// Stream Select: A/V PES Packets
 
 	if (SPUID < 0)
@@ -365,9 +371,7 @@ int DecoderPreparePES(struct cvdv_cards
 	    (i =
 	     DecoderSetChannelBuffers(card, 256000, 4096, 512, 0, 512,
 				      0))) {
-		printk(KERN_ERR LOGNAME
-		       ": SetDecoderBuffers failed for buffer at 0x%03X\n",
-		       i);
+		MDEBUG(0,": SetDecoderBuffers failed for buffer at 0x%03X\n", i);
 		DecoderKillChannelBuffers(card);
 		return 1;
 	}
@@ -390,8 +394,7 @@ int DecoderPreparePS(struct cvdv_cards *
 		     int PackHeader, int SysHeader, int DSIHeader, int DVD)
 {
 	int i=0;
-	printk(KERN_DEBUG LOGNAME ": -- PreparePS %s\n",
-	       ((DVD) ? "DVD" : ""));
+	MDEBUG(1, ": -- PreparePS %s\n", ((DVD) ? "DVD" : ""));
 	//DecoderStopDecode(card);
 	DecoderMaskByte(card, 0x007, 0xCE, 0xC2 | (1 << 2));	// Stream Select: MPEG1 System / MPEG2 Program Stream
 
@@ -419,9 +422,7 @@ int DecoderPreparePS(struct cvdv_cards *
 		//   512,0) ;
 
 		if (i) {
-			printk(KERN_ERR LOGNAME
-			       ": SetDecoderBuffers failed for buffer at 0x%03X\n",
-			       i);
+			MDEBUG(0,": SetDecoderBuffers failed for buffer at 0x%03X\n", i);
 			DecoderKillChannelBuffers(card);
 			return 1;
 		}
@@ -431,9 +432,7 @@ int DecoderPreparePS(struct cvdv_cards *
 		    (i =
                   DecoderSetChannelBuffers(card, 340000, 32768, 512,
                                    0, 512, 0))) {
- 			printk(KERN_ERR LOGNAME
-			       ": SetDecoderBuffers failed for buffer at 0x%03X\n",
-			       i);
+ 			MDEBUG(0,": SetDecoderBuffers failed for buffer at 0x%03X\n", i);
 			DecoderKillChannelBuffers(card);
 			return 1;
 		}