Changeset 20a3465 in mainline for uspace/drv/bus/usb/usbhid/subdrivers.h

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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:

Merge mainline changes

File:

• uspace/drv/bus/usb/usbhid/subdrivers.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/subdrivers.h

@@ -64 +64 @@
          */
         const usb_hid_subdriver_usage_t *usage_path;
-        
+
         /** Report ID for which the path should apply. */
         int report_id;
-        
+
         /** Compare type for the Usage path. */
         int compare;
-        
+
         /** Vendor ID (set to -1 if not specified). */
         int vendor_id;
-        
+
         /** Product ID (set to -1 if not specified). */
         int product_id;
-        
+
         /** Subdriver for controlling this device. */
-        usb_hid_subdriver_t subdriver;
+        const usb_hid_subdriver_t subdriver;
 } usb_hid_subdriver_mapping_t;
 
@@ -84 +84 @@
 
 extern const usb_hid_subdriver_mapping_t usb_hid_subdrivers[];
+extern const int USB_HID_MAX_SUBDRIVERS;
 
 /*----------------------------------------------------------------------------*/