Changeset 39580667 in mainline

Timestamp:

2009-05-28T19:55:56Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6b2f4c1

Parents:

0c0b800

Message:

Large I/O areas actually work as expected. Fix the definition of the gxe_bd device and pio_enable() the whole I/O area at once.

File:

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

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -73 +73 @@
         uint32_t status;
 
-/*      FIXME: Need to fix pio_enable() to support >= page_size areas.
-
         uint32_t pad4[3];
-        uint32_t pad5[0x3fc0];
-
-        uint8_t buffer[512];*/
+        uint8_t pad5[0x3fc0];
+
+        uint8_t buffer[512];
 } gxe_bd_t;
 
-typedef struct {
-        uint8_t buffer[512];
-} gxe_buf_t;
 
 static const size_t block_size = 512;
@@ -90 +85 @@
 static uintptr_t dev_physical = 0x13000000;
 static gxe_bd_t *dev;
-static gxe_buf_t *devbuf;
 
 static uint32_t disk_id = 0;
@@ -135 +129 @@
 
         dev = vaddr;
-
-        rc = pio_enable((void *) dev_physical + 0x4000, sizeof(gxe_buf_t), &vaddr);
-        if (rc != EOK) {
-                printf(NAME ": Could not initialize device I/O space.\n");
-                return rc;
-        }
-
-        devbuf = vaddr;
 
         rc = devmap_device_register("disk0", &dev_handle);
@@ -253 +239 @@
 
         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]);
         }
 
@@ -268 +253 @@
 
         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]);
         }