aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/rtl8187se/r8180_dm.c418
1 files changed, 209 insertions, 209 deletions
diff --git a/drivers/staging/rtl8187se/r8180_dm.c b/drivers/staging/rtl8187se/r8180_dm.c
index 97e4fefe8422..bd2cf4acb578 100644
--- a/drivers/staging/rtl8187se/r8180_dm.c
+++ b/drivers/staging/rtl8187se/r8180_dm.c
@@ -75,12 +75,12 @@ DoTxHighPower(
75 75
76 // If it never enter High Power. 76 // If it never enter High Power.
77 if( CckTxPwrIdx == u1bTmp) { 77 if( CckTxPwrIdx == u1bTmp) {
78 u1bTmp = (u1bTmp > 16) ? (u1bTmp -16): 0; // 8dbm 78 u1bTmp = (u1bTmp > 16) ? (u1bTmp -16): 0; // 8dbm
79 write_nic_byte(dev, CCK_TXAGC, u1bTmp); 79 write_nic_byte(dev, CCK_TXAGC, u1bTmp);
80 80
81 u1bTmp= read_nic_byte(dev, OFDM_TXAGC); 81 u1bTmp= read_nic_byte(dev, OFDM_TXAGC);
82 u1bTmp = (u1bTmp > 16) ? (u1bTmp -16): 0; // 8dbm 82 u1bTmp = (u1bTmp > 16) ? (u1bTmp -16): 0; // 8dbm
83 write_nic_byte(dev, OFDM_TXAGC, u1bTmp); 83 write_nic_byte(dev, OFDM_TXAGC, u1bTmp);
84 } 84 }
85 85
86 } else if((priv->UndecoratedSmoothedSS < HiPwrLowerTh) && 86 } else if((priv->UndecoratedSmoothedSS < HiPwrLowerTh) &&
@@ -91,16 +91,16 @@ DoTxHighPower(
91 //SD3 required. 91 //SD3 required.
92 u1bTmp= read_nic_byte(dev, CCK_TXAGC); 92 u1bTmp= read_nic_byte(dev, CCK_TXAGC);
93 if(u1bTmp < CckTxPwrIdx) { 93 if(u1bTmp < CckTxPwrIdx) {
94 //u1bTmp = ((u1bTmp+16) > 35) ? 35: (u1bTmp+16); // 8dbm 94 //u1bTmp = ((u1bTmp+16) > 35) ? 35: (u1bTmp+16); // 8dbm
95 //write_nic_byte(dev, CCK_TXAGC, u1bTmp); 95 //write_nic_byte(dev, CCK_TXAGC, u1bTmp);
96 write_nic_byte(dev, CCK_TXAGC, CckTxPwrIdx); 96 write_nic_byte(dev, CCK_TXAGC, CckTxPwrIdx);
97 } 97 }
98 98
99 u1bTmp= read_nic_byte(dev, OFDM_TXAGC); 99 u1bTmp= read_nic_byte(dev, OFDM_TXAGC);
100 if(u1bTmp < OfdmTxPwrIdx) { 100 if(u1bTmp < OfdmTxPwrIdx) {
101 //u1bTmp = ((u1bTmp+16) > 35) ? 35: (u1bTmp+16); // 8dbm 101 //u1bTmp = ((u1bTmp+16) > 35) ? 35: (u1bTmp+16); // 8dbm
102 //write_nic_byte(dev, OFDM_TXAGC, u1bTmp); 102 //write_nic_byte(dev, OFDM_TXAGC, u1bTmp);
103 write_nic_byte(dev, OFDM_TXAGC, OfdmTxPwrIdx); 103 write_nic_byte(dev, OFDM_TXAGC, OfdmTxPwrIdx);
104 } 104 }
105 } 105 }
106 } 106 }
@@ -121,8 +121,8 @@ void rtl8180_tx_pw_wq (struct work_struct *work)
121// struct ieee80211_device * ieee = (struct ieee80211_device*) 121// struct ieee80211_device * ieee = (struct ieee80211_device*)
122// container_of(work, struct ieee80211_device, watch_dog_wq); 122// container_of(work, struct ieee80211_device, watch_dog_wq);
123 struct delayed_work *dwork = to_delayed_work(work); 123 struct delayed_work *dwork = to_delayed_work(work);
124 struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq); 124 struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq);
125 struct net_device *dev = ieee->dev; 125 struct net_device *dev = ieee->dev;
126 126
127// printk("----> UpdateTxPowerWorkItemCallback()\n"); 127// printk("----> UpdateTxPowerWorkItemCallback()\n");
128 128
@@ -181,7 +181,7 @@ DIG_Zebra(
181// printk("DIG**********CCK False Alarm: %#X \n",CCKFalseAlarm); 181// printk("DIG**********CCK False Alarm: %#X \n",CCKFalseAlarm);
182// printk("DIG**********OFDM False Alarm: %#X \n",OFDMFalseAlarm); 182// printk("DIG**********OFDM False Alarm: %#X \n",OFDMFalseAlarm);
183 183
184 // The number of initial gain steps is different, by Bruce, 2007-04-13. 184 // The number of initial gain steps is different, by Bruce, 2007-04-13.
185 if (priv->InitialGain == 0 ) { //autoDIG 185 if (priv->InitialGain == 0 ) { //autoDIG
186 // Advised from SD3 DZ 186 // Advised from SD3 DZ
187 priv->InitialGain = 4; // In 87B, m74dBm means State 4 (m82dBm) 187 priv->InitialGain = 4; // In 87B, m74dBm means State 4 (m82dBm)
@@ -265,8 +265,8 @@ DynamicInitGain(struct net_device *dev)
265void rtl8180_hw_dig_wq (struct work_struct *work) 265void rtl8180_hw_dig_wq (struct work_struct *work)
266{ 266{
267 struct delayed_work *dwork = to_delayed_work(work); 267 struct delayed_work *dwork = to_delayed_work(work);
268 struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq); 268 struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq);
269 struct net_device *dev = ieee->dev; 269 struct net_device *dev = ieee->dev;
270 struct r8180_priv *priv = ieee80211_priv(dev); 270 struct r8180_priv *priv = ieee80211_priv(dev);
271 271
272 // Read CCK and OFDM False Alarm. 272 // Read CCK and OFDM False Alarm.
@@ -280,33 +280,33 @@ void rtl8180_hw_dig_wq (struct work_struct *work)
280 280
281int 281int
282IncludedInSupportedRates( 282IncludedInSupportedRates(
283 struct r8180_priv *priv, 283 struct r8180_priv *priv,
284 u8 TxRate ) 284 u8 TxRate )
285{ 285{
286 u8 rate_len; 286 u8 rate_len;
287 u8 rate_ex_len; 287 u8 rate_ex_len;
288 u8 RateMask = 0x7F; 288 u8 RateMask = 0x7F;
289 u8 idx; 289 u8 idx;
290 unsigned short Found = 0; 290 unsigned short Found = 0;
291 u8 NaiveTxRate = TxRate&RateMask; 291 u8 NaiveTxRate = TxRate&RateMask;
292 292
293 rate_len = priv->ieee80211->current_network.rates_len; 293 rate_len = priv->ieee80211->current_network.rates_len;
294 rate_ex_len = priv->ieee80211->current_network.rates_ex_len; 294 rate_ex_len = priv->ieee80211->current_network.rates_ex_len;
295 for( idx=0; idx< rate_len; idx++ ) { 295 for( idx=0; idx< rate_len; idx++ ) {
296 if( (priv->ieee80211->current_network.rates[idx] & RateMask) == NaiveTxRate ) { 296 if( (priv->ieee80211->current_network.rates[idx] & RateMask) == NaiveTxRate ) {
297 Found = 1; 297 Found = 1;
298 goto found_rate; 298 goto found_rate;
299 } 299 }
300 } 300 }
301 for( idx=0; idx< rate_ex_len; idx++ ) { 301 for( idx=0; idx< rate_ex_len; idx++ ) {
302 if( (priv->ieee80211->current_network.rates_ex[idx] & RateMask) == NaiveTxRate ) { 302 if( (priv->ieee80211->current_network.rates_ex[idx] & RateMask) == NaiveTxRate ) {
303 Found = 1; 303 Found = 1;
304 goto found_rate; 304 goto found_rate;
305 } 305 }
306 } 306 }
307 return Found; 307 return Found;
308 found_rate: 308 found_rate:
309 return Found; 309 return Found;
310} 310}
311 311
312// 312//
@@ -317,64 +317,64 @@ IncludedInSupportedRates(
317// 317//
318u8 318u8
319GetUpgradeTxRate( 319GetUpgradeTxRate(
320 struct net_device *dev, 320 struct net_device *dev,
321 u8 rate 321 u8 rate
322 ) 322 )
323{ 323{
324 struct r8180_priv *priv = ieee80211_priv(dev); 324 struct r8180_priv *priv = ieee80211_priv(dev);
325 u8 UpRate; 325 u8 UpRate;
326 326
327 // Upgrade 1 degree. 327 // Upgrade 1 degree.
328 switch(rate) { 328 switch(rate) {
329 case 108: // Up to 54Mbps. 329 case 108: // Up to 54Mbps.
330 UpRate = 108; 330 UpRate = 108;
331 break; 331 break;
332 332
333 case 96: // Up to 54Mbps. 333 case 96: // Up to 54Mbps.
334 UpRate = 108; 334 UpRate = 108;
335 break; 335 break;
336 336
337 case 72: // Up to 48Mbps. 337 case 72: // Up to 48Mbps.
338 UpRate = 96; 338 UpRate = 96;
339 break; 339 break;
340 340
341 case 48: // Up to 36Mbps. 341 case 48: // Up to 36Mbps.
342 UpRate = 72; 342 UpRate = 72;
343 break; 343 break;
344 344
345 case 36: // Up to 24Mbps. 345 case 36: // Up to 24Mbps.
346 UpRate = 48; 346 UpRate = 48;
347 break; 347 break;
348 348
349 case 22: // Up to 18Mbps. 349 case 22: // Up to 18Mbps.
350</