Changeset 9c0f158 in mainline for uspace/drv/usbkbd/kbdrepeat.c

Timestamp:

2011-03-25T15:21:01Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

57d9c05e

Parents:

96bfe76 (diff), f08c560 (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:

development merge

File:

• uspace/drv/usbkbd/kbdrepeat.c (moved) (moved from uspace/drv/usbhid/kbdrepeat.c ) (8 diffs)

uspace/drv/usbkbd/kbdrepeat.c

@@ -62 +62 @@
  * 
  * If the currently repeated key is not pressed any more (
- * usbhid_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.
  *
@@ -70 +70 @@
  * @param kbd Keyboard device structure.
  */
-static void usbhid_kbd_repeat_loop(usbhid_kbd_t *kbd)
+static void usb_kbd_repeat_loop(usb_kbd_t *kbd)
 {
         unsigned int delay = 0;
@@ -78 +78 @@
         while (true) {
                 // check if the kbd structure is usable
-                if (!usbhid_kbd_is_usable(kbd)) {
-                        usbhid_kbd_free(&kbd);
-                        assert(kbd == NULL);
+                if (!usb_kbd_is_initialized(kbd)) {
+                        if (usb_kbd_is_ready_to_destroy(kbd)) {
+                                usb_kbd_free(&kbd);
+                                assert(kbd == NULL);
+                        }
                         return;
                 }
@@ -90 +92 @@
                                 usb_log_debug2("Repeating key: %u.\n", 
                                     kbd->repeat.key_repeated);
-                                usbhid_kbd_push_ev(kbd, KEY_PRESS, 
+                                usb_kbd_push_ev(kbd, KEY_PRESS, 
                                     kbd->repeat.key_repeated);
                                 delay = kbd->repeat.delay_between;
@@ -125 +127 @@
  * @retval EINVAL if no argument is supplied.
  */
-int usbhid_kbd_repeat_fibril(void *arg)
+int usb_kbd_repeat_fibril(void *arg)
 {
         usb_log_debug("Autorepeat fibril spawned.\n");
@@ -134 +136 @@
         }
         
-        usbhid_kbd_t *kbd = (usbhid_kbd_t *)arg;
+        usb_kbd_t *kbd = (usb_kbd_t *)arg;
         
-        usbhid_kbd_repeat_loop(kbd);
+        usb_kbd_repeat_loop(kbd);
         
         return EOK;
@@ -152 +154 @@
  * @param key Key to start repeating.
  */
-void usbhid_kbd_repeat_start(usbhid_kbd_t *kbd, unsigned int key)
+void usb_kbd_repeat_start(usb_kbd_t *kbd, unsigned int key)
 {
         fibril_mutex_lock(kbd->repeat_mtx);
@@ -170 +172 @@
  * @param key Key to stop repeating.
  */
-void usbhid_kbd_repeat_stop(usbhid_kbd_t *kbd, unsigned int key)
+void usb_kbd_repeat_stop(usb_kbd_t *kbd, unsigned int key)
 {
         fibril_mutex_lock(kbd->repeat_mtx);