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

Timestamp:

2011-05-27T12:14:02Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2df648c2

Parents:

fb2de0a (diff), 74341ed (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 branch changes

File:

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

uspace/lib/usbhid/src/hidiface.c

@@ -46 +46 @@
  * @return Number of usages returned or negative error code.
  */
-int usbhid_dev_get_event_length(int dev_phone)
+int usbhid_dev_get_event_length(int dev_phone, size_t *size)
 {
         if (dev_phone < 0) {
@@ -56 +56 @@
             IPC_M_USBHID_GET_EVENT_LENGTH, &len);
         if (rc == EOK) {
-                return (int) len;
-        } else {
-                return rc;
-        }
+                if (size != NULL) {
+                        *size = (size_t) len;
+                }
+        }
+        
+        return rc;
 }
 
@@ -74 +76 @@
  * @return Error code.
  */
-int usbhid_dev_get_event(int dev_phone, uint16_t *usage_pages, uint16_t *usages,
-    size_t usage_count, size_t *actual_usage_count, unsigned int flags)
-{
-        if (dev_phone < 0) {
-                return EINVAL;
-        }
-        if ((usage_pages == NULL) || (usages == NULL)) {
-                return ENOMEM;
-        }
-        if (usage_count == 0) {
-                return EINVAL;
-        }
-
-        size_t buffer_size = sizeof(uint16_t) * usage_count * 2;
-        uint16_t *buffer = malloc(buffer_size);
+int usbhid_dev_get_event(int dev_phone, uint8_t *buf, 
+    size_t size, size_t *actual_size, int *event_nr, unsigned int flags)
+{
+        if (dev_phone < 0) {
+                return EINVAL;
+        }
+        if ((buf == NULL)) {
+                return ENOMEM;
+        }
+        if (size == 0) {
+                return EINVAL;
+        }
+        
+//      if (size == 0) {
+//              return EOK;
+//      }
+
+        size_t buffer_size =  size;
+        uint8_t *buffer = malloc(buffer_size);
         if (buffer == NULL) {
                 return ENOMEM;
         }
 
+        ipc_call_t opening_request_call;
         aid_t opening_request = async_send_2(dev_phone,
             DEV_IFACE_ID(USBHID_DEV_IFACE), IPC_M_USBHID_GET_EVENT,
-            flags, NULL);
+            flags, &opening_request_call);
         if (opening_request == 0) {
                 free(buffer);
@@ -128 +135 @@
         }
 
-        size_t actual_size = IPC_GET_ARG2(data_request_call);
-        size_t items = actual_size / 2;
+        size_t act_size = IPC_GET_ARG2(data_request_call);
 
         /* Copy the individual items. */
-        memcpy(usage_pages, buffer, items * sizeof(uint16_t));
-        memcpy(usages, buffer + items, items * sizeof(uint16_t));
-
-        if (actual_usage_count != NULL) {
-                *actual_usage_count = items;
+        memcpy(buf, buffer, act_size);
+//      memcpy(usages, buffer + items, items * sizeof(int32_t));
+
+        if (actual_size != NULL) {
+                *actual_size = act_size;
+        }
+        
+        if (event_nr != NULL) {
+                *event_nr = IPC_GET_ARG1(opening_request_call);
+        }
+
+        return EOK;
+}
+
+
+int usbhid_dev_get_report_descriptor_length(int dev_phone, size_t *size)
+{
+        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;
+}
+
+int usbhid_dev_get_report_descriptor(int dev_phone, uint8_t *buf, size_t size, 
+    size_t *actual_size)
+{
+        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;
         }