===================================================================
RCS file: /MkLinux/floppy-darwin/floppy.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- floppy-darwin/floppy.cpp	2002/03/16 08:16:32	1.23
+++ floppy-darwin/floppy.cpp	2002/03/19 06:53:21	1.24
@@ -110,8 +110,6 @@
             return false;
         }
 
-        bd=this->busdev;
-
         if( 0 == (fdMap = provider->mapDeviceMemoryWithIndex( 0 )) ) {
             IOLog("%s: no fd memory\n", getName());
             kprintf("Start is bailing\n");
@@ -133,12 +131,16 @@
 	    kprintf("Out of memory error -- malloc failed.\n");
 	    return false;
 	}
+        this->busdev = bd;
 
         /* Need to have a unique identifier.... */
         bd->unit=(this->paddr == (char *)0xf3015000) ? 0 : 1;
         
         org_mklinux_swim3_vaddr[bd->unit] = this->vaddr;
-        org_mklinux_swim3_dmvaddr[bd->unit] = this->vaddr;
+        org_mklinux_swim3_dmvaddr[bd->unit] = this->dma_vaddr;
+
+	kprintf("Set org_mklinux_swim3_vaddr[%d] to %d]\n",
+		bd->unit, org_mklinux_swim3_vaddr[bd->unit]);
 
         /* For now, only one device per floppy controller.  We're not dealing with 68k.... */
         bd->ctlr=0;
@@ -149,7 +151,9 @@
         
         /* Now do the equivalent of the open call. */
         error = FloppyPluginInit(bd->unit, (BSStorePtr) 0);
-        if (error != D_SUCCESS) {
+        if (error != E_BSSuccess) {
+	    IOLog("FloppyPluginInit failed!\n");
+	    kprintf("FloppyPluginInit failed!\n");
             return NULL;
         }