Changes in uspace/lib/usbhid/src/hiddescriptor.c [a1732929:3ca4ae9] in mainline

File:

• uspace/lib/usbhid/src/hiddescriptor.c (modified) (17 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <mem.h>
 #include <usb/debug.h>
 #include <assert.h>
+#include <stdlib.h>
 
 
@@ -75 +75 @@
 #define USB_HID_RESET_OFFSET    3
 
+#define USB_HID_INVALID                 -98
 /** Unknown tag was founded in report descriptor data*/
 #define USB_HID_UNKNOWN_TAG             -99
@@ -103 +104 @@
                 
                 if(usb_hid_report_compare_usage_path(path, cmp_path,
-                                        USB_HID_PATH_COMPARE_STRICT) == EOK){
+                                        USB_HID_PATH_COMPARE_STRICT) == 0){
                         break;
                 }
@@ -175 +176 @@
 
         if(report_item->usages_count > 0){
-                usages = malloc(sizeof(uint32_t) * report_item->usages_count);
+                usages = malloc(sizeof(int32_t) * report_item->usages_count);
                 memcpy(usages, report_item->usages, sizeof(int32_t) *
                                 report_item->usages_count); 
@@ -246 +247 @@
                 field->size = report_item->size;
 
-                field->offset = report_item->offset + (i * report_item->size);
+                if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
+                        int offset = report_item->offset + report_item->size * i;
+                        int field_offset = (offset/8)*8 + (offset/8 + 1) * 8 - 
+                                offset - report_item->size;
+                        if(field_offset < 0) {
+                                field->offset = 0;
+                        }
+                        else {
+                                field->offset = field_offset;
+                        }
+                }
+                else {
+                        field->offset = report_item->offset + (i * report_item->size);
+                }
+
 
                 if(report->use_report_ids != 0) {
@@ -539 +554 @@
 
                 if((ret=usb_hid_report_parse_main_tag(tag, data, item_size,
-                        report_item, usage_path)) == EOK) {
+                        report_item, usage_path)) == 0) {
 
                         return USB_HID_NEW_REPORT_ITEM;
@@ -570 +585 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 
@@ -585 +600 @@
         case USB_HID_REPORT_TAG_FEATURE:
                 report_item->item_flags = *data;                        
-                return EOK;                     
+                return 0;                       
                 break;
                         
@@ -625 +640 @@
         }
 
-        return EOK;
+        return 0;
 }
 
@@ -635 +650 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 int usb_hid_report_parse_global_tag(uint8_t tag, const uint8_t *data, 
@@ -711 +726 @@
         }
 
-        return EOK;
+        return 0;
 }
 
@@ -721 +736 @@
  * @param Length of data buffer
  * @param Current state table
- * @return Error code
+ * @return 0 or USB_HID_ code
  */
 int usb_hid_report_parse_local_tag(uint8_t tag, const uint8_t *data,
@@ -777 +792 @@
                             USB_HID_EXTENDED_USAGE_PAGE(
                             usb_hid_report_tag_data_uint32(data, item_size))) {
-                                return EINVAL;
+                                return USB_HID_INVALID;
                         }
                         
@@ -848 +863 @@
         }
         
-        return EOK;
+        return 0;
 }
 
@@ -881 +896 @@
 {
         if(list == NULL || list_empty(list)) {
-            usb_log_debug("\tempty");
+            usb_log_debug("\tempty\n");
             return;
         }
@@ -887 +902 @@
         list_foreach(*list, ritems_link, usb_hid_report_field_t,
             report_item) {
-                usb_log_debug("\t\tOFFSET: %u", report_item->offset);
-                usb_log_debug("\t\tSIZE: %zu", report_item->size);
-                usb_log_debug("\t\tLOGMIN: %d",
+                usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
+                usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
+                usb_log_debug("\t\tLOGMIN: %d\n",
                         report_item->logical_minimum);
-                usb_log_debug("\t\tLOGMAX: %d",
+                usb_log_debug("\t\tLOGMAX: %d\n",
                         report_item->logical_maximum);
-                usb_log_debug("\t\tPHYMIN: %d",
+                usb_log_debug("\t\tPHYMIN: %d\n",
                         report_item->physical_minimum);
-                usb_log_debug("\t\tPHYMAX: %d",
+                usb_log_debug("\t\tPHYMAX: %d\n",
                         report_item->physical_maximum);
-                usb_log_debug("\t\ttUSAGEMIN: %X",
+                usb_log_debug("\t\ttUSAGEMIN: %X\n",
                         report_item->usage_minimum);
-                usb_log_debug("\t\tUSAGEMAX: %X",
+                usb_log_debug("\t\tUSAGEMAX: %X\n",
                                report_item->usage_maximum);
-                usb_log_debug("\t\tUSAGES COUNT: %zu",
+                usb_log_debug("\t\tUSAGES COUNT: %zu\n",
                         report_item->usages_count);
 
-                usb_log_debug("\t\tVALUE: %X", report_item->value);
-                usb_log_debug("\t\ttUSAGE: %X", report_item->usage);
-                usb_log_debug("\t\tUSAGE PAGE: %X", report_item->usage_page);
+                usb_log_debug("\t\tVALUE: %X\n", report_item->value);
+                usb_log_debug("\t\ttUSAGE: %X\n", report_item->usage);
+                usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page);
 
                 usb_hid_print_usage_path(report_item->collection_path);
+
+                usb_log_debug("\n");
         }
 }
@@ -926 +943 @@
         list_foreach(report->reports, reports_link,
             usb_hid_report_description_t, report_des) {
-                usb_log_debug("Report ID: %d", report_des->report_id);
-                usb_log_debug("\tType: %d", report_des->type);
-                usb_log_debug("\tLength: %zu", report_des->bit_length);
-                usb_log_debug("\tB Size: %zu",
+                usb_log_debug("Report ID: %d\n", report_des->report_id);
+                usb_log_debug("\tType: %d\n", report_des->type);
+                usb_log_debug("\tLength: %zu\n", report_des->bit_length);
+                usb_log_debug("\tB Size: %zu\n",
                         usb_hid_report_byte_size(report,
                                 report_des->report_id,
                                 report_des->type));
-                usb_log_debug("\tItems: %zu", report_des->item_length);
+                usb_log_debug("\tItems: %zu\n", report_des->item_length);
 
                 usb_hid_descriptor_print_list(&report_des->report_items);