WebSVN – HelenOS – Path Comparison – / – /branches/dynload/kernel/ Rev 4337 and /branches/dynload/kernel Rev 3694

Ignore whitespace Rev 4337 → Rev 3694

 /branches/dynload/kernel/generic/src/interrupt/interrupt.c
 ,10 → 109,8
     panic("Unhandled exception %d.", n);
 }
-#ifdef CONFIG_KCONSOLE
 /** kconsole cmd - print all exceptions */
-static int cmd_exc_print(cmd_arg_t *argv)
+static int exc_print_cmd(cmd_arg_t *argv)
 {
 #if (IVT_ITEMS > 0)
     unsigned int i;
 ,18 → 158,15
     return 1;
 }
 static cmd_info_t exc_info = {
     .name = "exc",
     .description = "Print exception table.",
-    .func = cmd_exc_print,
+    .func = exc_print_cmd,
     .help = NULL,
     .argc = 0,
     .argv = NULL
 };
-#endif
 /** Initialize generic exception handling support */
 void exc_init(void)
 {
 ,11 → 175,9
     for (i = 0; i < IVT_ITEMS; i++)
         exc_register(i, "undef", (iroutine) exc_undef);
-#ifdef CONFIG_KCONSOLE
     cmd_initialize(&exc_info);
     if (!cmd_register(&exc_info))
-        printf("Cannot register command %s\n", exc_info.name);
-#endif
+        panic("could not register command %s\n", exc_info.name);
 }
 /** @}

 /branches/dynload/kernel/generic/src/proc/thread.c
 ,7 → 211,7
 void thread_init(void)
 {
     THREAD = NULL;
-    atomic_set(&nrdy, 0);
+    atomic_set(&nrdy,0);
     thread_slab = slab_cache_create("thread_slab", sizeof(thread_t), 0,
         thr_constructor, thr_destructor, 0);

 /branches/dynload/kernel/generic/src/mm/as.c
 ,12 → 146,8
     AS_KERNEL = as_create(FLAG_AS_KERNEL);
     if (!AS_KERNEL)
-        panic("Cannot create kernel address space\n");
+        panic("can't create kernel address space\n");
-    /* Make sure the kernel address space
-     * reference count never drops to zero.
-     */
-    atomic_set(&AS_KERNEL->refcount, 1);
 }
 /** Create address space.
 ,7 → 176,7
 #else
     page_table_create(flags);
 #endif
     return as;
 }
 ,12 → 769,11
  * In order for this to work properly, this may copy the data
  * into private anonymous memory (unless it's already there).
  *
- * @param as      Address space.
- * @param flags   Flags of the area memory.
- * @param address Address within the area to be changed.
+ * @param as        Address space.
+ * @param flags     Flags of the area memory.
+ * @param address   Address withing the area to be changed.
  *
- * @return Zero on success or a value from @ref errno.h on failure.
- *
+ * @return      Zero on success or a value from @ref errno.h on failure.
  */
 int as_area_change_flags(as_t *as, int flags, uintptr_t address)
 {
 ,7 → 785,7
     uintptr_t *old_frame;
     index_t frame_idx;
     count_t used_pages;
     /* Flags for the new memory mapping */
     page_flags = area_flags_to_page_flags(flags);
 ,7 → 799,7
         return ENOENT;
     }
