Changeset e765ccb in mainline for uspace/lib

Timestamp:

2011-05-20T10:44:53Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7079cf

Parents:

d1fb591

Message:

Changed HID driver interface and modified mkbd + fixes.

Location:

uspace/lib

Files:

• drv/generic/remote_usbhid.c (modified) (3 diffs)
• usbhid/include/usb/hid/iface.h (modified) (1 diff)
• usbhid/src/hidiface.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_usbhid.c

@@ -71 +71 @@
         }
 
-        int len = hid_iface->get_event_length(fun);
+        size_t len = hid_iface->get_event_length(fun);
         if (len == 0) {
                 len = EEMPTY;
@@ -100 +100 @@
                 return;
         }
-        /* Check that length is even number. Truncate otherwise. */
-        if ((len % 2) == 1) {
-                len--;
-        }
+//      /* Check that length is even number. Truncate otherwise. */
+//      if ((len % 2) == 1) {
+//              len--;
+//      }
         if (len == 0) {
                 async_answer_0(data_callid, EINVAL);
@@ -111 +111 @@
         int rc;
 
-        size_t items = len / 2;
-        uint16_t *usage_pages_and_usages = malloc(sizeof(uint16_t) * len);
-        if (usage_pages_and_usages == NULL) {
+        int32_t *data = malloc(len);
+        if (data == NULL) {
                 async_answer_0(data_callid, ENOMEM);
                 async_answer_0(callid, ENOMEM);
         }
 
-        size_t act_items;
-        int rc = hid_iface->get_event(fun, usage_pages_and_usages,
-            usage_pages_and_usages + items, items, &act_items, flags);
+        size_t act_length;
+        rc = hid_iface->get_event(fun, data, len, &act_length, flags);
         if (rc != EOK) {
-                free(usage_pages_and_usages);
+                free(data);
                 async_answer_0(data_callid, rc);
                 async_answer_0(callid, rc);
         }
-        if (act_items >= items) {
+        if (act_length >= len) {
                 /* This shall not happen. */
                 // FIXME: how about an assert here?
-                act_items = items;
+                act_length = len;
         }
 
-        async_data_read_finalize(data_callid, usage_pages_and_usages,
-            act_items * 2 * sizeof(uint16_t));
+        async_data_read_finalize(data_callid, data, act_length);
 
-        free(usage_pages_and_usages);
+        free(data);
 
         async_answer_0(callid, EOK);

uspace/lib/usbhid/include/usb/hid/iface.h

@@ -38 +38 @@
 #include <sys/types.h>
 
-int usbhid_dev_get_event_length(int);
-int usbhid_dev_get_event(int, uint16_t *, uint16_t *, size_t, size_t *,
+int usbhid_dev_get_event_length(int, size_t *);
+int usbhid_dev_get_event(int, int32_t *, size_t, size_t *,
     unsigned int);
 

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;
+                *size = (size_t) len;
         }
+        
+        return rc;
 }
 
@@ -74 +74 @@
  * @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)
+int usbhid_dev_get_event(int dev_phone, int32_t *buf, 
+    size_t size, size_t *actual_size, unsigned int flags)
 {
         if (dev_phone < 0) {
                 return EINVAL;
         }
-        if ((usage_pages == NULL) || (usages == NULL)) {
+        if ((buf == NULL)) {
                 return ENOMEM;
         }
-        if (usage_count == 0) {
+        if (size == 0) {
                 return EINVAL;
         }
 
-        size_t buffer_size = sizeof(uint16_t) * usage_count * 2;
+        size_t buffer_size =  size;
         uint16_t *buffer = malloc(buffer_size);
         if (buffer == NULL) {
@@ -128 +128 @@
         }
 
-        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));
+        memcpy(buf, buffer, act_size);
+//      memcpy(usages, buffer + items, items * sizeof(int32_t));
 
-        if (actual_usage_count != NULL) {
-                *actual_usage_count = items;
+        if (actual_size != NULL) {
+                *actual_size = act_size;
         }