Changeset b65ca41d in mainline

Timestamp:

2011-01-14T14:34:32Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

192466bc, 64861b8

Parents:

7a725b13 (diff), 1d7a74e (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 with /usb/development (compilation fix)

Location:

uspace

Files:

• app/virtusbkbd/virtusbkbd.c (modified) (1 diff)
• drv/usbhub/usbhub.c (modified) (1 diff)
• drv/usbkbd/Makefile (modified) (1 diff)
• drv/usbkbd/descdump.c (added)
• drv/usbkbd/descdump.h (added)
• drv/usbkbd/descparser.c (added)
• drv/usbkbd/descparser.h (added)
• drv/usbkbd/main.c (modified) (8 diffs)
• drv/vhc/hcd.c (modified) (1 diff)
• lib/usb/include/usb/classes/hid.h (modified) (6 diffs)
• srv/devman/main.c (modified) (1 diff)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -271 +271 @@
         printf("%s: Simulating keyboard events...\n", NAME);
         fibril_sleep(10);
-        while (1) {
+        //while (1) {
                 kb_process_events(&status, keyboard_events, keyboard_events_count,
                         on_keyboard_change);
-        }
+        //}
         
         printf("%s: Terminating...\n", NAME);

uspace/drv/usbhub/usbhub.c

@@ -460 +460 @@
                 target.address = hub_info->usb_device->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
-                dprintf(1,"[usb_hub] checking changes for hub at addr %d",
-                    target.address);
+                /*dprintf(1,"[usb_hub] checking changes for hub at addr %d",
+                    target.address);*/
 
                 size_t port_count = hub_info->port_count;

uspace/drv/usbkbd/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        main.c
+        main.c \
+        descparser.c \
+        descdump.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/usbkbd/main.c

@@ -38 +38 @@
 #include <usb/devreq.h>
 #include <usb/descriptor.h>
+#include "descparser.h"
+#include "descdump.h"
 
 #define BUFFER_SIZE 32
@@ -88 +90 @@
  * Callbacks for parser
  */
-static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
-                                    void *arg)
-{
-
+static void usbkbd_process_keycodes(const uint8_t *key_codes, size_t count,
+                                    uint8_t modifiers, void *arg)
+{
+        printf("Got keys: ");
+        unsigned i;
+        for (i = 0; i < count; ++i) {
+                printf("%d ", key_codes[i]);
+        }
+        printf("\n");
 }
 
@@ -97 +104 @@
  * Kbd functions
  */
-static int usbkbd_parse_descriptors(usb_hid_dev_kbd_t *kbd_dev,
-                                    const uint8_t *data, size_t size)
-{
-//      const uint8_t *pos = data;
-        
-//      // get the configuration descriptor (should be first)
-//      if (*pos != sizeof(usb_standard_configuration_descriptor_t)
-//          || *(pos + 1) != USB_DESCTYPE_CONFIGURATION) {
-//              fprintf(stderr, "Wrong format of configuration descriptor");
-//              return EINVAL;
-//      }
-        
-//      usb_standard_configuration_descriptor_t config_descriptor;
-//      memcpy(&config_descriptor, pos, 
-//          sizeof(usb_standard_configuration_descriptor_t));
-//      pos += sizeof(usb_standard_configuration_descriptor_t);
-        
-//      // parse other descriptors
-//      while (pos - data < size) {
-//              //uint8_t desc_size = *pos;
-//              uint8_t desc_type = *(pos + 1);
-//              switch (desc_type) {
-//              case USB_DESCTYPE_INTERFACE:
-//                      break;
-//              case USB_DESCTYPE_ENDPOINT:
-//                      break;
-//              case USB_DESCTYPE_HID:
-//                      break;
-//              case USB_DESCTYPE_HID_REPORT:
-//                      break;
-//              case USB_DESCTYPE_HID_PHYSICAL:
-//                      break;
-//              }
-//      }
-        
+static int usbkbd_get_report_descriptor(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // iterate over all configurations and interfaces
+        // TODO: more configurations!!
+        unsigned i;
+        for (i = 0; i < kbd_dev->conf->config_descriptor.interface_count; ++i) {
+                // TODO: endianness
+                uint16_t length = 
+                    kbd_dev->conf->interfaces[i].hid_desc.report_desc_info.length;
+                size_t actual_size = 0;
+
+                // allocate space for the report descriptor
+                kbd_dev->conf->interfaces[i].report_desc = (uint8_t *)malloc(length);
+                
+                // get the descriptor from the device
+                int rc = usb_drv_req_get_descriptor(kbd_dev->device->parent_phone,
+                    kbd_dev->address, USB_REQUEST_TYPE_CLASS, USB_DESCTYPE_HID_REPORT, 
+                    0, i, kbd_dev->conf->interfaces[i].report_desc, length, 
+                    &actual_size);
+
+                if (rc != EOK) {
+                        return rc;
+                }
+
+                assert(actual_size == length);
+
+                dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
+                    kbd_dev->conf->interfaces[i].report_desc, length);
+        }
+
         return EOK;
 }
 
-static int usbkbd_get_descriptors(usb_hid_dev_kbd_t *kbd_dev)
-{
-        // get the first configuration descriptor (TODO: or some other??)
+static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // get the first configuration descriptor (TODO: parse also other!)
         usb_standard_configuration_descriptor_t config_desc;
         
@@ -166 +168 @@
         }
         
-        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
+        kbd_dev->conf = (usb_hid_configuration_t *)calloc(1, 
+            sizeof(usb_hid_configuration_t));
+        if (kbd_dev->conf == NULL) {
+                free(descriptors);
+                return ENOMEM;
+        }
+        
+        rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
         free(descriptors);
-        
-        return rc;
+        if (rc != EOK) {
+                printf("Problem with parsing standard descriptors.\n");
+                return rc;
+        }
+
+        // get and report descriptors
+        rc = usbkbd_get_report_descriptor(kbd_dev);
+        if (rc != EOK) {
+                printf("Problem with parsing HID REPORT descriptor.\n");
+                return rc;
+        }
+        
+        usbkbd_print_config(kbd_dev->conf);
+
+        /*
+         * TODO: 
+         * 1) select one configuration (lets say the first)
+         * 2) how many interfaces?? how to select one??
+     *    ("The default setting for an interface is always alternate setting zero.")
+         * 3) find endpoint which is IN and INTERRUPT (parse), save its number
+     *    as the endpoint for polling
+         */
+        
+        return EOK;
 }
 
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)malloc(
-                        sizeof(usb_hid_dev_kbd_t));
+        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
+            sizeof(usb_hid_dev_kbd_t));
 
         if (kbd_dev == NULL) {
@@ -186 +217 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
-
-        kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
-            dev);
+        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+        if (rc < 0) {
+                printf("Problem setting phone to HC.\n");
+                free(kbd_dev);
+                return NULL;
+        }
+
+        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
+        if (rc < 0) {
+                printf("Problem getting address of the device.\n");
+                free(kbd_dev);
+                return NULL;
+        }
 
         // doesn't matter now that we have no address
