Changeset 7de1988c in mainline for uspace/drv/char

Timestamp:

2013-09-12T20:53:09Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddd0499d

Parents:

8049b79

Message:

Adapt drivers using parsed HW resources to use the new interface.

Location:

uspace/drv/char/i8042

Files:

• i8042.c (modified) (5 diffs)
• i8042.h (modified) (1 diff)
• main.c (modified) (7 diffs)

uspace/drv/char/i8042/i8042.c

@@ -145 +145 @@
  *
  * @param dev       Driver structure to initialize.
- * @param regs      I/O address of registers.
- * @param reg_size  size of the reserved I/O address space.
+ * @param regs      I/O range  of registers.
  * @param irq_kbd   IRQ for primary port.
  * @param irq_mouse IRQ for aux port.
@@ -154 +153 @@
  *
  */
-int i8042_init(i8042_t *dev, void *regs, size_t reg_size, int irq_kbd,
+int i8042_init(i8042_t *dev, addr_range_t *regs, int irq_kbd,
     int irq_mouse, ddf_dev_t *ddf_dev)
 {
@@ -162 +161 @@
         const size_t cmd_count = sizeof(i8042_cmds) / sizeof(irq_cmd_t);
         irq_cmd_t cmds[cmd_count];
+        i8042_regs_t *ar;
 
         int rc;
@@ -170 +170 @@
         dev->aux_fun = NULL;
         
-        if (reg_size < sizeof(i8042_regs_t)) {
+        if (regs->size < sizeof(i8042_regs_t)) {
                 rc = EINVAL;
                 goto error;
         }
         
-        if (pio_enable(regs, sizeof(i8042_regs_t), (void **) &dev->regs) != 0) {
+        if (pio_enable_range(regs, (void **) &dev->regs) != 0) {
                 rc = EIO;
                 goto error;
@@ -234 +234 @@
 
         memcpy(ranges, i8042_ranges, sizeof(i8042_ranges));
-        ranges[0].base = (uintptr_t) regs;
-
+        ranges[0].base = RNGABS(*regs);
+
+
+        ar = RNGABSPTR(*regs);
         memcpy(cmds, i8042_cmds, sizeof(i8042_cmds));
-        cmds[0].addr = (void *) &(((i8042_regs_t *) regs)->status);
-        cmds[3].addr = (void *) &(((i8042_regs_t *) regs)->data);
+        cmds[0].addr = (void *) &ar->status;
+        cmds[3].addr = (void *) &ar->data;
 
         irq_code_t irq_code = {

uspace/drv/char/i8042/i8042.h

@@ -68 +68 @@
 } i8042_t;
 
-int i8042_init(i8042_t *, void *, size_t, int, int, ddf_dev_t *);
+int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *);
 
 #endif

uspace/drv/char/i8042/main.c

@@ -49 +49 @@
  *
  * @param[in]  dev            Device asking for the addresses.
- * @param[out] io_reg_address Base address of the memory range.
- * @param[out] io_reg_size    Size of the memory range.
+ * @param[out] p_io_reg       Pointer to register range.
  * @param[out] kbd_irq        Primary port IRQ.
  * @param[out] mouse_irq      Auxiliary port IRQ.
@@ -57 +56 @@
  *
  */
-static int get_my_registers(ddf_dev_t *dev, uintptr_t *io_reg_address,
-    size_t *io_reg_size, int *kbd_irq, int *mouse_irq)
+static int get_my_registers(ddf_dev_t *dev, addr_range_t *p_io_reg,
+    int *kbd_irq, int *mouse_irq)
 {
         assert(dev);
@@ -79 +78 @@
         }
         
-        if (io_reg_address)
-                *io_reg_address = hw_resources.io_ranges.ranges[0].address;
-        
-        if (io_reg_size)
-                *io_reg_size = hw_resources.io_ranges.ranges[0].size;
+        if (p_io_reg)
+                *p_io_reg = hw_resources.io_ranges.ranges[0];
         
         if (kbd_irq)
@@ -104 +100 @@
 static int i8042_dev_add(ddf_dev_t *device)
 {
-        uintptr_t io_regs = 0;
-        size_t io_size = 0;
+        addr_range_t io_regs;
         int kbd = 0;
         int mouse = 0;
@@ -113 +108 @@
                 return EINVAL;
         
-        rc = get_my_registers(device, &io_regs, &io_size, &kbd, &mouse);
+        rc = get_my_registers(device, &io_regs, &kbd, &mouse);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to get registers: %s.",
@@ -120 +115 @@
         }
         
-        ddf_msg(LVL_DEBUG, "I/O regs at %p (size %zuB), IRQ kbd %d, IRQ mouse %d.",
-            (void *) io_regs, io_size, kbd, mouse);
+        ddf_msg(LVL_DEBUG,
+            "I/O regs at %p (size %zuB), IRQ kbd %d, IRQ mouse %d.",
+            RNGABSPTR(io_regs), RNGSZ(io_regs), kbd, mouse);
         
         i8042_t *i8042 = ddf_dev_data_alloc(device, sizeof(i8042_t));
@@ -129 +125 @@
         }
         
-        rc = i8042_init(i8042, (void *) io_regs, io_size, kbd, mouse, device);
+        rc = i8042_init(i8042, &io_regs, kbd, mouse, device);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to initialize i8042 driver: %s.",