Add compile guards for code that exists in the controller binary

Author: h2zero

src/nimble/nimble/host/src/ble_sm_alg.c

@@ -515,6 +515,7 @@ ble_sm_alg_g2(const uint8_t *u, const uint8_t *v, const uint8_t *x,
     return 0;
 }
 
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
 int
 ble_sm_alg_gen_dhkey(const uint8_t *peer_pub_key_x, const uint8_t *peer_pub_key_y,
                      const uint8_t *our_priv_key, uint8_t *out_dhkey)
@@ -611,6 +612,7 @@ ble_sm_alg_gen_dhkey(const uint8_t *peer_pub_key_x, const uint8_t *peer_pub_key_
     swap_buf(out_dhkey, dh, 32);
     return 0;
 }
+#endif
 
 /* based on Core Specification 4.2 Vol 3. Part H 2.3.5.6.1 */
 static const uint8_t ble_sm_alg_dbg_priv_key[32] = {
@@ -690,6 +692,7 @@ void mbedtls_free_keypair(void)
 }
 #endif
 
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
 /**
  * pub: 64 bytes
  * priv: 32 bytes
@@ -726,6 +729,7 @@ ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv)
 
     return 0;
 }
+#endif
 
 #if MYNEWT_VAL(SELFTEST)
 /* Unit tests rely on custom RNG function not being set */

src/nimble/porting/nimble/src/endian.c

@@ -17,6 +17,10 @@
  * under the License.
  */
 
+#include "syscfg/syscfg.h"
+
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+
 #include "nimble/porting/nimble/include/os/endian.h"
 
 void
@@ -266,3 +270,5 @@ swap_buf(uint8_t *dst, const uint8_t *src, int len)
         dst[len - 1 - i] = src[i];
     }
 }
+
+#endif

src/nimble/porting/nimble/src/mem.c

@@ -17,6 +17,10 @@
  * under the License.
  */
 
+#include "syscfg/syscfg.h"
+
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+
 #include <stdlib.h>
 #include "nimble/porting/nimble/include/os/os.h"
 #include "nimble/porting/nimble/include/mem/mem.h"
@@ -326,3 +330,5 @@ mem_pullup_obj(struct os_mbuf **om, uint16_t len)
     return (*om)->om_data;
 
 }
+
+#endif

src/nimble/porting/nimble/src/os_mbuf.c

@@ -33,6 +33,10 @@
  *
  */
 
+#include "syscfg/syscfg.h"
+
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+
 #include "nimble/porting/nimble/include/os/os.h"
 #include "nimble/porting/nimble/include/os/os_trace_api.h"
 #include "nimble/porting/nimble/include/modlog/modlog.h"
@@ -1262,3 +1266,5 @@ os_mbuf_pack_chains(struct os_mbuf *m1, struct os_mbuf *m2)
 
     return m1;
 }
+
+#endif

src/nimble/porting/nimble/src/os_mempool.c

@@ -17,13 +17,16 @@
  * under the License.
  */
 
+#include "syscfg/syscfg.h"
+
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+
 #include "nimble/porting/nimble/include/os/os.h"
 #include "nimble/porting/nimble/include/os/os_trace_api.h"
 
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
-#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 #include "nimble/porting/nimble/include/modlog/modlog.h"
 #if !MYNEWT_VAL(OS_SYSVIEW_TRACE_MEMPOOL)
 #define OS_TRACE_DISABLE_FILE_API
@@ -485,3 +488,5 @@ os_mempool_module_init(void)
 {
     STAILQ_INIT(&g_os_mempool_list);
 }
+
+#endif

src/nimble/porting/nimble/src/os_msys_init.c

@@ -17,6 +17,10 @@
  * under the License.
  */
 
+#include "syscfg/syscfg.h"
+
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+
 #include <assert.h>
 #include "nimble/porting/nimble/include/os/os.h"
 #include "nimble/porting/nimble/include/mem/mem.h"
@@ -220,3 +224,5 @@ void os_msys_init(void)
     SYSINIT_PANIC_ASSERT(rc == 0);
 #endif
 }
+
+#endif

src/nimble/porting/npl/freertos/src/npl_os_freertos.c

@@ -17,11 +17,14 @@
  * under the License.
  */
 
+#include "syscfg/syscfg.h"
+
+#if !CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
+
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
-#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 #include "nimble/console/console.h"
 
 #include "nimble/nimble/include/nimble/nimble_npl.h"
@@ -1405,3 +1408,5 @@ void npl_freertos_funcs_deinit(void)
     }
     npl_funcs = NULL;
 }
+
+#endif