diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c
index 1072b8e..ec6ccf4 100644
--- a/hal/HalHWImg8188E_BB.c
+++ b/hal/HalHWImg8188E_BB.c
@@ -189,7 +189,7 @@ static u4Byte Array_AGC_TAB_1T_8188E[] = {
 		0xC78, 0x407F0001,
 };
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ReadAndConfig_AGC_TAB_1T_8188E(
 	struct odm_dm_struct * pDM_Odm
 	)
@@ -209,7 +209,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
 	PADAPTER	Adapter =  pDM_Odm->Adapter;
 	struct xmit_frame	*pxmit_frame;
 	u8 bndy_cnt=1;
-	HAL_STATUS rst =HAL_STATUS_SUCCESS;
+	enum HAL_STATUS rst =HAL_STATUS_SUCCESS;
 
 	hex += board;
 	hex += interfaceValue << 8;
@@ -491,7 +491,7 @@ static u4Byte Array_PHY_REG_1T_8188E[] = {
 };
 
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ReadAndConfig_PHY_REG_1T_8188E(
 	struct odm_dm_struct * pDM_Odm
 	)
@@ -511,7 +511,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
 	PADAPTER	Adapter =  pDM_Odm->Adapter;
 	struct xmit_frame	*pxmit_frame;
 	u8 bndy_cnt=1;
-	HAL_STATUS rst =HAL_STATUS_SUCCESS;
+	enum HAL_STATUS rst =HAL_STATUS_SUCCESS;
 	hex += board;
 	hex += interfaceValue << 8;
 	hex += platform << 16;
diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c
index 3701419..b57afdc 100644
--- a/hal/HalHWImg8188E_MAC.c
+++ b/hal/HalHWImg8188E_MAC.c
@@ -149,7 +149,7 @@ static u4Byte Array_MAC_REG_8188E[] = {
 		0x70B, 0x00000087,
 };
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ReadAndConfig_MAC_REG_8188E(
 	struct odm_dm_struct * pDM_Odm
 	)
@@ -170,7 +170,7 @@ ODM_ReadAndConfig_MAC_REG_8188E(
 	PADAPTER	Adapter =  pDM_Odm->Adapter;
 	struct xmit_frame	*pxmit_frame;
 	u8 bndy_cnt = 1;
-	HAL_STATUS rst =HAL_STATUS_SUCCESS;
+	enum HAL_STATUS rst = HAL_STATUS_SUCCESS;
 	hex += board;
 	hex += interfaceValue << 8;
 	hex += platform << 16;
diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c
index c9d2ec1..ce8eae3 100644
--- a/hal/HalHWImg8188E_RF.c
+++ b/hal/HalHWImg8188E_RF.c
@@ -160,7 +160,7 @@ static u4Byte Array_RadioA_1T_8188E[] = {
 		0x000, 0x00033E60,
 };
 
-HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm)
+enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm)
 {
 	#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0)
 
@@ -177,7 +177,7 @@ HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm)
 	PADAPTER	Adapter =  pDM_Odm->Adapter;
 	struct xmit_frame	*pxmit_frame;
 	u8 bndy_cnt = 1;
-	HAL_STATUS rst =HAL_STATUS_SUCCESS;
+	enum HAL_STATUS rst = HAL_STATUS_SUCCESS;
 
 	hex += board;
 	hex += interfaceValue << 8;
