summaryrefslogtreecommitdiffstats
path: root/platforms/chibios
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-11-23 19:50:19 +1100
committerGitHub <noreply@github.com>2022-11-23 08:50:19 +0000
commitbebfdad795add9fbc8c6c1393d1b817d542474ed (patch)
tree1d09d181a2c6a3be74d3e9125f952afe0f1f5ab4 /platforms/chibios
parentbfdc76181980545b18d9e4d909b62d09895bca9d (diff)
NVRAM refactor, phase 1. (#18969)
* Rename `eeprom_stm32` to `eeprom_legacy_emulated_flash`. * Rename `flash_stm32` to `legacy_flash_ops`. * Rename `eeprom_teensy` to `eeprom_kinetis_flexram`.
Diffstat (limited to 'platforms/chibios')
-rw-r--r--platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c (renamed from platforms/chibios/drivers/eeprom/eeprom_teensy.c)2
-rwxr-xr-xplatforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h (renamed from platforms/chibios/drivers/eeprom/eeprom_teensy.h)0
-rw-r--r--platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c (renamed from platforms/chibios/drivers/eeprom/eeprom_stm32.c)6
-rw-r--r--platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h (renamed from platforms/chibios/drivers/eeprom/eeprom_stm32.h)0
-rw-r--r--platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h (renamed from platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h)0
-rw-r--r--platforms/chibios/drivers/flash/legacy_flash_ops.c (renamed from platforms/chibios/drivers/flash/flash_stm32.c)2
-rw-r--r--platforms/chibios/drivers/flash/legacy_flash_ops.h (renamed from platforms/chibios/drivers/flash/flash_stm32.h)2
-rw-r--r--platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c2
8 files changed, 7 insertions, 7 deletions
diff --git a/platforms/chibios/drivers/eeprom/eeprom_teensy.c b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
index c8777febde..6468cbf3fa 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_teensy.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.c
@@ -1,7 +1,7 @@
#include <ch.h>
#include <hal.h>
-#include "eeprom_teensy.h"
+#include "eeprom_kinetis_flexram.h"
#include "eeconfig.h"
/*************************************/
diff --git a/platforms/chibios/drivers/eeprom/eeprom_teensy.h b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h
index 9a14a1fa79..9a14a1fa79 100755
--- a/platforms/chibios/drivers/eeprom/eeprom_teensy.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_kinetis_flexram.h
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.c b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
index 1a354dc213..a81fe3353c 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.c
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.c
@@ -22,8 +22,8 @@
#include <stdbool.h>
#include "util.h"
#include "debug.h"
-#include "eeprom_stm32.h"
-#include "flash_stm32.h"
+#include "eeprom_legacy_emulated_flash.h"
+#include "legacy_flash_ops.h"
/*
* We emulate eeprom by writing a snapshot compacted view of eeprom contents,
@@ -132,7 +132,7 @@
*
*/
-#include "eeprom_stm32_defs.h"
+#include "eeprom_legacy_emulated_flash_defs.h"
/* These bits are used for optimizing encoding of bytes, 0 and 1 */
#define FEE_WORD_ENCODING 0x8000
#define FEE_VALUE_NEXT 0x6000
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32.h b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h
index 8fcfb556b8..8fcfb556b8 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash.h
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h
index 57d0440330..57d0440330 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32_defs.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_legacy_emulated_flash_defs.h
diff --git a/platforms/chibios/drivers/flash/flash_stm32.c b/platforms/chibios/drivers/flash/legacy_flash_ops.c
index 72c41b8b78..fe5ad64764 100644
--- a/platforms/chibios/drivers/flash/flash_stm32.c
+++ b/platforms/chibios/drivers/flash/legacy_flash_ops.c
@@ -17,7 +17,7 @@
*/
#include <hal.h>
-#include "flash_stm32.h"
+#include "legacy_flash_ops.h"
#if defined(STM32F1XX)
# define FLASH_SR_WRPERR FLASH_SR_WRPRTERR
diff --git a/platforms/chibios/drivers/flash/flash_stm32.h b/platforms/chibios/drivers/flash/legacy_flash_ops.h
index 6c66642ec5..ef80764055 100644
--- a/platforms/chibios/drivers/flash/flash_stm32.h
+++ b/platforms/chibios/drivers/flash/legacy_flash_ops.h
@@ -24,7 +24,7 @@ extern "C" {
#include <stdint.h>
-#ifdef FLASH_STM32_MOCKED
+#ifdef LEGACY_FLASH_OPS_MOCKED
extern uint8_t FlashBuf[MOCK_FLASH_SIZE];
#endif
diff --git a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
index 87126c4467..7c6fd2d808 100644
--- a/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
+++ b/platforms/chibios/drivers/wear_leveling/wear_leveling_legacy.c
@@ -5,7 +5,7 @@
#include "timer.h"
#include "wear_leveling.h"
#include "wear_leveling_internal.h"
-#include "flash_stm32.h"
+#include "legacy_flash_ops.h"
bool backing_store_init(void) {
bs_dprintf("Init\n");