Changeset 5828554 in mainline for uspace/drv/bus/usb/uhci/uhci.c
- Timestamp:
- 2014-01-19T14:37:22Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- cf982ff
- Parents:
- 2f591127 (diff), 476f62c (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/bus/usb/uhci/uhci.c
r2f591127 r5828554 132 132 }; 133 133 134 static pio_window_t *get_pio_window(ddf_fun_t *fun) 135 { 136 rh_t *rh = ddf_fun_data_get(fun); 137 138 if (rh == NULL) 139 return NULL; 140 return &rh->pio_window; 141 } 142 143 static pio_window_ops_t pio_window_iface = { 144 .get_pio_window = get_pio_window 145 }; 146 134 147 /** RH function support for uhci_rhd */ 135 148 static ddf_dev_ops_t rh_ops = { 136 149 .interfaces[USB_DEV_IFACE] = &usb_iface, 137 .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface 150 .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface, 151 .interfaces[PIO_WINDOW_DEV_IFACE] = &pio_window_iface 138 152 }; 139 153 … … 246 260 } 247 261 248 rc = rh_init(&instance->rh, instance->rh_fun, 249 (uintptr_t)instance->hc.registers + 0x10, 4); 262 rc = rh_init(&instance->rh, instance->rh_fun, ®s, 0x10, 4); 250 263 if (rc != EOK) { 251 264 usb_log_error("Failed to setup UHCI root hub: %s.\n",
Note:
See TracChangeset
for help on using the changeset viewer.