Changeset 1d7a74e in mainline for uspace/lib/usb/include/usb/classes/hid.h

Timestamp:

2011-01-14T14:31:58Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

192466bc, b65ca41d

Parents:

2f60e57d (diff), 0a9ea4a (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:

Merged lelian/hidd into development

File:

• uspace/lib/usb/include/usb/classes/hid.h (modified) (6 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. 
+         *
+         * @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
 /**