merge new version v4.3.14 from https://github.com/ptpt52/rtl8812au (#160)

2025-10-19 17:11:09 +02:00 · 2016-10-10 02:54:43 +08:00
parent c962f7a88d
commit 00aedbde5c
408 changed files with 192446 additions and 81116 deletions
--- a/hal/hal_intf.c
+++ b/hal/hal_intf.c
@@ -1,7 +1,7 @@
 /******************************************************************************
 *
 * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
- *                                        
+ *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of version 2 of the GNU General Public License as
 * published by the Free Software Foundation.
@@ -21,7 +21,7 @@
 #define _HAL_INTF_C_

 #include <drv_types.h>
-
+#include <hal_data.h>

 void rtw_hal_chip_configure(_adapter *padapter)
 {
@@ -43,24 +43,53 @@ void rtw_hal_read_chip_version(_adapter *padapter)

 void rtw_hal_def_value_init(_adapter *padapter)
 {
-	if(padapter->HalFunc.init_default_value)
-		padapter->HalFunc.init_default_value(padapter);
+	if (is_primary_adapter(padapter)) {
+		if(padapter->HalFunc.init_default_value)
+			padapter->HalFunc.init_default_value(padapter);
+
+		rtw_init_hal_com_default_value(padapter);
+
+		{
+			struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
+			HAL_DATA_TYPE *hal_data = GET_HAL_DATA(padapter);
+
+			/* hal_data..macid_num is ready here */
+			dvobj->macid_ctl.num = rtw_min(hal_data->macid_num, MACID_NUM_SW_LIMIT);
+		}
+	}
 }
 void	rtw_hal_free_data(_adapter *padapter)
 {
-	if(padapter->HalFunc.free_hal_data)
-		padapter->HalFunc.free_hal_data(padapter);
+	//free HAL Data
+	rtw_hal_data_deinit(padapter);
+
+	if (is_primary_adapter(padapter))
+		if(padapter->HalFunc.free_hal_data)
+			padapter->HalFunc.free_hal_data(padapter);
 }
-void	rtw_hal_dm_init(_adapter *padapter)
+void rtw_hal_dm_init(_adapter *padapter)
 {
-	if(padapter->HalFunc.dm_init)
-		padapter->HalFunc.dm_init(padapter);
+	if (is_primary_adapter(padapter)) {
+		PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(padapter);
+		struct dm_priv	*pdmpriv = &pHalData->dmpriv;
+
+		if(padapter->HalFunc.dm_init)
+			padapter->HalFunc.dm_init(padapter);
+
+		_rtw_spinlock_init(&pdmpriv->IQKSpinLock);
+	}
 }
 void rtw_hal_dm_deinit(_adapter *padapter)
 {
-	// cancel dm  timer
-	if(padapter->HalFunc.dm_deinit)
-		padapter->HalFunc.dm_deinit(padapter);	
+	if (is_primary_adapter(padapter)) {
+		PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(padapter);
+		struct dm_priv	*pdmpriv = &pHalData->dmpriv;
+
+		if(padapter->HalFunc.dm_deinit)
+			padapter->HalFunc.dm_deinit(padapter);
+
+		_rtw_spinlock_free(&pdmpriv->IQKSpinLock);
+	}
 }
 void	rtw_hal_sw_led_init(_adapter *padapter)
 {
@@ -80,35 +109,55 @@ u32 rtw_hal_power_on(_adapter *padapter)
 		return padapter->HalFunc.hal_power_on(padapter);
 	return _FAIL;
 }
+void rtw_hal_power_off(_adapter *padapter)
+{
+	if(padapter->HalFunc.hal_power_off)
+		padapter->HalFunc.hal_power_off(padapter);
+}

