fixup! Revert deleting eeprom function definition

Author: kbumsik

cores/arduino/stm32/stm32_eeprom.c

@@ -39,13 +39,6 @@
 extern "C" {
 #endif
 
-#ifndef EEPROM_RETRAM_MODE  /* Buffering not needed in RETRAM mode */
-
-static void eeprom_buffer_fill();
-static void eeprom_buffer_flush();
-static uint8_t eeprom_buffered_read_byte(const uint32_t pos);
-static void eeprom_buffered_write_byte(uint32_t pos, uint8_t value);
-
 /* Be able to change FLASH_BANK_NUMBER to use if relevant */
 #if !defined(FLASH_BANK_NUMBER) &&\
     (defined(STM32F0xx) || defined(STM32F1xx) || defined(STM32G4xx) ||\
@@ -122,6 +115,8 @@ static inline uint32_t get_flash_end(void)
       defined(STM32WBxx)
 /* If FLASH_PAGE_NUMBER is defined by user, this is not really end of the flash */
 #define FLASH_END  ((uint32_t)(FLASH_BASE + (((FLASH_PAGE_NUMBER +1) * FLASH_PAGE_SIZE))-1))
+#elif defined(EEPROM_RETRAM_MODE)
+#define FLASH_END  ((uint32_t)(EEPROM_RETRAM_START_ADDRESS + EEPROM_RETRAM_MODE_SIZE -1))
 #endif
 #ifndef FLASH_END
 #error "FLASH_END could not be defined"
@@ -137,6 +132,8 @@ static inline uint32_t get_flash_end(void)
  */
 #if defined(STM32L0xx)
 #define FLASH_BASE_ADDRESS  ((uint32_t)(DATA_EEPROM_BASE))
+#elif defined(EEPROM_RETRAM_MODE)
+#define FLASH_BASE_ADDRESS  EEPROM_RETRAM_START_ADDRESS
 #else
 #define FLASH_BASE_ADDRESS  ((uint32_t)((FLASH_END + 1) - FLASH_PAGE_SIZE))
 #endif
@@ -201,6 +198,20 @@ void eeprom_buffer_fill(void)
   memcpy(eeprom_buffer, (uint8_t *)(FLASH_BASE_ADDRESS), E2END + 1);
 }
 
+#if defined(EEPROM_RETRAM_MODE)
+
+/**
+  * @brief  This function writes the buffer content into the flash
+  * @param  none
+  * @retval none
+  */
+void eeprom_buffer_flush(void)
+{
+  memcpy((uint8_t *)(FLASH_BASE_ADDRESS), eeprom_buffer, E2END + 1);
+}
+
+#else /* defined(EEPROM_RETRAM_MODE) */
+
 /**
   * @brief  This function writes the buffer content into the flash
   * @param  none
@@ -313,36 +324,7 @@ void eeprom_buffer_flush(void)
 #endif
 }
 
-#else /* EEPROM_RETRAM_MODE */
-/**
-  * @brief  Function reads a byte from emulated eeprom (flash)
-  * @param  pos : address to read
-  * @retval byte : data read from eeprom
-  */
-uint8_t eeprom_read_byte(const uint32_t pos)
-{
-  uint8_t tmp;
-  if (pos > E2END) {
-    return 0;
-  }
-  memcpy(&tmp, (uint8_t *)(EEPROM_RETRAM_START_ADDRESS + pos), sizeof(uint8_t));
-  return tmp;
-}
-
-/**
-  * @brief  Function writes a byte to emulated eeprom (flash)
-  * @param  pos : address to write
-  * @param  value : value to write
-  * @retval none
-  */
-void eeprom_write_byte(uint32_t pos, uint8_t value)
-{
-  if (pos > E2END) {
-    return;
-  }
-  memcpy((uint8_t *)(EEPROM_RETRAM_START_ADDRESS + pos), &value, sizeof(uint8_t));
-}
-#endif /* EEPROM_RETRAM_MODE */
+#endif /* defined(EEPROM_RETRAM_MODE) */
 
 #ifdef __cplusplus
 }

cores/arduino/stm32/stm32_eeprom.h

@@ -89,6 +89,11 @@ extern "C" {
 uint8_t eeprom_read_byte(const uint32_t pos);
 void eeprom_write_byte(uint32_t pos, uint8_t value);
 
+void eeprom_buffer_fill();
+void eeprom_buffer_flush();
+uint8_t eeprom_buffered_read_byte(const uint32_t pos);
+void eeprom_buffered_write_byte(uint32_t pos, uint8_t value);
+
 #ifdef __cplusplus
 }
 #endif