Changeset 32fb6bce in mainline for uspace/drv/bus/usb/xhci/bus.c
- Timestamp:
- 2017-12-18T22:50:21Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 7f70d1c
- Parents:
- 1ea0bbf
- git-author:
- Ondřej Hlavatý <aearsis@…> (2017-12-18 22:04:50)
- git-committer:
- Ondřej Hlavatý <aearsis@…> (2017-12-18 22:50:21)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/xhci/bus.c
r1ea0bbf r32fb6bce 111 111 112 112 uint16_t max_packet_size; 113 if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, hc->hcd, &dev->base)))113 if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base))) 114 114 return err; 115 115 … … 168 168 169 169 /* Read the device descriptor, derive the match ids */ 170 if ((err = hcd_d df_device_explore(dev))) {170 if ((err = hcd_device_explore(dev))) { 171 171 usb_log_error("Device(%d): Failed to explore device: %s", dev->address, str_error(err)); 172 172 goto err_address; … … 233 233 /* Destroy DDF device. */ 234 234 /* XXX: Not a good idea, this method should not destroy devices. */ 235 hcd_ddf_ device_destroy(dev);235 hcd_ddf_fun_destroy(dev); 236 236 237 237 return EOK; … … 501 501 BIND_OP(batch_destroy) 502 502 #undef BIND_OP 503 504 .interrupt = hc_interrupt, 505 .status = hc_status, 506 .batch_schedule = hc_schedule, 503 507 }; 504 508 … … 507 511 assert(bus); 508 512 509 bus_init(&bus->base, hc->hcd,sizeof(xhci_device_t));513 bus_init(&bus->base, sizeof(xhci_device_t)); 510 514 511 515 bus->devices_by_slot = calloc(hc->max_slots, sizeof(xhci_device_t *));
Note:
See TracChangeset
for help on using the changeset viewer.