diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-05-28 15:03:13 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-05-28 15:03:13 +0000 |
| commit | 41e7421452706fbf2d6750a80220ca392c6cef8c (patch) | |
| tree | bc22aa0bc4f835ad17bce143b1b5a74d5e262091 | |
| parent | Add gprof.info handling. (diff) | |
| download | rtems-41e7421452706fbf2d6750a80220ca392c6cef8c.tar.bz2 | |
2007-05-28 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1244/bsps
* console/console.c: Remove definition of __assert.
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/console.c | 40 |
2 files changed, 5 insertions, 40 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 0931032992..2f15899c42 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,8 @@ +2007-05-28 Joel Sherrill <joel.sherrill@OARcorp.com> + + PR 1244/bsps + * console/console.c: Remove definition of __assert. + 2007-01-29 Ralf Corsépius <ralf.corsepius@rtems.org> * console/fb_vga.c: Eliminate __u16, __u32. diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c index 887fcb9334..5581c6583c 100644 --- a/c/src/lib/libbsp/i386/pc386/console/console.c +++ b/c/src/lib/libbsp/i386/pc386/console/console.c @@ -34,8 +34,6 @@ #include <stdlib.h> #include <assert.h> #include <unistd.h> -#undef __assert -void __assert (const char *file, int line, const char *msg); #include <bsp.h> #include <bsp/irq.h> @@ -141,44 +139,6 @@ int kbd_poll_read( int minor ) return -1; } -/* -static void* termios_ttyp_console = NULL; -void enq_key( char key ) -{ - if( termios_ttyp_console ) - { - rtems_termios_enqueue_raw_characters(termios_ttyp_console, &key,1 ); - } -} -*/ - -void __assert (const char *file, int line, const char *msg) -{ - static char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot..."; - unsigned char ch; - - /* - * Note we cannot call exit or printf from here, - * assert can fail inside ISR too - */ - - /* - * Close console - */ - close(2); - close(1); - close(0); - - printk("\nassert failed: %s: ", file); - printk("%d: ", line); - printk("%s\n\n", msg); - printk(exit_msg); - ch = BSP_poll_char(); - printk("\n\n"); - rtemsReboot(); - -} - /*-------------------------------------------------------------------------+ | Console device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ |