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

More SPI initialize naming clarification

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-31 15:38:28 -06:00
parent 2171438c61
commit 91fa0b9616
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/lpc11xx/lpc11_ssp.c
View File

@ -949,7 +949,7 @@ static inline FAR struct lpc11_sspdev_s *lpc11_ssp2initialize(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: lpc11_sspinitialize * Name: lpc11_sspbus_initialize
* *
* Description: * Description:
* Initialize the selected SSP port. * Initialize the selected SSP port.
@ -962,7 +962,7 @@ static inline FAR struct lpc11_sspdev_s *lpc11_ssp2initialize(void)
* *
****************************************************************************/ ****************************************************************************/
FAR struct spi_dev_s *lpc11_sspinitialize(int port) FAR struct spi_dev_s *lpc11_sspbus_initialize(int port)
{ {
FAR struct lpc11_sspdev_s *priv; FAR struct lpc11_sspdev_s *priv;
uint32_t regval; uint32_t regval;

10
arch/arm/src/lpc11xx/lpc11_ssp.h
View File

@ -71,7 +71,7 @@ extern "C"
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: lpc11_sspinitialize * Name: lpc11_sspbus_initialize
* *
* Description: * Description:
* Initialize the selected SSP port. * Initialize the selected SSP port.
@ -84,7 +84,7 @@ extern "C"
* *
************************************************************************************/ ************************************************************************************/
FAR struct spi_dev_s *lpc11_sspinitialize(int port); FAR struct spi_dev_s *lpc11_sspbus_initialize(int port);
/************************************************************************************ /************************************************************************************
* Name: lpc11_ssp0/ssp1select, lpc11_ssp0/ssp1status, and lpc11_ssp0/ssp1cmddata * Name: lpc11_ssp0/ssp1select, lpc11_ssp0/ssp1status, and lpc11_ssp0/ssp1cmddata
@ -93,7 +93,7 @@ FAR struct spi_dev_s *lpc11_sspinitialize(int port);
* These external functions must be provided by board-specific logic. They are * These external functions must be provided by board-specific logic. They are
* implementations of the select, status, and cmddata methods of the SPI interface * implementations of the select, status, and cmddata methods of the SPI interface
* defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* including lpc11_sspinitialize()) are provided by common LPC11xx logic. To use * including lpc11_sspbus_initialize()) are provided by common LPC11xx logic. To use
* this common SPI logic on your board: * this common SPI logic on your board:
* *
* 1. Provide logic in lpc11_boardinitialize() to configure SSP chip select pins. * 1. Provide logic in lpc11_boardinitialize() to configure SSP chip select pins.
@ -104,9 +104,9 @@ FAR struct spi_dev_s *lpc11_sspinitialize(int port);
* lpc11_ssp0/ssp1cmddata() functions in your board-specific logic. These * lpc11_ssp0/ssp1cmddata() functions in your board-specific logic. These
* functions will perform cmd/data selection operations using GPIOs in the way * functions will perform cmd/data selection operations using GPIOs in the way
* your board is configured. * your board is configured.
* 3. Add a call to lpc11_sspinitialize() in your low level application * 3. Add a call to lpc11_sspbus_initialize() in your low level application
* initialization logic * initialization logic
* 4. The handle returned by lpc11_sspinitialize() may then be used to bind the * 4. The handle returned by lpc11_sspbus_initialize() may then be used to bind the
* SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(),
* for example, will bind the SSP driver to the SPI MMC/SD driver). * for example, will bind the SSP driver to the SPI MMC/SD driver).
* *

4
arch/arm/src/lpc17xx/lpc17_ssp.c
View File

@ -938,7 +938,7 @@ static inline FAR struct lpc17_sspdev_s *lpc17_ssp2initialize(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: lpc17_sspinitialize * Name: lpc17_sspbus_initialize
* *
* Description: * Description:
* Initialize the selected SSP port. * Initialize the selected SSP port.
@ -951,7 +951,7 @@ static inline FAR struct lpc17_sspdev_s *lpc17_ssp2initialize(void)
* *
****************************************************************************/ ****************************************************************************/
FAR struct spi_dev_s *lpc17_sspinitialize(int port) FAR struct spi_dev_s *lpc17_sspbus_initialize(int port)
{ {
FAR struct lpc17_sspdev_s *priv; FAR struct lpc17_sspdev_s *priv;
uint32_t regval; uint32_t regval;

10
arch/arm/src/lpc17xx/lpc17_ssp.h
View File

@ -71,7 +71,7 @@ extern "C"
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: lpc17_sspinitialize * Name: lpc17_sspbus_initialize
* *
* Description: * Description:
* Initialize the selected SSP port. * Initialize the selected SSP port.
@ -84,7 +84,7 @@ extern "C"
* *
************************************************************************************/ ************************************************************************************/
FAR struct spi_dev_s *lpc17_sspinitialize(int port); FAR struct spi_dev_s *lpc17_sspbus_initialize(int port);
/************************************************************************************ /************************************************************************************
* Name: lpc17_ssp0/ssp1select, lpc17_ssp0/ssp1status, and lpc17_ssp0/ssp1cmddata * Name: lpc17_ssp0/ssp1select, lpc17_ssp0/ssp1status, and lpc17_ssp0/ssp1cmddata
@ -93,7 +93,7 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port);
* These external functions must be provided by board-specific logic. They are * These external functions must be provided by board-specific logic. They are
* implementations of the select, status, and cmddata methods of the SPI interface * implementations of the select, status, and cmddata methods of the SPI interface
* defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods * defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
* including lpc17_sspinitialize()) are provided by common LPC17xx logic. To use * including lpc17_sspbus_initialize()) are provided by common LPC17xx logic. To use
* this common SPI logic on your board: * this common SPI logic on your board:
* *
* 1. Provide logic in lpc17_boardinitialize() to configure SSP chip select pins. * 1. Provide logic in lpc17_boardinitialize() to configure SSP chip select pins.
@ -104,9 +104,9 @@ FAR struct spi_dev_s *lpc17_sspinitialize(int port);
* lpc17_ssp0/ssp1cmddata() functions in your board-specific logic. These * lpc17_ssp0/ssp1cmddata() functions in your board-specific logic. These
* functions will perform cmd/data selection operations using GPIOs in the way * functions will perform cmd/data selection operations using GPIOs in the way
* your board is configured. * your board is configured.
* 3. Add a call to lpc17_sspinitialize() in your low level application * 3. Add a call to lpc17_sspbus_initialize() in your low level application
* initialization logic * initialization logic
* 4. The handle returned by lpc17_sspinitialize() may then be used to bind the * 4. The handle returned by lpc17_sspbus_initialize() may then be used to bind the
* SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(),
* for example, will bind the SSP driver to the SPI MMC/SD driver). * for example, will bind the SSP driver to the SPI MMC/SD driver).
* *

2
arch/arm/src/lpc43xx/lpc43_spi.c
View File

@ -586,7 +586,7 @@ FAR struct spi_dev_s *lpc43_spibus_initialize(int port)
if (port) if (port)
{ {
#if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1) #if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
return lpc43_sspinitialize(port - 1); return lpc43_sspbus_initialize(port - 1);
#else #else
return NULL; return NULL;
#endif #endif

4
arch/arm/src/lpc43xx/lpc43_ssp.c
View File

@ -784,7 +784,7 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: lpc43_sspinitialize * Name: lpc43_sspbus_initialize
* *
* Description: * Description:
* Initialize the selected SSP port (0=SSP0, 1=SSP1) * Initialize the selected SSP port (0=SSP0, 1=SSP1)
@ -797,7 +797,7 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void)
* *
****************************************************************************/ ****************************************************************************/
FAR struct spi_dev_s *lpc43_sspinitialize(int port) FAR struct spi_dev_s *lpc43_sspbus_initialize(int port)
{ {
FAR struct lpc43_sspdev_s *priv; FAR struct lpc43_sspdev_s *priv;
uint32_t regval; uint32_t regval;

8
arch/arm/src/lpc43xx/lpc43_ssp.h
View File

@ -60,8 +60,8 @@
* lpc43_ssp0/1cmddata() functions in your board-specific logic. These * lpc43_ssp0/1cmddata() functions in your board-specific logic. These
* functions will perform cmd/data selection operations using GPIOs in the * functions will perform cmd/data selection operations using GPIOs in the
* way your board is configured. * way your board is configured.
* 4. Your low level board initialization logic should call lpc43_sspinitialize. * 4. Your low level board initialization logic should call lpc43_sspbus_initialize.
* 5. The handle returned by lpc43_sspinitialize() may then be used to bind the * 5. The handle returned by lpc43_sspbus_initialize() may then be used to bind the
* SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(), * SSP driver to higher level logic (e.g., calling mmcsd_spislotinitialize(),
* for example, will bind the SPI driver to the SPI MMC/SD driver). * for example, will bind the SPI driver to the SPI MMC/SD driver).
*/ */
@ -90,7 +90,7 @@ extern "C"
************************************************************************************/ ************************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: lpc43_sspinitialize * Name: lpc43_sspbus_initialize
* *
* Description: * Description:
* Initialize the selected SSP port (0=SSP0, 1=SSP1) * Initialize the selected SSP port (0=SSP0, 1=SSP1)
@ -103,7 +103,7 @@ extern "C"
* *
****************************************************************************/ ****************************************************************************/
FAR struct spi_dev_s *lpc43_sspinitialize(int port); FAR struct spi_dev_s *lpc43_sspbus_initialize(int port);
/************************************************************************************ /************************************************************************************
* Name: lpc43_ssp0/1select, lpc43_ssp0/1status, and lpc43_ssp0/1cmddata * Name: lpc43_ssp0/1select, lpc43_ssp0/1status, and lpc43_ssp0/1cmddata