Merge pull request #4 from cparata/main

Move the interrupt management inside the ST25R3916 library

Author: cparata

library.properties

@@ -1,5 +1,5 @@
 name=STM32duino ST25R3916
-version=1.0.1
+version=1.0.2
 author=STMicroelectronics
 maintainer=stm32duino
 sentence=Allows controlling the ST ST25R3916 component

src/rfal_rfst25r3916.cpp

@@ -50,6 +50,7 @@ RfalRfST25R3916Class::RfalRfST25R3916Class(SPIClass *spi, int cs_pin, int int_pi
   dev_i2c = NULL;
   isr_pending = false;
   bus_busy = false;
+  irq_handler = NULL;
 }
 
 RfalRfST25R3916Class::RfalRfST25R3916Class(TwoWire *i2c, int int_pin) : dev_i2c(i2c), int_pin(int_pin)
@@ -64,6 +65,7 @@ RfalRfST25R3916Class::RfalRfST25R3916Class(TwoWire *i2c, int int_pin) : dev_i2c(
   dev_spi = NULL;
   isr_pending = false;
   bus_busy = false;
+  irq_handler = NULL;
 }
 
 
@@ -74,6 +76,11 @@ ReturnCode RfalRfST25R3916Class::rfalInitialize(void)
   pinMode(cs_pin, OUTPUT);
   digitalWrite(cs_pin, HIGH);
 
+  pinMode(int_pin, INPUT);
+  Callback<void()>::func = std::bind(&RfalRfST25R3916Class::st25r3916Isr, this);
+  irq_handler = static_cast<ST25R3916IrqHandler>(Callback<void()>::callback);
+  attachInterrupt(int_pin, irq_handler, RISING);
+
   rfalAnalogConfigInitialize();              /* Initialize RFAL's Analog Configs */
 
   EXIT_ON_ERR(err, st25r3916Initialize());
@@ -196,6 +203,10 @@ ReturnCode RfalRfST25R3916Class::rfalDeinitialize(void)
   rfalSetAnalogConfig((RFAL_ANALOG_CONFIG_TECH_CHIP | RFAL_ANALOG_CONFIG_CHIP_DEINIT));
 
   gRFAL.state = RFAL_STATE_IDLE;
+
+  detachInterrupt(int_pin);
+  irq_handler = NULL;
+
   return ERR_NONE;
 }
 

src/rfal_rfst25r3916.h

@@ -48,6 +48,7 @@
 #include "rfal_rfst25r3916_analogConfig.h"
 #include "rfal_rfst25r3916_iso15693_2.h"
 #include "st25r3916_aat.h"
+#include <functional>
 
 /*
  ******************************************************************************
@@ -210,6 +211,23 @@ typedef struct {
   bool    ready;                  /*!< Indicate if Look Up Table is complete and ready for use */
 } rfalAnalogConfigMgmt;
 
+template <typename T>
+struct Callback;
+
+template <typename Ret, typename... Params>
+struct Callback<Ret(Params...)> {
+   template <typename... Args>
+   static Ret callback(Args... args) {
+      return func(args...);
+   }
+   static std::function<Ret(Params...)> func;
+};
+
+template <typename Ret, typename... Params>
+std::function<Ret(Params...)> Callback<Ret(Params...)>::func;
+
+typedef void (*ST25R3916IrqHandler)(void);
+
 /*
 ******************************************************************************
 * GLOBAL DEFINES
@@ -1747,15 +1765,6 @@ class RfalRfST25R3916Class : public RfalRfClass {
      */
     void st25r3916CheckForReceivedInterrupts(void);
 
-    /*!
-     *****************************************************************************
-     *  \brief  ISR Service routine
-     *
-     *  This function modiefies the interrupt
-     *****************************************************************************
-     */
-    void  st25r3916Isr(void);
-
     /*!
      *****************************************************************************
      *  \brief  Enable a given ST25R3916 Interrupt source
@@ -1951,6 +1960,14 @@ class RfalRfST25R3916Class : public RfalRfClass {
     ReturnCode aatStepDacVals(const struct st25r3916AatTuneParams *tuningParams, uint8_t *a, uint8_t *b, int32_t dir);
     void setISRPending(void);
     bool isBusBusy(void);
+    /*!
+     *****************************************************************************
+     *  \brief  ISR Service routine
+     *
+     *  This function modifies the interrupt
+     *****************************************************************************
+     */
+    void  st25r3916Isr(void);
 
     TwoWire *dev_i2c;
     SPIClass *dev_spi;
@@ -1967,6 +1984,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
     bool i2c_enabled;
     volatile bool isr_pending;
     volatile bool bus_busy;
+    ST25R3916IrqHandler irq_handler;
 };
 
 #ifdef __cplusplus