drivers: wifi: Fix inclusion of macros

Using Zephyr macros without Zephyr header files make all the code enabled for compilation costing memory, as we cannot use Zephyr macros in OSAL, define a new ones matching to Zephyr. Signed-off-by: Chaitanya Tata <[email protected]>
nrfconnect · Oct 23, 2023 · 1bbab9c · 1bbab9c
1 parent 0af0856
commit 1bbab9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/nrf_wifi/os_if/inc/osal_api.h b/nrf_wifi/os_if/inc/osal_api.h
@@ -15,6 +15,11 @@
 #include <stdarg.h>
 #include "osal_structs.h"
 
+/* Have to match zephyr/include/zephyr/logging/log_core.h */
+#define NRF_WIFI_LOG_LEVEL_ERR  1U
+#define NRF_WIFI_LOG_LEVEL_INF  3U
+#define NRF_WIFI_LOG_LEVEL_DBG  4U
+
 #ifndef CONFIG_NRF700X_LOG_VERBOSE
 #define __func__ "<snipped>"
 #endif /* CONFIG_NRF700X_LOG_VERBOSE */
@@ -318,7 +323,7 @@ void nrf_wifi_osal_spinlock_irq_rel(struct nrf_wifi_osal_priv *opriv,
 				     unsigned long *flags);
 
 
-#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= LOG_LEVEL_DBG
+#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= NRF_WIFI_LOG_LEVEL_DBG
 /**
  * nrf_wifi_osal_log_dbg() - Log a debug message.
  * @opriv: Pointer to the OSAL context returned by the @nrf_wifi_osal_init API.
@@ -336,7 +341,7 @@ int nrf_wifi_osal_log_dbg(struct nrf_wifi_osal_priv *opriv,
 #endif
 
 
-#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= LOG_LEVEL_INF
+#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= NRF_WIFI_LOG_LEVEL_INF
 /**
  * nrf_wifi_osal_log_info() - Log a informational message.
  * @opriv: Pointer to the OSAL context returned by the @nrf_wifi_osal_init API.
@@ -354,7 +359,7 @@ int nrf_wifi_osal_log_info(struct nrf_wifi_osal_priv *opriv,
 #endif
 
 
-#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= LOG_LEVEL_ERR
+#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= NRF_WIFI_LOG_LEVEL_ERR
 /**
  * nrf_wifi_osal_log_err() - Logs an error message.
  * @opriv: Pointer to the OSAL context returned by the @nrf_wifi_osal_init API.

diff --git a/nrf_wifi/os_if/src/osal.c b/nrf_wifi/os_if/src/osal.c
@@ -200,7 +200,7 @@ void nrf_wifi_osal_spinlock_irq_rel(struct nrf_wifi_osal_priv *opriv,
 }
 
 
-#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= LOG_LEVEL_DBG
+#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= NRF_WIFI_LOG_LEVEL_DBG
 int nrf_wifi_osal_log_dbg(struct nrf_wifi_osal_priv *opriv,
 			  const char *fmt,
 			  ...)
@@ -219,7 +219,7 @@ int nrf_wifi_osal_log_dbg(struct nrf_wifi_osal_priv *opriv,
 #endif /* CONFIG_WIFI_NRF700X_LOG_LEVEL_DBG */
 
 
-#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= LOG_LEVEL_INF
+#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= NRF_WIFI_LOG_LEVEL_INF
 int nrf_wifi_osal_log_info(struct nrf_wifi_osal_priv *opriv,
 			   const char *fmt,
 			   ...)
@@ -238,7 +238,7 @@ int nrf_wifi_osal_log_info(struct nrf_wifi_osal_priv *opriv,
 #endif /* CONFIG_WIFI_NRF700X_LOG_LEVEL_INF */
 
 
-#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= LOG_LEVEL_ERR
+#if CONFIG_WIFI_NRF700X_LOG_LEVEL >= NRF_WIFI_LOG_LEVEL_ERR
 int nrf_wifi_osal_log_err(struct nrf_wifi_osal_priv *opriv,
 			  const char *fmt,
 			  ...)