Changeset 2a5b62b in mainline for uspace/drv/bus/usb/usbhid/kbd

Timestamp:

2011-10-15T00:09:46Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8a121b1

Parents:

1526c174

Message:

usbhid: Wait for autorepeat fibril during destruction.

Fixes random failure on keyboard unplug.
Add a bunch of debug messages.

Location:

uspace/drv/bus/usb/usbhid/kbd

Files:

• kbddev.c (modified) (5 diffs)
• kbdrepeat.c (modified) (2 diffs)
• kbdrepeat.h (modified) (1 diff)

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -502 +502 @@
 
         if (kbd_dev == NULL) {
-                usb_log_fatal("No memory!\n");
+                usb_log_error("No memory!\n");
                 return NULL;
         }
@@ -624 +624 @@
 
         if (kbd_dev->keys == NULL) {
-                usb_log_fatal("No memory!\n");
+                usb_log_error("No memory!\n");
                 free(kbd_dev);
                 return ENOMEM;
@@ -633 +633 @@
 
         if (kbd_dev->keys_old == NULL) {
-                usb_log_fatal("No memory!\n");
+                usb_log_error("No memory!\n");
                 free(kbd_dev->keys);
                 free(kbd_dev);
@@ -797 +797 @@
                 usb_log_warning("Failed to unbind kbd function.\n");
         } else {
+                usb_log_debug2("%s unbound.\n", kbd_dev->fun->name);
                 kbd_dev->fun->driver_data = NULL;
                 ddf_fun_destroy(kbd_dev->fun);
@@ -811 +812 @@
 
         if (data != NULL) {
-                usb_kbd_t *kbd_dev = (usb_kbd_t *)data;
+                usb_kbd_t *kbd_dev = data;
                 if (usb_kbd_is_initialized(kbd_dev)) {
                         usb_kbd_mark_unusable(kbd_dev);
-                } else {
+                        /* wait for autorepeat */
+                        async_usleep(CHECK_DELAY);
                         usb_kbd_destroy(kbd_dev);
                 }

uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c

@@ -46 +46 @@
 
 
-/** Delay between auto-repeat state checks when no key is being repeated. */
-static unsigned int CHECK_DELAY = 10000;
 
 /*----------------------------------------------------------------------------*/
@@ -79 +77 @@
                 // check if the kbd structure is usable
                 if (!usb_kbd_is_initialized(kbd)) {
-                        if (usb_kbd_is_ready_to_destroy(kbd)) {
-                                usb_kbd_destroy(kbd);
-                        }
+                        usb_log_warning("kbd not ready, exiting autorepeat.\n");
                         return;
                 }

uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.h

@@ -37 +37 @@
 #define USB_HID_KBDREPEAT_H_
 
+/** Delay between auto-repeat state checks when no key is being repeated. */
+#define CHECK_DELAY 10000
+
 struct usb_kbd_t;