Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .codespell-ignore-lines
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
mynewt-nimble/nimble/host/services/ans/src/ble_svc_ans.c
mynewt-nimble/nimble/host/services/ans/include
#include "services/ans/ble_svc_ans.h"
#include "crypto/controlse/ccertificate.hxx"
* notifications for the ANS Unread Alert Status characteristic
object = new Controlse::CCertificate(
Controlse::CCertificate cert(se, settings->key_id);
auto certificate = Controlse::CCertificate(
6 changes: 1 addition & 5 deletions boot/miniboot/miniboot_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* Name: miniboot_main
*
* Description:
* Minimal bootlaoder entry point.
* Minimal bootloader entry point.
*
****************************************************************************/

Expand All @@ -49,10 +49,6 @@ int main(int argc, FAR char *argv[])

syslog(LOG_INFO, "*** miniboot ***\n");

/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);

#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

Expand Down
6 changes: 0 additions & 6 deletions boot/nxboot/nxboot_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,10 @@ int main(int argc, FAR char *argv[])
FAR struct boardioc_reset_cause_s cause;
#endif

#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);

#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
#endif
#endif

syslog(LOG_INFO, "*** nxboot ***\n");
Expand Down
10 changes: 2 additions & 8 deletions examples/foc/foc_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ struct args_s g_args =
}
};

/* Start allowed at defaule */
/* Start allowed at default */

static bool g_start_allowed = true;
static pthread_mutex_t g_start_allowed_lock = PTHREAD_MUTEX_INITIALIZER;
Expand Down Expand Up @@ -294,16 +294,10 @@ int main(int argc, char *argv[])
goto errout_no_nxscope;
}

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);

# ifdef CONFIG_BOARDCTL_FINALINIT
#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
# endif
#endif

PRINTF("\nStart foc_main application!\n\n");
Expand Down
24 changes: 0 additions & 24 deletions examples/lvgldemo/lvgldemo.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,6 @@
* Pre-processor Definitions
****************************************************************************/

/* Should we perform board-specific driver initialization? There are two
* ways that board initialization can occur: 1) automatically via
* board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE
* or 2).
* via a call to boardctl() if the interface is enabled
* (CONFIG_BOARDCTL=y).
* If this task is running as an NSH built-in application, then that
* initialization has probably already been performed otherwise we do it
* here.
*/

#undef NEED_BOARDINIT

#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
# define NEED_BOARDINIT 1
#endif

/****************************************************************************
* Private Types
****************************************************************************/
Expand Down Expand Up @@ -122,13 +105,6 @@ int main(int argc, FAR char *argv[])
return -1;
}

#ifdef NEED_BOARDINIT
/* Perform board-specific driver initialization */

boardctl(BOARDIOC_INIT, 0);

#endif

lv_init();

lv_nuttx_dsc_init(&info);
Expand Down
23 changes: 0 additions & 23 deletions examples/lvglterm/lvglterm.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,6 @@
* Pre-processor Definitions
****************************************************************************/

/* Should we perform board-specific driver initialization? There are two
* ways that board initialization can occur: 1) automatically via
* board_late_initialize() during bootupif CONFIG_BOARD_LATE_INITIALIZE
* or 2).
* via a call to boardctl() if the interface is enabled
* (CONFIG_BOARDCTL=y).
* If this task is running as an NSH built-in application, then that
* initialization has probably already been performed otherwise we do it
* here.
*/

#undef NEED_BOARDINIT

#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_NSH_ARCHINIT)
# define NEED_BOARDINIT 1
#endif

/* How often to poll for output from NSH Shell (milliseconds) */

#define TIMER_PERIOD_MS 100
Expand Down Expand Up @@ -550,16 +533,10 @@ int main(int argc, FAR char *argv[])
uv_loop_t ui_loop;
#endif

#ifdef NEED_BOARDINIT
/* Perform board-specific driver initialization */

boardctl(BOARDIOC_INIT, 0);

#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
#endif
#endif

/* LVGL initialization */
Expand Down
6 changes: 0 additions & 6 deletions examples/nimble/nimble_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,6 @@ int main(int argc, FAR char *argv[])
ble_hci_sock_set_device(atoi(argv[1]));
}

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization */

boardctl(BOARDIOC_INIT, 0);
#endif

#ifndef CONFIG_NSH_NETINIT
/* Bring up the network */

Expand Down
8 changes: 1 addition & 7 deletions examples/nimble_blecent/nimble_blecent_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ static int blecent_gap_event(FAR struct ble_gap_event *event, FAR void *arg)
return 0;
}

/* An advertisment report was received during GAP discovery. */
/* An advertisement report was received during GAP discovery. */

print_adv_fields(&fields);

Expand Down Expand Up @@ -632,12 +632,6 @@ int main(int argc, FAR char **argv)
ble_hci_sock_set_device(atoi(argv[1]));
}

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization */

boardctl(BOARDIOC_INIT, 0);
#endif

#ifndef CONFIG_NSH_NETINIT
/* Bring up the network */

Expand Down
8 changes: 1 addition & 7 deletions examples/nimble_bleprph/nimble_bleprph_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static void bleprph_advertise(void)
BLE_HS_ADV_F_BREDR_UNSUP;

/* Indicate that the TX power level field should be included; have the
* stack fill this value automatically. This is done by assiging the
* stack fill this value automatically. This is done by assigning the
* special value BLE_HS_ADV_TX_PWR_LVL_AUTO.
*/

Expand Down Expand Up @@ -372,12 +372,6 @@ int main(int argc, FAR char *argv[])
ble_hci_sock_set_device(atoi(argv[1]));
}

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization */

boardctl(BOARDIOC_INIT, 0);
#endif

#ifndef CONFIG_NSH_NETINIT
/* Bring up the network */

