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

Final batch

Browse Source
This commit is contained in:
Sebastien Lorquet
2017-04-28 18:31:44 +02:00
parent abc8322728
commit b78137049c
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/arduino-due/src/sam_mmcsd.c
+6 -6
View File
@@ -109,11 +109,11 @@
* Private Function Prototypes * 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); 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 #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); bool cmd);
#endif #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) bool selected)
{ {
if (devid == SPIDEV_MMCSD) 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) 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 #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) bool cmd)
{ {
return OK; return OK;
configs/arduino-due/src/sam_touchscreen.c
+6 -6
View File
@@ -121,11 +121,11 @@
****************************************************************************/ ****************************************************************************/
/* Lower-half SPI */ /* 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); 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 #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); bool cmd);
#endif #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) bool selected)
{ {
/* The touchscreen controller is always 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; 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 #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) bool cmd)
{ {
return OK; return OK;
configs/demo9s12ne64/src/m9s12_spi.c
+2 -2
View File
@@ -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; return SPI_STATUS_PRESENT;
} }
configs/ea3131/src/lpc31_spi.c
+2 -2
View File
@@ -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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#warning "Missing logic" #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; return SPI_STATUS_PRESENT;
} }
configs/ea3152/src/lpc31_spi.c
+2 -2
View File
@@ -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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
#warning "Missing logic" #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; return SPI_STATUS_PRESENT;
} }
configs/eagle100/src/lm_ssi.c
+2 -2
View File
@@ -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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD) 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"); spiinfo("Returning SPI_STATUS_PRESENT\n");
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
configs/ekk-lm3s9b96/src/lm_ssi.c
+2 -2
View File
@@ -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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
ssi_dumpgpio("tiva_ssiselect() Entry"); 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"); 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"); spiinfo("Returning SPI_STATUS_PRESENT\n");
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
configs/maple/src/stm32_spi.c
+6 -6
View File
@@ -104,7 +104,7 @@ void weak_function stm32_spidev_initialize(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_SPI1 #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) bool selected)
{ {
spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); 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 # 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; 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; return -ENODEV;
} }
#endif #endif
#ifdef CONFIG_STM32_SPI2 #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) 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; 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; return -ENODEV;
} }
configs/mirtoo/src/pic32_spi2.c
+4 -4
View File
@@ -154,9 +154,9 @@ void weak_function pic32mx_spi2initialize(void)
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; 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"); 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; return 0;
} }
#ifdef CONFIG_SPI_CMDDATA #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; return 0;
} }
configs/ne64badge/src/m9s12_spi.c
+2 -2
View File
@@ -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; return SPI_STATUS_PRESENT;
} }
configs/olimex-strp711/src/str71_spi.c
+6 -6
View File
@@ -400,11 +400,11 @@ static inline void spi_drain(FAR struct str71x_spidev_s *priv);
/* SPI methods */ /* SPI methods */
static int spi_lock(FAR struct spi_dev_s *dev, bool lock); 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 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 #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 #endif
static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd); 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); 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; FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
uint16_t reg16; 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; uint8_t ret = 0;
uint16_t reg16 = getreg16(STR71X_GPIO1_PD); 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 #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" # error "spi_cmddata not implemented"
return -ENOSYS; return -ENOSYS;
configs/teensy-2.0/src/at90usb_spi.c
+2 -2
View File
@@ -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"); 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 ret = 0;
uint8_t regval = PINB; uint8_t regval = PINB;