[GitHub] andrzej-kaczmarek closed pull request #759: nimble/ll: Fix DTM build without 2M/Coded PHY enabled

[GitBox <gi...@apache.org>]

andrzej-kaczmarek closed pull request #759: nimble/ll: Fix DTM build without 2M/Coded PHY enabled
URL: https://github.com/apache/mynewt-core/pull/759
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/net/nimble/controller/src/ble_ll_dtm.c b/net/nimble/controller/src/ble_ll_dtm.c
index f893f7680..aa1d2433d 100644
--- a/net/nimble/controller/src/ble_ll_dtm.c
+++ b/net/nimble/controller/src/ble_ll_dtm.c
@@ -26,6 +26,7 @@
 #include "controller/ble_ll.h"
 #include "controller/ble_phy.h"
 #include "controller/ble_ll_sched.h"
+#include "controller/ble_ll_xcvr.h"
 #include "ble_ll_dtm_priv.h"
 
 struct dtm_ctx {
@@ -184,7 +185,9 @@ ble_ll_dtm_tx_sched_cb(struct ble_ll_sched_item *sch)
         return BLE_LL_SCHED_STATE_DONE;
     }
 
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY))
     ble_phy_mode_set(ctx->phy_mode, ctx->phy_mode);
+#endif
     ble_phy_set_txend_cb(ble_ll_dtm_tx_done, ctx);
     ble_phy_txpwr_set(0);
 
@@ -302,7 +305,9 @@ ble_ll_dtm_rx_start(void)
                          BLE_DTM_CRC);
     assert(rc == 0);
 
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY))
     ble_phy_mode_set(g_ble_ll_dtm_ctx.phy_mode, g_ble_ll_dtm_ctx.phy_mode);
+#endif
 
     rc = ble_phy_rx_set_start_time(os_cputime_get32() +
                                    g_ble_ll_sched_offset_ticks, 0);
@@ -368,15 +373,19 @@ ble_ll_dtm_tx_test(uint8_t *cmdbuf, bool enhanced)
         case BLE_HCI_LE_PHY_1M:
             phy_mode = BLE_PHY_MODE_1M;
             break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
         case BLE_HCI_LE_PHY_2M:
             phy_mode = BLE_PHY_MODE_2M;
             break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
         case BLE_HCI_LE_PHY_CODED_S8:
             phy_mode = BLE_PHY_MODE_CODED_125KBPS;
             break;
         case BLE_HCI_LE_PHY_CODED_S2:
             phy_mode = BLE_PHY_MODE_CODED_500KBPS;
             break;
+#endif
         default:
             return BLE_ERR_INV_HCI_CMD_PARMS;
         }
@@ -409,12 +418,16 @@ int ble_ll_dtm_rx_test(uint8_t *cmdbuf, bool enhanced)
         case BLE_HCI_LE_PHY_1M:
             phy_mode = BLE_PHY_MODE_1M;
             break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
         case BLE_HCI_LE_PHY_2M:
             phy_mode = BLE_PHY_MODE_2M;
             break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
         case BLE_HCI_LE_PHY_CODED:
             phy_mode = BLE_PHY_MODE_CODED_500KBPS;
             break;
+#endif
         default:
             return BLE_ERR_INV_HCI_CMD_PARMS;
         }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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


With regards,
Apache Git Services