+void rtw_hal_init_opmode(_adapter *padapter)
+{
+	NDIS_802_11_NETWORK_INFRASTRUCTURE networkType = Ndis802_11InfrastructureMax;
+	struct  mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+	sint fw_state;

-uint	 rtw_hal_init(_adapter *padapter) 
+	fw_state = get_fwstate(pmlmepriv);
+
+	if (fw_state & WIFI_ADHOC_STATE)
+		networkType = Ndis802_11IBSS;
+	else if (fw_state & WIFI_STATION_STATE)
+		networkType = Ndis802_11Infrastructure;
+	else if (fw_state & WIFI_AP_STATE)
+		networkType = Ndis802_11APMode;
+	else
+		return;
+
+	rtw_setopmode_cmd(padapter, networkType, _FALSE);
+}
+
+uint	 rtw_hal_init(_adapter *padapter)
 {
 	uint	status = _SUCCESS;
+	struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
+	int i;

 #ifdef CONFIG_DUALMAC_CONCURRENT
-	if(padapter->hw_init_completed == _TRUE)
-	{
+	if(padapter->hw_init_completed == _TRUE) {
 		DBG_871X("rtw_hal_init: hw_init_completed == _TRUE\n");
 		return status;
 	}

 	// before init mac0, driver must init mac1 first to avoid usb rx error.
 	if((padapter->pbuddy_adapter != NULL) && (padapter->DualMacConcurrent == _TRUE)
-		&& (padapter->adapter_type == PRIMARY_ADAPTER))
-	{
-		if(padapter->pbuddy_adapter->hw_init_completed == _TRUE)
-		{
+	   && (padapter->adapter_type == PRIMARY_ADAPTER)) {
+		if(padapter->pbuddy_adapter->hw_init_completed == _TRUE) {
 			DBG_871X("rtw_hal_init: pbuddy_adapter hw_init_completed == _TRUE\n");
-		}
-		else
-		{
+		} else {
 			status = 	padapter->HalFunc.hal_init(padapter->pbuddy_adapter);
-			if(status == _SUCCESS){
+			if(status == _SUCCESS) {
 				padapter->pbuddy_adapter->hw_init_completed = _TRUE;
-			}
-			else{
-			 	padapter->pbuddy_adapter->hw_init_completed = _FALSE;
+			} else {
+				padapter->pbuddy_adapter->hw_init_completed = _FALSE;
 				RT_TRACE(_module_hal_init_c_,_drv_err_,("rtw_hal_init: hal__init fail(pbuddy_adapter)\n"));
 				DBG_871X("rtw_hal_init: hal__init fail(pbuddy_adapter)\n");
 				return status;
@@ -117,22 +166,34 @@ uint	 rtw_hal_init(_adapter *padapter)
 	}
 #endif

-	padapter->hw_init_completed=_FALSE;
-
 	status = padapter->HalFunc.hal_init(padapter);

-	if(status == _SUCCESS){
-		padapter->hw_init_completed = _TRUE;
-			
+	if(status == _SUCCESS) {
+
+		for (i = 0; i<dvobj->iface_nums; i++)
+			dvobj->padapters[i]->hw_init_completed = _TRUE;
+
 		if (padapter->registrypriv.notch_filter == 1)
 			rtw_hal_notch_filter(padapter, 1);

 		rtw_hal_reset_security_engine(padapter);

+		for (i = 0; i<dvobj->iface_nums; i++)
+			rtw_sec_restore_wep_key(dvobj->padapters[i]);
+
 		rtw_led_control(padapter, LED_CTL_POWER_ON);
-	}
-	else{
-	 	padapter->hw_init_completed = _FALSE;
+
+		init_hw_mlme_ext(padapter);
+
+		rtw_hal_init_opmode(padapter);
+
+#ifdef CONFIG_RF_GAIN_OFFSET
+		rtw_bb_rf_gain_offset(padapter);
+#endif //CONFIG_RF_GAIN_OFFSET
+
+	} else {
+		for (i = 0; i<dvobj->iface_nums; i++)
+			dvobj->padapters[i]->hw_init_completed = _FALSE;
 		DBG_871X("rtw_hal_init: hal__init fail\n");
 	}

@@ -140,31 +201,33 @@ uint	 rtw_hal_init(_adapter *padapter)

 	return status;

-}	
+}

 uint rtw_hal_deinit(_adapter *padapter)
 {
 	uint	status = _SUCCESS;
-	
-_func_enter_;
+	struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
+	int i;
+	_func_enter_;

 	status = padapter->HalFunc.hal_deinit(padapter);

-	if(status == _SUCCESS){
+	if(status == _SUCCESS) {
 		rtw_led_control(padapter, LED_CTL_POWER_OFF);
-		padapter->hw_init_completed = _FALSE;
-	}
-	else
-	{
+		for (i = 0; i<dvobj->iface_nums; i++) {
+			padapter = dvobj->padapters[i];
+			padapter->hw_init_completed = _FALSE;
+		}
+	} else {
 		DBG_871X("\n rtw_hal_deinit: hal_init fail\n");
 	}

-_func_exit_;
-	
+	_func_exit_;
+
 	return status;
 }

-void rtw_hal_set_hwreg(_adapter *padapter, u8 variable, u8 *val)
+void rtw_hal_set_hwreg(_adapter *padapter, u8 variable, const u8 *val)
 {
 	if (padapter->HalFunc.SetHwRegHandler)
 		padapter->HalFunc.SetHwRegHandler(padapter, variable, val);
@@ -176,71 +239,108 @@ void rtw_hal_get_hwreg(_adapter *padapter, u8 variable, u8 *val)
 		padapter->HalFunc.GetHwRegHandler(padapter, variable, val);
 }

-u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue)
-{	
+#ifdef CONFIG_C2H_PACKET_EN
+void rtw_hal_set_hwreg_with_buf(_adapter *padapter, u8 variable, const u8 *pbuf, int len)
+{
+	if (padapter->HalFunc.SetHwRegHandlerWithBuf)
+		padapter->HalFunc.SetHwRegHandlerWithBuf(padapter, variable, pbuf, len);
+}
+#endif
+
+u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, const PVOID pValue)
+{
 	if(padapter->HalFunc.SetHalDefVarHandler)
 		return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue);
 	return _FAIL;
 }
 u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue)
-{	
+{
 	if(padapter->HalFunc.GetHalDefVarHandler)
 		return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue);
-	return _FAIL;	
-}	
+	return _FAIL;
+}

-void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet)
+void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, const PVOID pValue1,BOOLEAN bSet)
 {
 	if(padapter->HalFunc.SetHalODMVarHandler)
 		padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
 }
