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/console/console.c | 30 -------------------------- 1 file changed, 30 deletions(-) (limited to 'c/src/lib/libbsp/i386/i386ex/console/console.c') 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. +--------------------------------------------------------------------------+ -- cgit v1.2.3