Skip to content

Adapt library to mbed-os 6.4.0 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 30, 2020
Merged

Adapt library to mbed-os 6.4.0 #139

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd0db8c
Move mbed includes after Arduino.h
polldo Nov 10, 2020
947ec7b
Remove cordio vendor namespace for adapting to mbed-os-6.4.0
polldo Nov 10, 2020
70af909
Prepare namespace macro for current mbed version
polldo Nov 10, 2020
63ffef4
squashme: Adapt to both mbed cores
facchinm Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions src/utility/HCICordioTransport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

#if defined(ARDUINO_ARCH_MBED)

#include <driver/CordioHCITransportDriver.h>
#include <driver/CordioHCIDriver.h>

#include <Arduino.h>
#include <mbed.h>

#include <driver/CordioHCITransportDriver.h>
#include <driver/CordioHCIDriver.h>

#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
#include "ble/BLE.h"
#include <events/mbed_events.h>
Expand All @@ -47,35 +47,37 @@

#include "HCICordioTransport.h"

extern ble::vendor::cordio::CordioHCIDriver& ble_cordio_get_hci_driver();
#if (MBED_VERSION > MBED_ENCODE_VERSION(6, 2, 0))
#define BLE_NAMESPACE ble
#else
#define BLE_NAMESPACE ble::vendor::cordio
#endif

extern BLE_NAMESPACE::CordioHCIDriver& ble_cordio_get_hci_driver();

namespace ble {
namespace vendor {
namespace cordio {
struct CordioHCIHook {
static CordioHCIDriver& getDriver() {
return ble_cordio_get_hci_driver();
}
namespace BLE_NAMESPACE {
struct CordioHCIHook {
static CordioHCIDriver& getDriver() {
return ble_cordio_get_hci_driver();
}

static CordioHCITransportDriver& getTransportDriver() {
return getDriver()._transport_driver;
}
static CordioHCITransportDriver& getTransportDriver() {
return getDriver()._transport_driver;
}

static void setDataReceivedHandler(void (*handler)(uint8_t*, uint8_t)) {
getTransportDriver().set_data_received_handler(handler);
}
};
static void setDataReceivedHandler(void (*handler)(uint8_t*, uint8_t)) {
getTransportDriver().set_data_received_handler(handler);
}
}
};
}

using ble::vendor::cordio::CordioHCIHook;
using BLE_NAMESPACE::CordioHCIHook;

#if CORDIO_ZERO_COPY_HCI
extern uint8_t *SystemHeapStart;
extern uint32_t SystemHeapSize;

void init_wsf(ble::vendor::cordio::buf_pool_desc_t& buf_pool_desc) {
void init_wsf(BLE_NAMESPACE::buf_pool_desc_t& buf_pool_desc) {
static bool init = false;

if (init) {
Expand Down Expand Up @@ -195,7 +197,7 @@ int HCICordioTransportClass::begin()
_rxBuf.clear();

#if CORDIO_ZERO_COPY_HCI
ble::vendor::cordio::buf_pool_desc_t bufPoolDesc = CordioHCIHook::getDriver().get_buffer_pool_description();
BLE_NAMESPACE::buf_pool_desc_t bufPoolDesc = CordioHCIHook::getDriver().get_buffer_pool_description();
init_wsf(bufPoolDesc);
#endif

Expand Down