BLE: Expose HCI driver in public API.

pan- · pan- · commit 0baa92d70c03 · 2020-08-25T11:26:28.000+01:00
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h b/connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h
@@ -20,6 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <BLETypes.h>
+// FIXME: make this invisible!
 #include "wsf_buf.h"
 #include "CordioHCITransportDriver.h"
 #include "ble/common/blecommon.h"
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/CordioHCITransportDriver.h b/connectivity/FEATURE_BLE/include/ble/driver/CordioHCITransportDriver.h
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h b/connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include "mbed.h"
-#include "CordioHCITransportDriver.h"
+#include "driver/CordioHCITransportDriver.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/doc/HCIAbstraction.md b/connectivity/FEATURE_BLE/include/ble/driver/doc/HCIAbstraction.md
@@ -25,7 +25,7 @@ in the future with an implementation of the H5 interface. However, there is no
 plan to provide the SDIO implementation at the moment.
 
 This interface is defined in the header file
-[CordioHCITransportDriver.h](../driver/CordioHCITransportDriver.h)
+[CordioHCITransportDriver.h](../CordioHCITransportDriver.h)
 
 ## CordioHCIDriver
 
@@ -35,10 +35,10 @@ The responsibilities of this driver are:
 * Handle the reset/startup sequence of the Bluetooth controller.
 
 This interface is defined in the header file
-[CordioHCIDriver.h](../driver/CordioHCIDriver.h)
+[CordioHCIDriver.h](../CordioHCIDriver.h)
 
 A partial implementation is present in the file
-[CordioHCIDriver.cpp](../driver/CordioHCIDriver.cpp). It defines the function
+[CordioHCIDriver.cpp](../../../../source/impl/driver/CordioHCIDriver.cpp). It defines the function
 delivering memory to the stack and a complete reset sequence. However, it does
 not define any initialization for the Bluetooth controller, this part being
 specific to the controller used.
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/doc/PortingGuide.md b/connectivity/FEATURE_BLE/include/ble/driver/doc/PortingGuide.md
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/doc/resources/architecture.png b/connectivity/FEATURE_BLE/include/ble/driver/doc/resources/architecture.png
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/doc/resources/architecture_layer.png b/connectivity/FEATURE_BLE/include/ble/driver/doc/resources/architecture_layer.png
diff --git a/connectivity/FEATURE_BLE/source/impl/README.md b/connectivity/FEATURE_BLE/source/impl/README.md
@@ -29,5 +29,5 @@ Build time configuration may be controlled through options set in:
 
 ## Documentation
 
-* [HCI architecture](doc/HCIAbstraction.md)
-* [Porting guide](doc/PortingGuide.md)
+* [HCI architecture](../../include/ble/driver/doc/HCIAbstraction.md)
+* [Porting guide](../../include/ble/driver/doc/PortingGuide.md)
diff --git a/connectivity/FEATURE_BLE/source/impl/driver/CordioHCIDriver.cpp b/connectivity/FEATURE_BLE/source/impl/driver/CordioHCIDriver.cpp
@@ -19,7 +19,7 @@
 
 #include "ble/BLE.h"
 #include "ble/Gap.h"
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
 #include "hci_core.h"
diff --git a/connectivity/FEATURE_BLE/source/impl/driver/CordioHCITransportDriver.cpp b/connectivity/FEATURE_BLE/source/impl/driver/CordioHCITransportDriver.cpp
@@ -17,8 +17,8 @@
 #include <algorithm>
 #include <limits>
 
-#include "CordioHCITransportDriver.h"
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 
 extern "C" void hciTrSerialRxIncoming(uint8_t *pBuf, uint8_t len);
 
diff --git a/connectivity/FEATURE_BLE/source/impl/driver/H4TransportDriver.cpp b/connectivity/FEATURE_BLE/source/impl/driver/H4TransportDriver.cpp
@@ -16,7 +16,7 @@
 
 #if DEVICE_SERIAL && DEVICE_SERIAL_FC
 
-#include "H4TransportDriver.h"
+#include "ble/driver/H4TransportDriver.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/source/impl/include/ble/internal/BLEInstanceBaseImpl.h b/connectivity/FEATURE_BLE/source/impl/include/ble/internal/BLEInstanceBaseImpl.h
@@ -23,7 +23,7 @@
 #include "ble/common/blecommon.h"
 #include "source/BLEInstanceBase.h"
 
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 #include "ble/GattServer.h"
 #include "source/pal/PalAttClient.h"
 #include "source/pal/PalGattClient.h"
diff --git a/connectivity/FEATURE_BLE/source/impl/source/BLEInstanceBaseImpl.cpp b/connectivity/FEATURE_BLE/source/impl/source/BLEInstanceBaseImpl.cpp
@@ -42,7 +42,7 @@
 #include "source/pal/PalGap.h"
 #include "source/pal/PalSigningMonitor.h"
 #include "source/BLEInstanceBase.h"
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 #include "source/generic/GattServerImpl.h"
 
 using namespace std::chrono;
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp
@@ -27,8 +27,8 @@
 #include "platform/mbed_wait_api.h"
 
 // FEATURE_BLE/targets/TARGET_CORDIO
-#include "CordioHCIDriver.h"
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
 #include "hci_core.h"
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h
@@ -21,7 +21,7 @@
 #if (DEVICE_SERIAL && DEVICE_SERIAL_FC) || defined(DOXYGEN_ONLY)
 
 #include <stdint.h>
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 #include "drivers/DigitalInOut.h"
 #include "cyhal_uart.h"
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <stdio.h>
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
 #include "hci_core.h"
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
@@ -24,7 +24,7 @@
 *******************************************************************************/
 
 #include <stdio.h>
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
 #include "hci_core.h"
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/Psoc6BLE.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/Psoc6BLE.cpp
@@ -19,7 +19,7 @@
 
 #include "hci_api.h"
 #include "bstream.h"
-#include "driver/CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 #include "drivers/IPCPipeTransportDriver.h"
 #include "psoc6_utils.h"
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include "mbed.h"
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 
 
 namespace ble {
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.h
@@ -17,7 +17,7 @@
 #ifndef NRF_CORDIO_HCI_DRIVER_H_
 #define NRF_CORDIO_HCI_DRIVER_H_
 
-#include "CordioHCIDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
 
 namespace ble {
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.cpp
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "NRFCordioHCITransportDriver.h"
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 
 using namespace ble;
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.h
@@ -17,7 +17,7 @@
 #ifndef NRF_CORDIO_HCI_TRANSPORT_DRIVER_H_
 #define NRF_CORDIO_HCI_TRANSPORT_DRIVER_H_
 
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 
 namespace ble {
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 #include "ble/common/blecommon.h"
-#include "CordioHCIDriver.h"
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCIDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 #include "mbed.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
