diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:49:27 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:49:27 +0000 |
commit | 06ec9001b84b07397331ac2ccbcc4d977231524f (patch) | |
tree | fa65ce43afe93e7f240467ea0bd56de1ede60960 /c/src/lib/libbsp/arm/rtl22xx/startup | |
parent | 2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-06ec9001b84b07397331ac2ccbcc4d977231524f.tar.bz2 |
2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, console/uart.c, startup/bspstart.c: Use
standardized bsp_cleanup() which can optionally print a message, poll
for user to press key, and call bsp_reset(). Using this eliminates
the various bsp_cleanup() implementations which had their own
implementation and variety of string constants.
* startup/bspclean.c: Removed.
Diffstat (limited to 'c/src/lib/libbsp/arm/rtl22xx/startup')
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/startup/bspclean.c | 45 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c | 17 |
2 files changed, 0 insertions, 62 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspclean.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspclean.c deleted file mode 100644 index 2ea71522aa..0000000000 --- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspclean.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Philips LPC22XX/LPC21xx BSP Shutdown code - * Copyright (c) 2007 by Ray Xu <rayx.cn@gmail.com> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * - * http://www.rtems.com/license/LICENSE. - * - * - * $Id$ -*/ - -#include <bsp.h> -#include <rtems/bspIo.h> -#include <rtems/libio.h> - -int uart_poll_read(int); - -void rtemsReboot (void) -{ -#ifdef __thumb__ - int tmp; - asm volatile (" .code 16 \n" \ - "ldr %[tmp], =_start \n" \ - "bx %[tmp] \n" \ - "nop \n" \ - : [tmp]"=&r" (tmp) ); -#else - asm volatile ("b _start"); -#endif -} - -void bsp_cleanup(void) -{ - /* - * AT this point, the console driver is disconnected => we must - * use polled output/input. This is exactly what printk - * does. - */ - printk("\nEXECUTIVE SHUTDOWN! Any key to reboot..."); - while (uart_poll_read(0) < 0) continue; - - /* rtemsReboot(); */ -} diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c index 8013eca607..39824fac30 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c @@ -17,7 +17,6 @@ * Function prototypes */ extern void rtems_irq_mngt_init(void); -void bsp_libc_init( void *, uint32_t, int ); extern void UART0_Ini(void); extern void printi(unsigned long); @@ -99,22 +98,6 @@ void bsp_start_default( void ) rtems_irq_mngt_init(); } /* bsp_start */ - -/** - * Reset the system. - * - * This functions enables the watchdog and waits for it to - * fire, thus resetting the system. - */ -void bsp_reset(void) -{ - rtems_interrupt_level level; - - rtems_interrupt_disable(level); - - while(1); -} - /* * By making this a weak alias for bsp_start_default, a brave soul * can override the actual bsp_start routine used. |