Changeset 7fc092a in mainline for uspace/lib/usb/include/usb/classes/hidparser.h

Timestamp:

2011-01-27T22:09:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

db7ed07

Parents:

9ee87f6 (diff), 6265a2b (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:

Changes from development branch

File:

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

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -38 +38 @@
 #include <stdint.h>
 
+/**
+ * Description of report items
+ */
+typedef struct {
+
+        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;
+
+} usb_hid_report_item_t;
+
+
 /** HID report parser structure. */
 typedef struct {
 } usb_hid_report_parser_t;
+
 
 /** HID parser callbacks for IN items. */
@@ -50 +67 @@
          * @param arg Custom argument.
          */
-        void (*keyboard)(const uint16_t *key_codes, size_t count, void *arg);
+        void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t modifiers, void *arg);
 } usb_hid_report_in_callbacks_t;
+
+#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_parse_report_descriptor(usb_hid_report_parser_t *parser, 
@@ -60 +92 @@
     const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 
+
+int usb_hid_free_report_parser(usb_hid_report_parser_t *parser);
+
 #endif
 /**