Refs #981. Minor refactoring of the STM32CubeIDE demo bootloaders by removing the AppDeInit() function.

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@801 5dc33758-31d5-4daf-9ae8-b24bf3d40d73

Target/Demo/ARMCM0_STM32G0_Nucleo_G071RB_CubeIDE/Boot/App/app.c

@@ -59,17 +59,4 @@ void AppTask(void)
 } /*** end of AppTask ***/
 
 
-/************************************************************************************//**
-** \brief     Uninitializes the bootloader application. Should be called right before the
-**            bootloader starts the user program.
-** \return    none.
-**
-****************************************************************************************/
-void AppDeInit(void)
-{
-  /* Reset the RCC clock configuration to the default reset state. */
-  HAL_RCC_DeInit();
-} /*** end of AppDeInit ***/
-
-
 /*********************************** end of app.c **************************************/

Target/Demo/ARMCM0_STM32G0_Nucleo_G071RB_CubeIDE/Boot/App/app.h

@@ -33,7 +33,6 @@
 ****************************************************************************************/
 void AppInit(void);
 void AppTask(void);
-void AppDeInit(void);
 
 
 #endif /* APP_H */

Target/Demo/ARMCM0_STM32G0_Nucleo_G071RB_CubeIDE/Boot/App/hooks.c

@@ -30,7 +30,6 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
-#include "app.h"                                 /* bootloader application header      */
 #include "led.h"                                 /* LED driver header                  */
 #include "stm32g0xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32g0xx_ll_gpio.h"                   /* STM32 LL GPIO header               */
@@ -93,8 +92,6 @@ blt_bool CpuUserProgramStartHook(void)
 
   /* clean up the LED driver */
   LedBlinkExit();
-  /* clean up the application. */
-  AppDeInit();
   /* okay to start the user program */
   return BLT_TRUE;
 } /*** end of CpuUserProgramStartHook ***/

Target/Demo/ARMCM0_STM32G0_Nucleo_G071RB_CubeIDE/Boot/Core/Src/stm32g0xx_hal_msp.c

@@ -87,6 +87,9 @@ void HAL_MspInit(void)
   */
 void HAL_MspDeInit(void)
 {
+  /* Reset the RCC clock configuration to the default reset state. */
+  HAL_RCC_DeInit();
+
   /* Reset GPIO pin for the LED to turn it off. */
   LL_GPIO_ResetOutputPin(GPIOA, LL_GPIO_PIN_5);
 

Target/Demo/ARMCM7_STM32F7_Nucleo_F746ZG_CubeIDE/Boot/App/app.c

@@ -31,7 +31,6 @@
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
 #include "stm32f7xx.h"                           /* STM32 CPU and HAL header           */
-#include "stm32f7xx_ll_rcc.h"                    /* STM32 LL RCC header                */
 
 
 /************************************************************************************//**
@@ -60,17 +59,4 @@ void AppTask(void)
 } /*** end of AppTask ***/
 
 
-/************************************************************************************//**
-** \brief     Uninitializes the bootloader application. Should be called right before the
-**            bootloader starts the user program.
-** \return    none.
-**
-****************************************************************************************/
-void AppDeInit(void)
-{
-  /* Reset the RCC clock configuration to the default reset state. */
-  LL_RCC_DeInit();
-} /*** end of AppDeInit ***/
-
-
 /*********************************** end of app.c **************************************/

Target/Demo/ARMCM7_STM32F7_Nucleo_F746ZG_CubeIDE/Boot/App/app.h

@@ -33,7 +33,6 @@
 ****************************************************************************************/
 void AppInit(void);
 void AppTask(void);
-void AppDeInit(void);
 
 
 #endif /* APP_H */

Target/Demo/ARMCM7_STM32F7_Nucleo_F746ZG_CubeIDE/Boot/App/hooks.c

@@ -30,7 +30,6 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
-#include "app.h"                                 /* bootloader application header      */
 #include "led.h"                                 /* LED driver header                  */
 #include "stm32f7xx.h"                           /* STM32 CPU and HAL header           */
 #include "stm32f7xx_ll_gpio.h"                   /* STM32 LL GPIO header               */
@@ -65,8 +64,6 @@ blt_bool CpuUserProgramStartHook(void)
   }
   /* clean up the LED driver */
   LedBlinkExit();
-  /* clean up the application. */
-  AppDeInit();
   /*  okay to start the user program.*/
   return BLT_TRUE;
 } /*** end of CpuUserProgramStartHook ***/

Target/Demo/ARMCM7_STM32F7_Nucleo_F746ZG_CubeIDE/Boot/Core/Src/stm32f7xx_hal_msp.c

@@ -22,7 +22,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 /* USER CODE BEGIN Includes */
-
+#include "stm32f7xx_ll_rcc.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -213,6 +213,9 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd)
   */
 void HAL_MspDeInit(void)
 {
+  /* Reset the RCC clock configuration to the default reset state. */
+  LL_RCC_DeInit();
+
   /* Reset GPIO pin for the LED to turn it off. */
   LL_GPIO_ResetOutputPin(GPIOB, LL_GPIO_PIN_7);
 

Target/Demo/ARMCM7_STM32F7_Nucleo_F767ZI_CubeIDE/Boot/App/app.c

@@ -93,17 +93,4 @@ void AppTask(void)
 } /*** end of AppTask ***/
 
 
-/************************************************************************************//**
-** \brief     Uninitializes the bootloader application. Should be called right before the
-**            bootloader starts the user program.
-** \return    none.
-**
-****************************************************************************************/
-void AppDeInit(void)
-{
-  /* Reset the RCC clock configuration to the default reset state. */
-  HAL_RCC_DeInit();
-} /*** end of AppDeInit ***/
-
-
 /*********************************** end of app.c **************************************/

Target/Demo/ARMCM7_STM32F7_Nucleo_F767ZI_CubeIDE/Boot/App/app.h

@@ -33,7 +33,6 @@
 ****************************************************************************************/
 void AppInit(void);
 void AppTask(void);
-void AppDeInit(void);
 
 
 #endif /* APP_H */

Target/Demo/ARMCM7_STM32F7_Nucleo_F767ZI_CubeIDE/Boot/App/hooks.c

@@ -30,7 +30,6 @@
 * Include files
 ****************************************************************************************/
 #include "boot.h"                                /* bootloader generic header          */
-#include "app.h"                                 /* bootloader application header      */
 #include "led.h"                                 /* LED driver header                  */
 #include "stm32f7xx.h"                           /* STM32 CPU and HAL header           */
 
@@ -64,8 +63,6 @@ blt_bool CpuUserProgramStartHook(void)
   }
   /* clean up the LED driver */
   LedBlinkExit();
-  /* clean up the application. */
-  AppDeInit();
   /*  okay to start the user program.*/
   return BLT_TRUE;
 } /*** end of CpuUserProgramStartHook ***/

Target/Demo/ARMCM7_STM32F7_Nucleo_F767ZI_CubeIDE/Boot/Core/Src/stm32f7xx_hal_msp.c

@@ -192,6 +192,9 @@ void HAL_ETH_MspDeInit(ETH_HandleTypeDef* heth)
   */
 void HAL_MspDeInit(void)
 {
+  /* Reset the RCC clock configuration to the default reset state. */
+  HAL_RCC_DeInit();
+
   /* Reset GPIO pin for the LED to turn it off. */
   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_7, GPIO_PIN_RESET);