-    if ((area->sh_info) || (area->backend != &anon_backend)) {
+    if (area->sh_info || area->backend != &anon_backend) {
         /* Copying shared areas not supported yet */
         /* Copying non-anonymous memory not supported yet */
         mutex_unlock(&area->lock);
 ,7 → 870,6
      */
     tlb_invalidate_pages(as->asid, area->base, area->pages);
     /*
      * Invalidate potential software translation caches (e.g. TSB on
      * sparc64).

 /branches/dynload/kernel/generic/src/syscall/syscall.c
 ,12 → 92,8
 /** Tell kernel to get keyboard/console access again */
 static unative_t sys_debug_enable_console(void)
 {
-#ifdef CONFIG_KCONSOLE
     arch_grab_console();
-    return true;
-#else
-    return false;
-#endif
+    return 0;
 }
 /** Print a hex integer into klog */

 /branches/dynload/kernel/generic/src/udebug/udebug.c
 ,7 → 72,7
     ut->uspace_state = NULL;
     ut->go = false;
     ut->stoppable = true;
-    ut->active = false;
+    ut->debug_active = false;
     ut->cur_event = 0; /* none */
 }
 ,7 → 112,7
     bool res;
     mutex_lock(&THREAD->udebug.lock);
-    res = THREAD->udebug.active;
+    res = THREAD->udebug.debug_active;
     mutex_unlock(&THREAD->udebug.lock);
     return res;
 ,7 → 170,7
          * Active debugging session
          */
-        if (THREAD->udebug.active == true &&
+        if (THREAD->udebug.debug_active == true &&
             THREAD->udebug.go == false) {
             /*
              * Thread was requested to stop - answer go call
 ,7 → 210,8
     mutex_lock(&TASK->udebug.lock);
     mutex_lock(&THREAD->udebug.lock);
-    if (THREAD->udebug.active && THREAD->udebug.go == false) {
+    if (THREAD->udebug.debug_active &&
+        THREAD->udebug.go == false) {
         TASK->udebug.begin_call = NULL;
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
 ,7 → 264,8
     mutex_lock(&THREAD->udebug.lock);
     /* Must only generate events when in debugging session and is go. */
-    if (THREAD->udebug.active != true || THREAD->udebug.go == false ||
+    if (THREAD->udebug.debug_active != true ||
+        THREAD->udebug.go == false ||
         (TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) {
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
 ,9 → 334,9
     LOG("- check state\n");
     /* Must only generate events when in debugging session */
-    if (THREAD->udebug.active != true) {
-        LOG("- udebug.active: %s, udebug.go: %s\n",
-            THREAD->udebug.active ? "yes(+)" : "no(-)",
+    if (THREAD->udebug.debug_active != true) {
+        LOG("- debug_active: %s, udebug.go: %s\n",
+            THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
             THREAD->udebug.go ? "yes(-)" : "no(+)");
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
 ,9 → 384,9
     LOG("- check state\n");
     /* Must only generate events when in debugging session. */
-    if (THREAD->udebug.active != true) {
-/*      printf("- udebug.active: %s, udebug.go: %s\n",
-            THREAD->udebug.active ? "yes(+)" : "no(-)",
+    if (THREAD->udebug.debug_active != true) {
+/*      printf("- debug_active: %s, udebug.go: %s\n",
+            THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
             THREAD->udebug.go ? "yes(-)" : "no(+)");*/
         mutex_unlock(&THREAD->udebug.lock);
         mutex_unlock(&TASK->udebug.lock);
 ,7 → 401,7
     IPC_SET_ARG1(call->data, UDEBUG_EVENT_THREAD_E);
     /* Prevent any further debug activity in thread. */
-    THREAD->udebug.active = false;
+    THREAD->udebug.debug_active = false;
     THREAD->udebug.cur_event = 0;       /* none */
     THREAD->udebug.go = false;  /* set to initial value */
 ,13 → 459,13
         /* Only process userspace threads. */
         if ((flags & THREAD_FLAG_USPACE) != 0) {
             /* Prevent any further debug activity in thread. */
-            t->udebug.active = false;
+            t->udebug.debug_active = false;
             t->udebug.cur_event = 0;    /* none */
             /* Is the thread still go? */
             if (t->udebug.go == true) {
                 /*
-                * Yes, so clear go. As active == false,
+                * Yes, so clear go. As debug_active == false,
                  * this doesn't affect anything.
                  */
                 t->udebug.go = false;

 /branches/dynload/kernel/generic/src/udebug/udebug_ops.c
 ,7 → 58,7
  * Specifically, verifies that thread t exists, is a userspace thread,
  * and belongs to the current task (TASK). Verifies, that the thread
  * is (or is not) go according to being_go (typically false).
- * It also locks t->udebug.lock, making sure that t->udebug.active
+ * It also locks t->udebug.lock, making sure that t->udebug.debug_active
  * is true - that the thread is in a valid debugging session.
  *
  * With this verified and the t->udebug.lock mutex held, it is ensured
 ,7 → 108,7
     }
     /* Verify debugging state. */
-    if (t->udebug.active != true) {
+    if (t->udebug.debug_active != true) {
         /* Not in debugging session or undesired GO state */
         spinlock_unlock(&t->lock);
         interrupts_restore(ipl);
 ,8 → 117,8
     }
     /*
-     * Since the thread has active == true, TASK->udebug.lock
-     * is enough to ensure its existence and that active remains
+     * Since the thread has debug_active == true, TASK->udebug.lock
+     * is enough to ensure its existence and that debug_active remains
      * true.
      */
     spinlock_unlock(&t->lock);
 ,7 → 204,7
         reply = 0; /* no reply */
     }
-    /* Set udebug.active on all of the task's userspace threads. */
+    /* Set udebug.debug_active on all of the task's userspace threads. */
     for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
         t = list_get_instance(cur, thread_t, th_link);
 ,7 → 211,7
         mutex_lock(&t->udebug.lock);
         if ((t->flags & THREAD_FLAG_USPACE) != 0)
-            t->udebug.active = true;
+            t->udebug.debug_active = true;
         mutex_unlock(&t->udebug.lock);
     }

 /branches/dynload/kernel/generic/src/main/main.c
 ,6 → 191,8
 {
     /* Keep this the first thing. */
     the_initialize(THE);
+    LOG();
     version_print();
 ,8 → 200,8
         "\nconfig.stack_base=%#" PRIp " config.stack_size=%" PRIs,
         config.base, config.kernel_size, config.stack_base,
         config.stack_size);
-#ifdef CONFIG_KCONSOLE
     /*
      * kconsole data structures must be initialized very early
      * because other subsystems will register their respective
 ,7 → 208,6
      * commands.
      */
     LOG_EXEC(kconsole_init());
-#endif
     /*
      * Exception handler initialization, before architecture
 ,7 → 252,7
     if (init.cnt > 0) {
         count_t i;
         for (i = 0; i < init.cnt; i++)
-            LOG("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
+            printf("init[%" PRIc "].addr=%#" PRIp ", init[%" PRIc
                 "].size=%#" PRIs "\n", i, init.tasks[i].addr, i,
                 init.tasks[i].size);
     } else
 ,8 → 271,8
     /*
      * Create the first thread.
      */
-    thread_t *kinit_thread
-        = thread_create(kinit, NULL, kernel, 0, "kinit", true);
+    thread_t *kinit_thread = thread_create(kinit, NULL, kernel, 0, "kinit",
+        true);
     if (!kinit_thread)
         panic("Can't create kinit thread\n");
     LOG_EXEC(thread_ready(kinit_thread));

 /branches/dynload/kernel/generic/src/main/kinit.c
 ,11 → 82,8
  */
 void kinit(void *arg)
 {
+    thread_t *t;
-#if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
-    thread_t *thread;
-#endif
     /*
      * Detach kinit as nobody will call thread_join_timeout() on it.
      */
 ,19 → 100,23
          * not mess together with kcpulb threads.
          * Just a beautification.
          */
-        thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true);
-        if (thread != NULL) {
-            spinlock_lock(&thread->lock);
-            thread->cpu = &cpus[0];
-            spinlock_unlock(&thread->lock);
-            thread_ready(thread);
+        if ((t = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED,
+            "kmp", true))) {
+            spinlock_lock(&t->lock);
+            t->cpu = &cpus[0];
+            spinlock_unlock(&t->lock);
+            thread_ready(t);
         } else
-            panic("Unable to create kmp thread\n");
-        thread_join(thread);
-        thread_detach(thread);
+            panic("thread_create/kmp\n");
+        thread_join(t);
+        thread_detach(t);
     }
 #endif /* CONFIG_SMP */
+    /*
+     * Now that all CPUs are up, we can report what we've found.
+     */
+    cpu_list();
 #ifdef CONFIG_SMP
     if (config.cpu_count > 1) {
         count_t i;
 ,37 → 125,35
          * For each CPU, create its load balancing thread.
          */
         for (i = 0; i < config.cpu_count; i++) {
-            thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
-            if (thread != NULL) {
-                spinlock_lock(&thread->lock);
-                thread->cpu = &cpus[i];
-                spinlock_unlock(&thread->lock);
-                thread_ready(thread);
+            if ((t = thread_create(kcpulb, NULL, TASK,
+                THREAD_FLAG_WIRED, "kcpulb", true))) {
+                spinlock_lock(&t->lock);
+                t->cpu = &cpus[i];
+                spinlock_unlock(&t->lock);
+                thread_ready(t);
             } else
-                printf("Unable to create kcpulb thread for cpu" PRIc "\n", i);
+                panic("thread_create/kcpulb\n");
         }
     }
 #endif /* CONFIG_SMP */
     /*
      * At this point SMP, if present, is configured.
      */
     arch_post_smp_init();
-#ifdef CONFIG_KCONSOLE
-    if (stdin) {
-        /*
-         * Create kernel console.
-         */
-        thread = thread_create(kconsole_thread, NULL, TASK, 0, "kconsole", false);
-        if (thread != NULL)
-            thread_ready(thread);
-        else
-            printf("Unable to create kconsole thread\n");
-    }
-#endif /* CONFIG_KCONSOLE */
+    /*
+     * Create kernel console.
+     */
+    t = thread_create(kconsole, (void *) "kconsole", TASK, 0, "kconsole",
+        false);
+    if (t)
+        thread_ready(t);
+    else
+        panic("thread_create/kconsole\n");
     interrupts_enable();
     /*
 ,14 → 164,14
     for (i = 0; i < init.cnt; i++) {
         if (init.tasks[i].addr % FRAME_SIZE) {
-            printf("init[%" PRIc "].addr is not frame aligned\n", i);
+            printf("init[%" PRIc "].addr is not frame aligned", i);
             continue;
         }
         int rc = program_create_from_image((void *) init.tasks[i].addr,
             "init-bin", &programs[i]);
-        if ((rc == 0) && (programs[i].task != NULL)) {
+        if (rc == 0 && programs[i].task != NULL) {
             /*
              * Set capabilities to init userspace tasks.
              */
 ,10 → 184,12
             /* It was the program loader and was registered */
         } else {
             /* RAM disk image */
-            int rd = init_rd((rd_header_t *) init.tasks[i].addr, init.tasks[i].size);
+            int rd = init_rd((rd_header_t *) init.tasks[i].addr,
+                init.tasks[i].size);
             if (rd != RE_OK)
-                printf("Init binary %" PRIc " not used (error %d)\n", i, rd);
+                printf("Init binary %" PRIc " not used, error "
+                    "code %d.\n", i, rd);
         }
     }
 ,18 → 203,12
         }
     }
-#ifdef CONFIG_KCONSOLE
     if (!stdin) {
-        printf("kinit: No stdin\nKernel alive: ");
-        uint64_t i = 0;
         while (1) {
-            printf(PRIu64 " ", i);
             thread_sleep(1);
-            i++;
+            printf("kinit... ");
         }
     }
-#endif /* CONFIG_KCONSOLE */
 }
 /** @}

 /branches/dynload/kernel/generic/src/console/cmd.c
 ,7 → 501,7
     for (i = 0; basic_commands[i]; i++) {
         cmd_initialize(basic_commands[i]);
         if (!cmd_register(basic_commands[i]))
-            printf("Cannot register command %s\n", basic_commands[i]->name);
+            panic("could not register command %s\n", basic_commands[i]->name);
     }
 }

 /branches/dynload/kernel/generic/src/console/kconsole.c
 ,15 → 401,11
     return current;
 }
-/** Kernel console prompt.
+/** Kernel console managing thread.
  *
  * @param prompt Kernel console prompt (e.g kconsole/panic).
- * @param msg    Message to display in the beginning.
- * @param kcon   Wait for keypress to show the prompt
- *               and never exit.
- *
  */
-void kconsole(char *prompt, char *msg, bool kcon)
+void kconsole(void *prompt)
 {
     cmd_info_t *cmd_info;
     count_t len;
 ,42 → 412,25
     char *cmdline;
     if (!stdin) {
-        LOG("No stdin for kernel console");
+        printf("%s: no stdin\n", __func__);
         return;
     }
-    if (msg)
-        printf("%s", msg);
-    if (kcon)
-        _getc(stdin);
     while (true) {
         cmdline = clever_readline((char *) prompt, stdin);
         len = strlen(cmdline);
         if (!len)
             continue;
         cmd_info = parse_cmdline(cmdline, len);
         if (!cmd_info)
             continue;
-        if ((!kcon)
-            && (strncmp(cmd_info->name, "exit", min(strlen(cmd_info->name), 5)) == 0))
+        if (strncmp(cmd_info->name, "exit",
+            min(strlen(cmd_info->name), 5)) == 0)
             break;
         (void) cmd_info->func(cmd_info->argv);
     }
 }
-/** Kernel console managing thread.
- *
- */
-void kconsole_thread(void *data)
-{
-    kconsole("kconsole", "Kernel console ready (press any key to activate)\n", true);
-}
 static int parse_int_arg(char *text, size_t len, unative_t *result)
 {
     static char symname[MAX_SYMBOL_NAME];

 /branches/dynload/kernel/generic/src/console/console.c
 ,7 → 167,7
             printf("cpu%u: ", CPU->id);
         else
             printf("cpu: ");
-        printf("halted (no kconsole)\n");
+        printf("halted - no kconsole\n");
         cpu_halt();
     }

 /branches/dynload/kernel/generic/src/lib/func.c
 ,6 → 55,8
 #ifdef CONFIG_DEBUG
     bool rundebugger = false;
+//      TODO test_and_set not defined on all arches
+//  if (!test_and_set(&haltstate))
     if (!atomic_get(&haltstate)) {
         atomic_set(&haltstate, 1);
         rundebugger = true;
 ,12 → 66,12
 #endif
     interrupts_disable();
-#if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
-    if (rundebugger)
-        kconsole("panic", "\nLast resort kernel console ready\n", false);
-#endif
+#ifdef CONFIG_DEBUG
+    if (rundebugger) {
+        printf("\n");
+        kconsole("panic"); /* Run kconsole as a last resort to user */
+    }
+#endif
     if (CPU)
         printf("cpu%u: halted\n", CPU->id);
     else

 /branches/dynload/kernel/generic/src/cpu/cpu.c
 ,7 → 86,7
     }
 #endif /* CONFIG_SMP */
-    CPU = &cpus[config.cpu_active - 1];
+    CPU = &cpus[config.cpu_active-1];
     CPU->active = 1;
     CPU->tlb_active = 1;

 /branches/dynload/kernel/generic/include/udebug/udebug.h
 ,9 → 177,9
     /** What type of event are we stopped in or 0 if none. */
     udebug_event_t cur_event;
-    bool go;        /**< thread is GO */
-    bool stoppable;     /**< thread is stoppable */
-    bool active;        /**< thread is in a debugging session */
+    bool go;       /**< thread is GO */
+    bool stoppable;    /**< thread is stoppable */
+    bool debug_active; /**< thread is in a debugging session */
 } udebug_thread_t;
 struct task;

 /branches/dynload/kernel/generic/include/macros.h
 ,8 → 45,8
 #define isspace(c)  (((c) == ' ') || ((c) == '\t') || ((c) == '\n') || \
                 ((c) == '\r'))
-#define min(a, b)   ((a) < (b) ? (a) : (b))
-#define max(a, b)   ((a) > (b) ? (a) : (b))
+#define min(a,b)    ((a) < (b) ? (a) : (b))
+#define max(a,b)    ((a) > (b) ? (a) : (b))
 /** Return true if the intervals overlap.
  *

 /branches/dynload/kernel/generic/include/console/kconsole.h
 ,8 → 87,7
 extern link_t cmd_head;
 extern void kconsole_init(void);
-extern void kconsole(char *prompt, char *msg, bool kcon);
-extern void kconsole_thread(void *data);
+extern void kconsole(void *prompt);
 extern int cmd_register(cmd_info_t *cmd);

 /branches/dynload/kernel/generic/include/debug.h
 ,15 → 63,15
 #   define ASSERT(expr)
 #endif
-/** Extensive logging output macro
+/** Extensive debugging output macro
  *
- * If CONFIG_LOG is set, the LOG() macro
+ * If CONFIG_EDEBUG is set, the LOG() macro
  * will print whatever message is indicated plus
  * an information about the location.
  *
  */
-#ifdef CONFIG_LOG
+#ifdef CONFIG_EDEBUG
 #   define LOG(format, ...) \
         printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
             __LINE__, ##__VA_ARGS__);
 ,15 → 79,15
 #   define LOG(format, ...)
 #endif
-/** Extensive logging execute macro
+/** Extensive debugging execute macro
  *
- * If CONFIG_LOG is set, the LOG_EXEC() macro
+ * If CONFIG_EDEBUG is set, the LOG_EXEC() macro
  * will print an information about calling a given
  * function and call it.
  *
  */
-#ifdef CONFIG_LOG
+#ifdef CONFIG_EDEBUG
 #   define LOG_EXEC(fnc) \
         { \
             printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \

 /branches/dynload/kernel/kernel.config
 ,28 → 40,28
 @ "sparc64" Sun UltraSPARC 64-bit
 ! ARCH (choice)
-# Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
-@ "icc_native" ICC Native
-@ "suncc_native" Sun Studio C Compiler
-! [ARCH=amd64|ARCH=ia32|ARCH=ia32xen] COMPILER (choice)
-# Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
-@ "icc_native" ICC Native
-! [ARCH=ia64] COMPILER (choice)
-# Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
-@ "suncc_native" Sun Studio C Compiler
-! [ARCH=sparc64] COMPILER (choice)
-# Compiler
-@ "gcc_cross" GCC Cross-compiler
-@ "gcc_native" GCC Native
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
+@ "suncc_native" Sun Studio C Compiler
+! [ARCH=amd64|ARCH=ia32|ARCH=ia32xen] COMPILER (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "icc_native" ICC Native
+! [ARCH=ia64] COMPILER (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
+@ "suncc_native" Sun Studio C Compiler
+! [ARCH=sparc64] COMPILER (choice)
+# Compiler
+@ "gcc_cross" GCC Cross-compiler
+@ "gcc_native" GCC Native
 ! [ARCH=arm32|ARCH=mips32|ARCH=ppc32|ARCH=ppc64] COMPILER (choice)
 # CPU type
 ,7 → 143,7
 # Support for Z8530 serial port
 ! [ARCH=sparc64] CONFIG_Z8530 (y/n)
-# Support for NS16550 serial port
+# Support for NS16550 serial port
 ! [ARCH=sparc64|(ARCH=ia64&MACHINE!=ski)] CONFIG_NS16550 (n/y)
 # Support for Serengeti console

/branches/dynload/kernel/genarch/include/kbd/i8042.h
35,7 → 35,6
#ifndef KERN_I8042_H_
#define KERN_I8042_H_

#include <arch/types.h>
#include <console/chardev.h>

extern void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr);

/branches/dynload/kernel/genarch/include/fb/logo-196x66.h
File deleted

Property changes:
Deleted: svn:mergeinfo

 /branches/dynload/kernel/genarch/include/fb/visuals.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,15 → 35,16
 #ifndef KERN_VISUALS_H_
 #define KERN_VISUALS_H_
-#define VISUAL_INDIRECT_8   0
+#define VISUAL_INDIRECT_8   0
-#define VISUAL_RGB_5_5_5    1
-#define VISUAL_RGB_5_6_5    2
-#define VISUAL_RGB_8_8_8    3
-#define VISUAL_RGB_8_8_8_0  4
-#define VISUAL_RGB_0_8_8_8  5
+#define VISUAL_RGB_5_5_5    1
+#define VISUAL_RGB_5_6_5    2
+#define VISUAL_RGB_8_8_8    3
+#define VISUAL_RGB_8_8_8_0  4
+#define VISUAL_RGB_0_8_8_8  5
-#define VISUAL_BGR_0_8_8_8  6
+#define VISUAL_BGR_0_8_8_8  6
+#define VISUAL_SB1500_PALETTE   7
 #endif

 /branches/dynload/kernel/genarch/include/fb/fb.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,8 → 65,6
 } fb_properties_t;
 SPINLOCK_EXTERN(fb_lock);
-void fb_redraw(void);
 void fb_init(fb_properties_t *props);
 #endif

 /branches/dynload/kernel/genarch/include/fb/font-8x16.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,14 → 35,11
 #ifndef KERN_FONT_8X16_H_
 #define KERN_FONT_8X16_H_
-#define FONT_GLYPHS      256
-#define FONT_WIDTH       8
-#define FONT_SCANLINES   16
+#define FONT_GLIPHS     256
+#define FONT_SCANLINES  16
-#include <arch/types.h>
+extern unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES];
-extern uint8_t fb_font[FONT_GLYPHS * FONT_SCANLINES];
 #endif
 /** @}

 /branches/dynload/kernel/genarch/src/kbd/key.c
 ,8 → 41,10
 #endif
 #if (defined(sparc64))
+#if (defined(CONFIG_Z8530) || defined(CONFIG_NS16550))
 #include <genarch/kbd/scanc_sun.h>
 #endif
+#endif
 #include <synch/spinlock.h>
 #include <console/chardev.h>

/branches/dynload/kernel/genarch/src/fb/logo-196x66.c
File deleted

Property changes:
Deleted: svn:mergeinfo

 /branches/dynload/kernel/genarch/src/fb/fb.c
 ,5 → 1,4
 /*
- * Copyright (c) 2008 Martin Decky
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
  *
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,7 → 33,6
  */
 #include <genarch/fb/font-8x16.h>
-#include <genarch/fb/logo-196x66.h>
 #include <genarch/fb/visuals.h>
 #include <genarch/fb/fb.h>
 #include <console/chardev.h>
 ,7 → 39,6
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
-#include <align.h>
 #include <panic.h>
 #include <memstr.h>
 #include <config.h>
 ,114 → 47,137
 #include <ddi/ddi.h>
 #include <arch/types.h>
-SPINLOCK_INITIALIZE(fb_lock);
+#include "helenos.xbm"
-/**< Physical memory area for fb. */
-static parea_t fb_parea;
+static parea_t fb_parea;        /**< Physical memory area for fb. */
-static uint8_t *fb_addr;
-static uint8_t *backbuf;
-static uint8_t *glyphs;
-static uint8_t *bgscan;
+SPINLOCK_INITIALIZE(fb_lock);
-static unsigned int xres;
-static unsigned int yres;
+static uint8_t *fbaddress = NULL;
-static unsigned int ylogo;
-static unsigned int ytrim;
-static unsigned int rowtrim;
+static uint8_t *blankline = NULL;
+static uint8_t *dbbuffer = NULL;    /* Buffer for fast scrolling console */
+static index_t dboffset;
-static unsigned int scanline;
-static unsigned int glyphscanline;
+static unsigned int xres = 0;
+static unsigned int yres = 0;
+static unsigned int scanline = 0;
+static unsigned int pixelbytes = 0;
+#ifdef FB_INVERT_COLORS
+static bool invert_colors = true;
+#else
+static bool invert_colors = false;
+#endif
-static unsigned int pixelbytes;
-static unsigned int glyphbytes;
-static unsigned int bgscanbytes;
-static unsigned int cols;
-static unsigned int rows;
 static unsigned int position = 0;
+static unsigned int columns = 0;
+static unsigned int rows = 0;
-#define BG_COLOR     0x000080
-#define FG_COLOR     0xffff00
+#define COL_WIDTH   8
+#define ROW_BYTES   (scanline * FONT_SCANLINES)
-#define CURSOR       219
+#define BGCOLOR     0x000080
+#define FGCOLOR     0xffff00
+#define LOGOCOLOR   0x2020b0
-#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))
+#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))
-#define COL2X(col)           ((col) * FONT_WIDTH)
-#define ROW2Y(row)           ((row) * FONT_SCANLINES)
+#define POINTPOS(x, y)  ((y) * scanline + (x) * pixelbytes)
-#define X2COL(x)             ((x) / FONT_WIDTH)
-#define Y2ROW(y)             ((y) / FONT_SCANLINES)
+/***************************************************************/
+/* Pixel specific fuctions */
-#define FB_POS(x, y)         ((y) * scanline + (x) * pixelbytes)
-#define BB_POS(col, row)     ((row) * cols + (col))
-#define GLYPH_POS(glyph, y)  ((glyph) * glyphbytes + (y) * glyphscanline)
+static void (*rgb2scr)(void *, int);
+static int (*scr2rgb)(void *);
+static inline int COLOR(int color)
+{
+    return invert_colors ? ~color : color;
+}
-static void (*rgb_conv)(void *, uint32_t);
+/* Conversion routines between different color representations */
+static void rgb_byte0888(void *dst, int rgb)
+{
+    *((int *) dst) = rgb;
+}
+static int byte0888_rgb(void *src)
+{
+    return (*((int *) src)) & 0xffffff;
+}
-/** ARGB 8:8:8:8 conversion
- *
- */
-static void rgb_0888(void *dst, uint32_t rgb)
+static void bgr_byte0888(void *dst, int rgb)
 {
-    *((uint32_t *) dst) = rgb & 0xffffff;
+    *((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 |
+        RED(rgb, 8);
 }
-/** ABGR 8:8:8:8 conversion
- *
- */
-static void bgr_0888(void *dst, uint32_t rgb)
+static int byte0888_bgr(void *src)
 {
-    *((uint32_t *) dst)
-        = (BLUE(rgb, 8) << 16) | (GREEN(rgb, 8) << 8) | RED(rgb, 8);
+    int color = *(uint32_t *)(src);
+    return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) |
+        ((color >> 16) & 0xff);
 }
-/** BGR 8:8:8 conversion
- *
- */
-static void rgb_888(void *dst, uint32_t rgb)
+static void rgb_byte888(void *dst, int rgb)
 {
+    uint8_t *scr = (uint8_t *) dst;
 #if defined(FB_INVERT_ENDIAN)
-    ((uint8_t *) dst)[0] = RED(rgb, 8);
-    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-    ((uint8_t *) dst)[2] = BLUE(rgb, 8);
+    scr[0] = RED(rgb, 8);
+    scr[1] = GREEN(rgb, 8);
+    scr[2] = BLUE(rgb, 8);
 #else
-    ((uint8_t *) dst)[0] = BLUE(rgb, 8);
-    ((uint8_t *) dst)[1] = GREEN(rgb, 8);
-    ((uint8_t *) dst)[2] = RED(rgb, 8);
+    scr[2] = RED(rgb, 8);
+    scr[1] = GREEN(rgb, 8);
+    scr[0] = BLUE(rgb, 8);
 #endif
 }
+static int byte888_rgb(void *src)
+{
+    uint8_t *scr = (uint8_t *) 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
+}
-/** RGB 5:5:5 conversion
- *
- */
-static void rgb_555(void *dst, uint32_t rgb)
+/**  16-bit depth (5:5:5) */
+static void rgb_byte555(void *dst, int rgb)
 {
-    *((uint16_t *) dst)
-        = (RED(rgb, 5) << 10) | (GREEN(rgb, 5) << 5) | BLUE(rgb, 5);
+    /* 5-bit, 5-bits, 5-bits */
+    *((uint16_t *) dst) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 |
+        BLUE(rgb, 5);
 }
+/** 16-bit depth (5:5:5) */
+static int byte555_rgb(void *src)
+{
+    int color = *(uint16_t *)(src);
+    return (((color >> 10) & 0x1f) << (16 + 3)) |
+        (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3);
+}
-/** RGB 5:6:5 conversion
- *
- */
-static void rgb_565(void *dst, uint32_t rgb)
+/**  16-bit depth (5:6:5) */
+static void rgb_byte565(void *dst, int rgb)
 {
-    *((uint16_t *) dst)
-        = (RED(rgb, 5) << 11) | (GREEN(rgb, 6) << 5) | BLUE(rgb, 5);
+    /* 5-bit, 6-bits, 5-bits */
+    *((uint16_t *) dst) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 |
+        BLUE(rgb, 5);
 }
+/** 16-bit depth (5:6:5) */
+static int byte565_rgb(void *src)
+{
+    int color = *(uint16_t *)(src);
+    return (((color >> 11) & 0x1f) << (16 + 3)) |
+        (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
+}
-/** RGB 3:2:3
+/** Put pixel - 8-bit depth (color palette/3:2:3)
  *
  * Even though we try 3:2:3 color scheme here, an 8-bit framebuffer
  * will most likely use a color palette. The color appearance
 ,117 → 184,228
  * will be pretty random and depend on the default installed
  * palette. This could be fixed by supporting custom palette
  * and setting it to simulate the 8-bit truecolor.
- *
- * Currently we set the palette on the ia32, amd64 and sparc64 port.
- *
- * Note that the byte is being inverted by this function. The reason is
- * that we would like to use a color palette where the white color code
- * is 0 and the black color code is 255, as some machines (Sun Blade 1500)
- * use these codes for black and white and prevent to set codes
- * 0 and 255 to other colors.
- *
  */
-static void rgb_323(void *dst, uint32_t rgb)
+static void rgb_byte8(void *dst, int rgb)
 {
-    *((uint8_t *) dst)
-        = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3));
+    *((uint8_t *) dst) = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 |
+        BLUE(rgb, 3);
 }
+static void sb1500rgb_byte8(void *dst, int rgb)
+{
+    if (RED(rgb, 1) && GREEN(rgb, 1) && BLUE(rgb, 1))
+        *((uint8_t *) dst) = 255;
+    else if (RED(rgb, 1) && GREEN(rgb, 1))
+        *((uint8_t *) dst) = 150;
+    else if (GREEN(rgb, 1) && BLUE(rgb, 1))
+        *((uint8_t *) dst) = 47;
+    else if (RED(rgb, 1) && BLUE(rgb, 1))
+        *((uint8_t *) dst) = 48;
+    else if (RED(rgb, 1))
+        *((uint8_t *) dst) = 32;
+    else if (GREEN(rgb, 1))
+        *((uint8_t *) dst) = 47;
+    else if (BLUE(rgb, 1))
+        *((uint8_t *) dst) = 2;
+    else
+        *((uint8_t *) dst) = 1;
+}
-/** Hide logo and refresh screen
+/** Return pixel color - 8-bit depth (color palette/3:2:3)
  *
+ * See the comment for rgb_byte().
  */
-static void logo_hide(void)
+static int byte8_rgb(void *src)
 {
-    ylogo = 0;
-    ytrim = yres;
-    rowtrim = rows;
-    fb_redraw();
+    int color = *(uint8_t *)src;
+    return (((color >> 5) & 0x7) << (16 + 5)) |
+        (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
 }
+static void putpixel(unsigned int x, unsigned int y, int color)
+{
+    (*rgb2scr)(&fbaddress[POINTPOS(x, y)], COLOR(color));
-/** Draw character at given position
- *
- */
-static void glyph_draw(uint8_t glyph, unsigned int col, unsigned int row)
+    if (dbbuffer) {
+        int dline = (y + dboffset) % yres;
+        (*rgb2scr)(&dbbuffer[POINTPOS(x, dline)], COLOR(color));
+    }
+}
+/** Get pixel from viewport */
+static int getpixel(unsigned int x, unsigned int y)
 {
-    unsigned int x = COL2X(col);
-    unsigned int y = ROW2Y(row);
-    unsigned int yd;
-    if (y >= ytrim)
-        logo_hide();
-    backbuf[BB_POS(col, row)] = glyph;
-    for (yd = 0; yd < FONT_SCANLINES; yd++)
-        memcpy(&fb_addr[FB_POS(x, y + yd + ylogo)],
-            &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
+    if (dbbuffer) {
+        int dline = (y + dboffset) % yres;
+        return COLOR((*scr2rgb)(&dbbuffer[POINTPOS(x, dline)]));
+    }
+    return COLOR((*scr2rgb)(&fbaddress[POINTPOS(x, y)]));
 }
-/** Scroll screen down by one row
- *
- *
- */
-static void screen_scroll(void)
+/** Fill screen with background color */
+static void clear_screen(void)
 {
-    if (ylogo > 0) {
-        logo_hide();
-        return;
+    unsigned int y;
+    for (y = 0; y < yres; y++) {
+        memcpy(&fbaddress[scanline * y], blankline, xres * pixelbytes);
+        if (dbbuffer)
+            memcpy(&dbbuffer[scanline * y], blankline,
+                xres * pixelbytes);
     }
-    unsigned int row;
-    for (row = 0; row < rows; row++) {
-        unsigned int y = ROW2Y(row);
-        unsigned int yd;
+}
+/** Scroll screen one row up */
+static void scroll_screen(void)
+{
+    if (dbbuffer) {
+        count_t first;
-        for (yd = 0; yd < FONT_SCANLINES; yd++) {
-            unsigned int x;
-            unsigned int col;
-            for (col = 0, x = 0; col < cols; col++,
-                x += FONT_WIDTH) {
-                uint8_t glyph;
-                if (row < rows - 1) {
-                    if (backbuf[BB_POS(col, row)] ==
-                        backbuf[BB_POS(col, row + 1)])
-                        continue;
-                    glyph = backbuf[BB_POS(col, row + 1)];
-                } else
-                    glyph = 0;
-                memcpy(&fb_addr[FB_POS(x, y + yd)],
-                    &glyphs[GLYPH_POS(glyph, yd)],
-                    glyphscanline);
-            }
+        /* Clear the last row */
+        memcpy(&dbbuffer[dboffset * scanline], blankline, ROW_BYTES);
+        dboffset = (dboffset + FONT_SCANLINES) % yres;
+        first = yres - dboffset;
+        /* Move all rows one row up */
+        if (xres * pixelbytes == scanline) {
+            memcpy(fbaddress, &dbbuffer[dboffset * scanline],
+                first * scanline);
+            memcpy(&fbaddress[first * scanline], dbbuffer,
+                dboffset * scanline);
+        } else {
+            /*
+             * When the scanline is bigger than number of bytes
+             * in the X-resolution, chances are that the
+             * frame buffer memory past the X-resolution is special
+             * in some way. For example, the SUNW,ffb framebuffer
+             * wraps this area around the beginning of the same
+             * line. To avoid troubles, copy only memory as
+             * specified by the resolution.
+             */
+            unsigned int i;
+            for (i = 0; i < first; i++)
+                memcpy(&fbaddress[i * scanline],
+                    &dbbuffer[(dboffset + i) * scanline],
+                    xres * pixelbytes);
+            for (i = 0; i < dboffset; i++)
+                memcpy(&fbaddress[(first + i) * scanline],
+                    &dbbuffer[i * scanline], xres * pixelbytes);
         }
+    } else {
+        uint8_t *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
+        if (xres * pixelbytes == scanline) {
+            /* Move all rows one row up */
+            memcpy((void *) fbaddress,
+                (void *) &fbaddress[ROW_BYTES],
+                scanline * yres - ROW_BYTES);
+            /* Clear the last row */
+            memcpy((void *) lastline, (void *) blankline,
+                ROW_BYTES);
+        } else {
+            /*
+             * See the comment in the dbbuffer case.
+             */
+            unsigned int i;
+            /* Move all rows one row up */
+            for (i = 0; i < yres - FONT_SCANLINES; i++)
+                memcpy(&fbaddress[i * scanline],
+                    &fbaddress[(i + FONT_SCANLINES) * scanline],
+                    xres * pixelbytes);
+            /* Clear the last row */
+            for (i = 0; i < FONT_SCANLINES; i++)
+                memcpy(&lastline[i * scanline],
+                    &blankline[i * scanline],
+                    xres * pixelbytes);
+        }
     }
-    memcpy(backbuf, backbuf + cols, cols * (rows - 1));
-    memsetb(&backbuf[BB_POS(0, rows - 1)], cols, 0);
 }
-static void cursor_put(void)
+static void invert_pixel(unsigned int x, unsigned int y)
 {
-    glyph_draw(CURSOR, position % cols, position / cols);
+    putpixel(x, y, ~getpixel(x, y));
 }
-static void cursor_remove(void)
+/** Draw one line of glyph at a given position */
+static void draw_glyph_line(unsigned int glline, unsigned int x, unsigned int y)
 {
-    glyph_draw(0, position % cols, position / cols);
+    unsigned int i;
+    for (i = 0; i < 8; i++)
+        if (glline & (1 << (7 - i))) {
+            putpixel(x + i, y, FGCOLOR);
+        } else
+            putpixel(x + i, y, BGCOLOR);
 }
+/***************************************************************/
+/* Character-console functions */
+/** Draw character at given position */
+static void draw_glyph(uint8_t glyph, unsigned int col, unsigned int row)
+{
+    unsigned int y;
+    for (y = 0; y < FONT_SCANLINES; y++)
+        draw_glyph_line(fb_font[glyph * FONT_SCANLINES + y],
+            col * COL_WIDTH, row * FONT_SCANLINES + y);
+}
+/** Invert character at given position */
+static void invert_char(unsigned int col, unsigned int row)
+{
+    unsigned int x;
+    unsigned int y;
+    for (x = 0; x < COL_WIDTH; x++)
+        for (y = 0; y < FONT_SCANLINES; y++)
+            invert_pixel(col * COL_WIDTH + x,
+                row * FONT_SCANLINES + y);
+}
+/** Draw character at default position */
+static void draw_char(char chr)
+{
+    draw_glyph(chr, position % columns, position / columns);
+}
+static void draw_logo(unsigned int startx, unsigned int starty)
+{
+    unsigned int x;
+    unsigned int y;
+    unsigned int byte;
+    unsigned int rowbytes;
+    rowbytes = (helenos_width - 1) / 8 + 1;
+    for (y = 0; y < helenos_height; y++)
+        for (x = 0; x < helenos_width; x++) {
+            byte = helenos_bits[rowbytes * y + x / 8];
+            byte >>= x % 8;
+            if (byte & 1)
+                putpixel(startx + x, starty + y,
+                    COLOR(LOGOCOLOR));
+        }
+}
+/***************************************************************/
+/* Stdout specific functions */
+static void invert_cursor(void)
+{
+    invert_char(position % columns, position / columns);
+}
 /** Print character to screen
  *
- * Emulate basic terminal commands.
- *
+ *  Emulate basic terminal commands
  */
 static void fb_putchar(chardev_t *dev, char ch)
 {
 ,38 → 413,37
     switch (ch) {
     case '\n':
-        cursor_remove();
-        position += cols;
-        position -= position % cols;
+        invert_cursor();
+        position += columns;
+        position -= position % columns;
         break;
     case '\r':
-        cursor_remove();
-        position -= position % cols;
+        invert_cursor();
+        position -= position % columns;
         break;
     case '\b':
-        cursor_remove();
-        if (position % cols)
+        invert_cursor();
+        if (position % columns)
             position--;
         break;
     case '\t':
-        cursor_remove();
+        invert_cursor();
         do {
-            glyph_draw((uint8_t) ' ', position % cols,
-                position / cols);
+            draw_char(' ');
             position++;
-        } while ((position % 8) && (position < cols * rows));
+        } while ((position % 8) && position < columns * rows);
         break;
     default:
-        glyph_draw((uint8_t) ch, position % cols, position / cols);
+        draw_char(ch);
         position++;
     }
-    if (position >= cols * rows) {
-        position -= cols;
-        screen_scroll();
+    if (position >= columns * rows) {
+        position -= columns;
+        scroll_screen();
     }
-    cursor_put();
+    invert_cursor();
     spinlock_unlock(&fb_lock);
 }
 ,135 → 454,51
 };
-/** Render glyphs
- *
- * Convert glyphs from device independent font
- * description to current visual representation.
- *
- */
-static void glyphs_render(void)
-{
-    /* Prerender glyphs */
-    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++) {
-                void *dst = &glyphs[GLYPH_POS(glyph, y) +
-                    x * pixelbytes];
-                uint32_t rgb = (fb_font[ROW2Y(glyph) + y] &
-                    (1 << (7 - x))) ? FG_COLOR : BG_COLOR;
-                rgb_conv(dst, rgb);
-            }
-        }
-    }
-    /* Prerender background scanline */
-    unsigned int x;
-    for (x = 0; x < xres; x++)
-        rgb_conv(&bgscan[x * pixelbytes], BG_COLOR);
-}
-/** Refresh the screen
- *
- */
-void fb_redraw(void)
-{
-    if (ylogo > 0) {
-        unsigned int y;
-        for (y = 0; y < LOGO_HEIGHT; y++) {
-            unsigned int x;
-            for (x = 0; x < xres; x++)
-                rgb_conv(&fb_addr[FB_POS(x, y)],
-                    (x < LOGO_WIDTH) ?
-                    fb_logo[y * LOGO_WIDTH + x] :
-                    LOGO_COLOR);
-        }
-    }
-    unsigned int row;
-    for (row = 0; row < rowtrim; row++) {
-        unsigned int y = ylogo + ROW2Y(row);
-        unsigned int yd;
-        for (yd = 0; yd < FONT_SCANLINES; yd++) {
-            unsigned int x;
-            unsigned int col;
-            for (col = 0, x = 0; col < cols;
-                col++, x += FONT_WIDTH) {
-                void *d = &fb_addr[FB_POS(x, y + yd)];
-                void *s = &glyphs[GLYPH_POS(backbuf[BB_POS(col,
-                    row)], yd)];
-                memcpy(d, s, glyphscanline);
-            }
-        }
-    }
-    if (COL2X(cols) < xres) {
-        unsigned int y;
-        unsigned int size = (xres - COL2X(cols)) * pixelbytes;
-        for (y = ylogo; y < yres; y++)
-            memcpy(&fb_addr[FB_POS(COL2X(cols), y)], bgscan, size);
-    }
-    if (ROW2Y(rowtrim) + ylogo < yres) {
-        unsigned int y;
-        for (y = ROW2Y(rowtrim) + ylogo; y < yres; y++)
-            memcpy(&fb_addr[FB_POS(0, y)], bgscan, bgscanbytes);
-    }
-}
 /** Initialize framebuffer as a chardev output device
  *
- * @param addr   Physical address of the framebuffer
- * @param x      Screen width in pixels
- * @param y      Screen height in pixels
- * @param scan   Bytes per one scanline
- * @param visual Color model
- *
+ * @param props     Properties of the framebuffer device.
  */
 void fb_init(fb_properties_t *props)
 {
     switch (props->visual) {
     case VISUAL_INDIRECT_8:
-        rgb_conv = rgb_323;
+        rgb2scr = rgb_byte8;
+        scr2rgb = byte8_rgb;
         pixelbytes = 1;
         break;
+    case VISUAL_SB1500_PALETTE:
+        rgb2scr = sb1500rgb_byte8;
+        scr2rgb = byte8_rgb;
+        pixelbytes = 1;
+        break;
     case VISUAL_RGB_5_5_5:
-        rgb_conv = rgb_555;
+        rgb2scr = rgb_byte555;
+        scr2rgb = byte555_rgb;
         pixelbytes = 2;
         break;
     case VISUAL_RGB_5_6_5:
-        rgb_conv = rgb_565;
+        rgb2scr = rgb_byte565;
+        scr2rgb = byte565_rgb;
         pixelbytes = 2;
         break;
     case VISUAL_RGB_8_8_8:
-        rgb_conv = rgb_888;
+        rgb2scr = rgb_byte888;
+        scr2rgb = byte888_rgb;
         pixelbytes = 3;
         break;
     case VISUAL_RGB_8_8_8_0:
-        rgb_conv = rgb_888;
+        rgb2scr = rgb_byte888;
+        scr2rgb = byte888_rgb;
         pixelbytes = 4;
         break;
     case VISUAL_RGB_0_8_8_8:
-        rgb_conv = rgb_0888;
+        rgb2scr = rgb_byte0888;
+        scr2rgb = byte0888_rgb;
         pixelbytes = 4;
         break;
     case VISUAL_BGR_0_8_8_8:
-        rgb_conv = bgr_0888;
+        rgb2scr = bgr_byte0888;
+        scr2rgb = byte0888_bgr;
         pixelbytes = 4;
         break;
     default:
 ,67 → 505,58
         panic("Unsupported visual.\n");
     }
+    unsigned int fbsize = props->scan * props->y + props->offset;
+    /* Map the framebuffer */
+    fbaddress = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
+    fbaddress += props->offset;
     xres = props->x;
     yres = props->y;
     scanline = props->scan;
-    cols = X2COL(xres);
-    rows = Y2ROW(yres);
-    if (yres > ylogo) {
-        ylogo = LOGO_HEIGHT;
-        rowtrim = rows - Y2ROW(ylogo);
-        if (ylogo % FONT_SCANLINES > 0)
-            rowtrim--;
-        ytrim = ROW2Y(rowtrim);
-    } else {
-        ylogo = 0;
-        ytrim = yres;
-        rowtrim = rows;
-    }
-    glyphscanline = FONT_WIDTH * pixelbytes;
-    glyphbytes = ROW2Y(glyphscanline);
-    bgscanbytes = xres * pixelbytes;
-    unsigned int fbsize = scanline * yres;
-    unsigned int bbsize = cols * rows;
-    unsigned int glyphsize = FONT_GLYPHS * glyphbytes;
-    backbuf = (uint8_t *) malloc(bbsize, 0);
-    if (!backbuf)
-        panic("Unable to allocate backbuffer.\n");
-    glyphs = (uint8_t *) malloc(glyphsize, 0);
-    if (!glyphs)
-        panic("Unable to allocate glyphs.\n");
-    bgscan = malloc(bgscanbytes, 0);
-    if (!bgscan)
-        panic("Unable to allocate background pixel.\n");
-    memsetb(backbuf, bbsize, 0);
-    glyphs_render();
-    fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
-    fb_parea.pbase = (uintptr_t) props->addr + props->offset;
-    fb_parea.vbase = (uintptr_t) fb_addr;
+    rows = props->y / FONT_SCANLINES;
+    columns = props->x / COL_WIDTH;
+    fb_parea.pbase = (uintptr_t) props->addr;
+    fb_parea.vbase = (uintptr_t) fbaddress;
     fb_parea.frames = SIZE2FRAMES(fbsize);
     fb_parea.cacheable = false;
     ddi_parea_register(&fb_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 1);
     sysinfo_set_item_val("fb.width", NULL, xres);
     sysinfo_set_item_val("fb.height", NULL, yres);
-    sysinfo_set_item_val("fb.scanline", NULL, scanline);
+    sysinfo_set_item_val("fb.scanline", NULL, props->scan);
     sysinfo_set_item_val("fb.visual", NULL, props->visual);
     sysinfo_set_item_val("fb.address.physical", NULL, props->addr);
+    sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
+    /* Allocate double buffer */
+    unsigned int order = fnzb(SIZE2FRAMES(fbsize) - 1) + 1;
+    dbbuffer = (uint8_t *) frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+    if (!dbbuffer)
+        printf("Failed to allocate scroll buffer.\n");
+    dboffset = 0;
+    /* Initialized blank line */
+    blankline = (uint8_t *) malloc(ROW_BYTES, FRAME_ATOMIC);
+    if (!blankline)
+        panic("Failed to allocate blank line for framebuffer.");
+    unsigned int x, y;
+    for (y = 0; y < FONT_SCANLINES; y++)
+        for (x = 0; x < xres; x++)
+            (*rgb2scr)(&blankline[POINTPOS(x, y)], COLOR(BGCOLOR));
-    fb_redraw();
+    clear_screen();
+    /* Update size of screen to match text area */
+    yres = rows * FONT_SCANLINES;
+    draw_logo(xres - helenos_width, 0);
+    invert_cursor();
     chardev_initialize("fb", &framebuffer, &fb_ops);
     stdout = &framebuffer;
 }

 /branches/dynload/kernel/genarch/src/fb/font-8x16.c
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup genarch
+/** @addtogroup genarch
  * @{
  */
 /** @file
 ,7 → 34,7
 #include <genarch/fb/font-8x16.h>
-uint8_t fb_font[FONT_GLYPHS * FONT_SCANLINES] = {
+unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES] = {
     /* 0 0x00 '^@' */
 x00, /* 00000000 */

 /branches/dynload/kernel/genarch/src/fb/helenos.xbm
 ,0 → 1,163
+#define helenos_width 127
+#define helenos_height 120
+static unsigned char helenos_bits[] = {
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x80, 0x0f, 0x78, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x80, 0x81,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+x0f, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x06,
+x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07,
+x00, 0x00, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x0c,
+x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00,
+x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00,
+x00, 0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
+x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00,
+x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00,
+x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x80, 0xc1, 0x00, 0x00, 0x00,
+x00, 0xc0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x80,
+xc1, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+xfe, 0x01, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00,
+x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00,
+x03, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+xff, 0x07, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0x06, 0x03, 0x00, 0x00,
+x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
+x0c, 0x02, 0x00, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+xff, 0x0f, 0x00, 0x00, 0x0c, 0x06, 0x00, 0x00, 0x08, 0x03, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00,
+x08, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x00, 0x00,
+x18, 0x0c, 0x00, 0x00, 0x08, 0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,
+xfc, 0x1f, 0x00, 0x00, 0x18, 0x0c, 0x00, 0x00, 0x08, 0x03, 0x00, 0x00,
+x80, 0x1f, 0x00, 0x00, 0xfc, 0x1f, 0x00, 0x00, 0x30, 0x18, 0x00, 0x00,
+x18, 0x02, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00,
+x30, 0x18, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00,
+xf8, 0x3f, 0x00, 0x00, 0x60, 0x10, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00,
+xe0, 0x7f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00,
+x38, 0x0c, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00,
+xe0, 0x20, 0x00, 0x00, 0x30, 0x0c, 0x00, 0x00, 0xe0, 0xff, 0x00, 0x00,
+xf0, 0x7f, 0x00, 0x00, 0xc0, 0x78, 0x00, 0x00, 0x70, 0x08, 0x00, 0x00,
+xe0, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0xc0, 0x7c, 0x00, 0x00,
+x70, 0x18, 0x00, 0x00, 0xe0, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x00,
+x80, 0xfd, 0x00, 0x00, 0x60, 0x3f, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00,
+xfc, 0xff, 0x01, 0x00, 0x80, 0xf9, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00,
+xc0, 0xff, 0x01, 0x80, 0xff, 0xff, 0x01, 0x00, 0x80, 0xfb, 0x00, 0x00,
+xc0, 0x7f, 0x00, 0x00, 0xc0, 0xff, 0x03, 0xe0, 0xff, 0xff, 0x03, 0x00,
+x00, 0xf3, 0x01, 0x00, 0xc0, 0x7f, 0x00, 0x00, 0x80, 0xff, 0x03, 0xfc,
+xff, 0xff, 0x03, 0x00, 0x00, 0xf3, 0x01, 0x00, 0xc0, 0x7f, 0x00, 0x00,
+x80, 0xff, 0x07, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0xf6, 0x03, 0x00,
+x80, 0xff, 0x00, 0x00, 0x00, 0xff, 0xe7, 0xff, 0xff, 0xff, 0x07, 0x00,
+x00, 0xe6, 0x03, 0x00, 0x80, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+xff, 0xff, 0x07, 0x00, 0x00, 0xec, 0x07, 0x00, 0x00, 0xff, 0x01, 0x00,
+x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0xcc, 0x07, 0x00,
+x00, 0xff, 0x01, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0x0f, 0x00,
+x00, 0xdc, 0x07, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xfe, 0xff, 0xff,
+x1f, 0xfe, 0x0f, 0x00, 0x00, 0xd8, 0x0f, 0x00, 0x00, 0xfe, 0x03, 0x00,
+x00, 0xfc, 0xff, 0xff, 0x03, 0xfe, 0x1f, 0x00, 0x00, 0x98, 0x0f, 0x00,
+x00, 0xfe, 0x03, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00, 0xfc, 0x1f, 0x00,
+x00, 0xb0, 0x1f, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, 0xf8, 0xff, 0x1f,
+x00, 0xfc, 0x3f, 0x00, 0x00, 0x30, 0x1f, 0x00, 0x00, 0xfc, 0x07, 0x00,
+x00, 0xf8, 0xff, 0x07, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x70, 0x1f, 0x00,
+x00, 0xfc, 0x07, 0x00, 0x00, 0xf8, 0xff, 0x00, 0x00, 0xf8, 0x7f, 0x00,
+x00, 0x60, 0x3e, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xf0, 0x7f, 0x00,
+x00, 0xf8, 0x7f, 0x00, 0x00, 0xe0, 0x3e, 0x00, 0x00, 0xf8, 0x0f, 0x00,
+x00, 0xf0, 0x7f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xf8, 0x7e, 0x00,
+x00, 0xf0, 0x1f, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x00,
+x00, 0xfc, 0x7c, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0xe0, 0xff, 0x00,
+x00, 0xf0, 0xff, 0x00, 0x00, 0xfe, 0xfd, 0x00, 0x00, 0xf0, 0x1f, 0x00,
+x00, 0xe0, 0xff, 0x01, 0x00, 0xe0, 0xff, 0x00, 0x80, 0xff, 0xf9, 0x00,
+x00, 0xe0, 0x3f, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, 0xe0, 0xff, 0x00,
+xc0, 0xff, 0xfb, 0x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0xc0, 0xff, 0x03,
+x00, 0xc0, 0x7f, 0x00, 0xe0, 0xff, 0xfb, 0x01, 0x00, 0xc0, 0x7f, 0x00,
+x00, 0x80, 0xff, 0x03, 0x00, 0xc0, 0x7f, 0x00, 0xf8, 0xff, 0xf7, 0x01,
+x00, 0xc0, 0x7f, 0x00, 0x00, 0x80, 0xff, 0x03, 0x00, 0x80, 0x3f, 0x00,
+xfc, 0xff, 0xf7, 0x03, 0x00, 0xc0, 0x7f, 0x00, 0x00, 0x80, 0xff, 0x07,
+x00, 0x00, 0x00, 0x00, 0xfe, 0xef, 0xe7, 0x03, 0x00, 0x80, 0xff, 0x00,
+x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x80, 0xff, 0xdf, 0xef, 0x07,
+x00, 0x80, 0xff, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xc0,
+xff, 0xdf, 0xef, 0x07, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x0f,
+x00, 0x00, 0x00, 0xe0, 0xff, 0xcf, 0xcf, 0x07, 0x00, 0x00, 0xff, 0x01,
+x00, 0x00, 0xfe, 0x1f, 0x00, 0x00, 0x00, 0xf0, 0x7f, 0xc3, 0xcf, 0x0f,
+x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x1f, 0x00, 0x00, 0x00, 0xfc,
+xff, 0xe0, 0xcf, 0x0f, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0xfc, 0x1f,
+x00, 0x00, 0x00, 0xfe, 0xff, 0xf9, 0xc7, 0x0f, 0x00, 0x00, 0xfe, 0x03,
+x00, 0x00, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe7, 0x0f,
+x00, 0x00, 0xfc, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xc0, 0xff,
+xff, 0xff, 0xe7, 0x0f, 0x00, 0x00, 0xfc, 0x07, 0x00, 0x00, 0xf8, 0x07,
+x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xe3, 0x0f, 0x00, 0x00, 0xfc, 0x0f,
+x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xf1, 0x0f,
+x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff,
+xff, 0xff, 0xf8, 0x0f, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0xfe, 0xff, 0xff, 0x3f, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1f,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x07, 0xfe, 0x0f,
+x00, 0x00, 0xf0, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff,
+xff, 0x81, 0xff, 0x07, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00,
+x00, 0xe0, 0xff, 0xff, 0x3f, 0xe0, 0xff, 0x07, 0x00, 0x00, 0xe0, 0x3f,
+x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x07, 0xfc, 0xff, 0x07,
+x00, 0x00, 0xe0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff,
+x80, 0xff, 0xff, 0x03, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00,
+x00, 0xfe, 0xff, 0x1f, 0xf0, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0x7f,
+x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x00,
+x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xc0,
+xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x80, 0xbf, 0x00, 0x00, 0x00, 0x00,
+xe0, 0xff, 0x1f, 0xf0, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x80, 0xdf,
+x00, 0x3c, 0x00, 0x00, 0xf0, 0xff, 0x03, 0xfe, 0xff, 0xff, 0x0f, 0x00,
+x00, 0x00, 0x00, 0xcf, 0x00, 0x7e, 0x00, 0x00, 0xfc, 0x7f, 0xc0, 0xff,
+xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x01, 0x7e, 0x00, 0x00,
+xfe, 0x0f, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97,
+x01, 0x3e, 0x00, 0x00, 0xff, 0x03, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00,
+x00, 0x00, 0x00, 0x9e, 0x03, 0x00, 0x00, 0xc0, 0x7f, 0xc0, 0xff, 0xff,
+xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x03, 0x00, 0x00, 0xe0,
+x0f, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c,
+x03, 0x00, 0x00, 0xf8, 0x01, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x7c, 0x06, 0x00, 0x00, 0x3f, 0xe0, 0xff, 0xff, 0xff,
+x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x0e, 0x00, 0xe0, 0x0f,
+xfc, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
+x3c, 0x00, 0xfc, 0x01, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0xf8, 0x78, 0x80, 0x3f, 0xe0, 0xff, 0xff, 0xff, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xe1, 0xff, 0x07, 0xfc,
+xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
+x81, 0xff, 0x80, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0xf0, 0xff, 0xff, 0xff, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0xfe, 0xff,
+xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
+x0f, 0x00, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0xc0, 0x3f, 0xc0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff,
+x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x1f,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x0f, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+xf0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

 /branches/dynload/kernel/genarch/src/mm/asid.c
 ,7 → 32,7
 /**
  * @file
- * @brief ASID management.
+ * @brief   ASID management.
  *
  * Modern processor architectures optimize TLB utilization
  * by using ASIDs (a.k.a. memory contexts on sparc64 and

 /branches/dynload/kernel/genarch/src/acpi/acpi.c
 ,12 → 49,8
 struct acpi_rsdt *acpi_rsdt = NULL;
 struct acpi_xsdt *acpi_xsdt = NULL;
-struct acpi_signature_map signature_map[] = {
-    {
-        (uint8_t *) "APIC",
-        (void *) &acpi_madt,
-        "Multiple APIC Description Table"
-    }
+struct acpi_signature_map signature_map[] = {
+    { (uint8_t *)"APIC", (void *) &acpi_madt, "Multiple APIC Description Table" }
 };
 static int rsdp_check(uint8_t *rsdp) {
 ,7 → 105,7
                 if (!acpi_sdt_check((uint8_t *) h))
                     goto next;
                 *signature_map[j].sdt_ptr = h;
-                LOG("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
             }
         }
 next:
 ,7 → 126,7
                 if (!acpi_sdt_check((uint8_t *) h))
                     goto next;
                 *signature_map[j].sdt_ptr = h;
-                LOG("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
             }
         }
 next:
 ,7 → 160,7
     return;
 rsdp_found:
-    LOG("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
+    printf("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
     acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;
     if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) acpi_rsdp->xsdt_address);

/branches/dynload/kernel/genarch/Makefile.inc
60,7 → 60,6
ifeq ($(CONFIG_FB),y)
GENARCH_SOURCES += \
genarch/src/fb/font-8x16.c \
genarch/src/fb/logo-196x66.c \
genarch/src/fb/fb.c
DEFS += -DCONFIG_FB
endif

 /branches/dynload/kernel/Makefile
 ,14 → 90,10
     DEFS += -DCONFIG_DEBUG
 endif
-ifeq ($(CONFIG_LOG),y)
-    DEFS += -DCONFIG_LOG
+ifeq ($(CONFIG_EDEBUG),y)
+    DEFS += -DCONFIG_EDEBUG
 endif
-ifeq ($(CONFIG_KCONSOLE),y)
-    DEFS += -DCONFIG_KCONSOLE
-endif
 ifeq ($(CONFIG_DEBUG_SPINLOCK),y)
     DEFS += -DCONFIG_DEBUG_SPINLOCK
 endif
 ,6 → 236,8
     generic/src/adt/list.c \
     generic/src/console/chardev.c \
     generic/src/console/console.c \
+    generic/src/console/kconsole.c \
+    generic/src/console/cmd.c \
     generic/src/cpu/cpu.c \
     generic/src/ddi/ddi.c \
     generic/src/ddi/irq.c \
 ,15 → 299,6
     generic/src/security/cap.c \
     generic/src/sysinfo/sysinfo.c
-## Kernel console support
-#
-ifeq ($(CONFIG_KCONSOLE),y)
-GENERIC_SOURCES += \
-    generic/src/console/kconsole.c \
-    generic/src/console/cmd.c
-endif
 ## Udebug interface sources
 #

/branches/dynload/kernel/arch/sparc64/include/drivers/scr.h
49,7 → 49,6
extern scr_type_t scr_type;

extern void scr_init(ofw_tree_node_t *node);
extern void scr_redraw(void);

#endif

 /branches/dynload/kernel/arch/sparc64/include/barrier.h
 ,8 → 82,6
     asm volatile ("membar #Sync\n");
 }
-#if defined (US)
 #define smc_coherence(a)    \
 {               \
     write_barrier();    \
 ,22 → 97,6
         flush((void *)(a) + i);         \
 }
-#elif defined (US3)
-#define smc_coherence(a)    \
-{               \
-    write_barrier();    \
-    flush_pipeline();   \
-}
-#define smc_coherence_block(a, l)   \
-{                   \
-    write_barrier();        \
-    flush_pipeline();       \
-}
-#endif  /* defined(US3) */
 #endif
 /** @}

/branches/dynload/kernel/arch/sparc64/src/console.c
175,7 → 175,6
*/
void arch_grab_console(void)
{
scr_redraw();
switch (kbd_type) {
#ifdef CONFIG_Z8530
case KBD_Z8530:

 /branches/dynload/kernel/arch/sparc64/src/drivers/kbd.c
 ,20 → 86,21
      */
     uint32_t interrupts;
     prop = ofw_tree_getprop(node, "interrupts");
-    if ((!prop) || (!prop->value))
+    if (!prop || !prop->value)
         panic("Can't find \"interrupts\" property.\n");
     interrupts = *((uint32_t *) prop->value);
     /*
      * Read 'reg' property.
      */
     prop = ofw_tree_getprop(node, "reg");
-    if ((!prop) || (!prop->value))
+    if (!prop || !prop->value)
         panic("Can't find \"reg\" property.\n");
     uintptr_t pa;
     size_t size;
     inr_t inr;
+    devno_t devno = device_assign_devno();
     switch (kbd_type) {
     case KBD_Z8530:
 ,9 → 132,9
             return;
         };
         break;
     default:
-        panic("Unexpected keyboard type.\n");
+        panic("Unexpected type.\n");
     }
     /*
 ,18 → 145,17
      */
     aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
     offset = pa - aligned_addr;
+    uintptr_t vaddr = hw_map(aligned_addr, offset + size) + offset;
     switch (kbd_type) {
 #ifdef CONFIG_Z8530
     case KBD_Z8530:
-        z8530_init(device_assign_devno(),
-            hw_map(aligned_addr, offset + size) + offset, inr, cir, cir_arg);
+        z8530_init(devno, vaddr, inr, cir, cir_arg);
         break;
 #endif
 #ifdef CONFIG_NS16550
     case KBD_NS16550:
-        ns16550_init(device_assign_devno(),
-            (ioport_t) (hw_map(aligned_addr, offset + size) + offset), inr, cir, cir_arg);
+        ns16550_init(devno, (ioport_t)vaddr, inr, cir, cir_arg);
         break;
 #endif
     default:

 /branches/dynload/kernel/arch/sparc64/src/drivers/scr.c
 ,7 → 78,6
     }
     uintptr_t fb_addr;
-    unsigned int fb_offset = 0;
     uint32_t fb_width = 0;
     uint32_t fb_height = 0;
     uint32_t fb_depth = 0;
 ,12 → 167,10
             return;
         }
-        fb_offset = 4 * 0x2000;
         switch (fb_depth) {
         case 8:
             fb_scanline = fb_linebytes * (fb_depth >> 3);
-            visual = VISUAL_INDIRECT_8;
+            visual = VISUAL_SB1500_PALETTE;
             break;
         case 16:
             fb_scanline = fb_linebytes * (fb_depth >> 3);
 ,7 → 225,7
     fb_properties_t props = {
         .addr = fb_addr,
-        .offset = fb_offset,
+        .offset = 0,
         .x = fb_width,
         .y = fb_height,
         .scan = fb_scanline,
 ,10 → 234,5
     fb_init(&props);
 }
-void scr_redraw(void)
-{
-    fb_redraw();
-}
 /** @}
  */

 /branches/dynload/kernel/arch/ia64/src/ski/ski.c
 ,8 → 229,6
     sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR);
     sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno);
     sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);
-    sysinfo_set_item_val("fb", NULL, false);
 }
 void ski_kbd_grab(void)

 /branches/dynload/kernel/arch/arm32/src/mm/tlb.c
 ,7 → 81,7
  * @param page Address of the first page whose entry is to be invalidated.
  * @param cnt Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
     unsigned int i;

/branches/dynload/kernel/arch/ppc32/src/ppc32.c
152,7 → 152,6
*/
void arch_grab_console(void)
{
fb_redraw();
cuda_grab();
}

 /branches/dynload/kernel/arch/mips32/src/console.c
 ,7 → 36,6
 #include <arch/console.h>
 #include <arch/drivers/serial.h>
 #include <arch/drivers/msim.h>
-#include <genarch/fb/fb.h>
 void console_init(devno_t devno)
 {
 ,9 → 50,6
  */
 void arch_grab_console(void)
 {
-#ifdef CONFIG_FB
-    fb_redraw();
-#endif
     msim_kbd_grab();
 }

 /branches/dynload/kernel/arch/mips32/src/debugger.c
 ,8 → 47,6
 bpinfo_t breakpoints[BKPOINTS_MAX];
 SPINLOCK_INITIALIZE(bkpoint_lock);
-#ifdef CONFIG_KCONSOLE
 static int cmd_print_breakpoints(cmd_arg_t *argv);
 static cmd_info_t bkpts_info = {
     .name = "bkpts",
 ,12 → 123,10
     {0, 0} /* EndOfTable */
 };
 /** Test, if the given instruction is a jump or branch instruction
  *
  * @param instr Instruction code
  * @return true - it is jump instruction, false otherwise
- *
  */
 static bool is_jump(unative_t instr)
 {
 ,8 → 267,6
     return 1;
 }
-#endif
 /** Initialize debugger */
 void debugger_init()
 {
 ,24 → 274,22
     for (i = 0; i < BKPOINTS_MAX; i++)
         breakpoints[i].address = NULL;
-#ifdef CONFIG_KCONSOLE
     cmd_initialize(&bkpts_info);
     if (!cmd_register(&bkpts_info))
-        printf("Cannot register command %s\n", bkpts_info.name);
+        panic("could not register command %s\n", bkpts_info.name);
     cmd_initialize(&delbkpt_info);
     if (!cmd_register(&delbkpt_info))
-        printf("Cannot register command %s\n", delbkpt_info.name);
+        panic("could not register command %s\n", delbkpt_info.name);
     cmd_initialize(&addbkpt_info);
     if (!cmd_register(&addbkpt_info))
-        printf("Cannot register command %s\n", addbkpt_info.name);
+        panic("could not register command %s\n", addbkpt_info.name);
     cmd_initialize(&addbkpte_info);
     if (!cmd_register(&addbkpte_info))
-        printf("Cannot register command %s\n", addbkpte_info.name);
-#endif
+        panic("could not register command %s\n", addbkpte_info.name);
 }
 /** Handle breakpoint
 ,20 → 367,19
         if (cur->bkfunc)
             cur->bkfunc(cur, istate);
     } else {
-#ifdef CONFIG_KCONSOLE
+        printf("***Type 'exit' to exit kconsole.\n");
         /* This disables all other processors - we are not SMP,
          * actually this gets us to cpu_halt, if scheduler() is run
          * - we generally do not want scheduler to be run from debug,
          *   so this is a good idea
          */
-        atomic_set(&haltstate, 1);
+        atomic_set(&haltstate,1);
         spinlock_unlock(&bkpoint_lock);
-        kconsole("debug", "Debug console ready (type 'exit' to continue)\n", false);
+        kconsole("debug");
         spinlock_lock(&bkpoint_lock);
-        atomic_set(&haltstate, 0);
-#endif
+        atomic_set(&haltstate,0);
     }
     if (cur && cur->address == fireaddr && (cur->flags & BKPOINT_INPROG)) {
         /* Remove one-shot breakpoint */

/branches/dynload/kernel/arch/mips32/src/exception.c
45,6 → 45,7
#include <print.h>
#include <interrupt.h>
#include <func.h>
#include <console/kconsole.h>
#include <ddi/irq.h>
#include <arch/debugger.h>

 /branches/dynload/kernel/arch/mips32/src/cpu/cpu.c
 ,7 → 48,7
     { "MIPS", "R2000" },        /* 0x01 */
     { "MIPS", "R3000" },        /* 0x02 */
     { "MIPS", "R6000" },        /* 0x03 */
-    { "MIPS", "R4000/R4400" },  /* 0x04 */
+    { "MIPS", " R4000/R4400" },     /* 0x04 */
     { "LSI Logic", "R3000" },   /* 0x05 */
     { "MIPS", "R6000A" },       /* 0x06 */
     { "IDT", "3051/3052" },     /* 0x07 */
 ,9 → 123,9
         data = &imp_data[m->arch.imp_num];
     }
-    printf("cpu%u: %s %s (rev=%d.%d, imp=%d)\n",
+    printf("cpu%d: %s %s (rev=%d.%d, imp=%d)\n",
         m->id, data->vendor, data->model, m->arch.rev_num >> 4,
-        m->arch.rev_num & 0x0f, m->arch.imp_num);
+        m->arch.rev_num & 0xf, m->arch.imp_num);
 }
 /** @}

 /branches/dynload/kernel/arch/mips32/include/mm/asid.h
 ,7 → 37,7
 #include <arch/types.h>
-#define ASID_MAX_ARCH  255    /* 2^8 - 1 */
+#define ASID_MAX_ARCH       255 /* 2^8 - 1 */
 typedef uint8_t asid_t;

 /branches/dynload/kernel/arch/ia32/src/drivers/vesa.c
 ,11 → 97,6
     fb_init(&vesa_props);
 }
