Skip to content

Commit 77f358d

Browse files
committed
Rename SN32 WL driver, guard the last page
1 parent 40a8d85 commit 77f358d

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

builddefs/common_features.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ else
249249
endif
250250
endif
251251

252-
VALID_WEAR_LEVELING_DRIVER_TYPES := custom embedded_flash spi_flash rp2040_flash legacy sn32
252+
VALID_WEAR_LEVELING_DRIVER_TYPES := custom embedded_flash spi_flash rp2040_flash legacy sn32_flash
253253
WEAR_LEVELING_DRIVER ?= none
254254
ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
255255
ifeq ($(filter $(WEAR_LEVELING_DRIVER),$(VALID_WEAR_LEVELING_DRIVER_TYPES)),)
@@ -277,9 +277,9 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
277277
COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
278278
SRC += flash_stm32.c wear_leveling_legacy.c
279279
POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_legacy_config.h
280-
else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), sn32)
281-
SRC += wear_leveling_sn32.c
282-
POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_sn32_config.h
280+
else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), sn32_flash)
281+
SRC += wear_leveling_sn32_flash.c
282+
POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_sn32_flash_config.h
283283
endif
284284
endif
285285
endif
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
EEPROM_DRIVER = wear_leveling
2-
WEAR_LEVELING_DRIVER = sn32
2+
WEAR_LEVELING_DRIVER = sn32_flash

platforms/chibios/drivers/wear_leveling/wear_leveling_sn32_config.h renamed to platforms/chibios/drivers/wear_leveling/wear_leveling_sn32_flash_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef WEAR_LEVELING_SN32_PAGE_SIZE
77
# if defined(QMK_MCU_SERIES_SN32F240B)
88
# define WEAR_LEVELING_SN32_PAGE_SIZE 64
9-
# elif defined(QMK_MCU_SERIES_SN32F240)
9+
# elif defined(QMK_MCU_SERIES_SN32F260)
1010
# define WEAR_LEVELING_SN32_PAGE_SIZE 64
1111
# endif
1212
#endif
@@ -23,15 +23,15 @@
2323
// The number of pages to use
2424
#ifndef WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT
2525
# if defined(QMK_MCU_SERIES_SN32F240B)
26-
# define WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT 23
26+
# define WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT 22
2727
# elif defined(QMK_MCU_SERIES_SN32F260)
28-
# define WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT 23
28+
# define WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT 22
2929
# endif
3030
#endif
3131

3232
// The origin of the emulated eeprom
3333
#ifndef WEAR_LEVELING_SN32_EMULATION_BASE_PAGE_ADDRESS
34-
# define WEAR_LEVELING_SN32_EMULATION_BASE_PAGE_ADDRESS ((uint32_t)(WEAR_LEVELING_SN32_PAGE_SIZE * WEAR_LEVELING_SN32_EMULATION_TOTAL_PAGE - ((WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT + 1) * WEAR_LEVELING_SN32_PAGE_SIZE)))
34+
# define WEAR_LEVELING_SN32_EMULATION_BASE_PAGE_ADDRESS ((uint32_t)(WEAR_LEVELING_SN32_PAGE_SIZE * WEAR_LEVELING_SN32_EMULATION_TOTAL_PAGE - ((WEAR_LEVELING_SN32_EMULATION_PAGE_COUNT + 2) * WEAR_LEVELING_SN32_PAGE_SIZE)))
3535
#endif
3636

3737
// 4-byte writes

0 commit comments

Comments
 (0)