===================================================================
RCS file: /MkLinux/floppy-darwin/floppy_blkdev.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- floppy-darwin/floppy_blkdev.cpp	2002/04/12 22:05:18	1.31
+++ floppy-darwin/floppy_blkdev.cpp	2002/04/16 00:43:17	1.32
@@ -54,13 +54,14 @@
 void donone(char *,...);
 char *onepage = NULL;
 int org_mklinux_iokit_swim3_busyflag = 0;
+#include "MkLinux_floppy/dprintf.h"
 
 }
 
 // #undef MACH_DEBUG
 // #define MACH_DEBUG 0
 #if (!MACH_DEBUG)
-#define dIOLog donone
+#define dIOLog(a, b...) dprintf(DEBUG_GENERAL, a, ## b)
 #else
 #define dIOLog IOLog
 #endif
@@ -141,13 +142,13 @@
 
     /* I assume the higher levels of the I/O Kit handle checking write protection */
 
-    // IOLog("swim3: Entered doReadWrite.\n");
+    dIOLog("swim3: Entered doReadWrite.\n");
     if (!buffer) return kIOReturnNoMemory;
     direction = (buffer->getDirection() == kIODirectionIn ?
         kBSRead : kBSWrite);
 
-    // IOLog("swim3: direction is %s\n", ((direction == kBSRead) ? "kBSRead" :
-	// "kBSWrite"));
+    dIOLog("swim3: direction is %s\n", ((direction == kBSRead) ? "kBSRead" :
+	"kBSWrite"));
 // #define LOG_EACH_ACTION
 #ifdef LOG_EACH_ACTION
     kprintf("swim3: %s of block%s %d", ((direction==kBSRead) ? "read" : "write"), (nblks == 1 ? "" : "s"), block);
@@ -157,7 +158,7 @@
     kprintf("\n");
 #endif // LOG_EACH_ACTION
     
-    // IOLog("swim3: allocating buffer.\n");
+    dIOLog("swim3: allocating buffer.\n");
     if (nblks <= blocks_per_page) {
 	localbuf = onepage;
     } else {
@@ -169,12 +170,12 @@
 	}
     }
 
-    // IOLog("swim3: possibly waiting for busy flag....\n");
+    dIOLog("swim3: possibly waiting for busy flag....\n");
     while (org_mklinux_iokit_swim3_busyflag == 1) {
-	// IOLog("swim3: yup.  We're waiting.\n");
+	dIOLog("swim3: yup.  We're waiting.\n");
         non_bsd_sleep((char *) &org_mklinux_iokit_swim3_busyflag, 10);
     }
-    // IOLog("swim3: done waiting.\n");
+    dIOLog("swim3: done waiting.\n");
     org_mklinux_iokit_swim3_busyflag = 1;
 
     if (direction == kBSWrite) {
@@ -191,7 +192,7 @@
 	dIOLog("Doing write.\n");
     }
     
-    // IOLog("swim3: calling FloppyPluginIO.\n");
+    dIOLog("swim3: calling FloppyPluginIO.\n");
 
     for (retrycount = 0; retrycount < 5; retrycount++) {
       retval = FloppyPluginIO(this->busdev->unit, &Result, (nblks * 512),
@@ -201,7 +202,7 @@
       dIOLog("Retrying request.\n");
     }
 
-    // IOLog("swim3: checking return values and freeing.\n");
+    dIOLog("swim3: checking return values and freeing.\n");
 
     if (retval == kBSIOCompleted) {
       if (Result == (nblks * 512)) {
@@ -327,7 +328,7 @@
 #endif
     OSStatus ret;
     
-    // IOLog("Polling swim3\n");
+    dIOLog("Polling swim3\n");
     ScanForDisketteChange();
     ret=FloppyPluginGetInfo(this->busdev->unit, &info);