Use backup API for HID bootloader

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/backup.h

@@ -46,6 +46,18 @@ extern "C" {
 #define RTC_BKP_VALUE 0x32F2
 #endif
 
+#if defined (HIDBL_F1) || defined (HIDBL_F4)
+#if !defined(HID_MAGIC_NUMBER_BKP_INDEX)
+#if defined (HIDBL_F1)
+#define HID_MAGIC_NUMBER_BKP_INDEX LL_RTC_BKP_DR10
+#elif defined (HIDBL_F4)
+#define HID_MAGIC_NUMBER_BKP_INDEX 0
+#endif
+#endif /* HID_MAGIC_NUMBER_BKP_INDEX */
+#ifndef HID_MAGIC_NUMBER_BKP_VALUE
+#define HID_MAGIC_NUMBER_BKP_VALUE 0x424C
+#endif
+#endif /* HIDBL_F1 || HIDBL_F4 */
 
 /* Exported functions ------------------------------------------------------- */
 static inline void resetBackupDomain(void)

cores/arduino/stm32/usb/cdc/usbd_cdc_if.c

@@ -23,6 +23,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_desc.h"
 #include "usbd_cdc_if.h"
+#include "backup.h"
 
 #ifdef USE_USB_HS
 #define CDC_MAX_PACKET_SIZE USB_OTG_HS_MAX_PACKET_SIZE
@@ -229,19 +230,16 @@ static int8_t USBD_CDC_Receive(uint8_t *Buf, uint32_t *Len)
      */
     if (dtr_toggling > 3) {
       if ((Buf[0] == '1') && (Buf[1] == 'E') && (Buf[2] == 'A') && (Buf[3] == 'F')) {
+#if defined (HIDBL_F1) || defined (HIDBL_F4)
+        enableBackupDomain();
 #if defined (HIDBL_F1)
-        RTC_HandleTypeDef hrtc;
-        __HAL_RCC_PWR_CLK_ENABLE();
-        __HAL_RCC_BKP_CLK_ENABLE();
-        HAL_PWR_EnableBkUpAccess();
-        HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_DR10, 0x424C); //Write the magic number 0x424C
-
-#elif defined (HIDBL_F4)
-        __HAL_RCC_PWR_CLK_ENABLE();
-        HAL_PWR_EnableBkUpAccess();
-        __BKPSRAM_CLK_ENABLE();
-        *(__IO uint32_t *)(BKPSRAM_BASE) = 0x424C; //Write the magic number 0x424C at Backup SRAM address 0x40024000
-
+        setBackupRegister(HID_MAGIC_NUMBER_BKP_INDEX, HID_MAGIC_NUMBER_BKP_VALUE);
+#endif
+#if defined (HIDBL_F4)
+        writeBackupSRAM(HID_MAGIC_NUMBER_BKP_INDEX, &(uint32_t) {
+          HID_MAGIC_NUMBER_BKP_VALUE
+        }, 1);
+#endif
 #endif
         HAL_NVIC_SystemReset();
       }