From c4e9f685d155309c6ebb1c9f38e4e3724ffc7ce8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 19 Dec 2002 14:49:13 +0000 Subject: 2002-12-19 Joel Sherrill * console/console.c: Removed __assert() which conflicts with newlib. --- c/src/lib/libbsp/i386/i386ex/ChangeLog | 4 +++ c/src/lib/libbsp/i386/i386ex/console/console.c | 30 ---------------------- c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 4 +++ c/src/lib/libbsp/i386/ts_386ex/console/console.c | 30 ---------------------- .../lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 4 +++ c/src/lib/libbsp/powerpc/shared/ChangeLog | 4 +++ c/src/lib/libbsp/powerpc/shared/console/console.c | 29 --------------------- 7 files changed, 16 insertions(+), 89 deletions(-) (limited to 'c') 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 + + * console/console.c: Removed __assert() which conflicts with newlib. + 2002-12-17 Ralf Corsepius * 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 #include -/* workaround for gcc development tools */ -#undef __assert -void __assert (const char *file, int line, const char *msg); - #include #include #include @@ -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. +--------------------------------------------------------------------------+ diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index 7f7ab7d844..1de66c2db3 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,3 +1,7 @@ +2002-12-19 Joel Sherrill + + * console/console.c: Removed __assert() which conflicts with newlib. + 2002-12-17 Ralf Corsepius * clock/Makefile.am: Don't include @RTEMS_BSP@.cfg. diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/console.c b/c/src/lib/libbsp/i386/ts_386ex/console/console.c index 5bb720ba96..7031a81c59 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/console.c +++ b/c/src/lib/libbsp/i386/ts_386ex/console/console.c @@ -37,10 +37,6 @@ #include #include -/* workaround for gcc development tools */ -#undef __assert -void __assert (const char *file, int line, const char *msg); - #include #include #include @@ -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. +--------------------------------------------------------------------------+ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index a87eb72beb..9faa9410bd 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,7 @@ +2002-12-19 Joel Sherrill + + * console/console.c: Removed __assert() which conflicts with newlib. + 2002-12-17 Ralf Corsepius * bootloader/Makefile.am: Don't include @RTEMS_BSP@.cfg. diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog index be13af7318..8efd532d8c 100644 --- a/c/src/lib/libbsp/powerpc/shared/ChangeLog +++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog @@ -1,3 +1,7 @@ +2002-12-19 Joel Sherrill + + * console/console.c: Removed __assert() which conflicts with newlib. + 2002-11-17 Greg Menke * irq/irq_init.c, motorola/motorola.c: Support for MTX603e. diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c index a79e0a5984..b6d9b73095 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/console.c +++ b/c/src/lib/libbsp/powerpc/shared/console/console.c @@ -26,8 +26,6 @@ #include #include -#undef __assert -void __assert (const char *file, int line, const char *msg); extern int close(int fd); #include @@ -56,33 +54,6 @@ int BSPBaseBaud = BSP_UART_BAUD_BASE; static int conSetAttr(int minor, const struct termios *); -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 = debug_getc(); - printk("\n\n"); - rtemsReboot(); - -} - typedef struct TtySTblRec_ { char *name; void (*isr)(void); /* STUPID API doesn't pass a parameter :-( */ -- cgit v1.2.3