Changeset 51b46f2 in mainline for uspace/drv/uhci-hcd/main.c
- Timestamp:
- 2011-03-01T15:39:52Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e135751
- Parents:
- 0e3505a (diff), cc44f7e (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/main.c
r0e3505a r51b46f2 82 82 usb_log_info("uhci_add_device() called\n"); 83 83 84 85 uintptr_t io_reg_base; 86 size_t io_reg_size; 87 int irq; 84 uintptr_t io_reg_base = 0; 85 size_t io_reg_size = 0; 86 int irq = 0; 88 87 89 88 int ret = … … 95 94 io_reg_base, io_reg_size, irq); 96 95 97 ret = pci_enable_interrupts(device);98 CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);96 // ret = pci_enable_interrupts(device); 97 // CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret); 99 98 100 99 uhci_t *uhci_hc = malloc(sizeof(uhci_t)); … … 114 113 */ 115 114 device->driver_data = uhci_hc; 116 117 115 ret = register_interrupt_handler(device, irq, irq_handler, 118 116 &uhci_hc->interrupt_code); … … 149 147 { 150 148 sleep(3); 151 usb_log_enable(USB_LOG_LEVEL_ INFO, NAME);149 usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME); 152 150 153 151 return ddf_driver_main(&uhci_driver);
Note:
See TracChangeset
for help on using the changeset viewer.