Changes in uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c [9d58539:2a5b62b] in mainline

File:

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

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

@@ -45 +45 @@
 #include "kbddev.h"
 
+
+
+/*----------------------------------------------------------------------------*/
 /**
  * Main loop handling the auto-repeat of keys.
@@ -55 +58 @@
  * 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.
  */
@@ -72 +75 @@
 
         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");
                         return;
                 }
-
+                
                 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;
@@ -102 +106 @@
                 }
                 fibril_mutex_unlock(&kbd->repeat_mtx);
+                
                 async_usleep(delay);
         }
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -110 +116 @@
  *
  * Starts the loop for checking changes in auto-repeat.
- *
+ * 
  * @param arg User-specified argument. Expects pointer to the keyboard device
  *            structure representing the keyboard.
@@ -126 +132 @@
         }
 
-        usb_kbd_t *kbd = arg;
+        usb_kbd_t *kbd = (usb_kbd_t *)arg;
 
         usb_kbd_repeat_loop(kbd);
@@ -132 +138 @@
         return EOK;
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -149 +156 @@
         fibril_mutex_unlock(&kbd->repeat_mtx);
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -154 +162 @@
  *
  * @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).
  *
@@ -168 +176 @@
         fibril_mutex_unlock(&kbd->repeat_mtx);
 }
+
 /**
  * @}