Changes in / [0a9ea4a:2f60e57d] in mainline


Ignore:
Location:
uspace
Files:
4 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/virtusbkbd/virtusbkbd.c

    r0a9ea4a r2f60e57d  
    271271        printf("%s: Simulating keyboard events...\n", NAME);
    272272        fibril_sleep(10);
    273         //while (1) {
     273        while (1) {
    274274                kb_process_events(&status, keyboard_events, keyboard_events_count,
    275275                        on_keyboard_change);
    276         //}
     276        }
    277277       
    278278        printf("%s: Terminating...\n", NAME);

  • uspace/drv/usbhub/usbhub.c

    r0a9ea4a r2f60e57d  
    462462                target.address = hub_info->usb_device->address;
    463463                target.endpoint = 1;/// \TODO get from endpoint descriptor
    464                 /*dprintf(1,"[usb_hub] checking changes for hub at addr %d",
    465                     target.address);*/
     464                dprintf(1,"[usb_hub] checking changes for hub at addr %d",
     465                    target.address);
    466466
    467467                size_t port_count = hub_info->port_count;

  • uspace/drv/usbkbd/Makefile

    r0a9ea4a r2f60e57d  
    3333
    3434SOURCES = \
    35         main.c \
    36         descparser.c \
    37         descdump.c
     35        main.c
    3836
    3937include $(USPACE_PREFIX)/Makefile.common

  • uspace/drv/usbkbd/main.c

    r0a9ea4a r2f60e57d  
    3838#include <usb/devreq.h>
    3939#include <usb/descriptor.h>
    40 #include "descparser.h"
    41 #include "descdump.h"
    4240
    4341#define BUFFER_SIZE 32
    … …  
    9088 * Callbacks for parser
    9189 */
    92 static void usbkbd_process_keycodes(const uint8_t *key_codes, size_t count,
    93                                     uint8_t modifiers, void *arg)
    94 {
    95         printf("Got keys: ");
    96         unsigned i;
    97         for (i = 0; i < count; ++i) {
    98                 printf("%d ", key_codes[i]);
    99         }
    100         printf("\n");
     90static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
     91                                    void *arg)
     92{
     93
    10194}
    10295
    … …  
    10497 * Kbd functions
    10598 */
    106 static int usbkbd_get_report_descriptor(usb_hid_dev_kbd_t *kbd_dev)
    107 {
    108         // iterate over all configurations and interfaces
    109         // TODO: more configurations!!
    110         unsigned i;
    111         for (i = 0; i < kbd_dev->conf->config_descriptor.interface_count; ++i) {
    112                 // TODO: endianness
    113                 uint16_t length =
    114                     kbd_dev->conf->interfaces[i].hid_desc.report_desc_info.length;
    115                 size_t actual_size = 0;
    116 
    117                 // allocate space for the report descriptor
    118                 kbd_dev->conf->interfaces[i].report_desc = (uint8_t *)malloc(length);
    119                
    120                 // get the descriptor from the device
    121                 int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone,
    122                     kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT,
    123                     0, i, kbd_dev->conf->interfaces[i].report_desc, length,
    124                     &actual_size);
    125 
    126                 if (rc != EOK) {
    127                         return rc;
    128                 }
    129 
    130                 assert(actual_size == length);
    131 
    132                 dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT,
    133                     kbd_dev->conf->interfaces[i].report_desc, length);
    134         }
    135 
     99static int usbkbd_parse_descriptors(usb_hid_dev_kbd_t *kbd_dev,
     100                                    const uint8_t *data, size_t size)
     101{
     102//      const uint8_t *pos = data;
     103       
     104//      // get the configuration descriptor (should be first)
     105//      if (*pos != sizeof(usb_standard_configuration_descriptor_t)
     106//          || *(pos + 1) != USB_DESCTYPE_CONFIGURATION) {
     107//              fprintf(stderr, "Wrong format of configuration descriptor");
     108//              return EINVAL;
     109//      }
     110       
     111//      usb_standard_configuration_descriptor_t config_descriptor;
     112//      memcpy(&config_descriptor, pos,
     113//          sizeof(usb_standard_configuration_descriptor_t));
     114//      pos += sizeof(usb_standard_configuration_descriptor_t);
     115       
     116//      // parse other descriptors
     117//      while (pos - data < size) {
     118//              //uint8_t desc_size = *pos;
     119//              uint8_t desc_type = *(pos + 1);
     120//              switch (desc_type) {
     121//              case USB_DESCTYPE_INTERFACE:
     122//                      break;
     123//              case USB_DESCTYPE_ENDPOINT:
     124//                      break;
     125//              case USB_DESCTYPE_HID:
     126//                      break;
     127//              case USB_DESCTYPE_HID_REPORT:
     128//                      break;
     129//              case USB_DESCTYPE_HID_PHYSICAL:
     130//                      break;
     131//              }
     132//      }
     133       
    136134        return EOK;
    137135}
    138136
    139 static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
    140 {
    141         // get the first configuration descriptor (TODO: parse also other!)
     137static int usbkbd_get_descriptors(usb_hid_dev_kbd_t *kbd_dev)
     138{
     139        // get the first configuration descriptor (TODO: or some other??)
    142140        usb_standard_configuration_descriptor_t config_desc;
    143141       
    … …  
    168166        }
    169167       
    170         kbd_dev->conf = (usb_hid_configuration_t *)calloc(1,
    171             sizeof(usb_hid_configuration_t));
    172         if (kbd_dev->conf == NULL) {
    173                 free(descriptors);
    174                 return ENOMEM;
    175         }
    176        
    177         rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
     168        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
    178169        free(descriptors);
    179         if (rc != EOK) {
    180                 printf("Problem with parsing standard descriptors.\n");
    181                 return rc;
    182         }
    183 
    184         // get and report descriptors
    185         rc = usbkbd_get_report_descriptor(kbd_dev);
    186         if (rc != EOK) {
    187                 printf("Problem with parsing HID REPORT descriptor.\n");
    188                 return rc;
    189         }
    190        
    191         usbkbd_print_config(kbd_dev->conf);
    192 
    193         /*
    194          * TODO:
    195          * 1) select one configuration (lets say the first)
    196          * 2) how many interfaces?? how to select one??
    197      *    ("The default setting for an interface is always alternate setting zero.")
    198          * 3) find endpoint which is IN and INTERRUPT (parse), save its number
    199      *    as the endpoint for polling
    200          */
    201        
    202         return EOK;
     170       
     171        return rc;
    203172}
    204173
    205174static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
    206175{
    207         usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1,
    208             sizeof(usb_hid_dev_kbd_t));
     176        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)malloc(
     177                        sizeof(usb_hid_dev_kbd_t));
    209178
    210179        if (kbd_dev == NULL) {
    … …  
    217186        // get phone to my HC and save it as my parent's phone
    218187        // TODO: maybe not a good idea if DDF will use parent_phone
    219         int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
    220         if (rc < 0) {
    221                 printf("Problem setting phone to HC.\n");
    222                 free(kbd_dev);
    223                 return NULL;
    224         }
    225 
    226         rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
    227         if (rc < 0) {
    228                 printf("Problem getting address of the device.\n");
    229                 free(kbd_dev);
    230                 return NULL;
    231         }
     188        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
     189
     190        kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
     191            dev);
    232192
    233193        // doesn't matter now that we have no address
    … …  
    248208         */
    249209
    250         // TODO: get descriptors, parse descriptors and save endpoints
    251         usbkbd_process_descriptors(kbd_dev);
     210        // TODO: get descriptors
     211        usbkbd_get_descriptors(kbd_dev);
     212        // TODO: parse descriptors and save endpoints
    252213
    253214        return kbd_dev;
    … …  
    257218                                        uint8_t *buffer, size_t actual_size)
    258219{
     220        /*
     221         * here, the parser will be called, probably with some callbacks
     222         * now only take last 6 bytes and process, i.e. send to kbd
     223         */
     224
    259225        usb_hid_report_in_callbacks_t *callbacks =
    260226            (usb_hid_report_in_callbacks_t *)malloc(
    … …  
    262228        callbacks->keyboard = usbkbd_process_keycodes;
    263229
    264         //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks,
    265         //    NULL);
    266         printf("Calling usb_hid_boot_keyboard_input_report()...\n)");
    267         usb_hid_boot_keyboard_input_report(buffer, actual_size, callbacks, NULL);
     230        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks,
     231            NULL);
    268232}
    269233
    270234static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
    271235{
    272         return;
    273        
    274236        int rc;
    275237        usb_handle_t handle;

  • uspace/drv/vhc/hcd.c

    r0a9ea4a r2f60e57d  
    116116        sleep(5);
    117117
    118         usb_dprintf_enable(NAME, -1);
     118        usb_dprintf_enable(NAME, 0);
    119119
    120120        printf(NAME ": virtual USB host controller driver.\n");

  • uspace/lib/usb/include/usb/classes/hid.h

    r0a9ea4a r2f60e57d  
    3939#include <driver.h>
    4040#include <usb/classes/hidparser.h>
    41 #include <usb/descriptor.h>
    4241
    4342/** USB/HID device requests. */
    … …  
    6463 */
    6564typedef struct {
    66         /** Type of class-specific descriptor (Report or Physical). */
    67         uint8_t type;
    68         /** Length of class-specific descriptor in bytes. */
    69         uint16_t length;
    70 } __attribute__ ((packed)) usb_standard_hid_class_descriptor_info_t;
     65        /** Type of class descriptor (Report or Physical). */
     66        uint8_t class_descriptor_type;
     67        /** Length of class descriptor. */
     68        uint16_t class_descriptor_length;
     69} __attribute__ ((packed)) usb_standard_hid_descriptor_class_item_t;
    7170
    7271/** Standard USB HID descriptor.
    … …  
    7473 * (See HID Specification, p.22)
    7574 *
    76  * It is actually only the "header" of the descriptor, it does not contain
    77  * the last two mandatory fields (type and length of the first class-specific
    78  * descriptor).
     75 * It is actually only the "header" of the descriptor, as it may have arbitrary
     76 * length if more than one class descritor is provided.
    7977 */
    8078typedef struct {
    81         /** Total size of this descriptor in bytes.
    82          *
    83          * This includes all class-specific descriptor info - type + length
    84          * for each descriptor.
    85          */
     79        /** Size of this descriptor in bytes. */
    8680        uint8_t length;
    8781        /** Descriptor type (USB_DESCTYPE_HID). */
    … …  
    9185        /** Country code of localized hardware. */
    9286        uint8_t country_code;
    93         /** Total number of class-specific (i.e. Report and Physical)
    94          * descriptors.
    95          *
    96          * @note There is always only one Report descriptor.
    97          */
    98         uint8_t class_desc_count;
    99         /** First mandatory class descriptor (Report) info. */
    100         usb_standard_hid_class_descriptor_info_t report_desc_info;
     87        /** Total number of class (i.e. Report and Physical) descriptors. */
     88        uint8_t class_count;
     89        /** First mandatory class descriptor info. */
     90        usb_standard_hid_descriptor_class_item_t class_descriptor;
    10191} __attribute__ ((packed)) usb_standard_hid_descriptor_t;
    10292
    103 /**
    104  *
    105  */
    106 typedef struct {
    107         usb_standard_interface_descriptor_t iface_desc;
    108         usb_standard_endpoint_descriptor_t *endpoints;
    109         usb_standard_hid_descriptor_t hid_desc;
    110         uint8_t *report_desc;
    111         //usb_standard_hid_class_descriptor_info_t *class_desc_info;
    112         //uint8_t **class_descs;
    113 } usb_hid_iface_t;
    114 
    115 /**
    116  *
    117  */
    118 typedef struct {
    119         usb_standard_configuration_descriptor_t config_descriptor;
    120         usb_hid_iface_t *interfaces;
    121 } usb_hid_configuration_t;
    12293
    12394/**
    … …  
    12899typedef struct {
    129100        device_t *device;
    130         usb_hid_configuration_t *conf;
    131101        usb_address_t address;
    132102        usb_endpoint_t poll_endpoint;
    … …  
    134104} usb_hid_dev_kbd_t;
    135105
    136 // TODO: more configurations!
    137 
    138106#endif
    139107/**

  • uspace/srv/devman/main.c

    r0a9ea4a r2f60e57d  
    479479        }
    480480
    481 //      printf(NAME ": devman_forward: forward connection to device %s to "
    482 //          "driver %s.\n", dev->pathname, driver->name);
     481        printf(NAME ": devman_forward: forward connection to device %s to "
     482            "driver %s.\n", dev->pathname, driver->name);
    483483        ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);
    484484}
Note: See TracChangeset for help on using the changeset viewer.