-void	rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet)
+void	rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,PVOID pValue2)
 {
 	if(padapter->HalFunc.GetHalODMVarHandler)
-		padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
+		padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,pValue2);
 }

 void rtw_hal_enable_interrupt(_adapter *padapter)
 {
 	if (padapter->HalFunc.enable_interrupt)
 		padapter->HalFunc.enable_interrupt(padapter);
-	else 
+	else
 		DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__);
-	
+
 }
 void rtw_hal_disable_interrupt(_adapter *padapter)
 {
 	if (padapter->HalFunc.disable_interrupt)
 		padapter->HalFunc.disable_interrupt(padapter);
-	else 
+	else
 		DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __FUNCTION__);
-	
+
 }

+u8 rtw_hal_check_ips_status(_adapter *padapter)
+{
+	u8 val = _FALSE;
+	if (padapter->HalFunc.check_ips_status)
+		val = padapter->HalFunc.check_ips_status(padapter);
+	else
+		DBG_871X("%s: HalFunc.check_ips_status is NULL!\n", __FUNCTION__);
+
+	return val;
+}
+
+#if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN)
+void rtw_hal_clear_interrupt(_adapter *padapter)
+{
+	if (padapter->HalFunc.clear_interrupt)
+		padapter->HalFunc.clear_interrupt(padapter);
+	else
+		DBG_871X("%s: HalFunc.clear_interrupt is NULL!\n", __FUNCTION__);
+
+}
+#endif

 u32	rtw_hal_inirp_init(_adapter *padapter)
 {
 	u32 rst = _FAIL;
-	if(padapter->HalFunc.inirp_init)	
-		rst = padapter->HalFunc.inirp_init(padapter);	
-	else		
-		DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__);		
+	if(padapter->HalFunc.inirp_init)
+		rst = padapter->HalFunc.inirp_init(padapter);
+	else
+		DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__);
 	return rst;
 }
-	
+
 u32	rtw_hal_inirp_deinit(_adapter *padapter)
 {
-	
+
 	if(padapter->HalFunc.inirp_deinit)
 		return padapter->HalFunc.inirp_deinit(padapter);

 	return _FAIL;
-		
+
 }

-u8	rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val)
-{	
-	if(padapter->HalFunc.interface_ps_func)	
+void	rtw_hal_irp_reset(_adapter *padapter)
+{
+	if(padapter->HalFunc.irp_reset)
+		padapter->HalFunc.irp_reset(padapter);
+	else
+		DBG_871X("%s: HalFunc.rtw_hal_irp_reset is NULL!\n", __FUNCTION__);
+}
+
+u8	rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, const u8* val)
+{
+	if(padapter->HalFunc.interface_ps_func)
 		return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val);
 	return _FAIL;
 }
