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

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/srv/hid/kbd/include/kbd_ctl.h ) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief       HelenOS generic uspace keyboard handler.
- * @ingroup  kbd
+/** @addtogroup inputgen generic
+ * @brief Keyboard controller driver interface.
+ * @ingroup input
  * @{
- */ 
+ */
 /** @file
  */
@@ -38 +38 @@
 #define KBD_CTL_H_
 
-extern void kbd_ctl_parse_scancode(int);
-extern int kbd_ctl_init(void);
-extern void kbd_ctl_set_ind(unsigned);
+#include <kbd_port.h>
+
+struct kbd_dev;
+
+typedef struct kbd_ctl_ops {
+        void (*parse)(sysarg_t);
+        int (*init)(struct kbd_dev *);
+        void (*set_ind)(struct kbd_dev *, unsigned int);
+} 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
@@ -46 +59 @@
 /**
  * @}
- */ 
-
+ */