Changeset 408ebc5 in mainline

Timestamp:

2011-03-22T19:20:37Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

20a1e76

Parents:

87644b4 (diff), 11dd29b (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 branch changes

Files:

• HelenOS.config (modified) (1 diff)
• uspace/drv/ohci/main.c (modified) (1 diff)
• uspace/drv/uhci-hcd/uhci.c (modified) (1 diff)

HelenOS.config

@@ -552 +552 @@
 ! CONFIG_RUN_VIRTUAL_USB_HC (n/y)
 
+% Polling UHCI & OHCI (no interrupts)
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_USBHC_NO_INTERRUPTS (y/n)

uspace/drv/ohci/main.c

@@ -149 +149 @@
         }
 
+
         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(rc));
+                usb_log_info("HW interrupts not available, " \
+                    "falling back to polling.\n");
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
                 interrupts = true;
         }
+#endif
 
         ret = hc_init(hcd, hc_fun, device, mem_reg_base, mem_reg_size, interrupts);

uspace/drv/uhci-hcd/uhci.c

@@ -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(rc));
+                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");