From dced504a95094afb70e46e329f854f87bbfea440 Mon Sep 17 00:00:00 2001 From: fariouche Date: Mon, 8 Oct 2018 23:09:02 +0200 Subject: [PATCH 1/2] fix 8811 and 8821 not working when 8812 support is enabled, because of wrong firmware loaded --- hal/rtl8812a/rtl8812a_hal_init.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/hal/rtl8812a/rtl8812a_hal_init.c b/hal/rtl8812a/rtl8812a_hal_init.c index 967c762..5c1c6ac 100644 --- a/hal/rtl8812a/rtl8812a_hal_init.c +++ b/hal/rtl8812a/rtl8812a_hal_init.c @@ -18,7 +18,8 @@ #include #ifdef CONFIG_RTL8812A #include "hal8812a_fw.h" -#else +#endif +#ifdef CONFIG_RTL8821A #include "hal8821a_fw.h" #endif /* ------------------------------------------------------------------------- @@ -548,11 +549,16 @@ FirmwareDownload8812( #ifdef CONFIG_WOWLAN if (pwrpriv->wowlan_mode) { #ifdef CONFIG_RTL8812A + if (IS_HARDWARE_TYPE_8812(Adapter)) { pFirmware->szFwBuffer = array_mp_8812a_fw_wowlan; pFirmware->ulFwLength = array_length_mp_8812a_fw_wowlan; -#else + } +#endif +#ifdef CONFIG_RTL8821A + if (IS_HARDWARE_TYPE_8821(Adapter)) { pFirmware->szFwBuffer = array_mp_8821a_fw_wowlan; pFirmware->ulFwLength = array_length_mp_8821a_fw_wowlan; + } #endif RTW_INFO("%s fw:%s, size: %d\n", __func__, "WoWLAN", pFirmware->ulFwLength); @@ -562,11 +568,16 @@ FirmwareDownload8812( #ifdef CONFIG_AP_WOWLAN if (pwrpriv->wowlan_ap_mode) { #ifdef CONFIG_RTL8812A + if (IS_HARDWARE_TYPE_8812(Adapter)) { pFirmware->szFwBuffer = array_mp_8812a_fw_ap; pFirmware->ulFwLength = array_length_mp_8812a_fw_ap; -#else + } +#endif +#ifdef CONFIG_RTL8821A + if (IS_HARDWARE_TYPE_8821(Adapter)) { pFirmware->szFwBuffer = array_mp_8821a_fw_ap; pFirmware->ulFwLength = array_length_mp_8821a_fw_ap; + } #endif RTW_INFO("%s fw: %s, size: %d\n", __func__, "AP_WoWLAN", pFirmware->ulFwLength); @@ -577,11 +588,16 @@ FirmwareDownload8812( if (pHalData->EEPROMBluetoothCoexist == _TRUE) { #ifdef CONFIG_RTL8812A + if (IS_HARDWARE_TYPE_8812(pAdapter)) { pFirmware->szFwBuffer = array_mp_8812a_fw_nic_bt; pFirmware->ulFwLength = array_length_mp_8812a_fw_nic_bt; -#else + } +#endif +#ifdef CONFIG_RTL8821A + if (IS_HARDWARE_TYPE_8821(pAdapter)) { pFirmware->szFwBuffer = array_mp_8821a_fw_nic_bt; pFirmware->ulFwLength = array_length_mp_8821a_fw_nic_bt; + } #endif RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC-BTCOEX", pFirmware->ulFwLength); @@ -590,11 +606,16 @@ FirmwareDownload8812( { #ifdef CONFIG_RTL8812A + if (IS_HARDWARE_TYPE_8812(Adapter)) { pFirmware->szFwBuffer = array_mp_8812a_fw_nic; pFirmware->ulFwLength = array_length_mp_8812a_fw_nic; -#else + } +#endif +#ifdef CONFIG_RTL8821A + if (IS_HARDWARE_TYPE_8821(Adapter)) { pFirmware->szFwBuffer = array_mp_8821a_fw_nic; pFirmware->ulFwLength = array_length_mp_8821a_fw_nic; + } #endif RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC", pFirmware->ulFwLength); From 1a04d7c442933db492d5ccbcddd68637e3ed2d3b Mon Sep 17 00:00:00 2001 From: farid Date: Tue, 9 Oct 2018 12:55:58 +0200 Subject: [PATCH 2/2] cleanup fix --- hal/rtl8812a/rtl8812a_hal_init.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/hal/rtl8812a/rtl8812a_hal_init.c b/hal/rtl8812a/rtl8812a_hal_init.c index 5c1c6ac..811f77f 100644 --- a/hal/rtl8812a/rtl8812a_hal_init.c +++ b/hal/rtl8812a/rtl8812a_hal_init.c @@ -550,14 +550,14 @@ FirmwareDownload8812( if (pwrpriv->wowlan_mode) { #ifdef CONFIG_RTL8812A if (IS_HARDWARE_TYPE_8812(Adapter)) { - pFirmware->szFwBuffer = array_mp_8812a_fw_wowlan; - pFirmware->ulFwLength = array_length_mp_8812a_fw_wowlan; + pFirmware->szFwBuffer = array_mp_8812a_fw_wowlan; + pFirmware->ulFwLength = array_length_mp_8812a_fw_wowlan; } #endif #ifdef CONFIG_RTL8821A if (IS_HARDWARE_TYPE_8821(Adapter)) { - pFirmware->szFwBuffer = array_mp_8821a_fw_wowlan; - pFirmware->ulFwLength = array_length_mp_8821a_fw_wowlan; + pFirmware->szFwBuffer = array_mp_8821a_fw_wowlan; + pFirmware->ulFwLength = array_length_mp_8821a_fw_wowlan; } #endif RTW_INFO("%s fw:%s, size: %d\n", __func__, "WoWLAN", pFirmware->ulFwLength); @@ -569,14 +569,14 @@ FirmwareDownload8812( if (pwrpriv->wowlan_ap_mode) { #ifdef CONFIG_RTL8812A if (IS_HARDWARE_TYPE_8812(Adapter)) { - pFirmware->szFwBuffer = array_mp_8812a_fw_ap; - pFirmware->ulFwLength = array_length_mp_8812a_fw_ap; + pFirmware->szFwBuffer = array_mp_8812a_fw_ap; + pFirmware->ulFwLength = array_length_mp_8812a_fw_ap; } #endif #ifdef CONFIG_RTL8821A if (IS_HARDWARE_TYPE_8821(Adapter)) { - pFirmware->szFwBuffer = array_mp_8821a_fw_ap; - pFirmware->ulFwLength = array_length_mp_8821a_fw_ap; + pFirmware->szFwBuffer = array_mp_8821a_fw_ap; + pFirmware->ulFwLength = array_length_mp_8821a_fw_ap; } #endif @@ -589,14 +589,14 @@ FirmwareDownload8812( #ifdef CONFIG_RTL8812A if (IS_HARDWARE_TYPE_8812(pAdapter)) { - pFirmware->szFwBuffer = array_mp_8812a_fw_nic_bt; - pFirmware->ulFwLength = array_length_mp_8812a_fw_nic_bt; + pFirmware->szFwBuffer = array_mp_8812a_fw_nic_bt; + pFirmware->ulFwLength = array_length_mp_8812a_fw_nic_bt; } #endif #ifdef CONFIG_RTL8821A if (IS_HARDWARE_TYPE_8821(pAdapter)) { - pFirmware->szFwBuffer = array_mp_8821a_fw_nic_bt; - pFirmware->ulFwLength = array_length_mp_8821a_fw_nic_bt; + pFirmware->szFwBuffer = array_mp_8821a_fw_nic_bt; + pFirmware->ulFwLength = array_length_mp_8821a_fw_nic_bt; } #endif @@ -607,14 +607,14 @@ FirmwareDownload8812( #ifdef CONFIG_RTL8812A if (IS_HARDWARE_TYPE_8812(Adapter)) { - pFirmware->szFwBuffer = array_mp_8812a_fw_nic; - pFirmware->ulFwLength = array_length_mp_8812a_fw_nic; + pFirmware->szFwBuffer = array_mp_8812a_fw_nic; + pFirmware->ulFwLength = array_length_mp_8812a_fw_nic; } #endif #ifdef CONFIG_RTL8821A if (IS_HARDWARE_TYPE_8821(Adapter)) { - pFirmware->szFwBuffer = array_mp_8821a_fw_nic; - pFirmware->ulFwLength = array_length_mp_8821a_fw_nic; + pFirmware->szFwBuffer = array_mp_8821a_fw_nic; + pFirmware->ulFwLength = array_length_mp_8821a_fw_nic; } #endif