Changeset d900699 in mainline for uspace/srv/hid/input/include/kbd_ctl.h

Timestamp:

2011-06-17T16:48:53Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/kbd_ctl.h (moved) (moved from uspace/drv/usbhid/layout.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2011 Lubos Slovak 
- * (copied from /uspace/srv/hid/kbd/include/layout.h)
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -29 +27 @@
  */
 
-/** @addtogroup drvusbhid
+/** @addtogroup inputgen generic
+ * @brief       Keyboard controller driver interface.
+ * @ingroup  input
  * @{
  */
 /** @file
- * Keyboard layout.
  */
 
-#ifndef USB_HID_LAYOUT_H_
-#define USB_HID_LAYOUT_H_
+#ifndef KBD_CTL_H_
+#define KBD_CTL_H_
 
-#include <sys/types.h>
-#include <io/console.h>
+#include <kbd_port.h>
 
-typedef struct {
-        void (*reset)(void);
-        wchar_t (*parse_ev)(kbd_event_t *);
-} layout_op_t;
+struct kbd_dev;
 
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
+typedef struct kbd_ctl_ops {
+        void (*parse_scancode)(int);
+        int (*init)(struct kbd_dev *);
+        void (*set_ind)(struct kbd_dev *, unsigned);
+} kbd_ctl_ops_t;
+
+extern kbd_ctl_ops_t apple_ctl;
+extern kbd_ctl_ops_t gxe_fb_ctl;
+extern kbd_ctl_ops_t kbdev_ctl;
+extern kbd_ctl_ops_t pc_ctl;
+extern kbd_ctl_ops_t stty_ctl;
+extern kbd_ctl_ops_t sun_ctl;
 
 #endif
@@ -55 +59 @@
 /**
  * @}
- */
+ */ 
+