diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-02-17 11:40:18 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-02-19 09:59:39 +0100 |
commit | 33cb8bf64d7b7551ea3a2e7ced5d4b56cd32d6db (patch) | |
tree | 9aca7c789c974a8e3d7538cfad7d40c4c9aef37a /c/src/lib/libbsp/powerpc/gen5200 | |
parent | score: Delete INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP (diff) | |
download | rtems-33cb8bf64d7b7551ea3a2e7ced5d4b56cd32d6db.tar.bz2 |
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.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/gen5200')
9 files changed, 20 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c index dee1ca10be..f16a958f78 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c +++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c @@ -19,6 +19,7 @@ #include <libcpu/powerpc-utility.h> #include <bsp.h> +#include <bsp/fatal.h> #include <bsp/irq.h> typedef enum { @@ -182,7 +183,7 @@ void ata_driver_dma_pio_single_create(ata_driver_dma_pio_single *self, const cha self ); if (sc != RTEMS_SUCCESSFUL) { - mpc5200_fatal(MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL); + bsp_fatal(MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL); } } } diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c index 60380a8008..20e8f26904 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c +++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c @@ -13,6 +13,7 @@ */ #include <bsp/ata.h> +#include <bsp/fatal.h> #include <libchip/ata.h> @@ -33,7 +34,7 @@ rtems_status_code rtems_ata_initialize( ata_driver_dma_pio_single_create(&ata_driver_instance, "/dev/hda", TASK_PCI_TX); } else { - mpc5200_fatal(MPC5200_FATAL_ATA_DISK_IO_INIT); + bsp_fatal(MPC5200_FATAL_ATA_DISK_IO_INIT); } return sc; diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c index 54a31d1473..5230f5d3e1 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c +++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c @@ -17,6 +17,7 @@ #include <bsp/ata.h> #include <bsp.h> +#include <bsp/fatal.h> #include <bsp/mpc5200.h> #include <libcpu/powerpc-utility.h> @@ -125,7 +126,7 @@ static void create_lock(ata_driver *self) &self->lock ); if (sc != RTEMS_SUCCESSFUL) { - mpc5200_fatal(MPC5200_FATAL_ATA_LOCK_CREATE); + bsp_fatal(MPC5200_FATAL_ATA_LOCK_CREATE); } } @@ -133,7 +134,7 @@ static void destroy_lock(const ata_driver *self) { rtems_status_code sc = rtems_semaphore_delete(self->lock); if (sc != RTEMS_SUCCESSFUL) { - mpc5200_fatal(MPC5200_FATAL_ATA_LOCK_DESTROY); + bsp_fatal(MPC5200_FATAL_ATA_LOCK_DESTROY); } } @@ -162,7 +163,7 @@ void ata_driver_create(ata_driver *self, const char *device_file_path, rtems_blo ); if (sc != RTEMS_SUCCESSFUL) { - mpc5200_fatal(MPC5200_FATAL_ATA_DISK_CREATE); + bsp_fatal(MPC5200_FATAL_ATA_DISK_CREATE); } } } diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h index b8c46dc268..463417ac73 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h @@ -254,24 +254,6 @@ void BSP_IRQ_Benchmarking_Report(void); void cpu_init(void); -typedef enum { - MPC5200_FATAL_PCF8563_INVALID_YEAR, - MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL, - MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL, - MPC5200_FATAL_TM27_IRQ_INSTALL, - MPC5200_FATAL_MSCAN_A_INIT, - MPC5200_FATAL_MSCAN_B_INIT, - MPC5200_FATAL_MSCAN_A_SET_MODE, - MPC5200_FATAL_MSCAN_B_SET_MODE, - MPC5200_FATAL_ATA_DISK_IO_INIT, - MPC5200_FATAL_ATA_DISK_CREATE, - MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL, - MPC5200_FATAL_ATA_LOCK_CREATE, - MPC5200_FATAL_ATA_LOCK_DESTROY -} mpc5200_fatal_code; - -void mpc5200_fatal(mpc5200_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE; - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h b/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h index 612714cb9d..55ada2c66b 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h +++ b/c/src/lib/libbsp/powerpc/gen5200/include/tm27.h @@ -17,6 +17,7 @@ #ifndef __tm27_h #define __tm27_h +#include <bsp/fatal.h> #include <bsp/irq.h> /* @@ -37,7 +38,7 @@ void Install_tm27_vector(void (*_handler)()) clockIrqData.hdl = _handler; if (!BSP_install_rtems_irq_handler (&clockIrqData)) { printk("Error installing clock interrupt handler!\n"); - mpc5200_fatal(MPC5200_FATAL_TM27_IRQ_INSTALL); + bsp_fatal(MPC5200_FATAL_TM27_IRQ_INSTALL); } } diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c index 4be59503d0..3a804a3726 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c +++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c @@ -25,6 +25,7 @@ #include <string.h> #include "../include/bsp.h" +#include <bsp/fatal.h> #include <bsp/irq.h> #include "../mscan/mscan_int.h" @@ -770,20 +771,20 @@ rtems_device_driver mscan_initialize(rtems_device_major_number major, /* Initialization requested via RTEMS */ if ((status = mscan_channel_initialize(major, MSCAN_A)) != RTEMS_SUCCESSFUL) - mpc5200_fatal(MPC5200_FATAL_MSCAN_A_INIT); + bsp_fatal(MPC5200_FATAL_MSCAN_A_INIT); if ((status = mscan_channel_initialize(major, MSCAN_B)) != RTEMS_SUCCESSFUL) - mpc5200_fatal(MPC5200_FATAL_MSCAN_B_INIT); + bsp_fatal(MPC5200_FATAL_MSCAN_B_INIT); if ((status = mpc5200_mscan_set_mode(MSCAN_A, MSCAN_INIT_NORMAL_MODE)) != RTEMS_SUCCESSFUL) - mpc5200_fatal(MPC5200_FATAL_MSCAN_A_SET_MODE); + bsp_fatal(MPC5200_FATAL_MSCAN_A_SET_MODE); if ((status = mpc5200_mscan_set_mode(MSCAN_B, MSCAN_INIT_NORMAL_MODE)) != RTEMS_SUCCESSFUL) - mpc5200_fatal(MPC5200_FATAL_MSCAN_B_SET_MODE); + bsp_fatal(MPC5200_FATAL_MSCAN_B_SET_MODE); return status; diff --git a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c index 8c54976de4..0c3bf0d38b 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c +++ b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c @@ -99,6 +99,7 @@ #include <bsp.h> #include <rtems/bspIo.h> +#include <bsp/fatal.h> #include <bsp/irq.h> #include <rtems.h> @@ -338,7 +339,7 @@ rtems_device_driver slt_initialize { printk("Unable to connect PSC Irq handler\n"); - mpc5200_fatal(MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL); + bsp_fatal(MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL); } @@ -353,7 +354,7 @@ rtems_device_driver slt_initialize { printk("Unable to connect PSC Irq handler\n"); - mpc5200_fatal(MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL); + bsp_fatal(MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL); } diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c index 8324b44dc9..bea818042d 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c @@ -124,11 +124,6 @@ void _BSP_Fatal_error(unsigned int v) __asm__ __volatile ("sc"); } -void mpc5200_fatal(mpc5200_fatal_code code) -{ - rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code); -} - void bsp_start(void) { ppc_cpu_id_t myCpu; diff --git a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c b/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c index 2f38ea86fb..0b584a013b 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c +++ b/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c @@ -41,6 +41,7 @@ */ #include <rtems.h> +#include <bsp/fatal.h> #include <libchip/rtc.h> #include <string.h> #include "../tod/pcf8563.h" @@ -185,7 +186,7 @@ pcf8563_set_time(int minor, const rtems_time_of_day *time) addr = RTC_Table[minor].ulDataPort; if ((time->year >= 2100) || (time->year < 1900)) { - mpc5200_fatal(MPC5200_FATAL_PCF8563_INVALID_YEAR); + bsp_fatal(MPC5200_FATAL_PCF8563_INVALID_YEAR); } info[0] = PCF8563_SECOND_ADR; info[1 + PCF8563_YEAR_ADR -PCF8563_SECOND_ADR] = To_BCD(time->year % 100); |