Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-03-23 22:43:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add an instance argument to the SPIDEV definitions.

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-29 12:26:52 -06:00
parent 73c78fb690
commit e9a5477506
102 changed files with 536 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/lpc31xx/lpc31_spi.c
View File

@@ -491,15 +491,15 @@ static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
* be in board specific code..... */
switch (devid)
{
case SPIDEV_FLASH:
case SPIDEV_FLASH(0):
slave = 0;
break;
case SPIDEV_MMCSD:
case SPIDEV_MMCSD(0):
slave = 1;
break;
case SPIDEV_ETHERNET:
case SPIDEV_ETHERNET(0):
slave = 2;
break;

2
arch/sim/src/up_spiflash.c
View File

@@ -362,7 +362,7 @@ static void spiflash_select(FAR struct spi_dev_s *dev, uint32_t devid,
{
FAR struct sim_spiflashdev_s *priv = (FAR struct sim_spiflashdev_s *)dev;
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
priv->selected = selected;

4
configs/arduino-due/src/sam_mmcsd.c
View File

@@ -145,7 +145,7 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid,
static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid,
bool selected)
{
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
if (selected)
{
@@ -175,7 +175,7 @@ static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid,
static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid)
{
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
return SPI_STATUS_PRESENT;
}

2
configs/clicker2-stm32/src/stm32_spi.c
View File

@@ -139,7 +139,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
switch(devid)
{
#ifdef CONFIG_IEEE802154_MRF24J40
case SPIDEV_IEEE802154:
case SPIDEV_IEEE802154(0):
/* Set the GPIO low to select and high to de-select */
stm32_gpiowrite(GPIO_MB1_CS, !selected);
break;

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

@@ -119,7 +119,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
/* SPI1 connects to the SD CARD and to the SPI FLASH */
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
/* Set the GPIO low to select and high to de-select */

2
configs/eagle100/src/lm_ssi.c
View File

@@ -110,7 +110,7 @@ void weak_function lm_ssidev_initialize(void)
void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert the CS pin to the card */

4
configs/ekk-lm3s9b96/src/lm_ssi.c
View File

@@ -111,14 +111,14 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssi_dumpgpio("tiva_ssiselect() Entry");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert the CS pin to the card */
tiva_gpiowrite(SDCCS_GPIO, !selected);
}
#ifdef CONFIG_NX_LCDDRIVER
else if (devid == SPIDEV_DISPLAY)
else if (devid == SPIDEV_DISPLAY(0))
{
/* Assert the CS pin to the display */

4
configs/fire-stm32v2/src/stm32_spi.c
View File

@@ -145,14 +145,14 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
else
#endif
#ifdef CONFIG_ENC28J60
if (devid == SPIDEV_ETHERNET)
if (devid == SPIDEV_ETHERNET(0))
{
/* Set the GPIO low to select and high to de-select */
stm32_gpiowrite(GPIO_ENC28J60_CS, !selected);
}
#else
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
/* Set the GPIO low to select and high to de-select */

4
configs/freedom-kl25z/src/kl_spi.c
View File

@@ -146,7 +146,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
(int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_ADXL345_SPI
if (devid == SPIDEV_ACCELEROMETER)
if (devid == SPIDEV_ACCELEROMETER(0))
{
/* Active low */
@@ -155,7 +155,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#endif
#if defined(CONFIG_WL_CC3000)
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
kl_gpiowrite(GPIO_WIFI_CS, !selected);
}

2
configs/hymini-stm32v/src/stm32_spi.c
View File

@@ -111,7 +111,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_TOUCHSCREEN)
if (devid == SPIDEV_TOUCHSCREEN(0))
{
/* Set the GPIO low to select and high to de-select */

2
configs/lm3s6432-s2e/src/lm_ssi.c
View File

@@ -110,7 +110,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssi_dumpgpio("tiva_ssiselect() Entry");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert the CS pin to the card */

2
configs/lm3s6965-ek/src/lm_oled.c
View File

@@ -164,7 +164,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
int tiva_ssicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Set GPIO to 1 for data, 0 for command */

4
configs/lm3s6965-ek/src/lm_ssi.c
View File

@@ -115,14 +115,14 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssi_dumpgpio("tiva_ssiselect() Entry");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert the CS pin to the card */
tiva_gpiowrite(SDCCS_GPIO, !selected);
}
#ifdef CONFIG_NX_LCDDRIVER
else if (devid == SPIDEV_DISPLAY)
else if (devid == SPIDEV_DISPLAY(0))
{
/* Assert the CS pin to the display */

2
configs/lm3s8962-ek/src/lm_oled.c
View File

@@ -162,7 +162,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
int tiva_ssicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Set GPIO to 1 for data, 0 for command */

4
configs/lm3s8962-ek/src/lm_ssi.c
View File

@@ -115,14 +115,14 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssi_dumpgpio("tiva_ssiselect() Entry");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert the CS pin to the card */
tiva_gpiowrite(SDCCS_GPIO, !selected);
}
#ifdef CONFIG_NX_LCDDRIVER
else if (devid == SPIDEV_DISPLAY)
else if (devid == SPIDEV_DISPLAY(0))
{
/* Assert the CS pin to the display */

6
configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
View File

@@ -153,14 +153,14 @@ void lpc11_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssp_dumpgpio("lpc11_ssp1select() Entry");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert/de-assert the CS pin to the card */
(void)lpc11_gpiowrite(LPCXPRESSO_SD_CS, !selected);
}
#ifdef CONFIG_NX_LCDDRIVER
else if (devid == SPIDEV_DISPLAY)
else if (devid == SPIDEV_DISPLAY(0))
{
/* Assert the CS pin to the OLED display */
@@ -172,7 +172,7 @@ void lpc11_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
uint8_t lpc11_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid)
{
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Read the state of the card-detect bit */

2
configs/lpcxpresso-lpc1768/src/lpc17_oled.c
View File

@@ -161,7 +161,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
int lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Set GPIO to 1 for data, 0 for command */

6
configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
View File

@@ -153,14 +153,14 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssp_dumpgpio("lpc17_ssp1select() Entry");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert/de-assert the CS pin to the card */
(void)lpc17_gpiowrite(LPCXPRESSO_SD_CS, !selected);
}
#ifdef CONFIG_NX_LCDDRIVER
else if (devid == SPIDEV_DISPLAY)
else if (devid == SPIDEV_DISPLAY(0))
{
/* Assert the CS pin to the OLED display */
@@ -172,7 +172,7 @@ void lpc17_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid)
{
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Read the state of the card-detect bit */

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

@@ -110,7 +110,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
# if defined(CONFIG_LCD_SHARP_MEMLCD)
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
stm32_gpiowrite(GPIO_MEMLCD_CS, selected);
}

12
configs/mikroe-stm32f4/src/stm32_spi.c
View File

@@ -127,11 +127,11 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_VS1053)
if (devid == SPIDEV_AUDIO_DATA)
if (devid == SPIDEV_AUDIO_DATA(0))
{
stm32_gpiowrite(GPIO_CS_MP3_DATA, !selected);
}
else if (devid == SPIDEV_AUDIO_CTRL)
else if (devid == SPIDEV_AUDIO_CTRL(0))
{
stm32_gpiowrite(GPIO_CS_MP3_CMD, !selected);
}
@@ -139,7 +139,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
#endif
#if defined(CONFIG_MMCSD)
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32_gpiowrite(GPIO_CS_MMCSD, !selected);
}
@@ -147,7 +147,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
#endif
#if defined(CONFIG_MTD_M25P)
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
stm32_gpiowrite(GPIO_CS_FLASH, !selected);
}
@@ -156,7 +156,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
/* Must be the expansion header device */
if (devid == SPIDEV_EXPANDER)
if (devid == SPIDEV_EXPANDER(0))
{
stm32_gpiowrite(GPIO_CS_EXP_SPI3, !selected);
}
@@ -167,7 +167,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
uint8_t ret = 0;
#if defined(CONFIG_MMCSD)
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* A low value indicates the card is present */

4
configs/mirtoo/src/pic32_spi2.c
View File

@@ -159,11 +159,11 @@ void pic32mx_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selecte
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
pic32mx_gpiowrite(GPIO_SST25VF032B_CS, !selected);
}
else if (devid == SPIDEV_MUX)
else if (devid == SPIDEV_MUX(0))
{
pic32mx_gpiowrite(GPIO_PGA117_CS, !selected);
}

