Changeset da56be2 in mainline

Timestamp:

2011-05-26T11:55:14Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6a544f5

Parents:

a9cdca0

Message:

Some debug output, checking return value from report parsing.

Location:

uspace

Files:

• app/mkbd/main.c (modified) (4 diffs)
• drv/usbhid/generic/hiddev.c (modified) (3 diffs)

uspace/app/mkbd/main.c

@@ -45 +45 @@
 #include <devmap.h>
 #include <usb/dev/hub.h>
-#include <usb/host.h>
-#include <usb/driver.h>
+//#include <usb/host.h>
+//#include <usb/driver.h>
 #include <usb/hid/iface.h>
 #include <usb/dev/pipes.h>
@@ -140 +140 @@
         assert(report != NULL);
         
+        printf("Calling usb_hid_parse_report() with size %zu and "
+            "buffer: \n", size);
+        for (size_t i = 0; i < size; ++i) {
+                printf(" %X ", buffer[i]);
+        }
+        printf("\n");
+        
         uint8_t report_id;
-        usb_hid_parse_report(report, buffer, size, &report_id);
+        int rc = usb_hid_parse_report(report, buffer, size, &report_id);
+        if (rc != EOK) {
+                printf("Error parsing report: %s\n", str_error(rc));
+                return;
+        }
         
         usb_hid_report_path_t *path = usb_hid_report_path();
@@ -196 +207 @@
         
         //char *devpath = argv[1];
-        const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID0/hid";
+        const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
         
         int rc;
@@ -269 +280 @@
                 }
                 
-                printf("Got buffer: %p, size: %zu\n", event, actual_size);
+                printf("Got buffer: %p, size: %zu, max size: %zu\n", event, 
+                    actual_size, size);
                 
                 print_key(event, size, report);

uspace/drv/usbhid/generic/hiddev.c

@@ -120 +120 @@
         
         if (hid_dev->input_report_size > size) {
+                usb_log_debug("input_report_size > size (%zu, %zu)\n", 
+                    hid_dev->input_report_size, size);
                 return EINVAL;  // TODO: other error code
         }
@@ -125 +127 @@
         /*! @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);
@@ -136 +140 @@
         // note that we already received this report
 //      report_received = true;
+        usb_log_debug("OK\n");
         
         return EOK;