Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / staging / rtl8723au / include / rtl8723a_hal.h

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index c20248bab717421a13ecc433f1a1894ab5b663de..344b7085f877ec58e8470676db8039e883fe519a 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -20,6 +20,7 @@
 #include "Hal8723APhyReg.h"
 #include "Hal8723APhyCfg.h"
 #include "rtl8723a_rf.h"
+#include "rtl8723a_bt_intf.h"
 #ifdef CONFIG_8723AU_BT_COEXIST
 #include "rtl8723a_bt-coexist.h"
 #endif
@@ -29,25 +30,16 @@
 #include "rtl8723a_cmd.h"
 #include "rtl8723a_sreset.h"
 #include "rtw_efuse.h"
+#include "rtw_eeprom.h"
 
 #include "odm_precomp.h"
+#include "odm.h"
 
 
 /* 2TODO: We should define 8192S firmware related macro settings here!! */
 #define RTL819X_DEFAULT_RF_TYPE                        RF_1T2R
 #define RTL819X_TOTAL_RF_PATH                          2
 
-/* TODO:  The following need to check!! */
-#define RTL8723_FW_UMC_IMG                             "rtl8192CU\\rtl8723fw.bin"
-#define RTL8723_FW_UMC_B_IMG                   "rtl8192CU\\rtl8723fw_B.bin"
-#define RTL8723_PHY_REG                                        "rtl8723S\\PHY_REG_1T.txt"
-#define RTL8723_PHY_RADIO_A                            "rtl8723S\\radio_a_1T.txt"
-#define RTL8723_PHY_RADIO_B                            "rtl8723S\\radio_b_1T.txt"
-#define RTL8723_AGC_TAB                                        "rtl8723S\\AGC_TAB_1T.txt"
-#define RTL8723_PHY_MACREG                             "rtl8723S\\MAC_REG.txt"
-#define RTL8723_PHY_REG_PG                             "rtl8723S\\PHY_REG_PG.txt"
-#define RTL8723_PHY_REG_MP                             "rtl8723S\\PHY_REG_MP.txt"
-
 /*  */
 /*             RTL8723S From header */
 /*  */
@@ -424,27 +416,9 @@ struct hal_data_8723a {
 
        bool                            bMACFuncEnable;
 
-#ifdef CONFIG_8723AU_P2P
-       struct P2P_PS_Offload_t p2p_ps_offload;
-#endif
-
-
-       /*  */
-       /*  For USB Interface HAL related */
-       /*  */
-       u32     UsbBulkOutSize;
-
        /*  Interrupt related register information. */
        u32     IntArray[2];
        u32     IntrMask[2];
-
-       /*  */
-       /*  For SDIO Interface HAL related */
-       /*  */
-
-       /*  Auto FSM to Turn On, include clock, isolation, power control for MAC only */
-       u8                      bMacPwrCtrlOn;
-
 };
 
 #define GET_HAL_DATA(__pAdapter)       ((struct hal_data_8723a *)((__pAdapter)->HalData))
@@ -551,25 +525,33 @@ void Hal_EfuseParseCustomerID(struct rtw_adapter *padapter, u8 *hwinfo, bool Aut
 void Hal_EfuseParseAntennaDiversity(struct rtw_adapter *padapter, u8 *hwinfo, bool AutoLoadFail);
 void Hal_EfuseParseRateIndicationOption(struct rtw_adapter *padapter, u8 *hwinfo, bool AutoLoadFail);
 void Hal_EfuseParseXtal_8723A(struct rtw_adapter *pAdapter, u8 *hwinfo, u8 AutoLoadFail);
-void Hal_EfuseParseThermalMeter_8723A(struct rtw_adapter *padapter, u8 *hwinfo, u8 AutoLoadFail);
+void Hal_EfuseParseThermalMeter_8723A(struct rtw_adapter *padapter, u8 *hwinfo, bool AutoLoadFail);
 
 void Hal_InitChannelPlan23a(struct rtw_adapter *padapter);
 
-void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc);
-void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val);
-void GetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val);
-#ifdef CONFIG_8723AU_BT_COEXIST
-void rtl8723a_SingleDualAntennaDetection(struct rtw_adapter *padapter);
-#endif
-
 /*  register */
 void SetBcnCtrlReg23a(struct rtw_adapter *padapter, u8 SetBits, u8 ClearBits);
 void rtl8723a_InitBeaconParameters(struct rtw_adapter *padapter);
 
-void rtl8723a_clone_haldata(struct rtw_adapter *dst_adapter, struct rtw_adapter *src_adapter);
 void rtl8723a_start_thread(struct rtw_adapter *padapter);
 void rtl8723a_stop_thread(struct rtw_adapter *padapter);
 
-s32 c2h_id_filter_ccx_8723a(u8 id);
+bool c2h_id_filter_ccx_8723a(u8 id);
+int c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
+
+void rtl8723a_read_adapter_info(struct rtw_adapter *Adapter);
+void rtl8723a_read_chip_version(struct rtw_adapter *padapter);
+void rtl8723a_notch_filter(struct rtw_adapter *adapter, bool enable);
+void rtl8723a_SetBeaconRelatedRegisters(struct rtw_adapter *padapter);
+void rtl8723a_SetHalODMVar(struct rtw_adapter *Adapter,
+                          enum hal_odm_variable eVariable,
+                          void *pValue1, bool bSet);
+void
+rtl8723a_readefuse(struct rtw_adapter *padapter,
+                  u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf);
+u16 rtl8723a_EfuseGetCurrentSize_WiFi(struct rtw_adapter *padapter);
+u16 rtl8723a_EfuseGetCurrentSize_BT(struct rtw_adapter *padapter);
+void rtl8723a_update_ramask(struct rtw_adapter *padapter,
+                           u32 mac_id, u8 rssi_level);
 
 #endif