4
configs/nucleo-f303re/src/stm32_spi.c
View File

@@ -109,7 +109,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_LCD_SSD1351)
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
stm32_gpiowrite(GPIO_OLED_CS, !selected);
}
@@ -176,7 +176,7 @@ int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
bool cmd)
{
#ifdef CONFIG_LCD_SSD1351
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
(void)stm32_gpiowrite(GPIO_OLED_DC, !cmd);
return OK;

6
configs/nucleo-f4x1re/src/stm32_spi.c
View File

@@ -146,14 +146,14 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_SPI_CS_WIFI, !selected);
}
else
#endif
#ifdef HAVE_MMCSD
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected);
}
@@ -172,7 +172,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_WIFI_CS, !selected);
}

6
configs/nucleo-l476rg/src/stm32_spi.c
View File

@@ -146,14 +146,14 @@ void stm32l4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32l4_gpiowrite(GPIO_SPI_CS_WIFI, !selected);
}
else
#endif
#ifdef HAVE_MMCSD
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32l4_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected);
}
@@ -172,7 +172,7 @@ void stm32l4_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32l4_gpiowrite(GPIO_WIFI_CS, !selected);
}

4
configs/olimex-lpc1766stk/src/lpc17_ssp.c
View File

@@ -266,7 +266,7 @@ void weak_function lpc1766stk_sspdev_initialize(void)
void lpc17_ssp0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Assert/de-assert the CS pin to the card */
@@ -287,7 +287,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid)
void lpc17_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Assert/de-assert the CS pin to the card */

