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/libcpu | |
| 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/libcpu')
3 files changed, 7 insertions, 6 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c b/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c index 0856ad7535..a2f687b013 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c +++ b/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c @@ -26,6 +26,7 @@ #include <assert.h> #include <bsp.h> +#include <bsp/fatal.h> #include <bsp/irq.h> #define EDMA_CHANNELS_PER_GROUP 32U @@ -199,7 +200,7 @@ void mpc55xx_edma_init(void) NULL ); if (sc != RTEMS_SUCCESSFUL) { - mpc55xx_fatal(MPC55XX_FATAL_EDMA_IRQ_INSTALL); + bsp_fatal(MPC55XX_FATAL_EDMA_IRQ_INSTALL); } } } @@ -283,7 +284,7 @@ void mpc55xx_edma_release_channel(edma_channel_context *ctx) ctx ); if (sc != RTEMS_SUCCESSFUL) { - mpc55xx_fatal(MPC55XX_FATAL_EDMA_IRQ_REMOVE); + bsp_fatal(MPC55XX_FATAL_EDMA_IRQ_REMOVE); } } diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c index 07dfbeaf6b..8a685d769c 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c +++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c @@ -25,7 +25,7 @@ #include <rtems.h> #include <bsp/vectors.h> -#include <bsp/generic-fatal.h> +#include <bsp/fatal.h> #define PPC_EXC_ASSERT_OFFSET(field, off) \ RTEMS_STATIC_ASSERT( \ @@ -145,7 +145,7 @@ static void ppc_exc_initialize_booke(void *vector_base) static void ppc_exc_fatal_error(void) { - bsp_generic_fatal(BSP_GENERIC_FATAL_EXCEPTION_INITIALIZATION); + bsp_fatal(PPC_FATAL_EXCEPTION_INITIALIZATION); } void ppc_exc_initialize_with_vector_base( diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h index d928d70662..dc2487cddd 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h +++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h @@ -370,8 +370,8 @@ void ppc_exc_initialize_with_vector_base( * @brief Initializes the exception handling. * * If the initialization fails, then this is a fatal error. The fatal error - * source is RTEMS_FATAL_SOURCE_BSP_GENERIC and the fatal error code is - * BSP_GENERIC_FATAL_EXCEPTION_INITIALIZATION. + * source is RTEMS_FATAL_SOURCE_BSP and the fatal error code is + * PPC_FATAL_EXCEPTION_INITIALIZATION. * * Possible error reasons are * - no category set available for the current CPU, |