[nrfconnect] enable multiprotocol (#2484)

* [zephyr] add friend declaration of BLEManagerImpl to ThreadStackManager

* [zephyr] remove no longer needed workaround functions

* [nrfconnect] enable multiprotocol

* [workflows] bump container version used for CHIP NRF build

.github/workflows/examples.yaml

@@ -167,7 +167,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.4.2
+            image: connectedhomeip/chip-build-nrf-platform:0.4.3
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
                 - "/tmp/output_binaries:/tmp/output_binaries"

config/nrfconnect/Kconfig

@@ -21,4 +21,11 @@ source "Kconfig.zephyr"
 config CHIP_LIB_SHELL
 	bool "Enable CHIP's shell library"
 	help
-		Link the application with the library containing CHIP shell commands
+	  Link the application with the library containing CHIP shell commands
+
+config MULTIPROTOCOL
+	bool "Enable multiprotocol support"
+	select NRF_802154_MULTIPROTOCOL_SUPPORT
+	depends on BT && NET_L2_OPENTHREAD
+	help
+	  Enable multiprotocol in the nRF 802.15.4 radio driver

examples/lock-app/nrfconnect/prj.conf

@@ -76,15 +76,16 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6
 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=8
 CONFIG_NET_MAX_CONTEXTS=10
 
-# Disable Bluetooth Low Energy temporarily until dynamic multiprotocol is available
-# To enable Bluetooth, set CONFIG_BT=y and uncomment the below configs. You will also
-# have to set CONFIG_NET_L2_OPENTHREAD=n.
-CONFIG_BT=n
-# CONFIG_BT_PERIPHERAL=y
-# CONFIG_BT_DEVICE_APPEARANCE=0
-# CONFIG_BT_DEVICE_NAME_DYNAMIC=y
-# CONFIG_BT_DEVICE_NAME_MAX=15
-# CONFIG_BT_MAX_CONN=2
+# Enable multiprotocol
+CONFIG_MULTIPROTOCOL=y
+
+# Bluetooth Low Energy configs
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_DEVICE_APPEARANCE=0
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_DEVICE_NAME_MAX=15
+CONFIG_BT_MAX_CONN=2
 
 # Use mbedTLS from nrf_security library
 CONFIG_NORDIC_SECURITY_BACKEND=y

examples/shell/nrfconnect/prj.conf

@@ -81,15 +81,16 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=6
 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=8
 CONFIG_NET_MAX_CONTEXTS=10
 
-# Disable Bluetooth Low Energy temporarily until dynamic multiprotocol is available
-# To enable Bluetooth, set CONFIG_BT=y and uncomment the below configs. You will also
-# have to set CONFIG_NET_L2_OPENTHREAD=n.
-CONFIG_BT=n
-# CONFIG_BT_PERIPHERAL=y
-# CONFIG_BT_DEVICE_APPEARANCE=0
-# CONFIG_BT_DEVICE_NAME_DYNAMIC=y
-# CONFIG_BT_DEVICE_NAME_MAX=15
-# CONFIG_BT_MAX_CONN=2
+# Enable multiprotocol
+CONFIG_MULTIPROTOCOL=y
+
+# Bluetooth Low Energy configs
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_DEVICE_APPEARANCE=0
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_DEVICE_NAME_MAX=15
+CONFIG_BT_MAX_CONN=2
 
 # Use mbedTLS from nrf_security library
 CONFIG_NORDIC_SECURITY_BACKEND=y

src/include/platform/ThreadStackManager.h

@@ -38,6 +38,8 @@ class DeviceNetworkInfo;
 class DeviceControlServer;
 class BLEManagerImpl;
 template <class>
+class GenericBLEManagerImpl_Zephyr;
+template <class>
 class GenericPlatformManagerImpl;
 template <class>
 class GenericConfigurationManagerImpl;
@@ -89,6 +91,8 @@ class ThreadStackManager
     friend class ConfigurationManagerImpl;
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
     friend class Internal::BLEManagerImpl;
+    template <class>
+    friend class Internal::GenericBLEManagerImpl_Zephyr;
 #endif
     friend class Internal::DeviceControlServer;
     template <class>

src/inet/ZephyrSocket.h

@@ -26,16 +26,6 @@
 
 #include <sys/socket.h>
 
-static inline int getsockname(int sock, sockaddr * addr, socklen_t * addrlen)
-{
-    return zsock_getsockname(sock, addr, addrlen);
-}
-
-static inline ssize_t sendmsg(int sock, const struct msghdr * msg, int flags)
-{
-    return zsock_sendmsg(sock, msg, flags);
-}
-
 static inline ssize_t recvmsg(int sock, struct msghdr * msg, int flags)
 {
     // Zephyr doesn't implement recvmsg at all, but if the message vector size is > 0 we can simply