Merge branch 'feat/esp_version_check' into 'feature/esp_as_mcu_host'

mantriyogesh · mantriyogesh · commit 71f942b6a2bb · 2024-09-02T12:21:38.000+08:00
feat/esp_version_check Added Wifi Config Header for ESP Version checking

See merge request app-frameworks/esp_hosted!493
diff --git a/host/api/esp_hosted_api.c b/host/api/esp_hosted_api.c
@@ -19,6 +19,7 @@ extern "C" {
 
 /** Includes **/
 #include "esp_wifi_remote.h"
+#include "esp_hosted_wifi_config.h"
 #include "esp_hosted_api.h"
 #include "esp_check.h"
 #include "transport_drv.h"
@@ -379,7 +380,7 @@ esp_err_t esp_wifi_remote_sta_get_aid(uint16_t *aid)
 	return rpc_wifi_sta_get_aid(aid);
 }
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 esp_err_t esp_wifi_remote_set_band(wifi_band_t band)
 {
 	return rpc_wifi_set_band(band);
diff --git a/host/api/esp_hosted_api.h b/host/api/esp_hosted_api.h
@@ -26,7 +26,7 @@ extern "C" {
 #include "esp_wifi.h"
 #include "transport_drv.h"
 #include "esp_wifi_remote.h"
-
+#include "esp_hosted_wifi_config.h"
 
 /** Exported variables **/
 #define ESP_HOSTED_CHANNEL_CONFIG_DEFAULT()  { \
@@ -96,7 +96,7 @@ esp_err_t esp_wifi_remote_get_max_tx_power(int8_t *power);
 esp_err_t esp_wifi_remote_sta_get_aid(uint16_t *aid);
 esp_err_t esp_hosted_ota(const char* image_url);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 esp_err_t esp_wifi_remote_set_band(wifi_band_t band);
 esp_err_t esp_wifi_remote_get_band(wifi_band_t *band);
 esp_err_t esp_wifi_remote_set_band_mode(wifi_band_mode_t band_mode);
diff --git a/host/api/esp_wifi_weak.c b/host/api/esp_wifi_weak.c
@@ -20,6 +20,7 @@
  */
 
 #include "esp_hosted_api.h"
+#include "esp_hosted_wifi_config.h"
 
 #define WEAK __attribute__((weak))
 
@@ -223,7 +224,7 @@ WEAK esp_err_t esp_wifi_sta_get_rssi(int *rssi)
 	return esp_wifi_remote_sta_get_rssi(rssi);
 }
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 WEAK esp_err_t esp_wifi_set_band(wifi_band_t band)
 {
 	return esp_wifi_remote_set_band(band);
diff --git a/host/drivers/bt/vhci_drv.c b/host/drivers/bt/vhci_drv.c
@@ -121,7 +121,7 @@ void hci_drv_show_configuration(void)
  * - HCI_H4_xxx type should be set in esp_payload_header.hci_pkt_type
  */
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+#if H_BT_ENABLE_LL_INIT
 void ble_transport_ll_init(void)
 {
 }
diff --git a/host/drivers/rpc/core/rpc_req.c b/host/drivers/rpc/core/rpc_req.c
@@ -6,6 +6,7 @@
 #include "rpc_common.h"
 #include "adapter.h"
 #include "esp_log.h"
+#include "esp_hosted_wifi_config.h"
 
 DEFINE_LOG_TAG(rpc_req);
 
@@ -415,7 +416,7 @@ int compose_rpc_req(Rpc *req, ctrl_cmd_t *app_req, int32_t *failure_status)
 				rpc__req__wifi_get_protocol__init);
 		req_payload->ifx = app_req->u.wifi_protocol.ifx;
 		break;
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 	} case RPC_ID__Req_WifiSetProtocols: {
 		RPC_ALLOC_ASSIGN(RpcReqWifiSetProtocols, req_wifi_set_protocols,
 				rpc__req__wifi_set_protocols__init);
diff --git a/host/drivers/rpc/core/rpc_rsp.c b/host/drivers/rpc/core/rpc_rsp.c
@@ -5,6 +5,7 @@
 #include "rpc_slave_if.h"
 #include "adapter.h"
 #include "esp_log.h"
+#include "esp_hosted_wifi_config.h"
 
 DEFINE_LOG_TAG(rpc_rsp);
 
@@ -522,7 +523,7 @@ int rpc_parse_rsp(Rpc *rpc_msg, ctrl_cmd_t *app_resp)
 		app_resp->u.wifi_sta_get_aid.aid =
 			rpc_msg->resp_wifi_sta_get_aid->aid;
 		break;
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 	} case RPC_ID__Resp_WifiSetProtocols: {
 		RPC_FAIL_ON_NULL(resp_wifi_set_protocols);
 		RPC_ERR_IN_RESP(resp_wifi_set_protocols);
diff --git a/host/drivers/rpc/slaveif/rpc_slave_if.c b/host/drivers/rpc/slaveif/rpc_slave_if.c
@@ -6,7 +6,7 @@
  */
 #include "rpc_slave_if.h"
 #include "rpc_core.h"
-
+#include "esp_hosted_wifi_config.h"
 #include "esp_log.h"
 
 DEFINE_LOG_TAG(rpc_api);
@@ -364,7 +364,7 @@ ctrl_cmd_t * wifi_set_protocols(ctrl_cmd_t *req)
 	RPC_DECODE_RSP_IF_NOT_ASYNC();
 }
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 ctrl_cmd_t * wifi_get_protocols(ctrl_cmd_t *req)
 {
 	RPC_SEND_REQ(RPC_ID__Req_WifiGetProtocols);
diff --git a/host/drivers/rpc/slaveif/rpc_slave_if.h b/host/drivers/rpc/slaveif/rpc_slave_if.h
@@ -13,6 +13,7 @@
 #include "esp_hosted_rpc.pb-c.h"
 #include "esp_wifi.h"
 #include "esp_wifi_types.h"
+#include "esp_hosted_wifi_config.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,7 +224,7 @@ typedef struct Ctrl_cmd_t {
 
 		rpc_wifi_sta_get_aid_t      wifi_sta_get_aid;
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 		rpc_wifi_protocols_t        wifi_protocols;
 
 		rpc_wifi_bandwidths_t       wifi_bandwidths;
diff --git a/host/drivers/rpc/wrap/rpc_wrap.c b/host/drivers/rpc/wrap/rpc_wrap.c
@@ -30,6 +30,7 @@
 #include "rpc_common.h"
 #include "esp_log.h"
 #include "esp_http_client.h"
+#include "esp_hosted_wifi_config.h"
 
 DEFINE_LOG_TAG(rpc_wrap);
 static char* OTA_TAG = "h_ota";
@@ -1094,7 +1095,7 @@ esp_err_t rpc_wifi_sta_get_aid(uint16_t *aid)
 	return rpc_rsp_callback(resp);
 }
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 esp_err_t rpc_wifi_set_band(wifi_band_t band)
 {
 	/* implemented synchronous */
diff --git a/host/drivers/rpc/wrap/rpc_wrap.h b/host/drivers/rpc/wrap/rpc_wrap.h
@@ -24,6 +24,7 @@ extern "C" {
 /** Includes **/
 #include "common.h"
 #include "esp_wifi.h"
+#include "esp_hosted_wifi_config.h"
 
 /** Exported variables **/
 
@@ -78,7 +79,7 @@ esp_err_t rpc_wifi_get_max_tx_power(int8_t *power);
 esp_err_t rpc_wifi_sta_get_aid(uint16_t *aid);
 esp_err_t rpc_ota(const char* image_url);
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+#if H_WIFI_DUALBAND_SUPPORT
 esp_err_t rpc_wifi_set_band(wifi_band_t band);
 esp_err_t rpc_wifi_get_band(wifi_band_t *band);
 esp_err_t rpc_wifi_set_band_mode(wifi_band_mode_t band_mode);
diff --git a/host/port/esp_hosted_bt_config.h b/host/port/esp_hosted_bt_config.h
@@ -25,4 +25,11 @@
 #define H_BT_USE_VHCI 0
 #endif
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+// ll_init required
+#define H_BT_ENABLE_LL_INIT 1
+#else
+#define H_BT_ENABLE_LL_INIT 0
+#endif
+
 #endif
diff --git a/host/port/esp_hosted_wifi_config.h b/host/port/esp_hosted_wifi_config.h
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __ESP_HOSTED_WIFI_CONFIG_H__
+#define __ESP_HOSTED_WIFI_CONFIG_H__
+
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+// dual band API support available
+#define H_WIFI_DUALBAND_SUPPORT 1
+#else
+#define H_WIFI_DUALBAND_SUPPORT 0
+#endif
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ extern "C" {`
`19`	`19`
`20`	`20`	`/ Includes /`
`21`	`21`	`#include "esp_wifi_remote.h"`
	`22`	`+#include "esp_hosted_wifi_config.h"`
`22`	`23`	`#include "esp_hosted_api.h"`
`23`	`24`	`#include "esp_check.h"`
`24`	`25`	`#include "transport_drv.h"`
`@@ -379,7 +380,7 @@ esp_err_t esp_wifi_remote_sta_get_aid(uint16_t *aid)`
`379`	`380`	`return rpc_wifi_sta_get_aid(aid);`
`380`	`381`	`}`
`381`	`382`
`382`		`-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)`
	`383`	`+#if H_WIFI_DUALBAND_SUPPORT`
`383`	`384`	`esp_err_t esp_wifi_remote_set_band(wifi_band_t band)`
`384`	`385`	`{`
`385`	`386`	`return rpc_wifi_set_band(band);`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`#include "esp_hosted_api.h"`
	`23`	`+#include "esp_hosted_wifi_config.h"`
`23`	`24`
`24`	`25`	`#define WEAK __attribute__((weak))`
`25`	`26`
`@@ -223,7 +224,7 @@ WEAK esp_err_t esp_wifi_sta_get_rssi(int *rssi)`
`223`	`224`	`return esp_wifi_remote_sta_get_rssi(rssi);`
`224`	`225`	`}`
`225`	`226`
`226`		`-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)`
	`227`	`+#if H_WIFI_DUALBAND_SUPPORT`
`227`	`228`	`WEAK esp_err_t esp_wifi_set_band(wifi_band_t band)`
`228`	`229`	`{`
`229`	`230`	`return esp_wifi_remote_set_band(band);`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void hci_drv_show_configuration(void)`
`121`	`121`	`* - HCI_H4_xxx type should be set in esp_payload_header.hci_pkt_type`
`122`	`122`	`*/`
`123`	`123`
`124`		`-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)`
	`124`	`+#if H_BT_ENABLE_LL_INIT`
`125`	`125`	`void ble_transport_ll_init(void)`
`126`	`126`	`{`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include "rpc_common.h"`
`31`	`31`	`#include "esp_log.h"`
`32`	`32`	`#include "esp_http_client.h"`
	`33`	`+#include "esp_hosted_wifi_config.h"`
`33`	`34`
`34`	`35`	`DEFINE_LOG_TAG(rpc_wrap);`
`35`	`36`	`static char* OTA_TAG = "h_ota";`
`@@ -1094,7 +1095,7 @@ esp_err_t rpc_wifi_sta_get_aid(uint16_t *aid)`
`1094`	`1095`	`return rpc_rsp_callback(resp);`
`1095`	`1096`	`}`
`1096`	`1097`
`1097`		`-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)`
	`1098`	`+#if H_WIFI_DUALBAND_SUPPORT`
`1098`	`1099`	`esp_err_t rpc_wifi_set_band(wifi_band_t band)`
`1099`	`1100`	`{`
`1100`	`1101`	`/* implemented synchronous */`