From 8797823333ac44da7d05f68153b2e8005cb303f4 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 21 Oct 2020 09:08:37 -0700 Subject: [PATCH] px4_init:Split out console init to create null device to be used in non PX4 platform bsp (bootloadres) --- .../common/include/px4_platform_common/init.h | 1 + platforms/nuttx/src/px4/common/px4_init.cpp | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/platforms/common/include/px4_platform_common/init.h b/platforms/common/include/px4_platform_common/init.h index 0789dd03ba..3ef8ad9989 100644 --- a/platforms/common/include/px4_platform_common/init.h +++ b/platforms/common/include/px4_platform_common/init.h @@ -34,6 +34,7 @@ __BEGIN_DECLS int px4_platform_init(void); +int px4_platform_console_init(void); __END_DECLS diff --git a/platforms/nuttx/src/px4/common/px4_init.cpp b/platforms/nuttx/src/px4/common/px4_init.cpp index 1f8c7cc807..967421e20c 100644 --- a/platforms/nuttx/src/px4/common/px4_init.cpp +++ b/platforms/nuttx/src/px4/common/px4_init.cpp @@ -42,7 +42,7 @@ #include -int px4_platform_init(void) +int px4_platform_console_init(void) { #if !defined(CONFIG_DEV_CONSOLE) && defined(CONFIG_DEV_NULL) @@ -75,11 +75,23 @@ int px4_platform_init(void) } return -ENFILE; + } #endif + return OK; +} - int ret = px4_console_buffer_init(); +int px4_platform_init(void) +{ + + int ret = px4_platform_console_init(); + + if (ret < 0) { + return ret; + } + + ret = px4_console_buffer_init(); if (ret < 0) { return ret;