Changeset 266fcd8 in mainline for uspace/lib

Timestamp:

2011-05-27T09:27: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:

81d2f6a

Parents:

3c9eb46

Message:

Sending event number in get_event() interface + control in mkbd.

Location:

uspace/lib

Files:

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

uspace/lib/drv/generic/remote_usbhid.c

@@ -130 +130 @@
 
         size_t act_length;
-        rc = hid_iface->get_event(fun, data, len, &act_length, flags);
+        int event_nr;
+        rc = hid_iface->get_event(fun, data, len, &act_length, &event_nr, flags);
         if (rc != EOK) {
                 free(data);
@@ -147 +148 @@
         free(data);
 
-        async_answer_0(callid, EOK);
+        async_answer_1(callid, EOK, event_nr);
 }
 

uspace/lib/drv/include/usbhid_iface.h

@@ -109 +109 @@
          */
         int (*get_event)(ddf_fun_t *fun, uint8_t *buffer, size_t size,
-            size_t *act_size, unsigned int flags);
+            size_t *act_size, int *event_nr, unsigned int flags);
         
         /** Get size of the report descriptor in bytes.

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

@@ -39 +39 @@
 
 int usbhid_dev_get_event_length(int, size_t *);
-int usbhid_dev_get_event(int, uint8_t *, size_t, size_t *,
+int usbhid_dev_get_event(int, uint8_t *, size_t, size_t *, int *,
     unsigned int);
 int usbhid_dev_get_report_descriptor_length(int, size_t *);

uspace/lib/usbhid/src/hidiface.c

@@ -77 +77 @@
  */
 int usbhid_dev_get_event(int dev_phone, uint8_t *buf, 
-    size_t size, size_t *actual_size, unsigned int flags)
+    size_t size, size_t *actual_size, int *event_nr, unsigned int flags)
 {
         if (dev_phone < 0) {
@@ -99 +99 @@
         }
 
+        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);
@@ -143 +144 @@
                 *actual_size = act_size;
         }
+        
+        if (event_nr != NULL) {
+                *event_nr = IPC_GET_ARG1(opening_request_call);
+        }
 
         return EOK;