RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* shared/console/inch.c, shared/startup/panic.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.
	* shared/console/bspreset.c: New file.
	* shared/console/reboot.c: Removed.
This commit is contained in:
Joel Sherrill
2008-09-22 21:50:31 +00:00
parent 87a38dd39f
commit 788870e168
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,13 @@
2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* shared/console/inch.c, shared/startup/panic.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.
* shared/console/bspreset.c: New file.
* shared/console/reboot.c: Removed.
2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com>
* shared/startup/bspgetworkarea.c, shared/startup/sbrk.c: Remove * shared/startup/bspgetworkarea.c, shared/startup/sbrk.c: Remove

6
c/src/lib/libbsp/powerpc/shared/console/reboot.c → c/src/lib/libbsp/powerpc/shared/console/bspreset.c
View File

@@ -5,13 +5,13 @@
#include <libcpu/stackTrace.h> #include <libcpu/stackTrace.h>
/*-------------------------------------------------------------------------+ /*-------------------------------------------------------------------------+
| Function: rtemsReboot | Function: bsp_reset
| Description: Reboot the PC. | Description: Reboot the PC.
| Global Variables: None. | Global Variables: None.
| Arguments: None. | Arguments: None.
| Returns: Nothing. | Returns: Nothing.
+--------------------------------------------------------------------------*/ +--------------------------------------------------------------------------*/
void rtemsReboot(void) void bsp_reset(void)
{ {
printk("Printing a stack trace for your convenience :-)\n"); printk("Printing a stack trace for your convenience :-)\n");
CPU_print_stack(); CPU_print_stack();
@@ -22,4 +22,4 @@ void rtemsReboot(void)
#if defined(mvme2100) #if defined(mvme2100)
*(unsigned char*)0xffe00000 |= 0x80; *(unsigned char*)0xffe00000 |= 0x80;
#endif #endif
} /* rtemsReboot */ } /* bsp_reset */

3
c/src/lib/libbsp/powerpc/shared/console/inch.c
View File

@@ -20,6 +20,7 @@
*/ */
#include <bsp.h> #include <bsp.h>
#include <bsp/bootcard.h>
#ifdef BSP_KBD_IOBASE #ifdef BSP_KBD_IOBASE
#include <bsp/irq.h> #include <bsp/irq.h>
@@ -154,7 +155,7 @@ _IBMPC_scankey(char *outChar)
case 0x53: case 0x53:
if (ctrl_pressed && alt_pressed) if (ctrl_pressed && alt_pressed)
rtemsReboot(); /* ctrl+alt+del -> reboot */ bsp_reset(); /* ctrl+alt+del -> reboot */
break; break;
/* /*

3
c/src/lib/libbsp/powerpc/shared/startup/panic.c
View File

@@ -1,5 +1,6 @@
#include <rtems.h> #include <rtems.h>
#include <bsp.h> #include <bsp.h>
#include <bsp/bootcard.h>
#include <bsp/uart.h> #include <bsp/uart.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <rtems/error.h> #include <rtems/error.h>
@@ -10,7 +11,7 @@ rebootQuestion()
{ {
printk("Press a key to reboot\n"); printk("Press a key to reboot\n");
BSP_poll_char_via_serial(); BSP_poll_char_via_serial();
rtemsReboot(); bsp_reset();
} }
void BSP_panic(char *s) void BSP_panic(char *s)