You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/05/31 04:28:49 UTC
[incubator-nuttx] 01/03: sim: move driver/arch initialize to
sim_bringup
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2969cf7a6670349c3454f11e6d1b39c8ed1a4e36
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Tue Apr 27 22:48:30 2021 +0800
sim: move driver/arch initialize to sim_bringup
Change-Id: Ia41cc3978cc26294ca72be10cdedeb6efc8aea7a
Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
boards/sim/sim/sim/src/sim_appinit.c | 24 ---------------------
boards/sim/sim/sim/src/sim_bringup.c | 41 +++++++++++++++++++++++++++++++++---
2 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/boards/sim/sim/sim/src/sim_appinit.c b/boards/sim/sim/sim/src/sim_appinit.c
index ad181be..a7b40b4 100644
--- a/boards/sim/sim/sim/src/sim_appinit.c
+++ b/boards/sim/sim/sim/src/sim_appinit.c
@@ -24,12 +24,8 @@
#include <nuttx/config.h>
#include <nuttx/board.h>
-#include <nuttx/sensors/wtgahrs2.h>
-#include <nuttx/rc/lirc_dev.h>
-#include <nuttx/rc/dummy.h>
#include "sim.h"
-#include "up_internal.h"
/****************************************************************************
* Public Functions
@@ -67,26 +63,6 @@ int board_app_initialize(uintptr_t arg)
sim_bringup();
#endif
-#ifdef CONFIG_RPTUN
- up_rptun_init();
-#endif
-
-#ifdef CONFIG_SIM_WTGAHRS2_UARTN
-#if CONFIG_SIM_WTGAHRS2_UARTN == 0
- wtgahrs2_initialize(CONFIG_SIM_UART0_NAME, 0);
-#elif CONFIG_SIM_WTGAHRS2_UARTN == 1
- wtgahrs2_initialize(CONFIG_SIM_UART1_NAME, 1);
-#elif CONFIG_SIM_WTGAHRS2_UARTN == 2
- wtgahrs2_initialize(CONFIG_SIM_UART2_NAME, 2);
-#elif CONFIG_SIM_WTGAHRS2_UARTN == 3
- wtgahrs2_initialize(CONFIG_SIM_UART3_NAME, 3);
-#endif
-#endif
-
-#ifdef CONFIG_RC_DUMMY
- rc_dummy_initialize(0);
-#endif
-
return 0;
}
#endif /* CONFIG_LIB_BOARDCTL */
diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c
index 3dc26d6..cc8f773 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -34,14 +34,18 @@
#include <nuttx/mtd/mtd.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/nxffs.h>
-#include <nuttx/video/fb.h>
+#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/rc/lirc_dev.h>
+#include <nuttx/rc/dummy.h>
+#include <nuttx/sensors/fakesensor.h>
+#include <nuttx/sensors/mpu60x0.h>
+#include <nuttx/sensors/wtgahrs2.h>
#include <nuttx/timers/oneshot.h>
+#include <nuttx/video/fb.h>
#include <nuttx/wireless/pktradio.h>
#include <nuttx/wireless/bluetooth/bt_null.h>
#include <nuttx/wireless/bluetooth/bt_uart_shim.h>
#include <nuttx/wireless/ieee802154/ieee802154_loopback.h>
-#include <nuttx/i2c/i2c_master.h>
-#include <nuttx/sensors/mpu60x0.h>
#ifdef CONFIG_LCD_DEV
#include <nuttx/lcd/lcd_dev.h>
@@ -420,5 +424,36 @@ int sim_bringup(void)
}
#endif
+#ifdef CONFIG_RPTUN
+ up_rptun_init();
+#endif
+
+#ifdef CONFIG_SIM_WTGAHRS2_UARTN
+#if CONFIG_SIM_WTGAHRS2_UARTN == 0
+ wtgahrs2_initialize(CONFIG_SIM_UART0_NAME, 0);
+#elif CONFIG_SIM_WTGAHRS2_UARTN == 1
+ wtgahrs2_initialize(CONFIG_SIM_UART1_NAME, 1);
+#elif CONFIG_SIM_WTGAHRS2_UARTN == 2
+ wtgahrs2_initialize(CONFIG_SIM_UART2_NAME, 2);
+#elif CONFIG_SIM_WTGAHRS2_UARTN == 3
+ wtgahrs2_initialize(CONFIG_SIM_UART3_NAME, 3);
+#endif
+#endif
+
+#ifdef CONFIG_SENSORS_FAKESENSOR
+ fakesensor_init(SENSOR_TYPE_ACCELEROMETER,
+ "/data/boards/sim/sim/sim/src/csv/accel.csv", 0, 50);
+
+ fakesensor_init(SENSOR_TYPE_MAGNETIC_FIELD,
+ "/data/boards/sim/sim/sim/src/csv/mag.csv", 0, 50);
+
+ fakesensor_init(SENSOR_TYPE_GYROSCOPE,
+ "/data/boards/sim/sim/sim/src/csv/gyro.csv", 0, 50);
+#endif
+
+#ifdef CONFIG_RC_DUMMY
+ rc_dummy_initialize(0);
+#endif
+
return ret;
}