Changeset f1fae414 in mainline for uspace/srv/hid/input/include/layout.h

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/srv/hid/input/include/layout.h (moved) (moved from uspace/srv/hid/kbd/include/layout.h ) (2 diffs)

uspace/srv/hid/input/include/layout.h

@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+/** @addtogroup inputgen generic
+ * @brief Keyboard layout interface.
+ * @ingroup input
  * @{
  */
@@ -41 +41 @@
 #include <io/console.h>
 
-typedef struct {
-        void (*reset)(void);
-        wchar_t (*parse_ev)(kbd_event_t *);
-} layout_op_t;
+/** Layout instance state */
+typedef struct layout {
+        /** Ops structure */
+        struct layout_ops *ops;
 
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
+        /* Layout-private data */
+        void *layout_priv;
+} layout_t;
+
+/** Layout ops */
+typedef struct layout_ops {
+        int (*create)(layout_t *);
+        void (*destroy)(layout_t *);
+        wchar_t (*parse_ev)(layout_t *, kbd_event_t *);
+} layout_ops_t;
+
+extern layout_ops_t us_qwerty_ops;
+extern layout_ops_t us_dvorak_ops;
+extern layout_ops_t cz_ops;
+
+extern layout_t *layout_create(layout_ops_t *);
+extern void layout_destroy(layout_t *);
+extern wchar_t layout_parse_ev(layout_t *, kbd_event_t *);
 
 #endif