From 369730ca4b9e0062cdee75a4b7b8e41c349bfb63 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 15 Feb 2008 18:54:47 +0000
Subject: [PATCH] 2008-02-15	Joel Sherrill <joel.sherrill@OARcorp.com>

	* shared/comm/console.c: Do not have BSP specific __assert.
---
 c/src/lib/libbsp/arm/ChangeLog             |  4 +++
 c/src/lib/libbsp/arm/shared/comm/console.c | 30 ----------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

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 <joel.sherrill@OARcorp.com>
+
+	* shared/comm/console.c: Do not have BSP specific __assert.
+
 2007-11-03      Ray Xu <rayx.cn@gmail.com>
 
         * 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 <stdio.h>
 #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 <rtems/bspIo.h>
@@ -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.
 +--------------------------------------------------------------------------+