Changeset 1387692 in mainline


Ignore:
Timestamp:
2011-03-21T15:01:52Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c92c13f
Parents:
e34e77a
Message:

Rename batch_* ⇒ usb_transfer_batch_*

No change in functionality.

Location:
uspace
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ohci/batch.c

    re34e77a r1387692  
    4141#include "utils/malloc32.h"
    4242
    43 static void batch_call_in_and_dispose(batch_t *instance);
    44 static void batch_call_out_and_dispose(batch_t *instance);
     43static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
     44static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
    4545
    4646#define DEFAULT_ERROR_COUNT 3
    47 batch_t * batch_get(
     47usb_transfer_batch_t * batch_get(
    4848    ddf_fun_t *fun,
    4949                usb_target_t target,
    … …  
    7070        } else (void)0
    7171
    72         batch_t *instance = malloc(sizeof(batch_t));
     72        usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
    7373        CHECK_NULL_DISPOSE_RETURN(instance,
    7474            "Failed to allocate batch instance.\n");
    75         batch_init(instance, target, transfer_type, speed, max_packet_size,
     75        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
    7676            buffer, NULL, buffer_size, NULL, setup_size, func_in,
    7777            func_out, arg, fun, NULL);
    … …  
    9494}
    9595/*----------------------------------------------------------------------------*/
    96 void batch_dispose(batch_t *instance)
     96void batch_dispose(usb_transfer_batch_t *instance)
    9797{
    9898        assert(instance);
    … …  
    102102}
    103103/*----------------------------------------------------------------------------*/
    104 void batch_control_write(batch_t *instance)
     104void batch_control_write(usb_transfer_batch_t *instance)
    105105{
    106106        assert(instance);
    … …  
    113113}
    114114/*----------------------------------------------------------------------------*/
    115 void batch_control_read(batch_t *instance)
     115void batch_control_read(usb_transfer_batch_t *instance)
    116116{
    117117        assert(instance);
    … …  
    121121}
    122122/*----------------------------------------------------------------------------*/
    123 void batch_interrupt_in(batch_t *instance)
     123void batch_interrupt_in(usb_transfer_batch_t *instance)
    124124{
    125125        assert(instance);
    … …  
    130130}
    131131/*----------------------------------------------------------------------------*/
    132 void batch_interrupt_out(batch_t *instance)
     132void batch_interrupt_out(usb_transfer_batch_t *instance)
    133133{
    134134        assert(instance);
    … …  
    142142}
    143143/*----------------------------------------------------------------------------*/
    144 void batch_bulk_in(batch_t *instance)
     144void batch_bulk_in(usb_transfer_batch_t *instance)
    145145{
    146146        assert(instance);
    … …  
    151151}
    152152/*----------------------------------------------------------------------------*/
    153 void batch_bulk_out(batch_t *instance)
     153void batch_bulk_out(usb_transfer_batch_t *instance)
    154154{
    155155        assert(instance);
    … …  
    164164 * @param[in] instance Batch structure to use.
    165165 */
    166 void batch_call_in_and_dispose(batch_t *instance)
     166void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
    167167{
    168168        assert(instance);
    169         batch_call_in(instance);
     169        usb_transfer_batch_call_in(instance);
    170170        batch_dispose(instance);
    171171}
    … …  
    175175 * @param[in] instance Batch structure to use.
    176176 */
    177 void batch_call_out_and_dispose(batch_t *instance)
     177void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
    178178{
    179179        assert(instance);
    180         batch_call_out(instance);
     180        usb_transfer_batch_call_out(instance);
    181181        batch_dispose(instance);
    182182}

  • uspace/drv/ohci/batch.h

    re34e77a r1387692  
    4141#include <usb/host/batch.h>
    4242
    43 batch_t * batch_get(
     43usb_transfer_batch_t * batch_get(
    4444    ddf_fun_t *fun,
    4545                usb_target_t target,
    … …  
    5757                );
    5858
    59 void batch_dispose(batch_t *instance);
     59void batch_dispose(usb_transfer_batch_t *instance);
    6060
    61 void batch_control_write(batch_t *instance);
     61void batch_control_write(usb_transfer_batch_t *instance);
    6262
    63 void batch_control_read(batch_t *instance);
     63void batch_control_read(usb_transfer_batch_t *instance);
    6464
    65 void batch_interrupt_in(batch_t *instance);
     65void batch_interrupt_in(usb_transfer_batch_t *instance);
    6666
    67 void batch_interrupt_out(batch_t *instance);
     67void batch_interrupt_out(usb_transfer_batch_t *instance);
    6868
    69 void batch_bulk_in(batch_t *instance);
     69void batch_bulk_in(usb_transfer_batch_t *instance);
    7070
    71 void batch_bulk_out(batch_t *instance);
     71void batch_bulk_out(usb_transfer_batch_t *instance);
    7272#endif
    7373/**

  • uspace/drv/ohci/hc.c

    re34e77a r1387692  
    106106}
    107107/*----------------------------------------------------------------------------*/
    108 int hc_schedule(hc_t *instance, batch_t *batch)
     108int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch)
    109109{
    110110        assert(instance);

  • uspace/drv/ohci/hc.h

    re34e77a r1387692  
    6161int hc_register_hub(hc_t *instance);
    6262
    63 int hc_schedule(hc_t *instance, batch_t *batch);
     63int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
    6464
    6565void hc_interrupt(hc_t *instance, uint16_t status);

  • uspace/drv/ohci/iface.c

    re34e77a r1387692  
    205205      target.address, target.endpoint, size, max_packet_size);
    206206
    207   batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
     207  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
    208208      max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
    209209      &hc->manager);
    … …  
    247247      target.address, target.endpoint, size, max_packet_size);
    248248
    249   batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
     249  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
    250250      max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
    251251      &hc->manager);
    … …  
    290290      target.address, target.endpoint, size, max_packet_size);
    291291
    292   batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
     292  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
    293293      max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
    294294      &hc->manager);
    … …  
    333333      target.address, target.endpoint, size, max_packet_size);
    334334
    335   batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
     335  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
    336336      max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
    337337      &hc->manager);
    … …  
    383383    return EINVAL;
    384384
    385   batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
     385  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
    386386      max_packet_size, speed, data, size, setup_data, setup_size,
    387387      NULL, callback, arg, &hc->manager);
    … …  
    431431  usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
    432432      speed, target.address, target.endpoint, size, max_packet_size);
    433   batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
     433  usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
    434434      max_packet_size, speed, data, size, setup_data, setup_size, callback,
    435435      NULL, arg, &hc->manager);

  • uspace/drv/ohci/root_hub.c

    re34e77a r1387692  
    5656}
    5757/*----------------------------------------------------------------------------*/
    58 int rh_request(rh_t *instance, batch_t *request)
     58int rh_request(rh_t *instance, usb_transfer_batch_t *request)
    5959{
    6060        assert(instance);
    … …  
    6666        }
    6767        usb_log_error("Root hub request processing not implemented.\n");
    68         batch_finish(request, ENOTSUP);
     68        usb_transfer_batch_finish(request, ENOTSUP);
    6969        return EOK;
    7070}

  • uspace/drv/ohci/root_hub.h

    re34e77a r1387692  
    4949int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs);
    5050
    51 int rh_request(rh_t *instance, batch_t *request);
     51int rh_request(rh_t *instance, usb_transfer_batch_t *request);
    5252
    5353void rh_interrupt(rh_t *instance);

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

    re34e77a r1387692  
    5353} uhci_batch_t;
    5454
    55 static void batch_control(batch_t *instance,
     55static void batch_control(usb_transfer_batch_t *instance,
    5656    usb_packet_id data_stage, usb_packet_id status_stage);
    57 static void batch_data(batch_t *instance, usb_packet_id pid);
    58 static void batch_call_in_and_dispose(batch_t *instance);
    59 static void batch_call_out_and_dispose(batch_t *instance);
     57static void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid);
     58static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
     59static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
    6060
    6161
    … …  
    8282 * transaction and callback.
    8383 */
    84 batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     84usb_transfer_batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
    8585    usb_transfer_type_t transfer_type, size_t max_packet_size,
    8686    usb_speed_t speed, char *buffer, size_t buffer_size,
    … …  
    103103        } else (void)0
    104104
    105         batch_t *instance = malloc(sizeof(batch_t));
     105        usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
    106106        CHECK_NULL_DISPOSE_RETURN(instance,
    107107            "Failed to allocate batch instance.\n");
    108         batch_init(instance, target, transfer_type, speed, max_packet_size,
     108        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
    109109            buffer, NULL, buffer_size, NULL, setup_size, func_in,
    110110            func_out, arg, fun, NULL);
    … …  
    161161 * is reached.
    162162 */
    163 bool batch_is_complete(batch_t *instance)
     163bool batch_is_complete(usb_transfer_batch_t *instance)
    164164{
    165165        assert(instance);
    … …  
    205205 * Uses genercir control function with pids OUT and IN.
    206206 */
    207 void batch_control_write(batch_t *instance)
     207void batch_control_write(usb_transfer_batch_t *instance)
    208208{
    209209        assert(instance);
    … …  
    222222 * Uses generic control with pids IN and OUT.
    223223 */
    224 void batch_control_read(batch_t *instance)
     224void batch_control_read(usb_transfer_batch_t *instance)
    225225{
    226226        assert(instance);
    … …  
    236236 * Data transaction with PID_IN.
    237237 */
    238 void batch_interrupt_in(batch_t *instance)
     238void batch_interrupt_in(usb_transfer_batch_t *instance)
    239239{
    240240        assert(instance);
    … …  
    251251 * Data transaction with PID_OUT.
    252252 */
    253 void batch_interrupt_out(batch_t *instance)
     253void batch_interrupt_out(usb_transfer_batch_t *instance)
    254254{
    255255        assert(instance);
    … …  
    269269 * Data transaction with PID_IN.
    270270 */
    271 void batch_bulk_in(batch_t *instance)
     271void batch_bulk_in(usb_transfer_batch_t *instance)
    272272{
    273273        assert(instance);
    … …  
    284284 * Data transaction with PID_OUT.
    285285 */
    286 void batch_bulk_out(batch_t *instance)
     286void batch_bulk_out(usb_transfer_batch_t *instance)
    287287{
    288288        assert(instance);
    … …  
    304304 * The last packet is marked with IOC flag.
    305305 */
    306 void batch_data(batch_t *instance, usb_packet_id pid)
     306void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid)
    307307{
    308308        assert(instance);
    … …  
    358358 * The last packet is marked with IOC.
    359359 */
    360 void batch_control(batch_t *instance,
     360void batch_control(usb_transfer_batch_t *instance,
    361361   usb_packet_id data_stage, usb_packet_id status_stage)
    362362{
    … …  
    411411}
    412412/*----------------------------------------------------------------------------*/
    413 qh_t * batch_qh(batch_t *instance)
     413qh_t * batch_qh(usb_transfer_batch_t *instance)
    414414{
    415415        assert(instance);
    … …  
    423423 * @param[in] instance Batch structure to use.
    424424 */
    425 void batch_call_in_and_dispose(batch_t *instance)
    426 {
    427         assert(instance);
    428         batch_call_in(instance);
     425void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
     426{
     427        assert(instance);
     428        usb_transfer_batch_call_in(instance);
    429429        batch_dispose(instance);
    430430}
    … …  
    434434 * @param[in] instance Batch structure to use.
    435435 */
    436 void batch_call_out_and_dispose(batch_t *instance)
    437 {
    438         assert(instance);
    439         batch_call_out(instance);
     436void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
     437{
     438        assert(instance);
     439        usb_transfer_batch_call_out(instance);
    440440        batch_dispose(instance);
    441441}
    … …  
    445445 * @param[in] instance Batch structure to use.
    446446 */
    447 void batch_dispose(batch_t *instance)
     447void batch_dispose(usb_transfer_batch_t *instance)
    448448{
    449449        assert(instance);

  • uspace/drv/uhci-hcd/batch.h

    re34e77a r1387692  
    4444#include "uhci_struct/queue_head.h"
    4545
    46 batch_t * batch_get(
     46usb_transfer_batch_t * batch_get(
    4747    ddf_fun_t *fun,
    4848                usb_target_t target,
    … …  
    6060                );
    6161
    62 void batch_dispose(batch_t *instance);
     62void batch_dispose(usb_transfer_batch_t *instance);
    6363
    64 bool batch_is_complete(batch_t *instance);
     64bool batch_is_complete(usb_transfer_batch_t *instance);
    6565
    66 void batch_control_write(batch_t *instance);
     66void batch_control_write(usb_transfer_batch_t *instance);
    6767
    68 void batch_control_read(batch_t *instance);
     68void batch_control_read(usb_transfer_batch_t *instance);
    6969
    70 void batch_interrupt_in(batch_t *instance);
     70void batch_interrupt_in(usb_transfer_batch_t *instance);
    7171
    72 void batch_interrupt_out(batch_t *instance);
     72void batch_interrupt_out(usb_transfer_batch_t *instance);
    7373
    74 void batch_bulk_in(batch_t *instance);
     74void batch_bulk_in(usb_transfer_batch_t *instance);
    7575
    76 void batch_bulk_out(batch_t *instance);
     76void batch_bulk_out(usb_transfer_batch_t *instance);
    7777
    78 qh_t * batch_qh(batch_t *instance);
     78qh_t * batch_qh(usb_transfer_batch_t *instance);
    7979#endif
    8080/**

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

    re34e77a r1387692  
    154154            target.address, target.endpoint, size, max_packet_size);
    155155
    156         batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
     156        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
    157157            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
    158158            &hc->device_manager);
    … …  
    190190            target.address, target.endpoint, size, max_packet_size);
    191191
    192         batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
     192        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
    193193            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
    194194                        &hc->device_manager);
    … …  
    227227            target.address, target.endpoint, size, max_packet_size);
    228228
    229         batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
     229        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
    230230            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
    231231            &hc->device_manager);
    … …  
    263263            target.address, target.endpoint, size, max_packet_size);
    264264
    265         batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
     265        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
    266266            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
    267267            &hc->device_manager);
    … …  
    305305                return EINVAL;
    306306
    307         batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
     307        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
    308308            max_packet_size, speed, data, size, setup_data, setup_size,
    309309            NULL, callback, arg, &hc->device_manager);
    … …  
    345345        usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
    346346            speed, target.address, target.endpoint, size, max_packet_size);
    347         batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
     347        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
    348348            max_packet_size, speed, data, size, setup_data, setup_size, callback,
    349349            NULL, arg, &hc->device_manager);

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

    re34e77a r1387692  
    3838
    3939static void transfer_list_remove_batch(
    40     transfer_list_t *instance, batch_t *batch);
     40    transfer_list_t *instance, usb_transfer_batch_t *batch);
    4141/*----------------------------------------------------------------------------*/
    4242/** Initialize transfer list structures.
    … …  
    9292 * The batch is added to the end of the list and queue.
    9393 */
    94 void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch)
     94void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
    9595{
    9696        assert(instance);
    … …  
    115115        } else {
    116116                /* There is something scheduled */
    117                 batch_t *last = list_get_instance(
    118                     instance->batch_list.prev, batch_t, link);
     117                usb_transfer_batch_t *last = list_get_instance(
     118                    instance->batch_list.prev, usb_transfer_batch_t, link);
    119119                qh_set_next_qh(batch_qh(last), pa);
    120120        }
    … …  
    122122        list_append(&batch->link, &instance->batch_list);
    123123
    124         batch_t *first = list_get_instance(
    125             instance->batch_list.next, batch_t, link);
     124        usb_transfer_batch_t *first = list_get_instance(
     125            instance->batch_list.next, usb_transfer_batch_t, link);
    126126        usb_log_debug("Batch(%p) added to queue %s, first is %p.\n",
    127127                batch, instance->name, first);
    … …  
    148148        while (current != &instance->batch_list) {
    149149                link_t *next = current->next;
    150                 batch_t *batch = list_get_instance(current, batch_t, link);
     150                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
    151151
    152152                if (batch_is_complete(batch)) {
    … …  
    162162                link_t *item = done.next;
    163163                list_remove(item);
    164                 batch_t *batch = list_get_instance(item, batch_t, link);
     164                usb_transfer_batch_t *batch = list_get_instance(item, usb_transfer_batch_t, link);
    165165                batch->next_step(batch);
    166166        }
    … …  
    176176        while (list_empty(&instance->batch_list)) {
    177177                link_t *current = instance->batch_list.next;
    178                 batch_t *batch = list_get_instance(current, batch_t, link);
     178                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
    179179                transfer_list_remove_batch(instance, batch);
    180                 batch_finish(batch, EIO);
     180                usb_transfer_batch_finish(batch, EIO);
    181181        }
    182182        fibril_mutex_unlock(&instance->guard);
    … …  
    191191 * Does not lock the transfer list, caller is responsible for that.
    192192 */
    193 void transfer_list_remove_batch(transfer_list_t *instance, batch_t *batch)
     193void transfer_list_remove_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
    194194{
    195195        assert(instance);
    … …  
    207207                pos = "FIRST";
    208208        } else {
    209                 batch_t *prev =
    210                     list_get_instance(batch->link.prev, batch_t, link);
     209                usb_transfer_batch_t *prev =
     210                    list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
    211211                qh_set_next_qh(batch_qh(prev), batch_qh(batch)->next);
    212212                pos = "NOT FIRST";

  • uspace/drv/uhci-hcd/transfer_list.h

    re34e77a r1387692  
    6666void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
    6767
    68 void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);
     68void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch);
    6969
    7070void transfer_list_remove_finished(transfer_list_t *instance);

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

    re34e77a r1387692  
    316316 * Checks for bandwidth availability and appends the batch to the proper queue.
    317317 */
    318 int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
     318int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch)
    319319{
    320320        assert(instance);

  • uspace/drv/uhci-hcd/uhci_hc.h

    re34e77a r1387692  
    109109    void *regs, size_t reg_size, bool interupts);
    110110
    111 int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch);
     111int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch);
    112112
    113113void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status);

  • uspace/lib/usb/include/usb/host/batch.h

    re34e77a r1387692  
    4040#include <usb/usb.h>
    4141
    42 typedef struct batch
    43 {
     42typedef struct usb_transfer_batch usb_transfer_batch_t;
     43struct usb_transfer_batch {
    4444        link_t link;
    4545        usb_target_t target;
    … …  
    5656        size_t max_packet_size;
    5757        size_t transfered_size;
    58         void (*next_step)(struct batch*);
     58        void (*next_step)(usb_transfer_batch_t *);
    5959        int error;
    6060        ddf_fun_t *fun;
    6161        void *arg;
    6262        void *private_data;
    63 } batch_t;
     63};
    6464
    65 void batch_init(
    66     batch_t *instance,
     65void usb_transfer_batch_init(
     66    usb_transfer_batch_t *instance,
    6767    usb_target_t target,
    6868    usb_transfer_type_t transfer_type,
    … …  
    8181);
    8282
    83 static inline batch_t *batch_from_link(link_t *link_ptr)
     83static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *link_ptr)
    8484{
    8585        assert(link_ptr);
    86         return list_get_instance(link_ptr, batch_t, link);
     86        return list_get_instance(link_ptr, usb_transfer_batch_t, link);
    8787}
    8888
    89 void batch_call_in(batch_t *instance);
    90 void batch_call_out(batch_t *instance);
    91 void batch_finish(batch_t *instance, int error);
     89void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
     90void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
     91void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error);
     92
    9293#endif
    9394/**

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

    re34e77a r1387692  
    3939#include <usb/host/batch.h>
    4040
    41 void batch_init(
    42     batch_t *instance,
     41void usb_transfer_batch_init(
     42    usb_transfer_batch_t *instance,
    4343    usb_target_t target,
    4444    usb_transfer_type_t transfer_type,
    … …  
    8585 *
    8686 */
    87 void batch_finish(batch_t *instance, int error)
     87void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error)
    8888{
    8989        assert(instance);
    … …  
    9898 * parameters.
    9999 */
    100 void batch_call_in(batch_t *instance)
     100void usb_transfer_batch_call_in(usb_transfer_batch_t *instance)
    101101{
    102102        assert(instance);
    … …  
    120120 * @param[in] instance Batch structure to use.
    121121 */
    122 void batch_call_out(batch_t *instance)
     122void usb_transfer_batch_call_out(usb_transfer_batch_t *instance)
    123123{
    124124        assert(instance);
Note: See TracChangeset for help on using the changeset viewer.