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

Timestamp:

2011-05-24T21:01:02Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

a28b41d

Parents:

4e78236

Message:

A lot of changes to mkbd and HID interface.

• mkbd Report parser initialization (getting report descriptor, parsing).
• Getting report descriptor and its length from HID device added to HID interface (client and server stubs not implemented).
• Fixed event type to uint8_t *.
• Implemented these functions in generic HID driver.
• Moved mapping from Consumer page usages to string descriptions moved to libusbhid.
• Removed some temporary debug output.

File:

• uspace/lib/drv/include/usbhid_iface.h (modified) (4 diffs)

uspace/lib/drv/include/usbhid_iface.h

@@ -45 +45 @@
          * Parameters: none
          * Answer:
-         * - EOK (expected always as long as device support USB HID interface)
-         * Parameters of the answer:
-         * - number of items
+         * - Size of one report in bytes.
          */
         IPC_M_USBHID_GET_EVENT_LENGTH,
@@ -63 +61 @@
          * It is okay if the client requests less data. Extra data must
          * be truncated by the driver.
+         *
+         * @todo Change this comment.
          */
-        IPC_M_USBHID_GET_EVENT
+        IPC_M_USBHID_GET_EVENT,
+        
+        /** Get the size of the report descriptor from the HID device.
+         *
+         * Parameters:
+         * - none
+         * Answer:
+         * - Size of one report in bytes.
+         * - 
+         *
+         * @todo Finish this comment
+         */
+        IPC_M_USBHID_GET_REPORT_DESCRIPTOR_LENGTH,
+        
+        /** Get the report descriptor from the HID device.
+         *
+         * Parameters:
+         * - none
+         * Answer:
+         * - EOK - report descriptor returned.
+         * - 
+         *
+         * @todo Finish this comment
+         */
+        IPC_M_USBHID_GET_REPORT_DESCRIPTOR
 } usbhid_iface_funcs_t;
 
@@ -75 +99 @@
          *
          * @param[in] fun DDF function answering the request.
-         * @return Number of events or error code.
+         * @return Size of the event in bytes.
          */
         size_t (*get_event_length)(ddf_fun_t *fun);
@@ -87 +111 @@
          * @return Error code.
          */
-        int (*get_event)(ddf_fun_t *fun, int32_t *buffer, size_t size,
+        int (*get_event)(ddf_fun_t *fun, uint8_t *buffer, size_t size,
             size_t *act_size, unsigned int flags);
+        
+        /** Get size of the report descriptor in bytes.
+         *
+         * @param[in] fun DDF function answering the request.
+         * @return Size of the report descriptor in bytes.
+         */
+        size_t (*get_report_descriptor_length)(ddf_fun_t *fun);
+        
+        /** Get the report descriptor from the HID device.
+         *
+         * @param[in] fun DDF function answering the request.
+         * @param[out] desc Buffer with the report descriptor.
+         * @param[out] size Size of the report descriptors in bytes.
+         * @return Error code.
+         */
+        int (*get_report_descriptor)(ddf_fun_t *fun, uint8_t *desc, 
+            size_t size, size_t *act_size);
 } usbhid_iface_t;