Diff: nRF51822n.h

Revision:

356:55ede9fd5279

Parent:

355:c3637b4e7aff

Child:

360:7c68c8d67e1f

diff -r c3637b4e7aff -r 55ede9fd5279 nRF51822n.h
--- a/nRF51822n.h	Fri Jun 19 15:55:36 2015 +0100
+++ b/nRF51822n.h	Fri Jun 19 15:55:37 2015 +0100
@@ -23,8 +23,8 @@
 #include "nRF51Gap.h"
 #include "nRF51GattServer.h"
 #include "nRF51GattClient.h"
+#include "nRF51SecurityManager.h"
 #include "btle.h"
-#include "btle_security.h"
 
 class nRF51822n : public BLEInstanceBase
 {
@@ -32,6 +32,8 @@
     nRF51822n(void);
     virtual ~nRF51822n(void);
 
+    virtual ble_error_t init(void);
+    virtual ble_error_t shutdown(void);
     virtual const char *getVersion(void);
 
     virtual Gap &getGap() {
@@ -49,15 +51,11 @@
     virtual GattClient &getGattClient() {
         return nRF51GattClient::getInstance();
     }
-
-    virtual ble_error_t init(void);
-    virtual ble_error_t shutdown(void);
-    virtual ble_error_t reset(void);
-    virtual ble_error_t initializeSecurity(bool                          enableBonding = true,
-                                           bool                          requireMITM   = true,
-                                           Gap::SecurityIOCapabilities_t iocaps        = Gap::IO_CAPS_NONE,
-                                           const Gap::Passkey_t          passkey       = NULL) {
-        return btle_initializeSecurity(enableBonding, requireMITM, iocaps, passkey);
+    virtual const SecurityManager &getSecurityManager() const {
+        return nRF51SecurityManager::getInstance();
+    }
+    virtual SecurityManager &getSecurityManager() {
+        return nRF51SecurityManager::getInstance();
     }
     virtual void        waitForEvent(void);
 };