Changes in uspace/srv/console/console.c [cc1f8d4:47a350f] in mainline

File:

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

uspace/srv/console/console.c

@@ -50 +50 @@
 #include <event.h>
 #include <devmap.h>
-#include <fibril_sync.h>
+#include <fcntl.h>
+#include <vfs/vfs.h>
+#include <fibril_synch.h>
 
 #include "console.h"
@@ -57 +59 @@
 #include "screenbuffer.h"
 
-#define NAME  "console"
-
-#define MAX_DEVICE_NAME  32
+#define NAME       "console"
+#define NAMESPACE  "term"
 
 /** Phone to the keyboard driver. */
@@ -69 +70 @@
         ipcarg_t cols;  /**< Framebuffer columns */
         ipcarg_t rows;  /**< Framebuffer rows */
-        int color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
+        int color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
 } fb_info;
 
@@ -601 +602 @@
                                     IPC_GET_ARG2(call));
                         break;
+                case CONSOLE_GET_POS:
+                        arg1 = cons->scr.position_x;
+                        arg2 = cons->scr.position_y;
+                        break;
                 case CONSOLE_GET_SIZE:
                         arg1 = fb_info.cols;
@@ -662 +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;
         }
@@ -699 +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);
@@ -736 +747 @@
                         consoles[i].refcount = 0;
                         
-                        char vc[MAX_DEVICE_NAME];
-                        snprintf(vc, MAX_DEVICE_NAME, "vc%u", i);
+                        char vc[DEVMAP_NAME_MAXLEN + 1];
+                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%u", NAMESPACE, i);
                         
                         if (devmap_device_register(vc, &consoles[i].dev_handle) != EOK) {
@@ -768 +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;