diff --git a/core/rtw_mp.c b/core/rtw_mp.c
index c53fa39..71562b3 100644
--- a/core/rtw_mp.c
+++ b/core/rtw_mp.c
@@ -250,7 +250,7 @@ MPT_InitializeAdapter(
 		u8				Channel
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	s32		rtStatus = _SUCCESS;
 	PMPT_CONTEXT	pMptCtx = &pAdapter->mppriv.MptCtx;
 	struct mlme_priv *pmlmepriv = &pAdapter->mlmepriv;
@@ -355,7 +355,7 @@ void GetPowerTracking(PADAPTER padapter, u8 *enable)
 static void disable_dm(PADAPTER padapter)
 {
 	u8 v8;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 
 
@@ -933,7 +933,7 @@ void SetPacketTx(PADAPTER padapter)
 
 void SetPacketRx(PADAPTER pAdapter, u8 bStartRx)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	if (bStartRx) {
 		/*  Accept CRC error and destination address */
diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c
index 399438c..f4fafd7 100644
--- a/core/rtw_sreset.c
+++ b/core/rtw_sreset.c
@@ -22,7 +22,7 @@
 
 void sreset_init_value(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
 	_rtw_mutex_init(&psrtpriv->silentreset_mutex);
@@ -33,7 +33,7 @@ void sreset_init_value(_adapter *padapter)
 }
 void sreset_reset_value(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
 	psrtpriv->silent_reset_inprogress = false;
@@ -44,7 +44,7 @@ void sreset_reset_value(_adapter *padapter)
 
 u8 sreset_get_wifi_status(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
 	u8 status = WIFI_STATUS_SUCCESS;
@@ -78,6 +78,6 @@ u8 sreset_get_wifi_status(_adapter *padapter)
 
 void sreset_set_wifi_error_status(_adapter *padapter, u32 status)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	pHalData->srestpriv.Wifi_Error_Status = status;
 }
diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c
index 675ddfa..11dc688 100644
--- a/hal/HalPhyRf_8188e.c
+++ b/hal/HalPhyRf_8188e.c
@@ -152,7 +152,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
 	)
 {
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u1Byte			ThermalValue = 0, delta, delta_LCK, delta_IQK, offset;
 	u1Byte			ThermalValue_AVG_count = 0;
 	u4Byte			ThermalValue_AVG = 0;
@@ -553,7 +553,7 @@ phy_PathA_IQK_8188E(
 {
 	u4Byte regEAC, regE94, regE9C, regEA4;
 	u1Byte result = 0x00;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A IQK!\n"));
 
@@ -606,7 +606,7 @@ phy_PathA_RxIQK(
 {
 	u4Byte regEAC, regE94, regE9C, regEA4, u4tmp;
 	u1Byte result = 0x00;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path A Rx IQK!\n"));
 
@@ -739,7 +739,7 @@ phy_PathB_IQK_8188E(
 {
 	u4Byte regEAC, regEB4, regEBC, regEC4, regECC;
 	u1Byte	result = 0x00;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("Path B IQK!\n"));
 
@@ -795,7 +795,7 @@ _PHY_PathAFillIQKMatrix(
 {
 	u4Byte	Oldval_0, X, TX0_A, reg;
 	s4Byte	Y, TX0_C;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("Path A IQ Calibration %s !\n",(bIQKOK)?"Success":"Failed"));
 
@@ -855,7 +855,7 @@ _PHY_PathBFillIQKMatrix(
 {
 	u4Byte	Oldval_1, X, TX1_A, reg;
 	s4Byte	Y, TX1_C;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Path B IQ Calibration %s !\n",(bIQKOK)?"Success":"Failed"));
 
@@ -920,7 +920,7 @@ _PHY_SaveADDARegisters(
 	)
 {
 	u4Byte	i;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	if (ODM_CheckPowerStatus(pAdapter) == false)
@@ -940,7 +940,7 @@ static void _PHY_SaveMACRegisters(
 	)
 {
 	u4Byte	i;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Save MAC parameters.\n"));
 	for ( i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++){
@@ -960,7 +960,7 @@ _PHY_ReloadADDARegisters(
 	)
 {
 	u4Byte	i;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("Reload ADDA power saving parameters !\n"));
@@ -978,7 +978,7 @@ _PHY_ReloadMACRegisters(
 	)
 {
 	u4Byte	i;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("Reload MAC parameters !\n"));
@@ -999,7 +999,7 @@ _PHY_PathADDAOn(
 {
 	u4Byte	pathOn;
 	u4Byte	i;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("ADDA ON.\n"));
 
@@ -1026,7 +1026,7 @@ _PHY_MACSettingCalibration(
 	)
 {
 	u4Byte	i = 0;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("MAC settings for Calibration.\n"));
@@ -1045,7 +1045,7 @@ _PHY_PathAStandBy(
 	PADAPTER	pAdapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD,  ("Path-A standby mode!\n"));
@@ -1061,7 +1061,7 @@ static void _PHY_PIModeSwitch(
 	)
 {
 	u4Byte	mode;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	ODM_RT_TRACE(pDM_Odm,ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("BB Switch to %s mode!\n", (PIMode ? "PI" : "SI")));
@@ -1079,7 +1079,7 @@ static bool phy_SimularityCompare_8188E(
 	)
 {
 	u4Byte		i, j, diff, SimularityBitMap, bound = 0;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	u1Byte		final_candidate[2] = {0xFF, 0xFF};	/* for path A and path B */
 	bool		bResult = true;
@@ -1198,7 +1198,7 @@ static void phy_IQCalibrate_8188E(
 		bool		is2T
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	u4Byte			i;
 	u1Byte			PathAOK, PathBOK;
@@ -1386,7 +1386,7 @@ static void phy_LCCalibrate_8188E(
 {
 	u1Byte	tmpReg;
 	u4Byte	RF_Amode=0, RF_Bmode=0, LC_Cal;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	/* Check continuous TX and Packet TX */
@@ -1453,7 +1453,7 @@ static void phy_APCalibrate_8188E(
 		bool		is2T
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 	u4Byte			regD[PATH_NUM];
 	u4Byte			tmpReg, index, offset,  apkbound;
@@ -1885,7 +1885,7 @@ PHY_IQCalibrate_8188E(
 		bool		bReCovery
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
@@ -2076,7 +2076,7 @@ PHY_LCCalibrate_8188E(
 	bool			bSingleTone = false, bCarrierSuppression = false;
 	u4Byte			timeout = 2000, timecount = 0;
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
@@ -2135,7 +2135,7 @@ PHY_APCalibrate_8188E(
 		s1Byte		delta
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 #if DISABLE_BB_RF
@@ -2167,7 +2167,7 @@ static void phy_SetRFPathSwitch_8188E(
 		bool		is2T
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 	if (pAdapter->hw_init_completed == false)
@@ -2199,7 +2199,7 @@ void PHY_SetRFPathSwitch_8188E(
 		bool		bMain
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PDM_ODM_T		pDM_Odm = &pHalData->odmpriv;
 
 #if DISABLE_BB_RF
diff --git a/hal/odm.c b/hal/odm.c
index 9ec05c7..e852185 100644
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -2163,7 +2163,7 @@ odm_DynamicTxPowerInit(
 	)
 {
 	PADAPTER	Adapter = pDM_Odm->Adapter;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	pdmpriv->bDynamicTxPowerEnable = false;
 	pdmpriv->LastDTPLvl = TxHighPwrLevel_Normal;
@@ -2179,7 +2179,7 @@ odm_DynamicTxPowerSavePowerIndex(
 	u4Byte		Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
 
 	PADAPTER	Adapter = pDM_Odm->Adapter;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	for (index = 0; index< 6; index++)
 		pdmpriv->PowerIndex_backup[index] = rtw_read8(Adapter, Power_Index_REG[index]);
@@ -2193,7 +2193,7 @@ odm_DynamicTxPowerRestorePowerIndex(
 	u1Byte			index;
 	PADAPTER		Adapter = pDM_Odm->Adapter;
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u4Byte			Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	for (index = 0; index< 6; index++)
@@ -2349,7 +2349,7 @@ FindMinimumRSSI(
 	PADAPTER	pAdapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	struct mlme_priv	*pmlmepriv = &pAdapter->mlmepriv;
 
@@ -2375,7 +2375,7 @@ odm_RSSIMonitorCheckCE(
 	)
 {
 	PADAPTER	Adapter = pDM_Odm->Adapter;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	int	i;
 	int	tmpEntryMaxPWDB=0, tmpEntryMinPWDB=0xff;
@@ -2993,7 +2993,7 @@ odm_EdcaTurboCheckCE(
 	u64	cur_tx_bytes = 0;
 	u64	cur_rx_bytes = 0;
 	u8	bbtchange = false;
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	struct xmit_priv		*pxmitpriv = &(Adapter->xmitpriv);
 	struct recv_priv		*precvpriv = &(Adapter->recvpriv);
 	struct registry_priv	*pregpriv = &Adapter->registrypriv;
diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c
index ed6ce04..f834b52 100644
--- a/hal/odm_RTL8188E.c
+++ b/hal/odm_RTL8188E.c
@@ -512,7 +512,7 @@ odm_DynamicPrimaryCCA(
 	PADAPTER	Adapter =  pDM_Odm->Adapter;	/*  for NIC */
 	prtl8192cd_priv	priv		= pDM_Odm->priv;	/*  for AP */
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	Pfalse_ALARM_STATISTICS		FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);
 	pPri_CCA_T		PrimaryCCA = &(pDM_Odm->DM_PriCCA);
diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c
index f78e766..4a6d06c 100644
--- a/hal/rtl8188e_cmd.c
+++ b/hal/rtl8188e_cmd.c
@@ -74,7 +74,7 @@ static s32 FillH2CCmd_88E(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdB
 	u8 h2c_box_num;
 	u32	msgbox_addr;
 	u32 msgbox_ex_addr;
-	HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
 	u8 cmd_idx,ext_cmd_len;
 	u32	h2c_cmd = 0;
 	u32	h2c_cmd_ex = 0;
@@ -146,7 +146,7 @@ _func_exit_;
 u8 rtl8188e_set_rssi_cmd(_adapter*padapter, u8 *param)
 {
 	u8	res=_SUCCESS;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 _func_enter_;
 
 	if (pHalData->fw_ractrl == true){
@@ -165,7 +165,7 @@ u8 rtl8188e_set_raid_cmd(_adapter*padapter, u32 mask)
 {
 	u8	buf[3];
 	u8	res=_SUCCESS;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 _func_enter_;
 	if (pHalData->fw_ractrl == true){
@@ -193,7 +193,7 @@ _func_exit_;
 /* arg[5] = Short GI */
 void rtl8188e_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	u8 macid, init_rate, raid, shortGIrate=false;
 
@@ -543,7 +543,7 @@ CheckFwRsvdPageContent(
 /*  2009.10.15 by tynli. */
 static void SetFwRsvdPagePkt(PADAPTER padapter, bool bDLFinished)
 {
-	PHAL_DATA_TYPE pHalData;
+	struct hal_data_8188e *pHalData;
 	struct xmit_frame	*pmgntframe;
 	struct pkt_attrib	*pattrib;
 	struct xmit_priv	*pxmitpriv;
@@ -666,7 +666,7 @@ exit:
 void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
 {
 	JOINBSSRPT_PARM	JoinBssRptParm;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);
 	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
 	bool		bSendBeacon=false;
@@ -783,7 +783,7 @@ _func_exit_;
 
 void rtl8188e_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct pwrctrl_priv		*pwrpriv = &padapter->pwrctrlpriv;
 	struct wifidirect_info	*pwdinfo = &( padapter->wdinfo );
 	struct P2P_PS_Offload_t	*p2p_ps_offload = &pHalData->p2p_ps_offload;
diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c
index 8229fdb..6337555 100644
--- a/hal/rtl8188e_dm.c
+++ b/hal/rtl8188e_dm.c
@@ -105,7 +105,7 @@ dm_InitGPIOSetting(
 		PADAPTER	Adapter
 	)
 {
-	PHAL_DATA_TYPE		pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 
 	u8	tmp1byte;
 
@@ -130,7 +130,7 @@ dm_InitGPIOSetting(
 static void Init_ODM_ComInfo_88E(PADAPTER	Adapter)
 {
 
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
 	u8	cut_ver,fab_ver;
@@ -186,7 +186,7 @@ static void Update_ODM_ComInfo_88E(PADAPTER	Adapter)
 	struct mlme_ext_priv	*pmlmeext = &Adapter->mlmeextpriv;
 	struct mlme_priv	*pmlmepriv = &Adapter->mlmepriv;
 	struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	int i;
@@ -236,7 +236,7 @@ rtl8188e_InitHalDm(
 		PADAPTER	Adapter
 	)
 {
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
 	u8	i;
@@ -262,7 +262,7 @@ rtl8188e_HalDmWatchDog(
 	bool		bFwCurrentInPSMode = false;
 	bool		bFwPSAwake = true;
 	u8 hw_init_completed = false;
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
 
@@ -324,7 +324,7 @@ skip_dm:
 
 void rtl8188e_init_dm_priv(PADAPTER Adapter)
 {
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		podmpriv = &pHalData->odmpriv;
 	_rtw_memset(pdmpriv, 0, sizeof(struct dm_priv));
@@ -334,7 +334,7 @@ void rtl8188e_init_dm_priv(PADAPTER Adapter)
 
 void rtl8188e_deinit_dm_priv(PADAPTER Adapter)
 {
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		podmpriv = &pHalData->odmpriv;
 }
@@ -344,7 +344,7 @@ void rtl8188e_deinit_dm_priv(PADAPTER Adapter)
 /*  Compare RSSI for deciding antenna */
 void	AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	if (0 != pHalData->AntDivCfg) {
 		/* select optimum_antenna for before linked =>For antenna diversity */
 		if (dst->Rssi >=  src->Rssi )/* keep org parameter */
@@ -359,7 +359,7 @@ void	AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src
 u8 AntDivBeforeLink8188E(PADAPTER Adapter )
 {
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	PDM_ODM_T	pDM_Odm =&pHalData->odmpriv;
 	SWAT_T		*pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
 	struct mlme_priv	*pmlmepriv = &(Adapter->mlmepriv);
diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c
index 7ebc01c..1639f8a 100644
--- a/hal/rtl8188e_hal_init.c
+++ b/hal/rtl8188e_hal_init.c
@@ -639,7 +639,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter)
 	s32	rtStatus = _SUCCESS;
 	u8 writeFW_retry = 0;
 	u32 fwdl_start_time;
-	PHAL_DATA_TYPE	pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
 
 	u8			*FwImage;
 	u32			FwImageLen;
@@ -800,7 +800,7 @@ Exit:
 #ifdef CONFIG_WOWLAN
 void rtl8188e_InitializeFirmwareVars(PADAPTER padapter)
 {
-	PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
 	struct pwrctrl_priv *pwrpriv;
 	pwrpriv = &padapter->pwrctrlpriv;
 
@@ -827,7 +827,7 @@ SetFwRelatedForWoWLAN8188ES(
 )
 {
 		int				status=_FAIL;
-		HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+		struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 		u8				bRecover = false;
 	/*  */
 	/*  1. Before WoWLAN we need to re-download WoWLAN Fw. */
@@ -847,7 +847,7 @@ SetFwRelatedForWoWLAN8188ES(
 #else
 void rtl8188e_InitializeFirmwareVars(PADAPTER padapter)
 {
-	PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
 
 	/*  Init Fw LPS related. */
 	padapter->pwrctrlpriv.bFwCurrentInPSMode = false;
@@ -861,7 +861,7 @@ static void rtl8188e_free_hal_data(PADAPTER padapter)
 {
 _func_enter_;
 	if (padapter->HalData) {
-		rtw_mfree(padapter->HalData, sizeof(HAL_DATA_TYPE));
+		rtw_mfree(padapter->HalData, sizeof(struct hal_data_8188e));
 		padapter->HalData = NULL;
 	}
 _func_exit_;
@@ -2380,7 +2380,7 @@ static struct HAL_VERSION ReadChipVersion8188E(PADAPTER padapter)
 {
 	u32				value32;
 	struct HAL_VERSION		ChipVersion;
-	HAL_DATA_TYPE	*pHalData;
+	struct hal_data_8188e	*pHalData;
 
 
 	pHalData = GET_HAL_DATA(padapter);
@@ -2432,7 +2432,7 @@ static void rtl8188e_GetHalODMVar(
 	void *					pValue1,
 	bool					bSet)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	PDM_ODM_T podmpriv = &pHalData->odmpriv;
 	switch (eVariable){
 		case HAL_ODM_STA_INFO:
@@ -2447,7 +2447,7 @@ static void rtl8188e_SetHalODMVar(
 	void *					pValue1,
 	bool					bSet)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	PDM_ODM_T podmpriv = &pHalData->odmpriv;
 	switch (eVariable){
 		case HAL_ODM_STA_INFO:
@@ -2601,7 +2601,7 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy)
 	s32	status = _FAIL;
 	u32	i;
 	u32	Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER;/*  176, 22k */
-	HAL_DATA_TYPE *pHalData	= GET_HAL_DATA(padapter);
+	struct hal_data_8188e *pHalData	= GET_HAL_DATA(padapter);
 
 	if (rtw_IOL_applied(padapter)) {
 		status = iol_InitLLTTable(padapter, txpktbuf_bndy);
@@ -2916,7 +2916,7 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
 
 void Hal_ReadPowerSavingMode88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
 	u8 tmpvalue;
 
@@ -2953,7 +2953,7 @@ Hal_ReadTxPowerInfo88E(
 		bool			AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	TxPowerInfo24G		pwrInfo24G;
 	u8			rfPath, ch, group, rfPathMax=1;
 	u8			pwr, diff,bIn24G,TxCount;
@@ -3027,7 +3027,7 @@ Hal_EfuseParseXtal_8188E(
 		bool		AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	if (!AutoLoadFail)
 	{
@@ -3049,7 +3049,7 @@ Hal_EfuseParseBoardType88E(
 		bool			AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	if (!AutoLoadFail)
 		pHalData->BoardType = ((hwinfo[EEPROM_RF_BOARD_OPTION_88E]&0xE0)>>5);
@@ -3065,7 +3065,7 @@ Hal_EfuseParseEEPROMVer88E(
 		bool			AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	if (!AutoLoadFail){
 		pHalData->EEPROMVersion = hwinfo[EEPROM_VERSION_88E];
@@ -3104,7 +3104,7 @@ Hal_EfuseParseCustomerID88E(
 		bool			AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	if (!AutoLoadFail)
 	{
@@ -3126,7 +3126,7 @@ Hal_ReadAntennaDiversity88E(
 		bool			AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	struct registry_priv	*registry_par = &pAdapter->registrypriv;
 
 	if (!AutoLoadFail)
@@ -3174,7 +3174,7 @@ Hal_ReadThermalMeter_88E(
 		bool		AutoloadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u1Byte			tempval;
 
 	/*  */
@@ -3206,7 +3206,7 @@ Hal_InitChannelPlan(
 bool HalDetectPwrDownMode88E(PADAPTER Adapter)
 {
 	u8 tmpvalue = 0;
-	HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
 	struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;
 
 	EFUSE_ShadowRead(Adapter, 1, EEPROM_RF_FEATURE_OPTION_88E, (u32 *)&tmpvalue);
@@ -3245,7 +3245,7 @@ void SetBcnCtrlReg(
 	u8		SetBits,
 	u8		ClearBits)
 {
-	PHAL_DATA_TYPE pHalData;
+	struct hal_data_8188e *pHalData;
 
 
 	pHalData = GET_HAL_DATA(padapter);
diff --git a/hal/rtl8188e_mp.c b/hal/rtl8188e_mp.c
index 00b7842..69b9672 100644
--- a/hal/rtl8188e_mp.c
+++ b/hal/rtl8188e_mp.c
@@ -28,7 +28,7 @@
 
 s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
@@ -56,7 +56,7 @@ s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable)
 
 void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
@@ -68,7 +68,7 @@ void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable)
 static void Hal_disable_dm(PADAPTER padapter)
 {
 	u8 v8;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
@@ -110,12 +110,12 @@ static void Hal_disable_dm(PADAPTER padapter)
  *---------------------------------------------------------------------------*/
 void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter)
 {
-	/* HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter); */
+	/* struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter); */
 	struct mp_priv	*pmp = &pAdapter->mppriv;
 	u1Byte				ChannelToSw = pmp->channel;
 	ULONG				ulRateIdx = pmp->rateidx;
 	ULONG				ulbandwidth = pmp->bandwidth;
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(pAdapter);
 
 	/*  <20120525, Kordan> Dynamic mechanism for APK, asked by Dennis. */
 		pmp->MptCtx.backup0x52_RF_A = (u1Byte)PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_0x52, 0x000F0);
@@ -133,7 +133,7 @@ void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14)
 	u32		TempVal = 0, TempVal2 = 0, TempVal3 = 0;
 	u32		CurrCCKSwingVal = 0, CCKSwingIndex = 12;
 	u8		i;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 
 	/*  get current cck swing value and check 0xa22 & 0xa23 later to match the table. */
@@ -211,7 +211,7 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
 	u8		Action = 0;	/* 0: no action, 1: even->odd, 2:odd->even */
 	u8		TimeOut = 100;
 	s32		i = 0;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	PMPT_CONTEXT	pMptCtx = &pAdapter->mppriv.MptCtx;
 
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
@@ -294,7 +294,7 @@ void Hal_SetChannel(PADAPTER pAdapter)
 {
 	u8		eRFPath;
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	struct mp_priv	*pmp = &pAdapter->mppriv;
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	PDM_ODM_T		pDM_Odm = &(pHalData->odmpriv);
@@ -364,7 +364,7 @@ void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower)
 	u32 TxAGC = 0;
 	u8 tmpval = 0;
 	PMPT_CONTEXT	pMptCtx = &pAdapter->mppriv.MptCtx;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 
 	/*  HT Tx-rf(A) */
@@ -393,7 +393,7 @@ void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower)
 
 void Hal_SetAntennaPathPower(PADAPTER pAdapter)
 {
-	HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
 	u8 TxPowerLevel[MAX_RF_PATH_NUMS];
 	u8 rfPath;
 
@@ -432,7 +432,7 @@ void Hal_SetAntennaPathPower(PADAPTER pAdapter)
 
 void Hal_SetTxPower(PADAPTER pAdapter)
 {
-	HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
 	u8 TxPower = pAdapter->mppriv.txpoweridx;
 	u8 TxPowerLevel[MAX_RF_PATH_NUMS];
 	u8 rf, rfPath;
@@ -480,7 +480,7 @@ void Hal_SetDataRate(PADAPTER pAdapter)
 
 void Hal_SetAntenna(PADAPTER pAdapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	R_ANTENNA_SELECT_OFDM *p_ofdm_tx;	/* OFDM Tx register */
 	R_ANTENNA_SELECT_CCK *p_cck_txrx;
@@ -641,7 +641,7 @@ void Hal_SetAntenna(PADAPTER pAdapter)
 
 s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther)
 {
-	HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
 
 
 	if (!netif_running(pAdapter->pnetdev)) {
@@ -688,7 +688,7 @@ void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value)
 
 void Hal_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart)
 {
-    HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
+    struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
 	pAdapter->mppriv.MptCtx.bSingleCarrier = bStart;
 	if (bStart)/*  Start Single Carrier. */
 	{
@@ -736,7 +736,7 @@ void Hal_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart)
 
 void Hal_SetSingleToneTx(PADAPTER pAdapter, u8 bStart)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	bool		is92C = IS_92C_SERIAL(pHalData->VersionID);
 
 	u8 rfPath;
@@ -932,7 +932,7 @@ void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)
 
 void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart)
 {
-    HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+    struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	if (bStart) {
 		RT_TRACE(_module_mp_, _drv_info_, ("SetOFDMContinuousTx: test start\n"));
diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c
index 2186ed1..45a4c14 100644
--- a/hal/rtl8188e_phycfg.c
+++ b/hal/rtl8188e_phycfg.c
@@ -184,7 +184,7 @@ SIC_SetBBReg(
 		u32		Data
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u32			OriginalValue, BitShift;
 	u16			BBWaitCounter = 0;
 
@@ -208,7 +208,7 @@ SIC_QueryBBReg(
 		u32		BitMask
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u32			ReturnValue = 0, OriginalValue, BitShift;
 	u16			BBWaitCounter = 0;
 
@@ -313,7 +313,7 @@ rtl8188e_PHY_SetBBReg(
 		u32		Data
 	)
 {
-	HAL_DATA_TYPE	*pHalData		= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData		= GET_HAL_DATA(Adapter);
 	u32			OriginalValue, BitShift;
 
 #if (DISABLE_BB_RF == 1)
@@ -365,7 +365,7 @@ phy_RFSerialRead(
 	)
 {
 	u32						retValue = 0;
-	HAL_DATA_TYPE				*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e				*pHalData = GET_HAL_DATA(Adapter);
 	BB_REGISTER_DEFINITION_T	*pPhyReg = &pHalData->PHYRegDef[eRFPath];
 	u32						NewOffset;
 	u32						tmplong,tmplong2;
@@ -468,7 +468,7 @@ phy_RFSerialWrite(
 	)
 {
 	u32						DataAndAddr = 0;
-	HAL_DATA_TYPE				*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e				*pHalData = GET_HAL_DATA(Adapter);
 	BB_REGISTER_DEFINITION_T	*pPhyReg = &pHalData->PHYRegDef[eRFPath];
 	u32						NewOffset;
 
@@ -595,7 +595,7 @@ phy_ConfigMACWithParaFile(
 		u8*			pFileName
 )
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	int		rtStatus = _FAIL;
 
@@ -621,7 +621,7 @@ phy_ConfigMACWithParaFile(
 s32 PHY_MACConfig8188E(PADAPTER Adapter)
 {
 	int		rtStatus = _SUCCESS;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	s8			sz8188EMACRegFile[] = RTL8188E_PHY_MACREG;
 
 	/*  */
@@ -653,7 +653,7 @@ phy_InitBBRFRegisterDefinition(
 		PADAPTER		Adapter
 )
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 
 	/*  RF Interface Sowrtware Control */
 	pHalData->PHYRegDef[RF_PATH_A].rfintfs = rFPGA0_XAB_RFInterfaceSW; /*  16 LSBs if read 32-bit from 0x870 */
@@ -774,7 +774,7 @@ phy_ConfigBBWithParaFile(
 		u8*			pFileName
 )
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	int		rtStatus = _SUCCESS;
 
@@ -788,7 +788,7 @@ phy_ConfigBBWithParaFile(
 /*  */
 static void phy_ConfigBBExternalPA(PADAPTER Adapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u16 i=0;
 	u32 temp=0;
 
@@ -807,7 +807,7 @@ storePwrIndexDiffRateOffset(
 		u32		Data
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	if (RegAddr == rTxAGC_A_Rate18_06)
 		pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][0] = Data;
@@ -869,7 +869,7 @@ phy_ConfigBBWithPgParaFile(
 		PADAPTER		Adapter,
 		u8*			pFileName)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	int		rtStatus = _SUCCESS;
 
@@ -918,7 +918,7 @@ phy_BB8188E_Config_ParaFile(
 	)
 {
 	EEPROM_EFUSE_PRIV	*pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	int			rtStatus = _SUCCESS;
 
 	u8	sz8188EBBRegFile[] = RTL8188E_PHY_REG;
@@ -969,7 +969,7 @@ PHY_BBConfig8188E(
 	)
 {
 	int	rtStatus = _SUCCESS;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u32	RegVal;
 	u8	TmpU1B=0;
 	u8	value8,CrystalCap;
@@ -1004,7 +1004,7 @@ PHY_RFConfig8188E(
 		PADAPTER	Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	int		rtStatus = _SUCCESS;
 
 	/*  */
@@ -1043,7 +1043,7 @@ rtl8188e_PHY_ConfigRFWithParaFile(
 static int PHY_ConfigRFExternalPA(PADAPTER Adapter, RF_RADIO_PATH_E eRFPath)
 {
 	int	rtStatus = _SUCCESS;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u16 i=0;
 
 	if (!pHalData->ExternalPA)
@@ -1059,7 +1059,7 @@ rtl8192c_PHY_GetHWRegOriginalValue(
 		PADAPTER		Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	/*  read rx initial gain */
 	pHalData->DefaultInitialGain[0] = (u8)PHY_QueryBBReg(Adapter, rOFDM0_XAAGCCore1, bMaskByte0);
@@ -1181,7 +1181,7 @@ PHY_GetTxPowerLevel8188E(
 	u32*		powerlevel
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u8			TxPwrLevel = 0;
 	int			TxPwrDbm;
 
@@ -1215,7 +1215,7 @@ static void getTxPowerIndex88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLevel,
 			       u8 *ofdmPowerLevel, u8 *BW20PowerLevel,
 			       u8 *BW40PowerLevel)
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	u8				index = (channel -1);
 	u8				TxCount=0,path_nums;
 
@@ -1290,7 +1290,7 @@ static void getTxPowerIndex88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLevel,
 static void phy_PowerIndexCheck88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLevel,
 				   u8 *ofdmPowerLevel, u8 *BW20PowerLevel, u8 *BW40PowerLevel)
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 
 	pHalData->CurrentCckTxPwrIdx = cckPowerLevel[0];
 	pHalData->CurrentOfdm24GTxPwrIdx = ofdmPowerLevel[0];
@@ -1321,7 +1321,7 @@ PHY_SetTxPowerLevel8188E(
 		u8				channel
 	)
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 
 	u8	cckPowerLevel[MAX_TX_COUNT], ofdmPowerLevel[MAX_TX_COUNT];/*  [0]:RF-A, [1]:RF-B */
 	u8	BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT];
@@ -1349,7 +1349,7 @@ PHY_UpdateTxPowerDbm8188E(
 		int		powerInDbm
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u8				idx;
 	u8			rf_path;
 
@@ -1402,7 +1402,7 @@ _PHY_SetBWMode92C(
 		PADAPTER	Adapter
 )
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	u8				regBwOpMode;
 	u8				regRRSR_RSC;
 
@@ -1518,7 +1518,7 @@ PHY_SetBWMode8188E(
 		unsigned char	Offset		/*  Upper, Lower, or Don't care */
 )
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	HT_CHANNEL_WIDTH	tmpBW= pHalData->CurrentChannelBW;
 
 	pHalData->CurrentChannelBW = Bandwidth;
@@ -1535,7 +1535,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel)
 {
 	u8 eRFPath;
 	u32 param1, param2;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	if ( Adapter->bNotifyChannelChange )
 	{
@@ -1560,7 +1560,7 @@ PHY_SwChnl8188E(	/*  Call after initialization */
 		u8		channel
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u8	tmpchannel = pHalData->CurrentChannel;
 	bool  bResult = true;
 
@@ -1666,7 +1666,7 @@ PHY_SwChnlPhy8192C(	/*  Only called during initialize */
 		u8		channel
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	/* return immediately if it is peudo-phy */
 	if (pHalData->rf_chip == RF_PSEUDO_11N)
diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c
index 2edfd16..8bb5dcd 100644
--- a/hal/rtl8188e_rf6052.c
+++ b/hal/rtl8188e_rf6052.c
@@ -117,7 +117,7 @@ rtl8188e_PHY_RF6052SetBandwidth(
 		PADAPTER				Adapter,
 		HT_CHANNEL_WIDTH		Bandwidth)	/* 20M or 40M */
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	switch (Bandwidth)
 	{
@@ -161,7 +161,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
 		PADAPTER		Adapter,
 		u8*			pPowerlevel)
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	struct mlme_priv	*pmlmepriv = &Adapter->mlmepriv;
 	struct dm_priv		*pdmpriv = &pHalData->dmpriv;
 	struct mlme_ext_priv		*pmlmeext = &Adapter->mlmeextpriv;
@@ -283,7 +283,7 @@ static void getPowerBase88E(
 	u32*		MCSBase
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u32			powerBase0, powerBase1;
 	u8			Legacy_pwrdiff=0;
 	s8			HT20_pwrdiff=0;
@@ -324,7 +324,7 @@ static void getTxPowerWriteValByRegulatory88E(
 	)
 {
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	u1Byte			i, chnlGroup=0, pwr_diff_limit[4], customer_pwr_limit;
 	s1Byte			pwr_diff=0;
@@ -438,7 +438,7 @@ static void writeOFDMPowerReg88E(
 			u32*		pValue
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u16 RegOffset_A[6] = {	rTxAGC_A_Rate18_06, rTxAGC_A_Rate54_24,
 							rTxAGC_A_Mcs03_Mcs00, rTxAGC_A_Mcs07_Mcs04,
 							rTxAGC_A_Mcs11_Mcs08, rTxAGC_A_Mcs15_Mcs12};
@@ -522,7 +522,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
 		u8*		pPowerLevelBW40,
 		u8		Channel)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u32 writeVal[2], powerBase0[2], powerBase1[2], pwrtrac_value;
 	u8 direction;
 	u8 index = 0;
@@ -572,7 +572,7 @@ phy_RF6052_Config_ParaFile(
 	BB_REGISTER_DEFINITION_T	*pPhyReg;
 
 	int					rtStatus = _SUCCESS;
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 
 	static char			sz88eRadioAFile[] = RTL8188E_PHY_RADIO_A;
 	static char			sz88eRadioBFile[] = RTL8188E_PHY_RADIO_B;
@@ -657,7 +657,7 @@ int
 PHY_RF6052_Config8188E(
 		PADAPTER		Adapter)
 {
-	HAL_DATA_TYPE				*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e				*pHalData = GET_HAL_DATA(Adapter);
 	int					rtStatus = _SUCCESS;
 
 	/*  */
diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c
index 494ae1d..2144e3e 100644
--- a/hal/rtl8188e_rxdesc.c
+++ b/hal/rtl8188e_rxdesc.c
@@ -176,7 +176,7 @@ void update_recvframe_phyinfo_88e(
 {
 	PADAPTER			padapter = precvframe->u.hdr.adapter;
 	struct rx_pkt_attrib	*pattrib = &precvframe->u.hdr.attrib;
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(padapter);
 	PODM_PHY_INFO_T		pPHYInfo  = (PODM_PHY_INFO_T)(&pattrib->phy_info);
 	u8					*wlanhdr;
 	ODM_PACKET_INFO_T	pkt_info;
diff --git a/hal/rtl8188e_sreset.c b/hal/rtl8188e_sreset.c
index 5cb4fba..227d4d1 100644
--- a/hal/rtl8188e_sreset.c
+++ b/hal/rtl8188e_sreset.c
@@ -65,7 +65,7 @@ static void _restore_security_setting(_adapter *padapter)
 
 static void _restore_network_status(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
 	WLAN_BSSID_EX	*pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
@@ -125,7 +125,7 @@ void rtl8188e_silentreset_for_specific_platform(_adapter *padapter)
 
 void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
 	unsigned long current_time;
diff --git a/hal/rtl8188eu_led.c b/hal/rtl8188eu_led.c
index f3a2413..f01b65b 100644
--- a/hal/rtl8188eu_led.c
+++ b/hal/rtl8188eu_led.c
@@ -75,7 +75,7 @@ void SwLedOn(_adapter *padapter, struct LED_871x * pLed)
 void SwLedOff(_adapter *padapter, struct LED_871x * pLed)
 {
 	u8	LedCfg;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	if ((padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
 	{
diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c
index 4b839ad..571da36 100644
--- a/hal/rtl8188eu_xmit.c
+++ b/hal/rtl8188eu_xmit.c
@@ -29,7 +29,7 @@
 s32	rtl8188eu_init_xmit_priv(_adapter *padapter)
 {
 	struct xmit_priv	*pxmitpriv = &padapter->xmitpriv;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 
 	tasklet_init(&pxmitpriv->xmit_tasklet,
 	     (void(*)(unsigned long))rtl8188eu_xmit_tasklet,
@@ -44,7 +44,7 @@ void	rtl8188eu_free_xmit_priv(_adapter *padapter)
 static u8 urb_zero_packet_chk(_adapter *padapter, int sz)
 {
 	u8 blnSetTxDescOffset;
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(padapter);
 	blnSetTxDescOffset = (((sz + TXDESC_SIZE) %  pHalData->UsbBulkOutSize) ==0)?1:0;
 
 	return blnSetTxDescOffset;
@@ -199,7 +199,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
 	_adapter			*padapter = pxmitframe->padapter;
 	struct mlme_priv	*pmlmepriv = &padapter->mlmepriv;
 	struct pkt_attrib	*pattrib = &pxmitframe->attrib;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct tx_desc	*ptxdesc = (struct tx_desc *)pmem;
 	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -509,7 +509,7 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
 
 s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct xmit_frame *pxmitframe = NULL;
 	struct xmit_frame *pfirstframe = NULL;
 
diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index e42d223..82e2d3e 100644
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -47,7 +47,7 @@ _ConfigNormalChipOutEP_8188E(
 		u8		NumOutPipe
 	)
 {
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(pAdapter);
 
 	switch (NumOutPipe){
 		case	3:
@@ -76,7 +76,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(
 		u8		NumOutPipe
 	)
 {
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(pAdapter);
 	bool			result		= false;
 
 	_ConfigNormalChipOutEP_8188E(pAdapter, NumOutPipe);
@@ -98,7 +98,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(
 
 static void rtl8188eu_interface_configure(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(padapter);
 	struct dvobj_priv	*pdvobjpriv = adapter_to_dvobj(padapter);
 
 	if (pdvobjpriv->ishighspeed == true)
@@ -130,7 +130,7 @@ static u32 rtl8188eu_InitPowerOn(_adapter *padapter)
 {
 	u16 value16;
 	/*  HW Power on sequence */
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(padapter);
 	if (true == pHalData->bMacPwrCtrlOn)
 		return _SUCCESS;
 
@@ -175,7 +175,7 @@ static void _dbg_dump_macreg(_adapter *padapter)
 
 static void _InitPABias(_adapter *padapter)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	u8	pa_setting;
 	bool	is92C = IS_92C_SERIAL(pHalData->VersionID);
 
@@ -209,7 +209,7 @@ static void _InitPABias(_adapter *padapter)
 #ifdef CONFIG_BT_COEXIST
 static void _InitBTCoexist(_adapter *padapter)
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(padapter);
 	struct btcoexist_priv	*pbtpriv = &(pHalData->bt_coexist);
 	u8 u1Tmp;
 
@@ -297,7 +297,7 @@ _InitInterrupt(
 {
 	u32	imr,imr_ex;
 	u8  usb_opt;
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 
 	/* HISR write one to clear */
 	rtw_write32(Adapter, REG_HISR_88E, 0xFFFFFFFF);
@@ -329,7 +329,7 @@ _InitQueueReservedPage(
 	PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	struct registry_priv	*pregistrypriv = &Adapter->registrypriv;
 	u32			outEPNum	= (u32)pHalData->OutEpNumber;
 	u32			numHQ		= 0;
@@ -428,7 +428,7 @@ _InitNormalChipOneOutEpPriority(
 		PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 
 	u16	value = 0;
 	switch (pHalData->OutEpQueueSel)
@@ -462,7 +462,7 @@ _InitNormalChipTwoOutEpPriority(
 		PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 	struct registry_priv *pregistrypriv = &Adapter->registrypriv;
 	u16			beQ,bkQ,viQ,voQ,mgtQ,hiQ;
 
@@ -541,7 +541,7 @@ _InitQueuePriority(
 		PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 
 	switch (pHalData->OutEpNumber)
 	{
@@ -613,7 +613,7 @@ _InitWMACSetting(
 	PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	pHalData->ReceiveConfig =
 	RCR_AAP | RCR_APM | RCR_AM | RCR_AB |RCR_CBSSID_DATA| RCR_CBSSID_BCN| RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL | RCR_APP_MIC | RCR_APP_PHYSTS;
@@ -760,7 +760,7 @@ usb_AggSettingTxUpdate(
 		PADAPTER			Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u32			value32;
 
 	if (Adapter->registrypriv.wifi_spec)
@@ -796,7 +796,7 @@ usb_AggSettingRxUpdate(
 		PADAPTER			Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u8			valueDMA;
 	u8			valueUSB;
 
@@ -878,7 +878,7 @@ InitUsbAggregationSetting(
 	PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	/*  Tx aggregation setting */
 	usb_AggSettingTxUpdate(Adapter);
@@ -936,7 +936,7 @@ _InitBeaconParameters(
 	PADAPTER Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 	rtw_write16(Adapter, REG_BCN_CTRL, 0x1010);
 
@@ -962,7 +962,7 @@ _InitRFType(
 	)
 {
 	struct registry_priv	 *pregpriv = &Adapter->registrypriv;
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 	bool			is92CU		= IS_92C_SERIAL(pHalData->VersionID);
 
 #if	DISABLE_BB_RF
@@ -1026,7 +1026,7 @@ static void
 _InitAntenna_Selection(	PADAPTER Adapter)
 {
 
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 
 	if (pHalData->AntDivCfg==0)
 		return;
@@ -1080,7 +1080,7 @@ HwSuspendModeEnable_88eu(
 
 rt_rf_power_state RfOnOffDetect(	PADAPTER pAdapter )
 {
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(pAdapter);
 	u8	val8;
 	rt_rf_power_state rfpowerstate = rf_off;
 
@@ -1108,7 +1108,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
 	u16  value16;
 	u8	txpktbuf_bndy;
 	u32	status = _SUCCESS;
-	HAL_DATA_TYPE		*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e		*pHalData = GET_HAL_DATA(Adapter);
 	struct pwrctrl_priv		*pwrctrlpriv = &Adapter->pwrctrlpriv;
 	struct registry_priv	*pregistrypriv = &Adapter->registrypriv;
 	rt_rf_power_state		eRfPowerStateToSet;
@@ -1465,7 +1465,7 @@ static void CardDisableRTL8188EU(PADAPTER Adapter)
 	u8	val8;
 	u16	val16;
 	u32	val32;
-	HAL_DATA_TYPE	*pHalData	= GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData	= GET_HAL_DATA(Adapter);
 
 	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("CardDisableRTL8188EU\n"));
 
@@ -1534,7 +1534,7 @@ static void rtl8192cu_hw_power_down(_adapter *padapter)
 static u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
 {
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	DBG_88E("==> %s\n",__func__);
 
 	rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E);
@@ -1641,7 +1641,7 @@ _ReadLEDSetting(
 	)
 {
 	struct led_priv *pledpriv = &(Adapter->ledpriv);
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	pledpriv->bRegUseLed = true;
 
 	switch (pHalData->CustomerID)
@@ -1687,7 +1687,7 @@ readAntennaDiversity(
 		bool		AutoLoadFail
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 	struct registry_priv	*registry_par = &pAdapter->registrypriv;
 
 	pHalData->AntDivCfg = registry_par->antdiv_cfg ;  /*  0:OFF , 1:ON, */
@@ -1708,7 +1708,7 @@ Hal_EfuseParsePIDVID_8188EU(
 	)
 {
 
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(pAdapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);
 
 	if ( !AutoLoadFail )
 	{
@@ -1838,7 +1838,7 @@ _ReadRFType(
 		PADAPTER	Adapter
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 
 #if DISABLE_BB_RF
 	pHalData->rf_chip = RF_PSEUDO_11N;
@@ -1878,7 +1878,7 @@ static void rtl8192cu_trigger_gpio_0(_adapter *padapter)
 
 static void ResumeTxBeacon(_adapter *padapter)
 {
-	HAL_DATA_TYPE*	pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e*	pHalData = GET_HAL_DATA(padapter);
 
 	/*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
 	/*  which should be read from register to a global variable. */
@@ -1892,7 +1892,7 @@ static void ResumeTxBeacon(_adapter *padapter)
 
 static void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR)
 {
-	HAL_DATA_TYPE *pHalData;
+	struct hal_data_8188e *pHalData;
 
 	u32 *himr;
 	pHalData = GET_HAL_DATA(padapter);
@@ -1917,7 +1917,7 @@ static void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u
 
 static void StopTxBeacon(_adapter *padapter)
 {
-	HAL_DATA_TYPE*	pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e*	pHalData = GET_HAL_DATA(padapter);
 
 	/*  2010.03.01. Marked by tynli. No need to call workitem beacause we record the value */
 	/*  which should be read from register to a global variable. */
@@ -2050,7 +2050,7 @@ static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val)
 
 static void SetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	DM_ODM_T		*podmpriv = &pHalData->odmpriv;
 _func_enter_;
@@ -2757,7 +2757,7 @@ _func_exit_;
 
 static void GetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	DM_ODM_T		*podmpriv = &pHalData->odmpriv;
 _func_enter_;
 
@@ -2829,7 +2829,7 @@ GetHalDefVar8188EUsb(
 		void *					pValue
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u8			bResult = _SUCCESS;
 
 	switch (eVariable)
@@ -2958,7 +2958,7 @@ static u8 SetHalDefVar8188EUsb(
 		void *					pValue
 	)
 {
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(Adapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	u8			bResult = _SUCCESS;
 
 	switch (eVariable)
@@ -3054,7 +3054,7 @@ static void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level
 	u8	shortGIrate = false;
 	int	supportRateNum = 0;
 	struct sta_info	*psta;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
 	WLAN_BSSID_EX		*cur_network = &(pmlmeinfo->network);
@@ -3203,7 +3203,7 @@ static void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter)
 
 static void rtl8188eu_init_default_value(_adapter * padapter)
 {
-	PHAL_DATA_TYPE pHalData;
+	struct hal_data_8188e *pHalData;
 	struct pwrctrl_priv *pwrctrlpriv;
 	u8 i;
 
@@ -3238,11 +3238,11 @@ void rtl8188eu_set_hal_ops(_adapter * padapter)
 
 _func_enter_;
 
-	padapter->HalData = rtw_zmalloc(sizeof(HAL_DATA_TYPE));
+	padapter->HalData = rtw_zmalloc(sizeof(struct hal_data_8188e));
 	if (padapter->HalData == NULL){
 		DBG_88E("cant not alloc memory for HAL DATA\n");
 	}
-	padapter->hal_data_sz = sizeof(HAL_DATA_TYPE);
+	padapter->hal_data_sz = sizeof(struct hal_data_8188e);
 
 	pHalFunc->hal_power_on = rtl8188eu_InitPowerOn;
 	pHalFunc->hal_init = &rtl8188eu_hal_init;
diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c
index 9c75838..edfca38 100644
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -100,7 +100,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
 					padapter->bSurpriseRemoved = true;
 				} else {
 					{
-						HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+						struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 						pHalData->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL;
 					}
 				}
@@ -319,7 +319,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
 
 static void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
 {
-	HAL_DATA_TYPE	*pHalData=GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData=GET_HAL_DATA(padapter);
 	struct reportpwrstate_parm pwr_rpt;
 
 	if ( pkt_len != INTERRUPT_MSG_FORMAT_LEN )
@@ -354,7 +354,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb)
 	_pkt				*pkt_copy = NULL;
 	union recv_frame	*precvframe = NULL;
 	struct rx_pkt_attrib	*pattrib = NULL;
-	HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 	struct recv_priv	*precvpriv = &padapter->recvpriv;
 	_queue			*pfree_recv_queue = &precvpriv->free_recv_queue;
 
@@ -620,7 +620,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 		case -EPROTO:
 		case -EOVERFLOW:
 			{
-				HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+				struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 				pHalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
 			}
 			precvbuf->reuse = true;
diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h
index 66fd83e..2f01286 100644
--- a/include/rtl8188e_hal.h
+++ b/include/rtl8188e_hal.h
@@ -469,10 +469,7 @@ typedef struct hal_data_8188e
 	u8	UsbRxAggPageTimeout;
 } HAL_DATA_8188E, *PHAL_DATA_8188E;
 
-typedef struct hal_data_8188e HAL_DATA_TYPE, *PHAL_DATA_TYPE;
-
-
-#define GET_HAL_DATA(__pAdapter)	((HAL_DATA_TYPE *)((__pAdapter)->HalData))
+#define GET_HAL_DATA(__pAdapter)	((struct hal_data_8188e *)((__pAdapter)->HalData))
 #define GET_RF_TYPE(priv)			(GET_HAL_DATA(priv)->rf_type)
 
 #define INCLUDE_MULTI_FUNC_BT(_Adapter)	(GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT)
diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index 5c28cdf..daaa6d1 100644
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -7115,7 +7115,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
 {
 	PADAPTER padapter = rtw_netdev_priv(dev);
 	EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
-	PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
+	struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
 	struct efuse_hal *pEfuseHal;
 	struct iw_point *wrqu;
 
@@ -7581,7 +7581,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
 {
 	PADAPTER padapter;
 	struct pwrctrl_priv *pwrctrlpriv ;
-	PHAL_DATA_TYPE pHalData;
+	struct hal_data_8188e *pHalData;
 	struct efuse_hal *pEfuseHal;
 
 	u8 ips_mode,lps_mode;
diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c
index 2cc747d..2ca942f 100644
--- a/os_dep/usb_ops_linux.c
+++ b/os_dep/usb_ops_linux.c
@@ -230,7 +230,7 @@ _func_enter_;
 	}
 
 	{
-		HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+		struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 		pHalData->srestpriv.last_tx_complete_time = rtw_get_current_time();
 	}
 
@@ -318,7 +318,7 @@ _func_enter_;
 	status = usb_submit_urb(purb, GFP_ATOMIC);
 	if (!status) {
 		{
-			HAL_DATA_TYPE	*pHalData = GET_HAL_DATA(padapter);
+			struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);
 			pHalData->srestpriv.last_tx_time = rtw_get_current_time();
 		}
 	} else {