Changes in uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c [2d1ba51:5f6e25e] in mainline

File:

• uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c (modified) (9 diffs)

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

@@ -45 +45 @@
 #include "kbddev.h"
 
+
+/** Delay between auto-repeat state checks when no key is being repeated. */
+static unsigned int CHECK_DELAY = 10000;
+
+/*----------------------------------------------------------------------------*/
 /**
  * Main loop handling the auto-repeat of keys.
@@ -55 +60 @@
  * If the same key is still pressed, it uses the delay between repeats stored
  * in the keyboard structure to wait until the key should be repeated.
- *
+ * 
  * If the currently repeated key is not pressed any more (
- * usb_kbd_repeat_stop() was called), it stops repeating it and starts
+ * usb_kbd_repeat_stop() was called), it stops repeating it and starts 
  * checking again.
  *
  * @note For accessing the keyboard device auto-repeat information a fibril
  *       mutex (repeat_mtx) from the @a kbd structure is used.
- *
+ * 
  * @param kbd Keyboard device structure.
  */
@@ -68 +73 @@
 {
         unsigned int delay = 0;
-
+        
         usb_log_debug("Starting autorepeat loop.\n");
 
         while (true) {
-                /* Check if the kbd structure is usable. */
+                // check if the kbd structure is usable
                 if (!usb_kbd_is_initialized(kbd)) {
-                        usb_log_warning("kbd not ready, exiting autorepeat.\n");
+                        if (usb_kbd_is_ready_to_destroy(kbd)) {
+                                usb_kbd_destroy(kbd);
+                        }
                         return;
                 }
-
-                fibril_mutex_lock(&kbd->repeat_mtx);
+                
+                fibril_mutex_lock(kbd->repeat_mtx);
 
                 if (kbd->repeat.key_new > 0) {
                         if (kbd->repeat.key_new == kbd->repeat.key_repeated) {
-                                usb_log_debug2("Repeating key: %u.\n",
+                                usb_log_debug2("Repeating key: %u.\n", 
                                     kbd->repeat.key_repeated);
-                                usb_kbd_push_ev(kbd, KEY_PRESS,
+                                // ugly hack with the NULL
+                                usb_kbd_push_ev(NULL, kbd, KEY_PRESS, 
                                     kbd->repeat.key_repeated);
                                 delay = kbd->repeat.delay_between;
@@ -101 +109 @@
                         delay = CHECK_DELAY;
                 }
-                fibril_mutex_unlock(&kbd->repeat_mtx);
+                fibril_mutex_unlock(kbd->repeat_mtx);
+                
                 async_usleep(delay);
         }
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -110 +120 @@
  *
  * Starts the loop for checking changes in auto-repeat.
- *
+ * 
  * @param arg User-specified argument. Expects pointer to the keyboard device
  *            structure representing the keyboard.
@@ -120 +130 @@
 {
         usb_log_debug("Autorepeat fibril spawned.\n");
-
+        
         if (arg == NULL) {
                 usb_log_error("No device!\n");
                 return EINVAL;
         }
-
-        usb_kbd_t *kbd = arg;
-
+        
+        usb_kbd_t *kbd = (usb_kbd_t *)arg;
+        
         usb_kbd_repeat_loop(kbd);
-
+        
         return EOK;
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -145 +156 @@
 void usb_kbd_repeat_start(usb_kbd_t *kbd, unsigned int key)
 {
-        fibril_mutex_lock(&kbd->repeat_mtx);
+        fibril_mutex_lock(kbd->repeat_mtx);
         kbd->repeat.key_new = key;
-        fibril_mutex_unlock(&kbd->repeat_mtx);
+        fibril_mutex_unlock(kbd->repeat_mtx);
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -154 +166 @@
  *
  * @note Only one key is repeated at any time, but this function may be called
- *       even with key that is not currently repeated (in that case nothing
+ *       even with key that is not currently repeated (in that case nothing 
  *       happens).
  *
@@ -162 +174 @@
 void usb_kbd_repeat_stop(usb_kbd_t *kbd, unsigned int key)
 {
-        fibril_mutex_lock(&kbd->repeat_mtx);
+        fibril_mutex_lock(kbd->repeat_mtx);
         if (key == kbd->repeat.key_new) {
                 kbd->repeat.key_new = 0;
         }
-        fibril_mutex_unlock(&kbd->repeat_mtx);
+        fibril_mutex_unlock(kbd->repeat_mtx);
 }
+
 /**
  * @}