-void vesa_redraw(void)
-{
-    fb_redraw();
-}
 #endif
 /** @}

 /branches/dynload/kernel/arch/ia32/src/cpu/cpu.c
 ,8 → 65,8
 static char *vendor_str[] = {
     "Unknown Vendor",
-    "AMD",
-    "Intel"
+    "AuthenticAMD",
+    "GenuineIntel"
 };
 void fpu_disable(void)
 ,7 → 77,7
         "mov %%eax,%%cr0;"
         :
         :
-        : "%eax"
+        :"%eax"
     );
 }
 ,7 → 89,7
         "mov %%eax,%%cr0;"
         :
         :
-        : "%eax"
+        :"%eax"
     );
 }
 ,31 → 140,29
         /*
          * Check for AMD processor.
          */
-        if ((info.cpuid_ebx == AMD_CPUID_EBX)
-            && (info.cpuid_ecx == AMD_CPUID_ECX)
-            && (info.cpuid_edx == AMD_CPUID_EDX))
+        if (info.cpuid_ebx==AMD_CPUID_EBX && info.cpuid_ecx==AMD_CPUID_ECX && info.cpuid_edx==AMD_CPUID_EDX) {
             CPU->arch.vendor = VendorAMD;
+        }
         /*
          * Check for Intel processor.
          */
