rtl8812au: support both RTL8812A and RTL8821A

[android-x86/external-kernel-drivers.git] / rtl8812au / hal / rtl8812a / rtl8812a_hal_init.c

diff --git a/rtl8812au/hal/rtl8812a/rtl8812a_hal_init.c b/rtl8812au/hal/rtl8812a/rtl8812a_hal_init.c
index 0238c72..f6645a6 100644 (file)
--- a/rtl8812au/hal/rtl8812a/rtl8812a_hal_init.c
+++ b/rtl8812au/hal/rtl8812a/rtl8812a_hal_init.c
@@ -21,11 +21,8 @@
 
 /* #include <drv_types.h> */
 #include <rtl8812a_hal.h>
-#ifdef CONFIG_RTL8812A
 #include "hal8812a_fw.h"
-#else
 #include "hal8821a_fw.h"
-#endif
 /* -------------------------------------------------------------------------
  *
  * LLT R/W/Init function
@@ -546,13 +543,13 @@ FirmwareDownload8812(
                if (bUsedWoWLANFw) {
                #ifdef CONFIG_WOWLAN
                        if (pwrpriv->wowlan_mode) {
-#ifdef CONFIG_RTL8812A
-                               pFirmware->szFwBuffer = array_mp_8812a_fw_wowlan;
-                               pFirmware->ulFwLength = array_length_mp_8812a_fw_wowlan;
-#else
-                               pFirmware->szFwBuffer = array_mp_8821a_fw_wowlan;
-                               pFirmware->ulFwLength = array_length_mp_8821a_fw_wowlan;
-#endif
+                               if (IS_HARDWARE_TYPE_8812(Adapter)) {
+                                       pFirmware->szFwBuffer = array_mp_8812a_fw_wowlan;
+                                       pFirmware->ulFwLength = array_length_mp_8812a_fw_wowlan;
+                               } else {
+                                       pFirmware->szFwBuffer = array_mp_8821a_fw_wowlan;
+                                       pFirmware->ulFwLength = array_length_mp_8821a_fw_wowlan;
+                               }
                                RTW_INFO("%s fw:%s, size: %d\n", __func__, "WoWLAN", pFirmware->ulFwLength);
 
                        }
@@ -560,13 +557,13 @@ FirmwareDownload8812(
 
                #ifdef CONFIG_AP_WOWLAN
                        if (pwrpriv->wowlan_ap_mode) {
-#ifdef CONFIG_RTL8812A
-                               pFirmware->szFwBuffer = array_mp_8812a_fw_ap;
-                               pFirmware->ulFwLength = array_length_mp_8812a_fw_ap;
-#else
-                               pFirmware->szFwBuffer = array_mp_8821a_fw_ap;
-                               pFirmware->ulFwLength = array_length_mp_8821a_fw_ap;
-#endif
+                               if (IS_HARDWARE_TYPE_8812(Adapter)) {
+                                       pFirmware->szFwBuffer = array_mp_8812a_fw_ap;
+                                       pFirmware->ulFwLength = array_length_mp_8812a_fw_ap;
+                               } else {
+                                       pFirmware->szFwBuffer = array_mp_8821a_fw_ap;
+                                       pFirmware->ulFwLength = array_length_mp_8821a_fw_ap;
+                               }
 
                                RTW_INFO("%s fw: %s, size: %d\n", __func__, "AP_WoWLAN", pFirmware->ulFwLength);
                        }
@@ -575,26 +572,26 @@ FirmwareDownload8812(
 #ifdef CONFIG_BT_COEXIST
                        if (pHalData->EEPROMBluetoothCoexist == _TRUE) {
 
-#ifdef CONFIG_RTL8812A
-                               pFirmware->szFwBuffer = array_mp_8812a_fw_nic_bt;
-                               pFirmware->ulFwLength = array_length_mp_8812a_fw_nic_bt;
-#else
-                               pFirmware->szFwBuffer = array_mp_8821a_fw_nic_bt;
-                               pFirmware->ulFwLength = array_length_mp_8821a_fw_nic_bt;
-#endif
+                               if (IS_HARDWARE_TYPE_8812(Adapter)) {
+                                       pFirmware->szFwBuffer = array_mp_8812a_fw_nic_bt;
+                                       pFirmware->ulFwLength = array_length_mp_8812a_fw_nic_bt;
+                               } else {
+                                       pFirmware->szFwBuffer = array_mp_8821a_fw_nic_bt;
+                                       pFirmware->ulFwLength = array_length_mp_8821a_fw_nic_bt;
+                               }
 
                                RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC-BTCOEX", pFirmware->ulFwLength);
                        } else
 #endif /* CONFIG_BT_COEXIST */
                        {
 
-#ifdef CONFIG_RTL8812A
-                               pFirmware->szFwBuffer = array_mp_8812a_fw_nic;
-                               pFirmware->ulFwLength = array_length_mp_8812a_fw_nic;
-#else
-                               pFirmware->szFwBuffer = array_mp_8821a_fw_nic;
-                               pFirmware->ulFwLength = array_length_mp_8821a_fw_nic;
-#endif
+                               if (IS_HARDWARE_TYPE_8812(Adapter)) {
+                                       pFirmware->szFwBuffer = array_mp_8812a_fw_nic;
+                                       pFirmware->ulFwLength = array_length_mp_8812a_fw_nic;
+                               } else {
+                                       pFirmware->szFwBuffer = array_mp_8821a_fw_nic;
+                                       pFirmware->ulFwLength = array_length_mp_8821a_fw_nic;
+                               }
 
                                RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC", pFirmware->ulFwLength);
                        }