From 0ef762ff8bb7cf188c835982042b4f0d68e21dc0 Mon Sep 17 00:00:00 2001
From: Paolo Calao <paolo.calao@gmail.com>
Date: Wed, 7 Oct 2020 12:34:38 +0200
Subject: [PATCH] Change singleton definition.

This change is needed for mocking BLE classes in the CI environment
---
 src/local/BLELocalDevice.cpp   | 3 ++-
 src/local/BLELocalDevice.h     | 2 +-
 src/utility/ATT.cpp            | 3 ++-
 src/utility/ATT.h              | 2 +-
 src/utility/GAP.cpp            | 3 ++-
 src/utility/GAP.h              | 2 +-
 src/utility/GATT.cpp           | 3 ++-
 src/utility/GATT.h             | 2 +-
 src/utility/HCI.cpp            | 3 ++-
 src/utility/HCI.h              | 2 +-
 src/utility/L2CAPSignaling.cpp | 3 ++-
 src/utility/L2CAPSignaling.h   | 2 +-
 12 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 57477e23..ae6708b1 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -311,4 +311,5 @@ void BLELocalDevice::noDebug()
   HCI.noDebug();
 }
 
-BLELocalDevice BLE;
+BLELocalDevice BLEObj;
+BLELocalDevice& BLE = BLEObj;
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 20837c14..75f950d5 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -78,6 +78,6 @@ class BLELocalDevice {
 private:
 };
 
-extern BLELocalDevice BLE;
+extern BLELocalDevice& BLE;
 
 #endif
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 296caeee..e6443b59 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -1687,4 +1687,5 @@ void ATTClass::writeCmd(uint16_t connectionHandle, uint16_t handle, const uint8_
   sendReq(connectionHandle, &writeReq, 3 + dataLen, NULL);
 }
 
-ATTClass ATT;
+ATTClass ATTObj;
+ATTClass& ATT = ATTObj;
diff --git a/src/utility/ATT.h b/src/utility/ATT.h
index 6a1611aa..b5df05d3 100644
--- a/src/utility/ATT.h
+++ b/src/utility/ATT.h
@@ -137,6 +137,6 @@ class ATTClass {
   BLEDeviceEventHandler _eventHandlers[2];
 };
 
-extern ATTClass ATT;
+extern ATTClass& ATT;
 
 #endif
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
index 83059899..943fa1bd 100644
--- a/src/utility/GAP.cpp
+++ b/src/utility/GAP.cpp
@@ -348,4 +348,5 @@ bool GAPClass::matchesScanFilter(const BLEDevice& device)
   return true;
 }
 
-GAPClass GAP;
+GAPClass GAPObj;
+GAPClass& GAP = GAPObj;
diff --git a/src/utility/GAP.h b/src/utility/GAP.h
index c2a99daa..5ef81bfd 100644
--- a/src/utility/GAP.h
+++ b/src/utility/GAP.h
@@ -87,6 +87,6 @@ class GAPClass {
   String _scanAddressFilter;
 };
 
-extern GAPClass GAP;
+extern GAPClass& GAP;
 
 #endif
diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 0c7ab4dd..21df18fd 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -172,4 +172,5 @@ void GATTClass::clearAttributes()
   _attributes.clear();
 }
 
-GATTClass GATT;
+GATTClass GATTObj;
+GATTClass& GATT = GATTObj;
diff --git a/src/utility/GATT.h b/src/utility/GATT.h
index 249d5728..e2195a8f 100644
--- a/src/utility/GATT.h
+++ b/src/utility/GATT.h
@@ -67,6 +67,6 @@ class GATTClass {
   BLELocalCharacteristic*       _servicesChangedCharacteristic;
 };
 
-extern GATTClass GATT;
+extern GATTClass& GATT;
 
 #endif
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 0234803f..6f602ea1 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -686,4 +686,5 @@ void HCIClass::dumpPkt(const char* prefix, uint8_t plen, uint8_t pdata[])
   }
 }
 
-HCIClass HCI;
+HCIClass HCIObj;
+HCIClass& HCI = HCIObj;
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index 86ec679c..37e4d803 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -96,6 +96,6 @@ class HCIClass {
   uint8_t _aclPktBuffer[255];
 };
 
-extern HCIClass HCI;
+extern HCIClass& HCI;
 
 #endif
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index f650cab2..4135099c 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -146,4 +146,5 @@ void L2CAPSignalingClass::connectionParameterUpdateResponse(uint16_t /*handle*/,
 {
 }
 
-L2CAPSignalingClass L2CAPSignaling;
+L2CAPSignalingClass L2CAPSignalingObj;
+L2CAPSignalingClass& L2CAPSignaling = L2CAPSignalingObj;
diff --git a/src/utility/L2CAPSignaling.h b/src/utility/L2CAPSignaling.h
index 349ffb85..20c174e9 100644
--- a/src/utility/L2CAPSignaling.h
+++ b/src/utility/L2CAPSignaling.h
@@ -49,6 +49,6 @@ class L2CAPSignalingClass {
   uint16_t _maxInterval;
 };
 
-extern L2CAPSignalingClass L2CAPSignaling;
+extern L2CAPSignalingClass& L2CAPSignaling;
 
 #endif