@@ -250,7 +350,7 @@ s32	rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
 	if(padapter->HalFunc.hal_xmitframe_enqueue)
 		return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe);

-	return _FALSE;	
+	return _FALSE;
 }

 s32	rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe)
@@ -258,22 +358,42 @@ s32	rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe)
 	if(padapter->HalFunc.hal_xmit)
 		return padapter->HalFunc.hal_xmit(padapter, pxmitframe);

-	return _FALSE;	
+	return _FALSE;
 }

+/*
+ * [IMPORTANT] This function would be run in interrupt context.
+ */
 s32	rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe)
 {
 	s32 ret = _FAIL;
-
+	//unsigned char	*pframe;
+	//struct rtw_ieee80211_hdr	*pwlanhdr;
 	update_mgntframe_attrib_addr(padapter, pmgntframe);
-	
+	//pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
+	//pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
+	//_rtw_memcpy(pmgntframe->attrib.ra, pwlanhdr->addr1, ETH_ALEN);
+
+#ifdef CONFIG_IEEE80211W
+	if(padapter->securitypriv.binstallBIPkey == _TRUE) {
+		if(IS_MCAST(pmgntframe->attrib.ra)) {
+			pmgntframe->attrib.encrypt = _BIP_;
+			//pmgntframe->attrib.bswenc = _TRUE;
+		} else {
+			pmgntframe->attrib.encrypt = _AES_;
+			pmgntframe->attrib.bswenc = _TRUE;
+		}
+		rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe);
+	}
+#endif //CONFIG_IEEE80211W
+
 	if(padapter->HalFunc.mgnt_xmit)
 		ret = padapter->HalFunc.mgnt_xmit(padapter, pmgntframe);
 	return ret;
 }

 s32	rtw_hal_init_xmit_priv(_adapter *padapter)
-{	
+{
 	if(padapter->HalFunc.init_xmit_priv != NULL)
 		return padapter->HalFunc.init_xmit_priv(padapter);
 	return _FAIL;
@@ -285,7 +405,7 @@ void	rtw_hal_free_xmit_priv(_adapter *padapter)
 }

 s32	rtw_hal_init_recv_priv(_adapter *padapter)
-{	
+{
 	if(padapter->HalFunc.init_recv_priv)
 		return padapter->HalFunc.init_recv_priv(padapter);

@@ -293,7 +413,7 @@ s32	rtw_hal_init_recv_priv(_adapter *padapter)
 }
 void	rtw_hal_free_recv_priv(_adapter *padapter)
 {
-	
+
 	if(padapter->HalFunc.free_recv_priv)
 		padapter->HalFunc.free_recv_priv(padapter);
 }
@@ -309,13 +429,10 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
 	padapter = psta->padapter;

 	pmlmepriv = &(padapter->mlmepriv);
-	
-	if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
-	{
+
+	if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) {
 		add_RATid(padapter, psta, rssi_level);
-	}
-	else
-	{
+	} else {
 		if(padapter->HalFunc.UpdateRAMaskHandler)
 			padapter->HalFunc.UpdateRAMaskHandler(padapter, psta->mac_id, rssi_level);
 	}
@@ -326,13 +443,7 @@ void	rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8* arg, u8 rssi_level)
 	if(padapter->HalFunc.Add_RateATid)
 		padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level);
 }
-#ifdef CONFIG_CONCURRENT_MODE	
-void	rtw_hal_clone_data(_adapter *dst_padapter, _adapter *src_padapter)
-{
-	if(dst_padapter->HalFunc.clone_haldata)
-		dst_padapter->HalFunc.clone_haldata(dst_padapter, src_padapter);
-}
-#endif
+
 /*	Start specifical interface thread		*/
 void	rtw_hal_start_thread(_adapter *padapter)
 {
@@ -350,7 +461,7 @@ u32	rtw_hal_read_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask)
 {
 	u32 data = 0;
 	if(padapter->HalFunc.read_bbreg)
-		 data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask);
+		data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask);
 	return data;
 }
 void	rtw_hal_write_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data)
