Changeset b1bdc7a4 in mainline for uspace/srv/hid/kbd/ctl

Timestamp:

2011-06-11T19:48:15Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

56ad818

Parents:

774fc85

Message:

Control keyboard port modules through ops structures. Allows compiling in
all modules at the same time.

Location:

uspace/srv/hid/kbd/ctl

Files:

• apple.c (modified) (2 diffs)
• gxe_fb.c (modified) (2 diffs)
• pc.c (modified) (3 diffs)
• stty.c (modified) (2 diffs)
• sun.c (modified) (2 diffs)

uspace/srv/hid/kbd/ctl/apple.c

@@ -40 +40 @@
 #include <io/keycode.h>
 #include <kbd_ctl.h>
+#include <kbd_port.h>
 
 #define KBD_KEY_RELEASE         0x80
@@ -45 +46 @@
 static int scanmap[];
 
-int kbd_ctl_init(void)
+int kbd_ctl_init(kbd_port_ops_t *kbd_port)
 {
+        (void) kbd_port;
         return 0;
 }

uspace/srv/hid/kbd/ctl/gxe_fb.c

@@ -40 +40 @@
 #include <io/keycode.h>
 #include <kbd_ctl.h>
+#include <kbd_port.h>
 #include <gsp.h>
 #include <stroke.h>
@@ -207 +208 @@
 };
 
-int kbd_ctl_init(void)
+int kbd_ctl_init(kbd_port_ops_t *kbd_port)
 {
+        (void) kbd_port;
         ds = 0;
 

uspace/srv/hid/kbd/ctl/pc.c

@@ -64 +64 @@
 
 static enum dec_state ds;
+static kbd_port_ops_t *kbd_port;
 
 static int scanmap_simple[] = {
@@ -197 +198 @@
 };
 
-int kbd_ctl_init(void)
+int kbd_ctl_init(kbd_port_ops_t *kbd_p)
 {
+        kbd_port = kbd_p;
         ds = ds_s;
         return 0;
@@ -265 +267 @@
                 b = b | LI_SCROLL;
 
-        kbd_port_write(KBD_CMD_SET_LEDS);
-        kbd_port_write(b);
+        (*kbd_port->write)(KBD_CMD_SET_LEDS);
+        (*kbd_port->write)(b);
 }
 

uspace/srv/hid/kbd/ctl/stty.c

@@ -39 +39 @@
 #include <io/keycode.h>
 #include <kbd_ctl.h>
+#include <kbd_port.h>
 #include <gsp.h>
 #include <stroke.h>
@@ -206 +207 @@
 };
 
-int kbd_ctl_init(void)
+int kbd_ctl_init(kbd_port_ops_t *kbd_port)
 {
+        (void) kbd_port;
         ds = 0;
 

uspace/srv/hid/kbd/ctl/sun.c

@@ -40 +40 @@
 #include <io/keycode.h>
 #include <kbd_ctl.h>
+#include <kbd_port.h>
 
 #define KBD_KEY_RELEASE         0x80
@@ -46 +47 @@
 static int scanmap_simple[];
 
-int kbd_ctl_init(void)
+int kbd_ctl_init(kbd_port_ops_t *kbd_port)
 {
         return 0;