mirror of
https://github.com/RinCat/RTL88x2BU-Linux-Driver.git
synced 2026-01-29 07:16:35 +00:00
Update to v5.13.1-30-g37e60b26a.20220819
This commit is contained in:
@@ -28,7 +28,7 @@ static const char *const glbt_info_src_8822b_2ant[] = {
|
||||
"BT Info[bt scbd]"
|
||||
};
|
||||
|
||||
u32 glcoex_ver_date_8822b_2ant = 20200302;
|
||||
u32 glcoex_ver_date_8822b_2ant = 20220812;
|
||||
u32 glcoex_ver_8822b_2ant = 0x7b;
|
||||
u32 glcoex_ver_btdesired_8822b_2ant = 0x79;
|
||||
|
||||
@@ -2012,6 +2012,11 @@ static void halbtc8822b2ant_table(struct btc_coexist *btc, boolean force_exec,
|
||||
0xffff55ff, break_table,
|
||||
select_table);
|
||||
break;
|
||||
case 19:
|
||||
halbtc8822b2ant_set_table(btc, force_exec, 0x55555555,
|
||||
0x6a5a6a5a, break_table,
|
||||
select_table);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -3477,7 +3482,7 @@ halbtc8822b2ant_action_wifi_native_lps(struct btc_coexist *btc)
|
||||
BT_8822B_2ANT_PHASE_2G);
|
||||
|
||||
halbtc8822b2ant_table(btc, NM_EXCU, 8);
|
||||
halbtc8822b2ant_tdma(btc, NM_EXCU, FALSE, 0);
|
||||
halbtc8822b2ant_tdma(btc, NM_EXCU, TRUE, 19);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
23
hal/hal_dm.c
23
hal/hal_dm.c
@@ -350,6 +350,15 @@ void rtw_phydm_priv_init(_adapter *adapter)
|
||||
odm_cmn_info_init(phydm, ODM_CMNINFO_PLATFORM, ODM_CE);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_LITTLE_ENDIAN
|
||||
static u8 *convert_to_big_endian(void *value, int size)
|
||||
{
|
||||
u8 *temp;
|
||||
temp = (u8 *)value + size - 1;
|
||||
return temp;
|
||||
}
|
||||
#endif
|
||||
|
||||
void Init_ODM_ComInfo(_adapter *adapter)
|
||||
{
|
||||
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
|
||||
@@ -467,11 +476,9 @@ void Init_ODM_ComInfo(_adapter *adapter)
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_TX_UNI, &(dvobj->traffic_stat.tx_bytes));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_RX_UNI, &(dvobj->traffic_stat.rx_bytes));
|
||||
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_BAND, &(pHalData->current_band_type));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_FORCED_RATE, &(pHalData->ForcedDataRate));
|
||||
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_SEC_CHNL_OFFSET, &(pHalData->nCur40MhzPrimeSC));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_SEC_MODE, &(adapter->securitypriv.dot11PrivacyAlgrthm));
|
||||
#ifdef CONFIG_NARROWBAND_SUPPORTING
|
||||
if ((adapter->registrypriv.rtw_nb_config == RTW_NB_CONFIG_WIDTH_10)
|
||||
|| (adapter->registrypriv.rtw_nb_config == RTW_NB_CONFIG_WIDTH_5)) {
|
||||
@@ -479,9 +486,19 @@ void Init_ODM_ComInfo(_adapter *adapter)
|
||||
}
|
||||
else
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LITTLE_ENDIAN
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_BAND, &(pHalData->current_band_type));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_SEC_MODE, &(adapter->securitypriv.dot11PrivacyAlgrthm));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_BW, &(pHalData->current_channel_bw));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_CHNL, &(pHalData->current_channel));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_NET_CLOSED, &(adapter->net_closed));
|
||||
#else /* CONFIG_BIG_ENDIAN */
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_BAND, convert_to_big_endian(&(pHalData->current_band_type), sizeof(BAND_TYPE)));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_SEC_MODE, convert_to_big_endian(&(adapter->securitypriv.dot11PrivacyAlgrthm), sizeof(u32)));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_BW, convert_to_big_endian(&(pHalData->current_channel_bw), sizeof(enum channel_width)));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_NET_CLOSED, convert_to_big_endian(&(adapter->net_closed), sizeof(int)));
|
||||
#endif
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_CHNL, &(pHalData->current_channel));
|
||||
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_SCAN, &(pHalData->bScanInProcess));
|
||||
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_POWER_SAVING, &(pwrctl->bpower_saving));
|
||||
|
||||
Reference in New Issue
Block a user