Changeset 0c2d9bb in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/bus/usb/uhci/uhci.c (modified) (6 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -132 +132 @@
 };
 
+static pio_window_t *get_pio_window(ddf_fun_t *fun)
+{
+        rh_t *rh = ddf_fun_data_get(fun);
+        
+        if (rh == NULL)
+                return NULL;
+        return &rh->pio_window;
+}
+
+static pio_window_ops_t pio_window_iface = {
+        .get_pio_window = get_pio_window
+};
+
 /** RH function support for uhci_rhd */
 static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
-        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
+        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface,
+        .interfaces[PIO_WINDOW_DEV_IFACE] = &pio_window_iface
 };
 
@@ -184 +198 @@
         ddf_fun_data_implant(instance->rh_fun, &instance->rh);
 
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        addr_range_t regs;
         int irq = 0;
 
-        rc = get_my_registers(device, &reg_base, &reg_size, &irq);
+        rc = get_my_registers(device, &regs, &irq);
         if (rc != EOK) {
                 usb_log_error("Failed to get I/O addresses for %" PRIun ": %s.\n",
@@ -194 +207 @@
                 goto error;
         }
-        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
-            (void *) reg_base, reg_size, irq);
+        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(regs), RNGSZ(regs), irq);
 
         rc = disable_legacy(device);
@@ -204 +217 @@
         }
 
-        rc = hc_register_irq_handler(device, reg_base, reg_size, irq, irq_handler);
+        rc = hc_register_irq_handler(device, &regs, irq, irq_handler);
         if (rc != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.\n",
@@ -223 +236 @@
         }
 
-        rc = hc_init(&instance->hc, (void*)reg_base, reg_size, interrupts);
+        rc = hc_init(&instance->hc, &regs, interrupts);
         if (rc != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(rc));
@@ -247 +260 @@
         }
 
-        rc = rh_init(&instance->rh, instance->rh_fun,
-            (uintptr_t)instance->hc.registers + 0x10, 4);
+        rc = rh_init(&instance->rh, instance->rh_fun, &regs, 0x10, 4);
         if (rc != EOK) {
                 usb_log_error("Failed to setup UHCI root hub: %s.\n",