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.

8 files changed, 12 insertions, 70 deletions

diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h b/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
index d4a20658cd..15dc1109b3 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
+++ b/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h
@@ -117,16 +117,6 @@ bool lpc24xx_uart_probe_2(int minor);
 
 bool lpc24xx_uart_probe_3(int minor);
 
-typedef enum {
-  BSP_ARM_PL111_FATAL_REGISTER_DEV,
-  BSP_ARM_PL111_FATAL_SEM_CREATE,
-  BSP_ARM_PL111_FATAL_SEM_RELEASE,
-  LPC24XX_FATAL_PL111_SET_UP,
-  LPC24XX_FATAL_PL111_PINS_SET_UP,
-  LPC24XX_FATAL_PL111_PINS_TEAR_DOWN,
-  LPC24XX_FATAL_PL111_TEAR_DOWN
-} lpc24xx_fatal_code;
-
 /** @} */
 
 #ifdef __cplusplus
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c b/c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c
index 320800188d..5ac870eae9 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c
@@ -15,6 +15,7 @@
 #include <bsp/arm-pl111-fb.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/io.h>
 #include <bsp/lcd.h>
 #include <bsp/lpc24xx.h>
@@ -48,7 +49,7 @@ static void fb_set_up(const pl111_fb_config *cfg)
 
   sc = lpc24xx_module_enable(LPC24XX_MODULE_LCD, LPC24XX_MODULE_PCLK_DEFAULT);
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, LPC24XX_FATAL_PL111_SET_UP);
+    bsp_fatal(LPC24XX_FATAL_PL111_SET_UP);
   }
 
   #ifdef ARM_MULTILIB_ARCH_V4
@@ -68,10 +69,7 @@ static void fb_pins_set_up(const pl111_fb_config *cfg)
 
   sc = lpc24xx_pin_config(tft_16_bit_5_6_5_pins, LPC24XX_PIN_SET_FUNCTION);
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      LPC24XX_FATAL_PL111_PINS_SET_UP
-    );
+    bsp_fatal(LPC24XX_FATAL_PL111_PINS_SET_UP);
   }
 }
 
@@ -81,10 +79,7 @@ static void fb_pins_tear_down(const pl111_fb_config *cfg)
 
   sc = lpc24xx_pin_config(tft_16_bit_5_6_5_pins, LPC24XX_PIN_SET_INPUT);
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      LPC24XX_FATAL_PL111_PINS_TEAR_DOWN
-    );
+    bsp_fatal(LPC24XX_FATAL_PL111_PINS_TEAR_DOWN);
   }
 }
 
@@ -98,10 +93,7 @@ static void fb_tear_down(const pl111_fb_config *cfg)
 
   sc = lpc24xx_module_disable(LPC24XX_MODULE_LCD);
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      LPC24XX_FATAL_PL111_TEAR_DOWN
-    );
+    bsp_fatal(LPC24XX_FATAL_PL111_TEAR_DOWN);
   }
 }
 
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h b/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h
index 959ff92e8f..9e7c407951 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h
@@ -51,16 +51,6 @@ extern "C" {
 
 #define BSP_ARM_GIC_DIST_BASE 0x1f001000
 
-typedef enum {
-  BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL,
-  BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE,
-  BSP_ARM_PL111_FATAL_REGISTER_DEV,
-  BSP_ARM_PL111_FATAL_SEM_CREATE,
-  BSP_ARM_PL111_FATAL_SEM_RELEASE
-} rvpbxa9_fatal_code;
-
-void rvpbxa9_fatal(rvpbxa9_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c
index d744fbc91c..8715e1d0ea 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c
@@ -16,11 +16,6 @@
 #include <bsp/bootcard.h>
 #include <bsp/irq-generic.h>
 
-void rvpbxa9_fatal(rvpbxa9_fatal_code code)
-{
-  rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
-}
-
 void bsp_start(void)
 {
   bsp_interrupt_initialize();
diff --git a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c
index 54f09fa13f..e32657d32e 100644
--- a/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c
+++ b/c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c
@@ -15,6 +15,7 @@
 #include <rtems/counter.h>
 
 #include <bsp.h>
+#include <bsp/fatal.h>
 #include <bsp/irq.h>
 #include <bsp/arm-a9mpcore-regs.h>
 #include <bsp/arm-a9mpcore-clock.h>
@@ -51,10 +52,7 @@ static void a9mpcore_clock_handler_install(void)
     NULL
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL
-    );
+    bsp_fatal(BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL);
   }
 }
 
@@ -121,10 +119,7 @@ static void a9mpcore_clock_cleanup(void)
     NULL
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE
-    );
+    bsp_fatal(BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE);
   }
 }
 
diff --git a/c/src/lib/libbsp/arm/shared/arm-pl111-fb.c b/c/src/lib/libbsp/arm/shared/arm-pl111-fb.c
index fd9967d0ba..408047df3c 100644
--- a/c/src/lib/libbsp/arm/shared/arm-pl111-fb.c
+++ b/c/src/lib/libbsp/arm/shared/arm-pl111-fb.c
@@ -22,6 +22,7 @@
 
 #include <bsp.h>
 #include <bsp/arm-pl111-fb.h>
+#include <bsp/fatal.h>
 
 typedef struct {
   rtems_id semaphore;
@@ -154,10 +155,7 @@ static void pl111_fb_release(const pl111_fb_context *ctx)
 {
   rtems_status_code sc = rtems_semaphore_release(ctx->semaphore);
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      BSP_ARM_PL111_FATAL_SEM_RELEASE
-    );
+    bsp_fatal(BSP_ARM_PL111_FATAL_SEM_RELEASE);
   }
 }
 
@@ -172,10 +170,7 @@ rtems_device_driver frame_buffer_initialize(
 
   sc = rtems_io_register_name(FRAMEBUFFER_DEVICE_0_NAME, major, 0);
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      BSP_ARM_PL111_FATAL_REGISTER_DEV
-    );
+    bsp_fatal(BSP_ARM_PL111_FATAL_REGISTER_DEV);
   }
 
   sc = rtems_semaphore_create(
@@ -186,10 +181,7 @@ rtems_device_driver frame_buffer_initialize(
     &ctx->semaphore
   );
   if (sc != RTEMS_SUCCESSFUL) {
-    rtems_fatal(
-      RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
-      BSP_ARM_PL111_FATAL_SEM_CREATE
-    );
+    bsp_fatal(BSP_ARM_PL111_FATAL_SEM_CREATE);
   }
 
   return sc;
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h b/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h
index 56e62a5633..c837d0ddbf 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h
@@ -55,13 +55,6 @@ extern "C" {
 
 #define BSP_ARM_GIC_DIST_BASE 0xf8f01000
 
-typedef enum {
-  BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL,
-  BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE
-} zynq_fatal_code;
-
-void zynq_fatal(zynq_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
-
 /**
  * @brief Zynq specific set up of the MMU.
  *
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c
index e312c9ab19..8715e1d0ea 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c
@@ -16,11 +16,6 @@
 #include <bsp/bootcard.h>
 #include <bsp/irq-generic.h>
 
-void zynq_fatal(zynq_fatal_code code)
-{
-  rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
-}
-
 void bsp_start(void)
 {
   bsp_interrupt_initialize();