Changeset 8fb45e08 in mainline

Timestamp:

2011-05-27T09:00:31Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

3c9eb46

Parents:

ff41576d

Message:

Changed way of remembering if event was picked up.

• Increasing event report number each time there is a new report.

Location:

uspace/drv/usbhid

Files:

• usbhid.c (modified) (4 diffs)
• usbhid.h (modified) (2 diffs)

uspace/drv/usbhid/usbhid.c

@@ -63 +63 @@
 static const int USB_HID_MAX_SUBDRIVERS = 10;
 
-static fibril_local bool report_received;
+/** @todo What happens if this is not fibril local? */
+//static fibril_local bool report_number;
 
 /*----------------------------------------------------------------------------*/
@@ -361 +362 @@
         
         uint8_t report_id = 0;
-        size_t size = usb_hid_report_byte_size(hid_dev->report, report_id, 
-            USB_HID_REPORT_TYPE_INPUT);
+        size_t size;/* = usb_hid_report_byte_size(hid_dev->report, report_id, 
+            USB_HID_REPORT_TYPE_INPUT);*/
         
         size_t max_size = 0;
         
         do {
-                max_size = (size > max_size) ? size : max_size;
                 size = usb_hid_report_byte_size(hid_dev->report, report_id, 
                     USB_HID_REPORT_TYPE_INPUT);
+                usb_log_debug("Report ID: %u, size: %zu\n", report_id, size);
+                max_size = (size > max_size) ? size : max_size;
                 report_id = usb_hid_get_next_report_id(hid_dev->report, 
                     report_id, USB_HID_REPORT_TYPE_INPUT);
@@ -578 +580 @@
         memcpy(hid_dev->input_report, buffer, buffer_size);
         hid_dev->input_report_size = buffer_size;
-        usb_hid_new_report();
+        usb_hid_new_report(hid_dev);
         
         bool cont = false;
@@ -654 +656 @@
 /*----------------------------------------------------------------------------*/
 
-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_new_report(usb_hid_dev_t *hid_dev)
+{
+        ++hid_dev->report_nr;
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usb_hid_report_number(usb_hid_dev_t *hid_dev)
+{
+        return hid_dev->report_nr;
+}
+
+/*----------------------------------------------------------------------------*/
+
+//void usb_hid_report_received(void)
+//{
+//      ++report_number;
+//}
+
+/*----------------------------------------------------------------------------*/
+
+//bool usb_hid_report_ready(void)
+//{
+//      return !report_received;
+//}
 
 /*----------------------------------------------------------------------------*/

uspace/drv/usbhid/usbhid.h

@@ -99 +99 @@
         size_t input_report_size;
         size_t max_input_report_size;
+        
+        int report_nr;
 } usb_hid_dev_t;
 
@@ -128 +130 @@
 //const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev);
 
-void usb_hid_new_report(void);
+void usb_hid_new_report(usb_hid_dev_t *hid_dev);
 
-void usb_hid_report_received(void);
+int usb_hid_report_number(usb_hid_dev_t *hid_dev);
 
-bool usb_hid_report_ready(void);
+//void usb_hid_report_received(void);
+
+//bool usb_hid_report_ready(void);
 
 void usb_hid_free(usb_hid_dev_t **hid_dev);