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/arm/lpc24xx | |
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/arm/lpc24xx')
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/include/bsp.h | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c | 18 |
2 files changed, 5 insertions, 23 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); } } |