From 40a6de582196b4decbd7ebadc0636388eaef0dde Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 3 May 2017 15:47:03 -1000 Subject: [PATCH] aerofc-v1:spi_dev_e is now uint32_t in NuttX Using new type of uint32_t for spi device and macros that define a PX4 device on a given BUS and Chip Select --- src/drivers/boards/aerofc-v1/aerofc_spi.c | 4 ++-- src/drivers/boards/aerofc-v1/board_config.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/boards/aerofc-v1/aerofc_spi.c b/src/drivers/boards/aerofc-v1/aerofc_spi.c index 16b3773e9a..029678eba4 100644 --- a/src/drivers/boards/aerofc-v1/aerofc_spi.c +++ b/src/drivers/boards/aerofc-v1/aerofc_spi.c @@ -77,13 +77,13 @@ __EXPORT void stm32_spiinitialize(void) } -__EXPORT void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +__EXPORT void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { /* SPI select is active low, so write !selected to select the device */ px4_arch_gpiowrite(GPIO_SPI_CS_MPU6500, !selected); } -__EXPORT uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +__EXPORT uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } diff --git a/src/drivers/boards/aerofc-v1/board_config.h b/src/drivers/boards/aerofc-v1/board_config.h index 578ae50b96..45971f9049 100644 --- a/src/drivers/boards/aerofc-v1/board_config.h +++ b/src/drivers/boards/aerofc-v1/board_config.h @@ -88,7 +88,7 @@ #define GPIO_SPI_CS_MPU6500 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4) #define PX4_SPI_BUS_SENSORS 1 -#define PX4_SPIDEV_MPU 1 +#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1) /* * STM32 ADC channels