apache-mynewt-bot commented on pull request #859: URL: https://github.com/apache/mynewt-nimble/pull/859#issuecomment-695959834
<!-- style-bot --> ## Style check summary ### Our coding style is [here!](https://github.com/apache/mynewt-core/blob/master/CODING_STANDARDS.md) #### nimble/drivers/dialog_cmac/src/ble_phy.c <details> ```diff @@ -42,36 +42,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_CODED_PHY) @@ -103,50 +103,50 @@ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_TX_DATA_SRC_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) | \ (g_ble_phy_data.phy_mode_pre_len << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_SIZE_M1_Pos) + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_SIZE_M1_Pos) #define FIELD_CTRL_REG_TX_ACCESS_ADDR \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EXC_ON_EXP_Pos) | \ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_TX_DATA_SRC_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) | \ (31 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_SIZE_M1_Pos) #define FIELD_CTRL_REG_TX_PAYLOAD \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (PHY_WHITENING << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_MEM_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos); #define FIELD_CTRL_REG_TX_ENC_PAYLOAD \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_CRYPTO_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) #define FIELD_CTRL_REG_TX_MIC \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_CRYPTO_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) #define FIELD_CTRL_REG_TX_CRC \ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (PHY_WHITENING << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_TX_DATA_SRC_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_LAST_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_MSB_FIRST_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) | \ (23 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_SIZE_M1_Pos) #define FIELD_CTRL_REG_RX_ACCESS_ADDR \ @@ -154,7 +154,7 @@ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (0 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_TX_DATA_SRC_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CORR_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) | \ (31 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_SIZE_M1_Pos) @@ -162,28 +162,28 @@ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EXC_ON_EXP_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (PHY_WHITENING << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_MEM_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) #define FIELD_CTRL_REG_RX_CRC \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (PHY_WHITENING << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_LAST_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_MSB_FIRST_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_MEM_Pos) #define FIELD_CTRL_REG_RX_PAYLOAD \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_CRC_Pos) | \ (PHY_WHITENING << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_MEM_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) #define FIELD_CTRL_REG_RX_PAYLOAD_WITH_EXC \ FIELD_CTRL_REG_RX_PAYLOAD | \ @@ -193,7 +193,7 @@ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_WHITENING_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_XL_DMA_CRYPTO_Pos) | \ (g_ble_phy_data.phy_mode_evpsym << \ - CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ + CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_EVPSYMBOL_LUT_Pos) | \ (1 << CMAC_CM_FIELD_PUSH_CTRL_REG_FIELD_VALID_Pos) /* RF power up/down delays */ @@ -216,16 +216,16 @@ /* Measured and pre-calculated offsets for transitions */ static const uint8_t g_ble_phy_frame_offset_txrx[4] = { - ((BLE_LL_IFS) - (PHY_DELAY_TX_RX) + (4)), /* 2M/1M */ - ((BLE_LL_IFS) - (PHY_DELAY_TX_RX) + (5)), /* 1M/1M */ - ((BLE_LL_IFS) - (PHY_DELAY_TX_RX) + (4)), /* 2M/2M */ - ((BLE_LL_IFS) - (PHY_DELAY_TX_RX) + (5)), /* 1M/2M */ + ((BLE_LL_IFS) -(PHY_DELAY_TX_RX) +(4)), /* 2M/1M */ + ((BLE_LL_IFS) -(PHY_DELAY_TX_RX) +(5)), /* 1M/1M */ + ((BLE_LL_IFS) -(PHY_DELAY_TX_RX) +(4)), /* 2M/2M */ + ((BLE_LL_IFS) -(PHY_DELAY_TX_RX) +(5)), /* 1M/2M */ }; static const uint8_t g_ble_phy_frame_offset_rxtx[4] = { - ((BLE_LL_IFS) - (PHY_DELAY_RX_TX) - (5)), /* 2M/1M */ - ((BLE_LL_IFS) - (PHY_DELAY_RX_TX) - (6)), /* 1M/1M */ - ((BLE_LL_IFS) - (PHY_DELAY_RX_TX) - (3)), /* 2M/2M */ - ((BLE_LL_IFS) - (PHY_DELAY_RX_TX) - (5)), /* 1M/2M */ + ((BLE_LL_IFS) -(PHY_DELAY_RX_TX) -(5)), /* 2M/1M */ + ((BLE_LL_IFS) -(PHY_DELAY_RX_TX) -(6)), /* 1M/1M */ + ((BLE_LL_IFS) -(PHY_DELAY_RX_TX) -(3)), /* 2M/2M */ + ((BLE_LL_IFS) -(PHY_DELAY_RX_TX) -(5)), /* 1M/2M */ }; /* packet start offsets (in usecs) */ @@ -287,7 +287,7 @@ /* Channel index to RF channel mapping */ static const uint8_t g_ble_phy_chan_to_rf[BLE_PHY_NUM_CHANS] = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, /* 0-9 */ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, /* 0-9 */ 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, /* 10-19 */ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* 20-29 */ 32, 33, 34, 35, 36, 37, 38, 0, 12, 39, /* 30-39 */ @@ -1110,7 +1110,7 @@ " adds %[src], %[src], r4 \n" " adds %[dst], %[dst], r4 \n" : [dst] "+l" (dst), [src] "+l" (src), - [len] "+l" (copy_len) + [len] "+l" (copy_len) : : "r3", "r4", "memory"); @@ -1573,12 +1573,12 @@ /* XXX: should we check for busy? */ /* XXX: might not be needed, but for now terminate any crypto operations. */ - //CMAC->CM_CRYPTO_CTRL_REG = CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_SW_REQ_ABORT_Msk; + /*CMAC->CM_CRYPTO_CTRL_REG = CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_SW_REQ_ABORT_Msk; */ CMAC->CM_CRYPTO_CTRL_REG = CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_OUT_SEL_Msk | - CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_CTR_MAC_EN_Msk | - CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_CTR_PLD_EN_Msk | - CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_AUTH_EN_Msk; + CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_CTR_MAC_EN_Msk | + CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_CTR_PLD_EN_Msk | + CMAC_CM_CRYPTO_CTRL_REG_CM_CRYPTO_AUTH_EN_Msk; /* Start crypto */ CMAC->CM_EV_SET_REG = CMAC_CM_EV_SET_REG_EV_CRYPTO_START_Msk; ``` </details> #### nimble/transport/dialog_cmac/cmac_driver/diag/src/cmac_diag.c <details> ```diff @@ -48,16 +48,16 @@ void cmac_diag_setup_cmac(void) { - MCU_DIAG_MAP( 0, 4, DSER); - MCU_DIAG_MAP( 1, 6, CMAC_ON_ERROR); - MCU_DIAG_MAP( 2, 2, PHY_TX_EN); - MCU_DIAG_MAP( 3, 2, PHY_RX_EN); - MCU_DIAG_MAP( 4, 2, PHY_TXRX_DATA_COMB); - MCU_DIAG_MAP( 5, 2, PHY_TXRX_DATA_EN_COMB); - MCU_DIAG_MAP( 6, 5, EV1US_FRAME_START); - MCU_DIAG_MAP( 7, 5, EV_BS_START); - MCU_DIAG_MAP( 8, 5, EV1C_BS_STOP); - MCU_DIAG_MAP( 9, 5, EV1US_PHY_TO_IDLE); + MCU_DIAG_MAP(0, 4, DSER); + MCU_DIAG_MAP(1, 6, CMAC_ON_ERROR); + MCU_DIAG_MAP(2, 2, PHY_TX_EN); + MCU_DIAG_MAP(3, 2, PHY_RX_EN); + MCU_DIAG_MAP(4, 2, PHY_TXRX_DATA_COMB); + MCU_DIAG_MAP(5, 2, PHY_TXRX_DATA_EN_COMB); + MCU_DIAG_MAP(6, 5, EV1US_FRAME_START); + MCU_DIAG_MAP(7, 5, EV_BS_START); + MCU_DIAG_MAP(8, 5, EV1C_BS_STOP); + MCU_DIAG_MAP(9, 5, EV1US_PHY_TO_IDLE); MCU_DIAG_MAP(10, 9, CALLBACK_IRQ); MCU_DIAG_MAP(11, 9, FIELD_IRQ); MCU_DIAG_MAP(12, 9, FRAME_IRQ); ``` </details> #### nimble/transport/dialog_cmac/cmac_driver/src/cmac_host.c <details> ```diff @@ -102,7 +102,9 @@ /* Spin if debugger is connected to CMAC to avoid resetting it */ if (cd->CM_STAT_REG & 0x20) { - for (;;); + for (;;) { + ; + } } #endif /* XXX CMAC is in error state, need to recover */ ``` </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]
