Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rb36e5de2 rfa48ebe  
    104104/*----------------------------------------------------------------------------*/
    105105static int interrupt_out(device_t *dev, usb_target_t target,
    106     size_t max_packet_size,
    107     void *data, size_t size,
    108     usbhc_iface_transfer_out_callback_t callback, void *arg)
    109 {
     106    void *data, size_t size,
     107    usbhc_iface_transfer_out_callback_t callback, void *arg)
     108{
     109        size_t max_packet_size = 8;
    110110        dev_speed_t speed = FULL_SPEED;
    111111
    … …  
    119119/*----------------------------------------------------------------------------*/
    120120static int interrupt_in(device_t *dev, usb_target_t target,
    121     size_t max_packet_size,
    122     void *data, size_t size,
    123     usbhc_iface_transfer_in_callback_t callback, void *arg)
    124 {
     121    void *data, size_t size,
     122    usbhc_iface_transfer_in_callback_t callback, void *arg)
     123{
     124        size_t max_packet_size = 4;
    125125        dev_speed_t speed = FULL_SPEED;
    126126
    … …  
    134134/*----------------------------------------------------------------------------*/
    135135static int control_write(device_t *dev, usb_target_t target,
    136     size_t max_packet_size,
    137136    void *setup_data, size_t setup_size, void *data, size_t size,
    138137    usbhc_iface_transfer_out_callback_t callback, void *arg)
    139138{
     139        size_t max_packet_size = 8;
    140140        dev_speed_t speed = FULL_SPEED;
    141141
    … …  
    150150/*----------------------------------------------------------------------------*/
    151151static int control_read(device_t *dev, usb_target_t target,
    152     size_t max_packet_size,
    153152    void *setup_data, size_t setup_size, void *data, size_t size,
    154153    usbhc_iface_transfer_in_callback_t callback, void *arg)
    155154{
     155        size_t max_packet_size = 8;
    156156        dev_speed_t speed = FULL_SPEED;
    157157
    … …  
    164164        return EOK;
    165165}
    166 
    167 
     166/*----------------------------------------------------------------------------*/
     167static int control_write_setup(device_t *dev, usb_target_t target,
     168    void *data, size_t size,
     169    usbhc_iface_transfer_out_callback_t callback, void *arg)
     170{
     171        size_t max_packet_size = 8;
     172        dev_speed_t speed = FULL_SPEED;
     173
     174        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
     175        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
     176            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
     177        if (!batch)
     178                return ENOMEM;
     179        batch_control_setup_old(batch);
     180        return EOK;
     181}
     182/*----------------------------------------------------------------------------*/
     183static int control_write_data(device_t *dev, usb_target_t target,
     184    void *data, size_t size,
     185    usbhc_iface_transfer_out_callback_t callback, void *arg)
     186{
     187        size_t max_packet_size = 8;
     188        dev_speed_t speed = FULL_SPEED;
     189
     190        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
     191        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
     192            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
     193        if (!batch)
     194                return ENOMEM;
     195        batch_control_write_data_old(batch);
     196        return EOK;
     197}
     198/*----------------------------------------------------------------------------*/
     199static int control_write_status(device_t *dev, usb_target_t target,
     200    usbhc_iface_transfer_in_callback_t callback, void *arg)
     201{
     202        size_t max_packet_size = 8;
     203        dev_speed_t speed = FULL_SPEED;
     204
     205        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
     206        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
     207            max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg);
     208        if (!batch)
     209                return ENOMEM;
     210        batch_control_write_status_old(batch);
     211        return EOK;
     212}
     213/*----------------------------------------------------------------------------*/
     214static int control_read_setup(device_t *dev, usb_target_t target,
     215    void *data, size_t size,
     216    usbhc_iface_transfer_out_callback_t callback, void *arg)
     217{
     218        size_t max_packet_size = 8;
     219        dev_speed_t speed = FULL_SPEED;
     220
     221        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
     222        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
     223            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
     224        if (!batch)
     225                return ENOMEM;
     226        batch_control_setup_old(batch);
     227        return EOK;
     228}
     229/*----------------------------------------------------------------------------*/
     230static int control_read_data(device_t *dev, usb_target_t target,
     231    void *data, size_t size,
     232    usbhc_iface_transfer_in_callback_t callback, void *arg)
     233{
     234        size_t max_packet_size = 8;
     235        dev_speed_t speed = FULL_SPEED;
     236
     237        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
     238        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
     239            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg);
     240        if (!batch)
     241                return ENOMEM;
     242        batch_control_read_data_old(batch);
     243        return EOK;
     244}
     245/*----------------------------------------------------------------------------*/
     246static int control_read_status(device_t *dev, usb_target_t target,
     247    usbhc_iface_transfer_out_callback_t callback, void *arg)
     248{
     249        size_t max_packet_size = 8;
     250        dev_speed_t speed = FULL_SPEED;
     251
     252        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
     253        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
     254            max_packet_size, speed, NULL, 0, NULL, 0, NULL, callback, arg);
     255        if (!batch)
     256                return ENOMEM;
     257        batch_control_read_status_old(batch);
     258        return EOK;
     259}
    168260/*----------------------------------------------------------------------------*/
    169261usbhc_iface_t uhci_iface = {
    … …  
    181273        .control_read = control_read,
    182274        .control_write = control_write,
     275
     276        .control_write_setup = control_write_setup,
     277        .control_write_data = control_write_data,
     278        .control_write_status = control_write_status,
     279
     280        .control_read_setup = control_read_setup,
     281        .control_read_data = control_read_data,
     282        .control_read_status = control_read_status
    183283};
    184284/**
Note: See TracChangeset for help on using the changeset viewer.