Index: HelenOS.config =================================================================== --- HelenOS.config (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ HelenOS.config (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -47,8 +47,4 @@ % Machine type -@ "gxemul" GXEmul -! [PLATFORM=arm32] MACHINE (choice) - -% Machine type @ "i460GX" i460GX chipset machine @ "ski" Ski ia64 simulator @@ -334,5 +330,5 @@ @ "generic" Keyboard or serial line @ "none" No input device -! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32] CONFIG_HID_IN (choice) +! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=amd64|PLATFORM=mips32] CONFIG_HID_IN (choice) % Output device class @@ -348,4 +344,11 @@ ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice) +% Output device class +@ "generic" Monitor or serial line +@ "monitor" Monitor +@ "serial" Serial line +@ "none" No output device +! [PLATFORM=arm32] CONFIG_HID_OUT (choice) + % PC keyboard support ! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n) @@ -357,12 +360,18 @@ ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=mips32] CONFIG_MIPS_PRN (y/n) +% Support for GXemul keyboard +! [CONFIG_HID_IN=generic&PLATFORM=arm32] CONFIG_ARM_KBD (y/n) + +% Support for GXemul printer +! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32] CONFIG_ARM_PRN (y/n) + % i8042 controller support ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y) % Dummy serial line input -! [CONFIG_MIPS_KBD=y] CONFIG_DSRLNIN (y) +! [CONFIG_MIPS_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y) % Dummy serial line output -! [CONFIG_MIPS_PRN=y] CONFIG_DSRLNOUT (y) +! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y) % Serial line input module @@ -398,4 +407,7 @@ % Framebuffer support ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n) + +% Framebuffer support +! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=arm32] CONFIG_FB (y/n) % Framebuffer support Index: defaults/arm32/Makefile.config =================================================================== --- defaults/arm32/Makefile.config (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ defaults/arm32/Makefile.config (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -24,11 +24,8 @@ # What is your input device? -CONFIG_HID_IN = keyboard +CONFIG_HID_IN = generic # What is your output device? -CONFIG_HID_OUT = monitor - -# Framebuffer support -CONFIG_FB = y +CONFIG_HID_OUT = generic # Keyboard layout Index: kernel/arch/arm32/Makefile.inc =================================================================== --- kernel/arch/arm32/Makefile.inc (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/Makefile.inc (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -52,5 +52,4 @@ arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/interrupt.c \ - arch/$(KARCH)/src/debug/print.c \ arch/$(KARCH)/src/console.c \ arch/$(KARCH)/src/exception.c \ Index: kernel/arch/arm32/include/asm/boot.h =================================================================== --- kernel/arch/arm32/include/asm/boot.h (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/include/asm/boot.h (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -38,5 +38,5 @@ /** Size of a temporary stack used for initial kernel start. */ -#define TEMP_STACK_SIZE 0x100 +#define TEMP_STACK_SIZE 0x100 #endif Index: rnel/arch/arm32/include/debug/print.h =================================================================== --- kernel/arch/arm32/include/debug/print.h (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ (revision ) @@ -1,56 +1,0 @@ -/* - * 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 Debug printing functions. - */ - -#ifndef KERN_arm32_DEBUG_PRINT_H_ -#define KERN_arm32_DEBUG_PRINT_H_ - -#include -#include - -extern void debug_puts(const char *str); -extern void debug_printf(const char *fmt, ...); - -#ifdef CONFIG_DEBUG -# define dprintf(arg1...) debug_printf(arg1) -# define dputs(arg1) debug_puts(arg1) -#else -# define dprintf(arg1...) -# define dputs(arg1) -#endif - -#endif - -/** @} - */ Index: kernel/arch/arm32/include/drivers/gxemul.h =================================================================== --- kernel/arch/arm32/include/drivers/gxemul.h (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/include/drivers/gxemul.h (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -39,38 +39,30 @@ #define KERN_arm32_GXEMUL_H_ -#include - -/** Last interrupt number (beginning from 0) whose status is probed +/** Last interrupt number (beginning from 0) whose status is probed * from interrupt controller */ -#define GXEMUL_IRQC_MAX_IRQ 8 +#define GXEMUL_IRQC_MAX_IRQ 8 +#define GXEMUL_KBD_IRQ 2 +#define GXEMUL_TIMER_IRQ 4 /** Timer frequency */ -#define GXEMUL_TIMER_FREQ 100 +#define GXEMUL_TIMER_FREQ 100 -/** Struct containing mappings of gxemul HW devices into kernel part - * of virtual address space. - */ -typedef struct { - uintptr_t videoram; - uintptr_t kbd; - uintptr_t rtc; - uintptr_t rtc_freq; - uintptr_t rtc_ack; - uintptr_t irqc; - uintptr_t irqc_mask; - uintptr_t irqc_unmask; -} gxemul_hw_map_t; +#define GXEMUL_KBD_ADDRESS 0x10000000 +#define GXEMUL_MP_ADDRESS 0x11000000 +#define GXEMUL_FB_ADDRESS 0x12000000 +#define GXEMUL_RTC_ADDRESS 0x15000000 +#define GXEMUL_IRQC_ADDRESS 0x16000000 -extern void gxemul_hw_map_init(void); -extern void gxemul_console_init(devno_t devno); -extern void gxemul_release_console(void); -extern void gxemul_grab_console(void); -extern void gxemul_timer_irq_start(void); -extern void gxemul_debug_putc(char ch); -extern void gxemul_cpu_halt(void); -extern void gxemul_irq_exception(int exc_no, istate_t *istate); -extern size_t gxemul_get_memory_size(void); -extern uintptr_t gxemul_get_fb_address(void); +extern void *gxemul_kbd; +extern void *gxemul_rtc; +extern void *gxemul_irqc; + +#define GXEMUL_HALT_OFFSET 0x010 +#define GXEMUL_RTC_FREQ_OFFSET 0x100 +#define GXEMUL_MP_MEMSIZE_OFFSET 0x090 +#define GXEMUL_RTC_ACK_OFFSET 0x110 + +extern void gxemul_init(void); #endif Index: rnel/arch/arm32/include/machine.h =================================================================== --- kernel/arch/arm32/include/machine.h (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ (revision ) @@ -1,119 +1,0 @@ -/* - * 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 Declarations of machine specific functions. - * - * These functions enable to differentiate more kinds of ARM emulators - * or CPUs. It's the same concept as "arch" functions on the architecture - * level. - */ - -#ifndef KERN_arm32_MACHINE_H_ -#define KERN_arm32_MACHINE_H_ - -#include -#include -#include -#include - - -/** Initializes console. - * - * @param devno Console device number. - */ -extern void machine_console_init(devno_t devno); - - -/** Acquire console back for kernel. */ -extern void machine_grab_console(void); - - -/** Return console to userspace. */ -extern void machine_release_console(void); - - -/** Maps HW devices to the kernel address space using #hw_map. */ -extern void machine_hw_map_init(void); - - -/** Starts timer. */ -extern void machine_timer_irq_start(void); - - -/** Halts CPU. */ -extern void machine_cpu_halt(void); - - -/** Returns size of available memory. - * - * @return Size of available memory. - */ -extern size_t machine_get_memory_size(void); - - -/** Prints a character. - * - * @param ch Character to be printed. - */ -extern void machine_debug_putc(char ch); - - -/** Interrupt exception handler. - * - * @param exc_no Interrupt exception number. - * @param istate Saved processor state. - */ -extern void machine_irq_exception(int exc_no, istate_t *istate); - - -/** Returns address of framebuffer device. - * - * @return Address of framebuffer device. - */ -extern uintptr_t machine_get_fb_address(void); - - -#ifdef MACHINE_gxemul - #define machine_console_init(devno) gxemul_console_init(devno) - #define machine_hw_map_init gxemul_hw_map_init - #define machine_timer_irq_start gxemul_timer_irq_start - #define machine_cpu_halt gxemul_cpu_halt - #define machine_get_memory_size gxemul_get_memory_size - #define machine_debug_putc(ch) gxemul_debug_putc(ch) - #define machine_irq_exception(exc_no, istate) gxemul_irq_exception(exc_no, istate) - #define machine_get_fb_address gxemul_get_fb_address -#endif - -#endif - -/** @} - */ Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/arm32.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -40,11 +40,14 @@ #include #include +#include +#include +#include +#include #include -#include +#include #include #include #include #include -#include #include #include @@ -76,16 +79,13 @@ void arch_post_mm_init(void) { - machine_hw_map_init(); - + gxemul_init(); + /* Initialize exception dispatch table */ exception_init(); - interrupt_init(); - machine_console_init(device_assign_devno()); - #ifdef CONFIG_FB fb_properties_t prop = { - .addr = machine_get_fb_address(), + .addr = GXEMUL_FB_ADDRESS, .offset = 0, .x = 640, @@ -95,5 +95,9 @@ }; fb_init(&prop); -#endif +#else +#ifdef CONFIG_ARM_PRN + dsrlnout_init((ioport8_t *) gxemul_kbd); +#endif /* CONFIG_ARM_PRN */ +#endif /* CONFIG_FB */ } @@ -124,4 +128,24 @@ void arch_post_smp_init(void) { +#ifdef CONFIG_ARM_KBD + devno_t devno = device_assign_devno(); + + /* + * Initialize the msim/GXemul keyboard port. Then initialize the serial line + * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts. + */ + indev_t *kbrdin = dsrlnin_init((dsrlnin_t *) gxemul_kbd, devno, GXEMUL_KBD_IRQ); + if (kbrdin) + srln_init(kbrdin); + + /* + * This is the necessary evil until the userspace driver is entirely + * self-sufficient. + */ + sysinfo_set_item_val("kbd", NULL, true); + sysinfo_set_item_val("kbd.devno", NULL, devno); + sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ); + sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd); +#endif } @@ -157,5 +181,6 @@ void cpu_halt(void) { - machine_cpu_halt(); + *((char *) (gxemul_kbd + GXEMUL_HALT_OFFSET)) + = 0; } Index: kernel/arch/arm32/src/console.c =================================================================== --- kernel/arch/arm32/src/console.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/console.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -27,8 +27,8 @@ */ -/** @addtogroup arm32 +/** @addtogroup arm32 * @{ */ -/** @file +/** @file * @brief Console. */ @@ -36,6 +36,4 @@ #include #include -#include - #include Index: rnel/arch/arm32/src/debug/print.c =================================================================== --- kernel/arch/arm32/src/debug/print.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ (revision ) @@ -1,97 +1,0 @@ -/* - * 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 Debug print functions. - */ - -#include -#include -#include - -/** Prints a character to the console. - * - * @param ch Character to be printed. - */ -static void putc(char ch) -{ - machine_debug_putc(ch); -} - -/** Prints a string to the console. - * - * @param str String to be printed. - * @param count Number of characters to be printed. - * @param unused Unused parameter. - * - * @return Number of printed characters. - */ -static int debug_write(const char *str, size_t count, void *unused) -{ - unsigned int i; - for (i = 0; i < count; ++i) - putc(str[i]); - - return i; -} - -/** Prints a formated string. - * - * @param fmt "Printf-like" format. - */ -void debug_printf(const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - - struct printf_spec ps = { - (int (*)(void *, size_t, void *)) debug_write, - NULL - }; - printf_core(fmt, &ps, args); - - va_end(args); -} - -/** Prints a string. - * - * @param str String to print. - */ -void debug_puts(const char *str) -{ - while (*str) { - putc(*str); - str++; - } -} - -/** @} - */ Index: kernel/arch/arm32/src/drivers/gxemul.c =================================================================== --- kernel/arch/arm32/src/drivers/gxemul.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/drivers/gxemul.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -34,330 +34,16 @@ */ -#include -#include #include -#include -#include -#include -#include #include -#include -#include -/* Addresses of devices. */ -#define GXEMUL_VIDEORAM 0x10000000 -#define GXEMUL_KBD 0x10000000 -#define GXEMUL_HALT_OFFSET 0x10 -#define GXEMUL_RTC 0x15000000 -#define GXEMUL_RTC_FREQ_OFFSET 0x100 -#define GXEMUL_RTC_ACK_OFFSET 0x110 -#define GXEMUL_IRQC 0x16000000 -#define GXEMUL_IRQC_MASK_OFFSET 0x4 -#define GXEMUL_IRQC_UNMASK_OFFSET 0x8 -#define GXEMUL_MP 0x11000000 -#define GXEMUL_MP_MEMSIZE_OFFSET 0x0090 -#define GXEMUL_FB 0x12000000 +void *gxemul_kbd; +void *gxemul_rtc; +void *gxemul_irqc; -/* IRQs */ -#define GXEMUL_KBD_IRQ 2 -#define GXEMUL_TIMER_IRQ 4 - -static gxemul_hw_map_t gxemul_hw_map; -static chardev_t console; -static irq_t gxemul_console_irq; -static irq_t gxemul_timer_irq; - -static bool hw_map_init_called = false; - -static void gxemul_kbd_enable(chardev_t *dev); -static void gxemul_kbd_disable(chardev_t *dev); -static void gxemul_write(chardev_t *dev, const char ch, bool silent); -static char gxemul_do_read(chardev_t *dev); - -static chardev_operations_t gxemul_ops = { - .resume = gxemul_kbd_enable, - .suspend = gxemul_kbd_disable, - .write = gxemul_write, - .read = gxemul_do_read, -}; - - -/** Returns the mask of active interrupts. */ -static inline uint32_t gxemul_irqc_get_sources(void) +void gxemul_init(void) { - return *((uint32_t *) gxemul_hw_map.irqc); -} - - -/** Masks interrupt. - * - * @param irq interrupt number - */ -static inline void gxemul_irqc_mask(uint32_t irq) -{ - *((uint32_t *) gxemul_hw_map.irqc_mask) = irq; -} - - -/** Unmasks interrupt. - * - * @param irq interrupt number - */ -static inline void gxemul_irqc_unmask(uint32_t irq) -{ - *((uint32_t *) gxemul_hw_map.irqc_unmask) = irq; -} - - -/** Initializes #gxemul_hw_map. */ -void gxemul_hw_map_init(void) -{ - gxemul_hw_map.videoram = hw_map(GXEMUL_VIDEORAM, PAGE_SIZE); - gxemul_hw_map.kbd = hw_map(GXEMUL_KBD, PAGE_SIZE); - gxemul_hw_map.rtc = hw_map(GXEMUL_RTC, PAGE_SIZE); - gxemul_hw_map.irqc = hw_map(GXEMUL_IRQC, PAGE_SIZE); - - gxemul_hw_map.rtc_freq = gxemul_hw_map.rtc + GXEMUL_RTC_FREQ_OFFSET; - gxemul_hw_map.rtc_ack = gxemul_hw_map.rtc + GXEMUL_RTC_ACK_OFFSET; - gxemul_hw_map.irqc_mask = gxemul_hw_map.irqc + GXEMUL_IRQC_MASK_OFFSET; - gxemul_hw_map.irqc_unmask = gxemul_hw_map.irqc + - GXEMUL_IRQC_UNMASK_OFFSET; - - hw_map_init_called = true; -} - - -/** Putchar that works with gxemul. - * - * @param dev Not used. - * @param ch Characted to be printed. - */ -static void gxemul_write(chardev_t *dev, const char ch, bool silent) -{ - if (!silent) - *((char *) gxemul_hw_map.videoram) = ch; -} - -/** Enables gxemul keyboard (interrupt unmasked). - * - * @param dev Not used. - * - * Called from getc(). - */ -static void gxemul_kbd_enable(chardev_t *dev) -{ - gxemul_irqc_unmask(GXEMUL_KBD_IRQ); -} - -/** Disables gxemul keyboard (interrupt masked). - * - * @param dev not used - * - * Called from getc(). - */ -static void gxemul_kbd_disable(chardev_t *dev) -{ - gxemul_irqc_mask(GXEMUL_KBD_IRQ); -} - -/** Read character using polling, assume interrupts disabled. - * - * @param dev Not used. - */ -static char gxemul_do_read(chardev_t *dev) -{ - char ch; - - while (1) { - ch = *((volatile char *) gxemul_hw_map.kbd); - if (ch) { - if (ch == '\r') - return '\n'; - if (ch == 0x7f) - return '\b'; - return ch; - } - } -} - -/** Process keyboard interrupt. - * - * @param irq IRQ information. - */ -static void gxemul_irq_handler(irq_t *irq) -{ - char ch = 0; - - ch = *((char *) gxemul_hw_map.kbd); - if (ch == '\r') { - ch = '\n'; - } - if (ch == 0x7f) { - ch = '\b'; - } - chardev_push_character(&console, ch); -} - -static irq_ownership_t gxemul_claim(irq_t *irq) -{ - return IRQ_ACCEPT; -} - -/** Initializes console object representing gxemul console. - * - * @param devno device number. - */ -void gxemul_console_init(devno_t devno) -{ - chardev_initialize("gxemul_console", &console, &gxemul_ops); - stdin = &console; - stdout = &console; - - irq_initialize(&gxemul_console_irq); - gxemul_console_irq.devno = devno; - gxemul_console_irq.inr = GXEMUL_KBD_IRQ; - gxemul_console_irq.claim = gxemul_claim; - gxemul_console_irq.handler = gxemul_irq_handler; - irq_register(&gxemul_console_irq); - - gxemul_irqc_unmask(GXEMUL_KBD_IRQ); - - sysinfo_set_item_val("kbd", NULL, true); - sysinfo_set_item_val("kbd.devno", NULL, devno); - sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ); - sysinfo_set_item_val("kbd.address.virtual", NULL, gxemul_hw_map.kbd); -} - -/** Starts gxemul Real Time Clock device, which asserts regular interrupts. - * - * @param frequency Interrupts frequency (0 disables RTC). - */ -static void gxemul_timer_start(uint32_t frequency) -{ - *((uint32_t*) gxemul_hw_map.rtc_freq) = frequency; -} - -static irq_ownership_t gxemul_timer_claim(irq_t *irq) -{ - return IRQ_ACCEPT; -} - -/** Timer interrupt handler. - * - * @param irq Interrupt information. - * @param arg Not used. - */ -static void gxemul_timer_irq_handler(irq_t *irq) -{ - /* - * We are holding a lock which prevents preemption. - * Release the lock, call clock() and reacquire the lock again. - */ - spinlock_unlock(&irq->lock); - clock(); - spinlock_lock(&irq->lock); - - /* acknowledge tick */ - *((uint32_t*) gxemul_hw_map.rtc_ack) = 0; -} - -/** Initializes and registers timer interrupt handler. */ -static void gxemul_timer_irq_init(void) -{ - irq_initialize(&gxemul_timer_irq); - gxemul_timer_irq.devno = device_assign_devno(); - gxemul_timer_irq.inr = GXEMUL_TIMER_IRQ; - gxemul_timer_irq.claim = gxemul_timer_claim; - gxemul_timer_irq.handler = gxemul_timer_irq_handler; - - irq_register(&gxemul_timer_irq); -} - - -/** Starts timer. - * - * Initiates regular timer interrupts after initializing - * corresponding interrupt handler. - */ -void gxemul_timer_irq_start(void) -{ - gxemul_timer_irq_init(); - gxemul_timer_start(GXEMUL_TIMER_FREQ); -} - -/** Returns the size of emulated memory. - * - * @return Size in bytes. - */ -size_t gxemul_get_memory_size(void) -{ - return *((int *) (GXEMUL_MP + GXEMUL_MP_MEMSIZE_OFFSET)); -} - -/** Prints a character. - * - * @param ch Character to be printed. - */ -void gxemul_debug_putc(char ch) -{ - char *addr = 0; - if (!hw_map_init_called) { - addr = (char *) GXEMUL_KBD; - } else { - addr = (char *) gxemul_hw_map.videoram; - } - - *(addr) = ch; -} - -/** Stops gxemul. */ -void gxemul_cpu_halt(void) -{ - char * addr = 0; - if (!hw_map_init_called) { - addr = (char *) GXEMUL_KBD; - } else { - addr = (char *) gxemul_hw_map.videoram; - } - - *(addr + GXEMUL_HALT_OFFSET) = '\0'; -} - -/** Gxemul specific interrupt exception handler. - * - * Determines sources of the interrupt from interrupt controller and - * calls high-level handlers for them. - * - * @param exc_no Interrupt exception number. - * @param istate Saved processor state. - */ -void gxemul_irq_exception(int exc_no, istate_t *istate) -{ - uint32_t sources = gxemul_irqc_get_sources(); - int i; - - for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) { - if (sources & (1 << i)) { - irq_t *irq = irq_dispatch_and_lock(i); - if (irq) { - /* The IRQ handler was found. */ - irq->handler(irq); - spinlock_unlock(&irq->lock); - } else { - /* Spurious interrupt.*/ - dprintf("cpu%d: spurious interrupt (inum=%d)\n", - CPU->id, i); - } - } - } -} - -/** Returns address of framebuffer device. - * - * @return Address of framebuffer device. - */ -uintptr_t gxemul_get_fb_address(void) -{ - return (uintptr_t) GXEMUL_FB; + gxemul_kbd = (void *) hw_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE); + gxemul_rtc = (void *) hw_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE); + gxemul_irqc = (void *) hw_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE); } Index: kernel/arch/arm32/src/exception.c =================================================================== --- kernel/arch/arm32/src/exception.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/exception.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -35,11 +35,10 @@ #include -#include #include #include #include -#include #include #include +#include #include #include @@ -261,5 +260,8 @@ static void prefetch_abort_exception_entry(void) { - asm("sub lr, lr, #4"); + asm volatile ( + "sub lr, lr, #4" + ); + PROCESS_EXCEPTION(EXC_PREFETCH_ABORT); } @@ -268,5 +270,8 @@ static void data_abort_exception_entry(void) { - asm("sub lr, lr, #8"); + asm volatile ( + "sub lr, lr, #8" + ); + PROCESS_EXCEPTION(EXC_DATA_ABORT); } @@ -280,5 +285,8 @@ static void irq_exception_entry(void) { - asm("sub lr, lr, #4"); + asm volatile ( + "sub lr, lr, #4" + ); + setup_stack_and_save_regs(); @@ -300,4 +308,10 @@ } +/** Returns the mask of active interrupts. */ +static inline uint32_t gxemul_irqc_get_sources(void) +{ + return *((uint32_t *) gxemul_irqc); +} + /** Interrupt Exception handler. * @@ -306,5 +320,21 @@ static void irq_exception(int exc_no, istate_t *istate) { - machine_irq_exception(exc_no, istate); + uint32_t sources = gxemul_irqc_get_sources(); + unsigned int i; + + for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) { + if (sources & (1 << i)) { + irq_t *irq = irq_dispatch_and_lock(i); + if (irq) { + /* The IRQ handler was found. */ + irq->handler(irq); + spinlock_unlock(&irq->lock); + } else { + /* Spurious interrupt.*/ + printf("cpu%d: spurious interrupt (inum=%d)\n", + CPU->id, i); + } + } + } } @@ -330,5 +360,5 @@ (unsigned *) EXC_IRQ_VEC); - install_handler((unsigned)fiq_exception_entry, + install_handler((unsigned) fiq_exception_entry, (unsigned *) EXC_FIQ_VEC); } @@ -380,16 +410,16 @@ void print_istate(istate_t *istate) { - dprintf("istate dump:\n"); - - dprintf(" r0: %x r1: %x r2: %x r3: %x\n", + printf("istate dump:\n"); + + printf(" r0: %x r1: %x r2: %x r3: %x\n", istate->r0, istate->r1, istate->r2, istate->r3); - dprintf(" r4: %x r5: %x r6: %x r7: %x\n", + printf(" r4: %x r5: %x r6: %x r7: %x\n", istate->r4, istate->r5, istate->r6, istate->r7); - dprintf(" r8: %x r8: %x r10: %x r11: %x\n", + printf(" r8: %x r8: %x r10: %x r11: %x\n", istate->r8, istate->r9, istate->r10, istate->r11); - dprintf(" r12: %x sp: %x lr: %x spsr: %x\n", + printf(" r12: %x sp: %x lr: %x spsr: %x\n", istate->r12, istate->sp, istate->lr, istate->spsr); - - dprintf(" pc: %x\n", istate->pc); + + printf(" pc: %x\n", istate->pc); } Index: kernel/arch/arm32/src/interrupt.c =================================================================== --- kernel/arch/arm32/src/interrupt.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/interrupt.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -36,10 +36,13 @@ #include #include +#include #include -#include +#include #include /** Initial size of a table holding interrupt handlers. */ #define IRQ_COUNT 8 + +static irq_t gxemul_timer_irq; /** Disable interrupts. @@ -50,5 +53,5 @@ { ipl_t ipl = current_status_reg_read(); - + current_status_reg_control_write(STATUS_REG_IRQ_DISABLED_BIT | ipl); @@ -63,7 +66,7 @@ { ipl_t ipl = current_status_reg_read(); - + current_status_reg_control_write(ipl & ~STATUS_REG_IRQ_DISABLED_BIT); - + return ipl; } @@ -89,4 +92,39 @@ } +/** Starts gxemul Real Time Clock device, which asserts regular interrupts. + * + * @param frequency Interrupts frequency (0 disables RTC). + */ +static void gxemul_timer_start(uint32_t frequency) +{ + *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_FREQ_OFFSET)) + = frequency; +} + +static irq_ownership_t gxemul_timer_claim(irq_t *irq) +{ + return IRQ_ACCEPT; +} + +/** Timer interrupt handler. + * + * @param irq Interrupt information. + * @param arg Not used. + */ +static void gxemul_timer_irq_handler(irq_t *irq) +{ + /* + * We are holding a lock which prevents preemption. + * Release the lock, call clock() and reacquire the lock again. + */ + spinlock_unlock(&irq->lock); + clock(); + spinlock_lock(&irq->lock); + + /* acknowledge tick */ + *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_ACK_OFFSET)) + = 0; +} + /** Initialize basic tables for exception dispatching * and starts the timer. @@ -95,5 +133,14 @@ { irq_init(IRQ_COUNT, IRQ_COUNT); - machine_timer_irq_start(); + + irq_initialize(&gxemul_timer_irq); + gxemul_timer_irq.devno = device_assign_devno(); + gxemul_timer_irq.inr = GXEMUL_TIMER_IRQ; + gxemul_timer_irq.claim = gxemul_timer_claim; + gxemul_timer_irq.handler = gxemul_timer_irq_handler; + + irq_register(&gxemul_timer_irq); + + gxemul_timer_start(GXEMUL_TIMER_FREQ); } Index: kernel/arch/arm32/src/mm/frame.c =================================================================== --- kernel/arch/arm32/src/mm/frame.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/mm/frame.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -36,7 +36,6 @@ #include #include -#include +#include #include -#include /** Address of the last frame in the memory. */ @@ -46,8 +45,9 @@ void frame_arch_init(void) { - /* all memory as one zone */ - zone_create(0, ADDR2PFN(machine_get_memory_size()), + last_frame = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET)); + + /* All memory as one zone */ + zone_create(0, ADDR2PFN(last_frame), BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0); - last_frame = machine_get_memory_size(); /* blacklist boot page table */ @@ -59,8 +59,7 @@ void boot_page_table_free(void) { - int i; - for (i = 0; i < BOOT_PAGE_TABLE_SIZE_IN_FRAMES; i++) { + unsigned int i; + for (i = 0; i < BOOT_PAGE_TABLE_SIZE_IN_FRAMES; i++) frame_free(i * FRAME_SIZE + BOOT_PAGE_TABLE_ADDRESS); - } } Index: kernel/arch/arm32/src/mm/page.c =================================================================== --- kernel/arch/arm32/src/mm/page.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/mm/page.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -52,17 +52,13 @@ void page_arch_init(void) { + int flags = PAGE_CACHEABLE; + page_mapping_operations = &pt_mapping_operations; + uintptr_t cur; - int flags; - - page_mapping_operations = &pt_mapping_operations; - - flags = PAGE_CACHEABLE; - - /* PA2KA(identity) mapping for all frames until last_frame */ - for (cur = 0; cur < last_frame; cur += FRAME_SIZE) { + /* Kernel identity mapping */ + for (cur = 0; cur < last_frame; cur += FRAME_SIZE) page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags); - } - /* create mapping for exception table at high offset */ + /* Create mapping for exception table at high offset */ #ifdef HIGH_EXCEPTION_VECTORS void *virtaddr = frame_alloc(ONE_FRAME, FRAME_KA); @@ -71,7 +67,7 @@ #error "Only high exception vector supported now" #endif - + as_switch(NULL, AS_KERNEL); - + boot_page_table_free(); } @@ -94,5 +90,5 @@ physaddr, size) } - + uintptr_t virtaddr = PA2KA(last_frame); pfn_t i; @@ -102,5 +98,5 @@ PAGE_NOT_CACHEABLE | PAGE_READ | PAGE_WRITE | PAGE_KERNEL); } - + last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE); return virtaddr; Index: kernel/arch/arm32/src/mm/page_fault.c =================================================================== --- kernel/arch/arm32/src/mm/page_fault.c (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/mm/page_fault.c (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -35,5 +35,4 @@ #include #include -#include #include #include @@ -183,8 +182,8 @@ if (ret == AS_PF_FAULT) { print_istate(istate); - dprintf("page fault - pc: %x, va: %x, status: %x(%x), " + printf("page fault - pc: %x, va: %x, status: %x(%x), " "access:%d\n", istate->pc, badvaddr, fsr.status, fsr, access); - + fault_if_from_uspace(istate, "Page fault: %#x.", badvaddr); panic("Page fault."); @@ -202,5 +201,5 @@ if (ret == AS_PF_FAULT) { - dprintf("prefetch_abort\n"); + printf("prefetch_abort\n"); print_istate(istate); panic("page fault - prefetch_abort at address: %x.", Index: kernel/arch/arm32/src/panic.S =================================================================== --- kernel/arch/arm32/src/panic.S (revision 3b122e9cc66b2491773f3199acba6d46f974cbc5) +++ kernel/arch/arm32/src/panic.S (revision 00287cc152fcd78464c9296775809f965d6e96fd) @@ -32,4 +32,4 @@ panic_printf: - bl debug_printf + bl printf bl cpu_halt