From a0a643f1446cf4eb9855f67bdb6e56cc261862f3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 27 Jan 2016 08:49:49 -0600 Subject: [PATCH] For STR71xx MCUs, rename up_spiinitialize to str71_spibus_initialize --- configs/olimex-strp711/src/str71_enc28j60.c | 2 +- configs/olimex-strp711/src/str71_nsh.c | 4 +++- configs/olimex-strp711/src/str71_spi.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/olimex-strp711/src/str71_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c index fbab96d3241..d36f61000ad 100644 --- a/configs/olimex-strp711/src/str71_enc28j60.c +++ b/configs/olimex-strp711/src/str71_enc28j60.c @@ -213,7 +213,7 @@ void up_netinitialize(void) /* Get the SPI port */ - spi = up_spiinitialize(ENC28J60_SPI_PORTNO); + spi = str71_spibus_initialize(ENC28J60_SPI_PORTNO); if (!spi) { nlldbg("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); diff --git a/configs/olimex-strp711/src/str71_nsh.c b/configs/olimex-strp711/src/str71_nsh.c index 90f140f4447..8e7f949c4cd 100644 --- a/configs/olimex-strp711/src/str71_nsh.c +++ b/configs/olimex-strp711/src/str71_nsh.c @@ -47,6 +47,8 @@ #include #include +#include "str71x.h" + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -118,7 +120,7 @@ int board_app_initialize(void) syslog(LOG_INFO, "Initializing SPI port %d\n", CONFIG_NSH_MMCSDSPIPORTNO); - spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + spi = str71_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!spi) { syslog(LOG_ERR, "ERROR: Failed to initialize SPI port %d\n", diff --git a/configs/olimex-strp711/src/str71_spi.c b/configs/olimex-strp711/src/str71_spi.c index 106199127fe..acd88ce4dc7 100644 --- a/configs/olimex-strp711/src/str71_spi.c +++ b/configs/olimex-strp711/src/str71_spi.c @@ -939,7 +939,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t bu ****************************************************************************/ /**************************************************************************** - * Name: up_spiinitialize + * Name: str71_spibus_initialize * * Description: * Initialize the selected SPI port. This function could get called @@ -953,7 +953,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t bu * ****************************************************************************/ -FAR struct spi_dev_s *up_spiinitialize(int port) +FAR struct spi_dev_s *str71_spibus_initialize(int port) { FAR struct spi_dev_s *ret; #if defined(CONFIG_STR71X_BSPI0) || defined(CONFIG_STR71X_BSPI1)