@@ -369,7 +480,7 @@ u32	rtw_hal_read_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask
 void	rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data)
 {
 	if(padapter->HalFunc.write_rfreg)
-		padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data);	
+		padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data);
 }

 s32	rtw_hal_interrupt_handler(_adapter *padapter)
@@ -381,20 +492,56 @@ s32	rtw_hal_interrupt_handler(_adapter *padapter)

 void	rtw_hal_set_bwmode(_adapter *padapter, CHANNEL_WIDTH Bandwidth, u8 Offset)
 {
-	if(padapter->HalFunc.set_bwmode_handler)
+	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(padapter);
+	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
+
+	if(padapter->HalFunc.set_bwmode_handler) {
+		ODM_AcquireSpinLock( pDM_Odm, RT_IQK_SPINLOCK);
+		if(pDM_Odm->RFCalibrateInfo.bIQKInProgress == _TRUE)
+			DBG_871X_LEVEL(_drv_err_, "%s, %d, IQK may race condition\n", __func__,__LINE__);
+		ODM_ReleaseSpinLock( pDM_Odm, RT_IQK_SPINLOCK);
 		padapter->HalFunc.set_bwmode_handler(padapter, Bandwidth, Offset);
+	}
 }

 void	rtw_hal_set_chan(_adapter *padapter, u8 channel)
 {
-	if(padapter->HalFunc.set_channel_handler)
+	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(padapter);
+	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
+
+	if(padapter->HalFunc.set_channel_handler) {
+		ODM_AcquireSpinLock( pDM_Odm, RT_IQK_SPINLOCK);
+		if(pDM_Odm->RFCalibrateInfo.bIQKInProgress == _TRUE)
+			DBG_871X_LEVEL(_drv_err_, "%s, %d, IQK may race condition\n", __func__,__LINE__);
+		ODM_ReleaseSpinLock( pDM_Odm, RT_IQK_SPINLOCK);
 		padapter->HalFunc.set_channel_handler(padapter, channel);
+	}
 }

 void	rtw_hal_set_chnl_bw(_adapter *padapter, u8 channel, CHANNEL_WIDTH Bandwidth, u8 Offset40, u8 Offset80)
 {
-	if(padapter->HalFunc.set_chnl_bw_handler)
+	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(padapter);
+	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
+
+	if(padapter->HalFunc.set_chnl_bw_handler) {
+		ODM_AcquireSpinLock( pDM_Odm, RT_IQK_SPINLOCK);
+		if(pDM_Odm->RFCalibrateInfo.bIQKInProgress == _TRUE)
+			DBG_871X_LEVEL(_drv_err_, "%s, %d, IQK may race condition\n", __func__,__LINE__);
+		ODM_ReleaseSpinLock( pDM_Odm, RT_IQK_SPINLOCK);
 		padapter->HalFunc.set_chnl_bw_handler(padapter, channel, Bandwidth, Offset40, Offset80);
+	}
+}
+
+void	rtw_hal_set_tx_power_level(_adapter *padapter, u8 channel)
+{
+	if(padapter->HalFunc.set_tx_power_level_handler)
+		padapter->HalFunc.set_tx_power_level_handler(padapter, channel);
+}
+
+void	rtw_hal_get_tx_power_level(_adapter *padapter, s32 *powerlevel)
+{
+	if(padapter->HalFunc.get_tx_power_level_handler)
+		padapter->HalFunc.get_tx_power_level_handler(padapter, powerlevel);
 }

 void	rtw_hal_dm_watchdog(_adapter *padapter)
@@ -402,26 +549,42 @@ void	rtw_hal_dm_watchdog(_adapter *padapter)
 #if defined(CONFIG_CONCURRENT_MODE)
 	if (padapter->adapter_type != PRIMARY_ADAPTER)
 		return;
-#endif	
+#endif
+
 	if(padapter->HalFunc.hal_dm_watchdog)
 		padapter->HalFunc.hal_dm_watchdog(padapter);