@@ -208 +248 @@
          */
 
-        // TODO: get descriptors
-        usbkbd_get_descriptors(kbd_dev);
-        // TODO: parse descriptors and save endpoints
+        // TODO: get descriptors, parse descriptors and save endpoints
+        usbkbd_process_descriptors(kbd_dev);
 
         return kbd_dev;
@@ -218 +257 @@
                                         uint8_t *buffer, size_t actual_size)
 {
-        /*
-         * here, the parser will be called, probably with some callbacks
-         * now only take last 6 bytes and process, i.e. send to kbd
-         */
-
         usb_hid_report_in_callbacks_t *callbacks =
             (usb_hid_report_in_callbacks_t *)malloc(
@@ -228 +262 @@
         callbacks->keyboard = usbkbd_process_keycodes;
 
-        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
-            NULL);
+        //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
+        //    NULL);
+        printf("Calling usb_hid_boot_keyboard_input_report()...\n)");
+        usb_hid_boot_keyboard_input_report(buffer, actual_size, callbacks, NULL);
 }
 
 static void usbkbd_poll_keyboard(usb_hid_dev_kbd_t *kbd_dev)
 {
+        return;
+        
         int rc;
         usb_handle_t handle;

uspace/drv/vhc/hcd.c

@@ -116 +116 @@
         sleep(5);
 
-        usb_dprintf_enable(NAME, 0);
+        usb_dprintf_enable(NAME, -1);
 
         printf(NAME ": virtual USB host controller driver.\n");

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

@@ -39 +39 @@
 #include <driver.h>
 #include <usb/classes/hidparser.h>
+#include <usb/descriptor.h>
 
 /** USB/HID device requests. */
@@ -63 +64 @@
  */
 typedef struct {
-        /** Type of class descriptor (Report or Physical). */
-        uint8_t class_descriptor_type;
-        /** Length of class descriptor. */
-        uint16_t class_descriptor_length;
-} __attribute__ ((packed)) usb_standard_hid_descriptor_class_item_t;
+        /** Type of class-specific descriptor (Report or Physical). */
+        uint8_t type;
+        /** Length of class-specific descriptor in bytes. */
+        uint16_t length;
+} __attribute__ ((packed)) usb_standard_hid_class_descriptor_info_t;
 
 /** Standard USB HID descriptor.
@@ -73 +74 @@
  * (See HID Specification, p.22)
  * 
- * It is actually only the "header" of the descriptor, as it may have arbitrary
- * length if more than one class descritor is provided.
+ * It is actually only the "header" of the descriptor, it does not contain
+ * the last two mandatory fields (type and length of the first class-specific
+ * descriptor).
  */
 typedef struct {
-        /** Size of this descriptor in bytes. */
+        /** Total size of this descriptor in bytes. 
+         *
+         * This includes all class-specific descriptor info - type + length 
+         * for each descriptor.
+         */
         uint8_t length;
         /** Descriptor type (USB_DESCTYPE_HID). */
@@ -85 +91 @@
         /** Country code of localized hardware. */
         uint8_t country_code;
-        /** Total number of class (i.e. Report and Physical) descriptors. */
-        uint8_t class_count;
-        /** First mandatory class descriptor info. */
-        usb_standard_hid_descriptor_class_item_t class_descriptor;
+        /** Total number of class-specific (i.e. Report and Physical) 
+         * descriptors. 
+         *
+         * @note There is always only one Report descriptor.
+         */
+        uint8_t class_desc_count;
+        /** First mandatory class descriptor (Report) info. */
+        usb_standard_hid_class_descriptor_info_t report_desc_info;
 } __attribute__ ((packed)) usb_standard_hid_descriptor_t;
 
