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 2022/10/19 16:08:49 UTC
[incubator-nuttx] 02/04: stm32f7/nucleo-144: refactor bringup logic
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 0d8b8ce5e220c33c08da4ac91e7e0db903852653
Author: raiden00pl <ra...@railab.me>
AuthorDate: Tue Oct 18 10:05:02 2022 +0200
stm32f7/nucleo-144: refactor bringup logic
---
boards/arm/stm32f7/nucleo-144/src/Makefile | 2 +-
boards/arm/stm32f7/nucleo-144/src/nucleo-144.h | 40 ++++-
.../stm32f7/nucleo-144/src/stm32_appinitialize.c | 197 +--------------------
boards/arm/stm32f7/nucleo-144/src/stm32_boot.c | 9 +-
.../src/{stm32_appinitialize.c => stm32_bringup.c} | 43 ++---
boards/arm/stm32f7/nucleo-144/src/stm32_can.c | 4 +-
boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c | 4 +-
7 files changed, 62 insertions(+), 237 deletions(-)
diff --git a/boards/arm/stm32f7/nucleo-144/src/Makefile b/boards/arm/stm32f7/nucleo-144/src/Makefile
index da813a67c0..a49133b4dc 100644
--- a/boards/arm/stm32f7/nucleo-144/src/Makefile
+++ b/boards/arm/stm32f7/nucleo-144/src/Makefile
@@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs
-CSRCS = stm32_boot.c
+CSRCS = stm32_boot.c stm32_bringup.c
ifeq ($(CONFIG_ARCH_LEDS),y)
CSRCS += stm32_autoleds.c
diff --git a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h b/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
index e7362de3a8..97113627c6 100644
--- a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
+++ b/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h
@@ -180,6 +180,26 @@
* Public Functions Definitions
****************************************************************************/
+/****************************************************************************
+ * Name: stm32_bringup
+ *
+ * Description:
+ * Perform architecture specific initialization
+ *
+ * CONFIG_BOARDCTL=y:
+ * If CONFIG_NSH_ARCHINITIALIZE=y:
+ * Called from the NSH library (or other application)
+ * Otherwise, assumed to be called from some other application.
+ *
+ * Otherwise CONFIG_BOARD_LATE_INITIALIZE=y:
+ * Called from board_late_initialize().
+ *
+ * Otherwise, bad news: Never called
+ *
+ ****************************************************************************/
+
+int stm32_bringup(void);
+
/****************************************************************************
* Name: stm32_spidev_initialize
*
@@ -281,11 +301,27 @@ int stm32_bbsram_int(void);
#endif
/****************************************************************************
- * Name: stm32F746_qencoder_initialize
+ * Name: stm32_qencoder_initialize
****************************************************************************/
#ifdef CONFIG_SENSORS_QENCODER
-int stm32f7_qencoder_initialize(const char *devpath, int timer);
+int stm32_qencoder_initialize(const char *devpath, int timer);
+#endif
+
+/****************************************************************************
+ * Name: stm32_can_setup
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_CAN
+int stm32_can_setup(void);
+#endif
+
+/****************************************************************************
+ * Name: stm32f7_gpio_initialize
+ ****************************************************************************/
+
+#ifdef CONFIG_DEV_GPIO
+int stm32_gpio_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
index 881014fcf0..133b027395 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
@@ -23,36 +23,11 @@
****************************************************************************/
#include <nuttx/config.h>
-
#include <sys/types.h>
-#include <debug.h>
-#include <syslog.h>
-#include <stdio.h>
#include "nucleo-144.h"
-#include <nuttx/fs/fs.h>
-#include <nuttx/i2c/i2c_master.h>
-#include <nuttx/kmalloc.h>
-#include <nuttx/leds/userled.h>
-#include <nuttx/sensors/mpu60x0.h>
-
-#include "stm32_i2c.h"
-
-#ifdef CONFIG_STM32_ROMFS
-#include "stm32_romfs.h"
-#endif
-#ifdef CONFIG_DEV_GPIO
-int stm32_gpio_initialize(void);
-#endif
-
-#ifdef CONFIG_SENSORS_QENCODER
-int stm32f7_qencoder_initialize(const char *devpath, int timer);
-#endif
-
-#ifdef CONFIG_STM32F7_CAN
-int stm32f7_can_setup(void);
-#endif
+#ifdef CONFIG_BOARDCTL
/****************************************************************************
* Public Functions
@@ -85,171 +60,13 @@ int stm32f7_can_setup(void);
int board_app_initialize(uintptr_t arg)
{
- int ret;
-#ifdef CONFIG_I2C
- int i2c_bus;
- struct i2c_master_s *i2c;
-#ifdef CONFIG_MPU60X0_I2C
- struct mpu_config_s *mpu_config;
-#endif
-#endif
-
-#ifdef CONFIG_FS_PROCFS
- /* Mount the procfs file system */
-
- ret = nx_mount(NULL, STM32_PROCFS_MOUNTPOINT, "procfs", 0, NULL);
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: Failed to mount procfs at %s: %d\n",
- STM32_PROCFS_MOUNTPOINT, ret);
- }
-#endif
-
-#ifdef CONFIG_STM32_ROMFS
- /* Mount the romfs partition */
-
- ret = stm32_romfs_initialize();
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: Failed to mount romfs at %s: %d\n",
- CONFIG_STM32_ROMFS_MOUNTPOINT, ret);
- }
-#endif
-
-#ifdef CONFIG_DEV_GPIO
- /* Register the GPIO driver */
-
- ret = stm32_gpio_initialize();
- if (ret < 0)
- {
- syslog(LOG_ERR, "Failed to initialize GPIO Driver: %d\n", ret);
- return ret;
- }
-#endif
-
-#if !defined(CONFIG_ARCH_LEDS) && defined(CONFIG_USERLED_LOWER)
- /* Register the LED driver */
-
- ret = userled_lower_initialize(LED_DRIVER_PATH);
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: userled_lower_initialize() failed: %d\n", ret);
- }
-#endif
-
-#ifdef CONFIG_ADC
- /* Initialize ADC and register the ADC driver. */
-
- ret = stm32_adc_setup();
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: stm32_adc_setup failed: %d\n", ret);
- }
-#endif
+#ifndef CONFIG_BOARD_LATE_INITIALIZE
+ /* Perform board-specific initialization */
-#ifdef CONFIG_STM32F7_BBSRAM
- /* Initialize battery-backed RAM */
-
- stm32_bbsram_int();
-#endif
-
-#if defined(CONFIG_FAT_DMAMEMORY)
- if (stm32_dma_alloc_init() < 0)
- {
- syslog(LOG_ERR, "DMA alloc FAILED");
- }
-#endif
-
-#if defined(CONFIG_NUCLEO_SPI_TEST)
- /* Create SPI interfaces */
-
- ret = stm32_spidev_bus_test();
- if (ret != OK)
- {
- syslog(LOG_ERR, "ERROR: Failed to initialize SPI interfaces: %d\n",
- ret);
- return ret;
- }
-#endif
-
-#if defined(CONFIG_MMCSD)
- /* Initialize the SDIO block driver */
-
- ret = stm32_sdio_initialize();
- if (ret != OK)
- {
- ferr("ERROR: Failed to initialize MMC/SD driver: %d\n", ret);
- return ret;
- }
-#endif
-
-#if defined(CONFIG_PWM)
- /* Initialize PWM and register the PWM device */
-
- ret = stm32_pwm_setup();
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
- }
-#endif
-
-#ifdef CONFIG_SENSORS_QENCODER
- char buf[9];
-
- sprintf(buf, "/dev/qe0");
- ret = stm32f7_qencoder_initialize(buf, 2);
- if (ret < 0)
- {
- syslog(LOG_ERR,
- "ERROR: Failed to register the qencoder: %d\n",
- ret);
- return ret;
- }
-#endif
-
-#ifdef CONFIG_CAN
- ret = stm32f7_can_setup();
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: stm32f7_can_setup failed: %d\n", ret);
- return ret;
- }
-#endif
-
-#if defined(CONFIG_I2C) && defined(CONFIG_STM32F7_I2C1)
- i2c_bus = 1;
- i2c = stm32_i2cbus_initialize(i2c_bus);
- if (i2c == NULL)
- {
- syslog(LOG_ERR, "ERROR: Failed to get I2C%d interface\n", i2c_bus);
- }
- else
- {
-#if defined(CONFIG_SYSTEM_I2CTOOL)
- ret = i2c_register(i2c, i2c_bus);
- if (ret < 0)
- {
- syslog(LOG_ERR, "ERROR: Failed to register I2C%d driver: %d\n",
- i2c_bus, ret);
- }
+ return stm32_bringup();
+#else
+ return OK;
#endif
+}
-#ifdef CONFIG_MPU60X0_I2C
- mpu_config = kmm_zalloc(sizeof(struct mpu_config_s));
- if (mpu_config == NULL)
- {
- syslog(LOG_ERR, "ERROR: Failed to allocate mpu60x0 driver\n");
- }
- else
- {
- mpu_config->i2c = i2c;
- mpu_config->addr = 0x68;
- mpu60x0_register("/dev/imu0", mpu_config);
- }
-#endif
- }
#endif
-
- UNUSED(ret);
- return OK;
-}
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
index e3f15c9898..5da2b44fa4 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c
@@ -83,13 +83,8 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
-#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
- /* Perform NSH initialization here instead of from the NSH. This
- * alternative NSH initialization is necessary when NSH is ran in
- * user-space but the initialization function must run in kernel space.
- */
+ /* Perform board-specific initialization */
- board_app_initialize(0);
-#endif
+ stm32_bringup();
}
#endif
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
similarity index 78%
copy from boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
copy to boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
index 881014fcf0..5a305644ba 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c
+ * boards/arm/stm32f7/nucleo-144/src/stm32_bringup.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -42,48 +42,25 @@
#include "stm32_romfs.h"
#endif
-#ifdef CONFIG_DEV_GPIO
-int stm32_gpio_initialize(void);
-#endif
-
-#ifdef CONFIG_SENSORS_QENCODER
-int stm32f7_qencoder_initialize(const char *devpath, int timer);
-#endif
-
-#ifdef CONFIG_STM32F7_CAN
-int stm32f7_can_setup(void);
-#endif
-
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
- * Name: board_app_initialize
+ * Name: stm32_bringup
*
* Description:
- * Perform application specific initialization. This function is never
- * called directly from application code, but only indirectly via the
- * (non-standard) boardctl() interface using the command BOARDIOC_INIT.
+ * Perform architecture-specific initialization
*
- * Input Parameters:
- * arg - The boardctl() argument is passed to the board_app_initialize()
- * implementation without modification. The argument has no
- * meaning to NuttX; the meaning of the argument is a contract
- * between the board-specific initialization logic and the
- * matching application logic. The value could be such things as a
- * mode enumeration value, a set of DIP switch switch settings, a
- * pointer to configuration data read from a file or serial FLASH,
- * or whatever you would like to do with it. Every implementation
- * should accept zero/NULL as a default configuration.
+ * CONFIG_BOARD_LATE_INITIALIZE=y :
+ * Called from board_late_initialize().
*
- * Returned Value:
- * Zero (OK) is returned on success; a negated errno value is returned on
- * any failure to indicate the nature of the failure.
+ * CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y :
+ * Called from the NSH library
*
****************************************************************************/
-int board_app_initialize(uintptr_t arg)
+int stm32_bringup(void)
{
int ret;
#ifdef CONFIG_I2C
@@ -197,7 +174,7 @@ int board_app_initialize(uintptr_t arg)
char buf[9];
sprintf(buf, "/dev/qe0");
- ret = stm32f7_qencoder_initialize(buf, 2);
+ ret = stm32_qencoder_initialize(buf, 2);
if (ret < 0)
{
syslog(LOG_ERR,
@@ -208,7 +185,7 @@ int board_app_initialize(uintptr_t arg)
#endif
#ifdef CONFIG_CAN
- ret = stm32f7_can_setup();
+ ret = stm32_can_setup();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: stm32f7_can_setup failed: %d\n", ret);
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c b/boards/arm/stm32f7/nucleo-144/src/stm32_can.c
index 30b3e7875b..89bef7ccda 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_can.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_can.c
@@ -50,14 +50,14 @@
****************************************************************************/
/****************************************************************************
- * Name: stm32f7_can_setup
+ * Name: stm32_can_setup
*
* Description:
* Initialize CAN and register the CAN device
*
****************************************************************************/
-int stm32f7_can_setup(void)
+int stm32_can_setup(void)
{
#if defined(CONFIG_STM32F7_CAN1)
struct can_dev_s *can;
diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c b/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
index acef32049e..287e1e54c6 100644
--- a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
+++ b/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c
@@ -40,7 +40,7 @@
****************************************************************************/
/****************************************************************************
- * Name: qe_devinit
+ * Name: stm32_qencoder_initialize
*
* Description:
* All STM32F7 architectures must provide the following interface to work
@@ -48,7 +48,7 @@
*
****************************************************************************/
-int stm32f7_qencoder_initialize(const char *devpath, int timer)
+int stm32_qencoder_initialize(const char *devpath, int timer)
{
int ret = 0;