Changeset 9e929a0 in mainline for uspace/drv/usbkbd/kbddev.c

Timestamp:

2011-04-29T14:07:23Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

0dea35f, 26f6094

Parents:

152ec79 (diff), f19f1b7 (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 development

File:

• uspace/drv/usbkbd/kbddev.c (modified) (12 diffs)

uspace/drv/usbkbd/kbddev.c

@@ -128 +128 @@
         0x15, 0x00,  //   Logical Minimum (0),
         0x25, 0x01,  //   Logical Maximum (1),
+        //0x85, 0x00,  //   Report ID,
+        //0xA4,      //   Push
         0x81, 0x02,  //   Input (Data, Variable, Absolute),   ; Modifier byte
-        0x95, 0x01,  //   Report Count (1),
-        0x75, 0x08,  //   Report Size (8),
+        //0xB4,      //   Pop
+        0x75, 0x08,  //   Report Size (1),
+        0x95, 0x01,  //   Report Count (8),       
         0x81, 0x01,  //   Input (Constant),                   ; Reserved byte
         0x95, 0x05,  //   Report Count (5),
@@ -268 +271 @@
                 return;
         }
-        
+
         unsigned i = 0;
         
@@ -290 +293 @@
         
         usb_log_debug("Creating output report.\n");
-        
-        int rc = usb_hid_report_output_translate(kbd_dev->parser, 
-            kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            kbd_dev->output_buffer, 
-            kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size);
+
+        usb_hid_report_output_set_data(kbd_dev->parser, kbd_dev->led_path, 
+                                       USB_HID_PATH_COMPARE_END , kbd_dev->led_data, 
+                                       kbd_dev->led_output_size);
+        int rc = usb_hid_report_output_translate(kbd_dev->parser, 0,
+            kbd_dev->output_buffer, kbd_dev->output_size);
         
         if (rc != EOK) {
@@ -563 +566 @@
         assert(kbd_dev != NULL);
 
-        usb_log_debug("Got keys from parser (report id: %u): %s\n", 
-            report_id, usb_debug_str_buffer(key_codes, count, 0));
+        usb_log_debug("Got keys from parser (report id: %d): %s\n", report_id, 
+            usb_debug_str_buffer(key_codes, count, 0));
         
         if (count != kbd_dev->key_count) {
@@ -614 +617 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
-        usb_hid_report_path_set_report_id(path, 0);
-        
-        int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
-            actual_size, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            callbacks, kbd_dev);
+
+        uint8_t report_id;
+        int rc = usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, &report_id);
+        usb_hid_descriptor_print (kbd_dev->parser);
 
         usb_hid_report_path_free (path);
@@ -663 +664 @@
         memset(kbd_dev, 0, sizeof(usb_kbd_t));
         
-        kbd_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
-            usb_hid_report_parser_t)));
+        kbd_dev->parser = (usb_hid_report_t *)(malloc(sizeof(
+            usb_hid_report_t)));
         if (kbd_dev->parser == NULL) {
                 usb_log_fatal("No memory!\n");
@@ -732 +733 @@
         
         /* Initialize the report parser. */
-        rc = usb_hid_parser_init(kbd_dev->parser);
-        if (rc != EOK) {
-                usb_log_error("Failed to initialize report parser.\n");
-                return rc;
-        }
+        //rc = usb_hid_parser_init(kbd_dev->parser);
+        //if (rc != EOK) {
+        //      usb_log_error("Failed to initialize report parser.\n");
+        //      return rc;
+        //}
         
         /* Get the report descriptor and parse it. */
@@ -771 +772 @@
         
         kbd_dev->key_count = usb_hid_report_input_length(
-            kbd_dev->parser, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
+            kbd_dev->parser, path, USB_HID_PATH_COMPARE_END);
         usb_hid_report_path_free (path);
         
@@ -789 +789 @@
         kbd_dev->output_size = 0;
         kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, 
-            &kbd_dev->output_size);
-        if (kbd_dev->output_buffer == NULL && kbd_dev->output_size != 0) {
+            &kbd_dev->output_size, 0x00);
+        if (kbd_dev->output_buffer == NULL) {
                 usb_log_warning("Error creating output report buffer.\n");
                 free(kbd_dev->keys);
@@ -801 +801 @@
         usb_hid_report_path_append_item(
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
+        usb_hid_report_path_set_report_id(kbd_dev->led_path, 0x00);
         
         kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, 
@@ -849 +850 @@
          * Set Idle rate
          */
-        usb_kbd_set_led(kbd_dev);
+        usb_kbd_set_led(kbd_dev);       
         
         usbhid_req_set_idle(&kbd_dev->usb_dev->ctrl_pipe, 
@@ -934 +935 @@
         // destroy the parser
         if ((*kbd_dev)->parser != NULL) {
-                usb_hid_free_report_parser((*kbd_dev)->parser);
+                usb_hid_free_report((*kbd_dev)->parser);
         }