Changeset 408ebc5 in mainline
- Timestamp:
- 2011-03-22T19:20:37Z (14 years ago)
- 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. - Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r87644b4 r408ebc5 552 552 ! CONFIG_RUN_VIRTUAL_USB_HC (n/y) 553 553 554 % Polling UHCI & OHCI (no interrupts) 555 ! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_USBHC_NO_INTERRUPTS (y/n) -
uspace/drv/ohci/main.c
r87644b4 r408ebc5 149 149 } 150 150 151 151 152 bool interrupts = false; 153 #ifdef CONFIG_USBHC_NO_INTERRUPTS 154 usb_log_warning("Interrupts disabled in OS config, " \ 155 "falling back to polling.\n"); 156 #else 152 157 ret = pci_enable_interrupts(device); 153 158 if (ret != EOK) { 154 usb_log_warning( 155 "Failed(%d) to enable interrupts, fall back to polling.\n", 156 ret); 159 usb_log_warning("Failed to enable interrupts: %s.\n", 160 str_error(rc)); 161 usb_log_info("HW interrupts not available, " \ 162 "falling back to polling.\n"); 157 163 } else { 158 164 usb_log_debug("Hw interrupts enabled.\n"); 159 165 interrupts = true; 160 166 } 167 #endif 161 168 162 169 ret = hc_init(hcd, hc_fun, device, mem_reg_base, mem_reg_size, interrupts); -
uspace/drv/uhci-hcd/uhci.c
r87644b4 r408ebc5 175 175 176 176 bool interrupts = false; 177 #ifdef CONFIG_USBHC_NO_INTERRUPTS 178 usb_log_warning("Interrupts disabled in OS config, " \ 179 "falling back to polling.\n"); 180 #else 177 181 ret = pci_enable_interrupts(device); 178 182 if (ret != EOK) { 179 usb_log_warning( 180 "Failed(%d) to enable interrupts, fall back to polling.\n", 181 ret); 183 usb_log_warning("Failed to enable interrupts: %s.\n", 184 str_error(rc)); 185 usb_log_info("HW interrupts not available, " \ 186 "falling back to polling.\n"); 182 187 } else { 183 188 usb_log_debug("Hw interrupts enabled.\n"); 184 189 interrupts = true; 185 190 } 191 #endif 186 192 187 193 instance->hc_fun = ddf_fun_create(device, fun_exposed, "uhci-hc");
Note:
See TracChangeset
for help on using the changeset viewer.