Changeset 25eec4ef in mainline for uspace/app

Timestamp:

2013-04-19T18:38:18Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• bdsh/cmds/modules/sleep/sleep.c (modified) (1 diff)
• bdsh/compl.c (modified) (1 diff)
• bdsh/input.c (modified) (1 diff)
• bnchmark/bnchmark.c (modified) (1 diff)
• edit/edit.c (modified) (11 diffs)
• edit/sheet.h (modified) (1 diff)
• ext2info/Makefile (deleted)
• ext2info/ext2info.c (deleted)
• init/init.c (modified) (2 diffs)
• klog/Makefile (modified) (1 diff)
• klog/klog.c (modified) (2 diffs)
• mkbd/main.c (modified) (3 diffs)
• mkexfat/exfat.h (modified) (1 diff)
• mkexfat/mkexfat.c (modified) (1 diff)
• msim/arch_helenos/input.c (modified) (1 diff)
• netecho/netecho.c (modified) (5 diffs)
• nettest2/nettest2.c (modified) (1 diff)
• nettest3/nettest3.c (modified) (4 diffs)
• nterm/conn.c (modified) (1 diff)
• nterm/nterm.c (modified) (3 diffs)
• ping/ping.c (modified) (3 diffs)
• stats/stats.c (modified) (1 diff)
• taskdump/symtab.c (modified) (1 diff)
• taskdump/taskdump.c (modified) (1 diff)
• tester/Makefile (modified) (2 diffs)
• tester/ext2/ext2_1.c (deleted)
• tester/ext2/ext2_1.def (deleted)
• tester/float/softfloat1.c (modified) (9 diffs)
• tester/ipc/starve.c (modified) (1 diff)
• tester/mm/common.c (modified) (1 diff)
• tester/mm/common.h (modified) (1 diff)
• tester/mm/mapping1.c (modified) (1 diff)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (2 diffs)
• tetris/scores.c (modified) (3 diffs)
• tetris/screen.c (modified) (4 diffs)
• tetris/screen.h (modified) (1 diff)
• top/screen.c (modified) (2 diffs)
• trace/ipc_desc.c (modified) (1 diff)
• trace/ipc_desc.h (modified) (1 diff)
• trace/ipcp.c (modified) (2 diffs)
• trace/syscalls.c (modified) (2 diffs)
• trace/syscalls.h (modified) (2 diffs)
• trace/trace.c (modified) (7 diffs)
• usbinfo/desctree.c (modified) (1 diff)
• usbinfo/dump.c (modified) (1 diff)
• usbinfo/list.c (modified) (1 diff)
• usbinfo/main.c (modified) (1 diff)
• vdemo/vdemo.c (modified) (3 diffs)
• vlaunch/Makefile (modified) (1 diff)
• vlaunch/gfx/helenos.tga (added)
• vlaunch/vlaunch.c (modified) (6 diffs)
• vterm/vterm.c (modified) (2 diffs)
• websrv/websrv.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -117 +117 @@
 static void waitkey()
 {
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         
         while (true) {
-                if (!console_get_kbd_event(console, &ev)) {
+                if (!console_get_event(console, &ev)) {
                         return;
                 }
-                if (ev.type == KEY_PRESS) {
-                        if (ev.key == KC_ESCAPE || ev.key == KC_Q) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        kev = &ev.ev.key;
+                        
+                        if (kev->key == KC_ESCAPE || kev->key == KC_Q) {
                                 should_quit = true;
                                 return;
                         }
-                        if (ev.key == KC_C) {
+                        if (kev->key == KC_C) {
                                 paging_enabled = false;
                                 return;
                         }
-                        if (ev.key == KC_ENTER || ev.key == KC_SPACE ||
-                            ev.key == KC_PAGE_DOWN) {
+                        if (kev->key == KC_ENTER || kev->key == KC_SPACE ||
+                            kev->key == KC_PAGE_DOWN) {
                                 return;
                         }

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -152 +152 @@
 
         while (true) {
-                kbd_event_t ev;
+                cons_event_t ev;
                 console_flush(con);
-                console_get_kbd_event(con, &ev);
-                if ((ev.type != KEY_PRESS)
-                    || (ev.mods & (KM_CTRL | KM_ALT)) != 0) {
+                console_get_event(con, &ev);
+                if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS ||
+                    (ev.ev.key.mods & (KM_CTRL | KM_ALT)) != 0) {
                         continue;
                 }
 
-                switch(ev.key) {
+                switch(ev.ev.key.key) {
                 case KC_Y:
                         printf("y\n");

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -315 +315 @@
 {
         if (stat(path, &de->s)) {
-                cli_error(CL_ENOENT, path);
+                cli_error(CL_ENOENT, "%s", path);
                 return LS_BOGUS;
         }

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -114 +114 @@
         int ret;
         unsigned int argc;
-        useconds_t duration;
+        useconds_t duration = 0;
 
         /* Count the arguments */

uspace/app/bdsh/compl.c

@@ -28 +28 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <dirent.h>
 #include <errno.h>

uspace/app/bdsh/input.c

@@ -41 +41 @@
 #include <errno.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <tinput.h>
 

uspace/app/bnchmark/bnchmark.c

@@ -142 +142 @@
 {
         int rc;
-        umseconds_t milliseconds_taken;
+        umseconds_t milliseconds_taken = 0;
         char *path = NULL;
         measure_func_t fn = NULL;

uspace/app/edit/edit.c

@@ -47 +47 @@
 #include <macros.h>
 #include <clipboard.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include "sheet.h"
@@ -80 +80 @@
         tag_t sel_start;
 
+        /** Active keyboard modifiers */
+        keymod_t keymod;
+
         /** 
          * Ideal column where the caret should try to get. This is used
@@ -119 +122 @@
 static void cursor_setvis(bool visible);
 
+static void key_handle_press(kbd_event_t *ev);
 static void key_handle_unmod(kbd_event_t const *ev);
 static void key_handle_ctrl(kbd_event_t const *ev);
@@ -124 +128 @@
 static void key_handle_shift_ctrl(kbd_event_t const *ev);
 static void key_handle_movement(unsigned int key, bool shift);
+
+static void pos_handle(pos_event_t *ev);
 
 static int file_save(char const *fname);
@@ -182 +188 @@
 int main(int argc, char *argv[])
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         bool new_file;
         int rc;
@@ -245 +251 @@
 
         while (!done) {
-                console_get_kbd_event(con, &ev);
+                console_get_event(con, &ev);
                 pane.rflags = 0;
 
-                if (ev.type == KEY_PRESS) {
-                        /* Handle key press. */
-                        if (((ev.mods & KM_ALT) == 0) &&
-                            ((ev.mods & KM_SHIFT) == 0) &&
-                             (ev.mods & KM_CTRL) != 0) {
-                                key_handle_ctrl(&ev);
-                        } else if (((ev.mods & KM_ALT) == 0) &&
-                            ((ev.mods & KM_CTRL) == 0) &&
-                             (ev.mods & KM_SHIFT) != 0) {
-                                key_handle_shift(&ev);
-                        } else if (((ev.mods & KM_ALT) == 0) &&
-                            ((ev.mods & KM_CTRL) != 0) &&
-                             (ev.mods & KM_SHIFT) != 0) {
-                                key_handle_shift_ctrl(&ev);
-                        } else if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                                key_handle_unmod(&ev);
-                        }
+                switch (ev.type) {
+                case CEV_KEY:
+                        pane.keymod = ev.ev.key.mods;
+                        if (ev.ev.key.type == KEY_PRESS)
+                                key_handle_press(&ev.ev.key);
+                        break;
+                case CEV_POS:
+                        pos_handle(&ev.ev.pos);
+                        break;
                 }
 
@@ -286 +284 @@
 
         return 0;
+}
+
+/* Handle key press. */
+static void key_handle_press(kbd_event_t *ev)
+{
+        if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_SHIFT) == 0) &&
+             (ev->mods & KM_CTRL) != 0) {
+                key_handle_ctrl(ev);
+        } else if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_CTRL) == 0) &&
+             (ev->mods & KM_SHIFT) != 0) {
+                key_handle_shift(ev);
+        } else if (((ev->mods & KM_ALT) == 0) &&
+            ((ev->mods & KM_CTRL) != 0) &&
+             (ev->mods & KM_SHIFT) != 0) {
+                key_handle_shift_ctrl(ev);
+        } else if ((ev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                key_handle_unmod(ev);
+        }
 }
 
@@ -462 +480 @@
 }
 
+static void pos_handle(pos_event_t *ev)
+{
+        coord_t bc;
+        spt_t pt;
+        bool select;
+
+        if (ev->type == POS_PRESS && ev->vpos < (unsigned)pane.rows) {
+                bc.row = pane.sh_row + ev->vpos;
+                bc.column = pane.sh_column + ev->hpos;
+                sheet_get_cell_pt(doc.sh, &bc, dir_before, &pt);
+
+                select = (pane.keymod & KM_SHIFT) != 0;
+
+                caret_move(pt, select, true);
+        }
+}
+
 /** Move caret while preserving or resetting selection. */
 static void caret_move(spt_t new_caret_pt, bool select, bool update_ideal_column)
@@ -592 +627 @@
 static char *prompt(char const *prompt, char const *init_value)
 {
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         char *str;
         wchar_t buffer[INFNAME_MAX_LEN + 1];
@@ -612 +648 @@
 
         while (!done) {
-                console_get_kbd_event(con, &ev);
-
-                if (ev.type == KEY_PRESS) {
+                console_get_event(con, &ev);
+
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        kev = &ev.ev.key;
+
                         /* Handle key press. */
-                        if (((ev.mods & KM_ALT) == 0) &&
-                             (ev.mods & KM_CTRL) != 0) {
+                        if (((kev->mods & KM_ALT) == 0) &&
+                             (kev->mods & KM_CTRL) != 0) {
                                 ;
-                        } else if ((ev.mods & (KM_CTRL | KM_ALT)) == 0) {
-                                switch (ev.key) {
+                        } else if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
+                                switch (kev->key) {
                                 case KC_ESCAPE:
                                         return NULL;
@@ -634 +672 @@
                                         break;
                                 default:
-                                        if (ev.c >= 32 && nc < max_len) {
-                                                putchar(ev.c);
+                                        if (kev->c >= 32 && nc < max_len) {
+                                                putchar(kev->c);
                                                 console_flush(con);
-                                                buffer[nc++] = ev.c;
+                                                buffer[nc++] = kev->c;
                                         }
                                         break;

uspace/app/edit/sheet.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 /** Direction (in linear space) */

uspace/app/init/init.c

@@ -39 +39 @@
 #include <stdarg.h>
 #include <vfs/vfs.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -369 +369 @@
 #ifdef CONFIG_START_BD
         srv_start("/srv/ata_bd");
-        srv_start("/srv/gxe_bd");
 #endif
         

uspace/app/klog/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
+LIBS = $(LIBCLUI_PREFIX)/libclui.a
+EXTRA_CFLAGS = -I$(LIBCLUI_PREFIX)
 BINARY = klog
 

uspace/app/klog/klog.c

@@ -48 +48 @@
 #include <adt/list.h>
 #include <adt/prodcons.h>
+#include <tinput.h>
 
 #define NAME       "klog"
@@ -228 +229 @@
         }
         
+        tinput_t *input = tinput_new();
+        if (!input) {
+                fprintf(stderr, "%s: Could not create input\n", NAME);
+                return ENOMEM;
+        }       
+
         fibril_add_ready(fid);
         event_unmask(EVENT_KLOG);
         klog_update();
         
-        task_retval(0);
-        async_manager();
-        
-        return 0;
+        tinput_set_prompt(input, "klog> ");
+
+        char *str;
+        while ((rc = tinput_read(input, &str)) == EOK) {
+                if (str_cmp(str, "") == 0) {
+                        free(str);
+                        continue;
+                }
+
+                klog_command(str, str_size(str));
+                free(str);
+        }
+ 
+        if (rc == ENOENT)
+                rc = EOK;       
+
+        return EOK;
 }
 

uspace/app/mkbd/main.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <getopt.h>
 #include <devman.h>
@@ -178 +178 @@
 
         while (1) {
-                kbd_event_t ev;
-                bool ok = console_get_kbd_event(con, &ev);
+                cons_event_t ev;
+                bool ok = console_get_event(con, &ev);
                 if (!ok) {
                         printf("Connection with console broken: %s.\n",
@@ -186 +186 @@
                 }
 
-                if (ev.key == KC_ESCAPE) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    ev.ev.key.key == KC_ESCAPE) {
                         break;
                 }

uspace/app/mkexfat/exfat.h

@@ -34 +34 @@
 #include <sys/types.h>
 #include <stdint.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #define EXFAT_FILENAME_LEN      255

uspace/app/mkexfat/mkexfat.c

@@ -46 +46 @@
 #include <sys/types.h>
 #include <sys/typefmt.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <str.h>
 #include <getopt.h>

uspace/app/msim/arch_helenos/input.c

@@ -91 +91 @@
 bool stdin_poll(char *key)
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         suseconds_t timeout = 0;
         errno = EOK;
         console_flush(input_prompt->console);
-        bool has_input = console_get_kbd_event_timeout(input_prompt->console, &ev, &timeout);
+        bool has_input = console_get_event_timeout(input_prompt->console, &ev, &timeout);
         if (!has_input) {
                 return false;
         }
 
-        if (ev.type != KEY_PRESS)
+        if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS)
                 return false;
 
-        *key = ev.c;
+        *key = ev.ev.key.c;
 
         return true;

uspace/app/netecho/netecho.c

@@ -243 +243 @@
                 if (verbose)
                         printf("accept()\n");
-                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
+                socket_id = accept(listening_id, (void *) address_buf, &addrlen);
                 if (socket_id <= 0) {
                         socket_print_error(stderr, socket_id, "Socket accept: ", "\n");
@@ -312 +312 @@
                                 rc = sendto(socket_id, reply ? reply : data, reply ? reply_length : length, 0, address, addrlen);
                                 if (rc != EOK)
-                                        socket_print_error(stderr, rc, "Socket send: ", "\n");
+                                        socket_print_error(stderr, rc, "Socket sendto: ", "\n");
                         }
                 }
@@ -394 +394 @@
                 return listening_id;
         }
-
+        
+        /* Bind the listening socket */
+        rc = bind(listening_id, address, addrlen);
+        if (rc != EOK) {
+                socket_print_error(stderr, rc, "Socket bind: ", "\n");
+                return rc;
+        }
+        
         /* if the stream socket is used */
         if (type == SOCK_STREAM) {
@@ -402 +409 @@
                         backlog = 3;
                 }
-
+                
                 /* Set the backlog */
                 rc = listen(listening_id, backlog);
@@ -409 +416 @@
                         return rc;
                 }
-        }
-
-        /* Bind the listening socket */
-        rc = bind(listening_id, address, addrlen);
-        if (rc != EOK) {
-                socket_print_error(stderr, rc, "Socket bind: ", "\n");
-                return rc;
         }
 

uspace/app/nettest2/nettest2.c

@@ -45 +45 @@
 #include <time.h>
 #include <arg_parse.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <net/in.h>

uspace/app/nettest3/nettest3.c

@@ -63 +63 @@
         port = 7;
 
-        data = (char *)"Hello World!";
+        data = (char *) "Hello World!";
         size = str_size(data);
 
@@ -98 +98 @@
 
         printf("connect()\n");
-        rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+        rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
         printf(" -> %d\n", rc);
         if (rc != 0)
@@ -115 +115 @@
         } while (rc > 0);
 
-        async_usleep(1000*1000);
+        async_usleep(1000 * 1000);
 
         printf("closesocket()\n");
@@ -124 +124 @@
 }
 
-
 /** @}
  */

uspace/app/nterm/conn.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <fibril.h>

uspace/app/nterm/nterm.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <io/console.h>
@@ -109 +109 @@
 int main(int argc, char *argv[])
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         int rc;
 
@@ -129 +129 @@
         done = false;
         while (!done) {
-                console_get_kbd_event(con, &ev);
-                if (ev.type == KEY_PRESS)
-                        key_handle(&ev);
+                console_get_event(con, &ev);
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS)
+                        key_handle(&ev.ev.key);
         }
 

uspace/app/ping/ping.c

@@ -34 +34 @@
 
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -188 +188 @@
 {
         console_ctrl_t *con;
-        kbd_event_t ev;
+        cons_event_t ev;
 
         con = console_init(stdin, stdout);
@@ -194 +194 @@
 
         while (true) {
-                if (!console_get_kbd_event(con, &ev))
+                if (!console_get_event(con, &ev))
                         break;
 
-                if (ev.type == KEY_PRESS && (ev.mods & (KM_ALT | KM_SHIFT)) ==
-                    0 && (ev.mods & KM_CTRL) != 0) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    (ev.ev.key.mods & (KM_ALT | KM_SHIFT)) ==
+                    0 && (ev.ev.key.mods & KM_CTRL) != 0) {
                         /* Ctrl+key */
-                        if (ev.key == KC_Q) {
+                        if (ev.ev.key.key == KC_Q) {
                                 ping_signal_done();
                                 return 0;

uspace/app/stats/stats.c

@@ -44 +44 @@
 #include <malloc.h>
 #include <inttypes.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <str.h>
 #include <arg_parse.h>

uspace/app/taskdump/symtab.c

@@ -267 +267 @@
                         continue;
 
-                if (best_name == NULL || (saddr <= addr && saddr > best_addr)) {
+                if (saddr <= addr && (best_name == NULL || saddr > best_addr)) {
                         best_name = sname;
                         best_addr = saddr;

uspace/app/taskdump/taskdump.c

@@ -47 +47 @@
 #include <macros.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <symtab.h>

uspace/app/tester/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBEXT2_PREFIX)/libext2.a $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
 BINARY = tester
 
@@ -63 +63 @@
         mm/mapping1.c \
         hw/misc/virtchar1.c \
-        hw/serial/serial1.c \
-        ext2/ext2_1.c
+        hw/serial/serial1.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tester/float/softfloat1.c

@@ -35 +35 @@
 #include <div.h>
 #include <comparison.h>
-#include <bool.h>
+#include <conversion.h>
+#include <stdbool.h>
 #include "../tester.h"
 
-#define OPERANDS  6 
+#define OPERANDS  10
 #define PRECISION  10000
 
@@ -44 +45 @@
 
 typedef int32_t cmptype_t;
-typedef void (* float_op_t)(float, float, float *, float_t *);
-typedef void (* double_op_t)(double, double, double *, double_t *);
+
+typedef void (* uint_to_double_op_t)(unsigned int, double *, double_t *);
+typedef void (* double_to_uint_op_t)(double, unsigned int *, unsigned int *);
+typedef void (* float_binary_op_t)(float, float, float *, float_t *);
+typedef void (* double_binary_op_t)(double, double, double *, double_t *);
 typedef void (* double_cmp_op_t)(double, double, cmptype_t *, cmptype_t *);
-typedef void (* template_t)(void *, unsigned, unsigned, cmptype_t *,
+
+typedef void (* template_unary_t)(void *, unsigned, cmptype_t *, cmptype_t *);
+typedef void (* template_binary_t)(void *, unsigned, unsigned, cmptype_t *,
     cmptype_t *);
 
-static float fop_a[OPERANDS] =
-        {3.5, -2.1, 100.0, 50.0, -1024.0, 0.0};
-
-static float fop_b[OPERANDS] =
-        {-2.1, 100.0, 50.0, -1024.0, 3.5, 0.0};
-
-static double dop_a[OPERANDS] =
-        {3.5, -2.1, 100.0, 50.0, -1024.0, 0.0};
-
-static double dop_b[OPERANDS] =
-        {-2.1, 100.0, 50.0, -1024.0, 3.5, 0.0};
+#define NUMBERS \
+        3.5, -2.1, 100.0, 50.0, -1024.0, 0.0, 768.3156, 1080.499999, -600.0, 1.0
+
+static float fop_a[OPERANDS] = {
+        NUMBERS
+};
+
+static double dop_a[OPERANDS] = {
+        NUMBERS
+};
+
+static unsigned int uop_a[OPERANDS] = {
+        4, -100, 100, 50, 1024, 0, 1000000, -1U, 0x80000000U, 500
+};
 
 static cmptype_t cmpabs(cmptype_t a)
@@ -81 +90 @@
 
 static void
-float_template(void *f, unsigned i, unsigned j, cmptype_t *pic,
+uint_to_double_template(void *f, unsigned i, cmptype_t *pic, cmptype_t *pisc)
+{
+        double c;
+        double_t sc;
+
+        uint_to_double_op_t op = (uint_to_double_op_t) f;
+        
+        op(uop_a[i], &c, &sc);
+
+        *pic = (cmptype_t) (c * PRECISION);
+        *pisc = (cmptype_t) (sc.val * PRECISION);
+}
+
+static void
+double_to_uint_template(void *f, unsigned i, cmptype_t *pic, cmptype_t *pisc)
+{
+        unsigned int c;
+        unsigned int sc;
+
+        double_to_uint_op_t op = (double_to_uint_op_t) f;
+        
+        op(dop_a[i], &c, &sc);
+
+        *pic = (cmptype_t) c;
+        *pisc = (cmptype_t) sc;
+}
+
+
+static void
+float_template_binary(void *f, unsigned i, unsigned j, cmptype_t *pic,
     cmptype_t *pisc)
 {
@@ -87 +125 @@
         float_t sc;
 
-        float_op_t op = (float_op_t) f;
-        
-        op(fop_a[i], fop_b[j], &c, &sc);
+        float_binary_op_t op = (float_binary_op_t) f;
+        
+        op(fop_a[i], fop_a[j], &c, &sc);
 
         *pic = (cmptype_t) (c * PRECISION);
@@ -96 +134 @@
 
 static void
-double_template(void *f, unsigned i, unsigned j, cmptype_t *pic,
+double_template_binary(void *f, unsigned i, unsigned j, cmptype_t *pic,
     cmptype_t *pisc)
 {
@@ -102 +140 @@
         double_t sc;
 
-        double_op_t op = (double_op_t) f;
-        
-        op(dop_a[i], dop_b[j], &c, &sc);
+        double_binary_op_t op = (double_binary_op_t) f;
+        
+        op(dop_a[i], dop_a[j], &c, &sc);
 
         *pic = (cmptype_t) (c * PRECISION);
@@ -116 +154 @@
         double_cmp_op_t op = (double_cmp_op_t) f;
         
-        op(dop_a[i], dop_b[j], pis, piss);
-}
-
-static bool test_template(template_t template, void *f)
+        op(dop_a[i], dop_a[j], pis, piss);
+}
+
+static bool test_template_unary(template_unary_t template, void *f)
+{
+        bool correct = true;
+        
+        for (unsigned int i = 0; i < OPERANDS; i++) {
+                cmptype_t ic;
+                cmptype_t isc;
+
+                template(f, i, &ic, &isc);      
+                cmptype_t diff = cmpabs(ic - isc);
+                        
+                if (diff != 0) {
+                        TPRINTF("i=%u diff=%" PRIdCMPTYPE "\n", i, diff);
+                        correct = false;
+                }
+        }
+        
+        return correct;
+}
+
+static bool test_template_binary(template_binary_t template, void *f)
 {
         bool correct = true;
@@ -142 +200 @@
 }
 
+static void uint_to_double_operator(unsigned int a, double *pc, double_t *psc)
+{
+        *pc = (double) a;
+        psc->data = uint_to_double(a);
+}
+
+static void
+double_to_uint_operator(double a, unsigned int *pc, unsigned int *psc)
+{
+        double_t sa;
+
+        sa.val = a;
+
+        *pc = (unsigned int) a;
+        *psc = double_to_uint(sa.data);
+}
+
+static void
+double_to_int_operator(double a, unsigned int *pc, unsigned int *psc)
+{
+        double_t sa;
+
+        sa.val = a;
+
+        *pc = (int) a;
+        *psc = double_to_int(sa.data);
+}
+
 static void float_add_operator(float a, float b, float *pc, float_t *psc)
 {
@@ -267 +353 @@
         const char *err = NULL;
 
-        if (!test_template(float_template, float_add_operator)) {
+        if (!test_template_binary(float_template_binary, float_add_operator)) {
                 err = "Float addition failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(float_template, float_mul_operator)) {
+        if (!test_template_binary(float_template_binary, float_mul_operator)) {
                 err = "Float multiplication failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(float_template, float_div_operator)) {
+        if (!test_template_binary(float_template_binary, float_div_operator)) {
                 err = "Float division failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_template, double_add_operator)) {
+        if (!test_template_binary(double_template_binary, double_add_operator)) {
                 err = "Double addition failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_template, double_mul_operator)) {
+        if (!test_template_binary(double_template_binary, double_mul_operator)) {
                 err = "Double multiplication failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_template, double_div_operator)) {
+        if (!test_template_binary(double_template_binary, double_div_operator)) {
                 err = "Double division failed";
                 TPRINTF("%s\n", err);
         }
-        if (!test_template(double_compare_template, double_cmp_operator)) {
+        if (!test_template_binary(double_compare_template, double_cmp_operator)) {
                 err = "Double comparison failed";
                 TPRINTF("%s\n", err);
         }
+        if (!test_template_unary(uint_to_double_template,
+            uint_to_double_operator)) {
+                err = "Conversion from unsigned int to double failed";
+                TPRINTF("%s\n", err);
+        }
+        if (!test_template_unary(double_to_uint_template,
+            double_to_uint_operator)) {
+                err = "Conversion from double to unsigned int failed";
+                TPRINTF("%s\n", err);
+        }
+        if (!test_template_unary(double_to_uint_template,
+            double_to_int_operator)) {
+                err = "Conversion from double to signed int failed";
+                TPRINTF("%s\n", err);
+        }
         
         return err;

uspace/app/tester/ipc/starve.c

@@ -62 +62 @@
                         break;
                 
-                kbd_event_t ev;
+                cons_event_t ev;
                 suseconds_t timeout = 0;
-                bool has_event = console_get_kbd_event_timeout(console, &ev, &timeout);
-                if (has_event && (ev.type == KEY_PRESS)) {
-                        TPRINTF("Key %d pressed, terminating.\n", ev.key);
+                bool has_event = console_get_event_timeout(console, &ev, &timeout);
+                if (has_event && ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
                         break;
                 }

uspace/app/tester/mm/common.c

@@ -343 +343 @@
         
         area->addr = as_area_create(AS_AREA_ANY, size,
-            AS_AREA_WRITE | AS_AREA_READ);
+            AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE);
         if (area->addr == AS_MAP_FAILED) {
                 free(area);

uspace/app/tester/mm/common.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <adt/list.h>
 

uspace/app/tester/mm/mapping1.c

@@ -43 +43 @@
         
         void *result = as_area_create(AS_AREA_ANY, size,
-            AS_AREA_READ | AS_AREA_WRITE);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         if (result == AS_MAP_FAILED)
                 return NULL;

uspace/app/tester/tester.c

@@ -74 +74 @@
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
-#include "ext2/ext2_1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stacktrace.h>
 
@@ -106 +106 @@
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);
-extern const char *test_ext2_1(void);
 extern const char *test_devman1(void);
 extern const char *test_devman2(void);

uspace/app/tetris/scores.c

@@ -125 +125 @@
         int j;
         size_t off;
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         
         clear_screen();
@@ -141 +142 @@
         while (1) {
                 console_flush(console);
-                if (!console_get_kbd_event(console, &ev))
+                if (!console_get_event(console, &ev))
                         exit(1);
                 
-                if (ev.type == KEY_RELEASE)
+                if (ev.type != CEV_KEY || ev.ev.key.type == KEY_RELEASE)
                         continue;
                 
-                if (ev.key == KC_ENTER || ev.key == KC_NENTER)
+                kev = &ev.ev.key;
+                
+                if (kev->key == KC_ENTER || kev->key == KC_NENTER)
                         break;
                 
-                if (ev.key == KC_BACKSPACE) {
+                if (kev->key == KC_BACKSPACE) {
                         if (i > 0) {
                                 wchar_t uc;
@@ -166 +169 @@
                                 scores[NUMSPOTS - 1].hs_name[off] = '\0';
                         }
-                } else if (ev.c != '\0') {
+                } else if (kev->c != '\0') {
                         if (i < (MAXLOGNAME - 1)) {
-                                if (chr_encode(ev.c, scores[NUMSPOTS - 1].hs_name,
+                                if (chr_encode(kev->c, scores[NUMSPOTS - 1].hs_name,
                                     &off, STR_BOUNDS(MAXLOGNAME) + 1) == EOK) {
                                         ++i;

uspace/app/tetris/screen.c

@@ -61 +61 @@
 #include <vfs/vfs.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <io/console.h>
 #include <io/style.h>
@@ -344 +344 @@
         
         while (timeout > 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeout))
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeout))
                         break;
         }
@@ -376 +376 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
                 }
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         
@@ -398 +398 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event(console, &event))
+                cons_event_t event;
+                
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         

uspace/app/tetris/screen.h

@@ -58 +58 @@
 #include <io/console.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 
 typedef struct {

uspace/app/top/screen.c

@@ -556 +556 @@
         
         while (c == 0) {
-                kbd_event_t event;
+                cons_event_t event;
                 
                 warning_timeleft -= timeleft;
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
@@ -565 +565 @@
                 warning_timeleft += timeleft;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         

uspace/app/trace/ipc_desc.c

@@ -49 +49 @@
         { IPC_M_DATA_READ,        "DATA_READ" },
         { IPC_M_DEBUG,            "DEBUG" },
-        
-        /* Terminating entry */
-        { 0, NULL }
 };
+
+size_t ipc_methods_len = sizeof(ipc_methods) / sizeof(ipc_m_desc_t);
 
 /** @}

uspace/app/trace/ipc_desc.h

@@ -42 +42 @@
 
 extern ipc_m_desc_t ipc_methods[];
+extern size_t ipc_methods_len;
 
 #endif

uspace/app/trace/ipcp.c

@@ -140 +140 @@
 void ipcp_init(void)
 {
-        ipc_m_desc_t *desc;
-        oper_t *oper;
-
         val_type_t arg_def[OPER_MAX_ARGS] = {
                 V_INTEGER,
@@ -162 +159 @@
         proto_system = proto_new("system");
 
-        desc = ipc_methods;
-        while (desc->number != 0) {
-                oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER,
-                        OPER_MAX_ARGS, arg_def);
-                proto_add_oper(proto_system, desc->number, oper);
-
-                ++desc;
+        for (size_t i = 0; i < ipc_methods_len; i++) {
+                oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS,
+                    arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def);
+                proto_add_oper(proto_system, ipc_methods[i].number, oper);
         }
 

uspace/app/trace/syscalls.c

@@ -46 +46 @@
 
     [SYS_TASK_GET_ID] = { "task_get_id",                1,      V_ERRNO },
+    [SYS_TASK_SET_NAME] = { "task_set_name",            2,      V_ERRNO },
     [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout",        3,      V_ERRNO },
     [SYS_FUTEX_WAKEUP] = { "futex_wakeup",              1,      V_ERRNO },
@@ -82 +83 @@
 };
 
+const size_t syscall_desc_len = (sizeof(syscall_desc) / sizeof(sc_desc_t));
+
 /** @}
  */

uspace/app/trace/syscalls.h

@@ -36 +36 @@
 #define SYSCALLS_H_
 
+#include <stdbool.h>
+#include <unistd.h>
+
 #include "trace.h"
 
@@ -45 +48 @@
 
 extern const sc_desc_t syscall_desc[];
+extern const size_t syscall_desc_len;
+
+static inline bool syscall_desc_defined(unsigned sc_id)
+{
+        return (sc_id < syscall_desc_len && syscall_desc[sc_id].name != NULL);
+}
 
 #endif

uspace/app/trace/trace.c

@@ -43 +43 @@
 #include <mem.h>
 #include <str.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <loader/loader.h>
 #include <io/console.h>
@@ -136 +136 @@
         }
 
-        free(task_ldr);
         task_ldr = NULL;
 
@@ -348 +347 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall name and arguments */
-                printf("%s", syscall_desc[sc_id].name);
-                print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                if (syscall_desc_defined(sc_id)) {
+                        printf("%s", syscall_desc[sc_id].name);
+                        print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+                }
+                else {
+                        printf("unknown_syscall<%d>", sc_id);
+                        print_sc_args(sc_args, 6);
+                }
         }
 }
@@ -372 +377 @@
         if ((display_mask & DM_SYSCALL) != 0) {
                 /* Print syscall return value */
-                rv_type = syscall_desc[sc_id].rv_type;
+                if (syscall_desc_defined(sc_id))
+                        rv_type = syscall_desc[sc_id].rv_type;
+                else
+                        rv_type = V_PTR;
                 print_sc_retval(sc_rc, rv_type);
         }
@@ -497 +505 @@
         ldr = loader_connect();
         if (ldr == NULL)
-                return 0;
+                return NULL;
 
         /* Get task ID. */
@@ -557 +565 @@
 static int cev_fibril(void *arg)
 {
+        cons_event_t event;
+
         (void) arg;
         
@@ -567 +577 @@
                 fibril_mutex_unlock(&state_lock);
                 
-                if (!console_get_kbd_event(console, &cev))
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                fibril_mutex_lock(&state_lock);
-                cev_valid = true;
-                fibril_condvar_broadcast(&state_cv);
-                fibril_mutex_unlock(&state_lock);
+                if (event.type == CEV_KEY) {
+                        fibril_mutex_lock(&state_lock);
+                        cev = event.ev.key;
+                        cev_valid = true;
+                        fibril_condvar_broadcast(&state_cv);
+                        fibril_mutex_unlock(&state_lock);
+                }
         }
 }

uspace/app/usbinfo/desctree.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <usb/usb.h>

uspace/app/usbinfo/dump.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #include <usb/usb.h>

uspace/app/usbinfo/list.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <getopt.h>
 #include <devman.h>

uspace/app/usbinfo/main.c

@@ -39 +39 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <getopt.h>
 #include <devman.h>

uspace/app/vdemo/vdemo.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <malloc.h>
@@ -110 +110 @@
 {
         if (argc >= 2) {
-                window_t *main_window = window_open(argv[1], true, true, "vdemo");
+                window_t *main_window = window_open(argv[1], true, true, "vdemo", 0, 0);
                 if (!main_window) {
                         printf("Cannot open main window.\n");
@@ -141 +141 @@
                     lbl_action->cancel);
 
-                grid->add(grid, &lbl_action->label.widget, 0, 0, 1, 2);
-                grid->add(grid, &btn_confirm->widget, 1, 0, 1, 1);
+                grid->add(grid, &lbl_action->label.widget, 0, 0, 2, 1);
+                grid->add(grid, &btn_confirm->widget, 0, 1, 1, 1);
                 grid->add(grid, &btn_cancel->widget, 1, 1, 1, 1);
-                window_resize(main_window, 200, 70);
+                window_resize(main_window, 200, 76);
 
                 window_exec(main_window);

uspace/app/vlaunch/Makefile

@@ -35 +35 @@
 
 SOURCES = \
-        vlaunch.c
+        vlaunch.c \
+        images.c
+
+IMAGES = \
+        gfx/helenos.tga
+
+PRE_DEPEND = images.c images.h
+EXTRA_CLEAN = images.c images.h
 
 include $(USPACE_PREFIX)/Makefile.common
+
+images.c images.h: $(IMAGES)
+        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^

uspace/app/vlaunch/vlaunch.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <stdio.h>
@@ -46 +46 @@
 #include <button.h>
 #include <label.h>
+#include <canvas.h>
 
-#define NAME "vlaunch"
+#include <surface.h>
+#include <source.h>
+#include <drawctx.h>
+#include <codec/tga.h>
+
+#include "images.h"
+
+#define NAME  "vlaunch"
+
+#define LOGO_WIDTH   196
+#define LOGO_HEIGHT  66
 
 static char *winreg = NULL;
@@ -97 +108 @@
         }
         
+        surface_t *logo = decode_tga((void *) helenos_tga, helenos_tga_size, 0);
+        if (!logo) {
+                printf("Unable to decode logo.\n");
+                return 1;
+        }
+        
         winreg = argv[1];
-        window_t *main_window = window_open(argv[1], true, true, "vlaunch");
+        window_t *main_window = window_open(argv[1], true, true, "vlaunch", 0, 0);
         if (!main_window) {
                 printf("Cannot open main window.\n");
@@ -110 +127 @@
         pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
         
+        canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT,
+            logo);
         label_t *lbl_caption = create_label(NULL, "Launch application:", 16,
             lbl_bg, lbl_fg);
@@ -118 +137 @@
         button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg,
             btn_fg);
-        grid_t *grid = create_grid(window_root(main_window), 4, 1, grd_bg);
+        grid_t *grid = create_grid(window_root(main_window), 1, 5, grd_bg);
         
-        if ((!lbl_caption) || (!btn_vterm) || (!btn_vdemo) ||
-            (!btn_vlaunch) || (!grid)) {
+        if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) ||
+            (!btn_vdemo) || (!btn_vlaunch) || (!grid)) {
                 window_close(main_window);
                 printf("Cannot create widgets.\n");
@@ -131 +150 @@
         sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch);
         
-        grid->add(grid, &lbl_caption->widget, 0, 0, 1, 1);
-        grid->add(grid, &btn_vterm->widget, 1, 0, 1, 1);
-        grid->add(grid, &btn_vdemo->widget, 2, 0, 1, 1);
-        grid->add(grid, &btn_vlaunch->widget, 3, 0, 1, 1);
+        grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1);
+        grid->add(grid, &lbl_caption->widget, 0, 1, 1, 1);
+        grid->add(grid, &btn_vterm->widget, 0, 2, 1, 1);
+        grid->add(grid, &btn_vdemo->widget, 0, 3, 1, 1);
+        grid->add(grid, &btn_vlaunch->widget, 0, 4, 1, 1);
         
-        window_resize(main_window, 180, 130);
+        window_resize(main_window, 210, 130 + LOGO_HEIGHT);
         window_exec(main_window);
+        
         task_retval(0);
         async_manager();

uspace/app/vterm/vterm.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <io/pixel.h>
@@ -49 +49 @@
         }
         
-        window_t *main_window = window_open(argv[1], true, true, "vterm");
+        window_t *main_window = window_open(argv[1], true, true, "vterm", 0, 0);
         if (!main_window) {
                 printf("%s: Cannot open main window.\n", NAME);

uspace/app/websrv/websrv.c

@@ -34 +34 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <assert.h>