diff --git a/c/src/lib/libbsp/arm/ChangeLog b/c/src/lib/libbsp/arm/ChangeLog index 473857cc3d..603722b064 100644 --- a/c/src/lib/libbsp/arm/ChangeLog +++ b/c/src/lib/libbsp/arm/ChangeLog @@ -1,3 +1,7 @@ +2008-02-15 Joel Sherrill + + * shared/comm/console.c: Do not have BSP specific __assert. + 2007-11-03 Ray Xu * shared/abort/simple_abort.c: Add veneer for ARM<->Thumb diff --git a/c/src/lib/libbsp/arm/shared/comm/console.c b/c/src/lib/libbsp/arm/shared/comm/console.c index 2af1359051..1cb80a177a 100644 --- a/c/src/lib/libbsp/arm/shared/comm/console.c +++ b/c/src/lib/libbsp/arm/shared/comm/console.c @@ -15,10 +15,7 @@ #include #include -#include #include -#undef __assert -void __assert (const char *file, int line, const char *msg); #include #include @@ -96,33 +93,6 @@ isr_is_on(const rtems_irq_connect_data *irq) return 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. +--------------------------------------------------------------------------+