diff --git a/hal/btc/HalBtc8703b2Ant.c b/hal/btc/HalBtc8703b2Ant.c old mode 100755 new mode 100644 diff --git a/hal/btc/HalBtc8703b2Ant.h b/hal/btc/HalBtc8703b2Ant.h old mode 100755 new mode 100644 diff --git a/hal/btc/HalBtcOutSrc.h b/hal/btc/HalBtcOutSrc.h index 9a8c8fb..545223b 100644 --- a/hal/btc/HalBtcOutSrc.h +++ b/hal/btc/HalBtcOutSrc.h @@ -146,7 +146,7 @@ typedef enum _BTC_WIFI_ROLE{ typedef enum _BTC_WIRELESS_FREQ{ BTC_FREQ_2_4G = 0x0, BTC_FREQ_5G = 0x1, - BTC_FREQ_MAX + BTC_FREQ_MAX }BTC_WIRELESS_FREQ,*PBTC_WIRELESS_FREQ; typedef enum _BTC_WIFI_BW_MODE{ @@ -155,13 +155,13 @@ typedef enum _BTC_WIFI_BW_MODE{ BTC_WIFI_BW_HT40 = 0x2, BTC_WIFI_BW_HT80 = 0x3, BTC_WIFI_BW_HT160 = 0x4, - BTC_WIFI_BW_MAX + BTC_WIFI_BW_MAX }BTC_WIFI_BW_MODE,*PBTC_WIFI_BW_MODE; typedef enum _BTC_WIFI_TRAFFIC_DIR{ BTC_WIFI_TRAFFIC_TX = 0x0, BTC_WIFI_TRAFFIC_RX = 0x1, - BTC_WIFI_TRAFFIC_MAX + BTC_WIFI_TRAFFIC_MAX }BTC_WIFI_TRAFFIC_DIR,*PBTC_WIFI_TRAFFIC_DIR; typedef enum _BTC_WIFI_PNP{ @@ -179,14 +179,14 @@ typedef enum _BTC_IOT_PEER BTC_IOT_PEER_RALINK = 4, BTC_IOT_PEER_ATHEROS = 5, BTC_IOT_PEER_CISCO = 6, - BTC_IOT_PEER_MERU = 7, + BTC_IOT_PEER_MERU = 7, BTC_IOT_PEER_MARVELL = 8, BTC_IOT_PEER_REALTEK_SOFTAP = 9,// peer is RealTek SOFT_AP, by Bohn, 2009.12.17 BTC_IOT_PEER_SELF_SOFTAP = 10, // Self is SoftAP BTC_IOT_PEER_AIRGO = 11, - BTC_IOT_PEER_INTEL = 12, - BTC_IOT_PEER_RTK_APCLIENT = 13, - BTC_IOT_PEER_REALTEK_81XX = 14, + BTC_IOT_PEER_INTEL = 12, + BTC_IOT_PEER_RTK_APCLIENT = 13, + BTC_IOT_PEER_REALTEK_81XX = 14, BTC_IOT_PEER_REALTEK_WOW = 15, BTC_IOT_PEER_REALTEK_JAGUAR_BCUTAP = 16, BTC_IOT_PEER_REALTEK_JAGUAR_CCUTAP = 17, @@ -215,7 +215,7 @@ typedef enum _BTC_ANT_TYPE{ typedef enum _BTC_VENDOR{ BTC_VENDOR_LENOVO, - BTC_VENDOR_ASUS, + BTC_VENDOR_ASUS, BTC_VENDOR_OTHER }BTC_VENDOR,*PBTC_VENDOR; @@ -242,7 +242,7 @@ typedef enum _BTC_GET_TYPE{ // type s4Byte BTC_GET_S4_WIFI_RSSI, BTC_GET_S4_HS_RSSI, - + // type u4Byte BTC_GET_U4_WIFI_BW, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, @@ -543,21 +543,21 @@ typedef VOID IN u4Byte BitMask, IN u4Byte Data ); -typedef u4Byte +typedef u4Byte (*BFP_BTC_GET_BB_REG)( IN PVOID pBtcContext, IN u4Byte RegAddr, IN u4Byte BitMask ); typedef VOID -(*BFP_BTC_SET_RF_REG)( +(*BFP_BTC_SET_RF_REG)( IN PVOID pBtcContext, IN u1Byte eRFPath, IN u4Byte RegAddr, IN u4Byte BitMask, IN u4Byte Data ); -typedef u4Byte +typedef u4Byte (*BFP_BTC_GET_RF_REG)( IN PVOID pBtcContext, IN u1Byte eRFPath, @@ -598,7 +598,7 @@ typedef BOOLEAN IN u1Byte txTime, IN u1Byte btChnl ); -typedef u2Byte +typedef u2Byte (*BFP_BTC_GET_BT_REG)( IN PVOID pBtcContext, IN u1Byte regType, @@ -620,17 +620,17 @@ typedef COL_H2C_STATUS IN u1Byte h2c_par_len ); -typedef u4Byte +typedef u4Byte (*BFP_BTC_GET_BT_COEX_SUPPORTED_FEATURE)( IN PVOID pBtcContext ); -typedef u4Byte +typedef u4Byte (*BFP_BTC_GET_BT_COEX_SUPPORTED_VERSION)( IN PVOID pBtcContext ); -typedef u4Byte +typedef u4Byte (*BFP_BTC_GET_PHYDM_VERSION)( IN PVOID pBtcContext ); @@ -775,7 +775,7 @@ extern struct btc_coexist GLBtCoexist; BOOLEAN EXhalbtcoutsrc_InitlizeVariables( - IN PVOID Adapter + IN PVOID Adapter ); VOID EXhalbtcoutsrc_PowerOnSetting( diff --git a/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.c b/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.c index 22f793c..b7ff6f6 100644 --- a/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.c +++ b/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.c @@ -1,21 +1,21 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* +/****************************************************************************** +* +* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of version 2 of the GNU General Public License as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA +* +* ******************************************************************************/ #include @@ -25,7 +25,7 @@ * MPCIE.TXT ******************************************************************************/ -u1Byte Array_MP_8814A_MPCIE[] = { +u1Byte Array_MP_8814A_MPCIE[] = { 0xFF, 0xFF, 0xFF, diff --git a/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.h b/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.h index 8b51c1b..9b4d7c5 100644 --- a/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.h +++ b/hal/efuse/rtl8814a/HalEfuseMask8814A_PCIE.h @@ -1,21 +1,21 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* +/****************************************************************************** +* +* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of version 2 of the GNU General Public License as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA +* +* ******************************************************************************/ diff --git a/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.c b/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.c index cd80e92..d882d92 100644 --- a/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.c +++ b/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.c @@ -1,21 +1,21 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* +/****************************************************************************** +* +* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of version 2 of the GNU General Public License as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA +* +* ******************************************************************************/ #include @@ -25,7 +25,7 @@ * MUSB.TXT ******************************************************************************/ -u1Byte Array_MP_8814A_MUSB[] = { +u1Byte Array_MP_8814A_MUSB[] = { 0xFF, 0xFF, 0xFF, diff --git a/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.h b/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.h index 4262400..be33e37 100644 --- a/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.h +++ b/hal/efuse/rtl8814a/HalEfuseMask8814A_USB.h @@ -1,21 +1,21 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* +/****************************************************************************** +* +* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of version 2 of the GNU General Public License as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA +* +* ******************************************************************************/ diff --git a/hal/phydm/halhwimg.h b/hal/phydm/halhwimg.h index 108f715..f072094 100644 --- a/hal/phydm/halhwimg.h +++ b/hal/phydm/halhwimg.h @@ -29,7 +29,7 @@ #define RTL8188EE_HWIMG_SUPPORT 0 #define RTL8188EU_HWIMG_SUPPORT 0 #define RTL8188ES_HWIMG_SUPPORT 0 - + #elif (DEV_BUS_TYPE == RT_USB_INTERFACE) // For 92C #define RTL8192CE_HWIMG_SUPPORT 0 @@ -52,7 +52,7 @@ #define RTL8188EE_HWIMG_SUPPORT 0 #define RTL8188EU_HWIMG_SUPPORT 0 #define RTL8188ES_HWIMG_SUPPORT 0 - + #elif (DEV_BUS_TYPE == RT_SDIO_INTERFACE) // For 92C #define RTL8192CE_HWIMG_SUPPORT 0 @@ -102,7 +102,7 @@ #define RTL8188EU_HWIMG_SUPPORT 0 #define RTL8188ES_HWIMG_SUPPORT 0 - #else + #else // For 8723 #define RTL8723E_HWIMG_SUPPORT 1 diff --git a/hal/phydm/mp_precomp.h b/hal/phydm/mp_precomp.h index 2ae8110..322bce0 100644 --- a/hal/phydm/mp_precomp.h +++ b/hal/phydm/mp_precomp.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. diff --git a/hal/phydm/phydm.c b/hal/phydm/phydm.c index e6a6af2..fd4fd8e 100644 --- a/hal/phydm/phydm.c +++ b/hal/phydm/phydm.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -76,21 +76,19 @@ ODM_PWdB_Conversion( s4Byte Y, integer = 0, decimal = 0; u4Byte i; - if(X == 0) + if (X == 0) X = 1; // log2(x), x can't be 0 - for(i = (TotalBit-1); i > 0; i--) - { - if(X & BIT(i)) - { + for (i = (TotalBit-1); i > 0; i--) { + if (X & BIT(i)) { integer = i; - if(i > 0) - decimal = (X & BIT(i-1))?2:0; //decimal is 0.5dB*3=1.5dB~=2dB + if (i > 0) + decimal = (X & BIT(i-1))?2:0; //decimal is 0.5dB*3=1.5dB~=2dB break; } } - - Y = 3*(integer-DecimalBit)+decimal; //10*log(x)=3*log2(x), + + Y = 3*(integer-DecimalBit)+decimal; //10*log(x)=3*log2(x), return Y; } @@ -101,17 +99,17 @@ ODM_SignConversion( IN u4Byte TotalBit ) { - if(value&BIT(TotalBit-1)) + if (value&BIT(TotalBit-1)) value -= BIT(TotalBit); return value; } void -phydm_seq_sorting( +phydm_seq_sorting( IN PVOID pDM_VOID, IN OUT u4Byte *p_value, IN OUT u4Byte *rank_idx, - IN OUT u4Byte *p_idx_out, + IN OUT u4Byte *p_idx_out, IN u1Byte seq_length ) { @@ -126,9 +124,9 @@ phydm_seq_sorting( } for (i = 0; i < (seq_length - 1); i++) { - + for (j = 0; j < (seq_length - 1 - i); j++) { - + tmp_a = p_value[j]; tmp_b = p_value[j+1]; @@ -138,20 +136,20 @@ phydm_seq_sorting( if (tmp_a < tmp_b) { p_value[j] = tmp_b; p_value[j+1] = tmp_a; - + rank_idx[j] = tmp_idx_b; rank_idx[j+1] = tmp_idx_a; } - } + } } for (i = 0; i < seq_length; i++) { p_idx_out[rank_idx[i]] = i+1; /**/ } - - + + } VOID @@ -180,7 +178,7 @@ ODM_InitMpDriverStatus( prtl8192cd_priv priv = pDM_Odm->priv; pDM_Odm->mp_mode = (BOOLEAN)priv->pshare->rf_ft_var.mp_specific; - + #endif } @@ -223,19 +221,19 @@ PHYDM_InitTRXAntennaSetting( } else if (pDM_Odm->SupportICType & (ODM_RTL8723D | ODM_RTL8821C)) { pDM_Odm->TXAntStatus = 0x1; pDM_Odm->RXAntStatus = 0x1; - + } /*#endif*/ } void -phydm_traffic_load_decision( +phydm_traffic_load_decision( IN PVOID pDM_VOID ) { PDM_ODM_T pDM_Odm = (PDM_ODM_T)pDM_VOID; pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; - + /*---trafic load decision---*/ pDM_Odm->curTxOkCnt = *(pDM_Odm->pNumTxBytesUnicast) - pDM_Odm->lastTxOkCnt; pDM_Odm->curRxOkCnt = *(pDM_Odm->pNumRxBytesUnicast) - pDM_Odm->lastRxOkCnt; @@ -249,25 +247,25 @@ phydm_traffic_load_decision( pDM_Odm->tx_tp = ((pDM_Odm->tx_tp)>>1) + (u4Byte)(((pDM_Odm->curTxOkCnt)>>18)>>1); /* <<3(8bit), >>20(10^6,M), >>1(2sec)*/ pDM_Odm->rx_tp = ((pDM_Odm->rx_tp)>>1) + (u4Byte)(((pDM_Odm->curRxOkCnt)>>18)>>1); /* <<3(8bit), >>20(10^6,M), >>1(2sec)*/ #endif - pDM_Odm->total_tp = pDM_Odm->tx_tp + pDM_Odm->rx_tp; - + pDM_Odm->total_tp = pDM_Odm->tx_tp + pDM_Odm->rx_tp; + pDM_Odm->pre_TrafficLoad = pDM_Odm->TrafficLoad; - + if (pDM_Odm->curTxOkCnt > 1875000 || pDM_Odm->curRxOkCnt > 1875000) { /* ( 1.875M * 8bit ) / 2sec= 7.5M bits /sec )*/ - + pDM_Odm->TrafficLoad = TRAFFIC_HIGH; /**/ } else if (pDM_Odm->curTxOkCnt > 500000 || pDM_Odm->curRxOkCnt > 500000) { /*( 0.5M * 8bit ) / 2sec = 2M bits /sec )*/ - + pDM_Odm->TrafficLoad = TRAFFIC_MID; /**/ } else if (pDM_Odm->curTxOkCnt > 100000 || pDM_Odm->curRxOkCnt > 100000) { /*( 0.1M * 8bit ) / 2sec = 0.4M bits /sec )*/ - + pDM_Odm->TrafficLoad = TRAFFIC_LOW; /**/ } else { - + pDM_Odm->TrafficLoad = TRAFFIC_ULTRA_LOW; /**/ } @@ -283,7 +281,7 @@ phydm_config_ofdm_tx_path( #if (RTL8192E_SUPPORT == 1) if (pDM_Odm->SupportICType & (ODM_RTL8192E)) { - + if (path == PHYDM_A) { ODM_SetBBReg(pDM_Odm, 0x90c , bMaskDWord, 0x81321311); /**/ @@ -294,8 +292,8 @@ phydm_config_ofdm_tx_path( ODM_SetBBReg(pDM_Odm, 0x90c , bMaskDWord, 0x83321333); /**/ } - - + + } #endif } @@ -310,7 +308,7 @@ phydm_config_ofdm_rx_path( #if (RTL8192E_SUPPORT == 1) if (pDM_Odm->SupportICType & (ODM_RTL8192E)) { - + if (path == PHYDM_A) { ofdm_rx_path = 1; /**/ @@ -321,7 +319,7 @@ phydm_config_ofdm_rx_path( ofdm_rx_path = 3; /**/ } - + ODM_SetBBReg(pDM_Odm, 0xC04 , 0xff, (((ofdm_rx_path)<<4)|ofdm_rx_path)); ODM_SetBBReg(pDM_Odm, 0xD04 , 0xf, ofdm_rx_path); } @@ -335,7 +333,7 @@ phydm_config_cck_rx_antenna_init( { #if (RTL8192E_SUPPORT == 1) if (pDM_Odm->SupportICType & (ODM_RTL8192E)) { - + /*CCK 2R CCA parameters*/ ODM_SetBBReg(pDM_Odm, 0xa2c , BIT18, 1); /*enable 2R Rx path*/ ODM_SetBBReg(pDM_Odm, 0xa2c , BIT22, 1); /*enable 2R MRC*/ @@ -360,7 +358,7 @@ phydm_config_cck_rx_path( #if (RTL8192E_SUPPORT == 1) if (pDM_Odm->SupportICType & (ODM_RTL8192E)) { - + if (path == PHYDM_A) { path_div_select = 0; cck_1_path = 0; @@ -368,21 +366,21 @@ phydm_config_cck_rx_path( } else if (path == PHYDM_B) { path_div_select = 0; cck_1_path = 1; - cck_2_path = 1; + cck_2_path = 1; } else if (path == PHYDM_AB) { - + if (path_div_en == CCA_PATHDIV_ENABLE) path_div_select = 1; - + cck_1_path = 0; - cck_2_path = 1; - + cck_2_path = 1; + } - + ODM_SetBBReg(pDM_Odm, 0xa04 , (BIT27|BIT26), cck_1_path); ODM_SetBBReg(pDM_Odm, 0xa04 , (BIT25|BIT24), cck_2_path); ODM_SetBBReg(pDM_Odm, 0xa74 , BIT8, path_div_select); - + } #endif } @@ -403,7 +401,7 @@ phydm_config_trx_path( /* CCK */ if (dm_value[0] == 0) { - + if (dm_value[1] == 1) { /*TX*/ if (dm_value[2] == 1) ODM_SetBBReg(pDM_Odm, 0xa04, 0xf0000000, 0x8); @@ -412,9 +410,9 @@ phydm_config_trx_path( else if (dm_value[2] == 3) ODM_SetBBReg(pDM_Odm, 0xa04, 0xf0000000, 0xc); } else if (dm_value[1] == 2) { /*RX*/ - + phydm_config_cck_rx_antenna_init(pDM_Odm); - + if (dm_value[2] == 1) { phydm_config_cck_rx_path(pDM_Odm, PHYDM_A, CCA_PATHDIV_DISABLE); } else if (dm_value[2] == 2) { @@ -426,7 +424,7 @@ phydm_config_trx_path( phydm_config_cck_rx_path(pDM_Odm, PHYDM_B, CCA_PATHDIV_DISABLE); } } - } + } /* OFDM */ else if (dm_value[0] == 1) { @@ -447,7 +445,7 @@ phydm_config_trx_path( (dm_value[2] & 0x4)?"C":"", (dm_value[2] & 0x8)?"D":"" )); - + } VOID @@ -460,19 +458,17 @@ phydm_Init_cck_setting( pDM_Odm->bCckHighPower = (BOOLEAN) ODM_GetBBReg(pDM_Odm, ODM_REG(CCK_RPT_FORMAT,pDM_Odm), ODM_BIT(CCK_RPT_FORMAT,pDM_Odm)); #if (RTL8192E_SUPPORT == 1) - if(pDM_Odm->SupportICType & (ODM_RTL8192E)) - { + if (pDM_Odm->SupportICType & (ODM_RTL8192E)) { #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) phydm_config_cck_rx_antenna_init(pDM_Odm); phydm_config_cck_rx_path(pDM_Odm, PHYDM_A, CCA_PATHDIV_DISABLE); #endif - + /* 0x824[9] = 0x82C[9] = 0xA80[7] those registers setting should be equal or CCK RSSI report may be incorrect */ value_824 = ODM_GetBBReg(pDM_Odm, 0x824, BIT9); value_82c = ODM_GetBBReg(pDM_Odm, 0x82c, BIT9); - - if(value_824 != value_82c) - { + + if (value_824 != value_82c) { ODM_SetBBReg(pDM_Odm, 0x82c , BIT9, value_824); } ODM_SetBBReg(pDM_Odm, 0xa80 , BIT7, value_824); @@ -481,19 +477,19 @@ phydm_Init_cck_setting( ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("cck_agc_report_type = (( %d )), ExtLNAGain = (( %d ))\n", pDM_Odm->cck_agc_report_type, pDM_Odm->ExtLNAGain)); } #endif - + #if ((RTL8703B_SUPPORT == 1) || (RTL8723D_SUPPORT == 1)) if (pDM_Odm->SupportICType & (ODM_RTL8703B|ODM_RTL8723D)) { pDM_Odm->cck_agc_report_type = ODM_GetBBReg(pDM_Odm, 0x950, BIT11) ? 1 : 0; /*1: 4bit LNA , 0: 3bit LNA */ - + if (pDM_Odm->cck_agc_report_type != 1) { DbgPrint("[Warning] 8703B/8723D CCK should be 4bit LNA, ie. 0x950[11] = 1\n"); /**/ } } #endif - + #if ((RTL8723D_SUPPORT == 1) || (RTL8822B_SUPPORT == 1) || (RTL8197F_SUPPORT == 1)) if (pDM_Odm->SupportICType & (ODM_RTL8723D|ODM_RTL8822B|ODM_RTL8197F)) { @@ -501,7 +497,7 @@ phydm_Init_cck_setting( } else #endif pDM_Odm->cck_new_agc = FALSE; - + } VOID @@ -535,7 +531,7 @@ odm_CommonInfoSelfInit( { phydm_Init_cck_setting(pDM_Odm); pDM_Odm->RFPathRxEnable = (u1Byte) ODM_GetBBReg(pDM_Odm, ODM_REG(BB_RX_PATH,pDM_Odm), ODM_BIT(BB_RX_PATH,pDM_Odm)); -#if (DM_ODM_SUPPORT_TYPE != ODM_CE) +#if (DM_ODM_SUPPORT_TYPE != ODM_CE) pDM_Odm->pbNet_closed = &pDM_Odm->BOOLEAN_temp; #endif @@ -559,7 +555,7 @@ odm_CommonInfoSelfInit( pDM_Odm->TrafficLoad = TRAFFIC_LOW; pDM_Odm->nbi_set_result = 0; - + } VOID @@ -602,8 +598,7 @@ odm_CommonInfoSelfUpdate( /* THis variable cannot be used because it is wrong*/ #if (DM_ODM_SUPPORT_TYPE == ODM_AP) - if (*(pDM_Odm->pBandWidth) == ODM_BW40M) - { + if (*(pDM_Odm->pBandWidth) == ODM_BW40M) { if (*(pDM_Odm->pSecChOffset) == 1) pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) + 2; else if (*(pDM_Odm->pSecChOffset) == 2) @@ -625,14 +620,11 @@ odm_CommonInfoSelfUpdate( pDM_Odm->ControlChannel = *(pDM_Odm->pChannel); #endif - for (i=0; ipODM_StaInfo[i]; - if(IS_STA_VALID(pEntry)) - { + if (IS_STA_VALID(pEntry)) { EntryCnt++; - if(EntryCnt==1) - { + if (EntryCnt==1) { OneEntry_MACID=i; } @@ -640,15 +632,14 @@ odm_CommonInfoSelfUpdate( ma_rx_tp = (pEntry->rx_byte_cnt_LowMAW)<<3; /* low moving average RX TP ( bit /sec)*/ ODM_RT_TRACE(pDM_Odm, PHYDM_COMP_RA_DBG, ODM_DBG_LOUD, ("ClientTP[%d]: ((%d )) bit/sec\n", i, ma_rx_tp)); - + if (ma_rx_tp > ACTIVE_TP_THRESHOLD) num_active_client++; #endif } } - - if(EntryCnt == 1) - { + + if (EntryCnt == 1) { pDM_Odm->bOneEntryOnly = TRUE; pDM_Odm->OneEntry_MACID=OneEntry_MACID; } @@ -657,15 +648,15 @@ odm_CommonInfoSelfUpdate( pDM_Odm->pre_number_linked_client = pDM_Odm->number_linked_client; pDM_Odm->pre_number_active_client = pDM_Odm->number_active_client; - + pDM_Odm->number_linked_client = EntryCnt; - pDM_Odm->number_active_client = num_active_client; + pDM_Odm->number_active_client = num_active_client; /* Update MP driver status*/ ODM_UpdateMpDriverStatus(pDM_Odm); /*Traffic load information update*/ - phydm_traffic_load_decision(pDM_Odm); + phydm_traffic_load_decision(pDM_Odm); } VOID @@ -691,7 +682,7 @@ PhyDM_Get_Structure( case PHYDM_FALSEALMCNT: pStruct = &FalseAlmCnt; break; - + case PHYDM_CFOTRACK: pStruct = &DM_CfoTrack; break; @@ -699,7 +690,7 @@ PhyDM_Get_Structure( case PHYDM_ADAPTIVITY: pStruct = &(pDM_Odm->Adaptivity); break; - + default: break; } @@ -709,7 +700,7 @@ PhyDM_Get_Structure( case PHYDM_FALSEALMCNT: pStruct = &(pDM_Odm->FalseAlmCnt); break; - + case PHYDM_CFOTRACK: pStruct = &(pDM_Odm->DM_CfoTrack); break; @@ -717,7 +708,7 @@ PhyDM_Get_Structure( case PHYDM_ADAPTIVITY: pStruct = &(pDM_Odm->Adaptivity); break; - + default: break; } @@ -732,7 +723,7 @@ odm_HWSetting( ) { #if (RTL8821A_SUPPORT == 1) - if(pDM_Odm->SupportICType & ODM_RTL8821) + if (pDM_Odm->SupportICType & ODM_RTL8821) odm_HWSetting_8821A(pDM_Odm); #endif @@ -774,7 +765,7 @@ ODM_DMInit( odm_PathDiversityInit(pDM_Odm); odm_DynamicTxPowerInit(pDM_Odm); phydm_initRaInfo(pDM_Odm); - + #if (DM_ODM_SUPPORT_TYPE & (ODM_WIN | ODM_CE)) #ifdef BEAMFORMING_VERSION_1 if (pHalData->BeamformingVersion == BEAMFORMING_VERSION_1) @@ -782,29 +773,27 @@ ODM_DMInit( { phydm_Beamforming_Init(pDM_Odm); } -#endif +#endif - if(pDM_Odm->SupportICType & ODM_IC_11N_SERIES) - { + if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) { odm_DynamicBBPowerSavingInit(pDM_Odm); #if (RTL8188E_SUPPORT == 1) - if(pDM_Odm->SupportICType==ODM_RTL8188E) - { + if (pDM_Odm->SupportICType==ODM_RTL8188E) { ODM_PrimaryCCA_Init(pDM_Odm); ODM_RAInfo_Init_all(pDM_Odm); } #endif #if (DM_ODM_SUPPORT_TYPE & (ODM_WIN|ODM_CE)) - + #if (RTL8723B_SUPPORT == 1) - if(pDM_Odm->SupportICType == ODM_RTL8723B) + if (pDM_Odm->SupportICType == ODM_RTL8723B) odm_SwAntDetectInit(pDM_Odm); #endif #if (RTL8192E_SUPPORT == 1) - if(pDM_Odm->SupportICType==ODM_RTL8192E) + if (pDM_Odm->SupportICType==ODM_RTL8192E) odm_PrimaryCCA_Check_Init(pDM_Odm); #endif @@ -821,7 +810,7 @@ ODM_DMReset( { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; - ODM_AntDivReset(pDM_Odm); + ODM_AntDivReset(pDM_Odm); phydm_setEDCCAThresholdAPI(pDM_Odm, pDM_DigTable->CurIGValue); } @@ -840,10 +829,9 @@ phydm_support_ability_debug( u4Byte used = *_used; u4Byte out_len = *_out_len; - pre_support_ability = pDM_Odm->SupportAbility ; + pre_support_ability = pDM_Odm->SupportAbility ; PHYDM_SNPRINTF((output+used, out_len-used,"\n%s\n", "================================")); - if(dm_value[0] == 100) - { + if (dm_value[0] == 100) { PHYDM_SNPRINTF((output+used, out_len-used, "[Supportability] PhyDM Selection\n")); PHYDM_SNPRINTF((output+used, out_len-used,"%s\n", "================================")); PHYDM_SNPRINTF((output+used, out_len-used, "00. (( %s ))DIG\n", ((pDM_Odm->SupportAbility & ODM_BB_DIG)?("V"):(".")))); @@ -851,20 +839,20 @@ phydm_support_ability_debug( PHYDM_SNPRINTF((output+used, out_len-used, "02. (( %s ))DYNAMIC_TXPWR\n", ((pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "03. (( %s ))FA_CNT\n", ((pDM_Odm->SupportAbility & ODM_BB_FA_CNT)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "04. (( %s ))RSSI_MONITOR\n", ((pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)?("V"):(".")))); - PHYDM_SNPRINTF((output+used, out_len-used, "05. (( %s ))CCK_PD\n", ((pDM_Odm->SupportAbility & ODM_BB_CCK_PD)?("V"):(".")))); + PHYDM_SNPRINTF((output+used, out_len-used, "05. (( %s ))CCK_PD\n", ((pDM_Odm->SupportAbility & ODM_BB_CCK_PD)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "06. (( %s ))ANT_DIV\n", ((pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)?("V"):(".")))); - PHYDM_SNPRINTF((output+used, out_len-used, "08. (( %s ))PWR_TRAIN\n", ((pDM_Odm->SupportAbility & ODM_BB_PWR_TRAIN)?("V"):(".")))); + PHYDM_SNPRINTF((output+used, out_len-used, "08. (( %s ))PWR_TRAIN\n", ((pDM_Odm->SupportAbility & ODM_BB_PWR_TRAIN)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "09. (( %s ))RATE_ADAPTIVE\n", ((pDM_Odm->SupportAbility & ODM_BB_RATE_ADAPTIVE)?("V"):(".")))); - PHYDM_SNPRINTF((output+used, out_len-used, "10. (( %s ))PATH_DIV\n", ((pDM_Odm->SupportAbility & ODM_BB_PATH_DIV)?("V"):(".")))); - PHYDM_SNPRINTF((output+used, out_len-used, "13. (( %s ))ADAPTIVITY\n", ((pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)?("V"):(".")))); + PHYDM_SNPRINTF((output+used, out_len-used, "10. (( %s ))PATH_DIV\n", ((pDM_Odm->SupportAbility & ODM_BB_PATH_DIV)?("V"):(".")))); + PHYDM_SNPRINTF((output+used, out_len-used, "13. (( %s ))ADAPTIVITY\n", ((pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "14. (( %s ))CFO_TRACKING\n", ((pDM_Odm->SupportAbility & ODM_BB_CFO_TRACKING)?("V"):(".")))); - PHYDM_SNPRINTF((output+used, out_len-used, "15. (( %s ))NHM_CNT\n", ((pDM_Odm->SupportAbility & ODM_BB_NHM_CNT)?("V"):(".")))); + PHYDM_SNPRINTF((output+used, out_len-used, "15. (( %s ))NHM_CNT\n", ((pDM_Odm->SupportAbility & ODM_BB_NHM_CNT)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "16. (( %s ))PRIMARY_CCA\n", ((pDM_Odm->SupportAbility & ODM_BB_PRIMARY_CCA)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "17. (( %s ))TXBF\n", ((pDM_Odm->SupportAbility & ODM_BB_TXBF)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "18. (( %s ))DYNAMIC_ARFR\n", ((pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_ARFR)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "20. (( %s ))EDCA_TURBO\n", ((pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "21. (( %s ))EARLY_MODE\n", ((pDM_Odm->SupportAbility & ODM_MAC_EARLY_MODE)?("V"):(".")))); - PHYDM_SNPRINTF((output+used, out_len-used, "24. (( %s ))TX_PWR_TRACK\n", ((pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)?("V"):(".")))); + PHYDM_SNPRINTF((output+used, out_len-used, "24. (( %s ))TX_PWR_TRACK\n", ((pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "25. (( %s ))RX_GAIN_TRACK\n", ((pDM_Odm->SupportAbility & ODM_RF_RX_GAIN_TRACK)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used, "26. (( %s ))RF_CALIBRATION\n", ((pDM_Odm->SupportAbility & ODM_RF_CALIBRATION)?("V"):(".")))); PHYDM_SNPRINTF((output+used, out_len-used,"%s\n", "================================")); @@ -874,31 +862,25 @@ phydm_support_ability_debug( { pDM_Odm->SupportAbility = 0 ; DbgPrint("Disable all SupportAbility components \n"); - PHYDM_SNPRINTF((output+used, out_len-used,"%s\n", "Disable all SupportAbility components")); + PHYDM_SNPRINTF((output+used, out_len-used,"%s\n", "Disable all SupportAbility components")); } */ - else - { + else { - if(dm_value[1] == 1) //enable - { + if (dm_value[1] == 1) { //enable pDM_Odm->SupportAbility |= BIT(dm_value[0]) ; - if(BIT(dm_value[0]) & ODM_BB_PATH_DIV) - { + if (BIT(dm_value[0]) & ODM_BB_PATH_DIV) { odm_PathDiversityInit(pDM_Odm); } } - else if(dm_value[1] == 2) //disable - { + else if (dm_value[1] == 2) { //disable pDM_Odm->SupportAbility &= ~(BIT(dm_value[0])) ; - } - else - { + } else { //DbgPrint("\n[Warning!!!] 1:enable, 2:disable \n\n"); PHYDM_SNPRINTF((output+used, out_len-used,"%s\n", "[Warning!!!] 1:enable, 2:disable")); } } - PHYDM_SNPRINTF((output+used, out_len-used,"pre-SupportAbility = 0x%x\n", pre_support_ability )); + PHYDM_SNPRINTF((output+used, out_len-used,"pre-SupportAbility = 0x%x\n", pre_support_ability )); PHYDM_SNPRINTF((output+used, out_len-used,"Curr-SupportAbility = 0x%x\n", pDM_Odm->SupportAbility )); PHYDM_SNPRINTF((output+used, out_len-used,"%s\n", "================================")); } @@ -911,15 +893,15 @@ VOID ODM_DMWatchdog_LPS( IN PDM_ODM_T pDM_Odm ) -{ +{ odm_CommonInfoSelfUpdate(pDM_Odm); odm_FalseAlarmCounterStatistics(pDM_Odm); odm_RSSIMonitorCheck(pDM_Odm); - odm_DIGbyRSSI_LPS(pDM_Odm); + odm_DIGbyRSSI_LPS(pDM_Odm); odm_CCKPacketDetectionThresh(pDM_Odm); odm_CommonInfoSelfReset(pDM_Odm); - if(*(pDM_Odm->pbPowerSaving)==TRUE) + if (*(pDM_Odm->pbPowerSaving)==TRUE) return; } #endif @@ -940,17 +922,16 @@ ODM_DMWatchdog( #if (DM_ODM_SUPPORT_TYPE == ODM_AP) { prtl8192cd_priv priv = pDM_Odm->priv; - if( (priv->auto_channel != 0) && (priv->auto_channel != 2) )//if ACS running, do not do FA/CCA counter read + if ( (priv->auto_channel != 0) && (priv->auto_channel != 2) )//if ACS running, do not do FA/CCA counter read return; } -#endif +#endif odm_FalseAlarmCounterStatistics(pDM_Odm); phydm_NoisyDetection(pDM_Odm); - + odm_RSSIMonitorCheck(pDM_Odm); - if(*(pDM_Odm->pbPowerSaving) == TRUE) - { + if (*(pDM_Odm->pbPowerSaving) == TRUE) { odm_DIGbyRSSI_LPS(pDM_Odm); { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; @@ -962,7 +943,7 @@ ODM_DMWatchdog( ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("DMWatchdog in power saving mode\n")); return; } - + Phydm_CheckAdaptivity(pDM_Odm); odm_UpdatePowerTrainingState(pDM_Odm); odm_DIG(pDM_Odm); @@ -971,7 +952,7 @@ ODM_DMWatchdog( Phydm_Adaptivity(pDM_Odm, pDM_DigTable->CurIGValue); } odm_CCKPacketDetectionThresh(pDM_Odm); - + phydm_ra_info_watchdog(pDM_Odm); odm_EdcaTurboCheck(pDM_Odm); odm_PathDiversity(pDM_Odm); @@ -984,9 +965,8 @@ ODM_DMWatchdog( phydm_rf_watchdog(pDM_Odm); - if(pDM_Odm->SupportICType & ODM_IC_11N_SERIES) - { - + if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) { + #if (RTL8188E_SUPPORT == 1) if (pDM_Odm->SupportICType == ODM_RTL8188E) ODM_DynamicPrimaryCCA(pDM_Odm); @@ -995,8 +975,8 @@ ODM_DMWatchdog( #if( DM_ODM_SUPPORT_TYPE & (ODM_WIN|ODM_CE)) #if (RTL8192E_SUPPORT == 1) - if(pDM_Odm->SupportICType==ODM_RTL8192E) - odm_DynamicPrimaryCCA_Check(pDM_Odm); + if (pDM_Odm->SupportICType==ODM_RTL8192E) + odm_DynamicPrimaryCCA_Check(pDM_Odm); #endif #endif } @@ -1006,7 +986,7 @@ ODM_DMWatchdog( #endif odm_CommonInfoSelfReset(pDM_Odm); - + } @@ -1017,7 +997,7 @@ VOID ODM_CmnInfoInit( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, - IN u4Byte Value + IN u4Byte Value ) { // @@ -1047,7 +1027,7 @@ ODM_CmnInfoInit( case ODM_CMNINFO_MP_TEST_CHIP: pDM_Odm->bIsMPChip= (u1Byte)Value; break; - + case ODM_CMNINFO_IC_TYPE: pDM_Odm->SupportICType = Value; break; @@ -1068,14 +1048,14 @@ ODM_CmnInfoInit( case ODM_CMNINFO_RF_ANTENNA_TYPE: pDM_Odm->AntDivType= (u1Byte)Value; break; - + case ODM_CMNINFO_WITH_EXT_ANTENNA_SWITCH: pDM_Odm->with_extenal_ant_switch = (u1Byte)Value; - break; - + break; + case ODM_CMNINFO_BE_FIX_TX_ANT: pDM_Odm->DM_FatTable.b_fix_tx_ant = (u1Byte)Value; - break; + break; case ODM_CMNINFO_BOARD_TYPE: if (!pDM_Odm->bInitHwInfoByRfe) @@ -1111,17 +1091,17 @@ ODM_CmnInfoInit( if (!pDM_Odm->bInitHwInfoByRfe) pDM_Odm->TypeGPA = (u2Byte)Value; break; - + case ODM_CMNINFO_APA: if (!pDM_Odm->bInitHwInfoByRfe) pDM_Odm->TypeAPA = (u2Byte)Value; break; - + case ODM_CMNINFO_GLNA: if (!pDM_Odm->bInitHwInfoByRfe) pDM_Odm->TypeGLNA = (u2Byte)Value; break; - + case ODM_CMNINFO_ALNA: if (!pDM_Odm->bInitHwInfoByRfe) pDM_Odm->TypeALNA = (u2Byte)Value; @@ -1141,7 +1121,7 @@ ODM_CmnInfoInit( break; case ODM_CMNINFO_BWIFI_TEST: pDM_Odm->WIFITest = (u1Byte)Value; - break; + break; case ODM_CMNINFO_SMART_CONCURRENT: pDM_Odm->bDualMacSmartConcurrent = (BOOLEAN )Value; break; @@ -1171,11 +1151,11 @@ ODM_CmnInfoInit( pDM_Odm->DFS_RegionDomain = (u1Byte)Value; break; #endif - //To remove the compiler warning, must add an empty default statement to handle the other values. + //To remove the compiler warning, must add an empty default statement to handle the other values. default: //do nothing - break; - + break; + } } @@ -1185,7 +1165,7 @@ VOID ODM_CmnInfoHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, - IN PVOID pValue + IN PVOID pValue ) { // @@ -1199,7 +1179,7 @@ ODM_CmnInfoHook( case ODM_CMNINFO_MAC_PHY_MODE: pDM_Odm->pMacPhyMode = (u1Byte *)pValue; break; - + case ODM_CMNINFO_TX_UNI: pDM_Odm->pNumTxBytesUnicast = (u8Byte *)pValue; break; @@ -1231,7 +1211,7 @@ ODM_CmnInfoHook( case ODM_CMNINFO_CHNL: pDM_Odm->pChannel = (u1Byte *)pValue; break; - + case ODM_CMNINFO_DMSP_GET_VALUE: pDM_Odm->pbGetValueFromOtherMac = (BOOLEAN *)pValue; break; @@ -1291,7 +1271,7 @@ ODM_CmnInfoHook( case ODM_CMNINFO_IS1ANTENNA: pDM_Odm->pIs1Antenna = (BOOLEAN *)pValue; break; - + case ODM_CMNINFO_RFDEFAULTPATH: pDM_Odm->pRFDefaultPath= (u1Byte *)pValue; break; @@ -1328,7 +1308,7 @@ ODM_CmnInfoHook( // break; //case ODM_CMNINFO_BT_COEXIST: - // pDM_Odm->BTCoexist = (BOOLEAN *)pValue; + // pDM_Odm->BTCoexist = (BOOLEAN *)pValue; //case ODM_CMNINFO_STA_STATUS: //pDM_Odm->pODM_StaInfo[] = (PSTA_INFO_T)pValue; @@ -1341,7 +1321,7 @@ ODM_CmnInfoHook( //case ODM_CMNINFO_MAC_STATUS: // pDM_Odm->pMacInfo = (ODM_MAC_INFO *)pValue; // break; - //To remove the compiler warning, must add an empty default statement to handle the other values. + //To remove the compiler warning, must add an empty default statement to handle the other values. default: //do nothing break; @@ -1356,7 +1336,7 @@ ODM_CmnInfoPtrArrayHook( IN PDM_ODM_T pDM_Odm, IN ODM_CMNINFO_E CmnInfo, IN u2Byte Index, - IN PVOID pValue + IN PVOID pValue ) { // @@ -1366,10 +1346,10 @@ ODM_CmnInfoPtrArrayHook( { // // Dynamic call by reference pointer. - // + // case ODM_CMNINFO_STA_STATUS: pDM_Odm->pODM_StaInfo[Index] = (PSTA_INFO_T)pValue; - + if (IS_STA_VALID(pDM_Odm->pODM_StaInfo[Index])) #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) pDM_Odm->platform2phydm_macid_table[((PSTA_INFO_T)pValue)->AssociatedMacId] = Index; /*AssociatedMacId are unique bttween different Adapter*/ @@ -1378,14 +1358,14 @@ ODM_CmnInfoPtrArrayHook( #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) pDM_Odm->platform2phydm_macid_table[((PSTA_INFO_T)pValue)->mac_id] = Index; #endif - - break; - //To remove the compiler warning, must add an empty default statement to handle the other values. + + break; + //To remove the compiler warning, must add an empty default statement to handle the other values. default: //do nothing break; } - + } @@ -1396,7 +1376,7 @@ VOID ODM_CmnInfoUpdate( IN PDM_ODM_T pDM_Odm, IN u4Byte CmnInfo, - IN u8Byte Value + IN u8Byte Value ) { // @@ -1407,7 +1387,7 @@ ODM_CmnInfoUpdate( case ODM_CMNINFO_LINK_IN_PROGRESS: pDM_Odm->bLinkInProcess = (BOOLEAN)Value; break; - + case ODM_CMNINFO_ABILITY: pDM_Odm->SupportAbility = (u4Byte)Value; break; @@ -1431,7 +1411,7 @@ ODM_CmnInfoUpdate( case ODM_CMNINFO_STATION_STATE: pDM_Odm->bsta_state = (BOOLEAN)Value; break; - + case ODM_CMNINFO_RSSI_MIN: pDM_Odm->RSSI_Min= (u1Byte)Value; break; @@ -1455,30 +1435,30 @@ ODM_CmnInfoUpdate( case ODM_CMNINFO_BT_ENABLED: pDM_Odm->bBtEnabled = (BOOLEAN)Value; break; - + case ODM_CMNINFO_BT_HS_CONNECT_PROCESS: pDM_Odm->bBtConnectProcess = (BOOLEAN)Value; break; - + case ODM_CMNINFO_BT_HS_RSSI: pDM_Odm->btHsRssi = (u1Byte)Value; break; - + case ODM_CMNINFO_BT_OPERATION: pDM_Odm->bBtHsOperation = (BOOLEAN)Value; break; case ODM_CMNINFO_BT_LIMITED_DIG: pDM_Odm->bBtLimitedDig = (BOOLEAN)Value; - break; + break; case ODM_CMNINFO_BT_DIG: pDM_Odm->btHsDigVal = (u1Byte)Value; break; - + case ODM_CMNINFO_BT_BUSY: pDM_Odm->bBtBusy = (BOOLEAN)Value; - break; + break; case ODM_CMNINFO_BT_DISABLE_EDCA: pDM_Odm->bBtDisableEdcaTurbo = (BOOLEAN)Value; @@ -1534,14 +1514,14 @@ ODM_CmnInfoUpdate( case ODM_CMNINFO_CHNL: pDM_Odm->Channel = (u1Byte)Value; - break; -*/ + break; +*/ default: //do nothing break; } - + } @@ -1553,59 +1533,59 @@ ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) PADAPTER pAdapter = pDM_Odm->Adapter; #if USE_WORKITEM #ifdef CONFIG_S0S1_SW_ANTENNA_DIVERSITY - ODM_InitializeWorkItem( pDM_Odm, - &pDM_Odm->DM_SWAT_Table.phydm_SwAntennaSwitchWorkitem, + ODM_InitializeWorkItem( pDM_Odm, + &pDM_Odm->DM_SWAT_Table.phydm_SwAntennaSwitchWorkitem, (RT_WORKITEM_CALL_BACK)ODM_SW_AntDiv_WorkitemCallback, (PVOID)pAdapter, "AntennaSwitchWorkitem"); #endif #ifdef CONFIG_HL_SMART_ANTENNA_TYPE1 - ODM_InitializeWorkItem(pDM_Odm, - &pDM_Odm->dm_sat_table.hl_smart_antenna_workitem, + ODM_InitializeWorkItem(pDM_Odm, + &pDM_Odm->dm_sat_table.hl_smart_antenna_workitem, (RT_WORKITEM_CALL_BACK)phydm_beam_switch_workitem_callback, (PVOID)pAdapter, "hl_smart_ant_workitem"); - ODM_InitializeWorkItem(pDM_Odm, - &pDM_Odm->dm_sat_table.hl_smart_antenna_decision_workitem, + ODM_InitializeWorkItem(pDM_Odm, + &pDM_Odm->dm_sat_table.hl_smart_antenna_decision_workitem, (RT_WORKITEM_CALL_BACK)phydm_beam_decision_workitem_callback, (PVOID)pAdapter, "hl_smart_ant_decision_workitem"); #endif - + ODM_InitializeWorkItem( pDM_Odm, - &(pDM_Odm->PathDivSwitchWorkitem), - (RT_WORKITEM_CALL_BACK)odm_PathDivChkAntSwitchWorkitemCallback, + &(pDM_Odm->PathDivSwitchWorkitem), + (RT_WORKITEM_CALL_BACK)odm_PathDivChkAntSwitchWorkitemCallback, (PVOID)pAdapter, "SWAS_WorkItem"); ODM_InitializeWorkItem( pDM_Odm, - &(pDM_Odm->CCKPathDiversityWorkitem), - (RT_WORKITEM_CALL_BACK)odm_CCKTXPathDiversityWorkItemCallback, + &(pDM_Odm->CCKPathDiversityWorkitem), + (RT_WORKITEM_CALL_BACK)odm_CCKTXPathDiversityWorkItemCallback, (PVOID)pAdapter, "CCKTXPathDiversityWorkItem"); ODM_InitializeWorkItem( pDM_Odm, - &(pDM_Odm->MPT_DIGWorkitem), - (RT_WORKITEM_CALL_BACK)odm_MPT_DIGWorkItemCallback, + &(pDM_Odm->MPT_DIGWorkitem), + (RT_WORKITEM_CALL_BACK)odm_MPT_DIGWorkItemCallback, (PVOID)pAdapter, "MPT_DIGWorkitem"); ODM_InitializeWorkItem( pDM_Odm, - &(pDM_Odm->RaRptWorkitem), - (RT_WORKITEM_CALL_BACK)ODM_UpdateInitRateWorkItemCallback, + &(pDM_Odm->RaRptWorkitem), + (RT_WORKITEM_CALL_BACK)ODM_UpdateInitRateWorkItemCallback, (PVOID)pAdapter, "RaRptWorkitem"); #if( defined(CONFIG_5G_CG_SMART_ANT_DIVERSITY) ) ||( defined(CONFIG_2G_CG_SMART_ANT_DIVERSITY) ) ODM_InitializeWorkItem( pDM_Odm, - &(pDM_Odm->FastAntTrainingWorkitem), - (RT_WORKITEM_CALL_BACK)odm_FastAntTrainingWorkItemCallback, + &(pDM_Odm->FastAntTrainingWorkitem), + (RT_WORKITEM_CALL_BACK)odm_FastAntTrainingWorkItemCallback, (PVOID)pAdapter, "FastAntTrainingWorkitem"); #endif @@ -1619,14 +1599,14 @@ ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) (RT_WORKITEM_CALL_BACK)halComTxbf_EnterWorkItemCallback, (PVOID)pAdapter, "Txbf_EnterWorkItem"); - + ODM_InitializeWorkItem( pDM_Odm, &(pDM_Odm->BeamformingInfo.TxbfInfo.Txbf_LeaveWorkItem), (RT_WORKITEM_CALL_BACK)halComTxbf_LeaveWorkItemCallback, (PVOID)pAdapter, "Txbf_LeaveWorkItem"); - + ODM_InitializeWorkItem( pDM_Odm, &(pDM_Odm->BeamformingInfo.TxbfInfo.Txbf_FwNdpaWorkItem), @@ -1700,7 +1680,7 @@ ODM_FreeAllWorkItems(IN PDM_ODM_T pDM_Odm ) ODM_FreeWorkItem(&(pDM_Odm->dm_sat_table.hl_smart_antenna_decision_workitem)); #endif - ODM_FreeWorkItem(&(pDM_Odm->PathDivSwitchWorkitem)); + ODM_FreeWorkItem(&(pDM_Odm->PathDivSwitchWorkitem)); ODM_FreeWorkItem(&(pDM_Odm->CCKPathDiversityWorkitem)); #if (defined(CONFIG_5G_CG_SMART_ANT_DIVERSITY)) || (defined(CONFIG_2G_CG_SMART_ANT_DIVERSITY)) ODM_FreeWorkItem(&(pDM_Odm->FastAntTrainingWorkitem)); @@ -1759,15 +1739,15 @@ odm_IsLinked( { u4Byte i; BOOLEAN Linked = FALSE; - + for(i=0; ipODM_StaInfo[i]) ) - { + { Linked = TRUE; break; } - + } pDM_Odm->bLinked = Linked; @@ -1776,7 +1756,7 @@ odm_IsLinked( VOID ODM_InitAllTimers( - IN PDM_ODM_T pDM_Odm + IN PDM_ODM_T pDM_Odm ) { #if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY)) @@ -1785,22 +1765,22 @@ ODM_InitAllTimers( #if (DM_ODM_SUPPORT_TYPE == ODM_AP) #ifdef MP_TEST - if (pDM_Odm->priv->pshare->rf_ft_var.mp_specific) - ODM_InitializeTimer(pDM_Odm, &pDM_Odm->MPT_DIGTimer, - (RT_TIMER_CALL_BACK)odm_MPT_DIGCallback, NULL, "MPT_DIGTimer"); + if (pDM_Odm->priv->pshare->rf_ft_var.mp_specific) + ODM_InitializeTimer(pDM_Odm, &pDM_Odm->MPT_DIGTimer, + (RT_TIMER_CALL_BACK)odm_MPT_DIGCallback, NULL, "MPT_DIGTimer"); #endif #elif(DM_ODM_SUPPORT_TYPE == ODM_WIN) - ODM_InitializeTimer(pDM_Odm, &pDM_Odm->MPT_DIGTimer, + ODM_InitializeTimer(pDM_Odm, &pDM_Odm->MPT_DIGTimer, (RT_TIMER_CALL_BACK)odm_MPT_DIGCallback, NULL, "MPT_DIGTimer"); #endif #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) - ODM_InitializeTimer(pDM_Odm, &pDM_Odm->PathDivSwitchTimer, + ODM_InitializeTimer(pDM_Odm, &pDM_Odm->PathDivSwitchTimer, (RT_TIMER_CALL_BACK)odm_PathDivChkAntSwitchCallback, NULL, "PathDivTimer"); - ODM_InitializeTimer(pDM_Odm, &pDM_Odm->CCKPathDiversityTimer, - (RT_TIMER_CALL_BACK)odm_CCKTXPathDiversityCallback, NULL, "CCKPathDiversityTimer"); + ODM_InitializeTimer(pDM_Odm, &pDM_Odm->CCKPathDiversityTimer, + (RT_TIMER_CALL_BACK)odm_CCKTXPathDiversityCallback, NULL, "CCKPathDiversityTimer"); ODM_InitializeTimer(pDM_Odm, &pDM_Odm->sbdcnt_timer, - (RT_TIMER_CALL_BACK)phydm_sbd_callback, NULL, "SbdTimer"); + (RT_TIMER_CALL_BACK)phydm_sbd_callback, NULL, "SbdTimer"); #if (BEAMFORMING_SUPPORT == 1) ODM_InitializeTimer(pDM_Odm, &pDM_Odm->BeamformingInfo.TxbfInfo.Txbf_FwNdpaTimer, (RT_TIMER_CALL_BACK)halComTxbf_FwNdpaTimerCallback, NULL, "Txbf_FwNdpaTimer"); @@ -1817,16 +1797,16 @@ ODM_InitAllTimers( VOID ODM_CancelAllTimers( - IN PDM_ODM_T pDM_Odm + IN PDM_ODM_T pDM_Odm ) { #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) // - // 2012/01/12 MH Temp BSOD fix. We need to find NIC allocate mem fail reason in + // 2012/01/12 MH Temp BSOD fix. We need to find NIC allocate mem fail reason in // win7 platform. // HAL_ADAPTER_STS_CHK(pDM_Odm) -#endif +#endif #if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY)) ODM_AntDivTimers(pDM_Odm,CANCEL_ANTDIV_TIMMER); @@ -1862,7 +1842,7 @@ ODM_CancelAllTimers( VOID ODM_ReleaseAllTimers( - IN PDM_ODM_T pDM_Odm + IN PDM_ODM_T pDM_Odm ) { #if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY)) @@ -1906,7 +1886,7 @@ ODM_ReleaseTimer(pDM_Odm, &pDM_Odm->MPT_DIGTimer); #if (DM_ODM_SUPPORT_TYPE == ODM_AP) VOID ODM_InitAllThreads( - IN PDM_ODM_T pDM_Odm + IN PDM_ODM_T pDM_Odm ) { #ifdef TPT_THREAD @@ -1916,17 +1896,17 @@ ODM_InitAllThreads( VOID ODM_StopAllThreads( - IN PDM_ODM_T pDM_Odm + IN PDM_ODM_T pDM_Odm ) { #ifdef TPT_THREAD kTPT_task_stop(pDM_Odm->priv); #endif } -#endif +#endif -#if( DM_ODM_SUPPORT_TYPE == ODM_WIN) +#if( DM_ODM_SUPPORT_TYPE == ODM_WIN) // // 2011/07/26 MH Add an API for testing IQK fail case. // @@ -1941,19 +1921,17 @@ ODM_CheckPowerStatus( PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); // 2011/07/27 MH We are not testing ready~~!! We may fail to get correct value when init sequence. - if (pMgntInfo->init_adpt_in_progress == TRUE) - { + if (pMgntInfo->init_adpt_in_progress == TRUE) { ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("ODM_CheckPowerStatus Return TRUE, due to initadapter\n")); return TRUE; } - + // // 2011/07/19 MH We can not execute tx pwoer tracking/ LLC calibrate or IQK. // - Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RF_STATE, (pu1Byte)(&rtState)); - if(Adapter->bDriverStopped || Adapter->bDriverIsGoingToPnpSetPowerSleep || rtState == eRfOff) - { - ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("ODM_CheckPowerStatus Return FALSE, due to %d/%d/%d\n", + Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RF_STATE, (pu1Byte)(&rtState)); + if (Adapter->bDriverStopped || Adapter->bDriverIsGoingToPnpSetPowerSleep || rtState == eRfOff) { + ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("ODM_CheckPowerStatus Return FALSE, due to %d/%d/%d\n", Adapter->bDriverStopped, Adapter->bDriverIsGoingToPnpSetPowerSleep, rtState)); return FALSE; } @@ -1980,10 +1958,10 @@ ODM_CheckPowerStatus( // // 2011/07/19 MH We can not execute tx pwoer tracking/ LLC calibrate or IQK. // - Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RF_STATE, (pu1Byte)(&rtState)); + Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RF_STATE, (pu1Byte)(&rtState)); if(Adapter->bDriverStopped || Adapter->bDriverIsGoingToPnpSetPowerSleep || rtState == eRfOff) { - ODM_RT_TRACE(pDM_Odm,COMP_INIT, DBG_LOUD, ("ODM_CheckPowerStatus Return FALSE, due to %d/%d/%d\n", + ODM_RT_TRACE(pDM_Odm,COMP_INIT, DBG_LOUD, ("ODM_CheckPowerStatus Return FALSE, due to %d/%d/%d\n", Adapter->bDriverStopped, Adapter->bDriverIsGoingToPnpSetPowerSleep, rtState)); return FALSE; } @@ -2005,7 +1983,7 @@ GetPSDData( //unsigned int val, rfval; //int psd_report; u4Byte psd_report; - + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); //Debug Message //val = PHY_QueryBBReg(Adapter,0x908, bMaskDWord); @@ -2026,7 +2004,7 @@ GetPSDData( ODM_SetBBReg(pDM_Odm, 0x808, BIT22, 0); //Read PSD report, Reg8B4[15:0] psd_report = ODM_GetBBReg(pDM_Odm,0x8B4, bMaskDWord) & 0x0000FFFF; - + #if 1//(DEV_BUS_TYPE == RT_PCI_INTERFACE) && ( (RT_PLATFORM == PLATFORM_LINUX) || (RT_PLATFORM == PLATFORM_MACOSX)) psd_report = (u4Byte) (odm_ConvertTo_dB(psd_report))+(u4Byte)(initial_gain_psd-0x1c); #else @@ -2034,11 +2012,11 @@ GetPSDData( #endif return psd_report; - + } #endif -u4Byte +u4Byte odm_ConvertTo_dB( u4Byte Value) { @@ -2048,23 +2026,18 @@ odm_ConvertTo_dB( Value = Value & 0xFFFF; - for (i = 0; i < 12; i++) - { - if (Value <= dB_Invert_Table[i][7]) - { + for (i = 0; i < 12; i++) { + if (Value <= dB_Invert_Table[i][7]) { break; } } - if (i >= 12) - { + if (i >= 12) { return (96); // maximum 96 dB } - for (j = 0; j < 8; j++) - { - if (Value <= dB_Invert_Table[i][j]) - { + for (j = 0; j < 8; j++) { + if (Value <= dB_Invert_Table[i][j]) { break; } } @@ -2074,16 +2047,16 @@ odm_ConvertTo_dB( return (dB); } -u4Byte +u4Byte odm_ConvertTo_linear( u4Byte Value) { u1Byte i; u1Byte j; u4Byte linear; - + /* 1dB~96dB */ - + Value = Value & 0xFF; i = (u1Byte)((Value - 1) >> 3); @@ -2112,22 +2085,20 @@ ODM_AsocEntry_Init( ODM_CmnInfoPtrArrayHook(pDM_OutSrc, ODM_CMNINFO_STA_STATUS, 0, &pLoopAdapter->MgntInfo.DefaultPort[0]); pLoopAdapter->MgntInfo.DefaultPort[0].MultiPortStationIdx = TotalAssocEntryNum; - + adaptercount += 1; - RT_TRACE(COMP_INIT, DBG_LOUD, ("adaptercount=%d\n", adaptercount)); + RT_TRACE(COMP_INIT, DBG_LOUD, ("adaptercount=%d\n", adaptercount)); pLoopAdapter = GetNextExtAdapter(pLoopAdapter); TotalAssocEntryNum +=1; - while(pLoopAdapter) - { - for (index = 0; index MgntInfo.AsocEntry[index]); - pLoopAdapter->MgntInfo.AsocEntry[index].MultiPortStationIdx = TotalAssocEntryNum+index; + pLoopAdapter->MgntInfo.AsocEntry[index].MultiPortStationIdx = TotalAssocEntryNum+index; } - + TotalAssocEntryNum+= index; - if(IS_HARDWARE_TYPE_8188E((pDM_Odm->Adapter))) + if (IS_HARDWARE_TYPE_8188E((pDM_Odm->Adapter))) pLoopAdapter->RASupport = TRUE; adaptercount += 1; RT_TRACE(COMP_INIT, DBG_LOUD, ("adaptercount=%d\n", adaptercount)); @@ -2136,7 +2107,7 @@ ODM_AsocEntry_Init( RT_TRACE(COMP_INIT, DBG_LOUD, ("TotalAssocEntryNum = %d\n", TotalAssocEntryNum)); if (TotalAssocEntryNum < (ODM_ASSOCIATE_ENTRY_NUM-1)) { - + RT_TRACE(COMP_INIT, DBG_LOUD, ("In hook null\n")); for (index = TotalAssocEntryNum; index < ODM_ASSOCIATE_ENTRY_NUM; index++) ODM_CmnInfoPtrArrayHook(pDM_OutSrc, ODM_CMNINFO_STA_STATUS, index, NULL); @@ -2191,8 +2162,7 @@ void odm_dtc(PDM_ODM_T pDM_Odm) if (DTC_BASE < pDM_Odm->RSSI_Min) { /* need to decade the CTS TX power */ sign = 1; - for (i=0;i= pDM_Odm->RSSI_Min) || (dtc_steps >= 6)) break; else @@ -2200,13 +2170,11 @@ void odm_dtc(PDM_ODM_T pDM_Odm) } } #if 0 - else if (DTC_DWN_BASE > pDM_Odm->RSSI_Min) - { + else if (DTC_DWN_BASE > pDM_Odm->RSSI_Min) { /* needs to increase the CTS TX power */ sign = 0; dtc_steps = 1; - for (i=0;iRSSI_Min) || (dtc_steps>=10)) break; else @@ -2241,21 +2209,19 @@ odm_UpdatePowerTrainingState( pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; u4Byte score = 0; - if(!(pDM_Odm->SupportAbility & ODM_BB_PWR_TRAIN)) + if (!(pDM_Odm->SupportAbility & ODM_BB_PWR_TRAIN)) return; ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState()============>\n")); pDM_Odm->bChangeState = FALSE; // Debug command - if(pDM_Odm->ForcePowerTrainingState) - { - if(pDM_Odm->ForcePowerTrainingState == 1 && !pDM_Odm->bDisablePowerTraining) - { + if (pDM_Odm->ForcePowerTrainingState) { + if (pDM_Odm->ForcePowerTrainingState == 1 && !pDM_Odm->bDisablePowerTraining) { pDM_Odm->bChangeState = TRUE; pDM_Odm->bDisablePowerTraining = TRUE; } - else if(pDM_Odm->ForcePowerTrainingState == 2 && pDM_Odm->bDisablePowerTraining) + else if (pDM_Odm->ForcePowerTrainingState == 2 && pDM_Odm->bDisablePowerTraining) { pDM_Odm->bChangeState = TRUE; pDM_Odm->bDisablePowerTraining = FALSE; @@ -2268,13 +2234,12 @@ odm_UpdatePowerTrainingState( pDM_Odm->ForcePowerTrainingState)); return; } - - if(!pDM_Odm->bLinked) + + if (!pDM_Odm->bLinked) return; - + // First connect - if((pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0 == FALSE)) - { + if ((pDM_Odm->bLinked) && (pDM_DigTable->bMediaConnect_0 == FALSE)) { pDM_Odm->PT_score = 0; pDM_Odm->bChangeState = TRUE; pDM_Odm->PhyDbgInfo.NumQryPhyStatusOFDM = 0; @@ -2284,54 +2249,48 @@ odm_UpdatePowerTrainingState( } // Compute score - if(pDM_Odm->NHM_cnt_0 >= 215) + if (pDM_Odm->NHM_cnt_0 >= 215) score = 2; - else if(pDM_Odm->NHM_cnt_0 >= 190) + else if (pDM_Odm->NHM_cnt_0 >= 190) score = 1; // unknow state - else - { + else { u4Byte RX_Pkt_Cnt; - + RX_Pkt_Cnt = (u4Byte)(pDM_Odm->PhyDbgInfo.NumQryPhyStatusOFDM) + (u4Byte)(pDM_Odm->PhyDbgInfo.NumQryPhyStatusCCK); - - if((FalseAlmCnt->Cnt_CCA_all > 31 && RX_Pkt_Cnt > 31) && (FalseAlmCnt->Cnt_CCA_all >= RX_Pkt_Cnt)) - { - if((RX_Pkt_Cnt + (RX_Pkt_Cnt >> 1)) <= FalseAlmCnt->Cnt_CCA_all) + + if ((FalseAlmCnt->Cnt_CCA_all > 31 && RX_Pkt_Cnt > 31) && (FalseAlmCnt->Cnt_CCA_all >= RX_Pkt_Cnt)) { + if ((RX_Pkt_Cnt + (RX_Pkt_Cnt >> 1)) <= FalseAlmCnt->Cnt_CCA_all) score = 0; - else if((RX_Pkt_Cnt + (RX_Pkt_Cnt >> 2)) <= FalseAlmCnt->Cnt_CCA_all) + else if ((RX_Pkt_Cnt + (RX_Pkt_Cnt >> 2)) <= FalseAlmCnt->Cnt_CCA_all) score = 1; else score = 2; } - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): RX_Pkt_Cnt = %d, Cnt_CCA_all = %d\n", + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): RX_Pkt_Cnt = %d, Cnt_CCA_all = %d\n", RX_Pkt_Cnt, FalseAlmCnt->Cnt_CCA_all)); } ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): NumQryPhyStatusOFDM = %d, NumQryPhyStatusCCK = %d\n", (u4Byte)(pDM_Odm->PhyDbgInfo.NumQryPhyStatusOFDM), (u4Byte)(pDM_Odm->PhyDbgInfo.NumQryPhyStatusCCK))); - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): NHM_cnt_0 = %d, score = %d\n", + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): NHM_cnt_0 = %d, score = %d\n", pDM_Odm->NHM_cnt_0, score)); // smoothing pDM_Odm->PT_score = (score << 4) + (pDM_Odm->PT_score>>1) + (pDM_Odm->PT_score>>2); score = (pDM_Odm->PT_score + 32) >> 6; - ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): PT_score = %d, score after smoothing = %d\n", + ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): PT_score = %d, score after smoothing = %d\n", pDM_Odm->PT_score, score)); // Mode decision - if(score == 2) - { - if(pDM_Odm->bDisablePowerTraining) - { + if (score == 2) { + if (pDM_Odm->bDisablePowerTraining) { pDM_Odm->bChangeState = TRUE; pDM_Odm->bDisablePowerTraining = FALSE; ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): Change state\n")); } ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): Enable Power Training\n")); } - else if(score == 0) - { - if(!pDM_Odm->bDisablePowerTraining) - { + else if (score == 0) { + if (!pDM_Odm->bDisablePowerTraining) { pDM_Odm->bChangeState = TRUE; pDM_Odm->bDisablePowerTraining = TRUE; ODM_RT_TRACE(pDM_Odm,ODM_COMP_RA_MASK, ODM_DBG_LOUD,("odm_UpdatePowerTrainingState(): Change state\n")); @@ -2358,14 +2317,14 @@ u1Byte GetRightChnlPlaceforIQK(u1Byte chnl) 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 149, 151, 153, 155, 157, 159, 161, 163, 165}; u1Byte place = chnl; - + if (chnl > 14) { for (place = 14; place < sizeof(channel_all); place++) { if (channel_all[place] == chnl) return place-13; } } - + return 0; } @@ -2379,17 +2338,17 @@ phydm_NoisyDetection( { u4Byte Total_FA_Cnt, Total_CCA_Cnt; u4Byte Score = 0, i, Score_Smooth; - + Total_CCA_Cnt = pDM_Odm->FalseAlmCnt.Cnt_CCA_all; - Total_FA_Cnt = pDM_Odm->FalseAlmCnt.Cnt_all; + Total_FA_Cnt = pDM_Odm->FalseAlmCnt.Cnt_all; /* if( Total_FA_Cnt*16>=Total_CCA_Cnt*14 ) // 87.5 - + else if( Total_FA_Cnt*16>=Total_CCA_Cnt*12 ) // 75 - + else if( Total_FA_Cnt*16>=Total_CCA_Cnt*10 ) // 56.25 - + else if( Total_FA_Cnt*16>=Total_CCA_Cnt*8 ) // 50 else if( Total_FA_Cnt*16>=Total_CCA_Cnt*7 ) // 43.75 @@ -2397,7 +2356,7 @@ phydm_NoisyDetection( else if( Total_FA_Cnt*16>=Total_CCA_Cnt*6 ) // 37.5 else if( Total_FA_Cnt*16>=Total_CCA_Cnt*5 ) // 31.25% - + else if( Total_FA_Cnt*16>=Total_CCA_Cnt*4 ) // 25% else if( Total_FA_Cnt*16>=Total_CCA_Cnt*3 ) // 18.75% @@ -2406,10 +2365,8 @@ phydm_NoisyDetection( else if( Total_FA_Cnt*16>=Total_CCA_Cnt*1 ) // 6.25% */ - for(i=0;i<=16;i++) - { - if( Total_FA_Cnt*16>=Total_CCA_Cnt*(16-i) ) - { + for (i=0;i<=16;i++) { + if ( Total_FA_Cnt*16>=Total_CCA_Cnt*(16-i) ) { Score = 16-i; break; } @@ -2487,7 +2444,7 @@ phydm_NoisyDetection( break; case 15: ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, - ("[NoisyDetection] Total_FA_Cnt/Total_CCA_Cnt=93.75%%\n")); + ("[NoisyDetection] Total_FA_Cnt/Total_CCA_Cnt=93.75%%\n")); break; case 16: ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, @@ -2495,13 +2452,13 @@ phydm_NoisyDetection( break; default: ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, - ("[NoisyDetection] Unknown Value!! Need Check!!\n")); + ("[NoisyDetection] Unknown Value!! Need Check!!\n")); } -*/ +*/ ODM_RT_TRACE(pDM_Odm, ODM_COMP_NOISY_DETECT, ODM_DBG_LOUD, ("[NoisyDetection] Total_CCA_Cnt=%d, Total_FA_Cnt=%d, NoisyDecision_Smooth=%d, Score=%d, Score_Smooth=%d, pDM_Odm->NoisyDecision=%d\n", Total_CCA_Cnt, Total_FA_Cnt, pDM_Odm->NoisyDecision_Smooth, Score, Score_Smooth, pDM_Odm->NoisyDecision)); - + } VOID @@ -2514,18 +2471,18 @@ phydm_csi_mask_enable( u4Byte reg_value = 0; reg_value = (enable == CSI_MASK_ENABLE) ? 1 : 0; - + if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) { ODM_SetBBReg(pDM_Odm, 0xD2C, BIT28, reg_value); ODM_RT_TRACE(pDM_Odm, ODM_COMP_API, ODM_DBG_LOUD, ("Enable CSI Mask: Reg 0xD2C[28] = ((0x%x))\n", reg_value)); - + } else if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) { ODM_SetBBReg(pDM_Odm, 0x874, BIT0, reg_value); ODM_RT_TRACE(pDM_Odm, ODM_COMP_API, ODM_DBG_LOUD, ("Enable CSI Mask: Reg 0x874[0] = ((0x%x))\n", reg_value)); } - + } VOID @@ -2536,14 +2493,14 @@ phydm_clean_all_csi_mask( PDM_ODM_T pDM_Odm = (PDM_ODM_T)pDM_VOID; if (pDM_Odm->SupportICType & ODM_IC_11N_SERIES) { - + ODM_SetBBReg(pDM_Odm, 0xD40, bMaskDWord, 0); ODM_SetBBReg(pDM_Odm, 0xD44, bMaskDWord, 0); ODM_SetBBReg(pDM_Odm, 0xD48, bMaskDWord, 0); ODM_SetBBReg(pDM_Odm, 0xD4c, bMaskDWord, 0); - + } else if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) { - + ODM_SetBBReg(pDM_Odm, 0x880, bMaskDWord, 0); ODM_SetBBReg(pDM_Odm, 0x884, bMaskDWord, 0); ODM_SetBBReg(pDM_Odm, 0x888, bMaskDWord, 0); @@ -2580,37 +2537,37 @@ phydm_set_csi_mask_reg( tone_num = 64; csi_mask_reg_p = 0xD40; - csi_mask_reg_n = 0xD48; - + csi_mask_reg_n = 0xD48; + } else if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) { tone_num = 128; csi_mask_reg_p = 0x880; - csi_mask_reg_n = 0x890; + csi_mask_reg_n = 0x890; } - + if (tone_direction == FREQ_POSITIVE) { if (tone_idx_tmp >= (tone_num - 1)) tone_idx_tmp = (tone_num - 1); - + byte_offset = (u1Byte)(tone_idx_tmp >> 3); bit_offset = (u1Byte)(tone_idx_tmp & 0x7); target_reg = csi_mask_reg_p + byte_offset; - + } else { tone_num_shift = tone_num; - + if (tone_idx_tmp >= tone_num) tone_idx_tmp = tone_num; tone_idx_tmp = tone_num - tone_idx_tmp; - + byte_offset = (u1Byte)(tone_idx_tmp >> 3); - bit_offset = (u1Byte)(tone_idx_tmp & 0x7); + bit_offset = (u1Byte)(tone_idx_tmp & 0x7); target_reg = csi_mask_reg_n + byte_offset; } - + reg_tmp_value = ODM_Read1Byte(pDM_Odm, target_reg); ODM_RT_TRACE(pDM_Odm, ODM_COMP_API, ODM_DBG_LOUD, ("Pre Mask tone idx[%d]: Reg0x%x = ((0x%x))\n", (tone_idx_tmp + tone_num_shift), target_reg, reg_tmp_value)); reg_tmp_value |= BIT(bit_offset); diff --git a/hal/phydm/phydm_rxhp.c b/hal/phydm/phydm_rxhp.c old mode 100755 new mode 100644 diff --git a/hal/phydm/phydm_rxhp.h b/hal/phydm/phydm_rxhp.h old mode 100755 new mode 100644 diff --git a/hal/phydm/rtchnlplan.c b/hal/phydm/rtchnlplan.c index 4b41ff1..6fa9894 100644 --- a/hal/phydm/rtchnlplan.c +++ b/hal/phydm/rtchnlplan.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -19,12 +19,12 @@ ******************************************************************************/ /****************************************************************************** - + History: Data Who Remark (Internal History) - + 05/14/2012 MH Collect RTK inernal infromation and generate channel plan draft. - + ******************************************************************************/ //============================================================ @@ -41,73 +41,73 @@ // /* - Channel Plan Contents - Domain Code EEPROM Countries in Specific Domain - 2G RD 5G RD Bit[6:0] 2G 5G - Case Old Define 00h~1Fh Old Define Old Define - 1 2G_WORLD 5G_NULL 20h Worldwird 13 NA - 2 2G_ETSI1 5G_NULL 21h Europe 2G NA - 3 2G_FCC1 5G_NULL 22h US 2G NA - 4 2G_MKK1 5G_NULL 23h Japan 2G NA - 5 2G_ETSI2 5G_NULL 24h France 2G NA + Channel Plan Contents + Domain Code EEPROM Countries in Specific Domain + 2G RD 5G RD Bit[6:0] 2G 5G + Case Old Define 00h~1Fh Old Define Old Define + 1 2G_WORLD 5G_NULL 20h Worldwird 13 NA + 2 2G_ETSI1 5G_NULL 21h Europe 2G NA + 3 2G_FCC1 5G_NULL 22h US 2G NA + 4 2G_MKK1 5G_NULL 23h Japan 2G NA + 5 2G_ETSI2 5G_NULL 24h France 2G NA 6 2G_FCC1 5G_FCC1 25h US 2G US 5G ¤K¤j°ê»{ÃÒ 7 2G_WORLD 5G_ETSI1 26h Worldwird 13 Europe ¤K¤j°ê»{ÃÒ 8 2G_MKK1 5G_MKK1 27h Japan 2G Japan 5G ¤K¤j°ê»{ÃÒ 9 2G_WORLD 5G_KCC1 28h Worldwird 13 Korea ¤K¤j°ê»{ÃÒ - 10 2G_WORLD 5G_FCC2 29h Worldwird 13 US o/w DFS Channels - 11 2G_WORLD 5G_FCC3 30h Worldwird 13 India, Mexico - 12 2G_WORLD 5G_FCC4 31h Worldwird 13 Venezuela - 13 2G_WORLD 5G_FCC5 32h Worldwird 13 China - 14 2G_WORLD 5G_FCC6 33h Worldwird 13 Israel + 10 2G_WORLD 5G_FCC2 29h Worldwird 13 US o/w DFS Channels + 11 2G_WORLD 5G_FCC3 30h Worldwird 13 India, Mexico + 12 2G_WORLD 5G_FCC4 31h Worldwird 13 Venezuela + 13 2G_WORLD 5G_FCC5 32h Worldwird 13 China + 14 2G_WORLD 5G_FCC6 33h Worldwird 13 Israel 15 2G_FCC1 5G_FCC7 34h US 2G US/Canada ¤K¤j°ê»{ÃÒ 16 2G_WORLD 5G_ETSI2 35h Worldwird 13 Australia, New Zealand ¤K¤j°ê»{ÃÒ - 17 2G_WORLD 5G_ETSI3 36h Worldwird 13 Russia - 18 2G_MKK1 5G_MKK2 37h Japan 2G Japan (W52, W53) - 19 2G_MKK1 5G_MKK3 38h Japan 2G Japan (W56) + 17 2G_WORLD 5G_ETSI3 36h Worldwird 13 Russia + 18 2G_MKK1 5G_MKK2 37h Japan 2G Japan (W52, W53) + 19 2G_MKK1 5G_MKK3 38h Japan 2G Japan (W56) 20 2G_FCC1 5G_NCC1 39h US 2G Taiwan ¤K¤j°ê»{ÃÒ - + NA 2G_WORLD 5G_FCC1 7F FCC FCC DFS Channels Realtek Define - - - - - - 2.4G Regulatory Domains + + + + + + 2.4G Regulatory Domains Case 2G RD Regulation Channels Frequencyes Note Countries in Specific Domain 1 2G_WORLD ETSI 1~13 2412~2472 Passive scan CH 12, 13 Worldwird 13 2 2G_ETSI1 ETSI 1~13 2412~2472 Europe 3 2G_FCC1 FCC 1~11 2412~2462 US 4 2G_MKK1 MKK 1~13, 14 2412~2472, 2484 Japan 5 2G_ETSI2 ETSI 10~13 2457~2472 France - - - - - 5G Regulatory Domains + + + + + 5G Regulatory Domains Case 5G RD Regulation Channels Frequencyes Note Countries in Specific Domain - 1 5G_NULL NA NA NA Do not support 5GHz - 2 5G_ETSI1 ETSI "36~48, 52~64, + 1 5G_NULL NA NA NA Do not support 5GHz + 2 5G_ETSI1 ETSI "36~48, 52~64, 100~140" "5180~5240, 5260~5230 5500~5700" Band1, Ban2, Band3 Europe - 3 5G_ETSI2 ETSI "36~48, 52~64, + 3 5G_ETSI2 ETSI "36~48, 52~64, 100~140, 149~165" "5180~5240, 5260~5230 5500~5700, 5745~5825" Band1, Ban2, Band3, Band4 Australia, New Zealand - 4 5G_ETSI3 ETSI "36~48, 52~64, - 100~132, 149~165" + 4 5G_ETSI3 ETSI "36~48, 52~64, + 100~132, 149~165" "5180~5240, 5260~5230 5500~5660, 5745~5825" Band1, Ban2, Band3(except CH 136, 140), Band4" Russia - 5 5G_FCC1 FCC "36~48, 52~64, - 100~140, 149~165" + 5 5G_FCC1 FCC "36~48, 52~64, + 100~140, 149~165" "5180~5240, 5260~5230 5500~5700, 5745~5825" Band1(5150~5250MHz), Band2(5250~5350MHz), Band3(5470~5725MHz), Band4(5725~5850MHz)" US 6 5G_FCC2 FCC 36~48, 149~165 5180~5240, 5745~5825 Band1, Band4 FCC o/w DFS Channels - 7 5G_FCC3 FCC "36~48, 52~64, + 7 5G_FCC3 FCC "36~48, 52~64, 149~165" "5180~5240, 5260~5230 5745~5825" Band1, Ban2, Band4 India, Mexico - 8 5G_FCC4 FCC "36~48, 52~64, + 8 5G_FCC4 FCC "36~48, 52~64, 149~161" "5180~5240, 5260~5230 5745~5805" Band1, Ban2, Band4(except CH 165)" Venezuela @@ -115,20 +115,20 @@ 10 5G_FCC6 FCC 36~48, 52~64 5180~5240, 5260~5230 Band1, Band2 Israel 11 5G_FCC7 5G_IC1 FCC - IC" "36~48, 52~64, - 100~116, 136, 140, + IC" "36~48, 52~64, + 100~116, 136, 140, 149~165" "5180~5240, 5260~5230 - 5500~5580, 5680, 5700, + 5500~5580, 5680, 5700, 5745~5825" "Band1, Band2, Band3(except 5600~5650MHz), Band4" "US Canada" - 12 5G_KCC1 KCC "36~48, 52~64, + 12 5G_KCC1 KCC "36~48, 52~64, 100~124, 149~165" "5180~5240, 5260~5230 5500~5620, 5745~5825" "Band1, Ban2, Band3(5470~5650MHz), Band4" Korea - 13 5G_MKK1 MKK "36~48, 52~64, + 13 5G_MKK1 MKK "36~48, 52~64, 100~140" "5180~5240, 5260~5230 5500~5700" W52, W53, W56 Japan 14 5G_MKK2 MKK 36~48, 52~64 5180~5240, 5260~5230 W52, W53 Japan (W52, W53) @@ -136,17 +136,17 @@ 16 5G_NCC1 NCC "56~64, 100~116, 136, 140, 149~165" "5260~5320 - 5500~5580, 5680, 5700, + 5500~5580, 5680, 5700, 5745~5825" "Band2(except CH 52), Band3(except 5600~5650MHz), Band4" Taiwan - - -*/ - + + +*/ + +// +// 2.4G CHannel // -// 2.4G CHannel -// /* 2.4G Band Regulatory Domains RTL8192D @@ -176,7 +176,7 @@ // /* - 5G Band RTL8192D RTL8195 (Jaguar) Jaguar 2 Regulatory Domains + 5G Band RTL8192D RTL8195 (Jaguar) Jaguar 2 Regulatory Domains Channel Number Channel Frequency Global Global Global "US (FCC 15.407)" "Canada (FCC, except 5.6~5.65GHz)" Argentina, Australia, New Zealand, Brazil, S. Africa (FCC/ETSI) "Europe @@ -199,7 +199,7 @@ 56 5280 v v v v v v Indoor v Indoor Indoor v v Indoor v 60 5300 v v v v v v v Indoor v Indoor Indoor v v Indoor v 64 5320 v v v v v v Indoor v Indoor Indoor v v Indoor v - + "Band 3 5.47GHz ~ @@ -209,13 +209,13 @@ 108 5540 v v v v v v v v v v v v 112 5560 v v v v v v v v v v v 116 5580 v v v v v v v v v v v v v - 120 5600 v v v Indoor v Indoor v v v - 124 5620 v v v v Indoor v Indoor v v v - 128 5640 v v v Indoor v Indoor v v - 132 5660 v v v E v Indoor v Indoor v v + 120 5600 v v v Indoor v Indoor v v v + 124 5620 v v v v Indoor v Indoor v v v + 128 5640 v v v Indoor v Indoor v v + 132 5660 v v v E v Indoor v Indoor v v 136 5680 v v v v v v v v v 140 5700 v v E v v v v v v v - 144 5720 E E E + 144 5720 E E E "Band 4 5.725GHz ~ @@ -225,14 +225,14 @@ 157 5785 v v v v v v v v v v v v v 161 5805 v v v v v v v v v v v v 165 5825 v v P P v v v v v v v v v - 169 5845 P P P - 173 5865 P P P P - 177 5885 P P P + 169 5845 P P P + 173 5865 P P P P + 177 5885 P P P Channel Count 28 28 14 7 0 28 24 20 24 19 5 13 8 19 20 22 15 12 E: FCC accepted the ask for CH144 from Accord. PS: 160MHz ¥Î 80MHz+80MHz¹ê²{¡H Argentina Belgium (¤ñ§Q®É) India Israel Russia P: Customer's requirement from James. Australia The Netherlands (²üÄõ) Mexico Turkey Ukraine - New Zealand UK (­^°ê) Singapore - Brazil Switzerland (·ç¤h) + New Zealand UK (­^°ê) Singapore + Brazil Switzerland (·ç¤h) */ @@ -240,11 +240,11 @@ Channel Count 28 28 14 7 0 28 24 20 24 19 5 13 8 19 20 22 15 12 /*---------------------------Define Local Constant---------------------------*/ -// define Maximum Power v.s each band for each region +// define Maximum Power v.s each band for each region // ISRAEL // Format: // RT_CHANNEL_DOMAIN_Region ={{{Chnl_Start, Chnl_end, Pwr_dB_Max}, {Chn2_Start, Chn2_end, Pwr_dB_Max}, {Chn3_Start, Chn3_end, Pwr_dB_Max}, {Chn4_Start, Chn4_end, Pwr_dB_Max}, {Chn5_Start, Chn5_end, Pwr_dB_Max}}, Limit_Num} */ -// RT_CHANNEL_DOMAIN_FCC ={{{01,11,30}, {36,48,17}, {52,64,24}, {100,140,24}, {149,165,30}}, 5} +// RT_CHANNEL_DOMAIN_FCC ={{{01,11,30}, {36,48,17}, {52,64,24}, {100,140,24}, {149,165,30}}, 5} // "NR" is non-release channle. // Issue--- Israel--Russia--New Zealand // DOMAIN_01= (2G_WORLD, 5G_NULL) @@ -272,8 +272,8 @@ Channel Count 28 28 14 7 0 28 24 20 24 19 5 13 8 19 20 22 15 12 static RT_CHANNEL_PLAN_MAXPWR ChnlPlanPwrMax_2G[] = { - // 2G_WORLD, - {{1, 13, 20}, 1}, + // 2G_WORLD, + {{1, 13, 20}, 1}, // 2G_ETSI1 {{1, 13, 20}, 1}, @@ -292,7 +292,7 @@ static RT_CHANNEL_PLAN_MAXPWR ChnlPlanPwrMax_2G[] = { /* //===========================================1:(2G_WORLD, 5G_NULL) -RT_CHANNEL_PLAN_MAXPWR RT_DOMAIN_01 ={{{01,13,20}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}}, 1} +RT_CHANNEL_PLAN_MAXPWR RT_DOMAIN_01 ={{{01,13,20}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}}, 1} //===========================================2:(2G_ETSI1, 5G_NULL) @@ -374,56 +374,56 @@ RT_DOMAIN_23 ={{{01,13,20}, {36,48,23}, {52,64,23}, {100,140,30}, {149,165,30}}, // // Counter & Realtek Channel plan transfer table. // -RT_CHNL_CTRY_TBL RtCtryChnlTbl[] = +RT_CHNL_CTRY_TBL RtCtryChnlTbl[] = { { - RT_CTRY_AL, // "Albaniaªüº¸¤Ú¥§¨È" + RT_CTRY_AL, // "Albaniaªüº¸¤Ú¥§¨È" "AL", RT_2G_WORLD, - RT_5G_WORLD, + RT_5G_WORLD, RT_CHANNEL_DOMAIN_UNDEFINED // 2G/5G world. }, -#if 0 +#if 0 { - RT_CTRY_BB, // "Barbados¤Ú¤Ú¦h´µ" + RT_CTRY_BB, // "Barbados¤Ú¤Ú¦h´µ" "BB", RT_2G_WORLD, - RT_5G_NULL, + RT_5G_NULL, RT_CHANNEL_DOMAIN_EFUSE_0x20 // 2G world. 5G_NULL }, - + { - RT_CTRY_DE, // "Germany¼w°ê" + RT_CTRY_DE, // "Germany¼w°ê" "DE", RT_2G_WORLD, - RT_5G_ETSI1, + RT_5G_ETSI1, RT_CHANNEL_DOMAIN_EFUSE_0x26 }, - + { - RT_CTRY_US, // "Germany¼w°ê" + RT_CTRY_US, // "Germany¼w°ê" "US", RT_2G_FCC1, - RT_5G_FCC7, + RT_5G_FCC7, RT_CHANNEL_DOMAIN_EFUSE_0x34 }, { - RT_CTRY_JP, // "Germany¼w°ê" + RT_CTRY_JP, // "Germany¼w°ê" "JP", RT_2G_MKK1, - RT_5G_MKK1, + RT_5G_MKK1, RT_CHANNEL_DOMAIN_EFUSE_0x34 }, - + { - RT_CTRY_TW, // "Germany¼w°ê" + RT_CTRY_TW, // "Germany¼w°ê" "TW", RT_2G_FCC1, - RT_5G_NCC1, + RT_5G_NCC1, RT_CHANNEL_DOMAIN_EFUSE_0x39 - }, + }, #endif }; // RtCtryChnlTbl @@ -437,13 +437,13 @@ static RT_CHANNEL_PLAN_NEW RtChnlPlan[] = { // Channel Plan 0x20. { - &RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table. - RT_CHANNEL_DOMAIN_EFUSE_0x20, // RT_CHANNEL_DOMAIN RT Channel Plan Define + &RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table. + RT_CHANNEL_DOMAIN_EFUSE_0x20, // RT_CHANNEL_DOMAIN RT Channel Plan Define RT_2G_WORLD, // RT_REGULATION_2G RT_5G_NULL, // RT_REGULATION_5G RT_WORLD, // RT_REGULATION_CMN RT Regulatory domain definition. RT_SREQ_NA, // RT Channel plan special & customerize requirement. - + CHNL_RT_2G_WORLD, CHNL_RT_2G_WORLD_SCAN_TYPE, &ChnlPlanPwrMax_2G[0], @@ -451,31 +451,27 @@ static RT_CHANNEL_PLAN_NEW RtChnlPlan[] = CHNL_RT_5G_NULL, CHNL_RT_5G_NULL_SCAN_TYPE, - + }, - + // Channel Plan 0x26. { - &RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table. - RT_CHANNEL_DOMAIN_EFUSE_0x26, // RT_CHANNEL_DOMAIN RT Channel Plan Define + &RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table. + RT_CHANNEL_DOMAIN_EFUSE_0x26, // RT_CHANNEL_DOMAIN RT Channel Plan Define RT_2G_WORLD, // RT_REGULATION_2G RT_5G_ETSI1, // RT_REGULATION_5G RT_WORLD, // RT_REGULATION_CMN RT Regulatory domain definition. RT_SREQ_NA, // RT Channel plan special & customerize requirement. - + CHNL_RT_2G_WORLD, // 2G workd cannel CHNL_RT_2G_WORLD_SCAN_TYPE, &ChnlPlanPwrMax_2G[1], - + CHNL_RT_5G_ETSI1, CHNL_RT_5G_ETSI1_SCAN_TYPE, - + } - - + + }; #endif - - - - diff --git a/hal/phydm/rtchnlplan.h b/hal/phydm/rtchnlplan.h index 37786cf..4589257 100644 --- a/hal/phydm/rtchnlplan.h +++ b/hal/phydm/rtchnlplan.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. @@ -41,7 +41,7 @@ typedef enum _RT_CHANNEL_DOMAIN_NEW // ..... RT_CHANNEL_DOMAIN_MAX_NEW, - + }RT_CHANNEL_DOMAIN_NEW, *PRT_CHANNEL_DOMAIN_NEW; @@ -90,7 +90,7 @@ typedef enum _RT_CHANNEL_DOMAIN_NEW #define DOMAIN_CODE_5G_NCC1 \ {56,60,64,100,104,108,112,116,136,140,149,153,157,161,165}, 24 #define DOMAIN_CODE_5G_NCC2 \ - {56,60,64,149,153,157,161,165}, 8 + {56,60,64,149,153,157,161,165}, 8 #define UNDEFINED \ {0}, 0 #endif @@ -103,157 +103,157 @@ typedef enum _RT_CHANNEL_DOMAIN_NEW Countries "Country Abbreviation" Domain Code SKU's Ch# of 20MHz 2G 5G Ch# of 40MHz "Albaniaªüº¸¤Ú¥§¨È" AL Local Test - -"Algeriaªüº¸¤Î§Q¨È" DZ CE TCF - -"Antigua & Barbuda¦w´£¥Ê®q&¤Ú¥¬¹F" AG 2G_WORLD FCC TCF - + +"Algeriaªüº¸¤Î§Q¨È" DZ CE TCF + +"Antigua & Barbuda¦w´£¥Ê®q&¤Ú¥¬¹F" AG 2G_WORLD FCC TCF + "Argentinaªü®Ú§Ê" AR 2G_WORLD Local Test - + "Armenia¨È¬ü¥§¨È" AM 2G_WORLD ETSI - + "Arubaªü¾|¤Ú®q" AW 2G_WORLD FCC TCF - -"Australia¿D¬w" AU 2G_WORLD 5G_ETSI2 - -"Austria¶ø¦a§Q" AT 2G_WORLD 5G_ETSI1 CE - -"Azerbaijanªü¶ë«ô¾Ê" AZ 2G_WORLD CE TCF - -"Bahamas¤Ú«¢°¨" BS 2G_WORLD - + +"Australia¿D¬w" AU 2G_WORLD 5G_ETSI2 + +"Austria¶ø¦a§Q" AT 2G_WORLD 5G_ETSI1 CE + +"Azerbaijanªü¶ë«ô¾Ê" AZ 2G_WORLD CE TCF + +"Bahamas¤Ú«¢°¨" BS 2G_WORLD + "Barbados¤Ú¤Ú¦h´µ" BB 2G_WORLD FCC TCF - -"Belgium¤ñ§Q®É" BE 2G_WORLD 5G_ETSI1 CE - -"Bermuda¦Ê¼}¹F" BM 2G_WORLD FCC TCF - + +"Belgium¤ñ§Q®É" BE 2G_WORLD 5G_ETSI1 CE + +"Bermuda¦Ê¼}¹F" BM 2G_WORLD FCC TCF + "Brazil¤Ú¦è" BR 2G_WORLD Local Test - -"Bulgaria«O¥[§Q¨È" BG 2G_WORLD 5G_ETSI1 CE - + +"Bulgaria«O¥[§Q¨È" BG 2G_WORLD 5G_ETSI1 CE + "Canada¥[®³¤j" CA 2G_FCC1 5G_FCC7 IC / FCC IC / FCC - -"Cayman Islands¶}°Ò¸s®q" KY 2G_WORLD 5G_ETSI1 CE - -"Chile´¼§Q" CL 2G_WORLD FCC TCF - -"China¤¤°ê" CN 2G_WORLD 5G_FCC5 «H³¡?¡i2002¡j353? - -"Columbia­ô­Û¤ñ¨È" CO 2G_WORLD Voluntary - -"Costa Rica­ô´µ¹F¾¤¥[" CR 2G_WORLD FCC TCF - -"Cyprus¶ë®ú¸ô´µ" CY 2G_WORLD 5G_ETSI1 CE - -"Czech ±¶§J" CZ 2G_WORLD 5G_ETSI1 CE - -"Denmark¤¦³Á" DK 2G_WORLD 5G_ETSI1 CE - -"Dominican Republic¦h©ú¥§¥[¦@©M°ê" DO 2G_WORLD FCC TCF - -"Egypt®J¤Î" EG 2G_WORLD CE T CF - -"El SalvadorÂĺ¸¥Ë¦h" SV 2G_WORLD Voluntary - -"Estonia·R¨F¥§¨È" EE 2G_WORLD 5G_ETSI1 CE - -"FinlandªâÄõ" FI 2G_WORLD 5G_ETSI1 CE - -"Franceªk°ê" FR 5G_E TSI1 CE - -"Germany¼w°ê" DE 2G_WORLD 5G_ETSI1 CE - -"Greece §Æþ" GR 2G_WORLD 5G_ETSI1 CE - -"GuamÃö®q" GU 2G_WORLD - -"Guatemala¥Ê¦a°¨©Ô" GT 2G_WORLD - -"Haiti®ü¦a" HT 2G_WORLD FCC TCF - -"Honduras§»³£©Ô´µ" HN 2G_WORLD FCC TCF - -"Hungary¦I¤ú§Q" HU 2G_WORLD 5G_ETSI1 CE - -"Iceland¦B®q" IS 2G_WORLD 5G_ETSI1 CE - -"India¦L«×" IN 2G_WORLD 5G_FCC3 FCC/CE TCF - -"Ireland·Rº¸Äõ" IE 2G_WORLD 5G_ETSI1 CE - -"Israel¥H¦â¦C" IL 5G_F CC6 CE TCF - -"Italy¸q¤j§Q" IT 2G_WORLD 5G_ETSI1 CE - -"Japan¤é¥»" JP 2G_MKK1 5G_MKK1 MKK MKK - -"KoreaÁú°ê" KR 2G_WORLD 5G_KCC1 KCC KCC - -"Latvia©Ô²æºû¨È" LV 2G_WORLD 5G_ETSI1 CE - -"Lithuania¥ß³³©{" LT 2G_WORLD 5G_ETSI1 CE - -"Luxembourg¿c´Ë³ù" LU 2G_WORLD 5G_ETSI1 CE - -"Malaysia°¨¨Ó¦è¨È" MY 2G_WORLD Local Test - -"Malta°¨º¸¥L" MT 2G_WORLD 5G_ETSI1 CE - -"Mexico¾¥¦è­ô" MX 2G_WORLD 5G_FCC3 Local Test - -"Morocco¼¯¬¥­ô" MA CE TCF - -"Netherlands²üÄõ" NL 2G_WORLD 5G_ETSI1 CE - -"New Zealand¯Ã¦èÄõ" NZ 2G_WORLD 5G_ETSI2 - -"Norway®¿«Â" NO 2G_WORLD 5G_ETSI1 CE - + +"Cayman Islands¶}°Ò¸s®q" KY 2G_WORLD 5G_ETSI1 CE + +"Chile´¼§Q" CL 2G_WORLD FCC TCF + +"China¤¤°ê" CN 2G_WORLD 5G_FCC5 «H³¡?¡i2002¡j353? + +"Columbia­ô­Û¤ñ¨È" CO 2G_WORLD Voluntary + +"Costa Rica­ô´µ¹F¾¤¥[" CR 2G_WORLD FCC TCF + +"Cyprus¶ë®ú¸ô´µ" CY 2G_WORLD 5G_ETSI1 CE + +"Czech ±¶§J" CZ 2G_WORLD 5G_ETSI1 CE + +"Denmark¤¦³Á" DK 2G_WORLD 5G_ETSI1 CE + +"Dominican Republic¦h©ú¥§¥[¦@©M°ê" DO 2G_WORLD FCC TCF + +"Egypt®J¤Î" EG 2G_WORLD CE T CF + +"El SalvadorÂĺ¸¥Ë¦h" SV 2G_WORLD Voluntary + +"Estonia·R¨F¥§¨È" EE 2G_WORLD 5G_ETSI1 CE + +"FinlandªâÄõ" FI 2G_WORLD 5G_ETSI1 CE + +"Franceªk°ê" FR 5G_E TSI1 CE + +"Germany¼w°ê" DE 2G_WORLD 5G_ETSI1 CE + +"Greece §Æþ" GR 2G_WORLD 5G_ETSI1 CE + +"GuamÃö®q" GU 2G_WORLD + +"Guatemala¥Ê¦a°¨©Ô" GT 2G_WORLD + +"Haiti®ü¦a" HT 2G_WORLD FCC TCF + +"Honduras§»³£©Ô´µ" HN 2G_WORLD FCC TCF + +"Hungary¦I¤ú§Q" HU 2G_WORLD 5G_ETSI1 CE + +"Iceland¦B®q" IS 2G_WORLD 5G_ETSI1 CE + +"India¦L«×" IN 2G_WORLD 5G_FCC3 FCC/CE TCF + +"Ireland·Rº¸Äõ" IE 2G_WORLD 5G_ETSI1 CE + +"Israel¥H¦â¦C" IL 5G_F CC6 CE TCF + +"Italy¸q¤j§Q" IT 2G_WORLD 5G_ETSI1 CE + +"Japan¤é¥»" JP 2G_MKK1 5G_MKK1 MKK MKK + +"KoreaÁú°ê" KR 2G_WORLD 5G_KCC1 KCC KCC + +"Latvia©Ô²æºû¨È" LV 2G_WORLD 5G_ETSI1 CE + +"Lithuania¥ß³³©{" LT 2G_WORLD 5G_ETSI1 CE + +"Luxembourg¿c´Ë³ù" LU 2G_WORLD 5G_ETSI1 CE + +"Malaysia°¨¨Ó¦è¨È" MY 2G_WORLD Local Test + +"Malta°¨º¸¥L" MT 2G_WORLD 5G_ETSI1 CE + +"Mexico¾¥¦è­ô" MX 2G_WORLD 5G_FCC3 Local Test + +"Morocco¼¯¬¥­ô" MA CE TCF + +"Netherlands²üÄõ" NL 2G_WORLD 5G_ETSI1 CE + +"New Zealand¯Ã¦èÄõ" NZ 2G_WORLD 5G_ETSI2 + +"Norway®¿«Â" NO 2G_WORLD 5G_ETSI1 CE + "Panama¤Ú®³°¨ " PA 2G_FCC1 Voluntary - + "Philippinesµá«ß»«" PH 2G_WORLD FCC TCF - -"PolandªiÄõ" PL 2G_WORLD 5G_ETSI1 CE - -"Portugal¸²µå¤ú" PT 2G_WORLD 5G_ETSI1 CE - -"Romaniaù°¨¥§¨È" RO 2G_WORLD 5G_ETSI1 CE - -"Russia«Xù´µ" RU 2G_WORLD 5G_ETSI3 CE TCF - -"Saudi Arabia¨F¦aªü©Ô§B" SA 2G_WORLD CE TCF - -"Singapore·s¥[©Y" SG 2G_WORLD - -"Slovakia´µ¬¥¥ï§J" SK 2G_WORLD 5G_ETSI1 CE - -"Slovenia´µ¬¥ºû¥§¨È" SI 2G_WORLD 5G_ETSI1 CE - -"South Africa«n«D" ZA 2G_WORLD CE TCF - -"Spain¦è¯Z¤ú" ES 5G_ETSI1 CE - -"Sweden·ç¨å" SE 2G_WORLD 5G_ETSI1 CE - -"Switzerland·ç¤h" CH 2G_WORLD 5G_ETSI1 CE - -"Taiwan»OÆW" TW 2G_FCC1 5G_NCC1 NCC - -"Thailand®õ°ê" TH 2G_WORLD FCC/CE TCF - -"Turkey¤g¦Õ¨ä" TR 2G_WORLD - -"Ukraine¯Q§JÄõ" UA 2G_WORLD Local Test - -"United Kingdom­^°ê" GB 2G_WORLD 5G_ETSI1 CE ETSI - + +"PolandªiÄõ" PL 2G_WORLD 5G_ETSI1 CE + +"Portugal¸²µå¤ú" PT 2G_WORLD 5G_ETSI1 CE + +"Romaniaù°¨¥§¨È" RO 2G_WORLD 5G_ETSI1 CE + +"Russia«Xù´µ" RU 2G_WORLD 5G_ETSI3 CE TCF + +"Saudi Arabia¨F¦aªü©Ô§B" SA 2G_WORLD CE TCF + +"Singapore·s¥[©Y" SG 2G_WORLD + +"Slovakia´µ¬¥¥ï§J" SK 2G_WORLD 5G_ETSI1 CE + +"Slovenia´µ¬¥ºû¥§¨È" SI 2G_WORLD 5G_ETSI1 CE + +"South Africa«n«D" ZA 2G_WORLD CE TCF + +"Spain¦è¯Z¤ú" ES 5G_ETSI1 CE + +"Sweden·ç¨å" SE 2G_WORLD 5G_ETSI1 CE + +"Switzerland·ç¤h" CH 2G_WORLD 5G_ETSI1 CE + +"Taiwan»OÆW" TW 2G_FCC1 5G_NCC1 NCC + +"Thailand®õ°ê" TH 2G_WORLD FCC/CE TCF + +"Turkey¤g¦Õ¨ä" TR 2G_WORLD + +"Ukraine¯Q§JÄõ" UA 2G_WORLD Local Test + +"United Kingdom­^°ê" GB 2G_WORLD 5G_ETSI1 CE ETSI + "United States¬ü°ê" US 2G_FCC1 5G_FCC7 FCC FCC - + "Venezuela©e¤º·ç©Ô" VE 2G_WORLD 5G_FCC4 FCC TCF - + "Vietnam¶V«n" VN 2G_WORLD FCC/CE TCF - + */ @@ -261,86 +261,86 @@ Countries "Country Abbreviation" Domain Code SKU's Ch# of 20MHz // Counter abbervation. typedef enum _RT_COUNTRY_DEFINE_NUM { - RT_CTRY_AL, // "Albaniaªüº¸¤Ú¥§¨È" - RT_CTRY_DZ, // "Algeriaªüº¸¤Î§Q¨È" - RT_CTRY_AG, // "Antigua & Barbuda¦w´£¥Ê®q&¤Ú¥¬¹F" - RT_CTRY_AR, // "Argentinaªü®Ú§Ê" - RT_CTRY_AM, // "Armenia¨È¬ü¥§¨È" - RT_CTRY_AW, // "Arubaªü¾|¤Ú®q" - RT_CTRY_AU, // "Australia¿D¬w" - RT_CTRY_AT, // "Austria¶ø¦a§Q" - RT_CTRY_AZ, // "Azerbaijanªü¶ë«ô¾Ê" - RT_CTRY_BS, // "Bahamas¤Ú«¢°¨" - RT_CTRY_BB, // "Barbados¤Ú¤Ú¦h´µ" - RT_CTRY_BE, // "Belgium¤ñ§Q®É" - RT_CTRY_BM, // "Bermuda¦Ê¼}¹F" - RT_CTRY_BR, // "Brazil¤Ú¦è" - RT_CTRY_BG, // "Bulgaria«O¥[§Q¨È" - RT_CTRY_CA, // "Canada¥[®³¤j" - RT_CTRY_KY, // "Cayman Islands¶}°Ò¸s®q" - RT_CTRY_CL, // "Chile´¼§Q" - RT_CTRY_CN, // "China¤¤°ê" - RT_CTRY_CO, // "Columbia­ô­Û¤ñ¨È" - RT_CTRY_CR, // "Costa Rica­ô´µ¹F¾¤¥[" - RT_CTRY_CY, // "Cyprus¶ë®ú¸ô´µ" - RT_CTRY_CZ, // "Czech ±¶§J" - RT_CTRY_DK, // "Denmark¤¦³Á" - RT_CTRY_DO, // "Dominican Republic¦h©ú¥§¥[¦@©M°ê" - RT_CTRY_CE, // "Egypt®J¤Î" EG 2G_WORLD - RT_CTRY_SV, // "El SalvadorÂĺ¸¥Ë¦h" - RT_CTRY_EE, // "Estonia·R¨F¥§¨È" - RT_CTRY_FI, // "FinlandªâÄõ" - RT_CTRY_FR, // "Franceªk°ê" - RT_CTRY_DE, // "Germany¼w°ê" - RT_CTRY_GR, // "Greece §Æþ" - RT_CTRY_GU, // "GuamÃö®q" - RT_CTRY_GT, // "Guatemala¥Ê¦a°¨©Ô" - RT_CTRY_HT, // "Haiti®ü¦a" - RT_CTRY_HN, // "Honduras§»³£©Ô´µ" - RT_CTRY_HU, // "Hungary¦I¤ú§Q" - RT_CTRY_IS, // "Iceland¦B®q" - RT_CTRY_IN, // "India¦L«×" - RT_CTRY_IE, // "Ireland·Rº¸Äõ" - RT_CTRY_IL, // "Israel¥H¦â¦C" - RT_CTRY_IT, // "Italy¸q¤j§Q" - RT_CTRY_JP, // "Japan¤é¥»" - RT_CTRY_KR, // "KoreaÁú°ê" - RT_CTRY_LV, // "Latvia©Ô²æºû¨È" - RT_CTRY_LT, // "Lithuania¥ß³³©{" - RT_CTRY_LU, // "Luxembourg¿c´Ë³ù" - RT_CTRY_MY, // "Malaysia°¨¨Ó¦è¨È" - RT_CTRY_MT, // "Malta°¨º¸¥L" - RT_CTRY_MX, // "Mexico¾¥¦è­ô" - RT_CTRY_MA, // "Morocco¼¯¬¥­ô" - RT_CTRY_NL, // "Netherlands²üÄõ" - RT_CTRY_NZ, // "New Zealand¯Ã¦èÄõ" - RT_CTRY_NO, // "Norway®¿«Â" - RT_CTRY_PA, // "Panama¤Ú®³°¨ " - RT_CTRY_PH, // "Philippinesµá«ß»«" - RT_CTRY_PL, // "PolandªiÄõ" - RT_CTRY_PT, // "Portugal¸²µå¤ú" - RT_CTRY_RO, // "Romaniaù°¨¥§¨È" - RT_CTRY_RU, // "Russia«Xù´µ" - RT_CTRY_SA, // "Saudi Arabia¨F¦aªü©Ô§B" - RT_CTRY_SG, // "Singapore·s¥[©Y" - RT_CTRY_SK, // "Slovakia´µ¬¥¥ï§J" - RT_CTRY_SI, // "Slovenia´µ¬¥ºû¥§¨È" - RT_CTRY_ZA, // "South Africa«n«D" - RT_CTRY_ES, // "Spain¦è¯Z¤ú" - RT_CTRY_SE, // "Sweden·ç¨å" - RT_CTRY_CH, // "Switzerland·ç¤h" - RT_CTRY_TW, // "Taiwan»OÆW" - RT_CTRY_TH, // "Thailand®õ°ê" - RT_CTRY_TR, // "Turkey¤g¦Õ¨ä" - RT_CTRY_UA, // "Ukraine¯Q§JÄõ" - RT_CTRY_GB, // "United Kingdom­^°ê" - RT_CTRY_US, // "United States¬ü°ê" - RT_CTRY_VE, // "Venezuela©e¤º·ç©Ô" - RT_CTRY_VN, // "Vietnam¶V«n" - RT_CTRY_MAX, // - + RT_CTRY_AL, // "Albaniaªüº¸¤Ú¥§¨È" + RT_CTRY_DZ, // "Algeriaªüº¸¤Î§Q¨È" + RT_CTRY_AG, // "Antigua & Barbuda¦w´£¥Ê®q&¤Ú¥¬¹F" + RT_CTRY_AR, // "Argentinaªü®Ú§Ê" + RT_CTRY_AM, // "Armenia¨È¬ü¥§¨È" + RT_CTRY_AW, // "Arubaªü¾|¤Ú®q" + RT_CTRY_AU, // "Australia¿D¬w" + RT_CTRY_AT, // "Austria¶ø¦a§Q" + RT_CTRY_AZ, // "Azerbaijanªü¶ë«ô¾Ê" + RT_CTRY_BS, // "Bahamas¤Ú«¢°¨" + RT_CTRY_BB, // "Barbados¤Ú¤Ú¦h´µ" + RT_CTRY_BE, // "Belgium¤ñ§Q®É" + RT_CTRY_BM, // "Bermuda¦Ê¼}¹F" + RT_CTRY_BR, // "Brazil¤Ú¦è" + RT_CTRY_BG, // "Bulgaria«O¥[§Q¨È" + RT_CTRY_CA, // "Canada¥[®³¤j" + RT_CTRY_KY, // "Cayman Islands¶}°Ò¸s®q" + RT_CTRY_CL, // "Chile´¼§Q" + RT_CTRY_CN, // "China¤¤°ê" + RT_CTRY_CO, // "Columbia­ô­Û¤ñ¨È" + RT_CTRY_CR, // "Costa Rica­ô´µ¹F¾¤¥[" + RT_CTRY_CY, // "Cyprus¶ë®ú¸ô´µ" + RT_CTRY_CZ, // "Czech ±¶§J" + RT_CTRY_DK, // "Denmark¤¦³Á" + RT_CTRY_DO, // "Dominican Republic¦h©ú¥§¥[¦@©M°ê" + RT_CTRY_CE, // "Egypt®J¤Î" EG 2G_WORLD + RT_CTRY_SV, // "El SalvadorÂĺ¸¥Ë¦h" + RT_CTRY_EE, // "Estonia·R¨F¥§¨È" + RT_CTRY_FI, // "FinlandªâÄõ" + RT_CTRY_FR, // "Franceªk°ê" + RT_CTRY_DE, // "Germany¼w°ê" + RT_CTRY_GR, // "Greece §Æþ" + RT_CTRY_GU, // "GuamÃö®q" + RT_CTRY_GT, // "Guatemala¥Ê¦a°¨©Ô" + RT_CTRY_HT, // "Haiti®ü¦a" + RT_CTRY_HN, // "Honduras§»³£©Ô´µ" + RT_CTRY_HU, // "Hungary¦I¤ú§Q" + RT_CTRY_IS, // "Iceland¦B®q" + RT_CTRY_IN, // "India¦L«×" + RT_CTRY_IE, // "Ireland·Rº¸Äõ" + RT_CTRY_IL, // "Israel¥H¦â¦C" + RT_CTRY_IT, // "Italy¸q¤j§Q" + RT_CTRY_JP, // "Japan¤é¥»" + RT_CTRY_KR, // "KoreaÁú°ê" + RT_CTRY_LV, // "Latvia©Ô²æºû¨È" + RT_CTRY_LT, // "Lithuania¥ß³³©{" + RT_CTRY_LU, // "Luxembourg¿c´Ë³ù" + RT_CTRY_MY, // "Malaysia°¨¨Ó¦è¨È" + RT_CTRY_MT, // "Malta°¨º¸¥L" + RT_CTRY_MX, // "Mexico¾¥¦è­ô" + RT_CTRY_MA, // "Morocco¼¯¬¥­ô" + RT_CTRY_NL, // "Netherlands²üÄõ" + RT_CTRY_NZ, // "New Zealand¯Ã¦èÄõ" + RT_CTRY_NO, // "Norway®¿«Â" + RT_CTRY_PA, // "Panama¤Ú®³°¨ " + RT_CTRY_PH, // "Philippinesµá«ß»«" + RT_CTRY_PL, // "PolandªiÄõ" + RT_CTRY_PT, // "Portugal¸²µå¤ú" + RT_CTRY_RO, // "Romaniaù°¨¥§¨È" + RT_CTRY_RU, // "Russia«Xù´µ" + RT_CTRY_SA, // "Saudi Arabia¨F¦aªü©Ô§B" + RT_CTRY_SG, // "Singapore·s¥[©Y" + RT_CTRY_SK, // "Slovakia´µ¬¥¥ï§J" + RT_CTRY_SI, // "Slovenia´µ¬¥ºû¥§¨È" + RT_CTRY_ZA, // "South Africa«n«D" + RT_CTRY_ES, // "Spain¦è¯Z¤ú" + RT_CTRY_SE, // "Sweden·ç¨å" + RT_CTRY_CH, // "Switzerland·ç¤h" + RT_CTRY_TW, // "Taiwan»OÆW" + RT_CTRY_TH, // "Thailand®õ°ê" + RT_CTRY_TR, // "Turkey¤g¦Õ¨ä" + RT_CTRY_UA, // "Ukraine¯Q§JÄõ" + RT_CTRY_GB, // "United Kingdom­^°ê" + RT_CTRY_US, // "United States¬ü°ê" + RT_CTRY_VE, // "Venezuela©e¤º·ç©Ô" + RT_CTRY_VN, // "Vietnam¶V«n" + RT_CTRY_MAX, // + }RT_COUNTRY_NAME, *PRT_COUNTRY_NAME; - + // Scan type including active and passive scan. typedef enum _RT_SCAN_TYPE_NEW { @@ -349,32 +349,32 @@ typedef enum _RT_SCAN_TYPE_NEW SCAN_PAS, SCAN_BOTH, }RT_SCAN_TYPE_NEW, *PRT_SCAN_TYPE_NEW; - + // Power table sample. typedef struct _RT_CHNL_PLAN_LIMIT { u2Byte Chnl_Start; - u2Byte Chnl_end; - + u2Byte Chnl_end; + u2Byte Freq_Start; - u2Byte Freq_end; + u2Byte Freq_end; }RT_CHNL_PLAN_LIMIT, *PRT_CHNL_PLAN_LIMIT; - -// + +// // 2.4G Regulatory Domains // typedef enum _RT_REGULATION_DOMAIN_2G { - RT_2G_NULL, + RT_2G_NULL, RT_2G_WORLD, RT_2G_ETSI1, RT_2G_FCC1, RT_2G_MKK1, - RT_2G_ETSI2 - + RT_2G_ETSI2 + }RT_REGULATION_2G, *PRT_REGULATION_2G; @@ -382,12 +382,12 @@ typedef enum _RT_REGULATION_DOMAIN_2G //{ // u1Byte Chnl; // RT_SCAN_TYPE_NEW -// +// //}RT_CHANNEL_BEHAVIOR, *PRT_CHANNEL_BEHAVIOR; //typedef struct _RT_CHANNEL_PLAN_TYPE //{ -// RT_CHANNEL_BEHAVIOR +// RT_CHANNEL_BEHAVIOR // u1Byte Chnl_num; //}RT_CHNL_PLAN_TYPE, *PRT_CHNL_PLAN_TYPE; @@ -447,17 +447,17 @@ typedef enum _RT_REGULATION_DOMAIN_2G {2457, 2472}, 1 -// +// // 5G Regulatory Domains // typedef enum _RT_REGULATION_DOMAIN_5G -{ +{ RT_5G_NULL, RT_5G_WORLD, RT_5G_ETSI1, RT_5G_ETSI2, RT_5G_ETSI3, - RT_5G_FCC1, + RT_5G_FCC1, RT_5G_FCC2, RT_5G_FCC3, RT_5G_FCC4, @@ -470,7 +470,7 @@ typedef enum _RT_REGULATION_DOMAIN_5G RT_5G_MKK2, RT_5G_MKK3, RT_5G_NCC1, - + }RT_REGULATION_5G, *PRT_REGULATION_5G; // @@ -511,7 +511,7 @@ typedef enum _RT_REGULATION_DOMAIN_5G #define CHNL_RT_5G_MKK3 \ {56,60,64,100,104,108,112,116,136,140,149,153,157,161,165}, 24 #define CHNL_RT_5G_NCC1 \ - {56,60,64,149,153,157,161,165}, 8 + {56,60,64,149,153,157,161,165}, 8 // // 5G Channel Active or passive scan. @@ -551,26 +551,26 @@ typedef enum _RT_REGULATION_DOMAIN_5G #define CHNL_RT_5G_MKK3_SCAN_TYPE \ {56,60,64,100,104,108,112,116,136,140,149,153,157,161,165}, 24 #define CHNL_RT_5G_NCC1_SCAN_TYPE \ - {56,60,64,149,153,157,161,165}, 8 + {56,60,64,149,153,157,161,165}, 8 -// +// // Global Regulation // typedef enum _RT_REGULATION_COMMON { - RT_WORLD, - RT_FCC, + RT_WORLD, + RT_FCC, RT_MKK, RT_ETSI, RT_IC, RT_CE, RT_NCC, - + }RT_REGULATION_CMN, *PRT_REGULATION_CMN; -// +// // Special requirement for different regulation domain. // For internal test or customerize special request. // @@ -580,46 +580,46 @@ typedef enum _RT_CHNLPLAN_SREQ RT_SREQ_2G_ADHOC_11N = 0x00000001, RT_SREQ_2G_ADHOC_11B = 0x00000002, RT_SREQ_2G_ALL_PASS = 0x00000004, - RT_SREQ_2G_ALL_ACT = 0x00000008, + RT_SREQ_2G_ALL_ACT = 0x00000008, RT_SREQ_5G_ADHOC_11N = 0x00000010, RT_SREQ_5G_ADHOC_11AC = 0x00000020, RT_SREQ_5G_ALL_PASS = 0x00000040, RT_SREQ_5G_ALL_ACT = 0x00000080, - RT_SREQ_C1_PLAN = 0x00000100, - RT_SREQ_C2_PLAN = 0x00000200, - RT_SREQ_C3_PLAN = 0x00000400, - RT_SREQ_C4_PLAN = 0x00000800, - RT_SREQ_NFC_ON = 0x00001000, + RT_SREQ_C1_PLAN = 0x00000100, + RT_SREQ_C2_PLAN = 0x00000200, + RT_SREQ_C3_PLAN = 0x00000400, + RT_SREQ_C4_PLAN = 0x00000800, + RT_SREQ_NFC_ON = 0x00001000, RT_SREQ_MASK = 0x0000FFFF, /* Requirements bit mask */ - + }RT_CHNLPLAN_SREQ, *PRT_CHNLPLAN_SREQ; // // RT_COUNTRY_NAME & RT_REGULATION_2G & RT_REGULATION_5G transfer table -// +// // typedef struct _RT_CHANNEL_PLAN_COUNTRY_TRANSFER_TABLE -{ +{ + // + // Define countery domain and corresponding // - // Define countery domain and corresponding - // RT_COUNTRY_NAME Country_Enum; char Country_Name[3]; - - //char Domain_Name[12]; - RT_REGULATION_2G Domain_2G; - RT_REGULATION_5G Domain_5G; + //char Domain_Name[12]; + RT_REGULATION_2G Domain_2G; + + RT_REGULATION_5G Domain_5G; RT_CHANNEL_DOMAIN RtChDomain; //u1Byte Country_Area; - + }RT_CHNL_CTRY_TBL, *PRT_CHNL_CTRY_TBL; - + #define RT_MAX_CHNL_NUM_2G 13 -#define RT_MAX_CHNL_NUM_5G 44 +#define RT_MAX_CHNL_NUM_5G 44 // Power table sample. @@ -640,7 +640,7 @@ typedef struct _RT_CHANNEL_PLAN_MAXPWR RT_CHNL_PWR_LIMIT Chnl[RT_MAX_BAND_NUM]; u1Byte Band_Useful_Num; - + }RT_CHANNEL_PLAN_MAXPWR, *PRT_CHANNEL_PLAN_MAXPWR; @@ -651,49 +651,45 @@ typedef struct _RT_CHANNEL_PLAN_MAXPWR typedef struct _RT_CHANNEL_PLAN_NEW -{ +{ // - // Define countery domain and corresponding + // Define countery domain and corresponding // //char Country_Name[36]; //u1Byte Country_Enum; - + //char Domain_Name[12]; - + PRT_CHNL_CTRY_TBL pCtryTransfer; - - RT_CHANNEL_DOMAIN RtChDomain; + + RT_CHANNEL_DOMAIN RtChDomain; RT_REGULATION_2G Domain_2G; - RT_REGULATION_5G Domain_5G; + RT_REGULATION_5G Domain_5G; RT_REGULATION_CMN Regulator; RT_CHNLPLAN_SREQ ChnlSreq; - + //RT_CHNL_PLAN_LIMIT RtChnl; - + u1Byte Chnl2G[MAX_CHANNEL_NUM]; // CHNL_RT_2G_WORLD u1Byte Len2G; u1Byte Chnl2GScanTp[MAX_CHANNEL_NUM]; // CHNL_RT_2G_WORLD_SCAN_TYPE //u1Byte Freq2G[2]; // FREQ_RT_2G_WORLD - u1Byte Chnl5G[MAX_CHANNEL_NUM]; + u1Byte Chnl5G[MAX_CHANNEL_NUM]; u1Byte Len5G; u1Byte Chnl5GScanTp[MAX_CHANNEL_NUM]; //u1Byte Freq2G[2]; // FREQ_RT_2G_WORLD RT_CHANNEL_PLAN_MAXPWR ChnlMaxPwr; - - + + }RT_CHANNEL_PLAN_NEW, *PRT_CHANNEL_PLAN_NEW; - - + + #endif // __RT_CHANNELPLAN_H__ - - - - - + diff --git a/include/autoconf.h b/include/autoconf.h index b0b5572..3c1713f 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -309,7 +309,6 @@ #endif /* !CONFIG_BT_COEXIST */ - #ifdef CONFIG_USB_TX_AGGREGATION /* #define CONFIG_TX_EARLY_MODE */ #endif @@ -347,12 +346,11 @@ /* #define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap" */ - /* #define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE */ /* #define DBG_ROAMING_TEST */ /* #define DBG_HAL_INIT_PROFILING */ -/*#define DBG_MEMORY_LEAK*/ +/* #define DBG_MEMORY_LEAK*/ #define DBG_RX_DFRAME_RAW_DATA -#define CONFIG_USE_EXTERNAL_POWER /* NOT USB2.0 power, so no 500mA power constraint, no limitation in Power by Rate */ +/* #define CONFIG_USE_EXTERNAL_POWER */ /* NOT USB2.0 power, so no 500mA power constraint, no limitation in Power by Rate */