Changeset d59d0bb in mainline for uspace/lib/usbhid/include

Timestamp:

2011-05-12T09:16:30Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

97cb542

Parents:

9e195e2c (diff), 9be8669 (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:

Merged changes to HID parser from maklf

Location:

uspace/lib/usbhid/include/usb/classes

Files:

• hid_report_items.h (modified) (1 diff)
• hidparser.h (modified) (2 diffs)
• hidtypes.h (modified) (3 diffs)

uspace/lib/usbhid/include/usb/classes/hid_report_items.h

@@ -46 +46 @@
 #define USB_HID_ITEM_IS_LONG(data)      (data == 0xFE)
 
+
+/**
+ * Extended usage macros
+ */
+#define USB_HID_IS_EXTENDED_USAGE(usage)        ((usage & 0xFFFF0000) != 0)
+#define USB_HID_EXTENDED_USAGE_PAGE(usage)      ((usage & 0xFFFF0000) >> 16)
+#define USB_HID_EXTENDED_USAGE(usage)           (usage & 0xFFFF)
 
 /**

uspace/lib/usbhid/include/usb/classes/hidparser.h

@@ -51 +51 @@
                          size_t size, uint8_t *report_id);
 
-/** */
-size_t usb_hid_report_input_length(const usb_hid_report_t *report,
-        usb_hid_report_path_t *path, int flags);
-
 /*
  * Output report parser functions
@@ -65 +61 @@
 void usb_hid_report_output_free(uint8_t *output);
 
-/** Returns size of output for given usage path */
-size_t usb_hid_report_output_size(usb_hid_report_t *report,
-                                  usb_hid_report_path_t *path, int flags);
+/** Returns size of report in items */
+size_t usb_hid_report_size(usb_hid_report_t *report, uint8_t report_id, 
+                           usb_hid_report_type_t type);
 
 /** Makes the output report buffer by translated given data */

uspace/lib/usbhid/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;