+
+}
+
+void	rtw_hal_dm_watchdog_in_lps(_adapter *padapter)
+{
+#if defined(CONFIG_CONCURRENT_MODE)
+	if (padapter->iface_type != IFACE_PORT0)
+		return;
+#endif
+
+	if (adapter_to_pwrctl(padapter)->bFwCurrentInPSMode ==_TRUE ) {
+		if(padapter->HalFunc.hal_dm_watchdog_in_lps) {
+			padapter->HalFunc.hal_dm_watchdog_in_lps(padapter);//this fuction caller is in interrupt context
+		}
+	}
 }

 void rtw_hal_bcn_related_reg_setting(_adapter *padapter)
 {
 	if(padapter->HalFunc.SetBeaconRelatedRegistersHandler)
-		padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);	
+		padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);
 }


 #ifdef CONFIG_ANTENNA_DIVERSITY
 u8	rtw_hal_antdiv_before_linked(_adapter *padapter)
-{	
+{
 	if(padapter->HalFunc.AntDivBeforeLinkHandler)
 		return padapter->HalFunc.AntDivBeforeLinkHandler(padapter);
-	return _FALSE;		
+	return _FALSE;
 }
-void	rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src)
+void	rtw_hal_antdiv_rssi_compared(_adapter *padapter, const WLAN_BSSID_EX *dst, const WLAN_BSSID_EX *src)
 {
 	if(padapter->HalFunc.AntDivCompareHandler)
 		padapter->HalFunc.AntDivCompareHandler(padapter, dst, src);
@@ -441,7 +604,7 @@ s32	rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
 void	rtw_hal_sreset_init(_adapter *padapter)
 {
 	if(padapter->HalFunc.sreset_init_value)
-		padapter->HalFunc.sreset_init_value(padapter); 
+		padapter->HalFunc.sreset_init_value(padapter);
 }
 void rtw_hal_sreset_reset(_adapter *padapter)
 {
@@ -459,23 +622,25 @@ void rtw_hal_sreset_reset_value(_adapter *padapter)

 void rtw_hal_sreset_xmit_status_check(_adapter *padapter)
 {
-#ifdef CONFIG_CONCURRENT_MODE
-	if (padapter->adapter_type != PRIMARY_ADAPTER)
+	if (!is_primary_adapter(padapter))
 		return;
-#endif
+
 	if(padapter->HalFunc.sreset_xmit_status_check)
-		padapter->HalFunc.sreset_xmit_status_check(padapter);		
+		padapter->HalFunc.sreset_xmit_status_check(padapter);
 }
 void rtw_hal_sreset_linked_status_check(_adapter *padapter)
 {
+	if (!is_primary_adapter(padapter))
+		return;
+
 	if(padapter->HalFunc.sreset_linked_status_check)
-		padapter->HalFunc.sreset_linked_status_check(padapter);	
+		padapter->HalFunc.sreset_linked_status_check(padapter);
 }
 u8   rtw_hal_sreset_get_wifi_status(_adapter *padapter)
 {
 	u8 status = 0;
-	if(padapter->HalFunc.sreset_get_wifi_status)				
-		status = padapter->HalFunc.sreset_get_wifi_status(padapter);       
+	if(padapter->HalFunc.sreset_get_wifi_status)
+		status = padapter->HalFunc.sreset_get_wifi_status(padapter);
 	return status;
 }

@@ -512,7 +677,7 @@ s32 rtw_hal_xmit_thread_handler(_adapter *padapter)
 void rtw_hal_notch_filter(_adapter *adapter, bool enable)
 {
 	if(adapter->HalFunc.hal_notch_filter)
-		adapter->HalFunc.hal_notch_filter(adapter,enable);		
+		adapter->HalFunc.hal_notch_filter(adapter,enable);
 }

 void rtw_hal_reset_security_engine(_adapter * adapter)
@@ -521,7 +686,41 @@ void rtw_hal_reset_security_engine(_adapter * adapter)
 		adapter->HalFunc.hal_reset_security_engine(adapter);
 }

-s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
+bool rtw_hal_c2h_valid(_adapter *adapter, const u8 *buf)
+{
+	HAL_DATA_TYPE *HalData = GET_HAL_DATA(adapter);
+	HAL_VERSION *hal_ver = &HalData->VersionID;
+	bool ret = _FAIL;
+
+	if (IS_81XXC(*hal_ver) || IS_8723_SERIES(*hal_ver) ||IS_92D(*hal_ver) ||IS_8188E(*hal_ver)) {
+		ret = c2h_evt_valid((const struct c2h_evt_hdr *)buf);
+	} else if(IS_8192E(*hal_ver) || IS_8812_SERIES(*hal_ver) || IS_8821_SERIES(*hal_ver) || IS_8723B_SERIES(*hal_ver)) {
+		ret = c2h_evt_valid((const struct c2h_evt_hdr_88xx*)buf);
+	} else {
+		rtw_warn_on(1);
+	}
+
+	return ret;
+}
+
+s32 rtw_hal_c2h_evt_read(_adapter *adapter, u8 *buf)
+{
+	HAL_DATA_TYPE *HalData = GET_HAL_DATA(adapter);
+	HAL_VERSION *hal_ver = &HalData->VersionID;
+	s32 ret = _FAIL;
+
+	if (IS_81XXC(*hal_ver) || IS_8723_SERIES(*hal_ver) ||IS_92D(*hal_ver) ||IS_8188E(*hal_ver)) {
+		ret = c2h_evt_read(adapter, buf);
+	} else if(IS_8192E(*hal_ver) || IS_8812_SERIES(*hal_ver) || IS_8821_SERIES(*hal_ver) || IS_8723B_SERIES(*hal_ver)) {
+		ret = c2h_evt_read_88xx(adapter, buf);
+	} else {
+		rtw_warn_on(1);
+	}
+
+	return ret;
+}
+
+s32 rtw_hal_c2h_handler(_adapter *adapter, u8 *c2h_evt)
 {
 	s32 ret = _FAIL;
 	if (adapter->HalFunc.c2h_handler)
@@ -530,7 +729,76 @@ s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
 }

 c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter)
