Changeset e69f10b in mainline for uspace/drv/usbhid/kbddev.h

Timestamp:

2011-03-10T19:07:11Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

a8def7d

Parents:

7351dc3 (diff), 45dd8bf (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:

Merged changes from lelian/hidd

File:

• uspace/drv/usbhid/kbddev.h (modified) (3 diffs)

uspace/drv/usbhid/kbddev.h

@@ -39 +39 @@
 #include <stdint.h>
 
+#include <fibril_synch.h>
+
 #include <usb/classes/hid.h>
 #include <usb/classes/hidparser.h>
@@ -47 +49 @@
 
 /*----------------------------------------------------------------------------*/
+/**
+ * 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;
 
 /**
- * @brief USB/HID keyboard device type.
+ * USB/HID keyboard device type.
+ *
+ * Holds a reference to generic USB/HID device structure and keyboard-specific
+ * data, such as currently pressed keys, modifiers and lock keys.
+ *
+ * Also holds a IPC phone to the console (since there is now no other way to 
+ * communicate with it).
+ *
+ * @note Storing active lock keys in this structure results in their setting
+ *       being device-specific.
  */
 typedef struct {
+        /** Structure holding generic USB/HID device information. */
         usbhid_dev_t *hid_dev;
         
-        uint8_t *keycodes;
-        size_t keycode_count;
+        /** Currently pressed keys (not translated to key codes). */
+        uint8_t *keys;
+        /** Count of stored keys (i.e. number of keys in the report). */
+        size_t key_count;
+        /** Currently pressed modifiers (bitmap). */
         uint8_t modifiers;
         
+        /** Currently active modifiers including locks. Sent to the console. */
         unsigned mods;
+        
+        /** Currently active lock keys. */
         unsigned lock_keys;
         
+        /** IPC phone to the console device (for sending key events). */
         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;
+
         usb_hid_report_parser_t *parser;
         
+        /** State of the structure (for checking before use). */
         int initialized;
 } usbhid_kbd_t;
@@ -72 +111 @@
 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_ */