staging: rtl8723bs: update to the latest driver

[android-x86/kernel.git] / drivers / staging / rtl8723bs / core / rtw_btcoex.c

diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index 55b3410..03332d5 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -11,52 +11,49 @@
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
  ******************************************************************************/
+#include <drv_types.h>
+#include <rtw_debug.h>
 #include <rtw_btcoex.h>
 #include <hal_btcoex.h>
 
 
-void rtw_btcoex_Initialize(PADAPTER padapter)
+void rtw_btcoex_Initialize(struct adapter *padapter)
 {
        hal_btcoex_Initialize(padapter);
 }
 
-void rtw_btcoex_PowerOnSetting(PADAPTER padapter)
+void rtw_btcoex_PowerOnSetting(struct adapter *padapter)
 {
        hal_btcoex_PowerOnSetting(padapter);
 }
 
-void rtw_btcoex_HAL_Initialize(PADAPTER padapter, u8 bWifiOnly)
+void rtw_btcoex_HAL_Initialize(struct adapter *padapter, u8 bWifiOnly)
 {
        hal_btcoex_InitHwConfig(padapter, bWifiOnly);
 }
 
-void rtw_btcoex_IpsNotify(PADAPTER padapter, u8 type)
+void rtw_btcoex_IpsNotify(struct adapter *padapter, u8 type)
 {
        hal_btcoex_IpsNotify(padapter, type);
 }
 
-void rtw_btcoex_LpsNotify(PADAPTER padapter, u8 type)
+void rtw_btcoex_LpsNotify(struct adapter *padapter, u8 type)
 {
        hal_btcoex_LpsNotify(padapter, type);
 }
 
-void rtw_btcoex_ScanNotify(PADAPTER padapter, u8 type)
+void rtw_btcoex_ScanNotify(struct adapter *padapter, u8 type)
 {
        hal_btcoex_ScanNotify(padapter, type);
 }
 
-void rtw_btcoex_ConnectNotify(PADAPTER padapter, u8 action)
+void rtw_btcoex_ConnectNotify(struct adapter *padapter, u8 action)
 {
        hal_btcoex_ConnectNotify(padapter, action);
 }
 
-void rtw_btcoex_MediaStatusNotify(PADAPTER padapter, u8 mediaStatus)
+void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus)
 {
        if ((RT_MEDIA_CONNECT == mediaStatus)
                && (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true))
@@ -67,31 +64,31 @@ void rtw_btcoex_MediaStatusNotify(PADAPTER padapter, u8 mediaStatus)
        hal_btcoex_MediaStatusNotify(padapter, mediaStatus);
 }
 
-void rtw_btcoex_SpecialPacketNotify(PADAPTER padapter, u8 pktType)
+void rtw_btcoex_SpecialPacketNotify(struct adapter *padapter, u8 pktType)
 {
        hal_btcoex_SpecialPacketNotify(padapter, pktType);
 }
 
-void rtw_btcoex_IQKNotify(PADAPTER padapter, u8 state)
+void rtw_btcoex_IQKNotify(struct adapter *padapter, u8 state)
 {
        hal_btcoex_IQKNotify(padapter, state);
 }
 
-void rtw_btcoex_BtInfoNotify(PADAPTER padapter, u8 length, u8 *tmpBuf)
+void rtw_btcoex_BtInfoNotify(struct adapter *padapter, u8 length, u8 *tmpBuf)
 {
        hal_btcoex_BtInfoNotify(padapter, length, tmpBuf);
 }
 
-void rtw_btcoex_SuspendNotify(PADAPTER padapter, u8 state)
+void rtw_btcoex_SuspendNotify(struct adapter *padapter, u8 state)
 {
        hal_btcoex_SuspendNotify(padapter, state);
 }
 
