Changeset 50114ef in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-03-24T13:45:48Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

915a851

Parents:

5f80527 (diff), e18e0d6 (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 development/ changes

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (9 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -54 +54 @@
 {
         assert(dev);
-        uhci_hc_t *hc = &((uhci_t*)dev->driver_data)->hc;
+        hc_t *hc = &((uhci_t*)dev->driver_data)->hc;
         uint16_t status = IPC_GET_ARG1(*call);
         assert(hc);
-        uhci_hc_interrupt(hc, status);
+        hc_interrupt(hc, status);
 }
 /*----------------------------------------------------------------------------*/
@@ -70 +70 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
+        usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.manager;
 
         usb_address_t addr = usb_device_keeper_find(manager, handle);
@@ -107 +107 @@
 };
 /*----------------------------------------------------------------------------*/
-static ddf_dev_ops_t uhci_hc_ops = {
+static ddf_dev_ops_t hc_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
-        .interfaces[USBHC_DEV_IFACE] = &uhci_hc_iface, /* see iface.h/c */
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/
@@ -120 +120 @@
 {
         assert(fun);
-        return &((uhci_rh_t*)fun->driver_data)->resource_list;
+        return &((rh_t*)fun->driver_data)->resource_list;
 }
 /*----------------------------------------------------------------------------*/
@@ -128 +128 @@
 };
 /*----------------------------------------------------------------------------*/
-static ddf_dev_ops_t uhci_rh_ops = {
+static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
         .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
@@ -175 +175 @@
 
         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(%d) to enable interrupts, fall back to polling.\n",
-                    ret);
+                usb_log_warning("Failed to enable interrupts: %s.\n",
+                    str_error(ret));
+                usb_log_info("HW interrupts not available, " \
+                    "falling back to polling.\n");
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
                 interrupts = true;
         }
+#endif
 
         instance->hc_fun = ddf_fun_create(device, fun_exposed, "uhci-hc");
@@ -190 +196 @@
             "Failed(%d) to create HC function.\n", ret);
 
-        ret = uhci_hc_init(&instance->hc, instance->hc_fun,
+        ret = hc_init(&instance->hc, instance->hc_fun,
             (void*)io_reg_base, io_reg_size, interrupts);
         CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to init uhci-hcd.\n", ret);
-        instance->hc_fun->ops = &uhci_hc_ops;
+        instance->hc_fun->ops = &hc_ops;
         instance->hc_fun->driver_data = &instance->hc;
         ret = ddf_fun_bind(instance->hc_fun);
@@ -208 +214 @@
         if (instance->rh_fun) \
                 ddf_fun_destroy(instance->rh_fun); \
-        uhci_hc_fini(&instance->hc); \
+        hc_fini(&instance->hc); \
         return ret; \
 }
@@ -223 +229 @@
             "Failed(%d) to create root hub function.\n", ret);
 
-        ret = uhci_rh_init(&instance->rh, instance->rh_fun,
+        ret = rh_init(&instance->rh, instance->rh_fun,
             (uintptr_t)instance->hc.registers + 0x10, 4);
         CHECK_RET_FINI_RETURN(ret,
             "Failed(%d) to setup UHCI root hub.\n", ret);
 
-        instance->rh_fun->ops = &uhci_rh_ops;
+        instance->rh_fun->ops = &rh_ops;
         instance->rh_fun->driver_data = &instance->rh;
         ret = ddf_fun_bind(instance->rh_fun);