Fix a bunch of compilation issues, thanks @pan-

Author: Donatien Garnier

features/nfc/controllers/PN512TransportDriver.h

@@ -35,14 +35,22 @@ class PN512TransportDriver {
         /**
          * Called when the PN512 asserts the interrupt line
          */
-        void on_hw_interrupt();
+        virtual void on_hw_interrupt() {}
+
+    protected:
+        ~Delegate() {}
     };
 
     /**
      * Create a PN512TransportDriver instance
      */
     PN512TransportDriver();
 
+    /**
+    * PN512TransportDriver destructor.
+    */
+    virtual ~PN512TransportDriver();
+
     /**
      * Initialize transport driver and perform a chip reset
      */

features/nfc/nfc/ISO7816App.h

@@ -36,6 +36,7 @@ class Type4RemoteInitiator;
  * This base class represents an ISO7816-4 application.
  */
 class ISO7816App {
+public:
     /**
      * This class describes an ISO7816-4 exchange (Command/Response).
      */
@@ -91,7 +92,12 @@ class ISO7816App {
     /**
      * Construct ISO7816 app instance
      */
-    ISO7816App();
+    ISO7816App() {}
+
+    /**
+     * ISO7816App destructor
+     */
+    virtual ~ISO7816App();
 
 private:
     friend class Type4RemoteInitiator;

features/nfc/nfc/NFCController.h

@@ -80,6 +80,9 @@ class NFCController : private NFCControllerDriver::Delegate {
          * @param[in] the NFCRemoteTarget instance
          */
         virtual void on_nfc_target_discovered(const SharedPtr<NFCRemoteTarget> &nfc_target) {}
+
+    protected:
+        ~Delegate() { }
     };
 
     /**

features/nfc/nfc/NFCControllerDriver.h

@@ -22,7 +22,7 @@
 
 #include "stack/nfc_errors.h"
 #include "stack/transceiver/transceiver.h"
-#include "stack/platform/scheduler.h"
+#include "stack/platform/nfc_scheduler.h"
 
 namespace mbed {
 namespace nfc {
@@ -37,11 +37,17 @@ namespace nfc {
  * Implementers need to derive from this class and implement its methods.
  */
 class NFCControllerDriver {
+public:
     /**
      * Instantiate a NFCControllerDriver
      */
     NFCControllerDriver();
 
+    /**
+     * NFCControllerDriver destructor
+     */
+    virtual ~NFCControllerDriver();
+
     /**
      * The NFCControllerDriver delegate
      */
@@ -50,6 +56,9 @@ class NFCControllerDriver {
          * Called when the controller asserts the interrupt line
          */
         virtual void on_hw_interrupt() {}
+
+    protected:
+        virtual ~Delegate() {}
     };
 
     /**

features/nfc/nfc/NFCEEPROM.h

@@ -18,6 +18,7 @@
 #define MBED_NFC_EEPROM_H
 
 #include <stdint.h>
+#include "events/EventQueue.h"
 
 #include "NFCDefinitions.h"
 #include "NFCTarget.h"
@@ -58,6 +59,29 @@ class NFCEEPROM : public NFCTarget, public NFCEEPROMDriver::Delegate {
      * The NFCEEPROM delegate. Users of the NFCEEPROM class need to implement this delegate's methods to receive events.
      */
     struct Delegate : NFCTarget::Delegate {
+        /**
+         * The NDEF message erasing request completed.
+         *
+         * @param[in] result NFC_OK or an error code on failure
+         */
+        virtual void on_ndef_message_erased(nfc_err_t result) {}
+
+        /**
+         * The NDEF message writing request completed.
+         *
+         * @param[in] result NFC_OK or an error code on failure
+         */
+        virtual void on_ndef_message_written(nfc_err_t result) {}
+
+        /**
+         * The NDEF message reading request completed.
+         *
+         * @param[in] result NFC_OK or an error code on failure
+         */
+        virtual void on_ndef_message_read(nfc_err_t result) {}
+
+    protected:
+        ~Delegate() {}
     };
 
     /**
@@ -96,15 +120,15 @@ class NFCEEPROM : public NFCTarget, public NFCEEPROMDriver::Delegate {
     void continue_read();
     void continue_erase();
 
-    enum class nfc_eeprom_operation_t {
+    enum nfc_eeprom_operation_t {
         nfc_eeprom_idle,
 
         nfc_eeprom_write_start_session,
         nfc_eeprom_write_write_bytes,
         nfc_eeprom_write_write_size,
         nfc_eeprom_write_end_session,
 
-        nfc_eeprom_write_start_session,
+        nfc_eeprom_read_start_session,
         nfc_eeprom_read_read_size,
         nfc_eeprom_read_read_bytes,
         nfc_eeprom_read_end_session,
@@ -119,7 +143,7 @@ class NFCEEPROM : public NFCTarget, public NFCEEPROMDriver::Delegate {
     bool _initialized;
 
     nfc_eeprom_operation_t _current_op;
-    buffer_t _ndef_buffer_reader;
+    ac_buffer_t _ndef_buffer_reader;
     size_t _ndef_buffer_read_sz;
     uint32_t _eeprom_address;
     nfc_err_t _operation_result;

features/nfc/nfc/NFCEEPROMDriver.h

@@ -42,6 +42,11 @@ class NFCEEPROMDriver  {
      */
     NFCEEPROMDriver();
 
+    /**
+     * NFCEEPROM driver destructor.
+     */
+    virtual ~NFCEEPROMDriver();
+
     /**
      * The NFCEEPROMDriver delegate.
      * Methods in this class are called by the driver on completion of long-running operations.
@@ -96,6 +101,9 @@ class NFCEEPROMDriver  {
          * @param[in] count number of bytes actually erased
          */
         virtual void on_bytes_erased(size_t count) = 0;
+
+    protected:
+        ~Delegate() {}
     };
 
     /**

features/nfc/nfc/NFCNDEFCapable.h

@@ -71,6 +71,9 @@ class NFCNDEFCapable {
         {
             return 0;
         }
+
+    protected:
+        ~Delegate() {}
     };
 
     /**
@@ -104,10 +107,10 @@ class NFCNDEFCapable {
 
 private:
     // Callbacks from NDEF stack
-    static nfc_err_t s_ndef_encode(ndef_msg_t *pTag, buffer_builder_t *pBufferBldr, void *pUserData);
-    static nfc_err_t s_ndef_decode(ndef_msg_t *pTag, buffer_t *pBuffer, void *pUserData);
-    nfc_err_t ndef_encode(buffer_builder_t *pBufferBldr);
-    nfc_err_t ndef_decode(buffer_t *pBuffer);
+    static nfc_err_t s_ndef_encode(ndef_msg_t *pTag, ac_buffer_builder_t *pBufferBldr, void *pUserData);
+    static nfc_err_t s_ndef_decode(ndef_msg_t *pTag, ac_buffer_t *pBuffer, void *pUserData);
+    nfc_err_t ndef_encode(ac_buffer_builder_t *pBufferBldr);
+    nfc_err_t ndef_decode(ac_buffer_t *pBuffer);
 
 
     Delegate *_delegate;

features/nfc/nfc/NFCRemoteEndpoint.h

@@ -37,7 +37,13 @@ class NFCController;
  */
 class NFCRemoteEndpoint {
 public:
-    NFCRemoteEndpoint();
+    /**
+     * Create a NFCRemoteEndpointinstance
+     * @param[in] controller the NFCController instance that detected this endpoint
+     */
+    NFCRemoteEndpoint(NFCController *controller);
+
+    virtual ~NFCRemoteEndpoint();
 
     /**
      * The NFCRemoteEndpoint base delegate.
@@ -46,12 +52,15 @@ class NFCRemoteEndpoint {
         /**
          * This method is called when the endpoint is connected
          */
-        virtual void on_connected() {};
+        virtual void on_connected() {}
 
         /**
          * This method is called when the endpoint is lost (air interface link disconnnected)
          */
-        virtual void on_disconnected() {};
+        virtual void on_disconnected() {}
+
+    protected:
+        ~Delegate() {}
     };
 
     /**

features/nfc/nfc/NFCRemoteInitiator.h

@@ -42,17 +42,19 @@ class NFCRemoteInitiator : public NFCRemoteEndpoint, public NFCNDEFCapable {
 public:
     /**
      * Create a NFCRemoteInitiator.
+     * @param[in] controller the NFCController instance that detected this endpoint
      * @param[in] buffer a bytes array used to store NDEF messages
      * @param[in] buffer_size the array size in bytes
      */
-    NFCRemoteInitiator(uint8_t *buffer, size_t buffer_size);
+    NFCRemoteInitiator(NFCController *controller, uint8_t *buffer, size_t buffer_size);
     virtual ~NFCRemoteInitiator();
 
     /**
      * The NFCRemoteInitiator delegate. Users of the NFCRemoteInitiator class need to implement this delegate's methods to receive events.
      */
-    struct Delegate : NFCEndpoint::Delegate, NFCNDEFCapable::Delegate {
-
+    struct Delegate : NFCRemoteEndpoint::Delegate, NFCNDEFCapable::Delegate {
+    protected:
+        ~Delegate() {}
     };
 
     /**

features/nfc/nfc/NFCTarget.h

@@ -45,6 +45,10 @@ class NFCTarget : public NFCNDEFCapable {
      * @param[in] buffer_size the array size in bytes
      */
     NFCTarget(uint8_t *buffer, size_t buffer_size);
+
+    /**
+     * NFCTarget destructor
+     */
     virtual ~NFCTarget();
 
     struct Delegate {
@@ -68,6 +72,9 @@ class NFCTarget : public NFCNDEFCapable {
          * @param[in] result NFC_OK or an error code on failure
          */
         virtual void on_ndef_message_read(nfc_err_t result) {}
+
+    protected:
+        ~Delegate() {}
     };
 
     /**

features/nfc/nfc/Type4RemoteInitiator.h

@@ -48,11 +48,16 @@ class Type4RemoteInitiator : public NFCRemoteInitiator {
      */
     Type4RemoteInitiator(NFCController *controller, uint8_t *buffer, size_t buffer_size);
 
+    /**
+     * Type4RemoteInitiator destructor.
+     */
+    virtual ~Type4RemoteInitiator();
+
     // NFCRemoteEndpoint implementation
     virtual nfc_err_t connect();
     virtual nfc_err_t disconnect();
-    virtual bool is_connected();
-    virtual bool is_disconnected();
+    virtual bool is_connected() const;
+    virtual bool is_disconnected() const;
     virtual nfc_rf_protocols_bitmask_t rf_protocols();
 
     // NFCRemoteInitiator implementation

features/nfc/source/controllers/PN512Driver.cpp

@@ -15,6 +15,10 @@
  */
 
 #include "PN512Driver.h"
+#include "nfc/stack/platform/nfc_debug.h"
+
+using namespace mbed;
+using namespace mbed::nfc;
 
 PN512Driver::PN512Driver(PN512TransportDriver *transport_driver) : NFCControllerDriver(), _transport_driver(transport_driver)
 {
@@ -26,14 +30,14 @@ nfc_transceiver_t *PN512Driver::initialize(nfc_scheduler_timer_t *scheduler_time
     // Initialize transport
     _transport_driver->initialize();
 
-    nfc_err_t ret = pn512_init(&pn512, _transport_driver->get_transport(), scheduler_timer);
+    nfc_err_t ret = pn512_init(&_pn512, _transport_driver->get_transport(), scheduler_timer);
     if (ret != NFC_OK) {
         NFC_ERR("PN512 init error (%d)", ret);
         return NULL;
     }
     NFC_DBG("PN512 Initialized");
 
-    return pn512_get_transceiver(&pn512);
+    return pn512_get_transceiver(&_pn512);
 }
 
 void PN512Driver::get_supported_nfc_techs(nfc_tech_t *initiator, nfc_tech_t *target) const

features/nfc/source/controllers/PN512SPITransportDriver.cpp

@@ -22,7 +22,7 @@
 using namespace mbed;
 using namespace mbed::nfc;
 
-PN512SPITransportDriver::PN512SPITransportDriver(PinName mosi, PinName miso, PinName sclk, PinName ssel, PinName irq, PinName rst)) :
+PN512SPITransportDriver::PN512SPITransportDriver(PinName mosi, PinName miso, PinName sclk, PinName ssel, PinName irq, PinName rst) :
     _spi(mosi, miso, sclk),
     _ssel(ssel, 1),
     _irq(irq, PullNone),
@@ -70,7 +70,7 @@ void PN512SPITransportDriver::transport_write(uint8_t address, const uint8_t *ou
     address = (address << 1) | 0x00;
     _ssel = 0;
     _spi.write(address); // First write address byte
-    _spi.write(outBuf, outLen, NULL, 0); // Ignore read bytes
+    _spi.write((const char *) outBuf, outLen, (char *) NULL, 0); // Ignore read bytes
     _ssel = 1;
 }
 
@@ -93,7 +93,7 @@ void PN512SPITransportDriver::transport_read(uint8_t address, uint8_t *inBuf, si
 
     _ssel = 0;
     _spi.write(address); // First write address byte
-    _spi.write(inBuf, inLen, inBuf, inLen);
+    _spi.write((const char *) inBuf, inLen, (char *) inBuf, inLen);
     _ssel = 1;
 }
 

features/nfc/source/controllers/PN512TransportDriver.cpp

@@ -24,6 +24,11 @@ PN512TransportDriver::PN512TransportDriver() : _delegate(NULL)
 
 }
 
+PN512TransportDriver::~PN512TransportDriver()
+{
+
+}
+
 void PN512TransportDriver::set_delegate(Delegate *delegate)
 {
     _delegate = delegate;