2
configs/olimex-stm32-p107/src/stm32_spi.c
View File

@@ -112,7 +112,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_ETHERNET)
if (devid == SPIDEV_ETHERNET(0))
{
/* Set the GPIO low to select and high to de-select */

4
configs/olimexino-stm32/src/stm32_spi.c
View File

@@ -110,7 +110,7 @@ void weak_function stm32_spidev_initialize(void)
void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_USER)
if (devid == SPIDEV_USER(0))
{
stm32_gpiowrite(USER_CSn, !selected);
}
@@ -127,7 +127,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_MMCSD)
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32_gpiowrite(MMCSD_CSn, !selected);
}

2
configs/open1788/src/lpc17_ssp.c
View File

@@ -146,7 +146,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid)
void lpc17_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_TOUCHSCREEN)
if (devid == SPIDEV_TOUCHSCREEN(0))
{
/* Assert/de-assert the CS pin to the touchscreen */

4
configs/pic32mx7mmb/src/pic32_spi.c
View File

@@ -134,7 +134,7 @@ void pic32mx_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selecte
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
pic32mx_gpiowrite(GPIO_SD_CS, !selected);
}
@@ -146,7 +146,7 @@ uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
/* Card detect active low. */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
if (!pic32mx_gpioread(GPIO_SD_CD))
{

2
configs/sam3u-ek/src/sam_spi.c
View File

@@ -149,7 +149,7 @@ void sam_spi0select(uint32_t devid, bool selected)
*/
#if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_ADS7843E)
if (devid == SPIDEV_TOUCHSCREEN)
if (devid == SPIDEV_TOUCHSCREEN(0))
{
sam_gpiowrite(GPIO_TSC_NPCS2, !selected);
}

4
configs/sam4e-ek/src/sam_spi.c
View File

@@ -153,7 +153,7 @@ void sam_spi0select(uint32_t devid, bool selected)
* manually and hold it low throughout the SPI transfer.
*/
case SPIDEV_TOUCHSCREEN:
case SPIDEV_TOUCHSCREEN(0):
sam_gpiowrite(GPIO_TSC_CS, !selected);
break;
#endif
@@ -161,7 +161,7 @@ void sam_spi0select(uint32_t devid, bool selected)
#if defined(CONFIG_MTD_AT25)
/* The AT25 Serial FLASH connects using NPCS3 (PA5). */
case SPIDEV_FLASH:
case SPIDEV_FLASH(0):
sam_gpiowrite(GPIO_FLASH_CS, !selected);
break;
#endif

8
configs/sam4l-xplained/src/sam_spi.c
View File

@@ -145,7 +145,7 @@ void sam_spi0select(uint32_t devid, bool selected)
#ifdef CONFIG_SAM4L_XPLAINED_IOMODULE
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -160,7 +160,7 @@ void sam_spi0select(uint32_t devid, bool selected)
#ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -190,7 +190,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAM4L_XPLAINED_IOMODULE
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -234,7 +234,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid)
int sam_spic0mddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.

