event queue added

Author: paul-szczepanek-arm

NFCEEPROMDriver.h

@@ -1,5 +1,7 @@
 /* FAKE HEADER SINCE IT'S NOT IN MBED OS YET */
+#include "EventQueue.h"
 
+using events::EventQueue;
 /**
  * The abstraction for a NFC EEPROM driver.
  * Implementers need to derive from this class and implement its methods.
@@ -65,18 +67,8 @@ class NFCEEPROMDriver {
          * @param[in] success whether this operation succeeded
          */
         virtual void on_bytes_erased(size_t count) = 0;
-
-        /**
-         * Indicate to user to put handle_events on the event queue.
-         */
-        virtual void on_event() = 0;
     };
 
-    /**
-     * Process pending events (if any).
-     */
-    void handle_events();
-
     /**
      * Set the delegate that will receive events generated by this EEPROM.
      *
@@ -85,6 +77,16 @@ class NFCEEPROMDriver {
     void set_delegate(Delegate* delegate) {
         _delegate = delegate;
     }
+
+    /**
+     * Set the event queue that will be used to schedule event handling
+     *
+     * @param[in] delegate the delegate instance to use
+     */
+    void set_event_queue(EventQueue* queue) {
+        _event_queue = queue;
+    }
+
     /**
      * Reset and initialize the EEPROM.
      * This method should complete synchronously.
@@ -94,7 +96,7 @@ class NFCEEPROMDriver {
     /**
      * Get the maximum memory size addressable by the EEPROM.
      */
-    virtual size_t get_max_size() = 0;
+    virtual size_t read_max_size() = 0;
 
     /**
      * Start a session of operations (reads, writes, erases, size gets/sets).
@@ -155,6 +157,10 @@ class NFCEEPROMDriver {
     Delegate* delegate() {
         return _delegate;
     }
+    EventQueue* event_queue() {
+        return _event_queue;
+    }
 private:
     Delegate* _delegate;
+    EventQueue* _event_queue;
 };

m24sr_driver.h

@@ -46,6 +46,7 @@
 #include <mbed.h>
 #include "I2C.h"
 #include "NFCEEPROMDriver.h"
+#include "EventQueue.h"
 
 #ifdef TARGET_DISCO_L475VG_IOT01A
 
@@ -67,6 +68,8 @@ namespace nfc {
 namespace vendor {
 namespace ST {
 
+using events::EventQueue;
+
 #define OPEN_SESSION_RETRIES  5
 #define CC_FILE_LENGTH        15
 #define NDEF_FILE_HEADER_SIZE 2
@@ -426,7 +429,7 @@ class M24srDriver : public NFCEEPROMDriver {
 
     /** @see NFCEEPROMDriver::get_max_size
      */
-    virtual size_t get_max_size() {
+    virtual size_t read_max_size() {
         return MAX_NDEF_SIZE;
     }
 
@@ -566,12 +569,6 @@ class M24srDriver : public NFCEEPROMDriver {
         write_bytes(address, NULL, size);
     }
 
-    /** @see NFCEEPROMDriver::handle_events
-     */
-    void handle_events() {
-        manage_event();
-    }
-
     /**
      * Change the function to call when a command ends.
      * @param commandCallback Object containing the callback, if NULL it will use empty callback
@@ -597,7 +594,8 @@ class M24srDriver : public NFCEEPROMDriver {
 
 private:
     static void nfc_interrupt_callback() {
-        get_instance()->delegate()->on_event();
+        M24srDriver* driver = get_instance();
+        driver->event_queue()->call(driver, &M24srDriver::manage_event);
     }
 
     /**