Changeset 1806e5d in mainline

Timestamp:

2009-06-12T21:27:58Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

4f5caea

Parents:

26360f7

Message:

Properly support two disks per ATA controller. Fake (Qemu-only) check whether disk is present. Only create device nodes for detected disks.

File:

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

uspace/srv/bd/ata_bd/ata_bd.c

@@ -51 +51 @@
 #include <sys/types.h>
 #include <errno.h>
+#include <bool.h>
 
 #define NAME "ata_bd"
@@ -134 +135 @@
 };
 
+typedef struct {
+        bool present;
+        unsigned heads;
+        unsigned cylinders;
+        unsigned sectors;
+        uint64_t blocks;
+} disk_t;
+
 static const size_t block_size = 512;
 static size_t comm_size;
@@ -146 +155 @@
 static atomic_t dev_futex = FUTEX_INITIALIZER;
 
-static unsigned heads, cylinders, sectors;
-static uint64_t disk_blocks;
+static disk_t disk[2];
 
 static int ata_bd_init(void);
@@ -155 +163 @@
 static int ata_bd_read_block(int disk_id, uint64_t blk_idx, size_t blk_cnt,
     void *buf);
+static int drive_identify(int drive_id, disk_t *d);
 
 int main(int argc, char **argv)
 {
         uint8_t status;
-        uint16_t data;
-        int i;
+        char name[16];
+        int i, rc;
+        int n_disks;
 
         printf(NAME ": ATA disk driver\n");
@@ -188 +198 @@
         printf("Status = 0x%x\n", pio_read_8(&cmd->status));
 
-        printf("Issue drive_identify command\n");
-        pio_write_8(&cmd->drive_head, 0x00);
-        async_usleep(100);
-        pio_write_8(&cmd->command, 0xEC);
-
-        printf("Status = 0x%x\n", pio_read_8(&cmd->status));
-
-        for (i = 0; i < 256; i++) {
-                do {
-                        status = pio_read_8(&cmd->status);
-                } while ((status & SR_DRDY) == 0);
-
-                data = pio_read_16(&cmd->data_port);
-
-                switch (i) {
-                case 1: cylinders = data; break;
-                case 3: heads = data; break;
-                case 6: sectors = data; break;
-                }
-        }
-
-        printf("\n\nStatus = 0x%x\n", pio_read_8(&cmd->status));
-
-        printf("Geometry: %u cylinders, %u heads, %u sectors\n",
-                cylinders, heads, sectors);
-        disk_blocks = cylinders * heads * sectors;
-
-        printf(NAME ": Accepting connections\n");
-        async_manager();
-
-        /* Not reached */
-        return 0;
-}
-
-static int ata_bd_init(void)
-{
-        void *vaddr;
-        int rc, i;
-        char name[16];
-
-        rc = devmap_driver_register(NAME, ata_bd_connection);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
-                return rc;
-        }
-
-        rc = pio_enable((void *) cmd_physical, sizeof(ata_cmd_t), &vaddr);
-        if (rc != EOK) {
-                printf(NAME ": Could not initialize device I/O space.\n");
-                return rc;
-        }
-
-        cmd = vaddr;
-
-        rc = pio_enable((void *) ctl_physical, sizeof(ata_ctl_t), &vaddr);
-        if (rc != EOK) {
-                printf(NAME ": Could not initialize device I/O space.\n");
-                return rc;
-        }
-
-        ctl = vaddr;
+        (void) drive_identify(0, &disk[0]);
+        (void) drive_identify(1, &disk[1]);
+
+        n_disks = 0;
 
         for (i = 0; i < MAX_DISKS; i++) {
+                /* Skip unattached drives. */
+                if (disk[i].present == false)
+                        continue;
+
                 snprintf(name, 16, "disk%d", i);
                 rc = devmap_device_register(name, &dev_handle[i]);
@@ -259 +216 @@
                         return rc;
                 }
-        }
+                ++n_disks;
+        }
+
+        if (n_disks == 0) {
+                printf("No disks detected.\n");
+                return -1;
+        }
+
+        printf(NAME ": Accepting connections\n");
+        async_manager();
+
+        /* Not reached */
+        return 0;
+}
+
+static int drive_identify(int disk_id, disk_t *d)
+{
+        uint16_t data;
+        uint8_t status;
+        int i;
+
+        printf("Identify drive %d\n", disk_id);
+        pio_write_8(&cmd->drive_head, ((disk_id != 0) ? DHR_DRV : 0));
+        async_usleep(100);
+        pio_write_8(&cmd->command, 0xEC);
+
+        status = pio_read_8(&cmd->status);
+        printf("Status = 0x%x\n", status);
+
+        d->present = false;
+
+        /*
+         * Detect if drive is present. This is Qemu only! Need to
+         * do the right thing to work with real drives.
+         */
+        if ((status & SR_DRDY) == 0) {
+                printf("None attached.\n");
+                return ENOENT;
+        }
+
+        for (i = 0; i < 256; i++) {
+                do {
+                        status = pio_read_8(&cmd->status);
+                } while ((status & SR_DRDY) == 0);
+
+                data = pio_read_16(&cmd->data_port);
+
+                switch (i) {
+                case 1: d->cylinders = data; break;
+                case 3: d->heads = data; break;
+                case 6: d->sectors = data; break;
+                }
+        }
+
+        printf("\n\nStatus = 0x%x\n", pio_read_8(&cmd->status));
+
+        d->blocks = d->cylinders * d->heads * d->sectors;
+
+        printf("Geometry: %u cylinders, %u heads, %u sectors\n",
+                d->cylinders, d->heads, d->sectors);
+
+        d->present = true;
+
+        return EOK;
+}
+
+static int ata_bd_init(void)
+{
+        void *vaddr;
+        int rc;
+
+        rc = devmap_driver_register(NAME, ata_bd_connection);
+        if (rc < 0) {
+                printf(NAME ": Unable to register driver.\n");
+                return rc;
+        }
+
+        rc = pio_enable((void *) cmd_physical, sizeof(ata_cmd_t), &vaddr);
+        if (rc != EOK) {
+                printf(NAME ": Could not initialize device I/O space.\n");
+                return rc;
+        }
+
+        cmd = vaddr;
+
+        rc = pio_enable((void *) ctl_physical, sizeof(ata_ctl_t), &vaddr);
+        if (rc != EOK) {
+                printf(NAME ": Could not initialize device I/O space.\n");
+                return rc;
+        }
+
+        ctl = vaddr;
+
 
         return EOK;
@@ -286 +335 @@
                         disk_id = i;
 
-        if (disk_id < 0) {
+        if (disk_id < 0 || disk[disk_id].present == false) {
                 ipc_answer_0(iid, EINVAL);
                 return;
@@ -375 +424 @@
         uint64_t idx;
         uint8_t drv_head;
+        disk_t *d;
+
+        d = &disk[disk_id];
 
         /* Check device bounds. */
-        if (blk_idx >= disk_blocks)
+        if (blk_idx >= d->blocks)
                 return EINVAL;
 
         /* Compute CHS. */
-        c = blk_idx / (heads * sectors);
-        idx = blk_idx % (heads * sectors);
-
-        h = idx / sectors;
-        s = 1 + (idx % sectors);
+        c = blk_idx / (d->heads * d->sectors);
+        idx = blk_idx % (d->heads * d->sectors);
+
+        h = idx / d->sectors;
+        s = 1 + (idx % d->sectors);
 
         /* New value for Drive/Head register */