rtlwifi: rename register-based C2H command IDs to V0

Current chips use packet-based C2H commands whose IDs differ from old
ones, so this commit simply gives C2H_V0_ as prefix of command IDs.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
index ec9bcf32f0ab28ae1d8253d652b45062fb7d55fc..788de88ab1ee3ab2b9aac9c98e646c682afb4c77 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c
@@ -1749,13 +1749,13 @@ void rtl_8723e_c2h_command_handle(struct ieee80211_hw *hw)
 
 
        switch (c2h_event.cmd_id) {
-       case C2H_BT_RSSI:
+       case C2H_V0_BT_RSSI:
                        break;
 
-       case C2H_BT_OP_MODE:
+       case C2H_V0_BT_OP_MODE:
                        break;
 
-       case BT_INFO:
+       case C2H_V0_BT_INFO:
                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
                        "BT info Byte[0] (ID) is 0x%x\n",
                        c2h_event.cmd_id);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
index 3723d7476717b4bb29479828a81c4c37428fba0b..756868897d8b3855a8b84bc748f9af0ea31806a6 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h
@@ -130,17 +130,17 @@ enum bt_state {
        BT_INFO_STATE_MAX = 7
 };
 
-enum rtl8723e_c2h_evt {
-       C2H_DBG = 0,
-       C2H_TSF = 1,
-       C2H_AP_RPT_RSP = 2,
+enum rtl8723e_c2h_evt_v0 {
+       C2H_V0_DBG = 0,
+       C2H_V0_TSF = 1,
+       C2H_V0_AP_RPT_RSP = 2,
        /* The FW notify the report of the specific tx packet. */
-       C2H_CCX_TX_RPT = 3,
-       C2H_BT_RSSI = 4,
-       C2H_BT_OP_MODE = 5,
-       C2H_HW_INFO_EXCH = 10,
-       C2H_C2H_H2C_TEST = 11,
-       BT_INFO = 12,
+       C2H_V0_CCX_TX_RPT = 3,
+       C2H_V0_BT_RSSI = 4,
+       C2H_V0_BT_OP_MODE = 5,
+       C2H_V0_HW_INFO_EXCH = 10,
+       C2H_V0_C2H_H2C_TEST = 11,
+       C2H_V0_BT_INFO = 12,
        MAX_C2HEVENT
 };