fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/ee6ce1a02cd4ede2d57997ee3e744113ae0f0464/applications/asset_tracker_v2
NordicSemiconductor · Nov 18, 2023 · 9f0bbee · 9f0bbee
1 parent a58ead7
commit 9f0bbee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/src/modules/modem_module.c b/src/modules/modem_module.c
@@ -36,9 +36,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_MODEM_MODULE_LOG_LEVEL);
 
-BUILD_ASSERT(!IS_ENABLED(CONFIG_LTE_AUTO_INIT_AND_CONNECT),
-		"The Modem module does not support this configuration");
-
 
 struct modem_msg_data {
 	union {
@@ -87,16 +84,6 @@ NRF_MODEM_LIB_ON_INIT(asset_tracker_init_hook, on_modem_lib_init, NULL);
 
 static void on_modem_lib_init(int ret, void *ctx)
 {
-	int err;
-
-	if (ret == 0) {
-		/* LTE LC is uninitialized on every modem shutdown. */
-		err = lte_lc_init();
-		if (err) {
-			LOG_ERR("lte_lc_init, error: %d", err);
-		}
-	}
-
 	k_sem_give(&nrf_modem_initialized);
 }
 

diff --git a/tests/location_module/CMakeLists.txt b/tests/location_module/CMakeLists.txt
@@ -18,7 +18,9 @@ cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/app_event_manager.h)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/subsys/app_event_manager/app_event_manager_priv.h)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/date_time.h)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/location.h)
-cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/lte_lc.h FUNC_EXCLUDE ".*(lte_lc_rai_req|lte_lc_rai_param_set)")
+cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/lte_lc.h
+	FUNC_EXCLUDE ".*(lte_lc_rai_req|lte_lc_rai_param_set)"
+	WORD_EXCLUDE "__deprecated")
 cmock_handle(${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_modem/include/nrf_modem_gnss.h)
 
 # add location_module (the unit under test)

diff --git a/tests/lwm2m_codec_helpers/CMakeLists.txt b/tests/lwm2m_codec_helpers/CMakeLists.txt
@@ -26,7 +26,9 @@ cmock_handle(${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_engine.h lwm2m)
 cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/lwm2m.h lwm2m)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/net/lwm2m_client_utils.h lwm2m_client_utils)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/net/lwm2m_client_utils_location.h lwm2m_client_utils)
-cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/lte_lc.h lte_lc FUNC_EXCLUDE ".*(lte_lc_rai_req|lte_lc_rai_param_set)")
+cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/lte_lc.h lte_lc
+	FUNC_EXCLUDE ".*(lte_lc_rai_req|lte_lc_rai_param_set)"
+	WORD_EXCLUDE "__deprecated")
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/date_time.h date_time)
 
 # Add Unit Under Test source files

diff --git a/tests/lwm2m_integration/CMakeLists.txt b/tests/lwm2m_integration/CMakeLists.txt
@@ -23,7 +23,9 @@ cmock_handle(${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_engine.h lwm2m)
 cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/lwm2m.h lwm2m)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/net/lwm2m_client_utils.h lwm2m_client_utils)
 cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/net/lwm2m_client_utils_location.h lwm2m_client_utils)
-cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/lte_lc.h lte_lc FUNC_EXCLUDE ".*(lte_lc_rai_req|lte_lc_rai_param_set)")
+cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/modem/lte_lc.h lte_lc
+	FUNC_EXCLUDE ".*(lte_lc_rai_req|lte_lc_rai_param_set)"
+	WORD_EXCLUDE "__deprecated")
 
 # Add Unit Under Test source files
 target_sources(app PRIVATE ${ASSET_TRACKER_V2_DIR}/src/cloud/lwm2m_integration/lwm2m_integration.c)