| 35,7 → 35,6 |
|---|
| |
| #include <arch.h> |
| #include <config.h> |
| #include <arch/console.h> |
| #include <genarch/fb/fb.h> |
| #include <genarch/fb/visuals.h> |
| #include <genarch/drivers/dsrln/dsrlnin.h> |
| 42,6 → 41,7 |
|---|
| #include <genarch/drivers/dsrln/dsrlnout.h> |
| #include <genarch/srln/srln.h> |
| #include <sysinfo/sysinfo.h> |
| #include <console/console.h> |
| #include <ddi/irq.h> |
| #include <arch/drivers/gxemul.h> |
| #include <print.h> |
| 62,8 → 62,8 |
|---|
| for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); ++i) { |
| init.tasks[i].addr = bootinfo->tasks[i].addr; |
| init.tasks[i].size = bootinfo->tasks[i].size; |
| strncpy(init.tasks[i].name, bootinfo->tasks[i].name, |
| CONFIG_TASK_NAME_BUFLEN); |
| str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN, |
| bootinfo->tasks[i].name); |
| } |
| } |
| |
| 128,12 → 128,19 |
|---|
| { |
| #ifdef CONFIG_ARM_KBD |
| /* |
| * Initialize the msim/GXemul keyboard port. Then initialize the serial line |
| * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts. |
| * Initialize the GXemul keyboard port. Then initialize the serial line |
| * module and connect it to the GXemul keyboard. |
| */ |
| indev_t *kbrdin = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ); |
| if (kbrdin) |
| srln_init(kbrdin); |
| dsrlnin_instance_t *dsrlnin_instance |
| = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ); |
| if (dsrlnin_instance) { |
| srln_instance_t *srln_instance = srln_init(); |
| if (srln_instance) { |
| indev_t *sink = stdin_wire(); |
| indev_t *srln = srln_wire(srln_instance, sink); |
| dsrlnin_wire(dsrlnin_instance, srln); |
| } |
| } |
| |
| /* |
| * This is the necessary evil until the userspace driver is entirely |
| 201,5 → 208,18 |
|---|
| return addr; |
| } |
| |
| /** Acquire console back for kernel. */ |
| void arch_grab_console(void) |
| { |
| #ifdef CONFIG_FB |
| fb_redraw(); |
| #endif |
| } |
| |
| /** Return console to userspace. */ |
| void arch_release_console(void) |
| { |
| } |
| |
| /** @} |
| */ |