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

Rename sam_spi_slave_initialize to up_spi_slave_initialize for better symmety with the Master SPI interface definition

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-09 17:41:55 -06:00
parent ec68d00ed8
commit c7b0a35e85
3 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/samv7/sam_spi.c
View File

@ -1726,7 +1726,7 @@ static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords)
* Name: up_spiinitialize
*
* Description:
* Initialize the selected SPI port
* Initialize the selected SPI port in master mode
*
* Input Parameter:
* cs - Chip select number (identifying the "logical" SPI port)
@ -1736,10 +1736,10 @@ static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords)
*
****************************************************************************/
struct spi_dev_s *up_spiinitialize(int port)
FAR struct spi_dev_s *up_spiinitialize(int port)
{
struct sam_spidev_s *spi;
struct sam_spics_s *spics;
FAR struct sam_spidev_s *spi;
FAR struct sam_spics_s *spics;
int csno = (port & __SPI_CS_MASK) >> __SPI_CS_SHIFT;
int spino = (port & __SPI_SPI_MASK) >> __SPI_SPI_SHIFT;
irqstate_t flags;

58
arch/arm/src/samv7/sam_spi.h
View File

@ -48,6 +48,8 @@
#include "chip.h"
#include "sam_config.h"
#ifdef CONFIG_SAMV7_SPI
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@ -109,6 +111,43 @@ extern "C"
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: up_spiinitialize
*
* Description:
* Initialize the selected SPI port in master mode
*
* Input Parameter:
* cs - Chip select number (identifying the "logical" SPI port)
*
* Returned Value:
* Valid SPI device structure reference on success; a NULL on failure
*
****************************************************************************/
#if 0 /* Prototyped in include/nuttx/spi/spi.h */
FAR struct spi_dev_s *up_spiinitialize(int port)
#endif
/****************************************************************************
* Name: up_spi_slave_initialize
*
* Description:
* Initialize the selected SPI port in slave mode.
*
* Input Parameter:
* port - Chip select number identifying the "logical" SPI port. Includes
* encoded port and chip select information.
*
* Returned Value:
* Valid SPI device structure reference on success; a NULL on failure
*
****************************************************************************/
#if 0 /* Prototyped in include/nuttx/spi/slave.h */
FAR struct spi_sctrlr_s *up_spi_slave_initialize(int port);
#endif
/****************************************************************************
* Name: sam_spi[0|1]select, sam_spi[0|1]status, and sam_spi[0|1]cmddata
*
@ -116,7 +155,7 @@ extern "C"
* These external functions must be provided by board-specific logic.
* They include:
*
* o sam_spi[0|1]select is a functions tomanage the board-specific chip
* o sam_spi[0|1]select is a functions to manage the board-specific chip
* selects
* o sam_spi[0|1]status and sam_spi[0|1]cmddata: Implementations of the
* status and cmddata methods of the SPI interface defined by struct
@ -143,9 +182,8 @@ extern "C"
*
****************************************************************************/
#ifdef CONFIG_SAMV7_SPI0
struct spi_dev_s;
enum spi_dev_e;
struct spi_dev_s; /* Forward reference */
enum spi_dev_e; /* Forward reference */
/****************************************************************************
* Name: sam_spi[0|1]select
@ -173,10 +211,10 @@ enum spi_dev_e;
*
****************************************************************************/
#ifdef CONFIG_SAMV7_SPI0
#ifdef CONFIG_SAMV7_SPI0_MASTER
void sam_spi0select(enum spi_dev_e devid, bool selected);
#endif
#ifdef CONFIG_SAMV7_SPI1
#ifdef CONFIG_SAMV7_SPI1_MASTER
void sam_spi1select(enum spi_dev_e devid, bool selected);
#endif
@ -227,14 +265,13 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
****************************************************************************/
#ifdef CONFIG_SPI_CMDDATA
#ifdef CONFIG_SAMV7_SPI0
#ifdef CONFIG_SAMV7_SPI0_MASTER
int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#ifdef CONFIG_SAMV7_SPI1
#ifdef CONFIG_SAMV7_SPI1_MASTER
int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif
#endif /* CONFIG_SAMV7_SPI0 */
#endif /* CONFIG_SPI_CMDDATA */
#undef EXTERN
#if defined(__cplusplus)
@ -242,4 +279,5 @@ int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_SAMV7_SPI */
#endif /* __ARCH_ARM_SRC_SAMV7_SAM_SPI_H */

4
arch/arm/src/samv7/sam_spi_slave.c
View File

@ -1003,7 +1003,7 @@ static void spi_qflush(FAR struct spi_sctrlr_s *sctrlr)
****************************************************************************/
/****************************************************************************
* Name: up_spi_slave_initialize
* Name: sam_spi_slave_initialize
*
* Description:
* Initialize the selected SPI port in slave mode.
@ -1017,7 +1017,7 @@ static void spi_qflush(FAR struct spi_sctrlr_s *sctrlr)
*
****************************************************************************/
struct spi_sctrlr_s *up_spi_slave_initialize(int port)
FAR struct spi_sctrlr_s *sam_spi_slave_initialize(int port)
{
struct sam_spidev_s *spidev;
struct sam_spics_s *spics;