diff --git a/hal/odm.c b/hal/odm.c
index 4136e11..50cac48 100644
--- a/hal/odm.c
+++ b/hal/odm.c
@@ -760,7 +760,7 @@ ODM_CmnInfoHook(
 		/* 	pDM_Odm->BTCoexist = (bool *)pValue; */
 
 		/* case	ODM_CMNINFO_STA_STATUS: */
-			/* pDM_Odm->pODM_StaInfo[] = (PSTA_INFO_T)pValue; */
+			/* pDM_Odm->pODM_StaInfo[] = (struct sta_info *)pValue; */
 			/* break; */
 
 		/* case	ODM_CMNINFO_PHY_STATUS: */
@@ -797,7 +797,7 @@ ODM_CmnInfoPtrArrayHook(
 		/*  Dynamic call by reference pointer. */
 		/*  */
 		case	ODM_CMNINFO_STA_STATUS:
-			pDM_Odm->pODM_StaInfo[Index] = (PSTA_INFO_T)pValue;
+			pDM_Odm->pODM_StaInfo[Index] = (struct sta_info *)pValue;
 			break;
 		/* To remove the compiler warning, must add an empty default statement to handle the other values. */
 		default:
@@ -911,7 +911,7 @@ odm_CommonInfoSelfUpdate(
 {
 	u1Byte	EntryCnt=0;
 	u1Byte	i;
-	PSTA_INFO_T	pEntry;
+	struct sta_info *	pEntry;
 
 	if (*(pDM_Odm->pBandWidth) == ODM_BW40M)
 	{
@@ -1922,7 +1922,7 @@ u4Byte ODM_Get_Rate_Bitmap(
 		u4Byte		ra_mask,
 		u1Byte		rssi_level)
 {
-	PSTA_INFO_T	pEntry;
+	struct sta_info *	pEntry;
 	u4Byte	rate_bitmap = 0x0fffffff;
 	u1Byte	WirelessMode;
 
@@ -2076,7 +2076,7 @@ odm_RefreshRateAdaptiveMaskCE(
 	}
 
 	for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++){
-		PSTA_INFO_T pstat = pDM_Odm->pODM_StaInfo[i];
+		struct sta_info * pstat = pDM_Odm->pODM_StaInfo[i];
 		if (IS_STA_VALID(pstat) ) {
 			if ( true == ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false , &pstat->rssi_level) ) {
 				ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, ("RSSI:%d, RSSI_LEVEL:%d\n", pstat->rssi_stat.UndecoratedSmoothedPWDB, pstat->rssi_level));
@@ -2456,7 +2456,7 @@ ODM_InitAllTimers(
 	)
 {
 	ODM_InitializeTimer(pDM_Odm,&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer,
-		(RT_TIMER_CALL_BACK)odm_SwAntDivChkAntSwitchCallback, NULL, "SwAntennaSwitchTimer");
+		(void *)odm_SwAntDivChkAntSwitchCallback, NULL, "SwAntennaSwitchTimer");
 }
 
 void
@@ -2840,7 +2840,7 @@ static void odm_HwAntDiv_92C_92D(struct odm_dm_struct *pDM_Odm)
 	u4Byte			RSSI_Min=0xFF, RSSI, RSSI_Ant1, RSSI_Ant2;
 	u1Byte			RxIdleAnt, i;
 	bool		bRet=false;
-	PSTA_INFO_T	pEntry;
+	struct sta_info *pEntry;
 
 	ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV,ODM_DBG_LOUD,("odm_HwAntDiv==============>\n"));
 
diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c
index 3654f53..bb4cd93 100644
--- a/hal/odm_HWConfig.c
+++ b/hal/odm_HWConfig.c
@@ -585,7 +585,7 @@ static void odm_Process_RSSIForDM(
 	u4Byte			OFDM_pkt=0;
 	u4Byte			Weighting=0;
 
-	PSTA_INFO_T	pEntry;
+	struct sta_info *	pEntry;
 
 	if (pPktinfo->StationID == 0xFF)
 		return;
@@ -844,7 +844,7 @@ ODM_MacStatusQuery(
 
 }
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ConfigRFWithHeaderFile(
 		struct odm_dm_struct *		pDM_Odm,
 		enum ODM_RF_RADIO_PATH	Content,
@@ -873,7 +873,7 @@ ODM_ConfigRFWithHeaderFile(
 }
 
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ConfigBBWithHeaderFile(
 		struct odm_dm_struct *		pDM_Odm,
 		enum odm_bb_config_type		ConfigType
@@ -903,7 +903,7 @@ ODM_ConfigBBWithHeaderFile(
 	return HAL_STATUS_SUCCESS;
 }
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ConfigMACWithHeaderFile(
 		struct odm_dm_struct *pDM_Odm
 	)
diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c
index c7df63f..4ac21ce 100644
--- a/hal/odm_RTL8188E.c
+++ b/hal/odm_RTL8188E.c
@@ -376,7 +376,7 @@ odm_HWAntDiv(
 	struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
 	bool	bMatchBSSID;
 	bool	bPktFilterMacth = false;
-	PSTA_INFO_T	pEntry;
+	struct sta_info *	pEntry;
 
 	for (i=0; i<ODM_ASSOCIATE_ENTRY_NUM; i++)
 	{
diff --git a/hal/odm_interface.c b/hal/odm_interface.c
index 463a0cd..019a8bb 100644
--- a/hal/odm_interface.c
+++ b/hal/odm_interface.c
@@ -170,7 +170,7 @@ s4Byte ODM_CompareMemory(
 void
 ODM_AcquireSpinLock(
 		struct odm_dm_struct *pDM_Odm,
-		RT_SPINLOCK_TYPE	type
+		enum RT_SPINLOCK_TYPE	type
 	)
 {
 }
@@ -178,7 +178,7 @@ ODM_AcquireSpinLock(
 void
 ODM_ReleaseSpinLock(
 		struct odm_dm_struct *pDM_Odm,
-		RT_SPINLOCK_TYPE	type
+		enum RT_SPINLOCK_TYPE	type
 	)
 {
 }
@@ -240,25 +240,25 @@ void ODM_sleep_us(u4Byte us)
 	rtw_usleep_os(us);
 }
 
-void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer, u4Byte msDelay)
+void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list * pTimer, u4Byte msDelay)
 {
 	_set_timer(pTimer,msDelay ); /* ms */
 }
 
-void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer,
-			 RT_TIMER_CALL_BACK CallBackFunc, void *pContext,
+void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
+			 void *CallBackFunc, void *pContext,
 			 const char *szID)
 {
 	PADAPTER Adapter = pDM_Odm->Adapter;
 	_init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm);
 }
 
-void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer)
+void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer)
 {
 	_cancel_timer_ex(pTimer);
 }
 
-void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer)
+void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer)
 {
 }
 
diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h
index a6c9677..25eac4d 100644
--- a/include/Hal8188EPhyCfg.h
+++ b/include/Hal8188EPhyCfg.h
@@ -235,7 +235,6 @@ PHY_ScanOperationBackup8188E(	PADAPTER	Adapter,
 //
 // Switch bandwidth for 8192S
 //
-//extern	void	PHY_SetBWModeCallback8192C(		PRT_TIMER		pTimer	);
 void	PHY_SetBWMode8188E(		PADAPTER			pAdapter,
 										HT_CHANNEL_WIDTH	ChnlWidth,
 										unsigned char	Offset	);
@@ -257,7 +256,6 @@ extern	void FillA2Entry8192C(			PADAPTER			Adapter,
 //
 // channel switch related funciton
 //
-//extern	void	PHY_SwChnlCallback8192C(		PRT_TIMER		pTimer	);
 void	PHY_SwChnl8188E(		PADAPTER		pAdapter,
 										u8			channel	);
 				// Call after initialization
diff --git a/include/HalHWImg8188E_BB.h b/include/HalHWImg8188E_BB.h
index 58e6c31..02466ff 100644
--- a/include/HalHWImg8188E_BB.h
+++ b/include/HalHWImg8188E_BB.h
@@ -28,7 +28,7 @@
 *                           AGC_TAB_1T.TXT
 ******************************************************************************/
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ReadAndConfig_AGC_TAB_1T_8188E(
 	struct odm_dm_struct * pDM_Odm
 );
@@ -37,7 +37,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
 *                           PHY_REG_1T.TXT
 ******************************************************************************/
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ReadAndConfig_PHY_REG_1T_8188E(
 	struct odm_dm_struct * pDM_Odm
 );
diff --git a/include/HalHWImg8188E_MAC.h b/include/HalHWImg8188E_MAC.h
index 0cfad89..19dd0c1 100644
--- a/include/HalHWImg8188E_MAC.h
+++ b/include/HalHWImg8188E_MAC.h
@@ -27,6 +27,6 @@
 *                           MAC_REG.TXT
 ******************************************************************************/
 
-HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E( struct odm_dm_struct *pDM_Odm);
+enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E( struct odm_dm_struct *pDM_Odm);
 
 #endif // end of HWIMG_SUPPORT
diff --git a/include/HalHWImg8188E_RF.h b/include/HalHWImg8188E_RF.h
index 059de1e..bcaa82a 100644
--- a/include/HalHWImg8188E_RF.h
+++ b/include/HalHWImg8188E_RF.h
@@ -25,6 +25,6 @@
  *                           RadioA_1T.TXT
  ******************************************************************************/
 
-HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm);
+enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm);
 
 #endif // end of HWIMG_SUPPORT
diff --git a/include/odm.h b/include/odm.h
index 5789c62..e348189 100644
--- a/include/odm.h
+++ b/include/odm.h
@@ -210,7 +210,7 @@ struct rx_hpc {
 	bool		First_time_enter;
 	bool		RXHP_enable;
 	u1Byte		TP_Mode;
-	RT_TIMER	PSDTimer;
+	struct timer_list PSDTimer;
 };
 
 #define ASSOCIATE_ENTRY_NUM					32 // Max size of AsocEntry[].
@@ -257,7 +257,7 @@ struct sw_ant_switch {
 	u8Byte		RXByteCnt_A;
 	u8Byte		RXByteCnt_B;
 	u1Byte		TrafficLoad;
-	RT_TIMER	SwAntennaSwitchTimer;
+	struct timer_list SwAntennaSwitchTimer;
 	//Hybrid Antenna Diversity
 	u4Byte		CCK_Ant1_Cnt[ASSOCIATE_ENTRY_NUM];
 	u4Byte		CCK_Ant2_Cnt[ASSOCIATE_ENTRY_NUM];
@@ -361,7 +361,7 @@ enum odm_ability {
 };
 
 //
-// 2011/20/20 MH For MP driver RT_WLAN_STA =  STA_INFO_T
+// 2011/20/20 MH For MP driver RT_WLAN_STA =  struct sta_info
 // Please declare below ODM relative info in your STA info structure.
 //
 struct odm_sta_info {
@@ -927,7 +927,7 @@ struct odm_dm_struct {
 	//2 Define STA info.
 	// _ODM_STA_INFO
 	// 2012/01/12 MH For MP, we need to reduce one array pointer for default port.??
-	PSTA_INFO_T		pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
+	struct sta_info *pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
 
 #if (RATE_ADAPTIVE_SUPPORT == 1)
 	u2Byte			CurrminRptTime;
@@ -973,7 +973,7 @@ struct odm_dm_struct {
 
 	//PSD
 	bool			bUserAssignLevel;
-	RT_TIMER		PSDTimer;
+	struct timer_list PSDTimer;
 	u1Byte			RSSI_BT;			//come from BT
 	bool			bPSDinProcess;
 	bool			bDMInitialGainEnable;
@@ -1003,10 +1003,10 @@ struct odm_dm_struct {
 	//
 
 	// ODM relative time.
-	RT_TIMER				PathDivSwitchTimer;
+	struct timer_list PathDivSwitchTimer;
 	//2011.09.27 add for Path Diversity
-	RT_TIMER				CCKPathDiversityTimer;
-	RT_TIMER	FastAntTrainingTimer;
+	struct timer_list CCKPathDiversityTimer;
+	struct timer_list FastAntTrainingTimer;
 };		// DM_Dynamic_Mechanism_Structure
 
 #define ODM_RF_PATH_MAX 2
diff --git a/include/odm_HWConfig.h b/include/odm_HWConfig.h
index c1f53e7..623230d 100644
--- a/include/odm_HWConfig.h
+++ b/include/odm_HWConfig.h
@@ -171,20 +171,20 @@ ODM_MacStatusQuery(
 			bool						bPacketBeacon
 	);
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ConfigRFWithHeaderFile(
 		struct odm_dm_struct *      pDM_Odm,
 		enum ODM_RF_RADIO_PATH	Content,
 		enum ODM_RF_RADIO_PATH	eRFPath
 	);
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ConfigBBWithHeaderFile(
 		struct odm_dm_struct *			pDM_Odm,
 		enum odm_bb_config_type		ConfigType
     );
 
-HAL_STATUS
+enum HAL_STATUS
 ODM_ConfigMACWithHeaderFile(
 		struct odm_dm_struct *pDM_Odm
     );
diff --git a/include/odm_interface.h b/include/odm_interface.h
index a039907..369d360 100644
--- a/include/odm_interface.h
+++ b/include/odm_interface.h
@@ -118,9 +118,9 @@ s4Byte ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2
 //
 // ODM MISC-spin lock relative API.
 //
-void ODM_AcquireSpinLock(struct odm_dm_struct *pDM_Odm, RT_SPINLOCK_TYPE	type);
+void ODM_AcquireSpinLock(struct odm_dm_struct *pDM_Odm, enum RT_SPINLOCK_TYPE	type);
 
-void ODM_ReleaseSpinLock(struct odm_dm_struct *pDM_Odm, RT_SPINLOCK_TYPE	type);
+void ODM_ReleaseSpinLock(struct odm_dm_struct *pDM_Odm, enum RT_SPINLOCK_TYPE	type);
 
 //
 // ODM MISC-workitem relative API.
@@ -152,13 +152,13 @@ void ODM_sleep_ms(u4Byte ms);
 
 void ODM_sleep_us(u4Byte us);
 
-void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER		pTimer, u4Byte msDelay);
+void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer, u4Byte msDelay);
 
-void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER pTimer, RT_TIMER_CALL_BACK CallBackFunc, void *pContext, const char *szID);
+void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer, void *CallBackFunc, void *pContext, const char *szID);
 
-void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER		pTimer);
+void ODM_CancelTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer);
 
