From 59ec0e8aef2bd105ff68c08b8c16da826f1cccd7 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 20 Jan 2017 16:33:37 -1000 Subject: [PATCH] Make board_crashdump.c arch agnostic and move to common --- src/drivers/boards/aerofc-v1/CMakeLists.txt | 1 - src/drivers/boards/auav-x21/CMakeLists.txt | 2 +- src/drivers/boards/common/{stm32 => }/board_crashdump.c | 5 ----- src/drivers/boards/crazyflie/CMakeLists.txt | 2 +- src/drivers/boards/mindpx-v2/CMakeLists.txt | 2 +- src/drivers/boards/px4fmu-v2/CMakeLists.txt | 2 +- src/drivers/boards/px4fmu-v2/px4fmu2_init.c | 7 ------- src/drivers/boards/px4fmu-v4/CMakeLists.txt | 2 +- src/drivers/boards/px4fmu-v4pro/CMakeLists.txt | 2 +- src/drivers/boards/px4fmu-v5/CMakeLists.txt | 2 +- src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt | 2 +- src/drivers/boards/tap-v1/CMakeLists.txt | 2 +- 12 files changed, 9 insertions(+), 22 deletions(-) rename src/drivers/boards/common/{stm32 => }/board_crashdump.c (95%) diff --git a/src/drivers/boards/aerofc-v1/CMakeLists.txt b/src/drivers/boards/aerofc-v1/CMakeLists.txt index 1b39e1a4c1..409c5b1e72 100644 --- a/src/drivers/boards/aerofc-v1/CMakeLists.txt +++ b/src/drivers/boards/aerofc-v1/CMakeLists.txt @@ -35,7 +35,6 @@ px4_add_module( MODULE drivers__boards__aerofc-v1 COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c aerofc_init.c aerofc_spi.c aerofc_usb.c diff --git a/src/drivers/boards/auav-x21/CMakeLists.txt b/src/drivers/boards/auav-x21/CMakeLists.txt index 243e372356..2faf8c8e02 100644 --- a/src/drivers/boards/auav-x21/CMakeLists.txt +++ b/src/drivers/boards/auav-x21/CMakeLists.txt @@ -34,7 +34,7 @@ px4_add_module( MODULE drivers__boards__auav-x21 COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c auav_can.c auav_init.c diff --git a/src/drivers/boards/common/stm32/board_crashdump.c b/src/drivers/boards/common/board_crashdump.c similarity index 95% rename from src/drivers/boards/common/stm32/board_crashdump.c rename to src/drivers/boards/common/board_crashdump.c index 206fd8871d..6b8888e606 100644 --- a/src/drivers/boards/common/stm32/board_crashdump.c +++ b/src/drivers/boards/common/board_crashdump.c @@ -6,22 +6,18 @@ #include -#include "board_config.h" #include -#if defined(CONFIG_STM32_SAVE_CRASHDUMP) || defined(CONFIG_STM32F7_SAVE_CRASHDUMP) static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size) { while (size--) { *dest++ = *src--; } } -#endif __EXPORT void board_crashdump(uintptr_t currentsp, FAR void *tcb, FAR const uint8_t *filename, int lineno) { -#if defined(CONFIG_STM32_SAVE_CRASHDUMP) || defined(CONFIG_STM32F7_SAVE_CRASHDUMP) /* We need a chunk of ram to save the complete context in. * Since we are going to reboot we will use &_sdata * which is the lowest memory and the amount we will save @@ -160,7 +156,6 @@ __EXPORT void board_crashdump(uintptr_t currentsp, FAR void *tcb, FAR const uint up_lowputc('!'); } -#endif #if defined(CONFIG_BOARD_RESET_ON_CRASH) px4_systemreset(false); diff --git a/src/drivers/boards/crazyflie/CMakeLists.txt b/src/drivers/boards/crazyflie/CMakeLists.txt index af26581758..fa47712a04 100644 --- a/src/drivers/boards/crazyflie/CMakeLists.txt +++ b/src/drivers/boards/crazyflie/CMakeLists.txt @@ -33,7 +33,7 @@ px4_add_module( MODULE drivers__boards__crazyflie SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c crazyflie_init.c crazyflie_usb.c diff --git a/src/drivers/boards/mindpx-v2/CMakeLists.txt b/src/drivers/boards/mindpx-v2/CMakeLists.txt index ac0e3a1b30..7eb553147a 100644 --- a/src/drivers/boards/mindpx-v2/CMakeLists.txt +++ b/src/drivers/boards/mindpx-v2/CMakeLists.txt @@ -34,7 +34,7 @@ px4_add_module( MODULE drivers__boards__mindpx-v2 COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c mindpx_can.c mindpx2_init.c diff --git a/src/drivers/boards/px4fmu-v2/CMakeLists.txt b/src/drivers/boards/px4fmu-v2/CMakeLists.txt index 2752be3805..606b17aa19 100644 --- a/src/drivers/boards/px4fmu-v2/CMakeLists.txt +++ b/src/drivers/boards/px4fmu-v2/CMakeLists.txt @@ -34,7 +34,7 @@ px4_add_module( MODULE drivers__boards__px4fmu-v2 COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c px4fmu_can.c px4fmu2_init.c diff --git a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c index 3ed0d5b379..c22b41c76c 100644 --- a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c +++ b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c @@ -477,10 +477,3 @@ __EXPORT int board_app_initialize(uintptr_t arg) return OK; } - -static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size) -{ - while (size--) { - *dest++ = *src--; - } -} diff --git a/src/drivers/boards/px4fmu-v4/CMakeLists.txt b/src/drivers/boards/px4fmu-v4/CMakeLists.txt index fb9250dd9e..baad9a6b6e 100644 --- a/src/drivers/boards/px4fmu-v4/CMakeLists.txt +++ b/src/drivers/boards/px4fmu-v4/CMakeLists.txt @@ -34,7 +34,7 @@ px4_add_module( MODULE drivers__boards__px4fmu-v4 COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c px4fmu_can.c px4fmu_init.c diff --git a/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt b/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt index 67a0665735..67cb15cf0e 100644 --- a/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt +++ b/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt @@ -34,7 +34,7 @@ px4_add_module( MODULE drivers__boards__px4fmu-v4pro COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c px4fmu_can.c px4fmu_init.c diff --git a/src/drivers/boards/px4fmu-v5/CMakeLists.txt b/src/drivers/boards/px4fmu-v5/CMakeLists.txt index 4f5cd609ad..7b7de80347 100644 --- a/src/drivers/boards/px4fmu-v5/CMakeLists.txt +++ b/src/drivers/boards/px4fmu-v5/CMakeLists.txt @@ -35,7 +35,7 @@ px4_add_module( COMPILE_FLAGS -Os SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c # WIP px4fmu_can.c px4fmu_init.c diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt b/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt index c955a0b985..318ec009a7 100644 --- a/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt +++ b/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt @@ -35,7 +35,7 @@ px4_add_module( COMPILE_FLAGS -Os SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c # WIP px4nucleo_can.c px4nucleo_init.c diff --git a/src/drivers/boards/tap-v1/CMakeLists.txt b/src/drivers/boards/tap-v1/CMakeLists.txt index df12827147..94fd131810 100644 --- a/src/drivers/boards/tap-v1/CMakeLists.txt +++ b/src/drivers/boards/tap-v1/CMakeLists.txt @@ -35,7 +35,7 @@ px4_add_module( MODULE drivers__boards__tap-v1 COMPILE_FLAGS SRCS - ../common/stm32/board_crashdump.c + ../common/board_crashdump.c ../common/board_dma_alloc.c tap_init.c tap_pwr.c