Changeset 30f9f8f in mainline for uspace/lib/drv/include/usbhid_iface.h

Timestamp:

2011-05-06T09:29:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9a884ed

Parents:

c709eb0 (diff), 310c4df (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:

Merge development/ changes

File:

• uspace/lib/drv/include/usbhid_iface.h (modified) (1 diff)

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;