-void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, PRT_TIMER		pTimer);
+void ODM_ReleaseTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer);
 
 //
 // ODM FW relative API.
diff --git a/include/odm_types.h b/include/odm_types.h
index 283ce36..dd42aec 100644
--- a/include/odm_types.h
+++ b/include/odm_types.h
@@ -32,20 +32,14 @@
 #define		RT_USB_INTERFACE				2
 #define		RT_SDIO_INTERFACE				3
 
-typedef enum _HAL_STATUS{
+enum HAL_STATUS {
 	HAL_STATUS_SUCCESS,
 	HAL_STATUS_FAILURE,
-	/*RT_STATUS_PENDING,
-	RT_STATUS_RESOURCE,
-	RT_STATUS_INVALID_CONTEXT,
-	RT_STATUS_INVALID_PARAMETER,
-	RT_STATUS_NOT_SUPPORT,
-	RT_STATUS_OS_API_FAILED,*/
-}HAL_STATUS,*PHAL_STATUS;
+};
 
-typedef enum _RT_SPINLOCK_TYPE{
+enum RT_SPINLOCK_TYPE {
 	RT_TEMP =1,
-}RT_SPINLOCK_TYPE;
+};
 
 #include <basic_types.h>
 
@@ -75,11 +69,6 @@ typedef enum _RT_SPINLOCK_TYPE{
 
 #define DEV_BUS_TYPE	RT_USB_INTERFACE
 
-typedef struct timer_list		RT_TIMER, *PRT_TIMER;
-typedef  void *				RT_TIMER_CALL_BACK;
-#define	STA_INFO_T			struct sta_info
-#define	PSTA_INFO_T		struct sta_info *
-
 #define SET_TX_DESC_ANTSEL_A_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 24, 1, __Value)
 #define SET_TX_DESC_ANTSEL_B_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+8, 25, 1, __Value)
 #define SET_TX_DESC_ANTSEL_C_88E(__pTxDesc, __Value) SET_BITS_TO_LE_4BYTE(__pTxDesc+28, 29, 1, __Value)