Changes in uspace/drv/usbhid/usbhid.c [252cf2a:bd2394b] in mainline

File:

• uspace/drv/usbhid/usbhid.c (modified) (5 diffs)

uspace/drv/usbhid/usbhid.c

@@ -63 +63 @@
 static const int USB_HID_MAX_SUBDRIVERS = 10;
 
-static fibril_local bool report_received;
-
 /*----------------------------------------------------------------------------*/
 
@@ -199 +197 @@
                     mapping->report_id);
         }
-
-        uint8_t report_id = (mapping->report_id >= 0) ? mapping->report_id : 0;
+        
         assert(hid_dev->report != NULL);
         
         usb_log_debug("Compare flags: %d\n", mapping->compare);
-        size_t size = usb_hid_report_size(hid_dev->report, report_id, 
+        size_t size = usb_hid_report_size(hid_dev->report, mapping->report_id, 
             USB_HID_REPORT_TYPE_INPUT);
         usb_log_debug("Size of the input report: %zuB\n", size);
-
+        
         usb_hid_report_path_free(usage_path);
         
@@ -415 +412 @@
         }
         
-        if (fallback) {
+        // TODO: remove the mouse hack
+        if (hid_dev->poll_pipe_index == USB_HID_MOUSE_POLL_EP_NO ||
+            fallback) {
                 // fall back to boot protocol
                 switch (hid_dev->poll_pipe_index) {
@@ -510 +509 @@
                                 free(input_old);
                         }
-                        usb_hid_new_report();
                 }
         }
@@ -591 +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)
 {