fixup! sys/fido2: update flash handling based on flashpage API extension

Author: Ollrogge

sys/fido2/ctap/ctap_mem.c

@@ -67,7 +67,7 @@ int fido2_ctap_mem_init(void)
 static unsigned _amount_flashpages_rk(void)
 {
     /* -1 because first page holds authenticator state information */
-    return CTAP_FLASH_NUM_FLASHPAGES - 1;
+    return CONFIG_FIDO2_CTAP_NUM_FLASHPAGES - 1;
 }
 
 int fido2_ctap_mem_read(void *buf, uint32_t page, uint32_t offset, uint32_t len)
@@ -164,7 +164,7 @@ int fido2_ctap_mem_get_offset_of_rk_into_flashpage(uint16_t rk_idx)
 
 unsigned fido2_ctap_mem_get_state_flashpage_number(void)
 {
-    return flashpage_last_free() - CTAP_FLASH_NUM_FLASHPAGES + 1;
+    return flashpage_last_free() - CONFIG_FIDO2_CTAP_NUM_FLASHPAGES + 1;
 }
 
 unsigned fido2_ctap_mem_get_rk_start_page(void)

sys/include/fido2/ctap/ctap_mem.h

@@ -43,11 +43,13 @@ extern "C" {
 /**
  * @brief   Default amount of flashpages to use
  */
-#if defined(CONFIG_FIDO2_CTAP_NUM_FLASHPAGES) && \
-    (CONFIG_FIDO2_CTAP_NUM_FLASHPAGES >= 2)
-#define CTAP_FLASH_NUM_FLASHPAGES CONFIG_FIDO2_CTAP_NUM_FLASHPAGES
-#else
-#define CTAP_FLASH_NUM_FLASHPAGES 4
+#ifndef CONFIG_FIDO2_CTAP_NUM_FLASHPAGES
+#define CONFIG_FIDO2_CTAP_NUM_FLASHPAGES 4
+#endif
+
+#if CONFIG_FIDO2_CTAP_NUM_FLASHPAGES <= 2 || \
+    CONFIG_FIDO2_CTAP_NUM_FLASHPAGES >= FLASHPAGE_NUMOF
+#error "ctap_mem.h: Configured number of flashpages is invalid"
 #endif
 
 /**