Changeset 72d120e in mainline for uspace/drv/bus/usb/usbhid/subdrivers.h

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

File:

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

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

@@ -40 +40 @@
 #include "kbd/kbddev.h"
 
-
-
 typedef struct usb_hid_subdriver_usage {
         int usage_page;
@@ -47 +45 @@
 } usb_hid_subdriver_usage_t;
 
-
-
-/** Structure representing the mapping between device requirements and the 
+/** Structure representing the mapping between device requirements and the
  *  subdriver supposed to handle this device.
  *
@@ -55 +51 @@
  * a new subdriver mapping will be created and used by the HID driver when it
  * searches for appropriate subdrivers for a device.
+ *
  */
 typedef struct usb_hid_subdriver_mapping {
-        /** Usage path that the device's Input reports must contain. 
+        /** Usage path that the device's input reports must contain.
          *
          * It is an array of pairs <usage_page, usage>, terminated by a <0, 0>
@@ -64 +61 @@
          */
         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. */
+        
+        /** 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. */
         const usb_hid_subdriver_t subdriver;
 } usb_hid_subdriver_mapping_t;
 
-
-
 extern const usb_hid_subdriver_mapping_t usb_hid_subdrivers[];
 extern const size_t USB_HID_MAX_SUBDRIVERS;
-
-
 
 #endif /* USB_HID_SUBDRIVERS_H_ */