Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/uhci-hcd/iface.c

    r1998bcd r52cc968  
    7474            name, target.address, target.endpoint, size, ep->max_packet_size);
    7575
    76 //      assert(ep->speed ==
    77 //          usb_device_keeper_get_speed(&(*hc)->manager, target.address));
     76        assert(ep->speed ==
     77            usb_device_keeper_get_speed(&(*hc)->manager, target.address));
    7878//      assert(ep->max_packet_size == max_packet_size);
    7979//      assert(ep->transfer_type == USB_TRANSFER_CONTROL);
     
    198198/*----------------------------------------------------------------------------*/
    199199static int register_endpoint(
    200     ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
    201     usb_endpoint_t endpoint,
     200    ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
    202201    usb_transfer_type_t transfer_type, usb_direction_t direction,
    203202    size_t max_packet_size, unsigned int interval)
     
    205204        hc_t *hc = fun_to_hc(fun);
    206205        assert(hc);
    207         usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
    208         if (speed >= USB_SPEED_MAX) {
    209                 speed = ep_speed;
    210         }
     206        const usb_speed_t speed =
     207            usb_device_keeper_get_speed(&hc->manager, address);
    211208        const size_t size =
    212209            (transfer_type == USB_TRANSFER_INTERRUPT
     
    246243        usb_log_debug("Unregister endpoint %d:%d %d.\n",
    247244            address, endpoint, direction);
    248         endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
    249             address, endpoint, direction, NULL);
    250         if (ep != NULL) {
    251                 usb_device_keeper_del_ep(&hc->manager, address, ep);
    252         }
    253245        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
    254246            endpoint, direction);
     
    259251 * @param[in] fun DDF function that was called.
    260252 * @param[in] target USB device to write to.
     253 * @param[in] max_packet_size maximum size of data packet the device accepts
    261254 * @param[in] data Source of data.
    262255 * @param[in] size Size of data source.
     
    266259 */
    267260static int interrupt_out(
    268     ddf_fun_t *fun, usb_target_t target, void *data,
     261    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
    269262    size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
    270263{
     
    287280 * @param[in] fun DDF function that was called.
    288281 * @param[in] target USB device to write to.
     282 * @param[in] max_packet_size maximum size of data packet the device accepts
    289283 * @param[out] data Data destination.
    290284 * @param[in] size Size of data source.
     
    294288 */
    295289static int interrupt_in(
    296     ddf_fun_t *fun, usb_target_t target, void *data,
     290    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
    297291    size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
    298292{
     
    315309 * @param[in] fun DDF function that was called.
    316310 * @param[in] target USB device to write to.
     311 * @param[in] max_packet_size maximum size of data packet the device accepts
    317312 * @param[in] data Source of data.
    318313 * @param[in] size Size of data source.
     
    322317 */
    323318static int bulk_out(
    324     ddf_fun_t *fun, usb_target_t target, void *data,
     319    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
    325320    size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
    326321{
     
    343338 * @param[in] fun DDF function that was called.
    344339 * @param[in] target USB device to write to.
     340 * @param[in] max_packet_size maximum size of data packet the device accepts
    345341 * @param[out] data Data destination.
    346342 * @param[in] size Size of data source.
     
    350346 */
    351347static int bulk_in(
    352     ddf_fun_t *fun, usb_target_t target, void *data,
     348    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
    353349    size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
    354350{
     
    371367 * @param[in] fun DDF function that was called.
    372368 * @param[in] target USB device to write to.
     369 * @param[in] max_packet_size maximum size of data packet the device accepts.
    373370 * @param[in] setup_data Data to send with SETUP transfer.
    374371 * @param[in] setup_size Size of data to send with SETUP transfer (always 8B).
     
    380377 */
    381378static int control_write(
    382     ddf_fun_t *fun, usb_target_t target,
     379    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
    383380    void *setup_data, size_t setup_size, void *data, size_t size,
    384381    usbhc_iface_transfer_out_callback_t callback, void *arg)
     
    404401 * @param[in] fun DDF function that was called.
    405402 * @param[in] target USB device to write to.
     403 * @param[in] max_packet_size maximum size of data packet the device accepts.
    406404 * @param[in] setup_data Data to send with SETUP packet.
    407405 * @param[in] setup_size Size of data to send with SETUP packet (should be 8B).
     
    413411 */
    414412static int control_read(
    415     ddf_fun_t *fun, usb_target_t target,
     413    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
    416414    void *setup_data, size_t setup_size, void *data, size_t size,
    417415    usbhc_iface_transfer_in_callback_t callback, void *arg)
Note: See TracChangeset for help on using the changeset viewer.