Skip to content

L
linux
Commit 40c66c68 authored by Joe Perches's avatar Joe Perches Committed by Kalle Valo
Browse files
Options

rtlwifi: Use const in 8188ee/8723be/8821ae swing_table declarations 

Reduce data usage about 1KB by using const.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200629055843.25394-1-pkshih@realtek.com
parent b28bd97c
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 58 deletions
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c
View file @ 40c66c68
...@@ -870,11 +870,11 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw) ...@@ -870,11 +870,11 @@ static void dm_txpower_track_cb_therm(struct ieee80211_hw *hw)
/*0.1 the following TWO tables decide the /*0.1 the following TWO tables decide the
*final index of OFDM/CCK swing table *final index of OFDM/CCK swing table
*/ */
s8 delta_swing_table_idx[2][15] = { static const s8 delta_swing_table_idx[2][15] = {
{0, 0, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11}, {0, 0, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11},
{0, 0, -1, -2, -3, -4, -4, -4, -4, -5, -7, -8, -9, -9, -10} {0, 0, -1, -2, -3, -4, -4, -4, -4, -5, -7, -8, -9, -9, -10}
}; };
u8 thermal_threshold[2][15] = { static const u8 thermal_threshold[2][15] = {
{0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 27}, {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 27},
{0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 25, 25, 25} {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 25, 25, 25}
}; };
......
drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c
View file @ 40c66c68
...@@ -736,11 +736,11 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter( ...@@ -736,11 +736,11 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter(
u8 ofdm_min_index = 6; u8 ofdm_min_index = 6;
u8 index_for_channel = 0; u8 index_for_channel = 0;
s8 delta_swing_table_idx_tup_a[TXSCALE_TABLE_SIZE] = { static const s8 delta_swing_table_idx_tup_a[TXSCALE_TABLE_SIZE] = {
0, 0, 1, 2, 2, 2, 3, 3, 3, 4, 5, 0, 0, 1, 2, 2, 2, 3, 3, 3, 4, 5,
5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 10, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 10,
10, 11, 11, 12, 12, 13, 14, 15}; 10, 11, 11, 12, 12, 13, 14, 15};
s8 delta_swing_table_idx_tdown_a[TXSCALE_TABLE_SIZE] = { static const s8 delta_swing_table_idx_tdown_a[TXSCALE_TABLE_SIZE] = {
0, 0, 1, 2, 2, 2, 3, 3, 3, 4, 5, 0, 0, 1, 2, 2, 2, 3, 3, 3, 4, 5,
5, 6, 6, 6, 6, 7, 7, 7, 8, 8, 9, 5, 6, 6, 6, 6, 7, 7, 7, 8, 8, 9,
9, 10, 10, 11, 12, 13, 14, 15}; 9, 10, 10, 11, 12, 13, 14, 15};
......
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
View file @ 40c66c68
...@@ -115,47 +115,47 @@ static const u32 edca_setting_ul[PEER_MAX] = { ...@@ -115,47 +115,47 @@ static const u32 edca_setting_ul[PEER_MAX] = {
0x5ea44f, /* 7 MARV */ 0x5ea44f, /* 7 MARV */
}; };
static u8 rtl8818e_delta_swing_table_idx_24gb_p[] = { static const u8 rtl8818e_delta_swing_table_idx_24gb_p[] = {
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4,
4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9}; 4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9};
static u8 rtl8818e_delta_swing_table_idx_24gb_n[] = { static const u8 rtl8818e_delta_swing_table_idx_24gb_n[] = {
0, 0, 0, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6, 0, 0, 0, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6,
7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11}; 7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11};
static u8 rtl8812ae_delta_swing_table_idx_24gb_n[] = { static const u8 rtl8812ae_delta_swing_table_idx_24gb_n[] = {
0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11}; 6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11};
static u8 rtl8812ae_delta_swing_table_idx_24gb_p[] = { static const u8 rtl8812ae_delta_swing_table_idx_24gb_p[] = {
0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9}; 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
static u8 rtl8812ae_delta_swing_table_idx_24ga_n[] = { static const u8 rtl8812ae_delta_swing_table_idx_24ga_n[] = {
0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11}; 6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11};
static u8 rtl8812ae_delta_swing_table_idx_24ga_p[] = { static const u8 rtl8812ae_delta_swing_table_idx_24ga_p[] = {
0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9}; 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
static u8 rtl8812ae_delta_swing_table_idx_24gcckb_n[] = { static const u8 rtl8812ae_delta_swing_table_idx_24gcckb_n[] = {
0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11}; 6, 6, 7, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11};
static u8 rtl8812ae_delta_swing_table_idx_24gcckb_p[] = { static const u8 rtl8812ae_delta_swing_table_idx_24gcckb_p[] = {
0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9}; 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
static u8 rtl8812ae_delta_swing_table_idx_24gccka_n[] = { static const u8 rtl8812ae_delta_swing_table_idx_24gccka_n[] = {
0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 5, 6,
6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11}; 6, 6, 7, 8, 8, 9, 9, 9, 10, 10, 10, 10, 11, 11};
static u8 rtl8812ae_delta_swing_table_idx_24gccka_p[] = { static const u8 rtl8812ae_delta_swing_table_idx_24gccka_p[] = {
0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6,
6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9}; 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9};
static u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = { static const u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
{0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, {0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7,
7, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13}, 7, 8, 8, 9, 9, 9, 10, 10, 11, 11, 12, 12, 13},
{0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, {0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
...@@ -164,7 +164,7 @@ static u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = { ...@@ -164,7 +164,7 @@ static u8 rtl8812ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
12, 12, 13, 14, 14, 14, 15, 16, 17, 17, 17, 18, 18, 18}, 12, 12, 13, 14, 14, 14, 15, 16, 17, 17, 17, 18, 18, 18},
}; };
static u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = { static const u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
{0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 8, {0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11}, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
...@@ -173,7 +173,7 @@ static u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = { ...@@ -173,7 +173,7 @@ static u8 rtl8812ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11}, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
}; };
static u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = { static const u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 13, 13, 13}, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 13, 13, 13},
{0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9, {0, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 9,
...@@ -182,7 +182,7 @@ static u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = { ...@@ -182,7 +182,7 @@ static u8 rtl8812ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
12, 13, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 18, 18}, 12, 13, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 18, 18},
}; };
static u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = { static const u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 7, 7, 8, {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11}, 8, 9, 9, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11},
{0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8, {0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 8,
...@@ -191,39 +191,39 @@ static u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = { ...@@ -191,39 +191,39 @@ static u8 rtl8812ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11}, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11},
}; };
static u8 rtl8821ae_delta_swing_table_idx_24gb_n[] = { static const u8 rtl8821ae_delta_swing_table_idx_24gb_n[] = {
0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10}; 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
static u8 rtl8821ae_delta_swing_table_idx_24gb_p[] = { static const u8 rtl8821ae_delta_swing_table_idx_24gb_p[] = {
0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12}; 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
static u8 rtl8821ae_delta_swing_table_idx_24ga_n[] = { static const u8 rtl8821ae_delta_swing_table_idx_24ga_n[] = {
0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10}; 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
static u8 rtl8821ae_delta_swing_table_idx_24ga_p[] = { static const u8 rtl8821ae_delta_swing_table_idx_24ga_p[] = {
0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12}; 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
static u8 rtl8821ae_delta_swing_table_idx_24gcckb_n[] = { static const u8 rtl8821ae_delta_swing_table_idx_24gcckb_n[] = {
0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10}; 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
static u8 rtl8821ae_delta_swing_table_idx_24gcckb_p[] = { static const u8 rtl8821ae_delta_swing_table_idx_24gcckb_p[] = {
0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12}; 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
static u8 rtl8821ae_delta_swing_table_idx_24gccka_n[] = { static const u8 rtl8821ae_delta_swing_table_idx_24gccka_n[] = {
0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6,
6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10}; 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10};
static u8 rtl8821ae_delta_swing_table_idx_24gccka_p[] = { static const u8 rtl8821ae_delta_swing_table_idx_24gccka_p[] = {
0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12}; 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 12, 12};
static u8 rtl8821ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = { static const u8 rtl8821ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
...@@ -232,7 +232,7 @@ static u8 rtl8821ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = { ...@@ -232,7 +232,7 @@ static u8 rtl8821ae_delta_swing_table_idx_5gb_n[][DEL_SW_IDX_SZ] = {
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
}; };
static u8 rtl8821ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = { static const u8 rtl8821ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
...@@ -241,7 +241,7 @@ static u8 rtl8821ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = { ...@@ -241,7 +241,7 @@ static u8 rtl8821ae_delta_swing_table_idx_5gb_p[][DEL_SW_IDX_SZ] = {
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
}; };
static u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = { static const u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
...@@ -250,7 +250,7 @@ static u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = { ...@@ -250,7 +250,7 @@ static u8 rtl8821ae_delta_swing_table_idx_5ga_n[][DEL_SW_IDX_SZ] = {
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
}; };
static u8 rtl8821ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = { static const u8 rtl8821ae_delta_swing_table_idx_5ga_p[][DEL_SW_IDX_SZ] = {
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16}, 12, 12, 13, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16},
{0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, {0, 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11,
...@@ -962,8 +962,10 @@ static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw) ...@@ -962,8 +962,10 @@ static void rtl8821ae_dm_iq_calibrate(struct ieee80211_hw *hw)
} }
static void rtl8812ae_get_delta_swing_table(struct ieee80211_hw *hw, static void rtl8812ae_get_delta_swing_table(struct ieee80211_hw *hw,
u8 **up_a, u8 **down_a, const u8 **up_a,
u8 **up_b, u8 **down_b) const u8 **down_a,
const u8 **up_b,
const u8 **down_b)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &rtlpriv->phy; struct rtl_phy *rtlphy = &rtlpriv->phy;
...@@ -999,10 +1001,10 @@ static void rtl8812ae_get_delta_swing_table(struct ieee80211_hw *hw, ...@@ -999,10 +1001,10 @@ static void rtl8812ae_get_delta_swing_table(struct ieee80211_hw *hw,
*up_b = rtl8812ae_delta_swing_table_idx_5gb_p[2]; *up_b = rtl8812ae_delta_swing_table_idx_5gb_p[2];
*down_b = rtl8812ae_delta_swing_table_idx_5gb_n[2]; *down_b = rtl8812ae_delta_swing_table_idx_5gb_n[2];
} else { } else {
*up_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p; *up_a = rtl8818e_delta_swing_table_idx_24gb_p;
*down_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n; *down_a = rtl8818e_delta_swing_table_idx_24gb_n;
*up_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p; *up_b = rtl8818e_delta_swing_table_idx_24gb_p;
*down_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n; *down_b = rtl8818e_delta_swing_table_idx_24gb_n;
} }
} }
...@@ -1492,17 +1494,17 @@ void rtl8812ae_dm_txpower_tracking_callback_thermalmeter( ...@@ -1492,17 +1494,17 @@ void rtl8812ae_dm_txpower_tracking_callback_thermalmeter(
/* 1. The following TWO tables decide /* 1. The following TWO tables decide
* the final index of OFDM/CCK swing table. * the final index of OFDM/CCK swing table.
*/ */
u8 *delta_swing_table_idx_tup_a; const u8 *delta_swing_table_idx_tup_a;
u8 *delta_swing_table_idx_tdown_a; const u8 *delta_swing_table_idx_tdown_a;
u8 *delta_swing_table_idx_tup_b; const u8 *delta_swing_table_idx_tup_b;
u8 *delta_swing_table_idx_tdown_b; const u8 *delta_swing_table_idx_tdown_b;
/*2. Initilization ( 7 steps in total )*/ /*2. Initilization ( 7 steps in total )*/
rtl8812ae_get_delta_swing_table(hw, rtl8812ae_get_delta_swing_table(hw,
(u8 **)&delta_swing_table_idx_tup_a, &delta_swing_table_idx_tup_a,
(u8 **)&delta_swing_table_idx_tdown_a, &delta_swing_table_idx_tdown_a,
(u8 **)&delta_swing_table_idx_tup_b, &delta_swing_table_idx_tup_b,
(u8 **)&delta_swing_table_idx_tdown_b); &delta_swing_table_idx_tdown_b);
rtldm->txpower_trackinginit = true; rtldm->txpower_trackinginit = true;
...@@ -1830,8 +1832,11 @@ void rtl8812ae_dm_txpower_tracking_callback_thermalmeter( ...@@ -1830,8 +1832,11 @@ void rtl8812ae_dm_txpower_tracking_callback_thermalmeter(
"<===rtl8812ae_dm_txpower_tracking_callback_thermalmeter\n"); "<===rtl8812ae_dm_txpower_tracking_callback_thermalmeter\n");
} }
static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw, u8 **up_a, static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw,
u8 **down_a, u8 **up_b, u8 **down_b) const u8 **up_a,
const u8 **down_a,
const u8 **up_b,
const u8 **down_b)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &rtlpriv->phy; struct rtl_phy *rtlphy = &rtlpriv->phy;
...@@ -1867,10 +1872,10 @@ static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw, u8 **up_a, ...@@ -1867,10 +1872,10 @@ static void rtl8821ae_get_delta_swing_table(struct ieee80211_hw *hw, u8 **up_a,
*up_b = rtl8821ae_delta_swing_table_idx_5gb_p[2]; *up_b = rtl8821ae_delta_swing_table_idx_5gb_p[2];
*down_b = rtl8821ae_delta_swing_table_idx_5gb_n[2]; *down_b = rtl8821ae_delta_swing_table_idx_5gb_n[2];
} else { } else {
*up_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p; *up_a = rtl8818e_delta_swing_table_idx_24gb_p;
*down_a = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n; *down_a = rtl8818e_delta_swing_table_idx_24gb_n;
*up_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_p; *up_b = rtl8818e_delta_swing_table_idx_24gb_p;
*down_b = (u8 *)rtl8818e_delta_swing_table_idx_24gb_n; *down_b = rtl8818e_delta_swing_table_idx_24gb_n;
} }
return; return;
} }
...@@ -2075,16 +2080,17 @@ void rtl8821ae_dm_txpower_tracking_callback_thermalmeter( ...@@ -2075,16 +2080,17 @@ void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(
/* 1. The following TWO tables decide the final /* 1. The following TWO tables decide the final
* index of OFDM/CCK swing table. * index of OFDM/CCK swing table.
*/ */
u8 *delta_swing_table_idx_tup_a; const u8 *delta_swing_table_idx_tup_a;
u8 *delta_swing_table_idx_tdown_a; const u8 *delta_swing_table_idx_tdown_a;
u8 *delta_swing_table_idx_tup_b; const u8 *delta_swing_table_idx_tup_b;
u8 *delta_swing_table_idx_tdown_b; const u8 *delta_swing_table_idx_tdown_b;
/*2. Initilization ( 7 steps in total )*/ /*2. Initilization ( 7 steps in total )*/
rtl8821ae_get_delta_swing_table(hw, (u8 **)&delta_swing_table_idx_tup_a, rtl8821ae_get_delta_swing_table(hw,
(u8 **)&delta_swing_table_idx_tdown_a, &delta_swing_table_idx_tup_a,
(u8 **)&delta_swing_table_idx_tup_b, &delta_swing_table_idx_tdown_a,
(u8 **)&delta_swing_table_idx_tdown_b); &delta_swing_table_idx_tup_b,
&delta_swing_table_idx_tdown_b);
rtldm->txpower_trackinginit = true; rtldm->txpower_trackinginit = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7