Changeset 8dc762e0 in mainline for uspace/drv/uhci-hcd/iface.c
- Timestamp:
- 2011-04-06T21:12:41Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
- Children:
- f567bcf
- Parents:
- 1e70157
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/iface.c
r1e70157 r8dc762e0 36 36 37 37 #include <usb/debug.h> 38 39 #include "endpoint.h" 38 #include <usb/host/endpoint.h> 39 40 40 #include "iface.h" 41 41 #include "hc.h" … … 159 159 const usb_speed_t speed = 160 160 usb_device_keeper_get_speed(&hc->manager, address); 161 const size_t size = max_packet_size; 161 const size_t size = 162 (transfer_type == USB_TRANSFER_INTERRUPT 163 || transfer_type == USB_TRANSFER_ISOCHRONOUS) ? 164 max_packet_size : 0; 162 165 int ret; 163 166 … … 175 178 usb_str_speed(speed), direction, size, max_packet_size, interval); 176 179 177 const size_t bw =178 (transfer_type == USB_TRANSFER_INTERRUPT179 || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?180 bandwidth_count_usb11(speed, transfer_type, size, max_packet_size) :181 0;182 183 180 ret = usb_endpoint_manager_register_ep(&hc->ep_manager, 184 address, endpoint, direction, ep, endpoint_destroy, bw);181 address, endpoint, direction, ep, size); 185 182 if (ret != EOK) { 186 183 endpoint_destroy(ep); … … 226 223 227 224 size_t res_bw; 228 endpoint_t *ep = usb_endpoint_manager_get_ep _data(&hc->ep_manager,225 endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, 229 226 target.address, target.endpoint, USB_DIRECTION_OUT, &res_bw); 230 227 if (ep == NULL) { … … 283 280 284 281 size_t res_bw; 285 endpoint_t *ep = usb_endpoint_manager_get_ep _data(&hc->ep_manager,282 endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, 286 283 target.address, target.endpoint, USB_DIRECTION_IN, &res_bw); 287 284 if (ep == NULL) { … … 340 337 target.address, target.endpoint, size, max_packet_size); 341 338 342 endpoint_t *ep = usb_endpoint_manager_get_ep _data(&hc->ep_manager,339 endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, 343 340 target.address, target.endpoint, USB_DIRECTION_OUT, NULL); 344 341 if (ep == NULL) { … … 387 384 target.address, target.endpoint, size, max_packet_size); 388 385 389 endpoint_t *ep = usb_endpoint_manager_get_ep _data(&hc->ep_manager,386 endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, 390 387 target.address, target.endpoint, USB_DIRECTION_IN, NULL); 391 388 if (ep == NULL) { … … 438 435 usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n", 439 436 speed, target.address, target.endpoint, size, max_packet_size); 440 endpoint_t *ep = usb_endpoint_manager_get_ep _data(&hc->ep_manager,437 endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, 441 438 target.address, target.endpoint, USB_DIRECTION_BOTH, NULL); 442 439 if (ep == NULL) { … … 489 486 usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n", 490 487 speed, target.address, target.endpoint, size, max_packet_size); 491 endpoint_t *ep = usb_endpoint_manager_get_ep _data(&hc->ep_manager,488 endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager, 492 489 target.address, target.endpoint, USB_DIRECTION_BOTH, NULL); 493 490 if (ep == NULL) {
Note:
See TracChangeset
for help on using the changeset viewer.