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

Timestamp:

2011-03-29T20:08:53Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fc883bb

Parents:

0d92638 (diff), 51e5608 (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:

development changes

File:

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

uspace/drv/uhci-hcd/uhci.c

@@ -44 +44 @@
 #include "pci.h"
 
-
 /** IRQ handling callback, identifies device
  *
@@ -108 +107 @@
 /*----------------------------------------------------------------------------*/
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface,
+//      .interfaces[USB_DEV_IFACE] = &usb_iface,
         .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
@@ -175 +174 @@
 
         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");