Changeset 4e78236 in mainline for uspace/drv/usbhid/generic/hiddev.c

Timestamp:

2011-05-24T19:10:49Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d7c72db

Parents:

e7079cf

Message:

Fixed mkbd and corresponding library functions.

• Fixed linking remote_usbhid.c
• Added some temporary debug output.
• Fix in hiddev.c.

File:

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

uspace/drv/usbhid/generic/hiddev.c

@@ -83 +83 @@
 static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun)
 {
-        usb_log_debug("Generic HID: Get event length.\n");
+        usb_log_debug("Generic HID: Get event length (fun: %p, "
+            "fun->driver_data: %p.\n", fun, fun->driver_data);
         
-        if (fun == NULL || fun->driver_data) {
+        if (fun == NULL || fun->driver_data == NULL) {
                 return 0;
         }
@@ -91 +92 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
         
-        return hid_dev->input_report_size;
+        usb_log_debug("hid_dev: %p, Max input report size (%d).\n",
+            hid_dev, hid_dev->max_input_report_size);
+        
+        return hid_dev->max_input_report_size;
 }
 
@@ -101 +105 @@
         usb_log_debug("Generic HID: Get event.\n");
         
-        if (fun == NULL || fun->driver_data) {
+        if (fun == NULL || fun->driver_data == NULL) {
+                usb_log_debug("No function");
                 return EINVAL;
         }