Changeset c28b3a5 in mainline

Timestamp:

2011-05-27T12:24:21Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

567a3e2, ed0cc81

Parents:

c8be56e (diff), 5c2c459 (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:

Small fixes

Location:

uspace

Files:

• app/mkbd/main.c (modified) (2 diffs)
• drv/usbhid/mouse/mousedev.c (modified) (1 diff)

uspace/app/mkbd/main.c

@@ -212 +212 @@
         }
         
-        //char *devpath = argv[1];
-        const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
+        char *devpath = argv[1];
+        //const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
         
         int rc;
@@ -297 +297 @@
                 }
                 
-                async_usleep(100000);
+                async_usleep(10000);
         }
         

uspace/drv/usbhid/mouse/mousedev.c

@@ -234 +234 @@
         
         if (mouse_dev->mouse_phone < 0) {
-                usb_log_error(NAME " No console phone.\n");
-                return false;   // ??
+                usb_log_warning(NAME " No console phone.\n");
+                return true;
         }