Changeset 985e26d2 in mainline for uspace/srv/hid/console

Timestamp:

2010-01-07T19:06:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (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.

Location:

uspace/srv/hid/console

Files:

• Makefile (added)
• Makefile.build (moved) (moved from uspace/srv/console/Makefile ) (3 diffs)
• Makefile.common (added)
• console.c (moved) (moved from uspace/srv/console/console.c ) (14 diffs)
• console.h (moved) (moved from uspace/srv/console/console.h )
• gcons.c (moved) (moved from uspace/srv/console/gcons.c ) (4 diffs)
• gcons.h (moved) (moved from uspace/srv/console/gcons.h )
• gfx/anim_1.ppm (moved) (moved from uspace/srv/console/gfx/anim_1.ppm )
• gfx/anim_2.ppm (moved) (moved from uspace/srv/console/gfx/anim_2.ppm )
• gfx/anim_3.ppm (moved) (moved from uspace/srv/console/gfx/anim_3.ppm )
• gfx/anim_4.ppm (moved) (moved from uspace/srv/console/gfx/anim_4.ppm )
• gfx/cons_has_data.ppm (moved) (moved from uspace/srv/console/gfx/cons_has_data.ppm )
• gfx/cons_idle.ppm (moved) (moved from uspace/srv/console/gfx/cons_idle.ppm )
• gfx/cons_kernel.ppm (moved) (moved from uspace/srv/console/gfx/cons_kernel.ppm )
• gfx/cons_selected.ppm (moved) (moved from uspace/srv/console/gfx/cons_selected.ppm )
• gfx/helenos.ppm (moved) (moved from uspace/srv/console/gfx/helenos.ppm )
• gfx/nameic.ppm (moved) (moved from uspace/srv/console/gfx/nameic.ppm )
• keybuffer.c (moved) (moved from uspace/srv/console/keybuffer.c ) (1 diff)
• keybuffer.h (moved) (moved from uspace/srv/console/keybuffer.h )
• screenbuffer.c (moved) (moved from uspace/srv/console/screenbuffer.c ) (1 diff)
• screenbuffer.h (moved) (moved from uspace/srv/console/screenbuffer.h )

uspace/srv/hid/console/Makefile.build

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -30 +31 @@
 #
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
-
+include Makefile.common
 include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -I.
-
-LIBS = $(LIBC_PREFIX)/libc.a
 
 ## Sources
 #
 
-OUTPUT = console
-
-GENERIC_SOURCES = \
+SOURCES = \
         console.c \
         screenbuffer.c \
@@ -62 +55 @@
         gfx/anim_4.ppm
 
-GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) \
-        $(addsuffix .o,$(basename $(IMAGES)))
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) $(addsuffix .o,$(basename $(IMAGES)))
 
-OBJECTS := $(GENERIC_OBJECTS)
-
-.PHONY: all clean depend disasm
+.PHONY: all
 
 all: $(OUTPUT) $(OUTPUT).disasm
 
--include Makefile.depend
+-include $(DEPEND)
 
-clean:
-        -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
-
-depend:
-        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(OUTPUT).disasm: $(OUTPUT)
+        $(OBJDUMP) -d $< > $@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
-disasm: $(OUTPUT).disasm
-
-$(OUTPUT).disasm: $(OUTPUT)
-        $(OBJDUMP) -d $< > $@
-
-%.o: %.S
-        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
-
-%.o: %.s
-        $(AS) $(AFLAGS) $< -o $@
-
-%.o: %.c
+%.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
 %.o: %.ppm
         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@
+
+$(DEPEND):
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
+        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@

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>
 #include <errno.h>
-#include <keybuffer.h>
 #include <ipc/console.h>
 #include <unistd.h>
@@ -51 +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"
 #include "gcons.h"
+#include "keybuffer.h"
 #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)
 {
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -442 +490 @@
         }
         
-        (void) ipc_data_write_finalize(callid, buf, size);
+        (void) async_data_write_finalize(callid, buf, size);
         
         async_serialize_start();
@@ -464 +512 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_read_receive(&callid, &size)) {
+        if (!async_data_read_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -489 +537 @@
         
         if (pos == size) {
-                (void) ipc_data_read_finalize(callid, buf, size);
+                (void) async_data_read_finalize(callid, buf, size);
                 ipc_answer_1(rid, EOK, size);
                 free(buf);
@@ -601 +649 @@
                                     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 +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 */
@@ -687 +768 @@
                 return -1;
         }
-        
+
         /* Register driver */
         int rc = devmap_driver_register(NAME, client_connection);
@@ -699 +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);
@@ -713 +795 @@
         
         if (interbuffer) {
-                if (ipc_share_out_start(fb_info.phone, interbuffer,
+                if (async_share_out_start(fb_info.phone, interbuffer,
                     AS_AREA_READ) != EOK) {
                         as_area_destroy(interbuffer);
@@ -736 +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) {
@@ -768 +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;
         

uspace/srv/hid/console/gcons.c

@@ -241 +241 @@
 
 /** Return x, where left <= x <= right && |a-x| == min(|a-x|) is smallest */
-static inline int limit(size_t a, size_t left, size_t right)
+static inline ssize_t limit(ssize_t a, ssize_t left, ssize_t right)
 {
         if (a < left)
@@ -261 +261 @@
         mouse_x = limit(mouse_x + dx, 0, xres);
         mouse_y = limit(mouse_y + dy, 0, yres);
-        
-        async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
+
+        if (active_console != KERNEL_CONSOLE)
+                async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
 }
 
@@ -339 +340 @@
                 goto exit;
         
-        rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
+        rc = async_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
@@ -409 +410 @@
                 goto exit;
         
-        rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
+        rc = async_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;

uspace/srv/hid/console/keybuffer.c

@@ -35 +35 @@
  */
 
-#include <keybuffer.h>
 #include <futex.h>
+#include "keybuffer.h"
 
 atomic_t keybuffer_futex = FUTEX_INITIALIZER;

uspace/srv/hid/console/screenbuffer.c

@@ -33 +33 @@
  */
 
-#include <screenbuffer.h>
 #include <io/style.h>
 #include <malloc.h>
 #include <unistd.h>
+#include "screenbuffer.h"
 
 /** Store one character to screenbuffer.