Changeset 026d6e2 in mainline


Ignore:
Timestamp:
2011-02-18T19:41:52Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b6c7da6, fbf0589
Parents:
9df965ec (diff), 0c00dac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge development/ changes

Location:
uspace
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r9df965ec r026d6e2  
    104104/*----------------------------------------------------------------------------*/
    105105static int interrupt_out(device_t *dev, usb_target_t target,
    106     void *data, size_t size,
    107     usbhc_iface_transfer_out_callback_t callback, void *arg)
    108 {
    109         size_t max_packet_size = 8;
     106    size_t max_packet_size,
     107    void *data, size_t size,
     108    usbhc_iface_transfer_out_callback_t callback, void *arg)
     109{
    110110        dev_speed_t speed = FULL_SPEED;
    111111
    … …  
    119119/*----------------------------------------------------------------------------*/
    120120static int interrupt_in(device_t *dev, usb_target_t target,
    121     void *data, size_t size,
    122     usbhc_iface_transfer_in_callback_t callback, void *arg)
    123 {
    124         size_t max_packet_size = 4;
     121    size_t max_packet_size,
     122    void *data, size_t size,
     123    usbhc_iface_transfer_in_callback_t callback, void *arg)
     124{
    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,
    136137    void *setup_data, size_t setup_size, void *data, size_t size,
    137138    usbhc_iface_transfer_out_callback_t callback, void *arg)
    138139{
    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,
    152153    void *setup_data, size_t setup_size, void *data, size_t size,
    153154    usbhc_iface_transfer_in_callback_t callback, void *arg)
    154155{
    155         size_t max_packet_size = 8;
    156156        dev_speed_t speed = FULL_SPEED;
    157157
    … …  
    166166/*----------------------------------------------------------------------------*/
    167167static 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)
     168    size_t max_packet_size,
     169    void *data, size_t size,
     170    usbhc_iface_transfer_out_callback_t callback, void *arg)
     171{
     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    size_t max_packet_size,
     185    void *data, size_t size,
     186    usbhc_iface_transfer_out_callback_t callback, void *arg)
     187{
     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)
    170201{
    171202        size_t max_packet_size = 8;
    … …  
    174205        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
    175206        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    size_t max_packet_size,
     216    void *data, size_t size,
     217    usbhc_iface_transfer_out_callback_t callback, void *arg)
     218{
     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,
    176223            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
    177224        if (!batch)
    … …  
    181228}
    182229/*----------------------------------------------------------------------------*/
    183 static 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 /*----------------------------------------------------------------------------*/
    199 static 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 /*----------------------------------------------------------------------------*/
    214 static 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 /*----------------------------------------------------------------------------*/
    230230static 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;
     231    size_t max_packet_size,
     232    void *data, size_t size,
     233    usbhc_iface_transfer_in_callback_t callback, void *arg)
     234{
    235235        dev_speed_t speed = FULL_SPEED;
    236236

  • uspace/drv/vhc/connhost.c

    r9df965ec r026d6e2  
    276276
    277277static int interrupt_out(device_t *dev, usb_target_t target,
     278    size_t max_packet_size,
    278279    void *data, size_t size,
    279280    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    285286
    286287static int interrupt_in(device_t *dev, usb_target_t target,
     288    size_t max_packet_size,
    287289    void *data, size_t size,
    288290    usbhc_iface_transfer_in_callback_t callback, void *arg)
    … …  
    294296
    295297static int control_write_setup(device_t *dev, usb_target_t target,
     298    size_t max_packet_size,
    296299    void *data, size_t size,
    297300    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    303306
    304307static int control_write_data(device_t *dev, usb_target_t target,
     308    size_t max_packet_size,
    305309    void *data, size_t size,
    306310    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    320324
    321325static int control_write(device_t *dev, usb_target_t target,
     326    size_t max_packet_size,
    322327    void *setup_packet, size_t setup_packet_size,
    323328    void *data, size_t data_size,
    … …  
    337342
    338343static int control_read_setup(device_t *dev, usb_target_t target,
     344    size_t max_packet_size,
    339345    void *data, size_t size,
    340346    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    346352
    347353static int control_read_data(device_t *dev, usb_target_t target,
     354    size_t max_packet_size,
    348355    void *data, size_t size,
    349356    usbhc_iface_transfer_in_callback_t callback, void *arg)
    … …  
    363370
    364371static int control_read(device_t *dev, usb_target_t target,
     372    size_t max_packet_size,
    365373    void *setup_packet, size_t setup_packet_size,
    366374    void *data, size_t data_size,

  • uspace/lib/drv/generic/remote_usbhc.c

    r9df965ec r026d6e2  
    4040
    4141#define USB_MAX_PAYLOAD_SIZE 1020
     42#define HACK_MAX_PACKET_SIZE 8
     43#define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4
    4244
    4345static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
    … …  
    326328        trans->size = len;
    327329
    328         int rc = transfer_func(device, target, buffer, len,
     330        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE,
     331            buffer, len,
    329332            callback_out, trans);
    330333
    … …  
    372375        trans->size = len;
    373376
    374         int rc = transfer_func(device, target, trans->buffer, len,
     377        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE_INTERRUPT_IN,
     378            trans->buffer, len,
    375379            callback_in, trans);
    376380
    … …  
    580584        trans->size = data_buffer_len;
    581585
    582         rc = usb_iface->control_write(device, target,
     586        rc = usb_iface->control_write(device, target, HACK_MAX_PACKET_SIZE,
    583587            setup_packet, setup_packet_len,
    584588            data_buffer, data_buffer_len,
    … …  
    644648        }
    645649
    646         rc = usb_iface->control_read(device, target,
     650        rc = usb_iface->control_read(device, target, HACK_MAX_PACKET_SIZE,
    647651            setup_packet, setup_packet_len,
    648652            trans->buffer, trans->size,

  • uspace/lib/drv/include/usbhc_iface.h

    r9df965ec r026d6e2  
    216216
    217217/** Out transfer processing function prototype. */
    218 typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t,
     218typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, size_t,
    219219    void *, size_t,
    220220    usbhc_iface_transfer_out_callback_t, void *);
    221221
    222 /** Setup transfer processing function prototype. */
     222/** Setup transfer processing function prototype. @deprecated */
    223223typedef usbhc_iface_transfer_out_t usbhc_iface_transfer_setup_t;
    224224
    225225/** In transfer processing function prototype. */
    226 typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t,
     226typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t, size_t,
    227227    void *, size_t,
    228228    usbhc_iface_transfer_in_callback_t, void *);
    … …  
    252252
    253253        int (*control_write)(device_t *, usb_target_t,
     254            size_t,
    254255            void *, size_t, void *, size_t,
    255256            usbhc_iface_transfer_out_callback_t, void *);
    256257
    257258        int (*control_read)(device_t *, usb_target_t,
     259            size_t,
    258260            void *, size_t, void *, size_t,
    259261            usbhc_iface_transfer_in_callback_t, void *);

  • uspace/lib/usbvirt/Makefile

    r9df965ec r026d6e2  
    3030LIBRARY = libusbvirt
    3131
    32 LIBS = $(LIBUSB_PREFIX)/libusb.a
    3332EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude
    3433
Note: See TracChangeset for help on using the changeset viewer.