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

Timestamp:

2011-05-07T10:05:14Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

28216a0

Parents:

beee81a (diff), bc02b83 (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:

Merge development/ changes

File:

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

uspace/drv/usbhid/generic/hiddev.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str_error.h>
+#include <bool.h>
 
 #include <usbhid_iface.h>
@@ -64 +65 @@
     size_t size, size_t *act_size, unsigned int flags);
 
+static int usb_generic_hid_client_connected(ddf_fun_t *fun);
+
 /*----------------------------------------------------------------------------*/
 
@@ -72 +75 @@
 
 static ddf_dev_ops_t usb_generic_hid_ops = {
-        .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface
+        .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface,
+        .open = usb_generic_hid_client_connected
 };
 
@@ -104 +108 @@
         
         /*! @todo This should probably be atomic. */
-        memcpy(buffer, hid_dev->input_report, hid_dev->input_report_size);
-        *act_size = hid_dev->input_report_size;
+        if (usb_hid_report_ready()) {
+                memcpy(buffer, hid_dev->input_report, 
+                    hid_dev->input_report_size);
+                *act_size = hid_dev->input_report_size;
+                usb_hid_report_received();
+        }
         
         // clear the buffer so that it will not be received twice
-        memset(hid_dev->input_report, 0, hid_dev->input_report_size);
+        //memset(hid_dev->input_report, 0, hid_dev->input_report_size);
         
+        // note that we already received this report
+//      report_received = true;
+        
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+
+static int usb_generic_hid_client_connected(ddf_fun_t *fun)
+{
+        usb_hid_report_received();
         return EOK;
 }