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

Timestamp:

2010-12-12T14:16:57Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1f3158c, c9113d2

Parents:

a59cdd2 (diff), 0c05496 (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 development changes/

File:

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

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

@@ -36 +36 @@
 #define LIBUSB_HID_H_
 
+#include <usb/usb.h>
+#include <driver.h>
+#include <usb/classes/hidparser.h>
+
 /** USB/HID device requests. */
 typedef enum {
@@ -54 +58 @@
 } usb_hid_protocol_t;
 
+/** Part of standard USB HID descriptor specifying one class descriptor.
+ *
+ * (See HID Specification, p.22)
+ */
+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;
+
+/** Standard USB HID descriptor.
+ *
+ * (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.
+ */
+typedef struct {
+        /** Size of this descriptor in bytes. */
+        uint8_t length;
+        /** Descriptor type (USB_DESCTYPE_HID). */
+        uint8_t descriptor_type;
+        /** HID Class Specification release. */
+        uint16_t spec_release;
+        /** 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;
+} __attribute__ ((packed)) usb_standard_hid_descriptor_t;
+
+
+/**
+ * @brief USB/HID keyboard device type.
+ *
+ * Quite dummy right now.
+ */
+typedef struct {
+        device_t *device;
+        usb_address_t address;
+        usb_endpoint_t default_ep;
+        usb_hid_report_parser_t *parser;
+} usb_hid_dev_kbd_t;
+
 #endif
 /**