Changeset ec6ab88 in mainline for uspace/lib/usb

Timestamp:

2010-12-12T12:27:46Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

a1ca50b3

Parents:

5174c62 (diff), 8365533 (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 lelian/hidd into development

Location:

uspace/lib/usb

Files:

• include/usb/classes/hid.h (modified) (2 diffs)
• include/usb/classes/hidparser.h (modified) (1 diff)
• src/hidparser.c (modified) (1 diff)

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;
 
+/**
+ * @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
 /**

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

@@ -50 +50 @@
          * @param arg Custom argument.
          */
-        void (*keyboard)(const uint32_t *key_codes, size_t count, void *arg);
+        void (*keyboard)(const uint16_t *key_codes, size_t count, void *arg);
 } usb_hid_report_in_callbacks_t;
 

uspace/lib/usb/src/hidparser.c

@@ -62 +62 @@
     const usb_hid_report_in_callbacks_t *callbacks, void *arg)
 {
-        return ENOTSUP;
+        int i;
+        
+        // TODO: parse report
+        
+        uint16_t keys[6];
+        
+        for (i = 0; i < 6; ++i) {
+                keys[i] = data[i];
+        }
+        
+        callbacks->keyboard(keys, 6, arg);
 }