michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Use new nrf COMPATIBLE options

Browse source 
To allow the BLE stack to be used both in the real nRF platforms
and simulated ones, change the used macros in the code to the
COMPATIBLE ones.

Signed-off-by: Alberto Escolar Piedras <alpi@oticon.com>
This commit is contained in:
Alberto Escolar Piedras 2018-10-03 16:37:18 +02:00 • committed by Anas Nashif
commit 5f39dbb1b0
12 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/controller/CMakeLists.txt
View file

@ -44,7 +44,7 @@ zephyr_library_sources_ifdef(
)
zephyr_library_sources_ifdef(
CONFIG_SOC_FAMILY_NRF
CONFIG_SOC_COMPATIBLE_NRF
hal/nrf5/cntr.c
hal/nrf5/ecb.c
hal/nrf5/radio/radio.c

24
subsys/bluetooth/controller/Kconfig
View file

@ -24,8 +24,8 @@ config BT_LL_SW
bool "Software-based BLE Link Layer"
select BT_RECV_IS_RX_THREAD
select ENTROPY_GENERATOR
select ENTROPY_NRF5_RNG if SOC_FAMILY_NRF
select ENTROPY_NRF5_BIAS_CORRECTION if SOC_FAMILY_NRF
select ENTROPY_NRF5_RNG if SOC_COMPATIBLE_NRF
select ENTROPY_NRF5_BIAS_CORRECTION if SOC_COMPATIBLE_NRF
help
Use Zephyr software BLE Link Layer implementation.
@ -138,7 +138,7 @@ config BT_CTLR_TX_PWR_PLUS_4
config BT_CTLR_TX_PWR_PLUS_3
bool "+3 dBm"
depends on SOC_SERIES_NRF52X
depends on SOC_COMPATIBLE_NRF52X
config BT_CTLR_TX_PWR_PLUS_2
bool "+2 dBm"
@ -168,7 +168,7 @@ config BT_CTLR_TX_PWR_MINUS_30
config BT_CTLR_TX_PWR_MINUS_40
bool "-40 dBm"
depends on SOC_SERIES_NRF52X
depends on SOC_COMPATIBLE_NRF52X
endchoice
@ -229,7 +229,7 @@ config BT_CTLR_RL_SIZE
int "LE Controller-based Privacy Resolving List size"
depends on BT_CTLR_PRIVACY
default 8
range 1 8 if SOC_FAMILY_NRF
range 1 8 if SOC_COMPATIBLE_NRF
help
Set the size of the Resolving List for LE Controller-based Privacy.
On nRF5x-based controllers, the hardware imposes a limit of 8 devices.
@ -244,7 +244,7 @@ config BT_CTLR_EXT_SCAN_FP
config BT_CTLR_DATA_LENGTH
bool "Data Length Update"
default y if SOC_SERIES_NRF52X
default y if SOC_COMPATIBLE_NRF52X
help
Enable support for Bluetooth v4.2 LE Data Length Update procedure in
the Controller.
@ -253,14 +253,14 @@ config BT_CTLR_DATA_LENGTH_MAX
int "Maximum data length supported"
depends on BT_CTLR_DATA_LENGTH
default 27
range 27 251 if SOC_SERIES_NRF52X || BT_CTLR_DATA_LENGTH_CLEAR
range 27 251 if SOC_COMPATIBLE_NRF52X || BT_CTLR_DATA_LENGTH_CLEAR
range 27 27
help
Set the maximum data length of PDU supported in the Controller.
config BT_CTLR_PHY
bool "PHY Update"
default y if SOC_SERIES_NRF52X
default y if SOC_COMPATIBLE_NRF52X
help
Enable support for Bluetooth 5.0 PHY Update Procedure in the
Controller.
@ -346,7 +346,7 @@ endif # BT_CTLR_PHY
config BT_CTLR_WORKER_PRIO
int "Radio and Ticker's Worker IRQ priority"
range 0 3 if SOC_SERIES_NRF51X
range 0 6 if SOC_SERIES_NRF52X
range 0 6 if SOC_COMPATIBLE_NRF52X
default 0
help
The interrupt priority for event preparation and radio IRQ. This value
@ -355,7 +355,7 @@ config BT_CTLR_WORKER_PRIO
config BT_CTLR_JOB_PRIO
int "Ticker's JOB IRQ priority"
range BT_CTLR_WORKER_PRIO 3 if SOC_SERIES_NRF51X
range BT_CTLR_WORKER_PRIO 6 if SOC_SERIES_NRF52X
range BT_CTLR_WORKER_PRIO 6 if SOC_COMPATIBLE_NRF52X
default 0
help
The interrupt priority for Ticker's Job (SWI4) IRQ. This value shall
@ -411,7 +411,7 @@ config BT_CTLR_SCHED_ADVANCED
config BT_CTLR_RADIO_ENABLE_FAST
bool "Use tTXEN/RXEN,FAST ramp-up"
depends on SOC_SERIES_NRF52X
depends on SOC_COMPATIBLE_NRF52X
default y
help
Enable use of fast radio ramp-up mode.
@ -425,7 +425,7 @@ config BT_CTLR_TIFS_HW
config BT_CTLR_SW_SWITCH_SINGLE_TIMER
bool "Single TIMER tIFS Trx SW switching"
depends on (!BT_CTLR_TIFS_HW) && SOC_SERIES_NRF52X
depends on (!BT_CTLR_TIFS_HW) && SOC_COMPATIBLE_NRF52X
help
Implement the tIFS Trx SW switch with the same TIMER
instance, as the one used for BLE event timing. Requires

2
subsys/bluetooth/controller/hal/nrf5/ecb.c
View file

@ -35,7 +35,7 @@ static void do_ecb(struct ecb_param *ecb)
while ((NRF_ECB->EVENTS_ENDECB == 0) &&
(NRF_ECB->EVENTS_ERRORECB == 0) &&
(NRF_ECB->ECBDATAPTR != 0)) {
#if defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)
#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
__WFE();
#else
/*__WFE();*/

8
subsys/bluetooth/controller/hal/nrf5/radio/radio.c
View file

@ -23,7 +23,7 @@
#if defined(CONFIG_SOC_SERIES_NRF51X)
#define RADIO_PDU_LEN_MAX (BIT(5) - 1)
#elif defined(CONFIG_SOC_SERIES_NRF52X)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define RADIO_PDU_LEN_MAX (BIT(8) - 1)
#else
#error "Platform not defined."
@ -155,7 +155,7 @@ void radio_pkt_configure(u8_t bits_len, u8_t max_len, u8_t flags)
if (!IS_ENABLED(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR) && dc) {
bits_len = 5;
}
#elif defined(CONFIG_SOC_SERIES_NRF52X)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF52X)
extra = 0;
phy = (flags >> 1) & 0x07; /* phy */
@ -981,7 +981,7 @@ void *radio_ccm_rx_pkt_set(struct ccm *ccm, u8_t phy, void *pkt)
mode = (CCM_MODE_MODE_Decryption << CCM_MODE_MODE_Pos) &
CCM_MODE_MODE_Msk;
#if defined(CONFIG_SOC_SERIES_NRF52X)
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
/* Enable CCM support for 8-bit length field PDUs. */
mode |= (CCM_MODE_LENGTH_Extended << CCM_MODE_LENGTH_Pos) &
CCM_MODE_LENGTH_Msk;
@ -1051,7 +1051,7 @@ void *radio_ccm_tx_pkt_set(struct ccm *ccm, void *pkt)
NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
mode = (CCM_MODE_MODE_Encryption << CCM_MODE_MODE_Pos) &
CCM_MODE_MODE_Msk;
#if defined(CONFIG_SOC_SERIES_NRF52X)
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
/* Enable CCM support for 8-bit length field PDUs. */
mode |= (CCM_MODE_LENGTH_Extended << CCM_MODE_LENGTH_Pos) &
CCM_MODE_LENGTH_Msk;

2
subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf5.h
View file

@ -16,7 +16,7 @@
#define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET 3
#define HAL_EVENT_TIMER_SAMPLE_TASK NRF_TIMER_TASK_CAPTURE3
#if defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)
#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
#include "radio_sim_nrfxx.h"
#elif defined(CONFIG_SOC_SERIES_NRF51X)
#include "radio_nrf51.h"

2
subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf5_ppi.h
View file

@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_SERIES_NRF52X)
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#include "nrf_ppi.h"

2
subsys/bluetooth/controller/hal/radio_txp.h
View file

@ -4,6 +4,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#include "nrf5/radio/radio_nrf5_txp.h"
#endif

2
subsys/bluetooth/controller/hal/ticker.h
View file

@ -7,7 +7,7 @@
#include <stdbool.h>
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#include "hal/nrf5/ticker.h"
#endif /* CONFIG_SOC_FAMILY_NRF */

4
subsys/bluetooth/controller/hci/hci.c
View file

@ -1810,7 +1810,7 @@ static void vs_read_static_addrs(struct net_buf *buf, struct net_buf **evt)
{
struct bt_hci_rp_vs_read_static_addrs *rp;
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
/* Read address from nRF5-specific storage
* Non-initialized FICR values default to 0xFF, skip if no address
* present. Also if a public address lives in FICR, do not use in this
@ -1854,7 +1854,7 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf,
rp = cmd_complete(evt, sizeof(*rp));
rp->status = 0x00;
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
/* Fill in IR if present */
if ((NRF_FICR->IR[0] != UINT32_MAX) &&
(NRF_FICR->IR[1] != UINT32_MAX) &&

4
subsys/bluetooth/controller/hci/hci_internal.h
View file

@ -19,11 +19,11 @@ extern atomic_t hci_state_mask;
#define HCI_CLASS_EVT_CONNECTION 2
#define HCI_CLASS_ACL_DATA 3
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#define BT_HCI_VS_HW_PLAT BT_HCI_VS_HW_PLAT_NORDIC
#if defined(CONFIG_SOC_SERIES_NRF51X)
#define BT_HCI_VS_HW_VAR BT_HCI_VS_HW_VAR_NORDIC_NRF51X;
#elif defined(CONFIG_SOC_SERIES_NRF52X)
#elif defined(CONFIG_SOC_COMPATIBLE_NRF52X)
#define BT_HCI_VS_HW_VAR BT_HCI_VS_HW_VAR_NORDIC_NRF52X;
#endif
#else

4
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -17,10 +17,10 @@
#include "ll.h"
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#include <drivers/clock_control/nrf5_clock_control.h>
#include <drivers/entropy/nrf5_entropy.h>
#endif /* CONFIG_SOC_FAMILY_NRF */
#endif /* CONFIG_SOC_COMPATIBLE_NRF */
#include "hal/cpu.h"
#include "hal/ecb.h"

4
subsys/bluetooth/shell/ticker.c
View file

@ -16,9 +16,9 @@
#include <shell/shell.h>
#if defined(CONFIG_SOC_FAMILY_NRF)
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
#include "../controller/hal/nrf5/ticker.h"
#endif /* CONFIG_SOC_FAMILY_NRF */
#endif /* CONFIG_SOC_COMPATIBLE_NRF */
#include "../controller/util/memq.h"
#include "../controller/util/mayfly.h"