Changeset 0773396 in mainline for uspace/drv/char/i8042/main.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

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] 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.",