lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8192su: some work on SetBWModeCallback8192SUsbWorkItem

Browse Source 
mostly cosmetics.

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Florian Schilhabel
2010-03-18 15:18:34 +01:00
committed by Greg Kroah-Hartman
parent 8e399b0332
commit df35bf66ee
1 changed files with 80 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
drivers/staging/rtl8192su/r8192S_phy.c
View File

@@ -3607,128 +3607,103 @@ void SetBWModeCallback8192SUsb(struct net_device *dev)
RT_TRACE(COMP_SCAN, "<==SetBWMode8190Pci()" ); RT_TRACE(COMP_SCAN, "<==SetBWMode8190Pci()" );
} }
// /*
// Callback routine of the work item for set bandwidth mode. * Callback routine of the work item for set bandwidth mode.
// *
// use in phy only (in win it's work) * use in phy only (in win it's work)
*/
void SetBWModeCallback8192SUsbWorkItem(struct net_device *dev) void SetBWModeCallback8192SUsbWorkItem(struct net_device *dev)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
u8 regBwOpMode; u8 regBwOpMode;
u8 regRRSR_RSC;
// Added it for 20/40 mhz switch time evaluation by guangan 070531 RT_TRACE(COMP_SCAN, "%s(): Switch to %s bandwidth", __func__,
//u32 NowL, NowH; priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 ? "20MHz" : "40MHz");
//u8Byte BeginTime, EndTime;
u8 regRRSR_RSC;
RT_TRACE(COMP_SCAN, "==>SetBWModeCallback8192SUsbWorkItem() Switch to %s bandwidth\n", \ if (priv->rf_chip == RF_PSEUDO_11N) {
priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20?"20MHz":"40MHz");
if(priv->rf_chip == RF_PSEUDO_11N)
{
priv->SetBWModeInProgress= FALSE; priv->SetBWModeInProgress= FALSE;
return; return;
} }
if(!priv->up) if(!priv->up)
return; return;
/* Set MAC register */
// Added it for 20/40 mhz switch time evaluation by guangan 070531
//NowL = read_nic_dword(dev, TSFR);
//NowH = read_nic_dword(dev, TSFR+4);
//BeginTime = ((u8Byte)NowH << 32) + NowL;
//3<1>Set MAC register
regBwOpMode = read_nic_byte(dev, BW_OPMODE); regBwOpMode = read_nic_byte(dev, BW_OPMODE);
regRRSR_RSC = read_nic_byte(dev, RRSR+2); regRRSR_RSC = read_nic_byte(dev, RRSR+2);
switch (priv->CurrentChannelBW) {
switch(priv->CurrentChannelBW) case HT_CHANNEL_WIDTH_20:
{ regBwOpMode |= BW_OPMODE_20MHZ;
case HT_CHANNEL_WIDTH_20: /* we have not verified whether this register works */
regBwOpMode |= BW_OPMODE_20MHZ; write_nic_byte(dev, BW_OPMODE, regBwOpMode);
// 2007/02/07 Mark by Emily becasue we have not verify whether this register works break;
write_nic_byte(dev, BW_OPMODE, regBwOpMode); case HT_CHANNEL_WIDTH_20_40:
break; regBwOpMode &= ~BW_OPMODE_20MHZ;
/* we have not verified whether this register works */
case HT_CHANNEL_WIDTH_20_40: write_nic_byte(dev, BW_OPMODE, regBwOpMode);
regBwOpMode &= ~BW_OPMODE_20MHZ; regRRSR_RSC = (regRRSR_RSC&0x90) | (priv->nCur40MhzPrimeSC<<5);
// 2007/02/07 Mark by Emily becasue we have not verify whether this register works write_nic_byte(dev, RRSR+2, regRRSR_RSC);
write_nic_byte(dev, BW_OPMODE, regBwOpMode); break;
regRRSR_RSC = (regRRSR_RSC&0x90) |(priv->nCur40MhzPrimeSC<<5); default:
write_nic_byte(dev, RRSR+2, regRRSR_RSC); RT_TRACE(COMP_DBG, "%s(): unknown Bandwidth: %#X", __func__,
priv->CurrentChannelBW);
break; break;
default:
RT_TRACE(COMP_DBG, "SetBWModeCallback8192SUsbWorkItem(): unknown Bandwidth: %#X\n",
priv->CurrentChannelBW);
break;
} }
/* Set PHY related register */
//3 <2>Set PHY related register switch (priv->CurrentChannelBW) {
switch(priv->CurrentChannelBW) case HT_CHANNEL_WIDTH_20:
{ rtl8192_setBBreg(dev, rFPGA0_RFMOD, bRFMOD, 0x0);
case HT_CHANNEL_WIDTH_20: rtl8192_setBBreg(dev, rFPGA1_RFMOD, bRFMOD, 0x0);
rtl8192_setBBreg(dev, rFPGA0_RFMOD, bRFMOD, 0x0); rtl8192_setBBreg(dev, rFPGA0_AnalogParameter2, 0xff, 0x58);
rtl8192_setBBreg(dev, rFPGA1_RFMOD, bRFMOD, 0x0); break;
case HT_CHANNEL_WIDTH_20_40:
rtl8192_setBBreg(dev, rFPGA0_AnalogParameter2, 0xff, 0x58); rtl8192_setBBreg(dev, rFPGA0_RFMOD, bRFMOD, 0x1);
rtl8192_setBBreg(dev, rFPGA1_RFMOD, bRFMOD, 0x1);
break; /*
case HT_CHANNEL_WIDTH_20_40: * Set Control channel to upper or lower.
rtl8192_setBBreg(dev, rFPGA0_RFMOD, bRFMOD, 0x1); * These settings are required only for 40MHz
rtl8192_setBBreg(dev, rFPGA1_RFMOD, bRFMOD, 0x1); */
rtl8192_setBBreg(dev, rCCK0_System, bCCKSideBand,
// Set Control channel to upper or lower. These settings are required only for 40MHz (priv->nCur40MhzPrimeSC>>1));
rtl8192_setBBreg(dev, rCCK0_System, bCCKSideBand, (priv->nCur40MhzPrimeSC>>1)); rtl8192_setBBreg(dev, rOFDM1_LSTF, 0xC00,
rtl8192_setBBreg(dev, rOFDM1_LSTF, 0xC00, priv->nCur40MhzPrimeSC); priv->nCur40MhzPrimeSC);
rtl8192_setBBreg(dev, rFPGA0_AnalogParameter2, 0xff, 0x18);
rtl8192_setBBreg(dev, rFPGA0_AnalogParameter2, 0xff, 0x18); break;
default:
break; RT_TRACE(COMP_DBG, "%s(): unknown Bandwidth: %#X", __func__,
priv->CurrentChannelBW);
break;
default:
RT_TRACE(COMP_DBG, "SetBWModeCallback8192SUsbWorkItem(): unknown Bandwidth: %#X\n"\
,priv->CurrentChannelBW);
break;
} }
//Skip over setting of J-mode in BB register here. Default value is "None J mode". Emily 20070315 /*
* Skip over setting of J-mode in BB register here.
* Default value is "None J mode".
*/
//3<3>Set RF related register /* Set RF related register */
switch( priv->rf_chip ) switch (priv->rf_chip) {
{ case RF_8225:
case RF_8225: PHY_SetRF8225Bandwidth(dev, priv->CurrentChannelBW);
PHY_SetRF8225Bandwidth(dev, priv->CurrentChannelBW); break;
break; case RF_8256:
/* Please implement this function in Hal8190PciPhy8256.c */
case RF_8256: /* PHY_SetRF8256Bandwidth(dev, priv->CurrentChannelBW); */
// Please implement this function in Hal8190PciPhy8256.c break;
//PHY_SetRF8256Bandwidth(dev, priv->CurrentChannelBW); case RF_6052:
break; PHY_RF6052SetBandwidth(dev, priv->CurrentChannelBW);
break;
case RF_6052: case RF_8258:
PHY_RF6052SetBandwidth(dev, priv->CurrentChannelBW); /* Please implement this function in Hal8190PciPhy8258.c */
break; /* PHY_SetRF8258Bandwidth(); */
break;
case RF_8258: case RF_PSEUDO_11N:
// Please implement this function in Hal8190PciPhy8258.c /* Do Nothing */
// PHY_SetRF8258Bandwidth(); break;
break; default:
RT_TRACE(COMP_DBG, "%s(): unknown rf_chip: %d", __func__,
case RF_PSEUDO_11N: priv->rf_chip);
// Do Nothing break;
break;
default:
//RT_ASSERT(FALSE, ("Unknown rf_chip: %d\n", priv->rf_chip));
break;
} }
priv->SetBWModeInProgress= FALSE; priv->SetBWModeInProgress= FALSE;
RT_TRACE(COMP_SCAN, "<==SetBWModeCallback8192SUsbWorkItem()" );
} }
//--------------------------Move to oter DIR later-------------------------------*/ //--------------------------Move to oter DIR later-------------------------------*/