diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-23 15:28:23 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-23 15:28:23 +0000 |
commit | 3e2f58a17c16ca8bdb2cc74ee6b1602fd80a5e84 (patch) | |
tree | 2ee0c967c81ac488d290bfccac6df8ecda5417b9 /c/src/lib/libbsp/m68k | |
parent | 2008-09-23 Eric Norum <norume@aps.anl.gov> (diff) | |
download | rtems-3e2f58a17c16ca8bdb2cc74ee6b1602fd80a5e84.tar.bz2 |
2008-09-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, include/bsp.h, startup/bspstart.c: Rename
existing bsp_reset() to bsp_sysReset() since the prototype did not
match the standard one. Add standard bsp_reset().
* startup/bspreset.c: New file.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/configure.ac | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bspreset.c | 19 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 6 |
6 files changed, 40 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 3cb6dc714b..1821a1f15e 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,10 @@ +2008-09-23 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, include/bsp.h, startup/bspstart.c: Rename + existing bsp_reset() to bsp_sysReset() since the prototype did not + match the standard one. Add standard bsp_reset(). + * startup/bspreset.c: New file. + 2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com> * include/bsp.h: Remove unnecessary boilerplate comments. diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index b5279aec30..2a5534bf1d 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -25,7 +25,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c startup/bspreset.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ startup/init5282.c startup/bspstart.c ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/uC5282/configure.ac b/c/src/lib/libbsp/m68k/uC5282/configure.ac index 35d3f7eed1..691c24a9da 100644 --- a/c/src/lib/libbsp/m68k/uC5282/configure.ac +++ b/c/src/lib/libbsp/m68k/uC5282/configure.ac @@ -19,6 +19,15 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +RTEMS_BSPOPTS_SET([BSP_PRESS_KEY_FOR_RESET],[*],[0]) +RTEMS_BSPOPTS_HELP([BSP_PRESS_KEY_FOR_RESET], +[If defined, print a message and wait until pressed before resetting + board when application exits.]) + +RTEMS_BSPOPTS_SET([BSP_RESET_BOARD_AT_EXIT],[*],[1]) +RTEMS_BSPOPTS_HELP([BSP_RESET_BOARD_AT_EXIT], +[If defined, reset the board when the application exits.]) + RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h index adbc829026..108b185f7a 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h @@ -64,7 +64,7 @@ typedef struct { uint32_t bsp_get_CPU_clock_speed(void); rtems_status_code bsp_allocate_interrupt(int level, int priority); -int bsp_reset(int flags); +int bsp_sysReset(int flags); int bsp_program(bsp_mnode_t *chain, int flags); unsigned const char *bsp_gethwaddr(int a); const char *bsp_getbenv(const char *a); diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspreset.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspreset.c new file mode 100644 index 0000000000..13f430305b --- /dev/null +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspreset.c @@ -0,0 +1,19 @@ +/* + * COPYRIGHT (c) 1989-2008. + * On-Line Applications Research Corporation (OAR). + * + * 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 <rtems.h> +#include <bsp.h> +#include <bsp/bootcard.h> + +void bsp_reset(void) +{ + bsp_sysReset(0); +} diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index 9beedc2c18..b55e339ddc 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -183,7 +183,7 @@ static void handler(int pc) static volatile int reent; rtems_interrupt_disable(level); - if (reent++) bsp_reset(0); + if (reent++) bsp_sysReset(0); { int *p = &pc; int info = p[-1]; @@ -363,14 +363,14 @@ type bsp_##name(d1type d1, d2type d2, d3type d3) \ syscall_return(type,ret); \ } -#define SysCode_reset 0 /* reset */ +#define SysCode_sysReset 0 /* system reset */ #define SysCode_program 5 /* program flash memory */ #define SysCode_gethwaddr 12 /* get hardware address */ #define SysCode_getbenv 14 /* get bootloader environment variable */ #define SysCode_setbenv 15 /* set bootloader environment variable */ #define SysCode_flash_erase_range 19 /* erase a section of flash */ #define SysCode_flash_write_range 20 /* write a section of flash */ -syscall_1(int, reset, int, flags) +syscall_1(int, sysReset, int, flags) syscall_1(unsigned const char *, gethwaddr, int, a) syscall_1(const char *, getbenv, const char *, a) syscall_1(int, setbenv, const char *, a) |