2
configs/sama5d3-xplained/src/sam_spi.c
View File

@@ -145,7 +145,7 @@ void sam_spi0select(uint32_t devid, bool selected)
#ifdef CONFIG_MTD_AT25
/* The AT25 serial FLASH connects using NPCS0 */
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
sam_piowrite(PIO_AT25_NPCS0, !selected);
}

2
configs/sama5d3x-ek/src/sam_spi.c
View File

@@ -145,7 +145,7 @@ void sam_spi0select(uint32_t devid, bool selected)
#ifdef CONFIG_MTD_AT25
/* The AT25 serial FLASH connects using NPCS0 */
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
sam_piowrite(PIO_AT25_NPCS0, !selected);
}

2
configs/sama5d4-ek/src/sam_spi.c
View File

@@ -145,7 +145,7 @@ void sam_spi0select(uint32_t devid, bool selected)
#ifdef CONFIG_MTD_AT25
/* The AT25 serial FLASH connects using NPCS0 */
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
sam_piowrite(PIO_AT25_NPCS0, !selected);
}

16
configs/samd20-xplained/src/sam_spi.c
View File

@@ -154,7 +154,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -165,7 +165,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -182,7 +182,7 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -193,7 +193,7 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -254,7 +254,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -277,7 +277,7 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -350,7 +350,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid)
int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.
@@ -371,7 +371,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.

16
configs/samd21-xplained/src/sam_spi.c
View File

@@ -154,7 +154,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD21_XPLAINED_IOMODULE_EXT1
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -165,7 +165,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD21_XPLAINED_OLED1MODULE_EXT1
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -182,7 +182,7 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD21_XPLAINED_IOMODULE_EXT2
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -193,7 +193,7 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAMD21_XPLAINED_OLED1MODULE_EXT2
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -254,7 +254,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAMD21_XPLAINED_IOMODULE_EXT1
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -277,7 +277,7 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAMD21_XPLAINED_IOMODULE_EXT2
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -350,7 +350,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid)
int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAMD21_XPLAINED_OLED1MODULE_EXT1
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.
@@ -371,7 +371,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAMD21_XPLAINED_OLED1MODULE_EXT2
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.

16
configs/saml21-xplained/src/sam_spi.c
View File

@@ -154,7 +154,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAML21_XPLAINED_IOMODULE_EXT1
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -165,7 +165,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAML21_XPLAINED_OLED1MODULE_EXT1
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -182,7 +182,7 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAML21_XPLAINED_IOMODULE_EXT2
/* Select/de-select the SD card */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -193,7 +193,7 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
#ifdef CONFIG_SAML21_XPLAINED_OLED1MODULE_EXT2
/* Select/de-select the OLED */
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* Active low */
@@ -254,7 +254,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAML21_XPLAINED_IOMODULE_EXT1
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -277,7 +277,7 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
#ifdef CONFIG_SAML21_XPLAINED_IOMODULE_EXT2
/* Check if an SD card is present in the microSD slot */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Active low */
@@ -350,7 +350,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid)
int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAML21_XPLAINED_OLED1MODULE_EXT1
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.
@@ -371,7 +371,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#ifdef CONFIG_SAML21_XPLAINED_OLED1MODULE_EXT2
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.

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

