Index: kernel/arch/arm32/Makefile.inc =================================================================== --- kernel/arch/arm32/Makefile.inc (revision 5481a22e6c9e058e260a8add1bed44351bfb88cf) +++ kernel/arch/arm32/Makefile.inc (revision c928bb72eb890b957cdc72cdaf2d5b201ee6ba6a) @@ -76,8 +76,4 @@ endif -ifeq ($(MACHINE),testarm) - ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c -endif - ifeq ($(MACHINE),integratorcp) ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c Index: kernel/arch/arm32/include/fpu_context.h =================================================================== --- kernel/arch/arm32/include/fpu_context.h (revision 5481a22e6c9e058e260a8add1bed44351bfb88cf) +++ kernel/arch/arm32/include/fpu_context.h (revision c928bb72eb890b957cdc72cdaf2d5b201ee6ba6a) @@ -31,7 +31,5 @@ */ /** @file - * @brief FPU context (not implemented). - * - * GXemul doesn't support FPU on its ARM CPU. + * @brief FPU context. */ Index: kernel/arch/arm32/include/mach/testarm/testarm.h =================================================================== --- kernel/arch/arm32/include/mach/testarm/testarm.h (revision 5481a22e6c9e058e260a8add1bed44351bfb88cf) +++ (revision ) @@ -1,83 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt - * Copyright (c) 2009 Vineeth Pillai - * 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 arm32gxemul GXemul - * @brief GXemul machine specific parts. - * @ingroup arm32 - * @{ - */ -/** @file - * @brief GXemul peripheries drivers declarations. - */ - -#ifndef KERN_arm32_testarm_H_ -#define KERN_arm32_testarm_H_ - -#include - -/** Size of GXemul IRQ number range (starting from 0) */ -#define GXEMUL_IRQ_COUNT 32 -#define GXEMUL_KBD_IRQ 2 -#define GXEMUL_TIMER_IRQ 4 - -/** Timer frequency */ -#define GXEMUL_TIMER_FREQ 100 - -#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_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); -extern void gxemul_output_init(void); -extern void gxemul_input_init(void); -extern void gxemul_timer_irq_start(void); -extern void gxemul_cpu_halt(void); -extern void gxemul_irq_exception(unsigned int, istate_t *); -extern void gxemul_get_memory_extents(uintptr_t *, size_t *); -extern void gxemul_frame_init(void); -extern size_t gxemul_get_irq_count(void); -extern const char *gxemul_get_platform_name(void); - -extern struct arm_machine_ops gxemul_machine_ops; - -#endif - -/** @} - */ Index: kernel/arch/arm32/src/mach/gta02/gta02.c =================================================================== --- kernel/arch/arm32/src/mach/gta02/gta02.c (revision 5481a22e6c9e058e260a8add1bed44351bfb88cf) +++ kernel/arch/arm32/src/mach/gta02/gta02.c (revision c928bb72eb890b957cdc72cdaf2d5b201ee6ba6a) @@ -27,5 +27,5 @@ */ -/** @addtogroup arm32gxemul +/** @addtogroup arm32gta02 * @{ */ Index: kernel/arch/arm32/src/mach/testarm/testarm.c =================================================================== --- kernel/arch/arm32/src/mach/testarm/testarm.c (revision 5481a22e6c9e058e260a8add1bed44351bfb88cf) +++ (revision ) @@ -1,256 +1,0 @@ -/* - * Copyright (c) 2007 Michal Kebrt, Petr Stepan - * 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 arm32gxemul - * @{ - */ -/** @file - * @brief GXemul drivers. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -void *gxemul_kbd; -void *gxemul_rtc; -void *gxemul_irqc; -static irq_t gxemul_timer_irq; - -struct arm_machine_ops gxemul_machine_ops = { - gxemul_init, - gxemul_timer_irq_start, - gxemul_cpu_halt, - gxemul_get_memory_extents, - gxemul_irq_exception, - gxemul_frame_init, - gxemul_output_init, - gxemul_input_init, - gxemul_get_irq_count, - gxemul_get_platform_name -}; - -void gxemul_init(void) -{ - gxemul_kbd = (void *) km_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE, - PAGE_WRITE | PAGE_NOT_CACHEABLE); - gxemul_rtc = (void *) km_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE, - PAGE_WRITE | PAGE_NOT_CACHEABLE); - gxemul_irqc = (void *) km_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE, - PAGE_WRITE | PAGE_NOT_CACHEABLE); -} - -void gxemul_output_init(void) -{ -#ifdef CONFIG_FB - fb_properties_t prop = { - .addr = GXEMUL_FB_ADDRESS, - .offset = 0, - .x = 640, - .y = 480, - .scan = 1920, - .visual = VISUAL_RGB_8_8_8, - }; - - outdev_t *fbdev = fb_init(&prop); - if (fbdev) - stdout_wire(fbdev); -#endif - -#ifdef CONFIG_ARM_PRN - outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) gxemul_kbd); - if (dsrlndev) - stdout_wire(dsrlndev); -#endif -} - -void gxemul_input_init(void) -{ -#ifdef CONFIG_ARM_KBD - /* - * Initialize the GXemul keyboard port. Then initialize the serial line - * module and connect it to the GXemul keyboard. - */ - 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 - * self-sufficient. - */ - sysinfo_set_item_val("kbd", NULL, true); - sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ); - sysinfo_set_item_val("kbd.address.physical", NULL, - GXEMUL_KBD_ADDRESS); -#endif -} - -size_t gxemul_get_irq_count(void) -{ - return GXEMUL_IRQ_COUNT; -} - -const char *gxemul_get_platform_name(void) -{ - return "gxemul"; -} - -/** 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; -} - -/** 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); -} - -/** Get extents of available memory. - * - * @param start Place to store memory start address. - * @param size Place to store memory size. - */ -void gxemul_get_memory_extents(uintptr_t *start, size_t *size) -{ - *start = 0; - *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET)); -} - -/** Returns the mask of active interrupts. */ -static inline uint32_t gxemul_irqc_get_sources(void) -{ - return *((uint32_t *) gxemul_irqc); -} - -/** Interrupt Exception handler. - * - * Determines the sources of interrupt and calls their handlers. - */ -void gxemul_irq_exception(unsigned int exc_no, istate_t *istate) -{ - uint32_t sources = gxemul_irqc_get_sources(); - unsigned int i; - - for (i = 0; i < GXEMUL_IRQ_COUNT; 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); - } - } - } -} - -void gxemul_cpu_halt(void) -{ - *((char *) (gxemul_kbd + GXEMUL_HALT_OFFSET)) = 0; -} - -void gxemul_frame_init(void) -{ -} - -/** @} - */ Index: kernel/arch/arm32/src/machine_func.c =================================================================== --- kernel/arch/arm32/src/machine_func.c (revision 5481a22e6c9e058e260a8add1bed44351bfb88cf) +++ kernel/arch/arm32/src/machine_func.c (revision c928bb72eb890b957cdc72cdaf2d5b201ee6ba6a) @@ -41,5 +41,4 @@ #include #include -#include #include @@ -52,6 +51,4 @@ #if defined(MACHINE_gta02) machine_ops = >a02_machine_ops; -#elif defined(MACHINE_testarm) - machine_ops = &gxemul_machine_ops; #elif defined(MACHINE_integratorcp) machine_ops = &icp_machine_ops;