From b78137049cdf238ee744755587ac6202daf58bed Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Fri, 28 Apr 2017 18:31:44 +0200 Subject: [PATCH] Final batch --- configs/arduino-due/src/sam_mmcsd.c | 12 ++++++------ configs/arduino-due/src/sam_touchscreen.c | 12 ++++++------ configs/demo9s12ne64/src/m9s12_spi.c | 4 ++-- configs/ea3131/src/lpc31_spi.c | 4 ++-- configs/ea3152/src/lpc31_spi.c | 4 ++-- configs/eagle100/src/lm_ssi.c | 4 ++-- configs/ekk-lm3s9b96/src/lm_ssi.c | 4 ++-- configs/maple/src/stm32_spi.c | 12 ++++++------ configs/mirtoo/src/pic32_spi2.c | 8 ++++---- configs/ne64badge/src/m9s12_spi.c | 4 ++-- configs/olimex-strp711/src/str71_spi.c | 12 ++++++------ configs/teensy-2.0/src/at90usb_spi.c | 4 ++-- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c index b7556ea082..bd60005f84 100644 --- a/configs/arduino-due/src/sam_mmcsd.c +++ b/configs/arduino-due/src/sam_mmcsd.c @@ -109,11 +109,11 @@ * Private Function Prototypes ****************************************************************************/ -static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, bool selected); -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid); +static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, bool cmd); #endif @@ -142,7 +142,7 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, * ****************************************************************************/ -static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, bool selected) { if (devid == SPIDEV_MMCSD) @@ -173,7 +173,7 @@ static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, * ****************************************************************************/ -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid) +static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid) { if (devid == SPIDEV_MMCSD) { @@ -200,7 +200,7 @@ static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, bool cmd) { return OK; diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c index b93aa11f68..4e78c9376a 100644 --- a/configs/arduino-due/src/sam_touchscreen.c +++ b/configs/arduino-due/src/sam_touchscreen.c @@ -121,11 +121,11 @@ ****************************************************************************/ /* Lower-half SPI */ -static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, bool selected); -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid); +static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, bool cmd); #endif @@ -198,7 +198,7 @@ static struct ads7843e_config_s g_tscinfo = * ****************************************************************************/ -static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, bool selected) { /* The touchscreen controller is always selected */ @@ -219,7 +219,7 @@ static void spi_select(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, * ****************************************************************************/ -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid) +static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid) { return 0; } @@ -241,7 +241,7 @@ static uint8_t spi_status(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, enum spi_dev_e devid, +static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, bool cmd) { return OK; diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c index e296ee5595..a869975170 100644 --- a/configs/demo9s12ne64/src/m9s12_spi.c +++ b/configs/demo9s12ne64/src/m9s12_spi.c @@ -91,11 +91,11 @@ void weak_function hcs12_spidev_initialize(void) * ****************************************************************************/ -void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void hcs12_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { } -uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c index 74914bdce6..b476b11ea9 100644 --- a/configs/ea3131/src/lpc31_spi.c +++ b/configs/ea3131/src/lpc31_spi.c @@ -99,13 +99,13 @@ void weak_function lpc31_spidev_intialize(void) * ************************************************************************************/ -void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void lpc31_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); #warning "Missing logic" } -uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c index 0995794a0f..02bf6a71fc 100644 --- a/configs/ea3152/src/lpc31_spi.c +++ b/configs/ea3152/src/lpc31_spi.c @@ -99,13 +99,13 @@ void weak_function lpc31_spidev_intialize(void) * ************************************************************************************/ -void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void lpc31_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); #warning "Missing logic" } -uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c index 7befb1f87d..b6722c2ba1 100644 --- a/configs/eagle100/src/lm_ssi.c +++ b/configs/eagle100/src/lm_ssi.c @@ -107,7 +107,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +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) @@ -120,7 +120,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select } } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c index 911e923e84..05dbf37b5e 100644 --- a/configs/ekk-lm3s9b96/src/lm_ssi.c +++ b/configs/ekk-lm3s9b96/src/lm_ssi.c @@ -107,7 +107,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +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"); @@ -128,7 +128,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c index 95040a67bf..a1c9ac3fcc 100644 --- a/configs/maple/src/stm32_spi.c +++ b/configs/maple/src/stm32_spi.c @@ -104,7 +104,7 @@ void weak_function stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, +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"); @@ -117,29 +117,29 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, # endif } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) { return 0; } -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, +void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) { return 0; } -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c index 3c1d513b83..6773995cdb 100644 --- a/configs/mirtoo/src/pic32_spi2.c +++ b/configs/mirtoo/src/pic32_spi2.c @@ -154,9 +154,9 @@ void weak_function pic32mx_spi2initialize(void) ************************************************************************************/ struct spi_dev_s; -enum spi_dev_e; +uint32_t; -void pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void pic32mx_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -170,13 +170,13 @@ void pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool s } } -uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) { return 0; } #ifdef CONFIG_SPI_CMDDATA -int pic32mx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +int pic32mx_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) { return 0; } diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c index 1539d0ca47..760ebf4c1d 100644 --- a/configs/ne64badge/src/m9s12_spi.c +++ b/configs/ne64badge/src/m9s12_spi.c @@ -91,11 +91,11 @@ void weak_function hcs12_spidev_initialize(void) * ****************************************************************************/ -void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void hcs12_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { } -uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } diff --git a/configs/olimex-strp711/src/str71_spi.c b/configs/olimex-strp711/src/str71_spi.c index f14df15033..e4d27894ee 100644 --- a/configs/olimex-strp711/src/str71_spi.c +++ b/configs/olimex-strp711/src/str71_spi.c @@ -400,11 +400,11 @@ static inline void spi_drain(FAR struct str71x_spidev_s *priv); /* SPI methods */ static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); +static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency); -static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); +static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); +static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd); static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen); @@ -608,7 +608,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; uint16_t reg16; @@ -713,7 +713,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) * ****************************************************************************/ -static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; uint16_t reg16 = getreg16(STR71X_GPIO1_PD); @@ -756,7 +756,7 @@ static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) { # error "spi_cmddata not implemented" return -ENOSYS; diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c index 6c55945b3d..db301389b9 100644 --- a/configs/teensy-2.0/src/at90usb_spi.c +++ b/configs/teensy-2.0/src/at90usb_spi.c @@ -136,7 +136,7 @@ void weak_function at90usb_spidev_initialize(void) * ************************************************************************************/ -void avr_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +void avr_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -152,7 +152,7 @@ void avr_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select } } -uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t avr_spistatus(FAR struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; uint8_t regval = PINB;