Changeset a9d67aa in mainline for uspace/drv


Ignore:
Timestamp:
2011-04-09T17:15:28Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
97e7e8a
Parents:
5410c04 (diff), 77223f8 (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.
Message:

Refactoring: libusb, USBHC interface protocol

Highlights:

  • refactoring of libusb (not complete)
  • max packet size is not send during each transfer
  • reserving of default address is possible via endpoint registration
  • endpoint registration can send speed as well
Location:
uspace/drv
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ehci-hcd/hc_iface.c

    r5410c04 ra9d67aa  
    123123 * @param[in] fun Device function the action was invoked on.
    124124 * @param[in] address USB address of the device.
     125 * @param[in] speed Endpoint speed (invalid means to use device one).
    125126 * @param[in] endpoint Endpoint number.
    126127 * @param[in] transfer_type USB transfer type.
    … …  
    131132 */
    132133static int register_endpoint(ddf_fun_t *fun,
    133     usb_address_t address, usb_endpoint_t endpoint,
     134    usb_address_t address, usb_speed_t speed, usb_endpoint_t endpoint,
    134135    usb_transfer_type_t transfer_type, usb_direction_t direction,
    135136    size_t max_packet_size, unsigned int interval)
    … …  
    165166 * @param[in] fun Device function the action was invoked on.
    166167 * @param[in] target Target pipe (address and endpoint number) specification.
    167  * @param[in] max_packet_size Max packet size for the transfer.
    168168 * @param[in] data Data to be sent (in USB endianess, allocated and deallocated
    169169 *      by the caller).
    … …  
    174174 */
    175175static int interrupt_out(ddf_fun_t *fun, usb_target_t target,
    176     size_t max_packet_size, void *data, size_t size,
     176    void *data, size_t size,
    177177    usbhc_iface_transfer_out_callback_t callback, void *arg)
    178178{
    … …  
    191191 * @param[in] fun Device function the action was invoked on.
    192192 * @param[in] target Target pipe (address and endpoint number) specification.
    193  * @param[in] max_packet_size Max packet size for the transfer.
    194193 * @param[in] data Buffer where to store the data (in USB endianess,
    195194 *      allocated and deallocated by the caller).
    … …  
    200199 */
    201200static int interrupt_in(ddf_fun_t *fun, usb_target_t target,
    202     size_t max_packet_size, void *data, size_t size,
     201    void *data, size_t size,
    203202    usbhc_iface_transfer_in_callback_t callback, void *arg)
    204203{
    … …  
    217216 * @param[in] fun Device function the action was invoked on.
    218217 * @param[in] target Target pipe (address and endpoint number) specification.
    219  * @param[in] max_packet_size Max packet size for the transfer.
    220218 * @param[in] data Data to be sent (in USB endianess, allocated and deallocated
    221219 *      by the caller).
    … …  
    226224 */
    227225static int bulk_out(ddf_fun_t *fun, usb_target_t target,
    228     size_t max_packet_size, void *data, size_t size,
     226    void *data, size_t size,
    229227    usbhc_iface_transfer_out_callback_t callback, void *arg)
    230228{
    … …  
    243241 * @param[in] fun Device function the action was invoked on.
    244242 * @param[in] target Target pipe (address and endpoint number) specification.
    245  * @param[in] max_packet_size Max packet size for the transfer.
    246243 * @param[in] data Buffer where to store the data (in USB endianess,
    247244 *      allocated and deallocated by the caller).
    … …  
    252249 */
    253250static int bulk_in(ddf_fun_t *fun, usb_target_t target,
    254     size_t max_packet_size, void *data, size_t size,
     251    void *data, size_t size,
    255252    usbhc_iface_transfer_in_callback_t callback, void *arg)
    256253{
    … …  
    269266 * @param[in] fun Device function the action was invoked on.
    270267 * @param[in] target Target pipe (address and endpoint number) specification.
    271  * @param[in] max_packet_size Max packet size for the transfer.
    272268 * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
    273269 *      and deallocated by the caller).
    … …  
    281277 */
    282278static int control_write(ddf_fun_t *fun, usb_target_t target,
    283     size_t max_packet_size,
    284279    void *setup_packet, size_t setup_packet_size,
    285280    void *data_buffer, size_t data_buffer_size,
    … …  
    300295 * @param[in] fun Device function the action was invoked on.
    301296 * @param[in] target Target pipe (address and endpoint number) specification.
    302  * @param[in] max_packet_size Max packet size for the transfer.
    303297 * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
    304298 *      and deallocated by the caller).
    … …  
    312306 */
    313307static int control_read(ddf_fun_t *fun, usb_target_t target,
    314     size_t max_packet_size,
    315308    void *setup_packet, size_t setup_packet_size,
    316309    void *data_buffer, size_t data_buffer_size,

  • uspace/drv/ohci/iface.c

    r5410c04 ra9d67aa  
    197197}
    198198/*----------------------------------------------------------------------------*/
    199 static int register_endpoint(
    200     ddf_fun_t *fun, usb_address_t address, usb_endpoint_t endpoint,
     199/** Register endpoint for bandwidth reservation.
     200 *
     201 * @param[in] fun Device function the action was invoked on.
     202 * @param[in] address USB address of the device.
     203 * @param[in] ep_speed Endpoint speed (invalid means to use device one).
     204 * @param[in] endpoint Endpoint number.
     205 * @param[in] transfer_type USB transfer type.
     206 * @param[in] direction Endpoint data direction.
     207 * @param[in] max_packet_size Max packet size of the endpoint.
     208 * @param[in] interval Polling interval.
     209 * @return Error code.
     210 */
     211static int register_endpoint(ddf_fun_t *fun,
     212    usb_address_t address, usb_speed_t ep_speed, usb_endpoint_t endpoint,
    201213    usb_transfer_type_t transfer_type, usb_direction_t direction,
    202214    size_t max_packet_size, unsigned int interval)
    … …  
    204216        hc_t *hc = fun_to_hc(fun);
    205217        assert(hc);
    206         const usb_speed_t speed =
    207             usb_device_keeper_get_speed(&hc->manager, address);
     218        if (address == hc->rh.address)
     219                return EOK;
     220        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
     221        if (speed >= USB_SPEED_MAX) {
     222                speed = ep_speed;
     223        }
    208224        const size_t size =
    209225            (transfer_type == USB_TRANSFER_INTERRUPT
    … …  
    243259        usb_log_debug("Unregister endpoint %d:%d %d.\n",
    244260            address, endpoint, direction);
     261        endpoint_t *ep = usb_endpoint_manager_get_ep(&hc->ep_manager,
     262            address, endpoint, direction, NULL);
     263        if (ep != NULL) {
     264                usb_device_keeper_del_ep(&hc->manager, address, ep);
     265        }
    245266        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
    246267            endpoint, direction);
    247268}
    248269/*----------------------------------------------------------------------------*/
    249 /** Interrupt out transaction interface function
    250  *
    251  * @param[in] fun DDF function that was called.
    252  * @param[in] target USB device to write to.
    253  * @param[in] max_packet_size maximum size of data packet the device accepts
    254  * @param[in] data Source of data.
    255  * @param[in] size Size of data source.
    256  * @param[in] callback Function to call on transaction completion
    257  * @param[in] arg Additional for callback function.
     270/** Schedule interrupt out transfer.
     271 *
     272 * The callback is supposed to be called once the transfer (on the wire) is
     273 * complete regardless of the outcome.
     274 * However, the callback could be called only when this function returns
     275 * with success status (i.e. returns EOK).
     276 *
     277 * @param[in] fun Device function the action was invoked on.
     278 * @param[in] target Target pipe (address and endpoint number) specification.
     279 * @param[in] data Data to be sent (in USB endianess, allocated and deallocated
     280 *      by the caller).
     281 * @param[in] size Size of the @p data buffer in bytes.
     282 * @param[in] callback Callback to be issued once the transfer is complete.
     283 * @param[in] arg Pass-through argument to the callback.
    258284 * @return Error code.
    259285 */
    260286static int interrupt_out(
    261     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     287    ddf_fun_t *fun, usb_target_t target, void *data,
    262288    size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
    263289{
    … …  
    276302}
    277303/*----------------------------------------------------------------------------*/
    278 /** Interrupt in transaction interface function
    279  *
    280  * @param[in] fun DDF function that was called.
    281  * @param[in] target USB device to write to.
    282  * @param[in] max_packet_size maximum size of data packet the device accepts
    283  * @param[out] data Data destination.
    284  * @param[in] size Size of data source.
    285  * @param[in] callback Function to call on transaction completion
    286  * @param[in] arg Additional for callback function.
     304/** Schedule interrupt in transfer.
     305 *
     306 * The callback is supposed to be called once the transfer (on the wire) is
     307 * complete regardless of the outcome.
     308 * However, the callback could be called only when this function returns
     309 * with success status (i.e. returns EOK).
     310 *
     311 * @param[in] fun Device function the action was invoked on.
     312 * @param[in] target Target pipe (address and endpoint number) specification.
     313 * @param[in] data Buffer where to store the data (in USB endianess,
     314 *      allocated and deallocated by the caller).
     315 * @param[in] size Size of the @p data buffer in bytes.
     316 * @param[in] callback Callback to be issued once the transfer is complete.
     317 * @param[in] arg Pass-through argument to the callback.
    287318 * @return Error code.
    288319 */
    289320static int interrupt_in(
    290     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     321    ddf_fun_t *fun, usb_target_t target, void *data,
    291322    size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
    292323{
    … …  
    305336}
    306337/*----------------------------------------------------------------------------*/
    307 /** Bulk out transaction interface function
    308  *
    309  * @param[in] fun DDF function that was called.
    310  * @param[in] target USB device to write to.
    311  * @param[in] max_packet_size maximum size of data packet the device accepts
    312  * @param[in] data Source of data.
    313  * @param[in] size Size of data source.
    314  * @param[in] callback Function to call on transaction completion
    315  * @param[in] arg Additional for callback function.
     338/** Schedule bulk out transfer.
     339 *
     340 * The callback is supposed to be called once the transfer (on the wire) is
     341 * complete regardless of the outcome.
     342 * However, the callback could be called only when this function returns
     343 * with success status (i.e. returns EOK).
     344 *
     345 * @param[in] fun Device function the action was invoked on.
     346 * @param[in] target Target pipe (address and endpoint number) specification.
     347 * @param[in] data Data to be sent (in USB endianess, allocated and deallocated
     348 *      by the caller).
     349 * @param[in] size Size of the @p data buffer in bytes.
     350 * @param[in] callback Callback to be issued once the transfer is complete.
     351 * @param[in] arg Pass-through argument to the callback.
    316352 * @return Error code.
    317353 */
    318354static int bulk_out(
    319     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     355    ddf_fun_t *fun, usb_target_t target, void *data,
    320356    size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
    321357{
    … …  
    334370}
    335371/*----------------------------------------------------------------------------*/
    336 /** Bulk in transaction interface function
    337  *
    338  * @param[in] fun DDF function that was called.
    339  * @param[in] target USB device to write to.
    340  * @param[in] max_packet_size maximum size of data packet the device accepts
    341  * @param[out] data Data destination.
    342  * @param[in] size Size of data source.
    343  * @param[in] callback Function to call on transaction completion
    344  * @param[in] arg Additional for callback function.
     372/** Schedule bulk in transfer.
     373 *
     374 * The callback is supposed to be called once the transfer (on the wire) is
     375 * complete regardless of the outcome.
     376 * However, the callback could be called only when this function returns
     377 * with success status (i.e. returns EOK).
     378 *
     379 * @param[in] fun Device function the action was invoked on.
     380 * @param[in] target Target pipe (address and endpoint number) specification.
     381 * @param[in] data Buffer where to store the data (in USB endianess,
     382 *      allocated and deallocated by the caller).
     383 * @param[in] size Size of the @p data buffer in bytes.
     384 * @param[in] callback Callback to be issued once the transfer is complete.
     385 * @param[in] arg Pass-through argument to the callback.
    345386 * @return Error code.
    346387 */
    347388static int bulk_in(
    348     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     389    ddf_fun_t *fun, usb_target_t target, void *data,
    349390    size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
    350391{
    … …  
    363404}
    364405/*----------------------------------------------------------------------------*/
    365 /** Control write transaction interface function
    366  *
    367  * @param[in] fun DDF function that was called.
    368  * @param[in] target USB device to write to.
    369  * @param[in] max_packet_size maximum size of data packet the device accepts.
    370  * @param[in] setup_data Data to send with SETUP transfer.
    371  * @param[in] setup_size Size of data to send with SETUP transfer (always 8B).
    372  * @param[in] data Source of data.
    373  * @param[in] size Size of data source.
    374  * @param[in] callback Function to call on transaction completion.
    375  * @param[in] arg Additional for callback function.
     406/** Schedule control write transfer.
     407 *
     408 * The callback is supposed to be called once the transfer (on the wire) is
     409 * complete regardless of the outcome.
     410 * However, the callback could be called only when this function returns
     411 * with success status (i.e. returns EOK).
     412 *
     413 * @param[in] fun Device function the action was invoked on.
     414 * @param[in] target Target pipe (address and endpoint number) specification.
     415 * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
     416 *      and deallocated by the caller).
     417 * @param[in] setup_packet_size Size of @p setup_packet buffer in bytes.
     418 * @param[in] data_buffer Data buffer (in USB endianess, allocated and
     419 *      deallocated by the caller).
     420 * @param[in] data_buffer_size Size of @p data_buffer buffer in bytes.
     421 * @param[in] callback Callback to be issued once the transfer is complete.
     422 * @param[in] arg Pass-through argument to the callback.
    376423 * @return Error code.
    377424 */
    378425static int control_write(
    379     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
     426    ddf_fun_t *fun, usb_target_t target,
    380427    void *setup_data, size_t setup_size, void *data, size_t size,
    381428    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    397444}
    398445/*----------------------------------------------------------------------------*/
    399 /** Control read transaction interface function
    400  *
    401  * @param[in] fun DDF function that was called.
    402  * @param[in] target USB device to write to.
    403  * @param[in] max_packet_size maximum size of data packet the device accepts.
    404  * @param[in] setup_data Data to send with SETUP packet.
    405  * @param[in] setup_size Size of data to send with SETUP packet (should be 8B).
    406  * @param[out] data Source of data.
    407  * @param[in] size Size of data source.
    408  * @param[in] callback Function to call on transaction completion.
    409  * @param[in] arg Additional for callback function.
     446/** Schedule control read transfer.
     447 *
     448 * The callback is supposed to be called once the transfer (on the wire) is
     449 * complete regardless of the outcome.
     450 * However, the callback could be called only when this function returns
     451 * with success status (i.e. returns EOK).
     452 *
     453 * @param[in] fun Device function the action was invoked on.
     454 * @param[in] target Target pipe (address and endpoint number) specification.
     455 * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
     456 *      and deallocated by the caller).
     457 * @param[in] setup_packet_size Size of @p setup_packet buffer in bytes.
     458 * @param[in] data_buffer Buffer where to store the data (in USB endianess,
     459 *      allocated and deallocated by the caller).
     460 * @param[in] data_buffer_size Size of @p data_buffer buffer in bytes.
     461 * @param[in] callback Callback to be issued once the transfer is complete.
     462 * @param[in] arg Pass-through argument to the callback.
    410463 * @return Error code.
    411464 */
    412465static int control_read(
    413     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
     466    ddf_fun_t *fun, usb_target_t target,
    414467    void *setup_data, size_t setup_size, void *data, size_t size,
    415468    usbhc_iface_transfer_in_callback_t callback, void *arg)

  • uspace/drv/uhci-hcd/iface.c

    r5410c04 ra9d67aa  
    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_endpoint_t endpoint,
     200    ddf_fun_t *fun, usb_address_t address, usb_speed_t ep_speed,
     201    usb_endpoint_t endpoint,
    201202    usb_transfer_type_t transfer_type, usb_direction_t direction,
    202203    size_t max_packet_size, unsigned int interval)
    … …  
    204205        hc_t *hc = fun_to_hc(fun);
    205206        assert(hc);
    206         const usb_speed_t speed =
    207             usb_device_keeper_get_speed(&hc->manager, address);
    208         const size_t size = max_packet_size;
     207        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, address);
     208        if (speed >= USB_SPEED_MAX) {
     209                speed = ep_speed;
     210        }
     211        const size_t size =
     212            (transfer_type == USB_TRANSFER_INTERRUPT
     213            || transfer_type == USB_TRANSFER_ISOCHRONOUS) ?
     214            max_packet_size : 0;
    209215        int ret;
    210216
    … …  
    240246        usb_log_debug("Unregister endpoint %d:%d %d.\n",
    241247            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        }
    242253        return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
    243254            endpoint, direction);
    … …  
    248259 * @param[in] fun DDF function that was called.
    249260 * @param[in] target USB device to write to.
    250  * @param[in] max_packet_size maximum size of data packet the device accepts
    251261 * @param[in] data Source of data.
    252262 * @param[in] size Size of data source.
    … …  
    256266 */
    257267static int interrupt_out(
    258     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     268    ddf_fun_t *fun, usb_target_t target, void *data,
    259269    size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
    260270{
    … …  
    277287 * @param[in] fun DDF function that was called.
    278288 * @param[in] target USB device to write to.
    279  * @param[in] max_packet_size maximum size of data packet the device accepts
    280289 * @param[out] data Data destination.
    281290 * @param[in] size Size of data source.
    … …  
    285294 */
    286295static int interrupt_in(
    287     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     296    ddf_fun_t *fun, usb_target_t target, void *data,
    288297    size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
    289298{
    … …  
    306315 * @param[in] fun DDF function that was called.
    307316 * @param[in] target USB device to write to.
    308  * @param[in] max_packet_size maximum size of data packet the device accepts
    309317 * @param[in] data Source of data.
    310318 * @param[in] size Size of data source.
    … …  
    314322 */
    315323static int bulk_out(
    316     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     324    ddf_fun_t *fun, usb_target_t target, void *data,
    317325    size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
    318326{
    … …  
    335343 * @param[in] fun DDF function that was called.
    336344 * @param[in] target USB device to write to.
    337  * @param[in] max_packet_size maximum size of data packet the device accepts
    338345 * @param[out] data Data destination.
    339346 * @param[in] size Size of data source.
    … …  
    343350 */
    344351static int bulk_in(
    345     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
     352    ddf_fun_t *fun, usb_target_t target, void *data,
    346353    size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
    347354{
    … …  
    364371 * @param[in] fun DDF function that was called.
    365372 * @param[in] target USB device to write to.
    366  * @param[in] max_packet_size maximum size of data packet the device accepts.
    367373 * @param[in] setup_data Data to send with SETUP transfer.
    368374 * @param[in] setup_size Size of data to send with SETUP transfer (always 8B).
    … …  
    374380 */
    375381static int control_write(
    376     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
     382    ddf_fun_t *fun, usb_target_t target,
    377383    void *setup_data, size_t setup_size, void *data, size_t size,
    378384    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    398404 * @param[in] fun DDF function that was called.
    399405 * @param[in] target USB device to write to.
    400  * @param[in] max_packet_size maximum size of data packet the device accepts.
    401406 * @param[in] setup_data Data to send with SETUP packet.
    402407 * @param[in] setup_size Size of data to send with SETUP packet (should be 8B).
    … …  
    408413 */
    409414static int control_read(
    410     ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
     415    ddf_fun_t *fun, usb_target_t target,
    411416    void *setup_data, size_t setup_size, void *data, size_t size,
    412417    usbhc_iface_transfer_in_callback_t callback, void *arg)

  • uspace/drv/vhc/connhost.c

    r5410c04 ra9d67aa  
    257257
    258258static int interrupt_out(ddf_fun_t *fun, usb_target_t target,
    259     size_t max_packet_size,
    260259    void *data, size_t size,
    261260    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    267266
    268267static int interrupt_in(ddf_fun_t *fun, usb_target_t target,
    269     size_t max_packet_size,
    270268    void *data, size_t size,
    271269    usbhc_iface_transfer_in_callback_t callback, void *arg)
    … …  
    277275
    278276static int control_write(ddf_fun_t *fun, usb_target_t target,
    279     size_t max_packet_size,
    280277    void *setup_packet, size_t setup_packet_size,
    281278    void *data, size_t data_size,
    … …  
    295292
    296293static int control_read(ddf_fun_t *fun, usb_target_t target,
    297     size_t max_packet_size,
    298294    void *setup_packet, size_t setup_packet_size,
    299295    void *data, size_t data_size,
Note: See TracChangeset for help on using the changeset viewer.