Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ohci/batch.c

    rc9dc471 r8790650  
    3939
    4040#include "batch.h"
    41 #include "hcd_endpoint.h"
    4241#include "utils/malloc32.h"
    4342#include "hw_struct/endpoint_descriptor.h"
    4443#include "hw_struct/transfer_descriptor.h"
    4544
    46 typedef struct ohci_transfer_batch {
     45typedef struct ohci_batch {
    4746        ed_t *ed;
    48         td_t **tds;
     47        td_t *tds;
    4948        size_t td_count;
    50         size_t leave_td;
    51         char *device_buffer;
    52 } ohci_transfer_batch_t;
    53 
    54 static void ohci_transfer_batch_dispose(void *ohci_batch)
    55 {
    56         ohci_transfer_batch_t *instance = ohci_batch;
    57         if (!instance)
    58                 return;
    59         free32(instance->device_buffer);
    60         unsigned i = 0;
    61         if (instance->tds) {
    62                 for (; i< instance->td_count; ++i) {
    63                         if (i != instance->leave_td)
    64                                 free32(instance->tds[i]);
    65                 }
    66                 free(instance->tds);
    67         }
    68         free(instance);
    69 }
    70 /*----------------------------------------------------------------------------*/
     49} ohci_batch_t;
     50
    7151static void batch_control(usb_transfer_batch_t *instance,
    7252    usb_direction_t data_dir, usb_direction_t status_dir);
    73 static void batch_data(usb_transfer_batch_t *instance);
    74 /*----------------------------------------------------------------------------*/
     53static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
     54static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
     55
     56#define DEFAULT_ERROR_COUNT 3
    7557usb_transfer_batch_t * batch_get(ddf_fun_t *fun, endpoint_t *ep,
    7658    char *buffer, size_t buffer_size, char* setup_buffer, size_t setup_size,
    … …  
    8264                usb_log_error(message); \
    8365                if (instance) { \
    84                         usb_transfer_batch_dispose(instance); \
     66                        batch_dispose(instance); \
    8567                } \
    8668                return NULL; \
    … …  
    9072        CHECK_NULL_DISPOSE_RETURN(instance,
    9173            "Failed to allocate batch instance.\n");
    92         usb_transfer_batch_init(instance, ep, buffer, NULL, buffer_size,
    93             NULL, setup_size, func_in, func_out, arg, fun, NULL,
    94             ohci_transfer_batch_dispose);
    95 
    96         hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
    97         assert(hcd_ep);
    98 
    99         ohci_transfer_batch_t *data = calloc(sizeof(ohci_transfer_batch_t), 1);
     74        usb_target_t target =
     75            { .address = ep->address, .endpoint = ep->endpoint };
     76        usb_transfer_batch_init(instance, target, ep->transfer_type, ep->speed,
     77            ep->max_packet_size, buffer, NULL, buffer_size, NULL, setup_size,
     78            func_in, func_out, arg, fun, ep, NULL);
     79
     80        ohci_batch_t *data = malloc(sizeof(ohci_batch_t));
    10081        CHECK_NULL_DISPOSE_RETURN(data, "Failed to allocate batch data.\n");
     82        bzero(data, sizeof(ohci_batch_t));
    10183        instance->private_data = data;
    10284
    103         data->td_count =
     85        /* we needs + 1 transfer descriptor as the last one won't be executed */
     86        data->td_count = 1 +
    10487            ((buffer_size + OHCI_TD_MAX_TRANSFER - 1) / OHCI_TD_MAX_TRANSFER);
    10588        if (ep->transfer_type == USB_TRANSFER_CONTROL) {
    … …  
    10790        }
    10891
    109         /* we need one extra place for td that is currently assigned to hcd_ep*/
    110         data->tds = calloc(sizeof(td_t*), data->td_count + 1);
     92        data->tds = malloc32(sizeof(td_t) * data->td_count);
    11193        CHECK_NULL_DISPOSE_RETURN(data->tds,
    11294            "Failed to allocate transfer descriptors.\n");
    113 
    114         data->tds[0] = hcd_ep->td;
    115         data->leave_td = 0;
    116         unsigned i = 1;
    117         for (; i <= data->td_count; ++i) {
    118                 data->tds[i] = malloc32(sizeof(td_t));
    119                 CHECK_NULL_DISPOSE_RETURN(data->tds[i],
    120                     "Failed to allocate TD %d.\n", i );
    121         }
    122 
    123         data->ed = hcd_ep->ed;
    124 
    125         if (setup_size + buffer_size > 0) {
    126                 data->device_buffer = malloc32(setup_size + buffer_size);
    127                 CHECK_NULL_DISPOSE_RETURN(data->device_buffer,
     95        bzero(data->tds, sizeof(td_t) * data->td_count);
     96
     97        data->ed = malloc32(sizeof(ed_t));
     98        CHECK_NULL_DISPOSE_RETURN(data->ed,
     99            "Failed to allocate endpoint descriptor.\n");
     100
     101        if (buffer_size > 0) {
     102                instance->transport_buffer = malloc32(buffer_size);
     103                CHECK_NULL_DISPOSE_RETURN(instance->transport_buffer,
    128104                    "Failed to allocate device accessible buffer.\n");
    129                 instance->setup_buffer = data->device_buffer;
    130                 instance->data_buffer = data->device_buffer + setup_size;
     105        }
     106
     107        if (setup_size > 0) {
     108                instance->setup_buffer = malloc32(setup_size);
     109                CHECK_NULL_DISPOSE_RETURN(instance->setup_buffer,
     110                    "Failed to allocate device accessible setup buffer.\n");
    131111                memcpy(instance->setup_buffer, setup_buffer, setup_size);
    132112        }
    … …  
    135115}
    136116/*----------------------------------------------------------------------------*/
     117void batch_dispose(usb_transfer_batch_t *instance)
     118{
     119        assert(instance);
     120        ohci_batch_t *data = instance->private_data;
     121        assert(data);
     122        free32(data->ed);
     123        free32(data->tds);
     124        free32(instance->setup_buffer);
     125        free32(instance->transport_buffer);
     126        free(data);
     127        free(instance);
     128}
     129/*----------------------------------------------------------------------------*/
    137130bool batch_is_complete(usb_transfer_batch_t *instance)
    138131{
    139132        assert(instance);
    140         ohci_transfer_batch_t *data = instance->private_data;
    141         assert(data);
    142         size_t tds = data->td_count;
    143         usb_log_debug("Batch(%p) checking %d td(s) for completion.\n",
     133        ohci_batch_t *data = instance->private_data;
     134        assert(data);
     135        size_t tds = data->td_count - 1;
     136        usb_log_debug2("Batch(%p) checking %d td(s) for completion.\n",
    144137            instance, tds);
    145         usb_log_debug("ED: %x:%x:%x:%x.\n",
    146             data->ed->status, data->ed->td_head, data->ed->td_tail,
    147             data->ed->next);
    148138        size_t i = 0;
    149139        for (; i < tds; ++i) {
    150                 assert(data->tds[i] != NULL);
    151                 usb_log_debug("TD %d: %x:%x:%x:%x.\n", i,
    152                     data->tds[i]->status, data->tds[i]->cbp, data->tds[i]->next,
    153                     data->tds[i]->be);
    154                 if (!td_is_finished(data->tds[i])) {
     140                if (!td_is_finished(&data->tds[i]))
    155141                        return false;
    156                 }
    157                 instance->error = td_error(data->tds[i]);
     142                instance->error = td_error(&data->tds[i]);
    158143                /* FIXME: calculate real transfered size */
    159144                instance->transfered_size = instance->buffer_size;
    160145                if (instance->error != EOK) {
    161146                        usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
    162                             instance, i, data->tds[i]->status);
    163                         /* Make sure TD queue is empty (one TD),
    164                          * ED should be marked as halted */
    165                         data->ed->td_tail =
    166                             (data->ed->td_head & ED_TDTAIL_PTR_MASK);
    167                         ++i;
    168                         break;
     147                            instance, i, data->tds[i].status);
     148                        return true;
     149//                      endpoint_toggle_set(instance->ep,
    169150                }
    170151        }
    171         data->leave_td = i;
    172         assert(data->leave_td <= data->td_count);
    173         hcd_endpoint_t *hcd_ep = hcd_endpoint_get(instance->ep);
    174         assert(hcd_ep);
    175         hcd_ep->td = data->tds[i];
    176         /* Clear possible ED HALT */
    177         data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
    178         uint32_t pa = addr_to_phys(hcd_ep->td);
    179         assert(pa == (data->ed->td_head & ED_TDHEAD_PTR_MASK));
    180         assert(pa == (data->ed->td_tail & ED_TDTAIL_PTR_MASK));
    181 
    182152        return true;
    183153}
    184154/*----------------------------------------------------------------------------*/
    185 void batch_commit(usb_transfer_batch_t *instance)
    186 {
    187         assert(instance);
    188         ohci_transfer_batch_t *data = instance->private_data;
    189         assert(data);
    190         ed_set_end_td(data->ed, data->tds[data->td_count]);
    191 }
    192 /*----------------------------------------------------------------------------*/
    193155void batch_control_write(usb_transfer_batch_t *instance)
    194156{
    195157        assert(instance);
    196158        /* We are data out, we are supposed to provide data */
    197         memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
    198         instance->next_step = usb_transfer_batch_call_out_and_dispose;
     159        memcpy(instance->transport_buffer, instance->buffer,
     160            instance->buffer_size);
     161        instance->next_step = batch_call_out_and_dispose;
    199162        batch_control(instance, USB_DIRECTION_OUT, USB_DIRECTION_IN);
    200163        usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
    … …  
    204167{
    205168        assert(instance);
    206         instance->next_step = usb_transfer_batch_call_in_and_dispose;
     169        instance->next_step = batch_call_in_and_dispose;
    207170        batch_control(instance, USB_DIRECTION_IN, USB_DIRECTION_OUT);
    208171        usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
    … …  
    212175{
    213176        assert(instance);
    214         instance->next_step = usb_transfer_batch_call_in_and_dispose;
    215         batch_data(instance);
     177        assert(instance->direction == USB_DIRECTION_IN);
     178        instance->next_step = batch_call_in_and_dispose;
     179        /* TODO: implement */
    216180        usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
    217181}
    … …  
    220184{
    221185        assert(instance);
     186        assert(instance->direction == USB_DIRECTION_OUT);
    222187        /* We are data out, we are supposed to provide data */
    223         memcpy(instance->data_buffer, instance->buffer, instance->buffer_size);
    224         instance->next_step = usb_transfer_batch_call_out_and_dispose;
    225         batch_data(instance);
     188        memcpy(instance->transport_buffer, instance->buffer,
     189            instance->buffer_size);
     190        instance->next_step = batch_call_out_and_dispose;
     191        /* TODO: implement */
    226192        usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
    227193}
    … …  
    230196{
    231197        assert(instance);
    232         instance->next_step = usb_transfer_batch_call_in_and_dispose;
    233         batch_data(instance);
     198        instance->direction = USB_DIRECTION_IN;
     199        instance->next_step = batch_call_in_and_dispose;
     200        /* TODO: implement */
    234201        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
    235202}
    … …  
    238205{
    239206        assert(instance);
    240         instance->next_step = usb_transfer_batch_call_in_and_dispose;
    241         batch_data(instance);
     207        instance->direction = USB_DIRECTION_IN;
     208        instance->next_step = batch_call_in_and_dispose;
     209        /* TODO: implement */
    242210        usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
    243211}
    … …  
    246214{
    247215        assert(instance);
    248         ohci_transfer_batch_t *data = instance->private_data;
     216        ohci_batch_t *data = instance->private_data;
    249217        assert(data);
    250218        return data->ed;
    … …  
    255223{
    256224        assert(instance);
    257         ohci_transfer_batch_t *data = instance->private_data;
    258         assert(data);
    259         usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", data->ed,
     225        ohci_batch_t *data = instance->private_data;
     226        assert(data);
     227        ed_init(data->ed, instance->ep);
     228        ed_add_tds(data->ed, &data->tds[0], &data->tds[data->td_count - 1]);
     229        usb_log_debug("Created ED(%p): %x:%x:%x:%x.\n", data->ed,
    260230            data->ed->status, data->ed->td_tail, data->ed->td_head,
    261231            data->ed->next);
    262232        int toggle = 0;
    263233        /* setup stage */
    264         td_init(data->tds[0], USB_DIRECTION_BOTH, instance->setup_buffer,
     234        td_init(&data->tds[0], USB_DIRECTION_BOTH, instance->setup_buffer,
    265235                instance->setup_size, toggle);
    266         td_set_next(data->tds[0], data->tds[1]);
    267         usb_log_debug("Created SETUP TD: %x:%x:%x:%x.\n", data->tds[0]->status,
    268             data->tds[0]->cbp, data->tds[0]->next, data->tds[0]->be);
     236        td_set_next(&data->tds[0], &data->tds[1]);
     237        usb_log_debug("Created SETUP TD: %x:%x:%x:%x.\n", data->tds[0].status,
     238            data->tds[0].cbp, data->tds[0].next, data->tds[0].be);
    269239
    270240        /* data stage */
    271241        size_t td_current = 1;
    272242        size_t remain_size = instance->buffer_size;
    273         char *buffer = instance->data_buffer;
     243        char *transfer_buffer = instance->transport_buffer;
    274244        while (remain_size > 0) {
    275245                size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
    … …  
    277247                toggle = 1 - toggle;
    278248
    279                 td_init(data->tds[td_current], data_dir, buffer,
     249                td_init(&data->tds[td_current], data_dir, transfer_buffer,
    280250                    transfer_size, toggle);
    281                 td_set_next(data->tds[td_current], data->tds[td_current + 1]);
     251                td_set_next(&data->tds[td_current], &data->tds[td_current + 1]);
    282252                usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
    283                     data->tds[td_current]->status, data->tds[td_current]->cbp,
    284                     data->tds[td_current]->next, data->tds[td_current]->be);
    285 
    286                 buffer += transfer_size;
     253                    data->tds[td_current].status, data->tds[td_current].cbp,
     254                    data->tds[td_current].next, data->tds[td_current].be);
     255
     256                transfer_buffer += transfer_size;
    287257                remain_size -= transfer_size;
    288                 assert(td_current < data->td_count - 1);
     258                assert(td_current < data->td_count - 2);
    289259                ++td_current;
    290260        }
    291261
    292262        /* status stage */
    293         assert(td_current == data->td_count - 1);
    294         td_init(data->tds[td_current], status_dir, NULL, 0, 1);
    295         td_set_next(data->tds[td_current], data->tds[td_current + 1]);
     263        assert(td_current == data->td_count - 2);
     264        td_init(&data->tds[td_current], status_dir, NULL, 0, 1);
    296265        usb_log_debug("Created STATUS TD: %x:%x:%x:%x.\n",
    297             data->tds[td_current]->status, data->tds[td_current]->cbp,
    298             data->tds[td_current]->next, data->tds[td_current]->be);
    299 }
    300 /*----------------------------------------------------------------------------*/
    301 void batch_data(usb_transfer_batch_t *instance)
    302 {
    303         assert(instance);
    304         ohci_transfer_batch_t *data = instance->private_data;
    305         assert(data);
    306         usb_log_debug("Using ED(%p): %x:%x:%x:%x.\n", data->ed,
    307             data->ed->status, data->ed->td_tail, data->ed->td_head,
    308             data->ed->next);
    309 
    310         size_t td_current = 0;
    311         size_t remain_size = instance->buffer_size;
    312         char *buffer = instance->data_buffer;
    313         while (remain_size > 0) {
    314                 size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
    315                     OHCI_TD_MAX_TRANSFER : remain_size;
    316 
    317                 td_init(data->tds[td_current], instance->ep->direction,
    318                     buffer, transfer_size, -1);
    319                 td_set_next(data->tds[td_current], data->tds[td_current + 1]);
    320                 usb_log_debug("Created DATA TD: %x:%x:%x:%x.\n",
    321                     data->tds[td_current]->status, data->tds[td_current]->cbp,
    322                     data->tds[td_current]->next, data->tds[td_current]->be);
    323 
    324                 buffer += transfer_size;
    325                 remain_size -= transfer_size;
    326                 assert(td_current < data->td_count);
    327                 ++td_current;
    328         }
     266            data->tds[td_current].status, data->tds[td_current].cbp,
     267            data->tds[td_current].next, data->tds[td_current].be);
     268}
     269/*----------------------------------------------------------------------------*/
     270/** Helper function calls callback and correctly disposes of batch structure.
     271 *
     272 * @param[in] instance Batch structure to use.
     273 */
     274void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
     275{
     276        assert(instance);
     277        usb_transfer_batch_call_in(instance);
     278        batch_dispose(instance);
     279}
     280/*----------------------------------------------------------------------------*/
     281/** Helper function calls callback and correctly disposes of batch structure.
     282 *
     283 * @param[in] instance Batch structure to use.
     284 */
     285void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
     286{
     287        assert(instance);
     288        usb_transfer_batch_call_out(instance);
     289        batch_dispose(instance);
    329290}
    330291/**
Note: See TracChangeset for help on using the changeset viewer.