From 9c5f0deccab68e7ea3b4f9750be774d724b6940d Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@codecoup.pl>
Date: Fri, 9 Jun 2017 12:51:25 +0200
Subject: [PATCH] nimble/controller: Rename BLE_MULTI_ADV_SUPPORT

Name it BLE_ANDROID_MULTI_ADV_SUPPORT as it will be used only do enable
Android specific vendor commands.

X-Original-Commit: 01b9ef9da0e00a45fd270bcdd661b7e4cf5b1fa8
---
 nimble/controller/src/ble_ll_adv.c | 20 ++++++++++----------
 nimble/controller/src/ble_ll_hci.c |  2 +-
 nimble/include/nimble/ble.h        |  2 +-
 nimble/syscfg.yml                  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index 0e91e3f8b..51f62de44 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -103,7 +103,7 @@ struct ble_ll_adv_sm
     uint8_t *conn_comp_ev;
     struct os_event adv_txdone_ev;
     struct ble_ll_sched_item adv_sch;
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     uint8_t adv_random_addr[BLE_DEV_ADDR_LEN];
 #endif
 };
@@ -659,7 +659,7 @@ ble_ll_adv_set_adv_params(uint8_t *cmd, uint8_t instance, int is_multi)
     }
 
     /* Deal with multi-advertising command specific*/
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     if (is_multi) {
         /* Get and check advertising power */
         advsm->adv_txpwr = cmd[22];
@@ -741,7 +741,7 @@ ble_ll_adv_sm_stop(struct ble_ll_adv_sm *advsm)
 
         /* Set to standby if we are no longer advertising */
         OS_ENTER_CRITICAL(sr);
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
         if (g_ble_ll_cur_adv_sm == advsm) {
             ble_phy_disable();
             ble_ll_wfr_disable();
@@ -805,7 +805,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
      * is why I chose command disallowed.
      */
     if (advsm->own_addr_type == BLE_HCI_ADV_OWN_ADDR_RANDOM) {
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
         if (!ble_ll_is_valid_random_addr(advsm->adv_random_addr)) {
             return BLE_ERR_CMD_DISALLOWED;
         }
@@ -842,7 +842,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
         addr = g_dev_addr;
         advsm->adv_txadd = 0;
     } else {
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
         addr = advsm->adv_random_addr;
 #else
         addr = g_random_addr;
@@ -1041,7 +1041,7 @@ ble_ll_adv_set_adv_data(uint8_t *cmd, uint8_t instance)
     return BLE_ERR_SUCCESS;
 }
 
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
 int
 ble_ll_adv_set_random_addr(uint8_t *addr, uint8_t instance)
 {
@@ -1330,7 +1330,7 @@ int
 ble_ll_adv_rx_isr_end(uint8_t pdu_type, struct os_mbuf *rxpdu, int crcok)
 {
     int rc;
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     struct ble_mbuf_hdr *rxhdr;
 #endif
 
@@ -1338,7 +1338,7 @@ ble_ll_adv_rx_isr_end(uint8_t pdu_type, struct os_mbuf *rxpdu, int crcok)
     if (rxpdu == NULL) {
         ble_ll_adv_tx_done(g_ble_ll_cur_adv_sm);
     } else {
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
         rxhdr = BLE_MBUF_HDR_PTR(rxpdu);
         rxhdr->rxinfo.advsm = g_ble_ll_cur_adv_sm;
 #endif
@@ -1382,7 +1382,7 @@ ble_ll_adv_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf, struct ble_mbuf_hdr *hdr)
     int adv_event_over;
     struct ble_ll_adv_sm *advsm;
 
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     advsm = (struct ble_ll_adv_sm *)hdr->rxinfo.advsm;
 #else
     advsm = &g_ble_ll_adv_sm[0];
@@ -1667,7 +1667,7 @@ ble_ll_adv_send_conn_comp_ev(struct ble_ll_conn_sm *connsm,
     uint8_t *evbuf;
     struct ble_ll_adv_sm *advsm;
 
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     advsm = (struct ble_ll_adv_sm *)rxhdr->rxinfo.advsm;
     evbuf = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
     if (evbuf) {
diff --git a/nimble/controller/src/ble_ll_hci.c b/nimble/controller/src/ble_ll_hci.c
index 625647496..90f0175c6 100644
--- a/nimble/controller/src/ble_ll_hci.c
+++ b/nimble/controller/src/ble_ll_hci.c
@@ -647,7 +647,7 @@ ble_ll_hci_vendor_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen)
             rc = BLE_ERR_SUCCESS;
         }
         break;
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     case BLE_HCI_OCF_MULTI_ADV:
         if (cmdlen > 0) {
             rc = ble_ll_adv_multi_adv_cmd(cmdbuf, cmdlen, rspbuf, rsplen);
diff --git a/nimble/include/nimble/ble.h b/nimble/include/nimble/ble.h
index 69ac3a384..6db8cd901 100644
--- a/nimble/include/nimble/ble.h
+++ b/nimble/include/nimble/ble.h
@@ -67,7 +67,7 @@ struct ble_mbuf_hdr_rxinfo
     uint8_t handle;
     int8_t  rssi;
     int8_t  phy;
-#if MYNEWT_VAL(BLE_MULTI_ADV_SUPPORT)
+#if MYNEWT_VAL(BLE_ANDROID_MULTI_ADV_SUPPORT)
     void *advsm;   /* advertising state machine */
 #endif
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
diff --git a/nimble/syscfg.yml b/nimble/syscfg.yml
index 7f348b8af..329810701 100644
--- a/nimble/syscfg.yml
+++ b/nimble/syscfg.yml
@@ -41,8 +41,8 @@ syscfg.defs:
             Enables the BLE whitelist for controlling who to connect to or
             accept a connection from. (0/1)
         value: 1
-    BLE_MULTI_ADV_SUPPORT:
-        description: 'Support for multi-advertisers'
+    BLE_ANDROID_MULTI_ADV_SUPPORT:
+        description: 'Support for Android Vendor multi-advertisers HCI commands'
         value: 0
     BLE_MULTI_ADV_INSTANCES:
         description: >