From 6894425fa6cf7a3bd2c6235b835ca2d4e103a4aa Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 3 May 2017 15:47:07 -1000 Subject: [PATCH] nxphlite-v3: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/nxphlite-v3/board_config.h | 2 +- src/drivers/boards/nxphlite-v3/nxphlite_spi.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/drivers/boards/nxphlite-v3/board_config.h b/src/drivers/boards/nxphlite-v3/board_config.h index 08814f9821..8ec6e4c5db 100644 --- a/src/drivers/boards/nxphlite-v3/board_config.h +++ b/src/drivers/boards/nxphlite-v3/board_config.h @@ -223,7 +223,7 @@ __BEGIN_DECLS #define GPIO_EXTI_BARO_INT1 (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTD | PIN11) #undef GPIO_EXTI_BARO_INT2 /* NC */ -/* Use these in place of the spi_dev_e enumeration to select a specific SPI device on SPI1 */ +/* Use these in place of the uint32_t enumeration to select a specific SPI device on SPI1 */ #define PX4_SPIDEV_MEMORY PX4_MK_SPI_SEL(PX4_SPI_BUS_MEMORY,0) #define PX4_MEMORY_BUS_CS_GPIO {GPIO_SPI_CS_MEMORY} diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_spi.c b/src/drivers/boards/nxphlite-v3/nxphlite_spi.c index 4b76656d8b..0cf3e08abc 100644 --- a/src/drivers/boards/nxphlite-v3/nxphlite_spi.c +++ b/src/drivers/boards/nxphlite-v3/nxphlite_spi.c @@ -226,15 +226,15 @@ __EXPORT int nxphlite_spi_bus_initialize(void) * ************************************************************************************/ -void kinetis_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void kinetis_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); /* SPI select is active low, so write !selected to select the device */ - int sel = (int) devid; + uint32_t sel = devid; - if (devid == SPIDEV_FLASH) { + if (devid == SPIDEV_FLASH(0)) { sel = PX4_SPIDEV_MEMORY; } @@ -255,12 +255,12 @@ void kinetis_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool se } } -uint8_t kinetis_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t kinetis_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } -void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void kinetis_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -284,12 +284,12 @@ void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool se } } -uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } -void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void kinetis_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -313,7 +313,7 @@ void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool se } } -uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; }