Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/ohci/batch.c

    r1387692 rd328172  
    4141#include "utils/malloc32.h"
    4242
    43 static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
    44 static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
     43static void batch_call_in_and_dispose(batch_t *instance);
     44static void batch_call_out_and_dispose(batch_t *instance);
    4545
    4646#define DEFAULT_ERROR_COUNT 3
    47 usb_transfer_batch_t * batch_get(
     47batch_t * batch_get(
    4848    ddf_fun_t *fun,
    4949                usb_target_t target,
     
    5858    usbhc_iface_transfer_out_callback_t func_out,
    5959                void *arg,
    60                 usb_device_keeper_t *manager
     60                device_keeper_t *manager
    6161                )
    6262{
     
    7070        } else (void)0
    7171
    72         usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
     72        batch_t *instance = malloc(sizeof(batch_t));
    7373        CHECK_NULL_DISPOSE_RETURN(instance,
    7474            "Failed to allocate batch instance.\n");
    75         usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
     75        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(usb_transfer_batch_t *instance)
     96void batch_dispose(batch_t *instance)
    9797{
    9898        assert(instance);
     
    102102}
    103103/*----------------------------------------------------------------------------*/
    104 void batch_control_write(usb_transfer_batch_t *instance)
     104void batch_control_write(batch_t *instance)
    105105{
    106106        assert(instance);
     
    113113}
    114114/*----------------------------------------------------------------------------*/
    115 void batch_control_read(usb_transfer_batch_t *instance)
     115void batch_control_read(batch_t *instance)
    116116{
    117117        assert(instance);
     
    121121}
    122122/*----------------------------------------------------------------------------*/
    123 void batch_interrupt_in(usb_transfer_batch_t *instance)
     123void batch_interrupt_in(batch_t *instance)
    124124{
    125125        assert(instance);
     
    130130}
    131131/*----------------------------------------------------------------------------*/
    132 void batch_interrupt_out(usb_transfer_batch_t *instance)
     132void batch_interrupt_out(batch_t *instance)
    133133{
    134134        assert(instance);
     
    142142}
    143143/*----------------------------------------------------------------------------*/
    144 void batch_bulk_in(usb_transfer_batch_t *instance)
     144void batch_bulk_in(batch_t *instance)
    145145{
    146146        assert(instance);
     
    151151}
    152152/*----------------------------------------------------------------------------*/
    153 void batch_bulk_out(usb_transfer_batch_t *instance)
     153void batch_bulk_out(batch_t *instance)
    154154{
    155155        assert(instance);
     
    164164 * @param[in] instance Batch structure to use.
    165165 */
    166 void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
     166void batch_call_in_and_dispose(batch_t *instance)
    167167{
    168168        assert(instance);
    169         usb_transfer_batch_call_in(instance);
     169        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(usb_transfer_batch_t *instance)
     177void batch_call_out_and_dispose(batch_t *instance)
    178178{
    179179        assert(instance);
    180         usb_transfer_batch_call_out(instance);
     180        batch_call_out(instance);
    181181        batch_dispose(instance);
    182182}
Note: See TracChangeset for help on using the changeset viewer.