Changes in / [026d6e2:9df965ec] in mainline


Ignore:
Location:
uspace
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r026d6e2 r9df965ec  
    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
    … …  
    166166/*----------------------------------------------------------------------------*/
    167167static int control_write_setup(device_t *dev, usb_target_t target,
    168     size_t max_packet_size,
    169     void *data, size_t size,
    170     usbhc_iface_transfer_out_callback_t callback, void *arg)
    171 {
     168    void *data, size_t size,
     169    usbhc_iface_transfer_out_callback_t callback, void *arg)
     170{
     171        size_t max_packet_size = 8;
    172172        dev_speed_t speed = FULL_SPEED;
    173173
    … …  
    182182/*----------------------------------------------------------------------------*/
    183183static 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 {
     184    void *data, size_t size,
     185    usbhc_iface_transfer_out_callback_t callback, void *arg)
     186{
     187        size_t max_packet_size = 8;
    188188        dev_speed_t speed = FULL_SPEED;
    189189
    … …  
    213213/*----------------------------------------------------------------------------*/
    214214static 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 {
     215    void *data, size_t size,
     216    usbhc_iface_transfer_out_callback_t callback, void *arg)
     217{
     218        size_t max_packet_size = 8;
    219219        dev_speed_t speed = FULL_SPEED;
    220220
    … …  
    229229/*----------------------------------------------------------------------------*/
    230230static int control_read_data(device_t *dev, usb_target_t target,
    231     size_t max_packet_size,
    232     void *data, size_t size,
    233     usbhc_iface_transfer_in_callback_t callback, void *arg)
    234 {
     231    void *data, size_t size,
     232    usbhc_iface_transfer_in_callback_t callback, void *arg)
     233{
     234        size_t max_packet_size = 8;
    235235        dev_speed_t speed = FULL_SPEED;
    236236

  • TabularUnified uspace/drv/vhc/connhost.c

    r026d6e2 r9df965ec  
    276276
    277277static int interrupt_out(device_t *dev, usb_target_t target,
    278     size_t max_packet_size,
    279278    void *data, size_t size,
    280279    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    286285
    287286static int interrupt_in(device_t *dev, usb_target_t target,
    288     size_t max_packet_size,
    289287    void *data, size_t size,
    290288    usbhc_iface_transfer_in_callback_t callback, void *arg)
    … …  
    296294
    297295static int control_write_setup(device_t *dev, usb_target_t target,
    298     size_t max_packet_size,
    299296    void *data, size_t size,
    300297    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    306303
    307304static int control_write_data(device_t *dev, usb_target_t target,
    308     size_t max_packet_size,
    309305    void *data, size_t size,
    310306    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    324320
    325321static int control_write(device_t *dev, usb_target_t target,
    326     size_t max_packet_size,
    327322    void *setup_packet, size_t setup_packet_size,
    328323    void *data, size_t data_size,
    … …  
    342337
    343338static int control_read_setup(device_t *dev, usb_target_t target,
    344     size_t max_packet_size,
    345339    void *data, size_t size,
    346340    usbhc_iface_transfer_out_callback_t callback, void *arg)
    … …  
    352346
    353347static int control_read_data(device_t *dev, usb_target_t target,
    354     size_t max_packet_size,
    355348    void *data, size_t size,
    356349    usbhc_iface_transfer_in_callback_t callback, void *arg)
    … …  
    370363
    371364static int control_read(device_t *dev, usb_target_t target,
    372     size_t max_packet_size,
    373365    void *setup_packet, size_t setup_packet_size,
    374366    void *data, size_t data_size,

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

    r026d6e2 r9df965ec  
    4040
    4141#define USB_MAX_PAYLOAD_SIZE 1020
    42 #define HACK_MAX_PACKET_SIZE 8
    43 #define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4
    4442
    4543static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
    … …  
    328326        trans->size = len;
    329327
    330         int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE,
    331             buffer, len,
     328        int rc = transfer_func(device, target, buffer, len,
    332329            callback_out, trans);
    333330
    … …  
    375372        trans->size = len;
    376373
    377         int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE_INTERRUPT_IN,
    378             trans->buffer, len,
     374        int rc = transfer_func(device, target, trans->buffer, len,
    379375            callback_in, trans);
    380376
    … …  
    584580        trans->size = data_buffer_len;
    585581
    586         rc = usb_iface->control_write(device, target, HACK_MAX_PACKET_SIZE,
     582        rc = usb_iface->control_write(device, target,
    587583            setup_packet, setup_packet_len,
    588584            data_buffer, data_buffer_len,
    … …  
    648644        }
    649645
    650         rc = usb_iface->control_read(device, target, HACK_MAX_PACKET_SIZE,
     646        rc = usb_iface->control_read(device, target,
    651647            setup_packet, setup_packet_len,
    652648            trans->buffer, trans->size,

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

    r026d6e2 r9df965ec  
    216216
    217217/** Out transfer processing function prototype. */
    218 typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, size_t,
     218typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t,
    219219    void *, size_t,
    220220    usbhc_iface_transfer_out_callback_t, void *);
    221221
    222 /** Setup transfer processing function prototype. @deprecated */
     222/** Setup transfer processing function prototype. */
    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, size_t,
     226typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_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,
    255254            void *, size_t, void *, size_t,
    256255            usbhc_iface_transfer_out_callback_t, void *);
    257256
    258257        int (*control_read)(device_t *, usb_target_t,
    259             size_t,
    260258            void *, size_t, void *, size_t,
    261259            usbhc_iface_transfer_in_callback_t, void *);

  • TabularUnified uspace/lib/usbvirt/Makefile

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