Diff: ble/BLEInstanceBase.h

Revision:

890:f3144091ae19

Parent:

886:0a45c67b2301

Child:

892:9e00f683e927

diff -r 958c04685226 -r f3144091ae19 ble/BLEInstanceBase.h
--- a/ble/BLEInstanceBase.h	Thu Nov 26 12:52:00 2015 +0000
+++ b/ble/BLEInstanceBase.h	Thu Nov 26 12:52:00 2015 +0000
@@ -18,8 +18,6 @@
 #define __BLE_DEVICE_INSTANCE_BASE__
 
 #include "Gap.h"
-#include "ble/SecurityManager.h"
-#include "ble/BLE.h"
 
 /* forward declarations */
 class GattServer;
@@ -32,19 +30,17 @@
 class BLEInstanceBase
 {
 public:
-    virtual ble_error_t            init(BLE::InstanceID_t instanceID,
-                                        FunctionPointerWithContext<BLE::InitializationCompleteCallbackContext *> initCallback) = 0;
-    virtual bool                   hasInitialized(void) const = 0;
-    virtual ble_error_t            shutdown(void)             = 0;
-    virtual const char *           getVersion(void)           = 0;
-    virtual Gap&                   getGap()                   = 0;
-    virtual const Gap&             getGap() const             = 0;
-    virtual GattServer&            getGattServer()            = 0;
-    virtual const GattServer&      getGattServer() const      = 0;
-    virtual GattClient&            getGattClient()            = 0;
-    virtual SecurityManager&       getSecurityManager()       = 0;
+    virtual ble_error_t init(void)                  = 0;
+    virtual ble_error_t shutdown(void)              = 0;
+    virtual const char *getVersion(void)            = 0;
+    virtual Gap&        getGap()                    = 0;
+    virtual const Gap&  getGap() const              = 0;
+    virtual GattServer& getGattServer()             = 0;
+    virtual const GattServer& getGattServer() const = 0;
+    virtual GattClient& getGattClient()             = 0;
+    virtual SecurityManager& getSecurityManager()   = 0;
     virtual const SecurityManager& getSecurityManager() const = 0;
-    virtual void                   waitForEvent(void)         = 0;
+    virtual void        waitForEvent(void)         = 0;
 };
 
 /**