Changeset 3f03199 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/drv/char/i8042/i8042.c (modified) (5 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 = {