Reuse HighCycleAreaOrOtpIrqHandler

Author: fabiangottstein

hal_st/stm32fxxx/FlashInternalHighCycleAreaStm.cpp

@@ -1,10 +1,10 @@
-#include DEVICE_HEADER
 #include "hal_st/stm32fxxx/FlashInternalHighCycleAreaStm.hpp"
 #include "hal_st/stm32fxxx/FlashInternalStmDetail.hpp"
 #include "infra/event/EventDispatcher.hpp"
 #include "infra/util/ByteRange.hpp"
 #include "infra/util/MemoryRange.hpp"
 #include <cstdint>
+#include DEVICE_HEADER
 
 namespace
 {
@@ -139,19 +139,6 @@ namespace hal
 
     FlashInternalHighCycleAreaStm::WithIrqHandler::WithIrqHandler(uint32_t bank)
         : FlashInternalHighCycleAreaStm(bank)
-        , nmi{
-            IRQn_Type::NonMaskableInt_IRQn, []
-            {
-                // From RM0481, Section 7.3.4 FLASH read operations:
-                // If the application reads an OTP data or flash high-cycle data not previously written, a
-                // double ECC error is reported and only a word full of set bits is returned (see
-                // Section 7.3.9 for details). The read data (in 16 bits) is stored in FLASH_ECCDR
-                // register, so that the user can identify if the double ECC error is due to a virgin data or a
-                // real ECC error.
-                really_assert(__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD) && READ_REG(FLASH->ECCDR) == 0xFFFF);
-
-                __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-            }
-        }
+        , HighCycleAreaOrOtpIrqHandler()
     {}
 }

hal_st/stm32fxxx/FlashInternalHighCycleAreaStm.hpp

@@ -1,12 +1,11 @@
-// Copyright (c) 2024 Koninklijke Philips N.V.
 #ifndef HAL_FLASH_INTERNAL_HIGH_CYCLE_AREA_STM_HPP
 #define HAL_FLASH_INTERNAL_HIGH_CYCLE_AREA_STM_HPP
 
-#include DEVICE_HEADER
 #include "hal/interfaces/Flash.hpp"
-#include "hal_st/cortex/InterruptCortex.hpp"
+#include "hal_st/stm32fxxx/HighCycleAreaOrOtpIrqHandler.hpp"
 #include "infra/util/MemoryRange.hpp"
 #include <cstdint>
+#include DEVICE_HEADER
 
 namespace hal
 {
@@ -19,7 +18,7 @@ namespace hal
 
         class WithIrqHandler;
 
-        FlashInternalHighCycleAreaStm(uint32_t bank = FLASH_BANK_2);
+        explicit FlashInternalHighCycleAreaStm(uint32_t bank = FLASH_BANK_2);
 
         void WriteBuffer(infra::ConstByteRange buffer, uint32_t address, infra::Function<void()> onDone) override;
         void ReadBuffer(infra::ByteRange buffer, uint32_t address, infra::Function<void()> onDone) override;
@@ -37,12 +36,10 @@ namespace hal
 
     class FlashInternalHighCycleAreaStm::WithIrqHandler
         : public FlashInternalHighCycleAreaStm
+        , private HighCycleAreaOrOtpIrqHandler
     {
     public:
-        WithIrqHandler(uint32_t bank = FLASH_BANK_2);
-
-    private:
-        hal::ImmediateInterruptHandler nmi;
+        explicit WithIrqHandler(uint32_t bank = FLASH_BANK_2);
     };
 }