Changeset df6ded8 in mainline for uspace/lib/usbhid/src/hiddescriptor.c

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

uspace/lib/usbhid/src/hiddescriptor.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Matej Klonfar
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -176 +177 @@
 
         if(report_item->usages_count > 0){
-                usages = malloc(sizeof(int32_t) * report_item->usages_count);
+                usages = malloc(sizeof(uint32_t) * report_item->usages_count);
                 memcpy(usages, report_item->usages, sizeof(int32_t) *
                                 report_item->usages_count); 
@@ -247 +248 @@
                 field->size = 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);
-                }
-
+                field->offset = report_item->offset + (i * report_item->size);
 
                 if(report->use_report_ids != 0) {
@@ -896 +883 @@
 {
         if(list == NULL || list_empty(list)) {
-            usb_log_debug("\tempty\n");
+            usb_log_debug("\tempty");
             return;
         }
@@ -902 +889 @@
         list_foreach(*list, ritems_link, usb_hid_report_field_t,
             report_item) {
-                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",
+                usb_log_debug("\t\tOFFSET: %u", report_item->offset);
+                usb_log_debug("\t\tSIZE: %zu", report_item->size);
+                usb_log_debug("\t\tLOGMIN: %d",
                         report_item->logical_minimum);
-                usb_log_debug("\t\tLOGMAX: %d\n",
+                usb_log_debug("\t\tLOGMAX: %d",
                         report_item->logical_maximum);
-                usb_log_debug("\t\tPHYMIN: %d\n",
+                usb_log_debug("\t\tPHYMIN: %d",
                         report_item->physical_minimum);
-                usb_log_debug("\t\tPHYMAX: %d\n",
+                usb_log_debug("\t\tPHYMAX: %d",
                         report_item->physical_maximum);
-                usb_log_debug("\t\ttUSAGEMIN: %X\n",
+                usb_log_debug("\t\ttUSAGEMIN: %X",
                         report_item->usage_minimum);
-                usb_log_debug("\t\tUSAGEMAX: %X\n",
+                usb_log_debug("\t\tUSAGEMAX: %X",
                                report_item->usage_maximum);
-                usb_log_debug("\t\tUSAGES COUNT: %zu\n",
+                usb_log_debug("\t\tUSAGES COUNT: %zu",
                         report_item->usages_count);
 
-                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_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_hid_print_usage_path(report_item->collection_path);
-
-                usb_log_debug("\n");
         }
 }
@@ -943 +928 @@
         list_foreach(report->reports, reports_link,
             usb_hid_report_description_t, report_des) {
-                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_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_hid_report_byte_size(report,
                                 report_des->report_id,
                                 report_des->type));
-                usb_log_debug("\tItems: %zu\n", report_des->item_length);
+                usb_log_debug("\tItems: %zu", report_des->item_length);
 
                 usb_hid_descriptor_print_list(&report_des->report_items);