===================================================================
RCS file: /MkLinux/floppy-darwin/floppy_sleep.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- floppy-darwin/floppy_sleep.c	2002/04/02 02:45:18	1.10
+++ floppy-darwin/floppy_sleep.c	2002/04/02 03:10:53	1.11
@@ -48,13 +48,13 @@
 
 static struct event_table org_mklinux_iokit_swim3_etable[NEVENTS];
 
-void *org_mklinux_iokit_swim3_etablelock;
+mutex_t *org_mklinux_iokit_swim3_etablelock;
 
 void org_mklinux_iokit_swim3_init_event_table(void)
 {
 int i;
 
-org_mklinux_iokit_swim3_etablelock = IOLockAlloc();
+org_mklinux_iokit_swim3_etablelock = mutex_alloc(0);
 for (i=0; i<NEVENTS; i++) org_mklinux_iokit_swim3_etable[i].used = 0;
 }
 
@@ -62,7 +62,7 @@
 {
     int i;
 
-    IOLockLock(org_mklinux_iokit_swim3_etablelock);
+    mutex_lock(org_mklinux_iokit_swim3_etablelock);
 
     for (i=0; i<NEVENTS; i++) {
 	if (org_mklinux_iokit_swim3_etable[i].event == event) {
@@ -76,7 +76,7 @@
 	    }
 	}
     }
-    IOLockUnlock(org_mklinux_iokit_swim3_etablelock);
+    mutex_unlock(org_mklinux_iokit_swim3_etablelock);
 }
 
 void org_mklinux_iokit_swim3_dispose_event_table(void)
@@ -88,23 +88,23 @@
 		org_mklinux_iokit_swim3_etable_free_sem(org_mklinux_iokit_swim3_etable[i].event);
 	}
     }
-    IOLockFree(org_mklinux_iokit_swim3_etablelock);
+    mutex_free(org_mklinux_iokit_swim3_etablelock);
 }
 
 semaphore_t org_mklinux_iokit_swim3_etable_get_sem(event_t event)
 {
     int i;
 
-    IOLockLock(org_mklinux_iokit_swim3_etablelock);
+    mutex_lock(org_mklinux_iokit_swim3_etablelock);
     for (i=0; i<NEVENTS; i++) {
 	if ((org_mklinux_iokit_swim3_etable[i].used) &&
 	    (org_mklinux_iokit_swim3_etable[i].event == event)) {
 		org_mklinux_iokit_swim3_etable[i].used++;
-		IOLockUnlock(org_mklinux_iokit_swim3_etablelock);
+		mutex_unlock(org_mklinux_iokit_swim3_etablelock);
 		return org_mklinux_iokit_swim3_etable[i].semptr;
 	}
     }
-    IOLockUnlock(org_mklinux_iokit_swim3_etablelock);
+    mutex_unlock(org_mklinux_iokit_swim3_etablelock);
     return NULL;
 }
 
@@ -113,7 +113,7 @@
     int i;
 
     /* @@@ FIXME DAG: Make this atomic! @@@ */
-    IOLockLock(org_mklinux_iokit_swim3_etablelock);
+    mutex_lock(org_mklinux_iokit_swim3_etablelock);
     for (i=0; i<NEVENTS; i++) {
 	if (!(org_mklinux_iokit_swim3_etable[i].used)) {
 		org_mklinux_iokit_swim3_etable[i].used = 1;
@@ -123,11 +123,11 @@
 			panic("semaphore_create failed!\n");
 		}
 		org_mklinux_iokit_swim3_etable[i].event = event;
-		IOLockUnlock(org_mklinux_iokit_swim3_etablelock);
+		mutex_unlock(org_mklinux_iokit_swim3_etablelock);
 		return org_mklinux_iokit_swim3_etable[i].semptr;
 	}
     }
-    IOLockUnlock(org_mklinux_iokit_swim3_etablelock);
+    mutex_unlock(org_mklinux_iokit_swim3_etablelock);
     return NULL;
 }