Changeset 18b3cfd in mainline

Timestamp:

2011-03-18T17:38:49Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

62f4212

Parents:

00b13408

Message:

Checking if the device is uninitialized in kbd repeat loop.

Location:

uspace/drv/usbhid

Files:

• kbddev.c (modified) (1 diff)
• kbddev.h (modified) (1 diff)
• kbdrepeat.c (modified) (1 diff)

uspace/drv/usbhid/kbddev.c

@@ -984 +984 @@
 /*----------------------------------------------------------------------------*/
 
-int usbhid_kbd_is_usable(const usbhid_kbd_t *kbd_dev)
+int usbhid_kbd_is_initialized(const usbhid_kbd_t *kbd_dev)
 {
         return (kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usbhid_kbd_is_ready_to_destroy(const usbhid_kbd_t *kbd_dev)
+{
+        return (kbd_dev->initialized == USBHID_KBD_STATUS_TO_DESTROY);
 }
 

uspace/drv/usbhid/kbddev.h

@@ -114 +114 @@
 int usbhid_kbd_try_add_device(ddf_dev_t *dev);
 
-int usbhid_kbd_is_usable(const usbhid_kbd_t *kbd_dev);
+int usbhid_kbd_is_initialized(const usbhid_kbd_t *kbd_dev);
+
+int usbhid_kbd_is_ready_to_destroy(const usbhid_kbd_t *kbd_dev);
 
 void usbhid_kbd_free(usbhid_kbd_t **kbd_dev);

uspace/drv/usbhid/kbdrepeat.c

@@ -78 +78 @@
         while (true) {
                 // check if the kbd structure is usable
-                if (!usbhid_kbd_is_usable(kbd)) {
-                        usbhid_kbd_free(&kbd);
-                        assert(kbd == NULL);
+                if (!usbhid_kbd_is_initialized(kbd)) {
+                        if (usbhid_kbd_is_ready_to_destroy(kbd)) {
+                                usbhid_kbd_free(&kbd);
+                                assert(kbd == NULL);
+                        }
                         return;
                 }