Changeset 651b352 in mainline for uspace/lib/usb/src


Ignore:
Timestamp:
2011-04-13T15:00:43Z (15 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8b4ce802
Parents:
4deca9b (diff), d6522dd (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:

Major rework

UHCI uses one buffer for both structures and data
OHCI uses new architecture that actually follows OHCI specification

Location:
uspace/lib/usb/src/host
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usb/src/host/batch.c

    r4deca9b r651b352  
    3939#include <usb/host/batch.h>
    4040
     41void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
     42void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
     43
    4144void usb_transfer_batch_init(
    4245    usb_transfer_batch_t *instance,
    43                 endpoint_t *ep,
     46    endpoint_t *ep,
    4447    char *buffer,
    4548    char *data_buffer,
    … …  
    5154    void *arg,
    5255    ddf_fun_t *fun,
    53     void *private_data
     56    void *private_data,
     57    void (*private_data_dtor)(void *p_data)
    5458    )
    5559{
    … …  
    6771        instance->fun = fun;
    6872        instance->private_data = private_data;
     73        instance->private_data_dtor = private_data_dtor;
    6974        instance->transfered_size = 0;
    7075        instance->next_step = NULL;
    7176        instance->error = EOK;
    7277        endpoint_use(instance->ep);
     78}
     79/*----------------------------------------------------------------------------*/
     80/** Helper function, calls callback and correctly destroys batch structure.
     81 *
     82 * @param[in] instance Batch structure to use.
     83 */
     84void usb_transfer_batch_call_in_and_dispose(usb_transfer_batch_t *instance)
     85{
     86        assert(instance);
     87        usb_transfer_batch_call_in(instance);
     88        usb_transfer_batch_dispose(instance);
     89}
     90/*----------------------------------------------------------------------------*/
     91/** Helper function calls callback and correctly destroys batch structure.
     92 *
     93 * @param[in] instance Batch structure to use.
     94 */
     95void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance)
     96{
     97        assert(instance);
     98        usb_transfer_batch_call_out(instance);
     99        usb_transfer_batch_dispose(instance);
    73100}
    74101/*----------------------------------------------------------------------------*/
    … …  
    129156            instance->error, instance->arg);
    130157}
     158/*----------------------------------------------------------------------------*/
     159/** Correctly dispose all used data structures.
     160 *
     161 * @param[in] instance Batch structure to use.
     162 */
     163void usb_transfer_batch_dispose(usb_transfer_batch_t *instance)
     164{
     165        assert(instance);
     166        usb_log_debug("Batch(%p) disposing.\n", instance);
     167        if (instance->private_data) {
     168                assert(instance->private_data_dtor);
     169                instance->private_data_dtor(instance->private_data);
     170        }
     171        free(instance);
     172}
    131173/**
    132174 * @}

  • uspace/lib/usb/src/host/endpoint.c

    r4deca9b r651b352  
    6363}
    6464/*----------------------------------------------------------------------------*/
     65void endpoint_set_hc_data(endpoint_t *instance,
     66    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int))
     67{
     68        assert(instance);
     69        instance->hc_data.data = data;
     70        instance->hc_data.toggle_get = toggle_get;
     71        instance->hc_data.toggle_set = toggle_set;
     72}
     73/*----------------------------------------------------------------------------*/
     74void endpoint_clear_hc_data(endpoint_t *instance)
     75{
     76        assert(instance);
     77        instance->hc_data.data = NULL;
     78        instance->hc_data.toggle_get = NULL;
     79        instance->hc_data.toggle_set = NULL;
     80}
     81/*----------------------------------------------------------------------------*/
    6582void endpoint_use(endpoint_t *instance)
    6683{
    … …  
    85102{
    86103        assert(instance);
     104        if (instance->hc_data.toggle_get)
     105                instance->toggle =
     106                    instance->hc_data.toggle_get(instance->hc_data.data);
    87107        return (int)instance->toggle;
    88108}
    … …  
    92112        assert(instance);
    93113        assert(toggle == 0 || toggle == 1);
     114        if (instance->hc_data.toggle_set)
     115                instance->hc_data.toggle_set(instance->hc_data.data, toggle);
    94116        instance->toggle = toggle;
    95117}
Note: See TracChangeset for help on using the changeset viewer.