sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configs/: Back out many of the changes in two recent commits: Too many changes from SPIDEV_WIRELESS to SPIDEV_CONTACTLESS. Specifically NRF24L01 should still be SPIDEV_WIRELESS.

Browse Source
This commit is contained in:
Gregory Nutt 2017-06-08 15:34:13 -06:00
parent 44b532e648
commit bf6709b887
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/shenzhou/src/stm32_spi.c
View File

@ -179,7 +179,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
stm32_gpiowrite(GPIO_LCDSD_CS, !selected);
}
else if (devid == SPIDEV_CONTACTLESS(0))
else if (devid == SPIDEV_WIRELESS(0))
{
/* Set the GPIO low to select and high to de-select */

4
configs/stm32_tiny/src/stm32_spi.c
View File

@ -125,7 +125,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
switch(devid)
{
#ifdef CONFIG_WL_NRF24L01
case SPIDEV_CONTACTLESS(0):
case SPIDEV_WIRELESS(0):
spiinfo("nRF24L01 device %s\n", selected ? "asserted" : "de-asserted");
/* Set the GPIO low to select and high to de-select */
@ -144,7 +144,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid)
switch(devid)
{
#ifdef CONFIG_WL_NRF24L01
case SPIDEV_CONTACTLESS(0):
case SPIDEV_WIRELESS(0):
status |= SPI_STATUS_PRESENT;
break;
#endif

4
configs/stm32f103-minimum/src/stm32_spi.c
View File

@ -157,7 +157,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#endif
#ifdef CONFIG_WL_NRF24L01
if (devid == SPIDEV_CONTACTLESS(0))
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_NRF24L01_CS, !selected);
}
@ -176,7 +176,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
uint8_t status = 0;
#ifdef CONFIG_WL_NRF24L01
if (devid == SPIDEV_CONTACTLESS(0))
if (devid == SPIDEV_WIRELESS(0))
{
status |= SPI_STATUS_PRESENT;
}