Changeset dfe53af in mainline

Timestamp:

2011-03-10T10:47:55Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

17ada7a, 8a02ff3

Parents:

269bd9b4

Message:

Auto-repeat of keys.

• Added structure usbhid_kbd_repeat_t.
• Added functions for:
  • checking repeat status in a loop
  • starting to repeat a key
  • stopping to repeat a key

Location:

uspace/drv/usbhid

Files:

• Makefile (modified) (1 diff)
• kbddev.c (modified) (12 diffs)
• kbddev.h (modified) (4 diffs)
• kbdrepeat.c (added)
• kbdrepeat.h (added)

uspace/drv/usbhid/Makefile

@@ -42 +42 @@
         hidreq.c \
         kbddev.c \
+        kbdrepeat.c \
         hiddev.c \
         $(STOLEN_LAYOUT_SOURCES)

uspace/drv/usbhid/kbddev.c

@@ -37 +37 @@
 #include <errno.h>
 #include <str_error.h>
-#include <fibril.h>
 #include <stdio.h>
 
@@ -43 +42 @@
 #include <ipc/kbd.h>
 #include <async.h>
+#include <fibril.h>
+#include <fibril_synch.h>
 
 #include <usb/usb.h>
@@ -56 +57 @@
 #include "layout.h"
 #include "conv.h"
+#include "kbdrepeat.h"
 
 /*----------------------------------------------------------------------------*/
@@ -65 +67 @@
 static const uint8_t BOOTP_ERROR_ROLLOVER = 1;
 static const uint8_t IDLE_RATE = 0;
+static const unsigned int DEFAULT_DELAY_BEFORE_FIRST_REPEAT = 500 * 1000;
+static const unsigned int DEFAULT_REPEAT_DELAY = 50 * 1000;
 
 /** Keyboard polling endpoint description for boot protocol class. */
@@ -190 +194 @@
 /*----------------------------------------------------------------------------*/
 
-static void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type, 
-    unsigned int key)
+void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type, unsigned int key)
 {
         console_event_t ev;
@@ -233 +236 @@
                          * up the lock state.
                          */
+                        unsigned int locks_old = kbd_dev->lock_keys;
+                        
                         kbd_dev->mods = 
                             kbd_dev->mods ^ (mod_mask & ~kbd_dev->lock_keys);
@@ -238 +243 @@
 
                         /* Update keyboard lock indicator lights. */
-                        usbhid_kbd_set_led(kbd_dev);
+                        if (kbd_dev->lock_keys != locks_old) {
+                                usbhid_kbd_set_led(kbd_dev);
+                        }
                 } else {
                         kbd_dev->lock_keys = kbd_dev->lock_keys & ~mod_mask;
@@ -359 +366 @@
                         // not found, i.e. the key was released
                         key = usbhid_parse_scancode(kbd_dev->keys[j]);
+                        usbhid_kbd_repeat_stop(kbd_dev, key);
                         usbhid_kbd_push_ev(kbd_dev, KEY_RELEASE, key);
                         usb_log_debug2("Key released: %d\n", key);
@@ -383 +391 @@
                             key_codes[i]);
                         usbhid_kbd_push_ev(kbd_dev, KEY_PRESS, key);
+                        usbhid_kbd_repeat_start(kbd_dev, key);
                 } else {
                         // found, nothing happens
@@ -527 +536 @@
         }
         
+        if ((*kbd_dev)->repeat_mtx != NULL) {
+                /* TODO: replace by some check and wait */
+                assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
+                free((*kbd_dev)->repeat_mtx);
+        }
+        
         free(*kbd_dev);
         *kbd_dev = NULL;
@@ -598 +613 @@
         kbd_dev->mods = DEFAULT_ACTIVE_MODS;
         kbd_dev->lock_keys = 0;
+        
+        kbd_dev->repeat.key_new = 0;
+        kbd_dev->repeat.key_repeated = 0;
+        kbd_dev->repeat.delay_before = DEFAULT_DELAY_BEFORE_FIRST_REPEAT;
+        kbd_dev->repeat.delay_between = DEFAULT_REPEAT_DELAY;
+        
+        kbd_dev->repeat_mtx = (fibril_mutex_t *)(
+            malloc(sizeof(fibril_mutex_t)));
+        if (kbd_dev->repeat_mtx == NULL) {
+                usb_log_fatal("No memory!\n");
+                free(kbd_dev->keys);
+                return ENOMEM;
+        }
+        
+        fibril_mutex_initialize(kbd_dev->repeat_mtx);
         
         /*
@@ -833 +863 @@
         }
         fibril_add_ready(fid);
+        
+        /*
+         * Create new fibril for auto-repeat
+         */
+        fid = fibril_create(usbhid_kbd_repeat_fibril, kbd_dev);
+        if (fid == 0) {
+                usb_log_error("Failed to start fibril for KBD auto-repeat");
+                return ENOMEM;
+        }
+        fibril_add_ready(fid);
 
         (void)keyboard_ops;

uspace/drv/usbhid/kbddev.h

@@ -39 +39 @@
 #include <stdint.h>
 
+#include <fibril_synch.h>
+
 #include <usb/classes/hid.h>
 #include <ddf/driver.h>
@@ -46 +48 @@
 
 /*----------------------------------------------------------------------------*/
+/**
+ * Structure for keeping information needed for auto-repeat of keys.
+ */
+typedef struct {
+        /** Last pressed key. */
+        unsigned int key_new;
+        /** Key to be repeated. */
+        unsigned int key_repeated;
+        /** Delay before first repeat in microseconds. */
+        unsigned int delay_before;
+        /** Delay between repeats in microseconds. */
+        unsigned int delay_between;
+} usbhid_kbd_repeat_t;
+
 /**
  * USB/HID keyboard device type.
@@ -78 +94 @@
         int console_phone;
         
+        /** Information for auto-repeat of keys. */
+        usbhid_kbd_repeat_t repeat;
+        
+        /** Mutex for accessing the information about auto-repeat. */
+        fibril_mutex_t *repeat_mtx;
+        
         /** State of the structure (for checking before use). */
         int initialized;
@@ -86 +108 @@
 int usbhid_kbd_try_add_device(ddf_dev_t *dev);
 
+void usbhid_kbd_push_ev(usbhid_kbd_t *kbd_dev, int type, unsigned int key);
+
 #endif /* USBHID_KBDDEV_H_ */