Changeset 9dddb3d in mainline

Timestamp:

2011-05-24T21:52:44Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fa8d346

Parents:

a28b41d

Message:

Implemented stubs for getting descriptor and its length

• Work done by VH.

Location:

uspace/lib

Files:

• drv/generic/remote_usbhid.c (modified) (4 diffs)
• drv/include/usbhid_iface.h (modified) (3 diffs)
• usbhid/src/hidiface.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usbhid.c

@@ -117 +117 @@
                 async_answer_0(data_callid, EINVAL);
                 async_answer_0(callid, EINVAL);
+                return;
         }
 
@@ -125 +126 @@
                 async_answer_0(data_callid, ENOMEM);
                 async_answer_0(callid, ENOMEM);
+                return;
         }
 
@@ -133 +135 @@
                 async_answer_0(data_callid, rc);
                 async_answer_0(callid, rc);
+                return;
         }
         if (act_length >= len) {
@@ -147 +150 @@
 }
 
-void remote_usbhid_get_report_descriptor(ddf_fun_t *fun, void *iface, 
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        /** @todo Implement! */
-}
-
-void remote_usbhid_get_report_descriptor_length(ddf_fun_t *fun, void *iface, 
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        /** @todo Implement! */
-}
+void remote_usbhid_get_report_descriptor_length(ddf_fun_t *fun, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface;
+
+        if (!hid_iface->get_report_descriptor_length) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        size_t len = hid_iface->get_report_descriptor_length(fun);
+        async_answer_1(callid, EOK, (sysarg_t) len);
+}
+
+void remote_usbhid_get_report_descriptor(ddf_fun_t *fun, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhid_iface_t *hid_iface = (usbhid_iface_t *) iface;
+
+        if (!hid_iface->get_report_descriptor) {
+                async_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        size_t len;
+        ipc_callid_t data_callid;
+        if (!async_data_read_receive(&data_callid, &len)) {
+                async_answer_0(callid, EINVAL);
+                return;
+        }
+
+        if (len == 0) {
+                async_answer_0(data_callid, EINVAL);
+                async_answer_0(callid, EINVAL);
+                return;
+        }
+
+        uint8_t *descriptor = malloc(len);
+        if (descriptor == NULL) {
+                async_answer_0(data_callid, ENOMEM);
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
+
+        size_t act_len = 0;
+        int rc = hid_iface->get_report_descriptor(fun, descriptor, len,
+            &act_len);
+        if (act_len > len) {
+                rc = ELIMIT;
+        }
+        if (rc != EOK) {
+                free(descriptor);
+                async_answer_0(data_callid, rc);
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        async_data_read_finalize(data_callid, descriptor, act_len);
+        async_answer_0(callid, EOK);
+
+        free(descriptor);
+}
+
+
 
 /**

uspace/lib/drv/include/usbhid_iface.h

@@ -71 +71 @@
          * - none
          * Answer:
-         * - Size of one report in bytes.
-         * - 
-         *
-         * @todo Finish this comment
+         * - EOK - method is implemented (expected always)
+         * Parameters of the answer:
+         * - Size of the report in bytes.
          */
         IPC_M_USBHID_GET_REPORT_DESCRIPTOR_LENGTH,
@@ -82 +81 @@
          * Parameters:
          * - none
+         * The call is followed by data read expecting the descriptor itself.
          * Answer:
          * - EOK - report descriptor returned.
-         * - 
-         *
-         * @todo Finish this comment
          */
         IPC_M_USBHID_GET_REPORT_DESCRIPTOR
@@ -125 +122 @@
          * @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.
+         * @param[in] size Size of the allocated @p desc buffer.
+         * @param[out] act_size Actual size of the report descriptor returned.
          * @return Error code.
          */

uspace/lib/usbhid/src/hidiface.c

@@ -56 +56 @@
             IPC_M_USBHID_GET_EVENT_LENGTH, &len);
         if (rc == EOK) {
-                *size = (size_t) len;
+                if (size != NULL) {
+                        *size = (size_t) len;
+                }
         }
         
@@ -148 +150 @@
 int usbhid_dev_get_report_descriptor_length(int dev_phone, size_t *size)
 {
-        /** @todo Implement! */
-        return ENOTSUP;
+        if (dev_phone < 0) {
+                return EINVAL;
+        }
+
+        sysarg_t arg_size;
+        int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(USBHID_DEV_IFACE),
+            IPC_M_USBHID_GET_REPORT_DESCRIPTOR_LENGTH, &arg_size);
+        if (rc == EOK) {
+                if (size != NULL) {
+                        *size = (size_t) arg_size;
+                }
+        }
+        return rc;
 }
 
@@ -155 +168 @@
     size_t *actual_size)
 {
-        /** @todo Implement! */
-        return ENOTSUP;
+        if (dev_phone < 0) {
+                return EINVAL;
+        }
+        if ((buf == NULL)) {
+                return ENOMEM;
+        }
+        if (size == 0) {
+                return EINVAL;
+        }
+
+        aid_t opening_request = async_send_1(dev_phone,
+            DEV_IFACE_ID(USBHID_DEV_IFACE), IPC_M_USBHID_GET_REPORT_DESCRIPTOR,
+            NULL);
+        if (opening_request == 0) {
+                return ENOMEM;
+        }
+
+        ipc_call_t data_request_call;
+        aid_t data_request = async_data_read(dev_phone, buf, size,
+            &data_request_call);
+        if (data_request == 0) {
+                async_wait_for(opening_request, NULL);
+                return ENOMEM;
+        }
+
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
+        async_wait_for(data_request, &data_request_rc);
+        async_wait_for(opening_request, &opening_request_rc);
+
+        if (data_request_rc != EOK) {
+                /* Prefer return code of the opening request. */
+                if (opening_request_rc != EOK) {
+                        return (int) opening_request_rc;
+                } else {
+                        return (int) data_request_rc;
+                }
+        }
+
+        if (opening_request_rc != EOK) {
+                return (int) opening_request_rc;
+        }
+
+        size_t act_size = IPC_GET_ARG2(data_request_call);
+
+        if (actual_size != NULL) {
+                *actual_size = act_size;
+        }
+
+        return EOK;
 }