From 37904f3ef2de1bb1e36f5b325f850509d8fdf253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Rymanowski?= Date: Tue, 27 Jun 2017 10:53:03 +0200 Subject: [PATCH] nimble/controller: Fix native and nrf51 header on RX With this patch we make sure phy and aux_data are set correctly in data receive header for all the supported phy X-Original-Commit: ab1ce17187828b547b9043e416913e3e14b6b7b3 --- nimble/drivers/native/src/ble_phy.c | 4 ++++ nimble/drivers/nrf51/src/ble_phy.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/nimble/drivers/native/src/ble_phy.c b/nimble/drivers/native/src/ble_phy.c index 81f2efeb9..b9a9fd21e 100644 --- a/nimble/drivers/native/src/ble_phy.c +++ b/nimble/drivers/native/src/ble_phy.c @@ -276,6 +276,10 @@ ble_phy_isr(void) ble_hdr->rxinfo.flags = 0; ble_hdr->rxinfo.rssi = -77; /* XXX: dummy rssi */ ble_hdr->rxinfo.channel = g_ble_phy_data.phy_chan; + ble_hdr->rxinfo.phy = BLE_PHY_1M; +#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) + ble_hdr->rxinfo.aux_data = NULL; +#endif /* Count PHY crc errors and valid packets */ crcok = 1; diff --git a/nimble/drivers/nrf51/src/ble_phy.c b/nimble/drivers/nrf51/src/ble_phy.c index 5fa42d984..3f092a5c0 100644 --- a/nimble/drivers/nrf51/src/ble_phy.c +++ b/nimble/drivers/nrf51/src/ble_phy.c @@ -695,6 +695,10 @@ ble_phy_rx_start_isr(void) ble_hdr->rxinfo.flags = ble_ll_state_get(); ble_hdr->rxinfo.channel = g_ble_phy_data.phy_chan; ble_hdr->rxinfo.handle = 0; + ble_hdr->rxinfo.phy = BLE_PHY_1M; +#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) + ble_hdr->rxinfo.aux_data = NULL; +#endif #if (MYNEWT_VAL(OS_CPUTIME_FREQ) == 32768) /*