Changeset a822cd8 in mainline for uspace/lib/usb

Timestamp:

2010-12-12T14:16:57Z (15 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/

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) (3 diffs)
• src/usbdrvreq.c (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
 /**

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;
 
 int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, 
-    const uint8_t *data);
+    const uint8_t *data, size_t size);
 
 int usb_hid_parse_report(const usb_hid_report_parser_t *parser,  
-    const uint8_t *data,
+    const uint8_t *data, size_t size,
     const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 

uspace/lib/usb/src/hidparser.c

@@ -40 +40 @@
  * @param parser Opaque HID report parser structure.
  * @param data Data describing the report.
+ * @param size Size of the descriptor in bytes.
  * @return Error code.
  */
 int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, 
-    const uint8_t *data)
+    const uint8_t *data, size_t size)
 {
         return ENOTSUP;
@@ -54 +55 @@
  * @param parser Opaque HID report parser structure.
  * @param data Data for the report.
+ * @param size Size of the data in bytes.
  * @param callbacks Callbacks for report actions.
  * @param arg Custom argument (passed through to the callbacks).
@@ -59 +61 @@
  */
 int usb_hid_parse_report(const usb_hid_report_parser_t *parser,  
-    const uint8_t *data,
+    const uint8_t *data, size_t size,
     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);
+        
+        return EOK;
 }
 

uspace/lib/usb/src/usbdrvreq.c

@@ -162 +162 @@
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .index = 0,
-                .length = sizeof(usb_standard_device_descriptor_t)
+                .length = sizeof(usb_standard_configuration_descriptor_t)
         };
         setup_packet.value_high = USB_DESCTYPE_CONFIGURATION;
@@ -225 +225 @@
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .index = 0,
-                .length = sizeof(usb_standard_device_descriptor_t)
+                .length = buffer_size
         };
         setup_packet.value_high = USB_DESCTYPE_CONFIGURATION;