Changeset 12956e57 in mainline for uspace/srv/bd/gxe_bd/gxe_bd.c

Timestamp:

2009-06-20T19:31:19Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2dfd9fa

Parents:

ac47b7c2

Message:

Use fibril synchronization in bd drivers. Use per-disk locks.

File:

• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (8 diffs)

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -43 +43 @@
 #include <async.h>
 #include <as.h>
-#include <futex.h>
+#include <fibril_sync.h>
 #include <devmap.h>
 #include <sys/types.h>
@@ -92 +92 @@
 static dev_handle_t dev_handle[MAX_DISKS];
 
-static atomic_t dev_futex = FUTEX_INITIALIZER;
+static fibril_mutex_t dev_lock[MAX_DISKS];
 
 static int gxe_bd_init(void);
@@ -146 +146 @@
                         return rc;
                 }
+                fibril_mutex_initialize(&dev_lock[i]);
         }
 
@@ -257 +258 @@
         uint32_t w;
 
-        futex_down(&dev_futex);
+        fibril_mutex_lock(&dev_lock[disk_id]);
         pio_write_32(&dev->offset_lo, (uint32_t) offset);
         pio_write_32(&dev->offset_hi, offset >> 32);
@@ -265 +266 @@
         status = pio_read_32(&dev->status);
         if (status == STATUS_FAILURE) {
+                fibril_mutex_unlock(&dev_lock[disk_id]);
                 return EIO;
         }
@@ -272 +274 @@
         }
 
-        futex_up(&dev_futex);
+        fibril_mutex_unlock(&dev_lock[disk_id]);
         return EOK;
 }
@@ -286 +288 @@
         }
 
-        futex_down(&dev_futex);
+        fibril_mutex_lock(&dev_lock[disk_id]);
         pio_write_32(&dev->offset_lo, (uint32_t) offset);
         pio_write_32(&dev->offset_hi, offset >> 32);
@@ -294 +296 @@
         status = pio_read_32(&dev->status);
         if (status == STATUS_FAILURE) {
+                fibril_mutex_unlock(&dev_lock[disk_id]);
                 return EIO;
         }
 
-        futex_up(&dev_futex);
+        fibril_mutex_unlock(&dev_lock[disk_id]);
         return EOK;
 }