Changeset 5eb5dcf in mainline for uspace/srv/hid/console/console.c

Timestamp:

2010-01-06T20:56:04Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fccc236

Parents:

002252a (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/console/console.c (moved) (moved from uspace/srv/console/console.c ) (10 diffs)

uspace/srv/hid/console/console.c

@@ -37 +37 @@
 #include <ipc/kbd.h>
 #include <io/keycode.h>
+#include <ipc/mouse.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
@@ -50 +51 @@
 #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 +60 @@
 #include "screenbuffer.h"
 
-#define NAME  "console"
-
-#define MAX_DEVICE_NAME  32
+#define NAME       "console"
+#define NAMESPACE  "term"
 
 /** Phone to the keyboard driver. */
 static int kbd_phone;
+
+/** Phone to the mouse driver. */
+static int mouse_phone;
 
 /** Information about framebuffer */
@@ -69 +74 @@
         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;
 
@@ -425 +430 @@
 }
 
+/** Handler for mouse events */
+static void mouse_events(ipc_callid_t iid, ipc_call_t *icall)
+{
+        int button, press;
+        int dx, dy;
+        int newcon;
+
+        /* Ignore parameters, the connection is already opened */
+        while (true) {
+
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+
+                int retval;
+
+                switch (IPC_GET_METHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
+                        /* TODO: Handle hangup */
+                        return;
+                case MEVENT_BUTTON:
+                        button = IPC_GET_ARG1(call);
+                        press = IPC_GET_ARG2(call);
+                        if (button == 1) {
+                                newcon = gcons_mouse_btn(press);
+                                if (newcon != -1)
+                                        change_console(&consoles[newcon]);
+                        }
+                        retval = 0;
+                        break;
+                case MEVENT_MOVE:
+                        dx = IPC_GET_ARG1(call);
+                        dy = IPC_GET_ARG2(call);
+                        gcons_mouse_move(dx, dy);
+                        retval = 0;
+                        break;
+                default:
+                        retval = ENOENT;
+                }
+
+                ipc_answer_0(callid, retval);
+        }
+}
+
 static void cons_write(console_t *cons, ipc_callid_t rid, ipc_call_t *request)
 {
@@ -666 +714 @@
 }
 
-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;
         }
-        
+
         async_new_connection(phonehash, 0, NULL, keyboard_events);
+
+        /* Connect to mouse device */
+        mouse_phone = -1;
+        int mouse_fd = open("/dev/hid_in/mouse", O_RDONLY);
+
+        if (mouse_fd < 0) {
+                printf(NAME ": Notice - failed opening %s\n", "/dev/hid_in/mouse");
+                goto skip_mouse;
+        }
+
+        mouse_phone = fd_phone(mouse_fd);
+        if (mouse_phone < 0) {
+                printf(NAME ": Failed to connect to mouse device\n");
+                goto skip_mouse;
+        }
+
+        if (ipc_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+                printf(NAME ": Failed to create callback from mouse device\n");
+                mouse_phone = -1;
+                goto skip_mouse;
+        }
+
+        async_new_connection(phonehash, 0, NULL, mouse_events);
+skip_mouse:
 
         /* Connect to framebuffer driver */
@@ -691 +768 @@
                 return -1;
         }
-        
+
         /* Register driver */
         int rc = devmap_driver_register(NAME, client_connection);
@@ -703 +780 @@
         
         /* 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);
@@ -740 +818 @@
                         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) {
@@ -772 +850 @@
 }
 
+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;