diff --git a/hal/odm_HWConfig.c b/hal/odm_HWConfig.c
index d65235a..0f65618 100644
--- a/hal/odm_HWConfig.c
+++ b/hal/odm_HWConfig.c
@@ -18,193 +18,94 @@
  *
  ******************************************************************************/
 
-/*  */
 /*  include files */
-/*  */
 
 #include "odm_precomp.h"
 
 #define READ_AND_CONFIG     READ_AND_CONFIG_MP
 
-#define READ_AND_CONFIG_MP(ic, txt) (ODM_ReadAndConfig##txt##ic(pDM_Odm))
-#define READ_AND_CONFIG_TC(ic, txt) (ODM_ReadAndConfig_TC##txt##ic(pDM_Odm))
+#define READ_AND_CONFIG_MP(ic, txt) (ODM_ReadAndConfig##txt##ic(dm_odm))
+#define READ_AND_CONFIG_TC(ic, txt) (ODM_ReadAndConfig_TC##txt##ic(dm_odm))
 
-static u1Byte odm_QueryRxPwrPercentage(s1Byte		AntPower)
+static u1Byte odm_QueryRxPwrPercentage(s1Byte AntPower)
 {
 	if ((AntPower <= -100) || (AntPower >= 20))
 		return	0;
 	else if (AntPower >= 0)
 		return	100;
 	else
-		return	(100+AntPower);
+		return 100+AntPower;
 }
 
-/*  */
 /*  2012/01/12 MH MOve some signal strength smooth method to MP HAL layer. */
 /*  IF other SW team do not support the feature, remove this section.?? */
-/*  */
-static s4Byte odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(
-	struct odm_dm_struct *pDM_Odm,
-	s4Byte CurrSig
-)
+static s4Byte odm_sig_patch_lenove(struct odm_dm_struct *dm_odm, s4Byte CurrSig)
+{
+	s4Byte RetSig;
+
+	return RetSig;
+}
+
+static s4Byte odm_sig_patch_netcore(struct odm_dm_struct *dm_odm, s4Byte CurrSig)
 {
 	s4Byte RetSig;
 	return RetSig;
 }
 
-static s4Byte odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(
-	struct odm_dm_struct *pDM_Odm,
-	s4Byte CurrSig
-)
+static s4Byte odm_SignalScaleMapping_92CSeries(struct odm_dm_struct *dm_odm, s4Byte CurrSig)
 {
 	s4Byte RetSig;
-	return RetSig;
-}
 