-void rtw_btcoex_HaltNotify(PADAPTER padapter)
+void rtw_btcoex_HaltNotify(struct adapter *padapter)
 {
        if (false == padapter->bup)
        {
-               DBG_871X(FUNC_ADPT_FMT ": bup=%d Skip!\n",
+               DBG_871X(FUNC_ADPT_FMT ": bup =%d Skip!\n",
                        FUNC_ADPT_ARG(padapter), padapter->bup);
 
                return;
@@ -99,7 +96,7 @@ void rtw_btcoex_HaltNotify(PADAPTER padapter)
 
        if (true == padapter->bSurpriseRemoved)
        {
-               DBG_871X(FUNC_ADPT_FMT ": bSurpriseRemoved=%d Skip!\n",
+               DBG_871X(FUNC_ADPT_FMT ": bSurpriseRemoved =%d Skip!\n",
                        FUNC_ADPT_ARG(padapter), padapter->bSurpriseRemoved);
 
                return;
@@ -108,17 +105,17 @@ void rtw_btcoex_HaltNotify(PADAPTER padapter)
        hal_btcoex_HaltNotify(padapter);
 }
 
-u8 rtw_btcoex_IsBtDisabled(PADAPTER padapter)
+u8 rtw_btcoex_IsBtDisabled(struct adapter *padapter)
 {
        return hal_btcoex_IsBtDisabled(padapter);
 }
 
-void rtw_btcoex_Handler(PADAPTER padapter)
+void rtw_btcoex_Handler(struct adapter *padapter)
 {
        hal_btcoex_Hanlder(padapter);
 }
 
-s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(PADAPTER padapter)
+s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter)
 {
        s32 coexctrl;
 
@@ -127,7 +124,7 @@ s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(PADAPTER padapter)
        return coexctrl;
 }
 
-void rtw_btcoex_SetManualControl(PADAPTER padapter, u8 manual)
+void rtw_btcoex_SetManualControl(struct adapter *padapter, u8 manual)
 {
        if (true == manual)
        {
@@ -139,75 +136,75 @@ void rtw_btcoex_SetManualControl(PADAPTER padapter, u8 manual)
        }
 }
 
-u8 rtw_btcoex_IsBtControlLps(PADAPTER padapter)
+u8 rtw_btcoex_IsBtControlLps(struct adapter *padapter)
 {
        return hal_btcoex_IsBtControlLps(padapter);
 }
 
-u8 rtw_btcoex_IsLpsOn(PADAPTER padapter)
+u8 rtw_btcoex_IsLpsOn(struct adapter *padapter)
 {
        return hal_btcoex_IsLpsOn(padapter);
 }
 
-u8 rtw_btcoex_RpwmVal(PADAPTER padapter)
+u8 rtw_btcoex_RpwmVal(struct adapter *padapter)
 {
        return hal_btcoex_RpwmVal(padapter);
 }
 
-u8 rtw_btcoex_LpsVal(PADAPTER padapter)
+u8 rtw_btcoex_LpsVal(struct adapter *padapter)
 {
        return hal_btcoex_LpsVal(padapter);
 }
 
-void rtw_btcoex_SetBTCoexist(PADAPTER padapter, u8 bBtExist)
+void rtw_btcoex_SetBTCoexist(struct adapter *padapter, u8 bBtExist)
 {
        hal_btcoex_SetBTCoexist(padapter, bBtExist);
 }
 
-void rtw_btcoex_SetChipType(PADAPTER padapter, u8 chipType)
+void rtw_btcoex_SetChipType(struct adapter *padapter, u8 chipType)
 {
        hal_btcoex_SetChipType(padapter, chipType);
 }
 
-void rtw_btcoex_SetPGAntNum(PADAPTER padapter, u8 antNum)
+void rtw_btcoex_SetPGAntNum(struct adapter *padapter, u8 antNum)
 {
        hal_btcoex_SetPgAntNum(padapter, antNum);
 }
 
-void rtw_btcoex_SetSingleAntPath(PADAPTER padapter, u8 singleAntPath)
+void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath)
 {
        hal_btcoex_SetSingleAntPath(padapter, singleAntPath);
 }
 
-u32 rtw_btcoex_GetRaMask(PADAPTER padapter)
+u32 rtw_btcoex_GetRaMask(struct adapter *padapter)
 {
        return hal_btcoex_GetRaMask(padapter);
 }
 
-void rtw_btcoex_RecordPwrMode(PADAPTER padapter, u8 *pCmdBuf, u8 cmdLen)
+void rtw_btcoex_RecordPwrMode(struct adapter *padapter, u8 *pCmdBuf, u8 cmdLen)
 {
        hal_btcoex_RecordPwrMode(padapter, pCmdBuf, cmdLen);
 }
 
-void rtw_btcoex_DisplayBtCoexInfo(PADAPTER padapter, u8 *pbuf, u32 bufsize)
+void rtw_btcoex_DisplayBtCoexInfo(struct adapter *padapter, u8 *pbuf, u32 bufsize)
 {
        hal_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize);
 }
 
-void rtw_btcoex_SetDBG(PADAPTER padapter, u32 *pDbgModule)
+void rtw_btcoex_SetDBG(struct adapter *padapter, u32 *pDbgModule)
 {
        hal_btcoex_SetDBG(padapter, pDbgModule);
 }
 
-u32 rtw_btcoex_GetDBG(PADAPTER padapter, u8 *pStrBuf, u32 bufSize)
+u32 rtw_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)
 {
        return hal_btcoex_GetDBG(padapter, pStrBuf, bufSize);
 }
 
-// ==================================================
-// Below Functions are called by BT-Coex
-// ==================================================
-void rtw_btcoex_RejectApAggregatedPacket(PADAPTER padapter, u8 enable)
+/*  ================================================== */
+/*  Below Functions are called by BT-Coex */
+/*  ================================================== */
+void rtw_btcoex_RejectApAggregatedPacket(struct adapter *padapter, u8 enable)
 {
        struct mlme_ext_info *pmlmeinfo;
        struct sta_info *psta;
@@ -227,7 +224,7 @@ void rtw_btcoex_RejectApAggregatedPacket(PADAPTER padapter, u8 enable)
        }
 }
 
-void rtw_btcoex_LPS_Enter(PADAPTER padapter)
+void rtw_btcoex_LPS_Enter(struct adapter *padapter)
 {
        struct pwrctrl_priv *pwrpriv;
        u8 lpsVal;
@@ -240,7 +237,7 @@ void rtw_btcoex_LPS_Enter(PADAPTER padapter)
        rtw_set_ps_mode(padapter, PS_MODE_MIN, 0, lpsVal, "BTCOEX");
 }
 
-void rtw_btcoex_LPS_Leave(PADAPTER padapter)
+void rtw_btcoex_LPS_Leave(struct adapter *padapter)
 {
        struct pwrctrl_priv *pwrpriv;