Changes in uspace/lib/usb/include/usb/classes/hid.h [c694b7e:1b29d6fa] in mainline

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. */
@@ -64 +63 @@
  */
 typedef struct {
-        /** 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;
+        /** 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;
 
 /** Standard USB HID descriptor.
@@ -74 +73 @@
  * (See HID Specification, p.22)
  * 
- * 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).
+ * It is actually only the "header" of the descriptor, as it may have arbitrary
+ * length if more than one class descritor is provided.
  */
 typedef struct {
-        /** Total size of this descriptor in bytes. 
-         *
-         * This includes all class-specific descriptor info - type + length 
-         * for each descriptor.
-         */
+        /** Size of this descriptor in bytes. */
         uint8_t length;
         /** Descriptor type (USB_DESCTYPE_HID). */
@@ -91 +85 @@
         /** Country code of localized hardware. */
         uint8_t country_code;
-        /** 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;
+        /** 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;
 } __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;
 
 /**
@@ -125 +99 @@
 typedef struct {
         device_t *device;
-        usb_hid_configuration_t *conf;
         usb_address_t address;
-        usb_endpoint_t default_ep;
+        usb_endpoint_t poll_endpoint;
         usb_hid_report_parser_t *parser;
 } usb_hid_dev_kbd_t;