Changes in / [73f56e4:bb2dbf8] in mainline

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/lib/libc/include/ipc/char.h (deleted)
• uspace/lib/libc/include/ipc/mouse.h (deleted)
• uspace/srv/char/i8042/Makefile (deleted)
• uspace/srv/char/i8042/Makefile.build (deleted)
• uspace/srv/char/i8042/Makefile.common (deleted)
• uspace/srv/char/i8042/i8042.c (deleted)
• uspace/srv/char/i8042/i8042.h (deleted)
• uspace/srv/console/console.c (modified) (7 diffs)
• uspace/srv/kbd/Makefile.build (modified) (1 diff)
• uspace/srv/kbd/generic/kbd.c (modified) (5 diffs)
• uspace/srv/kbd/port/chardev.c (deleted)
• uspace/srv/kbd/port/i8042.c (added)
• uspace/srv/kbd/port/i8042.h (added)
• uspace/srv/mouse/c_mouse/Makefile (deleted)
• uspace/srv/mouse/c_mouse/Makefile.build (deleted)
• uspace/srv/mouse/c_mouse/Makefile.common (deleted)
• uspace/srv/mouse/c_mouse/c_mouse.c (deleted)
• uspace/srv/mouse/c_mouse/chardev.c (deleted)
• uspace/srv/mouse/c_mouse/include/c_mouse.h (deleted)
• uspace/srv/mouse/c_mouse/include/mouse_port.h (deleted)
• uspace/srv/mouse/c_mouse/include/mouse_proto.h (deleted)
• uspace/srv/mouse/c_mouse/proto/ps2.c (deleted)

boot/arch/amd64/Makefile.inc

@@ -31 +31 @@
 RD_SRVS += \
         $(USPACEDIR)/srv/pci/pci \
-        $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
-        $(USPACEDIR)/srv/char/i8042/i8042 \
-        $(USPACEDIR)/srv/mouse/c_mouse/c_mouse
+        $(USPACEDIR)/srv/bd/ata_bd/ata_bd
 
 MODULES := $(notdir $(COMPONENTS))

uspace/Makefile

@@ -41 +41 @@
         srv/fb \
         srv/kbd \
-        srv/char/i8042 \
         srv/console \
         srv/fs/fat \
         srv/fs/tmpfs \
         srv/fs/devfs \
-        srv/mouse/c_mouse \
         srv/vfs \
         srv/devmap \

uspace/app/init/init.c

@@ -265 +265 @@
         spawn("/srv/fhc");
         spawn("/srv/obio");
-        srv_start("/srv/i8042");
-        srv_start("/srv/c_mouse");
 
         spawn("/srv/fb");

uspace/srv/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>
@@ -65 +64 @@
 /** Phone to the keyboard driver. */
 static int kbd_phone;
-
-/** Phone to the mouse driver. */
-static int mouse_phone;
 
 /** Information about framebuffer */
@@ -430 +426 @@
 }
 
-/** 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)
 {
@@ -722 +675 @@
                 return false;
         }
-
+        
         kbd_phone = fd_phone(input_fd);
         if (kbd_phone < 0) {
@@ -728 +681 @@
                 return false;
         }
-
+        
         /* NB: The callback connection is slotted for removal */
         ipcarg_t phonehash;
@@ -735 +688 @@
                 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 */
@@ -768 +697 @@
                 return -1;
         }
-
+        
         /* Register driver */
         int rc = devmap_driver_register(NAME, client_connection);

uspace/srv/kbd/Makefile.build

@@ -75 +75 @@
 ifeq ($(UARCH),ia32)
         SOURCES += \
-                port/chardev.c \
+                port/i8042.c \
                 ctl/pc.c
 endif

uspace/srv/kbd/generic/kbd.c

@@ -60 +60 @@
 #define NAMESPACE  "hid_in"
 
-int client_phone = -1;
+int phone2cons = -1;
 
 /** Currently active modifiers. */
@@ -164 +164 @@
         ev.c = layout[active_layout]->parse_ev(&ev);
 
-        async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
-}
-
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
+        async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
+}
+
+static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -179 +179 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        if (client_phone != -1) {
-                                ipc_hangup(client_phone);
-                                client_phone = -1;
+                        if (phone2cons != -1) {
+                                ipc_hangup(phone2cons);
+                                phone2cons = -1;
                         }
                         
@@ -187 +187 @@
                         return;
                 case IPC_M_CONNECT_TO_ME:
-                        if (client_phone != -1) {
+                        if (phone2cons != -1) {
                                 retval = ELIMIT;
                                 break;
                         }
-                        client_phone = IPC_GET_ARG5(call);
+                        phone2cons = IPC_GET_ARG5(call);
                         retval = 0;
                         break;
@@ -238 +238 @@
         
         /* Register driver */
-        int rc = devmap_driver_register(NAME, client_connection);
+        int rc = devmap_driver_register(NAME, console_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver (%d)\n", rc);