Changeset 26e7d6d in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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 (moved) (moved from uspace/drv/uhci/uhci.c ) (9 diffs)

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

@@ -41 +41 @@
 
 #include "uhci.h"
-#include "iface.h"
 #include "pci.h"
 
@@ -64 +63 @@
 {
         assert(dev);
-        assert(dev->driver_data);
         return dev->driver_data;
 }
@@ -78 +76 @@
         assert(dev);
         uhci_t *uhci = dev_to_uhci(dev);
-        hc_t *hc = &uhci->hc;
+        if (!uhci) {
+                usb_log_error("Interrupt on not yet initialized device.\n");
+                return;
+        }
         const uint16_t status = IPC_GET_ARG1(*call);
-        assert(hc);
-        hc_interrupt(hc, status);
+        hc_interrupt(&uhci->hc, status);
 }
 /*----------------------------------------------------------------------------*/
 /** Operations supported by the HC driver */
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/
@@ -99 +99 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &dev_to_uhci(fun->dev)->hc.manager;
-        usb_address_t addr = usb_device_keeper_find(manager, handle);
+        usb_device_manager_t *manager =
+            &dev_to_uhci(fun->dev)->hc.generic.dev_manager;
+        const usb_address_t addr = usb_device_manager_find(manager, handle);
 
         if (addr < 0) {
@@ -191 +192 @@
                 ddf_fun_destroy(instance->rh_fun); \
         } \
-        free(instance); \
+        device->driver_data = NULL; \
         usb_log_error(message); \
         return ret; \
@@ -201 +202 @@
         CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI HC function.\n");
         instance->hc_fun->ops = &hc_ops;
-        instance->hc_fun->driver_data = &instance->hc;
+        instance->hc_fun->driver_data = &instance->hc.generic;
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");
@@ -222 +223 @@
         ret = pci_disable_legacy(device);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
+            "Failed to disable legacy USB: %s.\n", str_error(ret));
+
+        const size_t cmd_count = hc_irq_cmd_count();
+        irq_cmd_t irq_cmds[cmd_count];
+        ret =
+            hc_get_irq_commands(irq_cmds, sizeof(irq_cmds), reg_base, reg_size);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to generate IRQ commands: %s.\n", str_error(ret));
+
+        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
+
+        /* Register handler to avoid interrupt lockup */
+        ret = register_interrupt_handler(device, irq, irq_handler, &irq_code);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to register interrupt handler: %s.\n", str_error(ret));
 
         bool interrupts = false;
-#ifdef CONFIG_USBHC_NO_INTERRUPTS
-        usb_log_warning("Interrupts disabled in OS config, " \
-            "falling back to polling.\n");
-#else
         ret = pci_enable_interrupts(device);
         if (ret != EOK) {
-                usb_log_warning("Failed to enable interrupts: %s.\n",
-                    str_error(ret));
-                usb_log_info("HW interrupts not available, " \
-                    "falling back to polling.\n");
+                usb_log_warning("Failed to enable interrupts: %s."
+                    " Falling back to polling.\n", str_error(ret));
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
                 interrupts = true;
         }
-#endif
-
 
         ret = hc_init(&instance->hc, (void*)reg_base, reg_size, interrupts);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed(%d) to init uhci_hcd: %s.\n", ret, str_error(ret));
+            "Failed to init uhci_hcd: %s.\n", str_error(ret));
+
+        device->driver_data = instance;
 
 #define CHECK_RET_FINI_RETURN(ret, message...) \
@@ -253 +262 @@
 } else (void)0
 
-        /* It does no harm if we register this on polling */
-        ret = register_interrupt_handler(device, irq, irq_handler,
-            &instance->hc.interrupt_code);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register interrupt handler: %s.\n",
-            ret, str_error(ret));
-
         ret = ddf_fun_bind(instance->hc_fun);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to bind UHCI device function: %s.\n",
-            ret, str_error(ret));
-
-        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_FINI_RETURN(ret, "Failed to bind UHCI device function: %s.\n",
+            str_error(ret));
+
+        ret = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);
         CHECK_RET_FINI_RETURN(ret,
             "Failed to add UHCI to HC class: %s.\n", str_error(ret));
@@ -272 +273 @@
             (uintptr_t)instance->hc.registers + 0x10, 4);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to setup UHCI root hub: %s.\n", ret, str_error(ret));
+            "Failed to setup UHCI root hub: %s.\n", str_error(ret));
 
         ret = ddf_fun_bind(instance->rh_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register UHCI root hub: %s.\n", ret, str_error(ret));
-
-        device->driver_data = instance;
+            "Failed to register UHCI root hub: %s.\n", str_error(ret));
+
         return EOK;
 #undef CHECK_RET_FINI_RETURN