-{	
-	return adapter->HalFunc.c2h_id_filter_ccx;	
+{
+	return adapter->HalFunc.c2h_id_filter_ccx;
 }

+s32 rtw_hal_is_disable_sw_channel_plan(PADAPTER padapter)
+{
+	return GET_HAL_DATA(padapter)->bDisableSWChannelPlan;
+}
+
+s32 rtw_hal_macid_sleep(PADAPTER padapter, u8 macid)
+{
+	struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
+	struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
+	u8 support;
+
+	support = _FALSE;
+	rtw_hal_get_def_var(padapter, HAL_DEF_MACID_SLEEP, &support);
+	if (_FALSE == support)
+		return _FAIL;
+
+	if (macid >= macid_ctl->num) {
+		DBG_871X_LEVEL(_drv_err_, FUNC_ADPT_FMT": Invalid macid(%u)\n",
+		               FUNC_ADPT_ARG(padapter), macid);
+		return _FAIL;
+	}
+
+	rtw_hal_set_hwreg(padapter, HW_VAR_MACID_SLEEP, &macid);
+
+	return _SUCCESS;
+}
+
+s32 rtw_hal_macid_wakeup(PADAPTER padapter, u8 macid)
+{
+	struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
+	struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
+	u8 support;
+
+	support = _FALSE;
+	rtw_hal_get_def_var(padapter, HAL_DEF_MACID_SLEEP, &support);
+	if (_FALSE == support)
+		return _FAIL;
+
+	if (macid >= macid_ctl->num) {
+		DBG_871X_LEVEL(_drv_err_, FUNC_ADPT_FMT": Invalid macid(%u)\n",
+		               FUNC_ADPT_ARG(padapter), macid);
+		return _FAIL;
+	}
+
+	rtw_hal_set_hwreg(padapter, HW_VAR_MACID_WAKEUP, &macid);
+
+	return _SUCCESS;
+}
+
+s32 rtw_hal_fill_h2c_cmd(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
+{
+	s32 ret = _FAIL;
+
+	if (padapter->HalFunc.fill_h2c_cmd)
+		ret = padapter->HalFunc.fill_h2c_cmd(padapter, ElementID, CmdLen, pCmdBuffer);
+	else {
+		DBG_871X("%s:  func[fill_h2c_cmd] not defined!\n", __FUNCTION__);
+		rtw_warn_on(1);
+	}
+
+	return ret;
+}
+#ifdef CONFIG_GPIO_API
+void rtw_hal_update_hisr_hsisr_ind(_adapter *padapter, u32 flag)
+{
+	if (padapter->HalFunc.update_hisr_hsisr_ind)
+		padapter->HalFunc.update_hisr_hsisr_ind(padapter, flag);
+}
+#endif