Revision 1084:40c1e518d6de, committed 2016-01-11

Comitter:

vcoubard

Date:

Mon Jan 11 08:51:47 2016 +0000

Parent:

1083:ec594a5c119b

Child:

1085:ab823cb9783f

Commit message:

Synchronized with git rev 022c37ce
Author: Rohit Grover
white space diffs

Changed in this revision

--- a/ble/Gap.h	Mon Jan 11 08:51:46 2016 +0000
+++ b/ble/Gap.h	Mon Jan 11 08:51:47 2016 +0000
@@ -1010,7 +1010,7 @@
     virtual ble_error_t reset(void) {
         /* Clear Gap state */
         state.advertising = 0;
-        state.connected = 0;
+        state.connected   = 0;
 
         /* Clear scanning state */
         scanningActive = false;
@@ -1024,7 +1024,7 @@
         connectionCallChain.clear();
         disconnectionCallChain.clear();
         radioNotificationCallback = NULL;
-        onAdvertisementReport = NULL;
+        onAdvertisementReport     = NULL;
 
         return BLE_ERROR_NONE;
     }

--- a/ble/GattServer.h	Mon Jan 11 08:51:46 2016 +0000
+++ b/ble/GattServer.h	Mon Jan 11 08:51:47 2016 +0000
@@ -26,13 +26,12 @@
 
 class GattServer {
 public:
-
     /* Event callback handlers. */
     typedef FunctionPointerWithContext<unsigned> DataSentCallback_t;
     typedef CallChainOfFunctionPointersWithContext<unsigned> DataSentCallbackChain_t;
 
     typedef FunctionPointerWithContext<const GattWriteCallbackParams*> DataWrittenCallback_t;
-    typedef CallChainOfFunctionPointersWithContext<const GattWriteCallbackParams*> DataWrittenCallbackChain_t;    
+    typedef CallChainOfFunctionPointersWithContext<const GattWriteCallbackParams*> DataWrittenCallbackChain_t;
 
     typedef FunctionPointerWithContext<const GattReadCallbackParams*> DataReadCallback_t;
     typedef CallChainOfFunctionPointersWithContext<const GattReadCallbackParams *> DataReadCallbackChain_t;
@@ -254,9 +253,9 @@
     }
 
     /**
-     * @brief get the callback chain called when the event DATA_EVENT is triggered. 
+     * @brief get the callback chain called when the event DATA_EVENT is triggered.
      */
-    DataSentCallbackChain_t& onDataSent() { 
+    DataSentCallbackChain_t& onDataSent() {
         return dataSentCallChain;
     }
 
@@ -274,7 +273,7 @@
      *
      * @Note: It is also possible to set up a callback into a member function of
      * some object.
-     * 
+     *
      * @Note It is possible to unregister a callback using onDataWritten().detach(callback)
      */
     void onDataWritten(const DataWrittenCallback_t& callback) {dataWrittenCallChain.add(callback);}
@@ -286,9 +285,9 @@
     /**
      * @brief provide access to the callchain of data written event callbacks
      * It is possible to register callbacks using onDataWritten().add(callback);
-     * It is possible to unregister callbacks using onDataWritten().detach(callback) 
+     * It is possible to unregister callbacks using onDataWritten().detach(callback)
      * @return The data written event callbacks chain
-     */    
+     */
     DataWrittenCallbackChain_t& onDataWritten() {
         return dataWrittenCallChain;
     }
@@ -335,7 +334,7 @@
     /**
      * @brief provide access to the callchain of data read event callbacks
      * It is possible to register callbacks using onDataRead().add(callback);
-     * It is possible to unregister callbacks using onDataRead().detach(callback) 
+     * It is possible to unregister callbacks using onDataRead().detach(callback)
      * @return The data read event callbacks chain
      */
     DataReadCallbackChain_t& onDataRead() {
@@ -409,14 +408,14 @@
      * @return BLE_ERROR_NONE on success.
      */
     virtual ble_error_t reset(void) {
-        serviceCount = 0;
+        serviceCount        = 0;
         characteristicCount = 0;
 
         dataSentCallChain.clear();
         dataWrittenCallChain.clear();
         dataReadCallChain.clear();
-        updatesEnabledCallback = NULL;
-        updatesDisabledCallback = NULL;
+        updatesEnabledCallback       = NULL;
+        updatesDisabledCallback      = NULL;
         confirmationReceivedCallback = NULL;
 
         return BLE_ERROR_NONE;

--- a/ble/SecurityManager.h	Mon Jan 11 08:51:46 2016 +0000
+++ b/ble/SecurityManager.h	Mon Jan 11 08:51:47 2016 +0000
@@ -246,9 +246,9 @@
     virtual ble_error_t reset(void) {
         securitySetupInitiatedCallback = NULL;
         securitySetupCompletedCallback = NULL;
-        linkSecuredCallback = NULL;
-        securityContextStoredCallback = NULL;
-        passkeyDisplayCallback = NULL;
+        linkSecuredCallback            = NULL;
+        securityContextStoredCallback  = NULL;
+        passkeyDisplayCallback         = NULL;
 
         return BLE_ERROR_NONE;
     }

--- a/ble/ServiceDiscovery.h	Mon Jan 11 08:51:46 2016 +0000
+++ b/ble/ServiceDiscovery.h	Mon Jan 11 08:51:47 2016 +0000
@@ -144,11 +144,11 @@
      * @return BLE_ERROR_NONE on success.
      */
     virtual ble_error_t reset(void) {
-        connHandle = 0;
-        matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN);
-        serviceCallback = NULL;
+        connHandle                 = 0;
+        matchingServiceUUID        = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN);
+        serviceCallback            = NULL;
         matchingCharacteristicUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN);
-        characteristicCallback = NULL;
+        characteristicCallback     = NULL;
 
         return BLE_ERROR_NONE;
     }