Changeset 19a1800 in mainline for uspace/lib/usb/include/usb/classes/hidparser.h

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 with the current development

File:

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

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

@@ -37 +37 @@
 
 #include <stdint.h>
-#include <adt/list.h>
-
-#include <hid_report_items.h>
 
 /**
- * Items prefix
+ * Item prefix
  */
 #define USB_HID_ITEM_SIZE(data)         ((uint8_t)(data & 0x3))
@@ -62 +59 @@
 #define USB_HID_ITEM_FLAG_VOLATILE(flags)       (flags & 0x80)
 #define USB_HID_ITEM_FLAG_BUFFERED(flags)       (flags & 0x100)
-
-
-/**
- * Collection Item Types
- */
-#define USB_HID_COLLECTION_TYPE_PHYSICAL                0x00
-#define USB_HID_COLLECTION_TYPE_APPLICATION             0x01
-#define USB_HID_COLLECTION_TYPE_LOGICAL                 0x02
-#define USB_HID_COLLECTION_TYPE_REPORT                  0x03
-#define USB_HID_COLLECTION_TYPE_NAMED_ARRAY             0x04
-#define USB_HID_COLLECTION_TYPE_USAGE_SWITCH    0x05
-
-/*
- * modifiers definitions
- */
-#define USB_HID_BOOT_KEYBOARD_NUM_LOCK          0x01
-#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK         0x02
-#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK       0x04
-#define USB_HID_BOOT_KEYBOARD_COMPOSE           0x08
-#define USB_HID_BOOT_KEYBOARD_KANA                      0x10
 
 
@@ -128 +105 @@
 
 
+
 /** HID parser callbacks for IN items. */
 typedef struct {
@@ -139 +117 @@
 } usb_hid_report_in_callbacks_t;
 
+
+typedef enum {
+        USB_HID_MOD_LCTRL = 0x01,
+        USB_HID_MOD_LSHIFT = 0x02,
+        USB_HID_MOD_LALT = 0x04,
+        USB_HID_MOD_LGUI = 0x08,
+        USB_HID_MOD_RCTRL = 0x10,
+        USB_HID_MOD_RSHIFT = 0x20,
+        USB_HID_MOD_RALT = 0x40,
+        USB_HID_MOD_RGUI = 0x80,
+        USB_HID_MOD_COUNT = 8
+} usb_hid_modifiers_t;
+
+typedef enum {
+        USB_HID_LED_NUM_LOCK = 0x1,
+        USB_HID_LED_CAPS_LOCK = 0x2,
+        USB_HID_LED_SCROLL_LOCK = 0x4,
+        USB_HID_LED_COMPOSE = 0x8,
+        USB_HID_LED_KANA = 0x10,
+        USB_HID_LED_COUNT = 5
+} usb_hid_led_t;
+
+static const usb_hid_modifiers_t 
+    usb_hid_modifiers_consts[USB_HID_MOD_COUNT] = {
+        USB_HID_MOD_LCTRL,
+        USB_HID_MOD_LSHIFT,
+        USB_HID_MOD_LALT,
+        USB_HID_MOD_LGUI,
+        USB_HID_MOD_RCTRL,
+        USB_HID_MOD_RSHIFT,
+        USB_HID_MOD_RALT,
+        USB_HID_MOD_RGUI
+};
+
+//static const usb_hid_led_t usb_hid_led_consts[USB_HID_LED_COUNT] = {
+//      USB_HID_LED_NUM_LOCK,
+//      USB_HID_LED_CAPS_LOCK,
+//      USB_HID_LED_SCROLL_LOCK,
+//      USB_HID_LED_COMPOSE,
+//      USB_HID_LED_KANA
+//};
+
+//#define USB_HID_BOOT_KEYBOARD_NUM_LOCK                0x01
+//#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK               0x02
+//#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK     0x04
+//#define USB_HID_BOOT_KEYBOARD_COMPOSE         0x08
+//#define USB_HID_BOOT_KEYBOARD_KANA                    0x10
+
+/*
+ * modifiers definitions
+ */
+
 int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size,
         const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 
 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);
@@ -157 +186 @@
 
 void usb_hid_descriptor_print(usb_hid_report_parser_t *parser);
+
 #endif
 /**