From a9e58df2157b236bd19c5f071880ca854897ff27 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 3 May 2017 15:47:06 -1000 Subject: [PATCH] nxphlite-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/nxphlite-v1/board_config.h | 2 +- src/drivers/boards/nxphlite-v1/nxphlite_spi.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/drivers/boards/nxphlite-v1/board_config.h b/src/drivers/boards/nxphlite-v1/board_config.h index c571c2b116..4c9e1e72aa 100644 --- a/src/drivers/boards/nxphlite-v1/board_config.h +++ b/src/drivers/boards/nxphlite-v1/board_config.h @@ -211,7 +211,7 @@ __BEGIN_DECLS #define PX4_SPI_BUS_ID(bd) (((bd) >> 4) & 0xf) #define PX4_SPI_DEV_ID(bd) ((bd) & 0xf) -/* 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_SDCARD PX4_MK_SPI_SEL(PX4_SPI_BUS_SDCARD,0) #define PX4_SDCARD_BUS_CS_GPIO {GPIO_SPI_CS_SDCARD} diff --git a/src/drivers/boards/nxphlite-v1/nxphlite_spi.c b/src/drivers/boards/nxphlite-v1/nxphlite_spi.c index 60e0cca1a4..956904819e 100644 --- a/src/drivers/boards/nxphlite-v1/nxphlite_spi.c +++ b/src/drivers/boards/nxphlite-v1/nxphlite_spi.c @@ -191,7 +191,7 @@ __EXPORT int nxphlite_spi_bus_initialize(void) static const uint32_t spi0selects_gpio[] = PX4_SDCARD_BUS_CS_GPIO; -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"); @@ -215,14 +215,14 @@ 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; } static const uint32_t spi1selects_gpio[] = PX4_ACCEL_MAG_BUS_CS_GPIO; -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"); @@ -246,14 +246,14 @@ 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; } static const uint32_t spi2selects_gpio[] = PX4_GYRO_BUS_CS_GPIO; -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"); @@ -277,7 +277,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; }