Changeset 1387692 in mainline for uspace/drv/ohci


Ignore:
Timestamp:
2011-03-21T15:01:52Z (15 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/drv/ohci
Files:
7 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);
Note: See TracChangeset for help on using the changeset viewer.