Skip to content

Commit

Permalink
git stfu
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphaelscholle
raphaelscholle committed May 7, 2024
1 parent 7b1bc2c commit 9415011
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions hal/rtl8812a/rtl8812a_hal_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,17 +1159,17 @@ hal_ReadPAType_8812A(
// pHalData->LNAType_5G = 0;
pHalData->PAType_5G = 1;

// pHalData->external_pa_5g = ((pHalData->PAType_5G & BIT1) && (pHalData->PAType_5G & BIT0)) ? 1 : 0;
pHalData->external_pa_5g = 1;
// pHalData->external_lna_5g = ((pHalData->LNAType_5G & BIT7) && (pHalData->LNAType_5G & BIT3)) ? 1 : 0;
} else {
RTW_WARN("Autoload Worked 5G !(%u)\n", AutoloadFail);
// pHalData->external_pa_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_PA_5G) ? 1 : 0;
pHalData->external_pa_5g = 1;
// pHalData->external_lna_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_LNA_5G) ? 1 : 0;
pHalData->PAType_5G = 1;
}
} else {
pHalData->ExternalPA_2G = EEPROM_Default_PAType;
pHalData->external_pa_5g = 0x3;
pHalData->external_pa_5g = 1;
pHalData->ExternalLNA_2G = EEPROM_Default_LNAType;
pHalData->external_lna_5g = 0xFF;

Expand All @@ -1186,10 +1186,11 @@ hal_ReadPAType_8812A(
pHalData->external_lna_5g = 0;
} else {
RTW_WARN("OpenHD NoGetRegAmplifier !!!!!!!!!!!!!!!!!!(%u)\n", AutoloadFail);
pHalData->external_pa_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_PA_5G) ? 1 : 0;
pHalData->external_pa_5g = 1;
pHalData->external_lna_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_LNA_5G) ? 1 : 0;
}
}
pHalData->external_pa_5g = 1;
RTW_INFO("pHalData->PAType_2G is 0x%x, pHalData->ExternalPA_2G = %d\n", pHalData->PAType_2G, pHalData->ExternalPA_2G);
RTW_INFO("pHalData->PAType_5G is 0x%x, pHalData->external_pa_5g = %d\n", pHalData->PAType_5G, pHalData->external_pa_5g);
RTW_INFO("pHalData->LNAType_2G is 0x%x, pHalData->ExternalLNA_2G = %d\n", pHalData->LNAType_2G, pHalData->ExternalLNA_2G);
Expand Down Expand Up @@ -1267,15 +1268,15 @@ Hal_ReadPAType_8821A(
if (pHalData->LNAType_5G == 0xFF)
pHalData->LNAType_5G = 0;

pHalData->external_pa_5g = (pHalData->PAType_5G & BIT0) ? 1 : 0;
pHalData->external_pa_5g = 1;
pHalData->external_lna_5g = (pHalData->LNAType_5G & BIT3) ? 1 : 0;
} else {
pHalData->external_pa_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_PA_5G) ? 1 : 0;
pHalData->external_pa_5g = 1;
pHalData->external_lna_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_LNA_5G) ? 1 : 0;
}
} else {
pHalData->ExternalPA_2G = EEPROM_Default_PAType;
pHalData->external_pa_5g = 0xFF;
pHalData->external_pa_5g = 1;
pHalData->ExternalLNA_2G = EEPROM_Default_LNAType;
pHalData->external_lna_5g = 0xFF;

Expand All @@ -1287,15 +1288,16 @@ Hal_ReadPAType_8821A(
pHalData->ExternalLNA_2G = (GetRegAmplifierType2G(Adapter) & ODM_BOARD_EXT_LNA) ? 1 : 0;
}
if (GetRegAmplifierType5G(Adapter) == 0) { /* AUTO */
pHalData->external_pa_5g = 0;
pHalData->external_pa_5g = 1;
pHalData->external_lna_5g = 0;
} else {
pHalData->external_pa_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_PA_5G) ? 1 : 0;
pHalData->external_pa_5g = 1;
pHalData->external_lna_5g = (GetRegAmplifierType5G(Adapter) & ODM_BOARD_EXT_LNA_5G) ? 1 : 0;
}
}
//OpenHD fix to PA always enabled
pHalData->PAType_5G = 1;
pHalData->external_pa_5g =1;
RTW_INFO("pHalData->PAType_2G is 0x%x, pHalData->ExternalPA_2G = %d\n", pHalData->PAType_2G, pHalData->ExternalPA_2G);
RTW_INFO("pHalData->PAType_5G is 0x%x, pHalData->external_pa_5g = %d\n", pHalData->PAType_5G, pHalData->external_pa_5g);
RTW_INFO("pHalData->LNAType_2G is 0x%x, pHalData->ExternalLNA_2G = %d\n", pHalData->LNAType_2G, pHalData->ExternalLNA_2G);
Expand Down

0 comments on commit 9415011

Please sign in to comment.