Changeset 9be360ee in mainline for uspace/srv/hid/kbd/include

Timestamp:

2011-06-11T22:06:47Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4f3f9659

Parents:

56ad818

Message:

Allow keyboard server to handle more than one driver at the same time.

Location:

uspace/srv/hid/kbd/include

Files:

• kbd.h (modified) (2 diffs)
• kbd_ctl.h (modified) (1 diff)
• kbd_port.h (modified) (1 diff)
• stroke.h (modified) (2 diffs)
• sun.h (modified) (1 diff)

uspace/srv/hid/kbd/include/kbd.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +39 @@
 #define KBD_KBD_H_
 
+#include <adt/list.h>
 #include <bool.h>
+
+struct kbd_port_ops;
+struct kbd_ctl_ops;
+
+typedef struct kbd_dev {
+        /** Link to kbd_devs list */
+        link_t kbd_devs;
+
+        /** Port ops */
+        struct kbd_port_ops *port_ops;
+
+        /** Ctl ops */
+        struct kbd_ctl_ops *ctl_ops;
+} kbd_dev_t;
 
 extern bool irc_service;
 extern int irc_phone;
 
-extern void kbd_push_scancode(int);
-extern void kbd_push_ev(int, unsigned int);
+extern void kbd_push_scancode(kbd_dev_t *, int);
+extern void kbd_push_ev(kbd_dev_t *, int, unsigned int);
 
 #endif

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

@@ -40 +40 @@
 #include <kbd_port.h>
 
-typedef struct {
+struct kbd_dev;
+
+typedef struct kbd_ctl_ops {
         void (*parse_scancode)(int);
-        int (*init)(kbd_port_ops_t *);
+        int (*init)(struct kbd_dev *);
         void (*set_ind)(unsigned);
 } kbd_ctl_ops_t;

uspace/srv/hid/kbd/include/kbd_port.h

@@ -40 +40 @@
 #include <sys/types.h>
 
-typedef struct {
-        int (*init)(void);
+struct kbd_dev;
+
+typedef struct kbd_port_ops {
+        int (*init)(struct kbd_dev *);
         void (*yield)(void);
         void (*reclaim)(void);

uspace/srv/hid/kbd/include/stroke.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #define KBD_STROKE_H_
 
-extern void stroke_sim(unsigned, unsigned);
+#include <kbd.h>
+
+extern void stroke_sim(kbd_dev_t *, unsigned, unsigned);
 
 #endif

uspace/srv/hid/kbd/include/sun.h

@@ -38 +38 @@
 #define KBD_SUN_H_
 
-extern int ns16550_port_init(void);
-extern int z8530_port_init(void);
+#include <kbd.h>
+
+extern int ns16550_port_init(kbd_dev_t *);
+extern int z8530_port_init(kbd_dev_t *);
 
 #endif