-        if ((info.cpuid_ebx == INTEL_CPUID_EBX)
-            && (info.cpuid_ecx == INTEL_CPUID_ECX)
-            && (info.cpuid_edx == INTEL_CPUID_EDX))
+        if (info.cpuid_ebx==INTEL_CPUID_EBX && info.cpuid_ecx==INTEL_CPUID_ECX && info.cpuid_edx==INTEL_CPUID_EDX) {
             CPU->arch.vendor = VendorIntel;
+        }
         cpuid(1, &info);
-        CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
-        CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;
-        CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0f;
+        CPU->arch.family = (info.cpuid_eax>>8)&0xf;
+        CPU->arch.model = (info.cpuid_eax>>4)&0xf;
+        CPU->arch.stepping = (info.cpuid_eax>>0)&0xf;
     }
 }
-void cpu_print_report(cpu_t* cpu)
+void cpu_print_report(cpu_t* m)
 {
-    printf("cpu%u: (%s family=%u model=%u stepping=%u) %" PRIu16 " MHz\n",
-        cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
-        cpu->arch.model, cpu->arch.stepping, cpu->frequency_mhz);
+    printf("cpu%d: (%s family=%d model=%d stepping=%d) %dMHz\n",
+        m->id, vendor_str[m->arch.vendor], m->arch.family, m->arch.model, m->arch.stepping,
+        m->frequency_mhz);
 }
 /** @}

 /branches/dynload/kernel/arch/ia32/src/boot/vga323.pal
 ,256 → 1,256
+    .byte 0x00, 0x00, 0x00, 0x00
+    .byte 0x09, 0x00, 0x00, 0x00
+    .byte 0x12, 0x00, 0x00, 0x00
+    .byte 0x1b, 0x00, 0x00, 0x00
+    .byte 0x24, 0x00, 0x00, 0x00
+    .byte 0x2d, 0x00, 0x00, 0x00
+    .byte 0x36, 0x00, 0x00, 0x00
+    .byte 0x3f, 0x00, 0x00, 0x00
+    .byte 0x00, 0x15, 0x00, 0x00
+    .byte 0x09, 0x15, 0x00, 0x00
+    .byte 0x12, 0x15, 0x00, 0x00
+    .byte 0x1b, 0x15, 0x00, 0x00
+    .byte 0x24, 0x15, 0x00, 0x00
+    .byte 0x2d, 0x15, 0x00, 0x00
+    .byte 0x36, 0x15, 0x00, 0x00
+    .byte 0x3f, 0x15, 0x00, 0x00
+    .byte 0x00, 0x2a, 0x00, 0x00
+    .byte 0x09, 0x2a, 0x00, 0x00
+    .byte 0x12, 0x2a, 0x00, 0x00
+    .byte 0x1b, 0x2a, 0x00, 0x00
+    .byte 0x24, 0x2a, 0x00, 0x00
+    .byte 0x2d, 0x2a, 0x00, 0x00
+    .byte 0x36, 0x2a, 0x00, 0x00
+    .byte 0x3f, 0x2a, 0x00, 0x00
+    .byte 0x00, 0x3f, 0x00, 0x00
+    .byte 0x09, 0x3f, 0x00, 0x00
+    .byte 0x12, 0x3f, 0x00, 0x00
+    .byte 0x1b, 0x3f, 0x00, 0x00
+    .byte 0x24, 0x3f, 0x00, 0x00
+    .byte 0x2d, 0x3f, 0x00, 0x00
+    .byte 0x36, 0x3f, 0x00, 0x00
+    .byte 0x3f, 0x3f, 0x00, 0x00
+    .byte 0x00, 0x00, 0x09, 0x00
+    .byte 0x09, 0x00, 0x09, 0x00
+    .byte 0x12, 0x00, 0x09, 0x00
+    .byte 0x1b, 0x00, 0x09, 0x00
+    .byte 0x24, 0x00, 0x09, 0x00
+    .byte 0x2d, 0x00, 0x09, 0x00
+    .byte 0x36, 0x00, 0x09, 0x00
+    .byte 0x3f, 0x00, 0x09, 0x00
+    .byte 0x00, 0x15, 0x09, 0x00
+    .byte 0x09, 0x15, 0x09, 0x00
+    .byte 0x12, 0x15, 0x09, 0x00
+    .byte 0x1b, 0x15, 0x09, 0x00
+    .byte 0x24, 0x15, 0x09, 0x00
+    .byte 0x2d, 0x15, 0x09, 0x00
+    .byte 0x36, 0x15, 0x09, 0x00
+    .byte 0x3f, 0x15, 0x09, 0x00
+    .byte 0x00, 0x2a, 0x09, 0x00
+    .byte 0x09, 0x2a, 0x09, 0x00
+    .byte 0x12, 0x2a, 0x09, 0x00
+    .byte 0x1b, 0x2a, 0x09, 0x00
+    .byte 0x24, 0x2a, 0x09, 0x00
+    .byte 0x2d, 0x2a, 0x09, 0x00
+    .byte 0x36, 0x2a, 0x09, 0x00
+    .byte 0x3f, 0x2a, 0x09, 0x00
+    .byte 0x00, 0x3f, 0x09, 0x00
+    .byte 0x09, 0x3f, 0x09, 0x00
+    .byte 0x12, 0x3f, 0x09, 0x00
+    .byte 0x1b, 0x3f, 0x09, 0x00
+    .byte 0x24, 0x3f, 0x09, 0x00
+    .byte 0x2d, 0x3f, 0x09, 0x00
+    .byte 0x36, 0x3f, 0x09, 0x00
+    .byte 0x3f, 0x3f, 0x09, 0x00
+    .byte 0x00, 0x00, 0x12, 0x00
+    .byte 0x09, 0x00, 0x12, 0x00
+    .byte 0x12, 0x00, 0x12, 0x00
+    .byte 0x1b, 0x00, 0x12, 0x00
+    .byte 0x24, 0x00, 0x12, 0x00
+    .byte 0x2d, 0x00, 0x12, 0x00
+    .byte 0x36, 0x00, 0x12, 0x00
+    .byte 0x3f, 0x00, 0x12, 0x00
+    .byte 0x00, 0x15, 0x12, 0x00
+    .byte 0x09, 0x15, 0x12, 0x00
+    .byte 0x12, 0x15, 0x12, 0x00
+    .byte 0x1b, 0x15, 0x12, 0x00
+    .byte 0x24, 0x15, 0x12, 0x00
+    .byte 0x2d, 0x15, 0x12, 0x00
+    .byte 0x36, 0x15, 0x12, 0x00
+    .byte 0x3f, 0x15, 0x12, 0x00
+    .byte 0x00, 0x2a, 0x12, 0x00
+    .byte 0x09, 0x2a, 0x12, 0x00
+    .byte 0x12, 0x2a, 0x12, 0x00
+    .byte 0x1b, 0x2a, 0x12, 0x00
+    .byte 0x24, 0x2a, 0x12, 0x00
+    .byte 0x2d, 0x2a, 0x12, 0x00
+    .byte 0x36, 0x2a, 0x12, 0x00
+    .byte 0x3f, 0x2a, 0x12, 0x00
+    .byte 0x00, 0x3f, 0x12, 0x00
+    .byte 0x09, 0x3f, 0x12, 0x00
+    .byte 0x12, 0x3f, 0x12, 0x00
+    .byte 0x1b, 0x3f, 0x12, 0x00
+    .byte 0x24, 0x3f, 0x12, 0x00
+    .byte 0x2d, 0x3f, 0x12, 0x00
+    .byte 0x36, 0x3f, 0x12, 0x00
+    .byte 0x3f, 0x3f, 0x12, 0x00
+    .byte 0x00, 0x00, 0x1b, 0x00
+    .byte 0x09, 0x00, 0x1b, 0x00
+    .byte 0x12, 0x00, 0x1b, 0x00
+    .byte 0x1b, 0x00, 0x1b, 0x00
+    .byte 0x24, 0x00, 0x1b, 0x00
+    .byte 0x2d, 0x00, 0x1b, 0x00
+    .byte 0x36, 0x00, 0x1b, 0x00
+    .byte 0x3f, 0x00, 0x1b, 0x00
+    .byte 0x00, 0x15, 0x1b, 0x00
+    .byte 0x09, 0x15, 0x1b, 0x00
+    .byte 0x12, 0x15, 0x1b, 0x00
+    .byte 0x1b, 0x15, 0x1b, 0x00
+    .byte 0x24, 0x15, 0x1b, 0x00
+    .byte 0x2d, 0x15, 0x1b, 0x00
+    .byte 0x36, 0x15, 0x1b, 0x00
+    .byte 0x3f, 0x15, 0x1b, 0x00
+    .byte 0x00, 0x2a, 0x1b, 0x00
+    .byte 0x09, 0x2a, 0x1b, 0x00
+    .byte 0x12, 0x2a, 0x1b, 0x00
+    .byte 0x1b, 0x2a, 0x1b, 0x00
+    .byte 0x24, 0x2a, 0x1b, 0x00
+    .byte 0x2d, 0x2a, 0x1b, 0x00
+    .byte 0x36, 0x2a, 0x1b, 0x00
+    .byte 0x3f, 0x2a, 0x1b, 0x00
+    .byte 0x00, 0x3f, 0x1b, 0x00
+    .byte 0x09, 0x3f, 0x1b, 0x00
+    .byte 0x12, 0x3f, 0x1b, 0x00
+    .byte 0x1b, 0x3f, 0x1b, 0x00
+    .byte 0x24, 0x3f, 0x1b, 0x00
+    .byte 0x2d, 0x3f, 0x1b, 0x00
+    .byte 0x36, 0x3f, 0x1b, 0x00
+    .byte 0x3f, 0x3f, 0x1b, 0x00
+    .byte 0x00, 0x00, 0x24, 0x00
+    .byte 0x09, 0x00, 0x24, 0x00
+    .byte 0x12, 0x00, 0x24, 0x00
+    .byte 0x1b, 0x00, 0x24, 0x00
+    .byte 0x24, 0x00, 0x24, 0x00
+    .byte 0x2d, 0x00, 0x24, 0x00
+    .byte 0x36, 0x00, 0x24, 0x00
+    .byte 0x3f, 0x00, 0x24, 0x00
+    .byte 0x00, 0x15, 0x24, 0x00
+    .byte 0x09, 0x15, 0x24, 0x00
+    .byte 0x12, 0x15, 0x24, 0x00
+    .byte 0x1b, 0x15, 0x24, 0x00
+    .byte 0x24, 0x15, 0x24, 0x00
+    .byte 0x2d, 0x15, 0x24, 0x00
+    .byte 0x36, 0x15, 0x24, 0x00
+    .byte 0x3f, 0x15, 0x24, 0x00
+    .byte 0x00, 0x2a, 0x24, 0x00
+    .byte 0x09, 0x2a, 0x24, 0x00
+    .byte 0x12, 0x2a, 0x24, 0x00
+    .byte 0x1b, 0x2a, 0x24, 0x00
+    .byte 0x24, 0x2a, 0x24, 0x00
+    .byte 0x2d, 0x2a, 0x24, 0x00
+    .byte 0x36, 0x2a, 0x24, 0x00
+    .byte 0x3f, 0x2a, 0x24, 0x00
+    .byte 0x00, 0x3f, 0x24, 0x00
+    .byte 0x09, 0x3f, 0x24, 0x00
+    .byte 0x12, 0x3f, 0x24, 0x00
+    .byte 0x1b, 0x3f, 0x24, 0x00
+    .byte 0x24, 0x3f, 0x24, 0x00
+    .byte 0x2d, 0x3f, 0x24, 0x00
+    .byte 0x36, 0x3f, 0x24, 0x00
+    .byte 0x3f, 0x3f, 0x24, 0x00
+    .byte 0x00, 0x00, 0x2d, 0x00
+    .byte 0x09, 0x00, 0x2d, 0x00
+    .byte 0x12, 0x00, 0x2d, 0x00
+    .byte 0x1b, 0x00, 0x2d, 0x00
+    .byte 0x24, 0x00, 0x2d, 0x00
+    .byte 0x2d, 0x00, 0x2d, 0x00
+    .byte 0x36, 0x00, 0x2d, 0x00
+    .byte 0x3f, 0x00, 0x2d, 0x00
+    .byte 0x00, 0x15, 0x2d, 0x00
+    .byte 0x09, 0x15, 0x2d, 0x00
+    .byte 0x12, 0x15, 0x2d, 0x00
+    .byte 0x1b, 0x15, 0x2d, 0x00
+    .byte 0x24, 0x15, 0x2d, 0x00
+    .byte 0x2d, 0x15, 0x2d, 0x00
+    .byte 0x36, 0x15, 0x2d, 0x00
+    .byte 0x3f, 0x15, 0x2d, 0x00
+    .byte 0x00, 0x2a, 0x2d, 0x00
+    .byte 0x09, 0x2a, 0x2d, 0x00
+    .byte 0x12, 0x2a, 0x2d, 0x00
+    .byte 0x1b, 0x2a, 0x2d, 0x00
+    .byte 0x24, 0x2a, 0x2d, 0x00
+    .byte 0x2d, 0x2a, 0x2d, 0x00
+    .byte 0x36, 0x2a, 0x2d, 0x00
+    .byte 0x3f, 0x2a, 0x2d, 0x00
+    .byte 0x00, 0x3f, 0x2d, 0x00
+    .byte 0x09, 0x3f, 0x2d, 0x00
+    .byte 0x12, 0x3f, 0x2d, 0x00
+    .byte 0x1b, 0x3f, 0x2d, 0x00
+    .byte 0x24, 0x3f, 0x2d, 0x00
+    .byte 0x2d, 0x3f, 0x2d, 0x00
+    .byte 0x36, 0x3f, 0x2d, 0x00
+    .byte 0x3f, 0x3f, 0x2d, 0x00
+    .byte 0x00, 0x00, 0x36, 0x00
+    .byte 0x09, 0x00, 0x36, 0x00
+    .byte 0x12, 0x00, 0x36, 0x00
+    .byte 0x1b, 0x00, 0x36, 0x00
+    .byte 0x24, 0x00, 0x36, 0x00
+    .byte 0x2d, 0x00, 0x36, 0x00
+    .byte 0x36, 0x00, 0x36, 0x00
+    .byte 0x3f, 0x00, 0x36, 0x00
+    .byte 0x00, 0x15, 0x36, 0x00
+    .byte 0x09, 0x15, 0x36, 0x00
+    .byte 0x12, 0x15, 0x36, 0x00
+    .byte 0x1b, 0x15, 0x36, 0x00
+    .byte 0x24, 0x15, 0x36, 0x00
+    .byte 0x2d, 0x15, 0x36, 0x00
+    .byte 0x36, 0x15, 0x36, 0x00
+    .byte 0x3f, 0x15, 0x36, 0x00
+    .byte 0x00, 0x2a, 0x36, 0x00
+    .byte 0x09, 0x2a, 0x36, 0x00
+    .byte 0x12, 0x2a, 0x36, 0x00
+    .byte 0x1b, 0x2a, 0x36, 0x00
+    .byte 0x24, 0x2a, 0x36, 0x00
+    .byte 0x2d, 0x2a, 0x36, 0x00
+    .byte 0x36, 0x2a, 0x36, 0x00
+    .byte 0x3f, 0x2a, 0x36, 0x00
+    .byte 0x00, 0x3f, 0x36, 0x00
+    .byte 0x09, 0x3f, 0x36, 0x00
+    .byte 0x12, 0x3f, 0x36, 0x00
+    .byte 0x1b, 0x3f, 0x36, 0x00
+    .byte 0x24, 0x3f, 0x36, 0x00
+    .byte 0x2d, 0x3f, 0x36, 0x00
+    .byte 0x36, 0x3f, 0x36, 0x00
+    .byte 0x3f, 0x3f, 0x36, 0x00
+    .byte 0x00, 0x00, 0x3f, 0x00
+    .byte 0x09, 0x00, 0x3f, 0x00
+    .byte 0x12, 0x00, 0x3f, 0x00
+    .byte 0x1b, 0x00, 0x3f, 0x00
+    .byte 0x24, 0x00, 0x3f, 0x00
+    .byte 0x2d, 0x00, 0x3f, 0x00
+    .byte 0x36, 0x00, 0x3f, 0x00
+    .byte 0x3f, 0x00, 0x3f, 0x00
+    .byte 0x00, 0x15, 0x3f, 0x00
+    .byte 0x09, 0x15, 0x3f, 0x00
+    .byte 0x12, 0x15, 0x3f, 0x00
+    .byte 0x1b, 0x15, 0x3f, 0x00
+    .byte 0x24, 0x15, 0x3f, 0x00
+    .byte 0x2d, 0x15, 0x3f, 0x00
+    .byte 0x36, 0x15, 0x3f, 0x00
+    .byte 0x3f, 0x15, 0x3f, 0x00
+    .byte 0x00, 0x2a, 0x3f, 0x00
+    .byte 0x09, 0x2a, 0x3f, 0x00
+    .byte 0x12, 0x2a, 0x3f, 0x00
+    .byte 0x1b, 0x2a, 0x3f, 0x00
+    .byte 0x24, 0x2a, 0x3f, 0x00
+    .byte 0x2d, 0x2a, 0x3f, 0x00
+    .byte 0x36, 0x2a, 0x3f, 0x00
+    .byte 0x3f, 0x2a, 0x3f, 0x00
+    .byte 0x00, 0x3f, 0x3f, 0x00
+    .byte 0x09, 0x3f, 0x3f, 0x00
+    .byte 0x12, 0x3f, 0x3f, 0x00
+    .byte 0x1b, 0x3f, 0x3f, 0x00
+    .byte 0x24, 0x3f, 0x3f, 0x00
+    .byte 0x2d, 0x3f, 0x3f, 0x00
+    .byte 0x36, 0x3f, 0x3f, 0x00
     .byte 0x3f, 0x3f, 0x3f, 0x00
-    .byte 0x36, 0x3f, 0x3f, 0x00
-    .byte 0x2d, 0x3f, 0x3f, 0x00
-    .byte 0x24, 0x3f, 0x3f, 0x00
-    .byte 0x1b, 0x3f, 0x3f, 0x00
-    .byte 0x12, 0x3f, 0x3f, 0x00
-    .byte 0x09, 0x3f, 0x3f, 0x00
-    .byte 0x00, 0x3f, 0x3f, 0x00
-    .byte 0x3f, 0x2a, 0x3f, 0x00
-    .byte 0x36, 0x2a, 0x3f, 0x00
-    .byte 0x2d, 0x2a, 0x3f, 0x00
-    .byte 0x24, 0x2a, 0x3f, 0x00
-    .byte 0x1b, 0x2a, 0x3f, 0x00
-    .byte 0x12, 0x2a, 0x3f, 0x00
-    .byte 0x09, 0x2a, 0x3f, 0x00
-    .byte 0x00, 0x2a, 0x3f, 0x00
-    .byte 0x3f, 0x15, 0x3f, 0x00
-    .byte 0x36, 0x15, 0x3f, 0x00
-    .byte 0x2d, 0x15, 0x3f, 0x00
-    .byte 0x24, 0x15, 0x3f, 0x00
-    .byte 0x1b, 0x15, 0x3f, 0x00
-    .byte 0x12, 0x15, 0x3f, 0x00
-    .byte 0x09, 0x15, 0x3f, 0x00
-    .byte 0x00, 0x15, 0x3f, 0x00
-    .byte 0x3f, 0x00, 0x3f, 0x00
-    .byte 0x36, 0x00, 0x3f, 0x00
-    .byte 0x2d, 0x00, 0x3f, 0x00
-    .byte 0x24, 0x00, 0x3f, 0x00
-    .byte 0x1b, 0x00, 0x3f, 0x00
-    .byte 0x12, 0x00, 0x3f, 0x00
-    .byte 0x09, 0x00, 0x3f, 0x00
-    .byte 0x00, 0x00, 0x3f, 0x00
-    .byte 0x3f, 0x3f, 0x36, 0x00
-    .byte 0x36, 0x3f, 0x36, 0x00
-    .byte 0x2d, 0x3f, 0x36, 0x00
-    .byte 0x24, 0x3f, 0x36, 0x00
-    .byte 0x1b, 0x3f, 0x36, 0x00
-    .byte 0x12, 0x3f, 0x36, 0x00
-    .byte 0x09, 0x3f, 0x36, 0x00
-    .byte 0x00, 0x3f, 0x36, 0x00
-    .byte 0x3f, 0x2a, 0x36, 0x00
-    .byte 0x36, 0x2a, 0x36, 0x00
-    .byte 0x2d, 0x2a, 0x36, 0x00
-    .byte 0x24, 0x2a, 0x36, 0x00
-    .byte 0x1b, 0x2a, 0x36, 0x00
-    .byte 0x12, 0x2a, 0x36, 0x00
-    .byte 0x09, 0x2a, 0x36, 0x00
-    .byte 0x00, 0x2a, 0x36, 0x00
-    .byte 0x3f, 0x15, 0x36, 0x00
-    .byte 0x36, 0x15, 0x36, 0x00
-    .byte 0x2d, 0x15, 0x36, 0x00
-    .byte 0x24, 0x15, 0x36, 0x00
-    .byte 0x1b, 0x15, 0x36, 0x00
-    .byte 0x12, 0x15, 0x36, 0x00
-    .byte 0x09, 0x15, 0x36, 0x00
-    .byte 0x00, 0x15, 0x36, 0x00
-    .byte 0x3f, 0x00, 0x36, 0x00
-    .byte 0x36, 0x00, 0x36, 0x00
-    .byte 0x2d, 0x00, 0x36, 0x00
-    .byte 0x24, 0x00, 0x36, 0x00
-    .byte 0x1b, 0x00, 0x36, 0x00
-    .byte 0x12, 0x00, 0x36, 0x00
-    .byte 0x09, 0x00, 0x36, 0x00
-    .byte 0x00, 0x00, 0x36, 0x00
-    .byte 0x3f, 0x3f, 0x2d, 0x00
-    .byte 0x36, 0x3f, 0x2d, 0x00
-    .byte 0x2d, 0x3f, 0x2d, 0x00
-    .byte 0x24, 0x3f, 0x2d, 0x00
-    .byte 0x1b, 0x3f, 0x2d, 0x00
-    .byte 0x12, 0x3f, 0x2d, 0x00
-    .byte 0x09, 0x3f, 0x2d, 0x00
-    .byte 0x00, 0x3f, 0x2d, 0x00
-    .byte 0x3f, 0x2a, 0x2d, 0x00
-    .byte 0x36, 0x2a, 0x2d, 0x00
-    .byte 0x2d, 0x2a, 0x2d, 0x00
-    .byte 0x24, 0x2a, 0x2d, 0x00
-    .byte 0x1b, 0x2a, 0x2d, 0x00
-    .byte 0x12, 0x2a, 0x2d, 0x00
-    .byte 0x09, 0x2a, 0x2d, 0x00
-    .byte 0x00, 0x2a, 0x2d, 0x00
-    .byte 0x3f, 0x15, 0x2d, 0x00
-    .byte 0x36, 0x15, 0x2d, 0x00
-    .byte 0x2d, 0x15, 0x2d, 0x00
-    .byte 0x24, 0x15, 0x2d, 0x00
-    .byte 0x1b, 0x15, 0x2d, 0x00
-    .byte 0x12, 0x15, 0x2d, 0x00
-    .byte 0x09, 0x15, 0x2d, 0x00
-    .byte 0x00, 0x15, 0x2d, 0x00
-    .byte 0x3f, 0x00, 0x2d, 0x00
-    .byte 0x36, 0x00, 0x2d, 0x00
-    .byte 0x2d, 0x00, 0x2d, 0x00
-    .byte 0x24, 0x00, 0x2d, 0x00
-    .byte 0x1b, 0x00, 0x2d, 0x00
-    .byte 0x12, 0x00, 0x2d, 0x00
-    .byte 0x09, 0x00, 0x2d, 0x00
-    .byte 0x00, 0x00, 0x2d, 0x00
-    .byte 0x3f, 0x3f, 0x24, 0x00
-    .byte 0x36, 0x3f, 0x24, 0x00
-    .byte 0x2d, 0x3f, 0x24, 0x00
-    .byte 0x24, 0x3f, 0x24, 0x00
-    .byte 0x1b, 0x3f, 0x24, 0x00
-    .byte 0x12, 0x3f, 0x24, 0x00
-    .byte 0x09, 0x3f, 0x24, 0x00
-    .byte 0x00, 0x3f, 0x24, 0x00
-    .byte 0x3f, 0x2a, 0x24, 0x00
-    .byte 0x36, 0x2a, 0x24, 0x00
-    .byte 0x2d, 0x2a, 0x24, 0x00
-    .byte 0x24, 0x2a, 0x24, 0x00
-    .byte 0x1b, 0x2a, 0x24, 0x00
-    .byte 0x12, 0x2a, 0x24, 0x00
-    .byte 0x09, 0x2a, 0x24, 0x00
-    .byte 0x00, 0x2a, 0x24, 0x00
-    .byte 0x3f, 0x15, 0x24, 0x00
-    .byte 0x36, 0x15, 0x24, 0x00
-    .byte 0x2d, 0x15, 0x24, 0x00
-    .byte 0x24, 0x15, 0x24, 0x00
-    .byte 0x1b, 0x15, 0x24, 0x00
-    .byte 0x12, 0x15, 0x24, 0x00
-    .byte 0x09, 0x15, 0x24, 0x00
-    .byte 0x00, 0x15, 0x24, 0x00
-    .byte 0x3f, 0x00, 0x24, 0x00
-    .byte 0x36, 0x00, 0x24, 0x00
-    .byte 0x2d, 0x00, 0x24, 0x00
-    .byte 0x24, 0x00, 0x24, 0x00
-    .byte 0x1b, 0x00, 0x24, 0x00
-    .byte 0x12, 0x00, 0x24, 0x00
-    .byte 0x09, 0x00, 0x24, 0x00
-    .byte 0x00, 0x00, 0x24, 0x00
-    .byte 0x3f, 0x3f, 0x1b, 0x00
-    .byte 0x36, 0x3f, 0x1b, 0x00
-    .byte 0x2d, 0x3f, 0x1b, 0x00
-    .byte 0x24, 0x3f, 0x1b, 0x00
-    .byte 0x1b, 0x3f, 0x1b, 0x00
-    .byte 0x12, 0x3f, 0x1b, 0x00
-    .byte 0x09, 0x3f, 0x1b, 0x00
-    .byte 0x00, 0x3f, 0x1b, 0x00
-    .byte 0x3f, 0x2a, 0x1b, 0x00
-    .byte 0x36, 0x2a, 0x1b, 0x00
-    .byte 0x2d, 0x2a, 0x1b, 0x00
-    .byte 0x24, 0x2a, 0x1b, 0x00
-    .byte 0x1b, 0x2a, 0x1b, 0x00
-    .byte 0x12, 0x2a, 0x1b, 0x00
-    .byte 0x09, 0x2a, 0x1b, 0x00
-    .byte 0x00, 0x2a, 0x1b, 0x00
-    .byte 0x3f, 0x15, 0x1b, 0x00
-    .byte 0x36, 0x15, 0x1b, 0x00
-    .byte 0x2d, 0x15, 0x1b, 0x00
-    .byte 0x24, 0x15, 0x1b, 0x00
-    .byte 0x1b, 0x15, 0x1b, 0x00
-    .byte 0x12, 0x15, 0x1b, 0x00
-    .byte 0x09, 0x15, 0x1b, 0x00
-    .byte 0x00, 0x15, 0x1b, 0x00
-    .byte 0x3f, 0x00, 0x1b, 0x00
-    .byte 0x36, 0x00, 0x1b, 0x00
-    .byte 0x2d, 0x00, 0x1b, 0x00
-    .byte 0x24, 0x00, 0x1b, 0x00
-    .byte 0x1b, 0x00, 0x1b, 0x00
-    .byte 0x12, 0x00, 0x1b, 0x00
-    .byte 0x09, 0x00, 0x1b, 0x00
-    .byte 0x00, 0x00, 0x1b, 0x00
-    .byte 0x3f, 0x3f, 0x12, 0x00
-    .byte 0x36, 0x3f, 0x12, 0x00
-    .byte 0x2d, 0x3f, 0x12, 0x00
-    .byte 0x24, 0x3f, 0x12, 0x00
-    .byte 0x1b, 0x3f, 0x12, 0x00
-    .byte 0x12, 0x3f, 0x12, 0x00
-    .byte 0x09, 0x3f, 0x12, 0x00
-    .byte 0x00, 0x3f, 0x12, 0x00
-    .byte 0x3f, 0x2a, 0x12, 0x00
-    .byte 0x36, 0x2a, 0x12, 0x00
-    .byte 0x2d, 0x2a, 0x12, 0x00
-    .byte 0x24, 0x2a, 0x12, 0x00
-    .byte 0x1b, 0x2a, 0x12, 0x00
-    .byte 0x12, 0x2a, 0x12, 0x00
-    .byte 0x09, 0x2a, 0x12, 0x00
-    .byte 0x00, 0x2a, 0x12, 0x00
-    .byte 0x3f, 0x15, 0x12, 0x00
-    .byte 0x36, 0x15, 0x12, 0x00
-    .byte 0x2d, 0x15, 0x12, 0x00
-    .byte 0x24, 0x15, 0x12, 0x00
-    .byte 0x1b, 0x15, 0x12, 0x00
-    .byte 0x12, 0x15, 0x12, 0x00
-    .byte 0x09, 0x15, 0x12, 0x00
-    .byte 0x00, 0x15, 0x12, 0x00
-    .byte 0x3f, 0x00, 0x12, 0x00
-    .byte 0x36, 0x00, 0x12, 0x00
-    .byte 0x2d, 0x00, 0x12, 0x00
-    .byte 0x24, 0x00, 0x12, 0x00
-    .byte 0x1b, 0x00, 0x12, 0x00
-    .byte 0x12, 0x00, 0x12, 0x00
-    .byte 0x09, 0x00, 0x12, 0x00
-    .byte 0x00, 0x00, 0x12, 0x00
-    .byte 0x3f, 0x3f, 0x09, 0x00
-    .byte 0x36, 0x3f, 0x09, 0x00
-    .byte 0x2d, 0x3f, 0x09, 0x00
-    .byte 0x24, 0x3f, 0x09, 0x00
-    .byte 0x1b, 0x3f, 0x09, 0x00
-    .byte 0x12, 0x3f, 0x09, 0x00
-    .byte 0x09, 0x3f, 0x09, 0x00
-    .byte 0x00, 0x3f, 0x09, 0x00
-    .byte 0x3f, 0x2a, 0x09, 0x00
-    .byte 0x36, 0x2a, 0x09, 0x00
-    .byte 0x2d, 0x2a, 0x09, 0x00
-    .byte 0x24, 0x2a, 0x09, 0x00
-    .byte 0x1b, 0x2a, 0x09, 0x00
-    .byte 0x12, 0x2a, 0x09, 0x00
-    .byte 0x09, 0x2a, 0x09, 0x00
-    .byte 0x00, 0x2a, 0x09, 0x00
-    .byte 0x3f, 0x15, 0x09, 0x00
-    .byte 0x36, 0x15, 0x09, 0x00
-    .byte 0x2d, 0x15, 0x09, 0x00
-    .byte 0x24, 0x15, 0x09, 0x00
-    .byte 0x1b, 0x15, 0x09, 0x00
-    .byte 0x12, 0x15, 0x09, 0x00
-    .byte 0x09, 0x15, 0x09, 0x00
-    .byte 0x00, 0x15, 0x09, 0x00
-    .byte 0x3f, 0x00, 0x09, 0x00
-    .byte 0x36, 0x00, 0x09, 0x00
-    .byte 0x2d, 0x00, 0x09, 0x00
-    .byte 0x24, 0x00, 0x09, 0x00
-    .byte 0x1b, 0x00, 0x09, 0x00
-    .byte 0x12, 0x00, 0x09, 0x00
-    .byte 0x09, 0x00, 0x09, 0x00
-    .byte 0x00, 0x00, 0x09, 0x00
-    .byte 0x3f, 0x3f, 0x00, 0x00
-    .byte 0x36, 0x3f, 0x00, 0x00
-    .byte 0x2d, 0x3f, 0x00, 0x00
-    .byte 0x24, 0x3f, 0x00, 0x00
-    .byte 0x1b, 0x3f, 0x00, 0x00
-    .byte 0x12, 0x3f, 0x00, 0x00
-    .byte 0x09, 0x3f, 0x00, 0x00
-    .byte 0x00, 0x3f, 0x00, 0x00
-    .byte 0x3f, 0x2a, 0x00, 0x00
-    .byte 0x36, 0x2a, 0x00, 0x00
-    .byte 0x2d, 0x2a, 0x00, 0x00
-    .byte 0x24, 0x2a, 0x00, 0x00
-    .byte 0x1b, 0x2a, 0x00, 0x00
-    .byte 0x12, 0x2a, 0x00, 0x00
-    .byte 0x09, 0x2a, 0x00, 0x00
-    .byte 0x00, 0x2a, 0x00, 0x00
-    .byte 0x3f, 0x15, 0x00, 0x00
-    .byte 0x36, 0x15, 0x00, 0x00
-    .byte 0x2d, 0x15, 0x00, 0x00
-    .byte 0x24, 0x15, 0x00, 0x00
-    .byte 0x1b, 0x15, 0x00, 0x00
-    .byte 0x12, 0x15, 0x00, 0x00
-    .byte 0x09, 0x15, 0x00, 0x00
-    .byte 0x00, 0x15, 0x00, 0x00
-    .byte 0x3f, 0x00, 0x00, 0x00
-    .byte 0x36, 0x00, 0x00, 0x00
-    .byte 0x2d, 0x00, 0x00, 0x00
-    .byte 0x24, 0x00, 0x00, 0x00
-    .byte 0x1b, 0x00, 0x00, 0x00
-    .byte 0x12, 0x00, 0x00, 0x00
-    .byte 0x09, 0x00, 0x00, 0x00
-    .byte 0x00, 0x00, 0x00, 0x00

 /branches/dynload/kernel/arch/ia32/src/ia32.c
 ,7 → 93,7
             vesa_init();
         else
 #endif
-            ega_init(); /* video */
+            ega_init(); /* video */
         /* Enable debugger */
         debugger_init();
 ,15 → 159,8
  */
 void arch_grab_console(void)
 {
-#ifdef CONFIG_FB
-    vesa_redraw();
-#else
-    ega_redraw();
-#endif
     i8042_grab();
 }
 /** Return console to userspace
  *
  */

 /branches/dynload/kernel/arch/ia32/include/cpu.h
 ,10 → 51,10
 #include <arch/asm.h>
 typedef struct {
-    unsigned int vendor;
-    unsigned int family;
-    unsigned int model;
-    unsigned int stepping;
+    int vendor;
+    int family;
+    int model;
+    int stepping;
     struct tss *tss;
     count_t iomapver_copy;  /** Copy of TASK's I/O Permission bitmap generation count. */

 /branches/dynload/kernel/arch/ia32/include/mm/as.h
 ,7 → 42,7
 #define USER_ADDRESS_SPACE_START_ARCH       ((unsigned long) 0x00000000)
 #define USER_ADDRESS_SPACE_END_ARCH     ((unsigned long) 0x7fffffff)
-#define USTACK_ADDRESS_ARCH (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))
+#define USTACK_ADDRESS_ARCH (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
 typedef struct {
 } as_arch_t;

/branches/dynload/kernel/arch/ia32/include/drivers/ega.h
40,7 → 40,6
#define ROWS 25
#define SCREEN (ROW * ROWS)

extern void ega_redraw(void);
extern void ega_init(void);

#endif

/branches/dynload/kernel/arch/ia32/include/drivers/vesa.h
36,7 → 36,6
#define KERN_ia32_VESA_H_

extern int vesa_present(void);
extern void vesa_redraw(void);
extern void vesa_init(void);

#endif

 /branches/dynload/kernel/arch/amd64/include/drivers/vesa.h
 ,0 → 1,44
+/*
+ * Copyright (c) 2006-2006 Jakub Vana
+ * 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 amd64
+ * @{
+ */
+/** @file
+ */
+#ifndef KERN_amd64_VESA_H_
+#define KERN_amd64_VESA_H_
+int vesa_present(void);
+void vesa_init(void);
+#endif
+/** @}
+ */

/branches/dynload/kernel/arch/amd64/include/drivers/i8254.h
0,0 → 1,0
link ../../../ia32/include/drivers/i8254.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/amd64/include/drivers/i8259.h
0,0 → 1,0
link ../../../ia32/include/drivers/i8259.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/amd64/include/drivers/ega.h
0,0 → 1,0
link ../../../ia32/include/drivers/ega.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

/branches/dynload/kernel/arch/amd64/include/drivers/i8042.h
0,0 → 1,0
link ../../../ia32/include/drivers/i8042.h
Property changes:
Added: svn:special
+*
\ No newline at end of property

 /branches/dynload/kernel/arch/amd64/src/debugger.c
 ,8 → 54,6
 static bpinfo_t breakpoints[BKPOINTS_MAX];
 SPINLOCK_INITIALIZE(bkpoint_lock);
-#ifdef CONFIG_KCONSOLE
 static int cmd_print_breakpoints(cmd_arg_t *argv);
 static cmd_info_t bkpts_info = {
     .name = "bkpts",
 ,9 → 99,44
     .argv = &addw_argv
 };
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
-#endif /* CONFIG_KCONSOLE */
+#endif
+/** Print table of active breakpoints */
+int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
+{
+    unsigned int i;
+    char *symbol;
+#ifdef __32_BITS__
+    printf("#  Count Address    In symbol\n");
+    printf("-- ----- ---------- ---------\n");
+#endif
+#ifdef __64_BITS__
+    printf("#  Count Address            In symbol\n");
+    printf("-- ----- ------------------ ---------\n");
+#endif
+    for (i = 0; i < BKPOINTS_MAX; i++)
+        if (breakpoints[i].address) {
+            symbol = get_symtab_entry(breakpoints[i].address);
+#ifdef __32_BITS__
+            printf("%-2u %-5d %#10zx %s\n", i,
+                breakpoints[i].counter, breakpoints[i].address,
+                symbol);
+#endif
+#ifdef __64_BITS__
+            printf("%-2u %-5d %#18zx %s\n", i,
+                breakpoints[i].counter, breakpoints[i].address,
+                symbol);
+#endif
+        }
+    return 1;
+}
 /* Setup DR register according to table */
 static void setup_dr(int curidx)
 {
 ,12 → 267,10
     }
     printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
         get_symtab_entry(getip(istate)));
