Changeset 12956e57 in mainline for uspace/srv/bd/ata_bd/ata_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/ata_bd/ata_bd.c (modified) (12 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -38 +38 @@
  * Currently based on the (now obsolete) ANSI X3.221-1994 (ATA-1) standard.
  * At this point only reading is possible, not writing.
+ *
+ * The driver services a single controller which can have up to two disks
+ * attached.
  */
 
@@ -47 +50 @@
 #include <async.h>
 #include <as.h>
-#include <futex.h>
+#include <fibril_sync.h>
 #include <devmap.h>
 #include <sys/types.h>
@@ -65 +68 @@
 static ata_ctl_t *ctl;
 
-static dev_handle_t dev_handle[MAX_DISKS];
-
-static atomic_t dev_futex = FUTEX_INITIALIZER;
-
+/** Per-disk state. */
 static disk_t disk[MAX_DISKS];
 
@@ -90 +90 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("cmd_physical = 0x%x\n", cmd_physical);
-        printf("ctl_physical = 0x%x\n", ctl_physical);
+        printf("I/O address 0x%x\n", cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -121 +120 @@
 
                 snprintf(name, 16, "disk%d", i);
-                rc = devmap_device_register(name, &dev_handle[i]);
+                rc = devmap_device_register(name, &disk[i].dev_handle);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -182 +181 @@
         }
 
-        printf("\n\nStatus = 0x%x\n", pio_read_8(&cmd->status));
-
         d->blocks = d->cylinders * d->heads * d->sectors;
 
@@ -190 +187 @@
 
         d->present = true;
+        fibril_mutex_initialize(&d->lock);
 
         return EOK;
@@ -244 +242 @@
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (dev_handle[i] == dh)
+                if (disk[i].dev_handle == dh)
                         disk_id = i;
 
@@ -356 +354 @@
             (h & 0x0f);
 
-        futex_down(&dev_futex);
+        fibril_mutex_lock(&d->lock);
 
         /* Program a Read Sectors operation. */
@@ -378 +376 @@
         }
 
-        futex_up(&dev_futex);
+        fibril_mutex_unlock(&d->lock);
         return EOK;
 }
@@ -410 +408 @@
             (h & 0x0f);
 
-        futex_down(&dev_futex);
+        fibril_mutex_lock(&d->lock);
 
         /* Program a Read Sectors operation. */
@@ -431 +429 @@
         }
 
-        futex_up(&dev_futex);
+        fibril_mutex_unlock(&d->lock);
         return EOK;
 }