Changeset 1f1fa64 in mainline for uspace/drv/bus/usb/uhci/uhci.c
- Timestamp:
- 2014-07-28T21:53:11Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c3b25985, f2f4c00
- Parents:
- cbfece7 (diff), 7eb6c96 (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
rcbfece7 r1f1fa64 34 34 */ 35 35 36 /* XXX Fix this */37 #define _DDF_DATA_IMPLANT38 39 36 #include <errno.h> 40 37 #include <stdbool.h> … … 62 59 hc_t hc; 63 60 /** Internal driver's representation of UHCI root hub */ 64 rh_t rh;61 rh_t *rh; 65 62 } uhci_t; 66 63 … … 186 183 187 184 ddf_fun_set_ops(instance->hc_fun, &hc_ops); 188 ddf_fun_data_implant(instance->hc_fun, &instance->hc.generic);189 185 190 186 instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh"); … … 196 192 197 193 ddf_fun_set_ops(instance->rh_fun, &rh_ops); 198 ddf_fun_data_implant(instance->rh_fun, &instance->rh);194 instance->rh = ddf_fun_data_alloc(instance->rh_fun, sizeof(rh_t)); 199 195 200 196 addr_range_t regs; … … 236 232 } 237 233 238 rc = hc_init(&instance->hc, ®s, interrupts);234 rc = hc_init(&instance->hc, instance->hc_fun, ®s, interrupts); 239 235 if (rc != EOK) { 240 236 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(rc)); … … 260 256 } 261 257 262 rc = rh_init( &instance->rh, instance->rh_fun, ®s, 0x10, 4);258 rc = rh_init(instance->rh, instance->rh_fun, ®s, 0x10, 4); 263 259 if (rc != EOK) { 264 260 usb_log_error("Failed to setup UHCI root hub: %s.\n",
Note:
See TracChangeset
for help on using the changeset viewer.