-#ifdef CONFIG_KCONSOLE
-    atomic_set(&haltstate, 1);
-    kconsole("debug", "Debug console ready (type 'exit' to continue)\n", false);
-    atomic_set(&haltstate, 0);
-#endif
+    printf("***Type 'exit' to exit kconsole.\n");
+    atomic_set(&haltstate,1);
+    kconsole((void *) "debug");
+    atomic_set(&haltstate,0);
 }
 void breakpoint_del(int slot)
 ,8 → 299,42
 #endif
 }
+#ifndef CONFIG_DEBUG_AS_WATCHPOINT
+/** Remove breakpoint from table */
+int cmd_del_breakpoint(cmd_arg_t *argv)
+{
+    unative_t bpno = argv->intval;
+    if (bpno > BKPOINTS_MAX) {
+        printf("Invalid breakpoint number.\n");
+        return 0;
+    }
+    breakpoint_del(argv->intval);
+    return 1;
+}
+/** Add new breakpoint to table */
+static int cmd_add_breakpoint(cmd_arg_t *argv)
+{
+    int flags;
+    int id;
+    if (argv == &add_argv) {
+        flags = BKPOINT_INSTR;
+    } else { /* addwatchp */
+        flags = BKPOINT_WRITE;
+    }
+    printf("Adding breakpoint on address: %p\n", argv->intval);
+    id = breakpoint_add((void *)argv->intval, flags, -1);
+    if (id < 0)
+        printf("Add breakpoint failed.\n");
+    else
+        printf("Added breakpoint %d.\n", id);
+    return 1;
+}
+#endif
 static void debug_exception(int n __attribute__((unused)), istate_t *istate)
 {
     unative_t dr6;
 ,26 → 379,24
     for (i = 0; i < BKPOINTS_MAX; i++)
         breakpoints[i].address = NULL;
-#ifdef CONFIG_KCONSOLE
     cmd_initialize(&bkpts_info);
     if (!cmd_register(&bkpts_info))
-        printf("Cannot register command %s\n", bkpts_info.name);
+        panic("could not register command %s\n", bkpts_info.name);
 #ifndef CONFIG_DEBUG_AS_WATCHPOINT
     cmd_initialize(&delbkpt_info);
     if (!cmd_register(&delbkpt_info))
-        printf("Cannot register command %s\n", delbkpt_info.name);
+        panic("could not register command %s\n", delbkpt_info.name);
     cmd_initialize(&addbkpt_info);
     if (!cmd_register(&addbkpt_info))
-        printf("Cannot register command %s\n", addbkpt_info.name);
+        panic("could not register command %s\n", addbkpt_info.name);
     cmd_initialize(&addwatchp_info);
     if (!cmd_register(&addwatchp_info))
-        printf("Cannot register command %s\n", addwatchp_info.name);
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
-#endif /* CONFIG_KCONSOLE */
+        panic("could not register command %s\n", addwatchp_info.name);
+#endif
     exc_register(VECTOR_DEBUG, "debugger", debug_exception);
 #ifdef CONFIG_SMP
 ,79 → 404,5
 #endif
 }
