Merge remote-tracking branch 'origin/master' into ieee802154

This commit is contained in:
Gregory Nutt
2017-04-29 10:06:35 -06:00
130 changed files with 861 additions and 844 deletions
+2 -2
View File
@@ -5014,11 +5014,11 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta
That structure defines a call table with the following methods: That structure defines a call table with the following methods:
<ul> <ul>
<p><code>void lock(FAR struct spi_dev_s *dev);</code></p> <p><code>void lock(FAR struct spi_dev_s *dev);</code></p>
<p><code>void select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);</code><br> <p><code>void select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);</code><br>
<code>uint32_t setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency);</code><br> <code>uint32_t setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency);</code><br>
<code>void setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);</code><br> <code>void setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);</code><br>
<code>void setbits(FAR struct spi_dev_s *dev, int nbits);</code><br> <code>void setbits(FAR struct spi_dev_s *dev, int nbits);</code><br>
<code>uint8_t status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);</code><br> <code>uint8_t status(FAR struct spi_dev_s *dev, uint32_t devid);</code><br>
<code>uint16_t send(FAR struct spi_dev_s *dev, uint16_t wd);</code><br> <code>uint16_t send(FAR struct spi_dev_s *dev, uint16_t wd);</code><br>
<code>void exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, FAR void *rxbuffer, size_t nwords);</code><br> <code>void exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, FAR void *rxbuffer, size_t nwords);</code><br>
<p><code>int registercallback(FAR struct spi_dev_s *dev, mediachange_t callback, void *arg);</code></p> <p><code>int registercallback(FAR struct spi_dev_s *dev, mediachange_t callback, void *arg);</code></p>
+9 -9
View File
@@ -109,11 +109,11 @@ struct efm32_spiconfig_s
/* SPI-specific methods */ /* SPI-specific methods */
void (*select)(struct spi_dev_s *dev, enum spi_dev_e devid, void (*select)(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t (*status)(struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t (*status)(struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int (*cmddata)(struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int (*cmddata)(struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
}; };
@@ -180,7 +180,7 @@ static inline void spi_dmatxstart(FAR struct efm32_spidev_s *priv);
/* SPI methods */ /* SPI methods */
static int spi_lock(struct spi_dev_s *dev, bool lock); static int spi_lock(struct spi_dev_s *dev, bool lock);
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
static uint32_t spi_setfrequency(struct spi_dev_s *dev, static uint32_t spi_setfrequency(struct spi_dev_s *dev,
uint32_t frequency); uint32_t frequency);
@@ -190,9 +190,9 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits);
static int spi_hwfeatures(FAR struct spi_dev_s *dev, static int spi_hwfeatures(FAR struct spi_dev_s *dev,
spi_hwfeatures_t features); spi_hwfeatures_t features);
#endif #endif
static uint8_t spi_status(struct spi_dev_s *dev, enum spi_dev_e devid); static uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
static int spi_cmddata(struct spi_dev_s *dev, enum spi_dev_e devid, static int spi_cmddata(struct spi_dev_s *dev, uint32_t devid,
bool cmd); bool cmd);
#endif #endif
static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd); static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd);
@@ -781,7 +781,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
* *
****************************************************************************/ ****************************************************************************/
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected) bool selected)
{ {
struct efm32_spidev_s *priv = (struct efm32_spidev_s *)dev; struct efm32_spidev_s *priv = (struct efm32_spidev_s *)dev;
@@ -1147,7 +1147,7 @@ static int spi_hwfeatures(FAR struct spi_dev_s *dev, spi_hwfeatures_t features)
* *
****************************************************************************/ ****************************************************************************/
static uint8_t spi_status(struct spi_dev_s *dev, enum spi_dev_e devid) static uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid)
{ {
struct efm32_spidev_s *priv = (struct efm32_spidev_s *)dev; struct efm32_spidev_s *priv = (struct efm32_spidev_s *)dev;
const struct efm32_spiconfig_s *config; const struct efm32_spiconfig_s *config;
@@ -1185,7 +1185,7 @@ static uint8_t spi_status(struct spi_dev_s *dev, enum spi_dev_e devid)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
static int spi_cmddata(struct spi_dev_s *dev, enum spi_dev_e devid, static int spi_cmddata(struct spi_dev_s *dev, uint32_t devid,
bool cmd); bool cmd);
{ {
struct efm32_spidev_s *priv = (struct efm32_spidev_s *)dev; struct efm32_spidev_s *priv = (struct efm32_spidev_s *)dev;
+9 -10
View File
@@ -52,7 +52,6 @@
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: efm32_spibus_initialize * Name: efm32_spibus_initialize
@@ -101,26 +100,26 @@ struct spi_dev_s *efm32_spibus_initialize(int port);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_EFM32_USART0_ISSPI #ifdef CONFIG_EFM32_USART0_ISSPI
void efm32_spi0_select(struct spi_dev_s *dev, enum spi_dev_e devid, void efm32_spi0_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t efm32_spi0_status(struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t efm32_spi0_status(struct spi_dev_s *dev, uint32_t devid);
int efm32_spi0_cmddata(struct spi_dev_s *dev, enum spi_dev_e devid, int efm32_spi0_cmddata(struct spi_dev_s *dev, uint32_t devid,
bool cmd); bool cmd);
#endif #endif
#ifdef CONFIG_EFM32_USART1_ISSPI #ifdef CONFIG_EFM32_USART1_ISSPI
void efm32_spi1_select(struct spi_dev_s *dev, enum spi_dev_e devid, void efm32_spi1_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t efm32_spi1_status(struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t efm32_spi1_status(struct spi_dev_s *dev, uint32_t devid);
int efm32_spi1_cmddata(struct spi_dev_s *dev, enum spi_dev_e devid, int efm32_spi1_cmddata(struct spi_dev_s *dev, uint32_t devid,
bool cmd); bool cmd);
#endif #endif
#ifdef CONFIG_EFM32_USART2_ISSPI #ifdef CONFIG_EFM32_USART2_ISSPI
void efm32_spi2_select(struct spi_dev_s *dev, enum spi_dev_e devid, void efm32_spi2_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t efm32_spi2_status(struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t efm32_spi2_status(struct spi_dev_s *dev, uint32_t devid);
int efm32_spi2_cmddata(struct spi_dev_s *dev, enum spi_dev_e devid, int efm32_spi2_cmddata(struct spi_dev_s *dev, uint32_t devid,
bool cmd); bool cmd);
#endif #endif
+3 -4
View File
@@ -178,7 +178,6 @@ extern "C"
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: imx_spibus_initialize * Name: imx_spibus_initialize
@@ -225,10 +224,10 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port);
* *
****************************************************************************/ ****************************************************************************/
void imx_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void imx_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t imx_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t imx_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int imx_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int imx_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#undef EXTERN #undef EXTERN
+9 -9
View File
@@ -138,12 +138,12 @@
/* Per SPI callouts to board-specific logic */ /* Per SPI callouts to board-specific logic */
typedef CODE void (*imx_select_t)(FAR struct spi_dev_s *dev, typedef CODE void (*imx_select_t)(FAR struct spi_dev_s *dev,
enum spi_dev_e devid, bool selected); uint32_t devid, bool selected);
typedef CODE uint8_t (*imx_status_t)(FAR struct spi_dev_s *dev, typedef CODE uint8_t (*imx_status_t)(FAR struct spi_dev_s *dev,
enum spi_dev_e devid); uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
typedef CODE int (*imx_cmddata_t)(FAR struct spi_dev_s *dev, typedef CODE int (*imx_cmddata_t)(FAR struct spi_dev_s *dev,
enum spi_dev_e devid, bool cmd); uint32_t devid, bool cmd);
#endif #endif
struct imx_spidev_s struct imx_spidev_s
@@ -228,16 +228,16 @@ static int spi_interrupt(int irq, void *context, FAR void *arg);
/* 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, static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev,
uint32_t frequency); uint32_t frequency);
static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); static void spi_setbits(FAR struct spi_dev_s *dev, int nbits);
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 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, static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
bool cmd); bool cmd);
#endif #endif
#ifdef CONFIG_SPI_EXCHANGE #ifdef CONFIG_SPI_EXCHANGE
@@ -835,7 +835,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, static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected) bool selected)
{ {
struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; struct imx_spidev_s *priv = (struct imx_spidev_s *)dev;
@@ -1051,7 +1051,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
* *
****************************************************************************/ ****************************************************************************/
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)
{ {
struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; struct imx_spidev_s *priv = (struct imx_spidev_s *)dev;
uint8_t ret = 0; uint8_t ret = 0;
@@ -1091,7 +1091,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, static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid,
bool cmd) bool cmd)
{ {
struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; struct imx_spidev_s *priv = (struct imx_spidev_s *)dev;
+15 -16
View File
@@ -70,7 +70,6 @@ extern "C"
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/************************************************************************************ /************************************************************************************
* Name: imx_spibus_initialize * Name: imx_spibus_initialize
@@ -118,42 +117,42 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_IMX6_ECSPI1 #ifdef CONFIG_IMX6_ECSPI1
void imx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void imx_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t imx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t imx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int imx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int imx_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_IMX6_ECSPI2 #ifdef CONFIG_IMX6_ECSPI2
void imx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void imx_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t imx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t imx_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int imx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int imx_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_IMX6_ECSPI3 #ifdef CONFIG_IMX6_ECSPI3
void imx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void imx_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t imx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t imx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int imx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int imx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_IMX6_ECSPI4 #ifdef CONFIG_IMX6_ECSPI4
void imx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void imx_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t imx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t imx_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int imx_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int imx_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_IMX6_ECSPI5 #ifdef CONFIG_IMX6_ECSPI5
void imx_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void imx_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t imx_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t imx_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int imx_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int imx_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+10 -11
View File
@@ -63,8 +63,7 @@ extern "C"
* Public Data * Public Data
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; struct spi_dev_s;
enum spi_dev_e;
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
@@ -115,24 +114,24 @@ FAR struct spi_dev_s *kinetis_spibus_initialize(int bus);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_KINETIS_SPI0 #ifdef CONFIG_KINETIS_SPI0
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);
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);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int kinetis_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int kinetis_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_KINETIS_SPI1 #ifdef CONFIG_KINETIS_SPI1
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);
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);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int kinetis_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int kinetis_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_KINETIS_SPI2 #ifdef CONFIG_KINETIS_SPI2
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);
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);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int kinetis_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int kinetis_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+6 -7
View File
@@ -64,7 +64,6 @@ extern "C"
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: kl_spibus_initialize * Name: kl_spibus_initialize
@@ -111,18 +110,18 @@ FAR struct spi_dev_s *kl_spibus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_KL_SPI0 #ifdef CONFIG_KL_SPI0
void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void kl_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t kl_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t kl_spi0status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int kl_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int kl_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_KL_SPI1 #ifdef CONFIG_KL_SPI1
void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void kl_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t kl_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t kl_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int kl_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int kl_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+3 -3
View File
@@ -112,10 +112,10 @@ FAR struct spi_dev_s *lpc11_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
void lpc11_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc11_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc11_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc11_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc11_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc11_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /************************************************************************************
+6 -6
View File
@@ -113,18 +113,18 @@ FAR struct spi_dev_s *lpc11_sspbus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_LPC11_SSP0 #ifdef CONFIG_LPC11_SSP0
void lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc11_ssp0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc11_ssp0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc11_ssp0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_LPC11_SSP1 #ifdef CONFIG_LPC11_SSP1
void lpc11_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc11_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc11_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc11_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc11_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc11_ssp1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+3 -4
View File
@@ -71,7 +71,6 @@ extern "C"
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/************************************************************************************ /************************************************************************************
* Name: lpc17_spibus_initialize * Name: lpc17_spibus_initialize
@@ -115,10 +114,10 @@ FAR struct spi_dev_s *lpc17_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
void lpc17_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc17_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc17_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc17_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc17_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc17_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/**************************************************************************** /****************************************************************************
+6 -6
View File
@@ -113,18 +113,18 @@ FAR struct spi_dev_s *lpc17_sspbus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_LPC17_SSP0 #ifdef CONFIG_LPC17_SSP0
void lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc17_ssp0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc17_ssp0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc17_ssp0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_LPC17_SSP1 #ifdef CONFIG_LPC17_SSP1
void lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc17_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+2 -3
View File
@@ -154,7 +154,6 @@
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: lpc23_spibus_initialize * Name: lpc23_spibus_initialize
@@ -178,7 +177,7 @@ FAR struct spi_dev_s *lpc23_spibus_initialize(int port);
* *
****************************************************************************/ ****************************************************************************/
void lpc23xx_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc23xx_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc23xx_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc23xx_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
#endif /* __ARCH_ARM_SRC_LPC2378_LPC23XX_SPI_H */ #endif /* __ARCH_ARM_SRC_LPC2378_LPC23XX_SPI_H */
+3 -5
View File
@@ -185,8 +185,6 @@ void lpc31_clockconfig(void);
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
FAR struct spi_dev_s *lpc31_spibus_initialize(int port); FAR struct spi_dev_s *lpc31_spibus_initialize(int port);
/************************************************************************************ /************************************************************************************
@@ -218,10 +216,10 @@ FAR struct spi_dev_s *lpc31_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
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);
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);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc31_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc31_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /************************************************************************************
+4 -4
View File
@@ -115,11 +115,11 @@ static inline uint16_t spi_readword(FAR struct lpc31_spidev_s *priv);
static inline void spi_writeword(FAR struct lpc31_spidev_s *priv, uint16_t word); static inline void spi_writeword(FAR struct lpc31_spidev_s *priv, uint16_t word);
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 void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); static void spi_setbits(FAR struct spi_dev_s *dev, int nbits);
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);
static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t word); static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t word);
static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
FAR void *rxbuffer, size_t nwords); FAR void *rxbuffer, size_t nwords);
@@ -482,7 +482,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)
{ {
struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *) dev; struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *) dev;
uint8_t slave = 0; uint8_t slave = 0;
@@ -689,7 +689,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
* *
****************************************************************************/ ****************************************************************************/
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)
{ {
/* FIXME: is there anyway to determine this /* FIXME: is there anyway to determine this
* it should probably be board dependant anyway */ * it should probably be board dependant anyway */
+1 -1
View File
@@ -103,7 +103,7 @@ struct lpc43_spidev_s
/* 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 void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); static void spi_setbits(FAR struct spi_dev_s *dev, int nbits);
+3 -3
View File
@@ -122,11 +122,11 @@ FAR struct spi_dev_s *lpc43_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
void lpc43_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc43_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc43_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc43_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc43_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc43_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /************************************************************************************
+6 -6
View File
@@ -121,18 +121,18 @@ FAR struct spi_dev_s *lpc43_sspbus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_LPC43_SSP0 #ifdef CONFIG_LPC43_SSP0
void lpc43_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc43_ssp0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc43_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc43_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc43_ssp0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc43_ssp0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_LPC43_SSP1 #ifdef CONFIG_LPC43_SSP1
void lpc43_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void lpc43_ssp1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t lpc43_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t lpc43_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int lpc43_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int lpc43_ssp1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+3 -3
View File
@@ -190,7 +190,7 @@ struct sam_spics_s
/* Type of board-specific SPI status function */ /* Type of board-specific SPI status function */
typedef void (*select_t)(enum spi_dev_e devid, bool selected); typedef void (*select_t)(uint32_t devid, bool selected);
/* Chip select register offsetrs */ /* Chip select register offsetrs */
@@ -272,7 +272,7 @@ static inline uintptr_t spi_regaddr(struct sam_spics_s *spics,
/* SPI methods */ /* SPI methods */
static int spi_lock(struct spi_dev_s *dev, bool lock); static int spi_lock(struct spi_dev_s *dev, bool lock);
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency);
static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode);
@@ -916,7 +916,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
* *
****************************************************************************/ ****************************************************************************/
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected) bool selected)
{ {
struct sam_spics_s *spics = (struct sam_spics_s *)dev; struct sam_spics_s *spics = (struct sam_spics_s *)dev;
+6 -7
View File
@@ -110,7 +110,6 @@ extern "C"
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: sam_spibus_initialize * Name: sam_spibus_initialize
@@ -189,10 +188,10 @@ struct spi_dev_s *sam_spibus_initialize(int port);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAM34_SPI0 #ifdef CONFIG_SAM34_SPI0
void sam_spi0select(enum spi_dev_e devid, bool selected); void sam_spi0select(uint32_t devid, bool selected);
#endif #endif
#ifdef CONFIG_SAM34_SPI1 #ifdef CONFIG_SAM34_SPI1
void sam_spi1select(enum spi_dev_e devid, bool selected); void sam_spi1select(uint32_t devid, bool selected);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -211,10 +210,10 @@ void sam_spi1select(enum spi_dev_e devid, bool selected);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAM34_SPI0 #ifdef CONFIG_SAM34_SPI0
uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef CONFIG_SAM34_SPI1 #ifdef CONFIG_SAM34_SPI1
uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -243,10 +242,10 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
#ifdef CONFIG_SAM34_SPI0 #ifdef CONFIG_SAM34_SPI0
int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_SAM34_SPI1 #ifdef CONFIG_SAM34_SPI1
int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+3 -3
View File
@@ -182,7 +182,7 @@ struct sam_spics_s
/* Type of board-specific SPI status fuction */ /* Type of board-specific SPI status fuction */
typedef void (*select_t)(enum spi_dev_e devid, bool selected); typedef void (*select_t)(uint32_t devid, bool selected);
/* Chip select register offsetrs */ /* Chip select register offsetrs */
@@ -263,7 +263,7 @@ static inline uintptr_t spi_physregaddr(struct sam_spics_s *spics,
/* SPI methods */ /* SPI methods */
static int spi_lock(struct spi_dev_s *dev, bool lock); static int spi_lock(struct spi_dev_s *dev, bool lock);
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency);
static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode);
@@ -905,7 +905,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
* *
****************************************************************************/ ****************************************************************************/
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected) bool selected)
{ {
struct sam_spics_s *spics = (struct sam_spics_s *)dev; struct sam_spics_s *spics = (struct sam_spics_s *)dev;
+6 -7
View File
@@ -104,7 +104,6 @@ extern "C"
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: sam_spibus_initialize * Name: sam_spibus_initialize
@@ -182,10 +181,10 @@ struct spi_dev_s *sam_spibus_initialize(int port);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMA5_SPI0 #ifdef CONFIG_SAMA5_SPI0
void sam_spi0select(enum spi_dev_e devid, bool selected); void sam_spi0select(uint32_t devid, bool selected);
#endif #endif
#ifdef CONFIG_SAMA5_SPI1 #ifdef CONFIG_SAMA5_SPI1
void sam_spi1select(enum spi_dev_e devid, bool selected); void sam_spi1select(uint32_t devid, bool selected);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -204,10 +203,10 @@ void sam_spi1select(enum spi_dev_e devid, bool selected);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMA5_SPI0 #ifdef CONFIG_SAMA5_SPI0
uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef CONFIG_SAMA5_SPI1 #ifdef CONFIG_SAMA5_SPI1
uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -236,10 +235,10 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
#ifdef CONFIG_SAMA5_SPI0 #ifdef CONFIG_SAMA5_SPI0
int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_SAMA5_SPI1 #ifdef CONFIG_SAMA5_SPI1
int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+18 -19
View File
@@ -87,7 +87,6 @@ extern "C"
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: sam_spibus_initialize * Name: sam_spibus_initialize
@@ -168,32 +167,32 @@ struct spi_dev_s *sam_spibus_initialize(int port);
****************************************************************************/ ****************************************************************************/
#ifdef SAMDL_HAVE_SPI0 #ifdef SAMDL_HAVE_SPI0
void sam_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
#endif #endif
#ifdef SAMDL_HAVE_SPI1 #ifdef SAMDL_HAVE_SPI1
void sam_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
#endif #endif
#ifdef SAMDL_HAVE_SPI2 #ifdef SAMDL_HAVE_SPI2
void sam_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void sam_spi2select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
#endif #endif
#ifdef SAMDL_HAVE_SPI3 #ifdef SAMDL_HAVE_SPI3
void sam_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void sam_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
#endif #endif
#ifdef SAMDL_HAVE_SPI4 #ifdef SAMDL_HAVE_SPI4
void sam_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void sam_spi4select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
#endif #endif
#ifdef SAMDL_HAVE_SPI5 #ifdef SAMDL_HAVE_SPI5
void sam_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
#endif #endif
@@ -213,27 +212,27 @@ void sam_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
****************************************************************************/ ****************************************************************************/
#ifdef SAMDL_HAVE_SPI0 #ifdef SAMDL_HAVE_SPI0
uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef SAMDL_HAVE_SPI1 #ifdef SAMDL_HAVE_SPI1
uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef SAMDL_HAVE_SPI2 #ifdef SAMDL_HAVE_SPI2
uint8_t sam_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef SAMDL_HAVE_SPI3 #ifdef SAMDL_HAVE_SPI3
uint8_t sam_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef SAMDL_HAVE_SPI4 #ifdef SAMDL_HAVE_SPI4
uint8_t sam_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef SAMDL_HAVE_SPI5 #ifdef SAMDL_HAVE_SPI5
uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -262,27 +261,27 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
#ifdef SAMDL_HAVE_SPI0 #ifdef SAMDL_HAVE_SPI0
int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef SAMDL_HAVE_SPI1 #ifdef SAMDL_HAVE_SPI1
int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef SAMDL_HAVE_SPI2 #ifdef SAMDL_HAVE_SPI2
int sam_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef SAMDL_HAVE_SPI3 #ifdef SAMDL_HAVE_SPI3
int sam_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef SAMDL_HAVE_SPI4 #ifdef SAMDL_HAVE_SPI4
int sam_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef SAMDL_HAVE_SPI5 #ifdef SAMDL_HAVE_SPI5
int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+3 -3
View File
@@ -181,7 +181,7 @@ struct sam_spics_s
/* Type of board-specific SPI status function */ /* Type of board-specific SPI status function */
typedef void (*select_t)(enum spi_dev_e devid, bool selected); typedef void (*select_t)(uint32_t devid, bool selected);
/* Chip select register offsets */ /* Chip select register offsets */
@@ -263,7 +263,7 @@ static inline uintptr_t spi_regaddr(struct sam_spics_s *spics,
/* SPI master methods */ /* SPI master methods */
static int spi_lock(struct spi_dev_s *dev, bool lock); static int spi_lock(struct spi_dev_s *dev, bool lock);
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency);
#ifdef CONFIG_SPI_CS_DELAY_CONTROL #ifdef CONFIG_SPI_CS_DELAY_CONTROL
@@ -943,7 +943,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
* *
****************************************************************************/ ****************************************************************************/
static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid, static void spi_select(struct spi_dev_s *dev, uint32_t devid,
bool selected) bool selected)
{ {
struct sam_spics_s *spics = (struct sam_spics_s *)dev; struct sam_spics_s *spics = (struct sam_spics_s *)dev;
+6 -7
View File
@@ -158,7 +158,6 @@ extern "C"
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
struct spi_sctrlr_s; /* Forward reference */ struct spi_sctrlr_s; /* Forward reference */
/**************************************************************************** /****************************************************************************
@@ -255,10 +254,10 @@ FAR struct spi_sctrlr_s *sam_spi_slave_initialize(int port);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMV7_SPI0_MASTER #ifdef CONFIG_SAMV7_SPI0_MASTER
void sam_spi0select(enum spi_dev_e devid, bool selected); void sam_spi0select(uint32_t devid, bool selected);
#endif #endif
#ifdef CONFIG_SAMV7_SPI1_MASTER #ifdef CONFIG_SAMV7_SPI1_MASTER
void sam_spi1select(enum spi_dev_e devid, bool selected); void sam_spi1select(uint32_t devid, bool selected);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -277,10 +276,10 @@ void sam_spi1select(enum spi_dev_e devid, bool selected);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMV7_SPI0 #ifdef CONFIG_SAMV7_SPI0
uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
#ifdef CONFIG_SAMV7_SPI1 #ifdef CONFIG_SAMV7_SPI1
uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -309,10 +308,10 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
#ifdef CONFIG_SAMV7_SPI0_MASTER #ifdef CONFIG_SAMV7_SPI0_MASTER
int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_SAMV7_SPI1_MASTER #ifdef CONFIG_SAMV7_SPI1_MASTER
int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif /* CONFIG_SPI_CMDDATA */ #endif /* CONFIG_SPI_CMDDATA */
+19 -20
View File
@@ -64,8 +64,7 @@ extern "C"
* Public Data * Public Data
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; struct spi_dev_s;
enum spi_dev_e;
/************************************************************************************ /************************************************************************************
* Public Functions * Public Functions
@@ -117,39 +116,39 @@ FAR struct spi_dev_s *stm32_spibus_initialize(int bus);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
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);
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);
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); 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);
int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI4 #ifdef CONFIG_STM32_SPI4
void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI5 #ifdef CONFIG_STM32_SPI5
void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32_SPI6 #ifdef CONFIG_STM32_SPI6
void stm32_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi6select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /************************************************************************************
+19 -20
View File
@@ -63,8 +63,7 @@ extern "C"
#define EXTERN extern #define EXTERN extern
#endif #endif
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/************************************************************************************ /************************************************************************************
* Name: stm32_spibus_initialize * Name: stm32_spibus_initialize
@@ -112,39 +111,39 @@ FAR struct spi_dev_s *stm32_spibus_initialize(int bus);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_STM32F7_SPI1 #ifdef CONFIG_STM32F7_SPI1
void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
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);
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);
#endif #endif
#ifdef CONFIG_STM32F7_SPI2 #ifdef CONFIG_STM32F7_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); 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);
int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32F7_SPI3 #ifdef CONFIG_STM32F7_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32F7_SPI4 #ifdef CONFIG_STM32F7_SPI4
void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32F7_SPI5 #ifdef CONFIG_STM32F7_SPI5
void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32F7_SPI6 #ifdef CONFIG_STM32F7_SPI6
void stm32_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32_spi6select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /************************************************************************************
+10 -11
View File
@@ -64,8 +64,7 @@ extern "C"
* Public Data * Public Data
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; struct spi_dev_s;
enum spi_dev_e;
/************************************************************************************ /************************************************************************************
* Public Functions * Public Functions
@@ -117,21 +116,21 @@ FAR struct spi_dev_s *stm32l4_spibus_initialize(int bus);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_STM32L4_SPI1 #ifdef CONFIG_STM32L4_SPI1
void stm32l4_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32l4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32L4_SPI2 #ifdef CONFIG_STM32L4_SPI2
void stm32l4_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32l4_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifdef CONFIG_STM32L4_SPI3 #ifdef CONFIG_STM32L4_SPI3
void stm32l4_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void stm32l4_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
/************************************************************************************ /************************************************************************************
+3 -4
View File
@@ -108,11 +108,10 @@ FAR struct spi_dev_s *tiva_ssibus_initialize(int port);
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; struct spi_dev_s;
enum spi_dev_e; void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid);
uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int tiva_ssicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int tiva_ssicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
+10 -11
View File
@@ -63,8 +63,7 @@ extern "C"
* Public Data * Public Data
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; struct spi_dev_s;
enum spi_dev_e;
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
@@ -115,24 +114,24 @@ FAR struct spi_dev_s *xmc4_spibus_initialize(int bus);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_XMC4_SPI0 #ifdef CONFIG_XMC4_SPI0
void xmc4_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void xmc4_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t xmc4_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t xmc4_spi0status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int xmc4_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int xmc4_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_XMC4_SPI1 #ifdef CONFIG_XMC4_SPI1
void xmc4_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void xmc4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t xmc4_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t xmc4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int xmc4_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int xmc4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_XMC4_SPI2 #ifdef CONFIG_XMC4_SPI2
void xmc4_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void xmc4_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t xmc4_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t xmc4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int xmc4_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int xmc4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+5 -6
View File
@@ -95,6 +95,8 @@ extern uint16_t g_idle_topstack;
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct spi_dev_s; /* Forward references */
/************************************************************************************ /************************************************************************************
* Name: up_copystate * Name: up_copystate
* *
@@ -150,9 +152,6 @@ uint8_t *up_doirq(uint8_t irq, uint8_t *regs);
* *
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward references */
enum spi_dev_e; /* Forward references */
FAR struct spi_dev_s *avr_spibus_initialize(int port); FAR struct spi_dev_s *avr_spibus_initialize(int port);
/************************************************************************************ /************************************************************************************
@@ -183,10 +182,10 @@ FAR struct spi_dev_s *avr_spibus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_AVR_SPI #ifdef CONFIG_AVR_SPI
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);
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);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int avr_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int avr_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+2 -4
View File
@@ -338,8 +338,6 @@ int hcs12_ethinitialize(int intf);
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
FAR struct spi_dev_s *hcs12_spibus_initialize(int port); FAR struct spi_dev_s *hcs12_spibus_initialize(int port);
/************************************************************************************ /************************************************************************************
@@ -367,8 +365,8 @@ FAR struct spi_dev_s *hcs12_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
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);
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
+12 -14
View File
@@ -400,8 +400,6 @@ void pic32mx_dumpgpio(uint32_t pinset, const char *msg);
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
FAR struct spi_dev_s *pic32mx_spibus_initialize(int port); FAR struct spi_dev_s *pic32mx_spibus_initialize(int port);
/************************************************************************************ /************************************************************************************
@@ -433,38 +431,38 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_PIC32MX_SPI1 #ifdef CONFIG_PIC32MX_SPI1
void pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mx_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MX_SPI2 #ifdef CONFIG_PIC32MX_SPI2
void pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mx_spi2select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
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);
#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);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MX_SPI3 #ifdef CONFIG_PIC32MX_SPI3
void pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mx_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MX_SPI3 #ifdef CONFIG_PIC32MX_SPI3
void pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mx_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+18 -19
View File
@@ -71,7 +71,6 @@ extern "C"
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/**************************************************************************** /****************************************************************************
* Name: pic32mz_spibus_initialize * Name: pic32mz_spibus_initialize
@@ -118,56 +117,56 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_PIC32MZ_SPI1 #ifdef CONFIG_PIC32MZ_SPI1
void pic32mz_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mz_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MZ_SPI2 #ifdef CONFIG_PIC32MZ_SPI2
void pic32mz_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mz_spi2select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MZ_SPI3 #ifdef CONFIG_PIC32MZ_SPI3
void pic32mz_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mz_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MZ_SPI4 #ifdef CONFIG_PIC32MZ_SPI4
void pic32mz_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mz_spi4select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MZ_SPI5 #ifdef CONFIG_PIC32MZ_SPI5
void pic32mz_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mz_spi5select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
#ifdef CONFIG_PIC32MZ_SPI6 #ifdef CONFIG_PIC32MZ_SPI6
void pic32mz_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, void pic32mz_spi6select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+6 -6
View File
@@ -200,11 +200,11 @@ static void spiflash_setbits(FAR struct spi_dev_s *dev, int nbits);
static uint16_t spiflash_send(FAR struct spi_dev_s *dev, uint16_t wd); static uint16_t spiflash_send(FAR struct spi_dev_s *dev, uint16_t wd);
static void spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, static void spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
FAR void *rxbuffer, size_t nwords); FAR void *rxbuffer, size_t nwords);
static void spiflash_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, static void spiflash_select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected); bool selected);
static uint8_t spiflash_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); static uint8_t spiflash_status(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
static int spiflash_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); static int spiflash_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#ifndef CONFIG_SPI_EXCHANGE #ifndef CONFIG_SPI_EXCHANGE
static void spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, static void spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
@@ -357,7 +357,7 @@ static int spiflash_lock(FAR struct spi_dev_s *dev, bool lock)
* *
************************************************************************************/ ************************************************************************************/
static void spiflash_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, static void spiflash_select(FAR struct spi_dev_s *dev, uint32_t devid,
bool selected) bool selected)
{ {
FAR struct sim_spiflashdev_s *priv = (FAR struct sim_spiflashdev_s *)dev; FAR struct sim_spiflashdev_s *priv = (FAR struct sim_spiflashdev_s *)dev;
@@ -392,7 +392,7 @@ static void spiflash_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
static int spiflash_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) static int spiflash_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{ {
return 0; return 0;
} }
@@ -467,7 +467,7 @@ static void spiflash_setbits(FAR struct spi_dev_s *dev, int nbits)
* *
************************************************************************************/ ************************************************************************************/
static uint8_t spiflash_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) static uint8_t spiflash_status(FAR struct spi_dev_s *dev, uint32_t devid)
{ {
return 0; return 0;
} }
+5 -10
View File
@@ -83,6 +83,8 @@ extern "C"
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
struct spi_dev_s; /* Forward reference */
/************************************************************************************ /************************************************************************************
* Name: i486_clockconfig * Name: i486_clockconfig
* *
@@ -207,9 +209,6 @@ int i486_dumpgpio(uint16_t pinset, const char *msg);
* *
****************************************************************************/ ****************************************************************************/
struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
FAR struct spi_dev_s *i486_spibus_initialize(int port); FAR struct spi_dev_s *i486_spibus_initialize(int port);
/************************************************************************************ /************************************************************************************
@@ -241,14 +240,11 @@ FAR struct spi_dev_s *i486_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
struct spi_dev_s;
enum spi_dev_e;
#ifdef CONFIG_I486_SPI #ifdef CONFIG_I486_SPI
void i486_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void i486_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t i486_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t i486_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int i486_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int i486_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
@@ -268,7 +264,6 @@ int i486_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
* *
****************************************************************************/ ****************************************************************************/
struct spi_dev_s;
#ifdef CONFIG_I486_SPI #ifdef CONFIG_I486_SPI
void spi_flush(FAR struct spi_dev_s *dev); void spi_flush(FAR struct spi_dev_s *dev);
#endif #endif
+3 -4
View File
@@ -677,7 +677,6 @@ void z16f_reset(void);
#ifdef CONFIG_Z16F_ESPI #ifdef CONFIG_Z16F_ESPI
struct spi_dev_s; /* Forward reference */ struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/* Initialize the selected SPI port */ /* Initialize the selected SPI port */
@@ -685,16 +684,16 @@ FAR struct spi_dev_s *z16_spibus_initialize(int port);
/* Select an SPI device (see include/nuttx/spi/spi.h) */ /* Select an SPI device (see include/nuttx/spi/spi.h) */
void z16f_espi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void z16f_espi_select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
/* Provide SPI device status (see include/nuttx/spi/spi.h) */ /* Provide SPI device status (see include/nuttx/spi/spi.h) */
uint8_t z16f_espi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t z16f_espi_status(FAR struct spi_dev_s *dev, uint32_t devid);
/* Select CMD/DATA options (often used with LCD devices) */ /* Select CMD/DATA options (often used with LCD devices) */
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
int z16f_espi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int z16f_espi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif #endif
#endif #endif
+3 -3
View File
@@ -145,9 +145,9 @@ FAR struct spi_dev_s *ez80_spibus_initialize(int port);
* *
************************************************************************************/ ************************************************************************************/
void ez80_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); void ez80_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
uint8_t ez80_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); uint8_t ez80_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
int ez80_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd); int ez80_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus
+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;
+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;
+9 -9
View File
@@ -107,32 +107,32 @@ 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, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
} }
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;
} }
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
/* To be provided */ /* To be provided */
} }
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;
} }
#endif #endif
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
@@ -149,7 +149,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
} }
} }
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
{ {
return 0; return 0;
} }
@@ -180,14 +180,14 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SPI_CMDDATA
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
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
int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{ {
/* To be provided */ /* To be provided */
@@ -196,7 +196,7 @@ int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
#endif #endif
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
{ {
/* To be provided */ /* To be provided */
+4 -4
View File
@@ -113,7 +113,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, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
@@ -127,7 +127,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
} }
} }
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 SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
@@ -135,13 +135,13 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#endif #endif
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
} }
uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid)
{ {
return 0; return 0;
} }
+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;
} }
+2 -2
View File
@@ -102,14 +102,14 @@ void weak_function tm4c_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");
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;
+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;
} }
+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;
} }
+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;
+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;
+4 -4
View File
@@ -131,7 +131,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, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
@@ -161,14 +161,14 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
#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 SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
#endif #endif
#ifdef CONFIG_STM32_SPI2 #ifdef CONFIG_STM32_SPI2
void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) 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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
@@ -180,7 +180,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
} }
} }
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 SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
} }
+6 -6
View File
@@ -100,13 +100,13 @@ void weak_function k64_spidev_initialize(void)
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_KINETIS_SPI0 #ifdef CONFIG_KINETIS_SPI0
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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
# warning "Missing logic" # warning "Missing logic"
} }
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)
{ {
# warning "Missing logic" # warning "Missing logic"
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
@@ -114,13 +114,13 @@ uint8_t kinetis_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#endif #endif
#ifdef CONFIG_KINETIS_SPI1 #ifdef CONFIG_KINETIS_SPI1
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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
# warning "Missing logic" # warning "Missing logic"
} }
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)
{ {
# warning "Missing logic" # warning "Missing logic"
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;
@@ -128,13 +128,13 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
#endif #endif
#ifdef CONFIG_KINETIS_SPI2 #ifdef CONFIG_KINETIS_SPI2
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"); spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
# warning "Missing logic" # warning "Missing logic"
} }
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)
{ {
# warning "Missing logic" # warning "Missing logic"
return SPI_STATUS_PRESENT; return SPI_STATUS_PRESENT;

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