Changeset ddd0499d in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2013-09-12T22:05:13Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4285851

Parents:

695b6ff (diff), 7de1988c (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:

Support for PIO window-relative and absolute HW resource ranges.

The goal of this merge is to allow bus drivers to pass resources with IO
and memory ranges to the child drivers either in the PIO window-relative
form or system bus absolute form. Using the PIO window and the
relative/absolute attribute of a range, each driver can now reconstruct
both forms. Helper functions are provided to automate these
transformations as much as possible.

Changes in this merge in a greater detail:

• Support for PIO_WINDOW_DEV_IFACE in isa so that it can provide the PIO window to its children.

• Add 'relative' member to both hw_resource_t.res.mem_range and hw_resource_t.res.io_range so that the drivers can actually tell whether a range is absolute (eg. it was absolutized by its parent).

• Add pio_enable_resource() to allow drivers to enable PIO without the need to actually care about what kind of range the resource contains. This is used by pci now.

• Automate things even more for drivers that use hw_res_get_list_parsed(). The parsed HW resources compute both forms (relative/absolute) and offer it to the driver which is using them. Such a driver then uses whatever form is more fit for it and its purposes.

• Drivers using the parsed resources can use pio_enable_range() to enable PIO and RNGABS*()/RNGREL()/RNGSZ courtesy macros for easier access to the actual range address/size are provided.

• Device drivers affected by these API changes were converted.

• uhcirh now requires uhci to provide PIO_WINDOW_DEV_IFACE; however, the uhcirh driver is removed in the feature USB branch so there was no point in implementing this feature and UHCI USB is thus temporarily broken.

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 = {