shunpei kataoka / nRF51822

Fork of nRF51822 by Shuta Nakamae

Files at this revision

API Documentation at this revision

Comitter:
rgrover1
Date:
Fri Jun 19 15:55:25 2015 +0100
Parent:
269:9d7eb76bf65d
Child:
271:208d78ccc9b7
Commit message:
Synchronized with git rev 46cf18e8
Author: Rohit Grover
replaced more uses of Gap::address_t with Gap::Address_t

Changed in this revision

nRF51Gap.cpp Show annotated file Show diff for this revision Revisions of this file
nRF51Gap.h Show annotated file Show diff for this revision Revisions of this file
--- a/nRF51Gap.cpp	Fri Jun 19 15:55:25 2015 +0100
+++ b/nRF51Gap.cpp	Fri Jun 19 15:55:25 2015 +0100
@@ -369,7 +369,7 @@
     @endcode
 */
 /**************************************************************************/
-ble_error_t nRF51Gap::setAddress(AddressType_t type, const address_t address)
+ble_error_t nRF51Gap::setAddress(AddressType_t type, const Address_t address)
 {
     if (type > ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE) {
         return BLE_ERROR_PARAM_OUT_OF_RANGE;
@@ -384,7 +384,7 @@
     return BLE_ERROR_NONE;
 }
 
-ble_error_t nRF51Gap::getAddress(AddressType_t *typeP, address_t address)
+ble_error_t nRF51Gap::getAddress(AddressType_t *typeP, Address_t address)
 {
     ble_gap_addr_t dev_addr;
     if (sd_ble_gap_address_get(&dev_addr) != NRF_SUCCESS) {
--- a/nRF51Gap.h	Fri Jun 19 15:55:25 2015 +0100
+++ b/nRF51Gap.h	Fri Jun 19 15:55:25 2015 +0100
@@ -41,8 +41,8 @@
     static nRF51Gap &getInstance();
 
     /* Functions that must be implemented from Gap */
-    virtual ble_error_t setAddress(AddressType_t  type,  const address_t address);
-    virtual ble_error_t getAddress(AddressType_t *typeP, address_t address);
+    virtual ble_error_t setAddress(AddressType_t  type,  const Address_t address);
+    virtual ble_error_t getAddress(AddressType_t *typeP, Address_t address);
     virtual ble_error_t setAdvertisingData(const GapAdvertisingData &, const GapAdvertisingData &);
 
     virtual uint16_t    getMinAdvertisingInterval(void) const {return ADVERTISEMENT_DURATION_UNITS_TO_MS(BLE_GAP_ADV_INTERVAL_MIN);}