You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2021/02/23 06:46:04 UTC

[GitHub] [mynewt-nimble] apache-mynewt-bot commented on pull request #919: controller: optimize code size based on roles

apache-mynewt-bot commented on pull request #919:
URL: https://github.com/apache/mynewt-nimble/pull/919#issuecomment-783951019


   
   <!-- style-bot -->
   
   ## Style check summary
   
   ### Our coding style is [here!](https://github.com/apache/mynewt-core/blob/master/CODING_STANDARDS.md)
   
   
   #### nimble/controller/src/ble_ll.c
   <details>
   
   ```diff
   @@ -577,7 +576,7 @@
         */
    #if NIMBLE_BLE_ADVERTISE || NIMBLE_BLE_SCAN
        if (g_ble_ll_conn_create_sm || ble_ll_scan_enabled() ||
   -                                (!hci_adv_ext && ble_ll_adv_enabled())) {
   +        (!hci_adv_ext && ble_ll_adv_enabled())) {
            return BLE_ERR_CMD_DISALLOWED;
        }
    #endif
   ```
   
   </details>
   
   #### nimble/controller/src/ble_ll_adv.c
   <details>
   
   ```diff
   @@ -5008,7 +5008,7 @@
    #if NIMBLE_BLE_ADVERTISE
        if (advsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
            if ((advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) &&
   -                                    ble_ll_is_rpa(advsm->adva, 1)) {
   +            ble_ll_is_rpa(advsm->adva, 1)) {
                rpa = advsm->adva;
            }
        }
   ```
   
   </details>
   
   #### nimble/controller/src/ble_ll_conn.c
   <details>
   
   ```diff
   @@ -159,68 +158,68 @@
    struct ble_ll_conn_free_list g_ble_ll_conn_free_list;
    
    STATS_SECT_START(ble_ll_conn_stats)
   -    STATS_SECT_ENTRY(cant_set_sched)
   -    STATS_SECT_ENTRY(conn_ev_late)
   -    STATS_SECT_ENTRY(wfr_expirations)
   -    STATS_SECT_ENTRY(handle_not_found)
   -    STATS_SECT_ENTRY(no_conn_sm)
   -    STATS_SECT_ENTRY(no_free_conn_sm)
   -    STATS_SECT_ENTRY(rx_data_pdu_no_conn)
   -    STATS_SECT_ENTRY(rx_data_pdu_bad_aa)
   -    STATS_SECT_ENTRY(slave_rxd_bad_conn_req_params)
   -    STATS_SECT_ENTRY(slave_ce_failures)
   -    STATS_SECT_ENTRY(data_pdu_rx_dup)
   -    STATS_SECT_ENTRY(data_pdu_txg)
   -    STATS_SECT_ENTRY(data_pdu_txf)
   -    STATS_SECT_ENTRY(conn_req_txd)
   -    STATS_SECT_ENTRY(l2cap_enqueued)
   -    STATS_SECT_ENTRY(rx_ctrl_pdus)
   -    STATS_SECT_ENTRY(rx_l2cap_pdus)
   -    STATS_SECT_ENTRY(rx_l2cap_bytes)
   -    STATS_SECT_ENTRY(rx_malformed_ctrl_pdus)
   -    STATS_SECT_ENTRY(rx_bad_llid)
   -    STATS_SECT_ENTRY(tx_ctrl_pdus)
   -    STATS_SECT_ENTRY(tx_ctrl_bytes)
   -    STATS_SECT_ENTRY(tx_l2cap_pdus)
   -    STATS_SECT_ENTRY(tx_l2cap_bytes)
   -    STATS_SECT_ENTRY(tx_empty_pdus)
   -    STATS_SECT_ENTRY(mic_failures)
   -    STATS_SECT_ENTRY(sched_start_in_idle)
   -    STATS_SECT_ENTRY(sched_end_in_idle)
   -    STATS_SECT_ENTRY(conn_event_while_tmo)
   +STATS_SECT_ENTRY(cant_set_sched)
   +STATS_SECT_ENTRY(conn_ev_late)
   +STATS_SECT_ENTRY(wfr_expirations)
   +STATS_SECT_ENTRY(handle_not_found)
   +STATS_SECT_ENTRY(no_conn_sm)
   +STATS_SECT_ENTRY(no_free_conn_sm)
   +STATS_SECT_ENTRY(rx_data_pdu_no_conn)
   +STATS_SECT_ENTRY(rx_data_pdu_bad_aa)
   +STATS_SECT_ENTRY(slave_rxd_bad_conn_req_params)
   +STATS_SECT_ENTRY(slave_ce_failures)
   +STATS_SECT_ENTRY(data_pdu_rx_dup)
   +STATS_SECT_ENTRY(data_pdu_txg)
   +STATS_SECT_ENTRY(data_pdu_txf)
   +STATS_SECT_ENTRY(conn_req_txd)
   +STATS_SECT_ENTRY(l2cap_enqueued)
   +STATS_SECT_ENTRY(rx_ctrl_pdus)
   +STATS_SECT_ENTRY(rx_l2cap_pdus)
   +STATS_SECT_ENTRY(rx_l2cap_bytes)
   +STATS_SECT_ENTRY(rx_malformed_ctrl_pdus)
   +STATS_SECT_ENTRY(rx_bad_llid)
   +STATS_SECT_ENTRY(tx_ctrl_pdus)
   +STATS_SECT_ENTRY(tx_ctrl_bytes)
   +STATS_SECT_ENTRY(tx_l2cap_pdus)
   +STATS_SECT_ENTRY(tx_l2cap_bytes)
   +STATS_SECT_ENTRY(tx_empty_pdus)
   +STATS_SECT_ENTRY(mic_failures)
   +STATS_SECT_ENTRY(sched_start_in_idle)
   +STATS_SECT_ENTRY(sched_end_in_idle)
   +STATS_SECT_ENTRY(conn_event_while_tmo)
    STATS_SECT_END
    STATS_SECT_DECL(ble_ll_conn_stats) ble_ll_conn_stats;
    
    STATS_NAME_START(ble_ll_conn_stats)
   -    STATS_NAME(ble_ll_conn_stats, cant_set_sched)
   -    STATS_NAME(ble_ll_conn_stats, conn_ev_late)
   -    STATS_NAME(ble_ll_conn_stats, wfr_expirations)
   -    STATS_NAME(ble_ll_conn_stats, handle_not_found)
   -    STATS_NAME(ble_ll_conn_stats, no_conn_sm)
   -    STATS_NAME(ble_ll_conn_stats, no_free_conn_sm)
   -    STATS_NAME(ble_ll_conn_stats, rx_data_pdu_no_conn)
   -    STATS_NAME(ble_ll_conn_stats, rx_data_pdu_bad_aa)
   -    STATS_NAME(ble_ll_conn_stats, slave_rxd_bad_conn_req_params)
   -    STATS_NAME(ble_ll_conn_stats, slave_ce_failures)
   -    STATS_NAME(ble_ll_conn_stats, data_pdu_rx_dup)
   -    STATS_NAME(ble_ll_conn_stats, data_pdu_txg)
   -    STATS_NAME(ble_ll_conn_stats, data_pdu_txf)
   -    STATS_NAME(ble_ll_conn_stats, conn_req_txd)
   -    STATS_NAME(ble_ll_conn_stats, l2cap_enqueued)
   -    STATS_NAME(ble_ll_conn_stats, rx_ctrl_pdus)
   -    STATS_NAME(ble_ll_conn_stats, rx_l2cap_pdus)
   -    STATS_NAME(ble_ll_conn_stats, rx_l2cap_bytes)
   -    STATS_NAME(ble_ll_conn_stats, rx_malformed_ctrl_pdus)
   -    STATS_NAME(ble_ll_conn_stats, rx_bad_llid)
   -    STATS_NAME(ble_ll_conn_stats, tx_ctrl_pdus)
   -    STATS_NAME(ble_ll_conn_stats, tx_ctrl_bytes)
   -    STATS_NAME(ble_ll_conn_stats, tx_l2cap_pdus)
   -    STATS_NAME(ble_ll_conn_stats, tx_l2cap_bytes)
   -    STATS_NAME(ble_ll_conn_stats, tx_empty_pdus)
   -    STATS_NAME(ble_ll_conn_stats, mic_failures)
   -    STATS_NAME(ble_ll_conn_stats, sched_start_in_idle)
   -    STATS_NAME(ble_ll_conn_stats, sched_end_in_idle)
   -    STATS_NAME(ble_ll_conn_stats, conn_event_while_tmo)
   +STATS_NAME(ble_ll_conn_stats, cant_set_sched)
   +STATS_NAME(ble_ll_conn_stats, conn_ev_late)
   +STATS_NAME(ble_ll_conn_stats, wfr_expirations)
   +STATS_NAME(ble_ll_conn_stats, handle_not_found)
   +STATS_NAME(ble_ll_conn_stats, no_conn_sm)
   +STATS_NAME(ble_ll_conn_stats, no_free_conn_sm)
   +STATS_NAME(ble_ll_conn_stats, rx_data_pdu_no_conn)
   +STATS_NAME(ble_ll_conn_stats, rx_data_pdu_bad_aa)
   +STATS_NAME(ble_ll_conn_stats, slave_rxd_bad_conn_req_params)
   +STATS_NAME(ble_ll_conn_stats, slave_ce_failures)
   +STATS_NAME(ble_ll_conn_stats, data_pdu_rx_dup)
   +STATS_NAME(ble_ll_conn_stats, data_pdu_txg)
   +STATS_NAME(ble_ll_conn_stats, data_pdu_txf)
   +STATS_NAME(ble_ll_conn_stats, conn_req_txd)
   +STATS_NAME(ble_ll_conn_stats, l2cap_enqueued)
   +STATS_NAME(ble_ll_conn_stats, rx_ctrl_pdus)
   +STATS_NAME(ble_ll_conn_stats, rx_l2cap_pdus)
   +STATS_NAME(ble_ll_conn_stats, rx_l2cap_bytes)
   +STATS_NAME(ble_ll_conn_stats, rx_malformed_ctrl_pdus)
   +STATS_NAME(ble_ll_conn_stats, rx_bad_llid)
   +STATS_NAME(ble_ll_conn_stats, tx_ctrl_pdus)
   +STATS_NAME(ble_ll_conn_stats, tx_ctrl_bytes)
   +STATS_NAME(ble_ll_conn_stats, tx_l2cap_pdus)
   +STATS_NAME(ble_ll_conn_stats, tx_l2cap_bytes)
   +STATS_NAME(ble_ll_conn_stats, tx_empty_pdus)
   +STATS_NAME(ble_ll_conn_stats, mic_failures)
   +STATS_NAME(ble_ll_conn_stats, sched_start_in_idle)
   +STATS_NAME(ble_ll_conn_stats, sched_end_in_idle)
   +STATS_NAME(ble_ll_conn_stats, conn_event_while_tmo)
    STATS_NAME_END(ble_ll_conn_stats)
    
    #if NIMBLE_BLE_CONNECT
   @@ -4369,10 +4368,10 @@
    
    #if NIMBLE_BLE_CONNECT
    #define MAX_TIME_UNCODED(_maxbytes) \
   -        ble_ll_pdu_tx_time_get(_maxbytes + BLE_LL_DATA_MIC_LEN, \
   +    ble_ll_pdu_tx_time_get(_maxbytes + BLE_LL_DATA_MIC_LEN, \
                                   BLE_PHY_MODE_1M);
    #define MAX_TIME_CODED(_maxbytes) \
   -        ble_ll_pdu_tx_time_get(_maxbytes + BLE_LL_DATA_MIC_LEN, \
   +    ble_ll_pdu_tx_time_get(_maxbytes + BLE_LL_DATA_MIC_LEN, \
                                   BLE_PHY_MODE_CODED_125KBPS);
    
    /**
   ```
   
   </details>
   
   #### nimble/controller/src/ble_ll_scan.c
   <details>
   
   ```diff
   @@ -74,8 +74,7 @@
    /* The scanning parameters set by host */
    static struct ble_ll_scan_params g_ble_ll_scan_params[BLE_LL_SCAN_PHY_NUMBER];
    
   -struct ble_ll_ext_adv_hdr
   -{
   +struct ble_ll_ext_adv_hdr {
        uint8_t mode;
        uint8_t hdr_len;
        uint8_t hdr[0];
   @@ -1396,8 +1396,8 @@
        case BLE_LL_STATE_ADV:
        case BLE_LL_STATE_CONNECTION:
        case BLE_LL_STATE_SYNC:
   -         start_scan = false;
   -         break;
   +        start_scan = false;
   +        break;
    #if NIMBLE_BLE_CONNECT
        case BLE_LL_STATE_INITIATING:
            /* Must disable PHY since we will move to a new channel */
   @@ -1976,7 +1976,7 @@
    #if NIMBLE_BLE_SCAN
    static void
    ble_ll_scan_get_addr_data_from_legacy(uint8_t pdu_type, uint8_t *rxbuf,
   -                                     struct ble_ll_scan_addr_data *addrd)
   +                                      struct ble_ll_scan_addr_data *addrd)
    {
        BLE_LL_ASSERT(pdu_type < BLE_ADV_PDU_TYPE_ADV_EXT_IND);
    
   ```
   
   </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:
users@infra.apache.org