6 files changed, 70 insertions(+), 19 deletions(-)

M module-bluetooth/Bluetooth/interface/profiles/A2DP/A2DP.cpp
M module-bluetooth/Bluetooth/interface/profiles/HSP/HSP.cpp
A module-bluetooth/Bluetooth/interface/profiles/Profile.cpp
M module-bluetooth/Bluetooth/interface/profiles/Profile.hpp
M module-bluetooth/Bluetooth/interface/profiles/ProfileManager.cpp
M module-bluetooth/CMakeLists.txt

@@ 122,7 122,7 @@ namespace bluetooth
         // request role change on reconnecting headset to always use them in slave mode
         hci_set_master_slave_policy(0);
 
-        l2cap_init();
+        Profile::initL2cap();
         // Initialize  A2DP Source.
         a2dp_source_init();
         a2dp_source_register_packet_handler(&sourcePacketHandler);


@@ 143,14 143,18 @@ namespace bluetooth
         avdtp_source_register_delay_reporting_category(AVRCP::mediaTracker.local_seid);
 
         AVRCP::init(const_cast<sys::Service *>(ownerService));
-        // Initialize SDP,
-        sdp_init();
+
+        // Initialize SDP
+        Profile::initSdp();
 
         // Create  A2DP Source service record and register it with SDP.
         sdpSourceServiceBuffer.fill(0);
+        constexpr uint32_t a2dpSdpRecordHandle = 0x10001;
         a2dp_source_create_sdp_record(
-            sdpSourceServiceBuffer.data(), 0x10001, AVDTP_SOURCE_FEATURE_MASK_PLAYER, nullptr, nullptr);
-        sdp_register_service(sdpSourceServiceBuffer.data());
+            sdpSourceServiceBuffer.data(), a2dpSdpRecordHandle, AVDTP_SOURCE_FEATURE_MASK_PLAYER, nullptr, nullptr);
+        if (const auto status = sdp_register_service(sdpSourceServiceBuffer.data()); status != ERROR_CODE_SUCCESS) {
+            LOG_ERROR("Can't register service. Status %x", status);
+        }
 
         // Create AVRCP target service record and register it with SDP.
         AVRCP::sdpTargetServiceBuffer.fill(0);


@@ 158,16 162,27 @@ namespace bluetooth
 #ifdef AVRCP_BROWSING_ENABLED
         supported_features |= AVRCP_FEATURE_MASK_BROWSING;
 #endif
+        constexpr uint32_t avrcpServiceSdpRecordHandle = 0x10002;
         avrcp_target_create_sdp_record(
-            AVRCP::sdpTargetServiceBuffer.data(), 0x10002, supportedFeatures, nullptr, nullptr);
-        sdp_register_service(AVRCP::sdpTargetServiceBuffer.data());
+            AVRCP::sdpTargetServiceBuffer.data(), avrcpServiceSdpRecordHandle, supportedFeatures, nullptr, nullptr);
+        if (const auto status = sdp_register_service(AVRCP::sdpTargetServiceBuffer.data());
+            status != ERROR_CODE_SUCCESS) {
+            LOG_ERROR("Can't register service. Status %x", status);
+        }
 
         // setup AVRCP Controller
         AVRCP::sdpControllerServiceBuffer.fill(0);
-        uint16_t controllerSupportedFeatures = AVRCP_FEATURE_MASK_CATEGORY_PLAYER_OR_RECORDER;
-        avrcp_controller_create_sdp_record(
-            AVRCP::sdpControllerServiceBuffer.data(), 0x10003, controllerSupportedFeatures, nullptr, nullptr);
-        sdp_register_service(AVRCP::sdpControllerServiceBuffer.data());
+        uint16_t controllerSupportedFeatures              = AVRCP_FEATURE_MASK_CATEGORY_PLAYER_OR_RECORDER;
+        constexpr uint32_t avrcpControllerSdpRecordHandle = 0x10003;
+        avrcp_controller_create_sdp_record(AVRCP::sdpControllerServiceBuffer.data(),
+                                           avrcpControllerSdpRecordHandle,
+                                           controllerSupportedFeatures,
+                                           nullptr,
+                                           nullptr);
+        if (const auto status = sdp_register_service(AVRCP::sdpControllerServiceBuffer.data());
+            status != ERROR_CODE_SUCCESS) {
+            LOG_ERROR("Can't register service. Status %x", status);
+        }
 
         // Set local name with a template Bluetooth address, that will be automatically
         // replaced with a actual address once it is available, i.e. when BTstack boots


