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

File:

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

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;
 
 /*----------------------------------------------------------------------------*/
@@ -73 +71 @@
 {
         unsigned int delay = 0;
-        
+
         usb_log_debug("Starting autorepeat loop.\n");
 
@@ -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;
                 }
                 
-                fibril_mutex_lock(kbd->repeat_mtx);
+                fibril_mutex_lock(&kbd->repeat_mtx);
 
                 if (kbd->repeat.key_new > 0) {
@@ -109 +105 @@
                         delay = CHECK_DELAY;
                 }
-                fibril_mutex_unlock(kbd->repeat_mtx);
+                fibril_mutex_unlock(&kbd->repeat_mtx);
                 
                 async_usleep(delay);
@@ -130 +126 @@
 {
         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_repeat_loop(kbd);
-        
+
         return EOK;
 }
@@ -156 +152 @@
 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);
 }
 
@@ -174 +170 @@
 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);
 }