WebSVN – HelenOS – Diff – /branches/dd/uspace/srv/bd/gxe_bd/gxe_bd.c

 enum {
     STATUS_FAILURE  = 0
 };
+enum {
+    MAX_DISKS   = 2
+};
 typedef struct {
     uint32_t offset_lo;
     uint32_t pad0;
     uint32_t offset_hi;
     uint32_t pad1;
     uint32_t control;
     uint32_t pad3[3];
     uint32_t status;
-/*  FIXME: Need to fix pio_enable() to support >= page_size areas.
     uint32_t pad4[3];
-    uint32_t pad5[0x3fc0];
+    uint8_t pad5[0x3fc0];
-    uint8_t buffer[512];*/
+    uint8_t buffer[512];
 } gxe_bd_t;
-typedef struct {
-    uint8_t buffer[512];
-} gxe_buf_t;
 static const size_t block_size = 512;
 static size_t comm_size;
 static uintptr_t dev_physical = 0x13000000;
 static gxe_bd_t *dev;
-static gxe_buf_t *devbuf;
-static uint32_t disk_id = 0;
+static dev_handle_t dev_handle[MAX_DISKS];
 static atomic_t dev_futex = FUTEX_INITIALIZER;
 static int gxe_bd_init(void);
 static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
-static int gx_bd_rdwr(ipcarg_t method, off_t offset, off_t size, void *buf);
+static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size,
+    void *buf);
-static int gxe_bd_read_block(uint64_t offset, size_t size, void *buf);
+static int gxe_bd_read_block(int disk_id, uint64_t offset, size_t size,
+    void *buf);
-static int gxe_bd_write_block(uint64_t offset, size_t size, const void *buf);
+static int gxe_bd_write_block(int disk_id, uint64_t offset, size_t size,
+    const void *buf);
 int main(int argc, char **argv)
+{
     printf(NAME ": GXemul disk driver\n");
     return 0;
+}
 static int gxe_bd_init(void)
+{
-    dev_handle_t dev_handle;
     void *vaddr;
-    int rc;
+    int rc, i;
+    char name[16];
     rc = devmap_driver_register(NAME, gxe_bd_connection);
     if (rc < 0) {
         printf(NAME ": Unable to register driver.\n");
         return rc;
         return rc;
+    }
     dev = vaddr;
-    rc = pio_enable((void *) dev_physical + 0x4000, sizeof(gxe_buf_t), &vaddr);
-    if (rc != EOK) {
+    for (i = 0; i < MAX_DISKS; i++) {
-        printf(NAME ": Could not initialize device I/O space.\n");
+        snprintf(name, 16, "disk%d", i);
-        return rc;
-    }
-    devbuf = vaddr;
-    rc = devmap_device_register("disk0", &dev_handle);
+        rc = devmap_device_register(name, &dev_handle[i]);
-    if (rc != EOK) {
+        if (rc != EOK) {
-        devmap_hangup_phone(DEVMAP_DRIVER);
+            devmap_hangup_phone(DEVMAP_DRIVER);
-        printf(NAME ": Unable to register device.\n");
+            printf(NAME ": Unable to register device %s.\n",
+                name);
-        return rc;
+            return rc;
+        }
+    }
     return EOK;
+}
+{
     void *fs_va = NULL;
     ipc_callid_t callid;
     ipc_call_t call;
     ipcarg_t method;
+    dev_handle_t dh;
     int flags;
     int retval;
     off_t idx;
     off_t size;
+    int disk_id, i;
+    /* Get the device handle. */
+    dh = IPC_GET_ARG1(*icall);
+    /* Determine which disk device is the client connecting to. */
+    disk_id = -1;
+    for (i = 0; i < MAX_DISKS; i++)
+        if (dev_handle[i] == dh)
+            disk_id = i;
+    if (disk_id < 0) {
+        ipc_answer_0(iid, EINVAL);
+        return;
+    }
     /* Answer the IPC_M_CONNECT_ME_TO call. */
     ipc_answer_0(iid, EOK);
     if (!ipc_share_out_receive(&callid, &comm_size, &flags)) {
             size = IPC_GET_ARG2(call);
             if (size > comm_size) {
                 retval = EINVAL;
                 break;
+            }
-            retval = gx_bd_rdwr(method, idx * size, size, fs_va);
+            retval = gx_bd_rdwr(disk_id, method, idx * size,
+                size, fs_va);
             break;
         default:
             retval = EINVAL;
             break;
+        }
         ipc_answer_0(callid, retval);
+    }
+}
-static int gx_bd_rdwr(ipcarg_t method, off_t offset, off_t size, void *buf)
+static int gx_bd_rdwr(int disk_id, ipcarg_t method, off_t offset, off_t size,
+    void *buf)
+{
     int rc;
     size_t now;
     while (size > 0) {
         now = size < block_size ? size : block_size;
         if (method == BD_READ_BLOCK)
-            rc = gxe_bd_read_block(offset, now, buf);
+            rc = gxe_bd_read_block(disk_id, offset, now, buf);
         else
-            rc = gxe_bd_write_block(offset, now, buf);
+            rc = gxe_bd_write_block(disk_id, offset, now, buf);
         if (rc != EOK)
             return rc;
         buf += block_size;
+    }
     return EOK;
+}
-static int gxe_bd_read_block(uint64_t offset, size_t size, void *buf)
+static int gxe_bd_read_block(int disk_id, uint64_t offset, size_t size,
+    void *buf)
+{
     uint32_t status;
     size_t i;
     uint32_t w;
     if (status == STATUS_FAILURE) {
         return EIO;
+    }
     for (i = 0; i < size; i++) {
-        ((uint8_t *) buf)[i] = w =
-            pio_read_8(&devbuf->buffer[i]);
+        ((uint8_t *) buf)[i] = w = pio_read_8(&dev->buffer[i]);
+    }
     futex_up(&dev_futex);
     return EOK;
+}
-static int gxe_bd_write_block(uint64_t offset, size_t size, const void *buf)
+static int gxe_bd_write_block(int disk_id, uint64_t offset, size_t size,
+    const void *buf)
+{
     uint32_t status;
     size_t i;
-    uint32_t w;
     for (i = 0; i < size; i++) {
-        pio_write_8(&devbuf->buffer[i], ((const uint8_t *) buf)[i]);
+        pio_write_8(&dev->buffer[i], ((const uint8_t *) buf)[i]);
+    }
     futex_down(&dev_futex);
     pio_write_32(&dev->offset_lo, (uint32_t) offset);
     pio_write_32(&dev->offset_hi, offset >> 32);

Subversion Repositories HelenOS

(root)/branches/dd/uspace/srv/bd/gxe_bd/gxe_bd.c – Rev 4439 → 4537