Changeset d93ff502 in mainline


Ignore:
Timestamp:
2011-01-28T14:59:50Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
10f479ae
Parents:
de0e6b3
Message:

Added toggle bit parameter.

Removed uhci_* specific functions, use uhci_transfer directly

Location:
uspace/drv/uhci
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci/iface.c

    rde0e6b3 rd93ff502  
    3131#include "iface.h"
    3232#include "uhci.h"
    33 /*
    34 static int enqueue_transfer_out(device_t *dev,
    35     usb_target_t target, usb_transfer_type_t transfer_type,
    36     void *buffer, size_t size,
    37     usbhc_iface_transfer_out_callback_t callback, void *arg)
    38 {
    39         printf(NAME ": transfer OUT [%d.%d (%s); %zu]\n",
    40             target.address, target.endpoint,
    41             usb_str_transfer_type(transfer_type),
    42             size);
    43 
    44         return ENOTSUP;
    45 }
    46 
    47 static int enqueue_transfer_setup(device_t *dev,
    48     usb_target_t target, usb_transfer_type_t transfer_type,
    49     void *buffer, size_t size,
    50     usbhc_iface_transfer_out_callback_t callback, void *arg)
    51 {
    52         printf(NAME ": transfer SETUP [%d.%d (%s); %zu]\n",
    53             target.address, target.endpoint,
    54             usb_str_transfer_type(transfer_type),
    55             size);
    56 
    57         return ENOTSUP;
    58 }
    59 
    60 static int enqueue_transfer_in(device_t *dev,
    61     usb_target_t target, usb_transfer_type_t transfer_type,
    62     void *buffer, size_t size,
    63     usbhc_iface_transfer_in_callback_t callback, void *arg)
    64 {
    65         printf(NAME ": transfer IN [%d.%d (%s); %zu]\n",
    66             target.address, target.endpoint,
    67             usb_str_transfer_type(transfer_type),
    68             size);
    69 
    70         return ENOTSUP;
    71 }
    72 */
    7333
    7434static int get_address(device_t *dev, devman_handle_t handle,
    … …  
    8242    usbhc_iface_transfer_out_callback_t callback, void *arg)
    8343{
    84         return uhci_out(dev, target, USB_TRANSFER_INTERRUPT,
    85             data, size, callback, arg);
     44        return uhci_transfer(dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_OUT,
     45                data, size, callback, NULL, arg);
    8646}
    8747/*----------------------------------------------------------------------------*/
    … …  
    9050    usbhc_iface_transfer_in_callback_t callback, void *arg)
    9151{
    92         return uhci_in(dev, target, USB_TRANSFER_INTERRUPT,
    93             data, size, callback, arg);
     52        return uhci_transfer(dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_IN,
     53                data, size, NULL, callback, arg);
    9454}
    9555/*----------------------------------------------------------------------------*/
    … …  
    9858    usbhc_iface_transfer_out_callback_t callback, void *arg)
    9959{
    100         return uhci_setup(dev, target, USB_TRANSFER_CONTROL,
    101             data, size, callback, arg);
     60        return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP,
     61                data, size, callback, NULL, arg);
    10262}
    10363/*----------------------------------------------------------------------------*/
    … …  
    10666    usbhc_iface_transfer_out_callback_t callback, void *arg)
    10767{
    108         return uhci_out(dev, target, USB_TRANSFER_CONTROL,
    109             data, size, callback, arg);
     68        return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_OUT,
     69                data, size, callback, NULL, arg);
    11070}
    11171/*----------------------------------------------------------------------------*/
    … …  
    11373    usbhc_iface_transfer_in_callback_t callback, void *arg)
    11474{
    115         return uhci_in(dev, target, USB_TRANSFER_CONTROL,
    116             NULL, 0, callback, arg);
     75        return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_IN,
     76                NULL, 0, NULL, callback, arg);
    11777}
    11878/*----------------------------------------------------------------------------*/
    … …  
    12181    usbhc_iface_transfer_out_callback_t callback, void *arg)
    12282{
    123         return uhci_setup(dev, target, USB_TRANSFER_CONTROL,
    124             data, size, callback, arg);
     83        return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP,
     84                data, size, callback, NULL, arg);
    12585}
    12686/*----------------------------------------------------------------------------*/
    … …  
    12989    usbhc_iface_transfer_in_callback_t callback, void *arg)
    13090{
    131         return uhci_in(dev, target, USB_TRANSFER_CONTROL,
    132             data, size, callback, arg);
     91        return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_IN,
     92                data, size, NULL, callback, arg);
    13393}
    13494/*----------------------------------------------------------------------------*/
    … …  
    13696    usbhc_iface_transfer_out_callback_t callback, void *arg)
    13797{
    138         return uhci_out(dev, target, USB_TRANSFER_CONTROL,
    139             NULL, 0, callback, arg);
     98        return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_OUT,
     99                NULL, 0, callback, NULL, arg);
    140100}
    141101

  • uspace/drv/uhci/uhci.c

    rde0e6b3 rd93ff502  
    1111static int uhci_init_transfer_lists(transfer_list_t list[]);
    1212static int uhci_clean_finished(void *arg);
    13 static inline int uhci_add_transfer(
    14   device_t *dev,
    15   usb_target_t target,
    16   usb_transfer_type_t transfer_type,
    17   usb_packet_id pid,
    18   void *buffer, size_t size,
    19   usbhc_iface_transfer_out_callback_t callback_out,
    20   usbhc_iface_transfer_in_callback_t callback_in,
    21   void *arg );
    2213
    2314int uhci_init(device_t *device, void *regs)
    … …  
    3627
    3728        /* create instance */
    38         uhci_t *instance = malloc( sizeof(uhci_t) );
     29        uhci_t *instance = malloc(sizeof(uhci_t));
    3930        int ret = instance ? EOK : ENOMEM;
    4031        CHECK_RET_FREE_INSTANCE("Failed to allocate uhci driver instance.\n");
    … …  
    4435        /* init address keeper(libusb) */
    4536        usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
     37        uhci_print_verbose("Initialized address manager.\n");
    4638
    4739        /* allow access to hc control registers */
    … …  
    5042        CHECK_RET_FREE_INSTANCE("Failed to gain access to registers at %p.\n", io);
    5143        instance->registers = io;
     44        uhci_print_verbose("Device registers accessible.\n");
    5245
    5346        /* init transfer lists */
    5447        ret = uhci_init_transfer_lists(instance->transfers);
    5548        CHECK_RET_FREE_INSTANCE("Failed to initialize transfer lists.\n");
     49        uhci_print_verbose("Transfer lists initialized.\n");
    5650
    5751        /* init root hub */
    … …  
    6054        CHECK_RET_FREE_INSTANCE("Failed to initialize root hub driver.\n");
    6155
     56        uhci_print_verbose("Initializing frame list.\n");
    6257        instance->frame_list =
    63           malloc32(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT);
     58          memallign32(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT, 4096);
    6459        if (instance->frame_list == NULL) {
    6560                uhci_print_error("Failed to allocate frame list pointer.\n");
    … …  
    8782        device->driver_data = instance;
    8883        return EOK;
    89 }
    90 /*----------------------------------------------------------------------------*/
    91 int uhci_in(
    92   device_t *dev,
    93         usb_target_t target,
    94         usb_transfer_type_t transfer_type,
    95         void *buffer, size_t size,
    96         usbhc_iface_transfer_in_callback_t callback, void *arg
    97         )
    98 {
    99         uhci_print_info( "transfer IN [%d.%d (%s); %zu]\n",
    100             target.address, target.endpoint,
    101             usb_str_transfer_type(transfer_type),
    102             size);
    103         return uhci_add_transfer(
    104           dev, target, transfer_type, USB_PID_IN, buffer, size, NULL, callback, arg);
    105 }
    106 /*----------------------------------------------------------------------------*/
    107 int uhci_out(
    108   device_t *dev,
    109   usb_target_t target,
    110   usb_transfer_type_t transfer_type,
    111   void *buffer, size_t size,
    112         usbhc_iface_transfer_out_callback_t callback, void *arg
    113   )
    114 {
    115         uhci_print_info( "transfer OUT [%d.%d (%s); %zu]\n",
    116             target.address, target.endpoint,
    117             usb_str_transfer_type(transfer_type),
    118             size);
    119         return uhci_add_transfer(
    120           dev, target, transfer_type, USB_PID_OUT, buffer, size, callback, NULL, arg);
    121 }
    122 /*----------------------------------------------------------------------------*/
    123 int uhci_setup(
    124   device_t *dev,
    125   usb_target_t target,
    126   usb_transfer_type_t transfer_type,
    127   void *buffer, size_t size,
    128   usbhc_iface_transfer_out_callback_t callback, void *arg
    129   )
    130 {
    131         uhci_print_info( "transfer SETUP [%d.%d (%s); %zu]\n",
    132             target.address, target.endpoint,
    133             usb_str_transfer_type(transfer_type),
    134             size);
    135         uhci_print_info("Setup packet content: %x %x.\n", ((uint8_t*)buffer)[0],
    136           ((uint8_t*)buffer)[1]);
    137         return uhci_add_transfer( dev,
    138           target, transfer_type, USB_PID_SETUP, buffer, size, callback, NULL, arg);
    139 
    14084}
    14185/*----------------------------------------------------------------------------*/
    … …  
    173117}
    174118/*----------------------------------------------------------------------------*/
    175 static inline int uhci_add_transfer(
     119int uhci_transfer(
    176120  device_t *dev,
    177121  usb_target_t target,
    178122  usb_transfer_type_t transfer_type,
     123        bool toggle,
    179124  usb_packet_id pid,
    180125  void *buffer, size_t size,
    … …  
    248193                                instance->transfers[i].last = instance->transfers[i].first;
    249194                }
    250 
    251195                async_usleep(1000000);
    252196        }

  • uspace/drv/uhci/uhci.h

    rde0e6b3 rd93ff502  
    4646typedef struct uhci_regs {
    4747        uint16_t usbcmd;
     48#define USB_CMD_
    4849        uint16_t usbsts;
    4950        uint16_t usbintr;
    … …  
    7273int uhci_destroy( device_t *device );
    7374
    74 int uhci_in(
    75   device_t *dev,
    76         usb_target_t target,
    77         usb_transfer_type_t transfer_type,
    78         void *buffer, size_t size,
    79         usbhc_iface_transfer_in_callback_t callback, void *arg
    80         );
    81 
    82 int uhci_out(
    83   device_t *dev,
    84         usb_target_t target,
    85   usb_transfer_type_t transfer_type,
    86   void *buffer, size_t size,
    87         usbhc_iface_transfer_out_callback_t callback, void *arg
    88   );
    89 
    90 int uhci_setup(
     75int uhci_transfer(
    9176  device_t *dev,
    9277  usb_target_t target,
    9378  usb_transfer_type_t transfer_type,
     79        bool toggle,
     80  usb_packet_id pid,
    9481  void *buffer, size_t size,
    95   usbhc_iface_transfer_out_callback_t callback, void *arg
    96   );
     82  usbhc_iface_transfer_out_callback_t callback_out,
     83  usbhc_iface_transfer_in_callback_t callback_in,
     84  void *arg );
    9785
    9886#endif
Note: See TracChangeset for help on using the changeset viewer.