Changeset cc5908e in mainline for uspace/lib/usb/include/usb/classes/hidtypes.h

Timestamp:

2011-05-07T14:28:51Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

252cf2a, 68b614e

Parents:

bd2394b (diff), 7205209 (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:

Development changes merged

File:

• uspace/lib/usb/include/usb/classes/hidtypes.h (modified) (3 diffs)

uspace/lib/usb/include/usb/classes/hidtypes.h

@@ -39 +39 @@
 #include <adt/list.h>
 
-#define USB_HID_MAX_USAGES      20
+#define USB_HID_MAX_USAGES      0xffff
 
 #define USB_HID_UINT32_TO_INT32(x, size)        ((((x) & (1 << ((size) - 1))) != 0) ? -(~(x - 1) & ((1 << size) - 1)) : (x)) //(-(~((x) - 1)))
@@ -92 +92 @@
         int32_t physical_minimum;
         int32_t physical_maximum;
-        uint32_t usage_minimum;
-        uint32_t usage_maximum;
+        int32_t usage_minimum;
+        int32_t usage_maximum;
         uint32_t unit;
         uint32_t unit_exponent;
-        
+
+        uint32_t *usages;
+        size_t usages_count;
 
         int32_t value;
@@ -121 +123 @@
 
         /** */  
-        uint32_t usage_minimum;
-        /** */  
-        uint32_t usage_maximum;
+        int32_t usage_minimum;
+        /** */  
+        int32_t usage_maximum;
         /** */  
         int32_t logical_minimum;