-static s4Byte
-odm_SignalScaleMapping_92CSeries(
-	struct odm_dm_struct *pDM_Odm,
-	s4Byte CurrSig
-)
-{
-	s4Byte RetSig;
-#if (DEV_BUS_TYPE == RT_PCI_INTERFACE)
-	if (pDM_Odm->SupportInterface  == ODM_ITRF_PCIE)
-	{
-		/*  Step 1. Scale mapping. */
-		if (CurrSig >= 61 && CurrSig <= 100)
-		{
-			RetSig = 90 + ((CurrSig - 60) / 4);
-		}
-		else if (CurrSig >= 41 && CurrSig <= 60)
-		{
-			RetSig = 78 + ((CurrSig - 40) / 2);
-		}
-		else if (CurrSig >= 31 && CurrSig <= 40)
-		{
-			RetSig = 66 + (CurrSig - 30);
-		}
-		else if (CurrSig >= 21 && CurrSig <= 30)
-		{
-			RetSig = 54 + (CurrSig - 20);
-		}
-		else if (CurrSig >= 5 && CurrSig <= 20)
-		{
-			RetSig = 42 + (((CurrSig - 5) * 2) / 3);
-		}
-		else if (CurrSig == 4)
-		{
-			RetSig = 36;
-		}
-		else if (CurrSig == 3)
-		{
-			RetSig = 27;
-		}
-		else if (CurrSig == 2)
-		{
-			RetSig = 18;
-		}
-		else if (CurrSig == 1)
-		{
-			RetSig = 9;
-		}
-		else
-		{
-			RetSig = CurrSig;
-		}
-	}
-#endif
-
-#if ((DEV_BUS_TYPE == RT_USB_INTERFACE) ||(DEV_BUS_TYPE == RT_SDIO_INTERFACE))
-	if ((pDM_Odm->SupportInterface  == ODM_ITRF_USB) || (pDM_Odm->SupportInterface  == ODM_ITRF_SDIO))
-	{
+	if ((dm_odm->SupportInterface  == ODM_ITRF_USB) ||
+	    (dm_odm->SupportInterface  == ODM_ITRF_SDIO)) {
 		if (CurrSig >= 51 && CurrSig <= 100)
-		{
 			RetSig = 100;
-		}
 		else if (CurrSig >= 41 && CurrSig <= 50)
-		{
 			RetSig = 80 + ((CurrSig - 40)*2);
-		}
 		else if (CurrSig >= 31 && CurrSig <= 40)
-		{
 			RetSig = 66 + (CurrSig - 30);
-		}
 		else if (CurrSig >= 21 && CurrSig <= 30)
-		{
 			RetSig = 54 + (CurrSig - 20);
-		}
 		else if (CurrSig >= 10 && CurrSig <= 20)
-		{
 			RetSig = 42 + (((CurrSig - 10) * 2) / 3);
-		}
 		else if (CurrSig >= 5 && CurrSig <= 9)
-		{
 			RetSig = 22 + (((CurrSig - 5) * 3) / 2);
-		}
 		else if (CurrSig >= 1 && CurrSig <= 4)
-		{
 			RetSig = 6 + (((CurrSig - 1) * 3) / 2);
-		}
 		else
-		{
 			RetSig = CurrSig;
-		}
 	}
-#endif
 	return RetSig;
 }
-static s4Byte
-odm_SignalScaleMapping(
-	struct odm_dm_struct *pDM_Odm,
-		s4Byte CurrSig
-)
-{
-	if (	(pDM_Odm->SupportPlatform == ODM_MP) &&
-		(pDM_Odm->SupportInterface  != ODM_ITRF_PCIE) && /* USB & SDIO */
-		(pDM_Odm->PatchID==10))/* pMgntInfo->CustomerID == RT_CID_819x_Netcore */
-	{
-		return odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore(pDM_Odm,CurrSig);
-	}
-	else if (	(pDM_Odm->SupportPlatform == ODM_MP) &&
-			(pDM_Odm->SupportInterface  == ODM_ITRF_PCIE) &&
-			(pDM_Odm->PatchID==19))/* pMgntInfo->CustomerID == RT_CID_819x_Lenovo) */
-	{
-		return odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo(pDM_Odm, CurrSig);
-	}
-	else{
-		return odm_SignalScaleMapping_92CSeries(pDM_Odm,CurrSig);
-	}
 
+static s4Byte odm_SignalScaleMapping(struct odm_dm_struct *dm_odm, s4Byte CurrSig)
+{
+	if ((dm_odm->SupportPlatform == ODM_MP) &&
+	    (dm_odm->SupportInterface != ODM_ITRF_PCIE) && /* USB & SDIO */
+	    (dm_odm->PatchID == 10))
+		return odm_sig_patch_netcore(dm_odm, CurrSig);
+	else if ((dm_odm->SupportPlatform == ODM_MP) &&
+		 (dm_odm->SupportInterface == ODM_ITRF_PCIE) &&
+		 (dm_odm->PatchID == 19))
+		return odm_sig_patch_lenove(dm_odm, CurrSig);
+	else
+		return odm_SignalScaleMapping_92CSeries(dm_odm, CurrSig);
 }
 
 /* pMgntInfo->CustomerID == RT_CID_819x_Lenovo */
-static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo(
-	struct odm_dm_struct *pDM_Odm,
-	u1Byte		isCCKrate,
-	u1Byte		PWDB_ALL,
-	u1Byte		path,
-	u1Byte		RSSI
-)
+static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo(struct odm_dm_struct *dm_odm,
+	u1Byte isCCKrate, u1Byte PWDB_ALL, u1Byte path, u1Byte RSSI)
 {
-	u1Byte	SQ;
+	u1Byte SQ;
 	return SQ;
 }
 
-static u1Byte
-odm_EVMdbToPercentage(
-    		s1Byte Value
-   )
+static u1Byte odm_EVMdbToPercentage(s1Byte Value)
 {
-	/*  */
 	/*  -33dB~0dB to 0%~99% */
-	/*  */
 	s1Byte ret_val;
 
 	ret_val = Value;
-	/* ret_val /= 2; */
-
-	/* ODM_RTPRINT(FRX, RX_PHY_SQ, ("EVMdbToPercentage92C Value=%d / %x\n", ret_val, ret_val)); */
 
 	if (ret_val >= 0)
 		ret_val = 0;
@@ -212,33 +113,27 @@ odm_EVMdbToPercentage(
 		ret_val = -33;
 
 	ret_val = 0 - ret_val;
-	ret_val*=3;
+	ret_val *= 3;
 
 	if (ret_val == 99)
 		ret_val = 100;
-
-	return(ret_val);
+	return ret_val;
 }
 
-
-
-static void
-odm_RxPhyStatus92CSeries_Parsing(
-		struct odm_dm_struct *				pDM_Odm,
+static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
 			struct odm_phy_status_info *pPhyInfo,
-			pu1Byte						pPhyStatus,
-			struct odm_per_pkt_info *pPktinfo
-	)
+			pu1Byte pPhyStatus,
+			struct odm_per_pkt_info *pPktinfo)
 {
-	struct sw_ant_switch *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
-	u1Byte				i, Max_spatial_stream;
-	s1Byte				rx_pwr[4], rx_pwr_all=0;
-	u1Byte				EVM, PWDB_ALL = 0, PWDB_ALL_BT;
-	u1Byte				RSSI, total_rssi=0;
-	u1Byte				isCCKrate=0;
-	u1Byte				rf_rx_num = 0;
-	u1Byte				cck_highpwr = 0;
-	u1Byte				LNA_idx, VGA_idx;
+	struct sw_ant_switch *pDM_SWAT_Table = &dm_odm->DM_SWAT_Table;
+	u1Byte i, Max_spatial_stream;
+	s1Byte rx_pwr[4], rx_pwr_all = 0;
+	u1Byte EVM, PWDB_ALL = 0, PWDB_ALL_BT;
+	u1Byte RSSI, total_rssi = 0;
+	u1Byte isCCKrate = 0;
+	u1Byte rf_rx_num = 0;
+	u1Byte cck_highpwr = 0;
+	u1Byte LNA_idx, VGA_idx;
 
 	struct phy_status_rpt *pPhyStaRpt = (struct phy_status_rpt *)pPhyStatus;
 
@@ -247,26 +142,23 @@ odm_RxPhyStatus92CSeries_Parsing(
 	pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = -1;
 	pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
 
-
 	if (isCCKrate) {
 		u1Byte report;
 		u1Byte cck_agc_rpt;
 
-		pDM_Odm->PhyDbgInfo.NumQryPhyStatusCCK++;
-		/*  */
+		dm_odm->PhyDbgInfo.NumQryPhyStatusCCK++;
 		/*  (1)Hardware does not provide RSSI for CCK */
 		/*  (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) */
-		/*  */
 
-		cck_highpwr = pDM_Odm->bCckHighPower;
+		cck_highpwr = dm_odm->bCckHighPower;
 
 		cck_agc_rpt =  pPhyStaRpt->cck_agc_rpt_ofdm_cfosho_a ;
 
 		/* 2011.11.28 LukeLee: 88E use different LNA & VGA gain table */
 		/* The RSSI formula should be modified according to the gain table */
 		/* In 88E, cck_highpwr is always set to 1 */
-		if (pDM_Odm->SupportICType & (ODM_RTL8188E|ODM_RTL8812)) {
-			LNA_idx = ((cck_agc_rpt & 0xE0) >>5);
+		if (dm_odm->SupportICType & (ODM_RTL8188E|ODM_RTL8812)) {
+			LNA_idx = ((cck_agc_rpt & 0xE0) >> 5);
 			VGA_idx = (cck_agc_rpt & 0x1F);
 			switch (LNA_idx) {
 			case 7:
@@ -291,7 +183,7 @@ odm_RxPhyStatus92CSeries_Parsing(
 				if (cck_highpwr)
 					rx_pwr_all = -12 + 2*(5-VGA_idx); /* VGA_idx = 5~0 */
 				else
-					rx_pwr_all = -6+ 2*(5-VGA_idx);
+					rx_pwr_all = -6 + 2*(5-VGA_idx);
 				break;
 			case 1:
 					rx_pwr_all = 8-2*VGA_idx;
@@ -304,87 +196,69 @@ odm_RxPhyStatus92CSeries_Parsing(
 			}
 			rx_pwr_all += 6;
 			PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
-			if (cck_highpwr == false)
-			{
+			if (!cck_highpwr) {
 				if (PWDB_ALL >= 80)
 					PWDB_ALL = ((PWDB_ALL-80)<<1)+((PWDB_ALL-80)>>1)+80;
 				else if ((PWDB_ALL <= 78) && (PWDB_ALL >= 20))
 					PWDB_ALL += 3;
-				if (PWDB_ALL>100)
+				if (PWDB_ALL > 100)
 					PWDB_ALL = 100;
 			}
-		}
-		else
-		{
-			if (!cck_highpwr)
-			{
-				report =(cck_agc_rpt & 0xc0)>>6;
-				switch (report)
-				{
-					/*  03312009 modified by cosa */
-					/*  Modify the RF RNA gain value to -40, -20, -2, 14 by Jenyu's suggestion */
-					/*  Note: different RF with the different RNA gain. */
-					case 0x3:
-						rx_pwr_all = -46 - (cck_agc_rpt & 0x3e);
-						break;
-					case 0x2:
-						rx_pwr_all = -26 - (cck_agc_rpt & 0x3e);
-						break;
-					case 0x1:
-						rx_pwr_all = -12 - (cck_agc_rpt & 0x3e);
-						break;
-					case 0x0:
-						rx_pwr_all = 16 - (cck_agc_rpt & 0x3e);
-						break;
+		} else {
+			if (!cck_highpwr) {
+				report = (cck_agc_rpt & 0xc0)>>6;
+				switch (report) {
+				/*  03312009 modified by cosa */
+				/*  Modify the RF RNA gain value to -40, -20, -2, 14 by Jenyu's suggestion */
+				/*  Note: different RF with the different RNA gain. */
+				case 0x3:
+					rx_pwr_all = -46 - (cck_agc_rpt & 0x3e);
+					break;
+				case 0x2:
+					rx_pwr_all = -26 - (cck_agc_rpt & 0x3e);
+					break;
+				case 0x1:
+					rx_pwr_all = -12 - (cck_agc_rpt & 0x3e);
+					break;
+				case 0x0:
+					rx_pwr_all = 16 - (cck_agc_rpt & 0x3e);
+					break;
 				}
-			}
-			else
-			{
-				/* report = pDrvInfo->cfosho[0] & 0x60; */
-				/* report = pPhyStaRpt->cck_agc_rpt_ofdm_cfosho_a& 0x60; */
-
+			} else {
 				report = (cck_agc_rpt & 0x60)>>5;
-				switch (report)
-				{
-					case 0x3:
-						rx_pwr_all = -46 - ((cck_agc_rpt & 0x1f)<<1) ;
-						break;
-					case 0x2:
-						rx_pwr_all = -26 - ((cck_agc_rpt & 0x1f)<<1);
-						break;
-					case 0x1:
-						rx_pwr_all = -12 - ((cck_agc_rpt & 0x1f)<<1) ;
-						break;
-					case 0x0:
-						rx_pwr_all = 16 - ((cck_agc_rpt & 0x1f)<<1) ;
-						break;
+				switch (report) {
+				case 0x3:
+					rx_pwr_all = -46 - ((cck_agc_rpt & 0x1f)<<1) ;
+					break;
+				case 0x2:
+					rx_pwr_all = -26 - ((cck_agc_rpt & 0x1f)<<1);
+					break;
+				case 0x1:
+					rx_pwr_all = -12 - ((cck_agc_rpt & 0x1f)<<1);
+					break;
+				case 0x0:
+					rx_pwr_all = 16 - ((cck_agc_rpt & 0x1f)<<1);
+					break;
 				}
 			}
 
 			PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
 
 			/* Modification for ext-LNA board */
-			if (pDM_Odm->BoardType == ODM_BOARD_HIGHPWR)
-			{
-				if ((cck_agc_rpt>>7) == 0){
-					PWDB_ALL = (PWDB_ALL>94)?100:(PWDB_ALL +6);
-				}
-				else
-	                   {
+			if (dm_odm->BoardType == ODM_BOARD_HIGHPWR) {
+				if ((cck_agc_rpt>>7) == 0) {
+					PWDB_ALL = (PWDB_ALL > 94) ? 100 : (PWDB_ALL+6);
+				} else {
 					if (PWDB_ALL > 38)
 						PWDB_ALL -= 16;
 					else
-						PWDB_ALL = (PWDB_ALL<=16)?(PWDB_ALL>>2):(PWDB_ALL -12);
+						PWDB_ALL = (PWDB_ALL <= 16) ? (PWDB_ALL>>2) : (PWDB_ALL-12);
 				}
 
 				/* CCK modification */
 				if (PWDB_ALL > 25 && PWDB_ALL <= 60)
 					PWDB_ALL += 6;
-				/* else if (PWDB_ALL <= 25) */
-				/* 	PWDB_ALL += 8; */
-			}
-			else/* Modification for int-LNA board */
-			{
+			} else {/* Modification for int-LNA board */
 				if (PWDB_ALL > 99)
 					PWDB_ALL -= 8;
 				else if (PWDB_ALL > 50 && PWDB_ALL <= 68)
@@ -395,20 +269,15 @@ odm_RxPhyStatus92CSeries_Parsing(
 		pPhyInfo->RxPWDBAll = PWDB_ALL;
 		pPhyInfo->BTRxRSSIPercentage = PWDB_ALL;
 		pPhyInfo->RecvSignalPower = rx_pwr_all;
-		/*  */
 		/*  (3) Get Signal Quality (EVM) */
-		/*  */
-		if (pPktinfo->bPacketMatchBSSID)
-		{
-			u1Byte	SQ,SQ_rpt;
+		if (pPktinfo->bPacketMatchBSSID) {
+			u1Byte SQ, SQ_rpt;
 
-			if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){/* pMgntInfo->CustomerID == RT_CID_819x_Lenovo */
-				SQ = odm_SQ_process_patch_RT_CID_819x_Lenovo(pDM_Odm,isCCKrate,PWDB_ALL,0,0);
-			}
-			else if (pPhyInfo->RxPWDBAll > 40 && !pDM_Odm->bInHctTest){
+			if ((dm_odm->SupportPlatform == ODM_MP) && (dm_odm->PatchID == 19)) {
+				SQ = odm_SQ_process_patch_RT_CID_819x_Lenovo(dm_odm, isCCKrate, PWDB_ALL, 0, 0);
+			} else if (pPhyInfo->RxPWDBAll > 40 && !dm_odm->bInHctTest) {
 				SQ = 100;
-			}
-			else{
+			} else {
 				SQ_rpt = pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all;
 
 				if (SQ_rpt > 64)
@@ -417,476 +286,315 @@ odm_RxPhyStatus92CSeries_Parsing(
 					SQ = 100;
 				else
 					SQ = ((64-SQ_rpt) * 100) / 44;
-
 			}
-
-			/* DbgPrint("cck SQ = %d\n", SQ); */
 			pPhyInfo->SignalQuality = SQ;
 			pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = SQ;
 			pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
 		}
-	}
-	else /* is OFDM rate */
-	{
-		pDM_Odm->PhyDbgInfo.NumQryPhyStatusOFDM++;
+	} else { /* is OFDM rate */
+		dm_odm->PhyDbgInfo.NumQryPhyStatusOFDM++;
 
-		/*  */
 		/*  (1)Get RSSI for HT rate */
-		/*  */
 
-	 for (i = ODM_RF_PATH_A; i < ODM_RF_PATH_MAX; i++)
-		{
+		 for (i = ODM_RF_PATH_A; i < ODM_RF_PATH_MAX; i++) {
 			/*  2008/01/30 MH we will judge RF RX path now. */
-			if (pDM_Odm->RFPathRxEnable & BIT(i))
+			if (dm_odm->RFPathRxEnable & BIT(i))
 				rf_rx_num++;
-			/* else */
-				/* continue; */
 
-			rx_pwr[i] = ((pPhyStaRpt->path_agc[i].gain& 0x3F)*2) - 110;
+			rx_pwr[i] = ((pPhyStaRpt->path_agc[i].gain & 0x3F)*2) - 110;
 
 			pPhyInfo->RxPwr[i] = rx_pwr[i];
 
 			/* Translate DBM to percentage. */
 			RSSI = odm_QueryRxPwrPercentage(rx_pwr[i]);
 			total_rssi += RSSI;
-			/* RTPRINT(FRX, RX_PHY_SS, ("RF-%d RXPWR=%x RSSI=%d\n", i, rx_pwr[i], RSSI)); */
 
 			/* Modification for ext-LNA board */
-			if (pDM_Odm->BoardType == ODM_BOARD_HIGHPWR)
-			{
+			if (dm_odm->BoardType == ODM_BOARD_HIGHPWR) {
 				if ((pPhyStaRpt->path_agc[i].trsw) == 1)
-					RSSI = (RSSI>94)?100:(RSSI +6);
+					RSSI = (RSSI > 94) ? 100 : (RSSI + 6);
 				else
-					RSSI = (RSSI<=16)?(RSSI>>3):(RSSI -16);
+					RSSI = (RSSI <= 16) ? (RSSI >> 3) : (RSSI - 16);
 
-				if ((RSSI <= 34) && (RSSI >=4))
+				if ((RSSI <= 34) && (RSSI >= 4))
 					RSSI -= 4;
 			}
 
-			pPhyInfo->RxMIMOSignalStrength[i] =(u1Byte) RSSI;
+			pPhyInfo->RxMIMOSignalStrength[i] = (u1Byte)RSSI;
 
 			/* Get Rx snr value in DB */
-			pPhyInfo->RxSNR[i] = pDM_Odm->PhyDbgInfo.RxSNRdB[i] = (s4Byte)(pPhyStaRpt->path_rxsnr[i]/2);
+			pPhyInfo->RxSNR[i] = (s4Byte)(pPhyStaRpt->path_rxsnr[i]/2);
+			dm_odm->PhyDbgInfo.RxSNRdB[i] = (s4Byte)(pPhyStaRpt->path_rxsnr[i]/2);
 
 			/* Record Signal Strength for next packet */
-			if (pPktinfo->bPacketMatchBSSID)
-			{
-				if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19))
-				{
-					if (i==ODM_RF_PATH_A)
-						pPhyInfo->SignalQuality = odm_SQ_process_patch_RT_CID_819x_Lenovo(pDM_Odm,isCCKrate,PWDB_ALL,i,RSSI);
-
+			if (pPktinfo->bPacketMatchBSSID) {
+				if ((dm_odm->SupportPlatform == ODM_MP) && (dm_odm->PatchID == 19)) {
+					if (i == ODM_RF_PATH_A)
+						pPhyInfo->SignalQuality = odm_SQ_process_patch_RT_CID_819x_Lenovo(dm_odm, isCCKrate, PWDB_ALL, i, RSSI);
 				}
-
 			}
 		}
-
-
-		/*  */
 		/*  (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) */
-		/*  */
-		rx_pwr_all = (((pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all) >> 1)& 0x7f) -110;
-		/* RTPRINT(FRX, RX_PHY_SS, ("PWDB_ALL=%d\n",	PWDB_ALL)); */
+		rx_pwr_all = (((pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all) >> 1) & 0x7f) - 110;
 
-		PWDB_ALL_BT = PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
-		/* RTPRINT(FRX, RX_PHY_SS, ("PWDB_ALL=%d\n",PWDB_ALL)); */
+		PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
+		PWDB_ALL_BT = PWDB_ALL;
 
 		pPhyInfo->RxPWDBAll = PWDB_ALL;
-		/* ODM_RT_TRACE(pDM_Odm,ODM_COMP_RSSI_MONITOR, ODM_DBG_LOUD, ("ODM OFDM RSSI=%d\n",pPhyInfo->RxPWDBAll)); */
 		pPhyInfo->BTRxRSSIPercentage = PWDB_ALL_BT;
 		pPhyInfo->RxPower = rx_pwr_all;
 		pPhyInfo->RecvSignalPower = rx_pwr_all;
 
-		if ((pDM_Odm->SupportPlatform == ODM_MP) &&(pDM_Odm->PatchID==19)){
+		if ((dm_odm->SupportPlatform == ODM_MP) && (dm_odm->PatchID == 19)) {
 			/* do nothing */
-		}
-		else{/* pMgntInfo->CustomerID != RT_CID_819x_Lenovo */
-			/*  */
+		} else {
 			/*  (3)EVM of HT rate */
-			/*  */
-			if (pPktinfo->Rate >=DESC92C_RATEMCS8 && pPktinfo->Rate <=DESC92C_RATEMCS15)
+			if (pPktinfo->Rate >= DESC92C_RATEMCS8 && pPktinfo->Rate <= DESC92C_RATEMCS15)
 				Max_spatial_stream = 2; /* both spatial stream make sense */
 			else
 				Max_spatial_stream = 1; /* only spatial stream 1 makes sense */
 
-			for (i=0; i<Max_spatial_stream; i++)
-			{
+			for (i = 0; i < Max_spatial_stream; i++) {
 				/*  Do not use shift operation like "rx_evmX >>= 1" because the compilor of free build environment */
 				/*  fill most significant bit to "zero" when doing shifting operation which may change a negative */
 				/*  value to positive one, then the dbm value (which is supposed to be negative)  is not correct anymore. */
 				EVM = odm_EVMdbToPercentage((pPhyStaRpt->stream_rxevm[i]));	/* dbm */
 
-				/* RTPRINT(FRX, RX_PHY_SQ, ("RXRATE=%x RXEVM=%x EVM=%s%d\n", */
-				/* GET_RX_STATUS_DESC_RX_MCS(pDesc), pDrvInfo->rxevm[i], "%", EVM)); */
-
-				if (pPktinfo->bPacketMatchBSSID)
-				{
-					if (i==ODM_RF_PATH_A) /*  Fill value in RFD, Get the first spatial stream only */
-					{
+				if (pPktinfo->bPacketMatchBSSID) {
+					if (i == ODM_RF_PATH_A) /*  Fill value in RFD, Get the first spatial stream only */
 						pPhyInfo->SignalQuality = (u1Byte)(EVM & 0xff);
-					}
 					pPhyInfo->RxMIMOSignalQuality[i] = (u1Byte)(EVM & 0xff);
 				}
 			}
 		}
-
 	}
 	/* UI BSS List signal strength(in percentage), make it good looking, from 0~100. */
 	/* It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp(). */
-	if (isCCKrate)
-	{
-		pPhyInfo->SignalStrength = (u1Byte)(odm_SignalScaleMapping(pDM_Odm, PWDB_ALL));/* PWDB_ALL; */
-	}
-	else
-	{
+	if (isCCKrate) {
+		pPhyInfo->SignalStrength = (u1Byte)(odm_SignalScaleMapping(dm_odm, PWDB_ALL));/* PWDB_ALL; */
+	} else {
 		if (rf_rx_num != 0)
-		{
-			pPhyInfo->SignalStrength = (u1Byte)(odm_SignalScaleMapping(pDM_Odm, total_rssi/=rf_rx_num));
-		}
+			pPhyInfo->SignalStrength = (u1Byte)(odm_SignalScaleMapping(dm_odm, total_rssi /= rf_rx_num));
 	}
 
 	/* For 92C/92D HW (Hybrid) Antenna Diversity */
 	pDM_SWAT_Table->antsel = pPhyStaRpt->ant_sel;
 	/* For 88E HW Antenna Diversity */
-	pDM_Odm->DM_FatTable.antsel_rx_keep_0 = pPhyStaRpt->ant_sel;
-	pDM_Odm->DM_FatTable.antsel_rx_keep_1 = pPhyStaRpt->ant_sel_b;
-	pDM_Odm->DM_FatTable.antsel_rx_keep_2 = pPhyStaRpt->antsel_rx_keep_2;
+	dm_odm->DM_FatTable.antsel_rx_keep_0 = pPhyStaRpt->ant_sel;
+	dm_odm->DM_FatTable.antsel_rx_keep_1 = pPhyStaRpt->ant_sel_b;
+	dm_odm->DM_FatTable.antsel_rx_keep_2 = pPhyStaRpt->antsel_rx_keep_2;
 }
 
-void
-odm_Init_RSSIForDM(
-		struct odm_dm_struct *pDM_Odm
-	)
+void odm_Init_RSSIForDM(struct odm_dm_struct *dm_odm)
 {
-
 }
 
-static void odm_Process_RSSIForDM(
-		struct odm_dm_struct *				pDM_Odm,
-			struct odm_phy_status_info *pPhyInfo,
-			struct odm_per_pkt_info *pPktinfo
-	)
+static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,
+				  struct odm_phy_status_info *pPhyInfo,
+				  struct odm_per_pkt_info *pPktinfo)
 {
-
-	s4Byte			UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK, UndecoratedSmoothedOFDM, RSSI_Ave;
-	u1Byte			isCCKrate=0;
-	u1Byte			RSSI_max, RSSI_min, i;
-	u4Byte			OFDM_pkt=0;
-	u4Byte			Weighting=0;
-
-	struct sta_info *	pEntry;
+	s4Byte UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK;
+	s4Byte UndecoratedSmoothedOFDM, RSSI_Ave;
+	u1Byte isCCKrate = 0;
+	u1Byte RSSI_max, RSSI_min, i;
+	u4Byte OFDM_pkt = 0;
+	u4Byte Weighting = 0;
+	struct sta_info *pEntry;
 
 	if (pPktinfo->StationID == 0xFF)
 		return;
-
-	/*  2011/11/17 MH Need to debug */
-	/* if (pDM_Odm->SupportPlatform == ODM_MP) */
-	{
-
-	}
-
-	pEntry = pDM_Odm->pODM_StaInfo[pPktinfo->StationID];
-	if (!IS_STA_VALID(pEntry)){
+	pEntry = dm_odm->pODM_StaInfo[pPktinfo->StationID];
+	if (!IS_STA_VALID(pEntry))
 		return;
-	}
 	if ((!pPktinfo->bPacketMatchBSSID))
-	{
 		return;
-	}
 
 	isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;
 
 	/* Smart Antenna Debug Message------------------  */
-	if (pDM_Odm->SupportICType == ODM_RTL8188E)
-	{
-		u1Byte	antsel_tr_mux;
-		struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
+	if (dm_odm->SupportICType == ODM_RTL8188E) {
+		u1Byte antsel_tr_mux;
+		struct fast_ant_train *pDM_FatTable = &dm_odm->DM_FatTable;
 
-		if (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV)
-		{
-			if (pDM_FatTable->FAT_State == FAT_TRAINING_STATE)
-			{
-				if (pPktinfo->bPacketToSelf)	/* pPktinfo->bPacketMatchBSSID && (!pPktinfo->bPacketBeacon)) */
-				{
-					antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2) |(pDM_FatTable->antsel_rx_keep_1 <<1) |pDM_FatTable->antsel_rx_keep_0;
+		if (dm_odm->AntDivType == CG_TRX_SMART_ANTDIV) {
+			if (pDM_FatTable->FAT_State == FAT_TRAINING_STATE) {
+				if (pPktinfo->bPacketToSelf) {
+					antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2) |
+							(pDM_FatTable->antsel_rx_keep_1<<1) |
+							pDM_FatTable->antsel_rx_keep_0;
 					pDM_FatTable->antSumRSSI[antsel_tr_mux] += pPhyInfo->RxPWDBAll;
 					pDM_FatTable->antRSSIcnt[antsel_tr_mux]++;
-						/* ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD,("isCCKrate=%d, PWDB_ALL=%d\n",isCCKrate, pPhyInfo->RxPWDBAll)); */
-						/* ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD,("antsel_tr_mux=3'b%d%d%d\n", */
-							/* pDM_FatTable->antsel_rx_keep_2, pDM_FatTable->antsel_rx_keep_1, pDM_FatTable->antsel_rx_keep_0)); */
-
 				}
 			}
-		}
-		else if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)||(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV))
-		{
-			if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
-			{
-				antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2) |(pDM_FatTable->antsel_rx_keep_1 <<1) |pDM_FatTable->antsel_rx_keep_0;
-				/* ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD,("antsel_tr_mux=3'b%d%d%d\n", */
-				/* 			pDM_FatTable->antsel_rx_keep_2, pDM_FatTable->antsel_rx_keep_1, pDM_FatTable->antsel_rx_keep_0)); */
-
-				ODM_AntselStatistics_88E(pDM_Odm, antsel_tr_mux, pPktinfo->StationID, pPhyInfo->RxPWDBAll);
+		} else if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV)) {
+			if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {
+				antsel_tr_mux = (pDM_FatTable->antsel_rx_keep_2<<2) |
+						(pDM_FatTable->antsel_rx_keep_1<<1) | pDM_FatTable->antsel_rx_keep_0;
+				ODM_AntselStatistics_88E(dm_odm, antsel_tr_mux, pPktinfo->StationID, pPhyInfo->RxPWDBAll);
 			}
 		}
-
 	}
-	/* Smart Antenna Debug Message------------------ */ 
+	/* Smart Antenna Debug Message------------------ */
 
 	UndecoratedSmoothedCCK =  pEntry->rssi_stat.UndecoratedSmoothedCCK;
 	UndecoratedSmoothedOFDM = pEntry->rssi_stat.UndecoratedSmoothedOFDM;
 	UndecoratedSmoothedPWDB = pEntry->rssi_stat.UndecoratedSmoothedPWDB;
 
-	if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
-	{
-
-		if (!isCCKrate)/* ofdm rate */
-		{
-			if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0){
+	if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {
+		if (!isCCKrate) { /* ofdm rate */
+			if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0) {
 				RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
-			}
-			else
-			{
-				/* DbgPrint("pRfd->Status.RxMIMOSignalStrength[0] = %d, pRfd->Status.RxMIMOSignalStrength[1] = %d\n", */
-					/* pRfd->Status.RxMIMOSignalStrength[0], pRfd->Status.RxMIMOSignalStrength[1]); */
-
-
-				if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B])
-				{
+			} else {
+				if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]) {
 					RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
 					RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];
-				}
-				else
-				{
+				} else {
 					RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];
 					RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];
 				}
-				if ((RSSI_max -RSSI_min) < 3)
+				if ((RSSI_max - RSSI_min) < 3)
 					RSSI_Ave = RSSI_max;
-				else if ((RSSI_max -RSSI_min) < 6)
+				else if ((RSSI_max - RSSI_min) < 6)
 					RSSI_Ave = RSSI_max - 1;
-				else if ((RSSI_max -RSSI_min) < 10)
+				else if ((RSSI_max - RSSI_min) < 10)
 					RSSI_Ave = RSSI_max - 2;
 				else
 					RSSI_Ave = RSSI_max - 3;
 			}
 
 			/* 1 Process OFDM RSSI */
-			if (UndecoratedSmoothedOFDM <= 0)	/*  initialize */
-			{
+			if (UndecoratedSmoothedOFDM <= 0) {	/*  initialize */
 				UndecoratedSmoothedOFDM = pPhyInfo->RxPWDBAll;
-			}
-			else
-			{
-				if (pPhyInfo->RxPWDBAll > (u4Byte)UndecoratedSmoothedOFDM)
-				{
+			} else {
+				if (pPhyInfo->RxPWDBAll > (u4Byte)UndecoratedSmoothedOFDM) {
 					UndecoratedSmoothedOFDM =
 							(((UndecoratedSmoothedOFDM)*(Rx_Smooth_Factor-1)) +
-							(RSSI_Ave)) /(Rx_Smooth_Factor);
+							(RSSI_Ave)) / (Rx_Smooth_Factor);
 					UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM + 1;
-				}
-				else
-				{
+				} else {
 					UndecoratedSmoothedOFDM =
 							(((UndecoratedSmoothedOFDM)*(Rx_Smooth_Factor-1)) +
-							(RSSI_Ave)) /(Rx_Smooth_Factor);
+							(RSSI_Ave)) / (Rx_Smooth_Factor);
 				}
 			}
 
 			pEntry->rssi_stat.PacketMap = (pEntry->rssi_stat.PacketMap<<1) | BIT0;
 
-		}
-		else
-		{
+		} else {
 			RSSI_Ave = pPhyInfo->RxPWDBAll;
 
 			/* 1 Process CCK RSSI */
-			if (UndecoratedSmoothedCCK <= 0)	/*  initialize */
-			{
+			if (UndecoratedSmoothedCCK <= 0) {	/*  initialize */
 				UndecoratedSmoothedCCK = pPhyInfo->RxPWDBAll;
-			}
-			else
-			{
-				if (pPhyInfo->RxPWDBAll > (u4Byte)UndecoratedSmoothedCCK)
-				{
+			} else {
+				if (pPhyInfo->RxPWDBAll > (u4Byte)UndecoratedSmoothedCCK) {
 					UndecoratedSmoothedCCK =
-							(((UndecoratedSmoothedCCK)*(Rx_Smooth_Factor-1)) +
-							(pPhyInfo->RxPWDBAll)) /(Rx_Smooth_Factor);
+							((UndecoratedSmoothedCCK * (Rx_Smooth_Factor-1)) +
+							pPhyInfo->RxPWDBAll) / Rx_Smooth_Factor;
 					UndecoratedSmoothedCCK = UndecoratedSmoothedCCK + 1;
-				}
-				else
-				{
+				} else {
 					UndecoratedSmoothedCCK =
-							(((UndecoratedSmoothedCCK)*(Rx_Smooth_Factor-1)) +
-							(pPhyInfo->RxPWDBAll)) /(Rx_Smooth_Factor);
+							((UndecoratedSmoothedCCK * (Rx_Smooth_Factor-1)) +
+							pPhyInfo->RxPWDBAll) / Rx_Smooth_Factor;
 				}
 			}
 			pEntry->rssi_stat.PacketMap = pEntry->rssi_stat.PacketMap<<1;
 		}
+		/* 2011.07.28 LukeLee: modified to prevent unstable CCK RSSI */
+		if (pEntry->rssi_stat.ValidBit >= 64)
+			pEntry->rssi_stat.ValidBit = 64;
+		else
+			pEntry->rssi_stat.ValidBit++;
 
-		/* if (pEntry) */
-		{
-			/* 2011.07.28 LukeLee: modified to prevent unstable CCK RSSI */
-			if (pEntry->rssi_stat.ValidBit >= 64)
-				pEntry->rssi_stat.ValidBit = 64;
+		for (i = 0; i < pEntry->rssi_stat.ValidBit; i++)
+			OFDM_pkt += (u1Byte)(pEntry->rssi_stat.PacketMap>>i)&BIT0;
+
+		if (pEntry->rssi_stat.ValidBit == 64) {
+			Weighting = ((OFDM_pkt<<4) > 64) ? 64 : (OFDM_pkt<<4);
+			UndecoratedSmoothedPWDB = (Weighting*UndecoratedSmoothedOFDM+(64-Weighting)*UndecoratedSmoothedCCK)>>6;
+		} else {
+			if (pEntry->rssi_stat.ValidBit != 0)
+				UndecoratedSmoothedPWDB = (OFDM_pkt * UndecoratedSmoothedOFDM +
+							  (pEntry->rssi_stat.ValidBit-OFDM_pkt) *
+							  UndecoratedSmoothedCCK)/pEntry->rssi_stat.ValidBit;
 			else
-				pEntry->rssi_stat.ValidBit++;
-
-			for (i=0; i<pEntry->rssi_stat.ValidBit; i++)
-				OFDM_pkt += (u1Byte)(pEntry->rssi_stat.PacketMap>>i)&BIT0;
-
-			if (pEntry->rssi_stat.ValidBit == 64)
-			{
-				Weighting = ((OFDM_pkt<<4) > 64)?64:(OFDM_pkt<<4);
-				UndecoratedSmoothedPWDB = (Weighting*UndecoratedSmoothedOFDM+(64-Weighting)*UndecoratedSmoothedCCK)>>6;
-			}
-			else
-			{
-				if (pEntry->rssi_stat.ValidBit != 0)
-					UndecoratedSmoothedPWDB = (OFDM_pkt*UndecoratedSmoothedOFDM+(pEntry->rssi_stat.ValidBit-OFDM_pkt)*UndecoratedSmoothedCCK)/pEntry->rssi_stat.ValidBit;
-				else
-					UndecoratedSmoothedPWDB = 0;
-			}
-
-			pEntry->rssi_stat.UndecoratedSmoothedCCK = UndecoratedSmoothedCCK;
-			pEntry->rssi_stat.UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM;
-			pEntry->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB;
-
-			/* DbgPrint("OFDM_pkt=%d, Weighting=%d\n", OFDM_pkt, Weighting); */
-			/* DbgPrint("UndecoratedSmoothedOFDM=%d, UndecoratedSmoothedPWDB=%d, UndecoratedSmoothedCCK=%d\n", */
-			/* 	UndecoratedSmoothedOFDM, UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK); */
-
+				UndecoratedSmoothedPWDB = 0;
 		}
-
+		pEntry->rssi_stat.UndecoratedSmoothedCCK = UndecoratedSmoothedCCK;
+		pEntry->rssi_stat.UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM;
+		pEntry->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB;
 	}
 }
 
-
-/*  */
 /*  Endianness before calling this API */
-/*  */
-static void
-ODM_PhyStatusQuery_92CSeries(
-		struct odm_dm_struct *				pDM_Odm,
-			struct odm_phy_status_info *pPhyInfo,
-			pu1Byte						pPhyStatus,
-			struct odm_per_pkt_info *pPktinfo
-	)
+static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm,
+					 struct odm_phy_status_info *pPhyInfo,
+					 pu1Byte pPhyStatus,
+					 struct odm_per_pkt_info *pPktinfo)
 {
-
-	odm_RxPhyStatus92CSeries_Parsing(
-							pDM_Odm,
-							pPhyInfo,
-							pPhyStatus,
-							pPktinfo);
-
-	if (pDM_Odm->RSSI_test == true) {
+	odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus,
+					 pPktinfo);
+	if (dm_odm->RSSI_test) {
 		/*  Select the packets to do RSSI checking for antenna switching. */
 		if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
-				ODM_SwAntDivChkPerPktRssi(pDM_Odm,pPktinfo->StationID,pPhyInfo);
+				ODM_SwAntDivChkPerPktRssi(dm_odm, pPktinfo->StationID, pPhyInfo);
 	} else {
-		odm_Process_RSSIForDM(pDM_Odm,pPhyInfo,pPktinfo);
+		odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo);
 	}
-
 }
 
-
-
-/*  */
-/*  Endianness before calling this API */
-/*  */
-static void
-ODM_PhyStatusQuery_JaguarSeries(
-		struct odm_dm_struct *				pDM_Odm,
+void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,
 			struct odm_phy_status_info *pPhyInfo,
-			pu1Byte						pPhyStatus,
-			struct odm_per_pkt_info *pPktinfo
-	)
+			pu1Byte pPhyStatus, struct odm_per_pkt_info *pPktinfo)
 {
-
-
-}
-
-void
-ODM_PhyStatusQuery(
-		struct odm_dm_struct *				pDM_Odm,
-			struct odm_phy_status_info *pPhyInfo,
-			pu1Byte						pPhyStatus,
-			struct odm_per_pkt_info *pPktinfo
-	)
-{
-	ODM_PhyStatusQuery_92CSeries(pDM_Odm,pPhyInfo,pPhyStatus,pPktinfo);
+	ODM_PhyStatusQuery_92CSeries(dm_odm, pPhyInfo, pPhyStatus, pPktinfo);
 }
 
 /*  For future use. */
-void
-ODM_MacStatusQuery(
-		struct odm_dm_struct *				pDM_Odm,
-			pu1Byte						pMacStatus,
-			u1Byte						MacID,
-			bool						bPacketMatchBSSID,
-			bool						bPacketToSelf,
-			bool						bPacketBeacon
-	)
+void ODM_MacStatusQuery(struct odm_dm_struct *dm_odm, pu1Byte mac_stat,
+			u1Byte macid, bool pkt_match_bssid,
+			bool pkttoself, bool pkt_beacon)
 {
 	/*  2011/10/19 Driver team will handle in the future. */
-
 }
 
-enum HAL_STATUS
-ODM_ConfigRFWithHeaderFile(
-		struct odm_dm_struct *		pDM_Odm,
-		enum ODM_RF_RADIO_PATH	Content,
-		enum ODM_RF_RADIO_PATH	eRFPath
-   )
+enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm,
+					   enum ODM_RF_RADIO_PATH content,
+					   enum ODM_RF_RADIO_PATH rfpath)
 {
-	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===>ODM_ConfigRFWithHeaderFile\n"));
-	if (pDM_Odm->SupportICType == ODM_RTL8188E)
-	{
-		if (eRFPath == ODM_RF_PATH_A)
-			READ_AND_CONFIG(8188E,_RadioA_1T_);
-		ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_A:Rtl8188ERadioA_1TArray\n"));
-		ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_B:Rtl8188ERadioB_1TArray\n"));
+	ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===>ODM_ConfigRFWithHeaderFile\n"));
+	if (dm_odm->SupportICType == ODM_RTL8188E) {
+		if (rfpath == ODM_RF_PATH_A)
+			READ_AND_CONFIG(8188E, _RadioA_1T_);
+		ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_A:Rtl8188ERadioA_1TArray\n"));
+		ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_B:Rtl8188ERadioB_1TArray\n"));
 	}
 
-	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, ("ODM_ConfigRFWithHeaderFile: Radio No %x\n", eRFPath));
+	ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_TRACE, ("ODM_ConfigRFWithHeaderFile: Radio No %x\n", rfpath));
 	return HAL_STATUS_SUCCESS;
 }
 
-enum HAL_STATUS
-ODM_ConfigBBWithHeaderFile(
-		struct odm_dm_struct *		pDM_Odm,
-		enum odm_bb_config_type		ConfigType
-	)
+enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *dm_odm,
+					   enum odm_bb_config_type config_tp)
 {
-
-    if (pDM_Odm->SupportICType == ODM_RTL8188E)
-	{
-
-		if (ConfigType == CONFIG_BB_PHY_REG)
-		{
-			READ_AND_CONFIG(8188E,_PHY_REG_1T_);
-		}
-		else if (ConfigType == CONFIG_BB_AGC_TAB)
-		{
-			READ_AND_CONFIG(8188E,_AGC_TAB_1T_);
-		}
-		else if (ConfigType == CONFIG_BB_PHY_REG_PG)
-		{
-			READ_AND_CONFIG(8188E,_PHY_REG_PG_);
-			ODM_RT_TRACE(pDM_Odm,ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> phy_ConfigBBWithHeaderFile() agc:Rtl8188EPHY_REG_PGArray\n"));
+	if (dm_odm->SupportICType == ODM_RTL8188E) {
+		if (config_tp == CONFIG_BB_PHY_REG) {
+			READ_AND_CONFIG(8188E, _PHY_REG_1T_);
+		} else if (config_tp == CONFIG_BB_AGC_TAB) {
+			READ_AND_CONFIG(8188E, _AGC_TAB_1T_);
+		} else if (config_tp == CONFIG_BB_PHY_REG_PG) {
+			READ_AND_CONFIG(8188E, _PHY_REG_PG_);
+			ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD,
+				     (" ===> phy_ConfigBBWithHeaderFile() agc:Rtl8188EPHY_REG_PGArray\n"));
 		}
 	}
 	return HAL_STATUS_SUCCESS;
 }
 
-enum HAL_STATUS
-ODM_ConfigMACWithHeaderFile(
-		struct odm_dm_struct *pDM_Odm
-	)
+enum HAL_STATUS ODM_ConfigMACWithHeaderFile(struct odm_dm_struct *dm_odm)
 {
 	u1Byte result = HAL_STATUS_SUCCESS;
-	if (pDM_Odm->SupportICType == ODM_RTL8188E)
-		result = READ_AND_CONFIG(8188E,_MAC_REG_);
+	if (dm_odm->SupportICType == ODM_RTL8188E)
+		result = READ_AND_CONFIG(8188E, _MAC_REG_);
 	return result;
 }
diff --git a/hal/odm_debug.c b/hal/odm_debug.c
index f47c2be..84caadd 100644
--- a/hal/odm_debug.c
+++ b/hal/odm_debug.c
@@ -18,22 +18,15 @@
  *
  ******************************************************************************/
 
-/*  */
 /*  include files */
-/*  */
 
 #include "odm_precomp.h"
 
-void
-ODM_InitDebugSetting(
-			struct odm_dm_struct *	pDM_Odm
-	)
+void ODM_InitDebugSetting(struct odm_dm_struct *pDM_Odm)
 {
-pDM_Odm->DebugLevel				=	ODM_DBG_TRACE;
+	pDM_Odm->DebugLevel = ODM_DBG_TRACE;
 
-pDM_Odm->DebugComponents			=
-\
-									0;
+	pDM_Odm->DebugComponents = 0;
 }
 
 u32 GlobalDebugLevel;