Changeset 9dddb3d in mainline for uspace/lib/usbhid/src/hidiface.c

Timestamp:

2011-05-24T21:52:44Z (14 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.

File:

• uspace/lib/usbhid/src/hidiface.c (modified) (3 diffs)

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;
 }