Changes in / [04c1524:22ded10] in mainline

Location:

uspace/drv/usbhid

Files:

• generic/hiddev.c (modified) (4 diffs)
• usbhid.c (modified) (3 diffs)
• usbhid.h (modified) (2 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;
 }

uspace/drv/usbhid/usbhid.c

@@ -63 +63 @@
 static const int USB_HID_MAX_SUBDRIVERS = 10;
 
-static fibril_local bool report_received;
-
 /*----------------------------------------------------------------------------*/
 
@@ -511 +509 @@
                                 free(input_old);
                         }
-                        usb_hid_new_report();
                 }
         }
@@ -592 +589 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_hid_new_report(void)
-{
-        report_received = false;
-}
-
-/*----------------------------------------------------------------------------*/
-
-void usb_hid_report_received(void)
-{
-        report_received = true;
-}
-
-/*----------------------------------------------------------------------------*/
-
-bool usb_hid_report_ready(void)
-{
-        return !report_received;
-}
-
-/*----------------------------------------------------------------------------*/
-
 void usb_hid_free(usb_hid_dev_t **hid_dev)
 {

uspace/drv/usbhid/usbhid.h

@@ -44 +44 @@
 #include <usb/devdrv.h>
 #include <usb/classes/hid.h>
-#include <bool.h>
 
 struct usb_hid_dev;
@@ -129 +128 @@
 //const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev);
 
-void usb_hid_new_report(void);
-
-void usb_hid_report_received(void);
-
-bool usb_hid_report_ready(void);
-
 void usb_hid_free(usb_hid_dev_t **hid_dev);