Expand Down
8 changes: 1 addition & 7 deletions examples/nxscope/nxscope_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,10 @@ int main(int argc, FAR char *argv[])
struct nxscope_dummy_cfg_s nxs_dummy_cfg;
#endif

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);

# ifdef CONFIG_BOARDCTL_FINALINIT
#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
# endif
#endif

#ifdef CONFIG_EXAMPLES_NXSCOPE_CDCACM
Expand Down
6 changes: 0 additions & 6 deletions examples/powerled/powerled_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,10 @@ int main(int argc, char *argv[])
goto errout;
}

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);

#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
#endif
#endif

/* Set LED current limit */
Expand Down
6 changes: 0 additions & 6 deletions examples/smps/smps_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -476,16 +476,10 @@ int main(int argc, char *argv[])
goto errout;
}

#ifndef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);

#ifdef CONFIG_BOARDCTL_FINALINIT
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
#endif
#endif

/* Set SMPS mode */
Expand Down
10 changes: 0 additions & 10 deletions graphics/nxwm/src/nxwm_main.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -485,16 +485,6 @@ static bool createMediaPlayer(void)

int main(int argc, char *argv[])
{
#if defined(CONFIG_BOARDCTL) && !defined(CONFIG_BOARD_LATE_INITIALIZE)
// Should we perform board-specific initialization? There are two ways
// that board initialization can occur: 1) automatically via
// board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or
// 2) here via a call to boardctl() if the interface is enabled
// (CONFIG_BOARDCTL=y).

boardctl(BOARDIOC_INIT, 0);
#endif

#ifdef CONFIG_NXWM_NXTERM
// Initialize the NSH library

Expand Down
11 changes: 0 additions & 11 deletions graphics/twm4nx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,6 @@ config TWM4NX_REVMINOR
string "Twm4Nx minor version number"
default "0"

config TWM4NX_ARCHINIT
bool "Have architecture-specific initialization"
default n
select BOARDCTL
depends on !NSH_ARCHINIT
---help---
Set if your board provides architecture specific initialization
via the board-interface function boardctl(). The boardctl()
function will be called early in Twm4Nx initialization to allow
board logic to do such things as configure MMC/SD slots.

config TWM4NX_NETINIT
bool "Network initialization"
default y
Expand Down
17 changes: 0 additions & 17 deletions graphics/twm4nx/src/twm4nx_main.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,6 @@ int main(int argc, FAR char *argv[])

int ret;

#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_BOARDCTL) && \
!defined(CONFIG_BOARD_LATE_INITIALIZE)
// Should we perform board-specific initialization? There are two ways
// that board initialization can occur: 1) automatically via
// board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or
// 2) here via a call to boardctl() if the interface is enabled
// (CONFIG_BOARDCTL=y). board_early_initialize() is also possibility,
// although less likely.

ret = boardctl(BOARDIOC_INIT, 0);
if (ret < 0)
{
twmerr("ERROR: boardctl(BOARDIOC_INIT) failed: %d\n", errno);
return EXIT_FAILURE;
}
#endif

#ifdef CONFIG_TWM4NX_NETINIT
/* Bring up the network */

Expand Down
12 changes: 1 addition & 11 deletions nshlib/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ config NSH_LIBRARY
bool "NSH Library"
default n
select NETUTILS_NETLIB if NET
select BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT) || NSH_ARCHINIT
select BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT)
select BOARDCTL_MKRD if !NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT
---help---
Build the NSH support library. This is used, for example, by
Expand Down Expand Up @@ -1116,16 +1116,6 @@ config NSH_USBDEV_TRACEINTERRUPTS
endif # NSH_USBDEV_TRACE
endmenu # USB Device Trace Support

config NSH_ARCHINIT
bool "Have architecture-specific initialization"
default n
select BOARDCTL
---help---
Set if your board provides architecture specific initialization
via the board-interface function boardctl(). The boardctl()
function will be called early in NSH initialization to allow
board logic to do such things as configure MMC/SD slots.

menu "Networking Configuration"
depends on NET

Expand Down
7 changes: 0 additions & 7 deletions nshlib/nsh.h
Original file line number Diff line number Diff line change
Expand Up @@ -807,13 +807,6 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl);
* available:
*/

/* Architecture-specific initialization depends on boardctl(BOARDIOC_INIT) */

#if defined(CONFIG_NSH_ARCHINIT) && !defined(CONFIG_BOARDCTL)
# warning CONFIG_NSH_ARCHINIT is set, but CONFIG_BOARDCTL is not
# undef CONFIG_NSH_ARCHINIT
#endif

/* The mkrd command depends on boardctl(BOARDIOC_MKRD) */

#if !defined(CONFIG_BOARDCTL) || !defined(CONFIG_BOARDCTL_MKRD)
Expand Down
12 changes: 0 additions & 12 deletions nshlib/nsh_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ void nsh_initialize(void)
boardctl(BOARDIOC_APP_SYMTAB, (uintptr_t)&symdesc);
#endif

#ifdef CONFIG_NSH_ARCHINIT
/* Perform architecture-specific initialization (if configured) */

boardctl(BOARDIOC_INIT, 0);
#endif

#if defined(CONFIG_ETC_ROMFS) && !defined(CONFIG_NSH_DISABLESCRIPT)
pstate = nsh_newconsole(false);

Expand All @@ -163,12 +157,6 @@ void nsh_initialize(void)
netinit_bringup();
#endif

#if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT)
/* Perform architecture-specific final-initialization (if configured) */

boardctl(BOARDIOC_FINALINIT, 0);
#endif

#if defined(CONFIG_ETC_ROMFS) && !defined(CONFIG_NSH_DISABLESCRIPT)
/* Execute the start-up script */

Expand Down
Loading
Loading