commit 048eaa9cbfd4ce47ed38c96be085c3e2027778d4
author wayne.guo <wayne.guo@mediatek.com> Fri Dec 08 11:06:44 2017 +0800
committer Wayne Guo <wayne.guo@mediatek.com> Fri Dec 08 11:17:21 2017 +0800
tree b0836b7640b275722fd725a96695b9f7066e3e70
parent 2765b33df3da803297a2c20793dbeacfe3c4d7da

[WCNCR00169280] core: Add WF0 1x1 only support

[Description]
Add WF0 1x1 only support with backward and forward compatibility.

Change-Id: I04e73b1f05f9ca6a5f2590cbd6c13eec84e7c141
Signed-off-by: wayne.guo <wayne.guo@mediatek.com>
CR-Id: WCNCR00169280
Feature: core
Reviewed-on: http://gerrit.mediatek.inc:8080/1239830
CheckPatch: Check Patch <srv_checkpatch@mediatek.com>
Reviewed-by: TH3 Huang <th3.huang@mediatek.com>
Build: srv_neptune_adm <srv_neptune_adm@mediatek.com>

common/wlan_lib.c

diff --git a/common/wlan_lib.c b/common/wlan_lib.c
index a3aa62d..da0926a 100644
--- a/common/wlan_lib.c
+++ b/common/wlan_lib.c
@@ -4893,20 +4893,39 @@
 #endif
 
 #if CFG_SISO_SW_DEVELOP
-	if ((!prEventNicCapability->ucHwNotSupportDBDC) && (!prEventNicCapability->ucHwSetNss1x1)) {
+	if ((!prEventNicCapability->ucHwNotSupportDBDC) &&
+		(!prEventNicCapability->ucHwSetNss1x1) &&
+		(!prEventNicCapability->ucHwWiFiZeroOnly)) {
 		prAdapter->rWifiFemCfg.u2WifiPath =
 			(WLAN_FLAG_2G4_WF0 | WLAN_FLAG_5G_WF0 | WLAN_FLAG_2G4_WF1 | WLAN_FLAG_5G_WF1);
-	} else if ((!prEventNicCapability->ucHwNotSupportDBDC) && (prEventNicCapability->ucHwSetNss1x1)) {
+	} else if ((!prEventNicCapability->ucHwNotSupportDBDC) &&
+			(prEventNicCapability->ucHwSetNss1x1) &&
+			(!prEventNicCapability->ucHwWiFiZeroOnly)) {
 		prAdapter->rWifiFemCfg.u2WifiPath =
 			(WLAN_FLAG_5G_WF0 | WLAN_FLAG_2G4_WF1);
-	} else if ((prEventNicCapability->ucHwNotSupportDBDC) && (prEventNicCapability->ucHwSetNss1x1)) {
+	} else if ((prEventNicCapability->ucHwNotSupportDBDC) &&
+		(prEventNicCapability->ucHwSetNss1x1) &&
+		(!prEventNicCapability->ucHwWiFiZeroOnly)) {
 		prAdapter->rWifiFemCfg.u2WifiPath =
 			(WLAN_FLAG_5G_WF0 | WLAN_FLAG_2G4_WF1);
-	} else if ((prEventNicCapability->ucHwNotSupportDBDC) && (!prEventNicCapability->ucHwSetNss1x1)) {
+	} else if ((prEventNicCapability->ucHwNotSupportDBDC) &&
+		(!prEventNicCapability->ucHwSetNss1x1) &&
+		(!prEventNicCapability->ucHwWiFiZeroOnly)) {
 		prAdapter->rWifiFemCfg.u2WifiPath =
 			(WLAN_FLAG_2G4_WF0 | WLAN_FLAG_5G_WF0 | WLAN_FLAG_2G4_WF1 | WLAN_FLAG_5G_WF1);
-	} else
+	} else if ((prEventNicCapability->ucHwNotSupportDBDC) &&
+		(prEventNicCapability->ucHwSetNss1x1) &&
+		(prEventNicCapability->ucHwWiFiZeroOnly)) {
+		prAdapter->rWifiFemCfg.u2WifiPath =
+			(WLAN_FLAG_2G4_WF0 | WLAN_FLAG_5G_WF0);
+	} else {
+		DBGLOG(INIT, ERROR, "ucHwNotSupportDBDC = %d\n", prEventNicCapability->ucHwNotSupportDBDC);
+		DBGLOG(INIT, ERROR, "ucHwSetNss1x1 = %d\n", prEventNicCapability->ucHwSetNss1x1);
+		DBGLOG(INIT, ERROR, "ucHwWiFiZeroOnly = %d\n", prEventNicCapability->ucHwWiFiZeroOnly);
 		ASSERT(0);
+	}
+
+	DBGLOG(INIT, INFO, "wifi path = %8x\n", prAdapter->rWifiFemCfg.u2WifiPath);
 #endif
 
 	return WLAN_STATUS_SUCCESS;

include/nic_cmd_event.h

diff --git a/include/nic_cmd_event.h b/include/nic_cmd_event.h
index 2e8e3e4..27a4f86 100644
--- a/include/nic_cmd_event.h
+++ b/include/nic_cmd_event.h
@@ -1172,7 +1172,7 @@
 	UINT_8 ucFwBuildNumber;
 	UINT_8 ucHwSetNss1x1;
 	UINT_8 ucHwNotSupportDBDC;
-	UINT_8 aucReserved0[1];
+	UINT_8 ucHwWiFiZeroOnly;
 	UINT_8 aucReserved1[56];
 } EVENT_NIC_CAPABILITY_T, *P_EVENT_NIC_CAPABILITY_T;