Changeset e3b5129 in mainline

Timestamp:

2011-04-12T19:00:00Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

11d2e96a, c7dd69d

Parents:

a6610d4

Message:

Report IDs in subdriver mappings, sample driver for Logitech kbd

Location:

uspace/drv/usbhid

Files:

• Makefile (modified) (1 diff)
• lgtch-ultrax/lgtch-ultrax.c (added)
• lgtch-ultrax/lgtch-ultrax.h (added)
• subdrivers.c (modified) (3 diffs)
• subdrivers.h (modified) (1 diff)
• usbhid.c (modified) (4 diffs)

uspace/drv/usbhid/Makefile

@@ -46 +46 @@
         generic/hiddev.c \
         mouse/mousedev.c \
+        lgtch-ultrax/lgtch-ultrax.c \
         $(STOLEN_LAYOUT_SOURCES)
 

uspace/drv/usbhid/subdrivers.c

@@ -37 +37 @@
 #include "usb/classes/hidut.h"
 
+#include "lgtch-ultrax/lgtch-ultrax.h"
+
 static usb_hid_subdriver_usage_t path_kbd[] = {
         {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {0, 0}
+};
+
+static usb_hid_subdriver_usage_t lgtch_path[] = {
+        {0xc, 0},
         {0, 0}
 };
@@ -45 +52 @@
         {
                 path_kbd,
+                -1,
                 USB_HID_PATH_COMPARE_END 
                 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
@@ -57 +65 @@
                 
         },
-        {NULL, 0, 0, 0, {NULL, NULL, NULL, NULL}}
+        {
+                lgtch_path,
+                1,
+                USB_HID_PATH_COMPARE_END 
+                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                0x046d,
+                0xc30e,
+                {
+                        .init = NULL,
+                        .deinit = NULL,
+                        .poll = usb_lgtch_polling_callback,
+                        .poll_end = NULL
+                }
+        },
+        {NULL, -1, 0, 0, 0, {NULL, NULL, NULL, NULL}}
 };
 

uspace/drv/usbhid/subdrivers.h

@@ -54 +54 @@
 typedef struct usb_hid_subdriver_mapping {
         const usb_hid_subdriver_usage_t *usage_path;
+        int report_id;
         int compare;
         uint16_t vendor_id;

uspace/drv/usbhid/usbhid.c

@@ -164 +164 @@
 
 static bool usb_hid_path_matches(usb_hid_dev_t *hid_dev, 
-    const usb_hid_subdriver_usage_t *path, int compare)
+    const usb_hid_subdriver_mapping_t *mapping)
 {
         assert(hid_dev != NULL);
-        assert(path != NULL);
+        assert(mapping != NULL);
         
         usb_hid_report_path_t *usage_path = usb_hid_report_path();
@@ -175 +175 @@
         }
         int i = 0;
-        while (path[i].usage != 0 || path[i].usage_page != 0) {
+        while (mapping->usage_path[i].usage != 0 
+            || mapping->usage_path[i].usage_page != 0) {
                 if (usb_hid_report_path_append_item(usage_path, 
-                    path[i].usage_page, path[i].usage) != EOK) {
+                    mapping->usage_path[i].usage_page, 
+                    mapping->usage_path[i].usage) != EOK) {
                         usb_log_debug("Failed to append to usage path.\n");
                         usb_hid_report_path_free(usage_path);
@@ -185 +187 @@
         }
         
+        if (mapping->report_id >= 0) {
+                usb_hid_report_path_set_report_id(usage_path, 
+                    mapping->report_id);
+        }
+        
         assert(hid_dev->parser != NULL);
         
-        usb_log_debug("Compare flags: %d\n", compare);
+        usb_log_debug("Compare flags: %d\n", mapping->compare);
         size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, 
-            compare);
+            mapping->compare);
         usb_log_debug("Size of the input report: %d\n", size);
         
@@ -273 +280 @@
                 if (mapping->usage_path != NULL) {
                         usb_log_debug("Comparing device against usage path.\n");
-                        if (usb_hid_path_matches(hid_dev, 
-                            mapping->usage_path, mapping->compare)) {
+                        if (usb_hid_path_matches(hid_dev, mapping)) {
                                 // does not matter if IDs were matched
                                 matched = true;