Changeset acdbd780 in mainline for uspace/lib

Timestamp:

2011-05-06T07:51:28Z (15 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

10849ffc, 3b5d5b9d

Parents:

b9d7965 (diff), 054537b (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 merge

Location:

uspace/lib

Files:

• drv/include/usbhid_iface.h (modified) (1 diff)
• usb/include/usb/classes/hidut.h (modified) (1 diff)
• usb/src/hiddescriptor.c (modified) (2 diffs)

uspace/lib/drv/include/usbhid_iface.h

@@ -72 +72 @@
 /** USB HID device communication interface. */
 typedef struct {
-        /** Get number of items in the event.
+        /** Get size of the event in bytes.
          *
          * @param[in] fun DDF function answering the request.
          * @return Number of events or error code.
          */
-        int (*get_event_length)(ddf_fun_t *fun);
+        size_t (*get_event_length)(ddf_fun_t *fun);
 
         /** Get single event from the HID device.
          *
          * @param[in] fun DDF function answering the request.
-         * @param[out] usage_page Array of usage pages and usages.
-         * @param[out] usage Array of data (1:1 with @p usage).
-         * @param[in] size Size of @p usage and @p data arrays.
+         * @param[out] buffer Buffer with raw data from the device.
          * @param[out] act_size Actual number of returned events.
          * @param[in] flags Flags (see USBHID_IFACE_FLAG_*).
          * @return Error code.
          */
-        int (*get_event)(ddf_fun_t *fun,
-            uint16_t *usage_page, uint16_t *usage, size_t size, size_t *act_size,
-            unsigned int flags);
+        int (*get_event)(ddf_fun_t *fun, int32_t *buffer, size_t size,
+            size_t *act_size, unsigned int flags);
 } usbhid_iface_t;
 

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

@@ -59 +59 @@
         USB_HIDUT_USAGE_GENERIC_DESKTOP_GAMEPAD = 5,
         USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD = 6,
-        USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYPAD = 7,
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_X = 0x30,
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_Y = 0x31,
+        USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL = 0x38
         /* USB_HIDUT_USAGE_GENERIC_DESKTOP_ = , */
         

uspace/lib/usb/src/hiddescriptor.c

@@ -640 +640 @@
 
                 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
-                usb_log_debug("\t\tSIZE: %X\n", report_item->size);                             
+                usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
                 usb_log_debug("\t\tLOGMIN: %d\n", report_item->logical_minimum);
                 usb_log_debug("\t\tLOGMAX: %d\n", report_item->logical_maximum);                
@@ -679 +679 @@
                 usb_log_debug("Report ID: %d\n", report_des->report_id);
                 usb_log_debug("\tType: %d\n", report_des->type);
-                usb_log_debug("\tLength: %d\n", report_des->bit_length);                
-                usb_log_debug("\tItems: %d\n", report_des->item_length);                
+                usb_log_debug("\tLength: %zu\n", report_des->bit_length);
+                usb_log_debug("\tItems: %zu\n", report_des->item_length);
 
                 usb_hid_descriptor_print_list(&report_des->report_items);