===================================================================
RCS file: /MkLinux/floppy-darwin/floppy_blkdev.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- floppy-darwin/floppy_blkdev.cpp	2002/04/12 21:49:32	1.28
+++ floppy-darwin/floppy_blkdev.cpp	2002/04/12 22:03:23	1.29
@@ -57,15 +57,17 @@
 
 }
 
-#undef MACH_DEBUG
-#define MACH_DEBUG 0
+// #undef MACH_DEBUG
+// #define MACH_DEBUG 0
 #if (!MACH_DEBUG)
 #define IOLog donone
 #else
-#if (SERIAL_DEBUG)
-#define IOLog kprintf
-#endif
+#define dIOLog IOLog
 #endif
+// #if (SERIAL_DEBUG)
+// #define IOLog kprintf
+// #endif
+// #endif
 
 // in floppy.cpp
 // virtual IOReturn doAsyncReadWrite(IOMemoryDescriptor *buffer,
@@ -147,7 +149,7 @@
 
     // IOLog("swim3: direction is %s\n", ((direction == kBSRead) ? "kBSRead" :
 	// "kBSWrite"));
-#define LOG_EACH_ACTION
+// #define LOG_EACH_ACTION
 #ifdef LOG_EACH_ACTION
     kprintf("swim3: %s of block%s %d", ((direction==kBSRead) ? "read" : "write"), (nblks == 1 ? "" : "s"), block);
     if (nblks > 1) {
@@ -187,7 +189,7 @@
 		org_mklinux_iokit_swim3_busyflag = 0;
 		return kIOReturnVMError;
 	}
-	IOLog("Doing write.\n");
+	dIOLog("Doing write.\n");
     }
     
     // IOLog("swim3: calling FloppyPluginIO.\n");
@@ -197,7 +199,7 @@
         (MemListDescriptorRef)localbuf, block * 512,
         direction, 0);
       if (retval == kBSIOCompleted) break;
-      IOLog("Retrying request.\n");
+      dIOLog("Retrying request.\n");
     }
 
     // IOLog("swim3: checking return values and freeing.\n");
@@ -225,7 +227,7 @@
 	IOFree(localbuf, (nblks * 512) + PAGE_SIZE);
     }
     org_mklinux_iokit_swim3_busyflag = 0;
-    IOLog("swim3: for block %d-%d, returning %s (FloppyPluginIO returned %d/%x).\n",
+    dIOLog("swim3: for block %d-%d, returning %s (FloppyPluginIO returned %d/%x).\n",
 	block, block+nblks-1,
 	myIOReturn == kIOReturnSuccess ?
 	"kIOReturnSuccess" : myIOReturn == kIOReturnVMError? "kIOReturnVMError"
@@ -342,7 +344,7 @@
 
     media_present = *mediaPresent;
 
-    IOLog("mediaPresent = %s, changedState = %s\n",
+    dIOLog("mediaPresent = %s, changedState = %s\n",
         (*mediaPresent == true) ? "true" : "false",
         (*changedState == true) ? "true" : "false");
 
@@ -390,11 +392,11 @@
         *isWriteProtected = false;
 
     if (ret == E_BSSuccess) {
-	IOLog("swim3: reportWriteProtection succeeded with status %d\n",
+	dIOLog("swim3: reportWriteProtection succeeded with status %d\n",
 		*isWriteProtected);
         return kIOReturnSuccess;
     } else {
-	IOLog("swim3: reportWriteProtection failed with status %d (error %d)\n",
+	dIOLog("swim3: reportWriteProtection failed with status %d (error %d)\n",
 		*isWriteProtected, ret);
         return kIOReturnError;
     }