-#ifdef CONFIG_KCONSOLE
-/** Print table of active breakpoints */
-int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
-{
-    unsigned int i;
-    char *symbol;
-#ifdef __32_BITS__
-    printf("#  Count Address    In symbol\n");
-    printf("-- ----- ---------- ---------\n");
-#endif
-#ifdef __64_BITS__
-    printf("#  Count Address            In symbol\n");
-    printf("-- ----- ------------------ ---------\n");
-#endif
-    for (i = 0; i < BKPOINTS_MAX; i++)
-        if (breakpoints[i].address) {
-            symbol = get_symtab_entry(breakpoints[i].address);
-#ifdef __32_BITS__
-            printf("%-2u %-5d %#10zx %s\n", i,
-                breakpoints[i].counter, breakpoints[i].address,
-                symbol);
-#endif
-#ifdef __64_BITS__
-            printf("%-2u %-5d %#18zx %s\n", i,
-                breakpoints[i].counter, breakpoints[i].address,
-                symbol);
-#endif
-        }
-    return 1;
-}
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
-/** Remove breakpoint from table */
-int cmd_del_breakpoint(cmd_arg_t *argv)
-{
-    unative_t bpno = argv->intval;
-    if (bpno > BKPOINTS_MAX) {
-        printf("Invalid breakpoint number.\n");
-        return 0;
-    }
-    breakpoint_del(argv->intval);
-    return 1;
-}
-/** Add new breakpoint to table */
-static int cmd_add_breakpoint(cmd_arg_t *argv)
-{
-    int flags;
-    int id;
-    if (argv == &add_argv) {
-        flags = BKPOINT_INSTR;
-    } else { /* addwatchp */
-        flags = BKPOINT_WRITE;
-    }
-    printf("Adding breakpoint on address: %p\n", argv->intval);
-    id = breakpoint_add((void *)argv->intval, flags, -1);
-    if (id < 0)
-        printf("Add breakpoint failed.\n");
-    else
-        printf("Added breakpoint %d.\n", id);
-    return 1;
-}
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
-#endif /* CONFIG_KCONSOLE */
 /** @}
  */

/branches/dynload/kernel/arch/amd64/src/amd64.c
210,7 → 210,6
{
i8042_grab();
}

/** Return console to userspace
*
*/

 /branches/dynload/kernel/arch/ia32xen/src/mm/tlb.c
 ,7 → 63,7
  * @param page Address of the first page whose entry is to be invalidated.
  * @param cnt Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
     unsigned int i;

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4337 → Rev 3694