Revert "[zephyr] Added several improvements to the BLEMgr implementation (project-chip#33189)"

This reverts commit 2211869.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

src/platform/Zephyr/BLEAdvertisingArbiter.cpp

@@ -29,9 +29,6 @@ namespace {
 // List of advertising requests ordered by priority
 sys_slist_t sRequests;
 
-bool sIsInitialized = false;
-uint8_t sBtId       = 0;
-
 // Cast an intrusive list node to the containing request object
 const BLEAdvertisingArbiter::Request & ToRequest(const sys_snode_t * node)
 {
@@ -58,9 +55,8 @@ CHIP_ERROR RestartAdvertising()
     ReturnErrorOnFailure(System::MapErrorZephyr(bt_le_adv_stop()));
     ReturnErrorCodeIf(sys_slist_is_empty(&sRequests), CHIP_NO_ERROR);
 
-    const Request & top    = ToRequest(sys_slist_peek_head(&sRequests));
-    bt_le_adv_param params = BT_LE_ADV_PARAM_INIT(top.options, top.minInterval, top.maxInterval, nullptr);
-    params.id              = sBtId;
+    const Request & top          = ToRequest(sys_slist_peek_head(&sRequests));
+    const bt_le_adv_param params = BT_LE_ADV_PARAM_INIT(top.options, top.minInterval, top.maxInterval, nullptr);
     const int result = bt_le_adv_start(&params, top.advertisingData.data(), top.advertisingData.size(), top.scanResponseData.data(),
                                        top.scanResponseData.size());
 
@@ -74,26 +70,8 @@ CHIP_ERROR RestartAdvertising()
 
 } // namespace
 
-CHIP_ERROR Init(uint8_t btId)
-{
-    if (sIsInitialized)
-    {
-        return CHIP_ERROR_INCORRECT_STATE;
-    }
-
-    sBtId          = btId;
-    sIsInitialized = true;
-
-    return CHIP_NO_ERROR;
-}
-
 CHIP_ERROR InsertRequest(Request & request)
 {
-    if (!sIsInitialized)
-    {
-        return CHIP_ERROR_INCORRECT_STATE;
-    }
-
     CancelRequest(request);
 
     sys_snode_t * prev = nullptr;
@@ -131,11 +109,6 @@ CHIP_ERROR InsertRequest(Request & request)
 
 void CancelRequest(Request & request)
 {
-    if (!sIsInitialized)
-    {
-        return;
-    }
-
     const bool isTopPriority = (sys_slist_peek_head(&sRequests) == &request);
     VerifyOrReturn(sys_slist_find_and_remove(&sRequests, &request));
 

src/platform/Zephyr/BLEAdvertisingArbiter.h

@@ -61,18 +61,6 @@ struct Request : public sys_snode_t
     OnAdvertisingStopped onStopped;       ///< (Optional) Callback invoked when the request stops being top-priority.
 };
 
-/**
- * @brief Initialize BLE advertising arbiter
- *
- * @note This method must be called before trying to insert or cancel any requests.
- *
- * @param btId   Local Bluetooth LE identifier to be used for the advertising parameters. Currently Bluetooth LE identifier used in
- * this method will be used for all advertising requests and changing it dynamically is not supported.
- * @return error    If the module is already initialized.
- * @return success  Otherwise.
- */
-CHIP_ERROR Init(uint8_t btId);
-
 /**
  * @brief Request BLE advertising
  *
@@ -86,9 +74,6 @@ CHIP_ERROR Init(uint8_t btId);
  * @note This method does not take ownership of the request object so the object
  *       must not get destroyed before it is cancelled.
  *
- * @note The arbiter module has to be initialized using Init() method before
- *       invoking this method.
- *
  * @param request   Reference to advertising request that contains priority and
  *                  other advertising parameters.
  * @return error    If the request is top-priority and failed to restart the
@@ -109,9 +94,6 @@ CHIP_ERROR InsertRequest(Request & request);
  * An attempt to cancel a request that has not been registered at the
  * advertising arbiter is a no-op. That is, it returns immediately.
  *
- * @note The arbiter module has to be initialized using Init() method before
- *       invoking this method.
- *
  * @param request   Reference to advertising request that contains priority and
  *                  other advertising parameters.
  */