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

Timestamp:

2011-04-14T08:24:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

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

uspace/drv/usbhid/generic/hiddev.c

@@ -39 +39 @@
 
 #include "hiddev.h"
+#include "usbhid.h"
 
 /*----------------------------------------------------------------------------*/
@@ -54 +55 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
+bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, 
+    uint8_t *buffer, size_t buffer_size)
 {
-        usb_log_debug("usb_hid_polling_callback()\n");
+        usb_log_debug("usb_hid_polling_callback(%p, %p, %zu)\n",
+            hid_dev, buffer, buffer_size);
         usb_debug_str_buffer(buffer, buffer_size, 0);
         return true;