Nordic stack and drivers for the mbed BLE API

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Comitter:
rgrover1
Date:
Fri May 08 15:33:56 2015 +0100
Parent:
133:74079098b3c9
Child:
135:fb674d7364bf
Commit message:
Synchronized with git rev 0f6f9072
Author: Rohit Grover
move declaration into btle_security.h

Changed in this revision

btle/btle.h Show annotated file Show diff for this revision Revisions of this file
btle/btle_security.cpp Show annotated file Show diff for this revision Revisions of this file
btle/btle_security.h Show annotated file Show diff for this revision Revisions of this file
nRF51822n.h Show annotated file Show diff for this revision Revisions of this file
--- a/btle/btle.h	Fri May 08 15:33:55 2015 +0100
+++ b/btle/btle.h	Fri May 08 15:33:56 2015 +0100
@@ -27,7 +27,6 @@
 #include "ble.h"
 
 error_t     btle_init(void);
-ble_error_t btle_initializeSecurity(void);
 
 #ifdef __cplusplus
 }
--- a/btle/btle_security.cpp	Fri May 08 15:33:55 2015 +0100
+++ b/btle/btle_security.cpp	Fri May 08 15:33:56 2015 +0100
@@ -18,6 +18,7 @@
 #include "pstorage.h"
 #include "nRF51Gap.h"
 #include "device_manager.h"
+#include "btle_security.h"
 
 static ret_code_t dm_handler(dm_handle_t const *p_handle, dm_event_t const *p_event, ret_code_t event_result);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/btle/btle_security.h	Fri May 08 15:33:56 2015 +0100
@@ -0,0 +1,30 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _BTLE_SECURITY_H_
+#define _BTLE_SECURITY_H_
+
+/**
+ * Enable Nordic's Device Manager, which brings in functionality from the
+ * stack's Security Manager. The Security Manager implements the actual
+ * cryptographic algorithms and protocol exchanges that allow two devices to
+ * securely exchange data and privately detect each other.
+ *
+ * @return BLE_ERROR_NONE on success.
+ */
+ble_error_t btle_initializeSecurity();
+
+#endif /* _BTLE_SECURITY_H_ */
\ No newline at end of file
--- a/nRF51822n.h	Fri May 08 15:33:55 2015 +0100
+++ b/nRF51822n.h	Fri May 08 15:33:56 2015 +0100
@@ -23,6 +23,7 @@
 #include "nRF51Gap.h"
 #include "nRF51GattServer.h"
 #include "btle.h"
+#include "btle_security.h"
 
 class nRF51822n : public BLEDeviceInstanceBase
 {