BLE: Cleanup BLEInstanceBas implementation

Author: pan-

connectivity/FEATURE_BLE/source/BLEInstanceBase.h

@@ -49,10 +49,6 @@ namespace ble {
  *
  * @see BLE
  */
-#if !defined(DOXYGEN_ONLY)
-namespace interface {
-#endif // !defined(DOXYGEN_ONLY)
-
 class BLEInstanceBase {
 public:
     /**
@@ -116,7 +112,7 @@ class BLEInstanceBase {
      *
      * @see BLE::init() BLE::hasInitialized()
      */
-    virtual bool hasInitialized(void) const = 0;
+    virtual bool hasInitialized() const = 0;
 
     /**
      * Shutdown the vendor BLE subsystem.
@@ -139,7 +135,7 @@ class BLEInstanceBase {
      * @see BLE::shutdown() BLE::init() BLE::hasInitialized() Gap::reset()
      * GattClient::reset() GattServer::reset() SecurityManager::reset() .
      */
-    virtual ble_error_t shutdown(void) = 0;
+    virtual ble_error_t shutdown() = 0;
 
     /**
      * Fetches a NULL terminated string representation of the underlying BLE
@@ -150,7 +146,7 @@ class BLEInstanceBase {
      *
      * @see BLE::getVersion()
      */
-    virtual const char *getVersion(void) = 0;
+    virtual const char *getVersion() = 0;
 
     /**
      * Accessor to the vendor implementation of the Gap interface.
@@ -160,7 +156,7 @@ class BLEInstanceBase {
      *
      * @see BLE::gap() Gap
      */
-    virtual ble::Gap &getGap(void) = 0;
+    virtual ble::Gap &getGap() = 0;
 
     /**
      * Const alternative to getGap().
@@ -170,7 +166,7 @@ class BLEInstanceBase {
      *
      * @see BLE::gap() Gap
      */
-    virtual const ble::Gap &getGap(void) const = 0;
+    virtual const ble::Gap &getGap() const = 0;
 
 
 #if BLE_FEATURE_GATT_SERVER
@@ -183,7 +179,7 @@ class BLEInstanceBase {
      *
      * @see BLE::gattServer() GattServer
      */
-    virtual ble::GattServer &getGattServer(void) = 0;
+    virtual ble::GattServer &getGattServer() = 0;
 
     /**
      * A const alternative to getGattServer().
@@ -193,7 +189,7 @@ class BLEInstanceBase {
      *
      * @see BLE::gattServer() GattServer
      */
-    virtual const ble::GattServer &getGattServer(void) const = 0;
+    virtual const ble::GattServer &getGattServer() const = 0;
 
 #endif // BLE_FEATURE_GATT_SERVER
 
@@ -207,7 +203,7 @@ class BLEInstanceBase {
      *
      * @see BLE::gattClient() GattClient
      */
-    virtual ble::GattClient &getGattClient(void) = 0;
+    virtual ble::GattClient &getGattClient() = 0;
 
 #endif
 
@@ -221,7 +217,7 @@ class BLEInstanceBase {
      *
      * @see BLE::securityManager() SecurityManager
      */
-    virtual ble::SecurityManager &getSecurityManager(void) = 0;
+    virtual ble::SecurityManager &getSecurityManager() = 0;
 
     /**
      * A const alternative to getSecurityManager().
@@ -231,16 +227,11 @@ class BLEInstanceBase {
      *
      * @see BLE::securityManager() SecurityManager
      */
-    virtual const ble::SecurityManager &getSecurityManager(void) const = 0;
+    virtual const ble::SecurityManager &getSecurityManager() const = 0;
 
 #endif // BLE_FEATURE_SECURITY
 };
 
-#if !defined(DOXYGEN_ONLY)
-} // namespace interface
-#endif // !defined(DOXYGEN_ONLY)
-} // namespace ble
-
 /**
  * Return the instance of the vendor implementation of BLEInstanceBase.
  *
@@ -250,15 +241,13 @@ class BLEInstanceBase {
  * @attention The vendor library must provide an implementation for this function
  * library. Otherwise, there will be a linker error.
  */
-extern ble::BLEInstanceBase *createBLEInstance(void);
-
-/* This includes the concrete class implementation, to provide a an alternative BLE PAL implementation
- * disable Cordio and place your header in a path with the same structure */
-#include "ble/internal/BLEInstanceBaseImpl.h"
+extern ble::BLEInstanceBase *createBLEInstance();
 
 /**
  * @}
  * @}
  */
 
+} // namespace ble
+
 #endif // ifndef MBED_BLE_DEVICE_INSTANCE_BASE__

connectivity/FEATURE_BLE/source/cordio/include/ble/internal/BLEInstanceBaseImpl.h

@@ -46,15 +46,18 @@ namespace ble {
 
 class PalSigningMonitor;
 
+namespace impl {
+
 /**
  * @see BLEInstanceBase
  */
-class BLEInstanceBase : public interface::BLEInstanceBase {
+class BLEInstanceBase : public ble::BLEInstanceBase {
     friend PalSigningMonitor;
+
     /**
      * Construction with an HCI driver.
      */
-    BLEInstanceBase(CordioHCIDriver& hci_driver);
+    BLEInstanceBase(CordioHCIDriver &hci_driver);
 
     /**
      * Destructor
@@ -67,13 +70,13 @@ class BLEInstanceBase : public interface::BLEInstanceBase {
      * Access to the singleton containing the implementation of BLEInstanceBase
      * for the Cordio stack.
      */
-    static BLEInstanceBase& deviceInstance();
+    static BLEInstanceBase &deviceInstance();
 
     /**
     * @see BLEInstanceBase::init
     */
     virtual ble_error_t init(
-        FunctionPointerWithContext< ::BLE::InitializationCompleteCallbackContext*> initCallback
+        FunctionPointerWithContext<::BLE::InitializationCompleteCallbackContext *> initCallback
     );
 
     /**
@@ -91,34 +94,37 @@ class BLEInstanceBase : public interface::BLEInstanceBase {
      */
     virtual const char *getVersion();
 
-    ble::impl::Gap& getGapImpl();
+    ble::impl::Gap &getGapImpl();
 
     /**
      * @see BLEInstanceBase::getGap
      */
-    virtual ble::Gap& getGap();
+    virtual ble::Gap &getGap();
 
     /**
      * @see BLEInstanceBase::getGap
      */
-    virtual const ble::Gap& getGap() const;
+    virtual const ble::Gap &getGap() const;
 
 #if BLE_FEATURE_GATT_SERVER
-    ble::impl::GattServer& getGattServerImpl();
+
+    ble::impl::GattServer &getGattServerImpl();
 
     /**
      * @see BLEInstanceBase::getGattServer
      */
-    virtual GattServer &getGattServer();
+    virtual ble::GattServer &getGattServer();
 
     /**
      * @see BLEInstanceBase::getGattServer
      */
-    virtual const GattServer &getGattServer() const;
+    virtual const ble::GattServer &getGattServer() const;
+
 #endif // BLE_FEATURE_GATT_SERVER
 
 #if BLE_FEATURE_GATT_CLIENT
-    ble::impl::GattClient& getGattClientImpl();
+
+    ble::impl::GattClient &getGattClientImpl();
 
     /**
      * @see BLEInstanceBase::getGattClient
@@ -131,10 +137,12 @@ class BLEInstanceBase : public interface::BLEInstanceBase {
      * @return PAL Gatt Client.
      */
     PalGattClient &getPalGattClient();
+
 #endif // BLE_FEATURE_GATT_CLIENT
 
 #if BLE_FEATURE_SECURITY
-    ble::impl::SecurityManager& getSecurityManagerImpl();
+
+    ble::impl::SecurityManager &getSecurityManagerImpl();
 
     /**
      * @see BLEInstanceBase::getSecurityManager
@@ -159,17 +167,22 @@ class BLEInstanceBase : public interface::BLEInstanceBase {
     virtual void processEvents();
 
 private:
-    static void stack_handler(wsfEventMask_t event, wsfMsgHdr_t* msg);
-    static void device_manager_cb(dmEvt_t* dm_event);
-    static void connection_handler(dmEvt_t* dm_event);
+    static void stack_handler(wsfEventMask_t event, wsfMsgHdr_t *msg);
+
+    static void device_manager_cb(dmEvt_t *dm_event);
+
+    static void connection_handler(dmEvt_t *dm_event);
+
     static void timeoutCallback();
 
     void stack_setup();
+
     void start_stack_reset();
+
     void callDispatcher();
 
-    static CordioHCIDriver* _hci_driver;
-    static FunctionPointerWithContext< ::BLE::InitializationCompleteCallbackContext*> _init_callback;
+    static CordioHCIDriver *_hci_driver;
+    static FunctionPointerWithContext<::BLE::InitializationCompleteCallbackContext *> _init_callback;
 
     enum {
         NOT_INITIALIZED,
@@ -182,6 +195,7 @@ class BLEInstanceBase : public interface::BLEInstanceBase {
     uint64_t _last_update_us;
 };
 
+} // namespace impl
 } // namespace ble
 
 

connectivity/FEATURE_BLE/source/cordio/include/ble/internal/PalAttClientImpl.h

@@ -20,9 +20,10 @@
 #define IMPL_PAL_ATT_CLIENT_
 
 #include "source/pal/PalSimpleAttServerMessage.h"
-#include "att_api.h"
 #include "source/pal/PalAttClient.h"
 
+#include "att_api.h"
+
 namespace ble {
 namespace impl {