Changeset 27270db in mainline

Timestamp:

2011-03-01T15:26:57Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1c6c4092

Parents:

0b5644c

Message:

Fixed initialization of kbd_dev.

• Setting console phone to -1.

Location:

uspace/drv/usbhid

Files:

• hiddev.c (modified) (1 diff)
• kbddev.c (modified) (3 diffs)

uspace/drv/usbhid/hiddev.c

@@ -214 +214 @@
                 usb_log_warning("Not accepting device.\n");
                 free(descriptors);
-                return EREFUSED;
+                return EREFUSED;  // probably not very good return value
         }
         

uspace/drv/usbhid/kbddev.c

@@ -121 +121 @@
         sysarg_t method = IPC_GET_IMETHOD(*icall);
         
-        usb_log_debug("default_connection_handler()\n");
-        usb_log_debug("kbd_dev: %p\n", fun->driver_data);
-        
         usbhid_kbd_t *kbd_dev = (usbhid_kbd_t *)fun->driver_data;
-        assert(kbd_dev != NULL);        
+        assert(kbd_dev != NULL);
 
         if (method == IPC_M_CONNECT_TO_ME) {
@@ -139 +136 @@
                 return;
         }
-
+        
         async_answer_0(icallid, EINVAL);
 }
@@ -474 +471 @@
         }
         
+        kbd_dev->console_phone = -1;
         kbd_dev->initialized = 0;