Changeset 5b89d43b in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2013-12-14T11:54:29Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f5ceb18

Parents:

3558ba93

Message:

Unbreak USB UHCI support.

• Support PIO_WINDOW_DEV_IFACE in the uhci driver.
• Do not base the UHCI RH resources on the address obtained from pio_enable_range().
• Provide a restricted PIO window instead, based on the UHCI IO range. The UHCI RH resources are then relative to this window.

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (2 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
 };
 
@@ -246 +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",