From 22eec79469f32f0f9153ec19a37f7e8f448c0522 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 28 Jun 2009 16:20:32 +0200 Subject: [PATCH] Staging: rtl8187se: cleanup r8180_rtl8225z2.c * make read_rtl8225() static * make tables static const * remove commented out code * remove useless comments * beautify code Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 894 ++++++-------------- 1 file changed, 279 insertions(+), 615 deletions(-) diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c index b09c8d14bf00..b648751cdaa3 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c +++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c @@ -236,34 +236,31 @@ static void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch) mdelay(1); } -//2005.11.16 -u8 rtl8225z2_threshold[]={ +static const u8 rtl8225z2_threshold[] = { 0x8d, 0x8d, 0x8d, 0x8d, 0x9d, 0xad, 0xbd, }; -// 0xd 0x19 0x1b 0x21 -u8 rtl8225z2_gain_bg[]={ - 0x23, 0x15, 0xa5, // -82-1dbm - 0x23, 0x15, 0xb5, // -82-2dbm - 0x23, 0x15, 0xc5, // -82-3dbm - 0x33, 0x15, 0xc5, // -78dbm - 0x43, 0x15, 0xc5, // -74dbm - 0x53, 0x15, 0xc5, // -70dbm - 0x63, 0x15, 0xc5, // -66dbm +static const u8 rtl8225z2_gain_bg[] = { + 0x23, 0x15, 0xa5, /* -82-1dBm */ + 0x23, 0x15, 0xb5, /* -82-2dBm */ + 0x23, 0x15, 0xc5, /* -82-3dBm */ + 0x33, 0x15, 0xc5, /* -78dBm */ + 0x43, 0x15, 0xc5, /* -74dBm */ + 0x53, 0x15, 0xc5, /* -70dBm */ + 0x63, 0x15, 0xc5, /* -66dBm */ }; -u8 rtl8225z2_gain_a[]={ - 0x13,0x27,0x5a,//,0x37,// -82dbm - 0x23,0x23,0x58,//,0x37,// -82dbm - 0x33,0x1f,0x56,//,0x37,// -82dbm - 0x43,0x1b,0x54,//,0x37,// -78dbm - 0x53,0x17,0x51,//,0x37,// -74dbm - 0x63,0x24,0x4f,//,0x37,// -70dbm - 0x73,0x0f,0x4c,//,0x37,// -66dbm +static const u8 rtl8225z2_gain_a[] = { + 0x13, 0x27, 0x5a, /* -82dBm */ + 0x23, 0x23, 0x58, /* -82dBm */ + 0x33, 0x1f, 0x56, /* -82dBm */ + 0x43, 0x1b, 0x54, /* -78dBm */ + 0x53, 0x17, 0x51, /* -74dBm */ + 0x63, 0x24, 0x4f, /* -70dBm */ + 0x73, 0x0f, 0x4c, /* -66dBm */ }; -//- -u16 rtl8225z2_rxgain[]={ +static const u16 rtl8225z2_rxgain[] = { 0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409, 0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541, 0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583, @@ -279,75 +276,52 @@ u16 rtl8225z2_rxgain[]={ }; -//2005.11.16, -u8 ZEBRA2_CCK_OFDM_GAIN_SETTING[]={ - 0x00,0x01,0x02,0x03,0x04,0x05, - 0x06,0x07,0x08,0x09,0x0a,0x0b, - 0x0c,0x0d,0x0e,0x0f,0x10,0x11, - 0x12,0x13,0x14,0x15,0x16,0x17, - 0x18,0x19,0x1a,0x1b,0x1c,0x1d, - 0x1e,0x1f,0x20,0x21,0x22,0x23, +static const u8 ZEBRA2_CCK_OFDM_GAIN_SETTING[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, + 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, + 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, + 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, }; -/* - from 0 to 0x23 -u8 rtl8225_tx_gain_cck_ofdm[]={ - 0x02,0x06,0x0e,0x1e,0x3e,0x7e +static const u8 rtl8225z2_tx_power_ofdm[] = { + 0x42, 0x00, 0x40, 0x00, 0x40 }; -*/ -//- -u8 rtl8225z2_tx_power_ofdm[]={ - 0x42,0x00,0x40,0x00,0x40 +static const u8 rtl8225z2_tx_power_cck_ch14[] = { + 0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00 }; - -//- -u8 rtl8225z2_tx_power_cck_ch14[]={ - 0x36,0x35,0x2e,0x1b,0x00,0x00,0x00,0x00 +static const u8 rtl8225z2_tx_power_cck[] = { + 0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04 }; - -//- -u8 rtl8225z2_tx_power_cck[]={ - 0x36,0x35,0x2e,0x25,0x1c,0x12,0x09,0x04 -}; - - void rtl8225z2_set_gain(struct net_device *dev, short gain) { - u8* rtl8225_gain; + const u8 *rtl8225_gain; struct r8180_priv *priv = ieee80211_priv(dev); - u8 mode = priv->ieee80211->mode; - if(mode == IEEE_B || mode == IEEE_G) + if (mode == IEEE_B || mode == IEEE_G) rtl8225_gain = rtl8225z2_gain_bg; else rtl8225_gain = rtl8225z2_gain_a; - //write_phy_ofdm(dev, 0x0d, rtl8225_gain[gain * 3]); - //write_phy_ofdm(dev, 0x19, rtl8225_gain[gain * 3 + 1]); - //write_phy_ofdm(dev, 0x1b, rtl8225_gain[gain * 3 + 2]); - //2005.11.17, by ch-hsu - write_phy_ofdm(dev, 0x0b, rtl8225_gain[gain * 3]); - write_phy_ofdm(dev, 0x1b, rtl8225_gain[gain * 3 + 1]); - write_phy_ofdm(dev, 0x1d, rtl8225_gain[gain * 3 + 2]); + write_phy_ofdm(dev, 0x0b, rtl8225_gain[gain * 3]); + write_phy_ofdm(dev, 0x1b, rtl8225_gain[gain * 3 + 1]); + write_phy_ofdm(dev, 0x1d, rtl8225_gain[gain * 3 + 2]); write_phy_ofdm(dev, 0x21, 0x37); - } -u32 read_rtl8225(struct net_device *dev, u8 adr) +static u32 read_rtl8225(struct net_device *dev, u8 adr) { u32 data2Write = ((u32)(adr & 0x1f)) << 27; u32 dataRead; u32 mask; u16 oval,oval2,oval3,tmp; -// ThreeWireReg twreg; -// ThreeWireReg tdata; int i; short bit, rw; - u8 wLength = 6; u8 rLength = 12; u8 low2high = 0; @@ -370,8 +344,8 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) rw = 0; mask = (low2high) ? 0x01 : (((u32)0x01)<<(32-1)); - for(i = 0; i < wLength/2; i++) - { + + for (i = 0; i < wLength/2; i++) { bit = ((data2Write&mask) != 0) ? 1 : 0; write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(1); @@ -380,8 +354,7 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) mask = (low2high) ? (mask<<1): (mask>>1); - if(i == 2) - { + if (i == 2) { rw = BB_HOST_BANG_RW; write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2); write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(2); @@ -398,17 +371,16 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) mask = (low2high) ? (mask<<1) : (mask>>1); } - //twreg.struc.clk = 0; - //twreg.struc.data = 0; write_nic_word(dev, RFPinsOutput, rw|oval); udelay(2); mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1)); - // We must set data pin to HW controled, otherwise RF can't driver it and - // value RF register won't be able to read back properly. 2006.06.13, by rcnjko. + /* + * We must set data pin to HW controled, otherwise RF can't driver it + * and value RF register won't be able to read back properly. + */ write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01))); - for(i = 0; i < rLength; i++) - { + for (i = 0; i < rLength; i++) { write_nic_word(dev, RFPinsOutput, rw|oval); udelay(1); write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2); @@ -426,36 +398,26 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) write_nic_word(dev, RFPinsOutput, BB_HOST_BANG_EN|BB_HOST_BANG_RW|oval); udelay(2); write_nic_word(dev, RFPinsEnable, oval2); - write_nic_word(dev, RFPinsSelect, oval3); // Set To SW Switch + write_nic_word(dev, RFPinsSelect, oval3); /* Set To SW Switch */ write_nic_word(dev, RFPinsOutput, 0x3a0); return dataRead; - } short rtl8225_is_V_z2(struct net_device *dev) { short vz2 = 1; - //int i; - /* sw to reg pg 1 */ - //write_rtl8225(dev, 0, 0x1b7); - //write_rtl8225(dev, 0, 0x0b7); - /* reg 8 pg 1 = 23*/ - //printk(KERN_WARNING "RF Rigisters:\n"); - - if( read_rtl8225(dev, 8) != 0x588) + if (read_rtl8225(dev, 8) != 0x588) vz2 = 0; - else /* reg 9 pg 1 = 24 */ - if( read_rtl8225(dev, 9) != 0x700) + if (read_rtl8225(dev, 9) != 0x700) vz2 = 0; /* sw back to pg 0 */ write_rtl8225(dev, 0, 0xb7); return vz2; - } void rtl8225z2_rf_close(struct net_device *dev) @@ -469,67 +431,55 @@ void rtl8225z2_rf_close(struct net_device *dev) rtl8185_set_anaparam2(dev, RTL8225z2_ANAPARAM2_OFF); } -// -// Description: -// Map dBm into Tx power index according to -// current HW model, for example, RF and PA, and -// current wireless mode. -// -s8 -DbmToTxPwrIdx( - struct r8180_priv *priv, - WIRELESS_MODE WirelessMode, - s32 PowerInDbm - ) +/* + * Map dBm into Tx power index according to current HW model, for example, + * RF and PA, and current wireless mode. + */ +s8 DbmToTxPwrIdx(struct r8180_priv *priv, WIRELESS_MODE WirelessMode, + s32 PowerInDbm) { bool bUseDefault = true; s8 TxPwrIdx = 0; - // - // 071011, SD3 SY: - // OFDM Power in dBm = Index * 0.5 + 0 - // CCK Power in dBm = Index * 0.25 + 13 - // - if(priv->card_8185 >= VERSION_8187S_B) - { + /* + * OFDM Power in dBm = Index * 0.5 + 0 + * CCK Power in dBm = Index * 0.25 + 13 + */ + if (priv->card_8185 >= VERSION_8187S_B) { s32 tmp = 0; - if(WirelessMode == WIRELESS_MODE_G) - { + if (WirelessMode == WIRELESS_MODE_G) { bUseDefault = false; tmp = (2 * PowerInDbm); - if(tmp < 0) + if (tmp < 0) TxPwrIdx = 0; - else if(tmp > 40) // 40 means 20 dBm. + else if (tmp > 40) /* 40 means 20 dBm. */ TxPwrIdx = 40; else TxPwrIdx = (s8)tmp; - } - else if(WirelessMode == WIRELESS_MODE_B) - { + } else if (WirelessMode == WIRELESS_MODE_B) { bUseDefault = false; tmp = (4 * PowerInDbm) - 52; if(tmp < 0) TxPwrIdx = 0; - else if(tmp > 28) // 28 means 20 dBm. + else if (tmp > 28) /* 28 means 20 dBm. */ TxPwrIdx = 28; else TxPwrIdx = (s8)tmp; } } - // - // TRUE if we want to use a default implementation. - // We shall set it to FALSE when we have exact translation formular - // for target IC. 070622, by rcnjko. - // - if(bUseDefault) - { - if(PowerInDbm < 0) + /* + * TRUE if we want to use a default implementation. + * We shall set it to FALSE when we have exact translation formular + * for target IC. 070622, by rcnjko. + */ + if (bUseDefault) { + if (PowerInDbm < 0) TxPwrIdx = 0; - else if(PowerInDbm > 35) + else if (PowerInDbm > 35) TxPwrIdx = 35; else TxPwrIdx = (u8)PowerInDbm; @@ -541,133 +491,75 @@ DbmToTxPwrIdx( void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch) { struct r8180_priv *priv = ieee80211_priv(dev); - -// int GainIdx; -// int GainSetting; - //int i; - //u8 power; - //u8 *cck_power_table; u8 max_cck_power_level; - //u8 min_cck_power_level; u8 max_ofdm_power_level; u8 min_ofdm_power_level; -// u8 cck_power_level = 0xff & priv->chtxpwr[ch];//-by amy 080312 -// u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdm[ch];//-by amy 080312 - char cck_power_level = (char)(0xff & priv->chtxpwr[ch]);//+by amy 080312 - char ofdm_power_level = (char)(0xff & priv->chtxpwr_ofdm[ch]);//+by amy 080312 - - if(IS_DOT11D_ENABLE(priv->ieee80211) && - IS_DOT11D_STATE_DONE(priv->ieee80211) ) - { - //PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(priv->ieee80211); + char cck_power_level = (char)(0xff & priv->chtxpwr[ch]); + char ofdm_power_level = (char)(0xff & priv->chtxpwr_ofdm[ch]); + + if (IS_DOT11D_ENABLE(priv->ieee80211) && + IS_DOT11D_STATE_DONE(priv->ieee80211)) { u8 MaxTxPwrInDbm = DOT11D_GetMaxTxPwrInDbm(priv->ieee80211, ch); u8 CckMaxPwrIdx = DbmToTxPwrIdx(priv, WIRELESS_MODE_B, MaxTxPwrInDbm); u8 OfdmMaxPwrIdx = DbmToTxPwrIdx(priv, WIRELESS_MODE_G, MaxTxPwrInDbm); - //printk("Max Tx Power dBm (%d) => CCK Tx power index : %d, OFDM Tx power index: %d\n", MaxTxPwrInDbm, CckMaxPwrIdx, OfdmMaxPwrIdx); - - //printk("EEPROM channel(%d) => CCK Tx power index: %d, OFDM Tx power index: %d\n", - // ch, cck_power_level, ofdm_power_level); - - if(cck_power_level > CckMaxPwrIdx) + if (cck_power_level > CckMaxPwrIdx) cck_power_level = CckMaxPwrIdx; - if(ofdm_power_level > OfdmMaxPwrIdx) + if (ofdm_power_level > OfdmMaxPwrIdx) ofdm_power_level = OfdmMaxPwrIdx; } - //priv->CurrentCckTxPwrIdx = cck_power_level; - //priv->CurrentOfdmTxPwrIdx = ofdm_power_level; - max_cck_power_level = 15; - max_ofdm_power_level = 25; // 12 -> 25 + max_ofdm_power_level = 25; min_ofdm_power_level = 10; - - if(cck_power_level > 35) - { + if (cck_power_level > 35) cck_power_level = 35; - } - // - // Set up CCK TXAGC. suggested by SD3 SY. - // - write_nic_byte(dev, CCK_TXAGC, (ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)cck_power_level]) ); - //printk("CCK TX power is %x\n", (ZEBRA2_CCK_OFDM_GAIN_SETTING[cck_power_level])); - force_pci_posting(dev); + + write_nic_byte(dev, CCK_TXAGC, + (ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)cck_power_level])); + force_pci_posting(dev); mdelay(1); - /* OFDM power setting */ -// Old: -// if(ofdm_power_level > max_ofdm_power_level) -// ofdm_power_level = 35; -// ofdm_power_level += min_ofdm_power_level; -// Latest: -/* if(ofdm_power_level > (max_ofdm_power_level - min_ofdm_power_level)) - ofdm_power_level = max_ofdm_power_level; - else - ofdm_power_level += min_ofdm_power_level; - ofdm_power_level += priv->ofdm_txpwr_base; -*/ - if(ofdm_power_level > 35) + if (ofdm_power_level > 35) ofdm_power_level = 35; -// rtl8185_set_anaparam2(dev,RTL8225_ANAPARAM2_ON); - - //rtl8185_set_anaparam2(dev, ANAPARM2_ASIC_ON); - if (priv->up == 0) { - //must add these for rtl8185B down, xiong-2006-11-21 - write_phy_ofdm(dev,2,0x42); - write_phy_ofdm(dev,5,0); - write_phy_ofdm(dev,6,0x40); - write_phy_ofdm(dev,7,0); - write_phy_ofdm(dev,8,0x40); + write_phy_ofdm(dev, 2, 0x42); + write_phy_ofdm(dev, 5, 0x00); + write_phy_ofdm(dev, 6, 0x40); + write_phy_ofdm(dev, 7, 0x00); + write_phy_ofdm(dev, 8, 0x40); } - //write_nic_byte(dev, TX_GAIN_OFDM, ofdm_power_level); - //2005.11.17, - write_nic_byte(dev, OFDM_TXAGC, ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)ofdm_power_level]); - if(ofdm_power_level<=11) - { -// write_nic_dword(dev,PHY_ADR,0x00005c87); -// write_nic_dword(dev,PHY_ADR,0x00005c89); - write_phy_ofdm(dev,0x07,0x5c); - write_phy_ofdm(dev,0x09,0x5c); - } - if(ofdm_power_level<=17) - { -// write_nic_dword(dev,PHY_ADR,0x00005487); -// write_nic_dword(dev,PHY_ADR,0x00005489); - write_phy_ofdm(dev,0x07,0x54); - write_phy_ofdm(dev,0x09,0x54); - } - else - { -// write_nic_dword(dev,PHY_ADR,0x00005087); -// write_nic_dword(dev,PHY_ADR,0x00005089); - write_phy_ofdm(dev,0x07,0x50); - write_phy_ofdm(dev,0x09,0x50); + write_nic_byte(dev, OFDM_TXAGC, + ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)ofdm_power_level]); + + if (ofdm_power_level <= 11) { + write_phy_ofdm(dev, 0x07, 0x5c); + write_phy_ofdm(dev, 0x09, 0x5c); } + + if (ofdm_power_level <= 17) { + write_phy_ofdm(dev, 0x07, 0x54); + write_phy_ofdm(dev, 0x09, 0x54); + } else { + write_phy_ofdm(dev, 0x07, 0x50); + write_phy_ofdm(dev, 0x09, 0x50); + } + force_pci_posting(dev); mdelay(1); - } void rtl8225z2_rf_set_chan(struct net_device *dev, short ch) { -/* - short gset = (priv->ieee80211->state == IEEE80211_LINKED && - ieee80211_is_54g(priv->ieee80211->current_network)) || - priv->ieee80211->iw_mode == IW_MODE_MONITOR; -*/ rtl8225z2_SetTXPowerLevel(dev, ch); RF_WriteReg(dev, 0x7, rtl8225_chan[ch]); - //YJ,add,080828, if set channel failed, write again - if((RF_ReadReg(dev, 0x7) & 0x0F80) != rtl8225_chan[ch]) - { + if ((RF_ReadReg(dev, 0x7) & 0x0F80) != rtl8225_chan[ch]) RF_WriteReg(dev, 0x7, rtl8225_chan[ch]); - } mdelay(1); @@ -739,8 +631,6 @@ void rtl8225z2_rf_init(struct net_device *dev) priv->chan = channel; -// rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); - if (priv->card_type != USB) rtl8225_host_pci_init(dev); @@ -750,74 +640,40 @@ void rtl8225z2_rf_init(struct net_device *dev) write_nic_word(dev, BRSR, 0xffff); - write_nic_dword(dev, RF_PARA, 0x100044); - #if 1 //0->1 rtl8180_set_mode(dev, EPROM_CMD_CONFIG); write_nic_byte(dev, CONFIG3, 0x44); rtl8180_set_mode(dev, EPROM_CMD_NORMAL); - #endif - rtl8185_rf_pins_enable(dev); -// mdelay(1000); - write_rtl8225(dev, 0x0, 0x2bf); mdelay(1); - - write_rtl8225(dev, 0x1, 0xee0); mdelay(1); - write_rtl8225(dev, 0x2, 0x44d); mdelay(1); - write_rtl8225(dev, 0x3, 0x441); mdelay(1); - - - write_rtl8225(dev, 0x4, 0x8c3);mdelay(1); - - - - write_rtl8225(dev, 0x5, 0xc72);mdelay(1); -// } - + write_rtl8225(dev, 0x4, 0x8c3); mdelay(1); + write_rtl8225(dev, 0x5, 0xc72); mdelay(1); write_rtl8225(dev, 0x6, 0xe6); mdelay(1); - write_rtl8225(dev, 0x7, ((priv->card_type == USB)? 0x82a : rtl8225_chan[channel])); mdelay(1); - write_rtl8225(dev, 0x8, 0x3f); mdelay(1); - - write_rtl8225(dev, 0x9, 0x335); mdelay(1); - - write_rtl8225(dev, 0xa, 0x9d4); mdelay(1); - - write_rtl8225(dev, 0xb, 0x7bb); mdelay(1); - - write_rtl8225(dev, 0xc, 0x850); mdelay(1); - - - write_rtl8225(dev, 0xd, 0xcdf); mdelay(1); - + write_rtl8225(dev, 0x9, 0x335); mdelay(1); + write_rtl8225(dev, 0xa, 0x9d4); mdelay(1); + write_rtl8225(dev, 0xb, 0x7bb); mdelay(1); + write_rtl8225(dev, 0xc, 0x850); mdelay(1); + write_rtl8225(dev, 0xd, 0xcdf); mdelay(1); write_rtl8225(dev, 0xe, 0x2b); mdelay(1); - write_rtl8225(dev, 0xf, 0x114); - mdelay(100); - - //if(priv->card_type != USB) /* maybe not needed even for 8185 */ -// write_rtl8225(dev, 0x7, rtl8225_chan[channel]); - write_rtl8225(dev, 0x0, 0x1b7); - for(i=0;i<95;i++){ - write_rtl8225(dev, 0x1, (u8)(i+1)); - - /* version B & C & D*/ - + for (i = 0; i < 95; i++) { + write_rtl8225(dev, 0x1, (u8)(i + 1)); write_rtl8225(dev, 0x2, rtl8225z2_rxgain[i]); } + write_rtl8225(dev, 0x3, 0x80); write_rtl8225(dev, 0x5, 0x4); @@ -825,160 +681,90 @@ void rtl8225z2_rf_init(struct net_device *dev) write_rtl8225(dev, 0x2, 0xc4d); - if(priv->card_type == USB){ - // force_pci_posting(dev); + if (priv->card_type == USB) { mdelay(200); write_rtl8225(dev, 0x2, 0x44d); - - // force_pci_posting(dev); mdelay(100); + } - }//End of if(priv->card_type == USB) /* FIXME!! rtl8187 we have to check if calibrarion * is successful and eventually cal. again (repeat * the two write on reg 2) - */ - // Check for calibration status, 2005.11.17, - data = read_rtl8225(dev, 6); - if (!(data&0x00000080)) - { - write_rtl8225(dev, 0x02, 0x0c4d); - force_pci_posting(dev); mdelay(200); - write_rtl8225(dev, 0x02, 0x044d); - force_pci_posting(dev); mdelay(100); - data = read_rtl8225(dev, 6); - if (!(data&0x00000080)) - { - DMESGW("RF Calibration Failed!!!!\n"); - } - } - //force_pci_posting(dev); - - mdelay(200); //200 for 8187 - + */ + data = read_rtl8225(dev, 6); + if (!(data & 0x00000080)) { + write_rtl8225(dev, 0x02, 0x0c4d); + force_pci_posting(dev); mdelay(200); + write_rtl8225(dev, 0x02, 0x044d); + force_pci_posting(dev); mdelay(100); + data = read_rtl8225(dev, 6); + if (!(data & 0x00000080)) + DMESGW("RF Calibration Failed!!!!\n"); + } -// //if(priv->card_type != USB){ -// write_rtl8225(dev, 0x2, 0x44d); -// write_rtl8225(dev, 0x7, rtl8225_chan[channel]); -// write_rtl8225(dev, 0x2, 0x47d); -// -// force_pci_posting(dev); -// mdelay(100); -// -// write_rtl8225(dev, 0x2, 0x44d); -// //} + mdelay(200); write_rtl8225(dev, 0x0, 0x2bf); - if(priv->card_type != USB) + if (priv->card_type != USB) rtl8185_rf_pins_enable(dev); - //set up ZEBRA AGC table, 2005.11.17, - for(i=0;i<128;i++){ - data = rtl8225_agc[i]; - addr = i + 0x80; //enable writing AGC table - write_phy_ofdm(dev, 0xb, data); + for (i = 0; i < 128; i++) { + data = rtl8225_agc[i]; - mdelay(1); - write_phy_ofdm(dev, 0xa, addr); + addr = i + 0x80; /* enable writing AGC table */ + write_phy_ofdm(dev, 0xb, data); + mdelay(1); - mdelay(1); - } + write_phy_ofdm(dev, 0xa, addr); + mdelay(1); + } force_pci_posting(dev); mdelay(1); - write_phy_ofdm(dev, 0x0, 0x1); mdelay(1); - write_phy_ofdm(dev, 0x1, 0x2); mdelay(1); - write_phy_ofdm(dev, 0x2, ((priv->card_type == USB)? 0x42 : 0x62)); mdelay(1); - write_phy_ofdm(dev, 0x3, 0x0); mdelay(1); - write_phy_ofdm(dev, 0x4, 0x0); mdelay(1); - write_phy_ofdm(dev, 0x5, 0x0); mdelay(1); - write_phy_ofdm(dev, 0x6, 0x40); mdelay(1); - write_phy_ofdm(dev, 0x7, 0x0); mdelay(1); - write_phy_ofdm(dev, 0x8, 0x40); mdelay(1); - write_phy_ofdm(dev, 0x9, 0xfe); mdelay(1); - - write_phy_ofdm(dev, 0xa, 0x8); mdelay(1); - - //write_phy_ofdm(dev, 0x18, 0xef); - // } - //} - write_phy_ofdm(dev, 0xb, 0x80); mdelay(1); - - write_phy_ofdm(dev, 0xc, 0x1);mdelay(1); - - - //if(priv->card_type != USB) - write_phy_ofdm(dev, 0xd, 0x43); - - write_phy_ofdm(dev, 0xe, 0xd3);mdelay(1); - - - write_phy_ofdm(dev, 0xf, 0x38);mdelay(1); -/*ver D & 8187*/ -// } - -// if(priv->card_8185 == 1 && priv->card_8185_Bversion) -// write_phy_ofdm(dev, 0x10, 0x04);/*ver B*/ -// else - write_phy_ofdm(dev, 0x10, 0x84);mdelay(1); -/*ver C & D & 8187*/ - - write_phy_ofdm(dev, 0x11, 0x07);mdelay(1); -/*agc resp time 700*/ - - -// if(priv->card_8185 == 2){ - /* Ver D & 8187*/ - write_phy_ofdm(dev, 0x12, 0x20);mdelay(1); - - write_phy_ofdm(dev, 0x13, 0x20);mdelay(1); - - write_phy_ofdm(dev, 0x14, 0x0); mdelay(1); + write_phy_ofdm(dev, 0x00, 0x01); mdelay(1); + write_phy_ofdm(dev, 0x01, 0x02); mdelay(1); + write_phy_ofdm(dev, 0x02, ((priv->card_type == USB) ? 0x42 : 0x62)); mdelay(1); + write_phy_ofdm(dev, 0x03, 0x00); mdelay(1); + write_phy_ofdm(dev, 0x04, 0x00); mdelay(1); + write_phy_ofdm(dev, 0x05, 0x00); mdelay(1); + write_phy_ofdm(dev, 0x06, 0x40); mdelay(1); + write_phy_ofdm(dev, 0x07, 0x00); mdelay(1); + write_phy_ofdm(dev, 0x08, 0x40); mdelay(1); + write_phy_ofdm(dev, 0x09, 0xfe); mdelay(1); + write_phy_ofdm(dev, 0x0a, 0x08); mdelay(1); + write_phy_ofdm(dev, 0x0b, 0x80); mdelay(1); + write_phy_ofdm(dev, 0x0c, 0x01); mdelay(1); + write_phy_ofdm(dev, 0x0d, 0x43); + write_phy_ofdm(dev, 0x0e, 0xd3); mdelay(1); + write_phy_ofdm(dev, 0x0f, 0x38); mdelay(1); + write_phy_ofdm(dev, 0x10, 0x84); mdelay(1); + write_phy_ofdm(dev, 0x11, 0x07); mdelay(1); + write_phy_ofdm(dev, 0x12, 0x20); mdelay(1); + write_phy_ofdm(dev, 0x13, 0x20); mdelay(1); + write_phy_ofdm(dev, 0x14, 0x00); mdelay(1); write_phy_ofdm(dev, 0x15, 0x40); mdelay(1); - write_phy_ofdm(dev, 0x16, 0x0); mdelay(1); + write_phy_ofdm(dev, 0x16, 0x00); mdelay(1); write_phy_ofdm(dev, 0x17, 0x40); mdelay(1); - -// if (priv->card_type == USB) -// write_phy_ofdm(dev, 0x18, 0xef); - - write_phy_ofdm(dev, 0x18, 0xef);mdelay(1); - - + write_phy_ofdm(dev, 0x18, 0xef); mdelay(1); write_phy_ofdm(dev, 0x19, 0x19); mdelay(1); write_phy_ofdm(dev, 0x1a, 0x20); mdelay(1); - write_phy_ofdm(dev, 0x1b, 0x15);mdelay(1); - - write_phy_ofdm(dev, 0x1c, 0x4);mdelay(1); - - write_phy_ofdm(dev, 0x1d, 0xc5);mdelay(1); //2005.11.17, - - write_phy_ofdm(dev, 0x1e, 0x95);mdelay(1); - - write_phy_ofdm(dev, 0x1f, 0x75); mdelay(1); - -// } - - write_phy_ofdm(dev, 0x20, 0x1f);mdelay(1); - - write_phy_ofdm(dev, 0x21, 0x17);mdelay(1); - - write_phy_ofdm(dev, 0x22, 0x16);mdelay(1); - -// if(priv->card_type != USB) - write_phy_ofdm(dev, 0x23, 0x80);mdelay(1); //FIXME maybe not needed // <> - + write_phy_ofdm(dev, 0x1b, 0x15); mdelay(1); + write_phy_ofdm(dev, 0x1c, 0x04); mdelay(1); + write_phy_ofdm(dev, 0x1d, 0xc5); mdelay(1); + write_phy_ofdm(dev, 0x1e, 0x95); mdelay(1); + write_phy_ofdm(dev, 0x1f, 0x75); mdelay(1); + write_phy_ofdm(dev, 0x20, 0x1f); mdelay(1); + write_phy_ofdm(dev, 0x21, 0x17); mdelay(1); + write_phy_ofdm(dev, 0x22, 0x16); mdelay(1); + write_phy_ofdm(dev, 0x23, 0x80); mdelay(1); /* FIXME maybe not needed */ write_phy_ofdm(dev, 0x24, 0x46); mdelay(1); write_phy_ofdm(dev, 0x25, 0x00); mdelay(1); write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); - write_phy_ofdm(dev, 0x27, 0x88); mdelay(1); - - // <> Set init. gain to m74dBm. - rtl8225z2_set_gain(dev,4); write_phy_cck(dev, 0x0, 0x98); mdelay(1); @@ -986,90 +772,57 @@ void rtl8225z2_rf_init(struct net_device *dev) write_phy_cck(dev, 0x4, 0x7e); mdelay(1); write_phy_cck(dev, 0x5, 0x12); mdelay(1); write_phy_cck(dev, 0x6, 0xfc); mdelay(1); - - write_phy_cck(dev, 0x7, 0x78);mdelay(1); - /* Ver C & D & 8187*/ - - write_phy_cck(dev, 0x8, 0x2e);mdelay(1); - + write_phy_cck(dev, 0x7, 0x78); mdelay(1); + write_phy_cck(dev, 0x8, 0x2e); mdelay(1); write_phy_cck(dev, 0x10, ((priv->card_type == USB) ? 0x9b: 0x93)); mdelay(1); write_phy_cck(dev, 0x11, 0x88); mdelay(1); write_phy_cck(dev, 0x12, 0x47); mdelay(1); - write_phy_cck(dev, 0x13, 0xd0); /* Ver C & D & 8187*/ - - write_phy_cck(dev, 0x19, 0x0); + write_phy_cck(dev, 0x13, 0xd0); + write_phy_cck(dev, 0x19, 0x00); write_phy_cck(dev, 0x1a, 0xa0); - write_phy_cck(dev, 0x1b, 0x8); + write_phy_cck(dev, 0x1b, 0x08); write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */ - - write_phy_cck(dev, 0x41, 0x8d);mdelay(1); - - + write_phy_cck(dev, 0x41, 0x8d); mdelay(1); write_phy_cck(dev, 0x42, 0x15); mdelay(1); write_phy_cck(dev, 0x43, 0x18); mdelay(1); - - write_phy_cck(dev, 0x44, 0x36); mdelay(1); write_phy_cck(dev, 0x45, 0x35); mdelay(1); write_phy_cck(dev, 0x46, 0x2e); mdelay(1); write_phy_cck(dev, 0x47, 0x25); mdelay(1); write_phy_cck(dev, 0x48, 0x1c); mdelay(1); write_phy_cck(dev, 0x49, 0x12); mdelay(1); - write_phy_cck(dev, 0x4a, 0x9); mdelay(1); - write_phy_cck(dev, 0x4b, 0x4); mdelay(1); - write_phy_cck(dev, 0x4c, 0x5);mdelay(1); - + write_phy_cck(dev, 0x4a, 0x09); mdelay(1); + write_phy_cck(dev, 0x4b, 0x04); mdelay(1); + write_phy_cck(dev, 0x4c, 0x05); mdelay(1); write_nic_byte(dev, 0x5b, 0x0d); mdelay(1); - - -// <> -// // TESTR 0xb 8187 -// write_phy_cck(dev, 0x10, 0x93);// & 0xfb); -// -// //if(priv->card_type != USB){ -// write_phy_ofdm(dev, 0x2, 0x62); -// write_phy_ofdm(dev, 0x6, 0x0); -// write_phy_ofdm(dev, 0x8, 0x0); -// //} - rtl8225z2_SetTXPowerLevel(dev, channel); - write_phy_cck(dev, 0x11, 0x9b); mdelay(1); /* Rx ant A, 0xdb for B */ - write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); /* Rx ant A, 0x10 for B */ - rtl8185_tx_antenna(dev, 0x3); /* TX ant A, 0x0 for B */ + /* RX antenna default to A */ + write_phy_cck(dev, 0x11, 0x9b); mdelay(1); /* B: 0xDB */ + write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); /* B: 0x10 */ + + rtl8185_tx_antenna(dev, 0x03); /* B: 0x00 */ /* switch to high-speed 3-wire * last digit. 2 for both cck and ofdm */ - if(priv->card_type == USB) + if (priv->card_type == USB) write_nic_dword(dev, 0x94, 0x3dc00002); - else{ + else { write_nic_dword(dev, 0x94, 0x15c00002); rtl8185_rf_pins_enable(dev); } -// rtl8225_set_mode(dev, 1); /* FIXME start in B mode */ // <> -// -// /* make sure is waken up! */ -// write_rtl8225(dev,0x4, 0x9ff); -// rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); -// rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON); - rtl8225_rf_set_chan(dev, priv->chan); - - //write_nic_word(dev,BRSR,brsr); - - //rtl8225z2_rf_set_mode(dev); } void rtl8225z2_rf_set_mode(struct net_device *dev) { struct r8180_priv *priv = ieee80211_priv(dev); - if(priv->ieee80211->mode == IEEE_A) - { + if (priv->ieee80211->mode == IEEE_A) { write_rtl8225(dev, 0x5, 0x1865); write_nic_dword(dev, RF_PARA, 0x10084); write_nic_dword(dev, RF_TIMING, 0xa8008); @@ -1085,8 +838,7 @@ void rtl8225z2_rf_set_mode(struct net_device *dev) write_phy_ofdm(dev,0x17, 0x40); write_nic_dword(dev, 0x94,0x10000000); - }else{ - + } else { write_rtl8225(dev, 0x5, 0x1864); write_nic_dword(dev, RF_PARA, 0x10044); write_nic_dword(dev, RF_TIMING, 0xa8008); @@ -1105,46 +857,35 @@ void rtl8225z2_rf_set_mode(struct net_device *dev) } } -//lzm mod 080826 -//#define MAX_DOZE_WAITING_TIMES_85B 64 -//#define MAX_POLLING_24F_TIMES_87SE 5 #define MAX_DOZE_WAITING_TIMES_85B 20 -#define MAX_POLLING_24F_TIMES_87SE 10 +#define MAX_POLLING_24F_TIMES_87SE 10 #define LPS_MAX_SLEEP_WAITING_TIMES_87SE 5 -bool -SetZebraRFPowerState8185( - struct net_device *dev, - RT_RF_POWER_STATE eRFPowerState - ) +bool SetZebraRFPowerState8185(struct net_device *dev, + RT_RF_POWER_STATE eRFPowerState) { struct r8180_priv *priv = ieee80211_priv(dev); u8 btCR9346, btConfig3; - bool bActionAllowed= true, bTurnOffBB = true;//lzm mod 080826 - //u32 DWordContent; + bool bActionAllowed = true, bTurnOffBB = true; u8 u1bTmp; int i; - //u16 u2bTFPC = 0; bool bResult = true; u8 QueueID; - if(priv->SetRFPowerStateInProgress == true) + if (priv->SetRFPowerStateInProgress == true) return false; priv->SetRFPowerStateInProgress = true; - // enable EEM0 and EEM1 in 9346CR btCR9346 = read_nic_byte(dev, CR9346); - write_nic_byte(dev, CR9346, (btCR9346|0xC0) ); - // enable PARM_En in Config3 + write_nic_byte(dev, CR9346, (btCR9346 | 0xC0)); + btConfig3 = read_nic_byte(dev, CONFIG3); - write_nic_byte(dev, CONFIG3, (btConfig3|CONFIG3_PARM_En) ); + write_nic_byte(dev, CONFIG3, (btConfig3 | CONFIG3_PARM_En)); - switch( priv->rf_chip ) - { + switch (priv->rf_chip) { case RF_ZEBRA2: - switch( eRFPowerState ) - { + switch (eRFPowerState) { case eRfOn: RF_WriteReg(dev,0x4,0x9FF); @@ -1153,233 +894,168 @@ SetZebraRFPowerState8185( write_nic_byte(dev, CONFIG4, priv->RFProgType); - //Follow 87B, Isaiah 2007-04-27 + /* turn on CCK and OFDM */ u1bTmp = read_nic_byte(dev, 0x24E); - write_nic_byte(dev, 0x24E, (u1bTmp & (~(BIT5|BIT6))) );// 070124 SD1 Alex: turn on CCK and OFDM. + write_nic_byte(dev, 0x24E, (u1bTmp & (~(BIT5 | BIT6)))); break; - case eRfSleep: break; - case eRfOff: break; - default: bResult = false; break; } break; - case RF_ZEBRA4: - switch( eRFPowerState ) - { + switch (eRFPowerState) { case eRfOn: - //printk("===================================power on@jiffies:%d\n",jiffies); write_nic_word(dev, 0x37C, 0x00EC); - //turn on AFE + /* turn on AFE */ write_nic_byte(dev, 0x54, 0x00); write_nic_byte(dev, 0x62, 0x00); - //lzm mod 080826 - //turn on RF - //RF_WriteReg(dev, 0x0, 0x009f); //mdelay(1); - //RF_WriteReg(dev, 0x4, 0x0972); //mdelay(1); + /* turn on RF */ RF_WriteReg(dev, 0x0, 0x009f); udelay(500); RF_WriteReg(dev, 0x4, 0x0972); udelay(500); - //turn on RF again, suggested by SD3 stevenl. + + /* turn on RF again */ RF_WriteReg(dev, 0x0, 0x009f); udelay(500); RF_WriteReg(dev, 0x4, 0x0972); udelay(500); - //turn on BB -// write_nic_dword(dev, PhyAddr, 0x4090); //ofdm 10=00 -// write_nic_dword(dev, PhyAddr, 0x4092); //ofdm 12=00 + /* turn on BB */ write_phy_ofdm(dev,0x10,0x40); write_phy_ofdm(dev,0x12,0x40); - //Avoid power down at init time. + + /* Avoid power down at init time. */ write_nic_byte(dev, CONFIG4, priv->RFProgType); u1bTmp = read_nic_byte(dev, 0x24E); - write_nic_byte(dev, 0x24E, (u1bTmp & (~(BIT5|BIT6))) ); - + write_nic_byte(dev, 0x24E, (u1bTmp & (~(BIT5 | BIT6)))); break; - case eRfSleep: - // Make sure BusyQueue is empty befor turn off RFE pwoer. - //printk("===================================power sleep@jiffies:%d\n",jiffies); - - for(QueueID = 0, i = 0; QueueID < 6; ) - { - if(get_curr_tx_free_desc(dev,QueueID) == priv->txringcount) - { + for (QueueID = 0, i = 0; QueueID < 6;) { + if (get_curr_tx_free_desc(dev, QueueID) == priv->txringcount) { QueueID++; continue; - } - else//lzm mod 080826 - { + } else { priv->TxPollingTimes ++; - if(priv->TxPollingTimes >= LPS_MAX_SLEEP_WAITING_TIMES_87SE) - { - //RT_TRACE(COMP_POWER, DBG_WARNING, ("\n\n\n SetZebraRFPowerState8185B():eRfSleep: %d times TcbBusyQueue[%d] != 0 !!!\n\n\n", LPS_MAX_SLEEP_WAITING_TIMES_87SE, QueueID)); - bActionAllowed=false; - break; - } - else - { - udelay(10); // Windows may delay 3~16ms actually. - //RT_TRACE(COMP_POWER, DBG_LOUD, ("eRfSleep: %d times TcbBusyQueue[%d] !=0 before doze!\n", (pMgntInfo->TxPollingTimes), QueueID)); - } + if (priv->TxPollingTimes >= LPS_MAX_SLEEP_WAITING_TIMES_87SE) { + bActionAllowed = false; + break; + } else + udelay(10); } - - //lzm del 080826 - //if(i >= MAX_DOZE_WAITING_TIMES_85B) - //{ - //printk("\n\n\n SetZebraRFPowerState8185B(): %d times BusyQueue[%d] != 0 !!!\n\n\n", MAX_DOZE_WAITING_TIMES_85B, QueueID); - //break; - //} } - if(bActionAllowed)//lzm add 080826 - { - //turn off BB RXIQ matrix to cut off rx signal -// write_nic_dword(dev, PhyAddr, 0x0090); //ofdm 10=00 -// write_nic_dword(dev, PhyAddr, 0x0092); //ofdm 12=00 - write_phy_ofdm(dev,0x10,0x00); - write_phy_ofdm(dev,0x12,0x00); - //turn off RF - RF_WriteReg(dev, 0x4, 0x0000); //mdelay(1); - RF_WriteReg(dev, 0x0, 0x0000); //mdelay(1); - //turn off AFE except PLL + if (bActionAllowed) { + /* turn off BB RXIQ matrix to cut off rx signal */ + write_phy_ofdm(dev, 0x10, 0x00); + write_phy_ofdm(dev, 0x12, 0x00); + + /* turn off RF */ + RF_WriteReg(dev, 0x4, 0x0000); + RF_WriteReg(dev, 0x0, 0x0000); + + /* turn off AFE except PLL */ write_nic_byte(dev, 0x62, 0xff); write_nic_byte(dev, 0x54, 0xec); -// mdelay(10); -#if 1 mdelay(1); + { int i = 0; - while (true) - { + while (true) { u8 tmp24F = read_nic_byte(dev, 0x24f); - if ((tmp24F == 0x01) || (tmp24F == 0x09)) - { + + if ((tmp24F == 0x01) || (tmp24F == 0x09)) { bTurnOffBB = true; break; - } - else//lzm mod 080826 - { + } else { udelay(10); i++; priv->TxPollingTimes++; - if(priv->TxPollingTimes >= LPS_MAX_SLEEP_WAITING_TIMES_87SE) - { - //RT_TRACE(COMP_POWER, DBG_WARNING, ("\n\n\n SetZebraRFPowerState8185B(): eRfOff: %d times Rx Mac0x24F=0x%x !!!\n\n\n", i, u1bTmp24F)); - bTurnOffBB=false; + if (priv->TxPollingTimes >= LPS_MAX_SLEEP_WAITING_TIMES_87SE) { + bTurnOffBB = false; break; - } - else - { - udelay(10);// Windows may delay 3~16ms actually. - //RT_TRACE(COMP_POWER, DBG_LOUD,("(%d)eRfSleep- u1bTmp24F= 0x%X\n", i, u1bTmp24F)); - - } + } else + udelay(10); } - - //lzm del 080826 - //if (i > MAX_POLLING_24F_TIMES_87SE) - // break; } } -#endif - if (bTurnOffBB)//lzm mod 080826 - { - //turn off BB - u1bTmp = read_nic_byte(dev, 0x24E); - write_nic_byte(dev, 0x24E, (u1bTmp|BIT5|BIT6)); - //turn off AFE PLL - //write_nic_byte(dev, 0x54, 0xec); - //write_nic_word(dev, 0x37C, 0x00ec); - write_nic_byte(dev, 0x54, 0xFC); //[ECS] FC-> EC->FC, asked by SD3 Stevenl - write_nic_word(dev, 0x37C, 0x00FC);//[ECS] FC-> EC->FC, asked by SD3 Stevenl + if (bTurnOffBB) { + /* turn off BB */ + u1bTmp = read_nic_byte(dev, 0x24E); + write_nic_byte(dev, 0x24E, (u1bTmp | BIT5 | BIT6)); + + /* turn off AFE PLL */ + write_nic_byte(dev, 0x54, 0xFC); + write_nic_word(dev, 0x37C, 0x00FC); } } break; - case eRfOff: - // Make sure BusyQueue is empty befor turn off RFE pwoer. - //printk("===================================power off@jiffies:%d\n",jiffies); - for(QueueID = 0, i = 0; QueueID < 6; ) - { - if(get_curr_tx_free_desc(dev,QueueID) == priv->txringcount) - { + for (QueueID = 0, i = 0; QueueID < 6;) { + if (get_curr_tx_free_desc(dev, QueueID) == priv->txringcount) { QueueID++; continue; - } - else - { + } else { udelay(10); i++; } - if(i >= MAX_DOZE_WAITING_TIMES_85B) - { - //printk("\n\n\n SetZebraRFPowerState8185B(): %d times BusyQueue[%d] != 0 !!!\n\n\n", MAX_DOZE_WAITING_TIMES_85B, QueueID); + if (i >= MAX_DOZE_WAITING_TIMES_85B) break; - } } - //turn off BB RXIQ matrix to cut off rx signal -// write_nic_dword(dev, PhyAddr, 0x0090); //ofdm 10=00 -// write_nic_dword(dev, PhyAddr, 0x0092); //ofdm 12=00 - write_phy_ofdm(dev,0x10,0x00); - write_phy_ofdm(dev,0x12,0x00); - //turn off RF - RF_WriteReg(dev, 0x4, 0x0000); //mdelay(1); - RF_WriteReg(dev, 0x0, 0x0000); //mdelay(1); - //turn off AFE except PLL + /* turn off BB RXIQ matrix to cut off rx signal */ + write_phy_ofdm(dev, 0x10, 0x00); + write_phy_ofdm(dev, 0x12, 0x00); + + /* turn off RF */ + RF_WriteReg(dev, 0x4, 0x0000); + RF_WriteReg(dev, 0x0, 0x0000); + + /* turn off AFE except PLL */ write_nic_byte(dev, 0x62, 0xff); write_nic_byte(dev, 0x54, 0xec); -// mdelay(10); -#if 1 + mdelay(1); + { int i = 0; + while (true) { u8 tmp24F = read_nic_byte(dev, 0x24f); - if ((tmp24F == 0x01) || (tmp24F == 0x09)) - { + + if ((tmp24F == 0x01) || (tmp24F == 0x09)) { bTurnOffBB = true; break; - } - else - { + } else { bTurnOffBB = false; udelay(10); i++; } + if (i > MAX_POLLING_24F_TIMES_87SE) break; } } -#endif - if (bTurnOffBB)//lzm mod 080826 - { - //turn off BB - u1bTmp = read_nic_byte(dev, 0x24E); - write_nic_byte(dev, 0x24E, (u1bTmp|BIT5|BIT6)); - //turn off AFE PLL (80M) - //write_nic_byte(dev, 0x54, 0xec); - //write_nic_word(dev, 0x37C, 0x00ec); - write_nic_byte(dev, 0x54, 0xFC); //[ECS] FC-> EC->FC, asked by SD3 Stevenl - write_nic_word(dev, 0x37C, 0x00FC); //[ECS] FC-> EC->FC, asked by SD3 Stevenl - } + if (bTurnOffBB) { + /* turn off BB */ + u1bTmp = read_nic_byte(dev, 0x24E); + write_nic_byte(dev, 0x24E, (u1bTmp | BIT5 | BIT6)); + /* turn off AFE PLL (80M) */ + write_nic_byte(dev, 0x54, 0xFC); + write_nic_word(dev, 0x37C, 0x00FC); + } break; - default: bResult = false; printk("SetZebraRFPowerState8185(): unknow state to set: 0x%X!!!\n", eRFPowerState); @@ -1388,38 +1064,26 @@ SetZebraRFPowerState8185( break; } - // disable PARM_En in Config3 btConfig3 &= ~(CONFIG3_PARM_En); write_nic_byte(dev, CONFIG3, btConfig3); - // disable EEM0 and EEM1 in 9346CR + btCR9346 &= ~(0xC0); write_nic_byte(dev, CR9346, btCR9346); - if(bResult && bActionAllowed)//lzm mod 080826 - { - // Update current RF state variable. + if (bResult && bActionAllowed) priv->eRFPowerState = eRFPowerState; - } priv->SetRFPowerStateInProgress = false; - return (bResult && bActionAllowed) ; + return bResult && bActionAllowed; } + void rtl8225z4_rf_sleep(struct net_device *dev) { - // - // Turn off RF power. - // - //printk("=========>%s()\n", __func__); MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); - //mdelay(2); //FIXME } + void rtl8225z4_rf_wakeup(struct net_device *dev) { - // - // Turn on RF power. - // - //printk("=========>%s()\n", __func__); MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); } - -- 2.39.5