qcacmn: Use qdf macro for epping mode
Use QDF macro to check if we are in epping mode.
Hardcode the ce engine to use interrupts in
epping mode.
Change-Id: Ie58c2efffdced03f24905469319eabc0af4ed228
CRs-Fixed: 1003792
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 141738c..f1befaf 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -42,7 +42,6 @@
#ifdef CONFIG_CNSS
#include <net/cnss.h>
#endif
-#include "epping_main.h"
#include "hif_debug.h"
#include "ce_internal.h"
#include "ce_reg.h"
@@ -358,7 +357,7 @@
bool rc = false;
if (ce_state != NULL) {
- if (WLAN_IS_EPPING_ENABLED(hif_get_conparam(ce_state->scn))) {
+ if (QDF_IS_EPPING_ENABLED(hif_get_conparam(ce_state->scn))) {
svc_map = target_service_to_ce_map_wlan_epping;
map_sz = sizeof(target_service_to_ce_map_wlan_epping) /
sizeof(struct service_to_pipe);
@@ -1737,7 +1736,7 @@
if (QDF_GLOBAL_FTM_MODE == con_mode)
mode = ICNSS_FTM;
- else if (WLAN_IS_EPPING_ENABLED(con_mode))
+ else if (QDF_IS_EPPING_ENABLED(con_mode))
mode = ICNSS_EPPING;
else
mode = ICNSS_MISSION;
@@ -1748,6 +1747,8 @@
return icnss_wlan_enable(&cfg, mode, QWLAN_VERSIONSTR);
}
+#define CE_EPPING_USES_IRQ true
+
/**
* hif_ce_prepare_config() - load the correct static tables.
* @scn: hif context
@@ -1758,8 +1759,8 @@
{
uint32_t mode = hif_get_conparam(scn);
/* if epping is enabled we need to use the epping configuration. */
- if (WLAN_IS_EPPING_ENABLED(mode)) {
- if (WLAN_IS_EPPING_IRQ(mode))
+ if (QDF_IS_EPPING_ENABLED(mode)) {
+ if (CE_EPPING_USES_IRQ)
host_ce_config = host_ce_config_wlan_epping_irq;
else
host_ce_config = host_ce_config_wlan_epping_poll;
@@ -2241,7 +2242,7 @@
struct hif_softc *scn = HIF_GET_SOFTC(hif_hdl);
uint32_t mode = hif_get_conparam(scn);
- if (WLAN_IS_EPPING_ENABLED(mode)) {
+ if (QDF_IS_EPPING_ENABLED(mode)) {
tgt_svc_map_to_use = target_service_to_ce_map_wlan_epping;
sz_tgt_svc_map_to_use =
sizeof(target_service_to_ce_map_wlan_epping);