Changeset ff41576d in mainline

Timestamp:

2011-05-27T08:55:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8fb45e08

Parents:

aaa3d82b

Message:

Edited log messages + changed way of getting reports (get_event()).

File:

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

uspace/drv/usbhid/generic/hiddev.c

@@ -90 +90 @@
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
 {
-        usb_log_debug("Generic HID: Get event length (fun: %p, "
+        usb_log_debug2("Generic HID: Get event length (fun: %p, "
             "fun->driver_data: %p.\n", fun, fun->driver_data);
         
@@ -99 +99 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
         
-        usb_log_debug("hid_dev: %p, Max input report size (%d).\n",
+        usb_log_debug2("hid_dev: %p, Max input report size (%d).\n",
             hid_dev, hid_dev->max_input_report_size);
         
@@ -110 +110 @@
     size_t size, size_t *act_size, unsigned int flags)
 {
-        usb_log_debug("Generic HID: Get event.\n");
+        usb_log_debug2("Generic HID: Get event.\n");
         
         if (fun == NULL || fun->driver_data == NULL) {
@@ -126 +126 @@
         
         /*! @todo This should probably be atomic. */
-        if (usb_hid_report_ready()) {
-                usb_log_debug("Report ready, size: %zu\n", 
-                    hid_dev->input_report_size);
-                memcpy(buffer, hid_dev->input_report, 
-                    hid_dev->input_report_size);
-                *act_size = hid_dev->input_report_size;
-                usb_hid_report_received();
-        }
+//      if (usb_hid_report_ready()) {
+//              usb_log_debug2("Report ready, size: %zu\n", 
+//                  hid_dev->input_report_size);
+                
+//              usb_hid_report_received();
+//      } else {
+//              memset(buffer, 0, hid_dev->input_report_size);
+//      }
+        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
@@ -140 +143 @@
         // note that we already received this report
 //      report_received = true;
-        usb_log_debug("OK\n");
+        usb_log_debug2("OK\n");
         
         return EOK;
@@ -158 +161 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
         
-        printf("hid_dev->report_desc_size = %zu\n", hid_dev->report_desc_size);
+        usb_log_debug2("hid_dev->report_desc_size = %zu\n", 
+            hid_dev->report_desc_size);
         
         return hid_dev->report_desc_size;
@@ -168 +172 @@
     size_t size, size_t *actual_size)
 {
-        usb_log_debug("Generic HID: Get report descriptor.\n");
+        usb_log_debug2("Generic HID: Get report descriptor.\n");
         
         if (fun == NULL || fun->driver_data == NULL) {
@@ -192 +196 @@
 {
         usb_log_debug("Generic HID: Client connected.\n");
-        usb_hid_report_received();
         return EOK;
 }
@@ -242 +245 @@
     uint8_t *buffer, size_t buffer_size)
 {
-        usb_log_debug("usb_hid_polling_callback(%p, %p, %zu)\n",
+        usb_log_debug2("usb_hid_polling_callback(%p, %p, %zu)\n",
             hid_dev, buffer, buffer_size);
         usb_debug_str_buffer(buffer, buffer_size, 0);