[rtems commit] m68k/mvme167: Delete bsp_fatal_error_occurred()
Sebastian Huber
sebh at rtems.org
Thu Nov 22 15:31:31 UTC 2012
Module: rtems
Branch: master
Commit: 86d80f02b65c623a064ce1556fffbfc5c0dd89ee
Changeset: http://git.rtems.org/rtems/commit/?id=86d80f02b65c623a064ce1556fffbfc5c0dd89ee
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu Nov 22 14:34:41 2012 +0100
m68k/mvme167: Delete bsp_fatal_error_occurred()
---
c/src/lib/libbsp/m68k/mvme167/Makefile.am | 3 -
c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c | 91 ------------------------
c/src/lib/libbsp/m68k/mvme167/include/fatal.h | 17 -----
c/src/lib/libbsp/m68k/mvme167/preinstall.am | 4 -
4 files changed, 0 insertions(+), 115 deletions(-)
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 0ba3aa2..d98aeca 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
include_HEADERS += include/coverhd.h
include_HEADERS += include/page_table.h
-include_HEADERS += include/fatal.h
nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h
@@ -41,8 +40,6 @@ libbsp_a_SOURCES += startup/bspclean.c ../../shared/bsplibc.c \
libbsp_a_SOURCES += clock/ckinit.c
# console
libbsp_a_SOURCES += console/console.c console/console-recording.h
-# fatal
-libbsp_a_SOURCES += fatal/bspfatal.c
# timer
libbsp_a_SOURCES += timer/timer.c timer/timerisr.S
diff --git a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
deleted file mode 100644
index 65bf8d8..0000000
--- a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* fatal.c
- *
- * User-define fatal error handler.
- *
- * Copyright (c) 1998, National Research Council of Canada
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.com/license/LICENSE.
- */
-
-#include <bsp.h>
-#include <fatal.h>
-#include <string.h>
-
-/*
- * bsp_fatal_error_occurred
- *
- * Called when rtems_fatal_error_occurred() is called. Returns control to
- * 167Bug. The _Internal_error_Occurred() function has already saved the
- * parameters in Internal_errors_What_happened. If the function returns,
- * RTEMS will halt the CPU.
- *
- * Make sure the CPU is
- *
- * Input parameters:
- * the_source - what subsystem the error originated in
- * is_internal - if the error was internally generated
- * the_error - fatal error status code
- *
- * Output parameters:
- * output to the 167Bug console
- *
- * Return values: NONE.
- */
-User_extensions_routine bsp_fatal_error_occurred(
- Internal_errors_Source the_source,
- bool is_internal,
- uint32_t the_error
-)
-{
- struct {
- char index; /* First byte is number of chars in strbuf */
- char strbuf[254]; /* In case count is bumped up by one by 167Bug */
- } my_p_str;
-
- strcat(my_p_str.strbuf,
- "\r\nRTEMS Fatal Error Occurred:\r\n the_source = " );
-
- switch ( the_source ) {
- case INTERNAL_ERROR_CORE:
- strcat(my_p_str.strbuf,
- "INTERNAL_ERROR_CORE\r\n is_internal = " );
- break;
-
- case INTERNAL_ERROR_RTEMS_API:
- strcat(my_p_str.strbuf,
- "INTERNAL_ERROR_RTEMS_API\r\n is_internal = " );
- break;
-
- case INTERNAL_ERROR_POSIX_API:
- strcat(my_p_str.strbuf,
- "INTERNAL_ERROR_POSIX_API\r\n is_internal = " );
- break;
-
- default:
- strcat(my_p_str.strbuf,
- "UNKNOWN\r\n is_internal = " );
- break;
- }
-
- if ( is_internal )
- strcat(my_p_str.strbuf,
- "TRUE\r\n the_error = 0x|10,8|\r\n" );
- else
- strcat(my_p_str.strbuf,
- "FALSE\r\n the_error = 0x|10,8|\r\n" );
-
- my_p_str.index = strlen(my_p_str.strbuf);
- lcsr->intr_ena = 0; /* disable interrupts */
- m68k_set_vbr(0xFFE00000); /* restore 167Bug vectors */
-
- __asm__ volatile( "movel %0, -(%%a7)\n\t"
- "pea (%%a7)\n\t"
- "pea (%1)\n\t"
- "trap #15\n\t" /* trap to 167Bug (.WRITDLN) */
- ".short 0x25\n\t"
- "trap #15\n\t"
- ".short 0x63"
- :: "d" (the_error), "a" (&my_p_str) );
-}
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/fatal.h b/c/src/lib/libbsp/m68k/mvme167/include/fatal.h
deleted file mode 100644
index 95af7cb..0000000
--- a/c/src/lib/libbsp/m68k/mvme167/include/fatal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* fatal.h
- *
- * Copyright (c) 1998, National Research Council of Canada
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.com/license/LICENSE.
- */
-
-#include <rtems/score/interr.h>
-#include <rtems/score/userext.h>
-
-User_extensions_routine bsp_fatal_error_occurred(
- Internal_errors_Source the_source,
- bool is_internal,
- uint32_t the_error
-);
diff --git a/c/src/lib/libbsp/m68k/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am
index 332fc9c..fd59d14 100644
--- a/c/src/lib/libbsp/m68k/mvme167/preinstall.am
+++ b/c/src/lib/libbsp/m68k/mvme167/preinstall.am
@@ -61,10 +61,6 @@ $(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirst
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
-$(PROJECT_INCLUDE)/fatal.h: include/fatal.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/fatal.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/fatal.h
-
$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
More information about the vc
mailing list