Changes in uspace/drv/usbhid/generic/hiddev.c [dd3eda2:3facf63a] in mainline

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>
@@ -65 +64 @@
     size_t size, size_t *act_size, unsigned int flags);
 
-static int usb_generic_hid_client_connected(ddf_fun_t *fun);
-
 /*----------------------------------------------------------------------------*/
 
@@ -75 +72 @@
 
 static ddf_dev_ops_t usb_generic_hid_ops = {
-        .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface,
-        .open = usb_generic_hid_client_connected
+        .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface
 };
 
@@ -108 +104 @@
         
         /*! @todo This should probably be atomic. */
-        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();
-        }
+        memcpy(buffer, hid_dev->input_report, hid_dev->input_report_size);
+        *act_size = hid_dev->input_report_size;
         
         // 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;
 }