Changeset f1fae414 in mainline for uspace/srv/hid/input/layout/us_qwerty.c

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/layout/us_qwerty.c (moved) (moved from uspace/srv/hid/kbd/layout/us_qwerty.c ) (4 diffs)

uspace/srv/hid/input/layout/us_qwerty.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbd
+/** @addtogroup input
  * @brief       US QWERTY layout.
  * @{
- */ 
-
+ */
+
+#include <errno.h>
 #include <kbd.h>
 #include <io/console.h>
@@ -37 +38 @@
 #include <layout.h>
 
-static void layout_reset(void);
-static wchar_t layout_parse_ev(kbd_event_t *ev);
-
-layout_op_t us_qwerty_op = {
-        layout_reset,
-        layout_parse_ev
+static int us_qwerty_create(layout_t *);
+static void us_qwerty_destroy(layout_t *);
+static wchar_t us_qwerty_parse_ev(layout_t *, kbd_event_t *ev);
+
+layout_ops_t us_qwerty_ops = {
+        .create = us_qwerty_create,
+        .destroy = us_qwerty_destroy,
+        .parse_ev = us_qwerty_parse_ev
 };
 
@@ -200 +203 @@
 }
 
-static void layout_reset(void)
-{
-}
-
-static wchar_t layout_parse_ev(kbd_event_t *ev)
+static int us_qwerty_create(layout_t *state)
+{
+        return EOK;
+}
+
+static void us_qwerty_destroy(layout_t *state)
+{
+}
+
+static wchar_t us_qwerty_parse_ev(layout_t *state, kbd_event_t *ev)
 {
         wchar_t c;