Changeset 777e336 in mainline

Timestamp:

2011-04-12T15:59:44Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7df6cd

Parents:

1cbb4b7

Message:

Minor changes in subdrivers API.

• Changed vendor ID and product ID to uint16_t
• Removed size of the path, ending with {0, 0}
• Named structure initialization for usb_hid_subdrivers()

Location:

uspace/drv/usbhid

Files:

• subdrivers.c (modified) (1 diff)
• subdrivers.h (modified) (1 diff)
• usbhid.c (modified) (5 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -37 +37 @@
 #include "usb/classes/hidut.h"
 
-static usb_hid_subdriver_usage_t path_kbd[] = {{USB_HIDUT_PAGE_KEYBOARD, 0}};
+static usb_hid_subdriver_usage_t path_kbd[] = {
+        {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {0, 0}
+};
 
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
         {
                 path_kbd,
-                1,
                 USB_HID_PATH_COMPARE_END 
                 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                NULL,
-                NULL,
+                0,
+                0,
                 {
-                        usb_kbd_init,
-                        usb_kbd_deinit,
-                        usb_kbd_polling_callback,
-                        NULL
+                        .init = usb_kbd_init,
+                        .deinit = usb_kbd_deinit,
+                        .poll = usb_kbd_polling_callback,
+                        .poll_end = NULL
                 },
                 
         },
-        {NULL, 0, 0, NULL, NULL, {NULL, NULL, NULL, NULL}}
+        {NULL, 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 path_size;
         int compare;
-        const char *vendor_id;
-        const char *product_id;
+        uint16_t vendor_id;
+        uint16_t product_id;
         usb_hid_subdriver_t subdriver;
 } usb_hid_subdriver_mapping_t;

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 path_size, int compare)
+    const usb_hid_subdriver_usage_t *path, int compare)
 {
         assert(hid_dev != NULL);
@@ -174 +174 @@
                 return false;
         }
-        int i;
-        for (i = 0; i < path_size; ++i) {
+        int i = 0;
+        while (path[i].usage != 0 || path[i].usage_page != 0) {
                 if (usb_hid_report_path_append_item(usage_path, 
                     path[i].usage_page, path[i].usage) != EOK) {
@@ -182 +182 @@
                         return false;
                 }
+                ++i;
         }
         
@@ -238 +239 @@
         while (count < USB_HID_MAX_SUBDRIVERS &&
             (mapping->usage_path != NULL
-            || mapping->vendor_id != NULL
-            || mapping->product_id != NULL)) {
+            || mapping->vendor_id != 0 || mapping->product_id != 0)) {
                 // check the vendor & product ID
-                if (mapping->vendor_id != NULL && mapping->product_id == NULL) {
-                        usb_log_warning("Missing Product ID for Vendor ID %s\n",
+                if (mapping->vendor_id != 0 && mapping->product_id == 0) {
+                        usb_log_warning("Missing Product ID for Vendor ID %u\n",
                             mapping->vendor_id);
                         return EINVAL;
                 }
-                if (mapping->product_id != NULL && mapping->vendor_id == NULL) {
-                        usb_log_warning("Missing Vendor ID for Product ID %s\n",
+                if (mapping->product_id != 0 && mapping->vendor_id == 0) {
+                        usb_log_warning("Missing Vendor ID for Product ID %u\n",
                             mapping->product_id);
                         return EINVAL;
                 }
                 
-                if (mapping->vendor_id != NULL) {
-                        assert(mapping->product_id != NULL);
-                        usb_log_debug("Comparing device against vendor ID %s"
-                            " and product ID %s.\n", mapping->vendor_id,
+                if (mapping->vendor_id != 0) {
+                        assert(mapping->product_id != 0);
+                        usb_log_debug("Comparing device against vendor ID %u"
+                            " and product ID %u.\n", mapping->vendor_id,
                             mapping->product_id);
                         if (usb_hid_ids_match(hid_dev, mapping)) {
@@ -268 +268 @@
                         usb_log_debug("Comparing device against usage path.\n");
                         if (usb_hid_path_matches(hid_dev, 
-                            mapping->usage_path, mapping->path_size,
-                            mapping->compare)) {
+                            mapping->usage_path, mapping->compare)) {
                                 subdrivers[count++] = &mapping->subdriver;
                         } else {