apache-mynewt-bot commented on pull request #841: URL: https://github.com/apache/mynewt-nimble/pull/841#issuecomment-654910917
<!-- style-bot --> ## Style check summary ### Our coding style is [here!](https://github.com/apache/mynewt-core/blob/master/CODING_STANDARDS.md) #### nimble/drivers/nrf5340/src/ble_phy.c <details> ```diff @@ -66,13 +66,18 @@ #define DPPI_SUBSCRIBE_TIMER0_TASKS_START ((DPPI_CH_RTC0_EVENTS_COMPARE_0 << TIMER_SUBSCRIBE_START_CHIDX_Pos) | \ (TIMER_SUBSCRIBE_START_EN_Enabled << TIMER_SUBSCRIBE_START_EN_Pos)) #define DPPI_SUBSCRIBE_TIMER0_TASKS_CAPTURE1 ((DPPI_CH_RADIO_EVENTS_ADDRESS << TIMER_SUBSCRIBE_CAPTURE_CHIDX_Pos) | \ - (TIMER_SUBSCRIBE_CAPTURE_EN_Enabled << TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) + (TIMER_SUBSCRIBE_CAPTURE_EN_Enabled << \ + TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) #define DPPI_SUBSCRIBE_TIMER0_TASKS_CAPTURE2 ((DPPI_CH_RADIO_EVENTS_END << TIMER_SUBSCRIBE_CAPTURE_CHIDX_Pos) | \ - (TIMER_SUBSCRIBE_CAPTURE_EN_Enabled << TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) + (TIMER_SUBSCRIBE_CAPTURE_EN_Enabled << \ + TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) #define DPPI_SUBSCRIBE_TIMER0_TASKS_CAPTURE3 ((DPPI_CH_RADIO_EVENTS_ADDRESS << TIMER_SUBSCRIBE_CAPTURE_CHIDX_Pos) | \ - (TIMER_SUBSCRIBE_CAPTURE_EN_Enabled << TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) -#define DPPI_SUBSCRIBE_RADIO_TASKS_DISABLE ((DPPI_CH_TIMER0_EVENTS_COMPARE_3 << RADIO_SUBSCRIBE_DISABLE_CHIDX_Pos) | \ - (RADIO_SUBSCRIBE_DISABLE_EN_Enabled << RADIO_SUBSCRIBE_DISABLE_EN_Pos)) + (TIMER_SUBSCRIBE_CAPTURE_EN_Enabled << \ + TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) +#define DPPI_SUBSCRIBE_RADIO_TASKS_DISABLE ((DPPI_CH_TIMER0_EVENTS_COMPARE_3 << \ + RADIO_SUBSCRIBE_DISABLE_CHIDX_Pos) | \ + (RADIO_SUBSCRIBE_DISABLE_EN_Enabled << \ + RADIO_SUBSCRIBE_DISABLE_EN_Pos)) #define DPPI_SUBSCRIBE_RADIO_TASKS_RXEN ((DPPI_CH_TIMER0_EVENTS_COMPARE_0 << RADIO_SUBSCRIBE_RXEN_CHIDX_Pos) | \ (RADIO_SUBSCRIBE_RXEN_EN_Enabled << RADIO_SUBSCRIBE_RXEN_EN_Pos)) #define DPPI_SUBSCRIBE_RADIO_TASKS_TXEN ((DPPI_CH_TIMER0_EVENTS_COMPARE_0 << RADIO_SUBSCRIBE_TXEN_CHIDX_Pos) | \ @@ -85,13 +90,18 @@ #define DPPI_UNSUBSCRIBE_TIMER0_TASKS_START ((DPPI_CH_RTC0_EVENTS_COMPARE_0 << TIMER_SUBSCRIBE_START_CHIDX_Pos) | \ (TIMER_SUBSCRIBE_START_EN_Disabled << TIMER_SUBSCRIBE_START_EN_Pos)) #define DPPI_UNSUBSCRIBE_TIMER0_TASKS_CAPTURE1 ((DPPI_CH_RADIO_EVENTS_ADDRESS << TIMER_SUBSCRIBE_CAPTURE_CHIDX_Pos) | \ - (TIMER_SUBSCRIBE_CAPTURE_EN_Disabled << TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) + (TIMER_SUBSCRIBE_CAPTURE_EN_Disabled << \ + TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) #define DPPI_UNSUBSCRIBE_TIMER0_TASKS_CAPTURE2 ((DPPI_CH_RADIO_EVENTS_END << TIMER_SUBSCRIBE_CAPTURE_CHIDX_Pos) | \ - (TIMER_SUBSCRIBE_CAPTURE_EN_Disabled << TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) + (TIMER_SUBSCRIBE_CAPTURE_EN_Disabled << \ + TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) #define DPPI_UNSUBSCRIBE_TIMER0_TASKS_CAPTURE3 ((DPPI_CH_RADIO_EVENTS_ADDRESS << TIMER_SUBSCRIBE_CAPTURE_CHIDX_Pos) | \ - (TIMER_SUBSCRIBE_CAPTURE_EN_Disabled << TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) -#define DPPI_UNSUBSCRIBE_RADIO_TASKS_DISABLE ((DPPI_CH_TIMER0_EVENTS_COMPARE_3 << RADIO_SUBSCRIBE_DISABLE_CHIDX_Pos) | \ - (RADIO_SUBSCRIBE_DISABLE_EN_Disabled << RADIO_SUBSCRIBE_DISABLE_EN_Pos)) + (TIMER_SUBSCRIBE_CAPTURE_EN_Disabled << \ + TIMER_SUBSCRIBE_CAPTURE_EN_Pos)) +#define DPPI_UNSUBSCRIBE_RADIO_TASKS_DISABLE ((DPPI_CH_TIMER0_EVENTS_COMPARE_3 << \ + RADIO_SUBSCRIBE_DISABLE_CHIDX_Pos) | \ + (RADIO_SUBSCRIBE_DISABLE_EN_Disabled << \ + RADIO_SUBSCRIBE_DISABLE_EN_Pos)) #define DPPI_UNSUBSCRIBE_RADIO_TASKS_RXEN ((DPPI_CH_TIMER0_EVENTS_COMPARE_0 << RADIO_SUBSCRIBE_RXEN_CHIDX_Pos) | \ (RADIO_SUBSCRIBE_RXEN_EN_Disabled << RADIO_SUBSCRIBE_RXEN_EN_Pos)) #define DPPI_UNSUBSCRIBE_RADIO_TASKS_TXEN ((DPPI_CH_TIMER0_EVENTS_COMPARE_0 << RADIO_SUBSCRIBE_TXEN_CHIDX_Pos) | \ @@ -123,23 +133,22 @@ /* NRF_RADIO_NS->PCNF0 configuration values */ #define NRF_PCNF0 (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) | \ - (RADIO_PCNF0_S1INCL_Msk) | \ - (NRF_S0LEN << RADIO_PCNF0_S0LEN_Pos) | \ - (NRF_S1LEN_BITS << RADIO_PCNF0_S1LEN_Pos) + (RADIO_PCNF0_S1INCL_Msk) | \ + (NRF_S0LEN << RADIO_PCNF0_S0LEN_Pos) | \ + (NRF_S1LEN_BITS << RADIO_PCNF0_S1LEN_Pos) #define NRF_PCNF0_1M (NRF_PCNF0) | \ - (RADIO_PCNF0_PLEN_8bit << RADIO_PCNF0_PLEN_Pos) + (RADIO_PCNF0_PLEN_8bit << RADIO_PCNF0_PLEN_Pos) #define NRF_PCNF0_2M (NRF_PCNF0) | \ - (RADIO_PCNF0_PLEN_16bit << RADIO_PCNF0_PLEN_Pos) + (RADIO_PCNF0_PLEN_16bit << RADIO_PCNF0_PLEN_Pos) #define NRF_PCNF0_CODED (NRF_PCNF0) | \ - (RADIO_PCNF0_PLEN_LongRange << RADIO_PCNF0_PLEN_Pos) | \ - (NRF_CILEN_BITS << RADIO_PCNF0_CILEN_Pos) | \ - (NRF_TERMLEN_BITS << RADIO_PCNF0_TERMLEN_Pos) + (RADIO_PCNF0_PLEN_LongRange << RADIO_PCNF0_PLEN_Pos) | \ + (NRF_CILEN_BITS << RADIO_PCNF0_CILEN_Pos) | \ + (NRF_TERMLEN_BITS << RADIO_PCNF0_TERMLEN_Pos) /* BLE PHY data structure */ -struct ble_phy_obj -{ +struct ble_phy_obj { uint8_t phy_stats_initialized; - int8_t phy_txpwr_dbm; + int8_t phy_txpwr_dbm; uint8_t phy_chan; uint8_t phy_state; uint8_t phy_transition; @@ -152,7 +161,7 @@ uint8_t phy_tx_phy_mode; uint8_t phy_rx_phy_mode; uint8_t phy_bcc_offset; - int8_t rx_pwr_compensation; + int8_t rx_pwr_compensation; uint32_t phy_aar_scratch; uint32_t phy_access_address; struct ble_mbuf_hdr rxhdr; @@ -174,7 +183,7 @@ /* RF center frequency for each channel index (offset from 2400 MHz) */ static const uint8_t g_ble_phy_chan_freq[BLE_PHY_NUM_CHANS] = { - 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, /* 0-9 */ + 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, /* 0-9 */ 24, 28, 30, 32, 34, 36, 38, 40, 42, 44, /* 10-19 */ 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, /* 20-29 */ 66, 68, 70, 72, 74, 76, 78, 2, 26, 80, /* 30-39 */ @@ -226,36 +235,36 @@ /* Statistics */ STATS_SECT_START(ble_phy_stats) - STATS_SECT_ENTRY(phy_isrs) - STATS_SECT_ENTRY(tx_good) - STATS_SECT_ENTRY(tx_fail) - STATS_SECT_ENTRY(tx_late) - STATS_SECT_ENTRY(tx_bytes) - STATS_SECT_ENTRY(rx_starts) - STATS_SECT_ENTRY(rx_aborts) - STATS_SECT_ENTRY(rx_valid) - STATS_SECT_ENTRY(rx_crc_err) - STATS_SECT_ENTRY(rx_late) - STATS_SECT_ENTRY(radio_state_errs) - STATS_SECT_ENTRY(rx_hw_err) - STATS_SECT_ENTRY(tx_hw_err) +STATS_SECT_ENTRY(phy_isrs) +STATS_SECT_ENTRY(tx_good) +STATS_SECT_ENTRY(tx_fail) +STATS_SECT_ENTRY(tx_late) +STATS_SECT_ENTRY(tx_bytes) +STATS_SECT_ENTRY(rx_starts) +STATS_SECT_ENTRY(rx_aborts) +STATS_SECT_ENTRY(rx_valid) +STATS_SECT_ENTRY(rx_crc_err) +STATS_SECT_ENTRY(rx_late) +STATS_SECT_ENTRY(radio_state_errs) +STATS_SECT_ENTRY(rx_hw_err) +STATS_SECT_ENTRY(tx_hw_err) STATS_SECT_END STATS_SECT_DECL(ble_phy_stats) ble_phy_stats; STATS_NAME_START(ble_phy_stats) - STATS_NAME(ble_phy_stats, phy_isrs) - STATS_NAME(ble_phy_stats, tx_good) - STATS_NAME(ble_phy_stats, tx_fail) - STATS_NAME(ble_phy_stats, tx_late) - STATS_NAME(ble_phy_stats, tx_bytes) - STATS_NAME(ble_phy_stats, rx_starts) - STATS_NAME(ble_phy_stats, rx_aborts) - STATS_NAME(ble_phy_stats, rx_valid) - STATS_NAME(ble_phy_stats, rx_crc_err) - STATS_NAME(ble_phy_stats, rx_late) - STATS_NAME(ble_phy_stats, radio_state_errs) - STATS_NAME(ble_phy_stats, rx_hw_err) - STATS_NAME(ble_phy_stats, tx_hw_err) +STATS_NAME(ble_phy_stats, phy_isrs) +STATS_NAME(ble_phy_stats, tx_good) +STATS_NAME(ble_phy_stats, tx_fail) +STATS_NAME(ble_phy_stats, tx_late) +STATS_NAME(ble_phy_stats, tx_bytes) +STATS_NAME(ble_phy_stats, rx_starts) +STATS_NAME(ble_phy_stats, rx_aborts) +STATS_NAME(ble_phy_stats, rx_valid) +STATS_NAME(ble_phy_stats, rx_crc_err) +STATS_NAME(ble_phy_stats, rx_late) +STATS_NAME(ble_phy_stats, radio_state_errs) +STATS_NAME(ble_phy_stats, rx_hw_err) +STATS_NAME(ble_phy_stats, tx_hw_err) STATS_NAME_END(ble_phy_stats) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) @@ -273,8 +282,7 @@ static uint32_t nrf_encrypt_scratchpad[NRF_ENC_SCRATCH_WORDS]; -struct nrf_ccm_data -{ +struct nrf_ccm_data { uint8_t key[16]; uint64_t pkt_counter; uint8_t dir_bit; @@ -342,16 +350,16 @@ { #if (BLE_LL_BT5_PHY_SUPPORTED == 1) switch (g_ble_phy_data.phy_cur_phy_mode) { - case BLE_PHY_MODE_1M: - return BLE_PHY_1M; - case BLE_PHY_MODE_2M: - return BLE_PHY_2M; - case BLE_PHY_MODE_CODED_125KBPS: - case BLE_PHY_MODE_CODED_500KBPS: - return BLE_PHY_CODED; - default: - assert(0); - return -1; + case BLE_PHY_MODE_1M: + return BLE_PHY_1M; + case BLE_PHY_MODE_2M: + return BLE_PHY_2M; + case BLE_PHY_MODE_CODED_125KBPS: + case BLE_PHY_MODE_CODED_500KBPS: + return BLE_PHY_CODED; + default: + assert(0); + return -1; } #else return BLE_PHY_1M; @@ -418,10 +426,10 @@ " adds %[src], %[src], r4 \n" " adds %[dst], %[dst], r4 \n" : [dst] "+r" (dst), [src] "+r" (src), - [len] "+r" (copy_len) + [len] "+r" (copy_len) : : "r3", "r4", "memory" - ); + ); if ((rem_len < 4) && (block_rem_len >= rem_len)) { break; @@ -443,7 +451,7 @@ : [len] "+r" (rem_len) : [dst] "r" (dst), [src] "r" (src) : "r3", "memory" - ); + ); /* Copy header */ memcpy(BLE_MBUF_HDR_PTR(rxpdu), &g_ble_phy_data.rxhdr, @@ -734,7 +742,7 @@ NRF_CCM_NS->OUTPTR = (uint32_t)dptr; NRF_CCM_NS->SCRATCHPTR = (uint32_t)&nrf_encrypt_scratchpad[0]; NRF_CCM_NS->MODE = CCM_MODE_LENGTH_Msk | CCM_MODE_MODE_Decryption | - ble_phy_get_ccm_datarate(); + ble_phy_get_ccm_datarate(); NRF_CCM_NS->CNFPTR = (uint32_t)&nrf_ccm_data; NRF_CCM_NS->SHORTS = 0; NRF_CCM_NS->EVENTS_ERROR = 0; @@ -779,7 +787,7 @@ * to take this into account when setting up BCC. */ if (g_ble_phy_data.phy_cur_phy_mode == BLE_PHY_MODE_CODED_125KBPS || - g_ble_phy_data.phy_cur_phy_mode == BLE_PHY_MODE_CODED_500KBPS) { + g_ble_phy_data.phy_cur_phy_mode == BLE_PHY_MODE_CODED_500KBPS) { g_ble_phy_data.phy_bcc_offset = 5; } else { g_ble_phy_data.phy_bcc_offset = 0; @@ -796,10 +804,10 @@ NRF_RADIO_NS->EVENTS_RSSIEND = 0; NRF_RADIO_NS->EVENTS_CRCOK = 0; NRF_RADIO_NS->SHORTS = RADIO_SHORTS_END_DISABLE_Msk | - RADIO_SHORTS_READY_START_Msk | - RADIO_SHORTS_ADDRESS_BCSTART_Msk | - RADIO_SHORTS_ADDRESS_RSSISTART_Msk | - RADIO_SHORTS_DISABLED_RSSISTOP_Msk; + RADIO_SHORTS_READY_START_Msk | + RADIO_SHORTS_ADDRESS_BCSTART_Msk | + RADIO_SHORTS_ADDRESS_RSSISTART_Msk | + RADIO_SHORTS_DISABLED_RSSISTOP_Msk; NRF_RADIO_NS->INTENSET = RADIO_INTENSET_ADDRESS_Msk; } @@ -907,10 +915,10 @@ * using CI field. */ if ((phy == BLE_PHY_MODE_CODED_125KBPS) || - (phy == BLE_PHY_MODE_CODED_500KBPS)) { + (phy == BLE_PHY_MODE_CODED_500KBPS)) { phy = NRF_RADIO_NS->PDUSTAT & RADIO_PDUSTAT_CISTAT_Msk ? - BLE_PHY_MODE_CODED_500KBPS : - BLE_PHY_MODE_CODED_125KBPS; + BLE_PHY_MODE_CODED_500KBPS : + BLE_PHY_MODE_CODED_125KBPS; } #endif @@ -1144,7 +1152,7 @@ NRF_RADIO_NS->EVENTS_BCMATCH = 0; NRF_AAR_NS->SUBSCRIBE_START = DPPI_SUBSCRIBE_AAR_TASKS_START; NRF_RADIO_NS->BCC = (BLE_LL_PDU_HDR_LEN + adva_offset + BLE_DEV_ADDR_LEN) * 8 + - g_ble_phy_data.phy_bcc_offset; + g_ble_phy_data.phy_bcc_offset; } #endif @@ -1271,16 +1279,16 @@ /* XXX: should maxlen be 251 for encryption? */ NRF_RADIO_NS->PCNF1 = NRF_MAXLEN | - (RADIO_PCNF1_ENDIAN_Little << RADIO_PCNF1_ENDIAN_Pos) | - (NRF_BALEN << RADIO_PCNF1_BALEN_Pos) | - RADIO_PCNF1_WHITEEN_Msk; + (RADIO_PCNF1_ENDIAN_Little << RADIO_PCNF1_ENDIAN_Pos) | + (NRF_BALEN << RADIO_PCNF1_BALEN_Pos) | + RADIO_PCNF1_WHITEEN_Msk; /* Enable radio fast ramp-up */ NRF_RADIO_NS->MODECNF0 |= (RADIO_MODECNF0_RU_Fast << RADIO_MODECNF0_RU_Pos) & RADIO_MODECNF0_RU_Msk; /* Set logical address 1 for TX and RX */ - NRF_RADIO_NS->TXADDRESS = 0; - NRF_RADIO_NS->RXADDRESSES = (1 << 0); + NRF_RADIO_NS->TXADDRESS = 0; + NRF_RADIO_NS->RXADDRESSES = (1 << 0); /* Configure the CRC registers */ NRF_RADIO_NS->CRCCNF = (RADIO_CRCCNF_SKIPADDR_Skip << RADIO_CRCCNF_SKIPADDR_Pos) | RADIO_CRCCNF_LEN_Three; @@ -1350,7 +1358,7 @@ "ble_phy"); assert(rc == 0); - g_ble_phy_data.phy_stats_initialized = 1; + g_ble_phy_data.phy_stats_initialized = 1; } return 0; @@ -1376,7 +1384,7 @@ */ nrf_wait_disabled(); if ((NRF_RADIO_NS->STATE != RADIO_STATE_STATE_Disabled) && - ((NRF_RADIO_NS->STATE & 0x07) != RADIO_STATE_STATE_RxIdle)) { + ((NRF_RADIO_NS->STATE & 0x07) != RADIO_STATE_STATE_RxIdle)) { ble_phy_disable(); STATS_INC(ble_phy_stats, radio_state_errs); return BLE_PHY_ERR_RADIO_STATE; @@ -1692,7 +1700,8 @@ * * @return int Rounded power in dBm */ -int ble_phy_txpower_round(int dbm) +int +ble_phy_txpower_round(int dbm) { /* "Rail" power level if outside supported range */ @@ -1896,7 +1905,8 @@ } /* Gets the current access address */ -uint32_t ble_phy_access_addr_get(void) +uint32_t +ble_phy_access_addr_get(void) { return g_ble_phy_data.phy_access_address; } @@ -1965,7 +1975,8 @@ #endif #if MYNEWT_VAL(BLE_LL_DTM) -void ble_phy_enable_dtm(void) +void +ble_phy_enable_dtm(void) { /* When DTM is enabled we need to disable whitening as per * Bluetooth v5.0 Vol 6. Part F. 4.1.1 @@ -1973,7 +1984,8 @@ NRF_RADIO_NS->PCNF1 &= ~RADIO_PCNF1_WHITEEN_Msk; } -void ble_phy_disable_dtm(void) +void +ble_phy_disable_dtm(void) { /* Enable whitening */ NRF_RADIO_NS->PCNF1 |= RADIO_PCNF1_WHITEEN_Msk; ``` </details> #### nimble/drivers/nrf5340/src/ble_phy_trace.c <details> ```diff @@ -38,7 +38,7 @@ ble_phy_trace_init(void) { ble_phy_trace_off = - os_trace_module_register(&g_ble_phy_trace_mod, "ble_phy", 3, + os_trace_module_register(&g_ble_phy_trace_mod, "ble_phy", 3, ble_phy_trace_module_send_desc); } #endif ``` </details> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
