--- margi2/spu.c	2000/12/03 22:41:08	1.1
+++ margi2/spu.c	2001/04/25 15:31:09	1.2
@@ -29,8 +29,7 @@ int DecoderHighlight(struct cvdv_cards *
 	int i;
 	if ((coli == NULL) || (btn_posi == NULL))
 		return 1;
-	printk(KERN_ERR LOGNAME
-	       ": -- DecoderHighlight: col 0x%02X%02X, contr 0x%02X%02X, act %d, %d,%d - %d,%d\n",
+	MDEBUG(0,": -- DecoderHighlight: col 0x%02X%02X, contr 0x%02X%02X, act %d, %d,%d - %d,%d\n",
 	       coli[0], coli[1], coli[2], coli[3], active,
 	       (((int) btn_posi[0] & 0x3F) << 4) | (btn_posi[1] >> 4),
 	       (((int) btn_posi[3] & 0x3F) << 4) | (btn_posi[4] >> 4),
@@ -66,13 +65,11 @@ int DecoderHighlight(struct cvdv_cards *
 int DecoderSPUPalette(struct cvdv_cards *card, int length, u8 * palette)
 {
 	int i;
-	printk(KERN_DEBUG LOGNAME
-	       ": -- DecoderSPUPalette: setting up %d bytes of SPU palette(Y,Cr,Cb):",
-	       length);
+	MDEBUG(1,": -- DecoderSPUPalette: setting up %d bytes of SPU palette(Y,Cr,Cb):", length);
 	for (i = 0; i < (length / 3); i++)
-		printk(" %d=(%d,%d,%d)", i, palette[i * 3],
-		       palette[i * 3 + 1], palette[i * 3 + 2]);
-	printk("\n");
+		MDEBUG(1," %d=(%d,%d,%d)", i, palette[i * 3],palette[i * 3 + 1], 
+		       palette[i * 3 + 2]);
+	MDEBUG(1,"\n");
 	DecoderDelByte(card, 0x1A0, 0x01);	// SPU decode stop
 	DecoderSetByte(card, 0x1A0, 0x10);
 	for (i = 0; i < length; i++)
@@ -83,8 +80,7 @@ int DecoderSPUPalette(struct cvdv_cards
 
 int DecoderSPUStream(struct cvdv_cards *card, int stream, int active)
 {
-	printk(KERN_DEBUG LOGNAME
-	       ": -- DecoderSPUStream: stream %d, active %d\n", stream,
+	MDEBUG(1,": -- DecoderSPUStream: stream %d, active %d\n", stream,
 	       active);
 	if (stream < 32) {
 		card->reg092 |= (0x20 | (stream & 0x1F));	// stream ID and select