Make NFCLayerInterface destructor virtual and out-of-line B/F/V layer destructors

Author: GOB52

src/nfc/layer/a/emulation_layer_a.hpp

@@ -47,7 +47,7 @@ class EmulationLayerA {
     explicit EmulationLayerA(m5::unit::UnitST25R3916& u);
     //! @brief Construct with CapST25R3916 (SPI)
     explicit EmulationLayerA(m5::unit::CapST25R3916& u);
-    ~EmulationLayerA();
+    virtual ~EmulationLayerA();
 
     //! @brief Gets the current emulation state
     inline State state() const

src/nfc/layer/a/nfc_layer_a.hpp

@@ -51,7 +51,7 @@ class NFCLayerA : public m5::nfc::NFCLayerInterface {
     explicit NFCLayerA(m5::unit::UnitST25R3916& u);
     //! @brief Constructor with CapST25R3916 (SPI variant)
     explicit NFCLayerA(m5::unit::CapST25R3916& u);
-    ~NFCLayerA();
+    virtual ~NFCLayerA();
 
     ///@name override
     ///@{

src/nfc/layer/b/nfc_layer_b.cpp

@@ -62,6 +62,8 @@ constexpr uint8_t fsdi_for_size(const uint16_t bytes)
 namespace m5 {
 namespace nfc {
 
+NFCLayerB::~NFCLayerB() = default;
+
 uint16_t NFCLayerB::maximum_fifo_depth() const
 {
     return _impl->max_fifo_depth();

src/nfc/layer/b/nfc_layer_b.hpp

@@ -45,6 +45,7 @@ class NFCLayerB : public NFCLayerInterface {
     explicit NFCLayerB(m5::unit::CapST25R3916& u);
     //! @brief Constructor with UnitWS1850S (M5Unit-RFID)
     explicit NFCLayerB(m5::unit::UnitWS1850S& u);
+    virtual ~NFCLayerB();
 
     //! @brief Transceive (NFC-B)
     virtual bool transceive(uint8_t* rx, uint16_t& rx_len, const uint8_t* tx, const uint16_t tx_len,

src/nfc/layer/f/emulation_layer_f.cpp

@@ -65,6 +65,8 @@ inline bool is_system_code_wildcard(const uint8_t sc[2])
 namespace m5 {
 namespace nfc {
 
+EmulationLayerF::~EmulationLayerF() = default;
+
 bool EmulationLayerF::begin(const m5::nfc::f::PICC& picc, uint8_t* ptr, const uint32_t size)
 {
     if (_state != State::None) {

src/nfc/layer/f/emulation_layer_f.hpp

@@ -47,6 +47,7 @@ class EmulationLayerF {
     explicit EmulationLayerF(m5::unit::UnitST25R3916& u);
     //! @brief Construct with CapST25R3916 (SPI)
     explicit EmulationLayerF(m5::unit::CapST25R3916& u);
+    virtual ~EmulationLayerF();
 
     //! @brief Gets the current emulation state
     inline State state() const

src/nfc/layer/f/nfc_layer_f.cpp

@@ -79,6 +79,8 @@ const uint8_t* make_rc(uint8_t rc[16])
 namespace m5 {
 namespace nfc {
 
+NFCLayerF::~NFCLayerF() = default;
+
 uint16_t NFCLayerF::maximum_fifo_depth() const
 {
     return _impl->max_fifo_depth();

src/nfc/layer/f/nfc_layer_f.hpp

@@ -41,6 +41,7 @@ class NFCLayerF : public NFCLayerInterface {
     explicit NFCLayerF(m5::unit::UnitST25R3916& u);
     //! @brief Constructor with CapST25R3916 (SPI variant)
     explicit NFCLayerF(m5::unit::CapST25R3916& u);
+    virtual ~NFCLayerF();
 
     //! @brief Maximum FIFO depth in bytes
     virtual uint16_t maximum_fifo_depth() const override;

src/nfc/layer/nfc_layer.hpp

@@ -25,6 +25,8 @@ class IsoDEP;
  */
 class NFCLayerInterface {
 public:
+    //! @brief Virtual destructor (required for polymorphic deletion)
+    virtual ~NFCLayerInterface() = default;
     //! @brief activePICC's NDEF type
     virtual m5::nfc::NFCForumTag supportsNFCTag() const
     {

src/nfc/layer/v/nfc_layer_v.cpp

@@ -73,6 +73,8 @@ constexpr char dump_line[] =
 namespace m5 {
 namespace nfc {
 
+NFCLayerV::~NFCLayerV() = default;
+
 uint16_t NFCLayerV::maximum_fifo_depth() const
 {
     return _impl->max_fifo_depth();