board_common.h: move under platforms/common

Also move board_determine_hw_info and board_gpio_init under platforms/nuttx
This commit is contained in:
Beat Küng
2019-10-30 11:48:47 +01:00
parent dc601f15f1
commit b30171ba8d
51 changed files with 168 additions and 84 deletions
+1 -1
View File
@@ -57,4 +57,4 @@
#define ADC_AIRSPEED_VOLTAGE_CHANNEL 11
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
+1 -1
View File
@@ -346,7 +346,7 @@ extern void stm32_usbinitialize(void);
#define board_peripheral_reset(ms)
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -57,4 +57,4 @@
#define PX4_NUMBER_I2C_BUSES 3
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
+1 -1
View File
@@ -266,7 +266,7 @@ int usbmsc_archinitialize(void);
extern int composite_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -270,7 +270,7 @@ extern void stm32_usbinitialize(void);
extern void stm32_spiinitialize(void);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
__END_DECLS
+1 -1
View File
@@ -388,7 +388,7 @@ void board_spi_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+3 -2
View File
@@ -71,6 +71,7 @@
#include <systemlib/px4_macros.h>
#include <px4_platform_common/init.h>
#include <px4_platform_common/i2c.h>
#include <px4_platform/gpio.h>
#include <drivers/boards/common/board_dma_alloc.h>
static int configure_switch(void);
@@ -91,7 +92,7 @@ __EXPORT void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -118,7 +119,7 @@ stm32_boardinitialize(void)
/* configure pins */
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
/* configure SPI interfaces */
stm32_spiinitialize();
+1 -1
View File
@@ -64,7 +64,7 @@
#define PX4_NUMBER_I2C_BUSES 1
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#ifdef __cplusplus
extern "C" {
+1 -1
View File
@@ -283,7 +283,7 @@ extern int stm32_spi_bus_initialize(void);
void board_spi_reset(int ms);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+2 -1
View File
@@ -3,6 +3,7 @@
************************************************************************************/
#include <px4_platform_common/px4_config.h>
#include <px4_platform/gpio.h>
#include <stdint.h>
#include <stdbool.h>
@@ -46,7 +47,7 @@ static const uint32_t spi1selects_gpio[] = PX4_FLOW_BUS_CS_GPIO;
__EXPORT void stm32_spiinitialize(void)
{
#ifdef CONFIG_STM32_SPI1
board_gpio_init(spi1selects_gpio, arraySize(spi1selects_gpio));
px4_gpio_init(spi1selects_gpio, arraySize(spi1selects_gpio));
#endif
}
+1 -1
View File
@@ -60,4 +60,4 @@
#define PX4_NUMBER_I2C_BUSES 1
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
+1 -1
View File
@@ -270,7 +270,7 @@ extern void board_peripheral_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+4 -2
View File
@@ -68,6 +68,8 @@
#include <drivers/drv_board_led.h>
#include <systemlib/px4_macros.h>
#include <px4_platform_common/init.h>
#include <px4_platform/gpio.h>
#include <px4_platform/gpio.h>
#include <drivers/boards/common/board_dma_alloc.h>
# if defined(FLASH_BASED_PARAMS)
@@ -120,7 +122,7 @@ __EXPORT void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -149,7 +151,7 @@ stm32_boardinitialize(void)
/* configure pins */
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
/* configure SPI interfaces */
+1 -1
View File
@@ -180,7 +180,7 @@ extern void stm32_spiinitialize(void);
extern int board_sdio_initialize(void);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+2
View File
@@ -41,9 +41,11 @@ add_library(drivers_board
timer_config.c
usb.c
)
add_dependencies(drivers_board arch_board_hw_info)
target_link_libraries(drivers_board
PRIVATE
arch_board_hw_info
drivers__led # drv_led_start
nuttx_arch # sdio
nuttx_drivers # sdio
+1 -1
View File
@@ -544,7 +544,7 @@ extern void board_peripheral_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+4 -2
View File
@@ -70,6 +70,8 @@
#include <drivers/drv_board_led.h>
#include <systemlib/px4_macros.h>
#include <px4_platform_common/init.h>
#include <px4_platform/board_determine_hw_info.h>
#include <px4_platform/gpio.h>
#include <drivers/boards/common/board_dma_alloc.h>
/****************************************************************************
@@ -182,7 +184,7 @@ __EXPORT void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -236,7 +238,7 @@ stm32_boardinitialize(void)
/* configure pins */
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
/* configure SPI interfaces */
+1 -1
View File
@@ -392,7 +392,7 @@ extern void board_peripheral_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+3 -2
View File
@@ -69,6 +69,7 @@
#include <drivers/drv_board_led.h>
#include <systemlib/px4_macros.h>
#include <px4_platform_common/init.h>
#include <px4_platform/gpio.h>
#include <drivers/boards/common/board_dma_alloc.h>
/****************************************************************************
@@ -132,7 +133,7 @@ __EXPORT void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -159,7 +160,7 @@ stm32_boardinitialize(void)
/* configure pins */
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
/* configure SPI interfaces */
stm32_spiinitialize();
+1 -1
View File
@@ -664,7 +664,7 @@ void fmuk66_automount_event(bool inserted);
void fmuk66_timer_initialize(void);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+3 -2
View File
@@ -46,6 +46,7 @@
****************************************************************************/
#include <px4_platform_common/px4_config.h>
#include <px4_platform/gpio.h>
#include <stdbool.h>
#include <stdio.h>
@@ -116,7 +117,7 @@ void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -178,7 +179,7 @@ kinetis_boardinitialize(void)
board_autoled_initialize();
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
fmuk66_timer_initialize();
+1 -1
View File
@@ -313,7 +313,7 @@ extern void stm32_usbinitialize(void);
extern void board_peripheral_reset(int ms);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -54,4 +54,4 @@
#define PX4_NUMBER_I2C_BUSES 1
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
+1 -1
View File
@@ -274,7 +274,7 @@ int usbmsc_archinitialize(void);
extern int composite_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -343,7 +343,7 @@ int usbmsc_archinitialize(void);
extern int composite_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -517,7 +517,7 @@ extern void board_peripheral_reset(int ms);
extern void stm32_usbinitialize(void);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -518,7 +518,7 @@ extern void board_peripheral_reset(int ms);
extern void stm32_usbinitialize(void);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -393,7 +393,7 @@ extern void stm32_usbinitialize(void);
extern void board_peripheral_reset(int ms);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -390,7 +390,7 @@ extern void board_peripheral_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+2
View File
@@ -41,9 +41,11 @@ add_library(drivers_board
timer_config.c
usb.c
)
add_dependencies(drivers_board arch_board_hw_info)
target_link_libraries(drivers_board
PRIVATE
arch_board_hw_info
drivers__led # drv_led_start
nuttx_arch # sdio
nuttx_drivers # sdio
+1 -1
View File
@@ -737,7 +737,7 @@ extern void board_peripheral_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+4 -2
View File
@@ -69,6 +69,8 @@
#include <drivers/drv_board_led.h>
#include <systemlib/px4_macros.h>
#include <px4_platform_common/init.h>
#include <px4_platform/gpio.h>
#include <px4_platform/board_determine_hw_info.h>
#include <drivers/boards/common/board_dma_alloc.h>
/****************************************************************************
@@ -137,7 +139,7 @@ __EXPORT void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -166,7 +168,7 @@ stm32_boardinitialize(void)
/* configure pins */
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
/* configure SPI interfaces */
+2
View File
@@ -41,9 +41,11 @@ add_library(drivers_board
timer_config.c
usb.c
)
add_dependencies(drivers_board arch_board_hw_info)
target_link_libraries(drivers_board
PRIVATE
arch_board_hw_info
drivers__led # drv_led_start
nuttx_arch # sdio
nuttx_drivers # sdio
+1 -1
View File
@@ -736,7 +736,7 @@ extern void board_peripheral_reset(int ms);
int nsh_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+4 -2
View File
@@ -69,6 +69,8 @@
#include <drivers/drv_board_led.h>
#include <systemlib/px4_macros.h>
#include <px4_platform_common/init.h>
#include <px4_platform/gpio.h>
#include <px4_platform/board_determine_hw_info.h>
#include <drivers/boards/common/board_dma_alloc.h>
/****************************************************************************
@@ -143,7 +145,7 @@ __EXPORT void board_on_reset(int status)
/* configure the GPIO pins to outputs and keep them low */
const uint32_t gpio[] = PX4_GPIO_PWM_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
if (status >= 0) {
up_mdelay(6);
@@ -172,7 +174,7 @@ stm32_boardinitialize(void)
/* configure pins */
const uint32_t gpio[] = PX4_GPIO_INIT_LIST;
board_gpio_init(gpio, arraySize(gpio));
px4_gpio_init(gpio, arraySize(gpio));
/* configure SPI interfaces */
+1 -1
View File
@@ -47,7 +47,7 @@
#include <nuttx/compiler.h>
#include <stdint.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
/******************************************************************************
* Definitions
+1 -1
View File
@@ -55,4 +55,4 @@
#define ADC_BATTERY_CURRENT_CHANNEL 1
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
+1 -1
View File
@@ -58,4 +58,4 @@
#define BOARD_ARMED_STATE_LED LED_GREEN
#include <system_config.h>
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
+1 -1
View File
@@ -123,7 +123,7 @@ int board_can_initialize(void);
extern int composite_archinitialize(void);
#endif
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */
+1 -1
View File
@@ -382,7 +382,7 @@ extern void stm32_usbinitialize(void);
extern void board_peripheral_reset(int ms);
#include <drivers/boards/common/board_common.h>
#include <px4_platform_common/board_common.h>
#endif /* __ASSEMBLY__ */