score: Add RTEMS_FATAL_SOURCE_BSP

Merge RTEMS_FATAL_SOURCE_BSP_GENERIC and RTEMS_FATAL_SOURCE_BSP_SPECIFIC
into new fatal source RTEMS_FATAL_SOURCE_BSP.  This makes it easier to
figure out the code position given a fatal source and code.

7 files changed, 24 insertions, 50 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
index 48c592245b..69a45d33f8 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
@@ -21,6 +21,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #include <mpc55xx/regs.h>
@@ -53,7 +54,7 @@ static void mpc55xx_clock_handler_install(rtems_isr_entry isr)
     NULL
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL);
   }
 }
 
@@ -73,12 +74,12 @@ static void mpc55xx_clock_initialize(void)
   if (prescaler > 0) {
     interval /= (uint64_t) prescaler;
   } else {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER);
   }
 
   /* Check interval */
   if (interval == 0 || interval > MPC55XX_EMIOS_VALUE_MAX) {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL);
   }
 
   /* Configure eMIOS channel */
@@ -159,7 +160,7 @@ static void mpc55xx_clock_handler_install(rtems_isr_entry isr)
     NULL
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL);
   }
 }
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
index c54dd353fc..0620cda304 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c
@@ -21,6 +21,7 @@
 #include <bsp/console-esci.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #ifdef MPC55XX_HAS_ESCI
@@ -268,12 +269,12 @@ static int mpc55xx_esci_first_open(int major, int minor, void *arg)
 
   rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_BAUD);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_BAUD);
   }
 
   rv = mpc55xx_esci_set_attributes(minor, &tty->termios);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES);
   }
 
   sc = mpc55xx_interrupt_handler_install(
@@ -285,7 +286,7 @@ static int mpc55xx_esci_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL);
   }
 
   mpc55xx_esci_interrupts_clear_and_enable(self);
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
index 2f71948f74..14cb65ffbc 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c
@@ -22,6 +22,7 @@
 
 #include <bsp.h>
 #include <bsp/console-generic.h>
+#include <bsp/fatal.h>
 
 #include <rtems/console.h>
 
@@ -80,7 +81,7 @@ rtems_device_driver console_initialize(
   rtems_device_minor_number console = console_generic_minor;
 
   if (count <= 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_COUNT);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_COUNT);
   }
 
   rtems_termios_initialize();
@@ -90,13 +91,13 @@ rtems_device_driver console_initialize(
 
     sc = rtems_io_register_name(info->device_path, major, minor);
     if (sc != RTEMS_SUCCESSFUL) {
-      mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER);
+      bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER);
     }
   }
 
   sc = rtems_io_register_name(CONSOLE_DEVICE_NAME, major, console);
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE);
   }
 
   console_generic_char_out_do_init();
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
index 20ffcf3d57..71be4dc424 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c
@@ -21,6 +21,7 @@
 #include <bsp/console-linflex.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 
 #ifdef MPC55XX_HAS_LINFLEX
@@ -261,12 +262,12 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
 
   rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD);
   }
 
   rv = mpc55xx_linflex_set_attributes(minor, &tty->termios);
   if (rv != 0) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES);
   }
 
   sc = mpc55xx_interrupt_handler_install(
@@ -278,7 +279,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL);
   }
 
   sc = mpc55xx_interrupt_handler_install(
@@ -290,7 +291,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL);
   }
 
   /*
@@ -303,7 +304,7 @@ static int mpc55xx_linflex_first_open(int major, int minor, void *arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL);
   }
   */
 
@@ -333,7 +334,7 @@ static int mpc55xx_linflex_last_close(int major, int minor, void* arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE);
   }
 
   sc = rtems_interrupt_handler_remove(
@@ -342,7 +343,7 @@ static int mpc55xx_linflex_last_close(int major, int minor, void* arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE);
   }
 
   /*
@@ -352,7 +353,7 @@ static int mpc55xx_linflex_last_close(int major, int minor, void* arg)
     self
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE);
+    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE);
   }
   */
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
index 70dbea75a4..596a9bd11b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h
@@ -99,32 +99,6 @@ LINKER_SYMBOL(bsp_section_sysram_load_end)
 
 #define BSP_SYSRAM_SECTION __attribute__((section(".bsp_sysram")))
 
-typedef enum {
-  MPC55XX_FATAL_FMPLL_LOCK,
-  MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL,
-  MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER,
-  MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL,
-  MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_GENERIC_COUNT,
-  MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER,
-  MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE,
-  MPC55XX_FATAL_CONSOLE_ESCI_BAUD,
-  MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES,
-  MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE,
-  MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE,
-  MPC55XX_FATAL_EDMA_IRQ_INSTALL,
-  MPC55XX_FATAL_EDMA_IRQ_REMOVE
-} mpc55xx_fatal_code;
-
-void mpc55xx_fatal(mpc55xx_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
index ed3ef537b5..2c8ceed3a4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
@@ -61,11 +61,6 @@ void _BSP_Fatal_error(unsigned n)
 	}
 }
 
-void mpc55xx_fatal(mpc55xx_fatal_code code)
-{
-  rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
-}
-
 static void null_pointer_protection(void)
 {
 #ifdef MPC55XX_NULL_POINTER_PROTECTION
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
index f99efa22a5..b4c47579e4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
@@ -21,6 +21,7 @@
  */
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/start.h>
 #include <bsp/bootcard.h>
 #include <bsp/mpc55xx-config.h>
@@ -38,7 +39,7 @@
       }
 
       if (!lock) {
-        mpc55xx_fatal(MPC55XX_FATAL_FMPLL_LOCK);
+        bsp_fatal(MPC55XX_FATAL_FMPLL_LOCK);
       }
     }
   #endif