Changeset 266fcd8 in mainline for uspace/drv/usbhid/generic/hiddev.c

Timestamp:

2011-05-27T09:27:02Z (13 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.

File:

• uspace/drv/usbhid/generic/hiddev.c (modified) (3 diffs)

uspace/drv/usbhid/generic/hiddev.c

@@ -63 +63 @@
 
 static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
-    size_t size, size_t *act_size, unsigned int flags);
+    size_t size, size_t *act_size, int *event_nr, unsigned int flags);
 
 static int usb_generic_hid_client_connected(ddf_fun_t *fun);
@@ -108 +108 @@
 
 static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, 
-    size_t size, size_t *act_size, unsigned int flags)
+    size_t size, size_t *act_size, int *event_nr, unsigned int flags)
 {
         usb_log_debug2("Generic HID: Get event.\n");
         
-        if (fun == NULL || fun->driver_data == NULL) {
+        if (fun == NULL || fun->driver_data == NULL || buffer == NULL
+            || act_size == NULL || event_nr == NULL) {
                 usb_log_debug("No function");
                 return EINVAL;
@@ -137 +138 @@
             hid_dev->input_report_size);
         *act_size = hid_dev->input_report_size;
+        *event_nr = usb_hid_report_number(hid_dev);
         
         // clear the buffer so that it will not be received twice