Changeset 0588062e in mainline for uspace/lib/usb/include/usb/classes/hidparser.h

Timestamp:

2011-03-03T18:56:11Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8e9becf6

Parents:

d3594362 (diff), e259d95 (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 branch maklf - basic HID report descriptor parser

File:

• uspace/lib/usb/include/usb/classes/hidparser.h (modified) (4 diffs)

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

@@ -37 +37 @@
 
 #include <stdint.h>
+#include <adt/list.h>
+#include <usb/classes/hid_report_items.h>
+
+/**
+ * Item prefix
+ */
+#define USB_HID_ITEM_SIZE(data)         ((uint8_t)(data & 0x3))
+#define USB_HID_ITEM_TAG(data)          ((uint8_t)((data & 0xF0) >> 4))
+#define USB_HID_ITEM_TAG_CLASS(data)    ((uint8_t)((data & 0xC) >> 2))
+#define USB_HID_ITEM_IS_LONG(data)      (data == 0xFE)
+
+
+/**
+ * Input/Output/Feature Item flags
+ */
+#define USB_HID_ITEM_FLAG_CONSTANT(flags)       (flags & 0x1)
+#define USB_HID_ITEM_FLAG_VARIABLE(flags)       (flags & 0x2)
+#define USB_HID_ITEM_FLAG_RELATIVE(flags)       (flags & 0x4)
+#define USB_HID_ITEM_FLAG_WRAP(flags)           (flags & 0x8)
+#define USB_HID_ITEM_FLAG_LINEAR(flags)         (flags & 0x10)
+#define USB_HID_ITEM_FLAG_PREFERRED(flags)      (flags & 0x20)
+#define USB_HID_ITEM_FLAG_POSITION(flags)       (flags & 0x40)
+#define USB_HID_ITEM_FLAG_VOLATILE(flags)       (flags & 0x80)
+#define USB_HID_ITEM_FLAG_BUFFERED(flags)       (flags & 0x100)
+
 
 /**
@@ -42 +67 @@
  */
 typedef struct {
+        int32_t id;
+        int32_t usage_page;
+        int32_t usage;  
+        int32_t usage_minimum;
+        int32_t usage_maximum;
+        int32_t logical_minimum;
+        int32_t logical_maximum;
+        int32_t size;
+        int32_t count;
+        int32_t offset;
 
-        uint8_t usage_min;
-        uint8_t usage_max;
-        uint8_t logical_min;
-        uint8_t logical_max;
-        uint8_t size;
-        uint8_t count;
-        uint8_t offset;
+        int32_t unit_exponent;
+        int32_t unit;
 
+        /*
+         * some not yet used fields
+         */
+        int32_t string_index;
+        int32_t string_minimum;
+        int32_t string_maximum;
+        int32_t designator_index;
+        int32_t designator_minimum;
+        int32_t designator_maximum;
+        int32_t physical_minimum;
+        int32_t physical_maximum;
+
+        uint8_t item_flags;
+
+        link_t link;
 } usb_hid_report_item_t;
 
 
 /** HID report parser structure. */
-typedef struct {
-} usb_hid_report_parser_t;
+typedef struct {        
+        link_t input;
+        link_t output;
+        link_t feature;
+} usb_hid_report_parser_t;      
+
 
 
@@ -127 +176 @@
 int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size);
 
+int usb_hid_parser_init(usb_hid_report_parser_t *parser);
 int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, 
     const uint8_t *data, size_t size);
@@ -135 +185 @@
 
 
-int usb_hid_free_report_parser(usb_hid_report_parser_t *parser);
+void usb_hid_free_report_parser(usb_hid_report_parser_t *parser);
+
+void usb_hid_descriptor_print(usb_hid_report_parser_t *parser);
 
 #endif