@@ -123,13 +123,13 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
/* SPI1 connects to the SD CARD and to the SPI FLASH */
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
/* Set the GPIO low to select and high to de-select */
stm32_gpiowrite(GPIO_SD_CS, !selected);
}
else if (devid == SPIDEV_FLASH)
else if (devid == SPIDEV_FLASH(0))
{
/* Set the GPIO low to select and high to de-select */
@@ -161,25 +161,25 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
* wireless module.
*/
if (devid == SPIDEV_TOUCHSCREEN)
if (devid == SPIDEV_TOUCHSCREEN(0))
{
/* Set the GPIO low to select and high to de-select */
stm32_gpiowrite(GPIO_TP_CS, !selected);
}
else if (devid == SPIDEV_MMCSD)
else if (devid == SPIDEV_MMCSD(0))
{
/* Set the GPIO low to select and high to de-select */
stm32_gpiowrite(GPIO_LCDDF_CS, !selected);
}
else if (devid == SPIDEV_FLASH)
else if (devid == SPIDEV_FLASH(0))
{
/* Set the GPIO low to select and high to de-select */
stm32_gpiowrite(GPIO_LCDSD_CS, !selected);
}
else if (devid == SPIDEV_WIRELESS)
else if (devid == SPIDEV_WIRELESS(0))
{
/* Set the GPIO low to select and high to de-select */

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

@@ -134,7 +134,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
#if defined(CONFIG_MTD_SST25)
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
stm32_gpiowrite(GPIO_MEM_CS, !selected);
}
@@ -144,7 +144,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
#endif
#if defined(CONFIG_WL_CC3000)
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_WIFI_CS, !selected);
}

2
configs/stm3210e-eval/src/stm32_spi.c
View File

