Changeset f1fae414 in mainline for uspace/srv/hid/input/include/kbd_port.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/kbd_port.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_port.h ) (4 diffs)

uspace/srv/hid/input/include/kbd_port.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 port driver interface.
+ * @ingroup input
  * @{
- */ 
+ */
 /** @file
  */
@@ -40 +40 @@
 #include <sys/types.h>
 
-extern int kbd_port_init(void);
-extern void kbd_port_yield(void);
-extern void kbd_port_reclaim(void);
-extern void kbd_port_write(uint8_t);
+struct kbd_dev;
+
+typedef struct kbd_port_ops {
+        int (*init)(struct kbd_dev *);
+        void (*yield)(void);
+        void (*reclaim)(void);
+        void (*write)(uint8_t);
+} kbd_port_ops_t;
+
+extern kbd_port_ops_t adb_port;
+extern kbd_port_ops_t chardev_port;
+extern kbd_port_ops_t gxemul_port;
+extern kbd_port_ops_t msim_port;
+extern kbd_port_ops_t niagara_port;
+extern kbd_port_ops_t ns16550_port;
+extern kbd_port_ops_t pl050_port;
+extern kbd_port_ops_t sgcn_port;
+extern kbd_port_ops_t ski_port;
+extern kbd_port_ops_t z8530_port;
 
 #endif
@@ -49 +64 @@
 /**
  * @}
- */ 
-
+ */