===================================================================
RCS file: /MkLinux/floppy-darwin/floppy_blkdev.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- floppy-darwin/floppy_blkdev.cpp	2002/03/14 05:51:12	1.3
+++ floppy-darwin/floppy_blkdev.cpp	2002/03/14 05:54:14	1.4
@@ -28,7 +28,7 @@
 //                         UInt32 block,UInt32 nblks,
 //                         IOStorageCompletion completion) = 0;
 
-IOReturn org_mklinux_iokit_swim3::doEjectMedia(void)
+IOReturn org_mklinux_iokit_swim3_driver::doEjectMedia(void)
 {
     dev_t dev;
     
@@ -39,26 +39,26 @@
         return kIOReturnError;
 }
 
-IOReturn org_mklinux_iokit_swim3::doFormatMedia(UInt64 byteCapacity)
+IOReturn org_mklinux_iokit_swim3_driver::doFormatMedia(UInt64 byteCapacity)
 {
     /* @@@ WRITE ME! @@@*/
     return kIOReturnUnsupported;
 }
 
-UInt32 org_mklinux_iokit_swim3::doGetFormatCapacities(UInt64 * capacities,
+UInt32 org_mklinux_iokit_swim3_driver::doGetFormatCapacities(UInt64 * capacities,
                         UInt32 capacitiesMaxCount)
 {
     /* @@@ WRITE ME! @@@*/
     return kIOReturnUnsupported;
 }
 
-IOReturn org_mklinux_iokit_swim3::doLockUnlockMedia(bool doLock)
+IOReturn org_mklinux_iokit_swim3_driver::doLockUnlockMedia(bool doLock)
 {
     /* @@@ WRITE ME! @@@*/
     return kIOReturnUnsupported;
 }
 
-IOReturn org_mklinux_iokit_swim3::doSyncReadWrite(IOMemoryDescriptor *buffer,
+IOReturn org_mklinux_iokit_swim3_driver::doSyncReadWrite(IOMemoryDescriptor *buffer,
                         UInt32 block,UInt32 nblks)
 {
 /* @@@ WRITE ME! @@@ */
@@ -76,7 +76,7 @@
  FloppyPluginGetInfo(BSStorePtr infoStore,
                      struct BSStoreMPIInfo *info);
 
-IOReturn org_mklinux_iokit_swim3::reportBlockSize(UInt64 *blockSize)
+IOReturn org_mklinux_iokit_swim3_driver::reportBlockSize(UInt64 *blockSize)
 {
     struct BSStoreMPIInfo info;
     BSStorePtr infoStore;
@@ -92,25 +92,25 @@
         return kIOReturnError;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportEjectability(bool *isEjectable)
+IOReturn org_mklinux_iokit_swim3_driver::reportEjectability(bool *isEjectable)
 {
     *isEjectable=1;
     return kIOReturnSuccess;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportLockability(bool *isLockable)
+IOReturn org_mklinux_iokit_swim3_driver::reportLockability(bool *isLockable)
 {
     *isLockable=1;
     return kIOReturnSuccess;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportMaxReadTransfer(UInt64 blockSize,UInt64 *max)
+IOReturn org_mklinux_iokit_swim3_driver::reportMaxReadTransfer(UInt64 blockSize,UInt64 *max)
 {
     /* It's the same for floppies, so why screw with two functions? */
     return reportMaxWriteTransfer(blockSize, max);
 }
 
-IOReturn org_mklinux_iokit_swim3::reportMaxValidBlock(UInt64 *maxBlock)
+IOReturn org_mklinux_iokit_swim3_driver::reportMaxValidBlock(UInt64 *maxBlock)
 {
     struct BSStoreMPIInfo info;
     BSStorePtr infoStore;
@@ -127,7 +127,7 @@
 }
 
 
-IOReturn org_mklinux_iokit_swim3::reportMaxWriteTransfer(UInt64 blockSize,UInt64 *max)
+IOReturn org_mklinux_iokit_swim3_driver::reportMaxWriteTransfer(UInt64 blockSize,UInt64 *max)
 {
 
     *max=MAX_PHYS / blockSize;
@@ -135,7 +135,7 @@
     return kIOReturnSuccess;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportMediaState(bool *mediaPresent,bool *changedState)
+IOReturn org_mklinux_iokit_swim3_driver::reportMediaState(bool *mediaPresent,bool *changedState)
 {
     struct BSStoreMPIInfo info;
     BSStorePtr infoStore;
@@ -159,7 +159,7 @@
         return kIOReturnError;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportPollRequirements(bool *pollRequired,
+IOReturn org_mklinux_iokit_swim3_driver::reportPollRequirements(bool *pollRequired,
                     bool *pollIsExpensive)
 {
 *pollRequired=false;
@@ -167,13 +167,13 @@
 return kIOReturnSuccess;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportRemovability(bool *isRemovable)
+IOReturn org_mklinux_iokit_swim3_driver::reportRemovability(bool *isRemovable)
 {
 *isRemovable=true;
 return kIOReturnSuccess;
 }
 
-IOReturn org_mklinux_iokit_swim3::reportWriteProtection(bool *isWriteProtected)
+IOReturn org_mklinux_iokit_swim3_driver::reportWriteProtection(bool *isWriteProtected)
 {
     struct BSStoreMPIInfo info;
     BSStorePtr infoStore;