@@ -110,7 +110,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(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_WIRELESS:
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_WIRELESS:
case SPIDEV_WIRELESS(0):
status |= SPI_STATUS_PRESENT;
break;
#endif

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

@@ -78,7 +78,7 @@ void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid,
{
spiinfo("INFO: Selecting spi dev: %d, state: %d\n", devid, select);
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32_gpiowrite(GPIO_SD_CS, !select);
}
@@ -95,7 +95,7 @@ uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid)
{
spiinfo("INFO: Requesting info from spi dev: %d\n", devid);
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
if (stm32_gpioread(GPIO_SD_CD) == 0)
{

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

@@ -121,28 +121,28 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected)
{
#if defined(CONFIG_CL_MFRC522)
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_CS_MFRC522, !selected);
}
#endif
#ifdef CONFIG_LCD_ST7567
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
stm32_gpiowrite(GPIO_CS_MFRC522, !selected);
}
#endif
#ifdef CONFIG_WL_NRF24L01
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_NRF24L01_CS, !selected);
}
#endif
#ifdef CONFIG_MMCSD_SPI
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32_gpiowrite(GPIO_SDCARD_CS, !selected);
}
@@ -154,14 +154,14 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid)
uint8_t status = 0;
#ifdef CONFIG_WL_NRF24L01
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
status |= SPI_STATUS_PRESENT;
}
#endif
#ifdef CONFIG_MMCSD_SPI
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
status |= SPI_STATUS_PRESENT;
}
@@ -213,7 +213,7 @@ int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
bool cmd)
{
#ifdef CONFIG_LCD_ST7567
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.

6
configs/stm32f429i-disco/src/stm32_ili93414ws.c
View File

@@ -855,7 +855,7 @@ static inline void stm32_ili93414ws_cmddata(
{
FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
SPI_CMDDATA(priv->spi, SPIDEV_DISPLAY, cmd);
SPI_CMDDATA(priv->spi, SPIDEV_DISPLAY(0), cmd);
}
#else
static inline void stm32_ili93414ws_cmddata(
@@ -912,7 +912,7 @@ static void stm32_ili93414ws_select(FAR struct ili9341_lcd_s *lcd)
*/
SPI_LOCK(priv->spi, true);
SPI_SELECT(priv->spi, SPIDEV_DISPLAY, true);
SPI_SELECT(priv->spi, SPIDEV_DISPLAY(0), true);
/* Configure spi and disable */
@@ -971,7 +971,7 @@ static void stm32_ili93414ws_deselect(FAR struct ili9341_lcd_s *lcd)
/* de-select ili9341 and relinquish the spi bus. */
SPI_SELECT(priv->spi, SPIDEV_DISPLAY, false);
SPI_SELECT(priv->spi, SPIDEV_DISPLAY(0), false);
SPI_LOCK(priv->spi, false);
}
#else

2
configs/stm32f429i-disco/src/stm32_l3gd20.c
View File

@@ -71,7 +71,7 @@ static struct l3gd20_config_s g_l3gd20_config =
{
.attach = l3gd20_attach,
.irq = L3GD20_IRQ,
.spi_devid = SPIDEV_ACCELEROMETER
.spi_devid = SPIDEV_ACCELEROMETER(0)
};
/****************************************************************************

6
configs/stm32f429i-disco/src/stm32_spi.c
View File

@@ -154,7 +154,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
{
#if defined(CONFIG_MTD_SST25XX)
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
stm32_gpiowrite(GPIO_CS_SST25, !selected);
}
@@ -173,7 +173,7 @@ void stm32_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_STM32F429I_DISCO_ILI9341)
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
stm32_gpiowrite(GPIO_CS_LCD, !selected);
}
@@ -247,7 +247,7 @@ int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#if defined(CONFIG_STM32F429I_DISCO_ILI9341)
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* This is the Data/Command control pad which determines whether the
* data bits are data or a command.

8
configs/stm32f4discovery/src/stm32_spi.c
View File

@@ -122,7 +122,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
#if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \
defined(CONFIG_LCD_SSD1351)
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
stm32_gpiowrite(GPIO_OLED_CS, !selected);
}
@@ -145,13 +145,13 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#if defined(CONFIG_MAX31855)
if (devid == SPIDEV_TEMPERATURE)
if (devid == SPIDEV_TEMPERATURE(0))
{
stm32_gpiowrite(GPIO_MAX31855_CS, !selected);
}
#endif
#if defined(CONFIG_MAX6675)
if (devid == SPIDEV_TEMPERATURE)
if (devid == SPIDEV_TEMPERATURE(0))
{
stm32_gpiowrite(GPIO_MAX6675_CS, !selected);
}
@@ -205,7 +205,7 @@ int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{
#if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \
defined(CONFIG_LCD_SSD1351)
if (devid == SPIDEV_DISPLAY)
if (devid == SPIDEV_DISPLAY(0))
{
/* "This is the Data/Command control pad which determines whether the
* data bits are data or a command.

6
configs/stm32l476vg-disco/src/stm32_spi.c
View File

@@ -148,14 +148,14 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_SPI_CS_WIFI, !selected);
}
else
#endif
#ifdef HAVE_MMCSD
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected);
}
@@ -174,7 +174,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#ifdef CONFIG_WL_CC3000
if (devid == SPIDEV_WIRELESS)
if (devid == SPIDEV_WIRELESS(0))
{
stm32_gpiowrite(GPIO_WIFI_CS, !selected);
}

8
configs/sure-pic32mx/src/pic32mx_spi.c
View File

@@ -181,14 +181,14 @@ void pic32mx_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected
/* The SD card chip select is pulled high and active low */
#ifdef PIC32_HAVE_SD
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
pic32mx_gpiowrite(GPIO_SD_CS, !selected);
}
#endif
#ifdef PIC32_HAVE_SOIC
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
pic32mx_gpiowrite(GPIO_SOIC_CS, !selected);
}
@@ -204,7 +204,7 @@ uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, uint32_t devid)
*/
#ifdef PIC32_HAVE_SD
if (devid == SPIDEV_MMCSD)
if (devid == SPIDEV_MMCSD(0))
{
if (!pic32mx_gpioread(GPIO_SD_CD))
{
@@ -223,7 +223,7 @@ uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, uint32_t devid)
#endif
#ifdef PIC32_HAVE_SOIC
if (devid == SPIDEV_FLASH)
if (devid == SPIDEV_FLASH(0))
{
ret = SPI_STATUS_PRESENT;

Some files were not shown because too many files have changed in this diff Show More