Changeset 432a269 in mainline for uspace/lib/c/include/io/console.h

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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:

Merge mainline changes

File:

• uspace/lib/c/include/io/console.h (modified) (3 diffs)

uspace/lib/c/include/io/console.h

@@ -37 +37 @@
 
 #include <sys/time.h>
+#include <io/keycode.h>
 #include <async.h>
 #include <bool.h>
@@ -42 +43 @@
 
 typedef enum {
-        CONSOLE_CCAP_NONE = 0,
-        CONSOLE_CCAP_STYLE,
-        CONSOLE_CCAP_INDEXED,
-        CONSOLE_CCAP_RGB
+        CONSOLE_CAP_NONE = 0,
+        CONSOLE_CAP_STYLE = 1,
+        CONSOLE_CAP_INDEXED = 2,
+        CONSOLE_CAP_RGB = 4
 } console_caps_t;
 
@@ -76 +77 @@
 /** Console event structure. */
 typedef struct {
+        /** List handle */
+        link_t link;
+        
         /** Press or release event. */
         kbd_event_type_t type;
         
         /** Keycode of the key that was pressed or released. */
-        unsigned int key;
+        keycode_t key;
         
         /** Bitmask of modifiers held. */
-        unsigned int mods;
+        keymod_t mods;
         
         /** The character that was generated or '\0' for none. */