Changeset 47a350f in mainline for uspace/srv/console/console.c

Timestamp:

2009-12-16T01:49:16Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

df747bd8

Parents:

4491338

Message:

keyboard is not a single possible human input device, thus don't register the kbd driver as a singleton service to the Naming service, but to the Device mapper

File:

• uspace/srv/console/console.c (modified) (4 diffs)

uspace/srv/console/console.c

@@ -50 +50 @@
 #include <event.h>
 #include <devmap.h>
+#include <fcntl.h>
+#include <vfs/vfs.h>
 #include <fibril_synch.h>
 
@@ -665 +667 @@
 }
 
-static bool console_init(void)
-{
-        ipcarg_t color_cap;
-
-        /* Connect to keyboard driver */
-        kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+static bool console_init(char *input)
+{
+        /* Connect to input device */
+        int input_fd = open(input, O_RDONLY);
+        if (input_fd < 0) {
+                printf(NAME ": Failed opening %s\n", input);
+                return false;
+        }
+        
+        kbd_phone = fd_phone(input_fd);
         if (kbd_phone < 0) {
-                printf(NAME ": Failed to connect to keyboard service\n");
+                printf(NAME ": Failed to connect to input device\n");
                 return false;
         }
         
+        /* NB: The callback connection is slotted for removal */
         ipcarg_t phonehash;
         if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
-                printf(NAME ": Failed to create callback from keyboard service\n");
+                printf(NAME ": Failed to create callback from input device\n");
                 return false;
         }
@@ -702 +709 @@
         
         /* Synchronize, the gcons could put something in queue */
+        ipcarg_t color_cap;
         async_req_0_0(fb_info.phone, FB_FLUSH);
         async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.cols, &fb_info.rows);
@@ -771 +779 @@
 }
 
+static void usage(void)
+{
+        printf("Usage: console <input>\n");
+}
+
 int main(int argc, char *argv[])
 {
+        if (argc < 2) {
+                usage();
+                return -1;
+        }
+        
         printf(NAME ": HelenOS Console service\n");
         
-        if (!console_init())
+        if (!console_init(argv[1]))
                 return -1;