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

For PIC32MZ MCUs, rename up_spiinitialize to pic32mz_spibus_initialize

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-26 15:53:03 -06:00
parent 28bc4e133e
commit 57909612d8
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/pcblogic-pic32mx/src/pcblogic-pic32mx.h
View File

@ -69,7 +69,7 @@ extern "C" {
#endif
/************************************************************************************
* Name: pic32mx_spiinitialize
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the PCB Logic board.
@ -77,7 +77,7 @@ extern "C" {
************************************************************************************/
#if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2)
EXTERN void weak_function pic32mx_spiinitialize(void);
EXTERN void weak_function pic32mx_spidev_initialize(void);
#endif
/************************************************************************************

6
configs/pcblogic-pic32mx/src/pic32mx_boot.c
View File

@ -74,13 +74,13 @@
void pic32mx_boardinitialize(void)
{
/* Configure SPI chip selects if 1) at least one SPI is enabled, and 2) the weak
* function pic32mx_spiinitialize() has been brought into the link.
* function pic32mx_spidev_initialize() has been brought into the link.
*/
#if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2)
if (pic32mx_spiinitialize)
if (pic32mx_spidev_initialize)
{
pic32mx_spiinitialize();
pic32mx_spidev_initialize();
}
#endif

4
configs/pic32mx-starterkit/src/pic32mx-starterkit.h
View File

@ -91,7 +91,7 @@ extern "C"
#endif
/************************************************************************************
* Name: pic32mx_spiinitialize
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the PCB Logic board.
@ -99,7 +99,7 @@ extern "C"
************************************************************************************/
#if defined(CONFIG_PIC32MX_SPI2)
void weak_function pic32mx_spiinitialize(void);
void weak_function pic32mx_spidev_initialize(void);
#endif
/************************************************************************************

4
configs/pic32mx7mmb/src/pic32mx7mmb.h
View File

@ -120,7 +120,7 @@ extern "C" {
#endif
/************************************************************************************
* Name: pic32mx_spiinitialize
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Mikroelektronika PIC32MX7
@ -130,7 +130,7 @@ extern "C" {
#if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2) || \
defined(CONFIG_PIC32MX_SPI3) || defined(CONFIG_PIC32MX_SPI4)
void weak_function pic32mx_spiinitialize(void);
void weak_function pic32mx_spidev_initialize(void);
#endif
/************************************************************************************

4
configs/pic32mz-starterkit/src/pic32mz-starterkit.h
View File

@ -177,7 +177,7 @@ extern "C"
#endif
/************************************************************************************
* Name: pic32mz_spiinitialize
* Name: pic32mz_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the PCB Logic board.
@ -185,7 +185,7 @@ extern "C"
************************************************************************************/
#ifdef CONFIG_PIC32MZ_SPI
void weak_function pic32mz_spiinitialize(void);
void weak_function pic32mz_spidev_initialize(void);
#endif
/************************************************************************************

6
configs/pic32mz-starterkit/src/pic32mz_boot.c
View File

@ -71,13 +71,13 @@
void pic32mz_boardinitialize(void)
{
/* Configure SPI chip selects if 1) at least one SPI is enabled, and 2) the weak
* function pic32mz_spiinitialize() has been brought into the link.
* function pic32mz_spidev_initialize() has been brought into the link.
*/
#ifdef CONFIG_PIC32MZ_SPI
if (pic32mz_spiinitialize)
if (pic32mz_spidev_initialize)
{
pic32mz_spiinitialize();
pic32mz_spidev_initialize();
}
#endif

2
configs/pic32mz-starterkit/src/pic32mz_bringup.c
View File

@ -73,7 +73,7 @@ static int nsh_sdinitialize(void)
/* Get the SPI port */
spi = up_spiinitialize(PIC32MZ_MMCSDSPIPORTNO);
spi = pic32mz_spibus_initialize(PIC32MZ_MMCSDSPIPORTNO);
if (!spi)
{
syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n",

10
configs/pic32mz-starterkit/src/pic32mz_spi.c
View File

@ -80,14 +80,14 @@
************************************************************************************/
/************************************************************************************
* Name: pic32mz_spiinitialize
* Name: pic32mz_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Sure PIC32MZ board.
*
************************************************************************************/
void weak_function pic32mz_spiinitialize(void)
void weak_function pic32mz_spidev_initialize(void)
{
/* Configure the SPI chip select GPIOs */
@ -101,7 +101,7 @@ void weak_function pic32mz_spiinitialize(void)
* These external functions must be provided by board-specific logic. They are
* 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
* including up_spiinitialize()) are provided by common PIC32MZ logic. To use
* including pic32mz_spibus_initialize()) are provided by common PIC32MZ logic. To use
* this common SPI logic on your board:
*
* 1. Provide logic in pic32mz_boardinitialize() to configure SPI/SPI chip select
@ -113,9 +113,9 @@ void weak_function pic32mz_spiinitialize(void)
* pic32mz_spiNcmddata() functions in your board-specific logic. These
* functions will perform cmd/data selection operations using GPIOs in the way
* your board is configured.
* 3. Add a call to up_spiinitialize() in your low level application
* 3. Add a call to pic32mz_spibus_initialize() in your low level application
* initialization logic
* 4. The handle returned by up_spiinitialize() may then be used to bind the
* 4. The handle returned by pic32mz_spibus_initialize() may then be used to bind the
* SPI driver to higher level logic (e.g., calling
* mmcsd_spislotinitialize(), for example, will bind the SPI driver to
* the SPI MMC/SD driver).

4
configs/sure-pic32mx/src/sure-pic32mx.h
View File

@ -129,7 +129,7 @@ extern "C" {
#endif
/************************************************************************************
* Name: pic32mx_spiinitialize
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the Sure PIC32MX Logic board.
@ -137,7 +137,7 @@ extern "C" {
************************************************************************************/
#if defined(CONFIG_PIC32MX_SPI2)
void weak_function pic32mx_spiinitialize(void);
void weak_function pic32mx_spidev_initialize(void);
#endif
/************************************************************************************

6
configs/ubw32/src/pic32_boot.c
View File

@ -74,13 +74,13 @@
void pic32mx_boardinitialize(void)
{
/* Configure SPI chip selects if 1) at least one SPI is enabled, and 2) the weak
* function pic32mx_spiinitialize() has been brought into the link.
* function pic32mx_spidev_initialize() has been brought into the link.
*/
#if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2)
if (pic32mx_spiinitialize)
if (pic32mx_spidev_initialize)
{
pic32mx_spiinitialize();
pic32mx_spidev_initialize();
}
#endif

4
configs/ubw32/src/ubw32.h
View File

@ -70,7 +70,7 @@ extern "C"
#endif
/************************************************************************************
* Name: pic32mx_spiinitialize
* Name: pic32mx_spidev_initialize
*
* Description:
* Called to configure SPI chip select GPIO pins for the UBW32 board.
@ -78,7 +78,7 @@ extern "C"
************************************************************************************/
#if defined(CONFIG_PIC32MX_SPI1) || defined(CONFIG_PIC32MX_SPI2)
void weak_function pic32mx_spiinitialize(void);
void weak_function pic32mx_spidev_initialize(void);
#endif
/************************************************************************************