WebSVN – HelenOS – Path Comparison – / – /branches/tracing/uspace/ Rev 4376 and /branches/tracing/uspace/ Rev 4377

Ignore whitespace Rev 4376 → Rev 4377

 /branches/tracing/uspace/app/bdsh/input.c
 ,6 → 33,11
 #include <stdlib.h>
 #include <string.h>
 #include <io/stream.h>
+#include <console.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <errno.h>
+#include <bool.h>
 #include "config.h"
 #include "util.h"
 ,21 → 46,8
 #include "errors.h"
 #include "exec.h"
-extern volatile unsigned int cli_interactive;
-/* Not exposed in input.h */
-static void cli_restricted(char *);
 static void read_line(char *, int);
-/* More than a macro than anything */
-static void cli_restricted(char *cmd)
-{
-    printf("%s is not available in %s mode\n", cmd,
-        cli_interactive ? "interactive" : "non-interactive");
-    return;
-}
 /* Tokenizes input from console, sees if the first word is a built-in, if so
  * invokes the built-in entry point (a[0]) passing all arguments in a[] to
  * the handler */
 ,14 → 61,11
     if (NULL == usr->line)
         return CL_EFAIL;
-    tmp = cli_strdup(usr->line);
+    tmp = str_dup(usr->line);
-    /* Break up what the user typed, space delimited */
-    /* TODO: Protect things in quotes / ticks, expand wildcards */
-    cmd[n] = cli_strtok(tmp, " ");
+    cmd[n] = strtok(tmp, " ");
     while (cmd[n] && n < WORD_MAX) {
-        cmd[++n] = cli_strtok(NULL, " ");
+        cmd[++n] = strtok(NULL, " ");
     }
     /* We have rubbish */
 ,39 → 74,19
         goto finit;
     }
-    /* Its a builtin command */
+    /* Its a builtin command ? */
     if ((i = (is_builtin(cmd[0]))) > -1) {
-        /* Its not available in this mode, see what try_exec() thinks */
-        if (builtin_is_restricted(i)) {
-                rc = try_exec(cmd[0], cmd);
-                if (rc)
-                    /* No external matching it could be found, tell the
-                     * user that the command does exist, but is not
-                     * available in this mode. */
-                    cli_restricted(cmd[0]);
-                goto finit;
-        }
-        /* Its a builtin, its available, run it */
         rc = run_builtin(i, cmd, usr);
         goto finit;
-    /* We repeat the same dance for modules */
+    /* Its a module ? */
     } else if ((i = (is_module(cmd[0]))) > -1) {
-        if (module_is_restricted(i)) {
-            rc = try_exec(cmd[0], cmd);
-            if (rc)
-                cli_restricted(cmd[0]);
-            goto finit;
-        }
         rc = run_module(i, cmd);
         goto finit;
-    } else {
-        /* Its not a module or builtin, restricted or otherwise.
-         * See what try_exec() thinks of it and just pass its return
-         * value back to the caller */
-        rc = try_exec(cmd[0], cmd);
-        goto finit;
     }
+    /* See what try_exec thinks of it */
+    rc = try_exec(cmd[0], cmd);
 finit:
     if (NULL != usr->line) {
         free(usr->line);
 ,31 → 98,46
     return rc;
 }
-/* Borrowed from Jiri Svoboda's 'cli' uspace app */
 static void read_line(char *buffer, int n)
 {
-    char c;
-    int chars;
+    kbd_event_t ev;
+    size_t offs, otmp;
+    wchar_t dec;
-    chars = 0;
-    while (chars < n - 1) {
-        c = getchar();
-        if (c < 0)
+    offs = 0;
+    while (true) {
+        fflush(stdout);
+        if (kbd_get_event(&ev) < 0)
             return;
-        if (c == '\n')
+        if (ev.type == KE_RELEASE)
+            continue;
+        if (ev.key == KC_ENTER || ev.key == KC_NENTER)
             break;
-        if (c == '\b') {
-            if (chars > 0) {
+        if (ev.key == KC_BACKSPACE) {
+            if (offs > 0) {
+                /*
+                 * Back up until we reach valid start of
+                 * character.
+                 */
+                while (offs > 0) {
+                    --offs; otmp = offs;
+                    dec = str_decode(buffer, &otmp, n);
+                    if (dec != U_SPECIAL)
+                        break;
+                }
                 putchar('\b');
-                --chars;
             }
             continue;
         }
-        putchar(c);
-        buffer[chars++] = c;
+        if (ev.c >= ' ') {
+            //putchar(ev.c);
+            if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK)
+                console_putchar(ev.c);
+        }
     }
     putchar('\n');
-    buffer[chars] = '\0';
+    buffer[offs] = '\0';
 }
 /* TODO:
 ,15 → 146,16
 void get_input(cliuser_t *usr)
 {
     char line[INPUT_MAX];
-    size_t len = 0;
+    console_set_style(STYLE_EMPHASIS);
     printf("%s", usr->prompt);
+    console_set_style(STYLE_NORMAL);
     read_line(line, INPUT_MAX);
-    len = strlen(line);
     /* Make sure we don't have rubbish or a C/R happy user */
-    if (len == 0 || line[0] == '\n')
+    if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0)
         return;
-    usr->line = cli_strdup(line);
+    usr->line = str_dup(line);
     return;
 }

 /branches/tracing/uspace/app/bdsh/AUTHORS
 ,9 → 8,6
 * Based on the HelenOS testing sub-system written by Martin Decky
-* cli_strtok() and cli_strtok_r() (util.c) were adapted from the FreeBSD
-  strtok() and strtok_r() functions written by Wes Peters.
 * read_line() (input.c) was written by Jiri Svoboda
 Individual author copyrights are listed in the headers of each file.

 /branches/tracing/uspace/app/bdsh/cmds/mknewcmd
 ,8 → 46,6
   -e, --entry        Entry function of the command (def: cmd_${def})
   -h, --help-entry   Entry function for command help (def: help_cmd_${def})
   -a, --alias        Alias (nickname) for this command (def: none)
-  -r, --restrict     Restriction level (interactive, non-interactive, both)
-                     (def: module is both, builtin is interactive only)
   -t, --type         Type of command (module or builtin) (def: module)
   -H, --help         This help summary
   -V, --version      Print $PROGNAME version and exit normally
 ,8 → 65,7
     $PROGNAME -n foo -d "Foo power" -a bar -r both -t module modules/foo
   The example would generate a modular command named 'foo', which is also
-  reached by typing 'bar' and available in either interactive or noninteractive
-  mode.
+  reached by typing 'bar'.
   Skeletal files do *not* depend on the autoconf generated "config.h" unless you
   include it. This may or may not be desirable depending on your use.
 ,7 → 94,6
     "${CMDDESC}",
     &${CMDENTRY},
     &${HELPENTRY},
-    ${CMDRESTRICT}
 },
 EOF
 ,7 → 103,6
     NULL,
     &${CMDENTRY},
     &${HELPENTRY},
-    ${CMDRESTRICT}
 },
 EOF
 ,7 → 162,7
 #include "${CMDNAME}.h"
 #include "cmds.h"
-static char *cmdname = "${CMDNAME}";
+static const char *cmdname = "${CMDNAME}";
 /* Dispays help for ${CMDNAME} in various levels */
 void ${HELPENTRY}(unsigned int level)
 ,8 → 229,8
 # We need at least one
 [ $# = 0 ] && usage && exit 1;
-TEMP=$(getopt -o n:d:e:h:a:r:t:HV \
---long name:,desc:,entry:,help-entry:,alias:,restrict:,type:,help,version \
+TEMP=$(getopt -o n:d:e:h:a:t:HV \
+--long name:,desc:,entry:,help-entry:,alias:,type:,help,version \
 -- "$@") || {
     echo "Try $PROGNAME --help for help"
 }
 ,11 → 264,6
         shift 2
         continue
     ;;
-    -r | --restrict)
-        CMDRESTRICT="$2"
-        shift 2
-        continue
-    ;;
     -t | --type)
         CMDTYPE="$2"
         shift 2
 ,30 → 295,7
 [ -n "$CMDTYPE" ] || CMDTYPE="module"
 [ -n "$OUTDIR" ] || OUTDIR="${CMDTYPE}s/${CMDNAME}"
-# Builtins typically only need to be available in interactive mode,
-# set the default accordingly.
-[ -n "$CMDRESTRICT" ] || {
-    [ "$CMDTYPE" = "module" ] && CMDRESTRICT="both"
-    [ "$CMDTYPE" = "builtin" ] && CMDRESTRICT="interactive"
-}
-# Set the restriction level as the structure expects to see it
-case "$CMDRESTRICT" in
-| both)
-        CMDRESTRICT="0"
-    ;;
-| non-interactive)
-        CMDRESTRICT="1"
-    ;;
-    -1 | interactive)
-        CMDRESTRICT="-1"
-    ;;
-    *)
-        usage
-        exit 1
-    ;;
-esac
 # Do a little sanity
 [ -d $OUTDIR ] && {
     echo "$OUTDIR already exists, remove it to proceed."

 /branches/tracing/uspace/app/bdsh/cmds/mod_cmds.c
 ,26 → 53,6
 extern volatile unsigned int cli_interactive;
-int module_is_restricted(int pos)
-{
-    /* Restriction Levels:
-     * -1 -> Available only in interactive mode
-     *  0 -> Available in any mode
-     *  1 -> Available only in non-interactive mode */
-    module_t *mod = modules;
-    mod += pos;
-    /* We're interactive, and the module is OK to run */
-    if (cli_interactive && mod->restricted <= 0)
-        return 0;
-    /* We're not interactive, and the module is OK to run */
-    if (!cli_interactive && mod->restricted >= 0)
-        return 0;
-    /* Anything else is just a big fat no :) */
-    return 1;
-}
 /* Checks if an entry function matching command exists in modules[], if so
  * its position in the array is returned */
 int is_module(const char *command)
 ,7 → 64,7
         return -2;
     for (mod = modules; mod->name != NULL; mod++, i++) {
-        if (!strcmp(mod->name, command))
+        if (!str_cmp(mod->name, command))
             return i;
     }
 ,7 → 81,7
         return -1;
     for(i=0; mod_aliases[i] != NULL; i+=2) {
-        if (!strcmp(mod_aliases[i], command))
+        if (!str_cmp(mod_aliases[i], command))
             return 1;
     }
 ,7 → 97,7
         return (char *)NULL;
     for(i=0; mod_aliases[i] != NULL; i++) {
-        if (!strcmp(mod_aliases[i], command))
+        if (!str_cmp(mod_aliases[i], command))
             return (char *)mod_aliases[++i];
         i++;
     }

 /branches/tracing/uspace/app/bdsh/cmds/modules/mv/mv.c
 ,0 → 1,70
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "mv.h"
+#include "cmds.h"
+static const char *cmdname = "mv";
+/* Dispays help for mv in various levels */
+void help_cmd_mv(unsigned int level)
+{
+    printf("'%s' renames files\n", cmdname);
+    return;
+}
+/* Main entry point for mv, accepts an array of arguments */
+int cmd_mv(char **argv)
+{
+    unsigned int argc;
+    int rc;
+    argc = cli_count_args(argv);
+    if (argc != 3) {
+        printf("%s: invalid number of arguments.\n",
+            cmdname);
+        return CMD_FAILURE;
+    }
+    rc = rename(argv[1], argv[2]);
+    if (rc != EOK) {
+        printf("Unable to rename %s to %s (rc=%d)\n",
+            argv[1], argv[2], rc);
+        return CMD_FAILURE;
+    }
+    return CMD_SUCCESS;
+}

 /branches/tracing/uspace/app/bdsh/cmds/modules/mv/mv_def.h
 ,0 → 1,14
+{
+    "mv",
+    "The mv command",
+    &cmd_mv,
+    &help_cmd_mv,
+},
+{
+    "ren",
+    NULL,
+    &cmd_mv,
+    &help_cmd_mv,
+},

 /branches/tracing/uspace/app/bdsh/cmds/modules/mv/entry.h
 ,0 → 1,9
+#ifndef MV_ENTRY_H
+#define MV_ENTRY_H
+/* Entry points for the mv command */
+extern int cmd_mv(char **);
+extern void help_cmd_mv(unsigned int);
+#endif /* MV_ENTRY_H */

 /branches/tracing/uspace/app/bdsh/cmds/modules/mv/mv.h
 ,0 → 1,8
+#ifndef MV_H
+#define MV_H
+/* Prototypes for the mv command, excluding entry points */
+#endif /* MV_H */

 /branches/tracing/uspace/app/bdsh/cmds/modules/touch/touch.c
 ,6 → 37,7
 #include <fcntl.h>
 #include <dirent.h>
 #include <sys/types.h>
+#include <string.h>
 #include "config.h"
 #include "errors.h"
 ,7 → 80,7
     }
     for (i = 1; i < argc; i ++) {
-        buff = cli_strdup(argv[i]);
+        buff = str_dup(argv[i]);
         dirp = opendir(buff);
         if (dirp) {
             cli_error(CL_ENOTSUP, "%s is a directory", buff);

/branches/tracing/uspace/app/bdsh/cmds/modules/touch/touch_def.h
3,6 → 3,5
"Create files or update access times",
&cmd_touch,
&help_cmd_touch,
0
},

 /branches/tracing/uspace/app/bdsh/cmds/modules/mount/mount.c
 ,0 → 1,82
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <vfs/vfs.h>
+#include <errno.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "mount.h"
+#include "cmds.h"
+static const char *cmdname = "mount";
+/* Dispays help for mount in various levels */
+void help_cmd_mount(unsigned int level)
+{
+    static char helpfmt[] =
+        "Usage:  %s <fstype> <mp> <dev> [<moptions>]\n";
+    if (level == HELP_SHORT) {
+        printf("'%s' mounts a file system.\n", cmdname);
+    } else {
+        help_cmd_mount(HELP_SHORT);
+        printf(helpfmt, cmdname);
+    }
+    return;
+}
+/* Main entry point for mount, accepts an array of arguments */
+int cmd_mount(char **argv)
+{
+    unsigned int argc;
+    char *mopts = "";
+    int rc;
+    argc = cli_count_args(argv);
+    if ((argc < 4) || (argc > 5)) {
+        printf("%s: invalid number of arguments.\n",
+            cmdname);
+        return CMD_FAILURE;
+    }
+    if (argc == 5)
+        mopts = argv[4];
+    rc = mount(argv[1], argv[2], argv[3], mopts, 0);
+    if (rc != EOK) {
+        printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
+            argv[1], argv[2], argv[3], rc);
+        return CMD_FAILURE;
+    }
+    return CMD_SUCCESS;
+}

/branches/tracing/uspace/app/bdsh/cmds/modules/mount/mount_def.h
0,0 → 1,7
{
"mount",
"The mount command",
&cmd_mount,
&help_cmd_mount,
},

 /branches/tracing/uspace/app/bdsh/cmds/modules/mount/entry.h
 ,0 → 1,9
+#ifndef MOUNT_ENTRY_H
+#define MOUNT_ENTRY_H
+/* Entry points for the mount command */
+extern int cmd_mount(char **);
+extern void help_cmd_mount(unsigned int);
+#endif /* MOUNT_ENTRY_H */

 /branches/tracing/uspace/app/bdsh/cmds/modules/mount/mount.h
 ,0 → 1,8
+#ifndef MOUNT_H
+#define MOUNT_H
+/* Prototypes for the mount command, excluding entry points */
+#endif /* MOUNT_H */

 /branches/tracing/uspace/app/bdsh/cmds/modules/cp/cp.c
 ,7 → 34,6
 #include <getopt.h>
 #include <string.h>
 #include <fcntl.h>
-#include <assert.h>
 #include "config.h"
 #include "util.h"
 #include "errors.h"
 ,7 → 69,8
     return (int) t1;
 }
-static int64_t copy_file(const char *src, const char *dest, size_t blen, int vb)
+static int64_t copy_file(const char *src, const char *dest,
+    size_t blen, int vb)
 {
     int fd1, fd2, bytes = 0;
     off_t total = 0;
 ,12 → 124,19
                 goto err;
             res -= bytes;
         } while (res > 0);
-        assert(res == 0);
+        /* TODO: re-insert assert() once this is stand alone,
+         * removed as abort() exits the entire shell
+         */
+        if (res != 0) {
+            printf("\n%d more bytes than actually exist were copied\n", res);
+            goto err;
+        }
     }
     if (bytes < 0) {
 err:
-        printf("Error copying %s, (%d)\n", src, bytes);
+        printf("\nError copying %s, (%d)\n", src, bytes);
         copied = bytes;
     }

/branches/tracing/uspace/app/bdsh/cmds/modules/cp/cp_def.h
3,6 → 3,5
"Copy files and directories",
&cmd_cp,
&help_cmd_cp,
0
},

 /branches/tracing/uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
 ,7 → 93,7
     /* Its a good idea to allocate path, plus we (may) need a copy of
      * path to tokenize if parents are specified */
-    if (NULL == (tmp = cli_strdup(path))) {
+    if (NULL == (tmp = str_dup(path))) {
         cli_error(CL_ENOMEM, "%s: path too big?", cmdname);
         return 1;
     }
 ,9 → 128,9
         absolute = 1;
     /* TODO: Canonify the path prior to tokenizing it, see below */
-    dirs[i] = cli_strtok(tmp, "/");
+    dirs[i] = strtok(tmp, "/");
     while (dirs[i] && i < 255)
-        dirs[++i] = cli_strtok(NULL, "/");
+        dirs[++i] = strtok(NULL, "/");
     if (NULL == dirs[0])
         return 1;
 ,7 → 149,7
     while (dirs[i] != NULL) {
         /* Sometimes make or scripts conjoin odd paths. Account for something
          * like this: ../../foo/bar/../foo/foofoo/./bar */
-        if (!strcmp(dirs[i], "..") || !strcmp(dirs[i], ".")) {
+        if (!str_cmp(dirs[i], "..") || !str_cmp(dirs[i], ".")) {
             if (0 != (chdir(dirs[i]))) {
                 cli_error(CL_EFAIL, "%s: impossible path: %s",
                     cmdname, path);

 /branches/tracing/uspace/app/bdsh/cmds/modules/mkdir/mkdir_def.h
 ,14 → 3,6
     "Create new directories",
     &cmd_mkdir,
     &help_cmd_mkdir,
 },
-{
-    "md",
-    NULL,
-    &cmd_mkdir,
-    &help_cmd_mkdir,
-},

 /branches/tracing/uspace/app/bdsh/cmds/modules/cat/cat.c
 ,7 → 87,8
     off_t total = 0;
     char *buff = NULL;
-    if (-1 == (fd = open(fname, O_RDONLY))) {
+    fd = open(fname, O_RDONLY);
+    if (fd < 0) {
         printf("Unable to open %s\n", fname);
         return 1;
     }

/branches/tracing/uspace/app/bdsh/cmds/modules/cat/cat_def.h
3,6 → 3,5
"Show the contents of a file",
&cmd_cat,
&help_cmd_cat,
0
},

/branches/tracing/uspace/app/bdsh/cmds/modules/help/help.c
107,7 → 107,7
}

if (argc == 3) {
if (!strcmp("extended", argv[2]))
if (!str_cmp("extended", argv[2]))
level = HELP_LONG;
else
level = HELP_SHORT;
133,13 → 133,11

/* First, show a list of built in commands that are available in this mode */
for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
if (!builtin_is_restricted(i)) {
if (is_builtin_alias(cmd->name))
printf(" %-16s\tAlias for `%s'\n", cmd->name,
alias_for_builtin(cmd->name));
else
printf(" %-16s\t%s\n", cmd->name, cmd->desc);
}
}

i = 0;
146,13 → 144,11

/* Now, show a list of module commands that are available in this mode */
for (mod = modules; mod->name != NULL; mod++, i++) {
if (!module_is_restricted(i)) {
if (is_module_alias(mod->name))
printf(" %-16s\tAlias for `%s'\n", mod->name,
alias_for_module(mod->name));
else
printf(" %-16s\t%s\n", mod->name, mod->desc);
}
}

printf("\n Try %s %s for more information on how `%s' works.\n\n",

/branches/tracing/uspace/app/bdsh/cmds/modules/help/help_def.h
3,5 → 3,4
"Show help for commands",
&cmd_help,
&help_cmd_help,
0
},

/branches/tracing/uspace/app/bdsh/cmds/modules/sleep/sleep_def.h
3,6 → 3,5
"Pause for given time interval (in seconds)",
&cmd_sleep,
&help_cmd_sleep,
0
},

 /branches/tracing/uspace/app/bdsh/cmds/modules/kcon/kcon.h
 ,0 → 1,8
+#ifndef KCON_H
+#define KCON_H
+/* Prototypes for the kcon command, excluding entry points */
+#endif /* KCON_H */

 /branches/tracing/uspace/app/bdsh/cmds/modules/kcon/entry.h
 ,0 → 1,9
+#ifndef KCON_ENTRY_H
+#define KCON_ENTRY_H
+/* Entry points for the kcon command */
+extern int cmd_kcon(char **);
+extern void help_cmd_kcon(unsigned int);
+#endif /* KCON_ENTRY_H */

 /branches/tracing/uspace/app/bdsh/cmds/modules/kcon/kcon.c
 ,0 → 1,72
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <console.h>
+#include "config.h"
+#include "util.h"
+#include "errors.h"
+#include "entry.h"
+#include "kcon.h"
+#include "cmds.h"
+static char *cmdname = "kcon";
+/* Dispays help for kcon in various levels */
+void help_cmd_kcon(unsigned int level)
+{
+    printf("`kcon' switches to the kernel debug console.\n");
+    if (level != HELP_SHORT) {
+        printf("Usage:  %s\n", cmdname);
+    }
+    return;
+}
+/* Main entry point for kcon, accepts an array of arguments */
+int cmd_kcon(char **argv)
+{
+    unsigned int argc;
+    argc = cli_count_args(argv);
+    if (argc != 1) {
+        printf("%s - incorrect number of arguments. Try `%s --help'\n",
+            cmdname, cmdname);
+        return CMD_FAILURE;
+    }
+    console_kcon_enable();
+    return CMD_SUCCESS;
+}

/branches/tracing/uspace/app/bdsh/cmds/modules/kcon/kcon_def.h
0,0 → 1,7
{
"kcon",
"Switch to kernel console",
&cmd_kcon,
&help_cmd_kcon,
},

/branches/tracing/uspace/app/bdsh/cmds/modules/pwd/pwd_def.h
3,5 → 3,4
"Prints the current working directory",
&cmd_pwd,
&help_cmd_pwd,
-1
},

 /branches/tracing/uspace/app/bdsh/cmds/modules/module_aliases.h
 ,10 → 12,7
  * the entry point being reached. */
 char *mod_aliases[] = {
-    "exit", "quit",
-    "md", "mkdir",
-    "del", "rm",
-    "dir", "ls",
+    "ren", "mv",
     NULL, NULL
 };

 /branches/tracing/uspace/app/bdsh/cmds/modules/modules.h
 ,7 → 18,6
 /* Prototypes for each module's entry (help/exec) points */
 #include "help/entry.h"
-#include "quit/entry.h"
 #include "mkdir/entry.h"
 #include "rm/entry.h"
 #include "cat/entry.h"
 ,6 → 26,9
 #include "pwd/entry.h"
 #include "sleep/entry.h"
 #include "cp/entry.h"
+#include "mv/entry.h"
+#include "mount/entry.h"
+#include "kcon/entry.h"
 /* Each .def function fills the module_t struct with the individual name, entry
  * point, help entry point, etc. You can use config.h to control what modules
 ,7 → 36,6
 module_t modules[] = {
 #include "help/help_def.h"
-#include "quit/quit_def.h"
 #include "mkdir/mkdir_def.h"
 #include "rm/rm_def.h"
 #include "cat/cat_def.h"
 ,6 → 44,10
 #include "pwd/pwd_def.h"
 #include "sleep/sleep_def.h"
 #include "cp/cp_def.h"
+#include "mv/mv_def.h"
+#include "mount/mount_def.h"
+#include "kcon/kcon_def.h"
     {NULL, NULL, NULL, NULL}
 };

 /branches/tracing/uspace/app/bdsh/cmds/modules/rm/rm.c
 ,7 → 33,6
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <assert.h>
 #include <getopt.h>
 #include "config.h"
 ,9 → 216,13
     i = optind;
     while (NULL != argv[i]) {
-        len = strlen(argv[i]) + 2;
+        len = str_size(argv[i]) + 2;
         buff = (char *) realloc(buff, len);
-        assert(buff != NULL);
+        if (buff == NULL) {
+            printf("rm: out of memory\n");
+            ret = 1;
+            break;
+        }
         memset(buff, 0, sizeof(buff));
         snprintf(buff, len, argv[i]);

 /branches/tracing/uspace/app/bdsh/cmds/modules/rm/rm_def.h
 ,14 → 3,5
     "Remove files and directories",
     &cmd_rm,
     &help_cmd_rm,
 },
-{
-    "del",
-    NULL,
-    &cmd_rm,
-    &help_cmd_rm,
-},

 /branches/tracing/uspace/app/bdsh/cmds/modules/ls/ls.c
 ,6 → 50,24
 static char *cmdname = "ls";
+static inline off_t flen(const char *f)
+{
+    int fd;
+    off_t size;
+    fd = open(f, O_RDONLY);
+    if (fd == -1)
+        return 0;
+    size = lseek(fd, 0, SEEK_END);
+    close(fd);
+    if (size < 0)
+        size = 0;
+    return size;
+}
 static unsigned int ls_scope(const char *path)
 {
     int fd;
 ,7 → 114,7
             ls_print_dir(dp->d_name);
             break;
         case LS_FILE:
-            ls_print_file(dp->d_name);
+            ls_print_file(dp->d_name, buff);
             break;
         case LS_BOGUS:
             /* Odd chance it was deleted from the time readdir() found
 ,14 → 138,14
 static void ls_print_dir(const char *d)
 {
-    printf("%-40s\t<DIR>\n", d);
+    printf("%-40s\t<dir>\n", d);
     return;
 }
-static void ls_print_file(const char *f)
+static void ls_print_file(const char *name, const char *pathname)
 {
-    printf("%-40s\n", f);
+    printf("%-40s\t%llu\n", name, (long long) flen(pathname));
     return;
 }
 ,7 → 182,7
     if (argc == 1)
         getcwd(buff, PATH_MAX);
     else
-        strncpy(buff, argv[1], PATH_MAX);
+        str_cpy(buff, PATH_MAX, argv[1]);
     scope = ls_scope(buff);
 ,7 → 192,7
         free(buff);
         return CMD_FAILURE;
     case LS_FILE:
-        ls_print_file(buff);
+        ls_print_file(buff, buff);
         break;
     case LS_DIR:
         dirp = opendir(buff);

 /branches/tracing/uspace/app/bdsh/cmds/modules/ls/ls_def.h
 ,14 → 3,4
     "List files and directories",
     &cmd_ls,
     &help_cmd_ls,
 },
-{
-    "dir",
-    NULL,
-    &cmd_ls,
-    &help_cmd_ls,
-},

 /branches/tracing/uspace/app/bdsh/cmds/modules/ls/ls.h
 ,7 → 10,7
 static unsigned int ls_scope(const char *);
 static void ls_scan_dir(const char *, DIR *);
 static void ls_print_dir(const char *);
-static void ls_print_file(const char *);
+static void ls_print_file(const char *, const char *);
 #endif /* LS_H */

/branches/tracing/uspace/app/bdsh/cmds/builtins/builtins.h
4,9 → 4,11
#include "config.h"

#include "cd/entry.h"
#include "exit/entry.h"

builtin_t builtins[] = {
#include "cd/cd_def.h"
#include "exit/exit_def.h"
{NULL, NULL, NULL, NULL}
};

 /branches/tracing/uspace/app/bdsh/cmds/builtins/cd/cd_def.h
 ,12 → 3,4
     "Change the current working directory",
     &cmd_cd,
     &help_cmd_cd,
-    -1
 },
-{
-    "chdir",
-    NULL,
-    &cmd_cd,
-    &help_cmd_cd,
-    -1
-},

/branches/tracing/uspace/app/bdsh/cmds/builtins/exit/exit.h
0,0 → 1,6
#ifndef EXIT_H
#define EXIT_H

/* Prototypes for the quit command (excluding entry points) */

#endif

 /branches/tracing/uspace/app/bdsh/cmds/builtins/exit/entry.h
 ,0 → 1,12
+#ifndef EXIT_ENTRY_H_
+#define EXIT_ENTRY_H_
+#include "scli.h"
+/* Entry points for the quit command */
+extern void help_cmd_exit(unsigned int);
+extern int cmd_exit(char *[], cliuser_t *);
+#endif

 /branches/tracing/uspace/app/bdsh/cmds/builtins/exit/exit.c
 ,0 → 1,55
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the original program's authors nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include "entry.h"
+#include "exit.h"
+#include "cmds.h"
+static const char *cmdname = "exit";
+extern volatile unsigned int cli_quit;
+extern const char *progname;
+void help_cmd_exit(unsigned int level)
+{
+    printf("Type `%s' to exit %s\n", cmdname, progname);
+    return;
+}
+/* Quits the program and returns the status of whatever command
+ * came before invoking 'quit' */
+int cmd_exit(char *argv[], cliuser_t *usr)
+{
+    /* Inform that we're outta here */
+    cli_quit = 1;
+    return CMD_SUCCESS;
+}

/branches/tracing/uspace/app/bdsh/cmds/builtins/exit/exit_def.h
0,0 → 1,6
{
"exit",
"Exit the shell",
&cmd_exit,
&help_cmd_exit,
},

/branches/tracing/uspace/app/bdsh/cmds/builtins/builtin_aliases.h
4,7 → 4,6
/* See modules/module_aliases.h for an explanation of this file */

char *builtin_aliases[] = {
"chdir", "cd",
NULL, NULL
};

/branches/tracing/uspace/app/bdsh/cmds/cmds.h
36,7 → 36,6
char desc; / Description of the command */
mod_entry_t entry; /* Command (exec) entry function */
mod_help_t help; /* Command (help) entry function */
int restricted; /* Restricts to interactive/non-interactive only */
} module_t;

/* Builtin structure, same as modules except different types of entry points */

 /branches/tracing/uspace/app/bdsh/cmds/builtin_cmds.c
 ,19 → 40,6
 extern volatile unsigned int cli_interactive;
-int builtin_is_restricted(int pos)
-{
-    builtin_t *cmd = builtins;
-    cmd += pos;
-    if (cli_interactive && cmd->restricted <= 0)
-        return 0;
-    if (!cli_interactive && cmd->restricted >= 0)
-        return 0;
-    return 1;
-}
 int is_builtin(const char *command)
 {
     builtin_t *cmd;
 ,7 → 49,7
         return -2;
     for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
-        if (!strcmp(cmd->name, command))
+        if (!str_cmp(cmd->name, command))
             return i;
     }
 ,7 → 64,7
         return -1;
     for(i=0; builtin_aliases[i] != NULL; i+=2) {
-        if (!strcmp(builtin_aliases[i], command))
+        if (!str_cmp(builtin_aliases[i], command))
             return 1;
     }
 ,7 → 79,7
         return (char *)NULL;
     for(i=0; builtin_aliases[i] != NULL; i++) {
-        if (!strcmp(builtin_aliases[i], command))
+        if (!str_cmp(builtin_aliases[i], command))
             return (char *)builtin_aliases[++i];
         i++;
     }

 /branches/tracing/uspace/app/bdsh/util.c
 ,7 → 1,4
-/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com>
- * Copyright (C) 1998 by Wes Peters <wes@softweyr.com>
- * Copyright (c) 1988, 1993 The Regents of the University of California.
- * All rights reserved by all copyright holders.
+/* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> - All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
 ,18 → 27,6
  * POSSIBILITY OF SUCH DAMAGE.
  */
-/* NOTES:
- * 1 - Various functions were adapted from FreeBSD (copyright holders noted above)
- *     these functions are identified with comments.
- *
- * 2 - Some of these have since appeared in libc. They remain here for various
- *     reasons, such as the eventual integration of garbage collection for things
- *     that allocate memory and don't automatically free it.
- *
- * 3 - Things that expect a pointer to an allocated string do _no_ sanity checking
- *     if developing on a simulator with no debugger, take care :)
- */
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 ,71 → 39,6
 extern volatile int cli_errno;
-/* some platforms do not have strdup, implement it here.
- * Returns a pointer to an allocated string or NULL on failure */
-char * cli_strdup(const char *s1)
-{
-    size_t len = strlen(s1) + 1;
-    void *ret = malloc(len);
-    if (ret == NULL) {
-        cli_errno = CL_ENOMEM;
-        return (char *) NULL;
-    }
-    cli_errno = CL_EOK;
-    return (char *) memcpy(ret, s1, len);
-}
-/* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */
-char * cli_strtok_r(char *s, const char *delim, char **last)
-{
-    char *spanp, *tok;
-    int c, sc;
-    if (s == NULL && (s = *last) == NULL) {
-        cli_errno = CL_EFAIL;
-        return (NULL);
-    }
-cont:
-    c = *s++;
-    for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-        if (c == sc)
-            goto cont;
-    }
-    if (c == 0) {       /* no non-delimiter characters */
-        *last = NULL;
-        return (NULL);
-    }
-    tok = s - 1;
-    for (;;) {
-        c = *s++;
-        spanp = (char *)delim;
-        do {
-            if ((sc = *spanp++) == c) {
-                if (c == 0)
-                    s = NULL;
-                else
-                    s[-1] = '\0';
-                *last = s;
-                return (tok);
-            }
-        } while (sc != 0);
-    }
-}
-/* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */
-char * cli_strtok(char *s, const char *delim)
-{
-    static char *last;
-    return (cli_strtok_r(s, delim, &last));
-}
 /* Count and return the # of elements in an array */
 unsigned int cli_count_args(char **args)
 {

 /branches/tracing/uspace/app/bdsh/util.h
 ,11 → 3,6
 #include "scli.h"
-/* Internal string handlers */
-extern char * cli_strdup(const char *);
-extern char * cli_strtok_r(char *, const char *, char **);
-extern char * cli_strtok(char *, const char *);
 /* Utility functions */
 extern unsigned int cli_count_args(char **);
 extern unsigned int cli_set_prompt(cliuser_t *usr);

 /branches/tracing/uspace/app/bdsh/exec.c
 ,7 → 71,7
     char *path_tok;
     char *path[PATH_MAX];
     int n = 0, i = 0;
-    size_t x = strlen(cmd) + 2;
+    size_t x = str_size(cmd) + 2;
     found = (char *)malloc(PATH_MAX);
 ,18 → 80,18
         return (char *) cmd;
     }
-    path_tok = cli_strdup(PATH);
+    path_tok = str_dup(PATH);
     /* Extract the PATH env to a path[] array */
-    path[n] = cli_strtok(path_tok, PATH_DELIM);
+    path[n] = strtok(path_tok, PATH_DELIM);
     while (NULL != path[n]) {
-        if ((strlen(path[n]) + x ) > PATH_MAX) {
+        if ((str_size(path[n]) + x ) > PATH_MAX) {
             cli_error(CL_ENOTSUP,
                 "Segment %d of path is too large, search ends at segment %d",
                 n, n-1);
             break;
         }
-        path[++n] = cli_strtok(NULL, PATH_DELIM);
+        path[++n] = strtok(NULL, PATH_DELIM);
     }
     /* We now have n places to look for the command */
 ,7 → 114,7
     task_id_t tid;
     char *tmp;
-    tmp = cli_strdup(find_command(cmd));
+    tmp = str_dup(find_command(cmd));
     free(found);
     tid = task_spawn((const char *)tmp, argv);
 ,7 → 121,7
     free(tmp);
     if (tid == 0) {
-        cli_error(CL_EEXEC, "Can not spawn %s", cmd);
+        cli_error(CL_EEXEC, "Cannot spawn `%s'.", cmd);
         return 1;
     } else {
         return 0;

/branches/tracing/uspace/app/bdsh/scli.c
45,7 → 45,6
/* Globals that are modified during start-up that modules/builtins
* should be aware of. */
volatile unsigned int cli_quit = 0;
volatile unsigned int cli_interactive = 1;
volatile unsigned int cli_verbocity = 1;

/* The official name of this program

 /branches/tracing/uspace/app/bdsh/Makefile
 ,25 → 30,17
 # POSSIBILITY OF SUCH DAMAGE.
 include ../../../version
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../srv/kbd/include
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
+DEFS += -DRELEASE=$(RELEASE)
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(TIMESTAMP)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 PROGRAM = bdsh
 # Any directory that cleaning targets should know about
 ,7 → 49,6
     cmds/ \
     cmds/modules/ \
     cmds/modules/help/ \
-    cmds/modules/quit/ \
     cmds/modules/mkdir/ \
     cmds/modules/rm/ \
     cmds/modules/cat/ \
 ,12 → 57,15
     cmds/modules/pwd/ \
     cmds/modules/sleep/ \
     cmds/modules/cp/ \
+    cmds/modules/mv/ \
+    cmds/modules/mount \
+    cmds/modules/kcon/ \
     cmds/builtins/ \
+    cmds/builtins/exit/\
     cmds/builtins/cd/
 SOURCES = \
     cmds/modules/help/help.c \
-    cmds/modules/quit/quit.c \
     cmds/modules/mkdir/mkdir.c \
     cmds/modules/rm/rm.c \
     cmds/modules/cat/cat.c \
 ,6 → 74,10
     cmds/modules/pwd/pwd.c \
     cmds/modules/sleep/sleep.c \
     cmds/modules/cp/cp.c \
+    cmds/modules/mv/mv.c \
+    cmds/modules/mount/mount.c \
+    cmds/modules/kcon/kcon.c \
+    cmds/builtins/exit/exit.c \
     cmds/builtins/cd/cd.c \
     cmds/mod_cmds.c \
     cmds/builtin_cmds.c \
 ,7 → 110,7
     @$(CC) -M $(CFLAGS) $(INC) $*.c > $*.d
 $(PROGRAM): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
 # Everything else is a phony target
 .PHONY: all clean distclean depend disasm

 /branches/tracing/uspace/app/init/init.c
 ,9 → 27,9
  */
 /** @addtogroup init Init
- * @brief   Init process for testing purposes.
+ * @brief Init process for user space environment configuration.
  * @{
- */
+ */
 /**
  * @file
  */
 ,6 → 36,7
 #include <stdio.h>
 #include <unistd.h>
+#include <ipc/ipc.h>
 #include <vfs/vfs.h>
 #include <bool.h>
 #include <errno.h>
 ,22 → 43,23
 #include <fcntl.h>
 #include <task.h>
 #include <malloc.h>
+#include <macros.h>
+#include <console.h>
+#include <string.h>
 #include "init.h"
 #include "version.h"
-static void console_wait(void)
-{
-    while (get_cons_phone() < 0)
-        usleep(50000);  // FIXME
-}
 static bool mount_fs(const char *fstype)
 {
     int rc = -1;
+    char *opts = "";
+    if (str_cmp(fstype, "tmpfs") == 0)
+        opts = "restore";
     while (rc < 0) {
-        rc = mount(fstype, "/", "initrd");
+        rc = mount(fstype, "/", "initrd", opts, IPC_FLAG_BLOCKING);
         switch (rc) {
         case EOK:
             printf(NAME ": Root filesystem mounted\n");
 ,8 → 73,6
         case ENOENT:
             printf(NAME ": Unknown filesystem type (%s)\n", fstype);
             return false;
-        default:
-            sleep(5);   // FIXME
         }
     }
 ,24 → 82,21
 static void spawn(char *fname)
 {
     char *argv[2];
     printf(NAME ": Spawning %s\n", fname);
     argv[0] = fname;
     argv[1] = NULL;
-    if (task_spawn(fname, argv) != 0) {
-        /* Success */
-        sleep(1);
-    }
+    if (!task_spawn(fname, argv))
+        printf(NAME ": Error spawning %s\n", fname);
 }
 int main(int argc, char *argv[])
 {
     info_print();
-    sleep(5);   // FIXME
-    if (!mount_fs("tmpfs") && !mount_fs("fat")) {
+    if (!mount_fs(STRING(RDFMT))) {
         printf(NAME ": Exiting\n");
         return -1;
     }
 ,6 → 105,8
     spawn("/srv/fb");
     spawn("/srv/kbd");
     spawn("/srv/console");
+    spawn("/srv/fhc");
+    spawn("/srv/obio");
     console_wait();
     version_print();

 /branches/tracing/uspace/app/init/version.c
 ,19 → 35,20
 #include <unistd.h>
 #include <stdio.h>
+#include <macros.h>
 #include "init.h"
 #include "version.h"
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif
 ,7 → 61,8
 /** Print version information. */
 void version_print(void)
 {
-    printf("HelenOS init\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+    printf("HelenOS init\nRelease %s%s%s\n", release, revision, timestamp);
+    printf("Copyright (c) 2001-2009 HelenOS project\n");
 }
 /** @}

 /branches/tracing/uspace/app/init/Makefile
 ,7 → 27,6
 #
 include ../../../version
-include ../../Makefile.config
 ## Setup toolchain
 #
 ,21 → 33,14
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../srv/kbd/include
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
+DEFS += -DRELEASE=$(RELEASE)
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,13 → 58,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/app/debug/main.c
 ,7 → 178,7
     int idx_found;
     int num_found;
-    len = strlen(cmd_argv[0]);
+    len = str_length(cmd_argv[0]);
     cmp_len = 1;
     /* Silence warnings */
 ,7 → 190,7
         num_found = 0;
         i = 0;
         while (cmd_table[i].name != NULL) {
-            if (strncmp(cmd_table[i].name, cmd_argv[0], cmp_len) == 0) {
+            if (str_lcmp(cmd_table[i].name, cmd_argv[0], cmp_len) == 0) {
                 idx_found = i;
                 ++num_found;
             }

 /branches/tracing/uspace/app/debug/Makefile
 ,8 → 32,9
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(ARCH)/Makefile.inc
+include arch/$(UARCH)/Makefile.inc
 include genarch/Makefile.inc
 CFLAGS += -I../../srv/kbd/include -Igenarch/idec
 ,7 → 59,7
 all: inc $(OUTPUT) disasm
 inc:
-    ln -sfn ../arch/$(ARCH)/include include/arch
+    ln -sfn ../arch/$(UARCH)/include include/arch
 -include Makefile.depend
 ,7 → 71,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

/branches/tracing/uspace/app/debug/arch/arm32/Makefile.inc
27,6 → 27,6
#

ARCH_SOURCES := \
arch/$(ARCH)/src/arm32.c
arch/$(UARCH)/src/arm32.c

CONFIG_IDEC = y

/branches/tracing/uspace/app/debug/arch/ppc32/Makefile.inc
27,6 → 27,6
#

ARCH_SOURCES := \
arch/$(ARCH)/src/ppc32.c
arch/$(UARCH)/src/ppc32.c

CONFIG_IDEC = y

/branches/tracing/uspace/app/debug/arch/mips32/Makefile.inc
27,6 → 27,6
#

ARCH_SOURCES := \
arch/$(ARCH)/src/mips32.c
arch/$(UARCH)/src/mips32.c

CONFIG_IDEC = y

/branches/tracing/uspace/app/debug/arch/ia32/Makefile.inc
26,4 → 26,4
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

ARCH_SOURCES := arch/$(ARCH)/src/ia32.c
ARCH_SOURCES := arch/$(UARCH)/src/ia32.c

/branches/tracing/uspace/app/tester/console/console1.def
0,0 → 1,6
{
"console1",
"Console color test",
&test_console1,
true
},

 /branches/tracing/uspace/app/tester/console/console1.c
 ,0 → 1,109
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <io/stream.h>
+#include <async.h>
+#include "../tester.h"
+#include <console.h>
+const char *color_name[] = {
+    [COLOR_BLACK] = "black",
+    [COLOR_BLUE] = "blue",
+    [COLOR_GREEN] = "green",
+    [COLOR_CYAN] = "cyan",
+    [COLOR_RED] = "red",
+    [COLOR_MAGENTA] = "magenta",
+    [COLOR_YELLOW] = "yellow",
+    [COLOR_WHITE] = "white"
+};
+char * test_console1(bool quiet)
+{
+    int i, j;
+    printf("Style test: ");
+    console_set_style(STYLE_NORMAL);
+    printf("normal ");
+    console_set_style(STYLE_EMPHASIS);
+    printf("emphasized");
+    console_set_style(STYLE_NORMAL);
+    printf(".\n");
+    printf("Foreground color test:\n");
+    for (j = 0; j < 2; j++) {
+        for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
+            console_set_color(i, COLOR_WHITE,
+                j ? CATTR_BRIGHT : 0);
+            printf(" %s ", color_name[i]);
+        }
+        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        putchar('\n');
+    }
+    printf("Background color test:\n");
+    for (j = 0; j < 2; j++) {
+        for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
+            console_set_color(COLOR_WHITE, i,
+                j ? CATTR_BRIGHT : 0);
+            printf(" %s ", color_name[i]);
+        }
+        console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+        putchar('\n');
+    }
+    printf("Now let's test RGB colors:\n");
+    for (i = 0; i < 255; i += 16) {
+        console_set_rgb_color(0xffffff, i << 16);
+        putchar('X');
+    }
+    console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+    putchar('\n');
+    for (i = 0; i < 255; i += 16) {
+        console_set_rgb_color(0xffffff, i << 8);
+        putchar('X');
+    }
+    console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+    putchar('\n');
+    for (i = 0; i < 255; i += 16) {
+        console_set_rgb_color(0xffffff, i);
+        putchar('X');
+    }
+    console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+    putchar('\n');
+    printf("[press a key]\n");
+    getchar();
+    return NULL;
+}

/branches/tracing/uspace/app/tester/stdio/stdio1.def
0,0 → 1,6
{
"stdio1",
"ANSI C streams reading test",
&test_stdio1,
true
},

/branches/tracing/uspace/app/tester/stdio/stdio2.def
0,0 → 1,6
{
"stdio2",
"ANSI C streams writing test",
&test_stdio2,
true
},

 /branches/tracing/uspace/app/tester/stdio/stdio1.c
 ,0 → 1,85
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "../tester.h"
+#define BUF_SIZE 32
+static char buf[BUF_SIZE + 1];
+char * test_stdio1(bool quiet)
+{
+    FILE *f;
+    char *file_name = "/readme";
+    size_t n;
+    int c;
+    printf("Open file '%s'\n", file_name);
+    errno = 0;
+    f = fopen(file_name, "rt");
+    if (f == NULL) printf("errno = %d\n", errno);
+    if (f == NULL)
+        return "Failed opening file.";
+    n = fread(buf, 1, BUF_SIZE, f);
+    if (ferror(f)) {
+        fclose(f);
+        return "Failed reading file.";
+    }
+    printf("Read %d bytes.\n", n);
+    buf[n] = '\0';
+    printf("Read string '%s'.\n", buf);
+    printf("Seek to beginning.\n");
+    if (fseek(f, 0, SEEK_SET) != 0) {
+        fclose(f);
+        return "Failed seeking.";
+    }
+    printf("Read using fgetc().\n");
+    while (true) {
+        c = fgetc(f);
+        if (c == EOF) break;
+        printf("'%c'", c);
+    }
+    printf("[EOF]\n");
+    printf("Closing.\n");
+    if (fclose(f) != 0)
+        return "Failed closing.";
+    return NULL;
+}

 /branches/tracing/uspace/app/tester/stdio/stdio2.c
 ,0 → 1,69
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include "../tester.h"
+char * test_stdio2(bool quiet)
+{
+    FILE *f;
+    char *file_name = "/test";
+    size_t n;
+    int c;
+    printf("Open file '%s' for writing\n", file_name);
+    errno = 0;
+    f = fopen(file_name, "wt");
+    if (f == NULL)
+        return "Failed opening file.";
+    fprintf(f, "Integer: %d, string: '%s'\n", 42, "Hello!");
+    if (fclose(f) != 0)
+        return "Failed closing file.";
+    printf("Open file '%s' for reading\n", file_name);
+    f = fopen(file_name, "rt");
+    if (f == NULL)
+        return "Failed opening file.";
+    printf("File contains:\n");
+    while (true) {
+        c = fgetc(f);
+        if (c == EOF) break;
+        putchar(c);
+    }
+    if (fclose(f) != 0)
+        return "Failed closing file.";
+    return NULL;
+}

 /branches/tracing/uspace/app/tester/tester.c
 ,6 → 47,7
 test_t tests[] = {
 #include "thread/thread1.def"
 #include "print/print1.def"
+#include "print/print4.def"
 #include "fault/fault1.def"
 #include "fault/fault2.def"
 #include "ipc/register.def"
 ,6 → 59,9
 #include "devmap/devmap1.def"
 #include "loop/loop1.def"
 #include "vfs/vfs1.def"
+#include "console/console1.def"
+#include "stdio/stdio1.def"
+#include "stdio/stdio2.def"
 #include "debug/debug1.def"
     {NULL, NULL, NULL}
 };

 /branches/tracing/uspace/app/tester/devmap/devmap1.c
 ,17 → 132,15
     int phone;
     ipcarg_t callback_phonehash;
-    phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
-    while (phone < 0) {
-        usleep(100000);
-        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
-            DEVMAP_DRIVER, 0);
+    phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0);
+    if (phone < 0) {
+        printf("Failed to connect to device mapper\n");
+        return -1;
     }
     req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
-    retval = ipc_data_write_start(phone, (char *)name, strlen(name) + 1);
+    retval = ipc_data_write_start(phone, (char *)name, str_size(name) + 1);
     if (retval != EOK) {
         async_wait_for(req, NULL);
 ,7 → 173,7
     req = async_send_2(driver_phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
         &answer);
-    retval = ipc_data_write_start(driver_phone, name, strlen(name) + 1);
+    retval = ipc_data_write_start(driver_phone, name, str_size(name) + 1);
     if (retval != EOK) {
         printf("Failed to send device name '%s'.\n", name);
 ,7 → 215,7
     req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer);
     retval = ipc_data_write_start(driver_phone, (char *)name,
-        strlen(name) + 1);
+        str_size(name) + 1);
     if (retval != EOK) {
         printf("Failed to send device name '%s'.\n", name);

 /branches/tracing/uspace/app/tester/print/print4.c
 ,0 → 1,92
+/*
+ * Copyright (c) 2009 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <unistd.h>
+#include "../tester.h"
+#define PRIx8 "x"
+char *test_print4(bool quiet)
+{
+    if (!quiet) {
+        printf("ASCII printable characters (32 - 127) using printf(\"%%c\") and printf(\"%%lc\"):\n");
+        uint8_t group;
+        for (group = 1; group < 4; group++) {
+            printf("%#" PRIx8 ": ", group << 5);
+            uint8_t index;
+            for (index = 0; index < 32; index++)
+                printf("%c", (char) ((group << 5) + index));
+            printf("  ");
+            for (index = 0; index < 32; index++)
+                printf("%lc", (wchar_t) ((group << 5) + index));
+            printf("\n");
+        }
+        printf("\nExtended ASCII characters (128 - 255) using printf(\"%%lc\"):\n");
+        for (group = 4; group < 8; group++) {
+            printf("%#" PRIx8 ": ", group << 5);
+            uint8_t index;
+            for (index = 0; index < 32; index++)
+                printf("%lc", (wchar_t) ((group << 5) + index));
+            printf("\n");
+        }
+        printf("\nUTF-8 strings using printf(\"%%s\"):\n");
+        printf("English:  %s\n", "Quick brown fox jumps over the lazy dog");
+        printf("Czech:    %s\n", "Příliš žluťoučký kůň úpěl ďábelské ódy");
+        printf("Greek:    %s\n", "á½® Î¾Îµá¿–Î½â€™, á¼€Î³Î³ÎÎ»Î»ÎµÎ¹Î½ Î›Î±ÎºÎµÎ´Î±Î¹Î¼Î¿Î½Î¯Î¿Î¹Ï‚ á½…Ï„Î¹ Ï„á¿‡Î´Îµ");
+        printf("Hebrew:   %s\n", "משוואת ברנולי היא משוואה בהידרודינמיקה");
+        printf("Arabic:   %s\n", "التوزيع الجغرافي للحمل العنقودي");
+        printf("Russian:  %s\n", "Леннон познакомился с художницей-авангардисткой");
+        printf("Armenian: %s\n", "ÕÕ¯Õ½Õ¥Ö Õ°Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¾Õ¥Õ¬ ÔµÖ€Õ¸Ö‚Õ½Õ¡Õ²Õ¥Õ´Õ« Õ°Õ¡ÕµÕ¯Õ¡Õ¯Õ¡Õ¶");
+        printf("\nUTF-32 strings using printf(\"%%ls\"):\n");
+        printf("English:  %ls\n", L"Quick brown fox jumps over the lazy dog");
+        printf("Czech:    %ls\n", L"Příliš žluťoučký kůň úpěl ďábelské ódy");
+        printf("Greek:    %ls\n", L"á½® Î¾Îµá¿–Î½â€™, á¼€Î³Î³ÎÎ»Î»ÎµÎ¹Î½ Î›Î±ÎºÎµÎ´Î±Î¹Î¼Î¿Î½Î¯Î¿Î¹Ï‚ á½…Ï„Î¹ Ï„á¿‡Î´Îµ");
+        printf("Hebrew:   %ls\n", L"משוואת ברנולי היא משוואה בהידרודינמיקה");
+        printf("Arabic:   %ls\n", L"التوزيع الجغرافي للحمل العنقودي");
+        printf("Russian:  %ls\n", L"Леннон познакомился с художницей-авангардисткой");
+        printf("Armenian: %ls\n", L"ÕÕ¯Õ½Õ¥Ö Õ°Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¾Õ¥Õ¬ ÔµÖ€Õ¸Ö‚Õ½Õ¡Õ²Õ¥Õ´Õ« Õ°Õ¡ÕµÕ¯Õ¡Õ¯Õ¡Õ¶");
+        printf("Test: [%d] '%lc'\n", L'\x0161', L'\x0161');
+    }
+    printf("[Press a key]\n");
+    getchar();
+    return NULL;
+}

/branches/tracing/uspace/app/tester/print/print4.def
0,0 → 1,6
{
"print4",
"Unicode test",
&test_print4,
true
},

 /branches/tracing/uspace/app/tester/tester.h
 ,6 → 60,7
 extern char * test_thread1(bool quiet);
 extern char * test_print1(bool quiet);
+extern char * test_print4(bool quiet);
 extern char * test_fault1(bool quiet);
 extern char * test_fault2(bool quiet);
 extern char * test_register(bool quiet);
 ,6 → 72,9
 extern char * test_devmap1(bool quiet);
 extern char * test_loop1(bool quiet);
 extern char * test_vfs1(bool quiet);
+extern char * test_console1(bool quiet);
+extern char * test_stdio1(bool quiet);
+extern char * test_stdio2(bool quiet);
 extern char * test_debug1(bool quiet);
 extern test_t tests[];

 /branches/tracing/uspace/app/tester/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../srv/kbd/include -ggdb
 ,6 → 45,7
 SOURCES = tester.c \
     thread/thread1.c \
     print/print1.c \
+    print/print4.c \
     fault/fault1.c \
     fault/fault2.c \
     ipc/register.c \
 ,6 → 56,9
     ipc/hangup.c \
     loop/loop1.c \
     devmap/devmap1.c \
+    console/console1.c \
+    stdio/stdio1.c \
+    stdio/stdio2.c \
     vfs/vfs1.c \
     debug/debug1.c
 ,13 → 71,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/app/tester/vfs/vfs1.c
 ,7 → 45,7
 {
     int rc;
-    rc = mount("tmpfs", "/", "nulldev0");
+    rc = mount("tmpfs", "/", "nulldev0", "", 0);
     switch (rc) {
     case EOK:
         if (!quiet)

 /branches/tracing/uspace/app/tetris/scores.c
 ,6 → 55,9
 #include <stdio.h>
 /* #include <stdlib.h> */
 #include <string.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <stdlib.h>
 /* #include <time.h> */
 /* #include <term.h> */
 /* #include <unistd.h> */
 ,7 → 117,8
  */
 static void copyhiscore(int dest, int src)
 {
-    strcpy(scores[dest].hs_name, scores[src].hs_name);
+    str_cpy(scores[dest].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
+        scores[src].hs_name);
     scores[dest].hs_score = scores[src].hs_score;
     scores[dest].hs_level = scores[src].hs_level;
 }
 ,32 → 126,58
 void insertscore(int score, int level)
 {
     int i,j;
-    int key;
+    size_t off;
+    kbd_event_t ev;
     clear_screen();
     moveto(10 , 10);
     puts("Insert your name: ");
-    strncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
-    i = 6;
+    str_cpy(scores[NUMSPOTS - 1].hs_name, STR_BOUNDS(MAXLOGNAME) + 1,
+        "Player");
+    i = 6; off = 6;
     moveto(10 , 28);
     printf("%s%.*s",scores[NUMSPOTS - 1].hs_name,MAXLOGNAME-i,"........................................");
-    key = getchar();
-    while(key != '\n') {
-        if (key == '\b') {
-            if (i > 0)
-                scores[NUMSPOTS - 1].hs_name[--i] = '\0';
-        } else {
-            if (i < (MAXLOGNAME - 1))
-                scores[NUMSPOTS - 1].hs_name[i++] = key;
-                scores[NUMSPOTS - 1].hs_name[i] = '\0';
+    while (1) {
+        fflush(stdout);
+        if (kbd_get_event(&ev) != EOK)
+            exit(1);
+        if (ev.type == KE_RELEASE)
+            continue;
+        if (ev.key == KC_ENTER || ev.key == KC_NENTER)
+            break;
+        if (ev.key == KC_BACKSPACE) {
+            if (i > 0) {
+                wchar_t uc;
+                --i;
+                while (off > 0) {
+                    --off;
+                    size_t otmp = off;
+                    uc = str_decode(scores[NUMSPOTS - 1].hs_name,
+                        &otmp, STR_BOUNDS(MAXLOGNAME) + 1);
+                    if (uc != U_SPECIAL)
+                        break;
+                }
+                scores[NUMSPOTS - 1].hs_name[off] = '\0';
+            }
+        } else if (ev.c != '\0') {
+            if (i < (MAXLOGNAME - 1)) {
+                if (chr_encode(ev.c, scores[NUMSPOTS - 1].hs_name,
+                    &off, STR_BOUNDS(MAXLOGNAME) + 1) == EOK) {
+                    ++i;
+                }
+                scores[NUMSPOTS - 1].hs_name[off] = '\0';
+            }
         }
         moveto(10 , 28);
         printf("%s%.*s",scores[NUMSPOTS - 1].hs_name,MAXLOGNAME-i,"........................................");
-        key = getchar();
     }
     scores[NUMSPOTS - 1].hs_score = score;
 ,7 → 197,7
 {
     int i;
     for(i = 0; i < NUMSPOTS; i++) {
-        strncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
+        str_cpy(scores[i].hs_name, STR_BOUNDS(MAXLOGNAME) + 1, "HelenOS Team");
         scores[i].hs_score = (NUMSPOTS - i) * 200;
         scores[i].hs_level = (i + 1 > MAXLEVEL?MAXLEVEL:i + 1);
     }
 ,7 → 291,7
 /*  change = 0; */
 /*  me = thisuser(); */
 /*  for (i = 0, sp = &scores[0]; i < nscores; i++, sp++) { */
-/*      if (sp->hs_level != level || strcmp(sp->hs_name, me) != 0) */
+/*      if (sp->hs_level != level || str_cmp(sp->hs_name, me) != 0) */
 /*          continue; */
 /*      if (score > sp->hs_score) { */
 /*          (void)printf("%s bettered %s %d score of %d!\n", */
 ,7 → 419,7
 /*       * This is O(n^2), but do you think we care? */
 /*       *\/ */
 /*      for (j = 0, pu = count; j < numnames; j++, pu++) */
-/*          if (strcmp(sp->hs_name, pu->name) == 0) */
+/*          if (str_cmp(sp->hs_name, pu->name) == 0) */
 /*              break; */
 /*      if (j == numnames) { */
 /*          /\* */
 ,7 → 556,7
 /*      if (me != NULL && */
 /*          sp->hs_level == level && */
 /*          sp->hs_score == score && */
-/*          strcmp(sp->hs_name, me) == 0) { */
+/*          str_cmp(sp->hs_name, me) == 0) { */
 /*          putpad(SOstr); */
 /*          highlight = 1; */
 /*      } */

 /branches/tracing/uspace/app/tetris/input.c
 ,7 → 57,9
 #include "tetris.h"
 #include <async.h>
-#include "../../srv/console/console.h"
+#include <ipc/console.h>
+#include <console.h>
+#include <kbd/kbd.h>
 /* return true iff the given timeval is positive */
 #define TV_POS(tv) \
 ,10 → 113,11
         s = NULL;
     if (!lastchar) {
+again:
         if (!getchar_inprog) {
-            cons_phone = get_cons_phone();
+            cons_phone = console_open(true);
             getchar_inprog = async_send_2(cons_phone,
-                CONSOLE_GETCHAR, 0, 0, &charcall);
+                CONSOLE_GETKEY, 0, 0, &charcall);
         }
         if (!s)
             async_wait_for(getchar_inprog, &rc);
 ,7 → 130,10
         if (rc) {
             stop("end of file, help");
         }
-        lastchar = IPC_GET_ARG1(charcall);
+        if (IPC_GET_ARG1(charcall) == KE_RELEASE)
+            goto again;
+        lastchar = IPC_GET_ARG4(charcall);
     }
     if (tvp) {
         /* since there is input, we may not have timed out */

 /branches/tracing/uspace/app/tetris/screen.c
 ,13 → 50,12
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <io/stream.h>
+#include <console.h>
 #include <async.h>
 #include "screen.h"
 #include "tetris.h"
-#include "../../srv/console/console.h"
+#include <ipc/console.h>
 static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */
 static int curscore;
 ,29 → 72,19
         putchar(*(s++));
 }
-static int con_phone;
-static void set_style(int fgcolor, int bgcolor)
-{
-    async_msg_2(con_phone, CONSOLE_SET_STYLE, fgcolor, bgcolor);
-}
 static void start_standout(void)
 {
-    set_style(0xf0f0f0, 0);
+    console_set_rgb_color(0xf0f0f0, 0);
 }
 static void resume_normal(void)
 {
-    set_style(0, 0xf0f0f0);
+    console_set_rgb_color(0, 0xf0f0f0);
 }
 void clear_screen(void)
 {
-    async_msg_0(con_phone, CONSOLE_CLEAR);
+    console_clear();
     moveto(0, 0);
 }
 ,7 → 96,7
 {
     resume_normal();
-    async_msg_0(con_phone, CONSOLE_CLEAR);
+    console_clear();
     curscore = -1;
     memset((char *)curscreen, 0, sizeof(curscreen));
 }
 ,8 → 107,7
 void
 scr_init(void)
 {
-    con_phone = get_cons_phone();
-    async_msg_1(con_phone, CONSOLE_CURSOR_VISIBILITY, 0);
+    console_cursor_visibility(0);
     resume_normal();
     scr_clear();
 }
 ,20 → 114,14
 void moveto(int r, int c)
 {
-    async_msg_2(con_phone, CONSOLE_GOTO, r, c);
+    console_goto(r, c);
 }
-static void fflush(void)
-{
-    async_msg_0(con_phone, CONSOLE_FLUSH);
-}
 winsize_t winsize;
 static int get_display_size(winsize_t *ws)
 {
-    return async_req_0_2(con_phone, CONSOLE_GETSIZE, &ws->ws_row,
-        &ws->ws_col);
+    return console_get_size(&ws->ws_row, &ws->ws_col);
 }
 /*
 ,7 → 269,7
     }
     if (cur_so)
         resume_normal();
-    fflush();
+    fflush(stdout);
 }
 /*
 ,7 → 280,7
 scr_msg(char *s, int set)
 {
-    int l = strlen(s);
+    int l = str_size(s);
     moveto(Rows - 2, ((Cols - l) >> 1) - 1);
     if (set)

 /branches/tracing/uspace/app/tetris/scores.h
 ,9 → 45,11
  * Tetris scores.
  */
 #include <sys/time.h>
+#include <string.h>
 #define MAXLOGNAME 16
 struct highscore {
-    char    hs_name[MAXLOGNAME + 1];    /* login name */
+    char    hs_name[STR_BOUNDS(MAXLOGNAME) + 1];    /* login name */
     int hs_score;   /* raw score */
     int hs_level;   /* play level */
 //  time_t  hs_time;    /* time at game end */

 /branches/tracing/uspace/app/tetris/screen.h
 ,8 → 49,8
 #include <async.h>
 typedef struct {
-    ipcarg_t ws_row;
-    ipcarg_t ws_col;
+    int ws_row;
+    int ws_col;
 } winsize_t;
 extern winsize_t winsize;

 /branches/tracing/uspace/app/tetris/tetris.c
 ,7 → 277,7
 /*          classic = 1; */
 /*          break; */
 /*      case 'k': */
-/*          if (strlen(keys = optarg) != 6) */
+/*          if (str_size(keys = optarg) != 6) */
 /*              usage(); */
 /*          break; */
 /*      case 'l': */
 ,7 → 311,7
                 errx(1, "duplicate command keys specified.");
         }
         if (keys[i] == ' ')
-            strncpy(key_write[i], "<space>", sizeof key_write[i]);
+            str_cpy(key_write[i], sizeof key_write[i], "<space>");
         else {
             key_write[i][0] = keys[i];
             key_write[i][1] = '\0';
 ,7 → 390,7
                     scr_update();
                     scr_msg(key_msg, 0);
                     scr_msg(msg, 1);
-    //              (void) fflush(stdout);
+                    (void) fflush(stdout);
                 } while (rwait((struct timeval *)NULL) == -1);
                 scr_msg(msg, 0);
                 scr_msg(key_msg, 1);

 /branches/tracing/uspace/app/tetris/Makefile
 ,7 → 1,6
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,7 → 19,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 clean:
     -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o

 /branches/tracing/uspace/app/klog/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,13 → 53,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/app/klog/klog.c
 ,9 → 27,9
  */
 /** @addtogroup klog KLog
- * @brief   HelenOS KLog
+ * @brief HelenOS KLog
  * @{
- */
+ */
 /**
  * @file
  */
 ,31 → 41,27
 #include <as.h>
 #include <sysinfo.h>
 #include <io/stream.h>
+#include <console.h>
+#include <event.h>
 #include <errno.h>
 #define NAME "klog"
-#define KLOG_SIZE PAGE_SIZE
 /* Pointer to klog area */
-static char *klog;
+static wchar_t *klog;
+static count_t klog_length;
-static void console_wait(void)
-{
-    while (get_cons_phone() < 0)
-        usleep(50000);  // FIXME
-}
 static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
 {
     async_serialize_start();
-    size_t klog_start = (size_t) IPC_GET_ARG1(*call);
-    size_t klog_len = (size_t) IPC_GET_ARG2(*call);
-    size_t klog_stored = (size_t) IPC_GET_ARG3(*call);
-    size_t i;
+    count_t klog_start = (count_t) IPC_GET_ARG1(*call);
+    count_t klog_len = (count_t) IPC_GET_ARG2(*call);
+    count_t klog_stored = (count_t) IPC_GET_ARG3(*call);
+    count_t i;
     for (i = klog_len - klog_stored; i < klog_len; i++)
-        putchar(klog[(klog_start + i) % KLOG_SIZE]);
+        putchar(klog[(klog_start + i) % klog_length]);
     async_serialize_end();
 }
 ,22 → 70,24
 {
     console_wait();
-    klog = (char *) as_get_mappable_page(KLOG_SIZE);
+    count_t klog_pages = sysinfo_value("klog.pages");
+    size_t klog_size = klog_pages * PAGE_SIZE;
+    klog_length = klog_size / sizeof(wchar_t);
+    klog = (wchar_t *) as_get_mappable_page(klog_pages);
     if (klog == NULL) {
         printf(NAME ": Error allocating memory area\n");
         return -1;
     }
-    int res = ipc_share_in_start_1_0(PHONE_NS, (void *) klog, KLOG_SIZE,
-        SERVICE_MEM_KLOG);
+    int res = ipc_share_in_start_1_0(PHONE_NS, (void *) klog,
+        klog_size, SERVICE_MEM_KLOG);
     if (res != EOK) {
         printf(NAME ": Error initializing memory area\n");
         return -1;
     }
-    int inr = sysinfo_value("klog.inr");
-    int devno = sysinfo_value("klog.devno");
-    if (ipc_register_irq(inr, devno, 0, NULL) != EOK) {
+    if (event_subscribe(EVENT_KLOG, 0) != EOK) {
         printf(NAME ": Error registering klog notifications\n");
         return -1;
     }
 ,7 → 95,7
     async_set_interrupt_received(interrupt_received);
     klog_update();
     async_manager();
     return 0;
 }

 /branches/tracing/uspace/app/trace/trace.c
 ,7 → 49,7
 #include "proto.h"
 #include <ipc/services.h>
 #include "../../srv/vfs/vfs.h"
-#include "../../srv/console/console.h"
+#include <ipc/console.h>
 #include "syscalls.h"
 #include "ipcp.h"
 ,7 → 519,7
     int rc;
     /* Spawn a program loader */
-    ldr = loader_spawn(path);
+    ldr = loader_connect();
     if (ldr == NULL)
         return 0;
 ,7 → 623,7
         V_INTEGER,
         V_INTEGER,
         V_INTEGER,
-        V_INTEGER
+        V_INTEGER
     };
     next_thread_id = 1;
 ,17 → 642,32
     proto_add_oper(p, VFS_MOUNT, o);
 /*  o = oper_new("unmount", 0, arg_def);
     proto_add_oper(p, VFS_UNMOUNT, o);*/
+    o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_OPEN, o);
+    o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_CLOSE, o);
+    o = oper_new("seek", 3, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_SEEK, o);
+    o = oper_new("mkdir", 1, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_MKDIR, o);
+    o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_UNLINK, o);
+    o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_RENAME, o);
     proto_register(SERVICE_VFS, p);
     p = proto_new("console");
-    resp_def[0] = V_CHAR;
-    o = oper_new("getchar", 0, arg_def, V_INTEGER, 2, resp_def);
-    proto_add_oper(p, CONSOLE_GETCHAR, o);
+    resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER;
+    resp_def[2] = V_INTEGER; resp_def[3] = V_CHAR;
+    o = oper_new("getkey", 0, arg_def, V_ERRNO, 4, resp_def);
+    proto_add_oper(p, CONSOLE_GETKEY, o);
     arg_def[0] = V_CHAR;
     o = oper_new("putchar", 1, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_PUTCHAR, o);
+    o = oper_new("write", 0, arg_def, V_VOID, 0, resp_def);
+    proto_add_oper(p, CONSOLE_WRITE, o);
     o = oper_new("clear", 0, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_CLEAR, o);
 ,9 → 681,15
     o = oper_new("flush", 0, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_FLUSH, o);
+    arg_def[0] = V_INTEGER;
+    o = oper_new("set_style", 1, arg_def, V_VOID, 0, resp_def);
+    proto_add_oper(p, CONSOLE_SET_STYLE, o);
+    arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; arg_def[2] = V_INTEGER;
+    o = oper_new("set_color", 3, arg_def, V_VOID, 0, resp_def);
+    proto_add_oper(p, CONSOLE_SET_COLOR, o);
     arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER;
-    o = oper_new("set_style", 2, arg_def, V_INTEGER, 0, resp_def);
-    proto_add_oper(p, CONSOLE_SET_STYLE, o);
+    o = oper_new("set_rgb_color", 2, arg_def, V_VOID, 0, resp_def);
+    proto_add_oper(p, CONSOLE_SET_RGB_COLOR, o);
     o = oper_new("cursor_visibility", 1, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_CURSOR_VISIBILITY, o);

 /branches/tracing/uspace/app/trace/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../../srv/kbd/include
 ,7 → 64,7
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /branches/tracing/uspace/app/trace/syscalls.c
 ,11 → 59,14
     [SYS_IPC_ANSWER_FAST] = { "ipc_answer_fast",    6,  V_ERRNO },
     [SYS_IPC_ANSWER_SLOW] = { "ipc_answer_slow",    2,  V_ERRNO },
     [SYS_IPC_FORWARD_FAST] = { "ipc_forward_fast",  6,  V_ERRNO },
+    [SYS_IPC_FORWARD_SLOW] = { "ipc_forward_slow",  3,  V_ERRNO },
     [SYS_IPC_WAIT] = { "ipc_wait_for_call",     3,  V_HASH },
     [SYS_IPC_HANGUP] = { "ipc_hangup",          1,  V_ERRNO },
     [SYS_IPC_REGISTER_IRQ] = { "ipc_register_irq",  4,  V_ERRNO },
     [SYS_IPC_UNREGISTER_IRQ] = { "ipc_unregister_irq",  2,  V_ERRNO },
+    [SYS_EVENT_SUBSCRIBE] = { "event_subscribe",    2,  V_ERRNO },
     [SYS_CAP_GRANT] = { "cap_grant",            2,  V_ERRNO },
     [SYS_CAP_REVOKE] = { "cap_revoke",          2,  V_ERRNO },
     [SYS_PHYSMEM_MAP] = { "physmem_map",        4,  V_ERRNO },

 /branches/tracing/uspace/dist/readme
 ,0 → 0,0
-Lorem ipsum.
+Multilingual text test
+----------------------
+English:  Quick brown fox jumps over the lazy dog
+Czech:    Příliš žluťoučký kůň úpěl ďábelské ódy
+Greek:    á½® Î¾Îµá¿–Î½â€™, á¼€Î³Î³ÎÎ»Î»ÎµÎ¹Î½ Î›Î±ÎºÎµÎ´Î±Î¹Î¼Î¿Î½Î¯Î¿Î¹Ï‚ á½…Ï„Î¹ Ï„á¿‡Î´Îµ
+Hebrew:   משוואת ברנולי היא משוואה בהידרודינמיקה
+Arabic:   التوزيع الجغرافي للحمل العنقودي
+Russian:  Леннон познакомился с художницей-авангардисткой
+Armenian: ÕÕ¯Õ½Õ¥Ö Õ°Ö€Õ¡Õ¿Õ¡Ö€Õ¡Õ¯Õ¾Õ¥Õ¬ ÔµÖ€Õ¸Ö‚Õ½Õ¡Õ²Õ¥Õ´Õ« Õ°Õ¡ÕµÕ¯Õ¡Õ¯Õ¡Õ¶

 /branches/tracing/uspace/lib/libfs/libfs.c
 ,9 → 148,9
     if (last < next)
         last += PLB_SIZE;
-    void *par = NULL;
-    void *cur = ops->root_get(dev_handle);
-    void *tmp = NULL;
+    fs_node_t *par = NULL;
+    fs_node_t *cur = ops->root_get(dev_handle);
+    fs_node_t *tmp = NULL;
     if (ops->plb_get_char(next) == '/')
         next++;     /* eat slash */
 ,39 → 189,33
                     ipc_answer_0(rid, ENOTDIR);
                     goto out;
                 }
-                void *nodep;
+                fs_node_t *fn;
                 if (lflag & L_CREATE)
-                    nodep = ops->create(dev_handle, lflag);
+                    fn = ops->create(dev_handle, lflag);
                 else
-                    nodep = ops->node_get(dev_handle,
+                    fn = ops->node_get(dev_handle,
                         index);
-                if (nodep) {
+                if (fn) {
                     int rc;
-                    rc = ops->link(cur, nodep, component);
+                    rc = ops->link(cur, fn, component);
                     if (rc != EOK) {
                         if (lflag & L_CREATE) {
-                            (void)ops->destroy(
-                                nodep);
+                            (void)ops->destroy(fn);
                         }
                         ipc_answer_0(rid, rc);
                     } else {
                         ipc_answer_5(rid, EOK,
                             fs_handle, dev_handle,
-                            ops->index_get(nodep),
-                            ops->size_get(nodep),
-                            ops->lnkcnt_get(nodep));
-                        ops->node_put(nodep);
+                            ops->index_get(fn),
+                            ops->size_get(fn),
+                            ops->lnkcnt_get(fn));
+                        ops->node_put(fn);
                     }
                 } else {
                     ipc_answer_0(rid, ENOSPC);
                 }
                 goto out;
-            } else if (lflag & L_PARENT) {
-                /* return parent */
-                ipc_answer_5(rid, EOK, fs_handle, dev_handle,
-                    ops->index_get(cur), ops->size_get(cur),
-                    ops->lnkcnt_get(cur));
             }
             ipc_answer_0(rid, ENOENT);
             goto out;
 ,26 → 257,26
             assert(len);
             component[len] = '\0';
-            void *nodep;
+            fs_node_t *fn;
             if (lflag & L_CREATE)
-                nodep = ops->create(dev_handle, lflag);
+                fn = ops->create(dev_handle, lflag);
             else
-                nodep = ops->node_get(dev_handle, index);
-            if (nodep) {
+                fn = ops->node_get(dev_handle, index);
+            if (fn) {
                 int rc;
-                rc = ops->link(cur, nodep, component);
+                rc = ops->link(cur, fn, component);
                 if (rc != EOK) {
                     if (lflag & L_CREATE)
-                        (void)ops->destroy(nodep);
+                        (void)ops->destroy(fn);
                     ipc_answer_0(rid, rc);
                 } else {
                     ipc_answer_5(rid, EOK,
                         fs_handle, dev_handle,
-                        ops->index_get(nodep),
-                        ops->size_get(nodep),
-                        ops->lnkcnt_get(nodep));
-                    ops->node_put(nodep);
+                        ops->index_get(fn),
+                        ops->size_get(fn),
+                        ops->lnkcnt_get(fn));
+                    ops->node_put(fn);
                 }
             } else {
                 ipc_answer_0(rid, ENOSPC);
 ,18 → 288,9
     }
     /* handle hit */
-    if (lflag & L_PARENT) {
-        ops->node_put(cur);
-        cur = par;
-        par = NULL;
-        if (!cur) {
-            ipc_answer_0(rid, ENOENT);
-            goto out;
-        }
-    }
     if (lflag & L_UNLINK) {
         unsigned old_lnkcnt = ops->lnkcnt_get(cur);
-        int res = ops->unlink(par, cur);
+        int res = ops->unlink(par, cur, component);
         ipc_answer_5(rid, (ipcarg_t)res, fs_handle, dev_handle,
             ops->index_get(cur), ops->size_get(cur), old_lnkcnt);
         goto out;

 /branches/tracing/uspace/lib/libfs/libfs.h
 ,21 → 42,25
 #include <async.h>
 typedef struct {
-    void * (* match)(void *, const char *);
-    void * (* node_get)(dev_handle_t, fs_index_t);
-    void (* node_put)(void *);
-    void * (* create)(dev_handle_t, int);
-    int (* destroy)(void *);
-    int (* link)(void *, void *, const char *);
-    int (* unlink)(void *, void *);
-    fs_index_t (* index_get)(void *);
-    size_t (* size_get)(void *);
-    unsigned (* lnkcnt_get)(void *);
-    bool (* has_children)(void *);
-    void *(* root_get)(dev_handle_t);
+    void *data; /**< Data of the file system implementation. */
+} fs_node_t;
+typedef struct {
+    fs_node_t * (* match)(fs_node_t *, const char *);
+    fs_node_t * (* node_get)(dev_handle_t, fs_index_t);
+    void (* node_put)(fs_node_t *);
+    fs_node_t * (* create)(dev_handle_t, int);
+    int (* destroy)(fs_node_t *);
+    int (* link)(fs_node_t *, fs_node_t *, const char *);
+    int (* unlink)(fs_node_t *, fs_node_t *, const char *);
+    fs_index_t (* index_get)(fs_node_t *);
+    size_t (* size_get)(fs_node_t *);
+    unsigned (* lnkcnt_get)(fs_node_t *);
+    bool (* has_children)(fs_node_t *);
+    fs_node_t *(* root_get)(dev_handle_t);
     char (* plb_get_char)(unsigned pos);
-    bool (* is_directory)(void *);
-    bool (* is_file)(void *);
+    bool (* is_directory)(fs_node_t *);
+    bool (* is_file)(fs_node_t *);
 } libfs_ops_t;
 typedef struct {

 /branches/tracing/uspace/lib/libfs/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
-include ../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 libfs.a: depend $(OBJECTS)
     $(AR) rc libfs.a $(OBJECTS)

 /branches/tracing/uspace/lib/libblock/libblock.c
 ,15 → 27,15
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libblock
+/** @addtogroup libblock
  * @{
- */
+ */
 /**
  * @file
  * @brief
  */
-#include "libblock.h"
+#include "libblock.h"
 #include "../../srv/vfs/vfs.h"
 #include "../../srv/rd/rd.h"
 #include <ipc/devmap.h>
 ,7 → 146,7
     if (!com_area) {
         return ENOMEM;
     }
-    dev_phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP,
+    dev_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP,
         DEVMAP_CONNECT_TO_DEVICE, dev_handle);
     if (dev_phone < 0) {

 /branches/tracing/uspace/lib/libblock/Makefile
 ,9 → 30,8
 ## Common compiler flags
 #
-include ../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 58,7
     find . -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 libblock.a: depend $(OBJECTS)
     $(AR) rc libblock.a $(OBJECTS)

 /branches/tracing/uspace/lib/softfloat/Makefile
 ,28 → 29,27
 ## Common compiler flags
 #
-include ../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS +=-Iinclude -Iarch/$(ARCH)/include/
+CFLAGS +=-Iinclude -Iarch/$(UARCH)/include/
 ## Sources
 #
-GENERIC_SOURCES =       \
-    generic/add.c       \
-    generic/common.c    \
-    generic/comparison.c    \
-    generic/conversion.c    \
-    generic/div.c       \
-    generic/mul.c       \
-    generic/other.c     \
-    generic/softfloat.c \
+GENERIC_SOURCES = \
+    generic/add.c \
+    generic/common.c \
+    generic/comparison.c \
+    generic/conversion.c \
+    generic/div.c \
+    generic/mul.c \
+    generic/other.c \
+    generic/softfloat.c \
     generic/sub.c
 ARCH_SOURCES =
 ,7 → 67,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftfloat.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftfloat.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /branches/tracing/uspace/lib/softint/Makefile
 ,9 → 29,8
 ## Common compiler flags
 #
-include ../../Makefile.config
+LIBC_PREFIX = ../libc
-LIBC_PREFIX = ../libc
 ## Setup toolchain
 #
 ,7 → 59,7
     find generic/ -name '*.o' -follow -exec rm \{\} \;
 depend:
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEMD_DEFS) $(CFLAGS) -- $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libsoftint.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libsoftint.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)

 /branches/tracing/uspace/lib/libc/include/ddi.h
 ,9 → 37,11
 #include <task.h>
-extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags);
-extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
-extern int preemption_control(int enable);
+extern int device_assign_devno(void);
+extern int physmem_map(void *, void *, unsigned long, int);
+extern int iospace_enable(task_id_t, void *, unsigned long);
+extern int preemption_control(int);
+extern int pio_enable(void *, size_t, void **);
 #endif

 /branches/tracing/uspace/lib/libc/include/console.h
 ,0 → 1,65
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_CONSOLE_H_
+#define LIBC_CONSOLE_H_
+#include <console/style.h>
+#include <console/color.h>
+#include <sys/types.h>
+#include <bool.h>
+extern int console_open(bool);
+extern void console_close(void);
+extern void console_wait(void);
+extern void console_clear(void);
+extern void console_goto(int, int);
+extern void console_putchar(wchar_t);
+extern ssize_t console_write(const char *, size_t);
+extern void console_putstr(const char *);
+extern void console_flush(void);
+extern int console_get_size(int *, int *);
+extern void console_set_style(int);
+extern void console_set_color(int, int, int);
+extern void console_set_rgb_color(int, int);
+extern void console_cursor_visibility(int);
+extern void console_kcon_enable(void);
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/string.h
 ,32 → 35,60
 #ifndef LIBC_STRING_H_
 #define LIBC_STRING_H_
+#include <mem.h>
 #include <sys/types.h>
+#include <bool.h>
-#define bzero(ptr, len) memset((ptr), 0, (len))
+#define U_SPECIAL      '?'
+#define U_BOM          0xfeff
-extern void * memset(void *, int, size_t);
-extern void * memcpy(void *, const void *, size_t);
-extern void * memmove(void *, const void *, size_t);
+/** No size limit constant */
+#define STR_NO_LIMIT  ((size_t) -1)
-extern int bcmp(const char *, const char *, size_t);
+/** Maximum size of a string containing @c length characters */
+#define STR_BOUNDS(length)  ((length) << 2)
-extern int strcmp(const char *, const char *);
-extern int strncmp(const char *, const char *, size_t);
-extern int stricmp(const char *, const char *);
+extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
+extern int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t sz);
-extern char *strcpy(char *, const char *);
-extern char *strncpy(char *, const char *, size_t);
+extern size_t str_size(const char *str);
+extern size_t wstr_size(const wchar_t *str);
-extern char *strcat(char *, const char *);
+extern size_t str_lsize(const char *str, count_t max_len);
+extern size_t wstr_lsize(const wchar_t *str, count_t max_len);
-extern size_t strlen(const char *);
+extern count_t str_length(const char *str);
+extern count_t wstr_length(const wchar_t *wstr);
-extern char *strdup(const char *);
+extern count_t str_nlength(const char *str, size_t size);
+extern count_t wstr_nlength(const wchar_t *str, size_t size);
-extern char *strchr(const char *, int);
-extern char *strrchr(const char *, int);
+extern bool ascii_check(wchar_t ch);
+extern bool chr_check(wchar_t ch);
+extern int str_cmp(const char *s1, const char *s2);
+extern int str_lcmp(const char *s1, const char *s2, count_t max_len);
+extern void str_cpy(char *dest, size_t size, const char *src);
+extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);
+extern void str_append(char *dest, size_t size, const char *src);
+extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
+extern const char *str_chr(const char *str, wchar_t ch);
+extern const char *str_rchr(const char *str, wchar_t ch);
+extern bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos);
+extern bool wstr_remove(wchar_t *str, count_t pos);
+extern char *str_dup(const char *);
+/*
+ * TODO: Get rid of this.
+ */
+extern int stricmp(const char *, const char *);
 extern long int strtol(const char *, char **, int);
 extern unsigned long strtoul(const char *, char **, int);

 /branches/tracing/uspace/lib/libc/include/vfs/vfs.h
 ,7 → 39,8
 extern char *absolutize(const char *, size_t *);
-extern int mount(const char *, const char *, const char *);
+extern int mount(const char *, const char *, const char *, const char *,
+    const unsigned int flags);
 #endif

 /branches/tracing/uspace/lib/libc/include/async.h
 ,7 → 76,7
 #define async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, dataptr) \
     async_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \
         (arg5), (dataptr))
 extern aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr);
 extern aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
 ,8 → 86,8
 extern int async_wait_timeout(aid_t amsgid, ipcarg_t *retval,
     suseconds_t timeout);
-fid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid,
-    ipc_call_t *call, void (*cthread)(ipc_callid_t,ipc_call_t *));
+fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
+    ipc_call_t *call, void (*cthread)(ipc_callid_t, ipc_call_t *));
 void async_usleep(suseconds_t timeout);
 void async_create_manager(void);
 void async_destroy_manager(void);
 ,27 → 98,27
 /* Wrappers for simple communication */
 #define async_msg_0(phone, method) \
-    ipc_call_async_0((phone), (method), NULL, NULL, !in_interrupt_handler())
+    ipc_call_async_0((phone), (method), NULL, NULL, true)
 #define async_msg_1(phone, method, arg1) \
     ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \
-        !in_interrupt_handler())
+        true)
 #define async_msg_2(phone, method, arg1, arg2) \
     ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \
-        !in_interrupt_handler())
+        true)
 #define async_msg_3(phone, method, arg1, arg2, arg3) \
     ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \
-        !in_interrupt_handler())
+        true)
 #define async_msg_4(phone, method, arg1, arg2, arg3, arg4) \
     ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \
-        NULL, !in_interrupt_handler())
+        NULL, true)
 #define async_msg_5(phone, method, arg1, arg2, arg3, arg4, arg5) \
     ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \
-        (arg5), NULL, NULL, !in_interrupt_handler())
+        (arg5), NULL, NULL, true)
 /*
  * User-friendly wrappers for async_req_fast() and async_req_slow(). The macros
  * are in the form async_req_m_n(), where m is the number of payload arguments
- * and n is the number of return arguments. The macros decidce between the fast
+ * and n is the number of return arguments. The macros decide between the fast
  * and slow verion based on m.
  */
 #define async_req_0_0(phoneid, method) \
 ,8 → 253,6
     fibril_dec_sercount();
 }
-extern bool in_interrupt_handler(void);
 extern atomic_t async_futex;
 #endif

 /branches/tracing/uspace/lib/libc/include/stdio.h
 ,17 → 49,31
     int n; \
     n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
     if (n > 0) \
-        (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, strlen(buf)); \
+        (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, str_size(buf)); \
 }
+typedef struct {
+    /** Underlying file descriptor. */
+    int fd;
+    /** Error indicator. */
+    int error;
+    /** End-of-file indicator. */
+    int eof;
+} FILE;
+extern FILE *stdin, *stdout, *stderr;
 extern int getchar(void);
 extern int puts(const char *);
 extern int putchar(int);
+extern int fflush(FILE *);
 extern int printf(const char *, ...);
 extern int asprintf(char **, const char *, ...);
-extern int sprintf(char *, const char *fmt, ...);
+extern int sprintf(char *, const char *, ...);
 extern int snprintf(char *, size_t , const char *, ...);
 extern int vprintf(const char *, va_list);
 ,11 → 80,35
 extern int vsprintf(char *, const char *, va_list);
 extern int vsnprintf(char *, size_t, const char *, va_list);
-#define fprintf(f, fmt, ...) printf(fmt, ##__VA_ARGS__)
 extern int rename(const char *, const char *);
+extern FILE *fopen(const char *, const char *);
+extern int fclose(FILE *);
+extern size_t fread(void *, size_t, size_t, FILE *);
+extern size_t fwrite(const void *, size_t, size_t, FILE *);
+extern int feof(FILE *);
+extern int ferror(FILE *);
+extern void clearerr(FILE *);
+extern int fgetc(FILE *);
+extern int fputc(int, FILE *);
+extern int fputs(const char *, FILE *);
+extern int fprintf(FILE *, const char *, ...);
+extern int vfprintf(FILE *, const char *, va_list);
+#define getc fgetc
+#define putc fputc
+extern int fseek(FILE *, long, int);
+#ifndef SEEK_SET
+    #define SEEK_SET    0
+    #define SEEK_CUR    1
+    #define SEEK_END    2
 #endif
+#endif
 /** @}
  */

/branches/tracing/uspace/lib/libc/include/task.h
40,6 → 40,7
typedef uint64_t task_id_t;

extern task_id_t task_get_id(void);
extern int task_set_name(const char *name);
extern task_id_t task_spawn(const char path, char const argv[]);

#endif

 /branches/tracing/uspace/lib/libc/include/unistd.h
 ,9 → 44,11
 #define getpagesize()     (PAGE_SIZE)
-#define SEEK_SET    0
-#define SEEK_CUR    1
-#define SEEK_END    2
+#ifndef SEEK_SET
+    #define SEEK_SET    0
+    #define SEEK_CUR    1
+    #define SEEK_END    2
+#endif
 extern ssize_t write(int, const void *, size_t);
 extern ssize_t read(int, void *, size_t);
 ,7 → 60,7
 extern int chdir(const char *);
 extern char *getcwd(char *buf, size_t);
-extern void _exit(int status);
+extern void _exit(int status) __attribute__ ((noreturn));
 extern void *sbrk(ssize_t incr);
 extern int usleep(unsigned long usec);
 extern unsigned int sleep(unsigned int seconds);

 /branches/tracing/uspace/lib/libc/include/thread.h
 ,7 → 45,7
 extern void __thread_main(uspace_arg_t *);
 extern int thread_create(void (*)(void *), void *, char *, thread_id_t *);
-extern void thread_exit(int);
+extern void thread_exit(int) __attribute__ ((noreturn));
 extern void thread_detach(thread_id_t);
 extern int thread_join(thread_id_t);
 extern thread_id_t thread_get_id(void);

 /branches/tracing/uspace/lib/libc/include/kbd/kbd.h
 ,0 → 1,65
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_KBD_H_
+#define LIBC_KBD_H_
+#include <sys/types.h>
+typedef enum kbd_ev_type {
+    KE_PRESS,
+    KE_RELEASE
+} kbd_ev_type_t;
+/** Keyboard event structure. */
+typedef struct {
+    /** Press or release event. */
+    kbd_ev_type_t type;
+    /** Keycode of the key that was pressed or released. */
+    unsigned int key;
+    /** Bitmask of modifiers held. */
+    unsigned int mods;
+    /** The character that was generated or '\0' for none. */
+    wchar_t c;
+} kbd_event_t;
+extern int kbd_get_event(kbd_event_t *);
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/kbd/keycode.h
 ,0 → 1,220
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_KBD_KEYCODE_H_
+#define LIBC_KBD_KEYCODE_H_
+/** Keycode definitions.
+ *
+ * A keycode identifies a key by its position on the keyboard, rather
+ * than by its label. For human readability, key positions are noted
+ * with the key label on a keyboard with US layout. This label has
+ * nothing to do with the character, that the key produces
+ * -- this is determined by the keymap.
+ *
+ * The keyboard model reflects a standard PC keyboard layout.
+ * Non-standard keyboards need to be mapped to this model in some
+ * logical way. Scancodes are mapped to keycodes with a scanmap.
+ *
+ * For easier mapping to the model and to emphasize the nature of keycodes,
+ * they really are organized here by position, rather than by label.
+ */
+enum keycode {
+    /* Main block row 1 */
+    KC_BACKTICK = 1,
+    KC_1,
+    KC_2,
+    KC_3,
+    KC_4,
+    KC_5,
+    KC_6,
+    KC_7,
+    KC_8,
+    KC_9,
+    KC_0,
+    KC_MINUS,
+    KC_EQUALS,
+    KC_BACKSPACE,
+    /* Main block row 2 */
+    KC_TAB,
+    KC_Q,
+    KC_W,
+    KC_E,
+    KC_R,
+    KC_T,
+    KC_Y,
+    KC_U,
+    KC_I,
+    KC_O,
+    KC_P,
+    KC_LBRACKET,
+    KC_RBRACKET,
+    /* Main block row 3 */
+    KC_CAPS_LOCK,
+    KC_A,
+    KC_S,
+    KC_D,
+    KC_F,
+    KC_G,
+    KC_H,
+    KC_J,
+    KC_K,
+    KC_L,
+    KC_SEMICOLON,
+    KC_QUOTE,
+    KC_BACKSLASH,
+    KC_ENTER,
+    /* Main block row 4 */
+    KC_LSHIFT,
+    KC_Z,
+    KC_X,
+    KC_C,
+    KC_V,
+    KC_B,
+    KC_N,
+    KC_M,
+    KC_COMMA,
+    KC_PERIOD,
+    KC_SLASH,
+    KC_RSHIFT,
+    /* Main block row 5 */
+    KC_LCTRL,
+    KC_LALT,
+    KC_SPACE,
+    KC_RALT,
+    KC_RCTRL,
+    /* Function keys block */
+    KC_ESCAPE,
+    KC_F1,
+    KC_F2,
+    KC_F3,
+    KC_F4,
+    KC_F5,
+    KC_F6,
+    KC_F7,
+    KC_F8,
+    KC_F9,
+    KC_F10,
+    KC_F11,
+    KC_F12,
+    KC_PRTSCR,
+    KC_SCROLL_LOCK,
+    KC_PAUSE,
+    /* Cursor keys block */
+    KC_INSERT,
+    KC_HOME,
+    KC_PAGE_UP,
+    KC_DELETE,
+    KC_END,
+    KC_PAGE_DOWN,
+    KC_UP,
+    KC_LEFT,
+    KC_DOWN,
+    KC_RIGHT,
+    /* Numeric block */
+    KC_NUM_LOCK,
+    KC_NSLASH,
+    KC_NTIMES,
+    KC_NMINUS,
+    KC_NPLUS,
+    KC_NENTER,
+    KC_N7,
+    KC_N8,
+    KC_N9,
+    KC_N4,
+    KC_N5,
+    KC_N6,
+    KC_N1,
+    KC_N2,
+    KC_N3,
+    KC_N0,
+    KC_NPERIOD
+} keycode_t;
+enum keymod {
+    KM_LSHIFT   = 0x001,
+    KM_RSHIFT   = 0x002,
+    KM_LCTRL    = 0x004,
+    KM_RCTRL    = 0x008,
+    KM_LALT     = 0x010,
+    KM_RALT     = 0x020,
+    KM_CAPS_LOCK    = 0x040,
+    KM_NUM_LOCK = 0x080,
+    KM_SCROLL_LOCK  = 0x100,
+    KM_SHIFT    = KM_LSHIFT | KM_RSHIFT,
+    KM_CTRL     = KM_LCTRL | KM_RCTRL,
+    KM_ALT      = KM_LALT | KM_RALT
+} keymod_t;
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/console/color.h
 ,0 → 1,55
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_CONSOLE_COLOR_H_
+#define LIBC_CONSOLE_COLOR_H_
+enum console_color {
+    COLOR_BLACK = 0,
+    COLOR_BLUE  = 1,
+    COLOR_GREEN = 2,
+    COLOR_CYAN  = 3,
+    COLOR_RED   = 4,
+    COLOR_MAGENTA   = 5,
+    COLOR_YELLOW    = 6,
+    COLOR_WHITE = 7,
+    CATTR_BRIGHT    = 8,
+    CATTR_BLINK = 8
+};
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/console/style.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_CONSOLE_STYLE_H_
+#define LIBC_CONSOLE_STYLE_H_
+enum console_style {
+    STYLE_NORMAL    = 0,
+    STYLE_EMPHASIS  = 1
+};
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/mem.h
 ,0 → 1,51
+/*
+ * Copyright (c) 2005 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_MEM_H_
+#define LIBC_MEM_H_
+#include <sys/types.h>
+#define bzero(ptr, len)  memset((ptr), 0, (len))
+extern void * memset(void *, int, size_t);
+extern void * memcpy(void *, const void *, size_t);
+extern void * memmove(void *, const void *, size_t);
+extern int bcmp(const char *, const char *, size_t);
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/loader/loader.h
 ,7 → 44,8
     int phone_id;
 } loader_t;
-extern loader_t *loader_spawn(char *name);
+extern int loader_spawn(const char *);
+extern loader_t *loader_connect(void);
 extern int loader_get_task_id(loader_t *, task_id_t *);
 extern int loader_set_pathname(loader_t *, const char *);
 extern int loader_set_args(loader_t *, char *const []);

 /branches/tracing/uspace/lib/libc/include/io/printf_core.h
 ,16 → 39,19
 #include <stdarg.h>
 /** Structure for specifying output methods for different printf clones. */
-struct printf_spec {
-    /* Output function, returns count of printed characters or EOF */
-    int (*write)(void *, size_t, void *);
-    /* Support data - output stream specification, its state, locks,... */
+typedef struct printf_spec {
+    /* String output function, returns number of printed characters or EOF */
+    int (*str_write)(const char *, size_t, void *);
+    /* Wide string output function, returns number of printed characters or EOF */
+    int (*wstr_write)(const wchar_t *, size_t, void *);
+    /* User data - output stream specification, state, locks, etc. */
     void *data;
+} printf_spec_t;
-};
+int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
-int printf_core(const char *fmt, struct printf_spec *ps ,va_list ap);
 #endif
 /** @}

 /branches/tracing/uspace/lib/libc/include/io/stream.h
 ,18 → 37,12
 #include <libarch/types.h>
-#define EMFILE -17
+#define EMFILE  -17
-extern void open_console(void);
-extern void close_console(void);
+extern ssize_t read_stdin(void *, size_t);
+extern int klog_puts(const char *);
 extern void klog_update(void);
-extern ssize_t read_stdin(void *, size_t);
-extern ssize_t write_stdout(const void *, size_t);
-extern ssize_t write_stderr(const void *, size_t);
-extern int get_cons_phone(void);
 #endif
 /** @}

 /branches/tracing/uspace/lib/libc/include/event.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_EVENT_H_
+#define LIBC_EVENT_H_
+#include <kernel/ipc/event_types.h>
+#include <ipc/ipc.h>
+extern int event_subscribe(event_type_t, ipcarg_t);
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/macros.h
 ,0 → 1,50
+/*
+ * Copyright (c) 2009 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_MACROS_H_
+#define LIBC_MACROS_H_
+#define SIZE2KB(size) ((size) >> 10)
+#define SIZE2MB(size) ((size) >> 20)
+#define KB2SIZE(kb) ((kb) << 10)
+#define MB2SIZE(mb) ((mb) << 20)
+#define STRING(arg) STRING_ARG(arg)
+#define STRING_ARG(arg) #arg
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/ipc/bus.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcipc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_BUS_H_
+#define LIBC_BUS_H_
+#include <ipc/ipc.h>
+typedef enum {
+    BUS_CLEAR_INTERRUPT = IPC_FIRST_USER_METHOD
+} bus_request_t;
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/ipc/ipc.h
 ,8 → 47,7
 } ipc_call_t;
 typedef sysarg_t ipc_callid_t;
-typedef void (* ipc_async_callback_t)(void *private, int retval,
-    ipc_call_t *data);
+typedef void (* ipc_async_callback_t)(void *, int, ipc_call_t *);
 /*
  * User-friendly wrappers for ipc_call_sync_fast() and ipc_call_sync_slow().
 ,22 → 172,20
     ipc_call_sync_slow((phoneid), (method), (arg1), (arg2), (arg3), \
         (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
-extern int ipc_call_sync_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2,
-    ipcarg_t *result3, ipcarg_t *result4, ipcarg_t *result5);
+extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
-extern int ipc_call_sync_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
-    ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3, ipcarg_t *result4,
-    ipcarg_t *result5);
+extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
+    ipcarg_t *);
-extern ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags);
-extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *data, uint32_t usec);
+extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
+extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *, uint32_t);
 static inline ipc_callid_t ipc_wait_for_call(ipc_call_t *data)
 {
     return ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
 }
-extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data);
+extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *);
 /*
  * User-friendly wrappers for ipc_answer_fast() and ipc_answer_slow().
 ,10 → 206,10
 #define ipc_answer_5(callid, retval, arg1, arg2, arg3, arg4, arg5) \
     ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
-extern ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval,
-    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4);
-extern ipcarg_t ipc_answer_slow(ipc_callid_t callid, ipcarg_t retval,
-    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5);
+extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t);
+extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipcarg_t);
 /*
  * User-friendly wrappers for ipc_call_async_fast() and ipc_call_async_slow().
 ,8 → 217,7
  * arguments. The macros decide between the fast and the slow version according
  * to m.
  */
-#define ipc_call_async_0(phoneid, method, private, callback, \
-    can_preempt) \
+#define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
     ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
         (callback), (can_preempt))
 #define ipc_call_async_1(phoneid, method, arg1, private, callback, \
 ,23 → 241,24
     ipc_call_async_slow((phoneid), (method), (arg1), (arg2), (arg3), \
         (arg4), (arg5), (private), (callback), (can_preempt))
-extern void ipc_call_async_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, void *private,
-    ipc_async_callback_t callback, int can_preempt);
-extern void ipc_call_async_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
-    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, void *private,
-    ipc_async_callback_t callback, int can_preempt);
+extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, void *, ipc_async_callback_t, int);
+extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
-extern int ipc_connect_to_me(int phoneid, int arg1, int arg2, int arg3,
-    ipcarg_t *phone);
-extern int ipc_connect_me_to(int phoneid, int arg1, int arg2, int arg3);
-extern int ipc_hangup(int phoneid);
-extern int ipc_register_irq(int inr, int devno, int method, irq_code_t *code);
-extern int ipc_unregister_irq(int inr, int devno);
-extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method,
-    ipcarg_t arg1, ipcarg_t arg2, int mode);
+#define IPC_FLAG_BLOCKING  0x01
+extern int ipc_connect_to_me(int, int, int, int, ipcarg_t *);
+extern int ipc_connect_me_to(int, int, int, int);
+extern int ipc_connect_me_to_blocking(int, int, int, int);
+extern int ipc_hangup(int);
+extern int ipc_register_irq(int, int, int, irq_code_t *);
+extern int ipc_unregister_irq(int, int);
+extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
+extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipcarg_t, int);
 /*
  * User-friendly wrappers for ipc_share_in_start().
  */
 ,24 → 271,22
 #define ipc_share_in_start_1_1(phoneid, dst, size, arg, flags) \
     ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
-extern int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
-    int *flags);
-extern int ipc_share_in_receive(ipc_callid_t *callid, size_t *size);
-extern int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags);
-extern int ipc_share_out_start(int phoneid, void *src, int flags);
-extern int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags);
-extern int ipc_share_out_finalize(ipc_callid_t callid, void *dst);
-extern int ipc_data_read_start(int phoneid, void *dst, size_t size);
-extern int ipc_data_read_receive(ipc_callid_t *callid, size_t *size);
-extern int ipc_data_read_finalize(ipc_callid_t callid, const void *src,
-    size_t size);
-extern int ipc_data_write_start(int phoneid, const void *src, size_t size);
-extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size);
-extern int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size);
+extern int ipc_share_in_start(int, void *, size_t, ipcarg_t, int *);
+extern int ipc_share_in_receive(ipc_callid_t *, size_t *);
+extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
+extern int ipc_share_out_start(int, void *, int);
+extern int ipc_share_out_receive(ipc_callid_t *, size_t *, int *);
+extern int ipc_share_out_finalize(ipc_callid_t, void *);
+extern int ipc_data_read_start(int, void *, size_t);
+extern int ipc_data_read_receive(ipc_callid_t *, size_t *);
+extern int ipc_data_read_finalize(ipc_callid_t, const void *, size_t);
+extern int ipc_data_write_start(int, const void *, size_t);
+extern int ipc_data_write_receive(ipc_callid_t *, size_t *);
+extern int ipc_data_write_finalize(ipc_callid_t, void *, size_t);
 #include <task.h>
-extern int ipc_connect_kbox(task_id_t id);
+extern int ipc_connect_kbox(task_id_t);
 #endif

 /branches/tracing/uspace/lib/libc/include/ipc/console.h
 ,0 → 1,58
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libcipc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_IPC_CONSOLE_H_
+#define LIBC_IPC_CONSOLE_H_
+#include <ipc/ipc.h>
+typedef enum {
+    CONSOLE_GETKEY = IPC_FIRST_USER_METHOD,
+    CONSOLE_PUTCHAR,
+    CONSOLE_WRITE,
+    CONSOLE_CLEAR,
+    CONSOLE_GOTO,
+    CONSOLE_GETSIZE,
+    CONSOLE_FLUSH,
+    CONSOLE_SET_STYLE,
+    CONSOLE_SET_COLOR,
+    CONSOLE_SET_RGB_COLOR,
+    CONSOLE_CURSOR_VISIBILITY,
+    CONSOLE_KCON_ENABLE
+} console_request_t;
+#endif
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/include/ipc/services.h
 ,8 → 30,8
  * @{
  */
 /**
- * @file    services.h
- * @brief   List of all known services and their codes.
+ * @file  services.h
+ * @brief List of all known services and their codes.
  */
 #ifndef LIBIPC_SERVICES_H_
 ,12 → 38,15
 #define LIBIPC_SERVICES_H_
 typedef enum {
-    SERVICE_PCI = 1,
+    SERVICE_LOAD = 1,
+    SERVICE_PCI,
     SERVICE_KEYBOARD,
     SERVICE_VIDEO,
     SERVICE_CONSOLE,
     SERVICE_VFS,
-    SERVICE_DEVMAP
+    SERVICE_DEVMAP,
+    SERVICE_FHC,
+    SERVICE_OBIO
 } services_t;
 /* Memory area to be received from NS */

 /branches/tracing/uspace/lib/libc/include/ipc/fb.h
 ,10 → 48,11
     FB_VIEWPORT_CREATE,
     FB_VIEWPORT_DELETE,
     FB_SET_STYLE,
+    FB_SET_COLOR,
+    FB_SET_RGB_COLOR,
     FB_GET_RESOLUTION,
     FB_DRAW_TEXT_DATA,
     FB_FLUSH,
-    FB_VIEWPORT_DB,
     FB_DRAW_PPM,
     FB_PREPARE_SHM,
     FB_DROP_SHM,
 ,7 → 60,6
     FB_VP_DRAW_PIXMAP,
     FB_VP2PIXMAP,
     FB_DROP_PIXMAP,
-    FB_TRANS_PUTCHAR,
     FB_ANIM_CREATE,
     FB_ANIM_DROP,
     FB_ANIM_ADDPIXMAP,
 ,10 → 66,11
     FB_ANIM_CHGVP,
     FB_ANIM_START,
     FB_ANIM_STOP,
-    FB_POINTER_MOVE
+    FB_POINTER_MOVE,
+    FB_SCREEN_YIELD,
+    FB_SCREEN_RECLAIM
 } fb_request_t;
 #endif
 /** @}

 /branches/tracing/uspace/lib/libc/include/errno.h
 ,6 → 35,10
 #ifndef LIBC_ERRNO_H_
 #define LIBC_ERRNO_H_
+/* TODO: support threads/fibrils */
+extern int _errno;
+#define errno _errno
 #include <kernel/errno.h>
 #define ENAMETOOLONG    (-256)

 /branches/tracing/uspace/lib/libc/include/sys/types.h
 ,11 → 37,15
 #include <libarch/types.h>
-typedef unsigned long size_t;
-typedef signed long ssize_t;
 typedef long off_t;
 typedef int mode_t;
+typedef int32_t wchar_t;
+typedef volatile uint8_t ioport8_t;
+typedef volatile uint16_t ioport16_t;
+typedef volatile uint32_t ioport32_t;
 #endif
 /** @}

 /branches/tracing/uspace/lib/libc/Makefile.toolchain
 ,16 → 26,26
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration \
+    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32 -finput-charset=UTF-8 \
+    -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros \
+    $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =
-#-Werror
+## Cross-toolchain prefix
+#
+ifndef CROSS_PREFIX
+    CROSS_PREFIX = /usr/local
+endif
 ## Setup platform configuration
 #
-include $(LIBC_PREFIX)/arch/$(ARCH)/Makefile.inc
+-include $(LIBC_PREFIX)/../../../Makefile.config
+-include $(LIBC_PREFIX)/../../../config.defs
+-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
 ## Simple detection of the host system
 #
 ,6 → 69,7
     AR = $(BINUTILS_PREFIX)ar
     OBJCOPY = $(BINUTILS_PREFIX)objcopy
     OBJDUMP = $(BINUTILS_PREFIX)objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),icc_native)
 ,6 → 79,7
     AR = ar
     OBJCOPY = objcopy
     OBJDUMP = objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 ifeq ($(COMPILER),gcc_cross)
 ,5 → 89,5
     AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
     OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+    DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

 /branches/tracing/uspace/lib/libc/generic/kbd.c
 ,0 → 1,62
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <stdio.h>
+#include <io/stream.h>
+#include <kbd/kbd.h>
+#include <ipc/ipc.h>
+#include <ipc/console.h>
+#include <console.h>
+#include <async.h>
+int kbd_get_event(kbd_event_t *ev)
+{
+    int cons_phone = console_open(true);
+    ipcarg_t r0, r1, r2, r3;
+    int rc;
+    rc = async_req_0_4(cons_phone, CONSOLE_GETKEY, &r0, &r1, &r2, &r3);
+    if (rc < 0)
+        return -1;
+    ev->type = r0;
+    ev->key = r1;
+    ev->mods = r2;
+    ev->c = r3;
+    return 0;
+}
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/generic/ddi.c
 ,26 → 33,42
  */
 #include <ddi.h>
+#include <libarch/ddi.h>
 #include <libc.h>
 #include <task.h>
+#include <as.h>
+#include <align.h>
+#include <libarch/config.h>
 #include <kernel/ddi/ddi_arg.h>
+/** Return unique device number.
+ *
+ * @return New unique device number.
+ *
+ */
+int device_assign_devno(void)
+{
+    return __SYSCALL0(SYS_DEVICE_ASSIGN_DEVNO);
+}
 /** Map piece of physical memory to task.
  *
  * Caller of this function must have the CAP_MEM_MANAGER capability.
  *
- * @param pf Physical address of the starting frame.
- * @param vp Virtual address of the sterting page.
- * @param pages Number of pages to map.
- * @param flags Flags for the new address space area.
+ * @param pf        Physical address of the starting frame.
+ * @param vp        Virtual address of the starting page.
+ * @param pages     Number of pages to map.
+ * @param flags     Flags for the new address space area.
  *
- * @return 0 on success, EPERM if the caller lacks the CAP_MEM_MANAGER capability,
- *     ENOENT if there is no task with specified ID and ENOMEM if there
- *     was some problem in creating address space area.
+ * @return      0 on success, EPERM if the caller lacks the
+ *          CAP_MEM_MANAGER capability, ENOENT if there is no task
+ *          with specified ID and ENOMEM if there was some problem
+ *          in creating address space area.
  */
 int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-    return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
+    return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages,
+        flags);
 }
 /** Enable I/O space range to task.
 ,13 → 75,14
  *
  * Caller of this function must have the IO_MEM_MANAGER capability.
  *
- * @param id Task ID.
- * @param ioaddr Starting address of the I/O range.
- * @param size Size of the range.
+ * @param id        Task ID.
+ * @param ioaddr    Starting address of the I/O range.
+ * @param size      Size of the range.
  *
- * @return 0 on success, EPERM if the caller lacks the CAP_IO_MANAGER capability,
- *     ENOENT if there is no task with specified ID and ENOMEM if there
- *     was some problem in allocating memory.
+ * @return      0 on success, EPERM if the caller lacks the
+ *          CAP_IO_MANAGER capability, ENOENT if there is no task
+ *          with specified ID and ENOMEM if there was some problem
+ *          in allocating memory.
  */
 int iospace_enable(task_id_t id, void *ioaddr, unsigned long size)
 {
 ,7 → 97,7
 /** Interrupt control
  *
- * @param enable 1 - enable interrupts, 0 - disable interrupts
+ * @param enable    1 - enable interrupts, 0 - disable interrupts
  */
 int preemption_control(int enable)
 {
 ,5 → 104,36
     return __SYSCALL1(SYS_PREEMPT_CONTROL, (sysarg_t) enable);
 }
+/** Enable PIO for specified I/O range.
+ *
+ * @param pio_addr  I/O start address.
+ * @param size      Size of the I/O region.
+ * @param use_addr  Address where the final address for application's PIO
+ *          will be stored.
+ *
+ * @return      Zero on success or negative error code.
+ */
+int pio_enable(void *pio_addr, size_t size, void **use_addr)
+{
+    void *phys;
+    void *virt;
+    size_t offset;
+    unsigned int pages;
+#ifdef IO_SPACE_BOUNDARY
+    if (pio_addr < IO_SPACE_BOUNDARY) {
+        *use_addr = pio_addr;
+        return iospace_enable(task_get_id(), pio_addr, size);
+    }
+#endif
+    phys = ALIGN_DOWN((uintptr_t) pio_addr, PAGE_SIZE);
+    offset = pio_addr - phys;
+    pages = ALIGN_UP(offset + size, PAGE_SIZE) >> PAGE_WIDTH;
+    virt = as_get_mappable_page(pages);
+    *use_addr = virt + offset;
+    return physmem_map(phys, virt, pages, AS_AREA_READ | AS_AREA_WRITE);
+}
 /** @}
  */

 /branches/tracing/uspace/lib/libc/generic/console.c
 ,0 → 1,274
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2006 Jakub Vana
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <libc.h>
+#include <async.h>
+#include <io/stream.h>
+#include <ipc/console.h>
+#include <ipc/services.h>
+#include <errno.h>
+#include <string.h>
+#include <console.h>
+static int console_phone = -1;
+/** Size of cbuffer. */
+#define CBUFFER_SIZE  256
+/** Buffer for writing characters to the console. */
+static char cbuffer[CBUFFER_SIZE];
+/** Pointer to end of cbuffer. */
+static char *cbuffer_end = cbuffer + CBUFFER_SIZE;
+/** Pointer to first available field in cbuffer. */
+static char *cbp = cbuffer;
+/** Write one character to the console via IPC. */
+static void cons_putchar(wchar_t c)
+{
+    console_wait();
+    async_msg_1(console_phone, CONSOLE_PUTCHAR, c);
+}
+/** Write characters to the console via IPC or to klog */
+static ssize_t cons_write(const char *buf, size_t size)
+{
+    console_open(false);
+    if (console_phone >= 0) {
+        async_serialize_start();
+        ipc_call_t answer;
+        aid_t req = async_send_0(console_phone, CONSOLE_WRITE, &answer);
+        ipcarg_t rc = ipc_data_write_start(console_phone, (void *) buf, size);
+        if (rc != EOK) {
+            async_wait_for(req, NULL);
+            async_serialize_end();
+            return (ssize_t) rc;
+        }
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        if (rc == EOK)
+            return (ssize_t) IPC_GET_ARG1(answer);
+        else
+            return -1;
+    } else
+        return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
+}
+/** Write all data from output buffer to the console. */
+static void cbuffer_flush(void)
+{
+    size_t len = cbp - cbuffer;
+    while (len > 0) {
+        ssize_t rc = cons_write(cbuffer, cbp - cbuffer);
+        if (rc < 0)
+            return;
+        len -= rc;
+    }
+    cbp = cbuffer;
+}
+/** Drop all data in console output buffer. */
+static void cbuffer_drain(void)
+{
+    cbp = cbuffer;
+}
+/** Write one character to the output buffer. */
+static inline void cbuffer_putc(char c)
+{
+    if (cbp == cbuffer_end)
+        cbuffer_flush();
+    *cbp++ = c;
+    if (c == '\n')
+        cbuffer_flush();
+}
+int console_open(bool blocking)
+{
+    if (console_phone < 0) {
+        int phone;
+        if (blocking)
+            phone = ipc_connect_me_to_blocking(PHONE_NS,
+                SERVICE_CONSOLE, 0, 0);
+        else
+            phone = ipc_connect_me_to(PHONE_NS,
+                SERVICE_CONSOLE, 0, 0);
+        if (phone >= 0)
+            console_phone = phone;
+    }
+    return console_phone;
+}
+void console_close(void)
+{
+    if (console_phone >= 0) {
+        if (ipc_hangup(console_phone) == 0)
+            console_phone = -1;
+    }
+}
+void console_wait(void)
+{
+    while (console_phone < 0)
+        console_open(true);
+}
+void console_clear(void)
+{
+    console_wait();
+    cbuffer_drain();
+    async_msg_0(console_phone, CONSOLE_CLEAR);
+}
+int console_get_size(int *rows, int *cols)
+{
+    console_wait();
+    ipcarg_t r;
+    ipcarg_t c;
+    int rc = async_req_0_2(console_phone, CONSOLE_GETSIZE, &r, &c);
+    *rows = (int) r;
+    *cols = (int) c;
+    return rc;
+}
+void console_set_style(int style)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_1(console_phone, CONSOLE_SET_STYLE, style);
+}
+void console_set_color(int fg_color, int bg_color, int flags)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_3(console_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
+}
+void console_set_rgb_color(int fg_color, int bg_color)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_2(console_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+}
+void console_cursor_visibility(int show)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_1(console_phone, CONSOLE_CURSOR_VISIBILITY, show != 0);
+}
+void console_kcon_enable(void)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_0(console_phone, CONSOLE_KCON_ENABLE);
+}
+void console_goto(int row, int col)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_2(console_phone, CONSOLE_GOTO, row, col);
+}
+void console_putchar(wchar_t c)
+{
+    console_wait();
+    cbuffer_flush();
+    cons_putchar(c);
+}
+/** Write characters to the console. */
+ssize_t console_write(const char *buf, size_t size)
+{
+    size_t left = size;
+    while (left > 0) {
+        cbuffer_putc(*buf++);
+        left--;
+    }
+    return size;
+}
+/** Write a NULL-terminated string to the console. */
+void console_putstr(const char *str)
+{
+    size_t left = str_size(str);
+    while (left > 0) {
+        ssize_t rc = console_write(str, left);
+        if (rc < 0) {
+            /* Error */
+            return;
+        }
+        str += rc;
+        left -= rc;
+    }
+}
+/** Flush all output to the console or klog. */
+void console_flush(void)
+{
+    cbuffer_flush();
+    if (console_phone >= 0)
+        async_msg_0(console_phone, CONSOLE_FLUSH);
+}
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/generic/task.c
 ,6 → 38,7
 #include <stdlib.h>
 #include <errno.h>
 #include <loader/loader.h>
+#include <string.h>
 task_id_t task_get_id(void)
 {
 ,6 → 49,17
     return task_id;
 }
+/** Set the task name.
+ *
+ * @param name  The new name, typically the command used to execute the
+ *      program.
+ * @return  Zero on success or negative error code.
+ */
+int task_set_name(const char *name)
+{
+    return __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
+}
 /** Create a new task by running an executable from the filesystem.
  *
  * This is really just a convenience wrapper over the more complicated
 ,8 → 75,8
     task_id_t task_id;
     int rc;
-    /* Spawn a program loader. */
-    ldr = loader_spawn(path);
+    /* Connect to a program loader. */
+    ldr = loader_connect();
     if (ldr == NULL)
         return 0;
 ,7 → 101,6
         goto error;
     /* Run it. */
-    /* Load the program. */
     rc = loader_run(ldr);
     if (rc != EOK)
         goto error;

 /branches/tracing/uspace/lib/libc/generic/getopt.c
 ,7 → 241,7
         }
     }
     if ((optchar = (int)*place++) == (int)':' ||
-        (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
+        (oli = str_chr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
         /* option letter unknown or ':' */
         if (!*place)
             ++optind;
 ,20 → 377,20
             nonopt_start = nonopt_end = -1;
             return -1;
         }
-        if ((has_equal = strchr(current_argv, '=')) != NULL) {
+        if ((has_equal = str_chr(current_argv, '=')) != NULL) {
             /* argument found (--option=arg) */
             current_argv_len = has_equal - current_argv;
             has_equal++;
         } else
-            current_argv_len = strlen(current_argv);
+            current_argv_len = str_size(current_argv);
         for (i = 0; long_options[i].name; i++) {
             /* find matching long option */
-            if (strncmp(current_argv, long_options[i].name,
-                current_argv_len))
+            if (str_lcmp(current_argv, long_options[i].name,
+                str_nlength(current_argv, current_argv_len)))
                 continue;
-            if (strlen(long_options[i].name) ==
+            if (str_size(long_options[i].name) ==
                 (unsigned)current_argv_len) {
                 /* exact match */
                 match = i;

 /branches/tracing/uspace/lib/libc/generic/string.c
 ,7 → 1,6
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (C) 1998 by Wes Peters <wes@softweyr.com>
- * Copyright (c) 1988, 1993 The Regents of the University of California.
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,180 → 34,665
  */
 #include <string.h>
-#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
 #include <ctype.h>
-#include <limits.h>
+#include <malloc.h>
+#include <errno.h>
 #include <align.h>
-#include <sys/types.h>
-#include <malloc.h>
+#include <mem.h>
+#include <string.h>
-/* Dummy implementation of mem/ functions */
+/** Byte mask consisting of lowest @n bits (out of 8) */
+#define LO_MASK_8(n)  ((uint8_t) ((1 << (n)) - 1))
-void *memset(void *s, int c, size_t n)
+/** Byte mask consisting of lowest @n bits (out of 32) */
+#define LO_MASK_32(n)  ((uint32_t) ((1 << (n)) - 1))
+/** Byte mask consisting of highest @n bits (out of 8) */
+#define HI_MASK_8(n)  (~LO_MASK_8(8 - (n)))
+/** Number of data bits in a UTF-8 continuation byte */
+#define CONT_BITS  6
+/** Decode a single character from a string.
+ *
+ * Decode a single character from a string of size @a size. Decoding starts
+ * at @a offset and this offset is moved to the beginning of the next
+ * character. In case of decoding error, offset generally advances at least
+ * by one. However, offset is never moved beyond size.
+ *
+ * @param str    String (not necessarily NULL-terminated).
+ * @param offset Byte offset in string where to start decoding.
+ * @param size   Size of the string (in bytes).
+ *
+ * @return Value of decoded character, U_SPECIAL on decoding error or
+ *         NULL if attempt to decode beyond @a size.
+ *
+ */
+wchar_t str_decode(const char *str, size_t *offset, size_t size)
 {
-    char *os = s;
+    if (*offset + 1 > size)
+        return 0;
-    while (n--)
-        *(os++) = c;
+    /* First byte read from string */
+    uint8_t b0 = (uint8_t) str[(*offset)++];
-    return s;
+    /* Determine code length */
+    unsigned int b0_bits;  /* Data bits in first byte */
+    unsigned int cbytes;   /* Number of continuation bytes */
+    if ((b0 & 0x80) == 0) {
+        /* 0xxxxxxx (Plain ASCII) */
+        b0_bits = 7;
+        cbytes = 0;
+    } else if ((b0 & 0xe0) == 0xc0) {
+        /* 110xxxxx 10xxxxxx */
+        b0_bits = 5;
+        cbytes = 1;
+    } else if ((b0 & 0xf0) == 0xe0) {
+        /* 1110xxxx 10xxxxxx 10xxxxxx */
+        b0_bits = 4;
+        cbytes = 2;
+    } else if ((b0 & 0xf8) == 0xf0) {
+        /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+        b0_bits = 3;
+        cbytes = 3;
+    } else {
+        /* 10xxxxxx -- unexpected continuation byte */
+        return U_SPECIAL;
+    }
+    if (*offset + cbytes > size)
+        return U_SPECIAL;
+    wchar_t ch = b0 & LO_MASK_8(b0_bits);
+    /* Decode continuation bytes */
+    while (cbytes > 0) {
+        uint8_t b = (uint8_t) str[(*offset)++];
+        /* Must be 10xxxxxx */
+        if ((b & 0xc0) != 0x80)
+            return U_SPECIAL;
+        /* Shift data bits to ch */
+        ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS));
+        cbytes--;
+    }
+    return ch;
 }
-struct along {
-    unsigned long n;
-} __attribute__ ((packed));
+/** Encode a single character to string representation.
+ *
+ * Encode a single character to string representation (i.e. UTF-8) and store
+ * it into a buffer at @a offset. Encoding starts at @a offset and this offset
+ * is moved to the position where the next character can be written to.
+ *
+ * @param ch     Input character.
+ * @param str    Output buffer.
+ * @param offset Byte offset where to start writing.
+ * @param size   Size of the output buffer (in bytes).
+ *
+ * @return EOK if the character was encoded successfully, EOVERFLOW if there
+ *     was not enough space in the output buffer or EINVAL if the character
+ *     code was invalid.
+ */
+int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
+{
+    if (*offset >= size)
+        return EOVERFLOW;
+    if (!chr_check(ch))
+        return EINVAL;
+    /* Unsigned version of ch (bit operations should only be done
+       on unsigned types). */
+    uint32_t cc = (uint32_t) ch;
+    /* Determine how many continuation bytes are needed */
+    unsigned int b0_bits;  /* Data bits in first byte */
+    unsigned int cbytes;   /* Number of continuation bytes */
+    if ((cc & ~LO_MASK_32(7)) == 0) {
+        b0_bits = 7;
+        cbytes = 0;
+    } else if ((cc & ~LO_MASK_32(11)) == 0) {
+        b0_bits = 5;
+        cbytes = 1;
+    } else if ((cc & ~LO_MASK_32(16)) == 0) {
+        b0_bits = 4;
+        cbytes = 2;
+    } else if ((cc & ~LO_MASK_32(21)) == 0) {
+        b0_bits = 3;
+        cbytes = 3;
+    } else {
+        /* Codes longer than 21 bits are not supported */
+        return EINVAL;
+    }
+    /* Check for available space in buffer */
+    if (*offset + cbytes >= size)
+        return EOVERFLOW;
+    /* Encode continuation bytes */
+    unsigned int i;
+    for (i = cbytes; i > 0; i--) {
+        str[*offset + i] = 0x80 | (cc & LO_MASK_32(CONT_BITS));
+        cc = cc >> CONT_BITS;
+    }
+    /* Encode first byte */
+    str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1);
+    /* Advance offset */
+    *offset += cbytes + 1;
+    return EOK;
+}
-static void *unaligned_memcpy(void *dst, const void *src, size_t n)
+/** Get size of string.
+ *
+ * Get the number of bytes which are used by the string @a str (excluding the
+ * NULL-terminator).
+ *
+ * @param str String to consider.
+ *
+ * @return Number of bytes used by the string
+ *
+ */
+size_t str_size(const char *str)
 {
-    int i, j;
-    struct along *adst = dst;
-    const struct along *asrc = src;
+    size_t size = 0;
+    while (*str++ != 0)
+        size++;
+    return size;
+}
-    for (i = 0; i < n / sizeof(unsigned long); i++)
-        adst[i].n = asrc[i].n;
+/** Get size of wide string.
+ *
+ * Get the number of bytes which are used by the wide string @a str (excluding the
+ * NULL-terminator).
+ *
+ * @param str Wide string to consider.
+ *
+ * @return Number of bytes used by the wide string
+ *
+ */
+size_t wstr_size(const wchar_t *str)
+{
+    return (wstr_length(str) * sizeof(wchar_t));
+}
+/** Get size of string with length limit.
+ *
+ * Get the number of bytes which are used by up to @a max_len first
+ * characters in the string @a str. If @a max_len is greater than
+ * the length of @a str, the entire string is measured (excluding the
+ * NULL-terminator).
+ *
+ * @param str     String to consider.
+ * @param max_len Maximum number of characters to measure.
+ *
+ * @return Number of bytes used by the characters.
+ *
+ */
+size_t str_lsize(const char *str, count_t max_len)
+{
+    count_t len = 0;
+    size_t offset = 0;
+    while (len < max_len) {
+        if (str_decode(str, &offset, STR_NO_LIMIT) == 0)
+            break;
-    for (j = 0; j < n % sizeof(unsigned long); j++)
-        ((unsigned char *) (((unsigned long *) dst) + i))[j] =
-            ((unsigned char *) (((unsigned long *) src) + i))[j];
-    return (char *) dst;
+        len++;
+    }
+    return offset;
 }
-void *memcpy(void *dst, const void *src, size_t n)
+/** Get size of wide string with length limit.
+ *
+ * Get the number of bytes which are used by up to @a max_len first
+ * wide characters in the wide string @a str. If @a max_len is greater than
+ * the length of @a str, the entire wide string is measured (excluding the
+ * NULL-terminator).
+ *
+ * @param str     Wide string to consider.
+ * @param max_len Maximum number of wide characters to measure.
+ *
+ * @return Number of bytes used by the wide characters.
+ *
+ */
+size_t wstr_lsize(const wchar_t *str, count_t max_len)
 {
-    int i, j;
+    return (wstr_nlength(str, max_len * sizeof(wchar_t)) * sizeof(wchar_t));
+}
-    if (((long) dst & (sizeof(long) - 1)) ||
-        ((long) src & (sizeof(long) - 1)))
-        return unaligned_memcpy(dst, src, n);
+/** Get number of characters in a string.
+ *
+ * @param str NULL-terminated string.
+ *
+ * @return Number of characters in string.
+ *
+ */
+count_t str_length(const char *str)
+{
+    count_t len = 0;
+    size_t offset = 0;
+    while (str_decode(str, &offset, STR_NO_LIMIT) != 0)
+        len++;
+    return len;
+}
-    for (i = 0; i < n / sizeof(unsigned long); i++)
-        ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
-    for (j = 0; j < n % sizeof(unsigned long); j++)
-        ((unsigned char *) (((unsigned long *) dst) + i))[j] =
-            ((unsigned char *) (((unsigned long *) src) + i))[j];
-    return (char *) dst;
+/** Get number of characters in a wide string.
+ *
+ * @param str NULL-terminated wide string.
+ *
+ * @return Number of characters in @a str.
+ *
+ */
+count_t wstr_length(const wchar_t *wstr)
+{
+    count_t len = 0;
+    while (*wstr++ != 0)
+        len++;
+    return len;
 }
-void *memmove(void *dst, const void *src, size_t n)
+/** Get number of characters in a string with size limit.
+ *
+ * @param str  NULL-terminated string.
+ * @param size Maximum number of bytes to consider.
+ *
+ * @return Number of characters in string.
+ *
+ */
+count_t str_nlength(const char *str, size_t size)
 {
-    int i, j;
+    count_t len = 0;
+    size_t offset = 0;
-    if (src > dst)
-        return memcpy(dst, src, n);
+    while (str_decode(str, &offset, size) != 0)
+        len++;
+    return len;
+}
-    for (j = (n % sizeof(unsigned long)) - 1; j >= 0; j--)
-        ((unsigned char *) ((unsigned long *) dst))[j] =
-            ((unsigned char *) ((unsigned long *) src))[j];
+/** Get number of characters in a string with size limit.
+ *
+ * @param str  NULL-terminated string.
+ * @param size Maximum number of bytes to consider.
+ *
+ * @return Number of characters in string.
+ *
+ */
+count_t wstr_nlength(const wchar_t *str, size_t size)
+{
+    count_t len = 0;
+    count_t limit = ALIGN_DOWN(size, sizeof(wchar_t));
+    count_t offset = 0;
+    while ((offset < limit) && (*str++ != 0)) {
+        len++;
+        offset += sizeof(wchar_t);
+    }
+    return len;
+}
-    for (i = n / sizeof(unsigned long) - 1; i >=0 ; i--)
-        ((unsigned long *) dst)[i] = ((unsigned long *) src)[i];
-    return (char *) dst;
+/** Check whether character is plain ASCII.
+ *
+ * @return True if character is plain ASCII.
+ *
+ */
+bool ascii_check(wchar_t ch)
+{
+    if ((ch >= 0) && (ch <= 127))
+        return true;
+    return false;
 }
-/** Compare two memory areas.
+/** Check whether character is valid
  *
- * @param s1        Pointer to the first area to compare.
- * @param s2        Pointer to the second area to compare.
- * @param len       Size of the first area in bytes. Both areas must have
- *          the same length.
- * @return      If len is 0, return zero. If the areas match, return
- *          zero. Otherwise return non-zero.
+ * @return True if character is a valid Unicode code point.
+ *
  */
-int bcmp(const char *s1, const char *s2, size_t len)
+bool chr_check(wchar_t ch)
 {
-    for (; len && *s1++ == *s2++; len--)
-        ;
-    return len;
+    if ((ch >= 0) && (ch <= 1114111))
+        return true;
+    return false;
 }
-/** Count the number of characters in the string, not including terminating 0.
+/** Compare two NULL terminated strings.
  *
- * @param str       String.
- * @return      Number of characters in string.
+ * Do a char-by-char comparison of two NULL-terminated strings.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths.
+ *
+ * @param s1 First string to compare.
+ * @param s2 Second string to compare.
+ *
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
+ *
  */
-size_t strlen(const char *str)
+int str_cmp(const char *s1, const char *s2)
 {
-    size_t counter = 0;
+    wchar_t c1 = 0;
+    wchar_t c2 = 0;
+    size_t off1 = 0;
+    size_t off2 = 0;
-    while (str[counter] != 0)
-        counter++;
+    while (true) {
+        c1 = str_decode(s1, &off1, STR_NO_LIMIT);
+        c2 = str_decode(s2, &off2, STR_NO_LIMIT);
-    return counter;
+        if (c1 < c2)
+            return -1;
+        if (c1 > c2)
+            return 1;
+        if (c1 == 0 || c2 == 0)
+            break;
+    }
+    return 0;
 }
-int strcmp(const char *a, const char *b)
+/** Compare two NULL terminated strings with length limit.
+ *
+ * Do a char-by-char comparison of two NULL-terminated strings.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths and the length limit.
+ *
+ * @param s1      First string to compare.
+ * @param s2      Second string to compare.
+ * @param max_len Maximum number of characters to consider.
+ *
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
+ *
+ */
+int str_lcmp(const char *s1, const char *s2, count_t max_len)
 {
-    int c = 0;
+    wchar_t c1 = 0;
+    wchar_t c2 = 0;
-    while (a[c] && b[c] && (!(a[c] - b[c])))
-        c++;
+    size_t off1 = 0;
+    size_t off2 = 0;
-    return (a[c] - b[c]);
+    count_t len = 0;
+    while (true) {
+        if (len >= max_len)
+            break;
+        c1 = str_decode(s1, &off1, STR_NO_LIMIT);
+        c2 = str_decode(s2, &off2, STR_NO_LIMIT);
+        if (c1 < c2)
+            return -1;
+        if (c1 > c2)
+            return 1;
+        if (c1 == 0 || c2 == 0)
+            break;
+        ++len;
+    }
+    return 0;
 }
-int strncmp(const char *a, const char *b, size_t n)
+/** Copy string.
+ *
+ * Copy source string @a src to destination buffer @a dest.
+ * No more than @a size bytes are written. If the size of the output buffer
+ * is at least one byte, the output string will always be well-formed, i.e.
+ * null-terminated and containing only complete characters.
+ *
+ * @param dst   Destination buffer.
+ * @param count Size of the destination buffer (must be > 0).
+ * @param src   Source string.
+ */
+void str_cpy(char *dest, size_t size, const char *src)
 {
-    size_t c = 0;
+    wchar_t ch;
+    size_t src_off;
+    size_t dest_off;
-    while (c < n && a[c] && b[c] && (!(a[c] - b[c])))
-        c++;
+    /* There must be space for a null terminator in the buffer. */
+    assert(size > 0);
-    return ( c < n ? a[c] - b[c] : 0);
+    src_off = 0;
+    dest_off = 0;
+    while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) {
+        if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
+            break;
+    }
+    dest[dest_off] = '\0';
+}
+/** Copy size-limited substring.
+ *
+ * Copy prefix of string @a src of max. size @a size to destination buffer
+ * @a dest. No more than @a size bytes are written. The output string will
+ * always be well-formed, i.e. null-terminated and containing only complete
+ * characters.
+ *
+ * No more than @a n bytes are read from the input string, so it does not
+ * have to be null-terminated.
+ *
+ * @param dst   Destination buffer.
+ * @param count Size of the destination buffer (must be > 0).
+ * @param src   Source string.
+ * @param n Maximum number of bytes to read from @a src.
+ */
+void str_ncpy(char *dest, size_t size, const char *src, size_t n)
+{
+    wchar_t ch;
+    size_t src_off;
+    size_t dest_off;
+    /* There must be space for a null terminator in the buffer. */
+    assert(size > 0);
+    src_off = 0;
+    dest_off = 0;
+    while ((ch = str_decode(src, &src_off, n)) != 0) {
+        if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
+            break;
+    }
+    dest[dest_off] = '\0';
 }
-int stricmp(const char *a, const char *b)
+/** Append one string to another.
+ *
+ * Append source string @a src to string in destination buffer @a dest.
+ * Size of the destination buffer is @a dest. If the size of the output buffer
+ * is at least one byte, the output string will always be well-formed, i.e.
+ * null-terminated and containing only complete characters.
+ *
+ * @param dst   Destination buffer.
+ * @param count Size of the destination buffer.
+ * @param src   Source string.
+ */
+void str_append(char *dest, size_t size, const char *src)
 {
-    int c = 0;
+    size_t dstr_size;
+    dstr_size = str_size(dest);
+    str_cpy(dest + dstr_size, size - dstr_size, src);
+}
+/** Copy NULL-terminated wide string to string
+ *
+ * Copy source wide string @a src to destination buffer @a dst.
+ * No more than @a size bytes are written. NULL-terminator is always
+ * written after the last succesfully copied character (i.e. if the
+ * destination buffer is has at least 1 byte, it will be always
+ * NULL-terminated).
+ *
+ * @param src   Source wide string.
+ * @param dst   Destination buffer.
+ * @param count Size of the destination buffer.
+ *
+ */
+void wstr_nstr(char *dst, const wchar_t *src, size_t size)
+{
+    /* No space for the NULL-terminator in the buffer */
+    if (size == 0)
+        return;
-    while (a[c] && b[c] && (!(tolower(a[c]) - tolower(b[c]))))
-        c++;
+    wchar_t ch;
+    count_t src_idx = 0;
+    size_t dst_off = 0;
-    return (tolower(a[c]) - tolower(b[c]));
+    while ((ch = src[src_idx++]) != 0) {
+        if (chr_encode(ch, dst, &dst_off, size) != EOK)
+            break;
+    }
+    if (dst_off >= size)
+        dst[size - 1] = 0;
+    else
+        dst[dst_off] = 0;
 }
-/** Return pointer to the first occurence of character c in string.
+/** Find first occurence of character in string.
  *
- * @param str       Scanned string.
- * @param c     Searched character (taken as one byte).
- * @return      Pointer to the matched character or NULL if it is not
- *          found in given string.
+ * @param str String to search.
+ * @param ch  Character to look for.
+ *
+ * @return Pointer to character in @a str or NULL if not found.
  */
-char *strchr(const char *str, int c)
+const char *str_chr(const char *str, wchar_t ch)
 {
-    while (*str != '\0') {
-        if (*str == (char) c)
-            return (char *) str;
-        str++;
+    wchar_t acc;
+    size_t off = 0;
+    size_t last = 0;
+    while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
+        if (acc == ch)
+            return (str + last);
+        last = off;
     }
     return NULL;
 }
-/** Return pointer to the last occurence of character c in string.
+/** Find last occurence of character in string.
  *
- * @param str       Scanned string.
- * @param c     Searched character (taken as one byte).
- * @return      Pointer to the matched character or NULL if it is not
- *          found in given string.
+ * @param str String to search.
+ * @param ch  Character to look for.
+ *
+ * @return Pointer to character in @a str or NULL if not found.
  */
-char *strrchr(const char *str, int c)
+const char *str_rchr(const char *str, wchar_t ch)
 {
-    char *retval = NULL;
-    while (*str != '\0') {
-        if (*str == (char) c)
-            retval = (char *) str;
-        str++;
+    wchar_t acc;
+    size_t off = 0;
+    size_t last = 0;
+    char *res = NULL;
+    while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
+        if (acc == ch)
+            res = (str + last);
+        last = off;
     }
+    return res;
+}
-    return (char *) retval;
+/** Insert a wide character into a wide string.
+ *
+ * Insert a wide character into a wide string at position
+ * @a pos. The characters after the position are shifted.
+ *
+ * @param str     String to insert to.
+ * @param ch      Character to insert to.
+ * @param pos     Character index where to insert.
+ @ @param max_pos Characters in the buffer.
+ *
+ * @return True if the insertion was sucessful, false if the position
+ *         is out of bounds.
+ *
+ */
+bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos)
+{
+    count_t len = wstr_length(str);
+    if ((pos > len) || (pos + 1 > max_pos))
+        return false;
+    count_t i;
+    for (i = len; i + 1 > pos; i--)
+        str[i + 1] = str[i];
+    str[pos] = ch;
+    return true;
 }
+/** Remove a wide character from a wide string.
+ *
+ * Remove a wide character from a wide string at position
+ * @a pos. The characters after the position are shifted.
+ *
+ * @param str String to remove from.
+ * @param pos Character index to remove.
+ *
+ * @return True if the removal was sucessful, false if the position
+ *         is out of bounds.
+ *
+ */
+bool wstr_remove(wchar_t *str, count_t pos)
+{
+    count_t len = wstr_length(str);
+    if (pos >= len)
+        return false;
+    count_t i;
+    for (i = pos + 1; i <= len; i++)
+        str[i - 1] = str[i];
+    return true;
+}
+int stricmp(const char *a, const char *b)
+{
+    int c = 0;
+    while (a[c] && b[c] && (!(tolower(a[c]) - tolower(b[c]))))
+        c++;
+    return (tolower(a[c]) - tolower(b[c]));
+}
 /** Convert string to a number.
  * Core of strtol and strtoul functions.
  *
 ,91 → 842,47
     return (sgn ? -number : number);
 }
-char *strcpy(char *dest, const char *src)
+char *str_dup(const char *src)
 {
-    char *orig = dest;
-    while ((*(dest++) = *(src++)))
-        ;
-    return orig;
-}
+    size_t size = str_size(src);
+    void *dest = malloc(size + 1);
-char *strncpy(char *dest, const char *src, size_t n)
-{
-    char *orig = dest;
-    while ((*(dest++) = *(src++)) && --n)
-        ;
-    return orig;
-}
+    if (dest == NULL)
+        return (char *) NULL;
-char *strcat(char *dest, const char *src)
-{
-    char *orig = dest;
-    while (*dest++)
-        ;
-    --dest;
-    while ((*dest++ = *src++))
-        ;
-    return orig;
+    return (char *) memcpy(dest, src, size + 1);
 }
-char * strdup(const char *s1)
+char *strtok(char *s, const char *delim)
 {
-    size_t len = strlen(s1) + 1;
-    void *ret = malloc(len);
+    static char *next;
-    if (ret == NULL)
-        return (char *) NULL;
-    return (char *) memcpy(ret, s1, len);
+    return strtok_r(s, delim, &next);
 }
-/* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */
-char * strtok_r(char *s, const char *delim, char **last)
+char *strtok_r(char *s, const char *delim, char **next)
 {
-    char *spanp, *tok;
-    int c, sc;
+    char *start, *end;
-    if (s == NULL && (s = *last) == NULL)
-        return (NULL);
+    if (s == NULL)
+        s = *next;
-cont:
-    c = *s++;
-    for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-        if (c == sc)
-            goto cont;
-    }
+    /* Skip over leading delimiters. */
+    while (*s && (str_chr(delim, *s) != NULL)) ++s;
+    start = s;
-    if (c == 0) {       /* no non-delimiter characters */
-        *last = NULL;
-        return (NULL);
-    }
+    /* Skip over token characters. */
+    while (*s && (str_chr(delim, *s) == NULL)) ++s;
+    end = s;
+    *next = (*s ? s + 1 : s);
-    tok = s - 1;
-    for (;;) {
-        c = *s++;
-        spanp = (char *)delim;
-        do {
-            if ((sc = *spanp++) == c) {
-                if (c == 0)
-                    s = NULL;
-                else
-                    s[-1] = '\0';
-                *last = s;
-                return (tok);
-            }
-        } while (sc != 0);
+    if (start == end) {
+        return NULL;    /* No more tokens. */
     }
-}
-/* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */
-char * strtok(char *s, const char *delim)
-{
-    static char *last;
-    return (strtok_r(s, delim, &last));
+    /* Overwrite delimiter with NULL terminator. */
+    *end = '\0';
+    return start;
 }
 /** @}

 /branches/tracing/uspace/lib/libc/generic/loader.c
 ,6 → 34,7
 #include <ipc/ipc.h>
 #include <ipc/loader.h>
+#include <ipc/services.h>
 #include <libc.h>
 #include <task.h>
 #include <string.h>
 ,33 → 51,27
  * @return  Pointer to the loader connection structure (should be
  *      de-allocated using free() after use).
  */
-loader_t *loader_spawn(char *name)
+int loader_spawn(const char *name)
 {
-    int phone_id, rc;
+    return __SYSCALL2(SYS_PROGRAM_SPAWN_LOADER,
+        (sysarg_t) name, str_size(name));
+}
+loader_t *loader_connect(void)
+{
     loader_t *ldr;
+    int phone_id;
-    /*
-     * Ask kernel to spawn a new loader task.
-     */
-    rc = __SYSCALL3(SYS_PROGRAM_SPAWN_LOADER, (sysarg_t) &phone_id,
-        (sysarg_t) name, strlen(name));
-    if (rc != 0)
+    phone_id = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_LOAD, 0, 0);
+    if (phone_id < 0)
         return NULL;
-    /*
-     * Say hello so that the loader knows the incoming connection's
-     * phone hash.
-     */
-    rc = async_req_0_0(phone_id, LOADER_HELLO);
-    if (rc != EOK)
-        return NULL;
     ldr = malloc(sizeof(loader_t));
     if (ldr == NULL)
         return NULL;
     ldr->phone_id = phone_id;
-    return ldr;
+    return ldr;
 }
 /** Get ID of the new task.
 ,7 → 168,7
     ap = argv;
     buffer_size = 0;
     while (*ap != NULL) {
-        buffer_size += strlen(*ap) + 1;
+        buffer_size += str_size(*ap) + 1;
         ++ap;
     }
 ,9 → 178,10
     /* Now fill the buffer with null-terminated argument strings */
     ap = argv;
     dp = arg_buf;
     while (*ap != NULL) {
-        strcpy(dp, *ap);
-        dp += strlen(*ap) + 1;
+        str_cpy(dp, buffer_size - (dp - arg_buf), *ap);
+        dp += str_size(*ap) + 1;
         ++ap;
     }
 ,6 → 243,8
     if (rc != EOK)
         return rc;
+    ipc_hangup(ldr->phone_id);
+    ldr->phone_id = 0;
     return EOK;
 }

 /branches/tracing/uspace/lib/libc/generic/thread.c
 ,7 → 109,7
     uarg->uspace_uarg = uarg;
     rc = __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
-        (sysarg_t) strlen(name), (sysarg_t) tid);
+        (sysarg_t) str_size(name), (sysarg_t) tid);
     if (rc) {
         /*
 ,6 → 130,8
 void thread_exit(int status)
 {
     __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status);
+    for (;;)
+        ;
 }
 /** Detach thread.
 ,6 → 154,7
  */
 int thread_join(thread_id_t thread)
 {
+    return 0;
 }
 /** Get current thread ID.

 /branches/tracing/uspace/lib/libc/generic/libc.c
 ,11 → 48,14
 #include <ipc/ipc.h>
 #include <async.h>
 #include <as.h>
+#include <console.h>
 #include <loader/pcb.h>
 extern char _heap;
 extern int main(int argc, char *argv[]);
+int _errno;
 void _exit(int status)
 {
     thread_exit(status);
 ,8 → 72,6
     f = fibril_setup();
     __tcb_set(f->tcb);
-    open_console();
     /* Save the PCB pointer */
     __pcb = (pcb_t *)pcb_ptr;
 ,6 → 84,7
     }
     main(argc, argv);
+    console_flush();
 }
 void __exit(void)

 /branches/tracing/uspace/lib/libc/generic/ipc.c
 ,7 → 598,7
     ipcarg_t newphid;
     int res;
-    res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
+    res = ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
         NULL, NULL, NULL, NULL, &newphid);
     if (res)
         return res;
 ,6 → 605,30
     return newphid;
 }
+/** Ask through phone for a new connection to some service.
+ *
+ * If the connection is not available at the moment, the
+ * call will block.
+ *
+ * @param phoneid   Phone handle used for contacting the other side.
+ * @param arg1      User defined argument.
+ * @param arg2      User defined argument.
+ * @param arg3      User defined argument.
+ *
+ * @return      New phone handle on success or a negative error code.
+ */
+int ipc_connect_me_to_blocking(int phoneid, int arg1, int arg2, int arg3)
+{
+    ipcarg_t newphid;
+    int res;
+    res = ipc_call_sync_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
+        IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid);
+    if (res)
+        return res;
+    return newphid;
+}
 /** Hang up a phone.
  *
  * @param phoneid   Handle of the phone to be hung up.
 ,6 → 690,23
         arg2, mode);
 }
+int ipc_forward_slow(ipc_callid_t callid, int phoneid, int method,
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
+    int mode)
+{
+    ipc_call_t data;
+    IPC_SET_METHOD(data, method);
+    IPC_SET_ARG1(data, arg1);
+    IPC_SET_ARG2(data, arg2);
+    IPC_SET_ARG3(data, arg3);
+    IPC_SET_ARG4(data, arg4);
+    IPC_SET_ARG5(data, arg5);
+    return __SYSCALL3(SYS_IPC_FORWARD_SLOW, callid, (sysarg_t) &data, mode);
+}
 /** Wrapper for making IPC_M_SHARE_IN calls.
  *
  * @param phoneid   Phone that will be used to contact the receiving side.

 /branches/tracing/uspace/lib/libc/generic/async.c
 ,64 → 30,65
  * @{
  */
 /** @file
- */
+ */
 /**
  * Asynchronous library
  *
- * The aim of this library is facilitating writing programs utilizing the
- * asynchronous nature of HelenOS IPC, yet using a normal way of programming.
+ * The aim of this library is to provide a facility for writing programs which
+ * utilize the asynchronous nature of HelenOS IPC, yet using a normal way of
+ * programming.
  *
  * You should be able to write very simple multithreaded programs, the async
  * framework will automatically take care of most synchronization problems.
  *
  * Default semantics:
- * - async_send_*():    send asynchronously. If the kernel refuses to send
- *          more messages, [ try to get responses from kernel, if
- *          nothing found, might try synchronous ]
+ * - async_send_*(): Send asynchronously. If the kernel refuses to send
+ *                   more messages, [ try to get responses from kernel, if
+ *                   nothing found, might try synchronous ]
  *
  * Example of use (pseudo C):
- *
+ *
  * 1) Multithreaded client application
  *
- * fibril_create(fibril1, ...);
- * fibril_create(fibril2, ...);
- * ...
- *
- * int fibril1(void *arg)
- * {
- *  conn = ipc_connect_me_to();
- *  c1 = async_send(conn);
- *  c2 = async_send(conn);
- *  async_wait_for(c1);
- *  async_wait_for(c2);
- *  ...
- * }
+ *   fibril_create(fibril1, ...);
+ *   fibril_create(fibril2, ...);
+ *   ...
  *
+ *   int fibril1(void *arg)
+ *   {
+ *     conn = ipc_connect_me_to();
+ *     c1 = async_send(conn);
+ *     c2 = async_send(conn);
+ *     async_wait_for(c1);
+ *     async_wait_for(c2);
+ *     ...
+ *   }
  *
+ *
  * 2) Multithreaded server application
- * main()
- * {
- *  async_manager();
- * }
- *
  *
- * my_client_connection(icallid, *icall)
- * {
- *  if (want_refuse) {
- *      ipc_answer_0(icallid, ELIMIT);
- *      return;
- *  }
- *  ipc_answer_0(icallid, EOK);
+ *   main()
+ *   {
+ *     async_manager();
+ *   }
  *
- *  callid = async_get_call(&call);
- *  handle_call(callid, call);
- *  ipc_answer_2(callid, 1, 2, 3);
+ *   my_client_connection(icallid, *icall)
+ *   {
+ *     if (want_refuse) {
+ *       ipc_answer_0(icallid, ELIMIT);
+ *       return;
+ *     }
+ *     ipc_answer_0(icallid, EOK);
  *
- *  callid = async_get_call(&call);
- *  ....
- * }
+ *     callid = async_get_call(&call);
+ *     handle_call(callid, call);
+ *     ipc_answer_2(callid, 1, 2, 3);
  *
+ *     callid = async_get_call(&call);
+ *     ...
+ *   }
+ *
  */
 #include <futex.h>
 ,24 → 105,26
 #include <bool.h>
 atomic_t async_futex = FUTEX_INITIALIZER;
-static hash_table_t conn_hash_table;
-static LIST_INITIALIZE(timeout_list);
 /** Structures of this type represent a waiting fibril. */
 typedef struct {
     /** Expiration time. */
-    struct timeval expires;
+    struct timeval expires;
     /** If true, this struct is in the timeout list. */
-    int inlist;
+    bool inlist;
     /** Timeout list link. */
     link_t link;
     /** Identification of and link to the waiting fibril. */
     fid_t fid;
     /** If true, this fibril is currently active. */
-    int active;
+    bool active;
     /** If true, we have timed out. */
-    int timedout;
+    bool timedout;
 } awaiter_t;
 typedef struct {
 ,10 → 131,11
     awaiter_t wdata;
     /** If reply was received. */
-    int done;
+    bool done;
     /** Pointer to where the answer data is stored. */
-    ipc_call_t *dataptr;
+    ipc_call_t *dataptr;
     ipcarg_t retval;
 } amsg_t;
 ,24 → 151,24
 typedef struct {
     awaiter_t wdata;
     /** Hash table link. */
     link_t link;
     /** Incoming phone hash. */
-    ipcarg_t in_phone_hash;
+    ipcarg_t in_phone_hash;
     /** Messages that should be delivered to this fibril. */
-    link_t msg_queue;
+    link_t msg_queue;
     /** Identification of the opening call. */
     ipc_callid_t callid;
     /** Call data of the opening call. */
     ipc_call_t call;
     /** Identification of the closing call. */
     ipc_callid_t close_callid;
     /** Fibril function that will be used to handle the connection. */
     void (*cfibril)(ipc_callid_t, ipc_call_t *);
 } connection_t;
 ,12 → 176,6
 /** Identifier of the incoming connection handled by the current fibril. */
 __thread connection_t *FIBRIL_connection;
-/**
- * If true, it is forbidden to use async_req functions and all preemption is
- * disabled.
- */
-__thread int _in_interrupt_handler;
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
 static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call);
 ,6 → 183,7
  * Pointer to a fibril function that will be used to handle connections.
  */
 static async_client_conn_t client_connection = default_client_connection;
 /**
  * Pointer to a fibril function that will be used to handle interrupt
  * notifications.
 ,46 → 190,39
  */
 static async_client_conn_t interrupt_received = default_interrupt_received;
-/*
- * Getter for _in_interrupt_handler. We need to export the value of this thread
- * local variable to other modules, but the binutils 2.18 linkers die on an
- * attempt to export this symbol in the header file. For now, consider this as a
- * workaround.
- */
-bool in_interrupt_handler(void)
-{
-    return _in_interrupt_handler;
-}
-#define CONN_HASH_TABLE_CHAINS  32
+static hash_table_t conn_hash_table;
+static LIST_INITIALIZE(timeout_list);
+#define CONN_HASH_TABLE_CHAINS  32
 /** Compute hash into the connection hash table based on the source phone hash.
  *
- * @param key       Pointer to source phone hash.
+ * @param key Pointer to source phone hash.
  *
- * @return      Index into the connection hash table.
+ * @return Index into the connection hash table.
+ *
  */
 static hash_index_t conn_hash(unsigned long *key)
 {
     assert(key);
-    return ((*key) >> 4) % CONN_HASH_TABLE_CHAINS;
+    return (((*key) >> 4) % CONN_HASH_TABLE_CHAINS);
 }
 /** Compare hash table item with a key.
  *
- * @param key       Array containing the source phone hash as the only item.
- * @param keys      Expected 1 but ignored.
- * @param item      Connection hash table item.
+ * @param key  Array containing the source phone hash as the only item.
+ * @param keys Expected 1 but ignored.
+ * @param item Connection hash table item.
  *
- * @return      True on match, false otherwise.
+ * @return True on match, false otherwise.
+ *
  */
 static int conn_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-    connection_t *hs;
-    hs = hash_table_get_instance(item, connection_t, link);
-    return key[0] == hs->in_phone_hash;
+    connection_t *hs = hash_table_get_instance(item, connection_t, link);
+    return (key[0] == hs->in_phone_hash);
 }
 /** Connection hash table removal callback function.
 ,7 → 230,8
  * This function is called whenever a connection is removed from the connection
  * hash table.
  *
- * @param item      Connection hash table item being removed.
+ * @param item Connection hash table item being removed.
+ *
  */
 static void conn_remove(link_t *item)
 {
 ,23 → 248,24
 /** Sort in current fibril's timeout request.
  *
- * @param wd        Wait data of the current fibril.
+ * @param wd Wait data of the current fibril.
+ *
  */
 static void insert_timeout(awaiter_t *wd)
 {
-    link_t *tmp;
-    awaiter_t *cur;
-    wd->timedout = 0;
-    wd->inlist = 1;
-    tmp = timeout_list.next;
+    wd->timedout = false;
+    wd->inlist = true;
+    link_t *tmp = timeout_list.next;
     while (tmp != &timeout_list) {
-        cur = list_get_instance(tmp, awaiter_t, link);
+        awaiter_t *cur = list_get_instance(tmp, awaiter_t, link);
         if (tv_gteq(&cur->expires, &wd->expires))
             break;
         tmp = tmp->next;
     }
     list_append(&wd->link, tmp);
 }
 ,93 → 275,146
  * its message queue. If the fibril was not active, it is activated and all
  * timeouts are unregistered.
  *
- * @param callid    Hash of the incoming call.
- * @param call      Data of the incoming call.
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
  *
- * @return      Zero if the call doesn't match any connection.
- *          One if the call was passed to the respective connection
- *          fibril.
+ * @return False if the call doesn't match any connection.
+ *         True if the call was passed to the respective connection fibril.
+ *
  */
-static int route_call(ipc_callid_t callid, ipc_call_t *call)
+static bool route_call(ipc_callid_t callid, ipc_call_t *call)
 {
-    connection_t *conn;
-    msg_t *msg;
-    link_t *hlp;
-    unsigned long key;
     futex_down(&async_futex);
-    key = call->in_phone_hash;
-    hlp = hash_table_find(&conn_hash_table, &key);
+    unsigned long key = call->in_phone_hash;
+    link_t *hlp = hash_table_find(&conn_hash_table, &key);
     if (!hlp) {
         futex_up(&async_futex);
-        return 0;
+        return false;
     }
-    conn = hash_table_get_instance(hlp, connection_t, link);
-    msg = malloc(sizeof(*msg));
+    connection_t *conn = hash_table_get_instance(hlp, connection_t, link);
+    msg_t *msg = malloc(sizeof(*msg));
+    if (!msg) {
+        futex_up(&async_futex);
+        return false;
+    }
     msg->callid = callid;
     msg->call = *call;
     list_append(&msg->link, &conn->msg_queue);
     if (IPC_GET_METHOD(*call) == IPC_M_PHONE_HUNGUP)
         conn->close_callid = callid;
     /* If the connection fibril is waiting for an event, activate it */
     if (!conn->wdata.active) {
         /* If in timeout list, remove it */
         if (conn->wdata.inlist) {
-            conn->wdata.inlist = 0;
+            conn->wdata.inlist = false;
             list_remove(&conn->wdata.link);
         }
-        conn->wdata.active = 1;
+        conn->wdata.active = true;
         fibril_add_ready(conn->wdata.fid);
     }
     futex_up(&async_futex);
+    return true;
+}
-    return 1;
+/** Notification fibril.
+ *
+ * When a notification arrives, a fibril with this implementing function is
+ * created. It calls interrupt_received() and does the final cleanup.
+ *
+ * @param arg Message structure pointer.
+ *
+ * @return Always zero.
+ *
+ */
+static int notification_fibril(void *arg)
+{
+    msg_t *msg = (msg_t *) arg;
+    interrupt_received(msg->callid, &msg->call);
+    free(msg);
+    return 0;
 }
+/** Process interrupt notification.
+ *
+ * A new fibril is created which would process the notification.
+ *
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
+ * @return False if an error occured.
+ *         True if the call was passed to the notification fibril.
+ *
+ */
+static bool process_notification(ipc_callid_t callid, ipc_call_t *call)
+{
+    futex_down(&async_futex);
+    msg_t *msg = malloc(sizeof(*msg));
+    if (!msg) {
+        futex_up(&async_futex);
+        return false;
+    }
+    msg->callid = callid;
+    msg->call = *call;
+    fid_t fid = fibril_create(notification_fibril, msg);
+    fibril_add_ready(fid);
+    futex_up(&async_futex);
+    return true;
+}
 /** Return new incoming message for the current (fibril-local) connection.
  *
- * @param call      Storage where the incoming call data will be stored.
- * @param usecs     Timeout in microseconds. Zero denotes no timeout.
+ * @param call  Storage where the incoming call data will be stored.
+ * @param usecs Timeout in microseconds. Zero denotes no timeout.
  *
- * @return      If no timeout was specified, then a hash of the
- *          incoming call is returned. If a timeout is specified,
- *          then a hash of the incoming call is returned unless
- *          the timeout expires prior to receiving a message. In
- *          that case zero is returned.
+ * @return If no timeout was specified, then a hash of the
+ *         incoming call is returned. If a timeout is specified,
+ *         then a hash of the incoming call is returned unless
+ *         the timeout expires prior to receiving a message. In
+ *         that case zero is returned.
+ *
  */
 ipc_callid_t async_get_call_timeout(ipc_call_t *call, suseconds_t usecs)
 {
-    msg_t *msg;
-    ipc_callid_t callid;
-    connection_t *conn;
+    assert(FIBRIL_connection);
-    assert(FIBRIL_connection);
-    /* GCC 4.1.0 coughs on FIBRIL_connection-> dereference,
+    /* Why doing this?
+     * GCC 4.1.0 coughs on FIBRIL_connection-> dereference.
      * GCC 4.1.1 happilly puts the rdhwr instruction in delay slot.
-     *           I would never expect to find so many errors in
-     *           a compiler *($&$(*&$
+     *           I would never expect to find so many errors in
+     *           a compiler.
      */
-    conn = FIBRIL_connection;
+    connection_t *conn = FIBRIL_connection;
     futex_down(&async_futex);
     if (usecs) {
         gettimeofday(&conn->wdata.expires, NULL);
         tv_add(&conn->wdata.expires, usecs);
-    } else {
-        conn->wdata.inlist = 0;
-    }
+    } else
+        conn->wdata.inlist = false;
     /* If nothing in queue, wait until something arrives */
     while (list_empty(&conn->msg_queue)) {
         if (usecs)
             insert_timeout(&conn->wdata);
-        conn->wdata.active = 0;
+        conn->wdata.active = false;
         /*
          * Note: the current fibril will be rescheduled either due to a
          * timeout or due to an arriving message destined to it. In the
 ,13 → 422,14
          * case, route_call() will perform the wakeup.
          */
         fibril_switch(FIBRIL_TO_MANAGER);
         /*
-         * Futex is up after getting back from async_manager get it
-         * again.
+         * Futex is up after getting back from async_manager.
+         * Get it again.
          */
         futex_down(&async_futex);
-        if (usecs && conn->wdata.timedout &&
-            list_empty(&conn->msg_queue)) {
+        if ((usecs) && (conn->wdata.timedout)
+            && (list_empty(&conn->msg_queue))) {
             /* If we timed out -> exit */
             futex_up(&async_futex);
             return 0;
 ,9 → 436,10
         }
     }
-    msg = list_get_instance(conn->msg_queue.next, msg_t, link);
+    msg_t *msg = list_get_instance(conn->msg_queue.next, msg_t, link);
     list_remove(&msg->link);
-    callid = msg->callid;
+    ipc_callid_t callid = msg->callid;
     *call = msg->call;
     free(msg);
 ,8 → 451,9
  *
  * This function is defined as a weak symbol - to be redefined in user code.
  *
- * @param callid    Hash of the incoming call.
- * @param call      Data of the incoming call.
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
  */
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
 {
 ,8 → 462,11
 /** Default fibril function that gets called to handle interrupt notifications.
  *
- * @param callid    Hash of the incoming call.
- * @param call      Data of the incoming call.
+ * This function is defined as a weak symbol - to be redefined in user code.
+ *
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
  */
 static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
 {
 ,17 → 477,17
  * When a new connection arrives, a fibril with this implementing function is
  * created. It calls client_connection() and does the final cleanup.
  *
- * @param arg       Connection structure pointer.
+ * @param arg Connection structure pointer.
  *
- * @return      Always zero.
+ * @return Always zero.
+ *
  */
-static int connection_fibril(void  *arg)
+static int connection_fibril(void *arg)
 {
-    unsigned long key;
-    msg_t *msg;
-    int close_answered = 0;
-    /* Setup fibril-local connection pointer */
+    /*
+     * Setup fibril-local connection pointer and call client_connection().
+     *
+     */
     FIBRIL_connection = (connection_t *) arg;
     FIBRIL_connection->cfibril(FIBRIL_connection->callid,
         &FIBRIL_connection->call);
 ,20 → 494,20
     /* Remove myself from the connection hash table */
     futex_down(&async_futex);
-    key = FIBRIL_connection->in_phone_hash;
+    unsigned long key = FIBRIL_connection->in_phone_hash;
     hash_table_remove(&conn_hash_table, &key, 1);
     futex_up(&async_futex);
     /* Answer all remaining messages with EHANGUP */
     while (!list_empty(&FIBRIL_connection->msg_queue)) {
-        msg = list_get_instance(FIBRIL_connection->msg_queue.next,
-            msg_t, link);
+        msg_t *msg
+            = list_get_instance(FIBRIL_connection->msg_queue.next, msg_t, link);
         list_remove(&msg->link);
-        if (msg->callid == FIBRIL_connection->close_callid)
-            close_answered = 1;
         ipc_answer_0(msg->callid, EHANGUP);
         free(msg);
     }
     if (FIBRIL_connection->close_callid)
         ipc_answer_0(FIBRIL_connection->close_callid, EOK);
 ,43 → 516,45
 /** Create a new fibril for a new connection.
  *
- * Creates new fibril for connection, fills in connection structures and inserts
+ * Create new fibril for connection, fill in connection structures and inserts
  * it into the hash table, so that later we can easily do routing of messages to
  * particular fibrils.
  *
- * @param in_phone_hash Identification of the incoming connection.
- * @param callid    Hash of the opening IPC_M_CONNECT_ME_TO call.
- *          If callid is zero, the connection was opened by
- *          accepting the IPC_M_CONNECT_TO_ME call and this function
- *          is called directly by the server.
- * @param call      Call data of the opening call.
- * @param cfibril   Fibril function that should be called upon opening the
- *          connection.
+ * @param in_phone_hash Identification of the incoming connection.
+ * @param callid        Hash of the opening IPC_M_CONNECT_ME_TO call.
+ *                      If callid is zero, the connection was opened by
+ *                      accepting the IPC_M_CONNECT_TO_ME call and this function
+ *                      is called directly by the server.
+ * @param call          Call data of the opening call.
+ * @param cfibril       Fibril function that should be called upon opening the
+ *                      connection.
  *
- * @return      New fibril id or NULL on failure.
+ * @return New fibril id or NULL on failure.
+ *
  */
 fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
     ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
 {
-    connection_t *conn;
-    unsigned long key;
-    conn = malloc(sizeof(*conn));
+    connection_t *conn = malloc(sizeof(*conn));
     if (!conn) {
         if (callid)
             ipc_answer_0(callid, ENOMEM);
         return NULL;
     }
     conn->in_phone_hash = in_phone_hash;
     list_initialize(&conn->msg_queue);
     conn->callid = callid;
-    conn->close_callid = 0;
+    conn->close_callid = false;
     if (call)
         conn->call = *call;
-    conn->wdata.active = 1; /* We will activate the fibril ASAP */
+    /* We will activate the fibril ASAP */
+    conn->wdata.active = true;
     conn->cfibril = cfibril;
     conn->wdata.fid = fibril_create(connection_fibril, conn);
     if (!conn->wdata.fid) {
         free(conn);
         if (callid)
 ,14 → 561,16
             ipc_answer_0(callid, ENOMEM);
         return NULL;
     }
     /* Add connection to the connection hash table */
-    key = conn->in_phone_hash;
+    ipcarg_t key = conn->in_phone_hash;
     futex_down(&async_futex);
     hash_table_insert(&conn_hash_table, &key, &conn->link);
     futex_up(&async_futex);
     fibril_add_ready(conn->wdata.fid);
     return conn->wdata.fid;
 }
 ,19 → 579,18
  * If the call has the IPC_M_CONNECT_ME_TO method, a new connection is created.
  * Otherwise the call is routed to its connection fibril.
  *
- * @param callid    Hash of the incoming call.
- * @param call      Data of the incoming call.
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ *
  */
 static void handle_call(ipc_callid_t callid, ipc_call_t *call)
 {
     /* Unrouted call - do some default behaviour */
     if ((callid & IPC_CALLID_NOTIFICATION)) {
-        _in_interrupt_handler = 1;
-        (*interrupt_received)(callid, call);
-        _in_interrupt_handler = 0;
+        process_notification(callid, call);
         return;
-    }
+    }
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_CONNECT_ME_TO:
         /* Open new connection with fibril etc. */
 ,11 → 598,11
             client_connection);
         return;
     }
     /* Try to route the call through the connection hash table */
     if (route_call(callid, call))
         return;
     /* Unknown call from unknown phone - hang it up */
     ipc_answer_0(callid, EHANGUP);
 }
 ,47 → 611,44
 static void handle_expired_timeouts(void)
 {
     struct timeval tv;
-    awaiter_t *waiter;
-    link_t *cur;
     gettimeofday(&tv, NULL);
     futex_down(&async_futex);
-    cur = timeout_list.next;
+    link_t *cur = timeout_list.next;
     while (cur != &timeout_list) {
-        waiter = list_get_instance(cur, awaiter_t, link);
+        awaiter_t *waiter = list_get_instance(cur, awaiter_t, link);
         if (tv_gt(&waiter->expires, &tv))
             break;
         cur = cur->next;
         list_remove(&waiter->link);
-        waiter->inlist = 0;
-        waiter->timedout = 1;
+        waiter->inlist = false;
+        waiter->timedout = true;
         /*
-         * Redundant condition?
-         * The fibril should not be active when it gets here.
+         * Redundant condition?
+         * The fibril should not be active when it gets here.
          */
         if (!waiter->active) {
-            waiter->active = 1;
+            waiter->active = true;
             fibril_add_ready(waiter->fid);
         }
     }
     futex_up(&async_futex);
 }
 /** Endless loop dispatching incoming calls and answers.
  *
- * @return      Never returns.
+ * @return Never returns.
+ *
  */
 static int async_manager_worker(void)
 {
-    ipc_call_t call;
-    ipc_callid_t callid;
-    int timeout;
-    awaiter_t *waiter;
-    struct timeval tv;
-    while (1) {
+    while (true) {
         if (fibril_switch(FIBRIL_FROM_MANAGER)) {
             futex_up(&async_futex);
             /*
 ,11 → 657,17
              */
             continue;
         }
         futex_down(&async_futex);
+        suseconds_t timeout;
         if (!list_empty(&timeout_list)) {
-            waiter = list_get_instance(timeout_list.next, awaiter_t,
-                link);
+            awaiter_t *waiter
+                = list_get_instance(timeout_list.next, awaiter_t, link);
+            struct timeval tv;
             gettimeofday(&tv, NULL);
             if (tv_gteq(&tv, &waiter->expires)) {
                 futex_up(&async_futex);
                 handle_expired_timeouts();
 ,19 → 676,21
                 timeout = tv_sub(&waiter->expires, &tv);
         } else
             timeout = SYNCH_NO_TIMEOUT;
         futex_up(&async_futex);
-        callid = ipc_wait_cycle(&call, timeout, SYNCH_FLAGS_NONE);
+        ipc_call_t call;
+        ipc_callid_t callid
+            = ipc_wait_cycle(&call, timeout, SYNCH_FLAGS_NONE);
         if (!callid) {
             handle_expired_timeouts();
             continue;
         }
-        if (callid & IPC_CALLID_ANSWERED) {
+        if (callid & IPC_CALLID_ANSWERED)
             continue;
-        }
         handle_call(callid, &call);
     }
 ,16 → 698,17
 }
 /** Function to start async_manager as a standalone fibril.
- *
+ *
  * When more kernel threads are used, one async manager should exist per thread.
  *
- * @param arg       Unused.
+ * @param arg Unused.
+ * @return Never returns.
  *
- * @return      Never returns.
  */
 static int async_manager_fibril(void *arg)
 {
     futex_up(&async_futex);
     /*
      * async_futex is always locked when entering manager
      */
 ,9 → 720,7
 /** Add one manager to manager list. */
 void async_create_manager(void)
 {
-    fid_t fid;
-    fid = fibril_create(async_manager_fibril, NULL);
+    fid_t fid = fibril_create(async_manager_fibril, NULL);
     fibril_add_manager(fid);
 }
 ,7 → 732,7
 /** Initialize the async framework.
  *
- * @return      Zero on success or an error code.
+ * @return Zero on success or an error code.
  */
 int _async_init(void)
 {
 ,30 → 752,33
  *
  * Notify the fibril which is waiting for this message that it has arrived.
  *
- * @param private   Pointer to the asynchronous message record.
- * @param retval    Value returned in the answer.
- * @param data      Call data of the answer.
+ * @param arg    Pointer to the asynchronous message record.
+ * @param retval Value returned in the answer.
+ * @param data   Call data of the answer.
  */
-static void reply_received(void *private, int retval, ipc_call_t *data)
+static void reply_received(void *arg, int retval, ipc_call_t *data)
 {
-    amsg_t *msg = (amsg_t *) private;
+    amsg_t *msg = (amsg_t *) arg;
     msg->retval = retval;
     futex_down(&async_futex);
     /* Copy data after futex_down, just in case the call was detached */
     if (msg->dataptr)
-        *msg->dataptr = *data;
+        *msg->dataptr = *data;
     write_barrier();
     /* Remove message from timeout list */
     if (msg->wdata.inlist)
         list_remove(&msg->wdata.link);
-    msg->done = 1;
+    msg->done = true;
     if (!msg->wdata.active) {
-        msg->wdata.active = 1;
+        msg->wdata.active = true;
         fibril_add_ready(msg->wdata.fid);
     }
     futex_up(&async_futex);
 }
 ,38 → 787,35
  * The return value can be used as input for async_wait() to wait for
  * completion.
  *
- * @param phoneid   Handle of the phone that will be used for the send.
- * @param method    Service-defined method.
- * @param arg1      Service-defined payload argument.
- * @param arg2      Service-defined payload argument.
- * @param arg3      Service-defined payload argument.
- * @param arg4      Service-defined payload argument.
- * @param dataptr   If non-NULL, storage where the reply data will be
- *          stored.
+ * @param phoneid Handle of the phone that will be used for the send.
+ * @param method  Service-defined method.
+ * @param arg1    Service-defined payload argument.
+ * @param arg2    Service-defined payload argument.
+ * @param arg3    Service-defined payload argument.
+ * @param arg4    Service-defined payload argument.
+ * @param dataptr If non-NULL, storage where the reply data will be
+ *                stored.
  *
- * @return      Hash of the sent message.
+ * @return Hash of the sent message or 0 on error.
+ *
  */
 aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
 {
-    amsg_t *msg;
-    if (_in_interrupt_handler) {
-        printf("Cannot send asynchronous request in interrupt "
-            "handler.\n");
-        _exit(1);
-    }
-    msg = malloc(sizeof(*msg));
-    msg->done = 0;
+    amsg_t *msg = malloc(sizeof(*msg));
+    if (!msg)
+        return 0;
+    msg->done = false;
     msg->dataptr = dataptr;
     /* We may sleep in the next method, but it will use its own mechanism */
-    msg->wdata.active = 1;
+    msg->wdata.active = true;
     ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, msg,
-        reply_received, 1);
+        reply_received, true);
     return (aid_t) msg;
 }
 ,113 → 824,118
  * The return value can be used as input for async_wait() to wait for
  * completion.
  *
- * @param phoneid   Handle of the phone that will be used for the send.
- * @param method    Service-defined method.
- * @param arg1      Service-defined payload argument.
- * @param arg2      Service-defined payload argument.
- * @param arg3      Service-defined payload argument.
- * @param arg4      Service-defined payload argument.
- * @param arg5      Service-defined payload argument.
- * @param dataptr   If non-NULL, storage where the reply data will be
- *          stored.
+ * @param phoneid Handle of the phone that will be used for the send.
+ * @param method  Service-defined method.
+ * @param arg1    Service-defined payload argument.
+ * @param arg2    Service-defined payload argument.
+ * @param arg3    Service-defined payload argument.
+ * @param arg4    Service-defined payload argument.
+ * @param arg5    Service-defined payload argument.
+ * @param dataptr If non-NULL, storage where the reply data will be
+ *                stored.
  *
- * @return      Hash of the sent message.
+ * @return Hash of the sent message or 0 on error.
+ *
  */
 aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
     ipc_call_t *dataptr)
 {
-    amsg_t *msg;
-    if (_in_interrupt_handler) {
-        printf("Cannot send asynchronous request in interrupt "
-            "handler.\n");
-        _exit(1);
-    }
-    msg = malloc(sizeof(*msg));
-    msg->done = 0;
+    amsg_t *msg = malloc(sizeof(*msg));
+    if (!msg)
+        return 0;
+    msg->done = false;
     msg->dataptr = dataptr;
     /* We may sleep in next method, but it will use its own mechanism */
-    msg->wdata.active = 1;
+    msg->wdata.active = true;
     ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, msg,
-        reply_received, 1);
+        reply_received, true);
     return (aid_t) msg;
 }
 /** Wait for a message sent by the async framework.
  *
- * @param amsgid    Hash of the message to wait for.
- * @param retval    Pointer to storage where the retval of the answer will
- *          be stored.
+ * @param amsgid Hash of the message to wait for.
+ * @param retval Pointer to storage where the retval of the answer will
+ *               be stored.
+ *
  */
 void async_wait_for(aid_t amsgid, ipcarg_t *retval)
 {
     amsg_t *msg = (amsg_t *) amsgid;
     futex_down(&async_futex);
     if (msg->done) {
         futex_up(&async_futex);
         goto done;
     }
     msg->wdata.fid = fibril_get_id();
-    msg->wdata.active = 0;
-    msg->wdata.inlist = 0;
+    msg->wdata.active = false;
+    msg->wdata.inlist = false;
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
-    /* futex is up automatically after fibril_switch...*/
+    /* Futex is up automatically after fibril_switch */
 done:
     if (retval)
         *retval = msg->retval;
     free(msg);
 }
 /** Wait for a message sent by the async framework, timeout variant.
  *
- * @param amsgid    Hash of the message to wait for.
- * @param retval    Pointer to storage where the retval of the answer will
- *          be stored.
- * @param timeout   Timeout in microseconds.
+ * @param amsgid  Hash of the message to wait for.
+ * @param retval  Pointer to storage where the retval of the answer will
+ *                be stored.
+ * @param timeout Timeout in microseconds.
  *
- * @return      Zero on success, ETIMEOUT if the timeout has expired.
+ * @return Zero on success, ETIMEOUT if the timeout has expired.
+ *
  */
 int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout)
 {
     amsg_t *msg = (amsg_t *) amsgid;
     /* TODO: Let it go through the event read at least once */
     if (timeout < 0)
         return ETIMEOUT;
     futex_down(&async_futex);
     if (msg->done) {
         futex_up(&async_futex);
         goto done;
     }
     gettimeofday(&msg->wdata.expires, NULL);
     tv_add(&msg->wdata.expires, timeout);
     msg->wdata.fid = fibril_get_id();
-    msg->wdata.active = 0;
+    msg->wdata.active = false;
     insert_timeout(&msg->wdata);
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
-    /* futex is up automatically after fibril_switch...*/
+    /* Futex is up automatically after fibril_switch */
     if (!msg->done)
         return ETIMEOUT;
 done:
     if (retval)
         *retval = msg->retval;
     free(msg);
     return 0;
 }
 ,38 → 943,38
  *
  * The current fibril is suspended but the thread continues to execute.
  *
- * @param timeout   Duration of the wait in microseconds.
+ * @param timeout Duration of the wait in microseconds.
+ *
  */
 void async_usleep(suseconds_t timeout)
 {
-    amsg_t *msg;
+    amsg_t *msg = malloc(sizeof(*msg));
-    if (_in_interrupt_handler) {
-        printf("Cannot call async_usleep in interrupt handler.\n");
-        _exit(1);
-    }
-    msg = malloc(sizeof(*msg));
     if (!msg)
         return;
     msg->wdata.fid = fibril_get_id();
-    msg->wdata.active = 0;
+    msg->wdata.active = false;
     gettimeofday(&msg->wdata.expires, NULL);
     tv_add(&msg->wdata.expires, timeout);
     futex_down(&async_futex);
     insert_timeout(&msg->wdata);
     /* Leave the async_futex locked when entering this function */
     fibril_switch(FIBRIL_TO_MANAGER);
-    /* futex is up automatically after fibril_switch()...*/
+    /* Futex is up automatically after fibril_switch() */
     free(msg);
 }
 /** Setter for client_connection function pointer.
  *
- * @param conn      Function that will implement a new connection fibril.
+ * @param conn Function that will implement a new connection fibril.
+ *
  */
 void async_set_client_connection(async_client_conn_t conn)
 {
 ,12 → 983,12
 /** Setter for interrupt_received function pointer.
  *
- * @param conn      Function that will implement a new interrupt
- *          notification fibril.
+ * @param intr Function that will implement a new interrupt
+ *             notification fibril.
  */
-void async_set_interrupt_received(async_client_conn_t conn)
+void async_set_interrupt_received(async_client_conn_t intr)
 {
-    interrupt_received = conn;
+    interrupt_received = intr;
 }
 /** Pseudo-synchronous message sending - fast version.
 ,18 → 998,20
  * This function can only transfer 4 register payload arguments. For
  * transferring more arguments, see the slower async_req_slow().
  *
- * @param phoneid   Hash of the phone through which to make the call.
- * @param method    Method of the call.
- * @param arg1      Service-defined payload argument.
- * @param arg2      Service-defined payload argument.
- * @param arg3      Service-defined payload argument.
- * @param arg4      Service-defined payload argument.
- * @param r1        If non-NULL, storage for the 1st reply argument.
- * @param r2        If non-NULL, storage for the 2nd reply argument.
- * @param r3        If non-NULL, storage for the 3rd reply argument.
- * @param r4        If non-NULL, storage for the 4th reply argument.
- * @param r5        If non-NULL, storage for the 5th reply argument.
- * @return      Return code of the reply or a negative error code.
+ * @param phoneid Hash of the phone through which to make the call.
+ * @param method  Method of the call.
+ * @param arg1    Service-defined payload argument.
+ * @param arg2    Service-defined payload argument.
+ * @param arg3    Service-defined payload argument.
+ * @param arg4    Service-defined payload argument.
+ * @param r1      If non-NULL, storage for the 1st reply argument.
+ * @param r2      If non-NULL, storage for the 2nd reply argument.
+ * @param r3      If non-NULL, storage for the 3rd reply argument.
+ * @param r4      If non-NULL, storage for the 4th reply argument.
+ * @param r5      If non-NULL, storage for the 5th reply argument.
+ *
+ * @return Return code of the reply or a negative error code.
+ *
  */
 ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
 ,21 → 1018,27
     ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
 {
     ipc_call_t result;
-    ipcarg_t rc;
     aid_t eid = async_send_4(phoneid, method, arg1, arg2, arg3, arg4,
         &result);
+    ipcarg_t rc;
     async_wait_for(eid, &rc);
-    if (r1)
+    if (r1)
         *r1 = IPC_GET_ARG1(result);
     if (r2)
         *r2 = IPC_GET_ARG2(result);
     if (r3)
         *r3 = IPC_GET_ARG3(result);
     if (r4)
         *r4 = IPC_GET_ARG4(result);
     if (r5)
         *r5 = IPC_GET_ARG5(result);
     return rc;
 }
 ,19 → 1046,21
  *
  * Send message asynchronously and return only after the reply arrives.
  *
- * @param phoneid   Hash of the phone through which to make the call.
- * @param method    Method of the call.
- * @param arg1      Service-defined payload argument.
- * @param arg2      Service-defined payload argument.
- * @param arg3      Service-defined payload argument.
- * @param arg4      Service-defined payload argument.
- * @param arg5      Service-defined payload argument.
- * @param r1        If non-NULL, storage for the 1st reply argument.
- * @param r2        If non-NULL, storage for the 2nd reply argument.
- * @param r3        If non-NULL, storage for the 3rd reply argument.
- * @param r4        If non-NULL, storage for the 4th reply argument.
- * @param r5        If non-NULL, storage for the 5th reply argument.
- * @return      Return code of the reply or a negative error code.
+ * @param phoneid Hash of the phone through which to make the call.
+ * @param method  Method of the call.
+ * @param arg1    Service-defined payload argument.
+ * @param arg2    Service-defined payload argument.
+ * @param arg3    Service-defined payload argument.
+ * @param arg4    Service-defined payload argument.
+ * @param arg5    Service-defined payload argument.
+ * @param r1      If non-NULL, storage for the 1st reply argument.
+ * @param r2      If non-NULL, storage for the 2nd reply argument.
+ * @param r3      If non-NULL, storage for the 3rd reply argument.
+ * @param r4      If non-NULL, storage for the 4th reply argument.
+ * @param r5      If non-NULL, storage for the 5th reply argument.
+ *
+ * @return Return code of the reply or a negative error code.
+ *
  */
 ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
     ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
 ,21 → 1067,27
     ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
 {
     ipc_call_t result;
-    ipcarg_t rc;
     aid_t eid = async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5,
         &result);
+    ipcarg_t rc;
     async_wait_for(eid, &rc);
-    if (r1)
+    if (r1)
         *r1 = IPC_GET_ARG1(result);
     if (r2)
         *r2 = IPC_GET_ARG2(result);
     if (r3)
         *r3 = IPC_GET_ARG3(result);
     if (r4)
         *r4 = IPC_GET_ARG4(result);
     if (r5)
         *r5 = IPC_GET_ARG5(result);
     return rc;
 }

 /branches/tracing/uspace/lib/libc/generic/vfs/vfs.c
 ,7 → 31,7
  */
 /** @file
  */
 #include <vfs/vfs.h>
 #include <vfs/canonify.h>
 #include <stdlib.h>
 ,7 → 49,7
 #include <errno.h>
 #include <string.h>
 #include <ipc/devmap.h>
-#include "../../srv/vfs/vfs.h"
+#include "../../../srv/vfs/vfs.h"
 int vfs_phone = -1;
 futex_t vfs_phone_futex = FUTEX_INITIALIZER;
 ,7 → 57,7
 futex_t cwd_futex = FUTEX_INITIALIZER;
 DIR *cwd_dir = NULL;
 char *cwd_path = NULL;
-size_t cwd_len = 0;
+size_t cwd_size = 0;
 char *absolutize(const char *path, size_t *retlen)
 {
 ,22 → 65,22
     char *ncwd_path_nc;
     futex_down(&cwd_futex);
-    size_t len = strlen(path);
+    size_t size = str_size(path);
     if (*path != '/') {
         if (!cwd_path) {
             futex_up(&cwd_futex);
             return NULL;
         }
-        ncwd_path_nc = malloc(cwd_len + 1 + len + 1);
+        ncwd_path_nc = malloc(cwd_size + 1 + size + 1);
         if (!ncwd_path_nc) {
             futex_up(&cwd_futex);
             return NULL;
         }
-        strcpy(ncwd_path_nc, cwd_path);
-        ncwd_path_nc[cwd_len] = '/';
-        ncwd_path_nc[cwd_len + 1] = '\0';
+        str_cpy(ncwd_path_nc, cwd_size + 1 + size + 1, cwd_path);
+        ncwd_path_nc[cwd_size] = '/';
+        ncwd_path_nc[cwd_size + 1] = '\0';
     } else {
-        ncwd_path_nc = malloc(len + 1);
+        ncwd_path_nc = malloc(size + 1);
         if (!ncwd_path_nc) {
             futex_up(&cwd_futex);
             return NULL;
 ,7 → 87,7
         }
         ncwd_path_nc[0] = '\0';
     }
-    strcat(ncwd_path_nc, path);
+    str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path);
     ncwd_path = canonify(ncwd_path_nc, retlen);
     if (!ncwd_path) {
         futex_up(&cwd_futex);
 ,7 → 99,7
      * the address in ncwd_path need not be the same as ncwd_path_nc, even
      * though they both point into the same dynamically allocated buffer.
      */
-    ncwd_path = strdup(ncwd_path);
+    ncwd_path = str_dup(ncwd_path);
     free(ncwd_path_nc);
     if (!ncwd_path) {
         futex_up(&cwd_futex);
 ,34 → 109,39
     return ncwd_path;
 }
-static int vfs_connect(void)
+static void vfs_connect(void)
 {
-    if (vfs_phone < 0)
-        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
-    return vfs_phone;
+    while (vfs_phone < 0)
+        vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
 }
-static int device_get_handle(const char *name, dev_handle_t *handle)
+static int device_get_handle(const char *name, dev_handle_t *handle,
+    const unsigned int flags)
 {
-    int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT,
-);
+    int phone;
+    if (flags & IPC_FLAG_BLOCKING)
+        phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+    else
+        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
     if (phone < 0)
         return phone;
     ipc_call_t answer;
-    aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
+    aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0,
         &answer);
-    ipcarg_t retval = ipc_data_write_start(phone, name, strlen(name) + 1);
+    ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1);
     if (retval != EOK) {
         async_wait_for(req, NULL);
         ipc_hangup(phone);
         return retval;
     }
     async_wait_for(req, &retval);
     if (handle != NULL)
         *handle = -1;
 ,7 → 154,8
     return retval;
 }
-int mount(const char *fs_name, const char *mp, const char *dev)
+int mount(const char *fs_name, const char *mp, const char *dev,
+    const char *opts, const unsigned int flags)
 {
     int res;
     ipcarg_t rc;
 ,28 → 162,30
     aid_t req;
     dev_handle_t dev_handle;
-    res = device_get_handle(dev, &dev_handle);
+    res = device_get_handle(dev, &dev_handle, flags);
     if (res != EOK)
         return res;
-    size_t mpa_len;
-    char *mpa = absolutize(mp, &mpa_len);
+    size_t mpa_size;
+    char *mpa = absolutize(mp, &mpa_size);
     if (!mpa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(mpa);
-            return res;
-        }
+    vfs_connect();
+    req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL);
+    rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(mpa);
+        return (int) rc;
     }
-    req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL);
-    rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name));
+    rc = ipc_data_write_start(vfs_phone, (void *) opts, str_size(opts));
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,8 → 193,8
         free(mpa);
         return (int) rc;
     }
-    /* Ask VFS whether it likes fs_name. */
-    rc = async_req_0_0(vfs_phone, IPC_M_PING);
+    rc = ipc_data_write_start(vfs_phone, (void *) fs_name, str_size(fs_name));
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,7 → 202,9
         free(mpa);
         return (int) rc;
     }
-    rc = ipc_data_write_start(vfs_phone, (void *)mpa, mpa_len);
+    /* Ask VFS whether it likes fs_name. */
+    rc = async_req_0_0(vfs_phone, IPC_M_PING);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,38 → 212,32
         free(mpa);
         return (int) rc;
     }
     async_wait_for(req, &rc);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     free(mpa);
     return (int) rc;
 }
 static int _open(const char *path, int lflag, int oflag, ...)
 {
-    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
-    size_t pa_len;
-    char *pa = absolutize(path, &pa_len);
+    size_t pa_size;
+    char *pa = absolutize(path, &pa_size);
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(pa);
-            return res;
-        }
-    }
+    vfs_connect();
     req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
-    rc = ipc_data_write_start(vfs_phone, pa, pa_len);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,22 → 262,14
 int close(int fildes)
 {
-    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
+    vfs_connect();
     rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
 ,7 → 278,6
 ssize_t read(int fildes, void *buf, size_t nbyte)
 {
-    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
 ,14 → 284,8
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
+    vfs_connect();
     req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
     rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
 ,7 → 305,6
 ssize_t write(int fildes, const void *buf, size_t nbyte)
 {
-    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
 ,14 → 311,8
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
+    vfs_connect();
     req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
     rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
 ,20 → 332,12
 off_t lseek(int fildes, off_t offset, int whence)
 {
-    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
+    vfs_connect();
     ipcarg_t newoffs;
     rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence,
         &newoffs);
 ,19 → 353,12
 int ftruncate(int fildes, off_t length)
 {
-    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
+    vfs_connect();
     rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
 ,28 → 400,20
 int mkdir(const char *path, mode_t mode)
 {
-    int res;
     ipcarg_t rc;
     aid_t req;
-    size_t pa_len;
-    char *pa = absolutize(path, &pa_len);
+    size_t pa_size;
+    char *pa = absolutize(path, &pa_size);
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(pa);
-            return res;
-        }
-    }
+    vfs_connect();
     req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
-    rc = ipc_data_write_start(vfs_phone, pa, pa_len);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,28 → 430,20
 static int _unlink(const char *path, int lflag)
 {
-    int res;
     ipcarg_t rc;
     aid_t req;
-    size_t pa_len;
-    char *pa = absolutize(path, &pa_len);
+    size_t pa_size;
+    char *pa = absolutize(path, &pa_size);
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(pa);
-            return res;
-        }
-    }
+    vfs_connect();
     req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
-    rc = ipc_data_write_start(vfs_phone, pa, pa_len);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,17 → 470,16
 int rename(const char *old, const char *new)
 {
-    int res;
     ipcarg_t rc;
     aid_t req;
-    size_t olda_len;
-    char *olda = absolutize(old, &olda_len);
+    size_t olda_size;
+    char *olda = absolutize(old, &olda_size);
     if (!olda)
         return ENOMEM;
-    size_t newa_len;
-    char *newa = absolutize(new, &newa_len);
+    size_t newa_size;
+    char *newa = absolutize(new, &newa_size);
     if (!newa) {
         free(olda);
         return ENOMEM;
 ,18 → 487,10
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(olda);
-            free(newa);
-            return res;
-        }
-    }
+    vfs_connect();
     req = async_send_0(vfs_phone, VFS_RENAME, NULL);
-    rc = ipc_data_write_start(vfs_phone, olda, olda_len);
+    rc = ipc_data_write_start(vfs_phone, olda, olda_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,7 → 499,7
         free(newa);
         return (int) rc;
     }
-    rc = ipc_data_write_start(vfs_phone, newa, newa_len);
+    rc = ipc_data_write_start(vfs_phone, newa, newa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
 ,8 → 518,8
 int chdir(const char *path)
 {
-    size_t pa_len;
-    char *pa = absolutize(path, &pa_len);
+    size_t pa_size;
+    char *pa = absolutize(path, &pa_size);
     if (!pa)
         return ENOMEM;
 ,11 → 535,11
         cwd_dir = NULL;
         free(cwd_path);
         cwd_path = NULL;
-        cwd_len = 0;
+        cwd_size = 0;
     }
     cwd_dir = d;
     cwd_path = pa;
-    cwd_len = pa_len;
+    cwd_size = pa_size;
     futex_up(&cwd_futex);
     return EOK;
 }
 ,11 → 549,11
     if (!size)
         return NULL;
     futex_down(&cwd_futex);
-    if (size < cwd_len + 1) {
+    if (size < cwd_size + 1) {
         futex_up(&cwd_futex);
         return NULL;
     }
-    strcpy(buf, cwd_path);
+    str_cpy(buf, size, cwd_path);
     futex_up(&cwd_futex);
     return buf;
 }

 /branches/tracing/uspace/lib/libc/generic/mem.c
 ,0 → 1,239
+/*
+ * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+#include <mem.h>
+#include <stdlib.h>
+#include <sys/types.h>
+/** Fill memory block with a constant value. */
+void *memset(void *dest, int b, size_t n)
+{
+    char *pb;
+    unsigned long *pw;
+    size_t word_size;
+    size_t n_words;
+    unsigned long pattern;
+    size_t i;
+    size_t fill;
+    /* Fill initial segment. */
+    word_size = sizeof(unsigned long);
+    fill = word_size - ((uintptr_t) dest & (word_size - 1));
+    if (fill > n) fill = n;
+    pb = dest;
+    i = fill;
+    while (i-- != 0)
+        *pb++ = b;
+    /* Compute remaining size. */
+    n -= fill;
+    if (n == 0) return dest;
+    n_words = n / word_size;
+    n = n % word_size;
+    pw = (unsigned long *) pb;
+    /* Create word-sized pattern for aligned segment. */
+    pattern = 0;
+    i = word_size;
+    while (i-- != 0)
+        pattern = (pattern << 8) | (uint8_t) b;
+    /* Fill aligned segment. */
+    i = n_words;
+    while (i-- != 0)
+        *pw++ = pattern;
+    pb = (char *) pw;
+    /* Fill final segment. */
+    i = n;
+    while (i-- != 0)
+        *pb++ = b;
+    return dest;
+}
+struct along {
+    unsigned long n;
+} __attribute__ ((packed));
+static void *unaligned_memcpy(void *dst, const void *src, size_t n)
+{
+    int i, j;
+    struct along *adst = dst;
+    const struct along *asrc = src;
+    for (i = 0; i < n / sizeof(unsigned long); i++)
+        adst[i].n = asrc[i].n;
+    for (j = 0; j < n % sizeof(unsigned long); j++)
+        ((unsigned char *) (((unsigned long *) dst) + i))[j] =
+            ((unsigned char *) (((unsigned long *) src) + i))[j];
+    return (char *) dst;
+}
+/** Copy memory block. */
+void *memcpy(void *dst, const void *src, size_t n)
+{
+    size_t i;
+    size_t mod, fill;
+    size_t word_size;
+    size_t n_words;
+    const unsigned long *srcw;
+    unsigned long *dstw;
+    const uint8_t *srcb;
+    uint8_t *dstb;
+    word_size = sizeof(unsigned long);
+    /*
+     * Are source and destination addresses congruent modulo word_size?
+     * If not, use unaligned_memcpy().
+     */
+    if (((uintptr_t) dst & (word_size - 1)) !=
+        ((uintptr_t) src & (word_size - 1)))
+        return unaligned_memcpy(dst, src, n);
+    /*
+     * mod is the address modulo word size. fill is the length of the
+     * initial buffer segment before the first word boundary.
+     * If the buffer is very short, use unaligned_memcpy(), too.
+     */
+    mod = (uintptr_t) dst & (word_size - 1);
+    fill = word_size - mod;
+    if (fill > n) fill = n;
+    /* Copy the initial segment. */
+    srcb = src;
+    dstb = dst;
+    i = fill;
+    while (i-- != 0)
+        *dstb++ = *srcb++;
+    /* Compute remaining length. */
+    n -= fill;
+    if (n == 0) return dst;
+    /* Pointers to aligned segment. */
+    dstw = (unsigned long *) dstb;
+    srcw = (const unsigned long *) srcb;
+    n_words = n / word_size;    /* Number of whole words to copy. */
+    n -= n_words * word_size;   /* Remaining bytes at the end. */
+    /* "Fast" copy. */
+    i = n_words;
+    while (i-- != 0)
+        *dstw++ = *srcw++;
+    /*
+     * Copy the rest.
+     */
+    srcb = (const uint8_t *) srcw;
+    dstb = (uint8_t *) dstw;
+    i = n;
+    while (i-- != 0)
+        *dstb++ = *srcb++;
+    return dst;
+}
+/** Move memory block with possible overlapping. */
+void *memmove(void *dst, const void *src, size_t n)
+{
+    const uint8_t *sp;
+    uint8_t *dp;
+    /* Nothing to do? */
+    if (src == dst)
+        return dst;
+    /* Non-overlapping? */
+    if (dst >= src + n || src >= dst + n) {
+        return memcpy(dst, src, n);
+    }
+    /* Which direction? */
+    if (src > dst) {
+        /* Forwards. */
+        sp = src;
+        dp = dst;
+        while (n-- != 0)
+            *dp++ = *sp++;
+    } else {
+        /* Backwards. */
+        sp = src + (n - 1);
+        dp = dst + (n - 1);
+        while (n-- != 0)
+            *dp-- = *sp--;
+    }
+    return dst;
+}
+/** Compare two memory areas.
+ *
+ * @param s1        Pointer to the first area to compare.
+ * @param s2        Pointer to the second area to compare.
+ * @param len       Size of the first area in bytes. Both areas must have
+ *          the same length.
+ * @return      If len is 0, return zero. If the areas match, return
+ *          zero. Otherwise return non-zero.
+ */
+int bcmp(const char *s1, const char *s2, size_t len)
+{
+    for (; len && *s1++ == *s2++; len--)
+        ;
+    return len;
+}
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/generic/event.c
 ,0 → 1,57
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ * @}
+ */
+/** @addtogroup libc
+ */
+/** @file
+ */
+#include <libc.h>
+#include <event.h>
+#include <kernel/ipc/event_types.h>
+#include <ipc/ipc.h>
+/** Subscribe for event notifications.
+ *
+ * @param evno   Event number.
+ * @param method Use this method for notifying me.
+ *
+ * @return Value returned by the kernel.
+ */
+int event_subscribe(event_type_t e, ipcarg_t method)
+{
+    return __SYSCALL2(SYS_EVENT_SUBSCRIBE, (sysarg_t) e, (sysarg_t) method);
+}
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/generic/io/stdio.c
 ,0 → 1,278
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/**
+ * @file
+ * @brief ANSI C Stream I/O.
+ */
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <bool.h>
+#include <stdio.h>
+FILE *stdin, *stdout, *stderr;
+/**
+ * Open a stream.
+ *
+ * @param file_name Name of the file to open.
+ * @param mode      Mode string, (r|w|a)[b|t][+].
+ */
+FILE *fopen(const char *file_name, const char *mode)
+{
+    FILE *f;
+    int flags;
+    bool plus;
+    const char *mp;
+    /* Parse mode except first character. */
+    mp = mode;
+    if (*mp++ == '\0') {
+        errno = EINVAL;
+        return NULL;
+    }
+    if (*mp == 'b' || *mp == 't') ++mp;
+    if (*mp == '+') {
+        ++mp;
+        plus = true;
+    } else {
+        plus = false;
+    }
+    if (*mp != '\0') {
+        errno = EINVAL;
+        return NULL;
+    }
+    /* Parse first character of mode and determine flags for open(). */
+    switch (mode[0]) {
+    case 'r':
+        flags = plus ? O_RDWR : O_RDONLY;
+        break;
+    case 'w':
+        flags = (O_TRUNC | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
+        break;
+    case 'a':
+        /* TODO: a+ must read from beginning, append to the end. */
+        if (plus) {
+            errno = ENOTSUP;
+            return NULL;
+        }
+        flags = (O_APPEND | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
+    default:
+        errno = EINVAL;
+        return NULL;
+    }
+    /* Open file. */
+    f = malloc(sizeof(FILE));
+    if (f == NULL) {
+        errno = ENOMEM;
+        return NULL;
+    }
+    f->fd = open(file_name, flags, 0666);
+    if (f->fd < 0) {
+        free(f);
+        return NULL; /* errno was set by open() */
+    }
+    f->error = 0;
+    f->eof = 0;
+    return f;
+}
+/** Close a stream.
+ *
+ * @param f Pointer to stream.
+ * @return  0 on success, EOF on error.
+ */
+int fclose(FILE *f)
+{
+    int rc;
+    rc = close(f->fd);
+    free(f);
+    if (rc != 0)
+        return EOF; /* errno was set by close() */
+    return 0;
+}
+/** Read from a stream.
+ *
+ * @param buf   Destination buffer.
+ * @param size  Size of each record.
+ * @param nmemb Number of records to read.
+ * @param f Pointer to the stream.
+ */
+size_t fread(void *buf, size_t size, size_t nmemb, FILE *f)
+{
+    size_t left, done, n;
+    left = size * nmemb;
+    done = 0;
+    while (left > 0 && !f->error && !f->eof) {
+        n = read(f->fd, buf + done, left);
+        if (n < 0) {
+            f->error = 1;
+        } else if (n == 0) {
+            f->eof = 1;
+        } else {
+            left -= n;
+            done += n;
+        }
+    }
+    return done / size;
+}
+/** Write to a stream.
+ *
+ * @param buf   Source buffer.
+ * @param size  Size of each record.
+ * @param nmemb Number of records to write.
+ * @param f Pointer to the stream.
+ */
+size_t fwrite(const void *buf, size_t size, size_t nmemb, FILE *f)
+{
+    size_t left, done, n;
+    left = size * nmemb;
+    done = 0;
+    while (left > 0 && !f->error) {
+        n = write(f->fd, buf + done, left);
+        if (n <= 0) {
+            f->error = 1;
+        } else {
+            left -= n;
+            done += n;
+        }
+    }
+    return done / size;
+}
+/** Return the end-of-file indicator of a stream. */
+int feof(FILE *f)
+{
+    return f->eof;
+}
+/** Return the error indicator of a stream. */
+int ferror(FILE *f)
+{
+    return f->error;
+}
+/** Clear the error and end-of-file indicators of a stream. */
+void clearerr(FILE *f)
+{
+    f->eof = 0;
+    f->error = 0;
+}
+/** Read character from a stream. */
+int fgetc(FILE *f)
+{
+    unsigned char c;
+    size_t n;
+    n = fread(&c, sizeof(c), 1, f);
+    if (n < 1) return EOF;
+    return (int) c;
+}
+/** Write character to a stream. */
+int fputc(int c, FILE *f)
+{
+    unsigned char cc;
+    size_t n;
+    cc = (unsigned char) c;
+    n = fwrite(&cc, sizeof(cc), 1, f);
+    if (n < 1) return EOF;
+    return (int) cc;
+}
+/** Write string to a stream. */
+int fputs(const char *s, FILE *f)
+{
+    int rc;
+    rc = 0;
+    while (*s && rc >= 0) {
+        rc = fputc(*s++, f);
+    }
+    if (rc < 0) return EOF;
+    return 0;
+}
+/** Seek to position in stream. */
+int fseek(FILE *f, long offset, int origin)
+{
+    off_t rc;
+    rc = lseek(f->fd, offset, origin);
+    if (rc == (off_t) (-1)) {
+        /* errno has been set by lseek. */
+        return -1;
+    }
+    f->eof = 0;
+    return 0;
+}
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/generic/io/io.c
 ,6 → 36,9
 #include <unistd.h>
 #include <stdio.h>
 #include <io/io.h>
+#include <string.h>
+#include <errno.h>
+#include <console.h>
 const static char nl = '\n';
 ,8 → 50,9
         return putnchars("(NULL)", 6);
     for (count = 0; str[count] != 0; count++);
-    if (write_stdout((void *) str, count) == count) {
-        if (write_stdout(&nl, 1) == 1)
+    if (console_write((void *) str, count) == count) {
+        if (console_write(&nl, 1) == 1)
             return 0;
     }
 ,7 → 66,7
  */
 int putnchars(const char *buf, size_t count)
 {
-    if (write_stdout((void *) buf, count) == count)
+    if (console_write((void *) buf, count) == count)
         return 0;
     return EOF;
 ,7 → 83,7
         return putnchars("(NULL)", 6);
     for (count = 0; str[count] != 0; count++);
-    if (write_stdout((void *) str, count) == count)
+    if (console_write((void *) str, count) == count)
         return 0;
     return EOF;
 ,10 → 91,16
 int putchar(int c)
 {
-    unsigned char ch = c;
-    if (write_stdout((void *) &ch, 1) == 1)
+    char buf[STR_BOUNDS(1)];
+    size_t offs;
+    offs = 0;
+    if (chr_encode(c, buf, &offs, STR_BOUNDS(1)) != EOK)
+        return EOF;
+    if (console_write((void *) buf, offs) == offs)
         return c;
     return EOF;
 }
 ,6 → 107,8
 int getchar(void)
 {
     unsigned char c;
+    console_flush();
     if (read_stdin((void *) &c, 1) == 1)
         return c;
 ,5 → 115,13
     return EOF;
 }
+int fflush(FILE *f)
+{
+    /* Dummy implementation */
+    (void) f;
+    console_flush();
+    return 0;
+}
 /** @}
  */

 /branches/tracing/uspace/lib/libc/generic/io/vprintf.c
 ,14 → 38,45
 #include <io/printf_core.h>
 #include <futex.h>
 #include <async.h>
+#include <console.h>
 static atomic_t printf_futex = FUTEX_INITIALIZER;
-static int vprintf_write(const char *str, size_t count, void *unused)
+static int vprintf_str_write(const char *str, size_t size, void *data)
 {
-    return write_stdout(str, count);
+    size_t offset = 0;
+    size_t prev;
+    count_t chars = 0;
+    while (offset < size) {
+        prev = offset;
+        str_decode(str, &offset, size);
+        console_write(str + prev, offset - prev);
+        chars++;
+    }
+    return chars;
 }
+static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data)
+{
+    size_t offset = 0;
+    size_t boff;
+    count_t chars = 0;
+    char buf[4];
+    while (offset < size) {
+        boff = 0;
+        chr_encode(str[chars], buf, &boff, 4);
+        console_write(buf, boff);
+        chars++;
+        offset += sizeof(wchar_t);
+    }
+    return chars;
+}
 /** Print formatted text.
  * @param fmt   format string
  * @param ap    format parameters
 ,7 → 85,8
 int vprintf(const char *fmt, va_list ap)
 {
     struct printf_spec ps = {
-        (int (*)(void *, size_t, void *)) vprintf_write,
+        vprintf_str_write,
+        vprintf_wstr_write,
          NULL
     };
     /*

 /branches/tracing/uspace/lib/libc/generic/io/fprintf.c
 ,0 → 1,77
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup libc
+ * @{
+ */
+/**
+ * @file
+ * @brief fprintf, vfprintf
+ */
+#include <stdio.h>
+#include <sys/types.h>
+#include <io/printf_core.h>
+static int vfprintf_str_write(const char *s, size_t size, void *f)
+{
+    /* FIXME: Should return number of characters? */
+    return fwrite(s, 1, size, (FILE *) f);
+}
+static int vfprintf_wstr_write(const char *s, size_t size, void *f)
+{
+    /* TODO */
+    return size;
+}
+int vfprintf(FILE *f, const char *fmt, va_list ap)
+{
+    struct printf_spec ps = {
+        vfprintf_str_write,
+        vfprintf_wstr_write,
+        (void *) f
+    };
+    return printf_core(fmt, &ps, ap);
+}
+int fprintf(FILE *f, const char *fmt, ...)
+{
+    int rv;
+    va_list args;
+    va_start(args, fmt);
+    rv = vfprintf(f, fmt, args);
+    va_end(args);
+    return rv;
+}
+/** @}
+ */

 /branches/tracing/uspace/lib/libc/generic/io/vsnprintf.c
 ,87 → 36,145
 #include <stdio.h>
 #include <string.h>
 #include <io/printf_core.h>
+#include <errno.h>
-struct vsnprintf_data {
-    size_t size;    /* total space for string */
-    size_t len; /* count of currently used characters */
-    char *string;   /* destination string */
-};
+typedef struct {
+    size_t size;    /* Total size of the buffer (in bytes) */
+    size_t len;     /* Number of already used bytes */
+    char *dst;      /* Destination */
+} vsnprintf_data_t;
 /** Write string to given buffer.
- * Write at most data->size characters including trailing zero. According to C99
- * has snprintf to return number of characters that would have been written if
- * enough space had been available. Hence the return value is not number of
- * really printed characters but size of input string. Number of really used
- * characters is stored in data->len.
  *
- * @param str       Source string to print.
- * @param count     Size of the source string.
- * @param data      Structure with destination string, counter of used space
- *          and total string size.
- * @return      Number of characters to print (not characters really
- *          printed!)
+ * Write at most data->size plain characters including trailing zero.
+ * According to C99, snprintf() has to return number of characters that
+ * would have been written if enough space had been available. Hence
+ * the return value is not the number of actually printed characters
+ * but size of the input string.
+ *
+ * @param str  Source string to print.
+ * @param size Number of plain characters in str.
+ * @param data Structure describing destination string, counter
+ *             of used space and total string size.
+ *
+ * @return Number of characters to print (not characters actually
+ *         printed).
+ *
  */
-static int
-vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data)
+static int vsnprintf_str_write(const char *str, size_t size, vsnprintf_data_t *data)
 {
-    size_t i;
-    i = data->size - data->len;
-    if (i == 0) {
-        return count;
-    }
+    size_t left = data->size - data->len;
-    if (i == 1) {
-        /*
-         * We have only one free byte left in buffer => write there
-         * trailing zero.
+    if (left == 0)
+        return ((int) size);
+    if (left == 1) {
+        /* We have only one free byte left in buffer
+         * -> store trailing zero
          */
-        data->string[data->size - 1] = 0;
+        data->dst[data->size - 1] = 0;
         data->len = data->size;
-        return count;
+        return ((int) size);
     }
-    if (i <= count) {
-        /*
-         * We have not enought space for whole string with the trailing
-         * zero => print only a part of string.
+    if (left <= size) {
+        /* We do not have enough space for the whole string
+         * with the trailing zero => print only a part
+         * of string
          */
-        memcpy((void *)(data->string + data->len), (void *)str, i - 1);
-        data->string[data->size - 1] = 0;
-        data->len = data->size;
-        return count;
+        index_t index = 0;
+        while (index < size) {
+            wchar_t uc = str_decode(str, &index, size);
+            if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK)
+                break;
+        }
+        /* Put trailing zero at end, but not count it
+         * into data->len so it could be rewritten next time
+         */
+        data->dst[data->len] = 0;
+        return ((int) size);
     }
-    /* Buffer is big enought to print whole string */
-    memcpy((void *)(data->string + data->len), (void *)str, count);
-    data->len += count;
-    /*
-     * Put trailing zero at end, but not count it into data->len so it could
-     * be rewritten next time.
+    /* Buffer is big enought to print the whole string */
+    memcpy((void *)(data->dst + data->len), (void *) str, size);
+    data->len += size;
+    /* Put trailing zero at end, but not count it
+     * into data->len so it could be rewritten next time
      */
-    data->string[data->len] = 0;
+    data->dst[data->len] = 0;
+    return ((int) size);
+}
-    return count;
+/** Write wide string to given buffer.
+ *
+ * Write at most data->size plain characters including trailing zero.
+ * According to C99, snprintf() has to return number of characters that
+ * would have been written if enough space had been available. Hence
+ * the return value is not the number of actually printed characters
+ * but size of the input string.
+ *
+ * @param str  Source wide string to print.
+ * @param size Number of bytes in str.
+ * @param data Structure describing destination string, counter
+ *             of used space and total string size.
+ *
+ * @return Number of wide characters to print (not characters actually
+ *         printed).
+ *
+ */
+static int vsnprintf_wstr_write(const wchar_t *str, size_t size, vsnprintf_data_t *data)
+{
+    index_t index = 0;
+    while (index < (size / sizeof(wchar_t))) {
+        size_t left = data->size - data->len;
+        if (left == 0)
+            return ((int) size);
+        if (left == 1) {
+            /* We have only one free byte left in buffer
+             * -> store trailing zero
+             */
+            data->dst[data->size - 1] = 0;
+            data->len = data->size;
+            return ((int) size);
+        }
+        if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK)
+            break;
+        index++;
+    }
+    /* Put trailing zero at end, but not count it
+     * into data->len so it could be rewritten next time
+     */
+    data->dst[data->len] = 0;
+    return ((int) size);
 }
-/** Print formatted to the given buffer with limited size.
- * @param str       Buffer.
- * @param size      Bffer size.
- * @param fmt       Format string.
- * \see For more details about format string see printf_core.
- */
 int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
 {
-    struct vsnprintf_data data = {size, 0, str};
-    struct printf_spec ps = {
-        (int(*)(void *, size_t, void *)) vsnprintf_write,
+    vsnprintf_data_t data = {
+        size,
+,
+        str
+    };
+    printf_spec_t ps = {
+        (int(*) (const char *, size_t, void *)) vsnprintf_str_write,
+        (int(*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write,
         &data
     };
-    /*
-     * Print 0 at end of string - fix the case that nothing will be printed.
-     */
+    /* Print 0 at end of string - fix the case that nothing will be printed */
     if (size > 0)
         str[0] = 0;

 /branches/tracing/uspace/lib/libc/generic/io/printf_core.c
 ,6 → 1,7
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2009 Martin Decky
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,12 → 28,12
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libc
+/** @addtogroup generic
  * @{
  */
 /**
  * @file
- * @brief   Printing functions.
+ * @brief Printing functions.
  */
 #include <unistd.h>
 ,20 → 42,30
 #include <ctype.h>
 #include <string.h>
-#define __PRINTF_FLAG_PREFIX        0x00000001  /**< show prefixes 0x or 0*/
-#define __PRINTF_FLAG_SIGNED        0x00000002  /**< signed / unsigned number */
-#define __PRINTF_FLAG_ZEROPADDED    0x00000004  /**< print leading zeroes */
-#define __PRINTF_FLAG_LEFTALIGNED   0x00000010  /**< align to left */
-#define __PRINTF_FLAG_SHOWPLUS      0x00000020  /**< always show + sign */
-#define __PRINTF_FLAG_SPACESIGN     0x00000040  /**< print space instead of plus */
-#define __PRINTF_FLAG_BIGCHARS      0x00000080  /**< show big characters */
-#define __PRINTF_FLAG_NEGATIVE      0x00000100  /**< number has - sign */
+/** show prefixes 0x or 0 */
+#define __PRINTF_FLAG_PREFIX       0x00000001
+/** signed / unsigned number */
+#define __PRINTF_FLAG_SIGNED       0x00000002
+/** print leading zeroes */
+#define __PRINTF_FLAG_ZEROPADDED   0x00000004
+/** align to left */
+#define __PRINTF_FLAG_LEFTALIGNED  0x00000010
+/** always show + sign */
+#define __PRINTF_FLAG_SHOWPLUS     0x00000020
+/** print space instead of plus */
+#define __PRINTF_FLAG_SPACESIGN    0x00000040
+/** show big characters */
+#define __PRINTF_FLAG_BIGCHARS     0x00000080
+/** number has - sign */
+#define __PRINTF_FLAG_NEGATIVE     0x00000100
-#define PRINT_NUMBER_BUFFER_SIZE    (64+5)      /**< Buffer big enought for 64 bit number
-                             * printed in base 2, sign, prefix and
-                             * 0 to terminate string.. (last one is only for better testing
-                             * end of buffer by zero-filling subroutine)
-                             */
+/**
+ * Buffer big enough for 64-bit number printed in base 2, sign, prefix and 0
+ * to terminate string... (last one is only for better testing end of buffer by
+ * zero-filling subroutine)
+ */
+#define PRINT_NUMBER_BUFFER_SIZE  (64 + 5)
 /** Enumeration of possible arguments types.
  */
 typedef enum {
 ,171 → 74,299
     PrintfQualifierInt,
     PrintfQualifierLong,
     PrintfQualifierLongLong,
-    PrintfQualifierSizeT,
     PrintfQualifierPointer
 } qualifier_t;
-static char digits_small[] = "0123456789abcdef";    /**< Small hexadecimal characters */
-static char digits_big[] = "0123456789ABCDEF";      /**< Big hexadecimal characters */
+static char nullstr[] = "(NULL)";
+static char digits_small[] = "0123456789abcdef";
+static char digits_big[] = "0123456789ABCDEF";
+static char invalch = U_SPECIAL;
-/** Print count chars from buffer without adding newline
- * @param buf Buffer with size at least count bytes - NULL pointer NOT allowed!
- * @param count
- * @param ps output method and its data
- * @return number of printed characters
+/** Print one or more characters without adding newline.
+ *
+ * @param buf  Buffer holding characters with size of
+ *             at least size bytes. NULL is not allowed!
+ * @param size Size of the buffer in bytes.
+ * @param ps   Output method and its data.
+ *
+ * @return Number of characters printed.
+ *
  */
-static int printf_putnchars(const char * buf, size_t count,
-    struct printf_spec *ps)
+static int printf_putnchars(const char *buf, size_t size,
+    printf_spec_t *ps)
 {
-    return ps->write((void *)buf, count, ps->data);
+    return ps->str_write((void *) buf, size, ps->data);
 }
-/** Print string without added newline
- * @param str string to print
- * @param ps write function specification and support data
- * @return number of printed characters
+/** Print one or more wide characters without adding newline.
+ *
+ * @param buf  Buffer holding wide characters with size of
+ *             at least size bytes. NULL is not allowed!
+ * @param size Size of the buffer in bytes.
+ * @param ps   Output method and its data.
+ *
+ * @return Number of wide characters printed.
+ *
  */
-static int printf_putstr(const char * str, struct printf_spec *ps)
+static int printf_wputnchars(const wchar_t *buf, size_t size,
+    printf_spec_t *ps)
 {
-    size_t count;
+    return ps->wstr_write((void *) buf, size, ps->data);
+}
+/** Print string without adding a newline.
+ *
+ * @param str String to print.
+ * @param ps  Write function specification and support data.
+ *
+ * @return Number of characters printed.
+ *
+ */
+static int printf_putstr(const char *str, printf_spec_t *ps)
+{
+    if (str == NULL)
+        return printf_putnchars(nullstr, str_size(nullstr), ps);
-    if (str == NULL)
-        return printf_putnchars("(NULL)", 6, ps);
+    return ps->str_write((void *) str, str_size(str), ps->data);
+}
-    count = strlen(str);
-    return ps->write((void *) str, count, ps->data);
+/** Print one ASCII character.
+ *
+ * @param c  ASCII character to be printed.
+ * @param ps Output method.
+ *
+ * @return Number of characters printed.
+ *
+ */
+static int printf_putchar(const char ch, printf_spec_t *ps)
+{
+    if (!ascii_check(ch))
+        return ps->str_write((void *) &invalch, 1, ps->data);
+    return ps->str_write(&ch, 1, ps->data);
 }
-/** Print one character to output
- * @param c one character
- * @param ps output method
- * @return number of printed characters
+/** Print one wide character.
+ *
+ * @param c  Wide character to be printed.
+ * @param ps Output method.
+ *
+ * @return Number of characters printed.
+ *
  */
-static int printf_putchar(int c, struct printf_spec *ps)
+static int printf_putwchar(const wchar_t ch, printf_spec_t *ps)
 {
-    unsigned char ch = c;
+    if (!chr_check(ch))
+        return ps->str_write((void *) &invalch, 1, ps->data);
-    return ps->write((void *) &ch, 1, ps->data);
+    return ps->wstr_write(&ch, sizeof(wchar_t), ps->data);
 }
-/** Print one formatted character
- * @param c character to print
- * @param width
- * @param flags
- * @return number of printed characters
+/** Print one formatted ASCII character.
+ *
+ * @param ch    Character to print.
+ * @param width Width modifier.
+ * @param flags Flags that change the way the character is printed.
+ *
+ * @return Number of characters printed, negative value on failure.
+ *
  */
-static int print_char(char c, int width, uint64_t flags, struct printf_spec *ps)
+static int print_char(const char ch, int width, uint32_t flags, printf_spec_t *ps)
 {
-    int counter = 0;
+    count_t counter = 0;
     if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        /*
-         * One space is consumed by the character itself, hence the
-         * predecrement.
-         */
         while (--width > 0) {
-            if (printf_putchar(' ', ps) > 0)
-                ++counter;
+            /*
+             * One space is consumed by the character itself, hence
+             * the predecrement.
+             */
+            if (printf_putchar(' ', ps) > 0)
+                counter++;
         }
     }
-    if (printf_putchar(c, ps) > 0)
+    if (printf_putchar(ch, ps) > 0)
         counter++;
-    /*
-     * One space is consumed by the character itself, hence the
-     * predecrement.
-     */
     while (--width > 0) {
+        /*
+         * One space is consumed by the character itself, hence
+         * the predecrement.
+         */
         if (printf_putchar(' ', ps) > 0)
-            ++counter;
+            counter++;
     }
-    return ++counter;
+    return (int) (counter + 1);
 }
-/** Print one string
- * @param s string
- * @param width
- * @param precision
- * @param flags
- * @return number of printed characters
+/** Print one formatted wide character.
+ *
+ * @param ch    Character to print.
+ * @param width Width modifier.
+ * @param flags Flags that change the way the character is printed.
+ *
+ * @return Number of characters printed, negative value on failure.
+ *
  */
-static int print_string(char *s, int width, int precision, uint64_t flags,
-    struct printf_spec *ps)
+static int print_wchar(const wchar_t ch, int width, uint32_t flags, printf_spec_t *ps)
 {
-    int counter = 0;
-    size_t size;
-    int retval;
-    if (s == NULL) {
-        return printf_putstr("(NULL)", ps);
+    count_t counter = 0;
+    if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
+        while (--width > 0) {
+            /*
+             * One space is consumed by the character itself, hence
+             * the predecrement.
+             */
+            if (printf_putchar(' ', ps) > 0)
+                counter++;
+        }
     }
-    size = strlen(s);
+    if (printf_putwchar(ch, ps) > 0)
+        counter++;
+    while (--width > 0) {
+        /*
+         * One space is consumed by the character itself, hence
+         * the predecrement.
+         */
+        if (printf_putchar(' ', ps) > 0)
+            counter++;
+    }
+    return (int) (counter + 1);
+}
-    /* print leading spaces */
+/** Print string.
+ *
+ * @param str       String to be printed.
+ * @param width     Width modifier.
+ * @param precision Precision modifier.
+ * @param flags     Flags that modify the way the string is printed.
+ *
+ * @return Number of characters printed, negative value on failure.
+ */
+static int print_str(char *str, int width, unsigned int precision,
+    uint32_t flags, printf_spec_t *ps)
+{
+    if (str == NULL)
+        return printf_putstr(nullstr, ps);
-    if (precision == 0)
-        precision = size;
+    /* Print leading spaces. */
+    count_t strw = str_length(str);
+    if (precision == 0)
+        precision = strw;
+    /* Left padding */
+    count_t counter = 0;
     width -= precision;
     if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        while (width-- > 0) {
-            if (printf_putchar(' ', ps) == 1)
+        while (width-- > 0) {
+            if (printf_putchar(' ', ps) == 1)
                 counter++;
         }
     }
-    if ((retval = printf_putnchars(s, size < precision ? size : precision,
-        ps)) < 0) {
+    /* Part of @a str fitting into the alloted space. */
+    int retval;
+    size_t size = str_lsize(str, precision);
+    if ((retval = printf_putnchars(str, size, ps)) < 0)
         return -counter;
+    counter += retval;
+    /* Right padding */
+    while (width-- > 0) {
+        if (printf_putchar(' ', ps) == 1)
+            counter++;
     }
-    counter += retval;
+    return ((int) counter);
+}
+/** Print wide string.
+ *
+ * @param str       Wide string to be printed.
+ * @param width     Width modifier.
+ * @param precision Precision modifier.
+ * @param flags     Flags that modify the way the string is printed.
+ *
+ * @return Number of wide characters printed, negative value on failure.
+ */
+static int print_wstr(wchar_t *str, int width, unsigned int precision,
+    uint32_t flags, printf_spec_t *ps)
+{
+    if (str == NULL)
+        return printf_putstr(nullstr, ps);
+    if (*str == U_BOM)
+        str++;
+    /* Print leading spaces. */
+    size_t strw = wstr_length(str);
+    if (precision == 0)
+        precision = strw;
+    /* Left padding */
+    count_t counter = 0;
+    width -= precision;
+    if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
+        while (width-- > 0) {
+            if (printf_putchar(' ', ps) == 1)
+                counter++;
+        }
+    }
+    /* Part of @a wstr fitting into the alloted space. */
+    int retval;
+    size_t size = wstr_lsize(str, precision);
+    if ((retval = printf_wputnchars(str, size, ps)) < 0)
+        return -counter;
+    counter += retval;
+    /* Right padding */
     while (width-- > 0) {
-        if (printf_putchar(' ', ps) == 1)
-            ++counter;
+        if (printf_putchar(' ', ps) == 1)
+            counter++;
     }
-    return counter;
+    return ((int) counter);
 }
-/** Print number in given base
+/** Print a number in a given base.
  *
- * Print significant digits of a number in given
- * base.
+ * Print significant digits of a number in given base.
  *
- * @param num  Number to print.
- * @param width
- * @param precision
- * @param base Base to print the number in (should
- *             be in range 2 .. 16).
- * @param flags output modifiers
- * @return number of printed characters
+ * @param num       Number to print.
+ * @param width     Width modifier.
+ * @param precision Precision modifier.
+ * @param base      Base to print the number in (must be between 2 and 16).
+ * @param flags     Flags that modify the way the number is printed.
  *
+ * @return Number of characters printed.
+ *
  */
 static int print_number(uint64_t num, int width, int precision, int base,
-    uint64_t flags, struct printf_spec *ps)
+    uint32_t flags, printf_spec_t *ps)
 {
-    char *digits = digits_small;
-    char d[PRINT_NUMBER_BUFFER_SIZE];   /* this is good enough even for
-                         * base == 2, prefix and sign */
-    char *ptr = &d[PRINT_NUMBER_BUFFER_SIZE - 1];
-    int size = 0; /* size of number with all prefixes and signs */
-    int number_size; /* size of plain number */
-    char sgn;
-    int retval;
-    int counter = 0;
+    char *digits;
+    if (flags & __PRINTF_FLAG_BIGCHARS)
+        digits = digits_big;
+    else
+        digits = digits_small;
-    if (flags & __PRINTF_FLAG_BIGCHARS)
-        digits = digits_big;
+    char data[PRINT_NUMBER_BUFFER_SIZE];
+    char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1];
-    *ptr-- = 0; /* Put zero at end of string */
+    /* Size of number with all prefixes and signs */
+    int size = 0;
+    /* Put zero at end of string */
+    *ptr-- = 0;
     if (num == 0) {
         *ptr-- = '0';
         size++;
 ,15 → 377,17
         } while (num /= base);
     }
-    number_size = size;
+    /* Size of plain number */
+    int number_size = size;
     /*
-     * Collect sum of all prefixes/signs/... to calculate padding and
-     * leading zeroes
+     * Collect the sum of all prefixes/signs/etc. to calculate padding and
+     * leading zeroes.
      */
     if (flags & __PRINTF_FLAG_PREFIX) {
         switch(base) {
-        case 2: /* Binary formating is not standard, but usefull */
+        case 2:
+            /* Binary formating is not standard, but usefull */
             size += 2;
             break;
         case 8:
 ,8 → 398,8
             break;
         }
     }
-    sgn = 0;
+    char sgn = 0;
     if (flags & __PRINTF_FLAG_SIGNED) {
         if (flags & __PRINTF_FLAG_NEGATIVE) {
             sgn = '-';
 ,47 → 412,46
             size++;
         }
     }
-    if (flags & __PRINTF_FLAG_LEFTALIGNED) {
+    if (flags & __PRINTF_FLAG_LEFTALIGNED)
         flags &= ~__PRINTF_FLAG_ZEROPADDED;
-    }
     /*
-     * If number is leftaligned or precision is specified then zeropadding
-     * is ignored.
+     * If the number is left-aligned or precision is specified then
+     * padding with zeros is ignored.
      */
     if (flags & __PRINTF_FLAG_ZEROPADDED) {
-        if ((precision == 0) && (width > size)) {
+        if ((precision == 0) && (width > size))
             precision = width - size + number_size;
-        }
     }
-    /* print leading spaces */
-    /* We must print whole number not only a part. */
-    if (number_size > precision)
+    /* Print leading spaces */
+    if (number_size > precision) {
+        /* Print the whole number, not only a part */
         precision = number_size;
+    }
     width -= precision + size - number_size;
+    count_t counter = 0;
     if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
-        while (width-- > 0) {
-            if (printf_putchar(' ', ps) == 1)
+        while (width-- > 0) {
+            if (printf_putchar(' ', ps) == 1)
                 counter++;
         }
     }
-    /* print sign */
+    /* Print sign */
     if (sgn) {
         if (printf_putchar(sgn, ps) == 1)
             counter++;
     }
-    /* print prefix */
+    /* Print prefix */
     if (flags & __PRINTF_FLAG_PREFIX) {
         switch(base) {
-        case 2: /* Binary formating is not standard, but usefull */
+        case 2:
+            /* Binary formating is not standard, but usefull */
             if (printf_putchar('0', ps) == 1)
                 counter++;
             if (flags & __PRINTF_FLAG_BIGCHARS) {
 ,152 → 479,154
             break;
         }
     }
-    /* print leading zeroes */
+    /* Print leading zeroes */
     precision -= number_size;
-    while (precision-- > 0) {
+    while (precision-- > 0) {
         if (printf_putchar('0', ps) == 1)
             counter++;
     }
-    /* print number itself */
-    if ((retval = printf_putstr(++ptr, ps)) > 0) {
+    /* Print the number itself */
+    int retval;
+    if ((retval = printf_putstr(++ptr, ps)) > 0)
         counter += retval;
-    }
-    /* print ending spaces */
+    /* Print tailing spaces */
-    while (width-- > 0) {
-        if (printf_putchar(' ', ps) == 1)
+    while (width-- > 0) {
+        if (printf_putchar(' ', ps) == 1)
             counter++;
     }
-    return counter;
+    return ((int) counter);
 }
 /** Print formatted string.
  *
  * Print string formatted according to the fmt parameter and variadic arguments.
  * Each formatting directive must have the following form:
- *
- *  \% [ FLAGS ] [ WIDTH ] [ .PRECISION ] [ TYPE ] CONVERSION
  *
+ *  \% [ FLAGS ] [ WIDTH ] [ .PRECISION ] [ TYPE ] CONVERSION
+ *
  * FLAGS:@n
- *  - "#" Force to print prefix.
- *  For conversion \%o the prefix is 0, for %x and \%X prefixes are 0x and
- *  0X and for conversion \%b the prefix is 0b.
+ *  - "#" Force to print prefix. For \%o conversion, the prefix is 0, for
+ *        \%x and \%X prefixes are 0x and 0X and for conversion \%b the
+ *        prefix is 0b.
  *
- *  - "-"   Align to left.
+ *  - "-" Align to left.
  *
- *  - "+"   Print positive sign just as negative.
+ *  - "+" Print positive sign just as negative.
  *
- *  - " "   If the printed number is positive and "+" flag is not set,
- *      print space in place of sign.
+ *  - " " If the printed number is positive and "+" flag is not set,
+ *        print space in place of sign.
  *
- *  - "0"    Print 0 as padding instead of spaces. Zeroes are placed between
- *      sign and the rest of the number. This flag is ignored if "-"
- *      flag is specified.
- *
+ *  - "0" Print 0 as padding instead of spaces. Zeroes are placed between
+ *        sign and the rest of the number. This flag is ignored if "-"
+ *        flag is specified.
+ *
  * WIDTH:@n
- *  - Specify minimal width of printed argument. If it is bigger, width is
- *    ignored. If width is specified with a "*" character instead of number,
- *    width is taken from parameter list. And integer parameter is expected
- *    before parameter for processed conversion specification. If this value
- *    is negative its absolute value is taken and the "-" flag is set.
+ *  - Specify the minimal width of a printed argument. If it is bigger,
+ *    width is ignored. If width is specified with a "*" character instead of
+ *    number, width is taken from parameter list. And integer parameter is
+ *    expected before parameter for processed conversion specification. If
+ *    this value is negative its absolute value is taken and the "-" flag is
+ *    set.
  *
  * PRECISION:@n
- *  - Value precision. For numbers it specifies minimum valid numbers.
- *    Smaller numbers are printed with leading zeroes. Bigger numbers are
- *    not affected. Strings with more than precision characters are cut off.
- *    Just as with width, an "*" can be used used instead of a number. An
- *    integer value is then expected in parameters. When both width and
- *    precision are specified using "*", the first parameter is used for
- *    width and the second one for precision.
- *
+ *  - Value precision. For numbers it specifies minimum valid numbers.
+ *    Smaller numbers are printed with leading zeroes. Bigger numbers are not
+ *    affected. Strings with more than precision characters are cut off. Just
+ *    as with width, an "*" can be used used instead of a number. An integer
+ *    value is then expected in parameters. When both width and precision are
+ *    specified using "*", the first parameter is used for width and the
+ *    second one for precision.
+ *
  * TYPE:@n
- *  - "hh"  Signed or unsigned char.@n
- *  - "h"   Signed or usigned short.@n
- *  - ""    Signed or usigned int (default value).@n
- *  - "l"   Signed or usigned long int.@n
- *  - "ll"  Signed or usigned long long int.@n
- *  - "z"   Type size_t.@n
- *
- *
+ *  - "hh" Signed or unsigned char.@n
+ *  - "h"  Signed or unsigned short.@n
+ *  - ""   Signed or unsigned int (default value).@n
+ *  - "l"  Signed or unsigned long int.@n
+ *         If conversion is "c", the character is wchar_t (wide character).@n
+ *         If conversion is "s", the string is wchar_t * (wide string).@n
+ *  - "ll" Signed or unsigned long long int.@n
+ *
  * CONVERSION:@n
- *  - % Print percentile character itself.
+ *  - % Print percentile character itself.
  *
- *  - c Print single character.
+ *  - c Print single character. The character is expected to be plain
+ *      ASCII (e.g. only values 0 .. 127 are valid).@n
+ *      If type is "l", then the character is expected to be wide character
+ *      (e.g. values 0 .. 0x10ffff are valid).
  *
- *  - s Print zero terminated string. If a NULL value is passed as
- *      value, "(NULL)" is printed instead.
- *
- *  - P, p  Print value of a pointer. Void * value is expected and it is
- *      printed in hexadecimal notation with prefix (as with '\%#X' or
- *      '\%#x' for 32bit or '\%#X' or '\%#x' for 64bit long pointers).
+ *  - s Print zero terminated string. If a NULL value is passed as
+ *      value, "(NULL)" is printed instead.@n
+ *      If type is "l", then the string is expected to be wide string.
  *
- *  - b Print value as unsigned binary number. Prefix is not printed by
- *      default. (Nonstandard extension.)
- *
- *  - o Print value as unsigned octal number. Prefix is not printed by
- *      default.
+ *  - P, p Print value of a pointer. Void * value is expected and it is
+ *         printed in hexadecimal notation with prefix (as with \%#X / \%#x
+ *         for 32-bit or \%#X / \%#x for 64-bit long pointers).
  *
- *  - d, i  Print signed decimal number. There is no difference between d
- *      and i conversion.
+ *  - b Print value as unsigned binary number. Prefix is not printed by
+ *      default. (Nonstandard extension.)
  *
- *  - u Print unsigned decimal number.
+ *  - o Print value as unsigned octal number. Prefix is not printed by
+ *      default.
  *
- *  - X, x  Print hexadecimal number with upper- or lower-case. Prefix is
- *      not printed by default.
- *
- * All other characters from fmt except the formatting directives are printed in
+ *  - d, i Print signed decimal number. There is no difference between d
+ *         and i conversion.
+ *
+ *  - u Print unsigned decimal number.
+ *
+ *  - X, x Print hexadecimal number with upper- or lower-case. Prefix is
+ *         not printed by default.
+ *
+ * All other characters from fmt except the formatting directives are printed
  * verbatim.
  *
- * @param fmt Formatting NULL terminated string.
- * @return Number of printed characters or negative value on failure.
+ * @param fmt Format NULL-terminated string.
+ *
+ * @return Number of characters printed, negative value on failure.
+ *
  */
-int printf_core(const char *fmt, struct printf_spec *ps, va_list ap)
+int printf_core(const char *fmt, printf_spec_t *ps, va_list ap)
 {
-    /* i is the index of the currently processed char from fmt */
-    int i = 0;
-    /* j is the index to the first not printed nonformating character */
-    int j = 0;
-    int end;
-    int counter;    /* counter of printed characters */
-    int retval; /* used to store return values from called functions */
-    char c;
-    qualifier_t qualifier;  /* type of argument */
-    int base;   /* base in which will be a numeric parameter printed */
-    uint64_t number; /* argument value */
-    size_t  size;   /* byte size of integer parameter */
-    int width, precision;
-    uint64_t flags;
+    size_t i;        /* Index of the currently processed character from fmt */
+    size_t nxt = 0;  /* Index of the next character from fmt */
+    size_t j = 0;    /* Index to the first not printed nonformating character */
-    counter = 0;
+    count_t counter = 0;  /* Number of characters printed */
+    int retval;           /* Return values from nested functions */
-    while ((c = fmt[i])) {
-        /* control character */
-        if (c == '%' ) {
-            /* print common characters if any processed */
+    while (true) {
+        i = nxt;
+        wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+        if (uc == 0)
+            break;
+        /* Control character */
+        if (uc == '%') {
+            /* Print common characters if any processed */
             if (i > j) {
-                if ((retval = printf_putnchars(&fmt[j],
-                    (size_t)(i - j), ps)) < 0) { /* error */
-                    goto minus_out;
+                if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) {
+                    /* Error */
+                    counter = -counter;
+                    goto out;
                 }
                 counter += retval;
             }
             j = i;
-            /* parse modifiers */
-            flags = 0;
-            end = 0;
+            /* Parse modifiers */
+            uint32_t flags = 0;
+            bool end = false;
             do {
-                ++i;
-                switch (c = fmt[i]) {
+                i = nxt;
+                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                switch (uc) {
                 case '#':
                     flags |= __PRINTF_FLAG_PREFIX;
                     break;
 ,114 → 643,145
                     flags |= __PRINTF_FLAG_ZEROPADDED;
                     break;
                 default:
-                    end = 1;
-                };
-            } while (end == 0);
+                    end = true;
+                };
+            } while (!end);
-            /* width & '*' operator */
-            width = 0;
-            if (isdigit(fmt[i])) {
-                while (isdigit(fmt[i])) {
+            /* Width & '*' operator */
+            int width = 0;
+            if (isdigit(uc)) {
+                while (true) {
                     width *= 10;
-                    width += fmt[i++] - '0';
+                    width += uc - '0';
+                    i = nxt;
+                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                    if (uc == 0)
+                        break;
+                    if (!isdigit(uc))
+                        break;
                 }
-            } else if (fmt[i] == '*') {
-                /* get width value from argument list*/
-                i++;
-                width = (int)va_arg(ap, int);
+            } else if (uc == '*') {
+                /* Get width value from argument list */
+                i = nxt;
+                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                width = (int) va_arg(ap, int);
                 if (width < 0) {
-                    /* negative width sets '-' flag */
+                    /* Negative width sets '-' flag */
                     width *= -1;
                     flags |= __PRINTF_FLAG_LEFTALIGNED;
                 }
             }
-            /* precision and '*' operator */
-            precision = 0;
-            if (fmt[i] == '.') {
-                ++i;
-                if (isdigit(fmt[i])) {
-                    while (isdigit(fmt[i])) {
+            /* Precision and '*' operator */
+            int precision = 0;
+            if (uc == '.') {
+                i = nxt;
+                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                if (isdigit(uc)) {
+                    while (true) {
                         precision *= 10;
-                        precision += fmt[i++] - '0';
+                        precision += uc - '0';
+                        i = nxt;
+                        uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                        if (uc == 0)
+                            break;
+                        if (!isdigit(uc))
+                            break;
                     }
-                } else if (fmt[i] == '*') {
-                    /* get precision value from argument */
-                    i++;
-                    precision = (int)va_arg(ap, int);
+                } else if (uc == '*') {
+                    /* Get precision value from the argument list */
+                    i = nxt;
+                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                    precision = (int) va_arg(ap, int);
                     if (precision < 0) {
-                        /* negative precision ignored */
+                        /* Ignore negative precision */
                         precision = 0;
                     }
                 }
             }
-            switch (fmt[i++]) {
-            /** @todo unimplemented qualifiers:
-             * t ptrdiff_t - ISO C 99
+            qualifier_t qualifier;
+            switch (uc) {
+            /** @todo Unimplemented qualifiers:
+             *        t ptrdiff_t - ISO C 99
              */
-            case 'h':   /* char or short */
+            case 'h':
+                /* Char or short */
                 qualifier = PrintfQualifierShort;
-                if (fmt[i] == 'h') {
-                    i++;
+                i = nxt;
+                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                if (uc == 'h') {
+                    i = nxt;
+                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
                     qualifier = PrintfQualifierByte;
                 }
                 break;
-            case 'l':   /* long or long long*/
+            case 'l':
+                /* Long or long long */
                 qualifier = PrintfQualifierLong;
-                if (fmt[i] == 'l') {
-                    i++;
+                i = nxt;
+                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                if (uc == 'l') {
+                    i = nxt;
+                    uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
                     qualifier = PrintfQualifierLongLong;
                 }
                 break;
-            case 'z':   /* size_t */
-                qualifier = PrintfQualifierSizeT;
-                break;
             default:
-                /* set default type */
+                /* Default type */
                 qualifier = PrintfQualifierInt;
-                --i;
-            }
+            }
-            base = 10;
-            switch (c = fmt[i]) {
+            unsigned int base = 10;
+            switch (uc) {
             /*
              * String and character conversions.
              */
             case 's':
-                if ((retval = print_string(va_arg(ap, char*),
-                    width, precision, flags, ps)) < 0) {
-                    goto minus_out;
+                if (qualifier == PrintfQualifierLong)
+                    retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps);
+                else
+                    retval = print_str(va_arg(ap, char *), width, precision, flags, ps);
+                if (retval < 0) {
+                    counter = -counter;
+                    goto out;
                 }
                 counter += retval;
-                j = i + 1;
+                j = nxt;
                 goto next_char;
             case 'c':
-                c = va_arg(ap, unsigned int);
-                retval = print_char(c, width, flags, ps);
+                if (qualifier == PrintfQualifierLong)
+                    retval = print_wchar(va_arg(ap, wchar_t), width, flags, ps);
+                else
+                    retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
                 if (retval < 0) {
-                    goto minus_out;
-                }
+                    counter = -counter;
+                    goto out;
+                };
                 counter += retval;
-                j = i + 1;
+                j = nxt;
                 goto next_char;
-            /*
+            /*
              * Integer values
              */
-            case 'P': /* pointer */
-                    flags |= __PRINTF_FLAG_BIGCHARS;
+            case 'P':
+                /* Pointer */
+                flags |= __PRINTF_FLAG_BIGCHARS;
             case 'p':
                 flags |= __PRINTF_FLAG_PREFIX;
                 base = 16;
                 qualifier = PrintfQualifierPointer;
-                break;
-            case 'b':
+                break;
+            case 'b':
                 base = 2;
                 break;
             case 'o':
 ,7 → 789,7
                 break;
             case 'd':
             case 'i':
-                flags |= __PRINTF_FLAG_SIGNED;
+                flags |= __PRINTF_FLAG_SIGNED;
             case 'u':
                 break;
             case 'X':
 ,66 → 797,63
             case 'x':
                 base = 16;
                 break;
-            /* percentile itself */
-            case '%':
+            /* Percentile itself */
+            case '%':
                 j = i;
                 goto next_char;
             /*
              * Bad formatting.
              */
             default:
                 /*
-                 * Unknown format. Now, j is the index of '%',
-                 * so we will print the whole bad format
-                 * sequence.
+                 * Unknown format. Now, j is the index of '%'
+                 * so we will print whole bad format sequence.
                  */
-                goto next_char;
+                goto next_char;
             }
             /* Print integers */
+            size_t size;
+            uint64_t number;
             switch (qualifier) {
             case PrintfQualifierByte:
                 size = sizeof(unsigned char);
-                number = (uint64_t)va_arg(ap, unsigned int);
+                number = (uint64_t) va_arg(ap, unsigned int);
                 break;
             case PrintfQualifierShort:
                 size = sizeof(unsigned short);
-                number = (uint64_t)va_arg(ap, unsigned int);
+                number = (uint64_t) va_arg(ap, unsigned int);
                 break;
             case PrintfQualifierInt:
                 size = sizeof(unsigned int);
-                number = (uint64_t)va_arg(ap, unsigned int);
+                number = (uint64_t) va_arg(ap, unsigned int);
                 break;
             case PrintfQualifierLong:
                 size = sizeof(unsigned long);
-                number = (uint64_t)va_arg(ap, unsigned long);
+                number = (uint64_t) va_arg(ap, unsigned long);
                 break;
             case PrintfQualifierLongLong:
                 size = sizeof(unsigned long long);
-                number = (uint64_t)va_arg(ap,
-                    unsigned long long);
+                number = (uint64_t) va_arg(ap, unsigned long long);
                 break;
             case PrintfQualifierPointer:
                 size = sizeof(void *);
-                number = (uint64_t)(unsigned long)va_arg(ap,
-                    void *);
+                number = (uint64_t) (unsigned long) va_arg(ap, void *);
                 break;
-            case PrintfQualifierSizeT:
-                size = sizeof(size_t);
-                number = (uint64_t)va_arg(ap, size_t);
-                break;
-            default: /* Unknown qualifier */
-                goto minus_out;
+            default:
+                /* Unknown qualifier */
+                counter = -counter;
+                goto out;
             }
             if (flags & __PRINTF_FLAG_SIGNED) {
                 if (number & (0x1 << (size * 8 - 1))) {
                     flags |= __PRINTF_FLAG_NEGATIVE;
                     if (size == sizeof(uint64_t)) {
-                        number = -((int64_t)number);
+                        number = -((int64_t) number);
                     } else {
                         number = ~number;
                         number &=
 ,31 → 863,31
                     }
                 }
             }
             if ((retval = print_number(number, width, precision,
-                base, flags, ps)) < 0 ) {
-                goto minus_out;
+                base, flags, ps)) < 0) {
+                counter = -counter;
+                goto out;
             }
             counter += retval;
-            j = i + 1;
-        }
+            j = nxt;
+        }
 next_char:
-        ++i;
+        ;
     }
     if (i > j) {
-        retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps);
-        if (retval < 0) { /* error */
-            goto minus_out;
+        if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) {
+            /* Error */
+            counter = -counter;
+            goto out;
         }
         counter += retval;
     }
-    return counter;
-minus_out:
-    return -counter;
+out:
+    return ((int) counter);
 }
 /** @}

 /branches/tracing/uspace/lib/libc/generic/io/stream.c
 ,79 → 42,45
 #include <ipc/ns.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
+#include <ipc/console.h>
 #include <console.h>
+#include <kbd/kbd.h>
 #include <unistd.h>
 #include <async.h>
 #include <sys/types.h>
-static int console_phone = -1;
-ssize_t write_stderr(const void *buf, size_t count)
-{
-    return count;
-}
 ssize_t read_stdin(void *buf, size_t count)
 {
-    open_console();
-    if (console_phone >= 0) {
-        ipcarg_t r0, r1;
+    int cons_phone = console_open(false);
+    if (cons_phone >= 0) {
+        kbd_event_t ev;
+        int rc;
         size_t i = 0;
         while (i < count) {
-            if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0)
-                return -1;
-            ((char *) buf)[i++] = r0;
+            do {
+                rc = kbd_get_event(&ev);
+                if (rc < 0) return -1;
+            } while (ev.c == 0 || ev.type == KE_RELEASE);
+            ((char *) buf)[i++] = ev.c;
         }
         return i;
-    } else {
+    } else
         return -1;
-    }
 }
-ssize_t write_stdout(const void *buf, size_t count)
+/** Write a string to klog. */
+int klog_puts(const char *str)
 {
-    open_console();
-    if (console_phone >= 0) {
-        int i;
-        for (i = 0; i < count; i++)
-            async_msg_1(console_phone, CONSOLE_PUTCHAR,
-                ((const char *) buf)[i]);
-        return count;
-    } else
-        return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count);
+    return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) str, str_size(str));
 }
-void open_console(void)
-{
-    if (console_phone < 0) {
-        int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0);
-        if (phone >= 0)
-            console_phone = phone;
-    }
-}
-void close_console(void)
-{
-    if (console_phone >= 0) {
-        if (ipc_hangup(console_phone) == 0) {
-            console_phone = -1;
-        }
-    }
-}
 void klog_update(void)
 {
     (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
 }
-int get_cons_phone(void)
-{
-    open_console();
-    return console_phone;
-}
 /** @}
  */

 /branches/tracing/uspace/lib/libc/generic/sysinfo.c
 ,7 → 38,8
 sysarg_t sysinfo_value(char *name)
 {
-    return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name, (sysarg_t) strlen(name));
+    return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name,
+        (sysarg_t) str_size(name));
 }
 /** @}

 /branches/tracing/uspace/lib/libc/Makefile
 ,11 → 29,8
 ## Common compiler flags
 #
-include ../../Makefile.config
 LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
-CONSOLE_PREFIX = ../../srv/console
 ## Setup toolchain
 #
 ,17 → 37,18
 include $(LIBC_PREFIX)/Makefile.toolchain
-CFLAGS += -I$(CONSOLE_PREFIX)
 ## Sources
 #
 GENERIC_SOURCES = \
     generic/libc.c \
     generic/ddi.c \
     generic/as.c \
     generic/cap.c \
+    generic/console.c \
+    generic/event.c \
+    generic/mem.c \
     generic/string.c \
     generic/fibril.c \
     generic/pcb.c \
 ,6 → 60,8
     generic/io/asprintf.c \
     generic/io/io.c \
     generic/io/printf.c \
+    generic/io/fprintf.c \
+    generic/io/stdio.c \
     generic/io/stream.c \
     generic/io/sprintf.c \
     generic/io/snprintf.c \
 ,6 → 80,7
     generic/time.c \
     generic/err.c \
     generic/stdlib.c \
+    generic/kbd.c \
     generic/mman.c \
     generic/udebug.c \
     generic/vfs/vfs.c \
 ,34 → 87,35
     generic/vfs/canonify.c
 ARCH_SOURCES += \
-    arch/$(ARCH)/src/entry.s \
-    arch/$(ARCH)/src/thread_entry.s
+    arch/$(UARCH)/src/entry.s \
+    arch/$(UARCH)/src/thread_entry.s
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
+OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
 .PHONY: all clean depend kerninc
-all: kerninc libc.a arch/$(ARCH)/_link.ld
+all: kerninc libc.a arch/$(UARCH)/_link.ld
 kerninc:
     ln -sfn ../../../../kernel/generic/include include/kernel
     ln -sfn kernel/arch include/arch
-    ln -sfn ../arch/$(ARCH)/include include/libarch
+    ln -sfn ../arch/$(UARCH)/include include/libarch
 -include Makefile.depend
 clean:
-    -rm -f include/kernel include/arch include/libarch libc.a arch/$(ARCH)/_link.ld Makefile.depend
-    find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
+    -rm -f include/kernel include/arch include/libarch libc.a arch/$(UARCH)/_link.ld Makefile.depend
+    find generic/ arch/$(UARCH)/ malloc -name '*.o' -follow -exec rm \{\} \;
 depend: kerninc
-    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 libc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
     $(AR) rc libc.a $(LIBS) $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

 /branches/tracing/uspace/lib/libc/arch/sparc64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 31,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .bss : {
         *(.sbss);
         *(COMMON);

 /branches/tracing/uspace/lib/libc/arch/sparc64/include/ddi.h
 ,0 → 1,92
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @file
+ * @ingroup libsparc64
+ */
+#ifndef LIBC_sparc64_DDI_H_
+#define LIBC_sparc64_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline memory_barrier(void)
+{
+    asm volatile ("membar #LoadLoad | #StoreStore\n" ::: "memory");
+}
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+    memory_barrier();
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+    memory_barrier();
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+    memory_barrier();
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    uint8_t rv;
+    rv = *port;
+    memory_barrier();
+    return rv;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    uint16_t rv;
+    rv = *port;
+    memory_barrier();
+    return rv;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    uint32_t rv;
+    rv = *port;
+    memory_barrier();
+    return rv;
+}
+#endif

 /branches/tracing/uspace/lib/libc/arch/sparc64/include/types.h
 ,6 → 47,11
 typedef unsigned int uint32_t;
 typedef unsigned long int uint64_t;
+typedef int64_t ssize_t;
+typedef uint64_t size_t;
+typedef uint64_t count_t;
+typedef uint64_t index_t;
 typedef uint64_t uintptr_t;
 #endif

 /branches/tracing/uspace/lib/libc/arch/sparc64/Makefile.inc
 ,15 → 29,11
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = sparc64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N

 /branches/tracing/uspace/lib/libc/arch/ia64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 32,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .bss : {
         *(.sbss);
         *(.scommon);

 /branches/tracing/uspace/lib/libc/arch/ia64/include/ddi.h
 ,5 → 1,5
 /*
- * Copyright (c) 2005 Jakub Jermar, Jakub Vana
+ * Copyright (c) 2005 Jakub Vana
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup ia64
+/** @addtogroup libcia64
  * @{
  */
 /** @file
 ,63 → 35,80
 #ifndef LIBC_ia64_DDI_H_
 #define LIBC_ia64_DDI_H_
+#include <sys/types.h>
 #include <libarch/types.h>
-typedef uint64_t ioport_t;
+#define IO_SPACE_BOUNDARY   (64 * 1024)
 uint64_t get_ia64_iospace_address(void);
 extern uint64_t ia64_iospace_address;
-#define IA64_IOSPACE_ADDRESS (ia64_iospace_address?ia64_iospace_address:(ia64_iospace_address=get_ia64_iospace_address()))
+#define IA64_IOSPACE_ADDRESS \
+    (ia64_iospace_address ? \
+        ia64_iospace_address : \
+        (ia64_iospace_address = get_ia64_iospace_address()))
-static inline void  outb(ioport_t port,uint8_t v)
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
-    *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
+    uintptr_t prt = (uintptr_t) port;
+    *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
     asm volatile ("mf\n" ::: "memory");
 }
-static inline void  outw(ioport_t port,uint16_t v)
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
-    *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
+    uintptr_t prt = (uintptr_t) port;
+    *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
     asm volatile ("mf\n" ::: "memory");
 }
-static inline void  outl(ioport_t port,uint32_t v)
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
-    *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
+    uintptr_t prt = (uintptr_t) port;
+    *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
     asm volatile ("mf\n" ::: "memory");
 }
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    uintptr_t prt = (uintptr_t) port;
-static inline uint8_t inb(ioport_t port)
-{
     asm volatile ("mf\n" ::: "memory");
-    return *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
+    return *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
-static inline uint16_t inw(ioport_t port)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
+    uintptr_t prt = (uintptr_t) port;
     asm volatile ("mf\n" ::: "memory");
-    return *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xffE) | ( (port >> 2) << 12 ))));
+    return *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
-static inline uint32_t inl(ioport_t port)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
+    uintptr_t prt = (uintptr_t) port;
     asm volatile ("mf\n" ::: "memory");
-    return *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
+    return *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
 #endif
 /** @}

 /branches/tracing/uspace/lib/libc/arch/ia64/include/types.h
 ,6 → 47,11
 typedef unsigned int uint32_t;
 typedef unsigned long int uint64_t;
+typedef int64_t ssize_t;
+typedef uint64_t size_t;
+typedef uint64_t count_t;
+typedef uint64_t index_t;
 typedef uint64_t uintptr_t;
 typedef unsigned char __r8;                     /* Reserve byte */

 /branches/tracing/uspace/lib/libc/arch/ia64/Makefile.inc
 ,10 → 29,6
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = ia64-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
 CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
 ,10 → 35,10
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c\
-        arch/$(ARCH)/src/ddi.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/ddi.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

 /branches/tracing/uspace/lib/libc/arch/ia64/src/entry.s
 ,7 → 38,7
 #
 __entry:
     alloc loc0 = ar.pfs, 0, 1, 2, 0
-    mov r1 = _gp
+    movl r1 = _gp
     # Pass PCB pointer as the first argument to __main
     mov out0 = r2

 /branches/tracing/uspace/lib/libc/arch/ia64/src/thread_entry.s
 ,7 → 36,7
 __thread_entry:
     alloc loc0 = ar.pfs, 0, 1, 1, 0
-    mov r1 = _gp
+    movl r1 = _gp
     #
     # r8 contains address of uarg structure.

 /branches/tracing/uspace/lib/libc/arch/arm32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 28,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .bss : {
         *(.sbss);
         *(.scommon);

 /branches/tracing/uspace/lib/libc/arch/arm32/include/ddi.h
 ,0 → 1,69
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @file
+ * @ingroup libcarm32
+ */
+#ifndef LIBC_arm32_DDI_H_
+#define LIBC_arm32_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    return *port;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    return *port;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    return *port;
+}
+#endif

 /branches/tracing/uspace/lib/libc/arch/arm32/include/types.h
 ,6 → 48,11
 typedef unsigned long int uint32_t;
 typedef unsigned long long int uint64_t;
+typedef int32_t ssize_t;
+typedef uint32_t size_t;
+typedef uint32_t count_t;
+typedef uint32_t index_t;
 typedef uint32_t uintptr_t;
 #endif

 /branches/tracing/uspace/lib/libc/arch/arm32/Makefile.inc
 ,20 → 30,16
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
-AFLAGS +=
+AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

 /branches/tracing/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,19 → 29,15
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
-TARGET = mips-sgi-irix5
+TARGET = mips-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
-CFLAGS += -mips3
+CFLAGS += -mips3
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+        arch/$(UARCH)/src/fibril.S \
+        arch/$(UARCH)/src/tls.c
 LFLAGS += -N
 BFD_ARCH = mips
-BFD_NAME = elf32-big
+BFD_NAME = elf32-tradbigmips

 /branches/tracing/uspace/lib/libc/arch/ppc32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 27,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .bss : {
         *(.sbss);
         *(COMMON);

 /branches/tracing/uspace/lib/libc/arch/ppc32/include/ddi.h
 ,0 → 1,69
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @file
+ * @ingroup libcppc32
+ */
+#ifndef LIBC_ppc32_DDI_H_
+#define LIBC_ppc32_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    return *port;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    return *port;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    return *port;
+}
+#endif

 /branches/tracing/uspace/lib/libc/arch/ppc32/include/types.h
 ,6 → 47,11
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
+typedef int32_t ssize_t;
+typedef uint32_t size_t;
+typedef uint32_t count_t;
+typedef uint32_t index_t;
 typedef uint32_t uintptr_t;
 #endif

 /branches/tracing/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,16 → 29,12
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32

 /branches/tracing/uspace/lib/libc/arch/amd64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 26,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .bss : {
         *(COMMON);
         *(.bss);

 /branches/tracing/uspace/lib/libc/arch/amd64/include/types.h
 ,6 → 47,11
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
+typedef int64_t ssize_t;
+typedef uint64_t size_t;
+typedef uint64_t count_t;
+typedef uint64_t index_t;
 typedef uint64_t uintptr_t;
 #endif

 /branches/tracing/uspace/lib/libc/arch/amd64/Makefile.inc
 ,16 → 29,12
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 LFLAGS += -N

 /branches/tracing/uspace/lib/libc/arch/mips32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 33,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .sbss : {
         *(.scommon);

 /branches/tracing/uspace/lib/libc/arch/mips32/include/atomic.h
 ,13 → 59,14
     asm volatile (
         "1:\n"
         "   ll %0, %1\n"
-        "   addiu %0, %0, %3\n" /* same as addi, but never traps on overflow */
+        "   addu %0, %0, %3\n"  /* same as add, but never traps on overflow */
         "       move %2, %0\n"
         "   sc %0, %1\n"
         "   beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
         /*  nop */      /* nop is inserted automatically by compiler */
+        "   nop\n"
         : "=&r" (tmp), "+m" (val->count), "=&r" (v)
-        : "i" (i), "i" (0)
+        : "r" (i), "i" (0)
         );
     return v;

 /branches/tracing/uspace/lib/libc/arch/mips32/include/ddi.h
 ,0 → 1,69
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @file
+ * @ingroup libcmips32
+ */
+#ifndef LIBC_mips32_DDI_H_
+#define LIBC_mips32_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    return *port;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    return *port;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    return *port;
+}
+#endif

 /branches/tracing/uspace/lib/libc/arch/mips32/include/types.h
 ,6 → 48,11
 typedef unsigned long int uint32_t;
 typedef unsigned long long int uint64_t;
+typedef int32_t ssize_t;
+typedef uint32_t size_t;
+typedef uint32_t count_t;
+typedef uint32_t index_t;
 typedef uint32_t uintptr_t;
 #endif

 /branches/tracing/uspace/lib/libc/arch/mips32/Makefile.inc
 ,23 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
--include ../../Makefile.config
-ifeq ($(CONFIG_MIPS_FPU),y)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-    arch/$(ARCH)/src/fibril.S \
-    arch/$(ARCH)/src/tls.c
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips

 /branches/tracing/uspace/lib/libc/arch/ia32/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,13 → 26,11
         _tdata_start = .;
         *(.tdata);
         _tdata_end = .;
-    } :data
-    .tbss : {
         _tbss_start = .;
         *(.tbss);
         _tbss_end = .;
     } :data
-    _tls_alignment = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss));
+    _tls_alignment = ALIGNOF(.tdata);
     .bss : {
                 *(COMMON);
                 *(.bss);

 /branches/tracing/uspace/lib/libc/arch/ia32/include/ddi.h
 ,43 → 33,72
 #ifndef LIBC_ia32_DDI_H_
 #define LIBC_ia32_DDI_H_
-static inline void outb(int16_t port, uint8_t b)
+#include <sys/types.h>
+#include <libarch/types.h>
+#define IO_SPACE_BOUNDARY   ((void *) (64 * 1024))
+static inline uint8_t pio_read_8(ioport8_t *port)
 {
-    asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port));
+    uint8_t val;
+    asm volatile (
+        "inb %w[port], %b[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
+    return val;
 }
-static inline void outw(int16_t port, int16_t w)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
-    asm volatile ("outw %0, %1\n" :: "a" (w), "d" (port));
+    uint16_t val;
+    asm volatile (
+        "inw %w[port], %w[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
+    return val;
 }
-static inline void outl(int16_t port, uint32_t l)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
-    asm volatile ("outl %0, %1\n" :: "a" (l), "d" (port));
+    uint32_t val;
+    asm volatile (
+        "inl %w[port], %[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
+    return val;
 }
-static inline uint8_t inb(int16_t port)
+static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-    uint8_t val;
-    asm volatile ("inb %1, %0 \n" : "=a" (val) : "d"(port));
-    return val;
+    asm volatile (
+        "outb %b[val], %w[port]\n"
+        :: [val] "a" (val), [port] "d" (port)
+    );
 }
-static inline int16_t inw(int16_t port)
+static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-    int16_t val;
-    asm volatile ("inw %1, %0 \n" : "=a" (val) : "d"(port));
-    return val;
+    asm volatile (
+        "outw %w[val], %w[port]\n"
+        :: [val] "a" (val), [port] "d" (port)
+    );
 }
-static inline uint32_t inl(int16_t port)
+static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-    uint32_t val;
-    asm volatile ("inl %1, %0 \n" : "=a" (val) : "d"(port));
-    return val;
+    asm volatile (
+        "outl %[val], %w[port]\n"
+        :: [val] "a" (val), [port] "d" (port)
+    );
 }
 #endif

 /branches/tracing/uspace/lib/libc/arch/ia32/include/types.h
 ,6 → 47,11
 typedef unsigned int uint32_t;
 typedef unsigned long long int uint64_t;
+typedef int32_t ssize_t;
+typedef uint32_t size_t;
+typedef uint32_t count_t;
+typedef uint32_t index_t;
 typedef uint32_t uintptr_t;
 #endif

 /branches/tracing/uspace/lib/libc/arch/ia32/Makefile.inc
 ,17 → 29,13
 ## Toolchain configuration
 #
-ifndef CROSS_PREFIX
-    CROSS_PREFIX = /usr/local
-endif
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/setjmp.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/setjmp.S
 LFLAGS += -N

/branches/tracing/uspace/srv/kbd/arch/mips32eb
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/tracing/uspace/srv/kbd/arch/amd64
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

 /branches/tracing/uspace/srv/kbd/ctl/pc.c
 ,0 → 1,231
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   PC keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+#include <gsp.h>
+enum dec_state {
+    ds_s,
+    ds_e
+};
+static enum dec_state ds;
+static int scanmap_simple[] = {
+    [0x29] = KC_BACKTICK,
+    [0x02] = KC_1,
+    [0x03] = KC_2,
+    [0x04] = KC_3,
+    [0x05] = KC_4,
+    [0x06] = KC_5,
+    [0x07] = KC_6,
+    [0x08] = KC_7,
+    [0x09] = KC_8,
+    [0x0a] = KC_9,
+    [0x0b] = KC_0,
+    [0x0c] = KC_MINUS,
+    [0x0d] = KC_EQUALS,
+    [0x0e] = KC_BACKSPACE,
+    [0x0f] = KC_TAB,
+    [0x10] = KC_Q,
+    [0x11] = KC_W,
+    [0x12] = KC_E,
+    [0x13] = KC_R,
+    [0x14] = KC_T,
+    [0x15] = KC_Y,
+    [0x16] = KC_U,
+    [0x17] = KC_I,
+    [0x18] = KC_O,
+    [0x19] = KC_P,
+    [0x1a] = KC_LBRACKET,
+    [0x1b] = KC_RBRACKET,
+    [0x3a] = KC_CAPS_LOCK,
+    [0x1e] = KC_A,
+    [0x1f] = KC_S,
+    [0x20] = KC_D,
+    [0x21] = KC_F,
+    [0x22] = KC_G,
+    [0x23] = KC_H,
+    [0x24] = KC_J,
+    [0x25] = KC_K,
+    [0x26] = KC_L,
+    [0x27] = KC_SEMICOLON,
+    [0x28] = KC_QUOTE,
+    [0x2b] = KC_BACKSLASH,
+    [0x2a] = KC_LSHIFT,
+    [0x2c] = KC_Z,
+    [0x2d] = KC_X,
+    [0x2e] = KC_C,
+    [0x2f] = KC_V,
+    [0x30] = KC_B,
+    [0x31] = KC_N,
+    [0x32] = KC_M,
+    [0x33] = KC_COMMA,
+    [0x34] = KC_PERIOD,
+    [0x35] = KC_SLASH,
+    [0x36] = KC_RSHIFT,
+    [0x1d] = KC_LCTRL,
+    [0x38] = KC_LALT,
+    [0x39] = KC_SPACE,
+    [0x01] = KC_ESCAPE,
+    [0x3b] = KC_F1,
+    [0x3c] = KC_F2,
+    [0x3d] = KC_F3,
+    [0x3e] = KC_F4,
+    [0x3f] = KC_F5,
+    [0x40] = KC_F6,
+    [0x41] = KC_F7,
+    [0x42] = KC_F8,
+    [0x43] = KC_F9,
+    [0x44] = KC_F10,
+    [0x57] = KC_F11,
+    [0x58] = KC_F12,
+    [0x46] = KC_SCROLL_LOCK,
+    [0x1c] = KC_ENTER,
+    [0x45] = KC_NUM_LOCK,
+    [0x37] = KC_NTIMES,
+    [0x4a] = KC_NMINUS,
+    [0x4e] = KC_NPLUS,
+    [0x47] = KC_N7,
+    [0x48] = KC_N8,
+    [0x49] = KC_N9,
+    [0x4b] = KC_N4,
+    [0x4c] = KC_N5,
+    [0x4d] = KC_N6,
+    [0x4f] = KC_N1,
+    [0x50] = KC_N2,
+    [0x51] = KC_N3,
+    [0x52] = KC_N0,
+    [0x53] = KC_NPERIOD
+};
+static int scanmap_e0[] = {
+    [0x38] = KC_RALT,
+    [0x1d] = KC_RSHIFT,
+    [0x37] = KC_PRTSCR,
+    [0x52] = KC_INSERT,
+    [0x47] = KC_HOME,
+    [0x49] = KC_PAGE_UP,
+    [0x53] = KC_DELETE,
+    [0x4f] = KC_END,
+    [0x51] = KC_PAGE_DOWN,
+    [0x48] = KC_UP,
+    [0x4b] = KC_LEFT,
+    [0x50] = KC_DOWN,
+    [0x4d] = KC_RIGHT,
+    [0x35] = KC_NSLASH,
+    [0x1c] = KC_NENTER
+};
+int kbd_ctl_init(void)
+{
+    ds = ds_s;
+    return 0;
+}
+void kbd_ctl_parse_scancode(int scancode)
+{
+    kbd_ev_type_t type;
+    unsigned int key;
+    int *map;
+    size_t map_length;
+    if (scancode == 0xe0) {
+        ds = ds_e;
+        return;
+    }
+    switch (ds) {
+    case ds_s:
+        map = scanmap_simple;
+        map_length = sizeof(scanmap_simple) / sizeof(int);
+        break;
+    case ds_e:
+        map = scanmap_e0;
+        map_length = sizeof(scanmap_e0) / sizeof(int);
+        break;
+    }
+    ds = ds_s;
+    if (scancode & 0x80) {
+        scancode &= ~0x80;
+        type = KE_RELEASE;
+    } else {
+        type = KE_PRESS;
+    }
+    if (scancode < 0 || scancode >= map_length)
+        return;
+    key = map[scancode];
+    if (key != 0)
+        kbd_push_ev(type, key);
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/ctl/stty.c
 ,0 → 1,229
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   Serial TTY-like keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+#include <gsp.h>
+#include <stroke.h>
+/** Scancode parser */
+static gsp_t sp;
+/** Current parser state */
+static int ds;
+#include <stdio.h>
+int seq_defs[] = {
+    /* Not shifted */
+,  KC_BACKTICK,    0x60, GSP_END,
+,  KC_1,       0x31, GSP_END,
+,  KC_2,       0x32, GSP_END,
+,  KC_3,       0x33, GSP_END,
+,  KC_4,       0x34, GSP_END,
+,  KC_5,       0x35, GSP_END,
+,  KC_6,       0x36, GSP_END,
+,  KC_7,       0x37, GSP_END,
+,  KC_8,       0x38, GSP_END,
+,  KC_9,       0x39, GSP_END,
+,  KC_0,       0x30, GSP_END,
+,  KC_MINUS,   0x2d, GSP_END,
+,  KC_EQUALS,  0x3d, GSP_END,
+,  KC_BACKSPACE,   0x08, GSP_END,
+,  KC_TAB,     0x09, GSP_END,
+,  KC_Q,       0x71, GSP_END,
+,  KC_W,       0x77, GSP_END,
+,  KC_E,       0x65, GSP_END,
+,  KC_R,       0x72, GSP_END,
+,  KC_T,       0x74, GSP_END,
+,  KC_Y,       0x79, GSP_END,
+,  KC_U,       0x75, GSP_END,
+,  KC_I,       0x69, GSP_END,
+,  KC_O,       0x6f, GSP_END,
+,  KC_P,       0x70, GSP_END,
+,  KC_LBRACKET,    0x5b, GSP_END,
+,  KC_RBRACKET,    0x5d, GSP_END,
+,  KC_A,       0x61, GSP_END,
+,  KC_S,       0x73, GSP_END,
+,  KC_D,       0x64, GSP_END,
+,  KC_F,       0x66, GSP_END,
+,  KC_G,       0x67, GSP_END,
+,  KC_H,       0x68, GSP_END,
+,  KC_J,       0x6a, GSP_END,
+,  KC_K,       0x6b, GSP_END,
+,  KC_L,       0x6c, GSP_END,
+,  KC_SEMICOLON,   0x3b, GSP_END,
+,  KC_QUOTE,   0x27, GSP_END,
+,  KC_BACKSLASH,   0x5c, GSP_END,
+,  KC_Z,       0x7a, GSP_END,
+,  KC_X,       0x78, GSP_END,
+,  KC_C,       0x63, GSP_END,
+,  KC_V,       0x76, GSP_END,
+,  KC_B,       0x62, GSP_END,
+,  KC_N,       0x6e, GSP_END,
+,  KC_M,       0x6d, GSP_END,
+,  KC_COMMA,   0x2c, GSP_END,
+,  KC_PERIOD,  0x2e, GSP_END,
+,  KC_SLASH,   0x2f, GSP_END,
+    /* Shifted */
+    KM_SHIFT,   KC_BACKTICK,    0x7e, GSP_END,
+    KM_SHIFT,   KC_1,       0x21, GSP_END,
+    KM_SHIFT,   KC_2,       0x40, GSP_END,
+    KM_SHIFT,   KC_3,       0x23, GSP_END,
+    KM_SHIFT,   KC_4,       0x24, GSP_END,
+    KM_SHIFT,   KC_5,       0x25, GSP_END,
+    KM_SHIFT,   KC_6,       0x5e, GSP_END,
+    KM_SHIFT,   KC_7,       0x26, GSP_END,
+    KM_SHIFT,   KC_8,       0x2a, GSP_END,
+    KM_SHIFT,   KC_9,       0x28, GSP_END,
+    KM_SHIFT,   KC_0,       0x29, GSP_END,
+    KM_SHIFT,   KC_MINUS,   0x5f, GSP_END,
+    KM_SHIFT,   KC_EQUALS,  0x2b, GSP_END,
+    KM_SHIFT,   KC_Q,       0x51, GSP_END,
+    KM_SHIFT,   KC_W,       0x57, GSP_END,
+    KM_SHIFT,   KC_E,       0x45, GSP_END,
+    KM_SHIFT,   KC_R,       0x52, GSP_END,
+    KM_SHIFT,   KC_T,       0x54, GSP_END,
+    KM_SHIFT,   KC_Y,       0x59, GSP_END,
+    KM_SHIFT,   KC_U,       0x55, GSP_END,
+    KM_SHIFT,   KC_I,       0x49, GSP_END,
+    KM_SHIFT,   KC_O,       0x4f, GSP_END,
+    KM_SHIFT,   KC_P,       0x50, GSP_END,
+    KM_SHIFT,   KC_LBRACKET,    0x7b, GSP_END,
+    KM_SHIFT,   KC_RBRACKET,    0x7d, GSP_END,
+    KM_SHIFT,   KC_A,       0x41, GSP_END,
+    KM_SHIFT,   KC_S,       0x53, GSP_END,
+    KM_SHIFT,   KC_D,       0x44, GSP_END,
+    KM_SHIFT,   KC_F,       0x46, GSP_END,
+    KM_SHIFT,   KC_G,       0x47, GSP_END,
+    KM_SHIFT,   KC_H,       0x48, GSP_END,
+    KM_SHIFT,   KC_J,       0x4a, GSP_END,
+    KM_SHIFT,   KC_K,       0x4b, GSP_END,
+    KM_SHIFT,   KC_L,       0x4c, GSP_END,
+    KM_SHIFT,   KC_SEMICOLON,   0x3a, GSP_END,
+    KM_SHIFT,   KC_QUOTE,   0x22, GSP_END,
+    KM_SHIFT,   KC_BACKSLASH,   0x7c, GSP_END,
+    KM_SHIFT,   KC_Z,       0x5a, GSP_END,
+    KM_SHIFT,   KC_X,       0x58, GSP_END,
+    KM_SHIFT,   KC_C,       0x43, GSP_END,
+    KM_SHIFT,   KC_V,       0x56, GSP_END,
+    KM_SHIFT,   KC_B,       0x42, GSP_END,
+    KM_SHIFT,   KC_N,       0x4e, GSP_END,
+    KM_SHIFT,   KC_M,       0x4d, GSP_END,
+    KM_SHIFT,   KC_COMMA,   0x3c, GSP_END,
+    KM_SHIFT,   KC_PERIOD,  0x3e, GSP_END,
+    KM_SHIFT,   KC_SLASH,   0x3f, GSP_END,
+    /* ... */
+,  KC_SPACE,   0x20, GSP_END,
+,  KC_ENTER,   0x0a, GSP_END,
+,  KC_ENTER,   0x0d, GSP_END,
+,  KC_ESCAPE,  0x1b, 0x1b, GSP_END,
+,  KC_F1,      0x1b, 0x4f, 0x50, GSP_END,
+,  KC_F2,      0x1b, 0x4f, 0x51, GSP_END,
+,  KC_F3,      0x1b, 0x4f, 0x52, GSP_END,
+,  KC_F4,      0x1b, 0x4f, 0x53, GSP_END,
+,  KC_F5,      0x1b, 0x5b, 0x31, 0x35, 0x7e, GSP_END,
+,  KC_F6,      0x1b, 0x5b, 0x31, 0x37, 0x7e, GSP_END,
+,  KC_F7,      0x1b, 0x5b, 0x31, 0x38, 0x7e, GSP_END,
+,  KC_F8,      0x1b, 0x5b, 0x31, 0x39, 0x7e, GSP_END,
+,  KC_F9,      0x1b, 0x5b, 0x32, 0x30, 0x7e, GSP_END,
+,  KC_F10,     0x1b, 0x5b, 0x32, 0x31, 0x7e, GSP_END,
+,  KC_F11,     0x1b, 0x5b, 0x32, 0x33, 0x7e, GSP_END,
+,  KC_F12,     0x1b, 0x5b, 0x32, 0x34, 0x7e, GSP_END,
+,  KC_INSERT,  0x1b, 0x5b, 0x32, 0x7e, GSP_END,
+,  KC_HOME,    0x1b, 0x5b, 0x48, GSP_END,
+,  KC_PAGE_UP, 0x1b, 0x5b, 0x35, 0x7e, GSP_END,
+,  KC_DELETE,  0x1b, 0x5b, 0x33, 0x7e, GSP_END,
+,  KC_END,     0x1b, 0x5b, 0x46, GSP_END,
+,  KC_PAGE_DOWN,   0x1b, 0x5b, 0x36, 0x7e, GSP_END,
+,  KC_UP,      0x1b, 0x5b, 0x41, GSP_END,
+,  KC_LEFT,    0x1b, 0x5b, 0x44, GSP_END,
+,  KC_DOWN,    0x1b, 0x5b, 0x42, GSP_END,
+,  KC_RIGHT,   0x1b, 0x5b, 0x43, GSP_END,
+,  0
+};
+int kbd_ctl_init(void)
+{
+    ds = 0;
+    gsp_init(&sp);
+    return gsp_insert_defs(&sp, seq_defs);
+}
+void kbd_ctl_parse_scancode(int scancode)
+{
+    unsigned mods, key;
+    ds = gsp_step(&sp, ds, scancode, &mods, &key);
+    if (key != 0) {
+        stroke_sim(mods, key);
+    }
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/ctl/sun.c
 ,0 → 1,209
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   Sun keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+#define KBD_KEY_RELEASE     0x80
+#define KBD_ALL_KEYS_UP     0x7f
+static int scanmap_simple[];
+int kbd_ctl_init(void)
+{
+    return 0;
+}
+void kbd_ctl_parse_scancode(int scancode)
+{
+    kbd_ev_type_t type;
+    unsigned int key;
+    if (scancode < 0 || scancode >= 0x100)
+        return;
+    if (scancode == KBD_ALL_KEYS_UP)
+        return;
+    if (scancode & KBD_KEY_RELEASE) {
+        scancode &= ~KBD_KEY_RELEASE;
+        type = KE_RELEASE;
+    } else {
+        type = KE_PRESS;
+    }
+    key = scanmap_simple[scancode];
+    if (key != 0)
+        kbd_push_ev(type, key);
+}
+/** Primary meaning of scancodes. */
+static int scanmap_simple[] = {
+    [0x00] = 0,
+    [0x01] = 0,
+    [0x02] = 0,
+    [0x03] = 0,
+    [0x04] = 0,
+    [0x05] = KC_F1,
+    [0x06] = KC_F2,
+    [0x07] = KC_F10,
+    [0x08] = KC_F3,
+    [0x09] = KC_F11,
+    [0x0a] = KC_F4,
+    [0x0b] = KC_F12,
+    [0x0c] = KC_F5,
+    [0x0d] = KC_RALT,
+    [0x0e] = KC_F6,
+    [0x0f] = 0,
+    [0x10] = KC_F7,
+    [0x11] = KC_F8,
+    [0x12] = KC_F9,
+    [0x13] = KC_LALT,
+    [0x14] = KC_UP,
+    [0x15] = KC_PAUSE,
+    [0x16] = 0,
+    [0x17] = KC_SCROLL_LOCK,
+    [0x18] = KC_LEFT,
+    [0x19] = 0,
+    [0x1a] = 0,
+    [0x1b] = KC_DOWN,
+    [0x1c] = KC_RIGHT,
+    [0x1d] = KC_ESCAPE,
+    [0x1e] = KC_1,
+    [0x1f] = KC_2,
+    [0x20] = KC_3,
+    [0x21] = KC_4,
+    [0x22] = KC_5,
+    [0x23] = KC_6,
+    [0x24] = KC_7,
+    [0x25] = KC_8,
+    [0x26] = KC_9,
+    [0x27] = KC_0,
+    [0x28] = KC_MINUS,
+    [0x29] = KC_EQUALS,
+    [0x2a] = KC_BACKTICK,
+    [0x2b] = KC_BACKSPACE,
+    [0x2c] = KC_INSERT,
+    [0x2d] = 0,
+    [0x2e] = KC_NSLASH,
+    [0x2f] = KC_NTIMES,
+    [0x30] = 0,
+    [0x31] = 0,
+    [0x32] = KC_NPERIOD,
+    [0x33] = 0,
+    [0x34] = KC_HOME,
+    [0x35] = KC_TAB,
+    [0x36] = KC_Q,
+    [0x37] = KC_W,
+    [0x38] = KC_E,
+    [0x39] = KC_R,
+    [0x3a] = KC_T,
+    [0x3b] = KC_Y,
+    [0x3c] = KC_U,
+    [0x3d] = KC_I,
+    [0x3e] = KC_O,
+    [0x3f] = KC_P,
+    [0x40] = KC_LBRACKET,
+    [0x41] = KC_RBRACKET,
+    [0x42] = KC_DELETE,
+    [0x43] = 0,
+    [0x44] = KC_N7,
+    [0x45] = KC_N8,
+    [0x46] = KC_N9,
+    [0x47] = KC_NMINUS,
+    [0x48] = 0,
+    [0x49] = 0,
+    [0x4a] = KC_END,
+    [0x4b] = 0,
+    [0x4c] = KC_LCTRL,
+    [0x4d] = KC_A,
+    [0x4e] = KC_S,
+    [0x4f] = KC_D,
+    [0x50] = KC_F,
+    [0x51] = KC_G,
+    [0x52] = KC_H,
+    [0x53] = KC_J,
+    [0x54] = KC_K,
+    [0x55] = KC_L,
+    [0x56] = KC_SEMICOLON,
+    [0x57] = KC_QUOTE,
+    [0x58] = KC_BACKSLASH,
+    [0x59] = KC_ENTER,
+    [0x5a] = KC_NENTER,
+    [0x5b] = KC_N4,
+    [0x5c] = KC_N5,
+    [0x5d] = KC_N6,
+    [0x5e] = KC_N0,
+    [0x5f] = 0,
+    [0x60] = KC_PAGE_UP,
+    [0x61] = 0,
+    [0x62] = KC_NUM_LOCK,
+    [0x63] = KC_LSHIFT,
+    [0x64] = KC_Z,
+    [0x65] = KC_X,
+    [0x66] = KC_C,
+    [0x67] = KC_V,
+    [0x68] = KC_B,
+    [0x69] = KC_N,
+    [0x6a] = KC_M,
+    [0x6b] = KC_COMMA,
+    [0x6c] = KC_PERIOD,
+    [0x6d] = KC_SLASH,
+    [0x6e] = KC_RSHIFT,
+    [0x6f] = 0,
+    [0x70] = KC_N1,
+    [0x71] = KC_N2,
+    [0x72] = KC_N3,
+    [0x73] = 0,
+    [0x74] = 0,
+    [0x75] = 0,
+    [0x76] = 0,
+    [0x77] = KC_CAPS_LOCK,
+    [0x78] = 0,
+    [0x79] = KC_SPACE,
+    [0x7a] = 0,
+    [0x7b] = KC_PAGE_DOWN,
+    [0x7c] = 0,
+    [0x7d] = KC_NPLUS,
+    [0x7e] = 0,
+    [0x7f] = 0
+};
+/** @}
+ */

 /branches/tracing/uspace/srv/kbd/ctl/gxe_fb.c
 ,0 → 1,229
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   GXEmul framebuffer-mode keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+#include <gsp.h>
+#include <stroke.h>
+/** Scancode parser */
+static gsp_t sp;
+/** Current parser state */
+static int ds;
+#include <stdio.h>
+int seq_defs[] = {
+    /* Not shifted */
+,  KC_BACKTICK,    0x60, GSP_END,
+,  KC_1,       0x31, GSP_END,
+,  KC_2,       0x32, GSP_END,
+,  KC_3,       0x33, GSP_END,
+,  KC_4,       0x34, GSP_END,
+,  KC_5,       0x35, GSP_END,
+,  KC_6,       0x36, GSP_END,
+,  KC_7,       0x37, GSP_END,
+,  KC_8,       0x38, GSP_END,
+,  KC_9,       0x39, GSP_END,
+,  KC_0,       0x30, GSP_END,
+,  KC_MINUS,   0x2d, GSP_END,
+,  KC_EQUALS,  0x3d, GSP_END,
+,  KC_BACKSPACE,   0x08, GSP_END,
+,  KC_TAB,     0x09, GSP_END,
+,  KC_Q,       0x71, GSP_END,
+,  KC_W,       0x77, GSP_END,
+,  KC_E,       0x65, GSP_END,
+,  KC_R,       0x72, GSP_END,
+,  KC_T,       0x74, GSP_END,
+,  KC_Y,       0x79, GSP_END,
+,  KC_U,       0x75, GSP_END,
+,  KC_I,       0x69, GSP_END,
+,  KC_O,       0x6f, GSP_END,
+,  KC_P,       0x70, GSP_END,
+,  KC_LBRACKET,    0x5b, GSP_END,
+,  KC_RBRACKET,    0x5d, GSP_END,
+,  KC_A,       0x61, GSP_END,
+,  KC_S,       0x73, GSP_END,
+,  KC_D,       0x64, GSP_END,
+,  KC_F,       0x66, GSP_END,
+,  KC_G,       0x67, GSP_END,
+,  KC_H,       0x68, GSP_END,
+,  KC_J,       0x6a, GSP_END,
+,  KC_K,       0x6b, GSP_END,
+,  KC_L,       0x6c, GSP_END,
+,  KC_SEMICOLON,   0x3b, GSP_END,
+,  KC_QUOTE,   0x27, GSP_END,
+,  KC_BACKSLASH,   0x5c, GSP_END,
+,  KC_Z,       0x7a, GSP_END,
+,  KC_X,       0x78, GSP_END,
+,  KC_C,       0x63, GSP_END,
+,  KC_V,       0x76, GSP_END,
+,  KC_B,       0x62, GSP_END,
+,  KC_N,       0x6e, GSP_END,
+,  KC_M,       0x6d, GSP_END,
+,  KC_COMMA,   0x2c, GSP_END,
+,  KC_PERIOD,  0x2e, GSP_END,
+,  KC_SLASH,   0x2f, GSP_END,
+    /* Shifted */
+    KM_SHIFT,   KC_BACKTICK,    0x7e, GSP_END,
+    KM_SHIFT,   KC_1,       0x21, GSP_END,
+    KM_SHIFT,   KC_2,       0x40, GSP_END,
+    KM_SHIFT,   KC_3,       0x23, GSP_END,
+    KM_SHIFT,   KC_4,       0x24, GSP_END,
+    KM_SHIFT,   KC_5,       0x25, GSP_END,
+    KM_SHIFT,   KC_6,       0x5e, GSP_END,
+    KM_SHIFT,   KC_7,       0x26, GSP_END,
+    KM_SHIFT,   KC_8,       0x2a, GSP_END,
+    KM_SHIFT,   KC_9,       0x28, GSP_END,
+    KM_SHIFT,   KC_0,       0x29, GSP_END,
+    KM_SHIFT,   KC_MINUS,   0x5f, GSP_END,
+    KM_SHIFT,   KC_EQUALS,  0x2b, GSP_END,
+    KM_SHIFT,   KC_Q,       0x51, GSP_END,
+    KM_SHIFT,   KC_W,       0x57, GSP_END,
+    KM_SHIFT,   KC_E,       0x45, GSP_END,
+    KM_SHIFT,   KC_R,       0x52, GSP_END,
+    KM_SHIFT,   KC_T,       0x54, GSP_END,
+    KM_SHIFT,   KC_Y,       0x59, GSP_END,
+    KM_SHIFT,   KC_U,       0x55, GSP_END,
+    KM_SHIFT,   KC_I,       0x49, GSP_END,
+    KM_SHIFT,   KC_O,       0x4f, GSP_END,
+    KM_SHIFT,   KC_P,       0x50, GSP_END,
+    KM_SHIFT,   KC_LBRACKET,    0x7b, GSP_END,
+    KM_SHIFT,   KC_RBRACKET,    0x7d, GSP_END,
+    KM_SHIFT,   KC_A,       0x41, GSP_END,
+    KM_SHIFT,   KC_S,       0x53, GSP_END,
+    KM_SHIFT,   KC_D,       0x44, GSP_END,
+    KM_SHIFT,   KC_F,       0x46, GSP_END,
+    KM_SHIFT,   KC_G,       0x47, GSP_END,
+    KM_SHIFT,   KC_H,       0x48, GSP_END,
+    KM_SHIFT,   KC_J,       0x4a, GSP_END,
+    KM_SHIFT,   KC_K,       0x4b, GSP_END,
+    KM_SHIFT,   KC_L,       0x4c, GSP_END,
+    KM_SHIFT,   KC_SEMICOLON,   0x3a, GSP_END,
+    KM_SHIFT,   KC_QUOTE,   0x22, GSP_END,
+    KM_SHIFT,   KC_BACKSLASH,   0x7c, GSP_END,
+    KM_SHIFT,   KC_Z,       0x5a, GSP_END,
+    KM_SHIFT,   KC_X,       0x58, GSP_END,
+    KM_SHIFT,   KC_C,       0x43, GSP_END,
+    KM_SHIFT,   KC_V,       0x56, GSP_END,
+    KM_SHIFT,   KC_B,       0x42, GSP_END,
+    KM_SHIFT,   KC_N,       0x4e, GSP_END,
+    KM_SHIFT,   KC_M,       0x4d, GSP_END,
+    KM_SHIFT,   KC_COMMA,   0x3c, GSP_END,
+    KM_SHIFT,   KC_PERIOD,  0x3e, GSP_END,
+    KM_SHIFT,   KC_SLASH,   0x3f, GSP_END,
+    /* ... */
+,  KC_SPACE,   0x20, GSP_END,
+,  KC_ENTER,   0x0a, GSP_END,
+,  KC_ENTER,   0x0d, GSP_END,
+,  KC_ESCAPE,  0x1b, 0x1b, GSP_END,
+,  KC_F1,      0x1b, 0x5b, 0x4f, 0x50, GSP_END,
+,  KC_F2,      0x1b, 0x5b, 0x4f, 0x51, GSP_END,
+,  KC_F3,      0x1b, 0x5b, 0x4f, 0x52, GSP_END,
+,  KC_F4,      0x1b, 0x5b, 0x4f, 0x53, GSP_END,
+,  KC_F5,      0x1b, 0x5b, 0x31, 0x35, GSP_END,
+,  KC_F6,      0x1b, 0x5b, 0x31, 0x37, GSP_END,
+,  KC_F7,      0x1b, 0x5b, 0x31, 0x38, GSP_END,
+,  KC_F8,      0x1b, 0x5b, 0x31, 0x39, GSP_END,
+,  KC_F9,      0x1b, 0x5b, 0x32, 0x38, GSP_END,
+,  KC_F10,     0x1b, 0x5b, 0x32, 0x39, GSP_END,
+,  KC_F11,     0x1b, 0x5b, 0x32, 0x33, GSP_END,
+,  KC_F12,     0x1b, 0x5b, 0x32, 0x34, GSP_END,
+,  KC_INSERT,  0x1b, 0x5b, 0x32, 0x7e, GSP_END,
+,  KC_HOME,    0x1b, 0x5b, 0x48, GSP_END,
+,  KC_PAGE_UP, 0x1b, 0x5b, 0x35, 0x7e, GSP_END,
+,  KC_DELETE,  0x1b, 0x5b, 0x33, 0x7e, GSP_END,
+,  KC_END,     0x1b, 0x5b, 0x46, GSP_END,
+,  KC_PAGE_DOWN,   0x1b, 0x5b, 0x36, 0x7e, GSP_END,
+,  KC_UP,      0x1b, 0x5b, 0x41, GSP_END,
+,  KC_LEFT,    0x1b, 0x5b, 0x44, GSP_END,
+,  KC_DOWN,    0x1b, 0x5b, 0x42, GSP_END,
+,  KC_RIGHT,   0x1b, 0x5b, 0x43, GSP_END,
+,  0
+};
+int kbd_ctl_init(void)
+{
+    ds = 0;
+    gsp_init(&sp);
+    return gsp_insert_defs(&sp, seq_defs);
+}
+void kbd_ctl_parse_scancode(int scancode)
+{
+    unsigned mods, key;
+    ds = gsp_step(&sp, ds, scancode, &mods, &key);
+    if (key != 0) {
+        stroke_sim(mods, key);
+    }
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/include/gsp.h
 ,0 → 1,84
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen generic
+ * @brief   Generic scancode parser.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_GSP_H_
+#define KBD_GSP_H_
+#include <libadt/hash_table.h>
+enum {
+    GSP_END     = -1,   /**< Terminates a sequence. */
+    GSP_DEFAULT = -2    /**< Wildcard, catches unhandled cases. */
+};
+/** Scancode parser description */
+typedef struct {
+    /** Transition table, (state, input) -> (state, output) */
+    hash_table_t trans;
+    /** Number of states */
+    int states;
+} gsp_t;
+/** Scancode parser transition. */
+typedef struct {
+    link_t link;        /**< Link to hash table in @c gsp_t */
+    /* Preconditions */
+    int old_state;      /**< State before transition */
+    int input;      /**< Input symbol (scancode) */
+    /* Effects */
+    int new_state;      /**< State after transition */
+    /* Output emitted during transition */
+    unsigned out_mods;  /**< Modifier to emit */
+    unsigned out_key;   /**< Keycode to emit */
+} gsp_trans_t;
+extern void gsp_init(gsp_t *);
+extern int gsp_insert_defs(gsp_t *, const int *);
+extern int gsp_insert_seq(gsp_t *, const int *, unsigned, unsigned);
+extern int gsp_step(gsp_t *, int, int, unsigned *, unsigned *);
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/include/layout.h
 ,0 → 1,57
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen generic
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_LAYOUT_H_
+#define KBD_LAYOUT_H_
+#include <kbd/kbd.h>
+#include <sys/types.h>
+typedef struct {
+    void (*reset)(void);
+    wchar_t (*parse_ev)(kbd_event_t *);
+} layout_op_t;
+extern layout_op_t us_qwerty_op;
+extern layout_op_t us_dvorak_op;
+extern layout_op_t cz_op;
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/include/kbd.h
 ,11 → 38,25
 #define KBD_KBD_H_
 #include <key_buffer.h>
+#include <ipc/ipc.h>
-extern int kbd_arch_init(void);
-extern int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call);
-extern int mouse_arch_process(int phoneid, ipc_call_t *call);
+#define KBD_EVENT   1024
+#define KBD_MS_LEFT 1025
+#define KBD_MS_RIGHT    1026
+#define KBD_MS_MIDDLE   1027
+#define KBD_MS_MOVE 1028
+typedef enum {
+    KBD_YIELD   = IPC_FIRST_USER_METHOD,
+    KBD_RECLAIM
+} kbd_request_t;
+extern int cir_service;
+extern int cir_phone;
+extern void kbd_push_scancode(int);
+extern void kbd_push_ev(int, unsigned int);
 #endif
 /**

 /branches/tracing/uspace/srv/kbd/include/key_buffer.h
 ,23 → 38,24
 #define __KEY_BUFFER_H__
 #include <sys/types.h>
+#include <kbd/kbd.h>
 /** Size of buffer for pressed keys */
 #define KEYBUFFER_SIZE 128
 typedef struct {
-    int fifo[KEYBUFFER_SIZE];
+    kbd_event_t fifo[KEYBUFFER_SIZE];
     unsigned long head;
     unsigned long tail;
     unsigned long items;
 } keybuffer_t;
-void keybuffer_free(keybuffer_t *keybuffer);
-void keybuffer_init(keybuffer_t *keybuffer);
-int keybuffer_available(keybuffer_t *keybuffer);
-int keybuffer_empty(keybuffer_t *keybuffer);
-void keybuffer_push(keybuffer_t *keybuffer, int key);
-int keybuffer_pop(keybuffer_t *keybuffer, int *c);
+extern void keybuffer_free(keybuffer_t *);
+extern void keybuffer_init(keybuffer_t *);
+extern int keybuffer_available(keybuffer_t *);
+extern int keybuffer_empty(keybuffer_t *);
+extern void keybuffer_push(keybuffer_t *, const kbd_event_t *);
+extern int keybuffer_pop(keybuffer_t *, kbd_event_t *);
 #endif

 /branches/tracing/uspace/srv/kbd/include/kbd_ctl.h
 ,0 → 1,49
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen generic
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_CTL_H_
+#define KBD_CTL_H_
+extern void kbd_ctl_parse_scancode(int);
+extern int kbd_ctl_init(void);
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/include/kbd_port.h
 ,0 → 1,49
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen generic
+ * @brief   HelenOS generic uspace keyboard handler.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_PORT_H_
+#define KBD_PORT_H_
+extern int kbd_port_init(void);
+extern void kbd_port_yield(void);
+extern void kbd_port_reclaim(void);
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/include/sun.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2009 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen generic
+ * @brief Sun keyboard virtual port driver.
+ * @ingroup kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_SUN_H_
+#define KBD_SUN_H_
+extern int ns16550_port_init(void);
+extern int z8530_port_init(void);
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/include/stroke.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbdgen generic
+ * @brief   Generic scancode parser.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#ifndef KBD_STROKE_H_
+#define KBD_STROKE_H_
+extern void stroke_sim(unsigned, unsigned);
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/port/gxemul.c
 ,0 → 1,95
+/*
+ * Copyright (c) 2007 Michal Kebrt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @{
+ * @ingroup  kbd
+ */
+/** @file
+ * @brief   GXEmul keyboard port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd_port.h>
+#include <kbd.h>
+#include <ddi.h>
+static irq_cmd_t gxemul_cmds[] = {
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = (void *) 0,     /* will be patched in run-time */
+        .dstarg = 2,
+    },
+    {
+        .cmd = CMD_ACCEPT
+    }
+};
+static irq_code_t gxemul_kbd = {
+    sizeof(gxemul_cmds) / sizeof(irq_cmd_t),
+    gxemul_cmds
+};
+static void gxemul_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+/** Initializes keyboard handler. */
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(gxemul_irq_handler);
+    gxemul_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
+    ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
+, &gxemul_kbd);
+    return 0;
+}
+void kbd_port_yield(void)
+{
+}
+void kbd_port_reclaim(void)
+{
+}
+/** Process data sent when a key is pressed.
+ *
+ *  @param keybuffer Buffer of pressed keys.
+ *  @param call      IPC call.
+ *
+ *  @return Always 1.
+ */
+static void gxemul_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+}
+/** @}
+ */

 /branches/tracing/uspace/srv/kbd/port/ns16550.c
 ,0 → 1,129
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   NS16550 port driver.
+ */
+#include <ipc/ipc.h>
+#include <ipc/bus.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sun.h>
+#include <ddi.h>
+/* NS16550 registers */
+#define RBR_REG     0    /** Receiver Buffer Register. */
+#define IER_REG     1   /** Interrupt Enable Register. */
+#define IIR_REG     2   /** Interrupt Ident Register (read). */
+#define FCR_REG     2   /** FIFO control register (write). */
+#define LCR_REG     3   /** Line Control register. */
+#define MCR_REG     4   /** Modem Control Register. */
+#define LSR_REG     5   /** Line Status Register. */
+#define LSR_DATA_READY  0x01
+static irq_cmd_t ns16550_cmds[] = {
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = (void *) 0, /* will be patched in run-time */
+        .dstarg = 1
+    },
+    {
+        .cmd = CMD_BTEST,
+        .value = LSR_DATA_READY,
+        .srcarg = 1,
+        .dstarg = 3
+    },
+    {
+        .cmd = CMD_PREDICATE,
+        .value = 2,
+        .srcarg = 3
+    },
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = (void *) 0, /* will be patched in run-time */
+        .dstarg = 2
+    },
+    {
+        .cmd = CMD_ACCEPT
+    }
+};
+irq_code_t ns16550_kbd = {
+    sizeof(ns16550_cmds) / sizeof(irq_cmd_t),
+    ns16550_cmds
+};
+static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+static uintptr_t ns16550_physical;
+static uintptr_t ns16550_kernel;
+int ns16550_port_init(void)
+{
+    void *vaddr;
+    async_set_interrupt_received(ns16550_irq_handler);
+    ns16550_physical = sysinfo_value("kbd.address.physical");
+    ns16550_kernel = sysinfo_value("kbd.address.kernel");
+    ns16550_kbd.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG);
+    ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG);
+    ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
+        sysinfo_value("kbd.inr"), &ns16550_kbd);
+    return pio_enable((void *) ns16550_physical, 8, &vaddr);
+}
+void ns16550_port_yield(void)
+{
+}
+void ns16550_port_reclaim(void)
+{
+}
+static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+    if (cir_service)
+        async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
+            IPC_GET_METHOD(*call));
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/port/msim.c
 ,0 → 1,87
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   Msim keyboard port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd_port.h>
+#include <kbd.h>
+#include <ddi.h>
+irq_cmd_t msim_cmds[] = {
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = (void *) 0, /* will be patched in run-time */
+        .dstarg = 2
+    },
+    {
+        .cmd = CMD_ACCEPT
+    }
+};
+irq_code_t msim_kbd = {
+    sizeof(msim_cmds) / sizeof(irq_cmd_t),
+    msim_cmds
+};
+static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(msim_irq_handler);
+    msim_cmds[0].addr = sysinfo_value("kbd.address.virtual");
+    ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
+, &msim_kbd);
+    return 0;
+}
+void kbd_port_yield(void)
+{
+}
+void kbd_port_reclaim(void)
+{
+}
+static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+}
+/** @}
+*/

 /branches/tracing/uspace/srv/kbd/port/sun.c
 ,0 → 1,74
+/*
+ * Copyright (c) 2009 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief Sun keyboard virtual port driver.
+ */
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sun.h>
+#include <sysinfo.h>
+/** Sun keyboard virtual port driver.
+ *
+ * This is a virtual port driver which can use
+ * both ns16550_port_init and z8530_port_init
+ * according to the information passed from the
+ * kernel. This is just a temporal hack.
+ *
+ */
+int kbd_port_init(void)
+{
+    if (sysinfo_value("kbd.type.z8530")) {
+        if (z8530_port_init() == 0)
+            return 0;
+    }
+    if (sysinfo_value("kbd.type.ns16550")) {
+        if (ns16550_port_init() == 0)
+            return 0;
+    }
+    return -1;
+}
+void kbd_port_yield(void)
+{
+}
+void kbd_port_reclaim(void)
+{
+}
+/** @}
+*/

 /branches/tracing/uspace/srv/kbd/port/i8042.c
 ,0 → 1,177
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup kbd
+ * @{
+ */
+/** @file
+ * @brief i8042 port driver.
+ */
+#include <ddi.h>
+#include <libarch/ddi.h>
+#include <ipc/ipc.h>
+#include <async.h>
+#include <unistd.h>
+#include <sysinfo.h>
+#include <kbd_port.h>
+#include <kbd.h>
+#include <ddi.h>
+#include "i8042.h"
+/* Interesting bits for status register */
+#define i8042_OUTPUT_FULL  0x1
+#define i8042_INPUT_FULL   0x2
+#define i8042_MOUSE_DATA   0x20
+/* Command constants */
+#define i8042_CMD_KBD 0x60
+#define i8042_CMD_MOUSE  0xd4
+/* Keyboard cmd byte */
+#define i8042_KBD_IE        0x1
+#define i8042_MOUSE_IE      0x2
+#define i8042_KBD_DISABLE   0x10
+#define i8042_MOUSE_DISABLE 0x20
+#define i8042_KBD_TRANSLATE 0x40
+/* Mouse constants */
+#define MOUSE_OUT_INIT  0xf4
+#define MOUSE_ACK       0xfa
+static irq_cmd_t i8042_cmds[] = {
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = NULL,   /* will be patched in run-time */
+        .dstarg = 1
+    },
+    {
+        .cmd = CMD_BTEST,
+        .value = i8042_OUTPUT_FULL,
+        .srcarg = 1,
+        .dstarg = 3
+    },
+    {
+        .cmd = CMD_PREDICATE,
+        .value = 2,
+        .srcarg = 3
+    },
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = NULL,   /* will be patched in run-time */
+        .dstarg = 2
+    },
+    {
+        .cmd = CMD_ACCEPT
+    }
+};
+static irq_code_t i8042_kbd = {
+    sizeof(i8042_cmds) / sizeof(irq_cmd_t),
+    i8042_cmds
+};
+static uintptr_t i8042_physical;
+static uintptr_t i8042_kernel;
+static i8042_t * i8042;
+static void wait_ready(void) {
+    while (pio_read_8(&i8042->status) & i8042_INPUT_FULL)
+        ;
+}
+static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+int kbd_port_init(void)
+{
+    int mouseenabled = 0;
+    void *vaddr;
+    i8042_physical = sysinfo_value("kbd.address.physical");
+    i8042_kernel = sysinfo_value("kbd.address.kernel");
+    if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
+        return -1;
+    i8042 = vaddr;
+    async_set_interrupt_received(i8042_irq_handler);
+    /* Disable kbd, enable mouse */
+    pio_write_8(&i8042->status, i8042_CMD_KBD);
+    wait_ready();
+    pio_write_8(&i8042->status, i8042_CMD_KBD);
+    wait_ready();
+    pio_write_8(&i8042->data, i8042_KBD_DISABLE);
+    wait_ready();
+    /* Flush all current IO */
+    while (pio_read_8(&i8042->status) & i8042_OUTPUT_FULL)
+        (void) pio_read_8(&i8042->data);
+    /* Enable kbd */
+    i8042_kbd.cmds[0].addr = &((i8042_t *) i8042_kernel)->status;
+    i8042_kbd.cmds[3].addr = &((i8042_t *) i8042_kernel)->data;
+    ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);
+    int newcontrol = i8042_KBD_IE | i8042_KBD_TRANSLATE;
+    if (mouseenabled)
+        newcontrol |= i8042_MOUSE_IE;
+    pio_write_8(&i8042->status, i8042_CMD_KBD);
+    wait_ready();
+    pio_write_8(&i8042->data, newcontrol);
+    wait_ready();
+    return 0;
+}
+void kbd_port_yield(void)
+{
+}
+void kbd_port_reclaim(void)
+{
+}
+static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int status = IPC_GET_ARG1(*call);
+    if ((status & i8042_MOUSE_DATA))
+        return;
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+    return;
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/port/ski.c
 ,0 → 1,123
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   Ski console keyboard port driver.
+ */
+#include <stdlib.h>
+#include <unistd.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sys/types.h>
+#include <thread.h>
+#include <bool.h>
+#define SKI_GETCHAR     21
+#define POLL_INTERVAL       10000
+static void *ski_thread_impl(void *arg);
+static int32_t ski_getchar(void);
+static volatile bool polling_disabled = false;
+/** Initialize Ski port driver. */
+int kbd_port_init(void)
+{
+    thread_id_t tid;
+    int rc;
+    rc = thread_create(ski_thread_impl, NULL, "kbd_poll", &tid);
+    if (rc != 0) {
+        return rc;
+    }
+    return 0;
+}
+void kbd_port_yield(void)
+{
+    polling_disabled = true;
+}
+void kbd_port_reclaim(void)
+{
+    polling_disabled = false;
+}
+/** Thread to poll Ski for keypresses. */
+static void *ski_thread_impl(void *arg)
+{
+    int32_t c;
+    (void) arg;
+    while (1) {
+        while (polling_disabled == false) {
+            c = ski_getchar();
+            if (c == 0)
+                break;
+            kbd_push_scancode(c);
+        }
+        usleep(POLL_INTERVAL);
+    }
+}
+/** Ask Ski if a key was pressed.
+ *
+ * Use SSC (Simulator System Call) to get character from the debug console.
+ * This call is non-blocking.
+ *
+ * @return ASCII code of pressed key or 0 if no key pressed.
+ */
+static int32_t ski_getchar(void)
+{
+    uint64_t ch;
+    asm volatile (
+        "mov r15 = %1\n"
+        "break 0x80000;;\n" /* modifies r8 */
+        "mov %0 = r8;;\n"
+        : "=r" (ch)
+        : "i" (SKI_GETCHAR)
+        : "r15", "r8"
+    );
+    return (int32_t) ch;
+}
+/** @}
+ */

 /branches/tracing/uspace/srv/kbd/port/z8530.c
 ,0 → 1,117
+/*
+ * Copyright (c) 2006 Martin Decky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   Z8530 keyboard port driver.
+ */
+#include <ipc/ipc.h>
+#include <ipc/bus.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sun.h>
+#include <sys/types.h>
+#include <ddi.h>
+#define CHAN_A_STATUS   4
+#define CHAN_A_DATA 6
+#define RR0_RCA 1
+static irq_cmd_t z8530_cmds[] = {
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = (void *) 0, /* will be patched in run-time */
+        .dstarg = 1
+    },
+    {
+        .cmd = CMD_BTEST,
+        .value = RR0_RCA,
+        .srcarg = 1,
+        .dstarg = 3
+    },
+    {
+        .cmd = CMD_PREDICATE,
+        .value = 2,
+        .srcarg = 3
+    },
+    {
+        .cmd = CMD_PIO_READ_8,
+        .addr = (void *) 0, /* will be patched in run-time */
+        .dstarg = 2
+    },
+    {
+        .cmd = CMD_ACCEPT
+    }
+};
+irq_code_t z8530_kbd = {
+    sizeof(z8530_cmds) / sizeof(irq_cmd_t),
+    z8530_cmds
+};
+static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+int z8530_port_init(void)
+{
+    async_set_interrupt_received(z8530_irq_handler);
+    z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.kernel") +
+        CHAN_A_STATUS;
+    z8530_cmds[3].addr = (void *) sysinfo_value("kbd.address.kernel") +
+        CHAN_A_DATA;
+    ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(),
+        sysinfo_value("kbd.inr"), &z8530_kbd);
+    return 0;
+}
+void z8530_port_yield(void)
+{
+}
+void z8530_port_reclaim(void)
+{
+}
+static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+    if (cir_service)
+        async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
+            IPC_GET_METHOD(*call));
+}
+/** @}
+ */

 /branches/tracing/uspace/srv/kbd/port/sgcn.c
 ,0 → 1,176
+/*
+ * Copyright (c) 2008 Pavel Rimsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   SGCN (Serengeti Console) keyboard port driver.
+ */
+#include <as.h>
+#include <ddi.h>
+#include <async.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sysinfo.h>
+#include <stdio.h>
+#include <thread.h>
+#include <bool.h>
+#define POLL_INTERVAL       10000
+/**
+ * SGCN buffer header. It is placed at the very beginning of the SGCN
+ * buffer.
+ */
+typedef struct {
+    /** hard-wired to "CON" */
+    char magic[4];
+    /** we don't need this */
+    char unused[8];
+    /** offset within the SGCN buffer of the input buffer start */
+    uint32_t in_begin;
+    /** offset within the SGCN buffer of the input buffer end */
+    uint32_t in_end;
+    /** offset within the SGCN buffer of the input buffer read pointer */
+    uint32_t in_rdptr;
+    /** offset within the SGCN buffer of the input buffer write pointer */
+    uint32_t in_wrptr;
+} __attribute__ ((packed)) sgcn_buffer_header_t;
+/*
+ * Returns a pointer to the object of a given type which is placed at the given
+ * offset from the console buffer beginning.
+ */
+#define SGCN_BUFFER(type, offset) \
+        ((type *) (sram_virt_addr + sram_buffer_offset + (offset)))
+/** Returns a pointer to the console buffer header. */
+#define SGCN_BUFFER_HEADER  (SGCN_BUFFER(sgcn_buffer_header_t, 0))
+/**
+ * Virtual address mapped to SRAM.
+ */
+static uintptr_t sram_virt_addr;
+/**
+ * SGCN buffer offset within SGCN.
+ */
+static uintptr_t sram_buffer_offset;
+/* polling thread */
+static void *sgcn_thread_impl(void *arg);
+static volatile bool polling_disabled = false;
+/**
+ * Initializes the SGCN driver.
+ * Maps the physical memory (SRAM) and creates the polling thread.
+ */
+int kbd_port_init(void)
+{
+    sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+    if (physmem_map((void *) sysinfo_value("sram.address.physical"),
+        (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
+        AS_AREA_READ | AS_AREA_WRITE) != 0) {
+        printf("SGCN: uspace driver could not map physical memory.");
+        return -1;
+    }
+    sram_buffer_offset = sysinfo_value("sram.buffer.offset");
+    thread_id_t tid;
+    int rc;
+    rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid);
+    if (rc != 0) {
+        return rc;
+    }
+    return 0;
+}
+void kbd_port_yield(void)
+{
+    polling_disabled = true;
+}
+void kbd_port_reclaim(void)
+{
+    polling_disabled = false;
+}
+/**
+ * Handler of the "key pressed" event. Reads codes of all the pressed keys from
+ * the buffer.
+ */
+static void sgcn_key_pressed(void)
+{
+    char c;
+    uint32_t begin = SGCN_BUFFER_HEADER->in_begin;
+    uint32_t end = SGCN_BUFFER_HEADER->in_end;
+    uint32_t size = end - begin;
+    volatile char *buf_ptr = (volatile char *)
+        SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+    volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr);
+    volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr);
+    while (*in_rdptr_ptr != *in_wrptr_ptr) {
+        c = *buf_ptr;
+        *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin;
+        buf_ptr = (volatile char *)
+            SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+        kbd_push_scancode(c);
+    }
+}
+/**
+ * Thread to poll SGCN for keypresses.
+ */
+static void *sgcn_thread_impl(void *arg)
+{
+    (void) arg;
+    while (1) {
+        if (polling_disabled == false)
+            sgcn_key_pressed();
+        usleep(POLL_INTERVAL);
+    }
+}
+/** @}
+ */

 /branches/tracing/uspace/srv/kbd/port/dummy.c
 ,0 → 1,54
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @brief   Dummy keyboard port driver.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <kbd_port.h>
+#include <kbd.h>
+int kbd_port_init(void)
+{
+    return 0;
+}
+void kbd_port_yield(void)
+{
+}
+void kbd_port_reclaim(void)
+{
+}
+/** @}
+*/

 /branches/tracing/uspace/srv/kbd/port/i8042.h
 ,0 → 1,55
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief i8042 port driver.
+ */
+#ifndef KBD_PORT_i8042_H_
+#define KBD_PORT_i8042_H_
+#include <libarch/ddi.h>
+#include <libarch/types.h>
+struct i8042 {
+    ioport8_t data;
+    uint8_t pad[3];
+    ioport8_t status;
+} __attribute__ ((packed));
+typedef struct i8042 i8042_t;
+#endif
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/genarch/stroke.c
 ,0 → 1,84
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   Stroke simulator.
+ *
+ * When simulating a keyboard using a serial TTY we need to convert the
+ * recognized strokes (such as Shift-A) to sequences of key presses and
+ * releases (such as 'press Shift, press A, release A, release Shift').
+ */
+#include <stroke.h>
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+/** Correspondence between modifers and the modifier keycodes. */
+static unsigned int mods_keys[][2] = {
+    { KM_LSHIFT, KC_LSHIFT },
+    { 0, 0 }
+};
+/** Simulate keystroke using sequences of key presses and releases. */
+void stroke_sim(unsigned mod, unsigned key)
+{
+    int i;
+    /* Simulate modifier presses. */
+    i = 0;
+    while (mods_keys[i][0] != 0) {
+        if (mod & mods_keys[i][0]) {
+            kbd_push_ev(KE_PRESS, mods_keys[i][1]);
+        }
+        ++i;
+    }
+    /* Simulate key press and release. */
+    if (key != 0) {
+        kbd_push_ev(KE_PRESS, key);
+        kbd_push_ev(KE_RELEASE, key);
+    }
+    /* Simulate modifier releases. */
+    i = 0;
+    while (mods_keys[i][0] != 0) {
+        if (mod & mods_keys[i][0]) {
+            kbd_push_ev(KE_RELEASE, mods_keys[i][1]);
+        }
+        ++i;
+    }
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/genarch/gsp.c
 ,0 → 1,288
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/**
+ * @addtogroup kbdgen generic
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   Generic scancode parser.
+ *
+ * The scancode parser is a simple finite state machine. It is described
+ * using sequences of input symbols (scancodes) and the corresponding output
+ * value (mods, key pair). When the parser recognizes a sequence,
+ * it outputs the value and restarts. If a transition is undefined,
+ * the parser restarts, too.
+ *
+ * Apart from precise values, GSP_DEFAULT allows to catch general cases.
+ * I.e. if we knew that after 0x1b 0x4f there always follow two more
+ * scancodes, we can define (0x1b, 0x4f, GSP_DEFAULT, GSP_DEFAULT, GSP_END)
+ * with null output. This will force the parser to read the entire sequence,
+ * not leaving garbage on the input if it does not recognize the specific
+ * sequence.
+ */
+#include <gsp.h>
+#include <libadt/hash_table.h>
+#include <stdlib.h>
+#include <stdio.h>
+#define TRANS_TABLE_CHAINS 256
+/*
+ * Hash table operations for the transition function.
+ */
+static hash_index_t trans_op_hash(unsigned long key[]);
+static int trans_op_compare(unsigned long key[], hash_count_t keys,
+    link_t *item);
+static void trans_op_remove_callback(link_t *item);
+static hash_table_operations_t trans_ops = {
+    .hash = trans_op_hash,
+    .compare = trans_op_compare,
+    .remove_callback = trans_op_remove_callback
+};
+static gsp_trans_t *trans_lookup(gsp_t *p, int state, int input);
+static void trans_insert(gsp_t *p, gsp_trans_t *t);
+static gsp_trans_t *trans_new(void);
+/** Initialise scancode parser. */
+void gsp_init(gsp_t *p)
+{
+    p->states = 1;
+    hash_table_create(&p->trans, TRANS_TABLE_CHAINS, 2, &trans_ops);
+}
+/** Insert a series of definitions into the parser.
+ *
+ * @param p The parser.
+ * @param defs  Definition list. Each definition starts with two output values
+ *      (mods, key) and continues with a sequence of input values
+ *      terminated with GSP_END. The definition list is terminated
+ *      with two zeroes (0, 0) for output values.
+ */
+int gsp_insert_defs(gsp_t *p, const int *defs)
+{
+    unsigned mods, key;
+    const int *dp;
+    int rc;
+    dp = defs;
+    while (1) {
+        /* Read the output values. */
+        mods = *dp++;
+        key = *dp++;
+        if (key == 0) break;
+        /* Insert one sequence. */
+        rc = gsp_insert_seq(p, dp, mods, key);
+        if (rc != 0)
+            return rc;
+        /* Skip to the next definition. */
+        while (*dp != GSP_END)
+            ++dp;
+        ++dp;
+    }
+    return 0;
+}
+/** Insert one sequence into the parser.
+ *
+ * @param p The parser.
+ * @param seq   Sequence of input values terminated with GSP_END.
+ * @param mods  Corresponsing output value.
+ * @param key   Corresponsing output value.
+ */
+int gsp_insert_seq(gsp_t *p, const int *seq, unsigned mods, unsigned key)
+{
+    int state;
+    gsp_trans_t *t;
+    state = 0;
+    t = NULL;
+    /* Input sequence must be non-empty. */
+    if (*seq == GSP_END)
+        return -1;
+    while (*(seq + 1) != GSP_END) {
+        t = trans_lookup(p, state, *seq);
+        if (t == NULL) {
+            /* Create new state. */
+            t = trans_new();
+            t->old_state = state;
+            t->input = *seq;
+            t->new_state = p->states++;
+            t->out_mods = 0;
+            t->out_key = 0;
+            trans_insert(p, t);
+        }
+        state = t->new_state;
+        ++seq;
+    }
+    /* Process the last transition. */
+    t = trans_lookup(p, state, *seq);
+    if (t != NULL) {
+        exit(1);
+        return -1;  /* Conflicting definition. */
+    }
+    t = trans_new();
+    t->old_state = state;
+    t->input = *seq;
+    t->new_state = 0;
+    t->out_mods = mods;
+    t->out_key = key;
+    trans_insert(p, t);
+    return 0;
+}
+/** Compute one parser step.
+ *
+ * Computes the next state and output values for a given state and input.
+ * This handles everything including restarts and default branches.
+ *
+ * @param p     The parser.
+ * @param state     Old state.
+ * @param input     Input symbol (scancode).
+ * @param mods      Output value (modifier).
+ * @param key       Output value (key).
+ * @return      New state.
+ */
+int gsp_step(gsp_t *p, int state, int input, unsigned *mods, unsigned *key)
+{
+    gsp_trans_t *t;
+    t = trans_lookup(p, state, input);
+    if (t == NULL) {
+        t = trans_lookup(p, state, GSP_DEFAULT);
+    }
+    if (t == NULL) {
+        printf("gsp_step: not found\n");
+        *mods = NULL;
+        *key = NULL;
+        return 0;
+    }
+    *mods = t->out_mods;
+    *key = t->out_key;
+    return t->new_state;
+}
+/** Transition function lookup.
+ *
+ * Returns the value of the transition function for the given state
+ * and input. Note that the transition must be specified precisely,
+ * to obtain the default branch use input = GSP_DEFAULT.
+ *
+ * @param p     Parser.
+ * @param state     Current state.
+ * @param input     Input value.
+ * @return      The transition or @c NULL if not defined.
+ */
+static gsp_trans_t *trans_lookup(gsp_t *p, int state, int input)
+{
+    link_t *item;
+    unsigned long key[2];
+    key[0] = state;
+    key[1] = input;
+    item = hash_table_find(&p->trans, key);
+    if (item == NULL) return NULL;
+    return hash_table_get_instance(item, gsp_trans_t, link);
+}
+/** Define a new transition.
+ *
+ * @param p The parser.
+ * @param t Transition with all fields defined.
+ */
+static void trans_insert(gsp_t *p, gsp_trans_t *t)
+{
+    unsigned long key[2];
+    key[0] = t->old_state;
+    key[1] = t->input;
+    hash_table_insert(&p->trans, &key, &t->link);
+}
+/** Allocate transition structure. */
+static gsp_trans_t *trans_new(void)
+{
+    gsp_trans_t *t;
+    t = malloc(sizeof(gsp_trans_t));
+    if (t == NULL) {
+        printf("Memory allocation failed.\n");
+        exit(1);
+    }
+    return t;
+}
+/*
+ * Transition function hash table operations.
+ */
+static hash_index_t trans_op_hash(unsigned long key[])
+{
+    return (key[0] * 17 + key[1]) % TRANS_TABLE_CHAINS;
+}
+static int trans_op_compare(unsigned long key[], hash_count_t keys,
+    link_t *item)
+{
+    gsp_trans_t *t;
+    t = hash_table_get_instance(item, gsp_trans_t, link);
+    return (key[0] == t->old_state && key[1] == t->input);
+}
+static void trans_op_remove_callback(link_t *item)
+{
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/generic/kbd.c
 ,48 → 37,130
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <sysinfo.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ipc/ns.h>
+#include <async.h>
 #include <errno.h>
-#include <arch/kbd.h>
+#include <libadt/fifo.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
 #include <kbd.h>
-#include <libadt/fifo.h>
 #include <key_buffer.h>
-#include <async.h>
-#include <keys.h>
+#include <kbd_port.h>
+#include <kbd_ctl.h>
+#include <layout.h>
 #define NAME "kbd"
 int cons_connected = 0;
 int phone2cons = -1;
-keybuffer_t keybuffer;
+keybuffer_t keybuffer;
-static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
+/** Currently active modifiers. */
+static unsigned mods = KM_NUM_LOCK;
+/** Currently pressed lock keys. We track these to tackle autorepeat. */
+static unsigned lock_keys;
+int cir_service = 0;
+int cir_phone = -1;
+#define NUM_LAYOUTS 3
+static layout_op_t *layout[NUM_LAYOUTS] = {
+    &us_qwerty_op,
+    &us_dvorak_op,
+    &cz_op
+};
+static int active_layout = 0;
+void kbd_push_scancode(int scancode)
 {
-    int chr;
+/*  printf("scancode: 0x%x\n", scancode);*/
+    kbd_ctl_parse_scancode(scancode);
+}
-#ifdef MOUSE_ENABLED
-    if (mouse_arch_process(phone2cons, call))
-        return;
-#endif
-    kbd_arch_process(&keybuffer, call);
+void kbd_push_ev(int type, unsigned int key)
+{
+    kbd_event_t ev;
+    unsigned mod_mask;
-    if (cons_connected && phone2cons != -1) {
-        /*
-         * recode to ASCII - one interrupt can produce more than one
-         * code so result is stored in fifo
-         */
-        while (!keybuffer_empty(&keybuffer)) {
-            if (!keybuffer_pop(&keybuffer, (int *)&chr))
-                break;
+    switch (key) {
+    case KC_LCTRL: mod_mask = KM_LCTRL; break;
+    case KC_RCTRL: mod_mask = KM_RCTRL; break;
+    case KC_LSHIFT: mod_mask = KM_LSHIFT; break;
+    case KC_RSHIFT: mod_mask = KM_RSHIFT; break;
+    case KC_LALT: mod_mask = KM_LALT; break;
+    case KC_RALT: mod_mask = KM_RALT; break;
+    default: mod_mask = 0; break;
+    }
-            async_msg_1(phone2cons, KBD_PUSHCHAR, chr);
+    if (mod_mask != 0) {
+        if (type == KE_PRESS)
+            mods = mods | mod_mask;
+        else
+            mods = mods & ~mod_mask;
+    }
+    switch (key) {
+    case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
+    case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
+    case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
+    default: mod_mask = 0; break;
+    }
+    if (mod_mask != 0) {
+        if (type == KE_PRESS) {
+            /*
+             * Only change lock state on transition from released
+             * to pressed. This prevents autorepeat from messing
+             * up the lock state.
+             */
+            mods = mods ^ (mod_mask & ~lock_keys);
+            lock_keys = lock_keys | mod_mask;
+        } else {
+            lock_keys = lock_keys & ~mod_mask;
         }
     }
+/*
+    printf("type: %d\n", type);
+    printf("mods: 0x%x\n", mods);
+    printf("keycode: %u\n", key);
+*/
+    if (type == KE_PRESS && (mods & KM_LCTRL) &&
+        key == KC_F1) {
+        active_layout = 0;
+        layout[active_layout]->reset();
+        return;
+    }
+    if (type == KE_PRESS && (mods & KM_LCTRL) &&
+        key == KC_F2) {
+        active_layout = 1;
+        layout[active_layout]->reset();
+        return;
+    }
+    if (type == KE_PRESS && (mods & KM_LCTRL) &&
+        key == KC_F3) {
+        active_layout = 2;
+        layout[active_layout]->reset();
+        return;
+    }
+    ev.type = type;
+    ev.key = key;
+    ev.mods = mods;
+    ev.c = layout[active_layout]->parse_ev(&ev);
+    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)
 ,6 → 193,14
             phone2cons = IPC_GET_ARG5(call);
             retval = 0;
             break;
+        case KBD_YIELD:
+            kbd_port_yield();
+            retval = 0;
+            break;
+        case KBD_RECLAIM:
+            kbd_port_reclaim();
+            retval = 0;
+            break;
         default:
             retval = EINVAL;
         }
 ,16 → 215,35
     ipcarg_t phonead;
-    /* Initialize arch dependent parts */
-    if (kbd_arch_init())
+    if (sysinfo_value("kbd.cir.fhc") == 1)
+        cir_service = SERVICE_FHC;
+    else if (sysinfo_value("kbd.cir.obio") == 1)
+        cir_service = SERVICE_OBIO;
+    if (cir_service) {
+        while (cir_phone < 0) {
+            cir_phone = ipc_connect_me_to_blocking(PHONE_NS, cir_service,
+, 0);
+        }
+    }
+    /* Initialize port driver. */
+    if (kbd_port_init() != 0)
         return -1;
+    /* Initialize controller driver. */
+    if (kbd_ctl_init() != 0)
+        return -1;
+    /* Initialize (reset) layout. */
+    layout[active_layout]->reset();
     /* Initialize key buffer */
     keybuffer_init(&keybuffer);
     async_set_client_connection(console_connection);
-    async_set_interrupt_received(irq_handler);
-    /* Register service at nameserver */
+    /* Register service at nameserver. */
     if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
         return -1;
 ,7 → 250,7
     printf(NAME ": Accepting connections\n");
     async_manager();
-    /* Never reached */
+    /* Not reached. */
     return 0;
 }

 /branches/tracing/uspace/srv/kbd/generic/key_buffer.c
 ,7 → 40,7
 /** Clear key buffer.
  */
-void keybuffer_free(keybuffer_t *keybuffer)
+void keybuffer_free(keybuffer_t *keybuffer)
 {
     futex_down(&keybuffer_futex);
     keybuffer->head = 0;
 ,15 → 75,18
     return (keybuffer->items == 0);
 }
-/** Push key to key buffer.
- * If buffer is full, character is ignored.
- * @param key code of stored key
+/** Push key event to key buffer.
+ *
+ * If the buffer is full, the event is ignored.
+ *
+ * @param keybuffer The keybuffer.
+ * @param ev        The event to push.
  */
-void keybuffer_push(keybuffer_t *keybuffer, int key)
+void keybuffer_push(keybuffer_t *keybuffer, const kbd_event_t *ev)
 {
     futex_down(&keybuffer_futex);
     if (keybuffer->items < KEYBUFFER_SIZE) {
-        keybuffer->fifo[keybuffer->tail] = key;
+        keybuffer->fifo[keybuffer->tail] = *ev;
         keybuffer->tail = (keybuffer->tail + 1) % KEYBUFFER_SIZE;
         keybuffer->items++;
     }
 ,16 → 93,17
     futex_up(&keybuffer_futex);
 }
-/** Pop character from buffer.
- * @param c pointer to space where to store character from buffer.
- * @return zero on empty buffer, nonzero else
+/** Pop event from buffer.
+ *
+ * @param edst  Pointer to where the event should be saved.
+ * @return  Zero on empty buffer, nonzero otherwise.
  */
-int keybuffer_pop(keybuffer_t *keybuffer, int *c)
+int keybuffer_pop(keybuffer_t *keybuffer, kbd_event_t *edst)
 {
     futex_down(&keybuffer_futex);
     if (keybuffer->items > 0) {
         keybuffer->items--;
-        *c = (keybuffer->fifo[keybuffer->head]) ;
+        *edst = (keybuffer->fifo[keybuffer->head]) ;
         keybuffer->head = (keybuffer->head + 1) % KEYBUFFER_SIZE;
         futex_up(&keybuffer_futex);
         return 1;

 /branches/tracing/uspace/srv/kbd/Makefile
 ,13 → 29,11
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
-include $(LIBC_PREFIX)/Makefile.toolchain
-include ../../../Makefile.config
+include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -Iinclude -I../libadt/include
 LIBS = $(LIBC_PREFIX)/libc.a
 ,75 → 44,125
 OUTPUT = kbd
 GENERIC_SOURCES = \
     generic/kbd.c \
+    genarch/gsp.c \
+    genarch/stroke.c \
     generic/key_buffer.c
-ARCH_SOURCES = \
-    arch/$(ARCH)/src/kbd.c
+ARCH_SOURCES =
+GENARCH_SOURCES = \
+    layout/cz.c \
+    layout/us_qwerty.c \
+    layout/us_dvorak.c
-ifeq ($(ARCH), ia32)
-    ARCH_SOURCES += \
-        arch/$(ARCH)/src/mouse.c \
-        arch/$(ARCH)/src/scanc.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c
-    CFLAGS += -DMOUSE_ENABLED
+ifeq ($(UARCH), amd64)
+    GENARCH_SOURCES += \
+        port/i8042.c \
+        ctl/pc.c
 endif
-ifeq ($(ARCH), ia64)
-    ARCH_SOURCES += \
-        arch/$(ARCH)/src/mouse.c \
-        arch/$(ARCH)/src/scanc.c \
-        arch/$(ARCH)/src/lkbd.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c
-    CFLAGS += -DMOUSE_ENABLED
+ifeq ($(UARCH), arm32)
+    GENARCH_SOURCES += \
+        port/gxemul.c
+    ifeq ($(CONFIG_FB), y)
+        GENARCH_SOURCES += \
+            ctl/gxe_fb.c
+    else
+        GENARCH_SOURCES += \
+            ctl/stty.c
+    endif
 endif
-ifeq ($(ARCH), amd64)
-    ARCH_SOURCES += \
-        arch/$(ARCH)/src/mouse.c \
-        arch/$(ARCH)/src/scanc.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c
-    CFLAGS += -DMOUSE_ENABLED
+ifeq ($(UARCH), ia32)
+    GENARCH_SOURCES += \
+        port/i8042.c \
+        ctl/pc.c
 endif
-ifeq ($(ARCH), sparc64)
-    ARCH_SOURCES += \
-        arch/$(ARCH)/src/scanc.c \
-        arch/$(ARCH)/src/sgcn.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c \
-        genarch/src/nofb.c
+ifeq ($(MACHINE), i460GX)
+    GENARCH_SOURCES += \
+        port/i8042.c \
+        ctl/pc.c
 endif
-ifeq ($(ARCH), arm32)
-    ARCH_SOURCES += \
-        arch/$(ARCH)/src/kbd_gxemul.c
+ifeq ($(MACHINE), ski)
+    GENARCH_SOURCES += \
+        port/ski.c \
+        ctl/stty.c
 endif
-ifeq ($(ARCH), mips32)
+ifeq ($(MACHINE), msim)
     GENARCH_SOURCES += \
-        genarch/src/nofb.c
+        port/msim.c \
+        ctl/stty.c
 endif
+ifeq ($(MACHINE), lgxemul)
+    GENARCH_SOURCES += \
+        port/gxemul.c
+    ifeq ($(CONFIG_FB), y)
+        GENARCH_SOURCES += \
+            ctl/gxe_fb.c
+    else
+        GENARCH_SOURCES += \
+            ctl/stty.c
+    endif
+endif
+ifeq ($(MACHINE), bgxemul)
+    GENARCH_SOURCES += \
+        port/gxemul.c
+    ifeq ($(CONFIG_FB), y)
+        GENARCH_SOURCES += \
+            ctl/gxe_fb.c
+    else
+        GENARCH_SOURCES += \
+            ctl/stty.c
+    endif
+endif
+ifeq ($(UARCH), ppc32)
+    GENARCH_SOURCES += \
+        port/dummy.c \
+        ctl/stty.c
+endif
+ifeq ($(UARCH), sparc64)
+    ifeq ($(MACHINE),serengeti)
+        GENARCH_SOURCES += \
+            port/sgcn.c \
+            ctl/stty.c
+    else
+        GENARCH_SOURCES += \
+            port/sun.c \
+            port/z8530.c \
+            port/ns16550.c \
+            ctl/sun.c
+    endif
+endif
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
+OBJECTS := $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS)
 .PHONY: all clean depend disasm links
-all: links $(OUTPUT) $(OUTPUT).disasm
+all: $(OUTPUT) $(OUTPUT).disasm
 -include Makefile.depend
-links:
-    ln -sfn ../arch/$(ARCH)/include include/arch
-    ln -sfn ../genarch/include include/genarch
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend include/arch include/genarch
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(GENARCH_OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/kbd/layout/us_qwerty.c
 ,0 → 1,244
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @brief   US QWERTY leyout.
+ * @{
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <layout.h>
+static void layout_reset(void);
+static wchar_t layout_parse_ev(kbd_event_t *ev);
+layout_op_t us_qwerty_op = {
+    layout_reset,
+    layout_parse_ev
+};
+static wchar_t map_lcase[] = {
+    [KC_Q] = 'q',
+    [KC_W] = 'w',
+    [KC_E] = 'e',
+    [KC_R] = 'r',
+    [KC_T] = 't',
+    [KC_Y] = 'y',
+    [KC_U] = 'u',
+    [KC_I] = 'i',
+    [KC_O] = 'o',
+    [KC_P] = 'p',
+    [KC_A] = 'a',
+    [KC_S] = 's',
+    [KC_D] = 'd',
+    [KC_F] = 'f',
+    [KC_G] = 'g',
+    [KC_H] = 'h',
+    [KC_J] = 'j',
+    [KC_K] = 'k',
+    [KC_L] = 'l',
+    [KC_Z] = 'z',
+    [KC_X] = 'x',
+    [KC_C] = 'c',
+    [KC_V] = 'v',
+    [KC_B] = 'b',
+    [KC_N] = 'n',
+    [KC_M] = 'm',
+};
+static wchar_t map_ucase[] = {
+    [KC_Q] = 'Q',
+    [KC_W] = 'W',
+    [KC_E] = 'E',
+    [KC_R] = 'R',
+    [KC_T] = 'T',
+    [KC_Y] = 'Y',
+    [KC_U] = 'U',
+    [KC_I] = 'I',
+    [KC_O] = 'O',
+    [KC_P] = 'P',
+    [KC_A] = 'A',
+    [KC_S] = 'S',
+    [KC_D] = 'D',
+    [KC_F] = 'F',
+    [KC_G] = 'G',
+    [KC_H] = 'H',
+    [KC_J] = 'J',
+    [KC_K] = 'K',
+    [KC_L] = 'L',
+    [KC_Z] = 'Z',
+    [KC_X] = 'X',
+    [KC_C] = 'C',
+    [KC_V] = 'V',
+    [KC_B] = 'B',
+    [KC_N] = 'N',
+    [KC_M] = 'M',
+};
+static wchar_t map_not_shifted[] = {
+    [KC_BACKTICK] = '`',
+    [KC_1] = '1',
+    [KC_2] = '2',
+    [KC_3] = '3',
+    [KC_4] = '4',
+    [KC_5] = '5',
+    [KC_6] = '6',
+    [KC_7] = '7',
+    [KC_8] = '8',
+    [KC_9] = '9',
+    [KC_0] = '0',
+    [KC_MINUS] = '-',
+    [KC_EQUALS] = '=',
+    [KC_LBRACKET] = '[',
+    [KC_RBRACKET] = ']',
+    [KC_SEMICOLON] = ';',
+    [KC_QUOTE] = '\'',
+    [KC_BACKSLASH] = '\\',
+    [KC_COMMA] = ',',
+    [KC_PERIOD] = '.',
+    [KC_SLASH] = '/',
+};
+static wchar_t map_shifted[] = {
+    [KC_BACKTICK] = '~',
+    [KC_1] = '!',
+    [KC_2] = '@',
+    [KC_3] = '#',
+    [KC_4] = '$',
+    [KC_5] = '%',
+    [KC_6] = '^',
+    [KC_7] = '&',
+    [KC_8] = '*',
+    [KC_9] = '(',
+    [KC_0] = ')',
+    [KC_MINUS] = '_',
+    [KC_EQUALS] = '+',
+    [KC_LBRACKET] = '{',
+    [KC_RBRACKET] = '}',
+    [KC_SEMICOLON] = ':',
+    [KC_QUOTE] = '"',
+    [KC_BACKSLASH] = '|',
+    [KC_COMMA] = '<',
+    [KC_PERIOD] = '>',
+    [KC_SLASH] = '?',
+};
+static wchar_t map_neutral[] = {
+    [KC_BACKSPACE] = '\b',
+    [KC_TAB] = '\t',
+    [KC_ENTER] = '\n',
+    [KC_SPACE] = ' ',
+    [KC_NSLASH] = '/',
+    [KC_NTIMES] = '*',
+    [KC_NMINUS] = '-',
+    [KC_NPLUS] = '+',
+    [KC_NENTER] = '\n'
+};
+static wchar_t map_numeric[] = {
+    [KC_N7] = '7',
+    [KC_N8] = '8',
+    [KC_N9] = '9',
+    [KC_N4] = '4',
+    [KC_N5] = '5',
+    [KC_N6] = '6',
+    [KC_N1] = '1',
+    [KC_N2] = '2',
+    [KC_N3] = '3',
+    [KC_N0] = '0',
+    [KC_NPERIOD] = '.'
+};
+static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length)
+{
+    if (key >= map_length)
+        return 0;
+    return map[key];
+}
+static void layout_reset(void)
+{
+}
+static wchar_t layout_parse_ev(kbd_event_t *ev)
+{
+    wchar_t c;
+    /* Produce no characters when Ctrl or Alt is pressed. */
+    if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
+        return 0;
+    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
+        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_SHIFT) != 0)
+        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_NUM_LOCK) != 0)
+        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t));
+    else
+        c = 0;
+    return c;
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/layout/cz.c
 ,0 → 1,403
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @brief   US QWERTY leyout.
+ * @{
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <bool.h>
+#include <layout.h>
+static void layout_reset(void);
+static wchar_t layout_parse_ev(kbd_event_t *ev);
+enum m_state {
+    ms_start,
+    ms_hacek,
+    ms_carka
+};
+static enum m_state mstate;
+layout_op_t cz_op = {
+    layout_reset,
+    layout_parse_ev
+};
+static wchar_t map_lcase[] = {
+    [KC_Q] = 'q',
+    [KC_W] = 'w',
+    [KC_E] = 'e',
+    [KC_R] = 'r',
+    [KC_T] = 't',
+    [KC_Y] = 'z',
+    [KC_U] = 'u',
+    [KC_I] = 'i',
+    [KC_O] = 'o',
+    [KC_P] = 'p',
+    [KC_A] = 'a',
+    [KC_S] = 's',
+    [KC_D] = 'd',
+    [KC_F] = 'f',
+    [KC_G] = 'g',
+    [KC_H] = 'h',
+    [KC_J] = 'j',
+    [KC_K] = 'k',
+    [KC_L] = 'l',
+    [KC_Z] = 'y',
+    [KC_X] = 'x',
+    [KC_C] = 'c',
+    [KC_V] = 'v',
+    [KC_B] = 'b',
+    [KC_N] = 'n',
+    [KC_M] = 'm',
+};
+static wchar_t map_ucase[] = {
+    [KC_Q] = 'Q',
+    [KC_W] = 'W',
+    [KC_E] = 'E',
+    [KC_R] = 'R',
+    [KC_T] = 'T',
+    [KC_Y] = 'Z',
+    [KC_U] = 'U',
+    [KC_I] = 'I',
+    [KC_O] = 'O',
+    [KC_P] = 'P',
+    [KC_A] = 'A',
+    [KC_S] = 'S',
+    [KC_D] = 'D',
+    [KC_F] = 'F',
+    [KC_G] = 'G',
+    [KC_H] = 'H',
+    [KC_J] = 'J',
+    [KC_K] = 'K',
+    [KC_L] = 'L',
+    [KC_Z] = 'Y',
+    [KC_X] = 'X',
+    [KC_C] = 'C',
+    [KC_V] = 'V',
+    [KC_B] = 'B',
+    [KC_N] = 'N',
+    [KC_M] = 'M',
+};
+static wchar_t map_not_shifted[] = {
+    [KC_BACKTICK] = ';',
+    [KC_1] = '+',
+    [KC_MINUS] = '=',
+    [KC_RBRACKET] = ')',
+    [KC_QUOTE] = L'§',
+    [KC_COMMA] = ',',
+    [KC_PERIOD] = '.',
+    [KC_SLASH] = '-',
+};
+static wchar_t map_shifted[] = {
+    [KC_1] = '1',
+    [KC_2] = '2',
+    [KC_3] = '3',
+    [KC_4] = '4',
+    [KC_5] = '5',
+    [KC_6] = '6',
+    [KC_7] = '7',
+    [KC_8] = '8',
+    [KC_9] = '9',
+    [KC_0] = '0',
+    [KC_MINUS] = '%',
+    [KC_LBRACKET] = '/',
+    [KC_RBRACKET] = '(',
+    [KC_SEMICOLON] = '"',
+    [KC_QUOTE] = '!',
+    [KC_BACKSLASH] = '\'',
+    [KC_COMMA] = '?',
+    [KC_PERIOD] = ':',
+    [KC_SLASH] = '_',
+};
+static wchar_t map_ns_nocaps[] = {
+    [KC_2] = L'ě',
+    [KC_3] = L'š',
+    [KC_4] = L'č',
+    [KC_5] = L'ř',
+    [KC_6] = L'ž',
+    [KC_7] = L'ý',
+    [KC_8] = L'á',
+    [KC_9] = L'í',
+    [KC_0] = L'é',
+    [KC_LBRACKET] = L'ú',
+    [KC_SEMICOLON] = L'ů'
+};
+static wchar_t map_ns_caps[] = {
+    [KC_2] = L'Ě',
+    [KC_3] = L'Š',
+    [KC_4] = L'Č',
+    [KC_5] = L'Ř',
+    [KC_6] = L'Ž',
+    [KC_7] = L'Ý',
+    [KC_8] = L'Á',
+    [KC_9] = L'Í',
+    [KC_0] = L'É',
+    [KC_LBRACKET] = L'Ú',
+    [KC_SEMICOLON] = L'Ů'
+};
+static wchar_t map_neutral[] = {
+    [KC_BACKSPACE] = '\b',
+    [KC_TAB] = '\t',
+    [KC_ENTER] = '\n',
+    [KC_SPACE] = ' ',
+    [KC_NSLASH] = '/',
+    [KC_NTIMES] = '*',
+    [KC_NMINUS] = '-',
+    [KC_NPLUS] = '+',
+    [KC_NENTER] = '\n'
+};
+static wchar_t map_numeric[] = {
+    [KC_N7] = '7',
+    [KC_N8] = '8',
+    [KC_N9] = '9',
+    [KC_N4] = '4',
+    [KC_N5] = '5',
+    [KC_N6] = '6',
+    [KC_N1] = '1',
+    [KC_N2] = '2',
+    [KC_N3] = '3',
+    [KC_N0] = '0',
+    [KC_NPERIOD] = '.'
+};
+static wchar_t map_hacek_lcase[] = {
+    [KC_E] = L'ě',
+    [KC_R] = L'ř',
+    [KC_T] = L'ť',
+    [KC_Y] = L'ž',
+    [KC_U] = L'ů',
+    [KC_S] = L'š',
+    [KC_D] = L'ď',
+    [KC_C] = L'č',
+    [KC_N] = L'ň'
+};
+static wchar_t map_hacek_ucase[] = {
+    [KC_E] = L'Ě',
+    [KC_R] = L'Ř',
+    [KC_T] = L'Ť',
+    [KC_Y] = L'Ž',
+    [KC_U] = L'Ů',
+    [KC_S] = L'Š',
+    [KC_D] = L'Ď',
+    [KC_C] = L'Č',
+    [KC_N] = L'Ň'
+};
+static wchar_t map_carka_lcase[] = {
+    [KC_E] = L'é',
+    [KC_U] = L'ú',
+    [KC_I] = L'í',
+    [KC_O] = L'ó',
+    [KC_A] = L'á',
+    [KC_Z] = L'ý',
+};
+static wchar_t map_carka_ucase[] = {
+    [KC_E] = L'É',
+    [KC_U] = L'Ú',
+    [KC_I] = L'Í',
+    [KC_O] = L'Ó',
+    [KC_A] = L'Á',
+    [KC_Z] = L'Ý',
+};
+static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length)
+{
+    if (key >= map_length)
+        return 0;
+    return map[key];
+}
+static wchar_t parse_ms_hacek(kbd_event_t *ev)
+{
+    wchar_t c;
+    mstate = ms_start;
+    /* Produce no characters when Ctrl or Alt is pressed. */
+    if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
+        return 0;
+    if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
+        c = translate(ev->key, map_hacek_ucase, sizeof(map_hacek_ucase) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_hacek_lcase, sizeof(map_hacek_lcase) / sizeof(wchar_t));
+    return c;
+}
+static wchar_t parse_ms_carka(kbd_event_t *ev)
+{
+    wchar_t c;
+    mstate = ms_start;
+    /* Produce no characters when Ctrl or Alt is pressed. */
+    if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
+        return 0;
+    if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
+        c = translate(ev->key, map_carka_ucase, sizeof(map_carka_ucase) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_carka_lcase, sizeof(map_carka_lcase) / sizeof(wchar_t));
+    return c;
+}
+static wchar_t parse_ms_start(kbd_event_t *ev)
+{
+    wchar_t c;
+    /* Produce no characters when Ctrl or Alt is pressed. */
+    if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
+        return 0;
+    if (ev->key == KC_EQUALS) {
+        if ((ev->mods & KM_SHIFT) != 0)
+            mstate = ms_hacek;
+        else
+            mstate = ms_carka;
+        return 0;
+    }
+    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_SHIFT) == 0) {
+        if ((ev->mods & KM_CAPS_LOCK) != 0)
+            c = translate(ev->key, map_ns_caps, sizeof(map_ns_caps) / sizeof(wchar_t));
+        else
+            c = translate(ev->key, map_ns_nocaps, sizeof(map_ns_nocaps) / sizeof(wchar_t));
+        if (c != 0)
+            return c;
+    }
+    if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
+        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_SHIFT) != 0)
+        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_NUM_LOCK) != 0)
+        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t));
+    else
+        c = 0;
+    return c;
+}
+static bool key_is_mod(unsigned key)
+{
+    switch (key) {
+    case KC_LSHIFT:
+    case KC_RSHIFT:
+    case KC_LALT:
+    case KC_RALT:
+    case KC_LCTRL:
+    case KC_RCTRL:
+        return true;
+    default:
+        return false;
+    }
+}
+static void layout_reset(void)
+{
+    mstate = ms_start;
+}
+static wchar_t layout_parse_ev(kbd_event_t *ev)
+{
+    if (ev->type != KE_PRESS)
+        return '\0';
+    if (key_is_mod(ev->key))
+        return '\0';
+    switch (mstate) {
+    case ms_start: return parse_ms_start(ev);
+    case ms_hacek: return parse_ms_hacek(ev);
+    case ms_carka: return parse_ms_carka(ev);
+    }
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/kbd/layout/us_dvorak.c
 ,0 → 1,250
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup kbd
+ * @brief US Dvorak Simplified Keyboard layout.
+ * @{
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <layout.h>
+static void layout_reset(void);
+static wchar_t layout_parse_ev(kbd_event_t *ev);
+layout_op_t us_dvorak_op = {
+    layout_reset,
+    layout_parse_ev
+};
+static wchar_t map_lcase[] = {
+    [KC_R] = 'p',
+    [KC_T] = 'y',
+    [KC_Y] = 'f',
+    [KC_U] = 'g',
+    [KC_I] = 'c',
+    [KC_O] = 'r',
+    [KC_P] = 'l',
+    [KC_A] = 'a',
+    [KC_S] = 'o',
+    [KC_D] = 'e',
+    [KC_F] = 'u',
+    [KC_G] = 'i',
+    [KC_H] = 'd',
+    [KC_J] = 'h',
+    [KC_K] = 't',
+    [KC_L] = 'n',
+    [KC_SEMICOLON] = 's',
+    [KC_X] = 'q',
+    [KC_C] = 'j',
+    [KC_V] = 'k',
+    [KC_B] = 'x',
+    [KC_N] = 'b',
+    [KC_M] = 'm',
+    [KC_COMMA] = 'w',
+    [KC_PERIOD] = 'v',
+    [KC_SLASH] = 'z',
+};
+static wchar_t map_ucase[] = {
+    [KC_R] = 'P',
+    [KC_T] = 'Y',
+    [KC_Y] = 'F',
+    [KC_U] = 'G',
+    [KC_I] = 'C',
+    [KC_O] = 'R',
+    [KC_P] = 'L',
+    [KC_A] = 'A',
+    [KC_S] = 'O',
+    [KC_D] = 'E',
+    [KC_F] = 'U',
+    [KC_G] = 'I',
+    [KC_H] = 'D',
+    [KC_J] = 'H',
+    [KC_K] = 'T',
+    [KC_L] = 'N',
+    [KC_SEMICOLON] = 'S',
+    [KC_X] = 'Q',
+    [KC_C] = 'J',
+    [KC_V] = 'K',
+    [KC_B] = 'X',
+    [KC_N] = 'B',
+    [KC_M] = 'M',
+    [KC_COMMA] = 'W',
+    [KC_PERIOD] = 'V',
+    [KC_SLASH] = 'Z',
+};
+static wchar_t map_not_shifted[] = {
+    [KC_BACKTICK] = '`',
+    [KC_1] = '1',
+    [KC_2] = '2',
+    [KC_3] = '3',
+    [KC_4] = '4',
+    [KC_5] = '5',
+    [KC_6] = '6',
+    [KC_7] = '7',
+    [KC_8] = '8',
+    [KC_9] = '9',
+    [KC_0] = '0',
+    [KC_MINUS] = '[',
+    [KC_EQUALS] = ']',
+    [KC_Q] = '\'',
+    [KC_W] = ',',
+    [KC_E] = '.',
+    [KC_LBRACKET] = '/',
+    [KC_RBRACKET] = '=',
+    [KC_QUOTE] = '-',
+    [KC_BACKSLASH] = '\\',
+    [KC_Z] = ';',
+};
+static wchar_t map_shifted[] = {
+    [KC_BACKTICK] = '~',
+    [KC_1] = '!',
+    [KC_2] = '@',
+    [KC_3] = '#',
+    [KC_4] = '$',
+    [KC_5] = '%',
+    [KC_6] = '^',
+    [KC_7] = '&',
+    [KC_8] = '*',
+    [KC_9] = '(',
+    [KC_0] = ')',
+    [KC_MINUS] = '{',
+    [KC_EQUALS] = '}',
+    [KC_Q] = '"',
+    [KC_W] = '<',
+    [KC_E] = '>',
+    [KC_LBRACKET] = '?',
+    [KC_RBRACKET] = '+',
+    [KC_QUOTE] = '_',
+    [KC_BACKSLASH] = '|',
+    [KC_Z] = ':',
+};
+static wchar_t map_neutral[] = {
+    [KC_BACKSPACE] = '\b',
+    [KC_TAB] = '\t',
+    [KC_ENTER] = '\n',
+    [KC_SPACE] = ' ',
+    [KC_NSLASH] = '/',
+    [KC_NTIMES] = '*',
+    [KC_NMINUS] = '-',
+    [KC_NPLUS] = '+',
+    [KC_NENTER] = '\n'
+};
+static wchar_t map_numeric[] = {
+    [KC_N7] = '7',
+    [KC_N8] = '8',
+    [KC_N9] = '9',
+    [KC_N4] = '4',
+    [KC_N5] = '5',
+    [KC_N6] = '6',
+    [KC_N1] = '1',
+    [KC_N2] = '2',
+    [KC_N3] = '3',
+    [KC_N0] = '0',
+    [KC_NPERIOD] = '.'
+};
+static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length)
+{
+    if (key >= map_length)
+        return 0;
+    return map[key];
+}
+static void layout_reset(void)
+{
+}
+static wchar_t layout_parse_ev(kbd_event_t *ev)
+{
+    wchar_t c;
+    /* Produce no characters when Ctrl or Alt is pressed. */
+    if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
+        return 0;
+    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
+        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_SHIFT) != 0)
+        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t));
+    else
+        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t));
+    if (c != 0)
+        return c;
+    if ((ev->mods & KM_NUM_LOCK) != 0)
+        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t));
+    else
+        c = 0;
+    return c;
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/ns/ns.c
 ,11 → 28,11
 /** @addtogroup ns
  * @{
- */
+ */
 /**
- * @file    ns.c
- * @brief   Naming service for HelenOS IPC.
+ * @file  ns.c
+ * @brief Naming service for HelenOS IPC.
  */
 ,6 → 40,7
 #include <ipc/ns.h>
 #include <ipc/services.h>
 #include <stdio.h>
+#include <bool.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 ,17 → 48,24
 #include <libadt/list.h>
 #include <libadt/hash_table.h>
 #include <sysinfo.h>
+#include <loader/loader.h>
 #include <ddi.h>
 #include <as.h>
-#define NAME    "ns"
+#define NAME  "ns"
-#define NS_HASH_TABLE_CHAINS    20
+#define NS_HASH_TABLE_CHAINS  20
 static int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call);
-static int connect_to_service(ipcarg_t service, ipc_call_t *call,
+static void connect_to_service(ipcarg_t service, ipc_call_t *call,
     ipc_callid_t callid);
+void register_clonable(ipcarg_t service, ipcarg_t phone, ipc_call_t *call,
+    ipc_callid_t callid);
+void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
+    ipc_callid_t callid);
 /* Static functions implementing NS hash table operations. */
 static hash_index_t ns_hash(unsigned long *key);
 static int ns_compare(unsigned long *key, hash_count_t keys, link_t *item);
 ,60 → 84,128
 /** NS hash table item. */
 typedef struct {
     link_t link;
-    ipcarg_t service;       /**< Number of the service. */
-    ipcarg_t phone;         /**< Phone registered with the service. */
-    ipcarg_t in_phone_hash;     /**< Incoming phone hash. */
+    ipcarg_t service;        /**< Number of the service. */
+    ipcarg_t phone;          /**< Phone registered with the service. */
+    ipcarg_t in_phone_hash;  /**< Incoming phone hash. */
 } hashed_service_t;
+/** Pending connection structure. */
+typedef struct {
+    link_t link;
+    ipcarg_t service;        /**< Number of the service. */
+    ipc_callid_t callid;     /**< Call ID waiting for the connection */
+    ipcarg_t arg2;           /**< Second argument */
+    ipcarg_t arg3;           /**< Third argument */
+} pending_req_t;
+static link_t pending_req;
+/** Request for connection to a clonable service. */
+typedef struct {
+    link_t link;
+    ipcarg_t service;
+    ipc_call_t call;
+    ipc_callid_t callid;
+} cs_req_t;
+/** List of clonable-service connection requests. */
+static link_t cs_req;
 static void *clockaddr = NULL;
 static void *klogaddr = NULL;
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name,
-    void **addr)
+/** Return true if @a service is clonable. */
+static bool service_clonable(int service)
 {
-    void *ph_addr;
+    return (service == SERVICE_LOAD);
+}
-    if (!*addr) {
-        ph_addr = (void *) sysinfo_value(name);
-        if (!ph_addr) {
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, void *ph_addr, count_t pages, void **addr)
+{
+    if (ph_addr == NULL) {
+        ipc_answer_0(callid, ENOENT);
+        return;
+    }
+    if (*addr == NULL) {
+        *addr = as_get_mappable_page(pages * PAGE_SIZE);
+        if (*addr == NULL) {
             ipc_answer_0(callid, ENOENT);
             return;
         }
-        *addr = as_get_mappable_page(PAGE_SIZE);
-        physmem_map(ph_addr, *addr, 1,
-            AS_AREA_READ | AS_AREA_CACHEABLE);
+        if (physmem_map(ph_addr, *addr, pages,
+            AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
+            ipc_answer_0(callid, ENOENT);
+            return;
+        }
     }
     ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
 }
+/** Process pending connection requests */
+static void process_pending_req()
+{
+    link_t *cur;
+loop:
+    for (cur = pending_req.next; cur != &pending_req; cur = cur->next) {
+        pending_req_t *pr = list_get_instance(cur, pending_req_t, link);
+        unsigned long keys[3] = {
+            pr->service,
+,
+        };
+        link_t *link = hash_table_find(&ns_hash_table, keys);
+        if (!link)
+            continue;
+        hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
+        ipcarg_t retval = ipc_forward_fast(pr->callid, hs->phone,
+            pr->arg2, pr->arg3, 0, IPC_FF_NONE);
+        if (!(pr->callid & IPC_CALLID_NOTIFICATION))
+            ipc_answer_0(pr->callid, retval);
+        list_remove(cur);
+        free(pr);
+        goto loop;
+    }
+}
 int main(int argc, char **argv)
 {
     printf(NAME ": HelenOS IPC Naming Service\n");
-    ipc_call_t call;
-    ipc_callid_t callid;
-    ipcarg_t retval;
     if (!hash_table_create(&ns_hash_table, NS_HASH_TABLE_CHAINS, 3,
         &ns_hash_table_ops)) {
-        printf(NAME ": No memory available\n");
+        printf(NAME ": No memory available for services\n");
         return ENOMEM;
     }
+    list_initialize(&pending_req);
+    list_initialize(&cs_req);
     printf(NAME ": Accepting connections\n");
-    while (1) {
-        callid = ipc_wait_for_call(&call);
+    while (true) {
+        process_pending_req();
+        ipc_call_t call;
+        ipc_callid_t callid = ipc_wait_for_call(&call);
+        ipcarg_t retval;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_SHARE_IN:
             switch (IPC_GET_ARG3(call)) {
             case SERVICE_MEM_REALTIME:
-                get_as_area(callid, &call, "clock.faddr",
-                    &clockaddr);
+                get_as_area(callid, &call, sysinfo_value("clock.faddr"), 1, &clockaddr);
                 break;
             case SERVICE_MEM_KLOG:
-                get_as_area(callid, &call, "klog.faddr",
-                    &klogaddr);
+                get_as_area(callid, &call, sysinfo_value("klog.faddr"), sysinfo_value("klog.pages"), &klogaddr);
                 break;
             default:
                 ipc_answer_0(callid, ENOENT);
 ,23 → 218,36
             /*
              * Server requests service registration.
              */
-            retval = register_service(IPC_GET_ARG1(call),
-                IPC_GET_ARG5(call), &call);
+            if (service_clonable(IPC_GET_ARG1(call))) {
+                register_clonable(IPC_GET_ARG1(call),
+                    IPC_GET_ARG5(call), &call, callid);
+                continue;
+            } else {
+                retval = register_service(IPC_GET_ARG1(call),
+                    IPC_GET_ARG5(call), &call);
+            }
             break;
         case IPC_M_CONNECT_ME_TO:
             /*
              * Client requests to be connected to a service.
              */
-            retval = connect_to_service(IPC_GET_ARG1(call), &call,
-                callid);
+            if (service_clonable(IPC_GET_ARG1(call))) {
+                connect_to_clonable(IPC_GET_ARG1(call),
+                    &call, callid);
+                continue;
+            } else {
+                connect_to_service(IPC_GET_ARG1(call), &call,
+                    callid);
+                continue;
+            }
             break;
         default:
             retval = ENOENT;
             break;
         }
-        if (!(callid & IPC_CALLID_NOTIFICATION)) {
+        if (!(callid & IPC_CALLID_NOTIFICATION))
             ipc_answer_0(callid, retval);
-        }
     }
     /* Not reached */
 ,10 → 257,11
 /** Register service.
  *
  * @param service Service to be registered.
- * @param phone Phone to be used for connections to the service.
- * @param call Pointer to call structure.
+ * @param phone   Phone to be used for connections to the service.
+ * @param call    Pointer to call structure.
  *
  * @return Zero on success or a value from @ref errno.h.
+ *
  */
 int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
 {
 ,23 → 270,20
         call->in_phone_hash,
     };
-    hashed_service_t *hs;
-    if (hash_table_find(&ns_hash_table, keys)) {
+    if (hash_table_find(&ns_hash_table, keys))
         return EEXISTS;
-    }
-    hs = (hashed_service_t *) malloc(sizeof(hashed_service_t));
-    if (!hs) {
+    hashed_service_t *hs = (hashed_service_t *) malloc(sizeof(hashed_service_t));
+    if (!hs)
         return ENOMEM;
-    }
     link_initialize(&hs->link);
     hs->service = service;
     hs->phone = phone;
     hs->in_phone_hash = call->in_phone_hash;
     hash_table_insert(&ns_hash_table, keys, &hs->link);
     return 0;
 }
 ,36 → 290,135
 /** Connect client to service.
  *
  * @param service Service to be connected to.
- * @param call Pointer to call structure.
- * @param callid Call ID of the request.
+ * @param call    Pointer to call structure.
+ * @param callid  Call ID of the request.
  *
  * @return Zero on success or a value from @ref errno.h.
+ *
  */
-int connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
+void connect_to_service(ipcarg_t service, ipc_call_t *call, ipc_callid_t callid)
 {
-    unsigned long keys[3] = { service, 0, 0 };
-    link_t *hlp;
-    hashed_service_t *hs;
+    ipcarg_t retval;
+    unsigned long keys[3] = {
+        service,
+,
+    };
+    link_t *link = hash_table_find(&ns_hash_table, keys);
+    if (!link) {
+        if (IPC_GET_ARG4(*call) & IPC_FLAG_BLOCKING) {
+            /* Blocking connection, add to pending list */
+            pending_req_t *pr = (pending_req_t *) malloc(sizeof(pending_req_t));
+            if (!pr) {
+                retval = ENOMEM;
+                goto out;
+            }
-    hlp = hash_table_find(&ns_hash_table, keys);
-    if (!hlp) {
-        return ENOENT;
+            pr->service = service;
+            pr->callid = callid;
+            pr->arg2 = IPC_GET_ARG2(*call);
+            pr->arg3 = IPC_GET_ARG3(*call);
+            list_append(&pr->link, &pending_req);
+            return;
+        }
+        retval = ENOENT;
+        goto out;
     }
-    hs = hash_table_get_instance(hlp, hashed_service_t, link);
-    return ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
-        IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+    hashed_service_t *hs = hash_table_get_instance(link, hashed_service_t, link);
+    retval = ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
+        IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
+out:
+    if (!(callid & IPC_CALLID_NOTIFICATION))
+        ipc_answer_0(callid, retval);
 }
+/** Register clonable service.
+ *
+ * @param service Service to be registered.
+ * @param phone   Phone to be used for connections to the service.
+ * @param call    Pointer to call structure.
+ *
+ */
+void register_clonable(ipcarg_t service, ipcarg_t phone, ipc_call_t *call,
+    ipc_callid_t callid)
+{
+    if (list_empty(&cs_req)) {
+        /* There was no pending connection request. */
+        printf(NAME ": Unexpected clonable server.\n");
+        ipc_answer_0(callid, EBUSY);
+        return;
+    }
+    cs_req_t *csr = list_get_instance(cs_req.next, cs_req_t, link);
+    list_remove(&csr->link);
+    /* Currently we can only handle a single type of clonable service. */
+    assert(csr->service == SERVICE_LOAD);
+    ipc_answer_0(callid, EOK);
+    int rc = ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
+        IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
+    free(csr);
+    ipc_hangup(phone);
+}
+/** Connect client to clonable service.
+ *
+ * @param service Service to be connected to.
+ * @param call    Pointer to call structure.
+ * @param callid  Call ID of the request.
+ *
+ * @return Zero on success or a value from @ref errno.h.
+ *
+ */
+void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
+    ipc_callid_t callid)
+{
+    assert(service == SERVICE_LOAD);
+    cs_req_t *csr = malloc(sizeof(cs_req_t));
+    if (csr == NULL) {
+        ipc_answer_0(callid, ENOMEM);
+        return;
+    }
+    /* Spawn a loader. */
+    int rc = loader_spawn("loader");
+    if (rc < 0) {
+        free(csr);
+        ipc_answer_0(callid, rc);
+        return;
+    }
+    csr->service = service;
+    csr->call = *call;
+    csr->callid = callid;
+    /*
+     * We can forward the call only after the server we spawned connects
+     * to us. Meanwhile we might need to service more connection requests.
+     * Thus we store the call in a queue.
+     */
+    list_append(&csr->link, &cs_req);
+}
 /** Compute hash index into NS hash table.
  *
  * @param key Pointer keys. However, only the first key (i.e. service number)
- *        is used to compute the hash index.
+ *            is used to compute the hash index.
+ *
  * @return Hash index corresponding to key[0].
+ *
  */
 hash_index_t ns_hash(unsigned long *key)
 {
     assert(key);
-    return *key % NS_HASH_TABLE_CHAINS;
+    return (*key % NS_HASH_TABLE_CHAINS);
 }
 /** Compare a key with hashed item.
 ,20 → 429,20
  * value. Note that this is close to being classified
  * as a nasty hack.
  *
- * @param key Array of keys.
+ * @param key  Array of keys.
  * @param keys Must be lesser or equal to 3.
  * @param item Pointer to a hash table item.
+ *
  * @return Non-zero if the key matches the item, zero otherwise.
+ *
  */
 int ns_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-    hashed_service_t *hs;
     assert(key);
     assert(keys <= 3);
     assert(item);
-    hs = hash_table_get_instance(item, hashed_service_t, link);
+    hashed_service_t *hs = hash_table_get_instance(item, hashed_service_t, link);
     if (keys == 2)
         return key[1] == hs->in_phone_hash;
 ,6 → 453,7
 /** Perform actions after removal of item from the hash table.
  *
  * @param item Item that was removed from the hash table.
+ *
  */
 void ns_remove(link_t *item)
 {
 ,6 → 461,6
     free(hash_table_get_instance(item, hashed_service_t, link));
 }
-/**
+/**
  * @}
  */

 /branches/tracing/uspace/srv/ns/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,13 → 52,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/fhc/fhc.c
 ,0 → 1,157
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup fhc
+ * @{
+ */
+/**
+ * @file    fhc.c
+ * @brief   FHC bus controller driver.
+ */
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <ipc/bus.h>
+#include <ipc/ns.h>
+#include <sysinfo.h>
+#include <as.h>
+#include <ddi.h>
+#include <align.h>
+#include <bool.h>
+#include <errno.h>
+#include <async.h>
+#include <align.h>
+#include <async.h>
+#include <stdio.h>
+#include <ipc/devmap.h>
+#define NAME "fhc"
+#define FHC_UART_INR    0x39
+#define FHC_UART_IMAP   0x0
+#define FHC_UART_ICLR   0x4
+static void *fhc_uart_phys;
+static volatile uint32_t *fhc_uart_virt;
+static size_t fhc_uart_size;
+/** Handle one connection to fhc.
+ *
+ * @param iid       Hash of the request that opened the connection.
+ * @param icall     Call data of the request that opened the connection.
+ */
+static void fhc_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+    ipc_callid_t callid;
+    ipc_call_t call;
+    /*
+     * Answer the first IPC_M_CONNECT_ME_TO call.
+     */
+    ipc_answer_0(iid, EOK);
+    while (1) {
+        int inr;
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
+        case BUS_CLEAR_INTERRUPT:
+            inr = IPC_GET_ARG1(call);
+            switch (inr) {
+            case FHC_UART_INR:
+                fhc_uart_virt[FHC_UART_ICLR] = 0;
+                ipc_answer_0(callid, EOK);
+                break;
+            default:
+                ipc_answer_0(callid, ENOTSUP);
+                break;
+            }
+            break;
+        default:
+            ipc_answer_0(callid, EINVAL);
+            break;
+        }
+    }
+}
+/** Initialize the FHC driver.
+ *
+ * So far, the driver heavily depends on information provided by the kernel via
+ * sysinfo. In the future, there should be a standalone FHC driver.
+ */
+static bool fhc_init(void)
+{
+    ipcarg_t phonead;
+    fhc_uart_size = sysinfo_value("fhc.uart.size");
+    fhc_uart_phys = (void *) sysinfo_value("fhc.uart.physical");
+    if (!fhc_uart_size) {
+        printf(NAME ": no FHC UART registers found\n");
+        return false;
+    }
+    fhc_uart_virt = as_get_mappable_page(fhc_uart_size);
+    int flags = AS_AREA_READ | AS_AREA_WRITE;
+    int retval = physmem_map(fhc_uart_phys, (void *) fhc_uart_virt,
+        ALIGN_UP(fhc_uart_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
+    if (retval < 0) {
+        printf(NAME ": Error mapping FHC UART registers\n");
+        return false;
+    }
+    printf(NAME ": FHC UART registers at %p, %d bytes\n", fhc_uart_phys,
+        fhc_uart_size);
+    async_set_client_connection(fhc_connection);
+    ipc_connect_to_me(PHONE_NS, SERVICE_FHC, 0, 0, &phonead);
+    return true;
+}
+int main(int argc, char **argv)
+{
+    printf(NAME ": HelenOS FHC bus controller driver\n");
+    if (!fhc_init())
+        return -1;
+    printf(NAME ": Accepting connections\n");
+    async_manager();
+    /* Never reached */
+    return 0;
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/fhc/Makefile
 ,0 → 1,76
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Setup toolchain
+#
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
+## Sources
+#
+OUTPUT = fhc
+SOURCES = \
+    fhc.c
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(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
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/tracing/uspace/srv/console/console.c
 ,12 → 35,13
 #include <libc.h>
 #include <fb.h>
 #include <ipc/ipc.h>
-#include <keys.h>
+#include <kbd.h>
+#include <kbd/keycode.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
 #include <errno.h>
 #include <key_buffer.h>
-#include <console.h>
+#include <ipc/console.h>
 #include <unistd.h>
 #include <async.h>
 #include <libadt/fifo.h>
 ,7 → 48,11
 #include <screenbuffer.h>
 #include <sys/mman.h>
 #include <stdio.h>
+#include <string.h>
+#include <sysinfo.h>
+#include <event.h>
+#include "console.h"
 #include "gcons.h"
 #define MAX_KEYREQUESTS_BUFFERED 32
 ,9 → 62,12
 /** Index of currently used virtual console.
  */
 int active_console = 0;
+int prev_console = 0;
-/** Information about framebuffer
- */
+/** Phone to the keyboard driver. */
+static int kbd_phone;
+/** Information about framebuffer */
 struct {
     int phone;      /**< Framebuffer phone */
     ipcarg_t rows;      /**< Framebuffer rows */
 ,10 → 94,22
                          * faster virtual console
                          * switching */
-static int kernel_pixmap = -1;  /**< Number of fb pixmap, where kernel
-                 * console is stored */
+/** Information on row-span yet unsent to FB driver. */
+struct {
+    int row;        /**< Row where the span lies. */
+    int col;        /**< Leftmost column of the span. */
+    int n;          /**< Width of the span. */
+} fb_pending;
+/** Size of cwrite_buf. */
+#define CWRITE_BUF_SIZE 256
+/** Buffer for receiving data via the CONSOLE_WRITE call from the client. */
+static char cwrite_buf[CWRITE_BUF_SIZE];
+static void fb_putchar(wchar_t c, int row, int col);
 /** Find unused virtual console.
  *
  */
 ,42 → 129,168
     async_msg_0(fb_info.phone, FB_CLEAR);
 }
-static void curs_visibility(int v)
+static void curs_visibility(bool visible)
 {
-    async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, v);
+    async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, visible);
 }
+static void curs_hide_sync(void)
+{
+    ipc_call_sync_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false);
+}
 static void curs_goto(int row, int col)
 {
     async_msg_2(fb_info.phone, FB_CURSOR_GOTO, row, col);
 }
-static void set_style(style_t *style)
+static void screen_yield(void)
 {
-    async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color,
-        style->bg_color);
+    ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_YIELD);
 }
-static void set_style_col(int fgcolor, int bgcolor)
+static void screen_reclaim(void)
 {
-    async_msg_2(fb_info.phone, FB_SET_STYLE, fgcolor, bgcolor);
+    ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_RECLAIM);
 }
-static void prtchr(char c, int row, int col)
+static void kbd_yield(void)
 {
-    async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
+    ipc_call_sync_0_0(kbd_phone, KBD_YIELD);
 }
-/** Check key and process special keys.
+static void kbd_reclaim(void)
+{
+    ipc_call_sync_0_0(kbd_phone, KBD_RECLAIM);
+}
+static void set_style(int style)
+{
+    async_msg_1(fb_info.phone, FB_SET_STYLE, style);
+}
+static void set_color(int fgcolor, int bgcolor, int flags)
+{
+    async_msg_3(fb_info.phone, FB_SET_COLOR, fgcolor, bgcolor, flags);
+}
+static void set_rgb_color(int fgcolor, int bgcolor)
+{
+    async_msg_2(fb_info.phone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
+}
+static void set_attrs(attrs_t *attrs)
+{
+    switch (attrs->t) {
+    case at_style:
+        set_style(attrs->a.s.style);
+        break;
+    case at_idx:
+        set_color(attrs->a.i.fg_color, attrs->a.i.bg_color,
+            attrs->a.i.flags);
+        break;
+    case at_rgb:
+        set_rgb_color(attrs->a.r.fg_color, attrs->a.r.bg_color);
+        break;
+    }
+}
+/** Send an area of screenbuffer to the FB driver. */
+static void fb_update_area(connection_t *conn, int x, int y, int w, int h)
+{
+    int i, j;
+    int rc;
+    attrs_t *attrs;
+    keyfield_t *field;
+    if (interbuffer) {
+        for (j = 0; j < h; j++) {
+            for (i = 0; i < w; i++) {
+                interbuffer[i + j * w] =
+                    *get_field_at(&conn->screenbuffer,
+                    x + i, y + j);
+            }
+        }
+        rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
+            x, y, w, h);
+    } else {
+        rc = ENOTSUP;
+    }
+    if (rc != 0) {
+        /*
+        attrs = &conn->screenbuffer.attrs;
+        for (j = 0; j < h; j++) {
+            for (i = 0; i < w; i++) {
+                field = get_field_at(&conn->screenbuffer,
+                    x + i, y + j);
+                if (!attrs_same(*attrs, field->attrs))
+                    set_attrs(&field->attrs);
+                attrs = &field->attrs;
+                fb_putchar(field->character, y + j, x + i);
+            }
+        }*/
+    }
+}
+/** Flush pending cells to FB. */
+static void fb_pending_flush(void)
+{
+    screenbuffer_t *scr;
+    scr = &(connections[active_console].screenbuffer);
+    if (fb_pending.n > 0) {
+        fb_update_area(&connections[active_console], fb_pending.col,
+            fb_pending.row, fb_pending.n, 1);
+        fb_pending.n = 0;
+    }
+}
+/** Mark a character cell as changed.
  *
- *
+ * This adds the cell to the pending rowspan if possible. Otherwise
+ * the old span is flushed first.
  */
-static void write_char(int console, char key)
+static void cell_mark_changed(int row, int col)
 {
+    if (fb_pending.n != 0) {
+        if (row != fb_pending.row ||
+            col != fb_pending.col + fb_pending.n) {
+            fb_pending_flush();
+        }
+    }
+    if (fb_pending.n == 0) {
+        fb_pending.row = row;
+        fb_pending.col = col;
+    }
+    ++fb_pending.n;
+}
+/** Print a character to the active VC with buffering. */
+static void fb_putchar(wchar_t c, int row, int col)
+{
+    async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
+}
+/** Process a character from the client (TTY emulation). */
+static void write_char(int console, wchar_t ch)
+{
+    bool flush_cursor = false;
     screenbuffer_t *scr = &(connections[console].screenbuffer);
-    switch (key) {
+    switch (ch) {
     case '\n':
+        fb_pending_flush();
+        flush_cursor = true;
         scr->position_y++;
         scr->position_x = 0;
         break;
 ,20 → 305,24
             break;
         scr->position_x--;
         if (console == active_console)
-            prtchr(' ', scr->position_y, scr->position_x);
+            cell_mark_changed(scr->position_y, scr->position_x);
         screenbuffer_putchar(scr, ' ');
         break;
     default:
         if (console == active_console)
-            prtchr(key, scr->position_y, scr->position_x);
+            cell_mark_changed(scr->position_y, scr->position_x);
-        screenbuffer_putchar(scr, key);
+        screenbuffer_putchar(scr, ch);
         scr->position_x++;
     }
+    if (scr->position_x >= scr->size_x) {
+        flush_cursor = true;
+        scr->position_y++;
+    }
-    scr->position_y += (scr->position_x >= scr->size_x);
     if (scr->position_y >= scr->size_y) {
+        fb_pending_flush();
         scr->position_y = scr->size_y - 1;
         screenbuffer_clear_line(scr, scr->top_line);
         scr->top_line = (scr->top_line + 1) % scr->size_y;
 ,122 → 329,99
         if (console == active_console)
             async_msg_1(fb_info.phone, FB_SCROLL, 1);
     }
     scr->position_x = scr->position_x % scr->size_x;
-    if (console == active_console)
+    if (console == active_console && flush_cursor)
         curs_goto(scr->position_y, scr->position_x);
 }
-/** Save current screen to pixmap, draw old pixmap
- *
- * @param oldpixmap Old pixmap
- * @return ID of pixmap of current screen
- */
-static int switch_screens(int oldpixmap)
-{
-    int newpmap;
-    /* Save screen */
-    newpmap = async_req_0_0(fb_info.phone, FB_VP2PIXMAP);
-    if (newpmap < 0)
-        return -1;
-    if (oldpixmap != -1) {
-        /* Show old screen */
-        async_msg_2(fb_info.phone, FB_VP_DRAW_PIXMAP, 0, oldpixmap);
-        /* Drop old pixmap */
-        async_msg_1(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
-    }
-    return newpmap;
-}
 /** Switch to new console */
 static void change_console(int newcons)
 {
     connection_t *conn;
-    static int console_pixmap = -1;
     int i, j, rc;
     keyfield_t *field;
-    style_t *style;
+    attrs_t *attrs;
     if (newcons == active_console)
         return;
+    fb_pending_flush();
     if (newcons == KERNEL_CONSOLE) {
-        if (active_console == KERNEL_CONSOLE)
-            return;
-        active_console = KERNEL_CONSOLE;
-        curs_visibility(0);
         async_serialize_start();
-        if (kernel_pixmap == -1) {
-            /* store/restore unsupported */
-            set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
-            clrscr();
-        } else {
-            gcons_in_kernel();
-            console_pixmap = switch_screens(kernel_pixmap);
-            kernel_pixmap = -1;
-        }
+        curs_hide_sync();
+        gcons_in_kernel();
+        screen_yield();
+        kbd_yield();
         async_serialize_end();
-        __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
-        return;
-    }
+        if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
+            prev_console = active_console;
+            active_console = KERNEL_CONSOLE;
+        } else
+            newcons = active_console;
+    }
-    async_serialize_start();
-    if (console_pixmap != -1) {
-        kernel_pixmap = switch_screens(console_pixmap);
-        console_pixmap = -1;
-    }
-    active_console = newcons;
-    gcons_change_console(newcons);
-    conn = &connections[active_console];
-    set_style(&conn->screenbuffer.style);
-    curs_visibility(0);
-    if (interbuffer) {
-        for (i = 0; i < conn->screenbuffer.size_x; i++)
+    if (newcons != KERNEL_CONSOLE) {
+        async_serialize_start();
+        if (active_console == KERNEL_CONSOLE) {
+            screen_reclaim();
+            kbd_reclaim();
+            gcons_redraw_console();
+        }
+        active_console = newcons;
+        gcons_change_console(newcons);
+        conn = &connections[active_console];
+        set_attrs(&conn->screenbuffer.attrs);
+        curs_visibility(false);
+        if (interbuffer) {
             for (j = 0; j < conn->screenbuffer.size_y; j++) {
-                unsigned int size_x;
-                size_x = conn->screenbuffer.size_x;
-                interbuffer[i + j * size_x] =
-                    *get_field_at(&conn->screenbuffer, i, j);
+                for (i = 0; i < conn->screenbuffer.size_x; i++) {
+                    unsigned int size_x;
+                    size_x = conn->screenbuffer.size_x;
+                    interbuffer[j * size_x + i] =
+                        *get_field_at(&conn->screenbuffer, i, j);
+                }
             }
-        /* This call can preempt, but we are already at the end */
-        rc = async_req_0_0(fb_info.phone, FB_DRAW_TEXT_DATA);
-    }
-    if ((!interbuffer) || (rc != 0)) {
-        set_style(&conn->screenbuffer.style);
-        clrscr();
-        style = &conn->screenbuffer.style;
+            /* This call can preempt, but we are already at the end */
+            rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
+, 0, conn->screenbuffer.size_x,
+                conn->screenbuffer.size_y);
+        }
+        if ((!interbuffer) || (rc != 0)) {
+            set_attrs(&conn->screenbuffer.attrs);
+            clrscr();
+            attrs = &conn->screenbuffer.attrs;
+            for (j = 0; j < conn->screenbuffer.size_y; j++)
+                for (i = 0; i < conn->screenbuffer.size_x; i++) {
+                    field = get_field_at(&conn->screenbuffer, i, j);
+                    if (!attrs_same(*attrs, field->attrs))
+                        set_attrs(&field->attrs);
+                    attrs = &field->attrs;
+                    if ((field->character == ' ') &&
+                        (attrs_same(field->attrs,
+                        conn->screenbuffer.attrs)))
+                        continue;
-        for (j = 0; j < conn->screenbuffer.size_y; j++)
-            for (i = 0; i < conn->screenbuffer.size_x; i++) {
-                field = get_field_at(&conn->screenbuffer, i, j);
-                if (!style_same(*style, field->style))
-                    set_style(&field->style);
-                style = &field->style;
-                if ((field->character == ' ') &&
-                    (style_same(field->style,
-                    conn->screenbuffer.style)))
-                    continue;
-                prtchr(field->character, j, i);
-            }
+                    fb_putchar(field->character, j, i);
+                }
+        }
+        curs_goto(conn->screenbuffer.position_y,
+            conn->screenbuffer.position_x);
+        curs_visibility(conn->screenbuffer.is_cursor_visible);
+        async_serialize_end();
     }
-    curs_goto(conn->screenbuffer.position_y,
-        conn->screenbuffer.position_x);
-    curs_visibility(conn->screenbuffer.is_cursor_visible);
-    async_serialize_end();
 }
 /** Handler for keyboard */
 ,7 → 430,7
     ipc_callid_t callid;
     ipc_call_t call;
     int retval;
-    int c;
+    kbd_event_t ev;
     connection_t *conn;
     int newcon;
 ,22 → 452,24
                 IPC_GET_ARG2(call));
             retval = 0;
             break;
-        case KBD_PUSHCHAR:
-            /* got key from keyboard driver */
+        case KBD_EVENT:
+            /* Got event from keyboard driver. */
             retval = 0;
-            c = IPC_GET_ARG1(call);
+            ev.type = IPC_GET_ARG1(call);
+            ev.key = IPC_GET_ARG2(call);
+            ev.mods = IPC_GET_ARG3(call);
+            ev.c = IPC_GET_ARG4(call);
             /* switch to another virtual console */
             conn = &connections[active_console];
-/*
- *          if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 +
- *              CONSOLE_COUNT)) {
- */
-            if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
-                if (c == 0x112)
+            if ((ev.key >= KC_F1) && (ev.key < KC_F1 +
+                CONSOLE_COUNT) && ((ev.mods & KM_CTRL) == 0)) {
+                if (ev.key == KC_F12)
                     change_console(KERNEL_CONSOLE);
                 else
-                    change_console(c - 0x101);
+                    change_console(ev.key - KC_F1);
                 break;
             }
 ,14 → 476,14
             /* if client is awaiting key, send it */
             if (conn->keyrequest_counter > 0) {
                 conn->keyrequest_counter--;
-                ipc_answer_1(fifo_pop(conn->keyrequests), EOK,
-                    c);
+                ipc_answer_4(fifo_pop(conn->keyrequests), EOK,
+                    ev.type, ev.key, ev.mods, ev.c);
                 break;
             }
-            keybuffer_push(&conn->keybuffer, c);
+            keybuffer_push(&conn->keybuffer, &ev);
             retval = 0;
             break;
         default:
             retval = ENOENT;
 ,6 → 492,39
     }
 }
+/** Handle CONSOLE_WRITE call. */
+static void cons_write(int consnum, ipc_callid_t rid, ipc_call_t *request)
+{
+    ipc_callid_t callid;
+    size_t size;
+    wchar_t ch;
+    size_t off;
+    if (!ipc_data_write_receive(&callid, &size)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    if (size > CWRITE_BUF_SIZE)
+        size = CWRITE_BUF_SIZE;
+    (void) ipc_data_write_finalize(callid, cwrite_buf, size);
+    async_serialize_start();
+    off = 0;
+    while (off < size) {
+        ch = str_decode(cwrite_buf, &off, size);
+        write_char(consnum, ch);
+    }
+    async_serialize_end();
+    gcons_notify_char(consnum);
+    ipc_answer_1(rid, EOK, size);
+}
 /** Default thread for new connections */
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
 ,9 → 531,10
     ipc_callid_t callid;
     ipc_call_t call;
     int consnum;
-    ipcarg_t arg1, arg2;
+    ipcarg_t arg1, arg2, arg3, arg4;
     connection_t *conn;
+    screenbuffer_t *scr;
     if ((consnum = find_free_connection()) == -1) {
         ipc_answer_0(iid, ELIMIT);
         return;
 ,23 → 546,28
     gcons_notify_connect(consnum);
     conn->client_phone = IPC_GET_ARG5(*icall);
     screenbuffer_clear(&conn->screenbuffer);
+    if (consnum == active_console)
+        clrscr();
     /* Accept the connection */
     ipc_answer_0(iid, EOK);
     while (1) {
         async_serialize_end();
         callid = async_get_call(&call);
         async_serialize_start();
         arg1 = 0;
         arg2 = 0;
+        arg3 = 0;
+        arg4 = 0;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             gcons_notify_disconnect(consnum);
             /* Answer all pending requests */
-            while (conn->keyrequest_counter > 0) {
+            while (conn->keyrequest_counter > 0) {
                 conn->keyrequest_counter--;
                 ipc_answer_0(fifo_pop(conn->keyrequests),
                     ENOENT);
 ,6 → 579,11
             write_char(consnum, IPC_GET_ARG1(call));
             gcons_notify_char(consnum);
             break;
+        case CONSOLE_WRITE:
+            async_serialize_end();
+            cons_write(consnum, callid, &call);
+            async_serialize_start();
+            continue;
         case CONSOLE_CLEAR:
             /* Send message to fb */
             if (consnum == active_console) {
 ,24 → 605,48
             arg2 = fb_info.cols;
             break;
         case CONSOLE_FLUSH:
-            if (consnum == active_console)
+            fb_pending_flush();
+            if (consnum == active_console) {
                 async_req_0_0(fb_info.phone, FB_FLUSH);
+                scr = &(connections[consnum].screenbuffer);
+                curs_goto(scr->position_y, scr->position_x);
+            }
             break;
         case CONSOLE_SET_STYLE:
+            fb_pending_flush();
             arg1 = IPC_GET_ARG1(call);
+            screenbuffer_set_style(&conn->screenbuffer, arg1);
+            if (consnum == active_console)
+                set_style(arg1);
+            break;
+        case CONSOLE_SET_COLOR:
+            fb_pending_flush();
+            arg1 = IPC_GET_ARG1(call);
             arg2 = IPC_GET_ARG2(call);
-            screenbuffer_set_style(&conn->screenbuffer, arg1,
+            arg3 = IPC_GET_ARG3(call);
+            screenbuffer_set_color(&conn->screenbuffer, arg1,
+                arg2, arg3);
+            if (consnum == active_console)
+                set_color(arg1, arg2, arg3);
+            break;
+        case CONSOLE_SET_RGB_COLOR:
+            fb_pending_flush();
+            arg1 = IPC_GET_ARG1(call);
+            arg2 = IPC_GET_ARG2(call);
+            screenbuffer_set_rgb_color(&conn->screenbuffer, arg1,
                 arg2);
             if (consnum == active_console)
-                set_style_col(arg1, arg2);
+                set_rgb_color(arg1, arg2);
             break;
         case CONSOLE_CURSOR_VISIBILITY:
+            fb_pending_flush();
             arg1 = IPC_GET_ARG1(call);
             conn->screenbuffer.is_cursor_visible = arg1;
             if (consnum == active_console)
                 curs_visibility(arg1);
             break;
-        case CONSOLE_GETCHAR:
+        case CONSOLE_GETKEY:
             if (keybuffer_empty(&conn->keybuffer)) {
                 /* buffer is empty -> store request */
                 if (conn->keyrequest_counter <
 ,58 → 662,68
                 }
                 continue;
             }
-            int ch;
-            keybuffer_pop(&conn->keybuffer, &ch);
-            arg1 = ch;
+            kbd_event_t ev;
+            keybuffer_pop(&conn->keybuffer, &ev);
+            arg1 = ev.type;
+            arg2 = ev.key;
+            arg3 = ev.mods;
+            arg4 = ev.c;
             break;
+        case CONSOLE_KCON_ENABLE:
+            change_console(KERNEL_CONSOLE);
+            break;
         }
-        ipc_answer_2(callid, EOK, arg1, arg2);
+        ipc_answer_4(callid, EOK, arg1, arg2, arg3, arg4);
     }
 }
+static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
+{
+    change_console(prev_console);
+}
 int main(int argc, char *argv[])
 {
     printf(NAME ": HelenOS Console service\n");
     ipcarg_t phonehash;
-    int kbd_phone;
+    size_t ib_size;
     int i;
     async_set_client_connection(client_connection);
     /* Connect to keyboard driver */
-    kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-    while (kbd_phone < 0) {
-        usleep(10000);
-        kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+    kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+    if (kbd_phone < 0) {
+        printf(NAME ": Failed to connect to keyboard service\n");
+        return -1;
     }
-    if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
+    if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+        printf(NAME ": Failed to create callback from keyboard service\n");
         return -1;
+    }
     async_new_connection(phonehash, 0, NULL, keyboard_events);
     /* Connect to framebuffer driver */
-    fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
-    while (fb_info.phone < 0) {
-        usleep(10000);
-        fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
+    fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
+    if (fb_info.phone < 0) {
+        printf(NAME ": Failed to connect to video service\n");
+        return -1;
     }
-    /* Save old kernel screen */
-    kernel_pixmap = switch_screens(-1);
+    /* Disable kernel output to the console */
+    __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
     /* Initialize gcons */
     gcons_init(fb_info.phone);
     /* Synchronize, the gcons can have something in queue */
     async_req_0_0(fb_info.phone, FB_FLUSH);
-    /* Enable double buffering */
-    async_msg_2(fb_info.phone, FB_VIEWPORT_DB, (sysarg_t) -1, 1);
     async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.rows,
         &fb_info.cols);
-    set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
+    set_rgb_color(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
     clrscr();
     /* Init virtual consoles */
 ,33 → 743,46
         }
     }
     connections[KERNEL_CONSOLE].used = 1;
-    interbuffer = mmap(NULL,
-        sizeof(keyfield_t) * fb_info.cols * fb_info.rows,
-        PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
-    if (!interbuffer) {
+    /* Set up shared memory buffer. */
+    ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows;
+    interbuffer = as_get_mappable_page(ib_size);
+    fb_pending.n = 0;
+    if (as_area_create(interbuffer, ib_size, AS_AREA_READ |
+        AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer) {
+        interbuffer = NULL;
+    }
+    if (interbuffer) {
         if (ipc_share_out_start(fb_info.phone, interbuffer,
             AS_AREA_READ) != EOK) {
-            munmap(interbuffer,
-                sizeof(keyfield_t) * fb_info.cols * fb_info.rows);
+            as_area_destroy(interbuffer);
             interbuffer = NULL;
         }
     }
     curs_goto(0, 0);
     curs_visibility(
         connections[active_console].screenbuffer.is_cursor_visible);
     /* Register at NS */
     if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
         return -1;
+    /* Receive kernel notifications */
+    if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
+        printf(NAME ": Error registering kconsole notifications\n");
+    async_set_interrupt_received(interrupt_received);
     // FIXME: avoid connectiong to itself, keep using klog
     // printf(NAME ": Accepting connections\n");
     async_manager();
+    return 0;
+}
-    return 0;
-}
 /** @}
  */

 /branches/tracing/uspace/srv/console/console.h
 ,15 → 39,6
 #define CONSOLE_COUNT 12
-#define CONSOLE_GETCHAR     1026
-#define CONSOLE_PUTCHAR     1027
-#define CONSOLE_CLEAR       1028
-#define CONSOLE_GOTO        1029
-#define CONSOLE_GETSIZE     1030
-#define CONSOLE_FLUSH       1031
-#define CONSOLE_SET_STYLE   1032
-#define CONSOLE_CURSOR_VISIBILITY   1033
 #endif
 /** @}

 /branches/tracing/uspace/srv/console/gcons.c
 ,7 → 81,7
 static void vp_switch(int vp)
 {
-    async_msg_1(fbphone,FB_VIEWPORT_SWITCH, vp);
+    async_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp);
 }
 /** Create view port */
 ,15 → 97,15
     async_msg_0(fbphone, FB_CLEAR);
 }
-static void set_style(int fgcolor, int bgcolor)
+static void set_rgb_color(int fgcolor, int bgcolor)
 {
-    async_msg_2(fbphone, FB_SET_STYLE, fgcolor, bgcolor);
+    async_msg_2(fbphone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
 }
 /** Transparent putchar */
 static void tran_putch(char c, int row, int col)
 {
-    async_msg_3(fbphone, FB_TRANS_PUTCHAR, c, row, col);
+    async_msg_3(fbphone, FB_PUTCHAR, c, row, col);
 }
 /** Redraw the button showing state of a given console */
 ,10 → 189,10
         console_state[consnum] = CONS_DISCONNECTED_SEL;
     else
         console_state[consnum] = CONS_DISCONNECTED;
     if (active_console == KERNEL_CONSOLE)
         return;
     redraw_state(consnum);
     vp_switch(console_vp);
 }
 ,16 → 217,10
 /** Change to kernel console */
 void gcons_in_kernel(void)
 {
-    if (console_state[active_console] == CONS_DISCONNECTED_SEL)
-        console_state[active_console] = CONS_DISCONNECTED;
-    else
-        console_state[active_console] = CONS_IDLE;
-    redraw_state(active_console);
     if (animation != -1)
         async_msg_1(fbphone, FB_ANIM_STOP, animation);
-    active_console = KERNEL_CONSOLE; /* Set to kernel console */
+    active_console = KERNEL_CONSOLE;
     vp_switch(0);
 }
 ,22 → 336,23
 extern int _binary_helenos_ppm_size;
 extern char _binary_nameic_ppm_start[0];
 extern int _binary_nameic_ppm_size;
-/** Redraws console graphics  */
-static void gcons_redraw_console(void)
+/** Redraws console graphics */
+void gcons_redraw_console(void)
 {
     int i;
     if (!use_gcons)
         return;
     vp_switch(0);
-    set_style(MAIN_COLOR, MAIN_COLOR);
+    set_rgb_color(MAIN_COLOR, MAIN_COLOR);
     clear();
     draw_pixmap(_binary_helenos_ppm_start,
         (size_t) &_binary_helenos_ppm_size, xres - 66, 2);
     draw_pixmap(_binary_nameic_ppm_start,
         (size_t) &_binary_nameic_ppm_size, 5, 17);
     for (i = 0; i < CONSOLE_COUNT; i++)
         redraw_state(i);
     vp_switch(console_vp);
 ,16 → 454,16
     int rc;
     int i;
     int status_start = STATUS_START;
     fbphone = phone;
     rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
     if (rc)
         return;
-    if (xres < 800 || yres < 600)
+    if ((xres < 800) || (yres < 600))
         return;
     /* create console viewport */
     /* Align width & height to character size */
     console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP,
 ,7 → 481,7
         if (cstatus_vp[i] < 0)
             return;
         vp_switch(cstatus_vp[i]);
-        set_style(0x202020, 0xffffff);
+        set_rgb_color(0x202020, 0xffffff);
     }
     /* Initialize icons */
 ,13 → 501,12
     ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];
     make_anim();
     use_gcons = 1;
     console_state[0] = CONS_DISCONNECTED_SEL;
     console_state[KERNEL_CONSOLE] = CONS_KERNEL;
     gcons_redraw_console();
 }
 /** @}
  */

 /branches/tracing/uspace/srv/console/screenbuffer.c
 ,6 → 33,7
  */
 #include <screenbuffer.h>
+#include <console/style.h>
 #include <malloc.h>
 #include <unistd.h>
 ,14 → 43,14
  * @param scr   screenbuffer
  * @param c stored character
  */
-void screenbuffer_putchar(screenbuffer_t *scr, char c)
+void screenbuffer_putchar(screenbuffer_t *scr, wchar_t ch)
 {
     keyfield_t *field;
     field = get_field_at(scr, scr->position_x, scr->position_y);
-    field->character = c;
-    field->style = scr->style;
+    field->character = ch;
+    field->attrs = scr->attrs;
 }
 /** Initilize screenbuffer. Allocate space for screen content in accordance to given size.
 ,8 → 68,8
     scr->size_x = size_x;
     scr->size_y = size_y;
-    scr->style.fg_color = DEFAULT_FOREGROUND;
-    scr->style.bg_color = DEFAULT_BACKGROUND;
+    scr->attrs.t = at_style;
+    scr->attrs.a.s.style = STYLE_NORMAL;
     scr->is_cursor_visible = 1;
     screenbuffer_clear(scr);
 ,7 → 86,7
     for (i = 0; i < (scr->size_x * scr->size_y); i++) {
         scr->buffer[i].character = ' ';
-        scr->buffer[i].style = scr->style;
+        scr->buffer[i].attrs = scr->attrs;
     }
     scr->top_line = 0;
 ,7 → 104,7
     for (i = 0; i < scr->size_x; i++) {
         scr->buffer[i + line * scr->size_x].character = ' ';
-        scr->buffer[i + line * scr->size_x].style = scr->style;
+        scr->buffer[i + line * scr->size_x].attrs = scr->attrs;
     }
 }
 ,12 → 137,37
  * @param fg_color
  * @param bg_color
  */
-void screenbuffer_set_style(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
+void screenbuffer_set_style(screenbuffer_t *scr, int style)
 {
-    scr->style.fg_color = fg_color;
-    scr->style.bg_color = bg_color;
+    scr->attrs.t = at_style;
+    scr->attrs.a.s.style = style;
 }
+/** Set new color.
+ * @param scr
+ * @param fg_color
+ * @param bg_color
+ */
+void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color, unsigned int flags)
+{
+    scr->attrs.t = at_idx;
+    scr->attrs.a.i.fg_color = fg_color;
+    scr->attrs.a.i.bg_color = bg_color;
+    scr->attrs.a.i.flags = flags;
+}
+/** Set new RGB color.
+ * @param scr
+ * @param fg_color
+ * @param bg_color
+ */
+void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
+{
+    scr->attrs.t = at_rgb;
+    scr->attrs.a.r.fg_color = fg_color;
+    scr->attrs.a.r.bg_color = bg_color;
+}
 /** @}
  */

 /branches/tracing/uspace/srv/console/screenbuffer.h
 ,28 → 35,53
 #ifndef __SCREENBUFFER_H__
 #define __SCREENBUFFER_H__
+#include <stdint.h>
+#include <sys/types.h>
 #define DEFAULT_FOREGROUND 0x0  /**< default console foreground color */
 #define DEFAULT_BACKGROUND 0xf0f0f0 /**< default console background color */
 typedef struct {
-    unsigned int bg_color;      /**< background color */
-    unsigned int fg_color;      /**< foreground color */
-} style_t;
+    uint8_t style;
+} attr_style_t;
+typedef struct {
+    uint8_t fg_color;
+    uint8_t bg_color;
+    uint8_t flags;
+} attr_idx_t;
+typedef struct {
+    uint32_t bg_color;      /**< background color */
+    uint32_t fg_color;      /**< foreground color */
+} attr_rgb_t;
+typedef struct {
+    enum {
+        at_style,
+        at_idx,
+        at_rgb
+    } t;
+    union {
+        attr_style_t s;
+        attr_idx_t i;
+        attr_rgb_t r;
+    } a;
+} attrs_t;
 /** One field on screen. It contain one character and its attributes. */
 typedef struct {
-    char character;         /**< Character itself */
-    style_t style;          /**< Character`s attributes */
+    wchar_t character;      /**< Character itself */
+    attrs_t attrs;          /**< Character`s attributes */
 } keyfield_t;
 /** Structure for buffering state of one virtual console.
  */
 typedef struct {
-    keyfield_t *buffer;         /**< Screen content - characters and its style. Used as cyclyc buffer. */
+    keyfield_t *buffer;         /**< Screen content - characters and their attributes. Used as a circular buffer. */
     unsigned int size_x, size_y;        /**< Number of columns and rows */
     unsigned int position_x, position_y;    /**< Coordinates of last printed character for determining cursor position */
-    style_t style;              /**< Current style */
+    attrs_t attrs;              /**< Current attributes. */
     unsigned int top_line;          /**< Points to buffer[][] line that will be printed at screen as the first line */
     unsigned char is_cursor_visible;    /**< Cursor state - default is visible */
 } screenbuffer_t;
 ,23 → 92,32
  * @param y position on screen
  * @return  keyfield structure with character and its attributes on x,y
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y)
+static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y)
 {
     return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
 }
-/** Compares two styles.
+/** Compares two sets of attributes.
  * @param s1 first style
  * @param s2 second style
  * @return nonzero on equality
  */
-static inline int style_same(style_t s1, style_t s2)
+static inline int attrs_same(attrs_t a1, attrs_t a2)
 {
-    return s1.fg_color == s2.fg_color && s1.bg_color == s2.bg_color;
+    if (a1.t != a2.t) return 0;
+    switch (a1.t) {
+    case at_style: return a1.a.s.style == a2.a.s.style;
+    case at_idx: return a1.a.i.fg_color == a2.a.i.fg_color &&
+        a1.a.i.bg_color == a2.a.i.bg_color &&
+        a1.a.i.flags == a2.a.i.flags;
+    case at_rgb: return a1.a.r.fg_color == a2.a.r.fg_color &&
+        a1.a.r.bg_color == a2.a.r.bg_color;
+    }
 }
-void screenbuffer_putchar(screenbuffer_t *scr, char c);
+void screenbuffer_putchar(screenbuffer_t *scr, wchar_t c);
 screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y);
 void screenbuffer_clear(screenbuffer_t *scr);
 ,7 → 124,11
 void screenbuffer_clear_line(screenbuffer_t *scr, unsigned int line);
 void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest);
 void screenbuffer_goto(screenbuffer_t *scr, unsigned int x, unsigned int y);
-void screenbuffer_set_style(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color);
+void screenbuffer_set_style(screenbuffer_t *scr, int style);
+void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color,
+    unsigned int bg_color, unsigned int attr);
+void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color,
+    unsigned int bg_color);
 #endif

/branches/tracing/uspace/srv/console/gcons.h
36,6 → 36,7
#define _GCONS_H_

void gcons_init(int phone);
void gcons_redraw_console(void);
void gcons_change_console(int consnum);
void gcons_notify_char(int consnum);
void gcons_in_kernel(void);

 /branches/tracing/uspace/srv/console/Makefile
 ,12 → 29,11
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
-include $(LIBC_PREFIX)/Makefile.toolchain
+include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I. -I../kbd/include -I../fb
 LIBS = $(LIBC_PREFIX)/libc.a
 ,6 → 58,8
             $(addsuffix .o,$(basename $(IMAGES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
+OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
 .PHONY: all clean depend disasm
 all: $(OUTPUT) $(OUTPUT).disasm
 ,13 → 67,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(ARCH_OBJECTS) $(GENERIC_OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(GENERIC_OBJECTS) $(ARCH_OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS)
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/loader/main.c
 ,12 → 27,12
  */
 /** @addtogroup loader
- * @brief   Loads and runs programs from VFS.
+ * @brief Loads and runs programs from VFS.
  * @{
- */
+ */
 /**
  * @file
- * @brief   Loads and runs programs from VFS.
+ * @brief Loads and runs programs from VFS.
  *
  * The program loader is a special init binary. Its image is used
  * to create a new task upon a @c task_spawn syscall. The syscall
 ,8 → 50,10
 #include <fcntl.h>
 #include <sys/types.h>
 #include <ipc/ipc.h>
+#include <ipc/services.h>
 #include <ipc/loader.h>
 #include <loader/pcb.h>
+#include <console.h>
 #include <errno.h>
 #include <async.h>
 #include <as.h>
 ,6 → 61,8
 #include <elf.h>
 #include <elf_load.h>
+#define DPRINTF(...)
 /** Pathname of the file that will be loaded */
 static char *pathname = NULL;
 ,6 → 81,8
 static bool is_dyn_linked;
+/** Used to limit number of connections to one. */
+static bool connected;
 static void loader_get_taskid(ipc_callid_t rid, ipc_call_t *request)
 {
 ,17 → 89,18
     ipc_callid_t callid;
     task_id_t task_id;
     size_t len;
     task_id = task_get_id();
     if (!ipc_data_read_receive(&callid, &len)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
-    if (len > sizeof(task_id)) len = sizeof(task_id);
+    if (len > sizeof(task_id))
+        len = sizeof(task_id);
     ipc_data_read_finalize(callid, &task_id, len);
     ipc_answer_0(rid, EOK);
 }
 ,13 → 116,13
     ipc_callid_t callid;
     size_t len;
     char *name_buf;
     if (!ipc_data_write_receive(&callid, &len)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
     name_buf = malloc(len + 1);
     if (!name_buf) {
         ipc_answer_0(callid, ENOMEM);
 ,15 → 129,15
         ipc_answer_0(rid, ENOMEM);
         return;
     }
     ipc_data_write_finalize(callid, name_buf, len);
     ipc_answer_0(rid, EOK);
     if (pathname != NULL) {
         free(pathname);
         pathname = NULL;
     }
     name_buf[len] = '\0';
     pathname = name_buf;
 }
 ,55 → 150,53
 static void loader_set_args(ipc_callid_t rid, ipc_call_t *request)
 {
     ipc_callid_t callid;
-    size_t buf_len, arg_len;
+    size_t buf_size, arg_size;
     char *p;
     int n;
-    if (!ipc_data_write_receive(&callid, &buf_len)) {
+    if (!ipc_data_write_receive(&callid, &buf_size)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
     if (arg_buf != NULL) {
         free(arg_buf);
         arg_buf = NULL;
     }
     if (argv != NULL) {
         free(argv);
         argv = NULL;
     }
-    arg_buf = malloc(buf_len + 1);
+    arg_buf = malloc(buf_size + 1);
     if (!arg_buf) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
     }
-    ipc_data_write_finalize(callid, arg_buf, buf_len);
-    ipc_answer_0(rid, EOK);
-    arg_buf[buf_len] = '\0';
+    ipc_data_write_finalize(callid, arg_buf, buf_size);
+    arg_buf[buf_size] = '\0';
     /*
      * Count number of arguments
      */
     p = arg_buf;
     n = 0;
-    while (p < arg_buf + buf_len) {
-        arg_len = strlen(p);
-        p = p + arg_len + 1;
+    while (p < arg_buf + buf_size) {
+        arg_size = str_size(p);
+        p = p + arg_size + 1;
         ++n;
     }
     /* Allocate argv */
     argv = malloc((n + 1) * sizeof(char *));
     if (argv == NULL) {
         free(arg_buf);
-        ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
     }
 ,16 → 206,18
      */
     p = arg_buf;
     n = 0;
-    while (p < arg_buf + buf_len) {
+    while (p < arg_buf + buf_size) {
         argv[n] = p;
-        arg_len = strlen(p);
-        p = p + arg_len + 1;
+        arg_size = str_size(p);
+        p = p + arg_size + 1;
         ++n;
     }
     argc = n;
     argv[n] = NULL;
+    ipc_answer_0(rid, EOK);
 }
 /** Load the previously selected program.
 ,19 → 229,19
 static int loader_load(ipc_callid_t rid, ipc_call_t *request)
 {
     int rc;
     rc = elf_load_file(pathname, 0, &prog_info);
-    if (rc < 0) {
-        printf("Failed to load executable '%s'.\n", pathname);
+    if (rc != EE_OK) {
+        DPRINTF("Failed to load executable '%s'.\n", pathname);
         ipc_answer_0(rid, EINVAL);
         return 1;
     }
     elf_create_pcb(&prog_info, &pcb);
     pcb.argc = argc;
     pcb.argv = argv;
     if (prog_info.interp == NULL) {
         /* Statically linked program */
         is_dyn_linked = false;
 ,17 → 248,18
         ipc_answer_0(rid, EOK);
         return 0;
     }
     rc = elf_load_file(prog_info.interp, 0, &interp_info);
-    if (rc < 0) {
-        printf("Failed to load interpreter '%s.'\n", prog_info.interp);
+    if (rc != EE_OK) {
+        DPRINTF("Failed to load interpreter '%s.'\n",
+            prog_info.interp);
         ipc_answer_0(rid, EINVAL);
         return 1;
     }
     is_dyn_linked = true;
     ipc_answer_0(rid, EOK);
     return 0;
 }
 ,18 → 272,24
  */
 static void loader_run(ipc_callid_t rid, ipc_call_t *request)
 {
+    const char *cp;
+    /* Set the task name. */
+    cp = str_rchr(pathname, '/');
+    cp = (cp == NULL) ? pathname : (cp + 1);
+    task_set_name(cp);
     if (is_dyn_linked == true) {
         /* Dynamically linked program */
-        printf("run dynamic linker\n");
-        printf("entry point: 0x%lx\n", interp_info.entry);
-        close_console();
+        DPRINTF("Run ELF interpreter.\n");
+        DPRINTF("Entry point: 0x%lx\n", interp_info.entry);
+        console_close();
         ipc_answer_0(rid, EOK);
         elf_run(&interp_info, &pcb);
     } else {
         /* Statically linked program */
-        close_console();
+        console_close();
         ipc_answer_0(rid, EOK);
         elf_run(&prog_info, &pcb);
     }
 ,13 → 307,25
     ipc_callid_t callid;
     ipc_call_t call;
     int retval;
+    /* Already have a connection? */
+    if (connected) {
+        ipc_answer_0(iid, ELIMIT);
+        return;
+    }
+    connected = true;
+    /* Accept the connection */
+    ipc_answer_0(iid, EOK);
     /* Ignore parameters, the connection is already open */
-    (void)iid; (void)icall;
+    (void) iid;
+    (void) icall;
     while (1) {
         callid = async_get_call(&call);
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             exit(0);
 ,7 → 350,7
         }
         if ((callid & IPC_CALLID_NOTIFICATION) == 0 &&
             IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP) {
-            printf("responding EINVAL to method %d\n",
+            DPRINTF("Responding EINVAL to method %d.\n",
                 IPC_GET_METHOD(call));
             ipc_answer_0(callid, EINVAL);
         }
 ,31 → 361,20
  */
 int main(int argc, char *argv[])
 {
-    ipc_callid_t callid;
-    ipc_call_t call;
-    ipcarg_t phone_hash;
-    /* The first call only communicates the incoming phone hash */
-    callid = ipc_wait_for_call(&call);
-    if (IPC_GET_METHOD(call) != LOADER_HELLO) {
-        if (IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP)
-            ipc_answer_0(callid, EINVAL);
-        return 1;
-    }
-    ipc_answer_0(callid, EOK);
-    phone_hash = call.in_phone_hash;
-    /*
-     * Up until now async must not be used as it couldn't
-     * handle incoming requests. (Which means e.g. printf()
-     * cannot be used)
-     */
-    async_new_connection(phone_hash, 0, NULL, loader_connection);
+    ipcarg_t phonead;
+    connected = false;
+    /* Set a handler of incomming connections. */
+    async_set_client_connection(loader_connection);
+    /* Register at naming service. */
+    if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0)
+        return -1;
     async_manager();
-    /* not reached */
+    /* Never reached */
     return 0;
 }

 /branches/tracing/uspace/srv/loader/elf_load.c
 ,6 → 57,8
 #include "elf_load.h"
 #include "arch.h"
+#define DPRINTF(...)
 static char *error_codes[] = {
     "no error",
     "invalid image",
 ,11 → 108,9
     int fd;
     int rc;
-//  printf("open and read '%s'...\n", file_name);
     fd = open(file_name, O_RDONLY);
     if (fd < 0) {
-        printf("failed opening file\n");
+        DPRINTF("failed opening file\n");
         return -1;
     }
 ,19 → 171,18
     rc = my_read(elf->fd, header, sizeof(elf_header_t));
     if (rc < 0) {
-        printf("read error\n");
+        DPRINTF("Read error.\n");
         return EE_INVALID;
     }
     elf->header = header;
-//  printf("ELF-load:");
     /* Identify ELF */
     if (header->e_ident[EI_MAG0] != ELFMAG0 ||
         header->e_ident[EI_MAG1] != ELFMAG1 ||
         header->e_ident[EI_MAG2] != ELFMAG2 ||
         header->e_ident[EI_MAG3] != ELFMAG3) {
-        printf("invalid header\n");
+        DPRINTF("Invalid header.\n");
         return EE_INVALID;
     }
 ,18 → 192,18
         header->e_ident[EI_VERSION] != EV_CURRENT ||
         header->e_version != EV_CURRENT ||
         header->e_ident[EI_CLASS] != ELF_CLASS) {
-        printf("incompatible data/version/class\n");
+        DPRINTF("Incompatible data/version/class.\n");
         return EE_INCOMPATIBLE;
     }
     if (header->e_phentsize != sizeof(elf_segment_header_t)) {
-        printf("e_phentsize:%d != %d\n", header->e_phentsize,
+        DPRINTF("e_phentsize:%d != %d\n", header->e_phentsize,
             sizeof(elf_segment_header_t));
         return EE_INCOMPATIBLE;
     }
     if (header->e_shentsize != sizeof(elf_section_header_t)) {
-        printf("e_shentsize:%d != %d\n", header->e_shentsize,
+        DPRINTF("e_shentsize:%d != %d\n", header->e_shentsize,
             sizeof(elf_section_header_t));
         return EE_INCOMPATIBLE;
     }
 ,23 → 210,19
     /* Check if the object type is supported. */
     if (header->e_type != ET_EXEC && header->e_type != ET_DYN) {
-        printf("Object type %d is not supported\n", header->e_type);
+        DPRINTF("Object type %d is not supported\n", header->e_type);
         return EE_UNSUPPORTED;
     }
     /* Shared objects can be loaded with a bias */
-//  printf("Object type: %d\n", header->e_type);
     if (header->e_type == ET_DYN)
         elf->bias = so_bias;
     else
         elf->bias = 0;
-//  printf("Bias set to 0x%x\n", elf->bias);
     elf->info->interp = NULL;
     elf->info->dynamic = NULL;
-//  printf("parse segments\n");
     /* Walk through all segment headers and process them. */
     for (i = 0; i < header->e_phnum; i++) {
         elf_segment_header_t segment_hdr;
 ,7 → 234,7
         rc = my_read(elf->fd, &segment_hdr,
             sizeof(elf_segment_header_t));
         if (rc < 0) {
-            printf("read error\n");
+            DPRINTF("Read error.\n");
             return EE_INVALID;
         }
 ,7 → 243,7
             return rc;
     }
-//  printf("parse sections\n");
+    DPRINTF("Parse sections.\n");
     /* Inspect all section headers and proccess them. */
     for (i = 0; i < header->e_shnum; i++) {
 ,7 → 256,7
         rc = my_read(elf->fd, &section_hdr,
             sizeof(elf_section_header_t));
         if (rc < 0) {
-            printf("read error\n");
+            DPRINTF("Read error.\n");
             return EE_INVALID;
         }
 ,7 → 268,7
     elf->info->entry =
         (entry_point_t)((uint8_t *)header->e_entry + elf->bias);
-//  printf("done\n");
+    DPRINTF("Done.\n");
     return EE_OK;
 }
 ,7 → 311,7
     case PT_LOPROC:
     case PT_HIPROC:
     default:
-        printf("segment p_type %d unknown\n", entry->p_type);
+        DPRINTF("Segment p_type %d unknown.\n", entry->p_type);
         return EE_UNSUPPORTED;
         break;
     }
 ,8 → 334,8
     size_t mem_sz;
     int rc;
-//  printf("load segment at addr 0x%x, size 0x%x\n", entry->p_vaddr,
-//      entry->p_memsz);
+    DPRINTF("Load segment at addr 0x%x, size 0x%x\n", entry->p_vaddr,
+        entry->p_memsz);
     bias = elf->bias;
 ,7 → 342,7
     if (entry->p_align > 1) {
         if ((entry->p_offset % entry->p_align) !=
             (entry->p_vaddr % entry->p_align)) {
-            printf("align check 1 failed offset%%align=%d, "
+            DPRINTF("Align check 1 failed offset%%align=%d, "
                 "vaddr%%align=%d\n",
                 entry->p_offset % entry->p_align,
                 entry->p_vaddr % entry->p_align
 ,8 → 364,8
     base = ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE);
     mem_sz = entry->p_memsz + (entry->p_vaddr - base);
-//  printf("map to p_vaddr=0x%x-0x%x...\n", entry->p_vaddr + bias,
-//  entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
+    DPRINTF("Map to p_vaddr=0x%x-0x%x.\n", entry->p_vaddr + bias,
+    entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE));
     /*
      * For the course of loading, the area needs to be readable
 ,17 → 374,16
     a = as_area_create((uint8_t *)base + bias, mem_sz,
         AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
     if (a == (void *)(-1)) {
-        printf("memory mapping failed\n");
+        DPRINTF("Memory mapping failed.\n");
         return EE_MEMORY;
     }
-//  printf("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n",
-//      entry->p_vaddr+bias, entry->p_memsz, flags, (uintptr_t)a);
+    DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n",
+        entry->p_vaddr+bias, entry->p_memsz, flags, (uintptr_t)a);
     /*
      * Load segment data
      */
-//  printf("seek to %d\n", entry->p_offset);
     rc = lseek(elf->fd, entry->p_offset, SEEK_SET);
     if (rc < 0) {
         printf("seek error\n");
 ,11 → 390,10
         return EE_INVALID;
     }
-//  printf("read 0x%x bytes to address 0x%x\n", entry->p_filesz, entry->p_vaddr+bias);
 /*  rc = read(fd, (void *)(entry->p_vaddr + bias), entry->p_filesz);
     if (rc < 0) { printf("read error\n"); return EE_INVALID; }*/
-    /* Long reads are not possible yet. Load segment picewise */
+    /* Long reads are not possible yet. Load segment piecewise. */
     unsigned left, now;
     uint8_t *dp;
 ,12 → 405,10
         now = 16384;
         if (now > left) now = left;
-//      printf("read %d...", now);
         rc = my_read(elf->fd, dp, now);
-//      printf("->%d\n", rc);
         if (rc < 0) {
-            printf("read error\n");
+            DPRINTF("Read error.\n");
             return EE_INVALID;
         }
 ,10 → 416,9
         dp += now;
     }
-//  printf("set area flags to %d\n", flags);
     rc = as_area_change_flags((uint8_t *)entry->p_vaddr + bias, flags);
     if (rc != 0) {
-        printf("failed to set memory area flags\n");
+        DPRINTF("Failed to set memory area flags.\n");
         return EE_MEMORY;
     }
 ,7 → 455,7
         /* Record pointer to dynamic section into info structure */
         elf->info->dynamic =
             (void *)((uint8_t *)entry->sh_addr + elf->bias);
-        printf("dynamic section found at 0x%x\n",
+        DPRINTF("Dynamic section found at 0x%x.\n",
             (uintptr_t)elf->info->dynamic);
         break;
     default:

 /branches/tracing/uspace/srv/loader/Makefile
 ,29 → 27,19
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-include ../../Makefile.config
 ## Setup toolchain
 #
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(ARCH)/Makefile.inc
+include arch/$(UARCH)/Makefile.inc
 CFLAGS += -Iinclude
 LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
-ifdef REVISION
-    DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 ## Sources
 #
 ,18 → 59,18
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend
+    -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
-$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
-    $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
+$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+    $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
-arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
     $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 %.o: %.S

/branches/tracing/uspace/srv/loader/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/tracing/uspace/srv/loader/arch/sparc64/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__64_BITS__
ARCH_SOURCES := arch/$(ARCH)/sparc64.s
ARCH_SOURCES := arch/$(UARCH)/sparc64.s

 /branches/tracing/uspace/srv/loader/arch/ia64/_link.ld.in
 ,4 → 1,4
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {
 ,15 → 12,10
         *(.interp);
     } :interp
-    . = 0x00084000 + SIZEOF_HEADERS;
+    /* On Itanium code sections must be aligned to 16 bytes. */
+    . = ALIGN(0x800000000 + SIZEOF_HEADERS, 16);
     .init : {
-        LONG(0);
-        LONG(0);
-        LONG(0);
-        LONG(0);
-        LONG(0);
-        LONG(0);
         *(.init);
     } : text
     .text : {

/branches/tracing/uspace/srv/loader/arch/ia64/Makefile.inc
27,5 → 27,5
#

CFLAGS += -D__64_BITS__
ARCH_SOURCES := arch/$(ARCH)/ia64.s
ARCH_SOURCES := arch/$(UARCH)/ia64.s
AFLAGS += -xexplicit

 /branches/tracing/uspace/srv/loader/arch/arm32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/tracing/uspace/srv/loader/arch/arm32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/arm32.s
ARCH_SOURCES := arch/$(UARCH)/arm32.s

 /branches/tracing/uspace/srv/loader/arch/ppc32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/tracing/uspace/srv/loader/arch/ppc32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/ppc32.s
ARCH_SOURCES := arch/$(UARCH)/ppc32.s

/branches/tracing/uspace/srv/loader/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

/branches/tracing/uspace/srv/loader/arch/amd64/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__64_BITS__
ARCH_SOURCES := arch/$(ARCH)/amd64.s
ARCH_SOURCES := arch/$(UARCH)/amd64.s

 /branches/tracing/uspace/srv/loader/arch/mips32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The only difference from _link.ld.in for regular statically-linked apps
  * is the base address.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/tracing/uspace/srv/loader/arch/mips32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/mips32.s
ARCH_SOURCES := arch/$(UARCH)/mips32.s

 /branches/tracing/uspace/srv/loader/arch/ia32/_link.ld.in
 ,8 → 1,8
-/*
+/*
  * The difference from _link.ld.in for regular statically-linked apps
  * is the base address and the special interp section.
  */
-STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 PHDRS {

/branches/tracing/uspace/srv/loader/arch/ia32/Makefile.inc
27,4 → 27,4
#

CFLAGS += -D__32_BITS__
ARCH_SOURCES := arch/$(ARCH)/ia32.s
ARCH_SOURCES := arch/$(UARCH)/ia32.s

 /branches/tracing/uspace/srv/fb/serial_console.c
 ,15 → 38,66
  */
 #include <stdio.h>
+#include <ipc/ipc.h>
+#include <async.h>
+#include <ipc/fb.h>
+#include <bool.h>
+#include <errno.h>
+#include <console/color.h>
+#include <console/style.h>
+#include "../console/screenbuffer.h"
+#include "main.h"
 #include "serial_console.h"
 #define MAX_CONTROL 20
-static uint32_t width;
-static uint32_t height;
+static void serial_sgr(const unsigned int mode);
+void serial_putchar(wchar_t ch);
+static int scr_width;
+static int scr_height;
+static bool color = true;   /** True if producing color output. */
+static bool utf8 = false;   /** True if producing UTF8 output. */
 static putc_function_t putc_function;
+/* Allow only 1 connection */
+static int client_connected = 0;
+enum sgr_color_index {
+    CI_BLACK    = 0,
+    CI_RED      = 1,
+    CI_GREEN    = 2,
+    CI_BROWN    = 3,
+    CI_BLUE     = 4,
+    CI_MAGENTA  = 5,
+    CI_CYAN     = 6,
+    CI_WHITE    = 7,
+};
+enum sgr_command {
+    SGR_RESET   = 0,
+    SGR_BOLD    = 1,
+    SGR_BLINK   = 5,
+    SGR_REVERSE = 7,
+    SGR_NORMAL_INT  = 22,
+    SGR_BLINK_OFF   = 25,
+    SGR_REVERSE_OFF = 27,
+    SGR_FGCOLOR = 30,
+    SGR_BGCOLOR = 40
+};
+static int color_map[] = {
+    [COLOR_BLACK]   = CI_BLACK,
+    [COLOR_BLUE]    = CI_RED,
+    [COLOR_GREEN]   = CI_GREEN,
+    [COLOR_CYAN]    = CI_CYAN,
+    [COLOR_RED] = CI_RED,
+    [COLOR_MAGENTA] = CI_MAGENTA,
+    [COLOR_YELLOW]  = CI_BROWN,
+    [COLOR_WHITE]   = CI_WHITE
+};
 void serial_puts(char *str)
 {
     while (*str)
 ,18 → 104,49
         putc_function(*(str++));
 }
+void serial_putchar(wchar_t ch)
+{
+    uint8_t buf[STR_BOUNDS(1)];
+    size_t offs;
+    size_t i;
+    if (utf8 != true) {
+        if (ch >= 0 && ch < 128)
+            (*putc_function)((uint8_t) ch);
+        else
+            (*putc_function)('?');
+        return;
+    }
+    offs = 0;
+    if (chr_encode(ch, buf, &offs, STR_BOUNDS(1)) == EOK) {
+        for (i = 0; i < offs; i++)
+            (*putc_function)(buf[i]);
+    } else {
+        (*putc_function)('?');
+    }
+}
 void serial_goto(const unsigned int row, const unsigned int col)
 {
-    if ((row > height) || (col > width))
+    if ((row > scr_height) || (col > scr_width))
         return;
-    char control[20];
-    snprintf(control, 20, "\033[%u;%uf", row + 1, col + 1);
+    char control[MAX_CONTROL];
+    snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1);
     serial_puts(control);
 }
 void serial_clrscr(void)
 {
+    /* Initialize graphic rendition attributes. */
+    serial_sgr(SGR_RESET);
+    if (color) {
+        serial_sgr(SGR_FGCOLOR + CI_BLACK);
+        serial_sgr(SGR_BGCOLOR + CI_WHITE);
+    }
     serial_puts("\033[2J");
 }
 ,7 → 153,7
 void serial_scroll(int i)
 {
     if (i > 0) {
-        serial_goto(height - 1, 0);
+        serial_goto(scr_height - 1, 0);
         while (i--)
             serial_puts("\033D");
     } else if (i < 0) {
 ,7 → 163,8
     }
 }
-void serial_set_style(const unsigned int mode)
+/** ECMA-48 Set Graphics Rendition. */
+static void serial_sgr(const unsigned int mode)
 {
     char control[MAX_CONTROL];
     snprintf(control, MAX_CONTROL, "\033[%um", mode);
 ,6 → 171,14
     serial_puts(control);
 }
+/** Set scrolling region. */
+void serial_set_scroll_region(unsigned last_row)
+{
+    char control[MAX_CONTROL];
+    snprintf(control, MAX_CONTROL, "\033[0;%ur", last_row);
+    serial_puts(control);
+}
 void serial_cursor_disable(void)
 {
     serial_puts("\033[?25l");
 ,11 → 191,260
 void serial_console_init(putc_function_t putc_fn, uint32_t w, uint32_t h)
 {
-    width = w;
-    height = h;
+    scr_width = w;
+    scr_height = h;
     putc_function = putc_fn;
 }
+static void serial_set_style(int style)
+{
+    if (style == STYLE_EMPHASIS) {
+        if (color) {
+            serial_sgr(SGR_RESET);
+            serial_sgr(SGR_FGCOLOR + CI_RED);
+            serial_sgr(SGR_BGCOLOR + CI_WHITE);
+        }
+        serial_sgr(SGR_BOLD);
+    } else {
+        if (color) {
+            serial_sgr(SGR_RESET);
+            serial_sgr(SGR_FGCOLOR + CI_BLACK);
+            serial_sgr(SGR_BGCOLOR + CI_WHITE);
+        }
+        serial_sgr(SGR_NORMAL_INT);
+    }
+}
+static void serial_set_idx(unsigned fgcolor, unsigned bgcolor,
+    unsigned flags)
+{
+    if (color) {
+        serial_sgr(SGR_RESET);
+        serial_sgr(SGR_FGCOLOR + color_map[fgcolor]);
+        serial_sgr(SGR_BGCOLOR + color_map[bgcolor]);
+    } else {
+        if (fgcolor < bgcolor)
+            serial_sgr(SGR_RESET);
+        else
+            serial_sgr(SGR_REVERSE);
+    }
+}
+static void serial_set_rgb(uint32_t fgcolor, uint32_t bgcolor)
+{
+    if (fgcolor < bgcolor)
+        serial_sgr(SGR_REVERSE_OFF);
+    else
+        serial_sgr(SGR_REVERSE);
+}
+static void serial_set_attrs(const attrs_t *a)
+{
+    switch (a->t) {
+    case at_style: serial_set_style(a->a.s.style); break;
+    case at_rgb: serial_set_rgb(a->a.r.fg_color, a->a.r.bg_color); break;
+    case at_idx: serial_set_idx(a->a.i.fg_color,
+        a->a.i.bg_color, a->a.i.flags); break;
+    default: break;
+    }
+}
+/** Draw text data to viewport.
+ *
+ * @param vport Viewport id
+ * @param data  Text data.
+ * @param x Leftmost column of the area.
+ * @param y Topmost row of the area.
+ * @param w Number of rows.
+ * @param h Number of columns.
+ */
+static void draw_text_data(keyfield_t *data, unsigned int x,
+    unsigned int y, unsigned int w, unsigned int h)
+{
+    unsigned int i, j;
+    keyfield_t *field;
+    attrs_t *a0, *a1;
+    serial_goto(y, x);
+    a0 = &data[0].attrs;
+    serial_set_attrs(a0);
+    for (j = 0; j < h; j++) {
+        if (j > 0 && w != scr_width)
+            serial_goto(y, x);
+        for (i = 0; i < w; i++) {
+            field = &data[j * w + i];
+            a1 = &field->attrs;
+            if (!attrs_same(*a0, *a1))
+                serial_set_attrs(a1);
+            serial_putchar(field->character);
+            a0 = a1;
+        }
+    }
+}
+int lastcol = 0;
+int lastrow = 0;
+/**
+ * Main function of the thread serving client connections.
+ */
+void serial_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+    int retval;
+    ipc_callid_t callid;
+    ipc_call_t call;
+    keyfield_t *interbuf = NULL;
+    size_t intersize = 0;
+    wchar_t c;
+    int col, row, w, h;
+    int i;
+    attrs_t cur_attr;
+    if (client_connected) {
+        ipc_answer_0(iid, ELIMIT);
+        return;
+    }
+    client_connected = 1;
+    ipc_answer_0(iid, EOK);
+    cur_attr.t = at_style;
+    cur_attr.a.s.style = STYLE_NORMAL;
+    /* Clear the terminal, set scrolling region
+       to 0 - height rows. */
+    serial_clrscr();
+    serial_goto(0, 0);
+    serial_set_scroll_region(scr_height);
+    while (true) {
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
+        case IPC_M_PHONE_HUNGUP:
+            client_connected = 0;
+            ipc_answer_0(callid, EOK);
+            return;
+        case IPC_M_SHARE_OUT:
+            /* We accept one area for data interchange */
+            intersize = IPC_GET_ARG2(call);
+            if (intersize >= scr_width * scr_height *
+                sizeof(*interbuf)) {
+                receive_comm_area(callid, &call,
+                    (void *) &interbuf);
+                continue;
+            }
+            retval = EINVAL;
+            break;
+        case FB_DRAW_TEXT_DATA:
+            col = IPC_GET_ARG1(call);
+            row = IPC_GET_ARG2(call);
+            w = IPC_GET_ARG3(call);
+            h = IPC_GET_ARG4(call);
+            if (!interbuf) {
+                retval = EINVAL;
+                break;
+            }
+            if (col + w > scr_width || row + h > scr_height) {
+                retval = EINVAL;
+                break;
+            }
+            draw_text_data(interbuf, col, row, w, h);
+            lastrow = row + h - 1;
+            lastcol = col + w;
+            retval = 0;
+            break;
+        case FB_PUTCHAR:
+            c = IPC_GET_ARG1(call);
+            row = IPC_GET_ARG2(call);
+            col = IPC_GET_ARG3(call);
+            if ((lastcol != col) || (lastrow != row))
+                serial_goto(row, col);
+            lastcol = col + 1;
+            lastrow = row;
+            serial_putchar(c);
+            retval = 0;
+            break;
+        case FB_CURSOR_GOTO:
+            row = IPC_GET_ARG1(call);
+            col = IPC_GET_ARG2(call);
+            serial_goto(row, col);
+            lastrow = row;
+            lastcol = col;
+            retval = 0;
+            break;
+        case FB_GET_CSIZE:
+            ipc_answer_2(callid, EOK, scr_height, scr_width);
+            continue;
+        case FB_CLEAR:
+            serial_clrscr();
+            retval = 0;
+            break;
+        case FB_SET_STYLE:
+            cur_attr.t = at_style;
+            cur_attr.a.s.style = IPC_GET_ARG1(call);
+            cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+            serial_set_attrs(&cur_attr);
+            retval = 0;
+            break;
+        case FB_SET_COLOR:
+            cur_attr.t = at_idx;
+            cur_attr.a.i.fg_color = IPC_GET_ARG1(call);
+            cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+            cur_attr.a.i.flags = IPC_GET_ARG3(call);
+            serial_set_attrs(&cur_attr);
+            retval = 0;
+            break;
+        case FB_SET_RGB_COLOR:
+            cur_attr.t = at_rgb;
+            cur_attr.a.i.fg_color = IPC_GET_ARG1(call);
+            cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+            serial_set_attrs(&cur_attr);
+            retval = 0;
+            break;
+        case FB_SCROLL:
+            i = IPC_GET_ARG1(call);
+            if ((i > scr_height) || (i < -scr_height)) {
+                retval = EINVAL;
+                break;
+            }
+            serial_scroll(i);
+            serial_goto(lastrow, lastcol);
+            retval = 0;
+            break;
+        case FB_CURSOR_VISIBILITY:
+            if(IPC_GET_ARG1(call))
+                serial_cursor_enable();
+            else
+                serial_cursor_disable();
+            retval = 0;
+            break;
+        case FB_SCREEN_YIELD:
+            serial_sgr(SGR_RESET);
+            serial_puts("\033[2J");
+            serial_goto(0, 0);
+            serial_cursor_enable();
+            retval = 0;
+            break;
+        case FB_SCREEN_RECLAIM:
+            serial_clrscr();
+            serial_set_attrs(&cur_attr);
+            retval = 0;
+            break;
+        default:
+            retval = ENOENT;
+        }
+        ipc_answer_0(callid, retval);
+    }
+}
 /**
  * @}
  */

 /branches/tracing/uspace/srv/fb/msim.c
 ,17 → 36,9
  */
 #include <async.h>
-#include <ipc/fb.h>
-#include <ipc/ipc.h>
 #include <libc.h>
-#include <errno.h>
-#include <string.h>
-#include <libc.h>
-#include <stdio.h>
-#include <ipc/fb.h>
 #include <sysinfo.h>
 #include <as.h>
-#include <align.h>
 #include <ddi.h>
 #include "serial_console.h"
 ,13 → 45,8
 #include "msim.h"
 #define WIDTH 80
-#define HEIGHT 25
+#define HEIGHT 24
-#define MAX_CONTROL 20
-/* Allow only 1 connection */
-static int client_connected = 0;
 static char *virt_addr;
 static void msim_putc(const char c)
 ,110 → 54,17
     *virt_addr = c;
 }
-static void msim_client_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-    int retval;
-    ipc_callid_t callid;
-    ipc_call_t call;
-    char c;
-    int lastcol = 0;
-    int lastrow = 0;
-    int newcol;
-    int newrow;
-    int fgcolor;
-    int bgcolor;
-    int i;
-    if (client_connected) {
-        ipc_answer_0(iid, ELIMIT);
-        return;
-    }
-    client_connected = 1;
-    ipc_answer_0(iid, EOK);
-    /* Clear the terminal, set scrolling region
-       to 0 - 25 lines */
-    serial_clrscr();
-    serial_goto(0, 0);
-    serial_puts("\033[0;25r");
-    while (true) {
-        callid = async_get_call(&call);
-        switch (IPC_GET_METHOD(call)) {
-        case IPC_M_PHONE_HUNGUP:
-            client_connected = 0;
-            ipc_answer_0(callid, EOK);
-            return;
-        case FB_PUTCHAR:
-            c = IPC_GET_ARG1(call);
-            newrow = IPC_GET_ARG2(call);
-            newcol = IPC_GET_ARG3(call);
-            if ((lastcol != newcol) || (lastrow != newrow))
-                serial_goto(newrow, newcol);
-            lastcol = newcol + 1;
-            lastrow = newrow;
-            msim_putc(c);
-            retval = 0;
-            break;
-        case FB_CURSOR_GOTO:
-            newrow = IPC_GET_ARG1(call);
-            newcol = IPC_GET_ARG2(call);
-            serial_goto(newrow, newcol);
-            lastrow = newrow;
-            lastcol = newcol;
-            retval = 0;
-            break;
-        case FB_GET_CSIZE:
-            ipc_answer_2(callid, EOK, HEIGHT, WIDTH);
-            continue;
-        case FB_CLEAR:
-            serial_clrscr();
-            retval = 0;
-            break;
-        case FB_SET_STYLE:
-            fgcolor = IPC_GET_ARG1(call);
-            bgcolor = IPC_GET_ARG2(call);
-            if (fgcolor < bgcolor)
-                serial_set_style(0);
-            else
-                serial_set_style(7);
-            retval = 0;
-            break;
-        case FB_SCROLL:
-            i = IPC_GET_ARG1(call);
-            if ((i > HEIGHT) || (i < -HEIGHT)) {
-                retval = EINVAL;
-                break;
-            }
-            serial_scroll(i);
-            serial_goto(lastrow, lastcol);
-            retval = 0;
-            break;
-        case FB_CURSOR_VISIBILITY:
-            if(IPC_GET_ARG1(call))
-                serial_cursor_enable();
-            else
-                serial_cursor_disable();
-            retval = 0;
-            break;
-        default:
-            retval = ENOENT;
-        }
-        ipc_answer_0(callid, retval);
-    }
-}
 int msim_init(void)
 {
     void *phys_addr = (void *) sysinfo_value("fb.address.physical");
     virt_addr = (char *) as_get_mappable_page(1);
-    physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE);
+    if (physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     serial_console_init(msim_putc, WIDTH, HEIGHT);
-    async_set_client_connection(msim_client_connection);
+    async_set_client_connection(serial_client_connection);
     return 0;
 }

 /branches/tracing/uspace/srv/fb/serial_console.h
 ,6 → 38,8
 #ifndef FB_SERIAL_CONSOLE_H_
 #define FB_SERIAL_CONSOLE_H_
+#include <ipc/ipc.h>
 typedef void (*putc_function_t)(char);
 void serial_puts(char *str);
 ,9 → 46,11
 void serial_goto(const unsigned int row, const unsigned int col);
 void serial_clrscr(void);
 void serial_scroll(int i);
-void serial_set_style(const unsigned int mode);
 void serial_cursor_disable(void);
 void serial_cursor_enable(void);
+void serial_set_scroll_region(unsigned height);
 void serial_console_init(putc_function_t putc_fn, uint32_t w, uint32_t h);
+void serial_client_connection(ipc_callid_t iid, ipc_call_t *icall);
 #endif

 /branches/tracing/uspace/srv/fb/font-8x16.c
 ,5 → 1,6
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2000 Dmitry Bolkhovityanov
+ * Copyright (c) 2009 Martin Decky
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,4616 → 27,3245
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/** @addtogroup genarch
+ * @{
+ */
+/** @file
+ */
+#include <sys/types.h>
 #include "font-8x16.h"
-unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES] = {
+/** Convert character to font glyph index
+ *
+ * The font does not cover all Unicode characters.
+ * This function converts the character to an appropriate
+ * glyph in the font or returns an index to the question
+ * mark glyph if no specific glyph exists.
+ */
+uint16_t fb_font_glyph(const wchar_t ch)
+{
+    if (ch == 0x0000)
+        return 0;
+    if ((ch >= 0x0020) && (ch <= 0x007f))
+        return (ch - 32);
+    if ((ch >= 0x00a0) && (ch <= 0x021f))
+        return (ch - 64);
+    if ((ch >= 0x0222) && (ch <= 0x0233))
+        return (ch - 66);
+    if ((ch >= 0x0250) && (ch <= 0x02ad))
+        return (ch - 94);
+    if ((ch >= 0x02b0) && (ch <= 0x02cf))
+        return (ch - 96);
+    if ((ch >= 0x02d8) && (ch <= 0x02dd))
+        return (ch - 104);
+    if (ch == 0x02ee)
+        return 630;
+    if ((ch >= 0x0300) && (ch <= 0x0301))
+        return (ch - 137);
+    if (ch == 0x0303)
+        return 633;
+    if (ch == 0x0309)
+        return 634;
+    if ((ch >= 0x0312) && (ch <= 0x0314))
+        return (ch - 151);
+    if (ch == 0x0323)
+        return 638;
+    if ((ch >= 0x0340) && (ch <= 0x0341))
+        return (ch - 193);
+    if ((ch >= 0x0374) && (ch <= 0x0375))
+        return (ch - 243);
+    if (ch == 0x037a)
+        return 643;
+    if (ch == 0x037e)
+        return 644;
+    if ((ch >= 0x0384) && (ch <= 0x038a))
+        return (ch - 255);
+    if (ch == 0x038c)
+        return 652;
+    if ((ch >= 0x038e) && (ch <= 0x03a1))
+        return (ch - 257);
+    if ((ch >= 0x03a3) && (ch <= 0x03ce))
+        return (ch - 258);
+    if ((ch >= 0x03d0) && (ch <= 0x03d7))
+        return (ch - 259);
+    if ((ch >= 0x03da) && (ch <= 0x03f3))
+        return (ch - 261);
+    if ((ch >= 0x0400) && (ch <= 0x0486))
+        return (ch - 273);
+    if ((ch >= 0x0488) && (ch <= 0x04ce))
+        return (ch - 274);
+    if ((ch >= 0x04d0) && (ch <= 0x04f5))
+        return (ch - 275);
+    if ((ch >= 0x04f8) && (ch <= 0x04f9))
+        return (ch - 277);
+    if ((ch >= 0x0500) && (ch <= 0x050f))
+        return (ch - 283);
+    if ((ch >= 0x0530) && (ch <= 0x0556))
+        return (ch - 315);
+    if ((ch >= 0x0559) && (ch <= 0x055f))
+        return (ch - 317);
+    if ((ch >= 0x0561) && (ch <= 0x0587))
+        return (ch - 318);
+    if ((ch >= 0x0589) && (ch <= 0x058a))
+        return (ch - 319);
+    if ((ch >= 0x0591) && (ch <= 0x05a1))
+        return (ch - 325);
+    if ((ch >= 0x05a3) && (ch <= 0x05b9))
+        return (ch - 326);
+    if ((ch >= 0x05bb) && (ch <= 0x05c4))
+        return (ch - 327);
+    if ((ch >= 0x05d0) && (ch <= 0x05ea))
+        return (ch - 338);
+    if ((ch >= 0x05f0) && (ch <= 0x05f4))
+        return (ch - 343);
+    if (ch == 0x060c)
+        return 1182;
+    if (ch == 0x061b)
+        return 1183;
+    if (ch == 0x061f)
+        return 1184;
+    if ((ch >= 0x0621) && (ch <= 0x063a))
+        return (ch - 384);
+    if ((ch >= 0x0640) && (ch <= 0x0655))
+        return (ch - 389);
+    if ((ch >= 0x0660) && (ch <= 0x066d))
+        return (ch - 399);
+    if ((ch >= 0x0670) && (ch <= 0x06ed))
+        return (ch - 401);
+    if ((ch >= 0x06f0) && (ch <= 0x06fe))
+        return (ch - 403);
+    if (ch == 0x10d3)
+        return 1388;
+    if (ch == 0x10d7)
+        return 1389;
+    if (ch == 0x10da)
+        return 1390;
+    if (ch == 0x10dd)
+        return 1391;
+    if (ch == 0x10e6)
+        return 1392;
+    if ((ch >= 0x1e00) && (ch <= 0x1e9b))
+        return (ch - 6287);
+    if ((ch >= 0x1ea0) && (ch <= 0x1ef9))
+        return (ch - 6291);
+    if ((ch >= 0x1f00) && (ch <= 0x1f07))
+        return (ch - 6297);
+    if ((ch >= 0x2000) && (ch <= 0x2027))
+        return (ch - 6545);
+    if ((ch >= 0x2030) && (ch <= 0x2046))
+        return (ch - 6553);
+    if ((ch >= 0x2048) && (ch <= 0x204d))
+        return (ch - 6554);
+    if (ch == 0x2070)
+        return 1716;
+    if ((ch >= 0x2074) && (ch <= 0x208f))
+        return (ch - 6591);
+    if ((ch >= 0x20a0) && (ch <= 0x20af))
+        return (ch - 6607);
+    if ((ch >= 0x2100) && (ch <= 0x213a))
+        return (ch - 6687);
+    if ((ch >= 0x2153) && (ch <= 0x2183))
+        return (ch - 6711);
+    if ((ch >= 0x2190) && (ch <= 0x21f3))
+        return (ch - 6723);
+    if ((ch >= 0x2200) && (ch <= 0x22f1))
+        return (ch - 6735);
+    if (ch == 0x2300)
+        return 2211;
+    if (ch == 0x2302)
+        return 2212;
+    if ((ch >= 0x2308) && (ch <= 0x230b))
+        return (ch - 6755);
+    if (ch == 0x2310)
+        return 2217;
+    if (ch == 0x2318)
+        return 2218;
+    if ((ch >= 0x231a) && (ch <= 0x231b))
+        return (ch - 6767);
+    if ((ch >= 0x2320) && (ch <= 0x2321))
+        return (ch - 6771);
+    if ((ch >= 0x2329) && (ch <= 0x232a))
+        return (ch - 6778);
+    if ((ch >= 0x239b) && (ch <= 0x23bd))
+        return (ch - 6890);
+    if (ch == 0x23ce)
+        return 2260;
+    if ((ch >= 0x2409) && (ch <= 0x240d))
+        return (ch - 6964);
+    if ((ch >= 0x2423) && (ch <= 0x2424))
+        return (ch - 6985);
+    if (ch == 0x2426)
+        return 2268;
+    if ((ch >= 0x2500) && (ch <= 0x2595))
+        return (ch - 7203);
+    if ((ch >= 0x25a0) && (ch <= 0x25f7))
+        return (ch - 7213);
+    if ((ch >= 0x2600) && (ch <= 0x2602))
+        return (ch - 7221);
+    if ((ch >= 0x2605) && (ch <= 0x260d))
+        return (ch - 7223);
+    if ((ch >= 0x2610) && (ch <= 0x2613))
+        return (ch - 7225);
+    if (ch == 0x2620)
+        return 2523;
+    if (ch == 0x2622)
+        return 2524;
+    if (ch == 0x2626)
+        return 2525;
+    if ((ch >= 0x2628) && (ch <= 0x262b))
+        return (ch - 7242);
+    if ((ch >= 0x262e) && (ch <= 0x2637))
+        return (ch - 7244);
+    if ((ch >= 0x2639) && (ch <= 0x2653))
+        return (ch - 7245);
+    if ((ch >= 0x2660) && (ch <= 0x2667))
+        return (ch - 7257);
+    if ((ch >= 0x2669) && (ch <= 0x266f))
+        return (ch - 7258);
+    if ((ch >= 0xfb00) && (ch <= 0xfb05))
+        return (ch - 61674);
+    if ((ch >= 0xfb50) && (ch <= 0xfbb1))
+        return (ch - 61748);
+    if ((ch >= 0xfbd3) && (ch <= 0xfbe9))
+        return (ch - 61781);
+    if ((ch >= 0xfbfc) && (ch <= 0xfbff))
+        return (ch - 61799);
+    if ((ch >= 0xfc5b) && (ch <= 0xfc63))
+        return (ch - 61890);
+    if (ch == 0xfc90)
+        return 2722;
+    if ((ch >= 0xfcf2) && (ch <= 0xfcf4))
+        return (ch - 62031);
+    if ((ch >= 0xfd3c) && (ch <= 0xfd3f))
+        return (ch - 62102);
+    if (ch == 0xfdf2)
+        return 2730;
+    if ((ch >= 0xfe50) && (ch <= 0xfe52))
+        return (ch - 62373);
+    if ((ch >= 0xfe54) && (ch <= 0xfe66))
+        return (ch - 62374);
+    if ((ch >= 0xfe68) && (ch <= 0xfe6b))
+        return (ch - 62375);
+    if ((ch >= 0xfe70) && (ch <= 0xfe72))
+        return (ch - 62379);
+    if (ch == 0xfe74)
+        return 2760;
+    if ((ch >= 0xfe76) && (ch <= 0xfefc))
+        return (ch - 62381);
+    if (ch == 0xfeff)
+        return 2896;
+    return 2898;
+}
-    /* 0 0x00 '^@' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
+uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES] = {
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x7c, 0xc6, 0xc2, 0xc0, 0x7c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x18, 0x18, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x0c, 0x18, 0x30, 0x60, 0xc6, 0x86, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x6c, 0x38, 0x76, 0xdc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x30, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc, 0xfe, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xde, 0xde, 0xde, 0xdc, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xde, 0x7c, 0x0c, 0x0e, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00},
+    {0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18, 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x18, 0x3c, 0x66, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xe6, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 0x6c, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x99, 0xa5, 0xa1, 0xa1, 0xa5, 0x99, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x44, 0xba, 0xb2, 0xaa, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd8, 0x30, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xf6, 0xc0, 0xc0, 0xc0, 0x00},
+    {0x00, 0x00, 0x7f, 0xdb, 0xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x30, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x66, 0xce, 0x9e, 0x3e, 0x06, 0x06, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x0c, 0x18, 0x3e, 0x00, 0x00},
+    {0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30, 0x66, 0xce, 0x9e, 0x3e, 0x06, 0x06, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x60, 0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x0c, 0x38, 0x00},
+    {0x30, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x3c, 0x42, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0xf6, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7a, 0xc4, 0xce, 0xce, 0xd6, 0xd6, 0xe6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x6c, 0x66, 0x66, 0x66, 0x66, 0xec, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0x1c, 0x3c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0xc4, 0xce, 0xd6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x30, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x7c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x0c, 0x18, 0x0e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x0c, 0x18, 0x0e, 0x00},
+    {0x0c, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0xf6, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x3e, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x18, 0x30, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x6c, 0x38, 0x10, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x6c, 0x38, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x18, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x18, 0x30, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x10, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0xff, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7e, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7e, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0x3c, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x3c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x30, 0x1c, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x30, 0x1c, 0x00},
+    {0x18, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf7, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x7b, 0x7b, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x00, 0xee, 0x66, 0x66, 0x66, 0x66, 0x66, 0xf6, 0x06, 0x66, 0x3c, 0x00},
+    {0x08, 0x1c, 0x22, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x04, 0x0e, 0x1b, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x30, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x30},
+    {0x6c, 0x38, 0x10, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x66, 0x66, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0x30, 0x30, 0x30, 0x36, 0x36, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x78, 0xe0, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x1e, 0x78, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x18, 0x18, 0x30},
+    {0x6c, 0x38, 0x10, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x60, 0x60, 0xc0, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0xcc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0xcc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6e, 0xd8, 0xd8, 0xd8, 0xde, 0xd8, 0xd8, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xd6, 0xd6, 0xde, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x18, 0x18, 0x30},
+    {0x6c, 0x38, 0x10, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x6c, 0x38, 0x10, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x18, 0x0c, 0x38, 0x00},
+    {0x6c, 0x38, 0x10, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x10, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0xfc, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x78, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x78, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x38, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0xcc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x30, 0x60, 0x38, 0x00},
+    {0x10, 0x38, 0x44, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x66, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x00, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0xb3, 0xb3, 0x33, 0x3e, 0x33, 0x33, 0x33, 0x33, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x64, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x62, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xe6, 0xe6, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0xe0, 0xe0, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x06, 0x06, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x03, 0x3e, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x03, 0x7e, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0xf6, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xb6, 0xb3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x4c, 0x0c, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0x4c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x18, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0xfe, 0xcc, 0x8c, 0x2c, 0x3c, 0x2c, 0x0c, 0x8c, 0xcc, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc2, 0xc0, 0x78, 0xc0, 0xc0, 0xc2, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xc0, 0x00},
+    {0x00, 0x00, 0x1c, 0x36, 0x32, 0x30, 0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0xe0, 0x00},
+    {0x00, 0x03, 0x3e, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x38, 0x6c, 0x38, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xf3, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x6d, 0x6c, 0x78, 0x70, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc8, 0x38, 0x70, 0xd0, 0x38, 0x38, 0x6c, 0x64, 0xc6, 0xc2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0xec, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x76, 0x7e, 0x7e, 0x6e, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0xc0, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x73, 0xdf, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x03, 0x03, 0x03, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xdf, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x03, 0x03, 0x03, 0x00},
+    {0x00, 0x00, 0x7e, 0xb3, 0xb3, 0x33, 0x3e, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x78, 0x6c, 0x6c, 0xe6, 0x06, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x38, 0x60, 0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x0c, 0x38, 0x60, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x62, 0x30, 0x18, 0x18, 0x30, 0x62, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd8, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x0c, 0x6c, 0x38, 0x00},
+    {0x00, 0x00, 0x7e, 0xfe, 0x9a, 0x58, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x36, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00},
+    {0x03, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xee, 0x6c, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x63, 0xb3, 0xb3, 0x33, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x06, 0x0d, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x18, 0xf0, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x7e, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0xfc, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x30, 0x7c, 0x06, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc0, 0x60, 0x30, 0x18, 0x7c, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0x60, 0x30, 0x78, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x7c, 0xc0, 0xc6, 0x7c, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0c, 0x7e, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x60, 0x60, 0x78, 0x0c, 0x06, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x60, 0x78, 0x0c, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x18, 0x4c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x70, 0x60, 0x60, 0xf0, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x1b, 0x0e, 0x04, 0xf7, 0xd9, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf5, 0xda, 0xd8, 0xdf, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3d, 0x1a, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0x6f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc7, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xcb, 0xf6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf3, 0x63, 0x60, 0x67, 0x63, 0x63, 0x63, 0x67, 0x6f, 0xff, 0x03, 0x1b, 0x0e, 0x00},
+    {0x00, 0x00, 0xe3, 0x63, 0x60, 0x67, 0x63, 0x63, 0x63, 0x63, 0x63, 0xf3, 0x03, 0x33, 0x1e, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xfb, 0xfb, 0xfb, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xf8, 0xff, 0xfb, 0xfb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x33, 0x1e, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x00, 0xb7, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x33, 0x1e, 0x00},
+    {0x6c, 0x38, 0x10, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x00, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x78, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x30, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x28, 0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x78, 0x30, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x20, 0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x00, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x00, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x30, 0x30, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xdf, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x3e, 0xcc, 0x78, 0x00},
+    {0x6c, 0x38, 0x10, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x6c, 0x38, 0x10, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0xe0, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x6c, 0x38, 0x10, 0xfe, 0x0c, 0x18, 0x30, 0x7c, 0x06, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00},
+    {0x00, 0x1b, 0x0e, 0x04, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
+    {0x00, 0x00, 0xf7, 0xd9, 0xd9, 0xda, 0xda, 0xda, 0xda, 0xdc, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0xd8, 0xd8, 0xdf, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0xf7, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0x6f, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xdb, 0xfb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x66, 0x6c, 0x78, 0x70, 0x60, 0x60, 0x60, 0x60, 0xe0, 0x00},
+    {0x60, 0x30, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x38, 0x6c, 0x38, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x38, 0x6c, 0x38, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x7a, 0xc4, 0xce, 0xce, 0xd6, 0xe6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7a, 0xc4, 0xce, 0xd6, 0xe6, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x3c, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x18, 0x18, 0x30},
+    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x1c, 0x74, 0x06, 0x06, 0x06, 0x06, 0x1c, 0xf0, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0e, 0x3c, 0x06, 0x06, 0x1c, 0xf0, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0xc6, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc0, 0xfc, 0x06, 0x0c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc0, 0xfc, 0x06, 0x0c, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x7c, 0x00, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x00, 0x72, 0x9c, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x00, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x3c, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x5c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xdc, 0xe6, 0x7c, 0x80, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0d, 0x06, 0x00},
+    {0x00, 0x00, 0x06, 0x0d, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x6c, 0x8e, 0x16, 0x26, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0xcd, 0x0d, 0x38, 0x0c, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xdc, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x06, 0x06, 0x1f, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
+    {0x00, 0x00, 0x00, 0x06, 0x0d, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x46, 0x6c, 0x2c, 0x2c, 0x38, 0x18, 0x18, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0x64, 0x28, 0x38, 0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xdc, 0x6c, 0x0c, 0x0c, 0x0e, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x3c, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x7b, 0xde, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x78, 0x58, 0x3e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x7f, 0x63, 0x66, 0x6c, 0x7e, 0x63, 0xf3, 0x03, 0x33, 0x1e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6e, 0x06, 0x06, 0x06, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0xc0, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x03, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0xd8, 0xd8, 0xde, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0xcc, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0xcc, 0xdc, 0x6c, 0x0c, 0x0d, 0x06, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0x60, 0x60, 0x6c, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x66, 0x6c, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xfc, 0xc0, 0xd8, 0x70, 0x00},
+    {0x00, 0x00, 0x0e, 0x1b, 0x19, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x98, 0xd8, 0x70, 0x00},
+    {0x00, 0x00, 0x0e, 0x1b, 0x19, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x98, 0xd8, 0x70, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x18, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0xd8, 0x70, 0x00},
+    {0x00, 0x00, 0x70, 0xd8, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x3b, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xd6, 0xd6, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3e, 0x60, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x06, 0x06, 0x03, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x66, 0xcb, 0xfe, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x7e, 0xc7, 0x7c, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0x70, 0x30, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc3, 0xc3, 0xdb, 0xdb, 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x76, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x03, 0x7e, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x0c, 0x00, 0x1c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x7e, 0xcc, 0x78, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xcc, 0x6c, 0x3c, 0x3c, 0x6c, 0xcc, 0x0c, 0x0c, 0x0e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x06, 0x0d, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x1c, 0x18, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0x70, 0x30, 0xfc, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xda, 0xdc, 0x6f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xdb, 0xdb, 0xde, 0xde, 0xdb, 0x6b, 0x03, 0x1b, 0x0e, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x7f, 0xd9, 0xda, 0xda, 0xdb, 0xdd, 0x6f, 0x04, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x60, 0x60, 0xf6, 0x6d, 0x6c, 0x66, 0x63, 0x6b, 0x36, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x26, 0x6d, 0x6c, 0xfc, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x3c, 0x0c, 0x2c, 0x18, 0x00},
+    {0x00, 0x00, 0x20, 0x60, 0x60, 0xf6, 0x6d, 0x6c, 0x6c, 0x6e, 0x6d, 0x36, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd8, 0xc0, 0xfe, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x03, 0x0e, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6d, 0x6c, 0x66, 0x63, 0x6b, 0xf6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6f, 0x6b, 0x63, 0x66, 0x6c, 0x6d, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xd6, 0x7c, 0x6c, 0x28, 0xc6, 0xd6, 0x7c, 0x6c, 0x28, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xf0, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xc0, 0xf0, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x00, 0x38, 0x18, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xb0, 0xd8, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x18, 0xd8, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x18, 0xd8, 0x68, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xd8, 0xd8, 0xf0, 0xd8, 0xd8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc6, 0xd6, 0x7c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xd8, 0xd8, 0x78, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd8, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd8, 0xc0, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x70, 0xc0, 0x70, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0x70, 0x18, 0x70, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x20, 0x20, 0x70, 0x70, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xd8, 0xd8, 0x70, 0x70, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x1c, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x6c, 0x6c, 0x6c, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x34, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00},
+    {0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x34, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x3e, 0x32, 0x30, 0x34, 0x3c, 0x34, 0x30, 0x30, 0x32, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x33, 0x33, 0x33, 0x33, 0x3f, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x3e, 0x63, 0x63, 0x63, 0x63, 0x63, 0x36, 0x36, 0x36, 0x77, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x82, 0x44, 0x7c, 0x44, 0x00, 0x82, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x62, 0x30, 0x18, 0x18, 0x30, 0x62, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x92, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x6c, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x6c, 0x60, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x46, 0x6c, 0x2c, 0x2c, 0x38, 0x18, 0x18, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x30, 0x18, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x46, 0x7c, 0x18, 0x30, 0x60, 0x60, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0x20, 0x30, 0x10, 0x38, 0x38, 0x6c, 0x64, 0xc6, 0xc2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xf6, 0xc0, 0xc0, 0xc0, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x66, 0x6c, 0x3c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x3c, 0x30, 0x60, 0x3c, 0x60, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x46, 0x2c, 0x2c, 0x18, 0x30, 0x68, 0x68, 0xc4, 0xc2, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x6c, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x36, 0x1e, 0xc6, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc2, 0x65, 0x24, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0xc0, 0x21, 0x32, 0x12, 0x1c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc2, 0x65, 0x24, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0xa6, 0x2c, 0x38, 0x68, 0xca, 0xc4, 0x0c, 0x18, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0x60, 0x3c, 0x06, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x78, 0x68, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x32, 0x30, 0x30, 0x3c, 0x34, 0x30, 0x30, 0x30, 0x30, 0x00},
+    {0x00, 0x60, 0x30, 0x30, 0x60, 0x63, 0xff, 0xc6, 0x06, 0x0c, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x60, 0x60, 0xfe, 0xfe, 0x0c, 0x0c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xac, 0x26, 0x26, 0x0b, 0x0b, 0x1b, 0x1b, 0x1b, 0x1b, 0x03, 0x02, 0x04, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x30, 0x18, 0x28, 0x4c, 0x14, 0x24, 0x06, 0x02, 0x02, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6d, 0x03, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6d, 0x03, 0x7e, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xd6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x36, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x76, 0x9c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x7c, 0xd6, 0x66, 0x06, 0x06, 0x66, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x3c, 0x60, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x26, 0x1c, 0x70, 0xc0, 0xc2, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0x68, 0x38, 0x30, 0x38, 0x38, 0x4c, 0x4c, 0x86, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0xba, 0x30, 0x38, 0x28, 0x4c, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0xc0, 0xcc, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xdc, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x7e, 0x99, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x1c, 0x18, 0x7e, 0x58, 0x18, 0x18, 0x18, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0xa6, 0x2c, 0x38, 0x68, 0xca, 0xc4, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0x60, 0x3c, 0x06, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
+    {0x30, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xb2, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x03, 0x06, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xf8, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xd8, 0xd8, 0xd8, 0xde, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xd8, 0xfe, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xb2, 0x30, 0x3e, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x18, 0x00, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x38, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfe, 0xc6, 0x82, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xfe, 0x06, 0x02, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xff, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0xb0, 0xb0, 0x30, 0x3c, 0x36, 0x36, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x3e, 0x06, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x9c, 0xb6, 0xb6, 0xb6, 0xf6, 0xb6, 0xb6, 0xb6, 0xb6, 0x9c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0xcc, 0xcc, 0xcc, 0x7c, 0x6c, 0x6c, 0x6c, 0x6c, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x7c, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfe, 0xc6, 0x82, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xfe, 0x06, 0x02, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xff, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xb0, 0x30, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0xb6, 0xb6, 0xf6, 0xb6, 0xb6, 0x9c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xcc, 0xcc, 0x7c, 0x6c, 0x6c, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x06, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xf8, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xd8, 0xd8, 0xde, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xfe, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0xf8, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x38, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0xfc, 0xb4, 0x30, 0x3c, 0x36, 0x36, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x30, 0xfc, 0xb4, 0x30, 0x3c, 0x36, 0x36, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xce, 0xdb, 0xd9, 0xd8, 0xfe, 0xd8, 0xd8, 0xd9, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xdb, 0xd8, 0xfe, 0xd8, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0x6c, 0xfe, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x6c, 0x7c, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x88, 0x8c, 0x9c, 0x96, 0xf6, 0xb6, 0xbf, 0xab, 0xeb, 0xeb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x8c, 0x9c, 0xf6, 0xbe, 0xab, 0xeb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x6c, 0x6c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x6c, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0xa3, 0xb2, 0x96, 0xfc, 0x9c, 0xbe, 0xaa, 0xab, 0xeb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0xa3, 0x96, 0xfe, 0xab, 0xab, 0xeb, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x10, 0x7c, 0xc6, 0x06, 0x06, 0x7c, 0x06, 0x06, 0x06, 0x7c, 0xc0, 0x7c, 0x00, 0x00},
+    {0x00, 0x6c, 0x38, 0x10, 0x00, 0x7c, 0x86, 0x06, 0x7c, 0x06, 0x06, 0x7c, 0xc0, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x96, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x10, 0x96, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc2, 0xc6, 0xc6, 0xc4, 0xcc, 0x6c, 0x68, 0x78, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x64, 0x6c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0x66, 0x00, 0xc2, 0xc6, 0xc4, 0xc4, 0x6c, 0x68, 0x78, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0x66, 0x00, 0xc2, 0xc6, 0x64, 0x6c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd8, 0xd8, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6f, 0x03, 0x06, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x6f, 0x03, 0x06, 0x1c, 0x00},
+    {0x00, 0x10, 0x7c, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0xd6, 0xc6, 0xc6, 0xc6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00},
+    {0x04, 0x7c, 0x40, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x04, 0x7c, 0x40, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x7c, 0x54, 0x00, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0x54, 0x00, 0x6c, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x60, 0x3c, 0x0c, 0x0c, 0x0c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0x78, 0x18, 0x18, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x06, 0x3c, 0x0f, 0x18, 0x18, 0xf0, 0x3c, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x04, 0x7c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x24, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x40, 0x7c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x04, 0x7c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x66, 0x00, 0xc3, 0x00, 0x66, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x50, 0x46, 0x00, 0x82, 0x41, 0x00, 0x62, 0x0a, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x60, 0xf0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x6e, 0x64, 0x7a, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x6e, 0x64, 0x7a, 0x60, 0x60, 0xf0, 0x00},
+    {0x02, 0x06, 0xfe, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x02, 0x06, 0xfe, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0xf8, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0xf8, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xf6, 0x06, 0x16, 0x0c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x78, 0x6c, 0x66, 0xf6, 0x06, 0x16, 0x0c, 0x00},
+    {0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x30, 0x60, 0x38, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xd6, 0xd6, 0xdc, 0xf8, 0xdc, 0xd6, 0xd6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xdc, 0xf8, 0xdc, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0xf6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0xf0, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf3, 0xb3, 0xb3, 0x36, 0x3c, 0x3c, 0x36, 0x33, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf3, 0xb6, 0xbc, 0x3c, 0x36, 0x33, 0x73, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xdf, 0xdb, 0xd9, 0xd8, 0xf8, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdf, 0xdb, 0xd9, 0xf8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0xd8, 0xd8, 0xd8, 0xde, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x03, 0x0b, 0x06, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xfe, 0xdb, 0xdb, 0xdb, 0x03, 0x0b, 0x06, 0x00},
+    {0x00, 0x00, 0x7c, 0xc2, 0xcc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xcc, 0x7a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc2, 0xcc, 0xd6, 0xd6, 0xcc, 0x7a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x0c, 0x04, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x0c, 0x04, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x3c, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x3c, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xf6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7f, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7f, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0x7e, 0x16, 0x16, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xd6, 0x7e, 0x16, 0x16, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x33, 0xb3, 0xb3, 0x7f, 0x30, 0x30, 0x30, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x9e, 0xb3, 0x7f, 0x30, 0x30, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x33, 0xb3, 0xb3, 0x7f, 0x30, 0x30, 0x30, 0x33, 0x1e, 0x0c, 0x18, 0x0e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x9e, 0xb3, 0x7f, 0x30, 0x30, 0x33, 0x1e, 0x0c, 0x18, 0x0e, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x06, 0x16, 0x0c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x06, 0x16, 0x0c, 0x00},
+    {0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x16, 0x0c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x06, 0x16, 0x0c, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0e, 0x0c, 0x08, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x0e, 0x0c, 0x08, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc7, 0x03, 0x01, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x76, 0x36, 0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x86, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x86, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00},
+    {0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xce, 0xde, 0xfe, 0xf6, 0xe6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x3e, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x3e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x66, 0xcc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0xcc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc3, 0xc3, 0xc3, 0xf3, 0xdb, 0xdb, 0xf3, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x7c, 0xcd, 0xcd, 0xcd, 0xcd, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcd, 0xcd, 0xcd, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0x8c, 0x0c, 0x38, 0x0d, 0x0d, 0x0d, 0x0d, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0x0c, 0x39, 0x0d, 0x0d, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0x86, 0x06, 0x3c, 0x06, 0x06, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0x06, 0x07, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6d, 0x6d, 0x6d, 0x6d, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x6d, 0x6d, 0x6d, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xfc, 0xcd, 0xcd, 0xcd, 0xcd, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xfd, 0xcd, 0xcd, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xce, 0xc6, 0xc6, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xce, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x1b, 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x5a, 0x18, 0x1b, 0x1b, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x64, 0x94, 0xba, 0x52, 0x4c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x7b, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x7f, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x7e, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x0c, 0xd8, 0xfe, 0xc3, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x06, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xcf, 0xd6, 0xd6, 0xd6, 0xd6, 0xcc, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x7f, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x06, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xf6, 0xd6, 0xd6, 0xd6, 0xd6, 0xcc, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0x7f, 0x24, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0xf0, 0x3c, 0x0e, 0x04, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x6c, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x0c, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x30, 0x60, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcf, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x06, 0x06, 0x7c, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x60, 0x60, 0x60, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x06, 0x06, 0x06, 0x6c, 0x38, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x16, 0x16, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x76, 0x1e, 0x0e, 0x0c, 0xd8, 0xfe, 0xc3, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0xcc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x30, 0x18, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x63, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xfe, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd0, 0xd0, 0xd0, 0x7c, 0x16, 0x16, 0x16, 0xd6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x06, 0x3c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x1c, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x6a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7f, 0x0c, 0x0c, 0x0c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x0c, 0x0c, 0x0c, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x0f, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x0c, 0x18, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x7e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xcf, 0xd6, 0xd6, 0xcc, 0xc0, 0xc0, 0xc0, 0x00},
+    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x7f, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3e, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xf6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xca, 0xc0, 0xc0, 0xc0, 0x00},
+    {0x00, 0x00, 0x60, 0x38, 0x0c, 0x7f, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x06, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x1c, 0x0c, 0x18, 0x3c, 0x64, 0x66, 0x62, 0x63, 0x3d, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x0c, 0x0c, 0x0f, 0x00},
+    {0x00, 0x00, 0x0e, 0x18, 0x30, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0f, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x6c, 0x38, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x3e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x3e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7e, 0x06, 0x06, 0x06, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x76, 0x1c, 0x18, 0x30, 0x60, 0x3e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcf, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x0f, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x06, 0x66, 0x3c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x10, 0xdc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x76, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0xfe, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xd0, 0xd0, 0x7c, 0x16, 0x16, 0x16, 0x16, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0xcc, 0xcc, 0xcc, 0x77, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x6c},
+    {0x18, 0x00, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x38, 0x10, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x60, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x0c, 0x00},
+    {0x10, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x74, 0xd6, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0xc0, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x03, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x18, 0x30, 0x00},
+    {0x0c, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1b, 0x36, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x44, 0xaa, 0x6c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x0a, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x40, 0x50, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x3c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x6c, 0xd8, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x08, 0x30},
+    {0x60, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x40, 0xa0, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x10, 0x10},
+    {0x18, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x06, 0x03, 0x00},
+    {0x48, 0xa8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x33, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x00, 0x06, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0x60, 0x66, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x18},
+    {0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x18, 0x03, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x7e, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x66, 0x76, 0xdc, 0xcc, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x0c, 0x0c, 0x0c, 0x1c, 0x36, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xcc, 0xd6, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xee, 0x66, 0x66, 0x66, 0x66, 0x66, 0x2c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x4c, 0xcc, 0xcc, 0xec, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x46, 0xc6, 0xc6, 0xe6, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xee, 0x66, 0x66, 0x6c, 0x78, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xee, 0x66, 0x66, 0x34, 0x18, 0x0c, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x66, 0x64, 0x6c, 0x6e, 0x60, 0x60, 0x60, 0x60, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xf6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x66, 0x66, 0xe6, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x66, 0x66, 0xc6, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x22, 0x20, 0x10, 0x08, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x20, 0x1e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x02, 0x3c, 0x40, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x20, 0x1c, 0x20, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x18, 0x20, 0x1c, 0x20, 0x00, 0x00},
+    {0x00, 0x30, 0x40, 0x38, 0x40, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x28, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x88, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x20, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x40, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x3c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x40, 0x30, 0x4e, 0x49, 0x39, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x24, 0x00},
+    {0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x12, 0xca, 0x2c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00},
+    {0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x14, 0x0c, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00},
+    {0x0a, 0x2a, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x01, 0x7e, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x10, 0x0c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x10, 0x0c, 0x10},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x70, 0x70, 0x38, 0x18, 0x18, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x44, 0xfc, 0xf8, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x4a, 0xfe, 0xf4, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x20, 0x40, 0x30, 0x10, 0x20, 0x42, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x2c, 0x44, 0x42, 0x82, 0x82, 0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xf8, 0x78, 0x08, 0x08, 0x08, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x82, 0xc6, 0xc6, 0x6c, 0x28, 0x38, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x10, 0x38, 0x28, 0x6c, 0xc6, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xf8, 0x88, 0xf8, 0x78, 0x08, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x91, 0x92, 0x64, 0x08, 0x10, 0x26, 0x49, 0x89, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x18, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0xfe, 0x7c, 0x38, 0x6c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x06, 0x29, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x06, 0x28, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x06, 0x28, 0x5e, 0x00, 0x00, 0x00},
+    {0x00, 0x07, 0x08, 0x07, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x04, 0x03, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x04, 0x03, 0x04, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x23, 0x54, 0x33, 0x24, 0x40, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x04, 0x03, 0x04, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x08, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0x81, 0x7e, 0x08, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x08, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00},
+    {0x06, 0x08, 0x06, 0x08, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x08, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x94, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x88, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x94, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x20, 0x38, 0x28, 0x70, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x08, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x20, 0x38, 0x28, 0x70, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x00, 0x08, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x00, 0x14, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x08, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x1c, 0x6a, 0x04, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x14, 0x08, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x12, 0x04, 0x18, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x15, 0x88, 0x88, 0x8a, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x88, 0x90, 0x65, 0x00, 0x02, 0x00, 0x00, 0x00},
+    {0x00, 0x04, 0x00, 0x0a, 0x00, 0x01, 0x15, 0x88, 0x88, 0x90, 0x65, 0x00, 0x02, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x90, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x2a, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x20, 0x00, 0x50, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00},
+    {0x0a, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x00, 0x01, 0x02, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x20, 0x40, 0x3e, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x01, 0x02, 0x05, 0x0b, 0x48, 0x84, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x00, 0x29, 0x01, 0x19, 0x21, 0x19, 0xa1, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x05, 0x0b, 0x48, 0x84, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0xa4, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x44, 0x09, 0xa2, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x08, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x02, 0x2a, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x14, 0x00, 0x08, 0x00},
+    {0x00, 0x08, 0x00, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x04, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x08, 0x14, 0x08, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0x3c, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x38, 0x40, 0x38, 0x40, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x40, 0x38, 0x40, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x12, 0x2c, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x3c, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x28, 0x18, 0x10, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x08, 0x08, 0x08, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x20, 0x47, 0x88, 0x08, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x50, 0x20, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x08, 0x00, 0x08},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x14, 0x00, 0x08},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x80, 0x60, 0x80, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x40, 0x40, 0x43, 0x55, 0x7e, 0x80, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x2a, 0x20, 0x26, 0x2a, 0x7c, 0x80, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x0e, 0x1c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x14, 0x08, 0x14, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x2c, 0x10, 0x28, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x15, 0x8a, 0x90, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x5a, 0xa5, 0x66, 0x5b, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x5a, 0x66, 0xa5, 0x5a, 0x00},
+    {0x00, 0x00, 0x18, 0x66, 0x42, 0x42, 0x81, 0x99, 0x99, 0x81, 0x42, 0x42, 0x66, 0x18, 0x00, 0x00},
+    {0x08, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x26, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x0c, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x8a, 0x90, 0x60},
+    {0x32, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x0c, 0x04, 0x08, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x40, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x30, 0x40, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x28, 0x54, 0xaa, 0x92, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x82, 0xfe, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x14, 0x08},
+    {0x08, 0x14, 0x22, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x10, 0x10, 0x10},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x70, 0x70, 0x38, 0x18, 0x18, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x44, 0xfc, 0xf8, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x4a, 0xfe, 0xf4, 0x60, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x4e, 0xf0, 0xfe, 0x7c, 0x30, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x38, 0x2c, 0x44, 0x42, 0x82, 0x92, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x60, 0x7e, 0x3c, 0x30, 0x60, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x82, 0xc6, 0xc6, 0x6c, 0x28, 0x38, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x10, 0x38, 0x28, 0x6c, 0xc6, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xf8, 0x88, 0xf8, 0x78, 0x08, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x88, 0x88, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x40, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x88, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x20, 0x1e, 0x20, 0x00, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x3c, 0x40, 0x54, 0x54, 0x54, 0x54, 0x40, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x4c, 0x30, 0x4c, 0x02, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x64, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0xaa, 0xaa, 0xaa, 0x82, 0x82, 0x40, 0x30, 0x4c, 0x02, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x82, 0x82, 0x44, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92, 0x92, 0x82, 0x82, 0x40, 0x30, 0x4c, 0x02, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x38, 0x6c, 0x38},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x38, 0x6c, 0x38},
+    {0x18, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x0c, 0xec, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x7c, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x30, 0x30, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x60, 0x0c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x30, 0x18, 0x70, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x30, 0x18, 0x70, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x10, 0x38, 0x6c, 0x00},
+    {0x60, 0x30, 0x00, 0x7c, 0x00, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x7c, 0x00, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x76, 0xdc, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x76, 0xdc, 0x00},
+    {0x6c, 0x38, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x18, 0x0c, 0x38, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x0c, 0x38, 0x00},
+    {0x18, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0x38, 0x6c, 0x64, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00},
+    {0x30, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x0c, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xe0, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x60, 0x30, 0xe0, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x30, 0x18, 0x70, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x6c, 0x38, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x6c, 0x38, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x76, 0xdc, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x76, 0xdc, 0x00},
+    {0x0c, 0x18, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x66, 0x66, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x0c, 0xec, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x7c, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x7c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x7e, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x10, 0x38, 0x6c, 0x00},
+    {0x0c, 0x18, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x30, 0x30, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x10, 0x38, 0x6c, 0x00},
+    {0x0c, 0x18, 0x72, 0x9c, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x00, 0x72, 0x9c, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
+    {0x18, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00},
+    {0x18, 0x18, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x7c, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x7c, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x60, 0x6c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0x70, 0x1c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x60, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x44, 0x38, 0x10, 0x7c, 0xc6, 0xc6, 0x70, 0x1c, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x44, 0x38, 0x10, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0x7c, 0xc6, 0x60, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x18, 0x18, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x06, 0x16, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x7e, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x7e, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x08, 0x1c, 0x36, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x6c, 0x6c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x6c, 0x6c, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x76, 0xdc, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x76, 0xdc, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x10, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x10, 0x38, 0x6c, 0x00},
+    {0x0c, 0x18, 0x72, 0x9c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x76, 0xdc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0xcc, 0xcc, 0x00, 0xfc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x18, 0x18, 0x00},
+    {0x60, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x30, 0x30, 0x00},
+    {0x30, 0x30, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x10, 0x38, 0x44, 0xfe, 0xc6, 0x8c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x7c, 0x00, 0x00},
+    {0x6c, 0x6c, 0x00, 0x10, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x18, 0x0c, 0x18, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x30, 0x00, 0x38, 0x6c, 0x64, 0x60, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
+    {0x38, 0x0c, 0x18, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x16, 0x38, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x16, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0xc0, 0x68, 0x1c, 0x36, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0xc0, 0x68, 0x1c, 0x36, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x0e, 0x13, 0x3a, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x10, 0x28, 0x54, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x10, 0x38, 0x44, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x6c, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
+    {0x0c, 0x18, 0x44, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x18, 0x44, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x44, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x30, 0x44, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x08, 0x54, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x08, 0x54, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x72, 0x9c, 0x44, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x72, 0x9c, 0x44, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x6c, 0x38, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x38, 0x0c, 0x18, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x23, 0x76, 0x88, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x26, 0x70, 0xd8, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0xc4, 0x6e, 0x11, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0xc0, 0x64, 0x0e, 0x1b, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x10, 0x38, 0x44, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x10, 0x38, 0x44, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x38, 0x0c, 0x18, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x38, 0x0c, 0x18, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x0c, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x23, 0x76, 0x88, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x26, 0x70, 0xd8, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0xc4, 0x6e, 0x11, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0xc0, 0x64, 0x0e, 0x1b, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0e, 0x13, 0x3a, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0e, 0x13, 0x3a, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x10, 0x28, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x76, 0xdc, 0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x38, 0x44, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x18, 0x33, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1b, 0x33, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x33, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x63, 0x33, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x70, 0x1b, 0x33, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0x1b, 0x33, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x68, 0xb3, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x68, 0xb3, 0x03, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x03, 0x7a, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x06, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
+    {0x38, 0x0c, 0x18, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0x18, 0x30, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x33, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1b, 0x33, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x33, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x63, 0x33, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x70, 0x1b, 0x33, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0x1b, 0x33, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x68, 0xb3, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x68, 0xb3, 0x03, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x03, 0x03, 0xce, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x30, 0x30, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x06, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x30, 0x30, 0x00},
+    {0x30, 0x18, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x30, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x0c, 0x18, 0xf6, 0x06, 0x00},
+    {0x38, 0x0c, 0x18, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x38, 0x0c, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x3a, 0x5c, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00},
+    {0x00, 0x18, 0x18, 0x30, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x30, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x60, 0x6c, 0xc6, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xcc, 0x66, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x60, 0x66, 0xcc, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xc6, 0x6c, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x34, 0x58, 0x0c, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x34, 0x58, 0x30, 0x18, 0x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0xfe, 0x00, 0xa4, 0xaa, 0xea, 0xea, 0xa6, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xa4, 0xea, 0xaa, 0xaa, 0xa6, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xea, 0x8a, 0xce, 0x8e, 0xea, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xea, 0x8e, 0xca, 0x8a, 0xea, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xca, 0x2e, 0x4a, 0x2a, 0xca, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xaa, 0xae, 0xea, 0x2a, 0x2a, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0x6a, 0x8e, 0xca, 0xaa, 0x4a, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0x38, 0x20, 0x30, 0x20, 0x20, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0x30, 0x28, 0x30, 0x20, 0x20, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xea, 0x4a, 0x4e, 0x4a, 0x4a, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0x28, 0x28, 0x38, 0x28, 0x28, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xea, 0x2a, 0x4e, 0x8e, 0xee, 0x00, 0x6c, 0x8a, 0x4c, 0x28, 0xc8, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xea, 0x2a, 0x4e, 0x8e, 0xee, 0x00, 0xa2, 0xa2, 0xe2, 0xea, 0xa4, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xea, 0x2a, 0x4e, 0x8e, 0xee, 0x00, 0x08, 0x08, 0x08, 0x28, 0x10, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0x80, 0x80, 0x80, 0xf0, 0x28, 0x30, 0x28, 0x0a, 0x0e, 0x0e, 0x0a, 0x00, 0xfe, 0x00},
+    {0xfe, 0x00, 0xc0, 0xa0, 0xc0, 0xa0, 0x20, 0x20, 0x38, 0x0a, 0x0e, 0x0e, 0x0a, 0x00, 0xfe, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x9c, 0xd2, 0xbc, 0x92, 0x9c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00},
+    {0x00, 0x18, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00},
+    {0x00, 0x30, 0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x66, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00},
+    {0x00, 0xcc, 0xcc, 0xcc, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x38, 0x3c, 0x38, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc6, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc6, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x6b, 0x6b, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x92, 0x44, 0x28, 0x92, 0x28, 0x44, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0xc3, 0xdb, 0x1b, 0x1e, 0x1c, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x7c, 0x00, 0x00},
+    {0x7c, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x38, 0x6c, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x38, 0x28, 0x00, 0x00, 0x44, 0xee, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7b, 0xcf, 0xcf, 0x1b, 0x33, 0x33, 0x33, 0x00, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xde, 0xf3, 0xf3, 0xc6, 0xcc, 0xcc, 0xcc, 0x00, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x06, 0x06, 0x0c, 0x0c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xdb, 0xdb, 0xdb, 0xde, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x72, 0xf2, 0xf2, 0xf2, 0x72, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x9c, 0x9e, 0x9e, 0x9e, 0x9c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd8, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x18, 0x38, 0x78, 0xd8, 0xfc, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xf8, 0xc0, 0xf0, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x78, 0xc0, 0xf0, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xf8, 0xd8, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd8, 0x70, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd8, 0xd8, 0x78, 0x18, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x60, 0x60, 0x60, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x60, 0x30, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xb0, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0xd8, 0xfc, 0x18, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xc0, 0xf0, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xc0, 0xf0, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xd8, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x70, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xd8, 0x78, 0x18, 0xf0, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x60, 0x60, 0x60, 0x30, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0xc0, 0xcf, 0xcc, 0xcc, 0x7f, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x04, 0x7c, 0xce, 0xc8, 0xc8, 0xd0, 0xd0, 0xd0, 0xe0, 0xe6, 0x7c, 0x40, 0x40, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xd6, 0xd8, 0xd8, 0xd8, 0xde, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0xc0, 0xc0, 0xc0, 0xf0, 0xcd, 0xce, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x60, 0xf8, 0x60, 0xf8, 0x60, 0x60, 0xe6, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x02, 0xec, 0xd6, 0xde, 0xd6, 0xd6, 0xf6, 0xd6, 0x40, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x66, 0x76, 0xff, 0x76, 0x6e, 0xff, 0x6e, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x7c, 0x62, 0x66, 0x6f, 0x66, 0x66, 0xf3, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xf8, 0xe0, 0xf3, 0xd6, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x81, 0x81, 0x81, 0x5a, 0xff, 0x5a, 0xff, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xf2, 0x8a, 0xaa, 0xaa, 0xaa, 0xaa, 0xa2, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x3e, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x7c, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x36, 0x60, 0xfc, 0x60, 0xf8, 0x60, 0x60, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x6c, 0x78, 0xfe, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x1e, 0x78, 0x1e, 0x78, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x7c, 0xb6, 0x36, 0x33, 0x33, 0x33, 0x63, 0x66, 0xf6, 0xdc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd0, 0xd2, 0xd6, 0x7c, 0x18, 0x30, 0x6e, 0xd8, 0x98, 0x18, 0x0e, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xd0, 0xd2, 0xd6, 0x7c, 0x18, 0x30, 0x6e, 0xd8, 0x8c, 0x06, 0x1c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x62, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0xa0, 0x62, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x4e, 0xb9, 0x58, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x7c, 0xda, 0xd8, 0xd8, 0xda, 0x7c, 0x19, 0x3f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xc0, 0xc2, 0xc6, 0x7c, 0x18, 0x30, 0x6e, 0xdb, 0x9b, 0x1b, 0x0e, 0x00, 0x00, 0x00},
+    {0x00, 0x70, 0xc0, 0xc2, 0xc6, 0x7c, 0x18, 0x30, 0x7b, 0xdb, 0x9b, 0x1b, 0x0d, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc2, 0xc0, 0x78, 0xc0, 0xc0, 0xc2, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x26, 0x3e, 0x26, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7f, 0xb9, 0x58, 0x1a, 0x1e, 0x1a, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x66, 0x46, 0x87, 0x8c, 0x8c, 0x7c, 0x98, 0x98, 0x70, 0x00},
+    {0x00, 0x00, 0x52, 0xb5, 0x15, 0x16, 0x2c, 0x34, 0x68, 0xa9, 0xaa, 0x4c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x48, 0xb0, 0x80, 0x48, 0x7c, 0x66, 0x26, 0x26, 0xa6, 0x46, 0x06, 0x34, 0x48, 0x00},
+    {0x00, 0x00, 0xe2, 0xa2, 0xa2, 0xa2, 0xbe, 0xa2, 0xa2, 0xa2, 0xa2, 0xe2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x36, 0x3b, 0x3b, 0x33, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x1e, 0x18, 0x76, 0x3b, 0x3b, 0x33, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x33, 0x4e, 0x06, 0x06, 0x0c, 0x0c, 0x1f, 0x6c, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x71, 0x8e, 0x04, 0x0c, 0x06, 0x03, 0x63, 0xc3, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x46, 0x49, 0x39, 0x1e, 0x18, 0x30, 0x70, 0xb1, 0xba, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0e, 0x19, 0x31, 0x32, 0x64, 0x68, 0x70, 0xe1, 0x66, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd8, 0xff, 0xd8, 0xde, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xde, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe2, 0xa2, 0xb2, 0xb2, 0xaa, 0xaa, 0xa6, 0xa6, 0xa2, 0xe2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xcc, 0xcf, 0xed, 0xff, 0xfc, 0xdf, 0xcc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0xb9, 0xa5, 0xa5, 0xb9, 0xa1, 0xa1, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x40, 0x8e, 0x93, 0xa3, 0x63, 0x4b, 0x6a, 0xa4, 0xb0, 0xb0, 0x60, 0x00},
+    {0x00, 0x00, 0xfc, 0xa2, 0xa2, 0xa2, 0xa2, 0xbc, 0xa0, 0xa0, 0xa0, 0xe0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xa2, 0xa2, 0xa2, 0xa2, 0xa2, 0xa2, 0xaa, 0xa6, 0x7e, 0x01, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3e, 0x4d, 0x4d, 0x19, 0x1e, 0x1c, 0x34, 0x34, 0xb5, 0x62, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x58, 0xa6, 0xa3, 0x6c, 0xb8, 0x26, 0x26, 0x26, 0xa7, 0xc2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0xa2, 0xa2, 0xa2, 0xa2, 0xbc, 0xb0, 0xa8, 0xa4, 0xe2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 0x6d, 0x67, 0x66, 0xee, 0x08, 0x00, 0x00, 0x00},
+    {0x30, 0x0c, 0xfc, 0xc6, 0xc6, 0xc6, 0xfc, 0xd8, 0xdc, 0xdc, 0xe6, 0xe6, 0x20, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x71, 0xdb, 0x35, 0xd1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x52, 0x5a, 0x52, 0x5f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf1, 0x5b, 0x55, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x18, 0xce, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xe6, 0x6c, 0x38, 0x50, 0x40, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x0a, 0x14, 0x14, 0x28, 0x28, 0x50, 0x50, 0xa0, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x9c, 0x30, 0xfe, 0x0c, 0x18, 0x38, 0x0c, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x00},
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xee, 0x6c, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x26, 0x03, 0x13, 0x0c, 0x13, 0x03, 0x03, 0x66, 0x98, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x6c, 0x38, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x2d, 0x2d, 0x1a, 0x1e, 0x1b, 0x31, 0x31, 0xb2, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x14, 0x6b, 0xc8, 0xcc, 0xc6, 0xc6, 0xcc, 0xc0, 0x63, 0x1c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0xe7, 0xff, 0xe0, 0x67, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x26, 0x44, 0xf8, 0xc0, 0xc8, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x4c, 0x52, 0x3c, 0x10, 0x3c, 0x60, 0xc0, 0xc3, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x73, 0xce, 0x18, 0x3a, 0x5c, 0x18, 0x30, 0x30, 0xb0, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x2c, 0x3c, 0x2c, 0x8c, 0xcc, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x12, 0x12, 0x12, 0x16, 0x36, 0x3e, 0x3a, 0x5a, 0x52, 0x91, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x26, 0x46, 0xc6, 0xc4, 0xc8, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x42, 0xc6, 0xe7, 0x7a, 0x38, 0x5c, 0xce, 0xe7, 0x63, 0xe2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xfc, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x0c, 0x7e, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x40, 0x78, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x1e, 0x7e, 0xf2, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xfe, 0x7e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x38, 0x00, 0x78, 0x38, 0x38, 0x38, 0x38, 0x38, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7d, 0xff, 0x83, 0x86, 0x82, 0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x1c, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0xe0, 0x30, 0x62, 0xc6, 0xfc, 0x18, 0x30, 0x60, 0xdc, 0x86, 0x1c, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0xe0, 0x30, 0x62, 0xc6, 0xfc, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0x30, 0x70, 0xb2, 0xf6, 0x3c, 0x18, 0x30, 0x60, 0xde, 0x98, 0x1c, 0x06, 0x1c, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0xb0, 0x3c, 0x36, 0x1c, 0x00, 0x00},
+    {0x00, 0xf0, 0xc0, 0xe2, 0x36, 0xec, 0x18, 0x30, 0x60, 0xdc, 0xb0, 0x3c, 0x36, 0x1c, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
+    {0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
+    {0x00, 0xf0, 0x80, 0xe2, 0x36, 0xec, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
+    {0x00, 0xf0, 0x30, 0x62, 0x66, 0x6c, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x1c, 0x36, 0x1c, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0xce, 0xc4, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x73, 0x23, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x65, 0x65, 0x65, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xb5, 0xb5, 0xb5, 0xb5, 0xb5, 0xb5, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0xce, 0xce, 0xce, 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0xdb, 0x73, 0x73, 0x73, 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x95, 0x95, 0x95, 0x65, 0x65, 0x65, 0x95, 0x95, 0x95, 0x95, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xce, 0xc4, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x00, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x73, 0x23, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x05, 0x05, 0x00, 0x95, 0x95, 0x95, 0x95, 0x95, 0x65, 0x65, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x15, 0x15, 0x00, 0xb5, 0xb5, 0xb5, 0xb5, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0x00, 0xdb, 0xdb, 0xce, 0xce, 0xce, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x00, 0xdb, 0xdb, 0x73, 0x73, 0x73, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x05, 0x05, 0x00, 0x95, 0x95, 0x65, 0x65, 0x95, 0x95, 0x95, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x5a, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0x5a, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0xcc, 0xe6, 0xd6, 0xd6, 0xd6, 0xd6, 0xe6, 0xcc, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x5a, 0x99, 0xbd, 0xdb, 0xdb, 0xbd, 0x99, 0x5a, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0xcc, 0x86, 0x06, 0x06, 0x06, 0x06, 0x86, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xf0, 0xe0, 0xb0, 0x18, 0x0c, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x0f, 0x07, 0x0d, 0x18, 0x30, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x30, 0x18, 0x0d, 0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x0c, 0x18, 0xb0, 0xe0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x62, 0xff, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x26, 0xff, 0x46, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0xbb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x73, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xff, 0x6c, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0xff, 0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x66, 0xfc, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x66, 0x3f, 0x66, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x63, 0xff, 0x63, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xc6, 0xff, 0xc6, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x33, 0x63, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x60, 0xcc, 0xc6, 0x7f, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x3b, 0x6b, 0xfe, 0x68, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x60, 0xdc, 0xd6, 0x7f, 0x16, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x5a, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x6e, 0xff, 0x76, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x30, 0x60, 0x63, 0xff, 0xc6, 0x16, 0x1c, 0x1c, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 0x66, 0x36, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x0c, 0xfe, 0xcc, 0xd8, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x36, 0x66, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xd8, 0xcc, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x0c, 0x0c, 0x3f, 0x1e, 0x0c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x36, 0x66, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x30, 0xfc, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0x0c, 0x3f, 0x1e, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x00, 0xf0, 0xe0, 0xb0, 0x18, 0x0c, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x98, 0xb0, 0xff, 0xb0, 0x98, 0x19, 0x0d, 0xff, 0x0d, 0x19, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x1e, 0x1c, 0x16, 0x03, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x78, 0x38, 0x68, 0xc0, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x1c, 0x1e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1e, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x06, 0xff, 0x06, 0x0c, 0x30, 0x60, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x2e, 0x3f, 0x24, 0x24, 0x24, 0x24, 0xfc, 0x74, 0x24, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x60, 0xff, 0x60, 0x30, 0x0c, 0x06, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x7e, 0xff, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0xff, 0x7e, 0x24, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xff, 0x00, 0xff, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xff, 0x00, 0xff, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x7f, 0xc4, 0x7f, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x7e, 0xcb, 0x7e, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0xfe, 0x23, 0xfe, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x7f, 0xc0, 0x7f, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x7c, 0xee, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xfe, 0x03, 0xfe, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x7e, 0xc3, 0x7e, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x7c, 0xee, 0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xf0, 0xe0, 0xb0, 0xd8, 0xec, 0xb6, 0x1b, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x0f, 0x07, 0x0d, 0x1b, 0x37, 0x6d, 0xd8, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x20, 0x30, 0xd8, 0x6d, 0x37, 0x1b, 0x0d, 0x07, 0x0f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x0c, 0x1b, 0xb6, 0xec, 0xd8, 0xb0, 0xe0, 0xf0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x60, 0xff, 0x60, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0xfc, 0x06, 0xff, 0x06, 0xfc, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x6a, 0xff, 0x65, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xa6, 0xff, 0x56, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x3c, 0x18, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x3c, 0x18, 0x3c, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xd5, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0x66, 0x18, 0x00, 0x18, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x06, 0xab, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x00, 0x18, 0x00, 0x18, 0x00, 0x18, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xb0, 0xff, 0xb0, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x0d, 0xff, 0x0d, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x41, 0x81, 0x41, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x44, 0x44, 0x44, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0xfc, 0x82, 0x81, 0x82, 0xfc, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0x44, 0x44, 0x44, 0x44, 0x44, 0xc6, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x7c, 0x00, 0x7c, 0x44, 0x7c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x44, 0xc6, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x7c, 0xc6, 0x44, 0x44, 0x44, 0xc6, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x54, 0xd6, 0x54, 0x54, 0x54, 0xd6, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x28, 0x54, 0xee, 0x44, 0xc6, 0x44, 0x44, 0x44, 0x44, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x28, 0x54, 0xee, 0x44, 0xc6, 0x44, 0x44, 0xc6, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xe8, 0xbc, 0x82, 0x81, 0x82, 0xbc, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x80, 0xbc, 0xb8, 0xac, 0x86, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x01, 0x81, 0xc1, 0x61, 0x35, 0x1d, 0x3d, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0xc6, 0x44, 0x44, 0x44, 0xc6, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0xfe, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60, 0x60, 0x60, 0x60, 0x60, 0x66, 0x3c, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x06, 0x06, 0x3e, 0x66, 0xc6, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x7e, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0xfe, 0x16, 0x16, 0x16, 0x7e, 0x16, 0x26, 0x26, 0x26, 0xfe, 0x40, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x3e, 0x66, 0xcf, 0xdb, 0xdb, 0xf3, 0x66, 0x7c, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x3e, 0x60, 0xc0, 0xc0, 0xfe, 0xc0, 0xc0, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x3e, 0x64, 0xc8, 0xc8, 0xfe, 0xc8, 0xd0, 0x70, 0x3e, 0x20, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x3e, 0x60, 0xc0, 0xfe, 0xc0, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xf8, 0x0c, 0x06, 0x06, 0xfe, 0x06, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0xf8, 0x1c, 0x16, 0x26, 0xfe, 0x26, 0x26, 0x4c, 0xf8, 0x40, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xf8, 0x0c, 0x06, 0xfe, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xe7, 0x00, 0x00},
+    {0x00, 0x00, 0xe7, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x0c, 0x18, 0x30, 0x60, 0xc1, 0xff, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0xc0, 0xc0, 0x00, 0x00, 0x00},
+    {0x00, 0xc0, 0xc0, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x7e, 0x18, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x06, 0x06, 0x06, 0x0c, 0xcc, 0x6c, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe3, 0x33, 0x66, 0x36, 0xe6, 0x0c, 0xcc, 0x6c, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x33, 0x73, 0xb6, 0xf6, 0x36, 0x0c, 0xcc, 0x6c, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdb, 0xdb, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x16, 0x0c, 0x1c, 0x34, 0x62, 0xff, 0x02, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x1a, 0x1c, 0x38, 0x58, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6e, 0x7c, 0xec, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x1a, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
+    {0x33, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00},
+    {0x2a, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0xa8, 0x00, 0x00},
+    {0x0c, 0x1a, 0x18, 0x18, 0x3c, 0x5a, 0x99, 0x99, 0x5a, 0x3c, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
+    {0x33, 0x66, 0x66, 0x66, 0x7e, 0xe7, 0xe7, 0xe7, 0xe7, 0x7e, 0x66, 0x66, 0x66, 0xcc, 0x00, 0x00},
+    {0x2a, 0x54, 0x54, 0x54, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x54, 0x54, 0x54, 0xa8, 0x00, 0x00},
+    {0x18, 0x34, 0x30, 0x30, 0x38, 0x35, 0x33, 0x37, 0x30, 0x30, 0x30, 0x30, 0xb0, 0x60, 0x00, 0x00},
+    {0x0c, 0x1a, 0x18, 0x18, 0x3c, 0x5a, 0xfa, 0x5a, 0x5a, 0x3c, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
+    {0x0c, 0x1a, 0x18, 0x18, 0x3c, 0x5a, 0x5f, 0x5a, 0x5a, 0x3c, 0x18, 0x18, 0x58, 0x30, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0xfc, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0x7e, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x76, 0xdc, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xdb, 0xdb, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0xdb, 0xdb, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x1c, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x10, 0x76, 0xdc, 0x10, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x76, 0xdc, 0x10, 0xfe, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x08, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x08, 0x76, 0xdc, 0x10, 0xfe, 0x20, 0xfe, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x76, 0xdc, 0x10, 0x76, 0xdc, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x7c, 0x00, 0x7c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x66, 0x00, 0x00, 0x66, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x66, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0x60, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x06, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc0, 0xdf, 0x00, 0x00, 0xdf, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x03, 0xfb, 0x00, 0x00, 0xfb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x28, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x10, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x44, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x44, 0x28, 0x10, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x10, 0x7c, 0x28, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x10, 0x28, 0x44, 0x7c, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x26, 0x7c, 0xb4, 0x6c, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x68, 0x54, 0x54, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x08, 0x10, 0x00, 0x10, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x08, 0x7e, 0x08, 0x10, 0x7e, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x08, 0xfe, 0x08, 0x10, 0xfe, 0x10, 0x20, 0xfe, 0x20, 0x40, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x08, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x08, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x1b, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36, 0x1b, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x66, 0x18, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x66, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0xce, 0x7c, 0x10, 0x7c, 0xe6, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x04, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0xe0, 0x38, 0x2e, 0x38, 0xe0, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x04, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0xe0, 0x38, 0x2e, 0x38, 0xe0, 0x40, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x04, 0x0e, 0x38, 0xe8, 0x38, 0x0e, 0x10, 0x76, 0xdc, 0x20, 0x20, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0xe0, 0x38, 0x2e, 0x38, 0xe0, 0x40, 0x76, 0xdc, 0x80, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x0e, 0x38, 0xe8, 0x38, 0x1e, 0xf0, 0x38, 0x2e, 0x38, 0xe0, 0x20, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0xe8, 0x38, 0x0e, 0x38, 0xf0, 0x1e, 0x38, 0xe0, 0x38, 0x2e, 0x20, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0xf2, 0x1c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x9e, 0x70, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x06, 0x0c, 0x38, 0xe8, 0x38, 0x1c, 0x16, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0xd0, 0x70, 0x38, 0x2e, 0x38, 0x60, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x7e, 0xc8, 0xc8, 0xd0, 0xd0, 0x7e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0xfc, 0x16, 0x16, 0x26, 0x26, 0xfc, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0x7e, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x7e, 0xc8, 0xc8, 0xd0, 0xd0, 0x7e, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0xfc, 0x16, 0x16, 0x26, 0x26, 0xfc, 0x40, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0xc0, 0x7e, 0x08, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfc, 0x06, 0x06, 0x06, 0x06, 0xfc, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x82, 0x92, 0xa2, 0xfa, 0xa2, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0xba, 0xba, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0xba, 0x92, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x54, 0x92, 0xfe, 0x92, 0x54, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xfe, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0xaa, 0x92, 0xaa, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x8a, 0x92, 0xa2, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x92, 0xba, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x92, 0xaa, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x54, 0xd6, 0xba, 0xd6, 0x54, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0xba, 0x82, 0xba, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xba, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x92, 0x92, 0xfe, 0x92, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0xfe, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xaa, 0x92, 0xaa, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x92, 0xba, 0x92, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0xff, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x7e, 0x60, 0x7e, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xff, 0xc0, 0xff, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xd8, 0xdf, 0xd8, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xa8, 0xa8, 0xa8, 0xa8, 0xaf, 0xa8, 0xa8, 0xa8, 0xa8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xd8, 0xd8, 0xd8, 0xdf, 0xd8, 0xdf, 0xd8, 0xd8, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc2, 0xc4, 0xc4, 0xff, 0xc8, 0xc8, 0xd0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xc4, 0xc4, 0xff, 0xc8, 0xff, 0xd0, 0xd0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xd8, 0xd9, 0xda, 0xda, 0xdf, 0xda, 0xda, 0xdc, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xd8, 0xd9, 0xda, 0xdf, 0xda, 0xdf, 0xda, 0xdc, 0xd8, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x0c, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x60, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x06, 0x1e, 0x76, 0xc6, 0x76, 0x1e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc0, 0xf0, 0xdc, 0xc6, 0xdc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x1e, 0x76, 0xc6, 0x76, 0x1e, 0x06, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xf0, 0xdc, 0xc6, 0xdc, 0xf0, 0xc0, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xbf, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xfd, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0xc6, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xf0, 0xc8, 0xc4, 0xc4, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0b, 0x13, 0x23, 0x43, 0x83, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x38, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x92, 0x44, 0x28, 0x92, 0x28, 0x44, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x82, 0xc6, 0xaa, 0x92, 0xaa, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x82, 0xc4, 0xa8, 0x90, 0xa8, 0xc4, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x82, 0x46, 0x2a, 0x12, 0x2a, 0x46, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x28, 0x44, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x3e, 0x60, 0xce, 0xd8, 0xd8, 0xce, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xf8, 0x0c, 0xe6, 0x36, 0x36, 0xe6, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x44, 0x92, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x10, 0x38, 0x54, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x64, 0xce, 0x64, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x4c, 0xe6, 0x4c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x15, 0x2a, 0x54, 0xa8, 0x54, 0x2a, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xa8, 0x54, 0x2a, 0x15, 0x2a, 0x54, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0xfe, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x00},
+    {0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0xfe, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf2, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x9e, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0a, 0x0e, 0x1c, 0xf0, 0x1c, 0x16, 0xf2, 0x1c, 0x26, 0x22, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x88, 0xc8, 0x70, 0x1e, 0x70, 0xd0, 0x9e, 0x70, 0xe0, 0xa0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0xfe, 0xc8, 0xc8, 0xd0, 0xd0, 0xfe, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0xfe, 0x16, 0x16, 0x26, 0x26, 0xfe, 0x40, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x08, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x10, 0xfe, 0x20, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x38, 0x0e, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xe0, 0x38, 0x0e, 0x38, 0xe0, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x02, 0x06, 0x1c, 0xf0, 0x1c, 0x06, 0x02, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x80, 0xc0, 0x70, 0x1e, 0x70, 0xc0, 0x80, 0x10, 0x76, 0xdc, 0x10, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x0e, 0x1e, 0x76, 0xd6, 0x76, 0x1e, 0x26, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0xc8, 0xf0, 0xdc, 0xd6, 0xdc, 0xf0, 0xe0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x0e, 0x1e, 0x76, 0xd6, 0x76, 0x1e, 0x26, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0xc8, 0xf0, 0xdc, 0xd6, 0xdc, 0xf0, 0xe0, 0x20, 0xfe, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x3d, 0x66, 0xc7, 0xcb, 0xd3, 0xe3, 0x66, 0xbc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x42, 0xa5, 0x7e, 0x24, 0x24, 0x7e, 0xa5, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x38, 0x54, 0x8a, 0xf6, 0x82, 0x54, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0xfe, 0xfe, 0x44, 0x44, 0x28, 0x10, 0x28, 0x44, 0x44, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x00, 0x00},
+    {0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60, 0x00, 0x00},
+    {0x00, 0x03, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
+    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
+    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x03, 0x00, 0x00},
+    {0x00, 0xc0, 0x60, 0x30, 0x30, 0x18, 0x18, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
+    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
+    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x18, 0x18, 0x30, 0x30, 0x60, 0xc0, 0x00, 0x00},
+    {0x00, 0x3f, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
+    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30},
+    {0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3f, 0x00, 0x00},
+    {0x00, 0xfc, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
+    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c},
+    {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xfc, 0x00, 0x00},
+    {0x00, 0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0xe0, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0xe0, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0xe0, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x07, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0xe0},
+    {0xe0, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x07},
+    {0x00, 0x00, 0xff, 0xc1, 0xc0, 0x60, 0x60, 0x60, 0x60, 0x30, 0x30, 0x30, 0x30, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x30, 0x30, 0x30, 0x30, 0x60, 0x60, 0x60, 0x60, 0xc0, 0xc1, 0xff, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xff, 0x00, 0xff, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0x78, 0x78, 0x38, 0x38, 0x18, 0x18, 0x00, 0x00},
+    {0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+    {0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03},
+    {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x07, 0x05, 0x05, 0x05, 0x05, 0x25, 0x79, 0xc2, 0x7c, 0x20, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd8, 0xd8, 0xf8, 0xd8, 0xd8, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xf0, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd8, 0xd8, 0xf8, 0x70, 0x20, 0x0f, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xf0, 0xc0, 0xe0, 0xc0, 0xc0, 0x0f, 0x0c, 0x0e, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0xc0, 0xc0, 0xc0, 0x70, 0x1e, 0x1b, 0x1e, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x98, 0xd8, 0xf8, 0xd8, 0xd8, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7c, 0xfe, 0xc6, 0xc6, 0x60, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1f, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xfc, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xfc, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xfc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xfc, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0x1f, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0e, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x70, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x30, 0x70, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80},
+    {0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01},
+    {0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18},
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe},
+    {0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc},
+    {0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8},
+    {0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0},
+    {0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0},
+    {0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0},
+    {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80},
+    {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f},
+    {0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44},
+    {0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa},
+    {0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77},
+    {0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
+    {0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x82, 0xba, 0xba, 0xba, 0xba, 0xba, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x82, 0xfe, 0x82, 0xfe, 0x82, 0xfe, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0xaa, 0xfe, 0xaa, 0xfe, 0xaa, 0xfe, 0xaa, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x8a, 0xc6, 0xa2, 0x92, 0x8a, 0xc6, 0xa2, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0xa2, 0xc6, 0x8a, 0x92, 0xa2, 0xc6, 0x8a, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0xaa, 0xc6, 0xaa, 0x92, 0xaa, 0xc6, 0xaa, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x44, 0x44, 0x44, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x42, 0x84, 0x84, 0xfc, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x28, 0x44, 0x44, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x28, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x80, 0xc0, 0xa0, 0x90, 0x88, 0x84, 0x88, 0x90, 0xa0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x70, 0x78, 0x70, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x70, 0x48, 0x70, 0x40, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x98, 0x86, 0x98, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0x82, 0x44, 0x44, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x7e, 0x3e, 0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x02, 0x06, 0x0a, 0x12, 0x22, 0x42, 0x22, 0x12, 0x0a, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x38, 0x78, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x38, 0x48, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x3e, 0xfe, 0x3e, 0x0e, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x32, 0xc2, 0x32, 0x0e, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x7c, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0x44, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x44, 0x54, 0xba, 0xba, 0x54, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x99, 0xbd, 0xbd, 0xbd, 0xbd, 0x99, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x28, 0x28, 0x44, 0x82, 0x82, 0x44, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x14, 0x40, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x02, 0x28, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x99, 0xa5, 0xa5, 0xa5, 0xa5, 0x99, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x72, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0x72, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x4e, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x4e, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x7e, 0xff, 0xff, 0xff, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x4e, 0x8f, 0x8f, 0x8f, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x4e, 0x8f, 0x8f, 0x8f, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+    {0xff, 0xff, 0xc3, 0xbd, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0xbd, 0xc3, 0xff, 0xff, 0xff, 0xff},
+    {0xff, 0xff, 0xc3, 0xbd, 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0xbd, 0xc3, 0xff, 0xff, 0xff, 0xff},
+    {0x00, 0x00, 0x30, 0x40, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0c, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x30, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff},
+    {0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff},
+    {0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80},
+    {0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0xff, 0xfd, 0xf9, 0xf1, 0xf1, 0xe1, 0xc1, 0x81, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x81, 0x83, 0x87, 0x8f, 0x8f, 0x9f, 0xbf, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xff, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x28, 0x28, 0x44, 0x44, 0x92, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x74, 0x74, 0xf2, 0xf2, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x5c, 0x5c, 0x9e, 0x9e, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x92, 0x92, 0x92, 0xf2, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0xf2, 0x92, 0x92, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x9e, 0x92, 0x92, 0x92, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xfe, 0x92, 0x92, 0x92, 0x9e, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x4a, 0x89, 0x89, 0x89, 0xf9, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0xf9, 0x89, 0x89, 0x89, 0x4a, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x81, 0x9f, 0x91, 0x91, 0x91, 0x52, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x52, 0x91, 0x91, 0x91, 0x9f, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x54, 0x38, 0xfe, 0x38, 0x54, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x30, 0x7c, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0x10, 0x10, 0x10, 0x10, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0xfe, 0x7c, 0x38, 0x6c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x28, 0xee, 0x44, 0x54, 0x6c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x18, 0x30, 0x60, 0xc0, 0x60, 0x34, 0x1c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcd, 0xc7, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0x92, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0xa5, 0xa5, 0x42, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x42, 0xa5, 0xa5, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x78, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x36, 0x36, 0x1c, 0x18, 0x30, 0x70, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0x86, 0x8a, 0xba, 0x92, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0xfe, 0x82, 0xee, 0xba, 0xba, 0xee, 0x82, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x82, 0xc6, 0x6c, 0x7c, 0x38, 0x7c, 0x6c, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x7c, 0x82, 0xaa, 0x82, 0x44, 0x7c, 0x44, 0x38, 0x00, 0x44, 0xc6, 0x38, 0xc6, 0x44, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x44, 0xee, 0xfe, 0x92, 0xba, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x7e, 0x18, 0x18, 0xff, 0x18, 0x1e, 0x78, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x7e, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x38, 0x10, 0x10, 0x92, 0xfe, 0x92, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x72, 0xe0, 0xc4, 0xdf, 0xce, 0xca, 0xe0, 0x72, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x54, 0x28, 0x54, 0xaa, 0xaa, 0xaa, 0xaa, 0x54, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x5a, 0x99, 0x99, 0x99, 0xbd, 0xff, 0xdb, 0x5a, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x42, 0x81, 0x85, 0xb1, 0xf9, 0xff, 0xdf, 0x7e, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0x81, 0x99, 0xa5, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xa5, 0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xdb, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x54, 0x28, 0xc6, 0x28, 0x54, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x78, 0x14, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x14, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x28, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x28, 0x1e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x06, 0x0e, 0x1a, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x03, 0x03, 0x7b, 0xcf, 0xcf, 0xcf, 0x0f, 0x1b, 0x33, 0xff, 0x03, 0x03, 0x03, 0x00, 0x00},
+    {0x00, 0x00, 0x60, 0xf0, 0x60, 0x6e, 0x73, 0x63, 0x63, 0x66, 0x66, 0x63, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xd6, 0x54, 0x54, 0x7c, 0x54, 0x54, 0xd6, 0x38, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x3c, 0xdb, 0xdb, 0xdb, 0xdb, 0x7e, 0x3c, 0x18, 0x3c, 0x18, 0x18, 0x00, 0x00},
+    {0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xcc, 0xf8, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x42, 0xa5, 0xa5, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0xc3, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00},
+    {0x00, 0x00, 0xc3, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7e, 0xc3, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7e, 0xdb, 0xd8, 0x70, 0x00, 0x00, 0x0e, 0x1b, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1e, 0x33, 0x33, 0x33, 0x33, 0x1b, 0x7b, 0xdb, 0xdb, 0x73, 0x03, 0x01, 0x00, 0x00},
+    {0x00, 0x00, 0x94, 0x7c, 0x55, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x06, 0x0b, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x24, 0xe7, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x94, 0x7c, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x04, 0x03, 0x00, 0x00},
+    {0x00, 0x00, 0x1f, 0x07, 0x8f, 0xdb, 0x73, 0x70, 0xd8, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x90, 0x50, 0x70, 0x68, 0x48, 0x48, 0x4e, 0x49, 0x09, 0x0e, 0x10, 0x20, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x2a, 0x7e, 0xaa, 0x00, 0x00, 0x2a, 0x7e, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc3, 0x66, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x66, 0x66, 0xc3, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x82, 0x82, 0x82, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x44, 0x82, 0x44, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0xe7, 0xe7, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x24, 0x42, 0x81, 0x81, 0x66, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x18, 0x24, 0x3c, 0xe7, 0xa5, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x38, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x30, 0x3c, 0x3e, 0x32, 0x30, 0x30, 0x30, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0x7f, 0x6f, 0x63, 0x63, 0x63, 0x63, 0xe3, 0xe7, 0xc7, 0x06, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x7f, 0x63, 0x7f, 0x63, 0x63, 0x63, 0x63, 0x63, 0xe7, 0xe7, 0xc6, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0xde, 0xe6, 0xc4, 0xd8, 0xe0, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x40, 0x40, 0x44, 0x5c, 0x74, 0x44, 0x44, 0x5c, 0x74, 0x44, 0x04, 0x04, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x04, 0x46, 0x5c, 0x74, 0xc4, 0x46, 0x5c, 0x74, 0xc4, 0x40, 0x40, 0x00, 0x00},
+    {0x00, 0x00, 0x3b, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3c, 0x6e, 0x66, 0x60, 0xfe, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x3e, 0x6e, 0x66, 0x66, 0xfe, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6e, 0xdb, 0xdb, 0xd8, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x6f, 0xdb, 0xdb, 0xdb, 0xff, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x38, 0x6c, 0x6c, 0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6d, 0xf6, 0x00, 0x00, 0x00, 0x00},
+    {0x06, 0x29, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x06, 0x29, 0x5e, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x08, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x08, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x14, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x14, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x89, 0x86, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0a, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0a, 0x00, 0x0a, 0x00, 0x06, 0x49, 0x89, 0x86, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x14, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x88, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x88, 0x80, 0x88, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x94, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x94, 0x80, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x88, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x94, 0x80, 0x88, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x0a, 0x00, 0x04, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x94, 0x80, 0x94, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x94, 0x80, 0x94, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x28, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x28, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x00, 0x28, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x00, 0x28, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x20, 0x38, 0x28, 0x70, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x20, 0x38, 0x28, 0x70, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x00, 0x14, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x14, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x01, 0x02, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x01, 0x02, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00},
+    {0x04, 0x09, 0x12, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00},
+    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00},
+    {0x0c, 0x30, 0x46, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0xa4, 0x09, 0x12, 0x04, 0x08, 0x44, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0xa4, 0x09, 0x12, 0x04, 0x08, 0x48, 0x84, 0x82, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0xa2, 0x0c, 0x13, 0x0c, 0x10, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0xa2, 0x0c, 0x13, 0x0c, 0x10, 0x10, 0x08, 0x04, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x41, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x00, 0x01, 0x41, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x1c, 0x14, 0x38, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x38, 0x40, 0x38, 0x40, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x70, 0x80, 0x70, 0x80, 0x10, 0x68, 0x88, 0x74, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf0, 0x10, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf7, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0x3d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0x3d, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x38, 0x4c, 0x52, 0x32, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x18, 0x20, 0x3f, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x70, 0x80, 0x70, 0x80, 0x08, 0x14, 0x60, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x1c, 0x20, 0x1c, 0x20, 0x00, 0x00, 0x07, 0x18, 0x20, 0x3f, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x00, 0x29, 0x01, 0x19, 0x21, 0x19, 0xa1, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x00, 0x2a, 0x02, 0x32, 0x42, 0x32, 0xc6, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x40, 0x00, 0xa3, 0x0c, 0x10, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x40, 0x00, 0xa3, 0x0c, 0x10, 0x10, 0x08, 0x04, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x28, 0x18, 0x10, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x28, 0x18, 0x10, 0x20, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x08, 0x08, 0x08, 0x08, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x23, 0x54, 0x33, 0x24, 0x40, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x14, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x3c, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x3c, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x10, 0x00, 0x10},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x10, 0x00, 0x10},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x20, 0x20, 0x20, 0x20, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x10, 0x10, 0x10, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x10, 0x10, 0x10, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x24, 0x98, 0x60, 0xc2, 0x12, 0x92, 0x9c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x02, 0x92, 0x9c, 0x60, 0x0e, 0x70, 0x0e, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x60, 0x04, 0x54, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x28, 0x10, 0x60, 0x04, 0x54, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x04, 0x54, 0x58, 0x20, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x10, 0x04, 0x54, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
+    {0x0e, 0xf0, 0x02, 0x92, 0x9c, 0x60, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x24, 0x18, 0x60, 0x02, 0x92, 0x9c, 0x60, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x02, 0x12, 0x9c, 0x60, 0x0e, 0x70, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x10, 0x28, 0x50, 0x28, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x14, 0x28, 0x14, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x08, 0x10, 0x54, 0x38, 0x54, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x10, 0x08, 0x2a, 0x1c, 0x2a, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x2a, 0x14, 0x00, 0x21, 0x69, 0xa9, 0x69, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x08, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x20, 0x10, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x08, 0x08, 0x04, 0x08, 0x08, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x18, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x7c, 0x28, 0x7c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x28, 0x10, 0x2a, 0x24, 0x1a, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x38, 0x38, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x54, 0x30, 0x18, 0x54, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x08, 0x08, 0x10, 0x10, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x54, 0x58, 0x40, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x06, 0x18, 0x60, 0x06, 0x18, 0x60, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x12, 0xca, 0x2c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x0c, 0x30, 0x00, 0x00},
+    {0x0c, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x06, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x08, 0x14, 0x0c, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x24, 0x14, 0x18, 0x60, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x06, 0x18, 0x60, 0x00, 0x00},
+    {0x0a, 0x2a, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x02, 0x12, 0x92, 0x9c, 0x60, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x20, 0x1e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x02, 0x3c, 0x40, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x01, 0x3e, 0x40, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x18, 0x20, 0x1c, 0x20, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x0c, 0x10, 0x0e, 0x10, 0x04, 0x04, 0x04, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x0c, 0x10, 0x0e, 0x10, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x00, 0x0c, 0x10, 0x0e, 0x10, 0x00, 0x00},
+    {0x00, 0x30, 0x40, 0x38, 0x40, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x30, 0x40, 0x38, 0x40, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
+    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x1c, 0x20, 0x1c, 0x20, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x28, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x50, 0x00, 0x10, 0x10, 0x68, 0x88, 0x74, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x14, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x14, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x40, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x40, 0x80, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x88, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x88, 0x80, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x80, 0x80, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x20, 0x00, 0x00, 0x70, 0x8f, 0x30, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x00, 0x00, 0x70, 0x8f, 0x32, 0x41, 0x80, 0x80, 0x80, 0x40, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x00, 0x38, 0x47, 0x18, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x00, 0x00, 0x70, 0x8f, 0x32, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x00, 0x08, 0x08, 0x04, 0x46, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x04, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x04, 0x07, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x15, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0xd5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x14, 0x00, 0x01, 0x15, 0x88, 0x84, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x01, 0x15, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x14, 0x00, 0x00, 0x00, 0x2a, 0xd5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x09, 0x31, 0x9e, 0x88, 0x88, 0x70, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x00, 0x06, 0x29, 0x31, 0xde, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x20, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0xa2, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x24, 0x20, 0x20, 0x2c, 0x32, 0x22, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0x22, 0x41, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x10, 0x10, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x40, 0x00, 0x00, 0x70, 0x80, 0x8c, 0x70, 0x40, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x08, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0x22, 0x41, 0x80, 0x80, 0x80, 0x41, 0x3e, 0x00, 0x00},
+    {0x00, 0x00, 0x10, 0x00, 0x00, 0x0e, 0x10, 0x10, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x1e, 0x22, 0x1c, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x85, 0x83, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x04, 0x00, 0x06, 0x49, 0x89, 0x86, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0a, 0x00, 0x06, 0x09, 0x09, 0x47, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x0a, 0x00, 0x00, 0x06, 0x09, 0x49, 0x87, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x0a, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x14, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x0c, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x19, 0x21, 0x19, 0x21, 0x01, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x32, 0x42, 0x32, 0x42, 0x02, 0x86, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x18, 0x20, 0x10, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x06, 0x18, 0x20, 0x20, 0x10, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x42, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x12, 0x3c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x3c, 0x4b, 0x4a, 0x44, 0x40, 0x40, 0x40, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x32, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x32, 0xcd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x81, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x41, 0x81, 0x81, 0x42, 0x3c, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x22, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x68, 0x88, 0x74, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x40, 0x30, 0x4e, 0x49, 0x39, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x24, 0x28, 0xf3, 0x24, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0e, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x0f, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x88, 0x86, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x24, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x87, 0x81, 0x7e, 0x00, 0x24, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x04, 0xf8, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf7, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00},
+    {0x68, 0x90, 0x02, 0x22, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x68, 0x90, 0x02, 0x32, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x60, 0x80, 0x72, 0xa2, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x30, 0x40, 0x3a, 0x52, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x42, 0x22, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x18, 0x20, 0x1c, 0x20, 0x00},
+    {0x00, 0x00, 0x22, 0x12, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x18, 0x20, 0x1c, 0x20, 0x00},
+    {0x00, 0x00, 0x42, 0x22, 0x12, 0x0a, 0x04, 0x0c, 0x12, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0x00, 0x00, 0x22, 0x12, 0x12, 0x0a, 0x0a, 0x0e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8},
+    {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00},
+    /* Special glyph for unknown character */
+    {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00}
+};
-    /* 1 0x01 '^A' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x81, /* 10000001 */
-xa5, /* 10100101 */
-x81, /* 10000001 */
-x81, /* 10000001 */
-xbd, /* 10111101 */
-x99, /* 10011001 */
-x81, /* 10000001 */
-x81, /* 10000001 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 2 0x02 '^B' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-xff, /* 11111111 */
-xdb, /* 11011011 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xc3, /* 11000011 */
-xe7, /* 11100111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 3 0x03 '^C' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x6c, /* 01101100 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-x7c, /* 01111100 */
-x38, /* 00111000 */
-x10, /* 00010000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 4 0x04 '^D' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x7c, /* 01111100 */
-xfe, /* 11111110 */
-x7c, /* 01111100 */
-x38, /* 00111000 */
-x10, /* 00010000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 5 0x05 '^E' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x3c, /* 00111100 */
-xe7, /* 11100111 */
-xe7, /* 11100111 */
-xe7, /* 11100111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 6 0x06 '^F' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x7e, /* 01111110 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 7 0x07 '^G' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 8 0x08 '^H' */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xe7, /* 11100111 */
-xc3, /* 11000011 */
-xc3, /* 11000011 */
-xe7, /* 11100111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-    /* 9 0x09 '^I' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-x42, /* 01000010 */
-x42, /* 01000010 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 10 0x0a '^J' */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xc3, /* 11000011 */
-x99, /* 10011001 */
-xbd, /* 10111101 */
-xbd, /* 10111101 */
-x99, /* 10011001 */
-xc3, /* 11000011 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-    /* 11 0x0b '^K' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1e, /* 00011110 */
-x0e, /* 00001110 */
-x1a, /* 00011010 */
-x32, /* 00110010 */
-x78, /* 01111000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x78, /* 01111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 12 0x0c '^L' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 13 0x0d '^M' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3f, /* 00111111 */
-x33, /* 00110011 */
-x3f, /* 00111111 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x70, /* 01110000 */
-xf0, /* 11110000 */
-xe0, /* 11100000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 14 0x0e '^N' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7f, /* 01111111 */
-x63, /* 01100011 */
-x7f, /* 01111111 */
-x63, /* 01100011 */
-x63, /* 01100011 */
-x63, /* 01100011 */
-x63, /* 01100011 */
-x67, /* 01100111 */
-xe7, /* 11100111 */
-xe6, /* 11100110 */
-xc0, /* 11000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 15 0x0f '^O' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xdb, /* 11011011 */
-x3c, /* 00111100 */
-xe7, /* 11100111 */
-x3c, /* 00111100 */
-xdb, /* 11011011 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 16 0x10 '^P' */
-x00, /* 00000000 */
-x80, /* 10000000 */
-xc0, /* 11000000 */
-xe0, /* 11100000 */
-xf0, /* 11110000 */
-xf8, /* 11111000 */
-xfe, /* 11111110 */
-xf8, /* 11111000 */
-xf0, /* 11110000 */
-xe0, /* 11100000 */
-xc0, /* 11000000 */
-x80, /* 10000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 17 0x11 '^Q' */
-x00, /* 00000000 */
-x02, /* 00000010 */
-x06, /* 00000110 */
-x0e, /* 00001110 */
-x1e, /* 00011110 */
-x3e, /* 00111110 */
-xfe, /* 11111110 */
-x3e, /* 00111110 */
-x1e, /* 00011110 */
-x0e, /* 00001110 */
-x06, /* 00000110 */
-x02, /* 00000010 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 18 0x12 '^R' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 19 0x13 '^S' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 20 0x14 '^T' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7f, /* 01111111 */
-xdb, /* 11011011 */
-xdb, /* 11011011 */
-xdb, /* 11011011 */
-x7b, /* 01111011 */
-x1b, /* 00011011 */
-x1b, /* 00011011 */
-x1b, /* 00011011 */
-x1b, /* 00011011 */
-x1b, /* 00011011 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 21 0x15 '^U' */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-x60, /* 01100000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x0c, /* 00001100 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 22 0x16 '^V' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 23 0x17 '^W' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 24 0x18 '^X' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 25 0x19 '^Y' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 26 0x1a '^Z' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-xfe, /* 11111110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 27 0x1b '^[' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xfe, /* 11111110 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 28 0x1c '^\' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 29 0x1d '^]' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x28, /* 00101000 */
-x6c, /* 01101100 */
-xfe, /* 11111110 */
-x6c, /* 01101100 */
-x28, /* 00101000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 30 0x1e '^^' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x38, /* 00111000 */
-x7c, /* 01111100 */
-x7c, /* 01111100 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 31 0x1f '^_' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-x7c, /* 01111100 */
-x7c, /* 01111100 */
-x38, /* 00111000 */
-x38, /* 00111000 */
-x10, /* 00010000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 32 0x20 ' ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 33 0x21 '!' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x3c, /* 00111100 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 34 0x22 '"' */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x24, /* 00100100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 35 0x23 '#' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-xfe, /* 11111110 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-xfe, /* 11111110 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 36 0x24 '$' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc2, /* 11000010 */
-xc0, /* 11000000 */
-x7c, /* 01111100 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x86, /* 10000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 37 0x25 '%' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc2, /* 11000010 */
-xc6, /* 11000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc6, /* 11000110 */
-x86, /* 10000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 38 0x26 '&' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 39 0x27 ''' */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 40 0x28 '(' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 41 0x29 ')' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 42 0x2a '*' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-xff, /* 11111111 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 43 0x2b '+' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 44 0x2c ',' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 45 0x2d '-' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 46 0x2e '.' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 47 0x2f '/' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x02, /* 00000010 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc0, /* 11000000 */
-x80, /* 10000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 48 0x30 '0' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 49 0x31 '1' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x38, /* 00111000 */
-x78, /* 01111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 50 0x32 '2' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 51 0x33 '3' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x3c, /* 00111100 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 52 0x34 '4' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x0c, /* 00001100 */
-x1c, /* 00011100 */
-x3c, /* 00111100 */
-x6c, /* 01101100 */
-xcc, /* 11001100 */
-xfe, /* 11111110 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x1e, /* 00011110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 53 0x35 '5' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xfc, /* 11111100 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 54 0x36 '6' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x60, /* 01100000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xfc, /* 11111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 55 0x37 '7' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 56 0x38 '8' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 57 0x39 '9' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7e, /* 01111110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x78, /* 01111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 58 0x3a ':' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 59 0x3b ';' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 60 0x3c '<' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x06, /* 00000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 61 0x3d '=' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 62 0x3e '>' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 63 0x3f '?' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 64 0x40 '@' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xde, /* 11011110 */
-xde, /* 11011110 */
-xde, /* 11011110 */
-xdc, /* 11011100 */
-xc0, /* 11000000 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 65 0x41 'A' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 66 0x42 'B' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfc, /* 11111100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x7c, /* 01111100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-xfc, /* 11111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 67 0x43 'C' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-xc2, /* 11000010 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc2, /* 11000010 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 68 0x44 'D' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xf8, /* 11111000 */
-x6c, /* 01101100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x6c, /* 01101100 */
-xf8, /* 11111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 69 0x45 'E' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x66, /* 01100110 */
-x62, /* 01100010 */
-x68, /* 01101000 */
-x78, /* 01111000 */
-x68, /* 01101000 */
-x60, /* 01100000 */
-x62, /* 01100010 */
-x66, /* 01100110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 70 0x46 'F' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x66, /* 01100110 */
-x62, /* 01100010 */
-x68, /* 01101000 */
-x78, /* 01111000 */
-x68, /* 01101000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-xf0, /* 11110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 71 0x47 'G' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-xc2, /* 11000010 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xde, /* 11011110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x66, /* 01100110 */
-x3a, /* 00111010 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 72 0x48 'H' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 73 0x49 'I' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 74 0x4a 'J' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1e, /* 00011110 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x78, /* 01111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 75 0x4b 'K' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xe6, /* 11100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x6c, /* 01101100 */
-x78, /* 01111000 */
-x78, /* 01111000 */
-x6c, /* 01101100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-xe6, /* 11100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 76 0x4c 'L' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xf0, /* 11110000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x62, /* 01100010 */
-x66, /* 01100110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 77 0x4d 'M' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xee, /* 11101110 */
-xfe, /* 11111110 */
-xfe, /* 11111110 */
-xd6, /* 11010110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 78 0x4e 'N' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xe6, /* 11100110 */
-xf6, /* 11110110 */
-xfe, /* 11111110 */
-xde, /* 11011110 */
-xce, /* 11001110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 79 0x4f 'O' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 80 0x50 'P' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfc, /* 11111100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x7c, /* 01111100 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-xf0, /* 11110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 81 0x51 'Q' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xd6, /* 11010110 */
-xde, /* 11011110 */
-x7c, /* 01111100 */
-x0c, /* 00001100 */
-x0e, /* 00001110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 82 0x52 'R' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfc, /* 11111100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x7c, /* 01111100 */
-x6c, /* 01101100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-xe6, /* 11100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 83 0x53 'S' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x60, /* 01100000 */
-x38, /* 00111000 */
-x0c, /* 00001100 */
-x06, /* 00000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 84 0x54 'T' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x5a, /* 01011010 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 85 0x55 'U' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 86 0x56 'V' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x10, /* 00010000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 87 0x57 'W' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xfe, /* 11111110 */
-xee, /* 11101110 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 88 0x58 'X' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x7c, /* 01111100 */
-x38, /* 00111000 */
-x38, /* 00111000 */
-x7c, /* 01111100 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 89 0x59 'Y' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 90 0x5a 'Z' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-x86, /* 10000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc2, /* 11000010 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 91 0x5b '[' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 92 0x5c '\' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x80, /* 10000000 */
-xc0, /* 11000000 */
-xe0, /* 11100000 */
-x70, /* 01110000 */
-x38, /* 00111000 */
-x1c, /* 00011100 */
-x0e, /* 00001110 */
-x06, /* 00000110 */
-x02, /* 00000010 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 93 0x5d ']' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 94 0x5e '^' */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 95 0x5f '_' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 96 0x60 '`' */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 97 0x61 'a' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-x0c, /* 00001100 */
-x7c, /* 01111100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 98 0x62 'b' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xe0, /* 11100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x78, /* 01111000 */
-x6c, /* 01101100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 99 0x63 'c' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 100 0x64 'd' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1c, /* 00011100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x3c, /* 00111100 */
-x6c, /* 01101100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 101 0x65 'e' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 102 0x66 'f' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1c, /* 00011100 */
-x36, /* 00110110 */
-x32, /* 00110010 */
-x30, /* 00110000 */
-x78, /* 01111000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x78, /* 01111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 103 0x67 'g' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x7c, /* 01111100 */
-x0c, /* 00001100 */
-xcc, /* 11001100 */
-x78, /* 01111000 */
-x00, /* 00000000 */
-    /* 104 0x68 'h' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xe0, /* 11100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x6c, /* 01101100 */
-x76, /* 01110110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-xe6, /* 11100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 105 0x69 'i' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 106 0x6a 'j' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x00, /* 00000000 */
-x0e, /* 00001110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-    /* 107 0x6b 'k' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xe0, /* 11100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x66, /* 01100110 */
-x6c, /* 01101100 */
-x78, /* 01111000 */
-x78, /* 01111000 */
-x6c, /* 01101100 */
-x66, /* 01100110 */
-xe6, /* 11100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 108 0x6c 'l' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 109 0x6d 'm' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xec, /* 11101100 */
-xfe, /* 11111110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 110 0x6e 'n' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xdc, /* 11011100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 111 0x6f 'o' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 112 0x70 'p' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xdc, /* 11011100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x7c, /* 01111100 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-xf0, /* 11110000 */
-x00, /* 00000000 */
-    /* 113 0x71 'q' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x7c, /* 01111100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x1e, /* 00011110 */
-x00, /* 00000000 */
-    /* 114 0x72 'r' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xdc, /* 11011100 */
-x76, /* 01110110 */
-x66, /* 01100110 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-xf0, /* 11110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 115 0x73 's' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-x60, /* 01100000 */
-x38, /* 00111000 */
-x0c, /* 00001100 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 116 0x74 't' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-xfc, /* 11111100 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x36, /* 00110110 */
-x1c, /* 00011100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 117 0x75 'u' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 118 0x76 'v' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 119 0x77 'w' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xd6, /* 11010110 */
-xfe, /* 11111110 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 120 0x78 'x' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x38, /* 00111000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 121 0x79 'y' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7e, /* 01111110 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-xf8, /* 11111000 */
-x00, /* 00000000 */
-    /* 122 0x7a 'z' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xcc, /* 11001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 123 0x7b '{' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x0e, /* 00001110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x70, /* 01110000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x0e, /* 00001110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 124 0x7c '|' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 125 0x7d '}' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x70, /* 01110000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x0e, /* 00001110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x70, /* 01110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 126 0x7e '~' */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 127 0x7f '' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 128 0x80 '€' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-xc2, /* 11000010 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc2, /* 11000010 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x70, /* 01110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 129 0x81 '' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 130 0x82 '‚' */
-x00, /* 00000000 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 131 0x83 'ƒ' */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-x0c, /* 00001100 */
-x7c, /* 01111100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 132 0x84 '„' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-x0c, /* 00001100 */
-x7c, /* 01111100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 133 0x85 '…' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-x0c, /* 00001100 */
-x7c, /* 01111100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 134 0x86 '†' */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-x0c, /* 00001100 */
-x7c, /* 01111100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 135 0x87 '‡' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x18, /* 00011000 */
-x70, /* 01110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 136 0x88 'ˆ' */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 137 0x89 '‰' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 138 0x8a 'Š' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 139 0x8b '‹' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 140 0x8c 'Œ' */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 141 0x8d '' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 142 0x8e 'Ž' */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 143 0x8f '' */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 144 0x90 '' */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x66, /* 01100110 */
-x62, /* 01100010 */
-x68, /* 01101000 */
-x78, /* 01111000 */
-x68, /* 01101000 */
-x62, /* 01100010 */
-x66, /* 01100110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 145 0x91 '‘' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xec, /* 11101100 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x7e, /* 01111110 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-x6e, /* 01101110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 146 0x92 '’' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3e, /* 00111110 */
-x6c, /* 01101100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xfe, /* 11111110 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xce, /* 11001110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 147 0x93 '“' */
-x00, /* 00000000 */
-x10, /* 00010000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 148 0x94 '”' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 149 0x95 '•' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 150 0x96 '–' */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x78, /* 01111000 */
-xcc, /* 11001100 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 151 0x97 '—' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 152 0x98 '˜' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7e, /* 01111110 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x78, /* 01111000 */
-x00, /* 00000000 */
-    /* 153 0x99 '™' */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 154 0x9a 'š' */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 155 0x9b '›' */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 156 0x9c 'œ' */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x64, /* 01100100 */
-x60, /* 01100000 */
-xf0, /* 11110000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-xe6, /* 11100110 */
-xfc, /* 11111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 157 0x9d '' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 158 0x9e 'ž' */
-x00, /* 00000000 */
-xf8, /* 11111000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xf8, /* 11111000 */
-xc4, /* 11000100 */
-xcc, /* 11001100 */
-xde, /* 11011110 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 159 0x9f 'Ÿ' */
-x00, /* 00000000 */
-x0e, /* 00001110 */
-x1b, /* 00011011 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xd8, /* 11011000 */
-x70, /* 01110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 160 0xa0 ' ' */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-x0c, /* 00001100 */
-x7c, /* 01111100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 161 0xa1 '¡' */
-x00, /* 00000000 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 162 0xa2 '¢' */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 163 0xa3 '£' */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x00, /* 00000000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 164 0xa4 '¤' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-x00, /* 00000000 */
-xdc, /* 11011100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 165 0xa5 '¥' */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-x00, /* 00000000 */
-xc6, /* 11000110 */
-xe6, /* 11100110 */
-xf6, /* 11110110 */
-xfe, /* 11111110 */
-xde, /* 11011110 */
-xce, /* 11001110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 166 0xa6 '¦' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x3e, /* 00111110 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 167 0xa7 '§' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 168 0xa8 '¨' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc0, /* 11000000 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x7c, /* 01111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 169 0xa9 '©' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 170 0xaa 'ª' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 171 0xab '«' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-xe0, /* 11100000 */
-x62, /* 01100010 */
-x66, /* 01100110 */
-x6c, /* 01101100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xdc, /* 11011100 */
-x86, /* 10000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x3e, /* 00111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 172 0xac '¬' */
-x00, /* 00000000 */
-x60, /* 01100000 */
-xe0, /* 11100000 */
-x62, /* 01100010 */
-x66, /* 01100110 */
-x6c, /* 01101100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x66, /* 01100110 */
-xce, /* 11001110 */
-x9a, /* 10011010 */
-x3f, /* 00111111 */
-x06, /* 00000110 */
-x06, /* 00000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 173 0xad '' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x3c, /* 00111100 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 174 0xae '®' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x36, /* 00110110 */
-x6c, /* 01101100 */
-xd8, /* 11011000 */
-x6c, /* 01101100 */
-x36, /* 00110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 175 0xaf '¯' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xd8, /* 11011000 */
-x6c, /* 01101100 */
-x36, /* 00110110 */
-x6c, /* 01101100 */
-xd8, /* 11011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 176 0xb0 '°' */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-x11, /* 00010001 */
-x44, /* 01000100 */
-    /* 177 0xb1 '±' */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-x55, /* 01010101 */
-xaa, /* 10101010 */
-    /* 178 0xb2 '²' */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-xdd, /* 11011101 */
-x77, /* 01110111 */
-    /* 179 0xb3 '³' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 180 0xb4 '´' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 181 0xb5 'µ' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 182 0xb6 '¶' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xf6, /* 11110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 183 0xb7 '·' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 184 0xb8 '¸' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 185 0xb9 '¹' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xf6, /* 11110110 */
-x06, /* 00000110 */
-xf6, /* 11110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 186 0xba 'º' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 187 0xbb '»' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x06, /* 00000110 */
-xf6, /* 11110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 188 0xbc '¼' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xf6, /* 11110110 */
-x06, /* 00000110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 189 0xbd '½' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 190 0xbe '¾' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 191 0xbf '¿' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xf8, /* 11111000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 192 0xc0 'À' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 193 0xc1 'Á' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 194 0xc2 'Â' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 195 0xc3 'Ã' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 196 0xc4 'Ä' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 197 0xc5 'Å' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xff, /* 11111111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 198 0xc6 'Æ' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 199 0xc7 'Ç' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x37, /* 00110111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 200 0xc8 'È' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x37, /* 00110111 */
-x30, /* 00110000 */
-x3f, /* 00111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 201 0xc9 'É' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3f, /* 00111111 */
-x30, /* 00110000 */
-x37, /* 00110111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 202 0xca 'Ê' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xf7, /* 11110111 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 203 0xcb 'Ë' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-xf7, /* 11110111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 204 0xcc 'Ì' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x37, /* 00110111 */
-x30, /* 00110000 */
-x37, /* 00110111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 205 0xcd 'Í' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 206 0xce 'Î' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xf7, /* 11110111 */
-x00, /* 00000000 */
-xf7, /* 11110111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 207 0xcf 'Ï' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 208 0xd0 'Ð' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 209 0xd1 'Ñ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 210 0xd2 'Ò' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 211 0xd3 'Ó' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x3f, /* 00111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 212 0xd4 'Ô' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 213 0xd5 'Õ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 214 0xd6 'Ö' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x3f, /* 00111111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 215 0xd7 '×' */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-xff, /* 11111111 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-    /* 216 0xd8 'Ø' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xff, /* 11111111 */
-x18, /* 00011000 */
-xff, /* 11111111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 217 0xd9 'Ù' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xf8, /* 11111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 218 0xda 'Ú' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1f, /* 00011111 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 219 0xdb 'Û' */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-    /* 220 0xdc 'Ü' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-    /* 221 0xdd 'Ý' */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-xf0, /* 11110000 */
-    /* 222 0xde 'Þ' */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-x0f, /* 00001111 */
-    /* 223 0xdf 'ß' */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-xff, /* 11111111 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 224 0xe0 'à' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-xdc, /* 11011100 */
-x76, /* 01110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 225 0xe1 'á' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x78, /* 01111000 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xcc, /* 11001100 */
-xd8, /* 11011000 */
-xcc, /* 11001100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xcc, /* 11001100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 226 0xe2 'â' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-xc0, /* 11000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 227 0xe3 'ã' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 228 0xe4 'ä' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 229 0xe5 'å' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-x70, /* 01110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 230 0xe6 'æ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x7c, /* 01111100 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-xc0, /* 11000000 */
-x00, /* 00000000 */
-    /* 231 0xe7 'ç' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 232 0xe8 'è' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 233 0xe9 'é' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xfe, /* 11111110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 234 0xea 'ê' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-xee, /* 11101110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 235 0xeb 'ë' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1e, /* 00011110 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x3e, /* 00111110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x66, /* 01100110 */
-x3c, /* 00111100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 236 0xec 'ì' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-xdb, /* 11011011 */
-xdb, /* 11011011 */
-xdb, /* 11011011 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 237 0xed 'í' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x03, /* 00000011 */
-x06, /* 00000110 */
-x7e, /* 01111110 */
-xdb, /* 11011011 */
-xdb, /* 11011011 */
-xf3, /* 11110011 */
-x7e, /* 01111110 */
-x60, /* 01100000 */
-xc0, /* 11000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 238 0xee 'î' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x1c, /* 00011100 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x7c, /* 01111100 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x1c, /* 00011100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 239 0xef 'ï' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7c, /* 01111100 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-xc6, /* 11000110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 240 0xf0 'ð' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-xfe, /* 11111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 241 0xf1 'ñ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x7e, /* 01111110 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 242 0xf2 'ò' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x06, /* 00000110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 243 0xf3 'ó' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x30, /* 00110000 */
-x60, /* 01100000 */
-x30, /* 00110000 */
-x18, /* 00011000 */
-x0c, /* 00001100 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 244 0xf4 'ô' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x0e, /* 00001110 */
-x1b, /* 00011011 */
-x1b, /* 00011011 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-    /* 245 0xf5 'õ' */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-xd8, /* 11011000 */
-x70, /* 01110000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 246 0xf6 'ö' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 247 0xf7 '÷' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-x00, /* 00000000 */
-x76, /* 01110110 */
-xdc, /* 11011100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 248 0xf8 'ø' */
-x00, /* 00000000 */
-x38, /* 00111000 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x38, /* 00111000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 249 0xf9 'ù' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 250 0xfa 'ú' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x18, /* 00011000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 251 0xfb 'û' */
-x00, /* 00000000 */
-x0f, /* 00001111 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-x0c, /* 00001100 */
-xec, /* 11101100 */
-x6c, /* 01101100 */
-x6c, /* 01101100 */
-x3c, /* 00111100 */
-x1c, /* 00011100 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 252 0xfc 'ü' */
-x00, /* 00000000 */
-x6c, /* 01101100 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x36, /* 00110110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 253 0xfd 'ý' */
-x00, /* 00000000 */
-x3c, /* 00111100 */
-x66, /* 01100110 */
-x0c, /* 00001100 */
-x18, /* 00011000 */
-x32, /* 00110010 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 254 0xfe 'þ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x7e, /* 01111110 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-    /* 255 0xff 'ÿ' */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-x00, /* 00000000 */
-};
+/** @}
+ */

 /branches/tracing/uspace/srv/fb/font-8x16.h
 ,12 → 26,25
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef FB_FONT_8X16_H_
-#define FB_FONT_8X16_H_
+/** @addtogroup genarch
+ * @{
+ */
+/** @file
+ */
-#define FONT_GLIPHS 256
-#define FONT_SCANLINES  16
+#ifndef FONT_8X16_H_
+#define FONT_8X16_H_
-extern unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES];
+#define FONT_GLYPHS     2899
+#define FONT_WIDTH      8
+#define FONT_SCANLINES  16
+#include <sys/types.h>
+extern uint16_t fb_font_glyph(const wchar_t ch);
+extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
 #endif
+/** @}
+ */

 /branches/tracing/uspace/srv/fb/main.c
 ,6 → 38,7
 #include "fb.h"
 #include "ega.h"
 #include "msim.h"
+#include "ski.h"
 #include "sgcn.h"
 #include "main.h"
 ,7 → 47,7
 void receive_comm_area(ipc_callid_t callid, ipc_call_t *call, void **area)
 {
     void *dest;
     dest = as_get_mappable_page(IPC_GET_ARG2(*call));
     if (ipc_answer_1(callid, EOK, (sysarg_t) dest) == 0) {
         if (*area)
 ,12 → 62,12
     ipcarg_t phonead;
     bool initialized = false;
 #ifdef FB_ENABLED
     if (sysinfo_value("fb.kind") == 1) {
         if (fb_init() == 0)
             initialized = true;
-    }
+    }
 #endif
 #ifdef EGA_ENABLED
     if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
 ,15 → 87,22
             initialized = true;
     }
 #endif
+#ifdef SKI_ENABLED
+    if ((!initialized) && (sysinfo_value("fb") != true)) {
+        if (ski_init() == 0)
+            initialized = true;
+    }
+#endif
     if (!initialized)
         return -1;
     if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0)
         return -1;
     printf(NAME ": Accepting connections\n");
     async_manager();
     /* Never reached */
     return 0;
 }

 /branches/tracing/uspace/srv/fb/ski.c
 ,0 → 1,84
+/*
+ * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @defgroup msimfb MSIM text console
+ * @brief   HelenOS MSIM text console.
+ * @ingroup fbs
+ * @{
+ */
+/** @file
+ */
+#include <async.h>
+#include <libc.h>
+#include <sysinfo.h>
+#include <as.h>
+#include <ddi.h>
+#include "serial_console.h"
+#include "ski.h"
+#define SKI_PUTCHAR     31
+#define WIDTH 80
+#define HEIGHT 24
+/** Display character on ski debug console
+ *
+ * Use SSC (Simulator System Call) to
+ * display character on debug console.
+ *
+ * @param ch Character to be printed.
+ */
+static void ski_putc(const char ch)
+{
+    asm volatile (
+        "mov r15 = %0\n"
+        "mov r32 = %1\n"    /* r32 is in0 */
+        "break 0x80000\n"   /* modifies r8 */
+        :
+        : "i" (SKI_PUTCHAR), "r" (ch)
+        : "r15", "in0", "r8"
+    );
+    if (ch == '\n')
+        ski_putc('\r');
+}
+int ski_init(void)
+{
+    serial_console_init(ski_putc, WIDTH, HEIGHT);
+    async_set_client_connection(serial_client_connection);
+    return 0;
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/fb/fb.c
 ,4 → 1,5
 /*
+ * Copyright (c) 2008 Martin Decky
  * Copyright (c) 2006 Jakub Vana
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
 ,10 → 30,10
 /**
  * @defgroup fb Graphical framebuffer
- * @brief   HelenOS graphical framebuffer.
+ * @brief HelenOS graphical framebuffer.
  * @ingroup fbs
  * @{
- */
+ */
 /** @file
  */
 ,6 → 51,8
 #include <ipc/services.h>
 #include <kernel/errno.h>
 #include <kernel/genarch/fb/visuals.h>
+#include <console/color.h>
+#include <console/style.h>
 #include <async.h>
 #include <bool.h>
 ,575 → 65,848
 #include "pointer.xbm"
 #include "pointer_mask.xbm"
-#define DEFAULT_BGCOLOR                0xf0f0f0
-#define DEFAULT_FGCOLOR                0x0
+#define DEFAULT_BGCOLOR  0xf0f0f0
+#define DEFAULT_FGCOLOR  0x000000
-/***************************************************************/
-/* Pixel specific fuctions */
+#define GLYPH_UNAVAIL    '?'
-typedef void (*conv2scr_fn_t)(void *, int);
-typedef int (*conv2rgb_fn_t)(void *);
+#define MAX_ANIM_LEN     8
+#define MAX_ANIMATIONS   4
+#define MAX_PIXMAPS      256  /**< Maximum number of saved pixmaps */
+#define MAX_VIEWPORTS    128  /**< Viewport is a rectangular area on the screen */
+/** Function to render a pixel from a RGB value. */
+typedef void (*rgb_conv_t)(void *, uint32_t);
+/** Function to render a bit mask. */
+typedef void (*mask_conv_t)(void *, bool);
+/** Function to draw a glyph. */
+typedef void (*dg_t)(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
 struct {
-    uint8_t *fbaddress;
+    uint8_t *fb_addr;
     unsigned int xres;
     unsigned int yres;
     unsigned int scanline;
+    unsigned int glyphscanline;
     unsigned int pixelbytes;
-    unsigned int invert_colors;
-    conv2scr_fn_t rgb2scr;
-    conv2rgb_fn_t scr2rgb;
+    unsigned int glyphbytes;
+    /** Pre-rendered mask for rendering glyphs. Specific for the visual. */
+    uint8_t *glyphs;
+    rgb_conv_t rgb_conv;
+    mask_conv_t mask_conv;
 } screen;
+/** Backbuffer character cell. */
 typedef struct {
-    int initialized;
-    unsigned int x, y;
-    unsigned int width, height;
+    uint32_t glyph;
+    uint32_t fg_color;
+    uint32_t bg_color;
+} bb_cell_t;
+typedef struct {
+    bool initialized;
+    unsigned int x;
+    unsigned int y;
+    unsigned int width;
+    unsigned int height;
     /* Text support in window */
-    unsigned int rows, cols;
-    /* Style for text printing */
-    style_t style;
+    unsigned int cols;
+    unsigned int rows;
+    /*
+     * Style and glyphs for text printing
+     */
+    /** Current attributes. */
+    attr_rgb_t attr;
+    uint8_t *bgpixel;
+    /**
+     * Glyph drawing function for this viewport.  Different viewports
+     * might use different drawing functions depending on whether their
+     * scanlines are aligned on a word boundary.
+     */
+    dg_t dglyph;
     /* Auto-cursor position */
-    int cursor_active, cur_col, cur_row;
-    int cursor_shown;
-    /* Double buffering */
-    uint8_t *dbdata;
-    unsigned int dboffset;
-    unsigned int paused;
+    bool cursor_active;
+    unsigned int cur_col;
+    unsigned int cur_row;
+    bool cursor_shown;
+    /* Back buffer */
+    bb_cell_t *backbuf;
+    unsigned int bbsize;
 } viewport_t;
-#define MAX_ANIM_LEN    8
-#define MAX_ANIMATIONS  4
 typedef struct {
-    int initialized;
-    int enabled;
+    bool initialized;
+    bool enabled;
     unsigned int vp;
     unsigned int pos;
     unsigned int animlen;
     unsigned int pixmaps[MAX_ANIM_LEN];
 } animation_t;
 static animation_t animations[MAX_ANIMATIONS];
-static int anims_enabled;
+static bool anims_enabled;
-/** Maximum number of saved pixmaps
- * Pixmap is a saved rectangle
- */
-#define MAX_PIXMAPS        256
 typedef struct {
     unsigned int width;
     unsigned int height;
     uint8_t *data;
 } pixmap_t;
 static pixmap_t pixmaps[MAX_PIXMAPS];
-/* Viewport is a rectangular area on the screen */
-#define MAX_VIEWPORTS 128
 static viewport_t viewports[128];
-/* Allow only 1 connection */
-static int client_connected = 0;
+static bool client_connected = false;  /**< Allow only 1 connection */
-#define RED(x, bits)    ((x >> (16 + 8 - bits)) & ((1 << bits) - 1))
-#define GREEN(x, bits)  ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
-#define BLUE(x, bits)   ((x >> (8 - bits)) & ((1 << bits) - 1))
+static uint32_t color_table[16] = {
+    [COLOR_BLACK]       = 0x000000,
+    [COLOR_BLUE]        = 0x0000f0,
+    [COLOR_GREEN]       = 0x00f000,
+    [COLOR_CYAN]        = 0x00f0f0,
+    [COLOR_RED]         = 0xf00000,
+    [COLOR_MAGENTA]     = 0xf000f0,
+    [COLOR_YELLOW]      = 0xf0f000,
+    [COLOR_WHITE]       = 0xf0f0f0,
+    [8 + COLOR_BLACK]   = 0x000000,
+    [8 + COLOR_BLUE]    = 0x0000ff,
+    [8 + COLOR_GREEN]   = 0x00ff00,
+    [8 + COLOR_CYAN]    = 0x00ffff,
+    [8 + COLOR_RED]     = 0xff0000,
+    [8 + COLOR_MAGENTA] = 0xff00ff,
+    [8 + COLOR_YELLOW]  = 0xffff00,
+    [8 + COLOR_WHITE]   = 0xffffff,
+};
-#define COL_WIDTH   8
-#define ROW_BYTES   (screen.scanline * FONT_SCANLINES)
+static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
+static int rgb_from_style(attr_rgb_t *rgb, int style);
+static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t flags);
-#define POINTPOS(x, y)  ((y) * screen.scanline + (x) * screen.pixelbytes)
+static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t attr);
-static inline int COLOR(int color)
-{
-    return screen.invert_colors ? ~color : color;
-}
+static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
+static void draw_glyph_fallback(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color);
-/* Conversion routines between different color representations */
-static void
-rgb_byte0888(void *dst, int rgb)
-{
-    *(int *)dst = rgb;
-}
+static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
+    unsigned int row);
-static int
-byte0888_rgb(void *src)
-{
-    return (*(int *)src) & 0xffffff;
-}
-static void
-bgr_byte0888(void *dst, int rgb)
-{
-    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 |
-        RED(rgb, 8);
-}
+#define RED(x, bits)                 ((x >> (8 + 8 + 8 - bits)) & ((1 << bits) - 1))
+#define GREEN(x, bits)               ((x >> (8 + 8 - bits)) & ((1 << bits) - 1))
+#define BLUE(x, bits)                ((x >> (8 - bits)) & ((1 << bits) - 1))
-static int
-byte0888_bgr(void *src)
-{
-    int color = *(uint32_t *)(src);
-    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) |
-        ((color >> 16) & 0xff);
-}
+#define COL2X(col)                   ((col) * FONT_WIDTH)
+#define ROW2Y(row)                   ((row) * FONT_SCANLINES)
-static void
-rgb_byte888(void *dst, int rgb)
+#define X2COL(x)                     ((x) / FONT_WIDTH)
+#define Y2ROW(y)                     ((y) / FONT_SCANLINES)
+#define FB_POS(x, y)                 ((y) * screen.scanline + (x) * screen.pixelbytes)
+#define BB_POS(vport, col, row)      ((row) * vport->cols + (col))
+#define GLYPH_POS(glyph, y, cursor)  (((glyph) + (cursor) * FONT_GLYPHS) * screen.glyphbytes + (y) * screen.glyphscanline)
+/** ARGB 8:8:8:8 conversion
+ *
+ */
+static void rgb_0888(void *dst, uint32_t rgb)
 {
-    uint8_t *scr = dst;
-#if defined(FB_INVERT_ENDIAN)
-    scr[0] = RED(rgb, 8);
-    scr[1] = GREEN(rgb, 8);
-    scr[2] = BLUE(rgb, 8);
-#else
-    scr[2] = RED(rgb, 8);
-    scr[1] = GREEN(rgb, 8);
-    scr[0] = BLUE(rgb, 8);
-#endif
+    *((uint32_t *) dst) = rgb & 0x00ffffff;
 }
-static int
-byte888_rgb(void *src)
+static void mask_0888(void *dst, bool mask)
 {
-    uint8_t *scr = src;
-#if defined(FB_INVERT_ENDIAN)
-    return scr[0] << 16 | scr[1] << 8 | scr[2];
-#else
-    return scr[2] << 16 | scr[1] << 8 | scr[0];
-#endif
+    *((uint32_t *) dst) = (mask ? 0x00ffffff : 0);
 }
-/**  16-bit depth (5:5:5) */
-static void
-rgb_byte555(void *dst, int rgb)
+/** ABGR 8:8:8:8 conversion
+ *
+ */
+static void bgr_0888(void *dst, uint32_t rgb)
 {
-    /* 5-bit, 5-bits, 5-bits */
-    *((uint16_t *)(dst)) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 |
-        BLUE(rgb, 5);
+    *((uint32_t *) dst)
+        = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8);
 }
-/** 16-bit depth (5:5:5) */
-static int
-byte555_rgb(void *src)
+/** RGB 8:8:8 conversion
+ *
+ */
+static void rgb_888(void *dst, uint32_t rgb)
 {
-    int color = *(uint16_t *)(src);
-    return (((color >> 10) & 0x1f) << (16 + 3)) |
-        (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3);
+    ((uint8_t *) dst)[0] = BLUE(rgb, 8);
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
+    ((uint8_t *) dst)[2] = RED(rgb, 8);
 }
-/**  16-bit depth (5:6:5) */
-static void
-rgb_byte565(void *dst, int rgb)
+static void mask_888(void *dst, bool mask)
 {
-    /* 5-bit, 6-bits, 5-bits */
-    *((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 |
-        BLUE(rgb, 5);
+    if (mask) {
+        ((uint8_t *) dst)[0] = 0xff;
+        ((uint8_t *) dst)[1] = 0xff;
+        ((uint8_t *) dst)[2] = 0xff;
+    } else {
+        ((uint8_t *) dst)[0] = 0;
+        ((uint8_t *) dst)[1] = 0;
+        ((uint8_t *) dst)[2] = 0;
+    }
 }
-/** 16-bit depth (5:6:5) */
-static int
-byte565_rgb(void *src)
+/** BGR 8:8:8 conversion
+ *
+ */
+static void bgr_888(void *dst, uint32_t rgb)
 {
-    int color = *(uint16_t *)(src);
-    return (((color >> 11) & 0x1f) << (16 + 3)) |
-        (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
+    ((uint8_t *) dst)[0] = RED(rgb, 8);
+    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
+    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
 }
-/** Put pixel - 8-bit depth (3:2:3) */
-static void
-rgb_byte8(void *dst, int rgb)
+/** RGB 5:5:5 conversion
+ *
+ */
+static void rgb_555(void *dst, uint32_t rgb)
 {
-    *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
+    *((uint16_t *) dst)
+        = (RED(rgb, 5) << 10) | (GREEN(rgb, 5) << 5) | BLUE(rgb, 5);
 }
-/** Return pixel color - 8-bit depth (3:2:3) */
-static int
-byte8_rgb(void *src)
+static void mask_555(void *dst, bool mask)
 {
-    int color = *(uint8_t *)src;
-    return (((color >> 5) & 0x7) << (16 + 5)) |
-        (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
+    *((uint16_t *) dst) = (mask ? 0x7fff : 0);
 }
-/** Put pixel into viewport
+/** RGB 5:6:5 conversion
  *
- * @param vport Viewport identification
- * @param x X coord relative to viewport
- * @param y Y coord relative to viewport
- * @param color RGB color
  */
-static void
-putpixel(viewport_t *vport, unsigned int x, unsigned int y, int color)
+static void rgb_565(void *dst, uint32_t rgb)
 {
-    int dx = vport->x + x;
-    int dy = vport->y + y;
-    if (! (vport->paused && vport->dbdata))
-        (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)],
-            COLOR(color));
-    if (vport->dbdata) {
-        int dline = (y + vport->dboffset) % vport->height;
-        int doffset = screen.pixelbytes * (dline * vport->width + x);
-        (*screen.rgb2scr)(&vport->dbdata[doffset], COLOR(color));
-    }
+    *((uint16_t *) dst)
+        = (RED(rgb, 5) << 11) | (GREEN(rgb, 6) << 5) | BLUE(rgb, 5);
 }
-/** Get pixel from viewport */
-static int
-getpixel(viewport_t *vport, unsigned int x, unsigned int y)
+static void mask_565(void *dst, bool mask)
 {
-    int dx = vport->x + x;
-    int dy = vport->y + y;
-    return COLOR((*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx, dy)]));
+    *((uint16_t *) dst) = (mask ? 0xffff : 0);
 }
-static inline void
-putpixel_mem(char *mem, unsigned int x, unsigned int y, int color)
-{
-    (*screen.rgb2scr)(&mem[POINTPOS(x, y)], COLOR(color));
-}
-static void
-draw_rectangle(viewport_t *vport, unsigned int sx, unsigned int sy,
-    unsigned int width, unsigned int height, int color)
+/** RGB 3:2:3
+ *
+ */
+static void rgb_323(void *dst, uint32_t rgb)
 {
-    unsigned int x, y;
-    static void *tmpline;
-    if (!tmpline)
-        tmpline = malloc(screen.scanline * screen.pixelbytes);
-    /* Clear first line */
-    for (x = 0; x < width; x++)
-        putpixel_mem(tmpline, x, 0, color);
-    if (!vport->paused) {
-        /* Recompute to screen coords */
-        sx += vport->x;
-        sy += vport->y;
-        /* Copy the rest */
-        for (y = sy;y < sy+height; y++)
-            memcpy(&screen.fbaddress[POINTPOS(sx,y)], tmpline,
-                screen.pixelbytes * width);
-    }
-    if (vport->dbdata) {
-        for (y = sy; y < sy + height; y++) {
-            int rline = (y + vport->dboffset) % vport->height;
-            int rpos = (rline * vport->width + sx) *
-                screen.pixelbytes;
-            memcpy(&vport->dbdata[rpos], tmpline,
-                screen.pixelbytes * width);
-        }
-    }
+    *((uint8_t *) dst)
+        = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3));
 }
-/** Fill viewport with background color */
-static void
-clear_port(viewport_t *vport)
+static void mask_323(void *dst, bool mask)
 {
-    draw_rectangle(vport, 0, 0, vport->width, vport->height,
-        vport->style.bg_color);
+    *((uint8_t *) dst) = (mask ? 0xff : 0);
 }
-/** Scroll unbuffered viewport up/down
+/** Draw a filled rectangle.
  *
- * @param vport Viewport to scroll
- * @param lines Positive number - scroll up, negative - scroll down
+ * @note Need real implementation that does not access VRAM twice.
+ *
  */
-static void
-scroll_port_nodb(viewport_t *vport, int lines)
+static void draw_filled_rect(unsigned int x0, unsigned int y0, unsigned int x1,
+    unsigned int y1, uint32_t color)
 {
-    int y;
-    if (lines > 0) {
-        for (y = vport->y; y < vport->y+vport->height - lines; y++)
-            memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
-                &screen.fbaddress[POINTPOS(vport->x,y + lines)],
-                screen.pixelbytes * vport->width);
-        draw_rectangle(vport, 0, vport->height - lines, vport->width,
-            lines, vport->style.bg_color);
-    } else if (lines < 0) {
-        lines = -lines;
-        for (y = vport->y + vport->height-1; y >= vport->y + lines; y--)
-            memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
-                &screen.fbaddress[POINTPOS(vport->x,y - lines)],
-                screen.pixelbytes * vport->width);
-        draw_rectangle(vport, 0, 0, vport->width, lines,
-            vport->style.bg_color);
+    unsigned int x;
+    unsigned int y;
+    unsigned int copy_bytes;
+    uint8_t *sp;
+    uint8_t *dp;
+    uint8_t cbuf[4];
+    if ((y0 >= y1) || (x0 >= x1))
+        return;
+    screen.rgb_conv(cbuf, color);
+    sp = &screen.fb_addr[FB_POS(x0, y0)];
+    dp = sp;
+    /* Draw the first line. */
+    for (x = x0; x < x1; x++) {
+        memcpy(dp, cbuf, screen.pixelbytes);
+        dp += screen.pixelbytes;
     }
-}
-/** Refresh given viewport from double buffer */
-static void
-refresh_viewport_db(viewport_t *vport)
-{
-    unsigned int y, srcy, srcoff, dsty, dstx;
-    for (y = 0; y < vport->height; y++) {
-        srcy = (y + vport->dboffset) % vport->height;
-        srcoff = (vport->width * srcy) * screen.pixelbytes;
-        dstx = vport->x;
-        dsty = vport->y + y;
-        memcpy(&screen.fbaddress[POINTPOS(dstx,dsty)],
-            &vport->dbdata[srcoff], vport->width * screen.pixelbytes);
+    dp = sp + screen.scanline;
+    copy_bytes = (x1 - x0) * screen.pixelbytes;
+    /* Draw the remaining lines by copying. */
+    for (y = y0 + 1; y < y1; y++) {
+        memcpy(dp, sp, copy_bytes);
+        dp += screen.scanline;
     }
 }
-/** Scroll viewport that has double buffering enabled */
-static void
-scroll_port_db(viewport_t *vport, int lines)
+/** Redraw viewport.
+ *
+ * @param vport Viewport to redraw
+ *
+ */
+static void vport_redraw(viewport_t *vport)
 {
-    ++vport->paused;
-    if (lines > 0) {
-        draw_rectangle(vport, 0, 0, vport->width, lines,
-            vport->style.bg_color);
-        vport->dboffset += lines;
-        vport->dboffset %= vport->height;
-    } else if (lines < 0) {
-        lines = -lines;
-        draw_rectangle(vport, 0, vport->height-lines, vport->width,
-            lines, vport->style.bg_color);
-        if (vport->dboffset < lines)
-            vport->dboffset += vport->height;
-        vport->dboffset -= lines;
+    unsigned int row;
+    unsigned int col;
+    for (row = 0; row < vport->rows; row++) {
+        for (col = 0; col < vport->cols; col++) {
+            draw_vp_glyph(vport, false, col, row);
+        }
     }
-    --vport->paused;
+    if (COL2X(vport->cols) < vport->width) {
+        draw_filled_rect(
+            vport->x + COL2X(vport->cols), vport->y,
+            vport->x + vport->width, vport->y + vport->height,
+            vport->attr.bg_color);
+    }
-    refresh_viewport_db(vport);
+    if (ROW2Y(vport->rows) < vport->height) {
+        draw_filled_rect(
+            vport->x, vport->y + ROW2Y(vport->rows),
+            vport->x + vport->width, vport->y + vport->height,
+            vport->attr.bg_color);
+    }
 }
-/** Scrolls viewport given number of lines */
-static void
-scroll_port(viewport_t *vport, int lines)
+static void backbuf_clear(bb_cell_t *backbuf, size_t len, uint32_t fg_color,
+    uint32_t bg_color)
 {
-    if (vport->dbdata)
-        scroll_port_db(vport, lines);
-    else
-        scroll_port_nodb(vport, lines);
+    size_t i;
+    for (i = 0; i < len; i++) {
+        backbuf[i].glyph = 0;
+        backbuf[i].fg_color = fg_color;
+        backbuf[i].bg_color = bg_color;
+    }
 }
-static void
-invert_pixel(viewport_t *vport, unsigned int x, unsigned int y)
+/** Clear viewport.
+ *
+ * @param vport Viewport to clear
+ *
+ */
+static void vport_clear(viewport_t *vport)
 {
-    putpixel(vport, x, y, ~getpixel(vport, x, y));
+    backbuf_clear(vport->backbuf, vport->cols * vport->rows,
+        vport->attr.fg_color, vport->attr.bg_color);
+    vport_redraw(vport);
 }
-/***************************************************************/
-/* Character-console functions */
-/** Draw character at given position
+/** Scroll viewport by the specified number of lines.
  *
- * @param vport Viewport where the character is printed
- * @param sx Coordinates of top-left of the character
- * @param sy Coordinates of top-left of the character
- * @param style Color of the character
- * @param transparent If false, print background color
+ * @param vport Viewport to scroll
+ * @param lines Number of lines to scroll
+ *
  */
-static void
-draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy,
-    style_t style, int transparent)
+static void vport_scroll(viewport_t *vport, int lines)
 {
-    int i;
+    unsigned int row;
+    unsigned int col;
+    unsigned int x;
     unsigned int y;
-    unsigned int glline;
-    for (y = 0; y < FONT_SCANLINES; y++) {
-        glline = fb_font[glyph * FONT_SCANLINES + y];
-        for (i = 0; i < 8; i++) {
-            if (glline & (1 << (7 - i)))
-                putpixel(vport, sx + i, sy + y, style.fg_color);
-            else if (!transparent)
-                putpixel(vport, sx + i, sy + y, style.bg_color);
+    uint32_t glyph;
+    uint32_t fg_color;
+    uint32_t bg_color;
+    bb_cell_t *bbp;
+    bb_cell_t *xbp;
+    /*
+     * Redraw.
+     */
+    y = vport->y;
+    for (row = 0; row < vport->rows; row++) {
+        x = vport->x;
+        for (col = 0; col < vport->cols; col++) {
+            if ((row + lines >= 0) && (row + lines < vport->rows)) {
+                xbp = &vport->backbuf[BB_POS(vport, col, row + lines)];
+                bbp = &vport->backbuf[BB_POS(vport, col, row)];
+                glyph = xbp->glyph;
+                fg_color = xbp->fg_color;
+                bg_color = xbp->bg_color;
+                if ((bbp->glyph == glyph)
+                   && (bbp->fg_color == xbp->fg_color)
+                   && (bbp->bg_color == xbp->bg_color)) {
+                    x += FONT_WIDTH;
+                    continue;
+                }
+            } else {
+                glyph = 0;
+                fg_color = vport->attr.fg_color;
+                bg_color = vport->attr.bg_color;
+            }
+            (*vport->dglyph)(x, y, false, screen.glyphs, glyph,
+                fg_color, bg_color);
+            x += FONT_WIDTH;
         }
+        y += FONT_SCANLINES;
     }
+    /*
+     * Scroll backbuffer.
+     */
+    if (lines > 0) {
+        memmove(vport->backbuf, vport->backbuf + vport->cols * lines,
+            vport->cols * (vport->rows - lines) * sizeof(bb_cell_t));
+        backbuf_clear(&vport->backbuf[BB_POS(vport, 0, vport->rows - lines)],
+            vport->cols * lines, vport->attr.fg_color, vport->attr.bg_color);
+    } else {
+        memmove(vport->backbuf - vport->cols * lines, vport->backbuf,
+            vport->cols * (vport->rows + lines) * sizeof(bb_cell_t));
+        backbuf_clear(vport->backbuf, - vport->cols * lines,
+            vport->attr.fg_color, vport->attr.bg_color);
+    }
 }
-/** Invert character at given position */
-static void
-invert_char(viewport_t *vport,unsigned int row, unsigned int col)
+/** Render glyphs
+ *
+ * Convert glyphs from device independent font
+ * description to current visual representation.
+ *
+ */
+static void render_glyphs(void)
 {
-    unsigned int x;
-    unsigned int y;
-    for (x = 0; x < COL_WIDTH; x++)
-        for (y = 0; y < FONT_SCANLINES; y++)
-            invert_pixel(vport, col * COL_WIDTH + x, row *
-                FONT_SCANLINES + y);
+    unsigned int glyph;
+    for (glyph = 0; glyph < FONT_GLYPHS; glyph++) {
+        unsigned int y;
+        for (y = 0; y < FONT_SCANLINES; y++) {
+            unsigned int x;
+            for (x = 0; x < FONT_WIDTH; x++) {
+                screen.mask_conv(&screen.glyphs[GLYPH_POS(glyph, y, false) + x * screen.pixelbytes],
+                    (fb_font[glyph][y] & (1 << (7 - x))) ? true : false);
+                screen.mask_conv(&screen.glyphs[GLYPH_POS(glyph, y, true) + x * screen.pixelbytes],
+                    (fb_font[glyph][y] & (1 << (7 - x))) ? false : true);
+            }
+        }
+    }
 }
-/***************************************************************/
-/* Stdout specific functions */
 /** Create new viewport
  *
- * @return New viewport number
+ * @param x      Origin of the viewport (x).
+ * @param y      Origin of the viewport (y).
+ * @param width  Width of the viewport.
+ * @param height Height of the viewport.
+ *
+ * @return New viewport number.
+ *
  */
-static int
-viewport_create(unsigned int x, unsigned int y,unsigned int width,
-    unsigned int height)
+static int vport_create(unsigned int x, unsigned int y,
+    unsigned int width, unsigned int height)
 {
-    int i;
+    unsigned int i;
     for (i = 0; i < MAX_VIEWPORTS; i++) {
         if (!viewports[i].initialized)
             break;
     }
     if (i == MAX_VIEWPORTS)
         return ELIMIT;
+    unsigned int cols = width / FONT_WIDTH;
+    unsigned int rows = height / FONT_SCANLINES;
+    unsigned int bbsize = cols * rows * sizeof(bb_cell_t);
+    unsigned int word_size = sizeof(unsigned long);
+    bb_cell_t *backbuf = (bb_cell_t *) malloc(bbsize);
+    if (!backbuf)
+        return ENOMEM;
+    uint8_t *bgpixel = (uint8_t *) malloc(screen.pixelbytes);
+    if (!bgpixel) {
+        free(backbuf);
+        return ENOMEM;
+    }
+    backbuf_clear(backbuf, cols * rows, DEFAULT_FGCOLOR, DEFAULT_BGCOLOR);
+    memset(bgpixel, 0, screen.pixelbytes);
     viewports[i].x = x;
     viewports[i].y = y;
     viewports[i].width = width;
     viewports[i].height = height;
-    viewports[i].rows = height / FONT_SCANLINES;
-    viewports[i].cols = width / COL_WIDTH;
-    viewports[i].style.bg_color = DEFAULT_BGCOLOR;
-    viewports[i].style.fg_color = DEFAULT_FGCOLOR;
+    viewports[i].cols = cols;
+    viewports[i].rows = rows;
+    viewports[i].attr.bg_color = DEFAULT_BGCOLOR;
+    viewports[i].attr.fg_color = DEFAULT_FGCOLOR;
+    viewports[i].bgpixel = bgpixel;
+    /*
+     * Conditions necessary to select aligned version:
+     *  - word size is divisible by pixelbytes
+     *  - cell scanline size is divisible by word size
+     *  - cell scanlines are word-aligned
+     *
+     */
+    if (((word_size % screen.pixelbytes) == 0)
+        && ((FONT_WIDTH * screen.pixelbytes) % word_size == 0)
+        && ((x * screen.pixelbytes) % word_size == 0)
+        && (screen.scanline % word_size == 0)) {
+        viewports[i].dglyph = draw_glyph_aligned;
+    } else {
+        viewports[i].dglyph = draw_glyph_fallback;
+    }
     viewports[i].cur_col = 0;
     viewports[i].cur_row = 0;
-    viewports[i].cursor_active = 0;
-    viewports[i].initialized = 1;
+    viewports[i].cursor_active = false;
+    viewports[i].cursor_shown = false;
+    viewports[i].bbsize = bbsize;
+    viewports[i].backbuf = backbuf;
+    viewports[i].initialized = true;
+    screen.rgb_conv(viewports[i].bgpixel, viewports[i].attr.bg_color);
     return i;
 }
 /** Initialize framebuffer as a chardev output device
  *
- * @param addr          Address of theframebuffer
- * @param xres          Screen width in pixels
- * @param yres          Screen height in pixels
- * @param visual        Bits per pixel (8, 16, 24, 32)
- * @param scan          Bytes per one scanline
- * @param invert_colors Inverted colors.
+ * @param addr   Address of the framebuffer
+ * @param xres   Screen width in pixels
+ * @param yres   Screen height in pixels
+ * @param visual Bits per pixel (8, 16, 24, 32)
+ * @param scan   Bytes per one scanline
  *
  */
-static bool
-screen_init(void *addr, unsigned int offset, unsigned int xres,
-    unsigned int yres, unsigned int scan, unsigned int visual,
-    bool invert_colors)
+static bool screen_init(void *addr, unsigned int xres, unsigned int yres,
+    unsigned int scan, unsigned int visual)
 {
     switch (visual) {
     case VISUAL_INDIRECT_8:
-        screen.rgb2scr = rgb_byte8;
-        screen.scr2rgb = byte8_rgb;
+        screen.rgb_conv = rgb_323;
+        screen.mask_conv = mask_323;
         screen.pixelbytes = 1;
         break;
     case VISUAL_RGB_5_5_5:
-        screen.rgb2scr = rgb_byte555;
-        screen.scr2rgb = byte555_rgb;
+        screen.rgb_conv = rgb_555;
+        screen.mask_conv = mask_555;
         screen.pixelbytes = 2;
         break;
     case VISUAL_RGB_5_6_5:
-        screen.rgb2scr = rgb_byte565;
-        screen.scr2rgb = byte565_rgb;
+        screen.rgb_conv = rgb_565;
+        screen.mask_conv = mask_565;
         screen.pixelbytes = 2;
         break;
     case VISUAL_RGB_8_8_8:
-        screen.rgb2scr = rgb_byte888;
-        screen.scr2rgb = byte888_rgb;
+        screen.rgb_conv = rgb_888;
+        screen.mask_conv = mask_888;
         screen.pixelbytes = 3;
         break;
+    case VISUAL_BGR_8_8_8:
+        screen.rgb_conv = bgr_888;
+        screen.mask_conv = mask_888;
+        screen.pixelbytes = 3;
+        break;
     case VISUAL_RGB_8_8_8_0:
-        screen.rgb2scr = rgb_byte888;
-        screen.scr2rgb = byte888_rgb;
+        screen.rgb_conv = rgb_888;
+        screen.mask_conv = mask_888;
         screen.pixelbytes = 4;
         break;
     case VISUAL_RGB_0_8_8_8:
-        screen.rgb2scr = rgb_byte0888;
-        screen.scr2rgb = byte0888_rgb;
+        screen.rgb_conv = rgb_0888;
+        screen.mask_conv = mask_0888;
         screen.pixelbytes = 4;
         break;
     case VISUAL_BGR_0_8_8_8:
-        screen.rgb2scr = bgr_byte0888;
-        screen.scr2rgb = byte0888_bgr;
+        screen.rgb_conv = bgr_0888;
+        screen.mask_conv = mask_0888;
         screen.pixelbytes = 4;
         break;
     default:
         return false;
     }
-    screen.fbaddress = (unsigned char *) (((uintptr_t) addr) + offset);
+    screen.fb_addr = (unsigned char *) addr;
     screen.xres = xres;
     screen.yres = yres;
     screen.scanline = scan;
-    screen.invert_colors = invert_colors;
+    screen.glyphscanline = FONT_WIDTH * screen.pixelbytes;
+    screen.glyphbytes = screen.glyphscanline * FONT_SCANLINES;
+    size_t glyphsize = 2 * FONT_GLYPHS * screen.glyphbytes;
+    uint8_t *glyphs = (uint8_t *) malloc(glyphsize);
+    if (!glyphs)
+        return false;
+    memset(glyphs, 0, glyphsize);
+    screen.glyphs = glyphs;
+    render_glyphs();
     /* Create first viewport */
-    viewport_create(0, 0, xres, yres);
+    vport_create(0, 0, xres, yres);
     return true;
 }
-/** Hide cursor if it is shown */
-static void
-cursor_hide(viewport_t *vport)
+/** Draw a glyph, takes advantage of alignment.
+ *
+ * This version can only be used if the following conditions are met:
+ *
+ *   - word size is divisible by pixelbytes
+ *   - cell scanline size is divisible by word size
+ *   - cell scanlines are word-aligned
+ *
+ * It makes use of the pre-rendered mask to process (possibly) several
+ * pixels at once (word size / pixelbytes pixels at a time are processed)
+ * making it very fast. Most notably this version is not applicable at 24 bits
+ * per pixel.
+ *
+ * @param x        x coordinate of top-left corner on screen.
+ * @param y        y coordinate of top-left corner on screen.
+ * @param cursor   Draw glyph with cursor
+ * @param glyphs   Pointer to font bitmap.
+ * @param glyph    Code of the glyph to draw.
+ * @param fg_color Foreground color.
+ * @param bg_color Backgroudn color.
+ *
+ */
+static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color)
 {
-    if (vport->cursor_active && vport->cursor_shown) {
-        invert_char(vport, vport->cur_row, vport->cur_col);
-        vport->cursor_shown = 0;
+    unsigned int i;
+    unsigned int yd;
+    unsigned long fg_buf;
+    unsigned long bg_buf;
+    unsigned long mask;
+    /*
+     * Prepare a pair of words, one filled with foreground-color
+     * pattern and the other filled with background-color pattern.
+     */
+    for (i = 0; i < sizeof(unsigned long) / screen.pixelbytes; i++) {
+        screen.rgb_conv(&((uint8_t *) &fg_buf)[i * screen.pixelbytes],
+            fg_color);
+        screen.rgb_conv(&((uint8_t *) &bg_buf)[i * screen.pixelbytes],
+            bg_color);
     }
+    /* Pointer to the current position in the mask. */
+    unsigned long *maskp = (unsigned long *) &glyphs[GLYPH_POS(glyph, 0, cursor)];
+    /* Pointer to the current position on the screen. */
+    unsigned long *dp = (unsigned long *) &screen.fb_addr[FB_POS(x, y)];
+    /* Width of the character cell in words. */
+    unsigned int ww = FONT_WIDTH * screen.pixelbytes / sizeof(unsigned long);
+    /* Offset to add when moving to another screen scanline. */
+    unsigned int d_add = screen.scanline - FONT_WIDTH * screen.pixelbytes;
+    for (yd = 0; yd < FONT_SCANLINES; yd++) {
+        /*
+         * Now process the cell scanline, combining foreground
+         * and background color patters using the pre-rendered mask.
+         */
+        for (i = 0; i < ww; i++) {
+            mask = *maskp++;
+            *dp++ = (fg_buf & mask) | (bg_buf & ~mask);
+        }
+        /* Move to the beginning of the next scanline of the cell. */
+        dp = (unsigned long *) ((uint8_t *) dp + d_add);
+    }
 }
-/** Show cursor if cursor showing is enabled */
-static void
-cursor_print(viewport_t *vport)
+/** Draw a glyph, fallback version.
+ *
+ * This version does not make use of the pre-rendered mask, it uses
+ * the font bitmap directly. It works always, but it is slower.
+ *
+ * @param x        x coordinate of top-left corner on screen.
+ * @param y        y coordinate of top-left corner on screen.
+ * @param cursor   Draw glyph with cursor
+ * @param glyphs   Pointer to font bitmap.
+ * @param glyph    Code of the glyph to draw.
+ * @param fg_color Foreground color.
+ * @param bg_color Backgroudn color.
+ *
+ */
+void draw_glyph_fallback(unsigned int x, unsigned int y, bool cursor,
+    uint8_t *glyphs, uint32_t glyph, uint32_t fg_color, uint32_t bg_color)
 {
+    unsigned int i;
+    unsigned int j;
+    unsigned int yd;
+    uint8_t fg_buf[4];
+    uint8_t bg_buf[4];
+    uint8_t *sp;
+    uint8_t b;
+    /* Pre-render 1x the foreground and background color pixels. */
+    if (cursor) {
+        screen.rgb_conv(fg_buf, bg_color);
+        screen.rgb_conv(bg_buf, fg_color);
+    } else {
+        screen.rgb_conv(fg_buf, fg_color);
+        screen.rgb_conv(bg_buf, bg_color);
+    }
+    /* Pointer to the current position on the screen. */
+    uint8_t *dp = (uint8_t *) &screen.fb_addr[FB_POS(x, y)];
+    /* Offset to add when moving to another screen scanline. */
+    unsigned int d_add = screen.scanline - FONT_WIDTH * screen.pixelbytes;
+    for (yd = 0; yd < FONT_SCANLINES; yd++) {
+        /* Byte containing bits of the glyph scanline. */
+        b = fb_font[glyph][yd];
+        for (i = 0; i < FONT_WIDTH; i++) {
+            /* Choose color based on the current bit. */
+            sp = (b & 0x80) ? fg_buf : bg_buf;
+            /* Copy the pixel. */
+            for (j = 0; j < screen.pixelbytes; j++) {
+                *dp++ = *sp++;
+            }
+            /* Move to the next bit. */
+            b = b << 1;
+        }
+        /* Move to the beginning of the next scanline of the cell. */
+        dp += d_add;
+    }
+}
+/** Draw glyph at specified position in viewport.
+ *
+ * @param vport  Viewport identification
+ * @param cursor Draw glyph with cursor
+ * @param col    Screen position relative to viewport
+ * @param row    Screen position relative to viewport
+ *
+ */
+static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col,
+    unsigned int row)
+{
+    unsigned int x = vport->x + COL2X(col);
+    unsigned int y = vport->y + ROW2Y(row);
+    uint32_t glyph = vport->backbuf[BB_POS(vport, col, row)].glyph;
+    uint32_t fg_color = vport->backbuf[BB_POS(vport, col, row)].fg_color;
+    uint32_t bg_color = vport->backbuf[BB_POS(vport, col, row)].bg_color;
+    (*vport->dglyph)(x, y, cursor, screen.glyphs, glyph,
+        fg_color, bg_color);
+}
+/** Hide cursor if it is shown
+ *
+ */
+static void cursor_hide(viewport_t *vport)
+{
+    if ((vport->cursor_active) && (vport->cursor_shown)) {
+        draw_vp_glyph(vport, false, vport->cur_col, vport->cur_row);
+        vport->cursor_shown = false;
+    }
+}
+/** Show cursor if cursor showing is enabled
+ *
+ */
+static void cursor_show(viewport_t *vport)
+{
     /* Do not check for cursor_shown */
     if (vport->cursor_active) {
-        invert_char(vport, vport->cur_row, vport->cur_col);
-        vport->cursor_shown = 1;
+        draw_vp_glyph(vport, true, vport->cur_col, vport->cur_row);
+        vport->cursor_shown = true;
     }
 }
-/** Invert cursor, if it is enabled */
-static void
-cursor_blink(viewport_t *vport)
+/** Invert cursor, if it is enabled
+ *
+ */
+static void cursor_blink(viewport_t *vport)
 {
     if (vport->cursor_shown)
         cursor_hide(vport);
     else
-        cursor_print(vport);
+        cursor_show(vport);
 }
-/** Draw character at given position relative to viewport
- *
- * @param vport Viewport identification
- * @param c Character to print
- * @param row Screen position relative to viewport
- * @param col Screen position relative to viewport
- * @param transparent If false, print background color with character
+/** Draw character at given position relative to viewport
+ *
+ * @param vport  Viewport identification
+ * @param c      Character to draw
+ * @param col    Screen position relative to viewport
+ * @param row    Screen position relative to viewport
+ *
  */
-static void
-draw_char(viewport_t *vport, char c, unsigned int row, unsigned int col,
-    style_t style, int transparent)
+static void draw_char(viewport_t *vport, wchar_t c, unsigned int col, unsigned int row)
 {
-    /* Optimize - do not hide cursor if we are going to overwrite it */
-    if (vport->cursor_active && vport->cursor_shown &&
-        (vport->cur_col != col || vport->cur_row != row))
-        invert_char(vport, vport->cur_row, vport->cur_col);
+    bb_cell_t *bbp;
-    draw_glyph(vport, c, col * COL_WIDTH, row * FONT_SCANLINES, style,
-        transparent);
+    /* Do not hide cursor if we are going to overwrite it */
+    if ((vport->cursor_active) && (vport->cursor_shown) &&
+        ((vport->cur_col != col) || (vport->cur_row != row)))
+        cursor_hide(vport);
+    bbp = &vport->backbuf[BB_POS(vport, col, row)];
+    bbp->glyph = fb_font_glyph(c);
+    bbp->fg_color = vport->attr.fg_color;
+    bbp->bg_color = vport->attr.bg_color;
+    draw_vp_glyph(vport, false, col, row);
     vport->cur_col = col;
     vport->cur_row = row;
     vport->cur_col++;
     if (vport->cur_col >= vport->cols) {
         vport->cur_col = 0;
 ,65 → 914,97
         if (vport->cur_row >= vport->rows)
             vport->cur_row--;
     }
-    cursor_print(vport);
+    cursor_show(vport);
 }
-/** Draw text data to viewport
+/** Draw text data to viewport.
  *
  * @param vport Viewport id
- * @param data Text data fitting exactly into viewport
+ * @param data  Text data.
+ * @param x     Leftmost column of the area.
+ * @param y     Topmost row of the area.
+ * @param w     Number of rows.
+ * @param h     Number of columns.
+ *
  */
-static void
-draw_text_data(viewport_t *vport, keyfield_t *data)
+static void draw_text_data(viewport_t *vport, keyfield_t *data, unsigned int x,
+    unsigned int y, unsigned int w, unsigned int h)
 {
-    int i;
-    int col,row;
-    clear_port(vport);
-    for (i = 0; i < vport->cols * vport->rows; i++) {
-        if (data[i].character == ' ' && style_same(data[i].style,
-            vport->style))
-            continue;
-        col = i % vport->cols;
-        row = i / vport->cols;
-        draw_glyph(vport, data[i].character, col * COL_WIDTH, row *
-            FONT_SCANLINES, data[i].style, style_same(data[i].style,
-            vport->style));
+    unsigned int i;
+    unsigned int j;
+    bb_cell_t *bbp;
+    attrs_t *a;
+    attr_rgb_t rgb;
+    for (j = 0; j < h; j++) {
+        for (i = 0; i < w; i++) {
+            unsigned int col = x + i;
+            unsigned int row = y + j;
+            bbp = &vport->backbuf[BB_POS(vport, col, row)];
+            a = &data[j * w + i].attrs;
+            rgb_from_attr(&rgb, a);
+            bbp->glyph = fb_font_glyph(data[j * w + i].character);
+            bbp->fg_color = rgb.fg_color;
+            bbp->bg_color = rgb.bg_color;
+            draw_vp_glyph(vport, false, col, row);
+        }
     }
-    cursor_print(vport);
+    cursor_show(vport);
 }
-/** Return first free pixmap */
-static int
-find_free_pixmap(void)
+static void putpixel_pixmap(void *data, unsigned int x, unsigned int y, uint32_t color)
 {
-    int i;
+    int pm = *((int *) data);
+    pixmap_t *pmap = &pixmaps[pm];
+    unsigned int pos = (y * pmap->width + x) * screen.pixelbytes;
-    for (i = 0;i < MAX_PIXMAPS;i++)
+    screen.rgb_conv(&pmap->data[pos], color);
+}
+static void putpixel(void *data, unsigned int x, unsigned int y, uint32_t color)
+{
+    viewport_t *vport = (viewport_t *) data;
+    unsigned int dx = vport->x + x;
+    unsigned int dy = vport->y + y;
+    screen.rgb_conv(&screen.fb_addr[FB_POS(dx, dy)], color);
+}
+/** Return first free pixmap
+ *
+ */
+static int find_free_pixmap(void)
+{
+    unsigned int i;
+    for (i = 0; i < MAX_PIXMAPS; i++)
         if (!pixmaps[i].data)
             return i;
     return -1;
 }
-static void
-putpixel_pixmap(int pm, unsigned int x, unsigned int y, int color)
-{
-    pixmap_t *pmap = &pixmaps[pm];
-    int pos = (y * pmap->width + x) * screen.pixelbytes;
-    (*screen.rgb2scr)(&pmap->data[pos],COLOR(color));
-}
-/** Create a new pixmap and return appropriate ID */
-static int
-shm2pixmap(unsigned char *shm, size_t size)
+/** Create a new pixmap and return appropriate ID
+ *
+ */
+static int shm2pixmap(unsigned char *shm, size_t size)
 {
     int pm;
     pixmap_t *pmap;
     pm = find_free_pixmap();
     if (pm == -1)
         return ELIMIT;
     pmap = &pixmaps[pm];
     if (ppm_get_data(shm, size, &pmap->width, &pmap->height))
 ,19 → 1013,19
     pmap->data = malloc(pmap->width * pmap->height * screen.pixelbytes);
     if (!pmap->data)
         return ENOMEM;
-    ppm_draw(shm, size, 0, 0, pmap->width, pmap->height,
-        (putpixel_cb_t)putpixel_pixmap, (void *)pm);
+    ppm_draw(shm, size, 0, 0, pmap->width, pmap->height, putpixel_pixmap, (void *) &pm);
     return pm;
 }
 /** Handle shared memory communication calls
  *
  * Protocol for drawing pixmaps:
  * - FB_PREPARE_SHM(client shm identification)
  * - IPC_M_AS_AREA_SEND
- * - FB_DRAW_PPM(startx,starty)
+ * - FB_DRAW_PPM(startx, starty)
  * - FB_DROP_SHM
  *
  * Protocol for text drawing
 ,28 → 1033,32
  * - FB_DRAW_TEXT_DATA
  *
  * @param callid Callid of the current call
- * @param call Current call data
- * @param vp Active viewport
- * @return 0 if the call was not handled byt this function, 1 otherwise
+ * @param call   Current call data
+ * @param vp     Active viewport
  *
- * note: this function is not threads safe, you would have
+ * @return false if the call was not handled byt this function, true otherwise
+ *
+ * Note: this function is not threads safe, you would have
  * to redefine static variables with __thread
+ *
  */
-static int
-shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+static bool shm_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
 {
     static keyfield_t *interbuffer = NULL;
     static size_t intersize = 0;
     static unsigned char *shm = NULL;
     static ipcarg_t shm_id = 0;
     static size_t shm_size;
-    int handled = 1;
-    int retval = 0;
+    bool handled = true;
+    int retval = EOK;
     viewport_t *vport = &viewports[vp];
-    unsigned int x, y;
+    unsigned int x;
+    unsigned int y;
+    unsigned int w;
+    unsigned int h;
     switch (IPC_GET_METHOD(*call)) {
     case IPC_M_SHARE_OUT:
         /* We accept one area for data interchange */
 ,19 → 1065,20
         if (IPC_GET_ARG1(*call) == shm_id) {
             void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
             shm_size = IPC_GET_ARG2(*call);
-            if (!ipc_answer_1(callid, EOK, (sysarg_t) dest))
+            if (!ipc_answer_1(callid, EOK, (sysarg_t) dest))
                 shm = dest;
             else
                 shm_id = 0;
             if (shm[0] != 'P')
-                while (1)
-                    ;
-            return 1;
+                return false;
+            return true;
         } else {
             intersize = IPC_GET_ARG2(*call);
             receive_comm_area(callid, call, (void *) &interbuffer);
         }
-        return 1;
+        return true;
     case FB_PREPARE_SHM:
         if (shm_id)
             retval = EBUSY;
 ,7 → 1093,7
         }
         shm_id = 0;
         break;
     case FB_SHM2PIXMAP:
         if (!shm) {
             retval = EINVAL;
 ,29 → 1108,36
         }
         x = IPC_GET_ARG1(*call);
         y = IPC_GET_ARG2(*call);
-        if (x > vport->width || y > vport->height) {
+        if ((x > vport->width) || (y > vport->height)) {
             retval = EINVAL;
             break;
         }
         ppm_draw(shm, shm_size, IPC_GET_ARG1(*call),
-            IPC_GET_ARG2(*call), vport->width - x, vport->height - y,
-            (putpixel_cb_t)putpixel, vport);
+            IPC_GET_ARG2(*call), vport->width - x, vport->height - y, putpixel, (void *) vport);
         break;
     case FB_DRAW_TEXT_DATA:
+        x = IPC_GET_ARG1(*call);
+        y = IPC_GET_ARG2(*call);
+        w = IPC_GET_ARG3(*call);
+        h = IPC_GET_ARG4(*call);
         if (!interbuffer) {
             retval = EINVAL;
             break;
         }
-        if (intersize < vport->cols * vport->rows *
-            sizeof(*interbuffer)) {
+        if (x + w > vport->cols || y + h > vport->rows) {
             retval = EINVAL;
             break;
         }
-        draw_text_data(vport, interbuffer);
+        if (intersize < w * h * sizeof(*interbuffer)) {
+            retval = EINVAL;
+            break;
+        }
+        draw_text_data(vport, interbuffer, x, y, w, h);
         break;
     default:
-        handled = 0;
+        handled = false;
     }
     if (handled)
 ,41 → 1145,39
     return handled;
 }
-static void
-copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap)
+static void copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap)
 {
-    int y;
-    int tmp, srcrowsize;
-    int realwidth, realheight, realrowsize;
-    int width = vport->width;
-    int height = vport->height;
+    unsigned int width = vport->width;
+    unsigned int height = vport->height;
     if (width + vport->x > screen.xres)
         width = screen.xres - vport->x;
     if (height + vport->y > screen.yres)
         height = screen.yres - vport->y;
-    realwidth = pmap->width <= width ? pmap->width : width;
-    realheight = pmap->height <= height ? pmap->height : height;
-    srcrowsize = vport->width * screen.pixelbytes;
-    realrowsize = realwidth * screen.pixelbytes;
+    unsigned int realwidth = pmap->width <= width ? pmap->width : width;
+    unsigned int realheight = pmap->height <= height ? pmap->height : height;
+    unsigned int srcrowsize = vport->width * screen.pixelbytes;
+    unsigned int realrowsize = realwidth * screen.pixelbytes;
+    unsigned int y;
     for (y = 0; y < realheight; y++) {
-        tmp = (vport->y + y) * screen.scanline +
-            vport->x * screen.pixelbytes;
-        memcpy(pmap->data + srcrowsize * y, screen.fbaddress + tmp,
-            realrowsize);
+        unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
+        memcpy(pmap->data + srcrowsize * y, screen.fb_addr + tmp, realrowsize);
     }
 }
-/** Save viewport to pixmap */
-static int
-save_vp_to_pixmap(viewport_t *vport)
+/** Save viewport to pixmap
+ *
+ */
+static int save_vp_to_pixmap(viewport_t *vport)
 {
     int pm;
     pixmap_t *pmap;
     pm = find_free_pixmap();
     if (pm == -1)
         return ELIMIT;
 ,58 → 1186,60
     pmap->data = malloc(screen.pixelbytes * vport->width * vport->height);
     if (!pmap->data)
         return ENOMEM;
     pmap->width = vport->width;
     pmap->height = vport->height;
     copy_vp_to_pixmap(vport, pmap);
     return pm;
 }
 /** Draw pixmap on screen
  *
  * @param vp Viewport to draw on
  * @param pm Pixmap identifier
+ *
  */
 static int draw_pixmap(int vp, int pm)
 {
     pixmap_t *pmap = &pixmaps[pm];
     viewport_t *vport = &viewports[vp];
-    int y;
-    int tmp, srcrowsize;
-    int realwidth, realheight, realrowsize;
-    int width = vport->width;
-    int height = vport->height;
+    unsigned int width = vport->width;
+    unsigned int height = vport->height;
     if (width + vport->x > screen.xres)
         width = screen.xres - vport->x;
     if (height + vport->y > screen.yres)
         height = screen.yres - vport->y;
     if (!pmap->data)
         return EINVAL;
-    realwidth = pmap->width <= width ? pmap->width : width;
-    realheight = pmap->height <= height ? pmap->height : height;
-    srcrowsize = vport->width * screen.pixelbytes;
-    realrowsize = realwidth * screen.pixelbytes;
+    unsigned int realwidth = pmap->width <= width ? pmap->width : width;
+    unsigned int realheight = pmap->height <= height ? pmap->height : height;
+    unsigned int srcrowsize = vport->width * screen.pixelbytes;
+    unsigned int realrowsize = realwidth * screen.pixelbytes;
+    unsigned int y;
     for (y = 0; y < realheight; y++) {
-        tmp = (vport->y + y) * screen.scanline +
-            vport->x * screen.pixelbytes;
-        memcpy(screen.fbaddress + tmp, pmap->data + y * srcrowsize,
-            realrowsize);
+        unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
+        memcpy(screen.fb_addr + tmp, pmap->data + y * srcrowsize, realrowsize);
     }
-    return 0;
+    return EOK;
 }
-/** Tick animation one step forward */
-static void
-anims_tick(void)
+/** Tick animation one step forward
+ *
+ */
+static void anims_tick(void)
 {
-    int i;
+    unsigned int i;
     static int counts = 0;
     /* Limit redrawing */
 ,39 → 1246,38
     counts = (counts + 1) % 8;
     if (counts)
         return;
     for (i = 0; i < MAX_ANIMATIONS; i++) {
-        if (!animations[i].animlen || !animations[i].initialized ||
-            !animations[i].enabled)
+        if ((!animations[i].animlen) || (!animations[i].initialized) ||
+            (!animations[i].enabled))
             continue;
-        draw_pixmap(animations[i].vp,
-            animations[i].pixmaps[animations[i].pos]);
-        animations[i].pos = (animations[i].pos + 1) %
-            animations[i].animlen;
+        draw_pixmap(animations[i].vp, animations[i].pixmaps[animations[i].pos]);
+        animations[i].pos = (animations[i].pos + 1) % animations[i].animlen;
     }
 }
-static int pointer_x, pointer_y;
-static int pointer_shown, pointer_enabled;
+static unsigned int pointer_x;
+static unsigned int pointer_y;
+static bool pointer_shown, pointer_enabled;
 static int pointer_vport = -1;
 static int pointer_pixmap = -1;
-static void
-mouse_show(void)
+static void mouse_show(void)
 {
     int i, j;
     int visibility;
     int color;
     int bytepos;
-    if (pointer_shown || !pointer_enabled)
+    if ((pointer_shown) || (!pointer_enabled))
         return;
-    /* Save image under the cursor */
+    /* Save image under the pointer. */
     if (pointer_vport == -1) {
-        pointer_vport = viewport_create(pointer_x, pointer_y,
-            pointer_width, pointer_height);
+        pointer_vport = vport_create(pointer_x, pointer_y, pointer_width, pointer_height);
         if (pointer_vport < 0)
             return;
     } else {
 ,14 → 1284,13
         viewports[pointer_vport].x = pointer_x;
         viewports[pointer_vport].y = pointer_y;
     }
     if (pointer_pixmap == -1)
         pointer_pixmap = save_vp_to_pixmap(&viewports[pointer_vport]);
     else
-        copy_vp_to_pixmap(&viewports[pointer_vport],
-            &pixmaps[pointer_pixmap]);
-    /* Draw cursor */
+        copy_vp_to_pixmap(&viewports[pointer_vport], &pixmaps[pointer_pixmap]);
+    /* Draw mouse pointer. */
     for (i = 0; i < pointer_height; i++)
         for (j = 0; j < pointer_width; j++) {
             bytepos = i * ((pointer_width - 1) / 8 + 1) + j / 8;
 ,10 → 1308,10
     pointer_shown = 1;
 }
-static void
-mouse_hide(void)
+static void mouse_hide(void)
 {
-    /* Restore image under the cursor */
+    /* Restore image under the pointer. */
     if (pointer_shown) {
         draw_pixmap(pointer_vport, pointer_pixmap);
         pointer_shown = 0;
 ,8 → 1318,8
     }
 }
-static void
-mouse_move(unsigned int x, unsigned int y)
+static void mouse_move(unsigned int x, unsigned int y)
 {
     mouse_hide();
     pointer_x = x;
 ,14 → 1327,14
     mouse_show();
 }
-static int
-anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+static int anim_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
 {
-    int handled = 1;
-    int retval = 0;
-    int i,nvp;
+    bool handled = true;
+    int retval = EOK;
+    int i, nvp;
     int newval;
     switch (IPC_GET_METHOD(*call)) {
     case FB_ANIM_CREATE:
         nvp = IPC_GET_ARG1(*call);
 ,14 → 1424,16
     return handled;
 }
-/** Handler for messages concerning pixmap handling */
-static int
-pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
+/** Handler for messages concerning pixmap handling
+ *
+ */
+static int pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp)
 {
-    int handled = 1;
-    int retval = 0;
-    int i,nvp;
+    bool handled = true;
+    int retval = EOK;
+    int i, nvp;
     switch (IPC_GET_METHOD(*call)) {
     case FB_VP_DRAW_PIXMAP:
         nvp = IPC_GET_ARG1(*call);
 ,7 → 1471,7
     default:
         handled = 0;
     }
     if (handled)
         ipc_answer_0(callid, retval);
     return handled;
 ,35 → 1478,99
 }
+static int rgb_from_style(attr_rgb_t *rgb, int style)
+{
+    switch (style) {
+    case STYLE_NORMAL:
+        rgb->fg_color = color_table[COLOR_BLACK];
+        rgb->bg_color = color_table[COLOR_WHITE];
+        break;
+    case STYLE_EMPHASIS:
+        rgb->fg_color = color_table[COLOR_RED];
+        rgb->bg_color = color_table[COLOR_WHITE];
+        break;
+    default:
+        return EINVAL;
+    }
+    return EOK;
+}
+static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t flags)
+{
+    fg_color = (fg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
+    bg_color = (bg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
+    rgb->fg_color = color_table[fg_color];
+    rgb->bg_color = color_table[bg_color];
+    return EOK;
+}
+static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a)
+{
+    int rc;
+    switch (a->t) {
+    case at_style:
+        rc = rgb_from_style(rgb, a->a.s.style);
+        break;
+    case at_idx:
+        rc = rgb_from_idx(rgb, a->a.i.fg_color,
+            a->a.i.bg_color, a->a.i.flags);
+        break;
+    case at_rgb:
+        *rgb = a->a.r;
+        rc = EOK;
+        break;
+    }
+    return rc;
+}
+static int fb_set_style(viewport_t *vport, ipcarg_t style)
+{
+    return rgb_from_style(&vport->attr, (int) style);
+}
+static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
+    ipcarg_t bg_color, ipcarg_t flags)
+{
+    return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
+}
 /** Function for handling connections to FB
  *
  */
-static void
-fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    ipc_callid_t callid;
-    ipc_call_t call;
-    int retval;
-    int i;
-    unsigned int row,col;
-    char c;
-    int vp = 0;
-    viewport_t *vport = &viewports[0];
+    unsigned int vp = 0;
+    viewport_t *vport = &viewports[vp];
     if (client_connected) {
         ipc_answer_0(iid, ELIMIT);
         return;
     }
-    client_connected = 1;
-    ipc_answer_0(iid, EOK); /* Accept connection */
-    while (1) {
-        if (vport->cursor_active || anims_enabled)
+    /* Accept connection */
+    client_connected = true;
+    ipc_answer_0(iid, EOK);
+    while (true) {
+        ipc_callid_t callid;
+        ipc_call_t call;
+        int retval;
+        unsigned int i;
+        int scroll;
+        wchar_t ch;
+        unsigned int row, col;
+        if ((vport->cursor_active) || (anims_enabled))
             callid = async_get_call_timeout(&call, 250000);
         else
             callid = async_get_call(&call);
         mouse_hide();
         if (!callid) {
             cursor_blink(vport);
 ,105 → 1578,89
             mouse_show();
             continue;
         }
         if (shm_handle(callid, &call, vp))
             continue;
         if (pixmap_handle(callid, &call, vp))
             continue;
         if (anim_handle(callid, &call, vp))
             continue;
-        switch (IPC_GET_METHOD(call)) {
+        switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
-            client_connected = 0;
-            /* cleanup other viewports */
+            client_connected = false;
+            /* Cleanup other viewports */
             for (i = 1; i < MAX_VIEWPORTS; i++)
-                vport->initialized = 0;
-            return; /* Exit thread */
+                vport->initialized = false;
+            /* Exit thread */
+            return;
         case FB_PUTCHAR:
-        case FB_TRANS_PUTCHAR:
-            c = IPC_GET_ARG1(call);
+            ch = IPC_GET_ARG1(call);
             row = IPC_GET_ARG2(call);
             col = IPC_GET_ARG3(call);
-            if (row >= vport->rows || col >= vport->cols) {
+            if ((col >= vport->cols) || (row >= vport->rows)) {
                 retval = EINVAL;
                 break;
             }
             ipc_answer_0(callid, EOK);
-            draw_char(vport, c, row, col, vport->style,
-                IPC_GET_METHOD(call) == FB_TRANS_PUTCHAR);
-            continue; /* msg already answered */
+            draw_char(vport, ch, col, row);
+            /* Message already answered */
+            continue;
         case FB_CLEAR:
-            clear_port(vport);
-            cursor_print(vport);
-            retval = 0;
+            vport_clear(vport);
+            cursor_show(vport);
+            retval = EOK;
             break;
-        case FB_CURSOR_GOTO:
+        case FB_CURSOR_GOTO:
             row = IPC_GET_ARG1(call);
             col = IPC_GET_ARG2(call);
-            if (row >= vport->rows || col >= vport->cols) {
+            if ((col >= vport->cols) || (row >= vport->rows)) {
                 retval = EINVAL;
                 break;
             }
-            retval = 0;
+            retval = EOK;
             cursor_hide(vport);
             vport->cur_col = col;
             vport->cur_row = row;
-            cursor_print(vport);
-            break;
+            cursor_show(vport);
+            break;
         case FB_CURSOR_VISIBILITY:
             cursor_hide(vport);
             vport->cursor_active = IPC_GET_ARG1(call);
-            cursor_print(vport);
-            retval = 0;
+            cursor_show(vport);
+            retval = EOK;
             break;
         case FB_GET_CSIZE:
             ipc_answer_2(callid, EOK, vport->rows, vport->cols);
             continue;
         case FB_SCROLL:
-            i = IPC_GET_ARG1(call);
-            if (i > vport->rows || i < (- (int)vport->rows)) {
+            scroll = IPC_GET_ARG1(call);
+            if ((scroll > (int) vport->rows) || (scroll < (-(int) vport->rows))) {
                 retval = EINVAL;
                 break;
             }
             cursor_hide(vport);
-            scroll_port(vport, i*FONT_SCANLINES);
-            cursor_print(vport);
-            retval = 0;
+            vport_scroll(vport, scroll);
+            cursor_show(vport);
+            retval = EOK;
             break;
-        case FB_VIEWPORT_DB:
-            /* Enable double buffering */
-            i = IPC_GET_ARG1(call);
-            if (i == -1)
-                i = vp;
-            if (i < 0 || i >= MAX_VIEWPORTS) {
-                retval = EINVAL;
-                break;
-            }
-            if (!viewports[i].initialized ) {
-                retval = EADDRNOTAVAIL;
-                break;
-            }
-            viewports[i].dboffset = 0;
-            if (IPC_GET_ARG2(call) == 1 && !viewports[i].dbdata)
-                viewports[i].dbdata =
-                    malloc(screen.pixelbytes *
-                    viewports[i].width * viewports[i].height);
-            else if (IPC_GET_ARG2(call) == 0 &&
-                viewports[i].dbdata) {
-                free(viewports[i].dbdata);
-                viewports[i].dbdata = NULL;
-            }
-            retval = 0;
-            break;
         case FB_VIEWPORT_SWITCH:
             i = IPC_GET_ARG1(call);
-            if (i < 0 || i >= MAX_VIEWPORTS) {
+            if (i >= MAX_VIEWPORTS) {
                 retval = EINVAL;
                 break;
             }
-            if (! viewports[i].initialized ) {
+            if (!viewports[i].initialized) {
                 retval = EADDRNOTAVAIL;
                 break;
             }
 ,11 → 1667,11
             cursor_hide(vport);
             vp = i;
             vport = &viewports[vp];
-            cursor_print(vport);
-            retval = 0;
+            cursor_show(vport);
+            retval = EOK;
             break;
         case FB_VIEWPORT_CREATE:
-            retval = viewport_create(IPC_GET_ARG1(call) >> 16,
+            retval = vport_create(IPC_GET_ARG1(call) >> 16,
                 IPC_GET_ARG1(call) & 0xffff,
                 IPC_GET_ARG2(call) >> 16,
                 IPC_GET_ARG2(call) & 0xffff);
 ,34 → 1678,45
             break;
         case FB_VIEWPORT_DELETE:
             i = IPC_GET_ARG1(call);
-            if (i < 0 || i >= MAX_VIEWPORTS) {
+            if (i >= MAX_VIEWPORTS) {
                 retval = EINVAL;
                 break;
             }
-            if (! viewports[i].initialized ) {
+            if (!viewports[i].initialized) {
                 retval = EADDRNOTAVAIL;
                 break;
             }
-            viewports[i].initialized = 0;
-            if (viewports[i].dbdata) {
-                free(viewports[i].dbdata);
-                viewports[i].dbdata = NULL;
-            }
-            retval = 0;
+            viewports[i].initialized = false;
+            if (viewports[i].bgpixel)
+                free(viewports[i].bgpixel);
+            if (viewports[i].backbuf)
+                free(viewports[i].backbuf);
+            retval = EOK;
             break;
         case FB_SET_STYLE:
-            vport->style.fg_color = IPC_GET_ARG1(call);
-            vport->style.bg_color = IPC_GET_ARG2(call);
-            retval = 0;
+            retval = fb_set_style(vport, IPC_GET_ARG1(call));
             break;
+        case FB_SET_COLOR:
+            retval = fb_set_color(vport, IPC_GET_ARG1(call),
+                IPC_GET_ARG2(call), IPC_GET_ARG3(call));
+            break;
+        case FB_SET_RGB_COLOR:
+            vport->attr.fg_color = IPC_GET_ARG1(call);
+            vport->attr.bg_color = IPC_GET_ARG2(call);
+            retval = EOK;
+            break;
         case FB_GET_RESOLUTION:
             ipc_answer_2(callid, EOK, screen.xres, screen.yres);
             continue;
         case FB_POINTER_MOVE:
-            pointer_enabled = 1;
+            pointer_enabled = true;
             mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
-            retval = 0;
+            retval = EOK;
             break;
+        case FB_SCREEN_YIELD:
+        case FB_SCREEN_RECLAIM:
+            retval = EOK;
+            break;
         default:
             retval = ENOENT;
         }
 ,43 → 1724,33
     }
 }
-/** Initialization of framebuffer */
-int
-fb_init(void)
+/** Initialization of framebuffer
+ *
+ */
+int fb_init(void)
 {
-    void *fb_ph_addr;
-    unsigned int fb_width;
-    unsigned int fb_height;
-    unsigned int fb_scanline;
-    unsigned int fb_visual;
-    unsigned int fb_offset;
-    bool fb_invert_colors;
-    void *fb_addr;
-    size_t asz;
     async_set_client_connection(fb_client_connection);
-    fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
-    fb_offset = sysinfo_value("fb.offset");
-    fb_width = sysinfo_value("fb.width");
-    fb_height = sysinfo_value("fb.height");
-    fb_scanline = sysinfo_value("fb.scanline");
-    fb_visual = sysinfo_value("fb.visual");
-    fb_invert_colors = sysinfo_value("fb.invert-colors");
-    asz = fb_scanline * fb_height;
-    fb_addr = as_get_mappable_page(asz);
-    physmem_map(fb_ph_addr + fb_offset, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>
-        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
-    if (screen_init(fb_addr, fb_offset, fb_width, fb_height, fb_scanline, fb_visual,
-        fb_invert_colors))
+    void *fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
+    unsigned int fb_offset = sysinfo_value("fb.offset");
+    unsigned int fb_width = sysinfo_value("fb.width");
+    unsigned int fb_height = sysinfo_value("fb.height");
+    unsigned int fb_scanline = sysinfo_value("fb.scanline");
+    unsigned int fb_visual = sysinfo_value("fb.visual");
+    unsigned int fbsize = fb_scanline * fb_height;
+    void *fb_addr = as_get_mappable_page(fbsize);
+    if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
+        ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
+    if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
         return 0;
     return -1;
 }
-/**
+/**
  * @}
  */

 /branches/tracing/uspace/srv/fb/sgcn.c
 ,8 → 36,6
  */
 #include <async.h>
-#include <ipc/ipc.h>
-#include <ipc/fb.h>
 #include <sysinfo.h>
 #include <as.h>
 #include <errno.h>
 ,9 → 58,6
  */
 static uintptr_t sram_buffer_offset;
-/* Allow only 1 connection */
-static int client_connected = 0;
 /**
  * SGCN buffer header. It is placed at the very beginning of the SGCN
  * buffer.
 ,125 → 117,22
 }
 /**
- * Main function of the thread serving client connections.
- */
-static void sgcn_client_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-    int retval;
-    ipc_callid_t callid;
-    ipc_call_t call;
-    char c;
-    int lastcol = 0;
-    int lastrow = 0;
-    int newcol;
-    int newrow;
-    int fgcolor;
-    int bgcolor;
-    int i;
-    if (client_connected) {
-        ipc_answer_0(iid, ELIMIT);
-        return;
-    }
-    client_connected = 1;
-    ipc_answer_0(iid, EOK);
-    /* Clear the terminal, set scrolling region
-       to 0 - 24 lines */
-    serial_clrscr();
-    serial_goto(0, 0);
-    serial_puts("\033[0;24r");
-    while (true) {
-        callid = async_get_call(&call);
-        switch (IPC_GET_METHOD(call)) {
-        case IPC_M_PHONE_HUNGUP:
-            client_connected = 0;
-            ipc_answer_0(callid, EOK);
-            return;
-        case FB_PUTCHAR:
-            c = IPC_GET_ARG1(call);
-            newrow = IPC_GET_ARG2(call);
-            newcol = IPC_GET_ARG3(call);
-            if ((lastcol != newcol) || (lastrow != newrow))
-                serial_goto(newrow, newcol);
-            lastcol = newcol + 1;
-            lastrow = newrow;
-            sgcn_putc(c);
-            retval = 0;
-            break;
-        case FB_CURSOR_GOTO:
-            newrow = IPC_GET_ARG1(call);
-            newcol = IPC_GET_ARG2(call);
-            serial_goto(newrow, newcol);
-            lastrow = newrow;
-            lastcol = newcol;
-            retval = 0;
-            break;
-        case FB_GET_CSIZE:
-            ipc_answer_2(callid, EOK, HEIGHT, WIDTH);
-            continue;
-        case FB_CLEAR:
-            serial_clrscr();
-            retval = 0;
-            break;
-        case FB_SET_STYLE:
-            fgcolor = IPC_GET_ARG1(call);
-            bgcolor = IPC_GET_ARG2(call);
-            if (fgcolor < bgcolor)
-                serial_set_style(0);
-            else
-                serial_set_style(7);
-            retval = 0;
-            break;
-        case FB_SCROLL:
-            i = IPC_GET_ARG1(call);
-            if ((i > HEIGHT) || (i < -HEIGHT)) {
-                retval = EINVAL;
-                break;
-            }
-            serial_scroll(i);
-            serial_goto(lastrow, lastcol);
-            retval = 0;
-            break;
-        case FB_CURSOR_VISIBILITY:
-            if(IPC_GET_ARG1(call))
-                serial_cursor_enable();
-            else
-                serial_cursor_disable();
-            retval = 0;
-            break;
-        default:
-            retval = ENOENT;
-        }
-        ipc_answer_0(callid, retval);
-    }
-}
-/**
  * Initializes the SGCN serial driver.
  */
 int sgcn_init(void)
 {
-    sram_virt_addr = (uintptr_t) as_get_mappable_page(
-        sysinfo_value("sram.area.size"));
-    int result = physmem_map(
-        (void *) sysinfo_value("sram.address.physical"),
-        (void *) sram_virt_addr,
-        sysinfo_value("sram.area.size") / PAGE_SIZE,
-        AS_AREA_READ | AS_AREA_WRITE
-        );
-    if (result != 0) {
-        printf("SGCN: uspace driver couldn't map physical memory: %d\n",
-            result);
-    }
+    sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+    if (physmem_map((void *) sysinfo_value("sram.address.physical"),
+        (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
+        AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     serial_console_init(sgcn_putc, WIDTH, HEIGHT);
     sram_buffer_offset = sysinfo_value("sram.buffer.offset");
-    async_set_client_connection(sgcn_client_connection);
+    async_set_client_connection(serial_client_connection);
     return 0;
 }

 /branches/tracing/uspace/srv/fb/ski.h
 ,0 → 1,46
+/*
+ * Copyright (c) 2008 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup skifb
+ * @brief   HelenOS ski text console.
+ * @ingroup fbs
+ * @{
+ */
+/** @file
+ */
+#ifndef FB_SKI_H_
+#define FB_SKI_H_
+extern int ski_init(void);
+#endif
+/** @}
+ */

 /branches/tracing/uspace/srv/fb/ppm.c
 ,23 → 92,23
     int i;
     unsigned int color;
     unsigned int coef;
     /* Read magic */
-    if (data[0] != 'P' || data[1] != '6')
+    if ((data[0] != 'P') || (data[1] != '6'))
         return EINVAL;
-    data+=2;
+    data += 2;
     skip_whitespace(&data);
     read_num(&data, &width);
     skip_whitespace(&data);
-    read_num(&data,&height);
+    read_num(&data, &height);
     skip_whitespace(&data);
-    read_num(&data,&maxcolor);
+    read_num(&data, &maxcolor);
     data++;
-    if (maxcolor == 0 || maxcolor > 255 || width * height > datasz) {
+    if ((maxcolor == 0) || (maxcolor > 255) || (width * height > datasz))
         return EINVAL;
-    }
     coef = 255 / maxcolor;
     if (coef * maxcolor > 255)
         coef -= 1;
 ,6 → 125,6
         (*putpixel)(vport, sx + (i % width), sy + (i / width), color);
         data += 3;
     }
     return 0;
 }

 /branches/tracing/uspace/srv/fb/fb.h
 ,7 → 29,7
 /** @addtogroup fb
  * @ingroup fbs
  * @{
- */
+ */
 /** @file
  */
 ,8 → 36,10
 #ifndef FB_FB_H_
 #define FB_FB_H_
-typedef void (* putpixel_cb_t)(void *, unsigned int, unsigned int, int);
+#include <stdint.h>
+typedef void (* putpixel_cb_t)(void *, unsigned int, unsigned int, uint32_t);
 extern int fb_init(void);
 #endif

 /branches/tracing/uspace/srv/fb/ega.c
 ,6 → 49,9
 #include <ipc/ns.h>
 #include <ipc/services.h>
 #include <libarch/ddi.h>
+#include <console/style.h>
+#include <console/color.h>
+#include <sys/types.h>
 #include "ega.h"
 #include "../console/screenbuffer.h"
 ,26 → 64,27
 saved_screen saved_screens[MAX_SAVED_SCREENS];
-#define EGA_IO_ADDRESS 0x3d4
+#define EGA_IO_BASE ((ioport8_t *) 0x3d4)
 #define EGA_IO_SIZE 2
-int ega_normal_color=0x0f;
-int ega_inverted_color=0xf0;
+int ega_normal_color = 0x0f;
+int ega_inverted_color = 0xf0;
 #define NORMAL_COLOR        ega_normal_color
 #define INVERTED_COLOR      ega_inverted_color
-#define EGA_STYLE(fg,bg) ((fg) > (bg) ? NORMAL_COLOR : INVERTED_COLOR)
 /* Allow only 1 connection */
 static int client_connected = 0;
 static unsigned int scr_width;
 static unsigned int scr_height;
-static char *scr_addr;
+static uint8_t *scr_addr;
 static unsigned int style;
+static unsigned attr_to_ega_style(const attrs_t *a);
+static uint8_t ega_glyph(wchar_t ch);
 static void clrscr(void)
 {
     int i;
 ,10 → 101,10
     ega_cursor = col + scr_width * row;
-    outb(EGA_IO_ADDRESS, 0xe);
-    outb(EGA_IO_ADDRESS + 1, (ega_cursor >> 8) & 0xff);
-    outb(EGA_IO_ADDRESS, 0xf);
-    outb(EGA_IO_ADDRESS + 1, ega_cursor & 0xff);
+    pio_write_8(EGA_IO_BASE, 0xe);
+    pio_write_8(EGA_IO_BASE + 1, (ega_cursor >> 8) & 0xff);
+    pio_write_8(EGA_IO_BASE, 0xf);
+    pio_write_8(EGA_IO_BASE + 1, ega_cursor & 0xff);
 }
 static void cursor_disable(void)
 ,10 → 111,10
 {
     uint8_t stat;
-    outb(EGA_IO_ADDRESS, 0xa);
-    stat=inb(EGA_IO_ADDRESS + 1);
-    outb(EGA_IO_ADDRESS, 0xa);
-    outb(EGA_IO_ADDRESS + 1, stat | (1 << 5));
+    pio_write_8(EGA_IO_BASE, 0xa);
+    stat = pio_read_8(EGA_IO_BASE + 1);
+    pio_write_8(EGA_IO_BASE, 0xa);
+    pio_write_8(EGA_IO_BASE + 1, stat | (1 << 5));
 }
 static void cursor_enable(void)
 ,10 → 121,10
 {
     uint8_t stat;
-    outb(EGA_IO_ADDRESS, 0xa);
-    stat=inb(EGA_IO_ADDRESS + 1);
-    outb(EGA_IO_ADDRESS, 0xa);
-    outb(EGA_IO_ADDRESS + 1, stat & (~(1 << 5)));
+    pio_write_8(EGA_IO_BASE, 0xa);
+    stat = pio_read_8(EGA_IO_BASE + 1);
+    pio_write_8(EGA_IO_BASE, 0xa);
+    pio_write_8(EGA_IO_BASE + 1, stat & (~(1 << 5)));
 }
 static void scroll(int rows)
 ,13 → 131,13
 {
     int i;
     if (rows > 0) {
-        memcpy(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
+        memmove(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
             scr_width * scr_height * 2 - rows * scr_width * 2);
         for (i = 0; i < rows * scr_width; i++)
             (((short *) scr_addr) + scr_width * scr_height - rows *
                 scr_width)[i] = ((style << 8) + ' ');
     } else if (rows < 0) {
-        memcpy(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
+        memmove(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
             scr_width * scr_height * 2 + rows * scr_width * 2);
         for (i = 0; i < -rows * scr_width; i++)
             ((short *)scr_addr)[i] = ((style << 8 ) + ' ');
 ,22 → 144,38
     }
 }
-static void printchar(char c, unsigned int row, unsigned int col)
+static void printchar(wchar_t c, unsigned int row, unsigned int col)
 {
-    scr_addr[(row * scr_width + col) * 2] = c;
+    scr_addr[(row * scr_width + col) * 2] = ega_glyph(c);
     scr_addr[(row * scr_width + col) * 2 + 1] = style;
     cursor_goto(row, col + 1);
 }
-static void draw_text_data(keyfield_t *data)
+/** Draw text data to viewport.
+ *
+ * @param vport Viewport id
+ * @param data  Text data.
+ * @param x Leftmost column of the area.
+ * @param y Topmost row of the area.
+ * @param w Number of rows.
+ * @param h Number of columns.
+ */
+static void draw_text_data(keyfield_t *data, unsigned int x,
+    unsigned int y, unsigned int w, unsigned int h)
 {
-    int i;
+    unsigned int i, j;
+    keyfield_t *field;
+    uint8_t *dp;
-    for (i = 0; i < scr_width * scr_height; i++) {
-        scr_addr[i * 2] = data[i].character;
-        scr_addr[i * 2 + 1] = EGA_STYLE(data[i].style.fg_color,
-            data[i].style.bg_color);
+    for (j = 0; j < h; j++) {
+        for (i = 0; i < w; i++) {
+            field = &data[j * w + i];
+            dp = &scr_addr[2 * ((y + j) * scr_width + (x + i))];
+            dp[0] = ega_glyph(field->character);
+            dp[1] = attr_to_ega_style(&field->attrs);
+        }
     }
 }
 ,15 → 204,68
     return i;
 }
+static int style_to_ega_style(int style)
+{
+    unsigned int ega_style;
+    switch (style) {
+    case STYLE_NORMAL:
+        ega_style = INVERTED_COLOR;
+        break;
+    case STYLE_EMPHASIS:
+        ega_style = INVERTED_COLOR | 4;
+        break;
+    default:
+        return INVERTED_COLOR;
+    }
+    return ega_style;
+}
+static unsigned int color_to_ega_style(int fg_color, int bg_color, int attr)
+{
+    unsigned int style;
+    style = (fg_color & 7) | ((bg_color & 7) << 4);
+    if (attr & CATTR_BRIGHT)
+        style = style | 0x08;
+    return style;
+}
+static unsigned int rgb_to_ega_style(uint32_t fg, uint32_t bg)
+{
+    return (fg > bg) ? NORMAL_COLOR : INVERTED_COLOR;
+}
+static unsigned attr_to_ega_style(const attrs_t *a)
+{
+    switch (a->t) {
+    case at_style: return style_to_ega_style(a->a.s.style);
+    case at_rgb: return rgb_to_ega_style(a->a.r.fg_color, a->a.r.bg_color);
+    case at_idx: return color_to_ega_style(a->a.i.fg_color,
+        a->a.i.bg_color, a->a.i.flags);
+    default: return INVERTED_COLOR;
+    }
+}
+static uint8_t ega_glyph(wchar_t ch)
+{
+    if (ch >= 0 && ch < 128)
+        return ch;
+    return '?';
+}
 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
     int retval;
     ipc_callid_t callid;
     ipc_call_t call;
-    char c;
-    unsigned int row, col;
-    int bgcolor,fgcolor;
+    wchar_t c;
+    unsigned int row, col, w, h;
+    int bg_color, fg_color, attr;
+    uint32_t bg_rgb, fg_rgb;
     keyfield_t *interbuf = NULL;
     size_t intersize = 0;
     int i;
 ,11 → 296,19
             retval = EINVAL;
             break;
         case FB_DRAW_TEXT_DATA:
+            col = IPC_GET_ARG1(call);
+            row = IPC_GET_ARG2(call);
+            w = IPC_GET_ARG3(call);
+            h = IPC_GET_ARG4(call);
             if (!interbuf) {
                 retval = EINVAL;
                 break;
             }
-            draw_text_data(interbuf);
+            if (col + w > scr_width || row + h > scr_height) {
+                retval = EINVAL;
+                break;
+            }
+            draw_text_data(interbuf, col, row, w, h);
             retval = 0;
             break;
         case FB_GET_CSIZE:
 ,7 → 349,7
             retval = 0;
             break;
         case FB_CURSOR_VISIBILITY:
-            if(IPC_GET_ARG1(call))
+            if (IPC_GET_ARG1(call))
                 cursor_enable();
             else
                 cursor_disable();
 ,11 → 356,22
             retval = 0;
             break;
         case FB_SET_STYLE:
-            fgcolor = IPC_GET_ARG1(call);
-            bgcolor = IPC_GET_ARG2(call);
-            style = EGA_STYLE(fgcolor, bgcolor);
+            style = style_to_ega_style(IPC_GET_ARG1(call));
             retval = 0;
             break;
+        case FB_SET_COLOR:
+            fg_color = IPC_GET_ARG1(call);
+            bg_color = IPC_GET_ARG2(call);
+            attr = IPC_GET_ARG3(call);
+            style = color_to_ega_style(fg_color, bg_color, attr);
+            retval = 0;
+            break;
+        case FB_SET_RGB_COLOR:
+            fg_rgb = IPC_GET_ARG1(call);
+            bg_rgb = IPC_GET_ARG2(call);
+            style = rgb_to_ega_style(fg_rgb, bg_rgb);
+            retval = 0;
+            break;
         case FB_VP_DRAW_PIXMAP:
             i = IPC_GET_ARG2(call);
             retval = print_screen(i);
 ,9 → 391,12
             }
             retval = 0;
             break;
+        case FB_SCREEN_YIELD:
+        case FB_SCREEN_RECLAIM:
+            retval = EOK;
+            break;
         default:
-            retval = ENOENT;
+            retval = EINVAL;
         }
         ipc_answer_0(callid, retval);
     }
 ,20 → 410,22
     ega_ph_addr = (void *) sysinfo_value("fb.address.physical");
     scr_width = sysinfo_value("fb.width");
     scr_height = sysinfo_value("fb.height");
-    if(sysinfo_value("fb.blinking"))
-    {
-            ega_normal_color&=0x77;
-            ega_inverted_color&=0x77;
+    if (sysinfo_value("fb.blinking")) {
+        ega_normal_color &= 0x77;
+        ega_inverted_color &= 0x77;
     }
     style = NORMAL_COLOR;
-    iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2);
+    iospace_enable(task_get_id(), (void *) EGA_IO_BASE, 2);
     sz = scr_width * scr_height * 2;
     scr_addr = as_get_mappable_page(sz);
-    physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
-        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+    if (physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
+        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     async_set_client_connection(ega_client_connection);
 ,6 → 433,6
 }
-/**
+/**
  * @}
  */

 /branches/tracing/uspace/srv/fb/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../libipc/include
 ,35 → 46,43
     main.c \
     ppm.c
-ifneq ($(ARCH), ia64)
+ifneq ($(UARCH),ia64)
     SOURCES += fb.c \
         font-8x16.c
     CFLAGS += -DFB_ENABLED
 endif
-ifeq ($(ARCH), ia32)
+ifeq ($(UARCH),ia32)
     SOURCES += ega.c
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(ARCH), ia64)
-    SOURCES += ega.c
+ifeq ($(UARCH),ia64)
+    SOURCES += ega.c \
+        ski.c \
+        serial_console.c
+    CFLAGS += -DSKI_ENABLED
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(ARCH), amd64)
+ifeq ($(UARCH),amd64)
     SOURCES += ega.c
     CFLAGS += -DEGA_ENABLED
 endif
-ifeq ($(ARCH), mips32)
+ifeq ($(UARCH),mips32)
     SOURCES += msim.c \
-                   serial_console.c
-    CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN
+        serial_console.c
+    CFLAGS += -DMSIM_ENABLED
 endif
-ifeq ($(ARCH), sparc64)
+ifeq ($(UARCH),sparc64)
     SOURCES += sgcn.c \
-               serial_console.c
+        serial_console.c
     CFLAGS += -DSGCN_ENABLED
 endif
-CFLAGS += -D$(ARCH)
+CFLAGS += -D$(UARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,13 → 94,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/fs/tmpfs/tmpfs.h
 ,6 → 44,9
 #define dprintf(...)    printf(__VA_ARGS__)
 #endif
+#define TMPFS_NODE(node)    ((node) ? (tmpfs_node_t *)(node)->data : NULL)
+#define FS_NODE(node)       ((node) ? (node)->bp : NULL)
 typedef enum {
     TMPFS_NONE,
     TMPFS_FILE,
 ,22 → 53,33
     TMPFS_DIRECTORY
 } tmpfs_dentry_type_t;
+/* forward declaration */
+struct tmpfs_node;
 typedef struct tmpfs_dentry {
+    link_t link;        /**< Linkage for the list of siblings. */
+    struct tmpfs_node *node;/**< Back pointer to TMPFS node. */
+    char *name;     /**< Name of dentry. */
+} tmpfs_dentry_t;
+typedef struct tmpfs_node {
+    fs_node_t *bp;      /**< Back pointer to the FS node. */
     fs_index_t index;   /**< TMPFS node index. */
-    link_t dh_link;     /**< Dentries hash table link. */
-    struct tmpfs_dentry *sibling;
-    struct tmpfs_dentry *child;
-    hash_table_t names; /**< All names linking to this TMPFS node. */
+    dev_handle_t dev_handle;/**< Device handle. */
+    link_t nh_link;     /**< Nodes hash table link. */
     tmpfs_dentry_type_t type;
     unsigned lnkcnt;    /**< Link count. */
     size_t size;        /**< File size if type is TMPFS_FILE. */
     void *data;     /**< File content's if type is TMPFS_FILE. */
-} tmpfs_dentry_t;
+    link_t cs_head;     /**< Head of child's siblings list. */
+} tmpfs_node_t;
 extern fs_reg_t tmpfs_reg;
 extern libfs_ops_t tmpfs_libfs_ops;
+extern bool tmpfs_init(void);
 extern void tmpfs_mounted(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_mount(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_lookup(ipc_callid_t, ipc_call_t *);

 /branches/tracing/uspace/srv/fs/tmpfs/tmpfs_dump.c
 ,7 → 55,7
 static bool
 tmpfs_restore_recursion(int dev, off_t *bufpos, size_t *buflen, off_t *pos,
-    tmpfs_dentry_t *parent)
+    fs_node_t *pfn)
 {
     struct rdentry entry;
     libfs_ops_t *ops = &tmpfs_libfs_ops;
 ,7 → 63,8
     do {
         char *fname;
-        tmpfs_dentry_t *node;
+        fs_node_t *fn;
+        tmpfs_node_t *nodep;
         uint32_t size;
         if (block_read(dev, bufpos, buflen, pos, &entry, sizeof(entry),
 ,8 → 81,8
             if (fname == NULL)
                 return false;
-            node = (tmpfs_dentry_t *) ops->create(dev, L_FILE);
-            if (node == NULL) {
+            fn = ops->create(dev, L_FILE);
+            if (fn == NULL) {
                 free(fname);
                 return false;
             }
 ,15 → 89,15
             if (block_read(dev, bufpos, buflen, pos, fname,
                 entry.len, TMPFS_BLOCK_SIZE) != EOK) {
-                ops->destroy((void *) node);
+                ops->destroy(fn);
                 free(fname);
                 return false;
             }
             fname[entry.len] = 0;
-            rc = ops->link((void *) parent, (void *) node, fname);
+            rc = ops->link(pfn, fn, fname);
             if (rc != EOK) {
-                ops->destroy((void *) node);
+                ops->destroy(fn);
                 free(fname);
                 return false;
             }
 ,12 → 109,13
             size = uint32_t_le2host(size);
-            node->data = malloc(size);
-            if (node->data == NULL)
+            nodep = TMPFS_NODE(fn);
+            nodep->data = malloc(size);
+            if (nodep->data == NULL)
                 return false;
-            node->size = size;
-            if (block_read(dev, bufpos, buflen, pos, node->data,
+            nodep->size = size;
+            if (block_read(dev, bufpos, buflen, pos, nodep->data,
                 size, TMPFS_BLOCK_SIZE) != EOK)
                 return false;
 ,8 → 125,8
             if (fname == NULL)
                 return false;
-            node = (tmpfs_dentry_t *) ops->create(dev, L_DIRECTORY);
-            if (node == NULL) {
+            fn = ops->create(dev, L_DIRECTORY);
+            if (fn == NULL) {
                 free(fname);
                 return false;
             }
 ,15 → 133,15
             if (block_read(dev, bufpos, buflen, pos, fname,
                 entry.len, TMPFS_BLOCK_SIZE) != EOK) {
-                ops->destroy((void *) node);
+                ops->destroy(fn);
                 free(fname);
                 return false;
             }
             fname[entry.len] = 0;
-            rc = ops->link((void *) parent, (void *) node, fname);
+            rc = ops->link(pfn, fn, fname);
             if (rc != EOK) {
-                ops->destroy((void *) node);
+                ops->destroy(fn);
                 free(fname);
                 return false;
             }
 ,7 → 148,7
             free(fname);
             if (!tmpfs_restore_recursion(dev, bufpos, buflen, pos,
-                node))
+                fn))
                 return false;
             break;
 ,7 → 179,7
         goto error;
     tag[5] = 0;
-    if (strcmp(tag, "TMPFS") != 0)
+    if (str_cmp(tag, "TMPFS") != 0)
         goto error;
     if (!tmpfs_restore_recursion(dev, &bufpos, &buflen, &pos,

 /branches/tracing/uspace/srv/fs/tmpfs/tmpfs.c
 ,16 → 55,6
 vfs_info_t tmpfs_vfs_info = {
     .name = "tmpfs",
-    .ops = {
-        [IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_READ)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_WRITE)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_TRUNCATE)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_MOUNT)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_MOUNTED)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] = VFS_OP_NULL,
-        [IPC_METHOD_TO_VFS_OP(VFS_DESTROY)] = VFS_OP_DEFINED,
-    }
 };
 fs_reg_t tmpfs_reg;
 ,24 → 126,26
 int main(int argc, char **argv)
 {
-    int vfs_phone;
     printf(NAME ": HelenOS TMPFS file system server\n");
-    vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
-    while (vfs_phone < EOK) {
-        usleep(10000);
-        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+    if (!tmpfs_init()) {
+        printf(NAME ": failed to initialize TMPFS\n");
+        return -1;
     }
+    int vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
+    if (vfs_phone < EOK) {
+        printf(NAME ": Unable to connect to VFS\n");
+        return -1;
+    }
-    int rc;
-    rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info,
+    int rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info,
         tmpfs_connection);
     if (rc != EOK) {
         printf(NAME ": Failed to register file system (%d)\n", rc);
         return rc;
     }
     printf(NAME ": Accepting connections\n");
     async_manager();
     /* not reached */

 /branches/tracing/uspace/srv/fs/tmpfs/tmpfs_ops.c
 ,55 → 54,50
 #define min(a, b)       ((a) < (b) ? (a) : (b))
 #define max(a, b)       ((a) > (b) ? (a) : (b))
-#define DENTRIES_BUCKETS    256
+#define NODES_BUCKETS   256
-#define NAMES_BUCKETS       4
+/** All root nodes have index 0. */
+#define TMPFS_SOME_ROOT     0
+/** Global counter for assigning node indices. Shared by all instances. */
+fs_index_t tmpfs_next_index = 1;
 /*
- * For now, we don't distinguish between different dev_handles/instances. All
- * requests resolve to the only instance, rooted in the following variable.
- */
-static tmpfs_dentry_t *root;
-#define TMPFS_DEV       0    /**< Dummy device handle for TMPFS */
-/*
  * Implementation of the libfs interface.
  */
 /* Forward declarations of static functions. */
-static void *tmpfs_match(void *, const char *);
-static void *tmpfs_node_get(dev_handle_t, fs_index_t);
-static void tmpfs_node_put(void *);
-static void *tmpfs_create_node(dev_handle_t, int);
-static int tmpfs_link_node(void *, void *, const char *);
-static int tmpfs_unlink_node(void *, void *);
-static int tmpfs_destroy_node(void *);
+static fs_node_t *tmpfs_match(fs_node_t *, const char *);
+static fs_node_t *tmpfs_node_get(dev_handle_t, fs_index_t);
+static void tmpfs_node_put(fs_node_t *);
+static fs_node_t *tmpfs_create_node(dev_handle_t, int);
+static int tmpfs_link_node(fs_node_t *, fs_node_t *, const char *);
+static int tmpfs_unlink_node(fs_node_t *, fs_node_t *, const char *);
+static int tmpfs_destroy_node(fs_node_t *);
 /* Implementation of helper functions. */
-static fs_index_t tmpfs_index_get(void *nodep)
+static fs_index_t tmpfs_index_get(fs_node_t *fn)
 {
-    return ((tmpfs_dentry_t *) nodep)->index;
+    return TMPFS_NODE(fn)->index;
 }
-static size_t tmpfs_size_get(void *nodep)
+static size_t tmpfs_size_get(fs_node_t *fn)
 {
-    return ((tmpfs_dentry_t *) nodep)->size;
+    return TMPFS_NODE(fn)->size;
 }
-static unsigned tmpfs_lnkcnt_get(void *nodep)
+static unsigned tmpfs_lnkcnt_get(fs_node_t *fn)
 {
-    return ((tmpfs_dentry_t *) nodep)->lnkcnt;
+    return TMPFS_NODE(fn)->lnkcnt;
 }
-static bool tmpfs_has_children(void *nodep)
+static bool tmpfs_has_children(fs_node_t *fn)
 {
-    return ((tmpfs_dentry_t *) nodep)->child != NULL;
+    return !list_empty(&TMPFS_NODE(fn)->cs_head);
 }
-static void *tmpfs_root_get(dev_handle_t dev_handle)
+static fs_node_t *tmpfs_root_get(dev_handle_t dev_handle)
 {
-    return root;
+    return tmpfs_node_get(dev_handle, TMPFS_SOME_ROOT);
 }
 static char tmpfs_plb_get_char(unsigned pos)
 ,14 → 105,14
     return tmpfs_reg.plb_ro[pos % PLB_SIZE];
 }
-static bool tmpfs_is_directory(void *nodep)
+static bool tmpfs_is_directory(fs_node_t *fn)
 {
-    return ((tmpfs_dentry_t *) nodep)->type == TMPFS_DIRECTORY;
+    return TMPFS_NODE(fn)->type == TMPFS_DIRECTORY;
 }
-static bool tmpfs_is_file(void *nodep)
+static bool tmpfs_is_file(fs_node_t *fn)
 {
-    return ((tmpfs_dentry_t *) nodep)->type == TMPFS_FILE;
+    return TMPFS_NODE(fn)->type == TMPFS_FILE;
 }
 /** libfs operations */
 ,259 → 134,230
     .is_file = tmpfs_is_file
 };
-/** Hash table of all directory entries. */
-hash_table_t dentries;
+/** Hash table of all TMPFS nodes. */
+hash_table_t nodes;
-/* Implementation of hash table interface for the dentries hash table. */
-static hash_index_t dentries_hash(unsigned long *key)
-{
-    return *key % DENTRIES_BUCKETS;
-}
+#define NODES_KEY_INDEX 0
+#define NODES_KEY_DEV   1
-static int dentries_compare(unsigned long *key, hash_count_t keys,
-    link_t *item)
+/* Implementation of hash table interface for the nodes hash table. */
+static hash_index_t nodes_hash(unsigned long key[])
 {
-    tmpfs_dentry_t *dentry = hash_table_get_instance(item, tmpfs_dentry_t,
-        dh_link);
-    return dentry->index == *key;
+    return key[NODES_KEY_INDEX] % NODES_BUCKETS;
 }
-static void dentries_remove_callback(link_t *item)
+static int nodes_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
+    tmpfs_node_t *nodep = hash_table_get_instance(item, tmpfs_node_t,
+        nh_link);
+    return (nodep->index == key[NODES_KEY_INDEX] &&
+        nodep->dev_handle == key[NODES_KEY_DEV]);
 }
-/** TMPFS dentries hash table operations. */
-hash_table_operations_t dentries_ops = {
-    .hash = dentries_hash,
-    .compare = dentries_compare,
-    .remove_callback = dentries_remove_callback
-};
-fs_index_t tmpfs_next_index = 1;
-typedef struct {
-    char *name;
-    tmpfs_dentry_t *parent;
-    link_t link;
-} tmpfs_name_t;
-/* Implementation of hash table interface for the names hash table. */
-static hash_index_t names_hash(unsigned long *key)
+static void nodes_remove_callback(link_t *item)
 {
-    tmpfs_dentry_t *dentry = (tmpfs_dentry_t *) *key;
-    return dentry->index % NAMES_BUCKETS;
 }
-static int names_compare(unsigned long *key, hash_count_t keys, link_t *item)
-{
-    tmpfs_dentry_t *dentry = (tmpfs_dentry_t *) *key;
-    tmpfs_name_t *namep = hash_table_get_instance(item, tmpfs_name_t,
-        link);
-    return dentry == namep->parent;
-}
-static void names_remove_callback(link_t *item)
-{
-    tmpfs_name_t *namep = hash_table_get_instance(item, tmpfs_name_t,
-        link);
-    free(namep->name);
-    free(namep);
-}
-/** TMPFS node names hash table operations. */
-static hash_table_operations_t names_ops = {
-    .hash = names_hash,
-    .compare = names_compare,
-    .remove_callback = names_remove_callback
+/** TMPFS nodes hash table operations. */
+hash_table_operations_t nodes_ops = {
+    .hash = nodes_hash,
+    .compare = nodes_compare,
+    .remove_callback = nodes_remove_callback
 };
-static void tmpfs_name_initialize(tmpfs_name_t *namep)
+static void tmpfs_node_initialize(tmpfs_node_t *nodep)
 {
-    namep->name = NULL;
-    namep->parent = NULL;
-    link_initialize(&namep->link);
+    nodep->bp = NULL;
+    nodep->index = 0;
+    nodep->dev_handle = 0;
+    nodep->type = TMPFS_NONE;
+    nodep->lnkcnt = 0;
+    nodep->size = 0;
+    nodep->data = NULL;
+    link_initialize(&nodep->nh_link);
+    list_initialize(&nodep->cs_head);
 }
-static bool tmpfs_dentry_initialize(tmpfs_dentry_t *dentry)
+static void tmpfs_dentry_initialize(tmpfs_dentry_t *dentryp)
 {
-    dentry->index = 0;
-    dentry->sibling = NULL;
-    dentry->child = NULL;
-    dentry->type = TMPFS_NONE;
-    dentry->lnkcnt = 0;
-    dentry->size = 0;
-    dentry->data = NULL;
-    link_initialize(&dentry->dh_link);
-    return (bool)hash_table_create(&dentry->names, NAMES_BUCKETS, 1,
-        &names_ops);
+    link_initialize(&dentryp->link);
+    dentryp->name = NULL;
+    dentryp->node = NULL;
 }
-static bool tmpfs_init(void)
+bool tmpfs_init(void)
 {
-    if (!hash_table_create(&dentries, DENTRIES_BUCKETS, 1, &dentries_ops))
+    if (!hash_table_create(&nodes, NODES_BUCKETS, 2, &nodes_ops))
         return false;
-    root = (tmpfs_dentry_t *) tmpfs_create_node(TMPFS_DEV, L_DIRECTORY);
-    if (!root) {
-        hash_table_destroy(&dentries);
-        return false;
-    }
-    root->lnkcnt = 0;   /* FS root is not linked */
     return true;
 }
-/** Compare one component of path to a directory entry.
- *
- * @param parentp   Pointer to node from which we descended.
- * @param childp    Pointer to node to compare the path component with.
- * @param component Array of characters holding component name.
- *
- * @return      True on match, false otherwise.
- */
-static bool
-tmpfs_match_one(tmpfs_dentry_t *parentp, tmpfs_dentry_t *childp,
-    const char *component)
+static bool tmpfs_instance_init(dev_handle_t dev_handle)
 {
-    unsigned long key = (unsigned long) parentp;
-    link_t *hlp = hash_table_find(&childp->names, &key);
-    assert(hlp);
-    tmpfs_name_t *namep = hash_table_get_instance(hlp, tmpfs_name_t, link);
-    return !strcmp(namep->name, component);
+    fs_node_t *rfn;
+    rfn = tmpfs_create_node(dev_handle, L_DIRECTORY);
+    if (!rfn)
+        return false;
+    TMPFS_NODE(rfn)->lnkcnt = 0;    /* FS root is not linked */
+    return true;
 }
-void *tmpfs_match(void *prnt, const char *component)
+fs_node_t *tmpfs_match(fs_node_t *pfn, const char *component)
 {
-    tmpfs_dentry_t *parentp = (tmpfs_dentry_t *) prnt;
-    tmpfs_dentry_t *childp = parentp->child;
+    tmpfs_node_t *parentp = TMPFS_NODE(pfn);
+    link_t *lnk;
-    while (childp && !tmpfs_match_one(parentp, childp, component))
-        childp = childp->sibling;
+    for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
+        lnk = lnk->next) {
+        tmpfs_dentry_t *dentryp = list_get_instance(lnk, tmpfs_dentry_t,
+            link);
+        if (!str_cmp(dentryp->name, component))
+            return FS_NODE(dentryp->node);
+    }
-    return (void *) childp;
+    return NULL;
 }
-void *
-tmpfs_node_get(dev_handle_t dev_handle, fs_index_t index)
+fs_node_t *tmpfs_node_get(dev_handle_t dev_handle, fs_index_t index)
 {
-    unsigned long key = index;
-    link_t *lnk = hash_table_find(&dentries, &key);
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = index,
+        [NODES_KEY_DEV] = dev_handle
+    };
+    link_t *lnk = hash_table_find(&nodes, key);
     if (!lnk)
         return NULL;
-    return hash_table_get_instance(lnk, tmpfs_dentry_t, dh_link);
+    return FS_NODE(hash_table_get_instance(lnk, tmpfs_node_t, nh_link));
 }
-void tmpfs_node_put(void *node)
+void tmpfs_node_put(fs_node_t *fn)
 {
     /* nothing to do */
 }
-void *tmpfs_create_node(dev_handle_t dev_handle, int lflag)
+fs_node_t *tmpfs_create_node(dev_handle_t dev_handle, int lflag)
 {
     assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));
-    tmpfs_dentry_t *node = malloc(sizeof(tmpfs_dentry_t));
-    if (!node)
+    tmpfs_node_t *nodep = malloc(sizeof(tmpfs_node_t));
+    if (!nodep)
         return NULL;
-    if (!tmpfs_dentry_initialize(node)) {
-        free(node);
+    tmpfs_node_initialize(nodep);
+    nodep->bp = malloc(sizeof(fs_node_t));
+    if (!nodep->bp) {
+        free(nodep);
         return NULL;
     }
-    node->index = tmpfs_next_index++;
+    nodep->bp->data = nodep;    /* link the FS and TMPFS nodes */
+    if (!tmpfs_root_get(dev_handle))
+        nodep->index = TMPFS_SOME_ROOT;
+    else
+        nodep->index = tmpfs_next_index++;
+    nodep->dev_handle = dev_handle;
     if (lflag & L_DIRECTORY)
-        node->type = TMPFS_DIRECTORY;
+        nodep->type = TMPFS_DIRECTORY;
     else
-        node->type = TMPFS_FILE;
+        nodep->type = TMPFS_FILE;
-    /* Insert the new node into the dentry hash table. */
-    unsigned long key = node->index;
-    hash_table_insert(&dentries, &key, &node->dh_link);
-    return (void *) node;
+    /* Insert the new node into the nodes hash table. */
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = nodep->index,
+        [NODES_KEY_DEV] = nodep->dev_handle
+    };
+    hash_table_insert(&nodes, key, &nodep->nh_link);
+    return FS_NODE(nodep);
 }
-int tmpfs_link_node(void *prnt, void *chld, const char *nm)
+int tmpfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
 {
-    tmpfs_dentry_t *parentp = (tmpfs_dentry_t *) prnt;
-    tmpfs_dentry_t *childp = (tmpfs_dentry_t *) chld;
+    tmpfs_node_t *parentp = TMPFS_NODE(pfn);
+    tmpfs_node_t *childp = TMPFS_NODE(cfn);
+    tmpfs_dentry_t *dentryp;
+    link_t *lnk;
     assert(parentp->type == TMPFS_DIRECTORY);
-    tmpfs_name_t *namep = malloc(sizeof(tmpfs_name_t));
-    if (!namep)
+    /* Check for duplicit entries. */
+    for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
+        lnk = lnk->next) {
+        dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
+        if (!str_cmp(dentryp->name, nm))
+            return EEXIST;
+    }
+    /* Allocate and initialize the dentry. */
+    dentryp = malloc(sizeof(tmpfs_dentry_t));
+    if (!dentryp)
         return ENOMEM;
-    tmpfs_name_initialize(namep);
-    size_t len = strlen(nm);
-    namep->name = malloc(len + 1);
-    if (!namep->name) {
-        free(namep);
+    tmpfs_dentry_initialize(dentryp);
+    /* Populate and link the new dentry. */
+    size_t size = str_size(nm);
+    dentryp->name = malloc(size + 1);
+    if (!dentryp->name) {
+        free(dentryp);
         return ENOMEM;
     }
-    strcpy(namep->name, nm);
-    namep->parent = parentp;
+    str_cpy(dentryp->name, size + 1, nm);
+    dentryp->node = childp;
     childp->lnkcnt++;
+    list_append(&dentryp->link, &parentp->cs_head);
-    unsigned long key = (unsigned long) parentp;
-    hash_table_insert(&childp->names, &key, &namep->link);
-    /* Insert the new node into the namespace. */
-    if (parentp->child) {
-        tmpfs_dentry_t *tmp = parentp->child;
-        while (tmp->sibling)
-            tmp = tmp->sibling;
-        tmp->sibling = childp;
-    } else {
-        parentp->child = childp;
-    }
     return EOK;
 }
-int tmpfs_unlink_node(void *prnt, void *chld)
+int tmpfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
 {
-    tmpfs_dentry_t *parentp = (tmpfs_dentry_t *)prnt;
-    tmpfs_dentry_t *childp = (tmpfs_dentry_t *)chld;
+    tmpfs_node_t *parentp = TMPFS_NODE(pfn);
+    tmpfs_node_t *childp = NULL;
+    tmpfs_dentry_t *dentryp;
+    link_t *lnk;
     if (!parentp)
         return EBUSY;
+    for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
+        lnk = lnk->next) {
+        dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
+        if (!str_cmp(dentryp->name, nm)) {
+            childp = dentryp->node;
+            assert(FS_NODE(childp) == cfn);
+            break;
+        }
+    }
-    if (childp->child)
+    if (!childp)
+        return ENOENT;
+    if ((childp->lnkcnt == 1) && !list_empty(&childp->cs_head))
         return ENOTEMPTY;
-    if (parentp->child == childp) {
-        parentp->child = childp->sibling;
-    } else {
-        /* TODO: consider doubly linked list for organizing siblings. */
-        tmpfs_dentry_t *tmp = parentp->child;
-        while (tmp->sibling != childp)
-            tmp = tmp->sibling;
-        tmp->sibling = childp->sibling;
-    }
-    childp->sibling = NULL;
-    unsigned long key = (unsigned long) parentp;
-    hash_table_remove(&childp->names, &key, 1);
+    list_remove(&dentryp->link);
+    free(dentryp);
     childp->lnkcnt--;
     return EOK;
 }
-int tmpfs_destroy_node(void *nodep)
+int tmpfs_destroy_node(fs_node_t *fn)
 {
-    tmpfs_dentry_t *dentry = (tmpfs_dentry_t *) nodep;
+    tmpfs_node_t *nodep = TMPFS_NODE(fn);
-    assert(!dentry->lnkcnt);
-    assert(!dentry->child);
-    assert(!dentry->sibling);
+    assert(!nodep->lnkcnt);
+    assert(list_empty(&nodep->cs_head));
-    unsigned long key = dentry->index;
-    hash_table_remove(&dentries, &key, 1);
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = nodep->index,
+        [NODES_KEY_DEV] = nodep->dev_handle
+    };
+    hash_table_remove(&nodes, key, 2);
-    hash_table_destroy(&dentry->names);
-    if (dentry->type == TMPFS_FILE)
-        free(dentry->data);
-    free(dentry);
+    if (nodep->type == TMPFS_FILE)
+        free(nodep->data);
+    free(nodep->bp);
+    free(nodep);
     return EOK;
 }
 ,20 → 365,44
 {
     dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-    /* Initialize TMPFS. */
-    if (!root && !tmpfs_init()) {
+    /* accept the mount options */
+    ipc_callid_t callid;
+    size_t size;
+    if (!ipc_data_write_receive(&callid, &size)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    char *opts = malloc(size + 1);
+    if (!opts) {
+        ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
     }
+    ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
+    if (retval != EOK) {
+        ipc_answer_0(rid, retval);
+        free(opts);
+        return;
+    }
+    opts[size] = '\0';
-    if (dev_handle >= 0) {
+    /* Initialize TMPFS instance. */
+    if (!tmpfs_instance_init(dev_handle)) {
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
+    tmpfs_node_t *rootp = TMPFS_NODE(tmpfs_root_get(dev_handle));
+    if (str_cmp(opts, "restore") == 0) {
         if (tmpfs_restore(dev_handle))
-            ipc_answer_3(rid, EOK, root->index, root->size,
-                root->lnkcnt);
+            ipc_answer_3(rid, EOK, rootp->index, rootp->size,
+                rootp->lnkcnt);
         else
             ipc_answer_0(rid, ELIMIT);
     } else {
-        ipc_answer_3(rid, EOK, root->index, root->size, root->lnkcnt);
+        ipc_answer_3(rid, EOK, rootp->index, rootp->size,
+            rootp->lnkcnt);
     }
 }
 ,24 → 428,27
     off_t pos = (off_t)IPC_GET_ARG3(*request);
     /*
-     * Lookup the respective dentry.
+     * Lookup the respective TMPFS node.
      */
     link_t *hlp;
-    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &key);
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = index,
+        [NODES_KEY_DEV] = dev_handle,
+    };
+    hlp = hash_table_find(&nodes, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
-        dh_link);
+    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+        nh_link);
     /*
      * Receive the read request.
      */
     ipc_callid_t callid;
-    size_t len;
-    if (!ipc_data_read_receive(&callid, &len)) {
+    size_t size;
+    if (!ipc_data_read_receive(&callid, &size)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
 ,15 → 455,16
     }
     size_t bytes;
-    if (dentry->type == TMPFS_FILE) {
-        bytes = max(0, min(dentry->size - pos, len));
-        (void) ipc_data_read_finalize(callid, dentry->data + pos,
+    if (nodep->type == TMPFS_FILE) {
+        bytes = max(0, min(nodep->size - pos, size));
+        (void) ipc_data_read_finalize(callid, nodep->data + pos,
             bytes);
     } else {
+        tmpfs_dentry_t *dentryp;
+        link_t *lnk;
         int i;
-        tmpfs_dentry_t *cur;
-        assert(dentry->type == TMPFS_DIRECTORY);
+        assert(nodep->type == TMPFS_DIRECTORY);
         /*
          * Yes, we really use O(n) algorithm here.
 ,24 → 471,21
          * If it bothers someone, it could be fixed by introducing a
          * hash table.
          */
-        for (i = 0, cur = dentry->child; i < pos && cur; i++,
-            cur = cur->sibling)
+        for (i = 0, lnk = nodep->cs_head.next;
+            i < pos && lnk != &nodep->cs_head;
+            i++, lnk = lnk->next)
             ;
-        if (!cur) {
+        if (lnk == &nodep->cs_head) {
             ipc_answer_0(callid, ENOENT);
             ipc_answer_1(rid, ENOENT, 0);
             return;
         }
-        unsigned long key = (unsigned long) dentry;
-        link_t *hlp = hash_table_find(&cur->names, &key);
-        assert(hlp);
-        tmpfs_name_t *namep = hash_table_get_instance(hlp, tmpfs_name_t,
-            link);
+        dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
-        (void) ipc_data_read_finalize(callid, namep->name,
-            strlen(namep->name) + 1);
+        (void) ipc_data_read_finalize(callid, dentryp->name,
+            str_size(dentryp->name) + 1);
         bytes = 1;
     }
 ,24 → 502,27
     off_t pos = (off_t)IPC_GET_ARG3(*request);
     /*
-     * Lookup the respective dentry.
+     * Lookup the respective TMPFS node.
      */
     link_t *hlp;
-    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &key);
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = index,
+        [NODES_KEY_DEV] = dev_handle
+    };
+    hlp = hash_table_find(&nodes, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
-        dh_link);
+    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+        nh_link);
     /*
      * Receive the write request.
      */
     ipc_callid_t callid;
-    size_t len;
-    if (!ipc_data_write_receive(&callid, &len)) {
+    size_t size;
+    if (!ipc_data_write_receive(&callid, &size)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
 ,13 → 531,13
     /*
      * Check whether the file needs to grow.
      */
-    if (pos + len <= dentry->size) {
+    if (pos + size <= nodep->size) {
         /* The file size is not changing. */
-        (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
-        ipc_answer_2(rid, EOK, len, dentry->size);
+        (void) ipc_data_write_finalize(callid, nodep->data + pos, size);
+        ipc_answer_2(rid, EOK, size, nodep->size);
         return;
     }
-    size_t delta = (pos + len) - dentry->size;
+    size_t delta = (pos + size) - nodep->size;
     /*
      * At this point, we are deliberately extremely straightforward and
      * simply realloc the contents of the file on every write that grows the
 ,18 → 545,18
      * our heap allocator can save us and just grow the block whenever
      * possible.
      */
-    void *newdata = realloc(dentry->data, dentry->size + delta);
+    void *newdata = realloc(nodep->data, nodep->size + delta);
     if (!newdata) {
         ipc_answer_0(callid, ENOMEM);
-        ipc_answer_2(rid, EOK, 0, dentry->size);
+        ipc_answer_2(rid, EOK, 0, nodep->size);
         return;
     }
     /* Clear any newly allocated memory in order to emulate gaps. */
-    memset(newdata + dentry->size, 0, delta);
-    dentry->size += delta;
-    dentry->data = newdata;
-    (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
-    ipc_answer_2(rid, EOK, len, dentry->size);
+    memset(newdata + nodep->size, 0, delta);
+    nodep->size += delta;
+    nodep->data = newdata;
+    (void) ipc_data_write_finalize(callid, nodep->data + pos, size);
+    ipc_answer_2(rid, EOK, size, nodep->size);
 }
 void tmpfs_truncate(ipc_callid_t rid, ipc_call_t *request)
 ,34 → 566,37
     size_t size = (off_t)IPC_GET_ARG3(*request);
     /*
-     * Lookup the respective dentry.
+     * Lookup the respective TMPFS node.
      */
     link_t *hlp;
-    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &key);
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = index,
+        [NODES_KEY_DEV] = dev_handle
+    };
+    hlp = hash_table_find(&nodes, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
-        dh_link);
+    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+        nh_link);
-    if (size == dentry->size) {
+    if (size == nodep->size) {
         ipc_answer_0(rid, EOK);
         return;
     }
-    void *newdata = realloc(dentry->data, size);
+    void *newdata = realloc(nodep->data, size);
     if (!newdata) {
         ipc_answer_0(rid, ENOMEM);
         return;
     }
-    if (size > dentry->size) {
-        size_t delta = size - dentry->size;
-        memset(newdata + dentry->size, 0, delta);
+    if (size > nodep->size) {
+        size_t delta = size - nodep->size;
+        memset(newdata + nodep->size, 0, delta);
     }
-    dentry->size = size;
-    dentry->data = newdata;
+    nodep->size = size;
+    nodep->data = newdata;
     ipc_answer_0(rid, EOK);
 }
 ,15 → 607,18
     int rc;
     link_t *hlp;
-    unsigned long key = index;
-    hlp = hash_table_find(&dentries, &key);
+    unsigned long key[] = {
+        [NODES_KEY_INDEX] = index,
+        [NODES_KEY_DEV] = dev_handle
+    };
+    hlp = hash_table_find(&nodes, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
-        dh_link);
-    rc = tmpfs_destroy_node(dentry);
+    tmpfs_node_t *nodep = hash_table_get_instance(hlp, tmpfs_node_t,
+        nh_link);
+    rc = tmpfs_destroy_node(FS_NODE(nodep));
     ipc_answer_0(rid, rc);
 }

 /branches/tracing/uspace/srv/fs/tmpfs/Makefile
 ,12 → 29,11
 ## Setup toolchain
 #
-include ../../../Makefile.config
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
 LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
 ,13 → 61,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/fs/fat/fat.h
 ,6 → 178,9
 /** FAT in-core node. */
 typedef struct fat_node {
+    /** Back pointer to the FS node. */
+    fs_node_t       *bp;
     futex_t         lock;
     fat_node_type_t     type;
     fat_idx_t       *idx;

 /branches/tracing/uspace/srv/fs/fat/fat_dentry.c
 ,15 → 62,18
 int fat_dentry_namecmp(char *name, const char *component)
 {
     int rc;
+    size_t size;
     if (!(rc = stricmp(name, component)))
         return rc;
-    if (!strchr(name, '.')) {
+    if (!str_chr(name, '.')) {
         /*
          * There is no '.' in the name, so we know that there is enough
          * space for appending an extra '.' to name.
          */
-        name[strlen(name)] = '.';
-        name[strlen(name) + 1] = '\0';
+        size = str_size(name);
+        name[size] = '.';
+        name[size + 1] = '\0';
         rc = stricmp(name, component);
     }
     return rc;
 ,37 → 114,51
 void fat_dentry_name_get(const fat_dentry_t *d, char *buf)
 {
-    int i;
+    unsigned int i;
     for (i = 0; i < FAT_NAME_LEN; i++) {
         if (d->name[i] == FAT_PAD)
             break;
         if (d->name[i] == FAT_DENTRY_E5_ESC)
             *buf++ = 0xe5;
-        else
-            *buf++ = d->name[i];
+        else {
+            if (d->lcase & FAT_LCASE_LOWER_NAME)
+                *buf++ = tolower(d->name[i]);
+            else
+                *buf++ = d->name[i];
+        }
     }
     if (d->ext[0] != FAT_PAD)
         *buf++ = '.';
     for (i = 0; i < FAT_EXT_LEN; i++) {
         if (d->ext[i] == FAT_PAD) {
             *buf = '\0';
             return;
         }
         if (d->ext[i] == FAT_DENTRY_E5_ESC)
             *buf++ = 0xe5;
-        else
-            *buf++ = d->ext[i];
+        else {
+            if (d->lcase & FAT_LCASE_LOWER_EXT)
+                *buf++ = tolower(d->ext[i]);
+            else
+                *buf++ = d->ext[i];
+        }
     }
     *buf = '\0';
 }
 void fat_dentry_name_set(fat_dentry_t *d, const char *name)
 {
-    int i;
+    unsigned int i;
     const char fake_ext[] = "   ";
+    bool lower_name = true;
+    bool lower_ext = true;
     for (i = 0; i < FAT_NAME_LEN; i++) {
         switch ((uint8_t) *name) {
         case 0xe5:
 ,12 → 170,19
             d->name[i] = FAT_PAD;
             break;
         default:
+            if (isalpha(*name)) {
+                if (!islower(*name))
+                    lower_name = false;
+            }
             d->name[i] = toupper(*name++);
             break;
         }
     }
     if (*name++ != '.')
         name = fake_ext;
     for (i = 0; i < FAT_EXT_LEN; i++) {
         switch ((uint8_t) *name) {
         case 0xe5:
 ,10 → 193,25
             d->ext[i] = FAT_PAD;
             break;
         default:
+            if (isalpha(*name)) {
+                if (!islower(*name))
+                    lower_ext = false;
+            }
             d->ext[i] = toupper(*name++);
             break;
         }
     }
+    if (lower_name)
+        d->lcase |= FAT_LCASE_LOWER_NAME;
+    else
+        d->lcase &= ~FAT_LCASE_LOWER_NAME;
+    if (lower_ext)
+        d->lcase |= FAT_LCASE_LOWER_EXT;
+    else
+        d->lcase &= ~FAT_LCASE_LOWER_EXT;
 }
 fat_dentry_clsf_t fat_classify_dentry(const fat_dentry_t *d)

 /branches/tracing/uspace/srv/fs/fat/fat_dentry.h
 ,6 → 47,9
 #define FAT_ATTR_VOLLABEL   (1 << 3)
 #define FAT_ATTR_SUBDIR     (1 << 4)
+#define FAT_LCASE_LOWER_NAME    0x08
+#define FAT_LCASE_LOWER_EXT 0x10
 #define FAT_PAD         ' '
 #define FAT_DENTRY_UNUSED   0x00
 ,7 → 68,7
     uint8_t     name[8];
     uint8_t     ext[3];
     uint8_t     attr;
-    uint8_t     reserved;
+    uint8_t     lcase;
     uint8_t     ctime_fine;
     uint16_t    ctime;
     uint16_t    cdate;
 ,13 → 76,13
     union {
         uint16_t    eaidx;      /* FAT12/FAT16 */
         uint16_t    firstc_hi;  /* FAT32 */
-    };
+    } __attribute__ ((packed));
     uint16_t    mtime;
     uint16_t    mdate;
     union {
         uint16_t    firstc;     /* FAT12/FAT16 */
         uint16_t    firstc_lo;  /* FAT32 */
-    };
+    } __attribute__ ((packed));
     uint32_t    size;
 } __attribute__ ((packed)) fat_dentry_t;

 /branches/tracing/uspace/srv/fs/fat/fat.c
 ,15 → 49,6
 vfs_info_t fat_vfs_info = {
     .name = "fat",
-    .ops = {
-        [IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_READ)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_WRITE)] = VFS_OP_NULL,
-        [IPC_METHOD_TO_VFS_OP(VFS_TRUNCATE)] = VFS_OP_NULL,
-        [IPC_METHOD_TO_VFS_OP(VFS_MOUNT)] = VFS_OP_NULL,
-        [IPC_METHOD_TO_VFS_OP(VFS_MOUNTED)] = VFS_OP_DEFINED,
-        [IPC_METHOD_TO_VFS_OP(VFS_UNMOUNT)] = VFS_OP_NULL,
-    }
 };
 fs_reg_t fat_reg;
 ,16 → 122,16
     int vfs_phone;
     int rc;
-    printf("FAT: HelenOS FAT file system server.\n");
+    printf("fat: HelenOS FAT file system server.\n");
     rc = fat_idx_init();
     if (rc != EOK)
         goto err;
-    vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
-    while (vfs_phone < EOK) {
-        usleep(10000);
-        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+    vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
+    if (vfs_phone < EOK) {
+        printf("fat: failed to connect to VFS\n");
+        return -1;
     }
     rc = fs_register(vfs_phone, &fat_reg, &fat_vfs_info, fat_connection);

 /branches/tracing/uspace/srv/fs/fat/fat_ops.c
 ,6 → 55,9
 #include <sys/mman.h>
 #include <align.h>
+#define FAT_NODE(node)  ((node) ? (fat_node_t *) (node)->data : NULL)
+#define FS_NODE(node)   ((node) ? (node)->bp : NULL)
 /** Futex protecting the list of cached free FAT nodes. */
 static futex_t ffn_futex = FUTEX_INITIALIZER;
 ,6 → 67,7
 static void fat_node_initialize(fat_node_t *node)
 {
     futex_initialize(&node->lock, 1);
+    node->bp = NULL;
     node->idx = NULL;
     node->type = 0;
     link_initialize(&node->ffn_link);
 ,6 → 112,7
 static fat_node_t *fat_node_get_new(void)
 {
+    fs_node_t *fn;
     fat_node_t *nodep;
     futex_down(&ffn_futex);
 ,15 → 134,23
         idxp_tmp->nodep = NULL;
         futex_up(&nodep->lock);
         futex_up(&idxp_tmp->lock);
+        fn = FS_NODE(nodep);
     } else {
 skip_cache:
         /* Try to allocate a new node structure. */
         futex_up(&ffn_futex);
+        fn = (fs_node_t *)malloc(sizeof(fs_node_t));
+        if (!fn)
+            return NULL;
         nodep = (fat_node_t *)malloc(sizeof(fat_node_t));
-        if (!nodep)
+        if (!nodep) {
+            free(fn);
             return NULL;
+        }
     }
     fat_node_initialize(nodep);
+    fn->data = nodep;
+    nodep->bp = fn;
     return nodep;
 }
 ,7 → 159,7
  *
  * @param idxp      Locked index structure.
  */
-static void *fat_node_get_core(fat_idx_t *idxp)
+static fat_node_t *fat_node_get_core(fat_idx_t *idxp)
 {
     block_t *b;
     fat_bs_t *bs;
 ,21 → 236,21
 /*
  * Forward declarations of FAT libfs operations.
  */
-static void *fat_node_get(dev_handle_t, fs_index_t);
-static void fat_node_put(void *);
-static void *fat_create_node(dev_handle_t, int);
-static int fat_destroy_node(void *);
-static int fat_link(void *, void *, const char *);
-static int fat_unlink(void *, void *);
-static void *fat_match(void *, const char *);
-static fs_index_t fat_index_get(void *);
-static size_t fat_size_get(void *);
-static unsigned fat_lnkcnt_get(void *);
-static bool fat_has_children(void *);
-static void *fat_root_get(dev_handle_t);
+static fs_node_t *fat_node_get(dev_handle_t, fs_index_t);
+static void fat_node_put(fs_node_t *);
+static fs_node_t *fat_create_node(dev_handle_t, int);
+static int fat_destroy_node(fs_node_t *);
+static int fat_link(fs_node_t *, fs_node_t *, const char *);
+static int fat_unlink(fs_node_t *, fs_node_t *, const char *);
+static fs_node_t *fat_match(fs_node_t *, const char *);
+static fs_index_t fat_index_get(fs_node_t *);
+static size_t fat_size_get(fs_node_t *);
+static unsigned fat_lnkcnt_get(fs_node_t *);
+static bool fat_has_children(fs_node_t *);
+static fs_node_t *fat_root_get(dev_handle_t);
 static char fat_plb_get_char(unsigned);
-static bool fat_is_directory(void *);
-static bool fat_is_file(void *node);
+static bool fat_is_directory(fs_node_t *);
+static bool fat_is_file(fs_node_t *node);
 /*
  * FAT libfs operations.
 ,9 → 257,9
  */
 /** Instantiate a FAT in-core node. */
-void *fat_node_get(dev_handle_t dev_handle, fs_index_t index)
+fs_node_t *fat_node_get(dev_handle_t dev_handle, fs_index_t index)
 {
-    void *node;
+    fat_node_t *nodep;
     fat_idx_t *idxp;
     idxp = fat_idx_get_by_index(dev_handle, index);
 ,14 → 266,14
     if (!idxp)
         return NULL;
     /* idxp->lock held */
-    node = fat_node_get_core(idxp);
+    nodep = fat_node_get_core(idxp);
     futex_up(&idxp->lock);
-    return node;
+    return FS_NODE(nodep);
 }
-void fat_node_put(void *node)
+void fat_node_put(fs_node_t *fn)
 {
-    fat_node_t *nodep = (fat_node_t *)node;
+    fat_node_t *nodep = FAT_NODE(fn);
     bool destroy = false;
     futex_down(&nodep->lock);
 ,11 → 293,13
         }
     }
     futex_up(&nodep->lock);
-    if (destroy)
-        free(node);
+    if (destroy) {
+        free(nodep->bp);
+        free(nodep);
+    }
 }
-void *fat_create_node(dev_handle_t dev_handle, int flags)
+fs_node_t *fat_create_node(dev_handle_t dev_handle, int flags)
 {
     fat_idx_t *idxp;
     fat_node_t *nodep;
 ,7 → 325,7
     idxp = fat_idx_get_new(dev_handle);
     if (!idxp) {
         fat_free_clusters(bs, dev_handle, mcl);
-        fat_node_put(nodep);
+        fat_node_put(FS_NODE(nodep));
         return NULL;
     }
     /* idxp->lock held */
 ,12 → 360,12
     idxp->nodep = nodep;
     futex_up(&idxp->lock);
-    return nodep;
+    return FS_NODE(nodep);
 }
-int fat_destroy_node(void *node)
+int fat_destroy_node(fs_node_t *fn)
 {
-    fat_node_t *nodep = (fat_node_t *)node;
+    fat_node_t *nodep = FAT_NODE(fn);
     fat_bs_t *bs;
     /*
 ,7 → 379,7
     /*
      * The node may not have any children.
      */
-    assert(fat_has_children(node) == false);
+    assert(fat_has_children(fn) == false);
     bs = block_bb_get(nodep->idx->dev_handle);
     if (nodep->firstc != FAT_CLST_RES0) {
 ,14 → 389,15
     }
     fat_idx_destroy(nodep->idx);
+    free(nodep->bp);
     free(nodep);
     return EOK;
 }
-int fat_link(void *prnt, void *chld, const char *name)
+int fat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
-    fat_node_t *parentp = (fat_node_t *)prnt;
-    fat_node_t *childp = (fat_node_t *)chld;
+    fat_node_t *parentp = FAT_NODE(pfn);
+    fat_node_t *childp = FAT_NODE(cfn);
     fat_dentry_t *d;
     fat_bs_t *bs;
     block_t *b;
 ,6 → 405,8
     uint16_t bps;
     unsigned dps;
     unsigned blocks;
+    fat_cluster_t mcl, lcl;
+    int rc;
     futex_down(&childp->lock);
     if (childp->lnkcnt == 1) {
 ,19 → 455,36
         }
         block_put(b);
     }
+    j = 0;
     /*
      * We need to grow the parent in order to create a new unused dentry.
      */
-    futex_up(&parentp->idx->lock);
-    return ENOTSUP; /* XXX */
+    if (parentp->idx->pfc == FAT_CLST_ROOT) {
+        /* Can't grow the root directory. */
+        futex_up(&parentp->idx->lock);
+        return ENOSPC;
+    }
+    rc = fat_alloc_clusters(bs, parentp->idx->dev_handle, 1, &mcl, &lcl);
+    if (rc != EOK) {
+        futex_up(&parentp->idx->lock);
+        return rc;
+    }
+    fat_append_clusters(bs, parentp, mcl);
+    b = fat_block_get(bs, parentp, i, BLOCK_FLAGS_NOREAD);
+    d = (fat_dentry_t *)b->data;
+    /*
+     * Clear all dentries in the block except for the first one (the first
+     * dentry will be cleared in the next step).
+     */
+    memset(d + 1, 0, bps - sizeof(fat_dentry_t));
 hit:
     /*
      * At this point we only establish the link between the parent and the
      * child.  The dentry, except of the name and the extension, will remain
-     * uninitialized until the the corresponding node is synced. Thus the
-     * valid dentry data is kept in the child node structure.
+     * uninitialized until the corresponding node is synced. Thus the valid
+     * dentry data is kept in the child node structure.
      */
     memset(d, 0, sizeof(fat_dentry_t));
     fat_dentry_name_set(d, name);
 ,10 → 503,10
     b = fat_block_get(bs, childp, 0, BLOCK_FLAGS_NONE);
     d = (fat_dentry_t *)b->data;
     if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-        strcmp(d->name, FAT_NAME_DOT) == 0) {
+        str_cmp(d->name, FAT_NAME_DOT) == 0) {
         memset(d, 0, sizeof(fat_dentry_t));
-        strcpy(d->name, FAT_NAME_DOT);
-        strcpy(d->ext, FAT_EXT_PAD);
+        str_cpy(d->name, 8, FAT_NAME_DOT);
+        str_cpy(d->ext, 3, FAT_EXT_PAD);
         d->attr = FAT_ATTR_SUBDIR;
         d->firstc = host2uint16_t_le(childp->firstc);
         /* TODO: initialize also the date/time members. */
 ,10 → 513,10
     }
     d++;
     if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-        strcmp(d->name, FAT_NAME_DOT_DOT) == 0) {
+        str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
         memset(d, 0, sizeof(fat_dentry_t));
-        strcpy(d->name, FAT_NAME_DOT_DOT);
-        strcpy(d->ext, FAT_EXT_PAD);
+        str_cpy(d->name, 8, FAT_NAME_DOT_DOT);
+        str_cpy(d->ext, 3, FAT_EXT_PAD);
         d->attr = FAT_ATTR_SUBDIR;
         d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
             host2uint16_t_le(FAT_CLST_RES0) :
 ,15 → 543,21
     return EOK;
 }
-int fat_unlink(void *prnt, void *chld)
+int fat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
 {
-    fat_node_t *parentp = (fat_node_t *)prnt;
-    fat_node_t *childp = (fat_node_t *)chld;
+    fat_node_t *parentp = FAT_NODE(pfn);
+    fat_node_t *childp = FAT_NODE(cfn);
     fat_bs_t *bs;
     fat_dentry_t *d;
     uint16_t bps;
     block_t *b;
+    if (!parentp)
+        return EBUSY;
+    if (fat_has_children(cfn))
+        return ENOTEMPTY;
     futex_down(&parentp->lock);
     futex_down(&childp->lock);
     assert(childp->lnkcnt == 1);
 ,10 → 589,10
     return EOK;
 }
-void *fat_match(void *prnt, const char *component)
+fs_node_t *fat_match(fs_node_t *pfn, const char *component)
 {
     fat_bs_t *bs;
-    fat_node_t *parentp = (fat_node_t *)prnt;
+    fat_node_t *parentp = FAT_NODE(pfn);
     char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1];
     unsigned i, j;
     unsigned bps;       /* bytes per sector */
 ,7 → 625,7
             }
             if (fat_dentry_namecmp(name, component) == 0) {
                 /* hit */
-                void *node;
+                fat_node_t *nodep;
                 /*
                  * Assume tree hierarchy for locking.  We
                  * already have the parent and now we are going
 ,10 → 644,10
                     block_put(b);
                     return NULL;
                 }
-                node = fat_node_get_core(idx);
+                nodep = fat_node_get_core(idx);
                 futex_up(&idx->lock);
                 block_put(b);
-                return node;
+                return FS_NODE(nodep);
             }
         }
         block_put(b);
 ,28 → 657,25
     return NULL;
 }
-fs_index_t fat_index_get(void *node)
+fs_index_t fat_index_get(fs_node_t *fn)
 {
-    fat_node_t *fnodep = (fat_node_t *)node;
-    if (!fnodep)
-        return 0;
-    return fnodep->idx->index;
+    return FAT_NODE(fn)->idx->index;
 }
-size_t fat_size_get(void *node)
+size_t fat_size_get(fs_node_t *fn)
 {
-    return ((fat_node_t *)node)->size;
+    return FAT_NODE(fn)->size;
 }
-unsigned fat_lnkcnt_get(void *node)
+unsigned fat_lnkcnt_get(fs_node_t *fn)
 {
-    return ((fat_node_t *)node)->lnkcnt;
+    return FAT_NODE(fn)->lnkcnt;
 }
-bool fat_has_children(void *node)
+bool fat_has_children(fs_node_t *fn)
 {
     fat_bs_t *bs;
-    fat_node_t *nodep = (fat_node_t *)node;
+    fat_node_t *nodep = FAT_NODE(fn);
     unsigned bps;
     unsigned dps;
     unsigned blocks;
 ,7 → 723,7
     return false;
 }
-void *fat_root_get(dev_handle_t dev_handle)
+fs_node_t *fat_root_get(dev_handle_t dev_handle)
 {
     return fat_node_get(dev_handle, 0);
 }
 ,14 → 733,14
     return fat_reg.plb_ro[pos % PLB_SIZE];
 }
-bool fat_is_directory(void *node)
+bool fat_is_directory(fs_node_t *fn)
 {
-    return ((fat_node_t *)node)->type == FAT_DIRECTORY;
+    return FAT_NODE(fn)->type == FAT_DIRECTORY;
 }
-bool fat_is_file(void *node)
+bool fat_is_file(fs_node_t *fn)
 {
-    return ((fat_node_t *)node)->type == FAT_FILE;
+    return FAT_NODE(fn)->type == FAT_FILE;
 }
 /** libfs operations */
 ,6 → 774,28
     uint16_t rde;
     int rc;
+    /* accept the mount options */
+    ipc_callid_t callid;
+    size_t size;
+    if (!ipc_data_write_receive(&callid, &size)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    char *opts = malloc(size + 1);
+    if (!opts) {
+        ipc_answer_0(callid, ENOMEM);
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
+    ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
+    if (retval != EOK) {
+        ipc_answer_0(rid, retval);
+        free(opts);
+        return;
+    }
+    opts[size] = '\0';
     /* initialize libblock */
     rc = block_init(dev_handle, BS_SIZE);
     if (rc != EOK) {
 ,8 → 840,16
     }
     /* Initialize the root node. */
+    fs_node_t *rfn = (fs_node_t *)malloc(sizeof(fs_node_t));
+    if (!rfn) {
+        block_fini(dev_handle);
+        fat_idx_fini_by_dev_handle(dev_handle);
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
     fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t));
     if (!rootp) {
+        free(rfn);
         block_fini(dev_handle);
         fat_idx_fini_by_dev_handle(dev_handle);
         ipc_answer_0(rid, ENOMEM);
 ,8 → 859,9
     fat_idx_t *ridxp = fat_idx_get_by_pos(dev_handle, FAT_CLST_ROOTPAR, 0);
     if (!ridxp) {
+        free(rfn);
+        free(rootp);
         block_fini(dev_handle);
-        free(rootp);
         fat_idx_fini_by_dev_handle(dev_handle);
         ipc_answer_0(rid, ENOMEM);
         return;
 ,6 → 876,8
     rootp->size = rde * sizeof(fat_dentry_t);
     rootp->idx = ridxp;
     ridxp->nodep = rootp;
+    rootp->bp = rfn;
+    rfn->data = rootp;
     futex_up(&ridxp->lock);
 ,21 → 899,23
     dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
     fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
     off_t pos = (off_t)IPC_GET_ARG3(*request);
-    fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index);
+    fs_node_t *fn = fat_node_get(dev_handle, index);
+    fat_node_t *nodep;
     fat_bs_t *bs;
     uint16_t bps;
     size_t bytes;
     block_t *b;
-    if (!nodep) {
+    if (!fn) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
+    nodep = FAT_NODE(fn);
     ipc_callid_t callid;
     size_t len;
     if (!ipc_data_read_receive(&callid, &len)) {
-        fat_node_put(nodep);
+        fat_node_put(fn);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
 ,16 → 986,16
             bnum++;
         }
 miss:
-        fat_node_put(nodep);
+        fat_node_put(fn);
         ipc_answer_0(callid, ENOENT);
         ipc_answer_1(rid, ENOENT, 0);
         return;
 hit:
-        (void) ipc_data_read_finalize(callid, name, strlen(name) + 1);
+        (void) ipc_data_read_finalize(callid, name, str_size(name) + 1);
         bytes = (pos - spos) + 1;
     }
-    fat_node_put(nodep);
+    fat_node_put(fn);
     ipc_answer_1(rid, EOK, (ipcarg_t)bytes);
 }
 ,7 → 1004,8
     dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
     fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
     off_t pos = (off_t)IPC_GET_ARG3(*request);
-    fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index);
+    fs_node_t *fn = fat_node_get(dev_handle, index);
+    fat_node_t *nodep;
     fat_bs_t *bs;
     size_t bytes;
     block_t *b;
 ,15 → 1015,16
     off_t boundary;
     int flags = BLOCK_FLAGS_NONE;
-    if (!nodep) {
+    if (!fn) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
+    nodep = FAT_NODE(fn);
     ipc_callid_t callid;
     size_t len;
     if (!ipc_data_write_receive(&callid, &len)) {
-        fat_node_put(nodep);
+        fat_node_put(fn);
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
 ,7 → 1065,7
             nodep->dirty = true;    /* need to sync node */
         }
         ipc_answer_2(rid, EOK, bytes, nodep->size);
-        fat_node_put(nodep);
+        fat_node_put(fn);
         return;
     } else {
         /*
 ,7 → 1081,7
         status = fat_alloc_clusters(bs, dev_handle, nclsts, &mcl, &lcl);
         if (status != EOK) {
             /* could not allocate a chain of nclsts clusters */
-            fat_node_put(nodep);
+            fat_node_put(fn);
             ipc_answer_0(callid, status);
             ipc_answer_0(rid, status);
             return;
 ,7 → 1102,7
         nodep->size = pos + bytes;
         nodep->dirty = true;        /* need to sync node */
         ipc_answer_2(rid, EOK, bytes, nodep->size);
-        fat_node_put(nodep);
+        fat_node_put(fn);
         return;
     }
 }
 ,7 → 1112,8
     dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
     fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
     size_t size = (off_t)IPC_GET_ARG3(*request);
-    fat_node_t *nodep = (fat_node_t *)fat_node_get(dev_handle, index);
+    fs_node_t *fn = fat_node_get(dev_handle, index);
+    fat_node_t *nodep;
     fat_bs_t *bs;
     uint16_t bps;
     uint8_t spc;
 ,10 → 1120,11
     unsigned bpc;   /* bytes per cluster */
     int rc;
-    if (!nodep) {
+    if (!fn) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
+    nodep = FAT_NODE(fn);
     bs = block_bb_get(dev_handle);
     bps = uint16_t_le2host(bs->bps);
 ,7 → 1162,7
         nodep->dirty = true;        /* need to sync node */
         rc = EOK;
     }
-    fat_node_put(nodep);
+    fat_node_put(fn);
     ipc_answer_0(rid, rc);
     return;
 }
 ,13 → 1173,13
     fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
     int rc;
-    fat_node_t *nodep = fat_node_get(dev_handle, index);
-    if (!nodep) {
+    fs_node_t *fn = fat_node_get(dev_handle, index);
+    if (!fn) {
         ipc_answer_0(rid, ENOENT);
         return;
     }
-    rc = fat_destroy_node(nodep);
+    rc = fat_destroy_node(fn);
     ipc_answer_0(rid, rc);
 }

 /branches/tracing/uspace/srv/fs/fat/Makefile
 ,12 → 29,11
 ## Setup toolchain
 #
-include ../../../Makefile.config
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
 LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I $(LIBFS_PREFIX) -I $(LIBBLOCK_PREFIX)
 ,13 → 63,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/obio/obio.c
 ,0 → 1,158
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup obio
+ * @{
+ */
+/**
+ * @file    obio.c
+ * @brief   OBIO driver.
+ *
+ * OBIO is a short for on-board I/O. On UltraSPARC IIi and systems with U2P,
+ * there is a piece of the root PCI bus controller address space, which
+ * contains interrupt mapping and clear registers for all on-board devices.
+ * Although UltraSPARC IIi and U2P are different in general, these registers can
+ * be found at the same addresses.
+ */
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <ipc/bus.h>
+#include <ipc/ns.h>
+#include <sysinfo.h>
+#include <as.h>
+#include <ddi.h>
+#include <align.h>
+#include <bool.h>
+#include <errno.h>
+#include <async.h>
+#include <align.h>
+#include <async.h>
+#include <stdio.h>
+#include <ipc/devmap.h>
+#define NAME "obio"
+#define OBIO_SIZE   0x1898
+#define OBIO_IMR_BASE   0x200
+#define OBIO_IMR(ino)   (OBIO_IMR_BASE + ((ino) & INO_MASK))
+#define OBIO_CIR_BASE   0x300
+#define OBIO_CIR(ino)   (OBIO_CIR_BASE + ((ino) & INO_MASK))
+#define INO_MASK    0x1f
+static void *base_phys;
+static volatile uint64_t *base_virt;
+/** Handle one connection to obio.
+ *
+ * @param iid       Hash of the request that opened the connection.
+ * @param icall     Call data of the request that opened the connection.
+ */
+static void obio_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+    ipc_callid_t callid;
+    ipc_call_t call;
+    /*
+     * Answer the first IPC_M_CONNECT_ME_TO call.
+     */
+    ipc_answer_0(iid, EOK);
+    while (1) {
+        int inr;
+        callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
+        case BUS_CLEAR_INTERRUPT:
+            inr = IPC_GET_ARG1(call);
+            base_virt[OBIO_CIR(inr & INO_MASK)] = 0;
+            ipc_answer_0(callid, EOK);
+            break;
+        default:
+            ipc_answer_0(callid, EINVAL);
+            break;
+        }
+    }
+}
+/** Initialize the OBIO driver.
+ *
+ * So far, the driver heavily depends on information provided by the kernel via
+ * sysinfo. In the future, there should be a standalone OBIO driver.
+ */
+static bool obio_init(void)
+{
+    ipcarg_t phonead;
+    base_phys = (void *) sysinfo_value("obio.base.physical");
+    if (!base_phys) {
+        printf(NAME ": no OBIO registers found\n");
+        return false;
+    }
+    base_virt = as_get_mappable_page(OBIO_SIZE);
+    int flags = AS_AREA_READ | AS_AREA_WRITE;
+    int retval = physmem_map(base_phys, (void *) base_virt,
+        ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags);
+    if (retval < 0) {
+        printf(NAME ": Error mapping OBIO registers\n");
+        return false;
+    }
+    printf(NAME ": OBIO registers with base at %p\n", base_phys);
+    async_set_client_connection(obio_connection);
+    ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, &phonead);
+    return true;
+}
+int main(int argc, char **argv)
+{
+    printf(NAME ": HelenOS OBIO driver\n");
+    if (!obio_init())
+        return -1;
+    printf(NAME ": Accepting connections\n");
+    async_manager();
+    /* Never reached */
+    return 0;
+}
+/**
+ * @}
+ */

 /branches/tracing/uspace/srv/obio/Makefile
 ,0 → 1,76
+#
+# Copyright (c) 2006 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## Setup toolchain
+#
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
+include $(LIBC_PREFIX)/Makefile.toolchain
+LIBS = $(LIBC_PREFIX)/libc.a
+## Sources
+#
+OUTPUT = obio
+SOURCES = \
+    obio.c
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+.PHONY: all clean depend disasm
+all: $(OUTPUT) $(OUTPUT).disasm
+-include Makefile.depend
+clean:
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
+depend:
+    $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+$(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
+    $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

 /branches/tracing/uspace/srv/pci/libpci/names.c
 ,7 → 103,7
     u32 id34 = id_pair(id3, id4);
     unsigned int h = id_hash(cat, id12, id34);
     struct id_entry *n = a->id_hash[h];
-    int len = strlen((char *) text);
+    int len = str_size((char *) text);
     while (n && (n->id12 != id12 || n->id34 != id34 || n->cat != cat))
         n = n->next;

 /branches/tracing/uspace/srv/pci/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 ,7 → 53,7
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
     $(MAKE) -C libpci clean
 depend:
 ,7 → 61,7
 $(OUTPUT): $(OBJECTS) $(LIBS)
     $(MAKE) -C libpci
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm:
     $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm

 /branches/tracing/uspace/srv/devmap/Makefile
 ,10 → 29,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 CFLAGS += -I../libipc/include
 ,7 → 45,7
 SOURCES = \
     devmap.c
-CFLAGS += -D$(ARCH)
+CFLAGS += -D$(UARCH)
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 ,13 → 56,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/devmap/devmap.c
 ,9 → 28,9
 /**
  * @defgroup devmap Device mapper.
- * @brief   HelenOS device mapper.
+ * @brief HelenOS device mapper.
  * @{
- */
+ */
 /** @file
  */
 ,17 → 46,24
 #include <string.h>
 #include <ipc/devmap.h>
-#define NAME "devmap"
+#define NAME  "devmap"
+/** Pending lookup structure. */
+typedef struct {
+    link_t link;
+    char *name;              /**< Device name */
+    ipc_callid_t callid;     /**< Call ID waiting for the lookup */
+} pending_req_t;
 LIST_INITIALIZE(devices_list);
 LIST_INITIALIZE(drivers_list);
+LIST_INITIALIZE(pending_req);
-/* order of locking:
- * drivers_list_futex
- * devices_list_futex
- * (devmap_driver_t *)->devices_futex
- * create_handle_futex
+/* Locking order:
+ *  drivers_list_futex
+ *  devices_list_futex
+ *  (devmap_driver_t *)->devices_futex
+ *  create_handle_futex
  **/
 static atomic_t devices_list_futex = FUTEX_INITIALIZER;
 ,27 → 70,28
 static atomic_t drivers_list_futex = FUTEX_INITIALIZER;
 static atomic_t create_handle_futex = FUTEX_INITIALIZER;
 static int devmap_create_handle(void)
 {
     static int last_handle = 0;
     int handle;
     /* TODO: allow reusing old handles after their unregistration
-        and implement some version of LRU algorithm */
+     * and implement some version of LRU algorithm
+     */
     /* FIXME: overflow */
-    futex_down(&create_handle_futex);
+    futex_down(&create_handle_futex);
     last_handle += 1;
     handle = last_handle;
-    futex_up(&create_handle_futex);
+    futex_up(&create_handle_futex);
     return handle;
 }
-/** Initialize device mapper.
+/** Initialize device mapper.
  *
  *
  */
 ,7 → 98,7
 static int devmap_init()
 {
     /* TODO: */
     return EOK;
 }
 ,108 → 107,101
  */
 static devmap_device_t *devmap_device_find_name(const char *name)
 {
-    link_t *item;
+    link_t *item = devices_list.next;
     devmap_device_t *device = NULL;
-    item = devices_list.next;
     while (item != &devices_list) {
         device = list_get_instance(item, devmap_device_t, devices);
-        if (0 == strcmp(device->name, name)) {
+        if (0 == str_cmp(device->name, name))
             break;
-        }
         item = item->next;
     }
     if (item == &devices_list)
         return NULL;
     device = list_get_instance(item, devmap_device_t, devices);
     return device;
 }
 /** Find device with given handle.
+ *
  * @todo: use hash table
+ *
  */
 static devmap_device_t *devmap_device_find_handle(int handle)
 {
-    link_t *item;
+    futex_down(&devices_list_futex);
+    link_t *item = (&devices_list)->next;
     devmap_device_t *device = NULL;
-    futex_down(&devices_list_futex);
-    item = (&devices_list)->next;
     while (item != &devices_list) {
         device = list_get_instance(item, devmap_device_t, devices);
-        if (device->handle == handle) {
+        if (device->handle == handle)
             break;
-        }
         item = item->next;
     }
     if (item == &devices_list) {
         futex_up(&devices_list_futex);
         return NULL;
     }
     device = list_get_instance(item, devmap_device_t, devices);
     futex_up(&devices_list_futex);
     return device;
 }
 /**
+ *
  * Unregister device and free it. It's assumed that driver's device list is
  * already locked.
+ *
  */
 static int devmap_device_unregister_core(devmap_device_t *device)
 {
     list_remove(&(device->devices));
     list_remove(&(device->driver_devices));
-    free(device->name);
+    free(device->name);
     free(device);
     return EOK;
 }
 /**
+ *
  * Read info about new driver and add it into linked list of registered
  * drivers.
+ *
  */
 static void devmap_driver_register(devmap_driver_t **odriver)
 {
-    size_t name_size;
-    ipc_callid_t callid;
-    ipc_call_t call;
-    devmap_driver_t *driver;
-    ipc_callid_t iid;
-    ipc_call_t icall;
     *odriver = NULL;
-    iid = async_get_call(&icall);
+    ipc_call_t icall;
+    ipc_callid_t iid = async_get_call(&icall);
     if (IPC_GET_METHOD(icall) != DEVMAP_DRIVER_REGISTER) {
         ipc_answer_0(iid, EREFUSED);
         return;
-    }
-    if (NULL ==
-        (driver = (devmap_driver_t *)malloc(sizeof(devmap_driver_t)))) {
+    }
+    devmap_driver_t *driver = (devmap_driver_t *) malloc(sizeof(devmap_driver_t));
+    if (driver == NULL) {
         ipc_answer_0(iid, ENOMEM);
         return;
     }
-    /*
+    /*
      * Get driver name
      */
+    ipc_callid_t callid;
+    size_t name_size;
     if (!ipc_data_write_receive(&callid, &name_size)) {
         free(driver);
         ipc_answer_0(callid, EREFUSED);
 ,7 → 208,7
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     if (name_size > DEVMAP_NAME_MAXLEN) {
         free(driver);
         ipc_answer_0(callid, EINVAL);
 ,17 → 215,18
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     /*
      * Allocate buffer for device name.
      */
-    if (NULL == (driver->name = (char *)malloc(name_size + 1))) {
+    driver->name = (char *) malloc(name_size + 1);
+    if (driver->name == NULL) {
         free(driver);
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(iid, EREFUSED);
         return;
-    }
+    }
     /*
      * Send confirmation to sender and get data into buffer.
      */
 ,22 → 236,23
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     driver->name[name_size] = 0;
     /* Initialize futex for list of devices owned by this driver */
     futex_initialize(&(driver->devices_futex), 1);
-    /*
+    /*
      * Initialize list of asociated devices
      */
     list_initialize(&(driver->devices));
-    /*
+    /*
      * Create connection to the driver
      */
+    ipc_call_t call;
     callid = async_get_call(&call);
     if (IPC_M_CONNECT_TO_ME != IPC_GET_METHOD(call)) {
         ipc_answer_0(callid, ENOTSUP);
 ,73 → 261,95
         ipc_answer_0(iid, ENOTSUP);
         return;
     }
     driver->phone = IPC_GET_ARG5(call);
     ipc_answer_0(callid, EOK);
     list_initialize(&(driver->drivers));
-    futex_down(&drivers_list_futex);
+    futex_down(&drivers_list_futex);
     /* TODO:
      * check that no driver with name equal to driver->name is registered
      */
-    /*
+    /*
      * Insert new driver into list of registered drivers
      */
     list_append(&(driver->drivers), &drivers_list);
-    futex_up(&drivers_list_futex);
+    futex_up(&drivers_list_futex);
     ipc_answer_0(iid, EOK);
     *odriver = driver;
 }
-/** Unregister device driver, unregister all its devices and free driver
+/**
+ * Unregister device driver, unregister all its devices and free driver
  * structure.
+ *
  */
 static int devmap_driver_unregister(devmap_driver_t *driver)
 {
-    devmap_device_t *device;
-    if (NULL == driver)
+    if (driver == NULL)
         return EEXISTS;
-    futex_down(&drivers_list_futex);
+    futex_down(&drivers_list_futex);
     ipc_hangup(driver->phone);
     /* remove it from list of drivers */
     list_remove(&(driver->drivers));
     /* unregister all its devices */
-    futex_down(&devices_list_futex);
+    futex_down(&devices_list_futex);
     futex_down(&(driver->devices_futex));
     while (!list_empty(&(driver->devices))) {
-        device = list_get_instance(driver->devices.next,
+        devmap_device_t *device = list_get_instance(driver->devices.next,
             devmap_device_t, driver_devices);
         devmap_device_unregister_core(device);
     }
     futex_up(&(driver->devices_futex));
-    futex_up(&devices_list_futex);
-    futex_up(&drivers_list_futex);
+    futex_up(&devices_list_futex);
+    futex_up(&drivers_list_futex);
     /* free name and driver */
-    if (NULL != driver->name) {
+    if (NULL != driver->name)
         free(driver->name);
-    }
     free(driver);
     return EOK;
 }
+/** Process pending lookup requests */
+static void process_pending_lookup()
+{
+    link_t *cur;
+loop:
+    for (cur = pending_req.next; cur != &pending_req; cur = cur->next) {
+        pending_req_t *pr = list_get_instance(cur, pending_req_t, link);
+        const devmap_device_t *dev = devmap_device_find_name(pr->name);
+        if (!dev)
+            continue;
+        ipc_answer_1(pr->callid, EOK, dev->handle);
+        free(pr->name);
+        list_remove(cur);
+        free(pr);
+        goto loop;
+    }
+}
 /** Register instance of device
  *
  */
 ,29 → 356,27
 static void devmap_device_register(ipc_callid_t iid, ipc_call_t *icall,
     devmap_driver_t *driver)
 {
-    ipc_callid_t callid;
-    size_t size;
-    devmap_device_t *device;
-    if (NULL == driver) {
+    if (driver == NULL) {
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     /* Create new device entry */
-    if (NULL ==
-        (device = (devmap_device_t *) malloc(sizeof(devmap_device_t)))) {
+    devmap_device_t *device = (devmap_device_t *) malloc(sizeof(devmap_device_t));
+    if (device == NULL) {
         ipc_answer_0(iid, ENOMEM);
         return;
     }
     /* Get device name */
+    ipc_callid_t callid;
+    size_t size;
     if (!ipc_data_write_receive(&callid, &size)) {
         free(device);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     if (size > DEVMAP_NAME_MAXLEN) {
         free(device);
         ipc_answer_0(callid, EINVAL);
 ,8 → 386,8
     /* +1 for terminating \0 */
     device->name = (char *) malloc(size + 1);
-    if (NULL == device->name) {
+    if (device->name == NULL) {
         free(device);
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(iid, EREFUSED);
 ,12 → 396,12
     ipc_data_write_finalize(callid, device->name, size);
     device->name[size] = 0;
     list_initialize(&(device->devices));
     list_initialize(&(device->driver_devices));
-    futex_down(&devices_list_futex);
+    futex_down(&devices_list_futex);
     /* Check that device with such name is not already registered */
     if (NULL != devmap_device_find_name(device->name)) {
         printf(NAME ": Device '%s' already registered\n", device->name);
 ,24 → 411,26
         ipc_answer_0(iid, EEXISTS);
         return;
     }
     /* Get unique device handle */
-    device->handle = devmap_create_handle();
+    device->handle = devmap_create_handle();
     device->driver = driver;
     /* Insert device into list of all devices  */
     list_append(&device->devices, &devices_list);
     /* Insert device into list of devices that belog to one driver */
     futex_down(&device->driver->devices_futex);
     list_append(&device->driver_devices, &device->driver->devices);
-    futex_up(&device->driver->devices_futex);
-    futex_up(&devices_list_futex);
+    futex_up(&device->driver->devices_futex);
+    futex_up(&devices_list_futex);
     ipc_answer_1(iid, EOK, device->handle);
+    process_pending_lookup();
 }
 /**
 ,129 → 440,142
     devmap_driver_t *driver)
 {
     /* TODO */
     return EOK;
 }
 /** Connect client to the device.
+ *
  * Find device driver owning requested device and forward
  * the message to it.
+ *
  */
 static void devmap_forward(ipc_callid_t callid, ipc_call_t *call)
 {
-    devmap_device_t *dev;
-    int handle;
     /*
      * Get handle from request
      */
-    handle = IPC_GET_ARG2(*call);
-    dev = devmap_device_find_handle(handle);
+    int handle = IPC_GET_ARG2(*call);
+    devmap_device_t *dev = devmap_device_find_handle(handle);
     if (NULL == dev) {
         ipc_answer_0(callid, ENOENT);
         return;
-    }
+    }
     ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle),
         IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
 }
 /** Find handle for device instance identified by name.
+ *
  * In answer will be send EOK and device handle in arg1 or a error
- * code from errno.h.
+ * code from errno.h.
+ *
  */
 static void devmap_get_handle(ipc_callid_t iid, ipc_call_t *icall)
 {
-    char *name = NULL;
-    size_t name_size;
-    const devmap_device_t *dev;
-    ipc_callid_t callid;
-    ipcarg_t retval;
-    /*
+    /*
      * Wait for incoming message with device name (but do not
      * read the name itself until the buffer is allocated).
      */
-    if (!ipc_data_write_receive(&callid, &name_size)) {
+    ipc_callid_t callid;
+    size_t size;
+    if (!ipc_data_write_receive(&callid, &size)) {
         ipc_answer_0(callid, EREFUSED);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
-    if (name_size > DEVMAP_NAME_MAXLEN) {
+    if ((size < 1) || (size > DEVMAP_NAME_MAXLEN)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(iid, EREFUSED);
         return;
     }
     /*
      * Allocate buffer for device name.
      */
-    if (NULL == (name = (char *)malloc(name_size))) {
+    char *name = (char *) malloc(size);
+    if (name == NULL) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(iid, EREFUSED);
         return;
-    }
+    }
     /*
      * Send confirmation to sender and get data into buffer.
      */
-    if (EOK != (retval = ipc_data_write_finalize(callid, name,
-        name_size))) {
+    ipcarg_t retval = ipc_data_write_finalize(callid, name, size);
+    if (retval != EOK) {
         ipc_answer_0(iid, EREFUSED);
+        free(name);
         return;
     }
+    name[size] = '\0';
     /*
      * Find device name in linked list of known devices.
      */
-    dev = devmap_device_find_name(name);
+    const devmap_device_t *dev = devmap_device_find_name(name);
     /*
      * Device was not found.
      */
-    if (NULL == dev) {
+    if (dev == NULL) {
+        if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) {
+            /* Blocking lookup, add to pending list */
+            pending_req_t *pr = (pending_req_t *) malloc(sizeof(pending_req_t));
+            if (!pr) {
+                ipc_answer_0(iid, ENOMEM);
+                free(name);
+                return;
+            }
+            pr->name = name;
+            pr->callid = iid;
+            list_append(&pr->link, &pending_req);
+            return;
+        }
         ipc_answer_0(iid, ENOENT);
+        free(name);
         return;
     }
     ipc_answer_1(iid, EOK, dev->handle);
+    free(name);
 }
-/** Find name of device identified by id and send it to caller.
+/** Find name of device identified by id and send it to caller.
  *
  */
 static void devmap_get_name(ipc_callid_t iid, ipc_call_t *icall)
 {
-    const devmap_device_t *device;
-    size_t name_size;
-    device = devmap_device_find_handle(IPC_GET_ARG1(*icall));
+    const devmap_device_t *device = devmap_device_find_handle(IPC_GET_ARG1(*icall));
     /*
      * Device not found.
      */
-    if (NULL == device) {
+    if (device == NULL) {
         ipc_answer_0(iid, ENOENT);
         return;
-    }
+    }
     ipc_answer_0(iid, EOK);
-    name_size = strlen(device->name);
-/*  FIXME:
-    we have no channel from DEVMAP to client ->
-    sending must be initiated by client
-    int rc = ipc_data_write_send(phone, device->name, name_size);
-    if (rc != EOK) {
-        async_wait_for(req, NULL);
-        return rc;
-    }
-*/
+    size_t name_size = str_size(device->name);
+    /* FIXME:
+     * We have no channel from DEVMAP to client, therefore
+     * sending must be initiated by client.
+     *
+     * int rc = ipc_data_write_send(phone, device->name, name_size);
+     * if (rc != EOK) {
+     *     async_wait_for(req, NULL);
+     *     return rc;
+     * }
+     */
     /* TODO: send name in response */
 }
 ,31 → 584,30
  */
 static void devmap_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
 {
-    ipc_callid_t callid;
-    ipc_call_t call;
-    bool cont = true;
+    /* Accept connection */
+    ipc_answer_0(iid, EOK);
     devmap_driver_t *driver = NULL;
-    ipc_answer_0(iid, EOK);
     devmap_driver_register(&driver);
     if (NULL == driver)
         return;
+    bool cont = true;
     while (cont) {
-        callid = async_get_call(&call);
-        switch (IPC_GET_METHOD(call)) {
+        ipc_call_t call;
+        ipc_callid_t callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             cont = false;
-            continue; /* Exit thread */
+            /* Exit thread */
+            continue;
         case DEVMAP_DRIVER_UNREGISTER:
-            if (NULL == driver) {
+            if (NULL == driver)
                 ipc_answer_0(callid, ENOENT);
-            } else {
+            else
                 ipc_answer_0(callid, EOK);
-            }
             break;
         case DEVMAP_DEVICE_REGISTER:
             /* Register one instance of device */
 ,20 → 624,18
             devmap_get_handle(callid, &call);
             break;
         default:
-            if (!(callid & IPC_CALLID_NOTIFICATION)) {
+            if (!(callid & IPC_CALLID_NOTIFICATION))
                 ipc_answer_0(callid, ENOENT);
-            }
         }
     }
     if (NULL != driver) {
-        /*
+        /*
          * Unregister the device driver and all its devices.
          */
         devmap_driver_unregister(driver);
         driver = NULL;
     }
 }
 /** Handle connection with device client.
 ,23 → 643,21
  */
 static void devmap_connection_client(ipc_callid_t iid, ipc_call_t *icall)
 {
-    ipc_callid_t callid;
-    ipc_call_t call;
+    /* Accept connection */
+    ipc_answer_0(iid, EOK);
     bool cont = true;
-    ipc_answer_0(iid, EOK); /* Accept connection */
     while (cont) {
-        callid = async_get_call(&call);
-        switch (IPC_GET_METHOD(call)) {
+        ipc_call_t call;
+        ipc_callid_t callid = async_get_call(&call);
+        switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             cont = false;
-            continue; /* Exit thread */
+            /* Exit thread */
+            continue;
         case DEVMAP_DEVICE_GET_HANDLE:
-            devmap_get_handle(callid, &call);
+            devmap_get_handle(callid, &call);
             break;
         case DEVMAP_DEVICE_GET_NAME:
             /* TODO */
 ,14 → 664,13
             devmap_get_name(callid, &call);
             break;
         default:
-            if (!(callid & IPC_CALLID_NOTIFICATION)) {
+            if (!(callid & IPC_CALLID_NOTIFICATION))
                 ipc_answer_0(callid, ENOENT);
-            }
         }
     }
 }
-/** Function for handling connections to devmap
+/** Function for handling connections to devmap
  *
  */
 static void devmap_connection(ipc_callid_t iid, ipc_call_t *icall)
 ,10 → 688,9
         devmap_forward(iid, icall);
         break;
     default:
-        ipc_answer_0(iid, ENOENT); /* No such interface */
+        /* No such interface */
+        ipc_answer_0(iid, ENOENT);
     }
-    /* Cleanup */
 }
 /**
 ,8 → 700,6
 {
     printf(NAME ": HelenOS Device Mapper\n");
-    ipcarg_t phonead;
     if (devmap_init() != 0) {
         printf(NAME ": Error while initializing service\n");
         return -1;
 ,13 → 707,15
     /* Set a handler of incomming connections */
     async_set_client_connection(devmap_connection);
     /* Register device mapper at naming service */
+    ipcarg_t phonead;
     if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0)
         return -1;
     printf(NAME ": Accepting connections\n");
     async_manager();
     /* Never reached */
     return 0;
 }

 /branches/tracing/uspace/srv/vfs/vfs.c
 ,11 → 28,11
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file    vfs.c
- * @brief   VFS service for HelenOS.
+ * @file vfs.c
+ * @brief VFS service for HelenOS.
  */
 #include <ipc/ipc.h>
 ,14 → 51,14
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
-    bool keep_on_going = 1;
+    bool keep_on_going = true;
     /*
      * The connection was opened via the IPC_CONNECT_ME_TO call.
      * This call needs to be answered.
      */
     ipc_answer_0(iid, EOK);
     /*
      * Here we enter the main connection fibril loop.
      * The logic behind this loop and the protocol is that we'd like to keep
 ,18 → 70,38
      * connection later.
      */
     while (keep_on_going) {
-        ipc_callid_t callid;
         ipc_call_t call;
-        callid = async_get_call(&call);
+        ipc_callid_t callid = async_get_call(&call);
+        fs_handle_t fs_handle;
+        int phone;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             keep_on_going = false;
             break;
+        case IPC_M_CONNECT_ME_TO:
+            /*
+             * Connect the client file system to another one.
+             */
+            /* FIXME:
+             * Prevent ordinary clients from connecting to file
+             * system servers directly. This should be solved by
+             * applying some security mechanisms.
+             */
+            fs_handle = IPC_GET_ARG1(call);
+            phone = vfs_grab_phone(fs_handle);
+            (void) ipc_forward_fast(callid, phone, 0, 0, 0,
+                IPC_FF_NONE);
+            vfs_release_phone(phone);
+            break;
         case VFS_REGISTER:
             vfs_register(callid, &call);
-            keep_on_going = false;
+            /*
+             * Keep the connection open so that a file system can
+             * later ask us to connect it to another file system.
+             * This is necessary to support non-root mounts.
+             */
             break;
         case VFS_MOUNT:
             vfs_mount(callid, &call);
 ,22 → 138,19
             break;
         }
     }
     /* TODO: cleanup after the client */
 }
 int main(int argc, char **argv)
 {
-    ipcarg_t phonead;
     printf(NAME ": HelenOS VFS server\n");
     /*
      * Initialize the list of registered file systems.
      */
     list_initialize(&fs_head);
     /*
      * Initialize VFS node hash table.
      */
 ,7 → 158,7
         printf(NAME ": Failed to initialize VFS node hash table\n");
         return ENOMEM;
     }
     /*
      * Allocate and initialize the Path Lookup Buffer.
      */
 ,6 → 168,7
         printf(NAME ": Cannot allocate a mappable piece of address space\n");
         return ENOMEM;
     }
     if (as_area_create(plb, PLB_SIZE, AS_AREA_READ | AS_AREA_WRITE |
         AS_AREA_CACHEABLE) != plb) {
         printf(NAME ": Cannot create address space area\n");
 ,12 → 180,13
      * Set a connectio handling function/fibril.
      */
     async_set_client_connection(vfs_connection);
     /*
      * Register at the naming service.
      */
+    ipcarg_t phonead;
     ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, &phonead);
     /*
      * Start accepting connections.
      */
 ,4 → 197,4
 /**
  * @}
- */
+ */

 /branches/tracing/uspace/srv/vfs/vfs_ops.c
 ,11 → 28,11
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file    vfs_ops.c
- * @brief   Operations that VFS offers to its clients.
+ * @file vfs_ops.c
+ * @brief Operations that VFS offers to its clients.
  */
 #include "vfs.h"
 ,6 → 55,19
 /* Forward declarations of static functions. */
 static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, size_t);
+/** Pending mount structure. */
+typedef struct {
+    link_t link;
+    char *fs_name;            /**< File system name */
+    char *mp;                 /**< Mount point */
+    char *opts;       /**< Mount options. */
+    ipc_callid_t callid;      /**< Call ID waiting for the mount */
+    ipc_callid_t rid;         /**< Request ID */
+    dev_handle_t dev_handle;  /**< Device handle */
+} pending_req_t;
+LIST_INITIALIZE(pending_req);
 /**
  * This rwlock prevents the race between a triplet-to-VFS-node resolution and a
  * concurrent VFS operation which modifies the file system namespace.
 ,135 → 80,46
     .dev_handle = 0
 };
-void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
+static void vfs_mount_internal(ipc_callid_t rid, dev_handle_t dev_handle,
+    fs_handle_t fs_handle, char *mp, char *opts)
 {
-    dev_handle_t dev_handle;
+    vfs_lookup_res_t mp_res;
     vfs_node_t *mp_node = NULL;
-    ipc_callid_t callid;
-    ipc_call_t data;
-    int rc;
+    ipcarg_t rc;
     int phone;
-    size_t size;
+    aid_t msg;
+    ipc_call_t answer;
-    /*
-     * We expect the library to do the device-name to device-handle
-     * translation for us, thus the device handle will arrive as ARG1
-     * in the request.
-     */
-    dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
-    /*
-     * For now, don't make use of ARG2 and ARG3, but they can be used to
-     * carry mount options in the future.
-     */
-    /*
-     * Now, we expect the client to send us data with the name of the file
-     * system.
-     */
-    if (!ipc_data_write_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    /*
-     * Don't receive more than is necessary for storing a full file system
-     * name.
-     */
-    if (size < 1 || size > FS_NAME_MAXLEN) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    /* Deliver the file system name. */
-    char fs_name[FS_NAME_MAXLEN + 1];
-    (void) ipc_data_write_finalize(callid, fs_name, size);
-    fs_name[size] = '\0';
-    /*
-     * Wait for IPC_M_PING so that we can return an error if we don't know
-     * fs_name.
-     */
-    callid = async_get_call(&data);
-    if (IPC_GET_METHOD(data) != IPC_M_PING) {
-        ipc_answer_0(callid, ENOTSUP);
-        ipc_answer_0(rid, ENOTSUP);
-        return;
-    }
-    /*
-     * Check if we know a file system with the same name as is in fs_name.
-     * This will also give us its file system handle.
-     */
-    fs_handle_t fs_handle = fs_name_to_handle(fs_name, true);
-    if (!fs_handle) {
-        ipc_answer_0(callid, ENOENT);
-        ipc_answer_0(rid, ENOENT);
-        return;
-    }
-    /* Acknowledge that we know fs_name. */
-    ipc_answer_0(callid, EOK);
-    /* Now, we want the client to send us the mount point. */
-    if (!ipc_data_write_receive(&callid, &size)) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    /* Check whether size is reasonable wrt. the mount point. */
-    if (size < 1 || size > MAX_PATH_LEN) {
-        ipc_answer_0(callid, EINVAL);
-        ipc_answer_0(rid, EINVAL);
-        return;
-    }
-    /* Allocate buffer for the mount point data being received. */
-    char *buf;
-    buf = malloc(size + 1);
-    if (!buf) {
-        ipc_answer_0(callid, ENOMEM);
-        ipc_answer_0(rid, ENOMEM);
-        return;
-    }
-    /* Deliver the mount point. */
-    (void) ipc_data_write_finalize(callid, buf, size);
-    buf[size] = '\0';
     /* Resolve the path to the mountpoint. */
-    vfs_lookup_res_t mp_res;
     futex_down(&rootfs_futex);
     if (rootfs.fs_handle) {
         /* We already have the root FS. */
         rwlock_write_lock(&namespace_rwlock);
-        if ((size == 1) && (buf[0] == '/')) {
+        if (str_cmp(mp, "/") == 0) {
             /* Trying to mount root FS over root FS */
             rwlock_write_unlock(&namespace_rwlock);
             futex_up(&rootfs_futex);
-            free(buf);
             ipc_answer_0(rid, EBUSY);
             return;
         }
-        rc = vfs_lookup_internal(buf, L_DIRECTORY, &mp_res, NULL);
+        rc = vfs_lookup_internal(mp, L_DIRECTORY, &mp_res, NULL);
         if (rc != EOK) {
             /* The lookup failed for some reason. */
             rwlock_write_unlock(&namespace_rwlock);
             futex_up(&rootfs_futex);
-            free(buf);
             ipc_answer_0(rid, rc);
             return;
         }
         mp_node = vfs_node_get(&mp_res);
         if (!mp_node) {
             rwlock_write_unlock(&namespace_rwlock);
             futex_up(&rootfs_futex);
-            free(buf);
             ipc_answer_0(rid, ENOMEM);
             return;
         }
         /*
          * Now we hold a reference to mp_node.
          * It will be dropped upon the corresponding VFS_UNMOUNT.
 ,23 → 128,33
         rwlock_write_unlock(&namespace_rwlock);
     } else {
         /* We still don't have the root file system mounted. */
-        if ((size == 1) && (buf[0] == '/')) {
+        if (str_cmp(mp, "/") == 0) {
             vfs_lookup_res_t mr_res;
             vfs_node_t *mr_node;
-            ipcarg_t rindex;
-            ipcarg_t rsize;
-            ipcarg_t rlnkcnt;
+            fs_index_t rindex;
+            size_t rsize;
+            unsigned rlnkcnt;
             /*
              * For this simple, but important case,
              * we are almost done.
              */
-            free(buf);
             /* Tell the mountee that it is being mounted. */
             phone = vfs_grab_phone(fs_handle);
-            rc = async_req_1_3(phone, VFS_MOUNTED,
-                (ipcarg_t) dev_handle, &rindex, &rsize, &rlnkcnt);
+            msg = async_send_1(phone, VFS_MOUNTED,
+                (ipcarg_t) dev_handle, &answer);
+            /* send the mount options */
+            rc = ipc_data_write_start(phone, (void *)opts,
+                str_size(opts));
+            if (rc != EOK) {
+                async_wait_for(msg, NULL);
+                vfs_release_phone(phone);
+                futex_up(&rootfs_futex);
+                ipc_answer_0(rid, rc);
+                return;
+            }
+            async_wait_for(msg, &rc);
             vfs_release_phone(phone);
             if (rc != EOK) {
 ,21 → 163,25
                 return;
             }
+            rindex = (fs_index_t) IPC_GET_ARG1(answer);
+            rsize = (size_t) IPC_GET_ARG2(answer);
+            rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
             mr_res.triplet.fs_handle = fs_handle;
             mr_res.triplet.dev_handle = dev_handle;
-            mr_res.triplet.index = (fs_index_t) rindex;
-            mr_res.size = (size_t) rsize;
-            mr_res.lnkcnt = (unsigned) rlnkcnt;
+            mr_res.triplet.index = rindex;
+            mr_res.size = rsize;
+            mr_res.lnkcnt = rlnkcnt;
             mr_res.type = VFS_NODE_DIRECTORY;
             rootfs.fs_handle = fs_handle;
             rootfs.dev_handle = dev_handle;
             futex_up(&rootfs_futex);
             /* Add reference to the mounted root. */
             mr_node = vfs_node_get(&mr_res);
             assert(mr_node);
             ipc_answer_0(rid, rc);
             return;
         } else {
 ,7 → 190,6
              * being mounted first.
              */
             futex_up(&rootfs_futex);
-            free(buf);
             ipc_answer_0(rid, ENOENT);
             return;
         }
 ,21 → 196,31
     }
     futex_up(&rootfs_futex);
-    free(buf);  /* The buffer is not needed anymore. */
     /*
      * At this point, we have all necessary pieces: file system and device
      * handles, and we know the mount point VFS node.
      */
     phone = vfs_grab_phone(mp_res.triplet.fs_handle);
-    rc = async_req_4_0(phone, VFS_MOUNT,
+    msg = async_send_4(phone, VFS_MOUNT,
         (ipcarg_t) mp_res.triplet.dev_handle,
         (ipcarg_t) mp_res.triplet.index,
         (ipcarg_t) fs_handle,
-        (ipcarg_t) dev_handle);
+        (ipcarg_t) dev_handle, &answer);
+    /* send the mount options */
+    rc = ipc_data_write_start(phone, (void *)opts, str_size(opts));
+    if (rc != EOK) {
+        async_wait_for(msg, NULL);
+        vfs_release_phone(phone);
+        /* Mount failed, drop reference to mp_node. */
+        if (mp_node)
+            vfs_node_put(mp_node);
+        ipc_answer_0(rid, rc);
+        return;
+    }
+    async_wait_for(msg, &rc);
     vfs_release_phone(phone);
     if (rc != EOK) {
         /* Mount failed, drop reference to mp_node. */
         if (mp_node)
 ,6 → 230,233
     ipc_answer_0(rid, rc);
 }
+/** Process pending mount requests */
+void vfs_process_pending_mount()
+{
+    link_t *cur;
+loop:
+    for (cur = pending_req.next; cur != &pending_req; cur = cur->next) {
+        pending_req_t *pr = list_get_instance(cur, pending_req_t, link);
+        fs_handle_t fs_handle = fs_name_to_handle(pr->fs_name, true);
+        if (!fs_handle)
+            continue;
+        /* Acknowledge that we know fs_name. */
+        ipc_answer_0(pr->callid, EOK);
+        /* Do the mount */
+        vfs_mount_internal(pr->rid, pr->dev_handle, fs_handle, pr->mp,
+            pr->opts);
+        free(pr->fs_name);
+        free(pr->mp);
+        free(pr->opts);
+        list_remove(cur);
+        free(pr);
+        goto loop;
+    }
+}
+void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
+{
+    /*
+     * We expect the library to do the device-name to device-handle
+     * translation for us, thus the device handle will arrive as ARG1
+     * in the request.
+     */
+    dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+    /*
+     * Mount flags are passed as ARG2.
+     */
+    unsigned int flags = (unsigned int) IPC_GET_ARG2(*request);
+    /*
+     * For now, don't make use of ARG3, but it can be used to
+     * carry mount options in the future.
+     */
+    /* We want the client to send us the mount point. */
+    ipc_callid_t callid;
+    size_t size;
+    if (!ipc_data_write_receive(&callid, &size)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    /* Check whether size is reasonable wrt. the mount point. */
+    if ((size < 1) || (size > MAX_PATH_LEN)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        return;
+    }
+    /* Allocate buffer for the mount point data being received. */
+    char *mp = malloc(size + 1);
+    if (!mp) {
+        ipc_answer_0(callid, ENOMEM);
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
+    /* Deliver the mount point. */
+    ipcarg_t retval = ipc_data_write_finalize(callid, mp, size);
+    if (retval != EOK) {
+        ipc_answer_0(rid, retval);
+        free(mp);
+        return;
+    }
+    mp[size] = '\0';
+    /* Now we expect to receive the mount options. */
+    if (!ipc_data_write_receive(&callid, &size)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        free(mp);
+        return;
+    }
+    /* Check the offered options size. */
+    if (size < 0 || size > MAX_MNTOPTS_LEN) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        free(mp);
+        return;
+    }
+    /* Allocate buffer for the mount options. */
+    char *opts = (char *) malloc(size + 1);
+    if (!opts) {
+        ipc_answer_0(callid, ENOMEM);
+        ipc_answer_0(rid, ENOMEM);
+        free(mp);
+        return;
+    }
+    /* Deliver the mount options. */
+    retval = ipc_data_write_finalize(callid, opts, size);
+    if (retval != EOK) {
+        ipc_answer_0(rid, retval);
+        free(mp);
+        free(opts);
+        return;
+    }
+    opts[size] = '\0';
+    /*
+     * Now, we expect the client to send us data with the name of the file
+     * system.
+     */
+    if (!ipc_data_write_receive(&callid, &size)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        free(mp);
+        free(opts);
+        return;
+    }
+    /*
+     * Don't receive more than is necessary for storing a full file system
+     * name.
+     */
+    if ((size < 1) || (size > FS_NAME_MAXLEN)) {
+        ipc_answer_0(callid, EINVAL);
+        ipc_answer_0(rid, EINVAL);
+        free(mp);
+        free(opts);
+        return;
+    }
+    /*
+     * Allocate buffer for file system name.
+     */
+    char *fs_name = (char *) malloc(size + 1);
+    if (fs_name == NULL) {
+        ipc_answer_0(callid, ENOMEM);
+        ipc_answer_0(rid, ENOMEM);
+        free(mp);
+        free(opts);
+        return;
+    }
+    /* Deliver the file system name. */
+    retval = ipc_data_write_finalize(callid, fs_name, size);
+    if (retval != EOK) {
+        ipc_answer_0(rid, retval);
+        free(mp);
+        free(opts);
+        free(fs_name);
+        return;
+    }
+    fs_name[size] = '\0';
+    /*
+     * Wait for IPC_M_PING so that we can return an error if we don't know
+     * fs_name.
+     */
+    ipc_call_t data;
+    callid = async_get_call(&data);
+    if (IPC_GET_METHOD(data) != IPC_M_PING) {
+        ipc_answer_0(callid, ENOTSUP);
+        ipc_answer_0(rid, ENOTSUP);
+        free(mp);
+        free(opts);
+        free(fs_name);
+        return;
+    }
+    /*
+     * Check if we know a file system with the same name as is in fs_name.
+     * This will also give us its file system handle.
+     */
+    fs_handle_t fs_handle = fs_name_to_handle(fs_name, true);
+    if (!fs_handle) {
+        if (flags & IPC_FLAG_BLOCKING) {
+            pending_req_t *pr;
+            /* Blocking mount, add to pending list */
+            pr = (pending_req_t *) malloc(sizeof(pending_req_t));
+            if (!pr) {
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
+                free(mp);
+                free(fs_name);
+                free(opts);
+                return;
+            }
+            pr->fs_name = fs_name;
+            pr->mp = mp;
+            pr->opts = opts;
+            pr->callid = callid;
+            pr->rid = rid;
+            pr->dev_handle = dev_handle;
+            link_initialize(&pr->link);
+            list_append(&pr->link, &pending_req);
+            return;
+        }
+        ipc_answer_0(callid, ENOENT);
+        ipc_answer_0(rid, ENOENT);
+        free(mp);
+        free(fs_name);
+        free(opts);
+        return;
+    }
+    /* Acknowledge that we know fs_name. */
+    ipc_answer_0(callid, EOK);
+    /* Do the mount */
+    vfs_mount_internal(rid, dev_handle, fs_handle, mp, opts);
+    free(mp);
+    free(fs_name);
+    free(opts);
+}
 void vfs_open(ipc_callid_t rid, ipc_call_t *request)
 {
     if (!vfs_files_init()) {
 ,37 → 897,37
 void vfs_rename(ipc_callid_t rid, ipc_call_t *request)
 {
-    size_t len;
+    size_t olen, nlen;
     ipc_callid_t callid;
     int rc;
     /* Retrieve the old path. */
-    if (!ipc_data_write_receive(&callid, &len)) {
+    if (!ipc_data_write_receive(&callid, &olen)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
     }
-    char *old = malloc(len + 1);
+    char *old = malloc(olen + 1);
     if (!old) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
     }
-    if ((rc = ipc_data_write_finalize(callid, old, len))) {
+    if ((rc = ipc_data_write_finalize(callid, old, olen))) {
         ipc_answer_0(rid, rc);
         free(old);
         return;
     }
-    old[len] = '\0';
+    old[olen] = '\0';
     /* Retrieve the new path. */
-    if (!ipc_data_write_receive(&callid, &len)) {
+    if (!ipc_data_write_receive(&callid, &nlen)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         free(old);
         return;
     }
-    char *new = malloc(len + 1);
+    char *new = malloc(nlen + 1);
     if (!new) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
 ,16 → 934,16
         free(old);
         return;
     }
-    if ((rc = ipc_data_write_finalize(callid, new, len))) {
+    if ((rc = ipc_data_write_finalize(callid, new, nlen))) {
         ipc_answer_0(rid, rc);
         free(old);
         free(new);
         return;
     }
-    new[len] = '\0';
+    new[nlen] = '\0';
-    char *oldc = canonify(old, &len);
-    char *newc = canonify(new, NULL);
+    char *oldc = canonify(old, &olen);
+    char *newc = canonify(new, &nlen);
     if (!oldc || !newc) {
         ipc_answer_0(rid, EINVAL);
         free(old);
 ,8 → 950,18
         free(new);
         return;
     }
-    if (!strncmp(newc, oldc, len)) {
-        /* oldc is a prefix of newc */
+    oldc[olen] = '\0';
+    newc[nlen] = '\0';
+    if ((!str_lcmp(newc, oldc, str_length(oldc))) &&
+        ((newc[str_length(oldc)] == '/') ||
+        (str_length(oldc) == 1) ||
+        (str_length(oldc) == str_length(newc)))) {
+            /*
+         * oldc is a prefix of newc and either
+         * - newc continues with a / where oldc ends, or
+         * - oldc was / itself, or
+         * - oldc and newc are equal.
+         */
         ipc_answer_0(rid, EINVAL);
         free(old);
         free(new);
 ,8 → 989,23
         free(new);
         return;
     }
+    /* Determine the path to the parent of the node with the new name. */
+    char *parentc = str_dup(newc);
+    if (!parentc) {
+        rwlock_write_unlock(&namespace_rwlock);
+        ipc_answer_0(rid, rc);
+        free(old);
+        free(new);
+        return;
+    }
+    char *lastsl = str_rchr(parentc + 1, L'/');
+    if (lastsl)
+        *lastsl = '\0';
+    else
+        parentc[1] = '\0';
     /* Lookup parent of the new file name. */
-    rc = vfs_lookup_internal(newc, L_PARENT, &new_par_lr, NULL);
+    rc = vfs_lookup_internal(parentc, L_NONE, &new_par_lr, NULL);
+    free(parentc);  /* not needed anymore */
     if (rc != EOK) {
         rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);

 /branches/tracing/uspace/srv/vfs/vfs_register.c
 ,10 → 28,10
 /** @addtogroup fs
  * @{
- */
+ */
 /**
- * @file    vfs_register.c
+ * @file vfs_register.c
  * @brief
  */
 ,30 → 98,6
         return false;
     }
-    /*
-     * Check if the FS implements mandatory VFS operations.
-     */
-    if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_LOOKUP)] != VFS_OP_DEFINED) {
-        dprintf("Operation VFS_LOOKUP not defined by the client.\n");
-        return false;
-    }
-    if (info->ops[IPC_METHOD_TO_VFS_OP(VFS_READ)] != VFS_OP_DEFINED) {
-        dprintf("Operation VFS_READ not defined by the client.\n");
-        return false;
-    }
-    /*
-     * Check if each operation is either not defined, defined or default.
-     */
-    for (i = VFS_FIRST; i < VFS_LAST_CLNT; i++) {
-        if ((info->ops[IPC_METHOD_TO_VFS_OP(i)] != VFS_OP_NULL) &&
-            (info->ops[IPC_METHOD_TO_VFS_OP(i)] != VFS_OP_DEFAULT) &&
-            (info->ops[IPC_METHOD_TO_VFS_OP(i)] != VFS_OP_DEFINED)) {
-            dprintf("Operation info not understood.\n");
-            return false;
-        }
-    }
     return true;
 }
 ,6 → 278,11
     dprintf("\"%.*s\" filesystem successfully registered, handle=%d.\n",
         FS_NAME_MAXLEN, fs_info->vfs_info.name, fs_info->fs_handle);
+    /* Process pending mount requests possibly waiting
+     * for this filesystem implementation.
+     */
+    vfs_process_pending_mount();
 }
 /** For a given file system handle, implement policy for allocating a phone.
 ,8 → 376,7
     link_t *cur;
     for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
         fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-        if (strncmp(fs->vfs_info.name, name,
-            sizeof(fs->vfs_info.name)) == 0) {
+        if (str_cmp(fs->vfs_info.name, name) == 0) {
             handle = fs->fs_handle;
             break;
         }

 /branches/tracing/uspace/srv/vfs/vfs.h
 ,8 → 47,6
 #define VFS_FIRST   IPC_FIRST_USER_METHOD
-#define IPC_METHOD_TO_VFS_OP(m) ((m) - VFS_FIRST)
 /* Basic types. */
 typedef int16_t fs_handle_t;
 typedef int16_t dev_handle_t;
 ,32 → 79,16
     VFS_LAST_SRV,   /* keep this the last member of this enum */
 } vfs_request_srv_t;
-/**
- * An instance of this structure is associated with a particular FS operation.
- * It tells VFS if the FS supports the operation or maybe if a default one
- * should be used.
- */
-typedef enum {
-    VFS_OP_NULL = 0,
-    VFS_OP_DEFAULT,
-    VFS_OP_DEFINED
-} vfs_op_t;
 #define FS_NAME_MAXLEN  20
 /**
  * A structure like this is passed to VFS by each individual FS upon its
  * registration. It assosiates a human-readable identifier with each
- * registered FS. More importantly, through this structure, the FS announces
- * what operations it supports.
+ * registered FS.
  */
 typedef struct {
     /** Unique identifier of the fs. */
     char name[FS_NAME_MAXLEN + 1];
-    /** Operations. */
-    vfs_op_t ops[VFS_LAST_CLNT - VFS_FIRST];
 } vfs_info_t;
 /**
 ,11 → 166,6
  * VFS_UNLINK.
  */
 #define L_UNLINK    32
-/**
- * L_PARENT performs a lookup but returns the triplet of the parent node.
- * This flag may not be combined with any other lookup flag.
- */
-#define L_PARENT    64
 typedef enum vfs_node_type {
     VFS_NODE_UNKNOWN,
 ,6 → 249,8
 extern uint8_t *plb;        /**< Path Lookup Buffer */
 extern link_t plb_head;     /**< List of active PLB entries. */
+#define MAX_MNTOPTS_LEN     256
 /** Holding this rwlock prevents changes in file system namespace. */
 extern rwlock_t namespace_rwlock;
 ,6 → 279,7
 extern void vfs_node_addref(vfs_node_t *);
 extern void vfs_node_delref(vfs_node_t *);
+extern void vfs_process_pending_mount(void);
 extern void vfs_register(ipc_callid_t, ipc_call_t *);
 extern void vfs_mount(ipc_callid_t, ipc_call_t *);
 extern void vfs_open(ipc_callid_t, ipc_call_t *);

 /branches/tracing/uspace/srv/vfs/Makefile
 ,10 → 30,9
 ## Setup toolchain
 #
-include ../../Makefile.config
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
 include $(LIBC_PREFIX)/Makefile.toolchain
 LIBS = $(LIBC_PREFIX)/libc.a
 ,13 → 58,13
 -include Makefile.depend
 clean:
-    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+    -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
 depend:
     $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 $(OUTPUT): $(OBJECTS) $(LIBS)
-    $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+    $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 disasm: $(OUTPUT).disasm

 /branches/tracing/uspace/srv/vfs/vfs_file.c
 ,7 → 103,7
  */
 int vfs_fd_free(int fd)
 {
-    if ((fd >= MAX_OPEN_FILES) || (files[fd] == NULL))
+    if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (files[fd] == NULL))
         return EBADF;
     vfs_file_delref(files[fd]);
     files[fd] = NULL;
 ,7 → 150,7
  */
 vfs_file_t *vfs_file_get(int fd)
 {
-    if (fd < MAX_OPEN_FILES)
+    if ((fd >= 0) && (fd < MAX_OPEN_FILES))
         return files[fd];
     return NULL;
 }

 /branches/tracing/uspace/Makefile
 ,7 → 29,7
 ## Include configuration
 #
--include Makefile.config
+-include ../Makefile.config
 DIRS = \
     lib/libc \
 ,43 → 55,29
     app/init \
     app/bdsh
-ifeq ($(ARCH), amd64)
+ifeq ($(UARCH),amd64)
     DIRS += srv/pci
 endif
-ifeq ($(ARCH), ia32)
+ifeq ($(UARCH),ia32)
     DIRS += srv/pci
 endif
-ifeq ($(ARCH), mips32)
-    CFLAGS += -DCONFIG_MIPS_FPU
+ifeq ($(UARCH),sparc64)
+    DIRS += \
+        srv/fhc \
+        srv/obio
 endif
-ifeq ($(ARCH), mips32eb)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))
-.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean
+.PHONY: all $(BUILDS) $(CLEANS) clean
-all:
-    ../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
-    $(MAKE) -C . build
+all: ../Makefile.config ../config.h ../config.defs $(BUILDS)
-config:
-    ../tools/config.py uspace.config
-build: $(BUILDS)
 clean: $(CLEANS)
-    find $(DIRS) -name '*.o' -follow -exec rm \{\} \;
-    find lib/libc -name "_link.ld" -exec rm \{\} \;
-distclean: clean
-    -rm Makefile.config
 $(CLEANS):
     -$(MAKE) -C $(basename $@) clean

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4376 → Rev 4377