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

Timestamp:

2011-06-11T19:48:15Z (13 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.

File:

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

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

@@ -71 +71 @@
 static unsigned lock_keys;
 
+static kbd_port_ops_t *kbd_port;
+
 bool irc_service = false;
 int irc_phone = -1;
@@ -201 +203 @@
                         break;
                 case KBD_YIELD:
-                        kbd_port_yield();
+                        (*kbd_port->yield)();
                         retval = 0;
                         break;
                 case KBD_RECLAIM:
-                        kbd_port_reclaim();
+                        (*kbd_port->reclaim)();
                         retval = 0;
                         break;
@@ -215 +217 @@
 }
 
+static kbd_port_ops_t *kbd_select_port(void)
+{
+        kbd_port_ops_t *kbd_port;
+
+#if defined(UARCH_amd64)
+        kbd_port = &chardev_port;
+#elif defined(UARCH_arm32) && defined(MACHINE_gta02)
+        kbd_port = &chardev_port;
+#elif defined(UARCH_arm32) && defined(MACHINE_testarm)
+        kbd_port = &gxemul_port;
+#elif defined(UARCH_arm32) && defined(MACHINE_integratorcp)
+        kbd_port = &pl050_port;
+#elif defined(UARCH_ia32)
+        kbd_port = &chardev_port;
+#elif defined(MACHINE_i460GX)
+        kbd_port = &chardev_port;
+#elif defined(MACHINE_ski)
+        kbd_port = &ski_port;
+#elif defined(MACHINE_msim)
+        kbd_port = &msim_port;
+#elif defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
+        kbd_port = &gxemul_port;
+#elif defined(UARCH_ppc32)
+        kbd_port = &adb_port;
+#elif defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
+        kbd_port = &niagara_port;
+#elif defined(UARCH_sparc64) && defined(MACHINE_serengeti)
+        kbd_port = &sgcn_port;
+#elif defined(UARCH_sparc64) && defined(MACHINE_generic)
+        kbd_port = &sun_port;
+#else
+        kbd_port = &dummy_port;
+#endif
+        return kbd_port;
+}
 
 int main(int argc, char **argv)
@@ -232 +269 @@
         }
         
+        /* Select port driver. */
+        kbd_port = kbd_select_port();
+
         /* Initialize port driver. */
-        if (kbd_port_init() != 0)
+        if ((*kbd_port->init)() != 0)
                 return -1;
 
         /* Initialize controller driver. */
-        if (kbd_ctl_init() != 0)
+        if (kbd_ctl_init(kbd_port) != 0)
                 return -1;