| /branches/dd/kernel/arch/arm32/src/arm32.c |
|---|
| 35,6 → 35,7 |
| #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> |
| 41,7 → 42,6 |
| #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> |
| 129,18 → 129,11 |
| #ifdef CONFIG_ARM_KBD |
| /* |
| * Initialize the GXemul keyboard port. Then initialize the serial line |
| * module and connect it to the GXemul keyboard. |
| * module and connect it to the GXemul keyboard. Enable keyboard interrupts. |
| */ |
| 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); |
| } |
| } |
| indev_t *kbrdin = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ); |
| if (kbrdin) |
| srln_init(kbrdin); |
| /* |
| * This is the necessary evil until the userspace driver is entirely |
| 208,18 → 201,5 |
| 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) |
| { |
| } |
| /** @} |
| */ |
| /branches/dd/kernel/arch/arm32/src/console.c |
|---|
| 0,0 → 1,54 |
| /* |
| * Copyright (c) 2007 Michal Kebrt |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup arm32 |
| * @{ |
| */ |
| /** @file |
| * @brief Console. |
| */ |
| #include <console/console.h> |
| #include <arch/console.h> |
| #include <genarch/fb/fb.h> |
| /** 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) |
| { |
| } |
| /** @} |
| */ |
| /branches/dd/kernel/arch/arm32/include/console.h |
|---|
| 0,0 → 1,42 |
| /* |
| * Copyright (c) 2007 Michal Kebrt |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup arm32 |
| * @{ |
| */ |
| /** @file |
| * @brief Console. |
| */ |
| #ifndef KERN_arm32_CONSOLE_H_ |
| #define KERN_arm32_CONSOLE_H_ |
| #endif |
| /** @} |
| */ |
| /branches/dd/kernel/arch/arm32/Makefile.inc |
|---|
| 51,6 → 51,7 |
| arch/$(KARCH)/src/cpu/cpu.c \ |
| arch/$(KARCH)/src/ddi/ddi.c \ |
| arch/$(KARCH)/src/interrupt.c \ |
| arch/$(KARCH)/src/console.c \ |
| arch/$(KARCH)/src/exception.c \ |
| arch/$(KARCH)/src/userspace.c \ |
| arch/$(KARCH)/src/mm/as.c \ |