Changeset 68b5ed6e in mainline for uspace/drv/uhci-hcd/iface.c
- Timestamp:
- 2011-03-21T14:27:47Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e34e77a
- Parents:
- 3954a63b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/iface.c
r3954a63b r68b5ed6e 55 55 assert(hc); 56 56 usb_log_debug("Default address request with speed %d.\n", speed); 57 device_keeper_reserve_default(&hc->device_manager, speed);57 usb_device_keeper_reserve_default_address(&hc->device_manager, speed); 58 58 return EOK; 59 59 } … … 70 70 assert(hc); 71 71 usb_log_debug("Default address release.\n"); 72 device_keeper_release_default(&hc->device_manager);72 usb_device_keeper_release_default_address(&hc->device_manager); 73 73 return EOK; 74 74 } … … 90 90 91 91 usb_log_debug("Address request with speed %d.\n", speed); 92 *address = device_keeper_ request(&hc->device_manager, speed);92 *address = device_keeper_get_free_address(&hc->device_manager, speed); 93 93 usb_log_debug("Address request with result: %d.\n", *address); 94 94 if (*address <= 0) … … 111 111 assert(hc); 112 112 usb_log_debug("Address bind %d-%d.\n", address, handle); 113 device_keeper_bind(&hc->device_manager, address, handle);113 usb_device_keeper_bind(&hc->device_manager, address, handle); 114 114 return EOK; 115 115 } … … 127 127 assert(hc); 128 128 usb_log_debug("Address release %d.\n", address); 129 device_keeper_release(&hc->device_manager, address);129 usb_device_keeper_release(&hc->device_manager, address); 130 130 return EOK; 131 131 } … … 149 149 uhci_hc_t *hc = fun_to_uhci_hc(fun); 150 150 assert(hc); 151 usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);151 usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); 152 152 153 153 usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n", … … 186 186 uhci_hc_t *hc = fun_to_uhci_hc(fun); 187 187 assert(hc); 188 usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);188 usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); 189 189 usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n", 190 190 target.address, target.endpoint, size, max_packet_size); … … 222 222 uhci_hc_t *hc = fun_to_uhci_hc(fun); 223 223 assert(hc); 224 usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);224 usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); 225 225 226 226 usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n", … … 259 259 uhci_hc_t *hc = fun_to_uhci_hc(fun); 260 260 assert(hc); 261 usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);261 usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); 262 262 usb_log_debug("Bulk IN %d:%d %zu(%zu).\n", 263 263 target.address, target.endpoint, size, max_packet_size); … … 298 298 uhci_hc_t *hc = fun_to_uhci_hc(fun); 299 299 assert(hc); 300 usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);300 usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); 301 301 usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n", 302 302 speed, target.address, target.endpoint, size, max_packet_size); … … 310 310 if (!batch) 311 311 return ENOMEM; 312 device_keeper_reset_if_need(&hc->device_manager, target, setup_data);312 usb_device_keeper_reset_if_need(&hc->device_manager, target, setup_data); 313 313 batch_control_write(batch); 314 314 const int ret = uhci_hc_schedule(hc, batch); … … 341 341 uhci_hc_t *hc = fun_to_uhci_hc(fun); 342 342 assert(hc); 343 usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);343 usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address); 344 344 345 345 usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
Note:
See TracChangeset
for help on using the changeset viewer.