Skip to content

Commit 947ec7b

Browse files
committed
Remove cordio vendor namespace for adapting to mbed-os-6.4.0
1 parent dd0db8c commit 947ec7b

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

src/utility/HCICordioTransport.cpp

+16-20
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,31 @@
4747

4848
#include "HCICordioTransport.h"
4949

50-
extern ble::vendor::cordio::CordioHCIDriver& ble_cordio_get_hci_driver();
50+
extern ble::CordioHCIDriver& ble_cordio_get_hci_driver();
5151

5252
namespace ble {
53-
namespace vendor {
54-
namespace cordio {
55-
struct CordioHCIHook {
56-
static CordioHCIDriver& getDriver() {
57-
return ble_cordio_get_hci_driver();
58-
}
59-
60-
static CordioHCITransportDriver& getTransportDriver() {
61-
return getDriver()._transport_driver;
62-
}
63-
64-
static void setDataReceivedHandler(void (*handler)(uint8_t*, uint8_t)) {
65-
getTransportDriver().set_data_received_handler(handler);
66-
}
67-
};
53+
struct CordioHCIHook {
54+
static CordioHCIDriver& getDriver() {
55+
return ble_cordio_get_hci_driver();
6856
}
69-
}
57+
58+
static CordioHCITransportDriver& getTransportDriver() {
59+
return getDriver()._transport_driver;
60+
}
61+
62+
static void setDataReceivedHandler(void (*handler)(uint8_t*, uint8_t)) {
63+
getTransportDriver().set_data_received_handler(handler);
64+
}
65+
};
7066
}
7167

72-
using ble::vendor::cordio::CordioHCIHook;
68+
using ble::CordioHCIHook;
7369

7470
#if CORDIO_ZERO_COPY_HCI
7571
extern uint8_t *SystemHeapStart;
7672
extern uint32_t SystemHeapSize;
7773

78-
void init_wsf(ble::vendor::cordio::buf_pool_desc_t& buf_pool_desc) {
74+
void init_wsf(ble::buf_pool_desc_t& buf_pool_desc) {
7975
static bool init = false;
8076

8177
if (init) {
@@ -195,7 +191,7 @@ int HCICordioTransportClass::begin()
195191
_rxBuf.clear();
196192

197193
#if CORDIO_ZERO_COPY_HCI
198-
ble::vendor::cordio::buf_pool_desc_t bufPoolDesc = CordioHCIHook::getDriver().get_buffer_pool_description();
194+
ble::buf_pool_desc_t bufPoolDesc = CordioHCIHook::getDriver().get_buffer_pool_description();
199195
init_wsf(bufPoolDesc);
200196
#endif
201197

0 commit comments

Comments
 (0)