Changes in uspace/drv/char/i8042/main.c [7de1988c:ca4730a5] in mainline

File:

• uspace/drv/char/i8042/main.c (modified) (7 diffs)

uspace/drv/char/i8042/main.c

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