Changeset 00aece0 in mainline for uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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:

Merge mainline changes.

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.
@@ -60 +55 @@
  * 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.
  */
@@ -73 +68 @@
 {
         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)) {
-                        if (usb_kbd_is_ready_to_destroy(kbd)) {
-                                usb_kbd_free(&kbd);
-                                assert(kbd == NULL);
-                        }
+                        usb_log_warning("kbd not ready, exiting autorepeat.\n");
                         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);
-                                // ugly hack with the NULL
-                                usb_kbd_push_ev(NULL, kbd, KEY_PRESS, 
+                                usb_kbd_push_ev(kbd, KEY_PRESS,
                                     kbd->repeat.key_repeated);
                                 delay = kbd->repeat.delay_between;
@@ -110 +101 @@
                         delay = CHECK_DELAY;
                 }
-                fibril_mutex_unlock(kbd->repeat_mtx);
-                
+                fibril_mutex_unlock(&kbd->repeat_mtx);
                 async_usleep(delay);
         }
 }
-
 /*----------------------------------------------------------------------------*/
 /**
@@ -121 +110 @@
  *
  * Starts the loop for checking changes in auto-repeat.
- * 
+ *
  * @param arg User-specified argument. Expects pointer to the keyboard device
  *            structure representing the keyboard.
@@ -131 +120 @@
 {
         usb_log_debug("Autorepeat fibril spawned.\n");
-        
+
         if (arg == NULL) {
                 usb_log_error("No device!\n");
                 return EINVAL;
         }
-        
-        usb_kbd_t *kbd = (usb_kbd_t *)arg;
-        
+
+        usb_kbd_t *kbd = arg;
+
         usb_kbd_repeat_loop(kbd);
-        
+
         return EOK;
 }
-
 /*----------------------------------------------------------------------------*/
 /**
@@ -157 +145 @@
 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);
 }
-
 /*----------------------------------------------------------------------------*/
 /**
@@ -167 +154 @@
  *
  * @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).
  *
@@ -175 +162 @@
 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);
 }
-
 /**
  * @}