Rename arch_nshinitialize() to board_app_initialize()

This commit is contained in:
Gregory Nutt
2015-03-31 10:21:31 -06:00
parent 7b3761f4ea
commit 103a17d4f1
114 changed files with 299 additions and 395 deletions
+4
View File
@@ -1581,3 +1581,7 @@ endif
if ARCH_BOARD_SIM if ARCH_BOARD_SIM
source "configs/sim/Kconfig" source "configs/sim/Kconfig"
endif endif
config LIB_BOARDCTL
bool "Enabled boardctl() interface"
default n
+5 -3
View File
@@ -42,6 +42,8 @@
#include <stdio.h> #include <stdio.h>
#include <syslog.h> #include <syslog.h>
#include <nuttx/board.h>
#include "arduino-due.h" #include "arduino-due.h"
/**************************************************************************** /****************************************************************************
@@ -71,14 +73,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \ #if defined(CONFIG_ARDUINO_ITHEAD_TFT) && defined(CONFIG_SPI_BITBANG) && \
defined(CONFIG_MMCSD_SPI) defined(CONFIG_MMCSD_SPI)
@@ -89,7 +91,7 @@ int nsh_archinitialize(void)
if (ret < 0) if (ret < 0)
{ {
syslog(LOG_ERR, syslog(LOG_ERR,
"nsh_archinitialize: Failed to initialize MMC/SD slot: %d\n", "board_app_initialize: Failed to initialize MMC/SD slot: %d\n",
ret); ret);
return ret; return ret;
} }
+3 -2
View File
@@ -45,6 +45,7 @@
#include <debug.h> #include <debug.h>
#include <stdio.h> #include <stdio.h>
#include <nuttx/board.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include <arch/board/cc3200_utils.h> #include <arch/board/cc3200_utils.h>
#include <apps/nsh.h> #include <apps/nsh.h>
@@ -67,7 +68,7 @@
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
@@ -81,7 +82,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
+4 -2
View File
@@ -45,6 +45,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include "stm32.h" #include "stm32.h"
#include "cloudctrl-internal.h" #include "cloudctrl-internal.h"
@@ -101,14 +103,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(HAVE_USBHOST) || defined(HAVE_W25) #if defined(HAVE_USBHOST) || defined(HAVE_W25)
int ret; int ret;
+2 -2
View File
@@ -72,8 +72,8 @@
int usbmsc_archinitialize(void) int usbmsc_archinitialize(void)
{ {
/* If system/usbmsc is built as an NSH command, then SD slot should /* If system/usbmsc is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initized in board_app_initialize() (see stm32_nsh.c).
* this case, there is nothing further to be done here. * In this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_NSH_BUILTIN_APPS #ifndef CONFIG_NSH_BUILTIN_APPS
+4 -2
View File
@@ -43,6 +43,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include "demo9s12ne64.h" #include "demo9s12ne64.h"
/**************************************************************************** /****************************************************************************
@@ -54,14 +56,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
/* Configure SPI-based devices */ /* Configure SPI-based devices */
+4 -2
View File
@@ -39,6 +39,8 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/board.h>
#include "dk-tm4c129x.h" #include "dk-tm4c129x.h"
/**************************************************************************** /****************************************************************************
@@ -50,14 +52,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
/* If CONFIG_BOARD_INITIALIZE is selected then board initialization was /* If CONFIG_BOARD_INITIALIZE is selected then board initialization was
* already performed in board_initialize. * already performed in board_initialize.
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_LPC31_MCI #ifdef CONFIG_LPC31_MCI
# include <nuttx/sdio.h> # include <nuttx/sdio.h>
# include <nuttx/mmcsd.h> # include <nuttx/mmcsd.h>
@@ -100,14 +102,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef NSH_HAVEMMCSD #ifdef NSH_HAVEMMCSD
FAR struct sdio_dev_s *sdio; FAR struct sdio_dev_s *sdio;
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_LPC31_MCI #ifdef CONFIG_LPC31_MCI
# include <nuttx/sdio.h> # include <nuttx/sdio.h>
# include <nuttx/mmcsd.h> # include <nuttx/mmcsd.h>
@@ -100,14 +102,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef NSH_HAVEMMCSD #ifdef NSH_HAVEMMCSD
FAR struct sdio_dev_s *sdio; FAR struct sdio_dev_s *sdio;
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -95,14 +96,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
int ret; int ret;
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
@@ -53,14 +55,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
+2 -2
View File
@@ -70,8 +70,8 @@
int composite_archinitialize(void) int composite_archinitialize(void)
{ {
/* If system/composite is built as an NSH command, then SD slot should /* If system/composite is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initialized in board_app_initialize() (see stm32_nsh.c).
* this case, there is nothing further to be done here. * In this case, there is nothing further to be done here.
* *
* NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
* was built. * was built.
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include "stm32.h" #include "stm32.h"
#include "fire-internal.h" #include "fire-internal.h"
@@ -127,14 +129,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(HAVE_MMCSD) || defined(HAVE_W25) #if defined(HAVE_MMCSD) || defined(HAVE_W25)
int ret; int ret;
+2 -2
View File
@@ -71,8 +71,8 @@
int usbmsc_archinitialize(void) int usbmsc_archinitialize(void)
{ {
/* If system/usbmsc is built as an NSH command, then SD slot should /* If system/usbmsc is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initialized in board_app_initialize() (see stm32_nsh.c).
* this case, there is nothing further to be done here. * In this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_NSH_BUILTIN_APPS #ifndef CONFIG_NSH_BUILTIN_APPS
@@ -125,7 +125,7 @@ void board_initialize(void)
*/ */
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT) #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
(void)nsh_archinitialize(); (void)board_app_initialize();
#endif #endif
/* CC3000 wireless initialization */ /* CC3000 wireless initialization */
+4 -2
View File
@@ -43,6 +43,8 @@
#include <stdio.h> #include <stdio.h>
#include <syslog.h> #include <syslog.h>
#include <nuttx/board.h>
#ifdef CONFIG_NSH_LIBRARY #ifdef CONFIG_NSH_LIBRARY
/**************************************************************************** /****************************************************************************
@@ -54,7 +56,7 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
@@ -68,7 +70,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(CONFIG_SENSORS_ADXL345) #if defined(CONFIG_SENSORS_ADXL345)
int ret; int ret;
@@ -124,7 +124,7 @@ void board_initialize(void)
*/ */
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT) #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
(void)nsh_archinitialize(); (void)board_app_initialize();
#endif #endif
} }
#endif #endif
+4 -2
View File
@@ -43,6 +43,8 @@
#include <stdio.h> #include <stdio.h>
#include <syslog.h> #include <syslog.h>
#include <nuttx/board.h>
#ifdef CONFIG_NSH_LIBRARY #ifdef CONFIG_NSH_LIBRARY
/**************************************************************************** /****************************************************************************
@@ -54,7 +56,7 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
@@ -68,7 +70,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_STM32_SPI1 #ifdef CONFIG_STM32_SPI1
# include <nuttx/spi/spi.h> # include <nuttx/spi/spi.h>
# include <nuttx/mtd/mtd.h> # include <nuttx/mtd/mtd.h>
@@ -144,14 +146,14 @@ static int nsh_cdinterrupt(int irq, FAR void *context)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef NSH_HAVEMMCSD #ifdef NSH_HAVEMMCSD
int ret; int ret;
+2 -2
View File
@@ -89,8 +89,8 @@
int usbmsc_archinitialize(void) int usbmsc_archinitialize(void)
{ {
/* If system/usbmsc is built as an NSH command, then SD slot should /* If system/usbmsc is built as an NSH command, then SD slot should
* already have been initialized in nsh_archinitialize() (see up_nsh.c). In * already have been initialized in board_app_initialize() (see stm32_nsh.c).
* this case, there is nothing further to be done here. * In this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_NSH_BUILTIN_APPS #ifndef CONFIG_NSH_BUILTIN_APPS
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_KINETIS_SDHC #ifdef CONFIG_KINETIS_SDHC
# include <nuttx/sdio.h> # include <nuttx/sdio.h>
# include <nuttx/mmcsd.h> # include <nuttx/mmcsd.h>
@@ -178,14 +180,14 @@ static int kinetis_cdinterrupt(int irq, FAR void *context)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef NSH_HAVEMMCSD #ifdef NSH_HAVEMMCSD
int ret; int ret;
+2 -2
View File
@@ -85,8 +85,8 @@
int usbmsc_archinitialize(void) int usbmsc_archinitialize(void)
{ {
/* If system/usbmsc is built as an NSH command, then SD slot should /* If system/usbmsc is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initialized in board_app_initialize() (see k40_nsh.c).
* this case, there is nothing further to be done here. * In this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_NSH_BUILTIN_APPS #ifndef CONFIG_NSH_BUILTIN_APPS
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -55,14 +56,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -55,14 +56,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -95,14 +96,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
int ret; int ret;
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -95,14 +96,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
int ret; int ret;
+3 -2
View File
@@ -44,6 +44,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -73,14 +74,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
+4 -2
View File
@@ -43,6 +43,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include "chip.h" #include "chip.h"
#ifdef CONFIG_LPC43_SPIFI #ifdef CONFIG_LPC43_SPIFI
@@ -132,14 +134,14 @@ static int nsh_spifi_initialize(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
/* Initialize the SPIFI block device */ /* Initialize the SPIFI block device */
+4 -2
View File
@@ -43,6 +43,8 @@
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include "chip.h" #include "chip.h"
#ifdef CONFIG_LPC43_SPIFI #ifdef CONFIG_LPC43_SPIFI
@@ -132,14 +134,14 @@ static int nsh_spifi_initialize(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
/* Initialize the SPIFI block device */ /* Initialize the SPIFI block device */
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -111,14 +112,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef NSH_HAVEMMCSD #ifdef NSH_HAVEMMCSD
FAR struct spi_dev_s *ssp; FAR struct spi_dev_s *ssp;
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -72,14 +73,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
@@ -86,8 +86,8 @@
int composite_archinitialize(void) int composite_archinitialize(void)
{ {
/* If system/composite is built as an NSH command, then SD slot should /* If system/composite is built as an NSH command, then SD slot should
* already have been initized in nsh_archinitialize() (see up_nsh.c). In * already have been initialized in board_app_initialize() (see lpc2148_nsh.c).
* this case, there is nothing further to be done here. * In this case, there is nothing further to be done here.
* *
* NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
* was built. * was built.
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -95,14 +96,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
int ret; int ret;
+3 -2
View File
@@ -44,6 +44,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
@@ -155,14 +156,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef CONFIG_STM32_SPI3 #ifdef CONFIG_STM32_SPI3
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
+4 -2
View File
@@ -46,6 +46,8 @@
#include <errno.h> #include <errno.h>
#include <syslog.h> #include <syslog.h>
#include <nuttx/board.h>
#ifdef CONFIG_PIC32MX_SPI2 #ifdef CONFIG_PIC32MX_SPI2
# include <nuttx/spi/spi.h> # include <nuttx/spi/spi.h>
# include <nuttx/mtd/mtd.h> # include <nuttx/mtd/mtd.h>
@@ -89,14 +91,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef HAVE_SST25 #ifdef HAVE_SST25
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
+4 -2
View File
@@ -43,6 +43,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include "ne64badge_internal.h" #include "ne64badge_internal.h"
/**************************************************************************** /****************************************************************************
@@ -54,14 +56,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
/* Configure SPI-based devices */ /* Configure SPI-based devices */
+1 -1
View File
@@ -121,7 +121,7 @@ void board_initialize(void)
*/ */
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT) #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
nsh_archinitialize(); board_app_initialize();
#endif #endif
/* CC3000 wireless initialization */ /* CC3000 wireless initialization */
+3 -2
View File
@@ -44,6 +44,7 @@
#include <errno.h> #include <errno.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sdio.h> #include <nuttx/sdio.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -85,14 +86,14 @@ void up_netinitialize(void)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(HAVE_MMCSD) || defined(CONFIG_AJOYSTICK) #if defined(HAVE_MMCSD) || defined(CONFIG_AJOYSTICK)
int ret; int ret;
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -105,14 +106,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
FAR struct spi_dev_s *ssp; FAR struct spi_dev_s *ssp;
int ret; int ret;
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_SYSTEM_USBMONITOR #ifdef CONFIG_SYSTEM_USBMONITOR
# include <apps/usbmonitor.h> # include <apps/usbmonitor.h>
#endif #endif
@@ -74,14 +76,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(HAVE_MMCSD) || defined(HAVE_USBHOST) #if defined(HAVE_MMCSD) || defined(HAVE_USBHOST)
int ret; int ret;
+3 -2
View File
@@ -44,6 +44,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
#include <nuttx/usb/usbhost.h> #include <nuttx/usb/usbhost.h>
@@ -280,14 +281,14 @@ static int nsh_usbhostinitialize(void)
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
int ret; int ret;
+3 -2
View File
@@ -49,6 +49,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -84,14 +85,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
return OK; return OK;
} }
@@ -88,25 +88,6 @@
void weak_function stm32_usbinitialize(void); void weak_function stm32_usbinitialize(void);
#endif #endif
/************************************************************************************
* Name: nsh_archinitialize
*
* Description:
* Perform architecture specific initialization for NSH.
*
* CONFIG_NSH_ARCHINIT=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* Called from board_initialize().
*
************************************************************************************/
#ifdef CONFIG_NSH_LIBRARY
int nsh_archinitialize(void);
#endif
/************************************************************************************ /************************************************************************************
* Name: stm32_adc_initialize * Name: stm32_adc_initialize
* *
+1 -1
View File
@@ -118,7 +118,7 @@ void board_initialize(void)
*/ */
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT) #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
nsh_archinitialize(); board_app_initialize();
#endif #endif
} }
#endif #endif
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_SYSTEM_USBMONITOR #ifdef CONFIG_SYSTEM_USBMONITOR
# include <apps/usbmonitor.h> # include <apps/usbmonitor.h>
#endif #endif
@@ -68,7 +70,7 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
@@ -82,7 +84,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(CONFIG_CAN) || defined(CONFIG_ADC) #if defined(CONFIG_CAN) || defined(CONFIG_ADC)
int ret; int ret;
@@ -124,25 +124,6 @@ void weak_function stm32_usbinitialize(void);
int stm32_usbhost_initialize(void); int stm32_usbhost_initialize(void);
#endif #endif
/************************************************************************************
* Name: nsh_archinitialize
*
* Description:
* Perform architecture specific initialization for NSH.
*
* CONFIG_NSH_ARCHINIT=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* Called from board_initialize().
*
************************************************************************************/
#ifdef CONFIG_NSH_LIBRARY
int nsh_archinitialize(void);
#endif
/************************************************************************************ /************************************************************************************
* Name: stm32_adc_initialize * Name: stm32_adc_initialize
* *
+1 -1
View File
@@ -119,7 +119,7 @@ void board_initialize(void)
*/ */
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT) #if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_NSH_ARCHINIT)
nsh_archinitialize(); board_app_initialize();
#endif #endif
} }
#endif #endif
+4 -2
View File
@@ -44,6 +44,8 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#ifdef CONFIG_SYSTEM_USBMONITOR #ifdef CONFIG_SYSTEM_USBMONITOR
# include <apps/usbmonitor.h> # include <apps/usbmonitor.h>
#endif #endif
@@ -97,7 +99,7 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
@@ -111,7 +113,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#if defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || defined(CONFIG_ADC) #if defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || defined(CONFIG_ADC)
int ret; int ret;
+3 -2
View File
@@ -43,6 +43,7 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <nuttx/board.h>
#include <nuttx/spi/spi.h> #include <nuttx/spi/spi.h>
#include <nuttx/mmcsd.h> #include <nuttx/mmcsd.h>
@@ -99,14 +100,14 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: nsh_archinitialize * Name: board_app_initialize
* *
* Description: * Description:
* Perform architecture specific initialization * Perform architecture specific initialization
* *
****************************************************************************/ ****************************************************************************/
int nsh_archinitialize(void) int board_app_initialize(void)
{ {
#ifdef NSH_HAVEMMCSD #ifdef NSH_HAVEMMCSD
FAR struct spi_dev_s *spi; FAR struct spi_dev_s *spi;
@@ -171,25 +171,6 @@ void stm32_usbinitialize(void);
void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler); void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler);
/************************************************************************************
* Name: nsh_archinitialize
*
* Description:
* Perform architecture specific initialization for NSH.
*
* CONFIG_NSH_ARCHINIT=y :
* Called from the NSH library
*
* CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
* CONFIG_NSH_ARCHINIT=n :
* Called from board_initialize().
*
************************************************************************************/
#ifdef CONFIG_NSH_LIBRARY
int nsh_archinitialize(void);
#endif
/**************************************************************************** /****************************************************************************
* Name: stm32_led_initialize * Name: stm32_led_initialize
* *

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