Changeset e1dbcbc in mainline for uspace/drv/usbmouse/main.c

Timestamp:

2011-04-29T13:43:01Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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/usbmouse/main.c (modified) (3 diffs)

uspace/drv/usbmouse/main.c

@@ -36 +36 @@
 #include "mouse.h"
 #include <usb/debug.h>
+#include <usb/devpoll.h>
 #include <errno.h>
 #include <str_error.h>
@@ -53 +54 @@
         }
 
-        usb_log_debug("Polling pipe at endpoint %d.\n", dev->pipes[0].pipe->endpoint_no);
+        usb_log_debug("Polling pipe at endpoint %d.\n",
+            dev->pipes[0].pipe->endpoint_no);
 
         rc = usb_device_auto_poll(dev, 0,
@@ -65 +67 @@
         }
 
-        usb_log_info("controlling new mouse (handle %llu).\n",
+        usb_log_info("controlling new mouse (handle %" PRIun ").\n",
             dev->ddf_dev->handle);