Changeset c32688d in mainline

Timestamp:

2011-03-12T11:30:14Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

361e61b, bb41b85

Parents:

33382a9

Message:

bitmap translation

Location:

uspace/lib/usb

Files:

• include/usb/classes/hidparser.h (modified) (1 diff)
• src/hidparser.c (modified) (5 diffs)

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

@@ -52 +52 @@
  * Input/Output/Feature Item flags
  */
-#define USB_HID_ITEM_FLAG_CONSTANT(flags)       (flags & 0x1)
-#define USB_HID_ITEM_FLAG_VARIABLE(flags)       (flags & 0x2)
-#define USB_HID_ITEM_FLAG_RELATIVE(flags)       (flags & 0x4)
-#define USB_HID_ITEM_FLAG_WRAP(flags)           (flags & 0x8)
-#define USB_HID_ITEM_FLAG_LINEAR(flags)         (flags & 0x10)
-#define USB_HID_ITEM_FLAG_PREFERRED(flags)      (flags & 0x20)
-#define USB_HID_ITEM_FLAG_POSITION(flags)       (flags & 0x40)
-#define USB_HID_ITEM_FLAG_VOLATILE(flags)       (flags & 0x80)
-#define USB_HID_ITEM_FLAG_BUFFERED(flags)       (flags & 0x100)
+/** Constant (1) / Variable (0) */
+#define USB_HID_ITEM_FLAG_CONSTANT(flags)       ((flags & 0x1) == 0x1)
+/** Variable (1) / Array (0) */
+#define USB_HID_ITEM_FLAG_VARIABLE(flags)       ((flags & 0x2) == 0x2)
+/** Absolute / Relative*/
+#define USB_HID_ITEM_FLAG_RELATIVE(flags)       ((flags & 0x4) == 0x4)
+/** Wrap / No Wrap */
+#define USB_HID_ITEM_FLAG_WRAP(flags)           ((flags & 0x8) == 0x8)
+#define USB_HID_ITEM_FLAG_LINEAR(flags)         ((flags & 0x10) == 0x10)
+#define USB_HID_ITEM_FLAG_PREFERRED(flags)      ((flags & 0x20) == 0x20)
+#define USB_HID_ITEM_FLAG_POSITION(flags)       ((flags & 0x40) == 0x40)
+#define USB_HID_ITEM_FLAG_VOLATILE(flags)       ((flags & 0x80) == 0x80)
+#define USB_HID_ITEM_FLAG_BUFFERED(flags)       ((flags & 0x100) == 0x100)
 
 

uspace/lib/usb/src/hidparser.c

@@ -178 +178 @@
                                         }
                                         memcpy(new_report_item,report_item, sizeof(usb_hid_report_item_t));
+                                        /* reset local items */
+                                        new_report_item->usage_minimum = 0;
+                                        new_report_item->usage_maximum = 0;
+                                        
                                         link_initialize(&(new_report_item->link));
                                         report_item = new_report_item;
@@ -501 +505 @@
                 usb_log_debug("\tCOUNT: %X\n", report_item->count);
                 usb_log_debug("\tSIZE: %X\n", report_item->size);
-                usb_log_debug("\tCONSTANT: %X\n", USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags));
+                usb_log_debug("\tCONSTANT/VAR: %X\n", USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags));
+                usb_log_debug("\tVARIABLE/ARRAY: %X\n", USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags));
                 usb_log_debug("\tUSAGE: %X\n", report_item->usage);
                 usb_log_debug("\tUSAGE PAGE: %X\n", report_item->usage_page);
@@ -508 +513 @@
                 usb_log_debug("\tPHYMIN: %X\n", report_item->physical_minimum);         
                 usb_log_debug("\tPHYMAX: %X\n", report_item->physical_maximum);                         
+                usb_log_debug("\tUSAGEMIN: %X\n", report_item->usage_minimum);
+                usb_log_debug("\tUSAGEMAX: %X\n", report_item->usage_maximum);
+                
                 usb_log_debug("\n");            
 
@@ -602 +610 @@
         usb_hid_report_item_t *item;
         uint8_t *keys;
+        uint8_t item_value;
         size_t key_count=0;
         size_t i=0;
@@ -621 +630 @@
                 item = list_get_instance(list_item, usb_hid_report_item_t, link);
                 if(!USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) &&
-                   (item->usage_page == BAD_HACK_USAGE_PAGE)) {
+                   (item->usage_page == path.usage_page)) {
                         for(j=0; j<(size_t)(item->count); j++) {
-                                keys[i++] = usb_hid_translate_data(item, data,j);
+                                if((USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) ||
+                                   ((item->usage_minimum == 0) && (item->usage_maximum == 0))) {
+                                        // variable item
+                                        keys[i++] = usb_hid_translate_data(item, data,j);
+                                }
+                                else {
+                                        // bitmapa
+                                        if((item_value = usb_hid_translate_data(item, data, j)) != 0) {
+                                                keys[i++] = j + item->usage_minimum;
+                                        }
+                                        else {
+                                                keys[i++] = 0;
+                                        }
+                                }
                         }
                 }