net: wireless: rockchip_wlan: add rtl8188eu support
[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rockchip_wlan / rtl8188eu / include / rtl8723b_cmd.h
old mode 100755 (executable)
new mode 100644 (file)
index c7727c4..5663cb1
@@ -56,6 +56,7 @@ enum h2c_cmd_8723B{
        H2C_8723B_RSSI_SETTING = 0x42,  
        H2C_8723B_AP_REQ_TXRPT = 0x43,  
        H2C_8723B_INIT_RATE_COLLECT = 0x44,     
+       H2C_8723B_RA_PARA_ADJUST = 0x46,
        
        //BT Class: 011
        H2C_8723B_B_TYPE_TDMA = 0x60,
@@ -80,114 +81,44 @@ enum h2c_cmd_8723B{
        H2C_8723B_D0_SCAN_OFFLOAD_CTRL = 0x85,
        H2C_8723B_D0_SCAN_OFFLOAD_INFO = 0x86,
        H2C_8723B_CHNL_SWITCH_OFFLOAD = 0x87,
+       H2C_8723B_P2P_OFFLOAD_RSVD_PAGE = 0x8A, 
+       H2C_8723B_P2P_OFFLOAD = 0x8B,
 
        H2C_8723B_RESET_TSF = 0xC0,
        H2C_8723B_MAXID,
 };
-/* move to hal_com_h2c.h
-#define H2C_8723B_RSVDPAGE_LOC_LEN             5
-#define H2C_8723B_MEDIA_STATUS_RPT_LEN         3
-#define H2C_8723B_KEEP_ALIVE_CTRL_LEN  2
-#define H2C_8723B_DISCON_DECISION_LEN          3
-#define H2C_8723B_BCN_RSVDPAGE_LEN             5
-#define H2C_8723B_PROBERSP_RSVDPAGE_LEN                5
-#define H2C_8723B_AP_OFFLOAD_LEN               3
-#define H2C_8723B_AP_WOW_GPIO_CTRL_LEN         3
-#define H2C_8723B_PWRMODE_LEN                  7
-#define H2C_8723B_PSTUNEPARAM_LEN                      4
-#define H2C_8723B_MACID_CFG_LEN                7
-#define H2C_8723B_BTMP_OPER_LEN                        4
-#define H2C_8723B_WOWLAN_LEN                   4
-#define H2C_8723B_REMOTE_WAKE_CTRL_LEN 3
-#define H2C_8723B_AOAC_GLOBAL_INFO_LEN 2
-#define H2C_8723B_AOAC_RSVDPAGE_LOC_LEN        7
-#define H2C_8723B_SCAN_OFFLOAD_CTRL_LEN        4
-#define H2C_8723B_BT_FW_PATCH_LEN                      6
-#define H2C_8723B_RSSI_SETTING_LEN             4
-#define H2C_8723B_AP_REQ_TXRPT_LEN             2
-#define H2C_8723B_FORCE_BT_TXPWR_LEN           3
 
-#ifdef CONFIG_WOWLAN   
-#define eqMacAddr(a,b)                                         ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 )
-#define cpMacAddr(des,src)                                     ((des)[0]=(src)[0],(des)[1]=(src)[1],(des)[2]=(src)[2],(des)[3]=(src)[3],(des)[4]=(src)[4],(des)[5]=(src)[5])
-#define cpIpAddr(des,src)                                      ((des)[0]=(src)[0],(des)[1]=(src)[1],(des)[2]=(src)[2],(des)[3]=(src)[3])
-
-//
-// ARP packet
-//
-// LLC Header
-#define GET_ARP_PKT_LLC_TYPE(__pHeader)                                        ReadEF2Byte( ((u8*)(__pHeader)) + 6)
-
-//ARP element
-#define GET_ARP_PKT_OPERATION(__pHeader)                               ReadEF2Byte( ((u8*)(__pHeader)) + 6)
-#define GET_ARP_PKT_SENDER_MAC_ADDR(__pHeader, _val)   cpMacAddr((u8*)(_val), ((u8*)(__pHeader))+8)
-#define GET_ARP_PKT_SENDER_IP_ADDR(__pHeader, _val)            cpIpAddr((u8*)(_val), ((u8*)(__pHeader))+14)
-#define GET_ARP_PKT_TARGET_MAC_ADDR(__pHeader, _val)   cpMacAddr((u8*)(_val), ((u8*)(__pHeader))+18)
-#define GET_ARP_PKT_TARGET_IP_ADDR(__pHeader, _val)    cpIpAddr((u8*)(_val), ((u8*)(__pHeader))+24)
-
-#define SET_ARP_PKT_HW(__pHeader, __Value)                             WriteEF2Byte( ((u8*)(__pHeader)) + 0, __Value)
-#define SET_ARP_PKT_PROTOCOL(__pHeader, __Value)                       WriteEF2Byte( ((u8*)(__pHeader)) + 2, __Value)
-#define SET_ARP_PKT_HW_ADDR_LEN(__pHeader, __Value)            WriteEF1Byte( ((u8*)(__pHeader)) + 4, __Value)
-#define SET_ARP_PKT_PROTOCOL_ADDR_LEN(__pHeader, __Value)      WriteEF1Byte( ((u8*)(__pHeader)) + 5, __Value)
-#define SET_ARP_PKT_OPERATION(__pHeader, __Value)              WriteEF2Byte( ((u8*)(__pHeader)) + 6, __Value)
-#define SET_ARP_PKT_SENDER_MAC_ADDR(__pHeader, _val)   cpMacAddr(((u8*)(__pHeader))+8, (u8*)(_val))
-#define SET_ARP_PKT_SENDER_IP_ADDR(__pHeader, _val)            cpIpAddr(((u8*)(__pHeader))+14, (u8*)(_val))
-#define SET_ARP_PKT_TARGET_MAC_ADDR(__pHeader, _val)   cpMacAddr(((u8*)(__pHeader))+18, (u8*)(_val))
-#define SET_ARP_PKT_TARGET_IP_ADDR(__pHeader, _val)            cpIpAddr(((u8*)(__pHeader))+24, (u8*)(_val))
-
-#define FW_WOWLAN_FUN_EN                               BIT(0)
-#define FW_WOWLAN_PATTERN_MATCH                        BIT(1)
-#define FW_WOWLAN_MAGIC_PKT                            BIT(2)
-#define FW_WOWLAN_UNICAST                              BIT(3)
-#define FW_WOWLAN_ALL_PKT_DROP                 BIT(4)
-#define FW_WOWLAN_GPIO_ACTIVE                  BIT(5)
-#define FW_WOWLAN_REKEY_WAKEUP                 BIT(6)
-#define FW_WOWLAN_DEAUTH_WAKEUP                        BIT(7)
-
-#define FW_WOWLAN_GPIO_WAKEUP_EN               BIT(0)
-#define FW_FW_PARSE_MAGIC_PKT                  BIT(1)
-
-#define FW_REMOTE_WAKE_CTRL_EN                 BIT(0)
-#define FW_REALWOWLAN_EN                               BIT(5)
-
-#endif //CONFIG_WOWLAN
-*/
 //---------------------------------------------------------------------------------------------------------//
 //----------------------------------    H2C CMD CONTENT    --------------------------------------------------//
 //---------------------------------------------------------------------------------------------------------//
 //_RSVDPAGE_LOC_CMD_0x00
-#define SET_8723B_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__pH2CCmd, __Value)            SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
-#define SET_8723B_H2CCMD_RSVDPAGE_LOC_PSPOLL(__pH2CCmd, __Value)                       SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value)
-#define SET_8723B_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__pH2CCmd, __Value)            SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
+#define SET_8723B_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__pH2CCmd, __Value)                    SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
+#define SET_8723B_H2CCMD_RSVDPAGE_LOC_PSPOLL(__pH2CCmd, __Value)                               SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value)
+#define SET_8723B_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__pH2CCmd, __Value)                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
 #define SET_8723B_H2CCMD_RSVDPAGE_LOC_QOS_NULL_DATA(__pH2CCmd, __Value)                SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value)
-#define SET_8723B_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(__pH2CCmd, __Value)             SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 8, __Value)
-
-//_MEDIA_STATUS_RPT_PARM_CMD_0x01
-#define SET_8723B_H2CCMD_MSRRPT_PARM_OPMODE(__pH2CCmd, __Value)                SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
-#define SET_8723B_H2CCMD_MSRRPT_PARM_MACID_IND(__pH2CCmd, __Value)             SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
-#define SET_8723B_H2CCMD_MSRRPT_PARM_MACID(__pH2CCmd, __Value)                 SET_BITS_TO_LE_1BYTE(__pH2CCmd+1, 0, 8, __Value)
-#define SET_8723B_H2CCMD_MSRRPT_PARM_MACID_END(__pH2CCmd, __Value)                     SET_BITS_TO_LE_1BYTE(__pH2CCmd+2, 0, 8, __Value)
+#define SET_8723B_H2CCMD_RSVDPAGE_LOC_BT_QOS_NULL_DATA(__pH2CCmd, __Value)     SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 8, __Value)
 
 //_KEEP_ALIVE_CMD_0x03
-#define SET_8723B_H2CCMD_KEEPALIVE_PARM_ENABLE(__pH2CCmd, __Value)             SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
-#define SET_8723B_H2CCMD_KEEPALIVE_PARM_ADOPT(__pH2CCmd, __Value)              SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
-#define SET_8723B_H2CCMD_KEEPALIVE_PARM_PKT_TYPE(__pH2CCmd, __Value)           SET_BITS_TO_LE_1BYTE(__pH2CCmd, 2, 1, __Value)
+#define SET_8723B_H2CCMD_KEEPALIVE_PARM_ENABLE(__pH2CCmd, __Value)                     SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
+#define SET_8723B_H2CCMD_KEEPALIVE_PARM_ADOPT(__pH2CCmd, __Value)                              SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
+#define SET_8723B_H2CCMD_KEEPALIVE_PARM_PKT_TYPE(__pH2CCmd, __Value)                   SET_BITS_TO_LE_1BYTE(__pH2CCmd, 2, 1, __Value)
 #define SET_8723B_H2CCMD_KEEPALIVE_PARM_CHECK_PERIOD(__pH2CCmd, __Value)               SET_BITS_TO_LE_1BYTE(__pH2CCmd+1, 0, 8, __Value)
 
 //_DISCONNECT_DECISION_CMD_0x04
-#define SET_8723B_H2CCMD_DISCONDECISION_PARM_ENABLE(__pH2CCmd, __Value)                SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
-#define SET_8723B_H2CCMD_DISCONDECISION_PARM_ADOPT(__pH2CCmd, __Value)         SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
-#define SET_8723B_H2CCMD_DISCONDECISION_PARM_CHECK_PERIOD(__pH2CCmd, __Value)          SET_BITS_TO_LE_1BYTE(__pH2CCmd+1, 0, 8, __Value)
-#define SET_8723B_H2CCMD_DISCONDECISION_PARM_TRY_PKT_NUM(__pH2CCmd, __Value)           SET_BITS_TO_LE_1BYTE(__pH2CCmd+2, 0, 8, __Value)
+#define SET_8723B_H2CCMD_DISCONDECISION_PARM_ENABLE(__pH2CCmd, __Value)                        SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
+#define SET_8723B_H2CCMD_DISCONDECISION_PARM_ADOPT(__pH2CCmd, __Value)                 SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
+#define SET_8723B_H2CCMD_DISCONDECISION_PARM_CHECK_PERIOD(__pH2CCmd, __Value)  SET_BITS_TO_LE_1BYTE(__pH2CCmd+1, 0, 8, __Value)
+#define SET_8723B_H2CCMD_DISCONDECISION_PARM_TRY_PKT_NUM(__pH2CCmd, __Value)   SET_BITS_TO_LE_1BYTE(__pH2CCmd+2, 0, 8, __Value)
 
 // _PWR_MOD_CMD_0x20
-#define SET_8723B_H2CCMD_PWRMODE_PARM_MODE(__pH2CCmd, __Value)                 SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
-#define SET_8723B_H2CCMD_PWRMODE_PARM_RLBM(__pH2CCmd, __Value)                 SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 4, __Value)
-#define SET_8723B_H2CCMD_PWRMODE_PARM_SMART_PS(__pH2CCmd, __Value)             SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 4, 4, __Value)
-#define SET_8723B_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(__pH2CCmd, __Value)        SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_MODE(__pH2CCmd, __Value)                         SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_RLBM(__pH2CCmd, __Value)                         SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 4, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_SMART_PS(__pH2CCmd, __Value)                     SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 4, 4, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(__pH2CCmd, __Value)                SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
 #define SET_8723B_H2CCMD_PWRMODE_PARM_ALL_QUEUE_UAPSD(__pH2CCmd, __Value)      SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value)
-#define SET_8723B_H2CCMD_PWRMODE_PARM_PWR_STATE(__pH2CCmd, __Value)    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 8, __Value)
-#define SET_8723B_H2CCMD_PWRMODE_PARM_BYTE5(__pH2CCmd, __Value)        SET_BITS_TO_LE_1BYTE((__pH2CCmd)+5, 0, 8, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_BCN_EARLY_C2H_RPT(__pH2CCmd, __Value)    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 2, 1, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_PWR_STATE(__pH2CCmd, __Value)                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 8, __Value)
+#define SET_8723B_H2CCMD_PWRMODE_PARM_BYTE5(__pH2CCmd, __Value)                                SET_BITS_TO_LE_1BYTE((__pH2CCmd)+5, 0, 8, __Value)
 
 #define GET_8723B_H2CCMD_PWRMODE_PARM_MODE(__pH2CCmd)                                  LE_BITS_TO_1BYTE(__pH2CCmd, 0, 8)
 
@@ -222,7 +153,7 @@ enum h2c_cmd_8723B{
 #define SET_8723B_H2CCMD_APREQRPT_PARM_MACID2(__pH2CCmd, __Value)              SET_BITS_TO_LE_1BYTE(__pH2CCmd+1, 0, 8, __Value)
 
 // _FORCE_BT_TXPWR_CMD_0x62
-#define SET_8723B_H2CCMD_BT_PWR_IDX(__pH2CCmd, __Value)                                                        SET_BITS_TO_LE_1BYTE_8BIT(__pH2CCmd, 0, 8, __Value)
+#define SET_8723B_H2CCMD_BT_PWR_IDX(__pH2CCmd, __Value)                                                        SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
 
 // _FORCE_BT_MP_OPER_CMD_0x67
 #define SET_8723B_H2CCMD_BT_MPOPER_VER(__pH2CCmd, __Value)                                                     SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 4, __Value)
@@ -238,90 +169,11 @@ enum h2c_cmd_8723B{
 #define SET_8723B_H2CCMD_BT_FW_PATCH_ADDR1(__pH2CCmd, __Value)                                         SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value) 
 #define SET_8723B_H2CCMD_BT_FW_PATCH_ADDR2(__pH2CCmd, __Value)                                         SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 8, __Value) 
 #define SET_8723B_H2CCMD_BT_FW_PATCH_ADDR3(__pH2CCmd, __Value)                                         SET_BITS_TO_LE_1BYTE((__pH2CCmd)+5, 0, 8, __Value)
-/* move to hal_com_h2c.h
-// _WoWLAN PARAM_CMD_0x80
-#define SET_8723B_H2CCMD_WOWLAN_FUNC_ENABLE(__pH2CCmd, __Value)                SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_PATTERN_MATCH_ENABLE(__pH2CCmd, __Value)               SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_MAGIC_PKT_ENABLE(__pH2CCmd, __Value)           SET_BITS_TO_LE_1BYTE(__pH2CCmd, 2, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_UNICAST_PKT_ENABLE(__pH2CCmd, __Value)         SET_BITS_TO_LE_1BYTE(__pH2CCmd, 3, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_ALL_PKT_DROP(__pH2CCmd, __Value)               SET_BITS_TO_LE_1BYTE(__pH2CCmd, 4, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_GPIO_ACTIVE(__pH2CCmd, __Value)                                SET_BITS_TO_LE_1BYTE(__pH2CCmd, 5, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_REKEY_WAKE_UP(__pH2CCmd, __Value)              SET_BITS_TO_LE_1BYTE(__pH2CCmd, 6, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_DISCONNECT_WAKE_UP(__pH2CCmd, __Value)         SET_BITS_TO_LE_1BYTE(__pH2CCmd, 7, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_GPIONUM(__pH2CCmd, __Value)                                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 7, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_DATAPIN_WAKE_UP(__pH2CCmd, __Value)                                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 7, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_GPIO_DURATION(__pH2CCmd, __Value)                      SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
-//#define SET_8723B_H2CCMD_WOWLAN_GPIO_PULSE_EN(__pH2CCmd, __Value)                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 1, __Value)
-#define SET_8723B_H2CCMD_WOWLAN_GPIO_PULSE_COUNT(__pH2CCmd, __Value)           SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value)
-
-// _REMOTE_WAKEUP_CMD_0x81
-#define SET_8723B_H2CCMD_REMOTE_WAKECTRL_ENABLE(__pH2CCmd, __Value)            SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
-#define SET_8723B_H2CCMD_REMOTE_WAKE_CTRL_ARP_OFFLOAD_EN(__pH2CCmd, __Value)                           SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
-#define SET_8723B_H2CCMD_REMOTE_WAKE_CTRL_NDP_OFFLOAD_EN(__pH2CCmd, __Value)                           SET_BITS_TO_LE_1BYTE(__pH2CCmd, 2, 1, __Value)
-#define SET_8723B_H2CCMD_REMOTE_WAKE_CTRL_GTK_OFFLOAD_EN(__pH2CCmd, __Value)                           SET_BITS_TO_LE_1BYTE(__pH2CCmd, 3, 1, __Value)
-#define SET_8723B_H2CCMD_REMOTE_WAKE_CTRL_NLO_OFFLOAD_EN(__pH2CCmd, __Value)   SET_BITS_TO_LE_1BYTE(__pH2CCmd, 4, 1, __Value)
-#define SET_8723B_H2CCMD_REMOTE_WAKE_CTRL_FW_UNICAST_EN(__pH2CCmd, __Value)    SET_BITS_TO_LE_1BYTE(__pH2CCmd, 7, 1, __Value)
-#define SET_8723B_H2CCMD_REMOTE_WAKE_CTRL_ARP_ACTION(__pH2CCmd, __Value)       SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 1, __Value)
-
-// AOAC_GLOBAL_INFO_0x82
-#define SET_8723B_H2CCMD_AOAC_GLOBAL_INFO_PAIRWISE_ENC_ALG(__pH2CCmd, __Value)         SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_GLOBAL_INFO_GROUP_ENC_ALG(__pH2CCmd, __Value)                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value)
-
-// AOAC_RSVDPAGE_LOC_0x83
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_REMOTE_WAKE_CTRL_INFO(__pH2CCmd, __Value)           SET_BITS_TO_LE_1BYTE((__pH2CCmd), 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_ARP_RSP(__pH2CCmd, __Value)                                 SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_NEIGHBOR_ADV(__pH2CCmd, __Value)                    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_RSP(__pH2CCmd, __Value)                                 SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_INFO(__pH2CCmd, __Value)                                        SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 8, __Value)
-#ifdef CONFIG_GTK_OL
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(__pH2CCmd, __Value)                                     SET_BITS_TO_LE_1BYTE((__pH2CCmd)+5, 0, 8, __Value)
-#endif //CONFIG_GTK_OL
-#ifdef CONFIG_PNO_SUPPORT
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_NLO_INFO(__pH2CCmd, __Value)                                        SET_BITS_TO_LE_1BYTE((__pH2CCmd)+6, 0, 8, __Value)
-#endif
-
-#ifdef CONFIG_PNO_SUPPORT
-// D0_Scan_Offload_Info_0x86
-#define SET_8723B_H2CCMD_AOAC_NLO_FUN_EN(__pH2CCmd, __Value)                   SET_BITS_TO_LE_1BYTE((__pH2CCmd), 3, 1, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_PROBE_PACKET(__pH2CCmd, __Value)    SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_SCAN_INFO(__pH2CCmd, __Value)       SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 8, __Value)
-#define SET_8723B_H2CCMD_AOAC_RSVDPAGE_LOC_SSID_INFO(__pH2CCmd, __Value)       SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value)
-#endif //CONFIG_PNO_SUPPORT
-*/
 
 //---------------------------------------------------------------------------------------------------------//
 //-------------------------------------------    Structure    --------------------------------------------------//
 //---------------------------------------------------------------------------------------------------------//
-/* move to hal_com_h2c.h
-typedef struct _RSVDPAGE_LOC {
-       u8 LocProbeRsp;
-       u8 LocPsPoll;
-       u8 LocNullData;
-       u8 LocQosNull;
-       u8 LocBTQosNull;
-#ifdef CONFIG_WOWLAN
-       u8 LocRemoteCtrlInfo;
-       u8 LocArpRsp;
-       u8 LocNbrAdv;
-       u8 LocGTKRsp;
-       u8 LocGTKInfo;
-       u8 LocProbeReq;
-       u8 LocNetList;
-#ifdef CONFIG_GTK_OL
-       u8 LocGTKEXTMEM;
-#endif //CONFIG_GTK_OL
-#ifdef CONFIG_PNO_SUPPORT
-       u8 LocPNOInfo;
-       u8 LocScanInfo;
-       u8 LocSSIDInfo;
-       u8 LocProbePacket;
-#endif //CONFIG_PNO_SUPPORT
-#endif //CONFIG_WOWLAN
-#ifdef CONFIG_AP_WOWLAN
-       u8 LocApOffloadBCN;
-#endif //CONFIG_AP_WOWLAN
-} RSVDPAGE_LOC_8723B, *PRSVDPAGE_LOC_8723B;
-*/
+
 
 //---------------------------------------------------------------------------------------------------------//
 //----------------------------------    Function Statement     --------------------------------------------------//
@@ -331,12 +183,11 @@ typedef struct _RSVDPAGE_LOC {
 void rtl8723b_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode);
 void rtl8723b_set_FwJoinBssRpt_cmd(PADAPTER padapter, u8 mstatus);
 void rtl8723b_set_rssi_cmd(PADAPTER padapter, u8 *param);
-void rtl8723b_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8* arg, u8 rssi_level);
+void rtl8723b_Add_RateATid(PADAPTER pAdapter, u64 rate_bitmap, u8 *arg, u8 rssi_level);
 void rtl8723b_fw_try_ap_cmd(PADAPTER padapter, u32 need_ack);
 //s32 rtl8723b_set_lowpwr_lps_cmd(PADAPTER padapter, u8 enable);
 void rtl8723b_set_FwPsTuneParam_cmd(PADAPTER padapter);
 void rtl8723b_set_FwMacIdConfig_cmd(_adapter* padapter, u8 mac_id, u8 raid, u8 bw, u8 sgi, u32 mask);
-void rtl8723b_set_FwMediaStatusRpt_cmd(PADAPTER        padapter, u8 mstatus, u8 macid);
 void rtl8723b_set_FwBtMpOper_cmd(PADAPTER padapter, u8 idx, u8 ver, u8 reqnum, u8 *param);
 void rtl8723b_download_rsvd_page(PADAPTER padapter, u8 mstatus);
 #ifdef CONFIG_BT_COEXIST
@@ -348,11 +199,15 @@ void rtl8723b_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state);
 
 void CheckFwRsvdPageContent(PADAPTER padapter);
 
-#if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN)
-void rtl8723b_set_wowlan_cmd(_adapter* padapter, u8 enable);
-void rtl8723b_set_ap_wowlan_cmd(_adapter* padapter, u8 enable);
-void SetFwRelatedForWoWLAN8723b(_adapter* padapter, u8 bHostIsGoingtoSleep);
-#endif//CONFIG_WOWLAN
+#ifdef CONFIG_TDLS
+#ifdef CONFIG_TDLS_CH_SW
+void rtl8723b_set_BcnEarly_C2H_Rpt_cmd(PADAPTER padapter, u8 enable);
+#endif
+#endif
+
+#ifdef CONFIG_P2P_WOWLAN
+void rtl8723b_set_p2p_wowlan_offload_cmd(PADAPTER padapter);
+#endif
 
 void rtl8723b_set_FwPwrModeInIPS_cmd(PADAPTER padapter, u8 cmd_param);
 
@@ -360,6 +215,6 @@ void rtl8723b_set_FwPwrModeInIPS_cmd(PADAPTER padapter, u8 cmd_param);
 u8 rtl8723b_reset_tsf(_adapter *padapter, u8 reset_port);
 #endif // CONFIG_TSF_RESET_OFFLOAD
 s32 FillH2CCmd8723B(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer);
-
-#define FillH2CCmd FillH2CCmd8723B
+u8 GetTxBufferRsvdPageNum8723B(_adapter *padapter, bool wowlan);
 #endif
+