Changeset c694b7e in mainline

Timestamp:

2010-12-12T16:38:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

ca038b4

Parents:

a3b1107

Message:

Structures for holding HID device configuration.

One structure for holding the configuration descriptor and

info about all interfaces (second structure).

Second structure for holding interface descriptor, and info

about it (list of endpoint descriptors, HID descriptors
and HID class-specific descriptors).

File:

• uspace/lib/usb/include/usb/classes/hid.h (modified) (5 diffs)

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. 
+         */
+        uint8_t class_desc_count;
+//      /** First mandatory class descriptor info. */
+//      usb_standard_hid_descriptor_class_item_t class_descriptor;
 } __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;
+        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 +125 @@
 typedef struct {
         device_t *device;
+        usb_hid_configuration_t *conf;
         usb_address_t address;
         usb_endpoint_t default_ep;