Changeset 63517c2 in mainline for uspace/drv/usbhid

Timestamp:

2011-04-21T08:33:44Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

020559c9

Parents:

da1dd48 (diff), e50cd7f (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 to HID parser (report structure)

Location:

uspace/drv/usbhid

Files:

• kbd/kbddev.c (modified) (3 diffs)
• lgtch-ultrax/lgtch-ultrax.c (modified) (1 diff)
• usbhid.c (modified) (3 diffs)
• usbhid.h (modified) (1 diff)

uspace/drv/usbhid/kbd/kbddev.c

@@ -320 +320 @@
         // TODO: COMPOSE and KANA
         
-        usb_log_debug("Creating output report.\n");
-        
-        int rc = usb_hid_report_output_translate(hid_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_log_debug("Creating output report: %s\n", usb_debug_str_buffer ((uint8_t *)kbd_dev->led_data, kbd_dev->led_output_size * 4, 0));
+
+        usb_hid_report_output_set_data(hid_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(hid_dev->parser, 0,
+            kbd_dev->output_buffer, kbd_dev->output_size);
         
         if (rc != EOK) {
@@ -649 +649 @@
         //usb_hid_report_path_set_report_id(path, 0);
         
-        int rc = usb_hid_parse_report(hid_dev->parser, buffer,
-            actual_size, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            &usb_kbd_parser_callbacks, hid_dev);
-
+        int rc = usb_hid_parse_report(hid_dev->parser, buffer, actual_size);    
+        usb_hid_report_field_t *field = usb_hid_report_get_sibling(hid_dev->parser, 
+                            NULL, path, USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+                                                USB_HID_REPORT_TYPE_INPUT);
+        
+        while(field != NULL) {
+                usb_log_debug("FIELD (%X) - VALUE(%X) USAGE(%X)\n", field, field->value, field->usage);
+                field = usb_hid_report_get_sibling(hid_dev->parser, field, path, 
+                                                   USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+                                                   USB_HID_REPORT_TYPE_INPUT);
+        }
+                
+        
         usb_hid_report_path_free(path);
         
@@ -766 +774 @@
         kbd_dev->output_size = 0;
         kbd_dev->output_buffer = usb_hid_report_output(hid_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);
-                free(kbd_dev);
-                return ENOMEM;
+                return ENOMEM;  /* TODO: other error code */
         }
         

uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

@@ -81 +81 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, 0xc, 0);
-        usb_hid_report_path_set_report_id(path, 1);
+        usb_hid_report_path_set_report_id(path, 0);
         
-        int rc = usb_hid_parse_report(hid_dev->parser, buffer,
-            buffer_size, path, 
-            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            &usb_lgtch_parser_callbacks, hid_dev);
+        int rc = usb_hid_parse_report(hid_dev->parser, buffer, buffer_size);
+
+        usb_hid_report_field_t *field = usb_hid_report_get_sibling(hid_dev->parser, NULL, path, USB_HID_PATH_COMPARE_END , USB_HID_REPORT_TYPE_INPUT);
+        while(field != NULL) {
+                usb_log_debug("KEY VALUE(%X) USAGE(%X)\n", field->value, field->usage);
+        }
+        
 
         usb_hid_report_path_free(path);

uspace/drv/usbhid/usbhid.c

@@ -341 +341 @@
         }
         
-        hid_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
-            usb_hid_report_parser_t)));
+        hid_dev->parser = (usb_hid_report_t *)(malloc(sizeof(
+            usb_hid_report_t)));
         if (hid_dev->parser == NULL) {
                 usb_log_fatal("No memory!\n");
@@ -382 +382 @@
                 return rc;
         }
-        
-        /* Initialize the report parser. */
-        rc = usb_hid_parser_init(hid_dev->parser);
-        if (rc != EOK) {
-                usb_log_error("Failed to initialize report parser.\n");
-                //usb_hid_free(&hid_dev);
-                return rc;
-        }
-        
+                
         /* Get the report descriptor and parse it. */
         rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, 
@@ -592 +584 @@
         // destroy the parser
         if ((*hid_dev)->parser != NULL) {
-                usb_hid_free_report_parser((*hid_dev)->parser);
+                usb_hid_free_report((*hid_dev)->parser);
         }
 

uspace/drv/usbhid/usbhid.h

@@ -91 +91 @@
         
         /** HID Report parser. */
-        usb_hid_report_parser_t *parser;
+        usb_hid_report_t *parser;
         
         /** Arbitrary data (e.g. a special structure for handling keyboard). */