Changeset 56ad818 in mainline for uspace/srv/hid/kbd/generic/kbd.c

Timestamp:

2011-06-11T20:29:41Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be360ee

Parents:

b1bdc7a4

Message:

Control keyboard ctl modules through ops structures. Always compile in
all ctl modules.

File:

• uspace/srv/hid/kbd/generic/kbd.c (modified) (6 diffs)

uspace/srv/hid/kbd/generic/kbd.c

@@ -72 +72 @@
 
 static kbd_port_ops_t *kbd_port;
+static kbd_ctl_ops_t *kbd_ctl;
 
 bool irc_service = false;
@@ -89 +90 @@
 {
 /*      printf("scancode: 0x%x\n", scancode);*/
-        kbd_ctl_parse_scancode(scancode);
+        (*kbd_ctl->parse_scancode)(scancode);
 }
 
@@ -132 +133 @@
 
                         /* Update keyboard lock indicator lights. */
-                        kbd_ctl_set_ind(mods);
+                        (*kbd_ctl->set_ind)(mods);
                 } else {
                         lock_keys = lock_keys & ~mod_mask;
@@ -217 +218 @@
 }
 
-static kbd_port_ops_t *kbd_select_port(void)
-{
-        kbd_port_ops_t *kbd_port;
-
+static void kbd_select_drivers(kbd_port_ops_t **port, kbd_ctl_ops_t **ctl)
+{
 #if defined(UARCH_amd64)
-        kbd_port = &chardev_port;
+        *port = &chardev_port;
+        *ctl = &pc_ctl;
 #elif defined(UARCH_arm32) && defined(MACHINE_gta02)
-        kbd_port = &chardev_port;
+        *port = &chardev_port;
+        *ctl = &stty_ctl;
 #elif defined(UARCH_arm32) && defined(MACHINE_testarm)
-        kbd_port = &gxemul_port;
+        *port = &gxemul_port;
+        #ifdef CONFIG_FB
+                *ctl = &gxe_fb_ctl;
+        #else
+                *ctl = &stty_ctl;
+        #endif
 #elif defined(UARCH_arm32) && defined(MACHINE_integratorcp)
-        kbd_port = &pl050_port;
+        *port = &pl050_port;
+        *ctl = &pc_ctl;
 #elif defined(UARCH_ia32)
-        kbd_port = &chardev_port;
+        *port = &chardev_port;
+        *ctl = &pc_ctl;
 #elif defined(MACHINE_i460GX)
-        kbd_port = &chardev_port;
+        *port = &chardev_port;
+        *ctl = &pc_ctl;
 #elif defined(MACHINE_ski)
-        kbd_port = &ski_port;
+        *port = &ski_port;
+        *ctl = &stty_ctl;
 #elif defined(MACHINE_msim)
-        kbd_port = &msim_port;
+        *port = &msim_port;
+        *ctl = &stty_ctl;
 #elif defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
-        kbd_port = &gxemul_port;
+        *port = &gxemul_port;
+        #ifdef CONFIG_FB
+                *ctl = &gxe_fb_ctl;
+        #else
+                *ctl = &stty_ctl;
+        #endif
 #elif defined(UARCH_ppc32)
-        kbd_port = &adb_port;
+        *port = &adb_port;
+        *ctl = &apple_ctl;
 #elif defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
-        kbd_port = &niagara_port;
+        *port = &niagara_port;
+        *ctl = &stty_ctl;
 #elif defined(UARCH_sparc64) && defined(MACHINE_serengeti)
-        kbd_port = &sgcn_port;
+        *port = &sgcn_port;
+        *ctl = &stty_ctl;
 #elif defined(UARCH_sparc64) && defined(MACHINE_generic)
-        kbd_port = &sun_port;
+        *port = &sun_port;
+        *ctl = &sun_ctl;
 #else
-        kbd_port = &dummy_port;
+        *port = &dummy_port;
+        *ctl = &pc_ctl;
 #endif
-        return kbd_port;
 }
 
@@ -269 +289 @@
         }
         
-        /* Select port driver. */
-        kbd_port = kbd_select_port();
+        /* Select port and controller drivers. */
+        kbd_select_drivers(&kbd_port, &kbd_ctl);
 
         /* Initialize port driver. */
@@ -277 +297 @@
 
         /* Initialize controller driver. */
-        if (kbd_ctl_init(kbd_port) != 0)
+        if ((*kbd_ctl->init)(kbd_port) != 0)
                 return -1;