Staging: rtl8187se: remove ENABLE_DOT11D ifdefs
PATCH 1/18 Staging: rtl8187se: remove ENABLE_DOT11D ifdefs
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove ENABLE_DOT11D ifdefs
---
on top of http://patchwork.kernel.org/patch/30083/
drivers/staging/rtl8187se/Makefile | 3 drivers/staging/rtl8187se/ieee80211/dot11d.c | 2 drivers/staging/rtl8187se/ieee80211/ieee80211.h | 10 -- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 12 --- drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 62 ---------------- drivers/staging/rtl8187se/r8180_core.c | 20 ----- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 6 - drivers/staging/rtl8187se/r8180_wx.c | 14 --- drivers/staging/rtl8187se/r8185b_init.c | 4 - 9 files changed, 133 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -3
@@ -17,9 +17,6 @@ EXTRA_CFLAGS += -DSW_DIG EXTRA_CFLAGS += -DRATE_ADAPT EXTRA_CFLAGS += -DCONFIG_RTL8180_PM -#+YJ,080626 -EXTRA_CFLAGS += -DENABLE_DOT11D - #enable it for legacy power save, disable it for leisure power save EXTRA_CFLAGS += -DENABLE_LPS
drivers/staging/rtl8187se/ieee80211/dot11d.c +0 -2
@@ -1,4 +1,3 @@ -#ifdef ENABLE_DOT11D //----------------------------------------------------------------------------- // File: // Dot11d.c
@@ -233,4 +232,3 @@ EXPORT_SYMBOL(DOT11D_ScanComplete);EXPORT_SYMBOL (IsLegalChannel);EXPORT_SYMBOL (ToLegalChannel);#endif -#endif
drivers/staging/rtl8187se/ieee80211/ieee80211.h +0 -10
@@ -694,7 +694,6 @@ struct ieee80211_header_data {#define MFIE_TYPE_RATES_EX 50#define MFIE_TYPE_GENERIC 221 -#ifdef ENABLE_DOT11D typedef enum { COUNTRY_CODE_FCC = 0,
@@ -709,7 +708,6 @@ typedef enumCOUNTRY_CODE_GLOBAL_DOMAIN =9 , COUNTRY_CODE_WORLD_WIDE_13_INDEX = 10 }country_code_type_t; -#endif struct ieee80211_info_element_hdr {u8 id;
@@ -961,10 +959,8 @@ struct ieee80211_network {#ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas #endif -#ifdef ENABLE_DOT11D u16 CountryIeLen;u8 CountryIeBuf[MAX_IE_LEN ]; -#endif };enum ieee80211_state {
@@ -1105,18 +1101,12 @@ struct ieee80211_device {*/ short sync_scan_hurryup; -#ifdef ENABLE_DOT11D void * pDot11dInfo;bool bGlobalDomain;// For Liteon Ch12~13 passive scan u8 MinPassiveChnlNum;u8 IbssStartChnl; -#else -/* map of allowed channels. 0 is dummy */ -// FIXME: remeber to default to a basic channel plan depending of the PHY type -int channel_map[MAX_CHANNEL_NUMBER +1 ]; -#endif int rate;/* current rate */ int basic_rate;
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +0 -12
@@ -44,9 +44,7 @@#include <linux/ctype.h> #include "ieee80211.h" -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif static inline void ieee80211_monitor_rx (struct ieee80211_device *ieee,struct sk_buff *skb,struct ieee80211_rx_stats *rx_stats)
@@ -1072,7 +1070,6 @@ static inline int ieee80211_SignalStrengreturn RetSS; } -#ifdef ENABLE_DOT11D static inline void ieee80211_extract_country_ie( struct ieee80211_device *ieee, struct ieee80211_info_element *info_element,
@@ -1114,7 +1111,6 @@ static inline void ieee80211_extract_cou } } -#endif int ieee80211_TranslateToDbm(
@@ -1166,10 +1162,8 @@ inline int ieee80211_network_init(#ifdef THOMAS_TURBO network->Turbo_Enable =0 ;#endif -#ifdef ENABLE_DOT11D network->CountryIeLen =0 ;memset (network->CountryIeBuf,0 ,MAX_IE_LEN ); -#endif if (stats->freq ==IEEE80211_52GHZ_BAND ) {/* for A band (No DS info) */
@@ -1394,14 +1388,12 @@ inline int ieee80211_network_init(memcpy (network->rsn_ie, info_element, network->rsn_ie_len);break ; -#ifdef ENABLE_DOT11D case MFIE_TYPE_COUNTRY :IEEE80211_DEBUG_SCAN ("MFIE_TYPE_COUNTRY: %d bytes\n" , info_element->len);// printk("=====>Receive <%s> Country IE\n",network->ssid); ieee80211_extract_country_ie (ieee, info_element, network, beacon->header.addr2);break ; -#endif default :IEEE80211_DEBUG_SCAN ("unsupported IE %d\n" , info_element->id);
@@ -1552,10 +1544,8 @@ inline void update_network(struct ieee80#ifdef THOMAS_TURBO dst->Turbo_Enable = src->Turbo_Enable;#endif -#ifdef ENABLE_DOT11D dst->CountryIeLen = src->CountryIeLen;memcpy (dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); -#endif }
@@ -1623,7 +1613,6 @@ inline void ieee80211_process_probe_respreturn ; } -#ifdef ENABLE_DOT11D // For Asus EeePc request, // (1) if wireless adapter receive get any 802.11d country code in AP beacon, // wireless adapter should follow the country code.
@@ -1677,7 +1666,6 @@ inline void ieee80211_process_probe_resp } } } -#endif /* The network parsed correctly -- so now we scan our known networks * to see if we can find it in our list. *
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +0 -62
267 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_core.c +0 -20
@@ -78,9 +78,7 @@ double __extendsfdf2(float a) {return a;#include "r8180_pm.h" #endif -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif #ifdef CONFIG_RTL8185B //#define CONFIG_RTL8180_IO_MAP
@@ -3899,7 +3897,6 @@ void watch_dog_adaptive(unsigned long da// DMESG("<----watch_dog_adaptive()\n"); } -#ifdef ENABLE_DOT11D static CHANNEL_LIST ChannelPlan[] = { {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },19 },//FCC
@@ -3975,7 +3972,6 @@ static void rtl8180_set_channel_map(u8 c } } } -#endif //Add for RF power on power off by lizhaoming 080512 void GPIOChangeRFWorkItemCallBack (struct work_struct *work);
@@ -4003,7 +3999,6 @@ short rtl8180_init(struct net_device *deu16 tmpu16;int i, j; -#ifdef ENABLE_DOT11D#if 0 for (i=0 ;i<0xFF ;i++) {if (i%16 ==0 )
@@ -4020,21 +4015,6 @@ short rtl8180_init(struct net_device *deDMESG ("Channel plan is %d\n" ,priv->channel_plan);rtl8180_set_channel_map (priv->channel_plan, priv->ieee80211); -#else -int ch; -//Set Default Channel Plan -if (!channels){ -DMESG ("No channels, aborting" ); -return -1 ; - } - ch=channels; - priv->channel_plan =0 ;//hikaru -// set channels 1..14 allowed in given locale -for (i=1 ; i<=14 ; i++) { - (priv->ieee80211->channel_map)[i] = (u8)(ch &0x01 ); - ch >>=1 ; - } -#endif //memcpy(priv->stats,0,sizeof(struct Stats));
drivers/staging/rtl8187se/r8180_rtl8225z2.c +0 -6
@@ -14,9 +14,7 @@#include "r8180_rtl8225.h" #include "r8180_93cx6.h" -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif #ifdef CONFIG_RTL8185B
@@ -431,7 +429,6 @@ void rtl8225z2_rf_close(struct net_devicrtl8185_set_anaparam2 (dev, RTL8225z2_ANAPARAM2_OFF); } -#ifdef ENABLE_DOT11D // // Description: // Map dBm into Tx power index according to
@@ -502,7 +499,6 @@ DbmToTxPwrIdx(return TxPwrIdx; } -#endif void rtl8225z2_SetTXPowerLevel (struct net_device *dev,short ch) {
@@ -554,7 +550,6 @@ void rtl8225z2_SetTXPowerLevel(struct ne CckTxPwrIdx, OfdmTxPwrIdx); }#endif -#ifdef ENABLE_DOT11D if (IS_DOT11D_ENABLE (priv->ieee80211) &&IS_DOT11D_STATE_DONE (priv->ieee80211) ) {
@@ -576,7 +571,6 @@ void rtl8225z2_SetTXPowerLevel(struct ne//priv->CurrentCckTxPwrIdx = cck_power_level; //priv->CurrentOfdmTxPwrIdx = ofdm_power_level; -#endif max_cck_power_level =15 ; max_ofdm_power_level =25 ;// 12 -> 25
drivers/staging/rtl8187se/r8180_wx.c +0 -14
@@ -22,9 +22,7 @@#include "r8180_hw.h" #include "r8180_sa2400.h" -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif //#define RATE_COUNT 4 u32 rtl8180_rates[] = {1000000 ,2000000 ,5500000 ,11000000 ,
@@ -313,11 +311,7 @@ static int rtl8180_wx_get_range(struct nfor (i =0 , val =0 ; i <14 ; i++) {// Include only legal frequencies for some countries -#ifdef ENABLE_DOT11D if ((GET_DOT11D_INFO (priv->ieee80211)->channel_map)[i+1 ]) { -#else -if ((priv->ieee80211->channel_map)[i+1 ]) { -#endif range->freq[val].i = i +1 ; range->freq[val].m = ieee80211_wlan_frequencies[i] *100000 ; range->freq[val].e =1 ;
@@ -1189,20 +1183,12 @@ static int r8180_wx_set_channelplan(stru// Clear old channel map for (i=1 ;i<=MAX_CHANNEL_NUMBER ;i++) { -#ifdef ENABLE_DOT11D GET_DOT11D_INFO (priv->ieee80211)->channel_map[i] =0 ; -#else - priv->ieee80211->channel_map[i] =0 ; -#endif }// Set new channel map for (i=1 ;i<=DefaultChannelPlan[*val].Len;i++) { -#ifdef ENABLE_DOT11D GET_DOT11D_INFO (priv->ieee80211)->channel_map[DefaultChannelPlan[*val].Channel[i-1 ]] =1 ; -#else - priv->ieee80211->channel_map[DefaultChannelPlan[*val].Channel[i-1 ]] =1 ; -#endif } }up (&priv->wx_sem);
drivers/staging/rtl8187se/r8185b_init.c +0 -4
@@ -34,9 +34,7 @@ Notes:#include "r8180_pm.h" #endif -#ifdef ENABLE_DOT11D #include "ieee80211/dot11d.h" -#endif #ifdef CONFIG_RTL8185B
@@ -2576,10 +2574,8 @@ MgntDisconnect(// Indication of disassociation event. //DrvIFIndicateDisassociation(Adapter, asRsn); -#ifdef ENABLE_DOT11D if (IS_DOT11D_ENABLE (priv->ieee80211))Dot11d_Reset (priv->ieee80211); -#endif // In adhoc mode, update beacon frame. if ( priv->ieee80211->state ==IEEE80211_LINKED ) {
PATCH 2/18 Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove CONFIG_RTL8180_PM ifdefs
--- drivers/staging/rtl8187se/Makefile | 1 - drivers/staging/rtl8187se/r8180_core.c | 7 ------- drivers/staging/rtl8187se/r8180_pm.c | 2 -- drivers/staging/rtl8187se/r8180_pm.h | 2 -- drivers/staging/rtl8187se/r8185b_init.c | 2 -- 5 files changed, 14 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -15,7 +15,6 @@ EXTRA_CFLAGS += -DTX_TRACK EXTRA_CFLAGS += -DHIGH_POWER EXTRA_CFLAGS += -DSW_DIG EXTRA_CFLAGS += -DRATE_ADAPT -EXTRA_CFLAGS += -DCONFIG_RTL8180_PM #enable it for legacy power save, disable it for leisure power save EXTRA_CFLAGS += -DENABLE_LPS
drivers/staging/rtl8187se/r8180_core.c +0 -7
@@ -74,9 +74,7 @@ double __extendsfdf2(float a) {return a;#include "r8180_wx.h" #include "r8180_dm.h" -#ifdef CONFIG_RTL8180_PM #include "r8180_pm.h" -#endif #include "ieee80211/dot11d.h"
@@ -199,13 +197,8 @@ static struct pci_driver rtl8180_pci_dri .id_table = rtl8180_pci_id_tbl, /* PCI_ID table */ .probe = rtl8180_pci_probe, /* probe fn */ .remove = __devexit_p(rtl8180_pci_remove),/* remove fn */ -#ifdef CONFIG_RTL8180_PM .suspend = rtl8180_suspend, /* PM suspend fn */ .resume = rtl8180_resume, /* PM resume fn */ -#else - .suspend = NULL, /* PM suspend fn */ - .resume = NULL, /* PM resume fn */ -#endif .shutdown = rtl8180_shutdown, };
drivers/staging/rtl8187se/r8180_pm.c +0 -2
@@ -9,7 +9,6 @@Released under the terms of GPL (General Public Licence) */ -#ifdef CONFIG_RTL8180_PM #include "r8180_hw.h"
@@ -89,4 +88,3 @@ int rtl8180_enable_wake (struct pci_dev -#endif //CONFIG_RTL8180_PM
drivers/staging/rtl8187se/r8180_pm.h +0 -2
@@ -10,7 +10,6 @@*/ -#ifdef CONFIG_RTL8180_PM #ifndef R8180_PM_H #define R8180_PM_H
@@ -25,4 +24,3 @@ int rtl8180_enable_wake (struct pci_dev#endif //R8180_PM_H -#endif // CONFIG_RTL8180_PM
drivers/staging/rtl8187se/r8185b_init.c +0 -2
@@ -30,9 +30,7 @@ Notes:#include "r8180_93cx6.h" /* Card EEPROM */ #include "r8180_wx.h" -#ifdef CONFIG_RTL8180_PM #include "r8180_pm.h" -#endif #include "ieee80211/dot11d.h"
PATCH 3/18 Staging: rtl8187se: remove THOMAS_TURBO ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove THOMAS_TURBO ifdefs
--- drivers/staging/rtl8187se/Makefile | 1 - drivers/staging/rtl8187se/ieee80211/ieee80211.h | 2 -- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 6 ------ drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 15 --------------- drivers/staging/rtl8187se/r8185b_init.c | 2 -- 5 files changed, 26 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -4,7 +4,6 @@ #EXTRA_CFLAGS += -std=gnu89 #EXTRA_CFLAGS += -O2 #CC = gcc -EXTRA_CFLAGS += -DTHOMAS_TURBO #CFLAGS += -DCONFIG_RTL8185B #CFLAGS += -DCONFIG_RTL818x_S
drivers/staging/rtl8187se/ieee80211/ieee80211.h +0 -2
@@ -956,9 +956,7 @@ struct ieee80211_network {//by amy 080312 u8 HighestOperaRate;//by amy 080312 -#ifdef THOMAS_TURBO u8 Turbo_Enable;//enable turbo mode, added by thomas -#endif u16 CountryIeLen;u8 CountryIeBuf[MAX_IE_LEN ]; };
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +0 -6
@@ -1159,9 +1159,7 @@ inline int ieee80211_network_init(//by amy 080312 network->HighestOperaRate =0 ;//by amy 080312 -#ifdef THOMAS_TURBO network->Turbo_Enable =0 ; -#endif network->CountryIeLen =0 ;memset (network->CountryIeBuf,0 ,MAX_IE_LEN );
@@ -1338,7 +1336,6 @@ inline int ieee80211_network_init( network->wpa_ie_len); } -#ifdef THOMAS_TURBO if (info_element->len == 7 && info_element->data[0] == 0x00 && info_element->data[1] == 0xe0 &&
@@ -1347,7 +1344,6 @@ inline int ieee80211_network_init( info_element->data[4] == 0x02) { network->Turbo_Enable =1 ; } -#endif if (1 == stats->nic_type) {//nic 87 break ; }
@@ -1541,9 +1537,7 @@ inline void update_network(struct ieee80 dst->QoS_Enable =1 ;//for Rtl8187 simulation #endif dst->SignalStrength = src->SignalStrength; -#ifdef THOMAS_TURBO dst->Turbo_Enable = src->Turbo_Enable; -#endif dst->CountryIeLen = src->CountryIeLen;memcpy (dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen); }
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +0 -15
@@ -127,7 +127,6 @@ void ieee80211_WMM_Info(struct ieee80211 *tag_p = tag; } -#ifdef THOMAS_TURBO void ieee80211_TURBO_Info (struct ieee80211_device *ieee,u8 **tag_p) {u8 *tag = *tag_p;
@@ -144,7 +143,6 @@ void ieee80211_TURBO_Info(struct ieee802 *tag_p = tag;printk (KERN_ALERT "This is enable turbo mode IE process\n" ); } -#endif void enqueue_mgmt (struct ieee80211_device *ieee,struct sk_buff *skb) {
@@ -1108,9 +1106,7 @@ inline struct sk_buff *ieee80211_associa#endif unsigned int rate_len =ieee80211_MFIE_rate_len (ieee);unsigned int wmm_info_len = beacon->QoS_Enable?9 :0 ; -#ifdef THOMAS_TURBO unsigned int turbo_info_len = beacon->Turbo_Enable?9 :0 ; -#endif u8 encry_proto = ieee->wpax_type_notify &0xff ;//u8 pairwise_type = (ieee->wpax_type_notify >> 8) & 0xff;
@@ -1128,7 +1124,6 @@ inline struct sk_buff *ieee80211_associa wpa_len =0 ; } } -#ifdef THOMAS_TURBO len =sizeof (struct ieee80211_assoc_request_frame )+ + beacon->ssid_len//essid tagged val + rate_len//rates tagged val
@@ -1136,14 +1131,6 @@ inline struct sk_buff *ieee80211_associa + rsn_len + wmm_info_len + turbo_info_len; -#else - len =sizeof (struct ieee80211_assoc_request_frame )+ - + beacon->ssid_len//essid tagged val - + rate_len//rates tagged val - + wpa_len - + rsn_len - + wmm_info_len; -#endif skb =dev_alloc_skb (len);
@@ -1389,12 +1376,10 @@ inline struct sk_buff *ieee80211_associaif (wmm_info_len) {ieee80211_WMM_Info (ieee, &tag); } -#ifdef THOMAS_TURBO tag =skb_put (skb,turbo_info_len);if (turbo_info_len) {ieee80211_TURBO_Info (ieee, &tag); } -#endif return skb; }
drivers/staging/rtl8187se/r8185b_init.c +0 -2
@@ -2227,11 +2227,9 @@ ActUpdateChannelAccessSetting(//lzm reserved 080826 #if 1 -#ifdef THOMAS_TURBO // For turbo mode setting. port from 87B by Isaiah 2008-08-01 if ( ieee->current_network.Turbo_Enable ==1 ) AcParam.f.TXOPLimit =0x01FF ; -#endif // For 87SE with Intel 4965 Ad-Hoc mode have poor throughput (19MB) if (ieee->iw_mode ==IW_MODE_ADHOC ) AcParam.f.TXOPLimit =0x0020 ;
PATCH 4/18 Staging: rtl8187se: remove CONFIG_RTL818x_S ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove CONFIG_RTL818x_S ifdefs
CONFIG_RTL818x_S is defined in drivers/staging/rtl8187se/r8180_hw.h.
--- drivers/staging/rtl8187se/Makefile | 1 drivers/staging/rtl8187se/r8180_core.c | 40 ----- drivers/staging/rtl8187se/r8180_dm.c | 24 --- drivers/staging/rtl8187se/r8180_hw.h | 18 -- drivers/staging/rtl8187se/r8180_rtl8225.c | 21 --- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 41 ----- drivers/staging/rtl8187se/r8185b_init.c | 192 ---------------------------- 7 files changed, 337 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -5,7 +5,6 @@ #EXTRA_CFLAGS += -O2 #CC = gcc #CFLAGS += -DCONFIG_RTL8185B -#CFLAGS += -DCONFIG_RTL818x_S #added for EeePC testing EXTRA_CFLAGS += -DENABLE_IPS
drivers/staging/rtl8187se/r8180_core.c +0 -40
@@ -2479,10 +2479,8 @@ void rtl8180_rx(struct net_device *dev) }else { padding =0 ; } -#ifdef CONFIG_RTL818X_S padding =0 ;#endif -#endif priv->rx_prevlen+=len;if (priv->rx_prevlen >MAX_FRAG_THRESHOLD +100 ){
@@ -3862,14 +3860,12 @@ void watch_dog_adaptive(unsigned long da }#endif -#ifdef CONFIG_RTL818X_S // Tx Power Tracking on 87SE. #ifdef TX_TRACK //if( priv->bTxPowerTrack ) //lzm mod 080826 if (CheckTxPwrTracking ((struct net_device *)data));TxPwrTracking87SE ((struct net_device *)data);#endif -#endif // Perform DIG immediately. #ifdef SW_DIG
@@ -4024,11 +4020,7 @@ short rtl8180_init(struct net_device *de*/ #ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S priv->RegThreeWireMode =HW_THREE_WIRE_SI ; -#else - priv->RegThreeWireMode =SW_THREE_WIRE ; -#endif #endif //Add for RF power on power off by lizhaoming 080512
@@ -4269,10 +4261,6 @@ short rtl8180_init(struct net_device *de (0 ?TCR_SAT :0 );// FALSE: HW provies PLCP length and LENGEXT, TURE: SW proiveds them priv->ReceiveConfig = -#ifdef CONFIG_RTL818X_S -#else - priv->CSMethod | -#endif// RCR_ENMARP | RCR_AMF |RCR_ADF |//accept management/data RCR_ACF | //accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko.
@@ -4300,17 +4288,10 @@ short rtl8180_init(struct net_device *deswitch (hw_version){#ifdef CONFIG_RTL8185B case HW_VERID_R8185B_B : -#ifdef CONFIG_RTL818X_S priv->card_8185 =VERSION_8187S_C ;DMESG ("MAC controller is a RTL8187SE b/g" ); priv->phy_ver =2 ;break ; -#else -DMESG ("MAC controller is a RTL8185B b/g" ); - priv->card_8185 =3 ; - priv->phy_ver =2 ; -break ; -#endif #endif case HW_VERID_R8185_ABC :DMESG ("MAC controller is a RTL8185 b/g" );
@@ -4350,24 +4331,9 @@ short rtl8180_init(struct net_device *de priv->card_8185_Bversion =0 ;#ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S // just for sync 85 priv->card_type =PCI ;DMESG ("This is a PCI NIC" ); -#else - config3 =read_nic_byte (dev,CONFIG3 ); -if (config3 &0x8 ){ - priv->card_type =CARDBUS ; -DMESG ("This is a CARDBUS NIC" ); - } -else if ( config3 &0x4 ){ - priv->card_type =MINIPCI ; -DMESG ("This is a MINI-PCI NIC" ); - }else { - priv->card_type =PCI ; -DMESG ("This is a PCI NIC" ); - } -#endif #endif priv->enable_gpio0 =0 ;
@@ -4375,7 +4341,6 @@ short rtl8180_init(struct net_device *de#ifdef CONFIG_RTL8185B usValue =eprom_read (dev,EEPROM_SW_REVD_OFFSET );DMESG ("usValue is 0x%x\n" ,usValue); -#ifdef CONFIG_RTL818X_S //3Read AntennaDiversity // SW Antenna Diversity. if ( (usValue &EEPROM_SW_AD_MASK ) !=EEPROM_SW_AD_ENABLE )
@@ -4427,7 +4392,6 @@ short rtl8180_init(struct net_device *de }//printk("bDefaultAntenna1 = %d\n", priv->bDefaultAntenna1); #endif -#endif //by amy for antenna /* rtl8185 can calc plcp len in HW.*/ priv->hw_plcp_len =1 ;
@@ -4537,13 +4501,9 @@ DMESG output to [email protected] THA }#ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S priv->rf_chip =RF_ZEBRA4 ; priv->rf_sleep = rtl8225z4_rf_sleep; priv->rf_wakeup = rtl8225z4_rf_wakeup; -#else - priv->rf_chip =RF_ZEBRA2 ; -#endif //DMESG("Card reports RF frontend Realtek 8225z2"); //DMESGW("This driver has EXPERIMENTAL support for this chipset."); //DMESGW("use it with care and at your own risk and");
drivers/staging/rtl8187se/r8180_dm.c +0 -24
@@ -517,7 +517,6 @@ MgntIsCckRate(return bReturn; } -#ifdef CONFIG_RTL818X_S // // Description: // Tx Power tracking mechanism routine on 87SE.
@@ -1233,7 +1232,6 @@ SetInitialGain: priv->LastTxThroughput = TxThroughput; priv->ieee80211->rate = priv->CurrentOperaRate *5 ; } -#endif void rtl8180_rate_adapter (struct work_struct * work) {
@@ -1259,10 +1257,8 @@ void timer_rate_adaptive(unsigned long d (priv->ForcedDataRate == 0) ) {// DMESG("timer_rate_adaptive():schedule rate_adapter_wq\n"); -#ifdef CONFIG_RTL818X_S queue_work (priv->ieee80211->wq, (void *)&priv->ieee80211->rate_adapter_wq);// StaRateAdaptive87SE((struct net_device *)data); -#endif } priv->rateadapter_timer.expires = jiffies +MSECS (priv->RateAdaptivePeriod);add_timer (&priv->rateadapter_timer);
@@ -1320,20 +1316,12 @@ SetAntenna8185(case RF_ZEBRA2 :case RF_ZEBRA4 :#ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S // Mac register, main antenna write_nic_byte (dev,ANTSEL ,0x03 );//base band write_phy_cck (dev,0x11 ,0x9b );// Config CCK RX antenna. write_phy_ofdm (dev,0x0d ,0x5c );// Config OFDM RX antenna. -#else -// Mac register, main antenna -write_nic_byte (dev,ANTSEL ,0x03 ); -//base band -write_phy_cck (dev,0x10 ,0x9b );// Config CCK RX antenna. -write_phy_ofdm (dev,0x0d ,0x5c );// Config OFDM RX antenna. -#endif #endif bAntennaSwitched = true;
@@ -1351,19 +1339,11 @@ SetAntenna8185(case RF_ZEBRA2 :case RF_ZEBRA4 :#ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S // Mac register, aux antenna write_nic_byte (dev,ANTSEL ,0x00 );//base band write_phy_cck (dev,0x11 ,0xbb );// Config CCK RX antenna. write_phy_ofdm (dev,0x0d ,0x54 );// Config OFDM RX antenna. -#else -// Mac register, aux antenna -write_nic_byte (dev,ANTSEL ,0x00 ); -//base band -write_phy_cck (dev,0x10 ,0xbb );// Config CCK RX antenna. -write_phy_ofdm (dev,0x0d ,0x54 );// Config OFDM RX antenna. -#endif #endif bAntennaSwitched = true;
@@ -1406,12 +1386,10 @@ SwitchAntenna( {#if 0 //lzm del 080826 //by amy 080312 -#ifdef CONFIG_RTL818X_S if (priv->bSwAntennaDiverity) bResult =SetAntennaConfig87SE (dev,1 , true); else#endif -#endif bResult =SetAntenna8185 (dev,1 );//by amy 080312 // printk("SwitchAntenna(): switching to antenna 1 ......\n");
@@ -1421,12 +1399,10 @@ SwitchAntenna( {#if 0 //lzm del 080826 //by amy 080312 -#ifdef CONFIG_RTL818X_S if (priv->bSwAntennaDiverity) bResult =SetAntennaConfig87SE (dev,0 , true); else#endif -#endif bResult =SetAntenna8185 (dev,0 );//by amy 080312 // printk("SwitchAntenna(): switching to antenna 0 ......\n");
drivers/staging/rtl8187se/r8180_hw.h +0 -18
@@ -21,7 +21,6 @@#define R8180_HW #define CONFIG_RTL8185B //support for rtl8185B, xiong-2006-11-15 -#define CONFIG_RTL818X_S #define BIT0 0x00000001#define BIT1 0x00000002
@@ -300,7 +299,6 @@#define CONFIG3 0x0059#define CONFIG4 0x005A#ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S // SD3 szuyitasi: Mac0x57= CC -> B0 Mac0x60= D1 -> C6 // Mac0x60 = 0x000004C6 power save parameters #define ANAPARM_ASIC_ON 0xB0054D00
@@ -308,14 +306,6 @@#define ANAPARM_ON ANAPARM_ASIC_ON#define ANAPARM2_ON ANAPARM2_ASIC_ON -#else -// SD3 CMLin: -#define ANAPARM_ASIC_ON 0x45090658 -#define ANAPARM2_ASIC_ON 0x727f3f52 - -#define ANAPARM_ON ANAPARM_ASIC_ON -#define ANAPARM2_ON ANAPARM2_ASIC_ON -#endif #endif #define TESTR 0x005B
@@ -453,9 +443,7 @@/* 0x00DA - 0x00DB - reserved */ -#ifdef CONFIG_RTL818X_S #define PHYPR 0xDA //0xDA - 0x0B PHY Parameter Register. -#endif #define CWR 0x00DC#define CWR_END 0x00DD
@@ -468,9 +456,7 @@#define RDSAR_END 0x00E7/* 0x00E8 - 0x00EF - reserved */ -#ifdef CONFIG_RTL818X_S #define LED_CONTROL 0xED -#endif #define FER 0x00F0#define FER_END 0x00F3
@@ -827,11 +813,9 @@#define AC_BE_PARAM 0xF8 // AC_BE Parameters Record#define AC_BK_PARAM 0xFC // AC_BK Parameters Record -#ifdef CONFIG_RTL818X_S #define BcnTimingAdjust 0x16A // Beacon Timing Adjust Register.#define GPIOCtrl 0x16B // GPIO Control Register.#define PSByGC 0x180 // 0x180 - 0x183 Power Saving by Gated Clock. -#endif #define ARFR 0x1E0 // Auto Rate Fallback Register (0x1e0 ~ 0x1e2)#define RFSW_CTRL 0x272 // 0x272-0x273.
@@ -840,10 +824,8 @@#define SW_3W_CMD0 0x27C // Software 3-wire Control/Status Register.#define SW_3W_CMD1 0x27D // Software 3-wire Control/Status Register. -#ifdef CONFIG_RTL818X_S #define PI_DATA_READ 0X360 // 0x360 - 0x361 Parallel Interface Data Register.#define SI_DATA_READ 0x362 // 0x362 - 0x363 Serial Interface Data Register. -#endif //---------------------------------------------------------------------------- // 8185B TPPoll bits (offset 0xd9, 1 byte)
drivers/staging/rtl8187se/r8180_rtl8225.c +0 -21
@@ -38,7 +38,6 @@ u8 rtl8225_init_gain[]={ 0x93,0x38,0x5a,0xc5,//0x00,0x31,0x06,0x99,//Gain = 6 ~ -54dbm };#endif -#ifdef CONFIG_RTL818X_S u32 rtl8225_chan[] ={0 ,0x0080 ,//ch1
@@ -56,26 +55,6 @@ u32 rtl8225_chan[] ={0x0680 , 0x074A, //ch14 }; -#else -u32 rtl8225_chan[] = { -0 ,//dummy channel 0 -0x085c ,//1 -0x08dc ,//2 -0x095c ,//3 -0x09dc ,//4 -0x0a5c ,//5 -0x0adc ,//6 -0x0b5c ,//7 -0x0bdc ,//8 -0x0c5c ,//9 -0x0cdc ,//10 -0x0d5c ,//11 -0x0ddc ,//12 -0x0e5c ,//13 -//0x0f5c, //14 -0x0f72 ,// 14 -}; -#endif u16 rtl8225bcd_rxgain[]={ 0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
drivers/staging/rtl8187se/r8180_rtl8225z2.c +0 -41
79 lines not on this page · raw message
drivers/staging/rtl8187se/r8185b_init.c +0 -192
339 lines not on this page · raw message
PATCH 5/18 Staging: rtl8187se: remove CONFIG_RTL8185B ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove CONFIG_RTL8185B ifdefs
CONFIG_RTL8185B is defined in drivers/staging/rtl8187se/r8180_hw.h.
--- drivers/staging/rtl8187se/Makefile | 1 drivers/staging/rtl8187se/r8180.h | 4 drivers/staging/rtl8187se/r8180_93cx6.h | 2 drivers/staging/rtl8187se/r8180_core.c | 289 ---------------------------- drivers/staging/rtl8187se/r8180_dm.c | 4 drivers/staging/rtl8187se/r8180_hw.h | 61 ----- drivers/staging/rtl8187se/r8180_rtl8225.h | 2 drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 drivers/staging/rtl8187se/r8185b_init.c | 2 9 files changed, 369 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -4,7 +4,6 @@ #EXTRA_CFLAGS += -std=gnu89 #EXTRA_CFLAGS += -O2 #CC = gcc -#CFLAGS += -DCONFIG_RTL8185B #added for EeePC testing EXTRA_CFLAGS += -DENABLE_IPS
drivers/staging/rtl8187se/r8180.h +0 -4
@@ -64,7 +64,6 @@#define DEFAULT_RETRY_DATA 7#define PRISM_HDR_SIZE 64 -#ifdef CONFIG_RTL8185B #define MGNT_QUEUE 0#define BK_QUEUE 1
@@ -199,7 +198,6 @@ typedef union _ThreeWire{u16 longData; }ThreeWireReg; -#endif typedef struct buffer {
@@ -659,7 +657,6 @@ typedef struct r8180_privshort ack_tx_to_ieee;u8 PowerProfile; -#ifdef CONFIG_RTL8185B u32 CSMethod;u8 cck_txpwr_base;u8 ofdm_txpwr_base;
@@ -675,7 +672,6 @@ typedef struct r8180_privu32 IntrMask;struct ChnlAccessSetting ChannelAccessSetting; -#endif }r8180_priv;#define MANAGE_PRIORITY 0
drivers/staging/rtl8187se/r8180_93cx6.h +0 -2
@@ -28,11 +28,9 @@#define RFCHIPID_MAXIM 4#define RFCHIPID_GCT 5#define RFCHIPID_RTL8225 9 -#ifdef CONFIG_RTL8185B #define RF_ZEBRA2 11#define EPROM_TXPW_BASE 0x05#define RF_ZEBRA4 12 -#endif #define RFCHIPID_RTL8255 0xa#define RF_PARAM 0x19#define RF_PARAM_DIGPHY_SHIFT 0
drivers/staging/rtl8187se/r8180_core.c +0 -289
600 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_dm.c +0 -4
@@ -1315,14 +1315,12 @@ SetAntenna8185( {case RF_ZEBRA2 :case RF_ZEBRA4 : -#ifdef CONFIG_RTL8185B // Mac register, main antenna write_nic_byte (dev,ANTSEL ,0x03 );//base band write_phy_cck (dev,0x11 ,0x9b );// Config CCK RX antenna. write_phy_ofdm (dev,0x0d ,0x5c );// Config OFDM RX antenna. -#endif bAntennaSwitched = true;break ;
@@ -1338,13 +1336,11 @@ SetAntenna8185( {case RF_ZEBRA2 :case RF_ZEBRA4 : -#ifdef CONFIG_RTL8185B // Mac register, aux antenna write_nic_byte (dev,ANTSEL ,0x00 );//base band write_phy_cck (dev,0x11 ,0xbb );// Config CCK RX antenna. write_phy_ofdm (dev,0x0d ,0x54 );// Config OFDM RX antenna. -#endif bAntennaSwitched = true;break ;
drivers/staging/rtl8187se/r8180_hw.h +0 -61
127 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8225.h +0 -2
@@ -19,7 +19,6 @@#define RTL8225_ANAPARAM_SLEEP 0xa00bab59#define RTL8225_ANAPARAM2_SLEEP 0x840dec11 -#ifdef CONFIG_RTL8185B void rtl8225z2_rf_init (struct net_device *dev);void rtl8225z2_rf_set_chan (struct net_device *dev,short ch);void rtl8225z2_rf_close (struct net_device *dev);
@@ -30,7 +29,6 @@ void rtl8225_host_usb_init(struct net_devoid write_rtl8225 (struct net_device *dev,u8 adr,u16 data);void RF_WriteReg (struct net_device *dev,u8 offset,u32 data);u32 RF_ReadReg (struct net_device *dev,u8 offset); -#endif void rtl8225_rf_init (struct net_device *dev);void rtl8225_rf_set_chan (struct net_device *dev,short ch);void rtl8225_rf_close (struct net_device *dev);
drivers/staging/rtl8187se/r8180_rtl8225z2.c +0 -4
@@ -16,7 +16,6 @@#include "ieee80211/dot11d.h" -#ifdef CONFIG_RTL8185B extern u8 rtl8225_agc[];
@@ -574,7 +573,6 @@ void rtl8225z2_SetTXPowerLevel(struct ne max_ofdm_power_level =25 ;// 12 -> 25 min_ofdm_power_level =10 ; -#ifdef CONFIG_RTL8185B if (cck_power_level >35 ) {
@@ -587,7 +585,6 @@ void rtl8225z2_SetTXPowerLevel(struct ne//printk("CCK TX power is %x\n", (ZEBRA2_CCK_OFDM_GAIN_SETTING[cck_power_level])); force_pci_posting (dev);mdelay (1 ); -#endif /* OFDM power setting */ // Old: // if(ofdm_power_level > max_ofdm_power_level)
@@ -1536,5 +1533,4 @@ void rtl8225z4_rf_wakeup(struct net_devi//printk("=========>%s()\n", __func__); MgntActSet_RF_State (dev, eRfOn,RF_CHANGE_BY_PS ); } -#endif
drivers/staging/rtl8187se/r8185b_init.c +0 -2
@@ -34,7 +34,6 @@ Notes:#include "ieee80211/dot11d.h" -#ifdef CONFIG_RTL8185B //#define CONFIG_RTL8180_IO_MAP
@@ -3139,4 +3138,3 @@ void rtl8185b_tx_enable(struct net_devic } -#endif
PATCH 6/18 Staging: rtl8187se: remove CONFIG_RTL8180_IO_MAP ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove CONFIG_RTL8180_IO_MAP ifdefs
--- drivers/staging/rtl8187se/Makefile | 1 drivers/staging/rtl8187se/r8180_core.c | 83 --------------- drivers/staging/rtl8187se/r8185b_init.c | 168 -------------------------------- 3 files changed, 252 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -1,6 +1,5 @@ #EXTRA_CFLAGS += -DCONFIG_IEEE80211_NOWEP=y -#EXTRA_CFLAGS += -DCONFIG_RTL8180_IOMAP #EXTRA_CFLAGS += -std=gnu89 #EXTRA_CFLAGS += -O2 #CC = gcc
drivers/staging/rtl8187se/r8180_core.c +0 -83
155 lines not on this page · raw message
drivers/staging/rtl8187se/r8185b_init.c +0 -168
223 lines not on this page · raw message
PATCH 7/18 Staging: rtl8187se: remove dead code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove dead code
--- drivers/staging/rtl8187se/ieee80211/dot11d.c | 10 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c | 13 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 7 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 19 drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c | 5 drivers/staging/rtl8187se/ieee80211/ieee80211_module.c | 88 -- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 56 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 289 ------- drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c | 19 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 4 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 63 - drivers/staging/rtl8187se/r8180_core.c | 522 ------------- drivers/staging/rtl8187se/r8180_dm.c | 12 drivers/staging/rtl8187se/r8180_max2820.c | 69 - drivers/staging/rtl8187se/r8180_rtl8225.c | 200 ---- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 375 --------- drivers/staging/rtl8187se/r8180_rtl8255.c | 33 drivers/staging/rtl8187se/r8180_wx.c | 29 drivers/staging/rtl8187se/r8185b_init.c | 285 ------- 19 files changed, 13 insertions(+), 2085 deletions(-)
drivers/staging/rtl8187se/ieee80211/dot11d.c +0 -10
@@ -222,13 +222,3 @@ int ToLegalChannel(return default_chn; } - -#if 0 -EXPORT_SYMBOL (Dot11d_Init); -EXPORT_SYMBOL (Dot11d_Reset); -EXPORT_SYMBOL (Dot11d_UpdateCountryIe); -EXPORT_SYMBOL (DOT11D_GetMaxTxPwrInDbm); -EXPORT_SYMBOL (DOT11D_ScanComplete); -EXPORT_SYMBOL (IsLegalChannel); -EXPORT_SYMBOL (ToLegalChannel); -#endif
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c +0 -13
@@ -247,16 +247,3 @@ void ieee80211_crypto_deinit(void) }kfree (hcrypt); } - -#if 0 -EXPORT_SYMBOL (ieee80211_crypt_deinit_entries); -EXPORT_SYMBOL (ieee80211_crypt_deinit_handler); -EXPORT_SYMBOL (ieee80211_crypt_delayed_deinit); - -EXPORT_SYMBOL (ieee80211_register_crypto_ops); -EXPORT_SYMBOL (ieee80211_unregister_crypto_ops); -EXPORT_SYMBOL (ieee80211_get_crypto_ops); -#endif - -//module_init(ieee80211_crypto_init); -//module_exit(ieee80211_crypto_deinit);
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +0 -7
@@ -472,10 +472,3 @@ void ieee80211_crypto_ccmp_exit(void) {ieee80211_unregister_crypto_ops (&ieee80211_crypt_ccmp); } - -#if 0 -EXPORT_SYMBOL (ieee80211_ccmp_null); -#endif - -//module_init(ieee80211_crypto_ccmp_init); -//module_exit(ieee80211_crypto_ccmp_exit);
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c +0 -19
@@ -327,17 +327,6 @@ static int ieee80211_tkip_encrypt(structreturn -1 ; hdr = (struct ieee80211_hdr *) skb->data; -#if 0 -printk ("@@ tkey\n" ); -printk ("%x|" , ((u32 *)tkey->key)[0 ]); -printk ("%x|" , ((u32 *)tkey->key)[1 ]); -printk ("%x|" , ((u32 *)tkey->key)[2 ]); -printk ("%x|" , ((u32 *)tkey->key)[3 ]); -printk ("%x|" , ((u32 *)tkey->key)[4 ]); -printk ("%x|" , ((u32 *)tkey->key)[5 ]); -printk ("%x|" , ((u32 *)tkey->key)[6 ]); -printk ("%x\n" , ((u32 *)tkey->key)[7 ]); -#endif if (!tkey->tx_phase1_done) { tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
@@ -767,11 +756,3 @@ void ieee80211_tkip_null(void)// printk("============>%s()\n", __func__); return ; } - -#if 0 -EXPORT_SYMBOL (ieee80211_tkip_null); -#endif - - -//module_init(ieee80211_crypto_tkip_init); -//module_exit(ieee80211_crypto_tkip_exit);
drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c +0 -5
@@ -298,8 +298,3 @@ void ieee80211_wep_null(void)// printk("============>%s()\n", __func__); return ; } -#if 0 -EXPORT_SYMBOL (ieee80211_wep_null); -#endif -//module_init(ieee80211_crypto_wep_init); -//module_exit(ieee80211_crypto_wep_exit);
drivers/staging/rtl8187se/ieee80211/ieee80211_module.c +0 -88
91 lines not on this page · raw message
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +3 -53
90 lines not on this page · raw message
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +4 -285
344 lines not on this page · raw message
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c +0 -19
@@ -570,22 +570,3 @@ exit:return ret; } - -#if 0 -EXPORT_SYMBOL (ieee80211_wx_get_essid); -EXPORT_SYMBOL (ieee80211_wx_set_essid); -EXPORT_SYMBOL (ieee80211_wx_set_rate); -EXPORT_SYMBOL (ieee80211_wx_get_rate); -EXPORT_SYMBOL (ieee80211_wx_set_wap); -EXPORT_SYMBOL (ieee80211_wx_get_wap); -EXPORT_SYMBOL (ieee80211_wx_set_mode); -EXPORT_SYMBOL (ieee80211_wx_get_mode); -EXPORT_SYMBOL (ieee80211_wx_set_scan); -EXPORT_SYMBOL (ieee80211_wx_get_freq); -EXPORT_SYMBOL (ieee80211_wx_set_freq); -EXPORT_SYMBOL (ieee80211_wx_set_rawtx); -EXPORT_SYMBOL (ieee80211_wx_get_name); -EXPORT_SYMBOL (ieee80211_wx_set_power); -EXPORT_SYMBOL (ieee80211_wx_get_power); -EXPORT_SYMBOL (ieee80211_wlan_frequencies); -#endif
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +0 -4
@@ -585,7 +585,3 @@ int ieee80211_xmit(struct sk_buff *skb,return NETDEV_TX_BUSY ; } - -#if 0 -EXPORT_SYMBOL (ieee80211_txb_free); -#endif
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +1 -62
96 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_core.c +2 -520
700 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_dm.c +0 -12
@@ -1380,12 +1380,6 @@ SwitchAntenna(if (priv->CurrAntennaIndex ==0 ) { -#if 0 //lzm del 080826 -//by amy 080312 -if (priv->bSwAntennaDiverity) - bResult =SetAntennaConfig87SE (dev,1 , true); - else -#endif bResult =SetAntenna8185 (dev,1 );//by amy 080312 // printk("SwitchAntenna(): switching to antenna 1 ......\n");
@@ -1393,12 +1387,6 @@ SwitchAntenna( }else { -#if 0 //lzm del 080826 -//by amy 080312 -if (priv->bSwAntennaDiverity) - bResult =SetAntennaConfig87SE (dev,0 , true); - else -#endif bResult =SetAntenna8185 (dev,0 );//by amy 080312 // printk("SwitchAntenna(): switching to antenna 0 ......\n");
drivers/staging/rtl8187se/r8180_max2820.c +0 -69
75 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8225.c +1 -199
290 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8225z2.c +0 -375
482 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8255.c +1 -32
@@ -256,14 +256,6 @@ void rtl8255_SetTXPowerLevel(struct net_mdelay (1 );//write_nic_byte(dev, TX_AGC_CONTROL,4); } -#if 0 -/* switch between mode B and G */ -void rtl8255_set_mode (struct net_device *dev,short modeb) -{ -write_phy_ofdm (dev,0x15 , (modeb ?0x0 :0x40 )); -write_phy_ofdm (dev,0x17 , (modeb ?0x0 :0x40 )); -} -#endif void rtl8255_rf_set_chan (struct net_device *dev,short ch) {
@@ -281,25 +273,6 @@ void rtl8255_rf_set_chan(struct net_devirtl8255_SetTXPowerLevel (dev, ch);/* FIXME FIXME FIXME */ - -#if 0 -write_nic_byte (dev,DIFS ,0xe );//DIFS -write_nic_byte (dev,SLOT ,0x14 );//SLOT -write_nic_byte (dev,EIFS ,0x5b );// EIFS -//write_nic_byte(dev,0xbc,0); //CW CONFIG -write_nic_byte (dev,0xbd ,0xa4 );//CW VALUE -//write_nic_byte(dev,TX_AGC_CONTROL,4); -//write_nic_byte(dev, 0x9d,7); -//Apr 20 13:25:03 localhost kernel: w8. 409d<-7 // CCK AGC -/*write_nic_word(dev,0x84,0x488); -write_nic_byte(dev,0x91,0x3e); -write_nic_byte(dev,0x90,0x30); -write_nic_word(dev,0x84,0x488); -write_nic_byte(dev,0x91,0x3e); -write_nic_byte(dev,0x90,0x20); -*/ -//mdelay(100); -#endif }void rtl8255_init_BGband (struct net_device *dev)
@@ -1807,11 +1780,7 @@ void rtl8255_rf_init(struct net_device *write_phy_cck (dev,0x4a ,0x0 );write_phy_cck (dev,0x4b ,0x0 );// write_phy_cck(dev, 0x4c, 0x5); -#if 0 -write_phy_cck (dev,0x41 ,0x9d );/* Energy Threshold */ -// TESTR 0xb 8187 -write_phy_cck (dev,0x10 ,0x93 );// & 0xfb); -#endif +//rtl8255_set_gain(dev, 1); /* FIXME this '1' is random */ rtl8255_SetTXPowerLevel (dev, priv->chan);
drivers/staging/rtl8187se/r8180_wx.c +0 -29
@@ -1569,36 +1569,7 @@ static struct iw_statistics *r8180_get_w wstats->qual.updated =IW_QUAL_ALL_UPDATED |IW_QUAL_DBM ;return wstats; } -#if 0 -spin_lock_irqsave (&ieee->lock, flag); -list_for_each_entry (target, &ieee->network_list, list) - { -if (is_same_network (target, &ieee->current_network, ieee)) - { -printk ("it's same network:%s\n" , target->ssid); -#if 0 -if (!tmp_level) - { - tmp_level = target->stats.signalstrength; - tmp_qual = target->stats.signal; - } -else - { - tmp_level = (15 *tmp_level + target->stats.signalstrength)/16 ; - tmp_qual = (15 *tmp_qual + target->stats.signal)/16 ; - } -#else - tmp_level = target->stats.signal; - tmp_qual = target->stats.signalstrength; - tmp_noise = target->stats.noise; -printk ("level:%d, qual:%d, noise:%d\n" , tmp_level, tmp_qual, tmp_noise); -#endif -break ; - } - } -spin_unlock_irqrestore (&ieee->lock, flag); -#endif tmp_level = (&ieee->current_network)->stats.signal; tmp_qual = (&ieee->current_network)->stats.signalstrength; tmp_noise = (&ieee->current_network)->stats.noise;
drivers/staging/rtl8187se/r8185b_init.c +1 -284
346 lines not on this page · raw message
PATCH 8/18 Staging: rtl8187se: remove unused radio frontends
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove unused radio frontends
--- drivers/staging/rtl8187se/Makefile | 4 drivers/staging/rtl8187se/r8180_core.c | 4 drivers/staging/rtl8187se/r8180_gct.c | 296 ---- drivers/staging/rtl8187se/r8180_gct.h | 25 drivers/staging/rtl8187se/r8180_max2820.c | 171 -- drivers/staging/rtl8187se/r8180_max2820.h | 21 drivers/staging/rtl8187se/r8180_rtl8255.c | 1807 ------------------------------ drivers/staging/rtl8187se/r8180_rtl8255.h | 19 drivers/staging/rtl8187se/r8180_sa2400.c | 233 --- drivers/staging/rtl8187se/r8180_sa2400.h | 26 drivers/staging/rtl8187se/r8180_wx.c | 1 drivers/staging/rtl8187se/r8185b_init.c | 4 12 files changed, 2611 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -4
@@ -20,13 +20,9 @@ EXTRA_CFLAGS += -DENABLE_LPS rtl8187se-objs := \ r8180_core.o \ - r8180_sa2400.o \ r8180_93cx6.o \ r8180_wx.o \ - r8180_max2820.o \ - r8180_gct.o \ r8180_rtl8225.o \ - r8180_rtl8255.o \ r8180_rtl8225z2.o \ r8185b_init.o \ r8180_dm.o \
drivers/staging/rtl8187se/r8180_core.c +0 -4
@@ -54,11 +54,7 @@//#include <asm/uaccess.h> #include "r8180_hw.h" #include "r8180.h" -#include "r8180_sa2400.h" /* PHILIPS Radio frontend */ -#include "r8180_max2820.h" /* MAXIM Radio frontend */ -#include "r8180_gct.h" /* GCT Radio frontend */ #include "r8180_rtl8225.h" /* RTL8225 Radio frontend */ -#include "r8180_rtl8255.h" /* RTL8255 Radio frontend */ #include "r8180_93cx6.h" /* Card EEPROM */ #include "r8180_wx.h" #include "r8180_dm.h"
drivers/staging/rtl8187se/r8180_gct.c deleted +0 -296
296 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_gct.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* -This is part of rtl8180 OpenSource driver - v 0.20 -Copyright (C) Andrea Merello 2004 <[email protected]> -Released under the terms of GPL (General Public Licence) - -Parts of this driver are based on the GPL part of the official realtek driver -Parts of this driver are based on the rtl8180 driver skeleton from Patric Schenke & Andres Salomon -Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver - -We want to tanks the Authors of such projects and the Ndiswrapper project Authors. -*/ - -#define GCT_ANTENNA 0xA3 - - -// we use the untouched eeprom value- cross your finger ;-) -#define GCT_ANAPARAM_PWR1_ON ?? -#define GCT_ANAPARAM_PWR0_ON ?? - - - -void gct_rf_init (struct net_device *dev); -void gct_rf_set_chan (struct net_device *dev,short ch); - -void gct_rf_close (struct net_device *dev);
drivers/staging/rtl8187se/r8180_max2820.c deleted +0 -171
171 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_max2820.h deleted +0 -21
@@ -1,21 +0,0 @@ -/* -This is part of rtl8180 OpenSource driver -Copyright (C) Andrea Merello 2004-2005 <[email protected]> -Released under the terms of GPL (General Public Licence) - -Parts of this driver are based on the GPL part of the official realtek driver -Parts of this driver are based on the rtl8180 driver skeleton from Patric Schenke & Andres Salomon -Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver - -We want to tanks the Authors of such projects and the Ndiswrapper project Authors. -*/ - -#define MAXIM_ANTENNA 0xb3 -#define MAXIM_ANAPARAM_PWR1_ON 0x8 -#define MAXIM_ANAPARAM_PWR0_ON 0x0 - - -void maxim_rf_init (struct net_device *dev); -void maxim_rf_set_chan (struct net_device *dev,short ch); - -void maxim_rf_close (struct net_device *dev);
drivers/staging/rtl8187se/r8180_rtl8255.c deleted +0 -1807
1,807 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8255.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* -This is part of the rtl8180-sa2400 driver -released under the GPL (See file COPYING for details). -Copyright (c) 2005 Andrea Merello <[email protected]> - -This files contains programming code for the rtl8255 -radio frontend. - -*Many* thanks to Realtek Corp. for their great support! - -*/ - -#define RTL8255_ANAPARAM_ON 0xa0000b59 -#define RTL8255_ANAPARAM2_ON 0x840cf311 - - -void rtl8255_rf_init (struct net_device *dev); -void rtl8255_rf_set_chan (struct net_device *dev,short ch); -void rtl8255_rf_close (struct net_device *dev);
drivers/staging/rtl8187se/r8180_sa2400.c deleted +0 -233
233 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_sa2400.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* -This is part of rtl8180 OpenSource driver - v 0.7 -Copyright (C) Andrea Merello 2004 <[email protected]> -Released under the terms of GPL (General Public Licence) - -Parts of this driver are based on the GPL part of the official realtek driver -Parts of this driver are based on the rtl8180 driver skeleton from Patric Schenke & Andres Salomon -Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver - -We want to tanks the Authors of such projects and the Ndiswrapper project Authors. -*/ - -#define SA2400_ANTENNA 0x91 -#define SA2400_DIG_ANAPARAM_PWR1_ON 0x8 -#define SA2400_ANA_ANAPARAM_PWR1_ON 0x28 -#define SA2400_ANAPARAM_PWR0_ON 0x3 - -#define SA2400_RF_MAX_SENS 85 -#define SA2400_RF_DEF_SENS 80 - -#define SA2400_REG4_FIRDAC_SHIFT 7 - -void sa2400_rf_init (struct net_device *dev); -void sa2400_rf_set_chan (struct net_device *dev,short ch); -short sa2400_rf_set_sens (struct net_device *dev,short sens); -void sa2400_rf_close (struct net_device *dev);
drivers/staging/rtl8187se/r8180_wx.c +0 -1
@@ -20,7 +20,6 @@#include "r8180.h" #include "r8180_hw.h" -#include "r8180_sa2400.h" #include "ieee80211/dot11d.h"
drivers/staging/rtl8187se/r8185b_init.c +0 -4
@@ -22,11 +22,7 @@ Notes:#include <linux/spinlock.h> #include "r8180_hw.h" #include "r8180.h" -#include "r8180_sa2400.h" /* PHILIPS Radio frontend */ -#include "r8180_max2820.h" /* MAXIM Radio frontend */ -#include "r8180_gct.h" /* GCT Radio frontend */ #include "r8180_rtl8225.h" /* RTL8225 Radio frontend */ -#include "r8180_rtl8255.h" /* RTL8255 Radio frontend */ #include "r8180_93cx6.h" /* Card EEPROM */ #include "r8180_wx.h"
PATCH 9/18 Staging: rtl8187se: remove debugging code from r8180_core.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove debugging code from r8180_core.c
--- drivers/staging/rtl8187se/r8180_core.c | 384 --------------------------------- 1 file changed, 3 insertions(+), 381 deletions(-)
drivers/staging/rtl8187se/r8180_core.c +3 -381
@@ -24,30 +24,8 @@add RTL8185 and RTL8225 support, and to David Young also. */ -#undef DEBUG_TX_DESC2#undef RX_DONT_PASS_UL -#undef DEBUG_EPROM -#undef DEBUG_RX_VERBOSE#undef DUMMY_RX -#undef DEBUG_ZERO_RX -#undef DEBUG_RX_SKB -#undef DEBUG_TX_FRAG -#undef DEBUG_RX_FRAG -#undef DEBUG_TX_FILLDESC -#undef DEBUG_TX -#undef DEBUG_IRQ -#undef DEBUG_RX -#undef DEBUG_RXALLOC -#undef DEBUG_REGISTERS -#undef DEBUG_RING -#undef DEBUG_IRQ_TASKLET -#undef DEBUG_TX_ALLOC -#undef DEBUG_TX_DESC - -//#define DEBUG_TX -//#define DEBUG_TX_DESC2 -//#define DEBUG_RX -//#define DEBUG_RX_SKB #include <linux/syscalls.h> //#include <linux/fcntl.h>
@@ -462,10 +440,6 @@ void rtl8180_proc_init_one(struct net_deshort buffer_add (struct buffer **buffer,u32 *buf,dma_addr_t dma,struct buffer **bufferhead) { -#ifdef DEBUG_RING -DMESG ("adding buffer to TX/RX struct" ); -#endif -struct buffer *tmp;if (! *buffer){
@@ -622,168 +596,12 @@ short check_nic_enought_desc(struct net_return (required+2 <get_curr_tx_free_desc (dev,priority)); } - -/* This function is only for debuging purpose */ -void check_tx_ring (struct net_device *dev,int pri) -{ -static int maxlog =3 ; -struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -u32 * tmp; -struct buffer *buf; -int i; -int nic; -u32 * tail; -u32 * head; -u32 * begin; -u32 nicbegin; -struct buffer * buffer; - - maxlog --; -if (maxlog <0 )return ; - -switch (pri) { -case MANAGE_PRIORITY : - tail = priv->txmapringtail; - begin = priv->txmapring; - head = priv->txmapringhead; - nic =read_nic_dword (dev,TX_MANAGEPRIORITY_RING_ADDR ); - buffer = priv->txmapbufs; - nicbegin = priv->txmapringdma; -break ; - - -case BK_PRIORITY : - tail = priv->txbkpringtail; - begin = priv->txbkpring; - head = priv->txbkpringhead; - nic =read_nic_dword (dev,TX_BKPRIORITY_RING_ADDR ); - buffer = priv->txbkpbufs; - nicbegin = priv->txbkpringdma; -break ; - -case BE_PRIORITY : - tail = priv->txbepringtail; - begin = priv->txbepring; - head = priv->txbepringhead; - nic =read_nic_dword (dev,TX_BEPRIORITY_RING_ADDR ); - buffer = priv->txbepbufs; - nicbegin = priv->txbepringdma; -break ; - -case VI_PRIORITY : - tail = priv->txvipringtail; - begin = priv->txvipring; - head = priv->txvipringhead; - nic =read_nic_dword (dev,TX_VIPRIORITY_RING_ADDR ); - buffer = priv->txvipbufs; - nicbegin = priv->txvipringdma; -break ; - - -case VO_PRIORITY : - tail = priv->txvopringtail; - begin = priv->txvopring; - head = priv->txvopringhead; - nic =read_nic_dword (dev,TX_VOPRIORITY_RING_ADDR ); - buffer = priv->txvopbufs; - nicbegin = priv->txvopringdma; -break ; - -case HI_PRIORITY : - tail = priv->txhpringtail; - begin = priv->txhpring; - head = priv->txhpringhead; - nic =read_nic_dword (dev,TX_HIGHPRIORITY_RING_ADDR ); - buffer = priv->txhpbufs; - nicbegin = priv->txhpringdma; -break ; - -default : -return ; -break ; - } - -if (!priv->txvopbufs) -DMESGE ("NIC TX ack, but TX queue corrupted!" ); -else { - -for (i=0 ,buf=buffer, tmp=begin; - tmp<begin+(priv->txringcount)*8 ; - tmp+=8 ,buf=buf->next,i++) - -DMESG ("BUF%d %s %x %s. Next : %x" ,i, - *tmp & (1 <<31 ) ?"filled" :"empty" , - *(buf->buf), - *tmp & (1 <<15 )?"ok" :"err" , *(tmp+4 )); - } - -return ; -} - - - -/* this function is only for debugging purpose */ -void check_rxbuf (struct net_device *dev) -{ -struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -u32 * tmp; -struct buffer *buf; -u8 rx_desc_size; - - rx_desc_size =8 ; - -if (!priv->rxbuffer) -DMESGE ("NIC RX ack, but RX queue corrupted!" ); - -else { - -for (buf=priv->rxbuffer, tmp=priv->rxring; - tmp < priv->rxring+(priv->rxringcount)*rx_desc_size; - tmp+=rx_desc_size, buf=buf->next) - -DMESG ("BUF %s %x" , - *tmp & (1 <<31 ) ?"empty" :"filled" , - *(buf->buf)); - } - -return ; -} - - -void dump_eprom (struct net_device *dev) -{ -int i; -for (i=0 ; i<63 ; i++) -DMESG ("EEPROM addr %x : %x" , i,eprom_read (dev,i)); -} - - -void rtl8180_dump_reg (struct net_device *dev) -{ -int i; -int n; -int max=0xff ; - -DMESG ("Dumping NIC register map" ); - -for (n=0 ;n<=max;) - { -printk ("\nD: %2x> " , n); -for (i=0 ;i<16 && n<=max;i++,n++) -printk ("%2x " ,read_nic_byte (dev,n)); - } -printk ("\n" ); -} - -void fix_tx_fifo (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);u32 *tmp;int i; -#ifdef DEBUG_TX_ALLOC -DMESG ("FIXING TX FIFOs" ); -#endif +for (tmp=priv->txmapring, i=0 ; i < priv->txringcount; tmp+=8 , i++){
@@ -824,9 +642,7 @@ void fix_tx_fifo(struct net_device *dev) tmp+=8, i++){ *tmp = *tmp &~ (1 <<31 ); } -#ifdef DEBUG_TX_ALLOC -DMESG ("TX FIFOs FIXED" ); -#endif + priv->txmapringtail = priv->txmapring; priv->txmapringhead = priv->txmapring; priv->txmapbufstail = priv->txmapbufs;
@@ -869,11 +685,6 @@ void fix_rx_fifo(struct net_device *dev) rx_desc_size =8 ;// 4*8 = 32 bytes -#ifdef DEBUG_RXALLOC -DMESG ("FIXING RX FIFO" ); -check_rxbuf (dev); -#endif -for (tmp=priv->rxring, rxbuf=priv->rxbufferhead; (tmp < (priv->rxring)+(priv->rxringcount)*rx_desc_size); tmp+=rx_desc_size,rxbuf=rxbuf->next){
@@ -883,11 +694,6 @@ void fix_rx_fifo(struct net_device *dev) *tmp |= (1 <<31 ); } -#ifdef DEBUG_RXALLOC -DMESG ("RX FIFO FIXED" ); -check_rxbuf (dev); -#endif - priv->rxringtail=priv->rxring; priv->rxbuffer=priv->rxbufferhead; priv->rx_skb_complete=1 ;
@@ -1199,9 +1005,6 @@ void rtl8180_rx_enable(struct net_devicefix_rx_fifo (dev); -#ifdef DEBUG_RX -DMESG ("rxconf: %x %x" ,rxconf ,read_nic_dword (dev,RX_CONF )); -#endif cmd=read_nic_byte (dev,CMD );write_nic_byte (dev,CMD ,cmd | (1 <<CMD_RX_ENABLE_SHIFT ));
@@ -1336,10 +1139,6 @@ void rtl8180_tx_enable(struct net_devicefix_tx_fifo (dev); -#ifdef DEBUG_TX -DMESG ("txconf: %x %x" ,txconf,read_nic_dword (dev,TX_CONF )); -#endif - cmd=read_nic_byte (dev,CMD );write_nic_byte (dev,CMD ,cmd | (1 <<CMD_TX_ENABLE_SHIFT ));
@@ -1523,10 +1322,6 @@ short alloc_tx_desc_ring(struct net_devi } -#ifdef DEBUG_TX -DMESG ("Tx dma physical address: %x" ,dma_desc); -#endif -return 0 ; }
@@ -1626,11 +1421,6 @@ short alloc_rx_desc_ring(struct net_devi dma_tmp =pci_map_single (pdev,buf,bufsize *sizeof (u8),PCI_DMA_FROMDEVICE ); -#ifdef DEBUG_ZERO_RX -int j; -for (j=0 ;j<bufsize;j++) ((u8 *)buf)[i] =0 ; -#endif -//buf = (void*)pci_alloc_consistent(pdev,bufsize,&dma_tmp); if (-1 ==buffer_add (&(priv->rxbuffer), buf,dma_tmp, &(priv->rxbufferhead))){
@@ -1642,21 +1432,11 @@ short alloc_rx_desc_ring(struct net_devi *(tmp+2 ) = (u32 )dma_tmp; *tmp = *tmp |(1 <<31 );// descriptor void, owned by the NIC -#ifdef DEBUG_RXALLOC -DMESG ("Alloc %x size buffer, DMA mem @ %x, virtual mem @ %x" , - (u32)(bufsize&0xfff ), (u32 )dma_tmp, (u32 )buf); -#endif - tmp=tmp+rx_desc_size; } *(tmp-rx_desc_size) = *(tmp-rx_desc_size) | (1 <<30 );// this is the last descriptor - -#ifdef DEBUG_RXALLOC -DMESG ("RX DMA physical address: %x" ,dma_desc); -#endif -return 0 ; }
@@ -2129,16 +1909,6 @@ void rtl8180_rx(struct net_device *dev) priv->rx_skb_complete =1 ; } -#ifdef DEBUG_RX_FRAG -DMESG ("Iteration.. len %x" ,len); -if (first)DMESG ("First descriptor" ); -if (last)DMESG ("Last descriptor" ); - -#endif -#ifdef DEBUG_RX_VERBOSE -print_buffer ( priv->rxbuffer->buf, len); -#endif - signal=(unsigned char )(((*(priv->rxringtail+3 ))& (0x00ff0000 ))>>16 ); signal=(signal&0xfe )>>1 ;// Modify by hikaru 6.6
@@ -2271,14 +2041,8 @@ void rtl8180_rx(struct net_device *dev)if (!priv->rx_skb_complete){/* seems that HW sometimes fails to reiceve and doesn't provide the last descriptor */ -#ifdef DEBUG_RX_SKB -DMESG ("going to free incomplete skb" ); -#endif dev_kfree_skb_any (priv->rx_skb); priv->stats.rxnolast++; -#ifdef DEBUG_RX_SKB -DMESG ("free incomplete skb OK" ); -#endif }/* support for prism header has been originally added by Christian */ if (priv->prism_hdr && priv->ieee80211->iw_mode ==IW_MODE_MONITOR ){
@@ -2286,9 +2050,6 @@ void rtl8180_rx(struct net_device *dev) }else { priv->rx_skb =dev_alloc_skb (len+2 );if ( !priv->rx_skb) goto drop; -#ifdef DEBUG_RX_SKB -DMESG ("Alloc initial skb %x" ,len+2 ); -#endif } priv->rx_skb_complete=0 ;
@@ -2307,31 +2068,17 @@ void rtl8180_rx(struct net_device *dev)if (!tmp_skb) goto drop; tmp_skb->dev=dev; -#ifdef DEBUG_RX_SKB -DMESG ("Realloc skb %x" ,len+2 ); -#endif -#ifdef DEBUG_RX_SKB -DMESG ("going copy prev frag %x" ,priv->rx_skb->len); -#endif memcpy (skb_put (tmp_skb,priv->rx_skb->len), priv->rx_skb->data, priv->rx_skb->len); -#ifdef DEBUG_RX_SKB -DMESG ("skb copy prev frag complete" ); -#endif dev_kfree_skb_any (priv->rx_skb); -#ifdef DEBUG_RX_SKB -DMESG ("prev skb free ok" ); -#endif priv->rx_skb=tmp_skb; } } -#ifdef DEBUG_RX_SKB -DMESG ("going to copy current payload %x" ,len); -#endif +if (!priv->rx_skb_complete) {if (padding) { memcpy(skb_put(priv->rx_skb,len),
@@ -2341,39 +2088,19 @@ void rtl8180_rx(struct net_device *dev) priv->rxbuffer->buf,len); } } -#ifdef DEBUG_RX_SKB -DMESG ("current fragment skb copy complete" ); -#endif if (last && !priv->rx_skb_complete){ - -#ifdef DEBUG_RX_SKB -DMESG ("Got last fragment" ); -#endif -if (priv->rx_skb->len >4 )skb_trim (priv->rx_skb,priv->rx_skb->len-4 ); -#ifdef DEBUG_RX_SKB -DMESG ("yanked out crc, passing to the upper layer" ); -#endif -#ifndef RX_DONT_PASS_UL if (!ieee80211_rx (priv->ieee80211, priv->rx_skb, &stats)){ -#ifdef DEBUG_RX -DMESGW ("Packet not consumed" ); -#endif #endif // RX_DONT_PASS_UL dev_kfree_skb_any (priv->rx_skb); #ifndef RX_DONT_PASS_UL }#endif -#ifdef DEBUG_RX - else{ -DMESG ("Rcv frag" ); - } -#endif priv->rx_skb_complete=1 ; }
@@ -2400,9 +2127,6 @@ drop: // this is used when we have not e//wmb(); -#ifdef DEBUG_RX -DMESG ("Current descriptor: %x" ,(u32 )priv->rxringtail); -#endif //unsigned long flags; //spin_lock_irqsave(&priv->irq_lock,flags);
@@ -2829,12 +2553,6 @@ short rtl8180_tx(struct net_device *dev, temp_tail = tail;//printk("================================>buflen = %d, remain = %d!\n", buflen,remain); while (remain!=0 ){ -#ifdef DEBUG_TX_FRAG -DMESG ("TX iteration" ); -#endif -#ifdef DEBUG_TX -DMESG ("TX: filling descriptor %x" ,(u32 )tail); -#endif mb ();if (!buflist){DMESGE ("TX buffer error, cannot TX frames. pri %d." , priority);
@@ -2848,11 +2566,6 @@ short rtl8180_tx(struct net_device *dev,DMESGW ("No more TX desc, returning %x of %x" , remain,len); priv->stats.txrdu++; -#ifdef DEBUG_TX_DESC -check_tx_ring (dev,priority); -// netif_stop_queue(dev); -// netif_carrier_off(dev); -#endif // spin_unlock_irqrestore(&priv->tx_lock,flags); return remain;
@@ -2874,9 +2587,6 @@ short rtl8180_tx(struct net_device *dev,// *tail = *tail | (1<<16); if (remain==len && !descfrag) { ownbit_flag = false;//added by david woo,2007.12.14 -#ifdef DEBUG_TX_FRAG -DMESG ("First descriptor" ); -#endif *tail = *tail| (1 <<29 ) ;//fist segment of the packet *tail = *tail |(len); }else {
@@ -2925,12 +2635,6 @@ short rtl8180_tx(struct net_device *dev, duration =rtl8180_len2duration (len, rate,&ext); - -#ifdef DEBUG_TX -DMESG ("PLCP duration %d" ,duration ); -//DMESG("drift %d",drift); -DMESG ("extension %s" , (ext==1 ) ?"on" :"off" ); -#endif *(tail+1 ) = *(tail+1 ) | ((duration &0x7fff )<<16 );if (ext) *(tail+1 ) = *(tail+1 ) |(1 <<31 );//plcp length extension }
@@ -2938,10 +2642,6 @@ short rtl8180_tx(struct net_device *dev,if (morefrag) *tail = (*tail) | (1 <<17 );// more fragment if (!remain) *tail = (*tail) | (1 <<28 );// last segment of frame -#ifdef DEBUG_TX_FRAG -if (!remain)DMESG ("Last descriptor" ); -if (morefrag)DMESG ("More frag" ); -#endif *(tail+5 ) = *(tail+5 )|(2 <<27 ); *(tail+7 ) = *(tail+7 )|(1 <<4 );
@@ -2951,12 +2651,6 @@ short rtl8180_tx(struct net_device *dev, *tail = *tail | (1 <<31 );// descriptor ready to be txed } -#ifdef DEBUG_TX_DESC2 -printk ("tx desc is:\n" ); -DMESG ("%8x %8x %8x %8x %8x %8x %8x %8x" , tail[0 ], tail[1 ], tail[2 ], tail[3 ], - tail[4 ], tail[5 ], tail[6 ], tail[7 ]); -#endif -if ((tail - begin)/8 == count-1 ) tail=begin;
@@ -3839,11 +3533,6 @@ short rtl8180_init(struct net_device *de word =eprom_read (dev,EPROM_TXPW_CH1_2 + j); priv->chtxpwr[i]=word &0xff ; priv->chtxpwr[i+1 ]=(word &0xff00 )>>8 ; -#ifdef DEBUG_EPROM -DMESG ("tx word %x:%x" ,j,word); -DMESG ("ch %d pwr %x" ,i,priv->chtxpwr[i]); -DMESG ("ch %d pwr %x" ,i+1 ,priv->chtxpwr[i+1 ]); -#endif }if (priv->card_8185){for (i=1 ,j=0 ; i<14 ; i+=2 ,j++){
@@ -3851,11 +3540,6 @@ short rtl8180_init(struct net_device *de word =eprom_read (dev,EPROM_TXPW_OFDM_CH1_2 + j); priv->chtxpwr_ofdm[i]=word &0xff ; priv->chtxpwr_ofdm[i+1 ]=(word &0xff00 )>>8 ; -#ifdef DEBUG_EPROM -DMESG ("ofdm tx word %x:%x" ,j,word); -DMESG ("ofdm ch %d pwr %x" ,i,priv->chtxpwr_ofdm[i]); -DMESG ("ofdm ch %d pwr %x" ,i+1 ,priv->chtxpwr_ofdm[i+1 ]); -#endif } }//{by amy 080312
@@ -4006,10 +3690,6 @@ DMESG output to [email protected] THADMESG ("IRQ %d" ,dev->irq); } -#ifdef DEBUG_EPROM -dump_eprom (dev); -#endif -return 0 ; }
@@ -4194,9 +3874,6 @@ void write_phy(struct net_device *dev, uif (phy == data){//SUCCESS! force_pci_posting (dev);mdelay (3 );//random value -#ifdef DEBUG_BB -DMESG ("Phy wr %x,%x" ,adr,data); -#endif return ; }else {force_pci_posting (dev);
@@ -4314,9 +3991,6 @@ void rtl8180_adapter_start(struct net_dertl8180_set_mode (dev,EPROM_CMD_NORMAL );write_nic_dword (dev,INT_TIMEOUT ,0 ); -#ifdef DEBUG_REGISTERS -rtl8180_dump_reg (dev); -#endif if (!priv->card_8185) {
@@ -5236,12 +4910,7 @@ priv->txnpring)/8); nicv = (u32 *) ((nic - nicbegin) + (u8 *)begin);if ((head <= tail && (nicv > tail || nicv < head)) || (head > tail && (nicv > tail && nicv < head))){ -DMESGW ("nic has lost pointer" ); -#ifdef DEBUG_TX_DESC -//check_tx_ring(dev,NORM_PRIORITY); -check_tx_ring (dev,pri); -#endif spin_unlock_irqrestore (&priv->tx_lock,flag);rtl8180_restart (dev);return ;
@@ -5403,9 +5072,6 @@ irqreturn_t rtl8180_interrupt(int irq, v } priv->stats.ints++; -#ifdef DEBUG_IRQ -DMESG ("NIC irq %x" ,inta); -#endif //priv->irqpending = inta;
@@ -5436,18 +5102,12 @@ irqreturn_t rtl8180_interrupt(int irq, v }if (inta &ISR_THPDER ){ -#ifdef DEBUG_TX -DMESG ("TX high priority ERR" ); -#endif priv->stats.txhperr++;rtl8180_tx_isr (dev,HI_PRIORITY ,1 ); priv->ieee80211->stats.tx_errors++; }if (inta &ISR_THPDOK ){//High priority tx ok -#ifdef DEBUG_TX -DMESG ("TX high priority OK" ); -#endif // priv->NumTxOkTotal++; //priv->NumTxOkInPeriod++; //YJ,del,080828 priv->link_detect.NumTxOkInPeriod++;//YJ,add,080828
@@ -5457,16 +5117,10 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_RER ) { priv->stats.rxerr++; -#ifdef DEBUG_RX -DMESGW ("RX error int" ); -#endif }if (inta &ISR_TBKDER ){//corresponding to BK_PRIORITY priv->stats.txbkperr++; priv->ieee80211->stats.tx_errors++; -#ifdef DEBUG_TX -DMESGW ("TX bkp error int" ); -#endif //tasklet_schedule(&priv->irq_tx_tasklet); rtl8180_tx_isr (dev,BK_PRIORITY ,1 );rtl8180_try_wake_queue (dev,BE_PRIORITY );
@@ -5475,9 +5129,6 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_TBEDER ){//corresponding to BE_PRIORITY priv->stats.txbeperr++; priv->ieee80211->stats.tx_errors++; -#ifdef DEBUG_TX -DMESGW ("TX bep error int" ); -#endif rtl8180_tx_isr (dev,BE_PRIORITY ,1 );//tasklet_schedule(&priv->irq_tx_tasklet); rtl8180_try_wake_queue (dev,BE_PRIORITY );
@@ -5485,9 +5136,6 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_TNPDER ){//corresponding to VO_PRIORITY priv->stats.txnperr++; priv->ieee80211->stats.tx_errors++; -#ifdef DEBUG_TX -DMESGW ("TX np error int" ); -#endif //tasklet_schedule(&priv->irq_tx_tasklet); rtl8180_tx_isr (dev,NORM_PRIORITY ,1 );rtl8180_try_wake_queue (dev,NORM_PRIORITY );
@@ -5496,27 +5144,18 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_TLPDER ){//corresponding to VI_PRIORITY priv->stats.txlperr++; priv->ieee80211->stats.tx_errors++; -#ifdef DEBUG_TX -DMESGW ("TX lp error int" ); -#endif rtl8180_tx_isr (dev,LOW_PRIORITY ,1 );//tasklet_schedule(&priv->irq_tx_tasklet); rtl8180_try_wake_queue (dev,LOW_PRIORITY ); }if (inta &ISR_ROK ){ -#ifdef DEBUG_RX -DMESG ("Frame arrived !" ); -#endif //priv->NumRxOkInPeriod++; //YJ,del,080828 priv->stats.rxint++;tasklet_schedule (&priv->irq_rx_tasklet); }if (inta & ISR_RQoSOK ){ -#ifdef DEBUG_RX -DMESG ("QoS Frame arrived !" ); -#endif //priv->NumRxOkInPeriod++; //YJ,del,080828 priv->stats.rxint++;tasklet_schedule (&priv->irq_rx_tasklet);
@@ -5527,18 +5166,13 @@ irqreturn_t rtl8180_interrupt(int irq, v }if (inta &ISR_RDU ){ -//#ifdef DEBUG_RX DMESGW ("No RX descriptor available" ); priv->stats.rxrdu++; -//#endif tasklet_schedule (&priv->irq_rx_tasklet);/*queue_work(priv->workqueue ,&priv->restart_work);*/ }if (inta &ISR_RXFOVW ){ -#ifdef DEBUG_RX -DMESGW ("RX fifo overflow" ); -#endif priv->stats.rxoverflow++;tasklet_schedule (&priv->irq_rx_tasklet);//queue_work(priv->workqueue ,&priv->restart_work);
@@ -5547,9 +5181,6 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_TXFOVW ) priv->stats.txoverflow++;if (inta &ISR_TNPDOK ){//Normal priority tx ok -#ifdef DEBUG_TX -DMESG ("TX normal priority OK" ); -#endif // priv->NumTxOkTotal++; //priv->NumTxOkInPeriod++; //YJ,del,080828 priv->link_detect.NumTxOkInPeriod++;//YJ,add,080828
@@ -5559,9 +5190,6 @@ irqreturn_t rtl8180_interrupt(int irq, v }if (inta &ISR_TLPDOK ){//Low priority tx ok -#ifdef DEBUG_TX -DMESG ("TX low priority OK" ); -#endif // priv->NumTxOkTotal++; //priv->NumTxOkInPeriod++; //YJ,del,080828 priv->link_detect.NumTxOkInPeriod++;//YJ,add,080828
@@ -5573,9 +5201,6 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_TBKDOK ){//corresponding to BK_PRIORITY priv->stats.txbkpokint++; -#ifdef DEBUG_TX -DMESGW ("TX bk priority ok" ); -#endif // priv->NumTxOkTotal++; //priv->NumTxOkInPeriod++; //YJ,del,080828 priv->link_detect.NumTxOkInPeriod++;//YJ,add,080828
@@ -5585,9 +5210,6 @@ irqreturn_t rtl8180_interrupt(int irq, vif (inta &ISR_TBEDOK ){//corresponding to BE_PRIORITY priv->stats.txbeperr++; -#ifdef DEBUG_TX -DMESGW ("TX be priority ok" ); -#endif // priv->NumTxOkTotal++; //priv->NumTxOkInPeriod++; //YJ,del,080828 priv->link_detect.NumTxOkInPeriod++;//YJ,add,080828
PATCH 10/18 Staging: rtl8187se: remove unused rtl8225_rf_* functions
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove unused rtl8225_rf_* functions
--- drivers/staging/rtl8187se/r8180_core.c | 4 drivers/staging/rtl8187se/r8180_rtl8225.c | 369 ------------------------------ drivers/staging/rtl8187se/r8180_rtl8225.h | 4 3 files changed, 377 deletions(-)
drivers/staging/rtl8187se/r8180_core.c +0 -4
@@ -3613,10 +3613,6 @@ DMESG output to [email protected] THA priv->rf_init = rtl8225z2_rf_init; priv->rf_set_chan = rtl8225z2_rf_set_chan; priv->rf_set_sens =NULL ; -//priv->rf_sleep = rtl8225_rf_sleep; -//priv->rf_wakeup = rtl8225_rf_wakeup; - -if (!priv->card_8185){if (priv->antb)
drivers/staging/rtl8187se/r8180_rtl8225.c +0 -369
378 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8225.h +0 -4
@@ -29,11 +29,7 @@ void rtl8225_host_usb_init(struct net_devoid write_rtl8225 (struct net_device *dev,u8 adr,u16 data);void RF_WriteReg (struct net_device *dev,u8 offset,u32 data);u32 RF_ReadReg (struct net_device *dev,u8 offset); -void rtl8225_rf_init (struct net_device *dev);void rtl8225_rf_set_chan (struct net_device *dev,short ch); -void rtl8225_rf_close (struct net_device *dev); -void rtl8225_rf_sleep (struct net_device *dev); -void rtl8225_rf_wakeup (struct net_device *dev);void rtl8180_set_mode (struct net_device *dev,int mode);void rtl8180_set_mode (struct net_device *dev,int mode);bool SetZebraRFPowerState8185 (struct net_device *dev,RT_RF_POWER_STATE eRFPowerState);
PATCH 11/18 Staging: rtl8187se: cleanup r8180_rtl8225.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: cleanup r8180_rtl8225.c
* remove empty rtl8225_host_usb_init()
* remove commented out code
* remove useless comments
* beautify code
--- drivers/staging/rtl8187se/r8180_rtl8225.c | 251 +++++++++++----------------- drivers/staging/rtl8187se/r8180_rtl8225.h | 1 drivers/staging/rtl8187se/r8180_rtl8225z2.c | 5 3 files changed, 103 insertions(+), 154 deletions(-)
drivers/staging/rtl8187se/r8180_rtl8225.c +102 -149
@@ -16,35 +16,23 @@#include "r8180_rtl8225.h" -u8 rtl8225_gain[]={ -0x23 ,0x88 ,0x7c ,0xa5 ,// -82dbm -0x23 ,0x88 ,0x7c ,0xb5 ,// -82dbm -0x23 ,0x88 ,0x7c ,0xc5 ,// -82dbm -0x33 ,0x80 ,0x79 ,0xc5 ,// -78dbm -0x43 ,0x78 ,0x76 ,0xc5 ,// -74dbm -0x53 ,0x60 ,0x73 ,0xc5 ,// -70dbm -0x63 ,0x58 ,0x70 ,0xc5 ,// -66dbm +u8 rtl8225_gain[] = { +0x23 ,0x88 ,0x7c ,0xa5 ,/* -82dBm */ +0x23 ,0x88 ,0x7c ,0xb5 ,/* -82dBm */ +0x23 ,0x88 ,0x7c ,0xc5 ,/* -82dBm */ +0x33 ,0x80 ,0x79 ,0xc5 ,/* -78dBm */ +0x43 ,0x78 ,0x76 ,0xc5 ,/* -74dBm */ +0x53 ,0x60 ,0x73 ,0xc5 ,/* -70dBm */ +0x63 ,0x58 ,0x70 ,0xc5 ,/* -66dBm */ }; -u32 rtl8225_chan[] ={ -0 , -0x0080 ,//ch1 -0x0100 ,//ch2 -0x0180 ,//ch3 -0x0200 ,//ch4 -0x0280 , -0x0300 , -0x0380 , -0x0400 , -0x0480 , -0x0500 , -0x0580 , -0x0600 , -0x0680 , -0x074A ,//ch14 +u32 rtl8225_chan[] = { +0 , +0x0080 ,0x0100 ,0x0180 ,0x0200 ,0x0280 ,0x0300 ,0x0380 , +0x0400 ,0x0480 ,0x0500 ,0x0580 ,0x0600 ,0x0680 ,0x074A , }; -u16 rtl8225bcd_rxgain[]={ +u16 rtl8225bcd_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 ,
@@ -60,48 +48,51 @@ u16 rtl8225bcd_rxgain[]={ }; -u8 rtl8225_agc[]={ -0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9d ,0x9c ,0x9b ,0x9a ,0x99 ,0x98 ,0x97 ,0x96 , -0x95 ,0x94 ,0x93 ,0x92 ,0x91 ,0x90 ,0x8f ,0x8e ,0x8d ,0x8c ,0x8b ,0x8a ,0x89 ,0x88 ,0x87 ,0x86 , -0x85 ,0x84 ,0x83 ,0x82 ,0x81 ,0x80 ,0x3f ,0x3e ,0x3d ,0x3c ,0x3b ,0x3a ,0x39 ,0x38 ,0x37 ,0x36 , -0x35 ,0x34 ,0x33 ,0x32 ,0x31 ,0x30 ,0x2f ,0x2e ,0x2d ,0x2c ,0x2b ,0x2a ,0x29 ,0x28 ,0x27 ,0x26 , -0x25 ,0x24 ,0x23 ,0x22 ,0x21 ,0x20 ,0x1f ,0x1e ,0x1d ,0x1c ,0x1b ,0x1a ,0x19 ,0x18 ,0x17 ,0x16 , -0x15 ,0x14 ,0x13 ,0x12 ,0x11 ,0x10 ,0x0f ,0x0e ,0x0d ,0x0c ,0x0b ,0x0a ,0x09 ,0x08 ,0x07 ,0x06 , -0x05 ,0x04 ,0x03 ,0x02 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 , -0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 , +u8 rtl8225_agc[] = { +0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9e ,0x9e , +0x9d ,0x9c ,0x9b ,0x9a ,0x99 ,0x98 ,0x97 ,0x96 , +0x95 ,0x94 ,0x93 ,0x92 ,0x91 ,0x90 ,0x8f ,0x8e , +0x8d ,0x8c ,0x8b ,0x8a ,0x89 ,0x88 ,0x87 ,0x86 , +0x85 ,0x84 ,0x83 ,0x82 ,0x81 ,0x80 ,0x3f ,0x3e , +0x3d ,0x3c ,0x3b ,0x3a ,0x39 ,0x38 ,0x37 ,0x36 , +0x35 ,0x34 ,0x33 ,0x32 ,0x31 ,0x30 ,0x2f ,0x2e , +0x2d ,0x2c ,0x2b ,0x2a ,0x29 ,0x28 ,0x27 ,0x26 , +0x25 ,0x24 ,0x23 ,0x22 ,0x21 ,0x20 ,0x1f ,0x1e , +0x1d ,0x1c ,0x1b ,0x1a ,0x19 ,0x18 ,0x17 ,0x16 , +0x15 ,0x14 ,0x13 ,0x12 ,0x11 ,0x10 ,0x0f ,0x0e , +0x0d ,0x0c ,0x0b ,0x0a ,0x09 ,0x08 ,0x07 ,0x06 , +0x05 ,0x04 ,0x03 ,0x02 ,0x01 ,0x01 ,0x01 ,0x01 , +0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 , +0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 , +0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 ,0x01 , }; - -u8 rtl8225_tx_gain_cck_ofdm[]={ -0x02 ,0x06 ,0x0e ,0x1e ,0x3e ,0x7e +u8 rtl8225_tx_gain_cck_ofdm[] = { +0x02 ,0x06 ,0x0e ,0x1e ,0x3e ,0x7e }; - -u8 rtl8225_tx_power_ofdm[]={ -0x80 ,0x90 ,0xa2 ,0xb5 ,0xcb ,0xe4 +u8 rtl8225_tx_power_ofdm[] = { +0x80 ,0x90 ,0xa2 ,0xb5 ,0xcb ,0xe4 }; - -u8 rtl8225_tx_power_cck_ch14[]={ -0x18 ,0x17 ,0x15 ,0x0c ,0x00 ,0x00 ,0x00 ,0x00 , -0x1b ,0x1a ,0x17 ,0x0e ,0x00 ,0x00 ,0x00 ,0x00 , -0x1f ,0x1e ,0x1a ,0x0f ,0x00 ,0x00 ,0x00 ,0x00 , -0x22 ,0x21 ,0x1d ,0x11 ,0x00 ,0x00 ,0x00 ,0x00 , -0x26 ,0x25 ,0x21 ,0x13 ,0x00 ,0x00 ,0x00 ,0x00 , -0x2b ,0x2a ,0x25 ,0x15 ,0x00 ,0x00 ,0x00 ,0x00 +u8 rtl8225_tx_power_cck_ch14[] = { +0x18 ,0x17 ,0x15 ,0x0c ,0x00 ,0x00 ,0x00 ,0x00 , +0x1b ,0x1a ,0x17 ,0x0e ,0x00 ,0x00 ,0x00 ,0x00 , +0x1f ,0x1e ,0x1a ,0x0f ,0x00 ,0x00 ,0x00 ,0x00 , +0x22 ,0x21 ,0x1d ,0x11 ,0x00 ,0x00 ,0x00 ,0x00 , +0x26 ,0x25 ,0x21 ,0x13 ,0x00 ,0x00 ,0x00 ,0x00 , +0x2b ,0x2a ,0x25 ,0x15 ,0x00 ,0x00 ,0x00 ,0x00 }; - -u8 rtl8225_tx_power_cck[]={ -0x18 ,0x17 ,0x15 ,0x11 ,0x0c ,0x08 ,0x04 ,0x02 , -0x1b ,0x1a ,0x17 ,0x13 ,0x0e ,0x09 ,0x04 ,0x02 , -0x1f ,0x1e ,0x1a ,0x15 ,0x10 ,0x0a ,0x05 ,0x02 , -0x22 ,0x21 ,0x1d ,0x18 ,0x11 ,0x0b ,0x06 ,0x02 , -0x26 ,0x25 ,0x21 ,0x1b ,0x14 ,0x0d ,0x06 ,0x03 , -0x2b ,0x2a ,0x25 ,0x1e ,0x16 ,0x0e ,0x07 ,0x03 +u8 rtl8225_tx_power_cck[] = { +0x18 ,0x17 ,0x15 ,0x11 ,0x0c ,0x08 ,0x04 ,0x02 , +0x1b ,0x1a ,0x17 ,0x13 ,0x0e ,0x09 ,0x04 ,0x02 , +0x1f ,0x1e ,0x1a ,0x15 ,0x10 ,0x0a ,0x05 ,0x02 , +0x22 ,0x21 ,0x1d ,0x18 ,0x11 ,0x0b ,0x06 ,0x02 , +0x26 ,0x25 ,0x21 ,0x1b ,0x14 ,0x0d ,0x06 ,0x03 , +0x2b ,0x2a ,0x25 ,0x1e ,0x16 ,0x0e ,0x07 ,0x03 }; -void rtl8225_set_gain (struct net_device *dev,short gain) {write_phy_ofdm (dev,0x0d , rtl8225_gain[gain *4 ]);
@@ -113,15 +104,15 @@ void rtl8225_set_gain(struct net_devicevoid write_rtl8225 (struct net_device *dev,u8 adr,u16 data) {int i; -u16 out,select; +u16 out, select;u8 bit;u32 bangdata = (data <<4 ) | (adr &0xf );struct r8180_priv *priv =ieee80211_priv (dev); out =read_nic_word (dev, RFPinsOutput) &0xfff3 ; -write_nic_word (dev,RFPinsEnable, - (read_nic_word (dev,RFPinsEnable) |0x7 )); +write_nic_word (dev, RFPinsEnable, + (read_nic_word (dev, RFPinsEnable) |0x7 )); select =read_nic_word (dev, RFPinsSelect);
@@ -131,7 +122,7 @@ void write_rtl8225(struct net_device *deforce_pci_posting (dev);udelay (10 ); -write_nic_word (dev, RFPinsOutput, out |BB_HOST_BANG_EN );//| 0x1fff); +write_nic_word (dev, RFPinsOutput, out |BB_HOST_BANG_EN );force_pci_posting (dev);udelay (2 );
@@ -141,10 +132,8 @@ void write_rtl8225(struct net_device *deforce_pci_posting (dev);udelay (10 ); - -for (i=15 ; i>=0 ;i--){ - - bit = (bangdata & (1 <<i)) >> i; +for (i =15 ; i >=0 ; i--) { + bit = (bangdata & (1 << i)) >> i;write_nic_word (dev, RFPinsOutput, bit | out);
@@ -152,7 +141,7 @@ void write_rtl8225(struct net_device *dewrite_nic_word (dev, RFPinsOutput, bit | out |BB_HOST_BANG_CLK ); i--; - bit = (bangdata & (1 <<i)) >> i; + bit = (bangdata & (1 << i)) >> i;write_nic_word (dev, RFPinsOutput, bit | out |BB_HOST_BANG_CLK );write_nic_word (dev, RFPinsOutput, bit | out |BB_HOST_BANG_CLK );
@@ -172,7 +161,7 @@ void write_rtl8225(struct net_device *dewrite_nic_word (dev, RFPinsSelect, select | ((priv->card_type ==USB ) ?0 :SW_CONTROL_GPIO )); -if (priv->card_type ==USB ) +if (priv->card_type ==USB )mdelay (2 );else rtl8185_rf_pins_enable (dev);
@@ -181,7 +170,6 @@ void write_rtl8225(struct net_device *devoid rtl8225_SetTXPowerLevel (struct net_device *dev,short ch) {struct r8180_priv *priv =ieee80211_priv (dev); -int GainIdx;int GainSetting;int i;
@@ -193,36 +181,31 @@ void rtl8225_SetTXPowerLevel(struct net_u8 cck_power_level =0xff & priv->chtxpwr[ch];u8 ofdm_power_level =0xff & priv->chtxpwr_ofdm[ch]; -if (priv->card_type ==USB ){ +if (priv->card_type ==USB ) { max_cck_power_level =11 ; - max_ofdm_power_level =25 ;// 12 -> 25 + max_ofdm_power_level =25 ; min_ofdm_power_level =10 ; - }else { + }else { max_cck_power_level =35 ; max_ofdm_power_level =35 ; min_ofdm_power_level =0 ; } -/* CCK power setting */ -if (cck_power_level > max_cck_power_level) + +if (cck_power_level > max_cck_power_level) cck_power_level = max_cck_power_level; - GainIdx=cck_power_level %6 ; - GainSetting=cck_power_level /6 ; -if (ch ==14 ) + GainIdx = cck_power_level %6 ; + GainSetting = cck_power_level /6 ; + +if (ch ==14 ) cck_power_table = rtl8225_tx_power_cck_ch14;else cck_power_table = rtl8225_tx_power_cck; -// if(priv->card_8185 == 1 && priv->card_8185_Bversion ){ -/*Ver B*/ -// write_nic_byte(dev, TX_GAIN_CCK, rtl8225_tx_gain_cck_ofdm[GainSetting]); -// }else{ -/*Ver C - D */ -write_nic_byte (dev,TX_GAIN_CCK , rtl8225_tx_gain_cck_ofdm[GainSetting]>>1 ); -// } - -for (i=0 ;i<8 ;i++){ +write_nic_byte (dev,TX_GAIN_CCK , + rtl8225_tx_gain_cck_ofdm[GainSetting] >>1 ); +for (i =0 ; i <8 ; i++) { power = cck_power_table[GainIdx *8 + i];write_phy_cck (dev,0x44 + i, power); }
@@ -231,48 +214,33 @@ void rtl8225_SetTXPowerLevel(struct net_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)) +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; -if (ofdm_power_level >35 ) + +if (ofdm_power_level >35 ) ofdm_power_level =35 ; -// - GainIdx=ofdm_power_level %6 ; - GainSetting=ofdm_power_level /6 ; -#if 1 -// if(priv->card_type == USB){ -rtl8185_set_anaparam2 (dev,RTL8225_ANAPARAM2_ON ); - -write_phy_ofdm (dev,2 ,0x42 ); -write_phy_ofdm (dev,6 ,0 ); -write_phy_ofdm (dev,8 ,0 ); -// } -#endif -// if(priv->card_8185 == 1 && priv->card_8185_Bversion){ -// /*Ver B*/ -// write_nic_byte(dev, TX_GAIN_OFDM, rtl8225_tx_gain_cck_ofdm[GainSetting]); -// }else{ -/*Ver C - D */ -write_nic_byte (dev,TX_GAIN_OFDM , rtl8225_tx_gain_cck_ofdm[GainSetting]>>1 ); -// } + GainIdx = ofdm_power_level %6 ; + GainSetting = ofdm_power_level /6 ; + +rtl8185_set_anaparam2 (dev,RTL8225_ANAPARAM2_ON ); + +write_phy_ofdm (dev,2 ,0x42 ); +write_phy_ofdm (dev,6 ,0x00 ); +write_phy_ofdm (dev,8 ,0x00 ); +write_nic_byte (dev,TX_GAIN_OFDM , + rtl8225_tx_gain_cck_ofdm[GainSetting] >>1 ); power = rtl8225_tx_power_ofdm[GainIdx]; -write_phy_ofdm (dev,0x5 , power); -write_phy_ofdm (dev,0x7 , power); +write_phy_ofdm (dev,5 , power); +write_phy_ofdm (dev,7 , power);force_pci_posting (dev);mdelay (1 ); -//write_nic_byte(dev, TX_AGC_CONTROL,4); }void rtl8225_rf_set_chan (struct net_device *dev,short ch)
@@ -289,34 +257,27 @@ void rtl8225_rf_set_chan(struct net_deviforce_pci_posting (dev);mdelay (10 ); -// A mode sifs 0x44, difs 34-14, slot 9, eifs 23, cwm 3, cwM 7, ctstoself 0x10 -if (gset){ -write_nic_byte (dev,SIFS ,0x22 );// SIFS: 0x22 -write_nic_byte (dev,DIFS ,0x14 );//DIFS: 20 -//write_nic_byte(dev,DIFS,20); //DIFS: 20 - }else { -write_nic_byte (dev,SIFS ,0x44 );// SIFS: 0x22 -write_nic_byte (dev,DIFS ,50 -14 );//DIFS: 36 +if (gset) { +write_nic_byte (dev,SIFS ,0x22 ); +write_nic_byte (dev,DIFS ,0x14 ); + }else { +write_nic_byte (dev,SIFS ,0x44 ); +write_nic_byte (dev,DIFS ,0x24 ); } -if (priv->ieee80211->state ==IEEE80211_LINKED && -ieee80211_is_shortslot (priv->ieee80211->current_network)) -write_nic_byte (dev,SLOT ,0x9 );//SLOT: 9 +if (priv->ieee80211->state ==IEEE80211_LINKED && +ieee80211_is_shortslot (priv->ieee80211->current_network)) +write_nic_byte (dev,SLOT ,0x9 );else -write_nic_byte (dev,SLOT ,0x14 );//SLOT: 20 (0x14) +write_nic_byte (dev,SLOT ,0x14 ); - -if (gset){ -write_nic_byte (dev,EIFS ,81 );//91 - 20); // EIFS: 91 (0x5B) -write_nic_byte (dev,CW_VAL ,0x73 );//CW VALUE: 0x37 -//DMESG("using G net params"); - }else { -write_nic_byte (dev,EIFS ,81 );// EIFS: 91 (0x5B) -write_nic_byte (dev,CW_VAL ,0xa5 );//CW VALUE: 0x37 -//DMESG("using B net params"); +if (gset) { +write_nic_byte (dev,EIFS ,81 ); +write_nic_byte (dev,CW_VAL ,0x73 ); + }else { +write_nic_byte (dev,EIFS ,81 ); +write_nic_byte (dev,CW_VAL ,0xa5 ); } - - }void rtl8225_host_pci_init (struct net_device *dev)
@@ -325,21 +286,13 @@ void rtl8225_host_pci_init(struct net_dertl8185_rf_pins_enable (dev); -//if(priv->card_8185 == 2 && priv->enable_gpio0 ) /* version D */ -//write_nic_word(dev, RFPinsSelect, 0x88); -//else -write_nic_word (dev, RFPinsSelect,0x88 |SW_CONTROL_GPIO );/* 0x488 | SW_CONTROL_GPIO */ +write_nic_word (dev, RFPinsSelect,0x88 |SW_CONTROL_GPIO );write_nic_byte (dev,GP_ENABLE ,0 );force_pci_posting (dev);mdelay (200 ); -write_nic_word (dev,GP_ENABLE ,0xff & (~(1 <<6 )));/* bit 6 is for RF on/off detection */ - - -} - -void rtl8225_host_usb_init (struct net_device *dev) -{ +/* bit 6 is for RF on/off detection */ +write_nic_word (dev,GP_ENABLE ,0xff & (~(1 <<6 ))); }
drivers/staging/rtl8187se/r8180_rtl8225.h +0 -1
@@ -24,7 +24,6 @@ void rtl8225z2_rf_set_chan(struct net_devoid rtl8225z2_rf_close (struct net_device *dev);void rtl8225_host_pci_init (struct net_device *dev); -void rtl8225_host_usb_init (struct net_device *dev);void write_rtl8225 (struct net_device *dev,u8 adr,u16 data);void RF_WriteReg (struct net_device *dev,u8 offset,u32 data);
drivers/staging/rtl8187se/r8180_rtl8225z2.c +1 -4
@@ -472,10 +472,7 @@ void rtl8225z2_rf_init(struct net_device// rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); - -if (priv->card_type ==USB ) -rtl8225_host_usb_init (dev); -else +if (priv->card_type !=USB )rtl8225_host_pci_init (dev);write_nic_dword (dev,RF_TIMING ,0x000a8008 );
PATCH 12/18 Staging: rtl8187se: merge r8180_rtl8225.c with r8180_rtl8225z2.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: merge r8180_rtl8225.c with r8180_rtl8225z2.c
* merge r8180_rtl8225.c with r8180_rtl8225z2.c
* make functions static
* make tables static const
* remove unused rtl8225_set_gain()
--- drivers/staging/rtl8187se/Makefile | 1 drivers/staging/rtl8187se/r8180_rtl8225.c | 298 ---------------------------- drivers/staging/rtl8187se/r8180_rtl8225.h | 5 drivers/staging/rtl8187se/r8180_rtl8225z2.c | 275 +++++++++++++++++++++++++ 4 files changed, 272 insertions(+), 307 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -22,7 +22,6 @@ rtl8187se-objs := \ r8180_core.o \ r8180_93cx6.o \ r8180_wx.o \ - r8180_rtl8225.o \ r8180_rtl8225z2.o \ r8185b_init.o \ r8180_dm.o \
drivers/staging/rtl8187se/r8180_rtl8225.c deleted +0 -298
298 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_rtl8225.h +1 -4
@@ -23,12 +23,9 @@ void rtl8225z2_rf_init(struct net_devicevoid rtl8225z2_rf_set_chan (struct net_device *dev,short ch);void rtl8225z2_rf_close (struct net_device *dev); -void rtl8225_host_pci_init (struct net_device *dev); - -void write_rtl8225 (struct net_device *dev,u8 adr,u16 data);void RF_WriteReg (struct net_device *dev,u8 offset,u32 data);u32 RF_ReadReg (struct net_device *dev,u8 offset); -void rtl8225_rf_set_chan (struct net_device *dev,short ch); +void rtl8180_set_mode (struct net_device *dev,int mode);void rtl8180_set_mode (struct net_device *dev,int mode);bool SetZebraRFPowerState8185 (struct net_device *dev,RT_RF_POWER_STATE eRFPowerState);
drivers/staging/rtl8187se/r8180_rtl8225z2.c +271 -4
294 lines not on this page · raw message
PATCH 13/18 Staging: rtl8187se: cleanup r8180_pm.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: cleanup r8180_pm.c
* remove unused rtl8180_{save_state,enable_wake}()
* remove commented out code
* beautify code
--- drivers/staging/rtl8187se/r8180_pm.c | 32 ++++++++------------------------ drivers/staging/rtl8187se/r8180_pm.h | 2 -- 2 files changed, 8 insertions(+), 26 deletions(-)
drivers/staging/rtl8187se/r8180_pm.c +8 -24
@@ -15,16 +15,9 @@#include "r8180_pm.h" #include "r8180.h" -int rtl8180_save_state (struct pci_dev *dev,u32 state) -{ -printk (KERN_NOTICE "r8180 save state call (state %u).\n" , state); -return (-EAGAIN ); -} - -int rtl8180_suspend (struct pci_dev *pdev,pm_message_t state) +int rtl8180_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev); -// struct r8180_priv *priv = ieee80211_priv(dev); if (!netif_running (dev)) goto out_pci_suspend;
@@ -37,27 +30,28 @@ int rtl8180_suspend (struct pci_dev *pde out_pci_suspend:pci_save_state (pdev);pci_disable_device (pdev); -pci_set_power_state (pdev,pci_choose_state (pdev,state)); +pci_set_power_state (pdev,pci_choose_state (pdev, state));return 0 ; } -int rtl8180_resume (struct pci_dev *pdev) +int rtl8180_resume (struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); -// struct r8180_priv *priv = ieee80211_priv(dev); int err;u32 val;pci_set_power_state (pdev,PCI_D0 ); err =pci_enable_device (pdev); -if (err) { +if (err) {printk (KERN_ERR "%s: pci_enable_device failed on resume\n" , dev->name);return err; } +pci_restore_state (pdev); +/* * Suspend/Resume resets the PCI configuration space, so we have to * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
@@ -68,23 +62,13 @@ int rtl8180_resume (struct pci_dev *pdevif ((val &0x0000ff00 ) !=0 )pci_write_config_dword (pdev,0x40 , val &0xffff00ff ); -if (!netif_running (dev)) +if (!netif_running (dev)) goto out;if (dev->netdev_ops->ndo_open) dev->netdev_ops->ndo_open (dev); +netif_device_attach (dev); out:return 0 ; } - - -int rtl8180_enable_wake (struct pci_dev *dev,u32 state,int enable) -{ -printk (KERN_NOTICE "r8180 enable wake call (state %u, enable %d).\n" , - state, enable); -return (-EAGAIN ); -} - - -
drivers/staging/rtl8187se/r8180_pm.h +0 -2
@@ -17,10 +17,8 @@#include <linux/types.h> #include <linux/pci.h> -int rtl8180_save_state (struct pci_dev *dev,u32 state);int rtl8180_suspend (struct pci_dev *pdev,pm_message_t state);int rtl8180_resume (struct pci_dev *pdev); -int rtl8180_enable_wake (struct pci_dev *dev,u32 state,int enable);#endif //R8180_PM_H
PATCH 14/18 Staging: rtl8187se: merge r8180_pm.c with r8180_core.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: merge r8180_pm.c with r8180_core.c
* merge r8180_pm.c with r8180_core.c
* make functions static
--- drivers/staging/rtl8187se/Makefile | 1 drivers/staging/rtl8187se/r8180_core.c | 63 ++++++++++++++++++++++++++- drivers/staging/rtl8187se/r8180_pm.c | 74 -------------------------------- drivers/staging/rtl8187se/r8180_pm.h | 24 ---------- drivers/staging/rtl8187se/r8185b_init.c | 2 5 files changed, 61 insertions(+), 103 deletions(-)
drivers/staging/rtl8187se/Makefile +0 -1
@@ -25,7 +25,6 @@ rtl8187se-objs := \ r8180_rtl8225z2.o \ r8185b_init.o \ r8180_dm.o \ - r8180_pm.o \ ieee80211/dot11d.o \ ieee80211/ieee80211_softmac.o \ ieee80211/ieee80211_rx.o \
drivers/staging/rtl8187se/r8180_core.c +61 -2
81 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_pm.c deleted +0 -74
74 lines not on this page · raw message
drivers/staging/rtl8187se/r8180_pm.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* -Power management interface routines. -Written by Mariusz Matuszek. -This code is currently just a placeholder for later work and -does not do anything useful. - -This is part of rtl8180 OpenSource driver. -Copyright (C) Andrea Merello 2004 <[email protected]> -Released under the terms of GPL (General Public Licence) - -*/ - - -#ifndef R8180_PM_H -#define R8180_PM_H - -#include <linux/types.h> -#include <linux/pci.h> - -int rtl8180_suspend (struct pci_dev *pdev,pm_message_t state); -int rtl8180_resume (struct pci_dev *pdev); - -#endif //R8180_PM_H -
drivers/staging/rtl8187se/r8185b_init.c +0 -2
@@ -26,8 +26,6 @@ Notes:#include "r8180_93cx6.h" /* Card EEPROM */ #include "r8180_wx.h" -#include "r8180_pm.h" -#include "ieee80211/dot11d.h"
PATCH 15/18 Staging: rtl8187se: remove unused definitions from r8180_hw.h
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove unused definitions from r8180_hw.h
--- drivers/staging/rtl8187se/r8180_hw.h | 314 ----------------------------------- 1 file changed, 5 insertions(+), 309 deletions(-)
drivers/staging/rtl8187se/r8180_hw.h +5 -309
@@ -29,18 +29,10 @@#define BIT5 0x00000020#define BIT6 0x00000040#define BIT7 0x00000080 -#define BIT8 0x00000100#define BIT9 0x00000200 -#define BIT10 0x00000400#define BIT11 0x00000800 -#define BIT12 0x00001000#define BIT13 0x00002000 -#define BIT14 0x00004000#define BIT15 0x00008000 -#define BIT16 0x00010000 -#define BIT17 0x00020000 -#define BIT18 0x00040000 -#define BIT19 0x00080000#define BIT20 0x00100000#define BIT21 0x00200000#define BIT22 0x00400000
@@ -57,29 +49,14 @@#define MAX_SLEEP_TIME (10000)#define MIN_SLEEP_TIME (50) -#define BB_ANTATTEN_CHAN14 0x0c -#define BB_ANTENNA_B 0x40 - -#define BB_HOST_BANG (1<<30)#define BB_HOST_BANG_EN (1<<2)#define BB_HOST_BANG_CLK (1<<1) -#define BB_HOST_BANG_DATA 1 - -#define ANAPARAM_TXDACOFF_SHIFT 27 -#define ANAPARAM_PWR0_MASK ((1<<30)|(1<<29)|(1<<28)) -#define ANAPARAM_PWR0_SHIFT 28 -#define ANAPARAM_PWR1_MASK ((1<<26)|(1<<25)|(1<<24)|(1<<23)|(1<<22)|(1<<21)|(1<<20)) -#define ANAPARAM_PWR1_SHIFT 20#define MAC0 0 -#define MAC1 1 -#define MAC2 2 -#define MAC3 3#define MAC4 4 -#define MAC5 5 +#define CMD 0x37#define CMD_RST_SHIFT 4 -#define CMD_RESERVED_MASK ((1<<1) | (1<<5) | (1<<6) | (1<<7))#define CMD_RX_ENABLE_SHIFT 3#define CMD_TX_ENABLE_SHIFT 2
@@ -96,13 +73,9 @@#define EPROM_W_SHIFT 1#define EPROM_R_SHIFT 0#define CONFIG2_DMA_POLLING_MODE_SHIFT 3 -#define INTA 0x3e +#define INTA_TXOVERFLOW (1<<15)#define INTA_TIMEOUT (1<<14) -#define INTA_BEACONTIMEOUT (1<<13) -#define INTA_ATIM (1<<12) -#define INTA_BEACONDESCERR (1<<11) -#define INTA_BEACONDESCOK (1<<10)#define INTA_HIPRIORITYDESCERR (1<<9)#define INTA_HIPRIORITYDESCOK (1<<8)#define INTA_NORMPRIORITYDESCERR (1<<7)
@@ -111,9 +84,9 @@#define INTA_RXDESCERR (1<<4)#define INTA_LOWPRIORITYDESCERR (1<<3)#define INTA_LOWPRIORITYDESCOK (1<<2) -#define INTA_RXCRCERR (1<<1)#define INTA_RXOK (1)#define INTA_MASK 0x3c +#define RXRING_ADDR 0xe4 // page 0#define PGSELECT 0x5e#define PGSELECT_PG_SHIFT 0
@@ -131,20 +104,15 @@#define ACCEPT_MCAST_FRAME_SHIFT 2#define ACCEPT_ALLMAC_FRAME_SHIFT 0#define ACCEPT_NICMAC_FRAME_SHIFT 1 +#define RX_FIFO_THRESHOLD_MASK ((1<<13) | (1<<14) | (1<<15))#define RX_FIFO_THRESHOLD_SHIFT 13 -#define RX_FIFO_THRESHOLD_128 3 -#define RX_FIFO_THRESHOLD_256 4 -#define RX_FIFO_THRESHOLD_512 5 -#define RX_FIFO_THRESHOLD_1024 6#define RX_FIFO_THRESHOLD_NONE 7#define RX_AUTORESETPHY_SHIFT 28 -#define EPROM_TYPE_SHIFT 6 +#define TX_CONF 0x40#define TX_CONF_HEADER_AUTOICREMENT_SHIFT 30#define TX_LOOPBACK_SHIFT 17 -#define TX_LOOPBACK_MAC 1 -#define TX_LOOPBACK_BASEBAND 2#define TX_LOOPBACK_NONE 0#define TX_LOOPBACK_CONTINUE 3#define TX_LOOPBACK_MASK ((1<<17)|(1<<18))
@@ -158,21 +126,12 @@#define TX_DMA_POLLING_HIPRIORITY_SHIFT 6#define TX_DMA_POLLING_NORMPRIORITY_SHIFT 5#define TX_DMA_POLLING_LOWPRIORITY_SHIFT 4 -#define TX_DMA_STOP_BEACON_SHIFT 3 -#define TX_DMA_STOP_HIPRIORITY_SHIFT 2 -#define TX_DMA_STOP_NORMPRIORITY_SHIFT 1 -#define TX_DMA_STOP_LOWPRIORITY_SHIFT 0#define TX_MANAGEPRIORITY_RING_ADDR 0x0C#define TX_BKPRIORITY_RING_ADDR 0x10#define TX_BEPRIORITY_RING_ADDR 0x14#define TX_VIPRIORITY_RING_ADDR 0x20#define TX_VOPRIORITY_RING_ADDR 0x24#define TX_HIGHPRIORITY_RING_ADDR 0x28 -//AC_VI and Low priority share the sane queue -#define TX_LOWPRIORITY_RING_ADDR TX_VIPRIORITY_RING_ADDR -//AC_VO and Norm priority share the same queue -#define TX_NORMPRIORITY_RING_ADDR TX_VOPRIORITY_RING_ADDR -#define MAX_RX_DMA_MASK ((1<<8) | (1<<9) | (1<<10))#define MAX_RX_DMA_2048 7#define MAX_RX_DMA_1024 6
@@ -189,11 +148,7 @@#define ATIM 0x72#define EPROM_CS_SHIFT 3#define EPROM_CK_SHIFT 2 -#define PHY_DELAY 0x78 -#define PHY_CONFIG 0x80#define PHY_ADR 0x7c -#define PHY_READ 0x7e -#define CARRIER_SENSE_COUNTER 0x79 //byte#define SECURITY 0x5f //1209 this is sth wrong#define SECURITY_WEP_TX_ENABLE_SHIFT 1#define SECURITY_WEP_RX_ENABLE_SHIFT 0
@@ -214,44 +169,16 @@* RealTek names are used. */ -#define IDR0 0x0000 -#define IDR1 0x0001 -#define IDR2 0x0002 -#define IDR3 0x0003 -#define IDR4 0x0004 -#define IDR5 0x0005 - -/* 0x0006 - 0x0007 - reserved */ - -#define MAR0 0x0008 -#define MAR1 0x0009 -#define MAR2 0x000A -#define MAR3 0x000B -#define MAR4 0x000C -#define MAR5 0x000D -#define MAR6 0x000E -#define MAR7 0x000F - -/* 0x0010 - 0x0017 - reserved */ -#define TSFTR 0x0018 -#define TSFTR_END 0x001F#define TLPDA 0x0020 -#define TLPDA_END 0x0023 -#define TNPDA 0x0024 -#define TNPDA_END 0x0027 -#define THPDA 0x0028 -#define THPDA_END 0x002B#define BSSID 0x002E -#define BSSID_END 0x0033#define CR 0x0037#define RF_SW_CONFIG 0x8 // store data which is transmitted to RF for driver#define RF_SW_CFG_SI BIT1 -#define PIFS 0x2C // PCF InterFrame Spacing Timer Setting.#define EIFS 0x2D // Extended InterFrame Space Timer, in unit of 4 us.#define BRSR 0x34 // Basic rate set
@@ -260,26 +187,16 @@#define ISR 0x003C#define TCR 0x0040 -#define TCR_END 0x0043#define RCR 0x0044 -#define RCR_END 0x0047#define TimerInt 0x0048 -#define TimerInt_END 0x004B - -#define TBDA 0x004C -#define TBDA_END 0x004F#define CR9346 0x0050#define CONFIG0 0x0051 -#define CONFIG1 0x0052#define CONFIG2 0x0053 -#define ANA_PARM 0x0054 -#define ANA_PARM_END 0x0x0057 -#define MSR 0x0058#define CONFIG3 0x0059
@@ -294,37 +211,17 @@#define TESTR 0x005B -/* 0x005C - 0x005D - reserved */ -#define PSR 0x005E -/* 0x0060 - 0x006F - reserved */ -#define BcnItv 0x0070 -#define BcnItv_END 0x0071#define AtimWnd 0x0072 -#define AtimWnd_END 0x0073#define BintrItv 0x0074 -#define BintrItv_END 0x0075 - -#define AtimtrItv 0x0076 -#define AtimtrItv_END 0x0077 - -#define PhyDelay 0x0078 - -#define CRCount 0x0079 - -/* 0x007A - 0x007B - reserved */ #define PhyAddr 0x007C -#define PhyDataW 0x007D#define PhyDataR 0x007E -#define PhyCFG 0x0080 -#define PhyCFG_END 0x0083 -/* following are for rtl8185 */ #define RFPinsOutput 0x80#define RFPinsEnable 0x82
@@ -356,100 +253,13 @@#define MAX_RESP_RATE_SHIFT 4#define MIN_RESP_RATE_SHIFT 0#define RATE_FALLBACK 0xbe -/* -* 0x0084 - 0x00D3 is selected to page 1 when PSEn bit (bit0, PSR) -* is set to 1 -*/ - -#define Wakeup0 0x0084 -#define Wakeup0_END 0x008B - -#define Wakeup1 0x008C -#define Wakeup1_END 0x0093 - -#define Wakeup2LD 0x0094 -#define Wakeup2LD_END 0x009B -#define Wakeup2HD 0x009C -#define Wakeup2HD_END 0x00A3 - -#define Wakeup3LD 0x00A4 -#define Wakeup3LD_END 0x00AB -#define Wakeup3HD 0x00AC -#define Wakeup3HD_END 0x00B3 - -#define Wakeup4LD 0x00B4 -#define Wakeup4LD_END 0x00BB -#define Wakeup4HD 0x00BC -#define Wakeup4HD_END 0x00C3 - -#define CRC0 0x00C4 -#define CRC0_END 0x00C5 -#define CRC1 0x00C6 -#define CRC1_END 0x00C7 -#define CRC2 0x00C8 -#define CRC2_END 0x00C9 -#define CRC3 0x00CA -#define CRC3_END 0x00CB -#define CRC4 0x00CC -#define CRC4_END 0x00CD - -/* 0x00CE - 0x00D3 - reserved */ - - - -/* -* 0x0084 - 0x00D3 is selected to page 0 when PSEn bit (bit0, PSR) -* is set to 0 -*/ - -/* 0x0084 - 0x008F - reserved */ - -#define DK0 0x0090 -#define DK0_END 0x009F -#define DK1 0x00A0 -#define DK1_END 0x00AF -#define DK2 0x00B0 -#define DK2_END 0x00BF -#define DK3 0x00C0 -#define DK3_END 0x00CF - -/* 0x00D0 - 0x00D3 - reserved */ - - - - - -/* 0x00D4 - 0x00D7 - reserved */ #define CONFIG5 0x00D8 -#define TPPoll 0x00D9 - -/* 0x00DA - 0x00DB - reserved */ -#define PHYPR 0xDA //0xDA - 0x0B PHY Parameter Register. -#define CWR 0x00DC -#define CWR_END 0x00DD - -#define RetryCTR 0x00DE - -/* 0x00DF - 0x00E3 - reserved */ - -#define RDSAR 0x00E4 -#define RDSAR_END 0x00E7 - -/* 0x00E8 - 0x00EF - reserved */ -#define LED_CONTROL 0xED - -#define FER 0x00F0 -#define FER_END 0x00F3 -#define FEMR 0x1D4 // Function Event Mask register -#define FPSR 0x00F8 -#define FPSR_END 0x00FB -#define FFER 0x00FC#define FFER_END 0x00FF
@@ -598,53 +408,10 @@#define CR9346_EED1 ((1<<1))#define CR9346_EED0 ((1<<0)) -#define CONFIG0_WEP104 ((1<<6)) -#define CONFIG0_LEDGPO_En ((1<<4)) -#define CONFIG0_Aux_Status ((1<<3)) -#define CONFIG0_GL ((1<<1)|(1<<0)) -#define CONFIG0_GL1 ((1<<1)) -#define CONFIG0_GL0 ((1<<0)) - -#define CONFIG1_LEDS ((1<<7)|(1<<6)) -#define CONFIG1_LEDS1 ((1<<7)) -#define CONFIG1_LEDS0 ((1<<6)) -#define CONFIG1_LWACT ((1<<4)) -#define CONFIG1_MEMMAP ((1<<3)) -#define CONFIG1_IOMAP ((1<<2)) -#define CONFIG1_VPD ((1<<1)) -#define CONFIG1_PMEn ((1<<0)) - -#define CONFIG2_LCK ((1<<7)) -#define CONFIG2_ANT ((1<<6)) -#define CONFIG2_DPS ((1<<3)) -#define CONFIG2_PAPE_sign ((1<<2)) -#define CONFIG2_PAPE_time ((1<<1)|(1<<0)) -#define CONFIG2_PAPE_time1 ((1<<1)) -#define CONFIG2_PAPE_time0 ((1<<0)) - -#define CONFIG3_GNTSel ((1<<7))#define CONFIG3_PARM_En ((1<<6)) -#define CONFIG3_Magic ((1<<5)) -#define CONFIG3_CardB_En ((1<<3)) -#define CONFIG3_CLKRUN_En ((1<<2))#define CONFIG3_FuncRegEn ((1<<1)) -#define CONFIG3_FBtbEn ((1<<0)) -#define CONFIG4_VCOPDN ((1<<7)) -#define CONFIG4_PWROFF ((1<<6))#define CONFIG4_PWRMGT ((1<<5)) -#define CONFIG4_LWPME ((1<<4)) -#define CONFIG4_LWPTN ((1<<2)) -#define CONFIG4_RFTYPE ((1<<1)|(1<<0)) -#define CONFIG4_RFTYPE1 ((1<<1)) -#define CONFIG4_RFTYPE0 ((1<<0)) - -#define CONFIG5_TX_FIFO_OK ((1<<7)) -#define CONFIG5_RX_FIFO_OK ((1<<6)) -#define CONFIG5_CALON ((1<<5)) -#define CONFIG5_EACPI ((1<<2)) -#define CONFIG5_LANWake ((1<<1)) -#define CONFIG5_PME_STS ((1<<0))#define MSR_LINK_MASK ((1<<2)|(1<<3))#define MSR_LINK_MANAGED 2
@@ -653,50 +420,16 @@#define MSR_LINK_ADHOC 1#define MSR_LINK_MASTER 3 -#define PSR_GPO ((1<<7)) -#define PSR_GPI ((1<<6)) -#define PSR_LEDGPO1 ((1<<5)) -#define PSR_LEDGPO0 ((1<<4)) -#define PSR_UWF ((1<<1)) -#define PSR_PSEn ((1<<0)) - -#define SCR_KM ((1<<5)|(1<<4)) -#define SCR_KM1 ((1<<5)) -#define SCR_KM0 ((1<<4)) -#define SCR_TXSECON ((1<<1)) -#define SCR_RXSECON ((1<<0)) -#define BcnItv_BcnItv (0x01FF)#define AtimWnd_AtimWnd (0x01FF)#define BintrItv_BintrItv (0x01FF) -#define AtimtrItv_AtimtrItv (0x01FF) - -#define PhyDelay_PhyDelay ((1<<2)|(1<<1)|(1<<0)) - -#define TPPoll_BQ ((1<<7)) -#define TPPoll_HPQ ((1<<6)) -#define TPPoll_NPQ ((1<<5)) -#define TPPoll_LPQ ((1<<4)) -#define TPPoll_SBQ ((1<<3)) -#define TPPoll_SHPQ ((1<<2)) -#define TPPoll_SNPQ ((1<<1)) -#define TPPoll_SLPQ ((1<<0)) - -#define CWR_CW (0x01FF) - -#define FER_INTR ((1<<15)) -#define FER_GWAKE ((1<< 4)) -#define FEMR_INTR ((1<<15))#define FEMR_WKUP ((1<<14))#define FEMR_GWAKE ((1<< 4)) -#define FPSR_INTR ((1<<15)) -#define FPSR_GWAKE ((1<< 4)) -#define FFER_INTR ((1<<15))#define FFER_GWAKE ((1<< 4))
@@ -716,17 +449,6 @@#define RCR_MXDMA_OFFSET 8#define RCR_FIFO_OFFSET 13 -#define TMGDS 0x0C // Tx Management Descriptor Address -#define TBKDS 0x10 // Tx AC_BK Descriptor Address -#define TBEDS 0x14 // Tx AC_BE Descriptor Address -#define TLPDS 0x20 // Tx AC_VI Descriptor Address -#define TNPDS 0x24 // Tx AC_VO Descriptor Address -#define THPDS 0x28 // Tx Hign Priority Descriptor Address - -#define TBDS 0x4c // Beacon descriptor queue start address - -#define RDSA 0xE4 // Receive descriptor queue start address -#define AckTimeOutReg 0x79 // ACK timeout register, in unit of 4 us.#define RFTiming 0x8C
@@ -740,8 +462,6 @@#define ACM_CONTROL 0x00BF // ACM Control Registe -#define RTL8185B_VER_REG 0xE1 -#define IntMig 0xE2 // Interrupt Migration (0xE2 ~ 0xE3)#define TID_AC_MAP 0xE8 // TID to AC Mapping Register
@@ -753,9 +473,7 @@#define AC_BE_PARAM 0xF8 // AC_BE Parameters Record#define AC_BK_PARAM 0xFC // AC_BK Parameters Record -#define BcnTimingAdjust 0x16A // Beacon Timing Adjust Register.#define GPIOCtrl 0x16B // GPIO Control Register. -#define PSByGC 0x180 // 0x180 - 0x183 Power Saving by Gated Clock.#define ARFR 0x1E0 // Auto Rate Fallback Register (0x1e0 ~ 0x1e2)#define RFSW_CTRL 0x272 // 0x272-0x273.
@@ -768,27 +486,10 @@#define SI_DATA_READ 0x362 // 0x362 - 0x363 Serial Interface Data Register.//---------------------------------------------------------------------------- -// 8185B TPPoll bits (offset 0xd9, 1 byte) -//---------------------------------------------------------------------------- -#define TPPOLL_BQ (0x01 << 7) -#define TPPOLL_HPQ (0x01 << 6) -#define TPPOLL_AC_VOQ (0x01 << 5) -#define TPPOLL_AC_VIQ (0x01 << 4) -#define TPPOLL_AC_BEQ (0x01 << 3) -#define TPPOLL_AC_BKQ (0x01 << 2) -#define TPPOLL_AC_MGQ (0x01 << 1) - -//---------------------------------------------------------------------------- // 8185B TPPollStop bits (offset 0x93, 1 byte) //---------------------------------------------------------------------------- #define TPPOLLSTOP_BQ (0x01 << 7) -#define TPPOLLSTOP_HPQ (0x01 << 6) -#define TPPOLLSTOP_AC_VOQ (0x01 << 5)#define TPPOLLSTOP_AC_VIQ (0x01 << 4) -#define TPPOLLSTOP_AC_BEQ (0x01 << 3) -#define TPPOLLSTOP_AC_BKQ (0x01 << 2) -#define TPPOLLSTOP_AC_MGQ (0x01 << 1) -#define MSR_LINK_ENEDCA (1<<4)
@@ -807,7 +508,6 @@#define VIQ_ACM_EN (0x01 << 6) //BIT6#define BEQ_ACM_EN (0x01 << 5) //BIT5#define ACM_HW_EN (0x01 << 4) //BIT4 -#define TXOPSEL (0x01 << 3) //BIT3#define VOQ_ACM_CTL (0x01 << 2) //BIT2 // Set to 1 when AC_VO used time reaches or exceeds the admitted time#define VIQ_ACM_CTL (0x01 << 1) //BIT1 // Set to 1 when AC_VI used time reaches or exceeds the admitted time#define BEQ_ACM_CTL (0x01 << 0) //BIT0 // Set to 1 when AC_BE used time reaches or exceeds the admitted time
@@ -838,7 +538,6 @@#define RTL8225z2_ANAPARAM_OFF 0x55480658#define RTL8225z2_ANAPARAM2_OFF 0x72003f70//by amy for power save -#define RF_CHANGE_BY_SW BIT31#define RF_CHANGE_BY_HW BIT30#define RF_CHANGE_BY_PS BIT29#define RF_CHANGE_BY_IPS BIT28
@@ -856,18 +555,15 @@//{by amy 080312 //0x7C, 0x7D Crystal calibration and Tx Power tracking mechanism. Added by Roger. 2007.12.10. #define EEPROM_RSV 0x7C -#define EEPROM_XTAL_CAL_MASK 0x00FF // 0x7C[7:0], Crystal calibration mask.#define EEPROM_XTAL_CAL_XOUT_MASK 0x0F // 0x7C[3:0], Crystal calibration for Xout.#define EEPROM_XTAL_CAL_XIN_MASK 0xF0 // 0x7C[7:4], Crystal calibration for Xin.#define EEPROM_THERMAL_METER_MASK 0x0F00 // 0x7D[3:0], Thermal meter reference level.#define EEPROM_XTAL_CAL_ENABLE 0x1000 // 0x7D[4], Crystal calibration enabled/disabled BIT.#define EEPROM_THERMAL_METER_ENABLE 0x2000 // 0x7D[5], Thermal meter enabled/disabled BIT. -#define EEPROM_CID_RSVD1 0x3F#define EN_LPF_CAL 0x238 // Enable LPF Calibration.#define PWR_METER_EN BIT1// <RJ_TODO_8185B> where are false alarm counters in 8185B? #define CCK_FALSE_ALARM 0xD0 -#define OFDM_FALSE_ALARM 0xD2//by amy 080312} //YJ,add for Country IE, 080630
PATCH 16/18 Staging: rtl8187se: remove unused definitions from r8180.h
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: remove unused definitions from r8180.h
--- drivers/staging/rtl8187se/r8180.h | 14 -------------- 1 file changed, 14 deletions(-)
drivers/staging/rtl8187se/r8180.h +0 -14
@@ -52,30 +52,16 @@#define DEFAULT_FRAG_THRESHOLD 2342U#define MIN_FRAG_THRESHOLD 256U -//#define MAX_FRAG_THRESHOLD 2342U #define DEFAULT_RTS_THRESHOLD 2342U#define MIN_RTS_THRESHOLD 0U#define MAX_RTS_THRESHOLD 2342U#define DEFAULT_BEACONINTERVAL 0x64U -#define DEFAULT_BEACON_ESSID "Rtl8180" -#define DEFAULT_SSID ""#define DEFAULT_RETRY_RTS 7#define DEFAULT_RETRY_DATA 7 -#define PRISM_HDR_SIZE 64 - -#define MGNT_QUEUE 0 -#define BK_QUEUE 1 -#define BE_QUEUE 2 -#define VI_QUEUE 3 -#define VO_QUEUE 4 -#define HIGH_QUEUE 5#define BEACON_QUEUE 6 -#define LOW_QUEUE BE_QUEUE -#define NORMAL_QUEUE MGNT_QUEUE -#define aSifsTime 10#define sCrcLng 4
PATCH 17/18 Staging: rtl8187se: cleanup r8180_rtl8225z2.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
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
--- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 894 ++++++++-------------------- 1 file changed, 279 insertions(+), 615 deletions(-)
drivers/staging/rtl8187se/r8180_rtl8225z2.c +279 -615
@@ -236,34 +236,31 @@ static void rtl8225_SetTXPowerLevel(strumdelay (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 -}; -*/ - -//- -u8 rtl8225z2_tx_power_ofdm[]={ -0x42 ,0x00 ,0x40 ,0x00 ,0x40 +static const u8 rtl8225z2_tx_power_ofdm[] = { +0x42 ,0x00 ,0x40 ,0x00 ,0x40 }; - -//- -u8 rtl8225z2_tx_power_cck_ch14[]={ -0x36 ,0x35 ,0x2e ,0x1b ,0x00 ,0x00 ,0x00 ,0x00 +static const u8 rtl8225z2_tx_power_cck_ch14[] = { +0x36 ,0x35 ,0x2e ,0x1b ,0x00 ,0x00 ,0x00 ,0x00 }; - -//- -u8 rtl8225z2_tx_power_cck[]={ -0x36 ,0x35 ,0x2e ,0x25 ,0x1c ,0x12 ,0x09 ,0x04 +static const 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, 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, 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, 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,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_devicrtl8185_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 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_devicewrite_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_devicewrite_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_devicewrite_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_dewrite_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_de } } -//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 ); } -
PATCH 18/18 Staging: rtl8187se: cleanup r8180_core.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtl8187se: cleanup r8180_core.c
* remove commented out code
* remove useless comments
* beautify code
--- drivers/staging/rtl8187se/r8180_core.c | 1412 +++++---------------------------- 1 file changed, 245 insertions(+), 1167 deletions(-)
drivers/staging/rtl8187se/r8180_core.c +245 -1167
@@ -31,8 +31,7 @@#undef DUMMY_RX#include <linux/syscalls.h> -//#include <linux/fcntl.h> -//#include <asm/uaccess.h> +#include "r8180_hw.h" #include "r8180.h" #include "r8180_rtl8225.h" /* RTL8225 Radio frontend */
@@ -52,7 +51,6 @@static struct pci_device_id rtl8180_pci_id_tbl[]__devinitdata = { { .vendor =PCI_VENDOR_ID_REALTEK , -// .device = 0x8180, .device =0x8199 , .subvendor =PCI_ANY_ID , .subdevice =PCI_ANY_ID ,
@@ -70,7 +68,6 @@ static struct pci_device_id rtl8180_pci_static char * ifname ="wlan%d" ;static int hwseqnum =0 ; -//static char* ifname = "ath%d"; static int hwwep =0 ;static int channels =0x3fff ;
@@ -82,28 +79,12 @@ MODULE_AUTHOR("Andrea Merello <andreamrlMODULE_DESCRIPTION ("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards" ); - -/* -MODULE_PARM(ifname, "s"); -MODULE_PARM_DESC(devname," Net interface name, wlan%d=default"); - -MODULE_PARM(hwseqnum,"i"); -MODULE_PARM_DESC(hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default"); - -MODULE_PARM(hwwep,"i"); -MODULE_PARM_DESC(hwwep," Try to use hardware WEP support. Still broken and not available on all cards"); - -MODULE_PARM(channels,"i"); -MODULE_PARM_DESC(channels," Channel bitmask for specific locales. NYI"); -*/ -module_param (ifname, charp,S_IRUGO |S_IWUSR );module_param (hwseqnum,int,S_IRUGO |S_IWUSR );module_param (hwwep,int,S_IRUGO |S_IWUSR );module_param (channels,int,S_IRUGO |S_IWUSR );MODULE_PARM_DESC (devname," Net interface name, wlan%d=default" ); -//MODULE_PARM_DESC(devname," Net interface name, ath%d=default"); MODULE_PARM_DESC (hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default" );MODULE_PARM_DESC (hwwep," Try to use hardware WEP support. Still broken and not available on all cards" );MODULE_PARM_DESC (channels," Channel bitmask for specific locales. NYI" );
@@ -181,18 +162,15 @@ out: }static struct pci_driver rtl8180_pci_driver = { - .name =RTL8180_MODULE_NAME ,/* Driver name */ - .id_table = rtl8180_pci_id_tbl,/* PCI_ID table */ - .probe = rtl8180_pci_probe,/* probe fn */ - .remove =__devexit_p (rtl8180_pci_remove),/* remove fn */ - .suspend = rtl8180_suspend,/* PM suspend fn */ - .resume = rtl8180_resume,/* PM resume fn */ + .name =RTL8180_MODULE_NAME , + .id_table = rtl8180_pci_id_tbl, + .probe = rtl8180_pci_probe, + .remove =__devexit_p (rtl8180_pci_remove), + .suspend = rtl8180_suspend, + .resume = rtl8180_resume, .shutdown = rtl8180_shutdown, }; - - -u8 read_nic_byte (struct net_device *dev,int x) {return 0xff &readb ((u8 *)dev->mem_start +x);
@@ -226,18 +204,12 @@ void write_nic_word(struct net_device *dudelay (20 ); } - - - - -inline void force_pci_posting (struct net_device *dev) {read_nic_byte (dev,EPROM_CMD );mb (); } -irqreturn_t rtl8180_interrupt (int irq,void *netdev,struct pt_regs *regs);void set_nic_rxring (struct net_device *dev);void set_nic_txring (struct net_device *dev);
@@ -245,10 +217,6 @@ static struct net_device_stats *rtl8180_void rtl8180_commit (struct net_device *dev);void rtl8180_start_tx_beacon (struct net_device *dev); -/**************************************************************************** ------------------------------PROCFS STUFF------------------------- -*****************************************************************************/ -static struct proc_dir_entry *rtl8180_proc =NULL ; static int proc_get_registers(char *page, char **start,
@@ -256,33 +224,22 @@ static int proc_get_registers(char *page int *eof, void *data) { struct net_device *dev = data; -// struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); -int len =0 ;int i,n; - -int max=0xff ; +int max =0xff ;/* This dump the current register page */ -for (n=0 ;n<=max;) - { -//printk( "\nD: %2x> ", n); - len +=snprintf (page + len, count - len, -"\nD: %2x > " ,n); - -for (i=0 ;i<16 && n<=max;i++,n++) - len +=snprintf (page + len, count - len, -"%2x " ,read_nic_byte (dev,n)); +for (n =0 ; n <= max;) { + len +=snprintf (page + len, count - len,"\nD: %2x > " , n); -// printk("%2x ",read_nic_byte(dev,n)); +for (i =0 ; i <16 && n <= max; i++, n++) + len +=snprintf (page + len, count - len,"%2x " , +read_nic_byte (dev, n)); } len +=snprintf (page + len, count - len,"\n" ); - - *eof =1 ;return len; - }int get_curr_tx_free_desc (struct net_device *dev,int priority);
@@ -291,16 +248,12 @@ static int proc_get_stats_hw(char *page, off_t offset, int count, int *eof, void *data) { - //struct net_device *dev = data; - //struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - int len = 0; *eof =1 ;return len; } -static int proc_get_stats_rx (char *page,char **start,off_t offset,int count,int *eof,void *data)
@@ -311,30 +264,6 @@ static int proc_get_stats_rx(char *page,int len =0 ; len +=snprintf (page + len, count - len, -/* "RX descriptor not available: %lu\n" -"RX incomplete (missing last descriptor): %lu\n" -"RX not data: %lu\n" -//"RX descriptor pointer reset: %lu\n" -"RX descriptor pointer lost: %lu\n" -//"RX pointer workaround: %lu\n" -"RX error int: %lu\n" -"RX fifo overflow: %lu\n" -"RX int: %lu\n" -"RX packet: %lu\n" -"RX bytes: %lu\n" -"RX DMA fail: %lu\n", -priv->stats.rxrdu, -priv->stats.rxnolast, -priv->stats.rxnodata, -//priv->stats.rxreset, -priv->stats.rxnopointer, -//priv->stats.rxwrkaround, -priv->stats.rxerr, -priv->stats.rxoverflow, -priv->stats.rxint, -priv->ieee80211->stats.rx_packets, -priv->ieee80211->stats.rx_bytes, -priv->stats.rxdmafail */ "RX OK: %lu\n" "RX Retry: %lu\n" "RX CRC Error(0-500): %lu\n"
@@ -365,36 +294,6 @@ static int proc_get_stats_tx(char *page, totalOK=priv->stats.txnpokint+priv->stats.txhpokint+priv->stats.txlpokint; len +=snprintf (page + len, count - len, -/* "TX normal priority ok int: %lu\n" -"TX normal priority error int: %lu\n" -"TX high priority ok int: %lu\n" -"TX high priority failed error int: %lu\n" -"TX low priority ok int: %lu\n" -"TX low priority failed error int: %lu\n" -"TX bytes: %lu\n" -"TX packets: %lu\n" -"TX queue resume: %lu\n" -"TX queue stopped?: %d\n" -"TX fifo overflow: %lu\n" -//"SW TX stop: %lu\n" -//"SW TX wake: %lu\n" -"TX beacon: %lu\n" -"TX beacon aborted: %lu\n", -priv->stats.txnpokint, -priv->stats.txnperr, -priv->stats.txhpokint, -priv->stats.txhperr, -priv->stats.txlpokint, -priv->stats.txlperr, -priv->ieee80211->stats.tx_bytes, -priv->ieee80211->stats.tx_packets, -priv->stats.txresumed, -netif_queue_stopped(dev), -priv->stats.txoverflow, -//priv->ieee80211->ieee_stats.swtxstop, -//priv->ieee80211->ieee_stats.swtxawake, -priv->stats.txbeacon, -priv->stats.txbeaconerr */ "TX OK: %lu\n" "TX Error: %lu\n" "TX Retry: %lu\n"
@@ -417,13 +316,11 @@ void rtl8180_proc_module_init(void) rtl8180_proc=create_proc_entry (RTL8180_MODULE_NAME ,S_IFDIR , init_net.proc_net); } -void rtl8180_proc_module_remove (void ) {remove_proc_entry (RTL8180_MODULE_NAME , init_net.proc_net); } -void rtl8180_proc_remove_one (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);
@@ -431,19 +328,17 @@ void rtl8180_proc_remove_one(struct net_remove_proc_entry ("stats-hw" , priv->dir_dev);remove_proc_entry ("stats-tx" , priv->dir_dev);remove_proc_entry ("stats-rx" , priv->dir_dev); -// remove_proc_entry("stats-ieee", priv->dir_dev); -// remove_proc_entry("stats-ap", priv->dir_dev); remove_proc_entry ("registers" , priv->dir_dev);remove_proc_entry (dev->name, rtl8180_proc); priv->dir_dev =NULL ; } } -void rtl8180_proc_init_one (struct net_device *dev) {struct proc_dir_entry *e;struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); + priv->dir_dev = rtl8180_proc;if (!priv->dir_dev) { DMESGE("Unable to initialize /proc/net/r8180/%s\n",
@@ -453,7 +348,6 @@ void rtl8180_proc_init_one(struct net_de e =create_proc_read_entry ("stats-hw" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_stats_hw, dev); -if (!e) { DMESGE("Unable to initialize " "/proc/net/r8180/%s/stats-hw\n",
@@ -462,7 +356,6 @@ void rtl8180_proc_init_one(struct net_de e =create_proc_read_entry ("stats-rx" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_stats_rx, dev); -if (!e) { DMESGE("Unable to initialize " "/proc/net/r8180/%s/stats-rx\n",
@@ -472,7 +365,6 @@ void rtl8180_proc_init_one(struct net_de e =create_proc_read_entry ("stats-tx" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_stats_tx, dev); -if (!e) { DMESGE("Unable to initialize " "/proc/net/r8180/%s/stats-tx\n",
@@ -481,16 +373,13 @@ void rtl8180_proc_init_one(struct net_de e =create_proc_read_entry ("registers" ,S_IFREG |S_IRUGO , priv->dir_dev, proc_get_registers, dev); -if (!e) {DMESGE ("Unable to initialize " "/proc/net/r8180/%s/registers\n" , dev->name); } } -/**************************************************************************** ------------------------------MISC STUFF------------------------- -*****************************************************************************/ +/* FIXME: check if we can use some standard already-existent data type+functions in kernel
@@ -530,7 +419,6 @@ short buffer_add(struct buffer **buffer,return 0 ; } -void buffer_free (struct net_device *dev,struct buffer **buffer,int len,short consistent) {
@@ -538,14 +426,12 @@ consistent)struct buffer *tmp,*next;struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);struct pci_dev *pdev=priv->pdev; -//int i; -if (! *buffer)return ; +if (!*buffer) +return ; -/*for(tmp=*buffer; tmp->next != *buffer; tmp=tmp->next) + tmp = *buffer; -*/ - tmp=*buffer; do{ next=tmp->next; if(consistent){
@@ -564,7 +450,6 @@ consistent) *buffer=NULL ; } -void print_buffer (u32 *buffer,int len) {int i;
@@ -583,7 +468,6 @@ void print_buffer(u32 *buffer, int len)printk ("\n" ); } -int get_curr_tx_free_desc (struct net_device *dev,int priority) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -620,34 +504,33 @@ int get_curr_tx_free_desc(struct net_devreturn -1 ; } -//DMESG("%x %x", head, tail); - -/* FIXME FIXME FIXME FIXME */ - -if ( head <= tail ) +if (head <= tail) ret = priv->txringcount - (tail - head)/8 ;else ret = (head - tail)/8 ; -if (ret > priv->txringcount )DMESG ("BUG" ); +if (ret > priv->txringcount) +DMESG ("BUG" ); +return ret; } -short check_nic_enought_desc (struct net_device *dev,int priority) {struct r8180_priv *priv =ieee80211_priv (dev);struct ieee80211_device *ieee =netdev_priv (dev); -int requiredbyte, required; + requiredbyte = priv->ieee80211->fts +sizeof (struct ieee80211_header_data ); -if (ieee->current_network.QoS_Enable) { +if (ieee->current_network.QoS_Enable) requiredbyte +=2 ; - }; required = requiredbyte / (priv->txbuffsize-4 ); -if (requiredbyte % priv->txbuffsize) required++; + +if (requiredbyte % priv->txbuffsize) + required++; +/* for now we keep two free descriptor as a safety boundary * between the tail and the head */
@@ -734,7 +617,6 @@ void fix_tx_fifo(struct net_device *dev) priv->ack_tx_to_ieee =0 ; } -void fix_rx_fifo (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);
@@ -759,39 +641,34 @@ void fix_rx_fifo(struct net_device *dev)set_nic_rxring (dev); } - -/**************************************************************************** -------------------------------HW STUFF--------------------------- -*****************************************************************************/ -unsigned char QUALITY_MAP [] = { -0x64 ,0x64 ,0x64 ,0x63 ,0x63 ,0x62 ,0x62 ,0x61 , -0x61 ,0x60 ,0x60 ,0x5f ,0x5f ,0x5e ,0x5d ,0x5c , -0x5b ,0x5a ,0x59 ,0x57 ,0x56 ,0x54 ,0x52 ,0x4f , -0x4c ,0x49 ,0x45 ,0x41 ,0x3c ,0x37 ,0x31 ,0x29 , -0x24 ,0x22 ,0x22 ,0x22 ,0x22 ,0x22 ,0x22 ,0x22 , -0x22 ,0x22 ,0x21 ,0x21 ,0x21 ,0x21 ,0x21 ,0x20 , -0x20 ,0x20 ,0x20 ,0x1f ,0x1f ,0x1e ,0x1e ,0x1e , -0x1d ,0x1d ,0x1c ,0x1c ,0x1b ,0x1a ,0x19 ,0x19 , -0x18 ,0x17 ,0x16 ,0x15 ,0x14 ,0x12 ,0x11 ,0x0f , -0x0e ,0x0c ,0x0a ,0x08 ,0x06 ,0x04 ,0x01 ,0x00 +0x64 ,0x64 ,0x64 ,0x63 ,0x63 ,0x62 ,0x62 ,0x61 , +0x61 ,0x60 ,0x60 ,0x5f ,0x5f ,0x5e ,0x5d ,0x5c , +0x5b ,0x5a ,0x59 ,0x57 ,0x56 ,0x54 ,0x52 ,0x4f , +0x4c ,0x49 ,0x45 ,0x41 ,0x3c ,0x37 ,0x31 ,0x29 , +0x24 ,0x22 ,0x22 ,0x22 ,0x22 ,0x22 ,0x22 ,0x22 , +0x22 ,0x22 ,0x21 ,0x21 ,0x21 ,0x21 ,0x21 ,0x20 , +0x20 ,0x20 ,0x20 ,0x1f ,0x1f ,0x1e ,0x1e ,0x1e , +0x1d ,0x1d ,0x1c ,0x1c ,0x1b ,0x1a ,0x19 ,0x19 , +0x18 ,0x17 ,0x16 ,0x15 ,0x14 ,0x12 ,0x11 ,0x0f , +0x0e ,0x0c ,0x0a ,0x08 ,0x06 ,0x04 ,0x01 ,0x00 };unsigned char STRENGTH_MAP [] = { -0x64 ,0x64 ,0x63 ,0x62 ,0x61 ,0x60 ,0x5f ,0x5e , -0x5d ,0x5c ,0x5b ,0x5a ,0x57 ,0x54 ,0x52 ,0x50 , -0x4e ,0x4c ,0x4a ,0x48 ,0x46 ,0x44 ,0x41 ,0x3f , -0x3c ,0x3a ,0x37 ,0x36 ,0x36 ,0x1c ,0x1c ,0x1b , -0x1b ,0x1a ,0x1a ,0x19 ,0x19 ,0x18 ,0x18 ,0x17 , -0x17 ,0x16 ,0x16 ,0x15 ,0x15 ,0x14 ,0x14 ,0x13 , -0x13 ,0x12 ,0x12 ,0x11 ,0x11 ,0x10 ,0x10 ,0x0f , -0x0f ,0x0e ,0x0e ,0x0d ,0x0d ,0x0c ,0x0c ,0x0b , -0x0b ,0x0a ,0x0a ,0x09 ,0x09 ,0x08 ,0x08 ,0x07 , -0x07 ,0x06 ,0x06 ,0x05 ,0x04 ,0x03 ,0x02 ,0x00 +0x64 ,0x64 ,0x63 ,0x62 ,0x61 ,0x60 ,0x5f ,0x5e , +0x5d ,0x5c ,0x5b ,0x5a ,0x57 ,0x54 ,0x52 ,0x50 , +0x4e ,0x4c ,0x4a ,0x48 ,0x46 ,0x44 ,0x41 ,0x3f , +0x3c ,0x3a ,0x37 ,0x36 ,0x36 ,0x1c ,0x1c ,0x1b , +0x1b ,0x1a ,0x1a ,0x19 ,0x19 ,0x18 ,0x18 ,0x17 , +0x17 ,0x16 ,0x16 ,0x15 ,0x15 ,0x14 ,0x14 ,0x13 , +0x13 ,0x12 ,0x12 ,0x11 ,0x11 ,0x10 ,0x10 ,0x0f , +0x0f ,0x0e ,0x0e ,0x0d ,0x0d ,0x0c ,0x0c ,0x0b , +0x0b ,0x0a ,0x0a ,0x09 ,0x09 ,0x08 ,0x08 ,0x07 , +0x07 ,0x06 ,0x06 ,0x05 ,0x04 ,0x03 ,0x02 ,0x00 }; -void rtl8180_RSSI_calc (struct net_device *dev,u8 *rssi,u8 *qual){ -//void Mlme_UpdateRssiSQ(struct net_device *dev, u8 *rssi, u8 *qual){ +void rtl8180_RSSI_calc (struct net_device *dev,u8 *rssi,u8 *qual) +{struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);u32 temp;u32 temp2;
@@ -887,8 +764,6 @@ void rtl8180_RSSI_calc(struct net_device } }break ; - -/* case 4 */ case RFCHIPID_MAXIM : lsb = temp2 &1 ; temp2 &=0x7e ;
@@ -913,21 +788,14 @@ void rtl8180_RSSI_calc(struct net_devicereturn ; } -void rtl8180_irq_enable (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); + priv->irq_enabled =1 ; -/* -write_nic_word(dev,INTA_MASK,INTA_RXOK | INTA_RXDESCERR | INTA_RXOVERFLOW |\ -INTA_TXOVERFLOW | INTA_HIPRIORITYDESCERR | INTA_HIPRIORITYDESCOK |\ -INTA_NORMPRIORITYDESCERR | INTA_NORMPRIORITYDESCOK |\ -INTA_LOWPRIORITYDESCERR | INTA_LOWPRIORITYDESCOK | INTA_TIMEOUT); -*/ write_nic_word (dev,INTA_MASK , priv->irq_mask); } -void rtl8180_irq_disable (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);
@@ -937,10 +805,10 @@ void rtl8180_irq_disable(struct net_devi priv->irq_enabled =0 ; } -void rtl8180_set_mode (struct net_device *dev,int mode) {u8 ecmd; + ecmd=read_nic_byte (dev,EPROM_CMD ); ecmd=ecmd &~EPROM_CMD_OPERATING_MODE_MASK ; ecmd=ecmd | (mode<<EPROM_CMD_OPERATING_MODE_SHIFT );
@@ -982,28 +850,21 @@ void rtl8180_update_msr(struct net_devicwrite_nic_byte (dev,MSR , msr);write_nic_dword (dev,RX_CONF , rxconf); - } - -void rtl8180_set_chan (struct net_device *dev,short ch) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -if ((ch >14 ) || (ch <1 )) - { +if ((ch >14 ) || (ch <1 )) {printk ("In %s: Invalid chnanel %d\n" , __func__, ch);return ; } priv->chan=ch; -//printk("in %s:channel is %d\n",__func__,ch); priv->rf_set_chan (dev,priv->chan); - } -void rtl8180_rx_enable (struct net_device *dev) {u8 cmd;
@@ -1017,8 +878,8 @@ void rtl8180_rx_enable(struct net_device rxconf = rxconf | (1 <<ACCEPT_DATA_FRAME_SHIFT ); rxconf = rxconf | (1 <<ACCEPT_BCAST_FRAME_SHIFT ); rxconf = rxconf | (1 <<ACCEPT_MCAST_FRAME_SHIFT ); -// rxconf = rxconf | (1<<ACCEPT_CRCERR_FRAME_SHIFT); -if (dev->flags &IFF_PROMISC )DMESG ("NIC in promisc mode" ); +if (dev->flags &IFF_PROMISC ) +DMESG ("NIC in promisc mode" );if (priv->ieee80211->iw_mode ==IW_MODE_MONITOR || \ dev->flags &IFF_PROMISC ){
@@ -1029,11 +890,6 @@ void rtl8180_rx_enable(struct net_device rxconf = rxconf | (1 <<RX_CHECK_BSSID_SHIFT ); } -/*if(priv->ieee80211->iw_mode == IW_MODE_MASTER){ -rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT); -rxconf = rxconf | (1<<RX_CHECK_BSSID_SHIFT); -}*/ -if (priv->ieee80211->iw_mode ==IW_MODE_MONITOR ){ rxconf = rxconf | (1 <<ACCEPT_CTL_FRAME_SHIFT ); rxconf = rxconf | (1 <<ACCEPT_ICVERR_FRAME_SHIFT );
@@ -1043,81 +899,61 @@ void rtl8180_rx_enable(struct net_deviceif ( priv->crcmon ==1 && priv->ieee80211->iw_mode ==IW_MODE_MONITOR ) rxconf = rxconf | (1 <<ACCEPT_CRCERR_FRAME_SHIFT ); -//if(!priv->card_8185){ - rxconf = rxconf &~RX_FIFO_THRESHOLD_MASK ; - rxconf = rxconf | (RX_FIFO_THRESHOLD_NONE <<RX_FIFO_THRESHOLD_SHIFT ); -//} + rxconf = rxconf & ~RX_FIFO_THRESHOLD_MASK ; + rxconf = rxconf | (RX_FIFO_THRESHOLD_NONE <<RX_FIFO_THRESHOLD_SHIFT ); rxconf = rxconf | (1 <<RX_AUTORESETPHY_SHIFT ); rxconf = rxconf &~MAX_RX_DMA_MASK ; rxconf = rxconf | (MAX_RX_DMA_2048 <<MAX_RX_DMA_SHIFT ); -//if(!priv->card_8185) - rxconf = rxconf |RCR_ONLYERLPKT ; + rxconf = rxconf |RCR_ONLYERLPKT ; rxconf = rxconf &~RCR_CS_MASK ; -if (!priv->card_8185) + +if (!priv->card_8185) rxconf |= (priv->rcr_csense<<RCR_CS_SHIFT ); -// rxconf &=~ 0xfff00000; -// rxconf |= 0x90100000;//9014f76f; +write_nic_dword (dev,RX_CONF , rxconf);fix_rx_fifo (dev); cmd=read_nic_byte (dev,CMD );write_nic_byte (dev,CMD ,cmd | (1 <<CMD_RX_ENABLE_SHIFT )); - -/* In rtl8139 driver seems that DMA threshold has to be written -* after enabling RX, so we rewrite RX_CONFIG register -*/ -//mdelay(100); -// write_nic_dword(dev, RX_CONF, rxconf); - } -void set_nic_txring (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); write_nic_dword (dev,TX_MANAGEPRIORITY_RING_ADDR , priv->txmapringdma); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); write_nic_dword (dev,TX_BKPRIORITY_RING_ADDR , priv->txbkpringdma); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); write_nic_dword (dev,TX_BEPRIORITY_RING_ADDR , priv->txbepringdma); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); write_nic_dword (dev,TX_VIPRIORITY_RING_ADDR , priv->txvipringdma); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); write_nic_dword (dev,TX_VOPRIORITY_RING_ADDR , priv->txvopringdma); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); write_nic_dword (dev,TX_HIGHPRIORITY_RING_ADDR , priv->txhpringdma); -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); -write_nic_dword (dev,TX_BEACON_RING_ADDR , priv->txbeaconringdma); } -void rtl8180_conttx_enable (struct net_device *dev) {u32 txconf; + txconf =read_nic_dword (dev,TX_CONF ); txconf = txconf &~TX_LOOPBACK_MASK ; txconf = txconf | (TX_LOOPBACK_CONTINUE <<TX_LOOPBACK_SHIFT );write_nic_dword (dev,TX_CONF ,txconf); } -void rtl8180_conttx_disable (struct net_device *dev) {u32 txconf; + txconf =read_nic_dword (dev,TX_CONF ); txconf = txconf &~TX_LOOPBACK_MASK ; txconf = txconf | (TX_LOOPBACK_NONE <<TX_LOOPBACK_SHIFT );write_nic_dword (dev,TX_CONF ,txconf); } -void rtl8180_tx_enable (struct net_device *dev) {u8 cmd;
@@ -1125,12 +961,10 @@ void rtl8180_tx_enable(struct net_deviceu8 byte;u32 txconf;struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); - txconf=read_nic_dword (dev,TX_CONF ); - - -if (priv->card_8185){ + txconf =read_nic_dword (dev,TX_CONF ); +if (priv->card_8185) { byte =read_nic_byte (dev,CW_CONF ); byte &= ~(1 <<CW_CONF_PERPACKET_CW_SHIFT ); byte &= ~(1 <<CW_CONF_PERPACKET_RETRY_SHIFT );
@@ -1141,26 +975,12 @@ void rtl8180_tx_enable(struct net_device tx_agc_ctl &= ~(1 <<TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT ); tx_agc_ctl |=(1 <<TX_AGC_CTL_FEEDBACK_ANT );write_nic_byte (dev,TX_AGC_CTL , tx_agc_ctl); -/* -write_nic_word(dev, 0x5e, 0x01); -force_pci_posting(dev); -mdelay(1); -write_nic_word(dev, 0xfe, 0x10); -force_pci_posting(dev); -mdelay(1); -write_nic_word(dev, 0x5e, 0x00); -force_pci_posting(dev); -mdelay(1); -*/ write_nic_byte (dev,0xec ,0x3f );/* Disable early TX */ } -if (priv->card_8185){ - +if (priv->card_8185) txconf = txconf &~ (1 <<TCR_PROBE_NOTIMESTAMP_SHIFT ); - - }else { - +else {if (hwseqnum) txconf= txconf &~ (1 <<TX_CONF_HEADER_AUTOICREMENT_SHIFT );else
@@ -1175,43 +995,31 @@ void rtl8180_tx_enable(struct net_device txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT ); txconf = txconf &~ (1 <<TX_NOCRC_SHIFT ); -if (priv->card_8185){ -if (priv->hw_plcp_len) +if (priv->card_8185) { +if (priv->hw_plcp_len) txconf = txconf &~TCR_PLCP_LEN ;else txconf = txconf |TCR_PLCP_LEN ; - }else { + }else txconf = txconf &~TCR_SAT ; - } + txconf = txconf &~TCR_MXDMA_MASK ; txconf = txconf | (TCR_MXDMA_2048 <<TCR_MXDMA_SHIFT ); txconf = txconf |TCR_CWMIN ; txconf = txconf |TCR_DISCW ; -// if(priv->ieee80211->hw_wep) -// txconf=txconf &~ (1<<TX_NOICV_SHIFT); -// else - txconf=txconf | (1 <<TX_NOICV_SHIFT ); + txconf = txconf | (1 <<TX_NOICV_SHIFT );write_nic_dword (dev,TX_CONF ,txconf); -fix_tx_fifo (dev); cmd=read_nic_byte (dev,CMD );write_nic_byte (dev,CMD ,cmd | (1 <<CMD_TX_ENABLE_SHIFT )); -// mdelay(100); write_nic_dword (dev,TX_CONF ,txconf); -// #endif -/* -rtl8180_set_mode(dev,EPROM_CMD_CONFIG); -write_nic_byte(dev, TX_DMA_POLLING, priv->dma_poll_mask); -rtl8180_set_mode(dev,EPROM_CMD_NORMAL); -*/ } -void rtl8180_beacon_tx_enable (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);
@@ -1222,7 +1030,6 @@ void rtl8180_beacon_tx_enable(struct netrtl8180_set_mode (dev,EPROM_CMD_NORMAL ); } -void rtl8180_beacon_tx_disable (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);
@@ -1234,7 +1041,6 @@ void rtl8180_beacon_tx_disable(struct ne } -void rtl8180_rtx_disable (struct net_device *dev) {u8 cmd;
@@ -1245,9 +1051,6 @@ void rtl8180_rtx_disable(struct net_devi ((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));force_pci_posting (dev);mdelay (10 ); -/*while (read_nic_byte(dev,CMD) & (1<<CMD_RX_ENABLE_SHIFT)) -udelay(10); -*/ if (!priv->rx_skb_complete)dev_kfree_skb_any (priv->rx_skb);
@@ -1270,20 +1073,22 @@ short alloc_tx_desc_ring(struct net_devi } desc = (u32 *)pci_alloc_consistent (pdev,sizeof (u32)*8 *count+256 , &dma_desc); -if (desc==NULL )return -1 ; -if (dma_desc &0xff ){ +if (desc ==NULL ) +return -1 ; +if (dma_desc &0xff )/* * descriptor's buffer must be 256 byte aligned * we shouldn't be here, since we set DMA mask ! */ WARN (1 ,"DMA buffer is not aligned\n" ); - } - tmp=desc; -for (i=0 ;i<count;i++) - { - buf = (void *)pci_alloc_consistent (pdev,bufsize,&dma_tmp); -if (buf ==NULL )return -ENOMEM ; + + tmp = desc; + +for (i =0 ; i < count; i++) { + buf = (void *)pci_alloc_consistent (pdev, bufsize, &dma_tmp); +if (buf ==NULL ) +return -ENOMEM ;switch (addr) {case TX_MANAGEPRIORITY_RING_ADDR :
@@ -1292,7 +1097,6 @@ short alloc_tx_desc_ring(struct net_devireturn -ENOMEM ; }break ; -case TX_BKPRIORITY_RING_ADDR :if (-1 ==buffer_add (&(priv->txbkpbufs),buf,dma_tmp,NULL )){DMESGE ("Unable to allocate mem for buffer LP" );
@@ -1305,7 +1109,6 @@ short alloc_tx_desc_ring(struct net_devireturn -ENOMEM ; }break ; -case TX_VIPRIORITY_RING_ADDR :if (-1 ==buffer_add (&(priv->txvipbufs),buf,dma_tmp,NULL )){DMESGE ("Unable to allocate mem for buffer LP" );
@@ -1348,32 +1151,26 @@ short alloc_tx_desc_ring(struct net_devi priv->txmapringdma=dma_desc; priv->txmapring=desc;break ; -case TX_BKPRIORITY_RING_ADDR : priv->txbkpringdma=dma_desc; priv->txbkpring=desc;break ; -case TX_BEPRIORITY_RING_ADDR : priv->txbepringdma=dma_desc; priv->txbepring=desc;break ; -case TX_VIPRIORITY_RING_ADDR : priv->txvipringdma=dma_desc; priv->txvipring=desc;break ; -case TX_VOPRIORITY_RING_ADDR : priv->txvopringdma=dma_desc; priv->txvopring=desc;break ; -case TX_HIGHPRIORITY_RING_ADDR : priv->txhpringdma=dma_desc; priv->txhpring=desc;break ; -case TX_BEACON_RING_ADDR : priv->txbeaconringdma=dma_desc; priv->txbeaconring=desc;
@@ -1384,10 +1181,8 @@ short alloc_tx_desc_ring(struct net_devireturn 0 ; } -void free_tx_desc_rings (struct net_device *dev) { -struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);struct pci_dev *pdev=priv->pdev;int count = priv->txringcount;
@@ -1426,7 +1221,6 @@ void free_rx_desc_ring(struct net_device {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);struct pci_dev *pdev = priv->pdev; -int count = priv->rxringcount; pci_free_consistent(pdev, sizeof(u32)*8*count+256,
@@ -1435,7 +1229,6 @@ void free_rx_desc_ring(struct net_devicebuffer_free (dev,&(priv->rxbuffer),priv->rxbuffersize,0 ); } -short alloc_rx_desc_ring (struct net_device *dev,u16 bufsize,int count) {int i;
@@ -1457,21 +1250,18 @@ short alloc_rx_desc_ring(struct net_devi desc = (u32 *)pci_alloc_consistent (pdev,sizeof (u32)*rx_desc_size*count+256 , &dma_desc); -if (dma_desc &0xff ){ - +if (dma_desc &0xff )/* * descriptor's buffer must be 256 byte aligned * should never happen since we specify the DMA mask */ WARN (1 ,"DMA buffer is not aligned\n" ); - } priv->rxring=desc; priv->rxringdma=dma_desc; tmp=desc; -for (i=0 ;i<count;i++){ - +for (i =0 ; i < count; i++) {if ((buf=kmalloc (bufsize *sizeof (u8),GFP_ATOMIC )) ==NULL ){DMESGE ("Failed to kmalloc RX buffer" );return -1 ;
@@ -1480,7 +1270,6 @@ short alloc_rx_desc_ring(struct net_devi dma_tmp =pci_map_single (pdev,buf,bufsize *sizeof (u8),PCI_DMA_FROMDEVICE ); -//buf = (void*)pci_alloc_consistent(pdev,bufsize,&dma_tmp); if (-1 ==buffer_add (&(priv->rxbuffer), buf,dma_tmp, &(priv->rxbufferhead))){DMESGE ("Unable to allocate mem RX buf" );
@@ -1505,24 +1294,16 @@ void set_nic_rxring(struct net_device *du8 pgreg;struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -//rtl8180_set_mode(dev, EPROM_CMD_CONFIG); - pgreg=read_nic_byte (dev,PGSELECT );write_nic_byte (dev,PGSELECT , pgreg &~ (1 <<PGSELECT_PG_SHIFT )); -//rtl8180_set_mode(dev, EPROM_CMD_NORMAL); -write_nic_dword (dev,RXRING_ADDR ,priv->rxringdma); } -void rtl8180_reset (struct net_device *dev) { -//u32 txconf = 0x80e00707; //FIXME: Make me understandable u8 cr; -//write_nic_dword(dev,TX_CONF,txconf); -rtl8180_irq_disable (dev); cr=read_nic_byte (dev,CMD );
@@ -1539,83 +1320,80 @@ void rtl8180_reset(struct net_device *deelse DMESG ("Card successfully reset" ); -//#ifndef CONFIG_RTL8185B rtl8180_set_mode (dev,EPROM_CMD_LOAD );force_pci_posting (dev);mdelay (200 ); -//#endif }inline u16 ieeerate2rtlrate (int rate) {switch (rate){case 10 : -return 0 ; +return 0 ;case 20 : -return 1 ; +return 1 ;case 55 : -return 2 ; +return 2 ;case 110 : -return 3 ; +return 3 ;case 60 : -return 4 ; +return 4 ;case 90 : -return 5 ; +return 5 ;case 120 : -return 6 ; +return 6 ;case 180 : -return 7 ; +return 7 ;case 240 : -return 8 ; +return 8 ;case 360 : -return 9 ; +return 9 ;case 480 : -return 10 ; +return 10 ;case 540 : -return 11 ; +return 11 ;default : -return 3 ; - +return 3 ; } }static u16 rtl_rate[] = {10 ,20 ,55 ,110 ,60 ,90 ,120 ,180 ,240 ,360 ,480 ,540 ,720 }; +inline u16 rtl8180_rate2rate (short rate) { -if (rate >12 )return 10 ; +if (rate >12 ) +return 10 ;return rtl_rate[rate]; } +inline u8 rtl8180_IsWirelessBMode (u16 rate) {if ( ((rate <=110 ) && (rate !=60 ) && (rate !=90 )) || (rate ==220 ) )return 1 ; -else return 0 ; +else +return 0 ; } +u16 N_DBPSOfRate (u16 DataRate); -u16 ComputeTxTime ( -u16 FrameLength, -u16 DataRate, -u8 bManagementFrame, -u8 bShortPreamble -) + +u16 ComputeTxTime (u16 FrameLength,u16 DataRate,u8 bManagementFrame, +u8 bShortPreamble) {u16 FrameTime;u16 N_DBPS ;u16 Ceiling; -if (rtl8180_IsWirelessBMode (DataRate) ) - { -if ( bManagementFrame || !bShortPreamble || DataRate ==10 ) - {// long preamble +if (rtl8180_IsWirelessBMode (DataRate)) { +if (bManagementFrame || !bShortPreamble || DataRate ==10 ) +/* long preamble */ FrameTime = (u16)(144 +48 +(FrameLength*8 /(DataRate/10 ))); - }else - {// Short preamble +/* short preamble */ FrameTime = (u16)(72 +24 +(FrameLength*8 /(DataRate/10 ))); - } -if ( ( FrameLength*8 % (DataRate/10 ) ) !=0 )//Get the Ceilling - FrameTime ++; - }else {//802.11g DSSS-OFDM PLCP length field calculation. + +if ((FrameLength*8 % (DataRate/10 )) !=0 )/* get the ceilling */ + FrameTime++; + }else {/* 802.11g DSSS-OFDM PLCP length field calculation. */ N_DBPS =N_DBPSOfRate (DataRate); Ceiling = (16 +8 *FrameLength +6 ) /N_DBPS + (((16 +8 *FrameLength +6 ) %N_DBPS ) ?1 :0 );
@@ -1623,49 +1401,41 @@ u16 ComputeTxTime( }return FrameTime; } +u16 N_DBPSOfRate (u16 DataRate) {u16 N_DBPS =24 ; -switch (DataRate) - { -case 60 : -N_DBPS =24 ; -break ; - -case 90 : -N_DBPS =36 ; -break ; - -case 120 : -N_DBPS =48 ; -break ; - -case 180 : -N_DBPS =72 ; -break ; - -case 240 : -N_DBPS =96 ; -break ; - -case 360 : -N_DBPS =144 ; -break ; - -case 480 : -N_DBPS =192 ; -break ; - -case 540 : -N_DBPS =216 ; -break ; - -default : -break ; - } +switch (DataRate) { +case 60 : +N_DBPS =24 ; +break ; +case 90 : +N_DBPS =36 ; +break ; +case 120 : +N_DBPS =48 ; +break ; +case 180 : +N_DBPS =72 ; +break ; +case 240 : +N_DBPS =96 ; +break ; +case 360 : +N_DBPS =144 ; +break ; +case 480 : +N_DBPS =192 ; +break ; +case 540 : +N_DBPS =216 ; +break ; +default : +break ; + } -return N_DBPS ; +return N_DBPS ; }//{by amy 080312
@@ -1674,76 +1444,46 @@ u16 N_DBPSOfRate(u16 DataRate)// For Netgear case, they want good-looking singal strength. // 2004.12.05, by rcnjko. // -long -NetgearSignalStrengthTranslate ( -long LastSS, -long CurrSS - ) +long NetgearSignalStrengthTranslate (long LastSS,long CurrSS) {long RetSS;// Step 1. Scale mapping. -if (CurrSS >=71 && CurrSS <=100 ) - { +if (CurrSS >=71 && CurrSS <=100 ) RetSS =90 + ((CurrSS -70 ) /3 ); - } -else if (CurrSS >=41 && CurrSS <=70 ) - { +else if (CurrSS >=41 && CurrSS <=70 ) RetSS =78 + ((CurrSS -40 ) /3 ); - } -else if (CurrSS >=31 && CurrSS <=40 ) - { +else if (CurrSS >=31 && CurrSS <=40 ) RetSS =66 + (CurrSS -30 ); - } -else if (CurrSS >=21 && CurrSS <=30 ) - { +else if (CurrSS >=21 && CurrSS <=30 ) RetSS =54 + (CurrSS -20 ); - } -else if (CurrSS >=5 && CurrSS <=20 ) - { +else if (CurrSS >=5 && CurrSS <=20 ) RetSS =42 + (((CurrSS -5 ) *2 ) /3 ); - } -else if (CurrSS ==4 ) - { +else if (CurrSS ==4 ) RetSS =36 ; - } -else if (CurrSS ==3 ) - { +else if (CurrSS ==3 ) RetSS =27 ; - } -else if (CurrSS ==2 ) - { +else if (CurrSS ==2 ) RetSS =18 ; - } -else if (CurrSS ==1 ) - { +else if (CurrSS ==1 ) RetSS =9 ; - }else - { RetSS = CurrSS; - } -//RT_TRACE(COMP_DBG, DBG_LOUD, ("##### After Mapping: LastSS: %d, CurrSS: %d, RetSS: %d\n", LastSS, CurrSS, RetSS)); // Step 2. Smoothing. if (LastSS >0 ) - { RetSS = ((LastSS *5 ) + (RetSS)+5 ) /6 ; - } -//RT_TRACE(COMP_DBG, DBG_LOUD, ("$$$$$ After Smoothing: LastSS: %d, CurrSS: %d, RetSS: %d\n", LastSS, CurrSS, RetSS)); return RetSS; } +// // Description: // Translate 0-100 signal strength index into dBm. // -long -TranslateToDbm8185 ( -u8 SignalStrengthIndex// 0-100 index. - ) +long TranslateToDbm8185 (u8 SignalStrengthIndex) { -long SignalPower;// in dBm. +long SignalPower;// Translate to dBm (x=0.5y-95). SignalPower = (long )((SignalStrengthIndex +1 ) >>1 );
@@ -1751,6 +1491,7 @@ TranslateToDbm8185(return SignalPower; } +// // Description: // Perform signal smoothing for dynamic mechanism.
@@ -1759,53 +1500,23 @@ TranslateToDbm8185(// of correctness. Ported from 8187B. // 2007-02-26, by Bruce. // -void -PerformUndecoratedSignalSmoothing8185 ( -struct r8180_priv *priv, -bool bCckRate - ) +void PerformUndecoratedSignalSmoothing8185 (struct r8180_priv *priv, +bool bCckRate) { - -// Determin the current packet is CCK rate. priv->bCurCCKPkt = bCckRate; -if (priv->UndecoratedSmoothedSS >=0 ) - { +if (priv->UndecoratedSmoothedSS >=0 ) priv->UndecoratedSmoothedSS = ( (priv->UndecoratedSmoothedSS *5 ) + (priv->SignalStrength *10 ) ) /6 ; - }else - { priv->UndecoratedSmoothedSS = priv->SignalStrength *10 ; - } priv->UndercorateSmoothedRxPower = ( (priv->UndercorateSmoothedRxPower *50 ) + (priv->RxPower*11 )) /60 ; -// printk("Sommthing SignalSterngth (%d) => UndecoratedSmoothedSS (%d)\n", priv->SignalStrength, priv->UndecoratedSmoothedSS); -// printk("Sommthing RxPower (%d) => UndecoratedRxPower (%d)\n", priv->RxPower, priv->UndercorateSmoothedRxPower); - -//if(priv->CurCCKRSSI >= 0 && bCckRate) -if (bCckRate) - { +if (bCckRate) priv->CurCCKRSSI = priv->RSSI; - }else - { priv->CurCCKRSSI =0 ; - } - -// Boundary checking. -// TODO: The overflow condition does happen, if we want to fix, -// we shall recalculate thresholds first. -if (priv->UndecoratedSmoothedSS >100 ) - { -// printk("UndecoratedSmoothedSS(%d) overflow, SignalStrength(%d)\n", priv->UndecoratedSmoothedSS, priv->SignalStrength); - } -if (priv->UndecoratedSmoothedSS <0 ) - { -// printk("UndecoratedSmoothedSS(%d) underflow, SignalStrength(%d)\n", priv->UndecoratedSmoothedSS, priv->SignalStrength); - } - }//by amy 080312}
@@ -1815,70 +1526,47 @@ void rtl8180_rx(struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);struct sk_buff *tmp_skb; - -//struct sk_buff *skb; short first,last;u32 len;int lastlen;unsigned char quality, signal;u8 rate; -//u32 *prism_hdr; u32 *tmp,*tmp2;u8 rx_desc_size;u8 padding; -//u32 count=0; char rxpower =0 ;u32 RXAGC =0 ;long RxAGC_dBm =0 ;u8 LNA =0 ,BB =0 ;u8 LNA_gain[4 ]={02 ,17 ,29 ,39 };u8 Antenna =0 ; -struct ieee80211_hdr *hdr;//by amy +struct ieee80211_hdr *hdr;u16 fc,type;u8 bHwError =0 ,bCRC =0 ,bICV =0 ; -//bHwError = 0; -//bCRC = 0; -//bICV = 0; bool bCckRate = false;u8 RSSI =0 ; -long SignalStrengthIndex =0 ;//+by amy 080312 -// u8 SignalStrength = 0; +long SignalStrengthIndex =0 ;struct ieee80211_rx_stats stats = { .signal =0 , .noise =-98 , .rate =0 , -// .mac_time = jiffies, .freq =IEEE80211_24GHZ_BAND , }; stats.nic_type =NIC_8185B ; rx_desc_size =8 ; -//printk("receive frame!%d\n",count++); -//if (!priv->rxbuffer) DMESG ("EE: NIC RX ack, but RX queue corrupted!"); -//else { -if ((*(priv->rxringtail)) & (1 <<31 )) { -/* we have got an RX int, but the descriptor * we are pointing is empty*/ priv->stats.rxnodata++; priv->ieee80211->stats.rx_errors++; -/* if (! *(priv->rxring) & (1<<31)) { - -priv->stats.rxreset++; -priv->rxringtail=priv->rxring; -priv->rxbuffer=priv->rxbufferhead; - -}else{*/ - tmp2 =NULL ; tmp = priv->rxringtail; do{ if(tmp == priv->rxring) - //tmp = priv->rxring + (priv->rxringcount )*rx_desc_size; xiong-2006-11-15 tmp = priv->rxring + (priv->rxringcount - 1)*rx_desc_size; else tmp -= rx_desc_size;
@@ -1888,7 +1576,6 @@ void rtl8180_rx(struct net_device *dev) }while (tmp != priv->rxring);if (tmp2) priv->rxringtail = tmp2; -//} }/* while there are filled descriptors */
@@ -1930,7 +1617,6 @@ void rtl8180_rx(struct net_device *dev) len=lastlen-priv->rx_prevlen;if (*(priv->rxringtail) & (1 <<13 )) { -//lastlen=((*priv->rxringtail) &0xfff); if ((*(priv->rxringtail) &0xfff ) <500 ) priv->stats.rxcrcerrmin++;else if ((*(priv->rxringtail) &0x0fff ) >1000 )
@@ -1982,9 +1668,7 @@ void rtl8180_rx(struct net_device *dev) ((1<<23)|(1<<22)|(1<<21)|(1<<20)))>>20; stats.rate =rtl8180_rate2rate (rate); -//DMESG("%d",rate); Antenna = (((*(priv->rxringtail +3 ))& (0x00008000 )) ==0 )?0 :1 ; -// printk("in rtl8180_rx():Antenna is %d\n",Antenna); //by amy for antenna if (!rtl8180_IsWirelessBMode (stats.rate)) {// OFDM rate.
@@ -2089,12 +1773,6 @@ void rtl8180_rx(struct net_device *dev) }//by amy for antenna - - - - - -#ifndef DUMMY_RX if (first){if (!priv->rx_skb_complete){
@@ -2164,16 +1842,13 @@ void rtl8180_rx(struct net_device *dev) }#endif //DUMMY_RX -pci_dma_sync_single_for_device (priv->pdev, priv->rxbuffer->dma, priv->rxbuffersize * \sizeof (u8),PCI_DMA_FROMDEVICE ); - drop:// this is used when we have not enought mem -/* restore the descriptor */ *(priv->rxringtail+2 )=priv->rxbuffer->dma; *(priv->rxringtail)=*(priv->rxringtail) &~0xfff ;
@@ -2182,32 +1857,14 @@ drop: // this is used when we have not e *(priv->rxringtail)= *(priv->rxringtail) | (1 <<31 ); -//^empty descriptor - -//wmb(); - -//unsigned long flags; -//spin_lock_irqsave(&priv->irq_lock,flags); priv->rxringtail+=rx_desc_size;if (priv->rxringtail >= (priv->rxring)+(priv->rxringcount )*rx_desc_size) priv->rxringtail=priv->rxring; -//spin_unlock_irqrestore(&priv->irq_lock,flags); - - priv->rxbuffer=(priv->rxbuffer->next); - } - - - -// if(get_curr_tx_free_desc(dev,priority)) -// ieee80211_sta_ps_sleep(priv->ieee80211, &tmp, &tmp2); - - - }
@@ -2216,33 +1873,6 @@ void rtl8180_dma_kick(struct net_devicestruct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);rtl8180_set_mode (dev,EPROM_CMD_CONFIG ); -/* - -switch(priority){ - -case LOW_PRIORITY: - -write_nic_byte(dev,TX_DMA_POLLING, -(1<< TX_DMA_POLLING_LOWPRIORITY_SHIFT) | -priv->dma_poll_mask); -break; - -case NORM_PRIORITY: - -write_nic_byte(dev,TX_DMA_POLLING, -(1<< TX_DMA_POLLING_NORMPRIORITY_SHIFT) | -priv->dma_poll_mask); -break; - -case HI_PRIORITY: - -write_nic_byte(dev,TX_DMA_POLLING, -(1<< TX_DMA_POLLING_HIPRIORITY_SHIFT) | -priv->dma_poll_mask); -break; - -} -*/ write_nic_byte (dev,TX_DMA_POLLING , (1 << (priority +1 )) | priv->dma_poll_mask);rtl8180_set_mode (dev,EPROM_CMD_NORMAL );
@@ -2260,7 +1890,6 @@ void rtl8180_data_hard_stop(struct net_drtl8180_set_mode (dev,EPROM_CMD_NORMAL ); } -void rtl8180_data_hard_resume (struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev);
@@ -2271,7 +1900,6 @@ void rtl8180_data_hard_resume(struct netrtl8180_set_mode (dev,EPROM_CMD_NORMAL ); } -/* this function TX data frames when the ieee80211 stack requires this. * It checks also if we need to stop the ieee tx queue, eventually do it */
@@ -2284,7 +1912,6 @@ rate)short morefrag = (h->frame_ctl) &IEEE80211_FCTL_MOREFRAGS ;unsigned long flags;int priority; -//static int count = 0; mode = priv->ieee80211->iw_mode;
@@ -2306,22 +1933,16 @@ rate)return ; } -//printk(KERN_WARNING "priority = %d@%d\n", priority, count++); if (!check_nic_enought_desc (dev, priority)){ -//DMESG("Error: no descriptor left by previous TX (avail %d) ", -// get_curr_tx_free_desc(dev, priority)); DMESGW ("Error: no descriptor left by previous TX (avail %d) " ,get_curr_tx_free_desc (dev, priority)); -//printk(KERN_WARNING "==============================================================> \n"); ieee80211_stop_queue (priv->ieee80211); }rtl8180_tx (dev, skb->data, skb->len, priority, morefrag,0 ,rate);if (!check_nic_enought_desc (dev, priority))ieee80211_stop_queue (priv->ieee80211); -//dev_kfree_skb_any(skb); spin_unlock_irqrestore (&priv->tx_lock,flags); - }/* This is a rough attempt to TX a frame
@@ -2338,19 +1959,15 @@ rate)int rtl8180_hard_start_xmit (struct sk_buff *skb,struct net_device *dev) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -unsigned long flags; -int priority; priority =MANAGE_PRIORITY ;spin_lock_irqsave (&priv->tx_lock,flags); -if (priv->ieee80211->bHwRadioOff) - { +if (priv->ieee80211->bHwRadioOff) {spin_unlock_irqrestore (&priv->tx_lock,flags); -dev_kfree_skb_any (skb);return 0 ; }
@@ -2381,7 +1998,6 @@ u16 rtl8180_len2duration(u32 len, shortif (drift ==0 )break ; duration++;break ; -case 1 ://2mbps *ext=0 ; duration = ((len+4 )<<4 ) /0x4 ;
@@ -2389,7 +2005,6 @@ u16 rtl8180_len2duration(u32 len, shortif (drift ==0 )break ; duration++;break ; -case 2 ://5.5mbps *ext=0 ; duration = ((len+4 )<<4 ) /0xb ;
@@ -2398,7 +2013,6 @@ u16 rtl8180_len2duration(u32 len, shortbreak ; duration++;break ; -default :case 3 ://11mbps *ext=0 ;
@@ -2416,12 +2030,9 @@ u16 rtl8180_len2duration(u32 len, shortreturn duration; } -void rtl8180_prepare_beacon (struct net_device *dev) { -struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -struct sk_buff *skb;u16 word =read_nic_word (dev, BcnItv);
@@ -2429,7 +2040,6 @@ void rtl8180_prepare_beacon(struct net_d word |=cpu_to_le16 (priv->ieee80211->current_network.beacon_interval);//0x64; write_nic_word (dev, BcnItv, word); - skb =ieee80211_get_beacon (priv->ieee80211);if (skb){ rtl8180_tx(dev,skb->data,skb->len,BEACON_PRIORITY,
@@ -2453,19 +2063,14 @@ short rtl8180_tx(struct net_device *dev,int remain;int buflen;int count; -//u16 AckCtsTime; -//u16 FrameTime; u16 duration;short ext;struct buffer * buflist; -//unsigned long flags; struct ieee80211_hdr_3addr *frag_hdr = (struct ieee80211_hdr_3addr *)txbuf;u8 dest[ETH_ALEN ];u8 bUseShortPreamble =0 ;u8 bCTSEnable =0 ;u8 bRTSEnable =0 ; -//u16 RTSRate = 22; -//u8 RetryLimit = 0; u16 Duration =0 ;u16 RtsDur =0 ;u16 ThisFrameTime =0 ;
@@ -2479,56 +2084,47 @@ short rtl8180_tx(struct net_device *dev, buflist = priv->txmapbufstail; count = priv->txringcount;break ; -case BK_PRIORITY : tail=priv->txbkpringtail; begin=priv->txbkpring; buflist = priv->txbkpbufstail; count = priv->txringcount;break ; -case BE_PRIORITY : tail=priv->txbepringtail; begin=priv->txbepring; buflist = priv->txbepbufstail; count = priv->txringcount;break ; -case VI_PRIORITY : tail=priv->txvipringtail; begin=priv->txvipring; buflist = priv->txvipbufstail; count = priv->txringcount;break ; -case VO_PRIORITY : tail=priv->txvopringtail; begin=priv->txvopring; buflist = priv->txvopbufstail; count = priv->txringcount;break ; -case HI_PRIORITY : tail=priv->txhpringtail; begin=priv->txhpring; buflist = priv->txhpbufstail; count = priv->txringcount;break ; -case BEACON_PRIORITY : tail=priv->txbeaconringtail; begin=priv->txbeaconring; buflist = priv->txbeaconbufstail; count = priv->txbeaconcount;break ; -default :return -1 ;break ; } -//printk("in rtl8180_tx(): rate is %d\n",priv->ieee80211->rate); -#if 1 memcpy (&dest, frag_hdr->addr1,ETH_ALEN );if (is_multicast_ether_addr (dest) ||is_broadcast_ether_addr (dest))
@@ -2541,20 +2137,13 @@ short rtl8180_tx(struct net_device *dev, ThisFrameTime =ComputeTxTime (len + sCrcLng,rtl8180_rate2rate (rate),0 , bUseShortPreamble); TxDescDuration = ThisFrameTime; }else {// Unicast packet -//u8 AckRate; u16 AckTime;//YJ,add,080828,for Keep alive priv->NumTxUnicast++;// Figure out ACK rate according to BSS basic rate and Tx rate, 2006.03.08 by rcnjko. -//AckRate = ComputeAckRate( pMgntInfo->mBrates, (u1Byte)(pTcb->DataRate) ); -// Figure out ACK time according to the AckRate and assume long preamble is used on receiver, 2006.03.08, by rcnjko. -//AckTime = ComputeTxTime( sAckCtsLng/8, AckRate, FALSE, FALSE); -//For simplicity, just use the 1M basic rate -//AckTime = ComputeTxTime(14, 540,0, 0); // AckCTSLng = 14 use 1M bps send AckTime =ComputeTxTime (14 ,10 ,0 ,0 );// AckCTSLng = 14 use 1M bps send -//AckTime = ComputeTxTime(14, 2,false, false); // AckCTSLng = 14 use 1M bps send if ( ((len + sCrcLng) > priv->rts) && priv->rts ) {// RTS/CTS.
@@ -2605,30 +2194,24 @@ short rtl8180_tx(struct net_device *dev, }// End of Unicast packet frag_hdr->duration_id = Duration; -#endif buflen=priv->txbuffsize; remain=len; temp_tail = tail; -//printk("================================>buflen = %d, remain = %d!\n", buflen,remain); +while (remain!=0 ){mb ();if (!buflist){DMESGE ("TX buffer error, cannot TX frames. pri %d." , priority); -//spin_unlock_irqrestore(&priv->tx_lock,flags); return -1 ; } buf=buflist->buf; -if ( (*tail & (1 <<31 )) && (priority !=BEACON_PRIORITY )){ - -DMESGW ("No more TX desc, returning %x of %x" , - remain,len); - priv->stats.txrdu++; -// spin_unlock_irqrestore(&priv->tx_lock,flags); - +if ((*tail & (1 <<31 )) && (priority !=BEACON_PRIORITY )) { +DMESGW ("No more TX desc, returning %x of %x" , + remain, len); + priv->stats.txrdu++;return remain; - } *tail=0 ;// zeroes header
@@ -2641,9 +2224,8 @@ short rtl8180_tx(struct net_device *dev,if (priv->card_8185){//FIXME: this should be triggered by HW encryption parameters. *tail |= (1 <<15 );//no encrypt -// *tail |= (1<<30); //raise int when completed } -// *tail = *tail | (1<<16); +if (remain==len && !descfrag) { ownbit_flag = false;//added by david woo,2007.12.14 *tail = *tail| (1 <<29 ) ;//fist segment of the packet
@@ -2681,19 +2263,11 @@ short rtl8180_tx(struct net_device *dev, *(tail+5 ) |= (11 <<8 );//(priv->retry_data<<8); //retry lim ; *tail = *tail | ((rate&0xf ) <<24 ); -//DMESG("rate %d",rate); - -if (priv->card_8185){ -// *(tail+5) = 0; - }/* hw_plcp_len is not used for rtl8180 chip */ /* FIXME */ if (priv->card_8185 ==0 || !priv->hw_plcp_len){ - - duration =rtl8180_len2duration (len, - rate,&ext); - + duration =rtl8180_len2duration (len, rate, &ext); *(tail+1 ) = *(tail+1 ) | ((duration &0x7fff )<<16 );if (ext) *(tail+1 ) = *(tail+1 ) |(1 <<31 );//plcp length extension }
@@ -2712,7 +2286,6 @@ short rtl8180_tx(struct net_device *dev,if ((tail - begin)/8 == count-1 ) tail=begin; -else tail=tail+8 ;
@@ -2725,75 +2298,56 @@ short rtl8180_tx(struct net_device *dev, priv->txmapringtail=tail; priv->txmapbufstail=buflist;break ; -case BK_PRIORITY : priv->txbkpringtail=tail; priv->txbkpbufstail=buflist;break ; -case BE_PRIORITY : priv->txbepringtail=tail; priv->txbepbufstail=buflist;break ; -case VI_PRIORITY : priv->txvipringtail=tail; priv->txvipbufstail=buflist;break ; -case VO_PRIORITY : priv->txvopringtail=tail; priv->txvopbufstail=buflist;break ; -case HI_PRIORITY : priv->txhpringtail=tail; priv->txhpbufstail = buflist;break ; -case BEACON_PRIORITY :/* the HW seems to be happy with the 1st * descriptor filled and the 2nd empty... * So always update descriptor 1 and never * touch 2nd */ -// priv->txbeaconringtail=tail; -// priv->txbeaconbufstail=buflist; -break ; - } - -//rtl8180_dma_kick(dev,priority); } *temp_tail = *temp_tail | (1 <<31 );// descriptor ready to be txed rtl8180_dma_kick (dev,priority); -//spin_unlock_irqrestore(&priv->tx_lock,flags); return 0 ; - } -void rtl8180_irq_rx_tasklet (struct r8180_priv * priv); -void rtl8180_link_change (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);u16 beacon_interval; -struct ieee80211_network *net = &priv->ieee80211->current_network; -// rtl8180_adapter_start(dev); -rtl8180_update_msr (dev); +rtl8180_update_msr (dev);rtl8180_set_mode (dev,EPROM_CMD_CONFIG );write_nic_dword (dev,BSSID ,((u32 *)net->bssid)[0 ]);write_nic_word (dev,BSSID +4 ,((u16 *)net->bssid)[2 ]); - beacon_interval =read_nic_dword (dev,BEACON_INTERVAL ); beacon_interval &= ~BEACON_INTERVAL_MASK ; beacon_interval |= net->beacon_interval;
@@ -2801,23 +2355,14 @@ void rtl8180_link_change(struct net_devirtl8180_set_mode (dev,EPROM_CMD_NORMAL ); - -/* -u16 atim = read_nic_dword(dev,ATIM); -u16 = u16 &~ ATIM_MASK; -u16 = u16 | beacon->atim; -*/ -if (priv->card_8185)rtl8180_set_chan (dev, priv->chan); - - }void rtl8180_rq_tx_ack (struct net_device *dev){struct r8180_priv *priv =ieee80211_priv (dev); -// printk("====================>%s\n",__func__); +write_nic_byte (dev,CONFIG4 ,read_nic_byte (dev,CONFIG4 )|CONFIG4_PWRMGT ); priv->ack_tx_to_ieee =1 ; }
@@ -2858,39 +2403,29 @@ short rtl8180_is_tx_queue_empty(struct nvoid rtl8180_hw_wakeup (struct net_device *dev) {unsigned long flags; -struct r8180_priv *priv =ieee80211_priv (dev);spin_lock_irqsave (&priv->ps_lock,flags); -//DMESG("Waken up!"); write_nic_byte (dev,CONFIG4 ,read_nic_byte (dev,CONFIG4 )&~CONFIG4_PWRMGT ); - -if (priv->rf_wakeup) +if (priv->rf_wakeup) priv->rf_wakeup (dev); -// mdelay(HW_WAKE_DELAY); spin_unlock_irqrestore (&priv->ps_lock,flags); }void rtl8180_hw_sleep_down (struct net_device *dev) {unsigned long flags; -struct r8180_priv *priv =ieee80211_priv (dev);spin_lock_irqsave (&priv->ps_lock,flags); -//DMESG("Sleep!"); -if (priv->rf_sleep) priv->rf_sleep (dev);spin_unlock_irqrestore (&priv->ps_lock,flags); } -void rtl8180_hw_sleep (struct net_device *dev,u32 th,u32 tl) { -struct r8180_priv *priv =ieee80211_priv (dev); -u32 rb = jiffies;unsigned long flags;
@@ -2901,14 +2436,6 @@ void rtl8180_hw_sleep(struct net_device*/ tl -=MSECS (4 +16 +7 ); -//if(tl == 0) tl = 1; - -/* FIXME HACK FIXME HACK */ -// force_pci_posting(dev); -//mdelay(1); - -// rb = read_nic_dword(dev, TSFTR); -/* If the interval in witch we are requested to sleep is too * short then give up and remain awake */
@@ -2919,13 +2446,9 @@ void rtl8180_hw_sleep(struct net_devicereturn ; } -// write_nic_dword(dev, TimerInt, tl); -// rb = read_nic_dword(dev, TSFTR); {u32 tmp = (tl>rb)?(tl-rb):(rb-tl); -// if (tl<rb) -//lzm,add,080828 priv->DozePeriodInPast2Sec +=jiffies_to_msecs (tmp);queue_delayed_work (priv->ieee80211->wq, &priv->ieee80211->hw_wakeup_wq, tmp);//as tl may be less than rb
@@ -2933,26 +2456,20 @@ void rtl8180_hw_sleep(struct net_device/* if we suspect the TimerInt is gone beyond tl * while setting it, then give up */ -#if 1 +if (((tl > rb) && ((tl-rb) >MSECS (MAX_SLEEP_TIME )))|| ((tl < rb) && ((rb-tl) >MSECS (MAX_SLEEP_TIME )))) {spin_unlock_irqrestore (&priv->ps_lock,flags);return ; } -#endif -// if(priv->rf_sleep) -// priv->rf_sleep(dev); queue_work (priv->ieee80211->wq, (void *)&priv->ieee80211->hw_sleep_wq);spin_unlock_irqrestore (&priv->ps_lock,flags); } - -//void rtl8180_wmm_param_update(struct net_device *dev,u8 *ac_param) void rtl8180_wmm_param_update (struct work_struct * work) { struct ieee80211_device * ieee = container_of(work, struct ieee80211_device,wmm_param_update_wq); -//struct r8180_priv *priv = (struct r8180_priv*)(ieee->priv); struct net_device *dev = ieee->dev;u8 *ac_param = (u8 *)(ieee->current_network.wmm_param);u8 mode = ieee->current_network.mode;
@@ -2985,19 +2502,15 @@ void rtl8180_wmm_param_update(struct worcase AC1_BK :write_nic_dword (dev,AC_BK_PARAM , u4bAcParam);break ; -case AC0_BE :write_nic_dword (dev,AC_BE_PARAM , u4bAcParam);break ; -case AC2_VI :write_nic_dword (dev,AC_VI_PARAM , u4bAcParam);break ; -case AC3_VO :write_nic_dword (dev,AC_VO_PARAM , u4bAcParam);break ; -default :printk (KERN_WARNING "SetHwReg8185():invalid ACI: %d!\n" , eACI);break ;
@@ -3028,19 +2541,15 @@ void rtl8180_wmm_param_update(struct worcase AC1_BK :write_nic_dword (dev,AC_BK_PARAM , u4bAcParam);break ; -case AC0_BE :write_nic_dword (dev,AC_BE_PARAM , u4bAcParam);break ; -case AC2_VI :write_nic_dword (dev,AC_VI_PARAM , u4bAcParam);break ; -case AC3_VO :write_nic_dword (dev,AC_VO_PARAM , u4bAcParam);break ; -default :printk (KERN_WARNING "SetHwReg8185(): invalid ACI: %d !\n" , eACI);break ;
@@ -3061,17 +2570,13 @@ void rtl8180_watch_dog(struct net_devicevoid watch_dog_adaptive (unsigned long data) { -struct r8180_priv * priv =ieee80211_priv ((struct net_device *)data); -// DMESG("---->watch_dog_adaptive()\n"); -if (!priv->up) - { +struct r8180_priv * priv =ieee80211_priv ((struct net_device *)data); + +if (!priv->up) {DMESG ("<----watch_dog_adaptive():driver is not up!\n" );return ; } -// queue_work(priv->ieee80211->wq,&priv->ieee80211->watch_dog_wq); -//{by amy 080312 -#if 1 // Tx High Power Mechanism. #ifdef HIGH_POWER if (CheckHighPower ((struct net_device *)data))
@@ -3094,19 +2599,14 @@ void watch_dog_adaptive(unsigned long daqueue_work (priv->ieee80211->wq, (void *)&priv->ieee80211->hw_dig_wq); }#endif -#endif -//by amy 080312} rtl8180_watch_dog ((struct net_device *)data); -queue_work (priv->ieee80211->wq, (void *)&priv->ieee80211->GPIOChangeRFWorkItem); priv->watch_dog_timer.expires = jiffies +MSECS (IEEE80211_WATCH_DOG_TIME );add_timer (&priv->watch_dog_timer); -// DMESG("<----watch_dog_adaptive()\n"); } -static CHANNEL_LIST ChannelPlan[] = { {{1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,36 ,40 ,44 ,48 ,52 ,56 ,60 ,64 },19 },//FCC {{1,2,3,4,5,6,7,8,9,10,11},11}, //IC
@@ -3182,7 +2682,6 @@ static void rtl8180_set_channel_map(u8 c } } -//Add for RF power on power off by lizhaoming 080512 void GPIOChangeRFWorkItemCallBack (struct work_struct *work);//YJ,add,080828
@@ -3190,6 +2689,7 @@ static void rtl8180_statistics_init(stru {memset (pstats,0 ,sizeof (struct Stats )); } +static void rtl8180_link_detect_init (plink_detect_t plink_detect) {memset (plink_detect,0 ,sizeof (link_detect_t));
@@ -3213,13 +2713,10 @@ short rtl8180_init(struct net_device *deprintk ("rtl8180_init:Error channel plan! Set to default.\n" ); priv->channel_plan =0 ; } -//priv->channel_plan = 9; //Global Domain DMESG ("Channel plan is %d\n" ,priv->channel_plan);rtl8180_set_channel_map (priv->channel_plan, priv->ieee80211); -//memcpy(priv->stats,0,sizeof(struct Stats)); -//FIXME: these constants are placed in a bad pleace. priv->txbuffsize =2048 ;//1024; priv->txringcount =32 ;//32;
@@ -3227,14 +2724,9 @@ short rtl8180_init(struct net_device *de priv->rxringcount =64 ;//32; priv->txbeaconcount =2 ; priv->rx_skb_complete =1 ; -//priv->txnp_pending.ispending=0; -/* ^^ the SKB does not containt a partial RXed -* packet (is empty) -*/ priv->RegThreeWireMode =HW_THREE_WIRE_SI ; -//Add for RF power on power off by lizhaoming 080512 priv->RFChangeInProgress = false; priv->SetRFPowerStateInProgress = false; priv->RFProgType =0 ;
@@ -3242,11 +2734,8 @@ short rtl8180_init(struct net_device *de priv->irq_enabled=0 ; -//YJ,modified,080828 rtl8180_statistics_init (&priv->stats);rtl8180_link_detect_init (&priv->link_detect); -//YJ,modified,080828,end - priv->ack_tx_to_ieee =0 ; priv->ieee80211->current_network.beacon_interval =DEFAULT_BEACONINTERVAL ;
@@ -3279,8 +2768,6 @@ short rtl8180_init(struct net_device *de priv->eRFPowerState = eRfOff; priv->RfOffReason =0 ; priv->LedStrategy =SW_LED_MODE0 ; -//priv->NumRxOkInPeriod = 0; //YJ,del,080828 -//priv->NumTxOkInPeriod = 0; //YJ,del,080828 priv->TxPollingTimes =0 ;//lzm add 080826 priv->bLeisurePs = true; priv->dot11PowerSaveMode = eActive;
@@ -3336,13 +2823,10 @@ short rtl8180_init(struct net_device *de priv->CurCCKRSSI =0 ; priv->RxPower =0 ; priv->RSSI =0 ; -//YJ,add,080828 priv->NumTxOkTotal =0 ; priv->NumTxUnicast =0 ; priv->keepAliveLevel =DEFAULT_KEEP_ALIVE_LEVEL ; priv->PowerProfile =POWER_PROFILE_AC ; -//YJ,add,080828,end -//by amy for rate adaptive priv->CurrRetryCnt=0 ; priv->LastRetryCnt=0 ; priv->LastTxokCnt=0 ;
@@ -3363,8 +2847,6 @@ short rtl8180_init(struct net_device *de priv->ForcedDataRate =0 ; priv->RegBModeGainStage =1 ; -//by amy for rate adaptive -//by amy 080312} priv->promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ;spin_lock_init (&priv->irq_lock);spin_lock_init (&priv->irq_th_lock);
@@ -3377,39 +2859,26 @@ short rtl8180_init(struct net_device *deINIT_WORK (&priv->tx_irq_wq,(void *) rtl8180_tx_irq_wq);INIT_DELAYED_WORK (&priv->ieee80211->hw_wakeup_wq,(void *) rtl8180_hw_wakeup_wq);INIT_DELAYED_WORK (&priv->ieee80211->hw_sleep_wq,(void *) rtl8180_hw_sleep_wq); -//INIT_DELAYED_WORK(&priv->ieee80211->watch_dog_wq,(void*) rtl8180_watch_dog_wq); -//INIT_DELAYED_WORK(&priv->ieee80211->sw_antenna_wq,(void*) rtl8180_sw_antenna_wq); INIT_WORK (&priv->ieee80211->wmm_param_update_wq,(void *) rtl8180_wmm_param_update);INIT_DELAYED_WORK (&priv->ieee80211->rate_adapter_wq,(void *)rtl8180_rate_adapter);//+by amy 080312 INIT_DELAYED_WORK (&priv->ieee80211->hw_dig_wq,(void *)rtl8180_hw_dig_wq);//+by amy 080312 INIT_DELAYED_WORK (&priv->ieee80211->tx_pw_wq,(void *)rtl8180_tx_pw_wq);//+by amy 080312 -//add for RF power on power off by lizhaoming 080512 INIT_DELAYED_WORK (&priv->ieee80211->GPIOChangeRFWorkItem,(void *) GPIOChangeRFWorkItemCallBack); -//INIT_WORK(&priv->reset_wq,(void*) rtl8180_restart_wq,dev); tasklet_init (&priv->irq_rx_tasklet, (void (*)(unsigned long )) rtl8180_irq_rx_tasklet, (unsigned long )priv); -//by amy +init_timer (&priv->watch_dog_timer); priv->watch_dog_timer.data = (unsigned long )dev; priv->watch_dog_timer.function = watch_dog_adaptive; -//by amy -//{by amy 080312 -//by amy for rate adaptive init_timer (&priv->rateadapter_timer); priv->rateadapter_timer.data = (unsigned long )dev; priv->rateadapter_timer.function = timer_rate_adaptive; priv->RateAdaptivePeriod=RATE_ADAPTIVE_TIMER_PERIOD ; priv->bEnhanceTxPwr=false; -//by amy for rate adaptive -//by amy 080312} -//priv->ieee80211->func = -// kmalloc(sizeof(struct ieee80211_helper_functions),GFP_KERNEL); -//memset(priv->ieee80211->func, 0, -// sizeof(struct ieee80211_helper_functions)); priv->ieee80211->softmac_hard_start_xmit = rtl8180_hard_start_xmit; priv->ieee80211->set_chan = rtl8180_set_chan;
@@ -3440,11 +2909,9 @@ short rtl8180_init(struct net_device *de (0 ?TCR_SAT :0 );// FALSE: HW provies PLCP length and LENGEXT, TURE: SW proiveds them priv->ReceiveConfig = -// RCR_ENMARP | RCR_AMF |RCR_ADF |//accept management/data RCR_ACF |//accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko. RCR_AB |RCR_AM |RCR_APM |//accept BC/MC/UC -//RCR_AICV | RCR_ACRC32 | //accept ICV/CRC error packet (7 <<RCR_MXDMA_OFFSET ) |// Max DMA Burst Size per Rx DMA Burst, 7: unlimited. (priv->EarlyRxThreshold<<RCR_FIFO_OFFSET ) |// Rx FIFO Threshold, 7: No Rx threshold. (priv->EarlyRxThreshold ==7 ?RCR_ONLYERLPKT :0 );
@@ -3475,24 +2942,20 @@ short rtl8180_init(struct net_device *de/* you should not find a card with 8225 PHY ver < C*/ priv->phy_ver =2 ;break ; -case HW_VERID_R8185_D :DMESG ("MAC controller is a RTL8185 b/g (V. D)" ); priv->card_8185 =2 ;/* you should not find a card with 8225 PHY ver < C*/ priv->phy_ver =2 ;break ; -case HW_VERID_R8180_ABCD :DMESG ("MAC controller is a RTL8180" ); priv->card_8185 =0 ;break ; -case HW_VERID_R8180_F :DMESG ("MAC controller is a RTL8180 (v. F)" ); priv->card_8185 =0 ;break ; -default :DMESGW ("MAC chip not recognized: version %x. Assuming RTL8180" ,hw_version); priv->card_8185 =0 ;
@@ -3511,72 +2974,45 @@ short rtl8180_init(struct net_device *deDMESG ("This is a PCI NIC" ); priv->enable_gpio0 =0 ; -//by amy for antenna usValue =eprom_read (dev,EEPROM_SW_REVD_OFFSET );DMESG ("usValue is 0x%x\n" ,usValue);//3Read AntennaDiversity +// SW Antenna Diversity. -if ( (usValue &EEPROM_SW_AD_MASK ) !=EEPROM_SW_AD_ENABLE ) - { +if ((usValue &EEPROM_SW_AD_MASK ) !=EEPROM_SW_AD_ENABLE ) priv->EEPROMSwAntennaDiversity = false; -//printk("EEPROM Disable SW Antenna Diversity\n"); - }else - { priv->EEPROMSwAntennaDiversity = true; -//printk("EEPROM Enable SW Antenna Diversity\n"); - } +// Default Antenna to use. -if ( (usValue &EEPROM_DEF_ANT_MASK ) !=EEPROM_DEF_ANT_1 ) - { +if ((usValue &EEPROM_DEF_ANT_MASK ) !=EEPROM_DEF_ANT_1 ) priv->EEPROMDefaultAntenna1 = false; -//printk("EEPROM Default Antenna 0\n"); - }else - { priv->EEPROMDefaultAntenna1 = true; -//printk("EEPROM Default Antenna 1\n"); - } -// -// Antenna diversity mechanism. Added by Roger, 2007.11.05. -// if ( priv->RegSwAntennaDiversityMechanism ==0 )// Auto - {// 0: default from EEPROM. +/* 0: default from EEPROM. */ priv->bSwAntennaDiverity = priv->EEPROMSwAntennaDiversity; - }else - {// 1:disable antenna diversity, 2: enable antenna diversity. +/* 1:disable antenna diversity, 2: enable antenna diversity. */ priv->bSwAntennaDiverity = ((priv->RegSwAntennaDiversityMechanism ==1 )? false : true); - } -//printk("bSwAntennaDiverity = %d\n", priv->bSwAntennaDiverity); - -// -// Default antenna settings. Added by Roger, 2007.11.05. -// -if ( priv->RegDefaultAntenna ==0 ) - {// 0: default from EEPROM. +if (priv->RegDefaultAntenna ==0 ) +/* 0: default from EEPROM. */ priv->bDefaultAntenna1 = priv->EEPROMDefaultAntenna1; - }else - {// 1: main, 2: aux. +/* 1: main, 2: aux. */ priv->bDefaultAntenna1 = ((priv->RegDefaultAntenna==2 ) ? true : false); - } -//printk("bDefaultAntenna1 = %d\n", priv->bDefaultAntenna1); -//by amy for antenna +/* rtl8185 can calc plcp len in HW.*/ priv->hw_plcp_len =1 ; priv->plcp_preamble_mode =2 ;/*the eeprom type is stored in RCR register bit #6 */ -if (RCR_9356SEL &read_nic_dword (dev,RCR )){ +if (RCR_9356SEL &read_nic_dword (dev,RCR )) priv->epromtype=EPROM_93c56; -//DMESG("Reported EEPROM chip is a 93c56 (2Kbit)"); - }else { +else priv->epromtype=EPROM_93c46; -//DMESG("Reported EEPROM chip is a 93c46 (1Kbit)"); - } dev->dev_addr[0 ]=eprom_read (dev,MAC_ADR ) &0xff ; dev->dev_addr[1 ]=(eprom_read (dev,MAC_ADR ) &0xff00 )>>8 ;
@@ -3584,32 +3020,26 @@ short rtl8180_init(struct net_device *de dev->dev_addr[3 ]=(eprom_read (dev,MAC_ADR +1 ) &0xff00 )>>8 ; dev->dev_addr[4 ]=eprom_read (dev,MAC_ADR +2 ) &0xff ; dev->dev_addr[5 ]=(eprom_read (dev,MAC_ADR +2 ) &0xff00 )>>8 ; -//DMESG("Card MAC address is "MAC_FMT, MAC_ARG(dev->dev_addr)); -for (i=1 ,j=0 ; i<14 ; i+=2 ,j++){ - word =eprom_read (dev,EPROM_TXPW_CH1_2 + j); priv->chtxpwr[i]=word &0xff ; priv->chtxpwr[i+1 ]=(word &0xff00 )>>8 ; }if (priv->card_8185){for (i=1 ,j=0 ; i<14 ; i+=2 ,j++){ - word =eprom_read (dev,EPROM_TXPW_OFDM_CH1_2 + j); priv->chtxpwr_ofdm[i]=word &0xff ; priv->chtxpwr_ofdm[i+1 ]=(word &0xff00 )>>8 ; } } -//{by amy 080312 +//3Read crystal calibtration and thermal meter indication on 87SE. // By SD3 SY's request. Added by Roger, 2007.12.11. tmpu16 =eprom_read (dev,EEPROM_RSV >>1 ); -//printk("ReadAdapterInfo8185(): EEPROM_RSV(%04x)\n", tmpu16); -// Crystal calibration for Xin and Xout resp. priv->XtalCal_Xout = tmpu16 &EEPROM_XTAL_CAL_XOUT_MASK ;// 0~7.5pF priv->XtalCal_Xin = (tmpu16 &EEPROM_XTAL_CAL_XIN_MASK )>>4 ;// 0~7.5pF
@@ -3621,7 +3051,6 @@ short rtl8180_init(struct net_device *deif ((tmpu16 &EEPROM_THERMAL_METER_ENABLE )>>13 ) priv->bTxPowerTrack = true; -//by amy 080312} word =eprom_read (dev,EPROM_TXPW_BASE ); priv->cck_txpwr_base = word &0xf ; priv->ofdm_txpwr_base = (word>>4 ) &0xf ;
@@ -3663,9 +3092,6 @@ DMESG output to [email protected] THA priv->rf_chip =RF_ZEBRA4 ; priv->rf_sleep = rtl8225z4_rf_sleep; priv->rf_wakeup = rtl8225z4_rf_wakeup; -//DMESG("Card reports RF frontend Realtek 8225z2"); -//DMESGW("This driver has EXPERIMENTAL support for this chipset."); -//DMESGW("use it with care and at your own risk and"); DMESGW ("**PLEASE** REPORT SUCCESSFUL/UNSUCCESSFUL TO Realtek!" ); priv->rf_close = rtl8225z2_rf_close;
@@ -3718,11 +3144,7 @@ DMESG output to [email protected] THA TX_BEACON_RING_ADDR))return -ENOMEM ; - -//priv->beacon_buf=NULL; -if (!priv->card_8185){ -if (read_nic_byte (dev,CONFIG0 ) & (1 <<CONFIG0_WEP40_SHIFT ))DMESG ("40-bit WEP is supported in hardware" );else
@@ -3746,16 +3168,13 @@ DMESG output to [email protected] THA }return 0 ; - } -void rtl8180_no_hw_wep (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev); -if (!priv->card_8185) - { +if (!priv->card_8185) {u8 security; security =read_nic_byte (dev,SECURITY );
@@ -3763,19 +3182,9 @@ void rtl8180_no_hw_wep(struct net_device security &=~(1 <<SECURITY_WEP_RX_ENABLE_SHIFT );write_nic_byte (dev,SECURITY , security); - - }else { - -//FIXME!!! } -/* -write_nic_dword(dev,TX_CONF,read_nic_dword(dev,TX_CONF) | -(1<<TX_NOICV_SHIFT) ); -*/ -// priv->ieee80211->hw_wep=0; } -void rtl8180_set_hw_wep (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -3794,10 +3203,6 @@ void rtl8180_set_hw_wep(struct net_devicwrite_nic_dword (dev,KEY0 +4 +4 ,(priv->key0[2 ]));write_nic_dword (dev,KEY0 +4 +4 +4 ,(key0_word4)); -/* -TX_CONF,read_nic_dword(dev,TX_CONF) &~(1<<TX_NOICV_SHIFT)); -*/ - security =read_nic_byte (dev,SECURITY ); security |= (1 <<SECURITY_WEP_TX_ENABLE_SHIFT ); security |= (1 <<SECURITY_WEP_RX_ENABLE_SHIFT );
@@ -3809,8 +3214,6 @@ void rtl8180_set_hw_wep(struct net_devicDMESG ("key %x %x %x %x" ,read_nic_dword (dev,KEY0 +4 +4 +4 ),read_nic_dword (dev,KEY0 +4 +4 ),read_nic_dword (dev,KEY0 +4 ),read_nic_dword (dev,KEY0 )); - -//priv->ieee80211->hw_wep=1; }
@@ -3819,10 +3222,8 @@ void rtl8185_rf_pins_enable(struct net_d// u16 tmp; // tmp = read_nic_word(dev, RFPinsEnable); write_nic_word (dev, RFPinsEnable,0x1fff );// | tmp); -// write_nic_word(dev, RFPinsEnable,7 | tmp); } -void rtl8185_set_anaparam2 (struct net_device *dev,u32 a) {u8 conf3;
@@ -3836,10 +3237,8 @@ void rtl8185_set_anaparam2(struct net_de conf3 =read_nic_byte (dev,CONFIG3 );write_nic_byte (dev,CONFIG3 , conf3 &~(1 <<CONFIG3_ANAPARAM_W_SHIFT ));rtl8180_set_mode (dev,EPROM_CMD_NORMAL ); - } -void rtl8180_set_anaparam (struct net_device *dev,u32 a) {u8 conf3;
@@ -3855,7 +3254,6 @@ void rtl8180_set_anaparam(struct net_devrtl8180_set_mode (dev,EPROM_CMD_NORMAL ); } -void rtl8185_tx_antenna (struct net_device *dev,u8 ant) {write_nic_byte (dev,TX_ANTENNA , ant);
@@ -3863,12 +3261,9 @@ void rtl8185_tx_antenna(struct net_devicmdelay (1 ); } -void rtl8185_write_phy (struct net_device *dev,u8 adr,u32 data) { -//u8 phyr; u32 phyw; -//int i; adr |=0x80 ;
@@ -3886,21 +3281,18 @@ void rtl8185_write_phy(struct net_device//if(phyr != (data&0xff)) DMESGW("Phy write timeout %x %x %x", phyr, data,adr); } -inline void write_phy_ofdm (struct net_device *dev,u8 adr,u32 data) { data = data &0xff ;rtl8185_write_phy (dev, adr, data); } -void write_phy_cck (struct net_device *dev,u8 adr,u32 data) { data = data &0xff ;rtl8185_write_phy (dev, adr, data |0x10000 ); } -/* 70*3 = 210 ms * I hope this is enougth */
@@ -3944,55 +3336,32 @@ void rtl8185_set_rate(struct net_deviceu16 word;int basic_rate,min_rr_rate,max_rr_rate; -// struct r8180_priv *priv = ieee80211_priv(dev); - -//if (ieee80211_is_54g(priv->ieee80211->current_network) && -// priv->ieee80211->state == IEEE80211_LINKED){ basic_rate =ieeerate2rtlrate (240 ); min_rr_rate =ieeerate2rtlrate (60 ); max_rr_rate =ieeerate2rtlrate (240 ); -// -// }else{ -// basic_rate = ieeerate2rtlrate(20); -// min_rr_rate = ieeerate2rtlrate(10); -// max_rr_rate = ieeerate2rtlrate(110); -// } -write_nic_byte (dev,RESP_RATE , max_rr_rate<<MAX_RESP_RATE_SHIFT | min_rr_rate<<MIN_RESP_RATE_SHIFT ); word =read_nic_word (dev,BRSR ); word &= ~BRSR_MBR_8185 ; -for (i=0 ;i<=basic_rate;i++) word |= (1 <<i);write_nic_word (dev,BRSR , word); -//DMESG("RR:%x BRSR: %x", read_nic_byte(dev,RESP_RATE),read_nic_word(dev,BRSR)); } - -void rtl8180_adapter_start (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);u32 anaparam;u16 word;u8 config3; -// int i; rtl8180_rtx_disable (dev);rtl8180_reset (dev); -/* seems that 0xffff or 0xafff will cause -* HW interrupt line crash -*/ - -//priv->irq_mask = 0xafff; -// priv->irq_mask = 0x4fcf; -/* enable beacon timeout, beacon TX ok and err * LP tx ok and err, HP TX ok and err, NP TX ok and err, * RX ok and ERR, and GP timer */
@@ -4024,8 +3393,6 @@ void rtl8180_adapter_start(struct net_de/* These might be unnecessary since we do in rx_enable / tx_enable */ fix_rx_fifo (dev);fix_tx_fifo (dev); -/*set_nic_rxring(dev); -set_nic_txring(dev);*/ rtl8180_set_mode (dev,EPROM_CMD_CONFIG );
@@ -4060,7 +3427,6 @@ void rtl8180_adapter_start(struct net_dewrite_nic_byte (dev,CONFIG5 ,read_nic_byte (dev,CONFIG5 ) &~ (1 <<AGCRESET_SHIFT )); }else { -write_nic_byte (dev,WPA_CONFIG ,0 );//write_nic_byte(dev, TESTR, 0xd); }
@@ -4070,28 +3436,23 @@ void rtl8180_adapter_start(struct net_deif (priv->card_8185){rtl8185_set_rate (dev);write_nic_byte (dev,RATE_FALLBACK ,0x81 ); -// write_nic_byte(dev, 0xdf, 0x15); }else { word =read_nic_word (dev,BRSR ); word &= ~BRSR_MBR ; word &= ~BRSR_BPLCP ; word |=ieeerate2rtlrate (priv->ieee80211->basic_rate); -//by amy - word |=0x0f ; -//by amy + word |=0x0f ;write_nic_word (dev,BRSR , word); } -if (priv->card_8185){write_nic_byte (dev,GP_ENABLE ,read_nic_byte (dev,GP_ENABLE ) & ~(1 <<6 ));//FIXME cfg 3 ClkRun enable - isn't it ReadOnly ? rtl8180_set_mode (dev,EPROM_CMD_CONFIG );write_nic_byte (dev,CONFIG3 ,read_nic_byte (dev,CONFIG3 ) -|(1 <<CONFIG3_CLKRUN_SHIFT )); + | (1 <<CONFIG3_CLKRUN_SHIFT ));rtl8180_set_mode (dev,EPROM_CMD_NORMAL ); - } priv->rf_init (dev);
@@ -4101,39 +3462,23 @@ void rtl8180_adapter_start(struct net_dertl8180_irq_enable (dev);netif_start_queue (dev); -/*DMESG ("lfree %d",get_curr_tx_free_desc(dev,LOW_PRIORITY)); - -DMESG ("nfree %d",get_curr_tx_free_desc(dev,NORM_PRIORITY)); - -DMESG ("hfree %d",get_curr_tx_free_desc(dev,HI_PRIORITY)); -if(check_nic_enought_desc(dev,NORM_PRIORITY)) DMESG("NORM OK"); -if(check_nic_enought_desc(dev,HI_PRIORITY)) DMESG("HI OK"); -if(check_nic_enought_desc(dev,LOW_PRIORITY)) DMESG("LOW OK");*/ } - -/* this configures registers for beacon tx and enables it via * rtl8180_beacon_tx_enable(). rtl8180_beacon_tx_disable() might * be used to stop beacon transmission */ void rtl8180_start_tx_beacon (struct net_device *dev) { -// struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); u16 word; -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); DMESG ("Enabling beacon TX" ); -//write_nic_byte(dev, 0x42,0xe6);// TCR -// set_nic_txring(dev); -// fix_tx_fifo(dev); rtl8180_prepare_beacon (dev);rtl8180_irq_disable (dev);rtl8180_beacon_tx_enable (dev); word =read_nic_word (dev, AtimWnd) &~ AtimWnd_AtimWnd;write_nic_word (dev, AtimWnd,word);// word |= -//priv->ieee80211->current_network.atim_window); word =read_nic_word (dev, BintrItv); word &= ~BintrItv_BintrItv;
@@ -4143,26 +3488,11 @@ void rtl8180_start_tx_beacon(struct net_*/ write_nic_word (dev, BintrItv, word); -rtl8180_set_mode (dev,EPROM_CMD_NORMAL ); -// rtl8180_beacon_tx_enable(dev); rtl8185b_irq_enable (dev); -/* VV !!!!!!!!!! VV*/ -/* -rtl8180_set_mode(dev,EPROM_CMD_CONFIG); -write_nic_byte(dev,0x9d,0x00); -rtl8180_set_mode(dev,EPROM_CMD_NORMAL); -*/ -// DMESG("ring %x %x", priv->txlpringdma,read_nic_dword(dev,TLPDA)); - } - - -/*************************************************************************** --------------------------------NET STUFF--------------------------- -***************************************************************************/ static struct net_device_stats *rtl8180_stats (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -4179,93 +3509,42 @@ MgntActSet_802_11_PowerSaveMode(RT_PS_MODE rtPsMode ) { -// Currently, we do not change power save mode on IBSS mode. if (priv->ieee80211->iw_mode ==IW_MODE_ADHOC ) - {return false; - } - -// -// <RJ_NOTE> If we make HW to fill up the PwrMgt bit for us, -// some AP will not response to our mgnt frames with PwrMgt bit set, -// e.g. cannot associate the AP. -// So I commented out it. 2005.02.16, by rcnjko. -// -// // Change device's power save mode. -// Adapter->HalFunc.SetPSModeHandler( Adapter, rtPsMode ); -// Update power save mode configured. -// priv->dot11PowerSaveMode = rtPsMode; priv->ieee80211->ps = rtPsMode; -// Determine ListenInterval. return true; } -//================================================================================ -// Leisure Power Save in linked state. -//================================================================================ - -// -// Description: -// Enter the leisure power save mode. -// -void -LeisurePSEnter ( -struct r8180_priv *priv - ) +void LeisurePSEnter (struct r8180_priv *priv) { -if (priv->bLeisurePs) - { +if (priv->bLeisurePs) {if (priv->ieee80211->ps ==IEEE80211_PS_DISABLED ) - { -//printk("----Enter PS\n"); MgntActSet_802_11_PowerSaveMode (priv,IEEE80211_PS_MBCAST |IEEE80211_PS_UNICAST );//IEEE80211_PS_ENABLE - } } } - -// -// Description: -// Leave the leisure power save mode. -// -void -LeisurePSLeave ( -struct r8180_priv *priv - ) +void LeisurePSLeave (struct r8180_priv *priv) { -if (priv->bLeisurePs) - { +if (priv->bLeisurePs) {if (priv->ieee80211->ps !=IEEE80211_PS_DISABLED ) - { -//printk("----Leave PS\n"); MgntActSet_802_11_PowerSaveMode (priv,IEEE80211_PS_DISABLED ); - } } }void rtl8180_hw_wakeup_wq (struct work_struct *work) { -// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq); -// struct ieee80211_device * ieee = (struct ieee80211_device*) -// container_of(work, struct ieee80211_device, watch_dog_wq); struct delayed_work *dwork =to_delayed_work (work); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_wakeup_wq);struct net_device *dev = ieee->dev; -// printk("dev is %d\n",dev); -// printk("&*&(^*(&(&=========>%s()\n", __func__); rtl8180_hw_wakeup (dev); - }void rtl8180_hw_sleep_wq (struct work_struct *work) { -// struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq); -// struct ieee80211_device * ieee = (struct ieee80211_device*) -// container_of(work, struct ieee80211_device, watch_dog_wq); struct delayed_work *dwork =to_delayed_work (work); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_sleep_wq);struct net_device *dev = ieee->dev;
@@ -4273,7 +3552,6 @@ void rtl8180_hw_sleep_wq (struct work_strtl8180_hw_sleep_down (dev); } -//YJ,add,080828,for KeepAlive static void MgntLinkKeepAlive (struct r8180_priv *priv ) {if (priv->keepAliveLevel ==0 )
@@ -4284,7 +3562,6 @@ static void MgntLinkKeepAlive(struct r81// // Keep-Alive. // -//printk("LastTx:%d Tx:%d LastRx:%d Rx:%ld Idle:%d\n",priv->link_detect.LastNumTxUnicast,priv->NumTxUnicast, priv->link_detect.LastNumRxUnicast, priv->ieee80211->NumRxUnicast, priv->link_detect.IdleCount); if ( (priv->keepAliveLevel== 2) || (priv->link_detect.LastNumTxUnicast == priv->NumTxUnicast &&
@@ -4310,9 +3587,9 @@ static void MgntLinkKeepAlive(struct r81 priv->link_detect.LastNumRxUnicast = priv->ieee80211->NumRxUnicast; } } -//YJ,add,080828,for KeepAlive,end static u8 read_acadapter_file (char *filename); +void rtl8180_watch_dog (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -4334,7 +3611,7 @@ void rtl8180_watch_dog(struct net_device priv->link_detect.RxFrameNum[SlotIndex] = priv->ieee80211->NumRxDataInPeriod + priv->ieee80211->NumRxBcnInPeriod;for ( i=0 ; i<priv->link_detect.SlotNum; i++ ) TotalRxNum+= priv->link_detect.RxFrameNum[i]; -//printk("&&&&&=== TotalRxNum = %d\n", TotalRxNum); +if (TotalRxNum ==0 ){ priv->ieee80211->state =IEEE80211_ASSOCIATING ;queue_work (priv->ieee80211->wq, &priv->ieee80211->associate_procedure_wq);
@@ -4346,22 +3623,13 @@ void rtl8180_watch_dog(struct net_device//YJ,add,080828,for LPS #ifdef ENABLE_LPS -if (priv->PowerProfile ==POWER_PROFILE_BATTERY ) - { -//Turn on LeisurePS on battery power -//printk("!!!!!On battery power\n"); +if (priv->PowerProfile ==POWER_PROFILE_BATTERY ) priv->bLeisurePs = true; - } -else if (priv->PowerProfile ==POWER_PROFILE_AC ) - { -// Turn off LeisurePS on AC power -//printk("----On AC power\n"); +else if (priv->PowerProfile ==POWER_PROFILE_AC ) {LeisurePSLeave (priv); priv->bLeisurePs= false; } -#endif -#ifdef ENABLE_LPS if (priv->ieee80211->state ==IEEE80211_LINKED ){ priv->link_detect.NumRxOkInPeriod = priv->ieee80211->NumRxDataInPeriod;//printk("TxOk=%d RxOk=%d\n", priv->link_detect.NumTxOkInPeriod, priv->link_detect.NumRxOkInPeriod);
@@ -4372,21 +3640,15 @@ void rtl8180_watch_dog(struct net_deviceif (((priv->link_detect.NumRxOkInPeriod + priv->link_detect.NumTxOkInPeriod) >8 ) || (priv->link_detect.NumRxOkInPeriod >2 )) { bEnterPS= false; - } -else { + }else bEnterPS= true; - } -if (bEnterPS) { +if (bEnterPS)LeisurePSEnter (priv); - } -else { +else LeisurePSLeave(priv); - } - } -else { + }else LeisurePSLeave (priv); - }#endif priv->link_detect.bBusyTraffic = bBusyTraffic; priv->link_detect.NumRxOkInPeriod =0 ;
@@ -4394,10 +3656,10 @@ void rtl8180_watch_dog(struct net_device priv->ieee80211->NumRxDataInPeriod =0 ; priv->ieee80211->NumRxBcnInPeriod =0 ; } +int _rtl8180_up (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev); -//int i; priv->up=1 ;
@@ -4411,28 +3673,19 @@ int _rtl8180_up(struct net_device *dev) IPSLeave(dev); }#endif -//by amy 080312 #ifdef RATE_ADAPT timer_rate_adaptive ((unsigned long )dev);#endif -//by amy 080312 watch_dog_adaptive ((unsigned long )dev);#ifdef SW_ANTE if (priv->bSwAntennaDiverity)SwAntennaDiversityTimerCallback (dev);#endif -// IPSEnter(dev); ieee80211_softmac_start_protocol (priv->ieee80211); -//Add for RF power on power off by lizhaoming 080512 -// priv->eRFPowerState = eRfOn; -// printk("\n--------Start queue_work:GPIOChangeRFWorkItem"); -// queue_delayed_work(priv->ieee80211->wq,&priv->ieee80211->GPIOChangeRFWorkItem,1000); -return 0 ; } -int rtl8180_open (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -4442,10 +3695,8 @@ int rtl8180_open(struct net_device *dev) ret =rtl8180_up (dev);up (&priv->wx_sem);return ret; - } -int rtl8180_up (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -4455,7 +3706,6 @@ int rtl8180_up(struct net_device *dev)return _rtl8180_up (dev); } -int rtl8180_close (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);
@@ -4466,14 +3716,14 @@ int rtl8180_close(struct net_device *devup (&priv->wx_sem);return ret; - }int rtl8180_down (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev); -if (priv->up ==0 )return -1 ; +if (priv->up ==0 ) +return -1 ; priv->up=0 ;
@@ -4484,18 +3734,14 @@ int rtl8180_down(struct net_device *dev)rtl8180_rtx_disable (dev);rtl8180_irq_disable (dev);del_timer_sync (&priv->watch_dog_timer); -//cancel_delayed_work(&priv->ieee80211->watch_dog_wq); -//{by amy 080312 -del_timer_sync (&priv->rateadapter_timer); -cancel_delayed_work (&priv->ieee80211->rate_adapter_wq); -//by amy 080312} +del_timer_sync (&priv->rateadapter_timer); +cancel_delayed_work (&priv->ieee80211->rate_adapter_wq);cancel_delayed_work (&priv->ieee80211->hw_wakeup_wq);cancel_delayed_work (&priv->ieee80211->hw_sleep_wq);cancel_delayed_work (&priv->ieee80211->hw_dig_wq);cancel_delayed_work (&priv->ieee80211->tx_pw_wq);del_timer_sync (&priv->SwAntennaDiversityTimer);SetZebraRFPowerState8185 (dev,eRfOff); -//ieee80211_softmac_stop_protocol(priv->ieee80211); memset (&(priv->ieee80211->current_network),0 ,sizeof (struct ieee80211_network )); priv->ieee80211->state =IEEE80211_NOLINK ;return 0 ;
@@ -4516,26 +3762,20 @@ void rtl8180_restart_wq(struct work_struvoid rtl8180_restart (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev); -//rtl8180_commit(dev); +schedule_work (&priv->reset_wq); -//DMESG("TXTIMEOUT"); } -void rtl8180_commit (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev); -if (priv->up ==0 )return ; -//+by amy 080312 +if (priv->up ==0 ) +return ; +del_timer_sync (&priv->watch_dog_timer); -//cancel_delayed_work(&priv->ieee80211->watch_dog_wq); -//{by amy 080312 -//by amy for rate adaptive -del_timer_sync (&priv->rateadapter_timer); -cancel_delayed_work (&priv->ieee80211->rate_adapter_wq); -//by amy for rate adaptive -//by amy 080312} +del_timer_sync (&priv->rateadapter_timer); +cancel_delayed_work (&priv->ieee80211->rate_adapter_wq);cancel_delayed_work (&priv->ieee80211->hw_wakeup_wq);cancel_delayed_work (&priv->ieee80211->hw_sleep_wq);cancel_delayed_work (&priv->ieee80211->hw_dig_wq);
@@ -4547,22 +3787,17 @@ void rtl8180_commit(struct net_device *d_rtl8180_up (dev); } -static void r8180_set_multicast (struct net_device *dev) {struct r8180_priv *priv =ieee80211_priv (dev);short promisc; -//down(&priv->wx_sem); - promisc = (dev->flags &IFF_PROMISC ) ?1 :0 ;if (promisc != priv->promisc)rtl8180_restart (dev); priv->promisc = promisc; - -//up(&priv->wx_sem); }int r8180_set_mac_adr (struct net_device *dev,void *mac)
@@ -4591,27 +3826,20 @@ int r8180_set_mac_adr(struct net_deviceint rtl8180_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) {struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv (dev); -struct iwreq *wrq = (struct iwreq *) rq;int ret=-1 ; +switch (cmd) { -case RTL_IOCTL_WPA_SUPPLICANT : +case RTL_IOCTL_WPA_SUPPLICANT : ret =ieee80211_wpa_supplicant_ioctl (priv->ieee80211, &wrq->u.data);return ret; - -default : +default :return -EOPNOTSUPP ; }return -EOPNOTSUPP ; } - - -/**************************************************************************** ------------------------------PCI STUFF--------------------------- -*****************************************************************************/ -static const struct net_device_ops rtl8180_netdev_ops = { .ndo_open = rtl8180_open, .ndo_stop = rtl8180_close,
@@ -4631,7 +3859,6 @@ static int __devinit rtl8180_pci_probe(sunsigned long ioaddr =0 ;struct net_device *dev =NULL ;struct r8180_priv *priv=NULL ; -//u8 *ptr; u8 unit =0 ;unsigned long pmem_start, pmem_len, pmem_flags;
@@ -4644,7 +3871,6 @@ static int __devinit rtl8180_pci_probe(s }pci_set_master (pdev); -//pci_set_wmi(pdev); pci_set_dma_mask (pdev,0xffffff00ULL );pci_set_consistent_dma_mask (pdev,0xffffff00ULL ); dev =alloc_ieee80211 (sizeof (struct r8180_priv ));
@@ -4657,10 +3883,7 @@ static int __devinit rtl8180_pci_probe(sSET_NETDEV_DEV (dev, &pdev->dev); priv =ieee80211_priv (dev); -// memset(priv,0,sizeof(struct r8180_priv)); - priv->pdev=pdev; - - + priv->pdev = pdev; pmem_start =pci_resource_start (pdev,1 ); pmem_len =pci_resource_len (pdev,1 );
@@ -4671,26 +3894,20 @@ static int __devinit rtl8180_pci_probe(s goto fail; } -//DMESG("Memory mapped space @ 0x%08lx ", pmem_start); if ( !request_mem_region (pmem_start, pmem_len,RTL8180_MODULE_NAME )) {DMESG ("request_mem_region failed!" ); goto fail; } - ioaddr = (unsigned long )ioremap_nocache ( pmem_start, pmem_len);if ( ioaddr == (unsigned long )NULL ){DMESG ("ioremap failed!" ); -// release_mem_region( pmem_start, pmem_len ); goto fail1; } dev->mem_start = ioaddr;// shared mem start dev->mem_end = ioaddr +pci_resource_len (pdev,0 );// shared mem end - -//pci_read_config_byte(pdev, 0x05, ptr); -//pci_write_config_byte(pdev, 0x05, (*ptr) & (~0x04)); pci_read_config_byte (pdev,0x05 , &unit);pci_write_config_byte (pdev,0x05 , unit & (~0x04 ));
@@ -4706,11 +3923,9 @@ static int __devinit rtl8180_pci_probe(sif (dev_alloc_name (dev, ifname) <0 ){DMESG ("Oops: devname already taken! Trying wlan%%d...\n" ); ifname ="wlan%d" ; -// ifname = "ath%d"; dev_alloc_name (dev, ifname); } -if (rtl8180_init (dev)!=0 ){DMESG ("Initialization failed" ); goto fail1;
@@ -4724,19 +3939,14 @@ static int __devinit rtl8180_pci_probe(sDMESG ("Driver probe completed\n" );return 0 ; - fail1: -if ( dev->mem_start != (unsigned long )NULL ){iounmap ( (void *)dev->mem_start );release_mem_region (pci_resource_start (pdev,1 ),pci_resource_len (pdev,1 ) ); } - - fail:if (dev){ -if (priv->irq) {free_irq (dev->irq, dev); dev->irq=0 ;
@@ -4749,42 +3959,32 @@ fail:DMESG ("wlan driver load failed\n" );pci_set_drvdata (pdev,NULL );return -ENODEV ; - } - static void __devexit rtl8180_pci_remove(struct pci_dev *pdev) {struct r8180_priv *priv;struct net_device *dev =pci_get_drvdata (pdev); -if (dev){ +if (dev) {unregister_netdev (dev); - priv=ieee80211_priv (dev); + priv =ieee80211_priv (dev);
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.