@@ 487,9 502,6 @@ namespace bluetooth
         case A2DP_SUBEVENT_STREAMING_CAN_SEND_MEDIA_PACKET_NOW:
             local_seid = a2dp_subevent_streaming_can_send_media_packet_now_get_local_seid(packet);
             cid        = a2dp_subevent_signaling_media_codec_sbc_configuration_get_a2dp_cid(packet);
-            // LOG_INFO("A2DP Source: can send media packet: a2dp_cid [expected 0x%02x, received 0x%02x], local_seid
-            // [expected %d, received %d]\n", AVRCP::mediaTracker.a2dp_cid, cid, AVRCP::mediaTracker.local_seid,
-            // local_seid);
             sendMediaPacket();
             break;
 

@@ 191,12 191,16 @@ namespace bluetooth
         sco->setOwnerService(ownerService);
         sco->init();
 
-        l2cap_init();
-        sdp_init();
+        Profile::initL2cap();
+        Profile::initSdp();
 
         serviceBuffer.fill(0);
-        hsp_ag_create_sdp_record(serviceBuffer.data(), 0x10001, rfcommChannelNr, agServiceName.c_str());
-        sdp_register_service(serviceBuffer.data());
+        constexpr uint32_t hspSdpRecordHandle = 0x10004;
+        hsp_ag_create_sdp_record(serviceBuffer.data(), hspSdpRecordHandle, rfcommChannelNr, agServiceName.c_str());
+
+        if (const auto status = sdp_register_service(serviceBuffer.data()); status != ERROR_CODE_SUCCESS) {
+            LOG_ERROR("Can't register service. Status %x", status);
+        }
 
         rfcomm_init();
 

@@ 0,0 1,26 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "Profile.hpp"
+
+namespace bluetooth
+{
+    bool Profile::isL2CapInitialized = false;
+    bool Profile::isSdpInitialized   = false;
+
+    void Profile::initSdp()
+    {
+        if (!isSdpInitialized) {
+            sdp_init();
+            isSdpInitialized = true;
+        }
+    }
+
+    void Profile::initL2cap()
+    {
+        if (!isL2CapInitialized) {
+            l2cap_init();
+            isL2CapInitialized = true;
+        }
+    }
+} // namespace bluetooth

@@ 24,6 24,14 @@ namespace bluetooth
         virtual void stop()                                                                       = 0;
         virtual void disconnect()                                                                 = 0;
         virtual void setAudioDevice(std::shared_ptr<bluetooth::BluetoothAudioDevice> audioDevice) = 0;
+
+      protected:
+        static void initSdp();
+        static void initL2cap();
+
+      private:
+        static bool isL2CapInitialized;
+        static bool isSdpInitialized;
     };
 
 } // namespace bluetooth

@@ 15,7 15,7 @@ namespace bluetooth
     {
         if (!initialized) {
             profilesList = {{AudioProfile::A2DP, std::make_shared<bluetooth::A2DP>()},
-                            {AudioProfile::HSP, nullptr},
+                            {AudioProfile::HSP, std::make_shared<bluetooth::HSP>()},
                             {AudioProfile::HFP, nullptr},
                             {AudioProfile::None, nullptr}};
 

@@ 21,6 21,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/Bluetooth/interface/profiles/A2DP/AVDTP.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Bluetooth/interface/profiles/HSP/HSP.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Bluetooth/interface/profiles/HSP/SCO.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/Bluetooth/interface/profiles/Profile.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/Bluetooth/interface/profiles/ProfileManager.cpp
 
         )