diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex')
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/console/console.c | 30 |
2 files changed, 4 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 88b7a6c055..ed16b5f147 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,7 @@ +2002-12-19 Joel Sherrill <joel@OARcorp.com> + + * console/console.c: Removed __assert() which conflicts with newlib. + 2002-12-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * clock/Makefile.am: Don't include @RTEMS_BSP@.cfg. diff --git a/c/src/lib/libbsp/i386/i386ex/console/console.c b/c/src/lib/libbsp/i386/i386ex/console/console.c index 0cee60ee5d..6524cca196 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/console.c +++ b/c/src/lib/libbsp/i386/i386ex/console/console.c @@ -36,10 +36,6 @@ #include <stdlib.h> #include <assert.h> -/* workaround for gcc development tools */ -#undef __assert -void __assert (const char *file, int line, const char *msg); - #include <bsp.h> #include <irq.h> #include <rtems/libio.h> @@ -96,32 +92,6 @@ isr_is_on(const rtems_irq_connect_data *irq) return BSP_irq_enabled_at_i8259s(irq->name); } -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("\nShould jump to reset now!\n"); -} - - /*-------------------------------------------------------------------------+ | Console device driver INITIALIZE entry point. +--------------------------------------------------------------------------+ |