+/**
+ *
+ */
+typedef struct {
+        usb_standard_interface_descriptor_t iface_desc;
+        usb_standard_endpoint_descriptor_t *endpoints;
+        usb_standard_hid_descriptor_t hid_desc;
+        uint8_t *report_desc;
+        //usb_standard_hid_class_descriptor_info_t *class_desc_info;
+        //uint8_t **class_descs;
+} usb_hid_iface_t;
+
+/**
+ *
+ */
+typedef struct {
+        usb_standard_configuration_descriptor_t config_descriptor;
+        usb_hid_iface_t *interfaces;
+} usb_hid_configuration_t;
 
 /**
@@ -99 +128 @@
 typedef struct {
         device_t *device;
+        usb_hid_configuration_t *conf;
         usb_address_t address;
         usb_endpoint_t poll_endpoint;
@@ -104 +134 @@
 } usb_hid_dev_kbd_t;
 
+// TODO: more configurations!
+
 #endif
 /**

uspace/srv/devman/main.c

@@ -479 +479 @@
         }
 
-        printf(NAME ": devman_forward: forward connection to device %s to "
-            "driver %s.\n", dev->pathname, driver->name);
+//      printf(NAME ": devman_forward: forward connection to device %s to "
+//          "driver %s.\n", dev->pathname, driver->name);
         ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);
 }