diff options
Diffstat (limited to 'drivers/staging/rtl8187se')
42 files changed, 1202 insertions, 14092 deletions
diff --git a/drivers/staging/rtl8187se/Makefile b/drivers/staging/rtl8187se/Makefile index 6bc7e29771c3..ac35cffe5d4a 100644 --- a/drivers/staging/rtl8187se/Makefile +++ b/drivers/staging/rtl8187se/Makefile @@ -1,24 +1,14 @@ #EXTRA_CFLAGS += -DCONFIG_IEEE80211_NOWEP=y -#EXTRA_CFLAGS += -DCONFIG_RTL8180_IOMAP #EXTRA_CFLAGS += -std=gnu89 #EXTRA_CFLAGS += -O2 #CC = gcc -EXTRA_CFLAGS += -DTHOMAS_TURBO -#CFLAGS += -DCONFIG_RTL8185B -#CFLAGS += -DCONFIG_RTL818x_S -#added for EeePC testing -EXTRA_CFLAGS += -DENABLE_IPS EXTRA_CFLAGS += -DSW_ANTE EXTRA_CFLAGS += -DTX_TRACK EXTRA_CFLAGS += -DHIGH_POWER 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 @@ -28,17 +18,11 @@ 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 \ - r8180_pm.o \ ieee80211/dot11d.o \ ieee80211/ieee80211_softmac.o \ ieee80211/ieee80211_rx.o \ diff --git a/drivers/staging/rtl8187se/TODO b/drivers/staging/rtl8187se/TODO new file mode 100644 index 000000000000..c09a9160739d --- /dev/null +++ b/drivers/staging/rtl8187se/TODO @@ -0,0 +1,15 @@ +TODO: +- prepare private ieee80211 stack for merge with rtl8192su's version: + - add hwsec_active flag to struct ieee80211_device + - add bHwSec flag to cb_desc structure +- switch to use shared "librtl" instead of private ieee80211 stack +- switch to use LIB80211 +- switch to use MAC80211 +- switch to use EEPROM_93CX6 +- use kernel coding style +- checkpatch.pl fixes +- sparse fixes +- integrate with drivers/net/wireless/rtl818x + +Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and +Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>. diff --git a/drivers/staging/rtl8187se/dot11d.h b/drivers/staging/rtl8187se/dot11d.h deleted file mode 100644 index 2417da99529f..000000000000 --- a/drivers/staging/rtl8187se/dot11d.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef __INC_DOT11D_H -#define __INC_DOT11D_H - -#include "ieee80211.h" - -//#define ENABLE_DOT11D - -//#define DOT11D_MAX_CHNL_NUM 83 - -typedef struct _CHNL_TXPOWER_TRIPLE { - u8 FirstChnl; - u8 NumChnls; - u8 MaxTxPowerInDbm; -}CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE; - -typedef enum _DOT11D_STATE { - DOT11D_STATE_NONE = 0, - DOT11D_STATE_LEARNED, - DOT11D_STATE_DONE, -}DOT11D_STATE; - -typedef struct _RT_DOT11D_INFO { - //DECLARE_RT_OBJECT(RT_DOT11D_INFO); - - bool bEnabled; // dot11MultiDomainCapabilityEnabled - - u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element. - u8 CountryIeBuf[MAX_IE_LEN]; - u8 CountryIeSrcAddr[6]; // Source AP of the country IE. - u8 CountryIeWatchdog; - - u8 channel_map[MAX_CHANNEL_NUMBER+1]; //!!!Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) - //u8 ChnlListLen; // #Bytes valid in ChnlList[]. - //u8 ChnlList[DOT11D_MAX_CHNL_NUM]; - u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1]; - - DOT11D_STATE State; -}RT_DOT11D_INFO, *PRT_DOT11D_INFO; -#define eqMacAddr(a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 ) -#define cpMacAddr(des,src) ((des)[0]=(src)[0],(des)[1]=(src)[1],(des)[2]=(src)[2],(des)[3]=(src)[3],(des)[4]=(src)[4],(des)[5]=(src)[5]) -#define GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO)((__pIeeeDev)->pDot11dInfo)) - -#define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled -#define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0) - -#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa) eqMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa) -#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa) - -#define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \ - (((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \ - FALSE : \ - (!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length))) - -#define CIE_WATCHDOG_TH 1 -#define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog -#define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0 -#define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev) - -#define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE) - - -void -Dot11d_Init( - struct ieee80211_device *dev - ); - -void -Dot11d_Reset( - struct ieee80211_device *dev - ); - -void -Dot11d_UpdateCountryIe( - struct ieee80211_device *dev, - u8 * pTaddr, - u16 CoutryIeLen, - u8 * pCoutryIe - ); - -u8 -DOT11D_GetMaxTxPwrInDbm( - struct ieee80211_device *dev, - u8 Channel - ); - -void -DOT11D_ScanComplete( - struct ieee80211_device * dev - ); - -int IsLegalChannel( - struct ieee80211_device * dev, - u8 channel -); - -int ToLegalChannel( - struct ieee80211_device * dev, - u8 channel -); - -#endif // #ifndef __INC_DOT11D_H diff --git a/drivers/staging/rtl8187se/ieee80211.h b/drivers/staging/rtl8187se/ieee80211.h deleted file mode 100644 index 58336080ad50..000000000000 --- a/drivers/staging/rtl8187se/ieee80211.h +++ /dev/null @@ -1,1755 +0,0 @@ -/* - * Merged with mainline ieee80211.h in Aug 2004. Original ieee802_11 - * remains copyright by the original authors - * - * Portions of the merged code are based on Host AP (software wireless - * LAN access point) driver for Intersil Prism2/2.5/3. - * - * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen - * <jkmaline@cc.hut.fi> - * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> - * - * Adaption to a generic IEEE 802.11 stack by James Ketrenos - * <jketreno@linux.intel.com> - * Copyright (c) 2004, Intel Corporation - * - * Modified for Realtek's wi-fi cards by Andrea Merello - * <andreamrl@tiscali.it> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. See README and COPYING for - * more details. - */ -#ifndef IEEE80211_H -#define IEEE80211_H -#include <linux/if_ether.h> /* ETH_ALEN */ -#include <linux/kernel.h> /* ARRAY_SIZE */ -#include <linux/version.h> -#include <linux/jiffies.h> -#include <linux/timer.h> -#include <linux/sched.h> - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) -#include <linux/wireless.h> -#endif - -/* -#ifndef bool -#define bool int -#endif - -#ifndef true -#define true 1 -#endif - -#ifndef false -#define false 0 -#endif -*/ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) -#ifndef bool -typedef enum{false = 0, true} bool; -#endif -#endif -//#ifdef JOHN_HWSEC -#define KEY_TYPE_NA 0x0 -#define KEY_TYPE_WEP40 0x1 -#define KEY_TYPE_TKIP 0x2 -#define KEY_TYPE_CCMP 0x4 -#define KEY_TYPE_WEP104 0x5 -//#endif - - -#define aSifsTime 10 - -#define MGMT_QUEUE_NUM 5 - - -#define IEEE_CMD_SET_WPA_PARAM 1 -#define IEEE_CMD_SET_WPA_IE 2 -#define IEEE_CMD_SET_ENCRYPTION 3 -#define IEEE_CMD_MLME 4 - -#define IEEE_PARAM_WPA_ENABLED 1 -#define IEEE_PARAM_TKIP_COUNTERMEASURES 2 -#define IEEE_PARAM_DROP_UNENCRYPTED 3 -#define IEEE_PARAM_PRIVACY_INVOKED 4 -#define IEEE_PARAM_AUTH_ALGS 5 -#define IEEE_PARAM_IEEE_802_1X 6 -//It should consistent with the driver_XXX.c -// David, 2006.9.26 -#define IEEE_PARAM_WPAX_SELECT 7 -//Added for notify the encryption type selection -// David, 2006.9.26 -#define IEEE_PROTO_WPA 1 -#define IEEE_PROTO_RSN 2 -//Added for notify the encryption type selection -// David, 2006.9.26 -#define IEEE_WPAX_USEGROUP 0 -#define IEEE_WPAX_WEP40 1 -#define IEEE_WPAX_TKIP 2 -#define IEEE_WPAX_WRAP 3 -#define IEEE_WPAX_CCMP 4 -#define IEEE_WPAX_WEP104 5 - -#define IEEE_KEY_MGMT_IEEE8021X 1 -#define IEEE_KEY_MGMT_PSK 2 - - - -#define IEEE_MLME_STA_DEAUTH 1 -#define IEEE_MLME_STA_DISASSOC 2 - - -#define IEEE_CRYPT_ERR_UNKNOWN_ALG 2 -#define IEEE_CRYPT_ERR_UNKNOWN_ADDR 3 -#define IEEE_CRYPT_ERR_CRYPT_INIT_FAILED 4 -#define IEEE_CRYPT_ERR_KEY_SET_FAILED 5 -#define IEEE_CRYPT_ERR_TX_KEY_SET_FAILED 6 -#define IEEE_CRYPT_ERR_CARD_CONF_FAILED 7 - - -#define IEEE_CRYPT_ALG_NAME_LEN 16 - -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) -#define ieee80211_wx_get_scan ieee80211_wx_get_scan_rtl -#define ieee80211_wx_set_encode ieee80211_wx_set_encode_rtl -#define ieee80211_wx_get_encode ieee80211_wx_get_encode_rtl -//////////////////////////////// -// added for kernel conflict under FC5 -#define ieee80211_wx_get_name ieee80211_wx_get_name_rtl -#define free_ieee80211 free_ieee80211_rtl -#define alloc_ieee80211 alloc_ieee80211_rtl -/////////////////////////////// -#endif -//error in ubuntu2.6.22,so add these -#define ieee80211_wake_queue ieee80211_wake_queue_rtl -#define ieee80211_stop_queue ieee80211_stop_queue_rtl - -#define ieee80211_rx ieee80211_rx_rtl - -#define ieee80211_register_crypto_ops ieee80211_register_crypto_ops_rtl -#define ieee80211_unregister_crypto_ops ieee80211_unregister_crypto_ops_rtl -#define ieee80211_get_crypto_ops ieee80211_get_crypto_ops_rtl -#define ieee80211_crypt_deinit_entries ieee80211_crypt_deinit_entries_rtl -#define ieee80211_crypt_deinit_handler ieee80211_crypt_deinit_handler_rtl -#define ieee80211_crypt_delayed_deinit ieee80211_crypt_delayed_deinit_rtl - -#define ieee80211_txb_free ieee80211_txb_free_rtl -#define ieee80211_wx_get_essid ieee80211_wx_get_essid_rtl -#define ieee80211_wx_set_essid ieee80211_wx_set_essid_rtl -#define ieee80211_wx_set_rate ieee80211_wx_set_rate_rtl -#define ieee80211_wx_get_rate ieee80211_wx_get_rate_rtl -#define ieee80211_wx_set_wap ieee80211_wx_set_wap_rtl -#define ieee80211_wx_get_wap ieee80211_wx_get_wap_rtl -#define ieee80211_wx_set_mode ieee80211_wx_set_mode_rtl -#define ieee80211_wx_get_mode ieee80211_wx_get_mode_rtl -#define ieee80211_wx_set_scan ieee80211_wx_set_scan_rtl -#define ieee80211_wx_get_freq ieee80211_wx_get_freq_rtl -#define ieee80211_wx_set_freq ieee80211_wx_set_freq_rtl -#define ieee80211_wx_set_rawtx ieee80211_wx_set_rawtx_rtl -#define ieee80211_wx_set_power ieee80211_wx_set_power_rtl -#define ieee80211_wx_get_power ieee80211_wx_get_power_rtl -#define ieee80211_wlan_frequencies ieee80211_wlan_frequencies_rtl -#define ieee80211_softmac_stop_protocol ieee80211_softmac_stop_protocol_rtl -#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rtl -#define ieee80211_start_protocol ieee80211_start_protocol_rtl -#define ieee80211_stop_protocol ieee80211_stop_protocol_rtl -#define ieee80211_rx_mgt ieee80211_rx_mgt_rtl - -#define ieee80211_wx_set_auth ieee80211_wx_set_auth_rtl -//by amy for ps -#define notify_wx_assoc_event notify_wx_assoc_event_rtl -#define ieee80211_stop_send_beacons ieee80211_stop_send_beacons_rtl -#define ieee80211_disassociate ieee80211_disassociate_rtl -#define ieee80211_start_scan ieee80211_start_scan_rtl -//by amy for ps -typedef struct ieee_param { - u32 cmd; - u8 sta_addr[ETH_ALEN]; - union { - struct { - u8 name; - u32 value; - } wpa_param; - struct { - u32 len; - u8 reserved[32]; - u8 data[0]; - } wpa_ie; - struct{ - int command; - int reason_code; - } mlme; - struct { - u8 alg[IEEE_CRYPT_ALG_NAME_LEN]; - u8 set_tx; - u32 err; - u8 idx; - u8 seq[8]; /* sequence counter (set: RX, get: TX) */ - u16 key_len; - u8 key[0]; - } crypt; - - } u; -}ieee_param; - - -#if WIRELESS_EXT < 17 -#define IW_QUAL_QUAL_INVALID 0x10 -#define IW_QUAL_LEVEL_INVALID 0x20 -#define IW_QUAL_NOISE_INVALID 0x40 -#define IW_QUAL_QUAL_UPDATED 0x1 -#define IW_QUAL_LEVEL_UPDATED 0x2 -#define IW_QUAL_NOISE_UPDATED 0x4 -#endif - -// linux under 2.6.9 release may not support it, so modify it for common use -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)) -#define MSECS(t) (1000 * ((t) / HZ) + 1000 * ((t) % HZ) / HZ) -static inline unsigned long msleep_interruptible_rtl(unsigned int msecs) -{ - unsigned long timeout = MSECS(msecs) + 1; - - while (timeout) { - set_current_state(TASK_UNINTERRUPTIBLE); - timeout = schedule_timeout(timeout); - } - return timeout; -} -#else -#define MSECS(t) msecs_to_jiffies(t) -#define msleep_interruptible_rtl msleep_interruptible -#endif - -#define IEEE80211_DATA_LEN 2304 -/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section - 6.2.1.1.2. - - The figure in section 7.1.2 suggests a body size of up to 2312 - bytes is allowed, which is a bit confusing, I suspect this - represents the 2304 bytes of real data, plus a possible 8 bytes of - WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */ - - -#define IEEE80211_HLEN 30 -#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) - -/* this is stolen and modified from the madwifi driver*/ -#define IEEE80211_FC0_TYPE_MASK 0x0c -#define IEEE80211_FC0_TYPE_DATA 0x08 -#define IEEE80211_FC0_SUBTYPE_MASK 0xB0 -#define IEEE80211_FC0_SUBTYPE_QOS 0x80 - -#define IEEE80211_QOS_HAS_SEQ(fc) \ - (((fc) & (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) == \ - (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS)) - -/* this is stolen from ipw2200 driver */ -#define IEEE_IBSS_MAC_HASH_SIZE 31 -struct ieee_ibss_seq { - u8 mac[ETH_ALEN]; - u16 seq_num[17]; - u16 frag_num[17]; - unsigned long packet_time[17]; - struct list_head list; -}; - -struct ieee80211_hdr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u8 addr4[ETH_ALEN]; -} __attribute__ ((packed)); - -struct ieee80211_hdr_QOS { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u8 addr4[ETH_ALEN]; - u16 QOS_ctl; -} __attribute__ ((packed)); - -struct ieee80211_hdr_3addr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; -} __attribute__ ((packed)); - -struct ieee80211_hdr_3addr_QOS { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u16 QOS_ctl; -} __attribute__ ((packed)); - -enum eap_type { - EAP_PACKET = 0, - EAPOL_START, - EAPOL_LOGOFF, - EAPOL_KEY, - EAPOL_ENCAP_ASF_ALERT -}; - -static const char *eap_types[] = { - [EAP_PACKET] = "EAP-Packet", - [EAPOL_START] = "EAPOL-Start", - [EAPOL_LOGOFF] = "EAPOL-Logoff", - [EAPOL_KEY] = "EAPOL-Key", - [EAPOL_ENCAP_ASF_ALERT] = "EAPOL-Encap-ASF-Alert" -}; - -static inline const char *eap_get_type(int type) -{ - return (type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type]; -} - -struct eapol { - u8 snap[6]; - u16 ethertype; - u8 version; - u8 type; - u16 length; -} __attribute__ ((packed)); - -#define IEEE80211_3ADDR_LEN 24 -#define IEEE80211_4ADDR_LEN 30 -#define IEEE80211_FCS_LEN 4 - -#define MIN_FRAG_THRESHOLD 256U -#define MAX_FRAG_THRESHOLD 2346U - -/* Frame control field constants */ -#define IEEE80211_FCTL_VERS 0x0002 -#define IEEE80211_FCTL_FTYPE 0x000c -#define IEEE80211_FCTL_STYPE 0x00f0 -#define IEEE80211_FCTL_TODS 0x0100 -#define IEEE80211_FCTL_FROMDS 0x0200 -#define IEEE80211_FCTL_DSTODS 0x0300 //added by david -#define IEEE80211_FCTL_MOREFRAGS 0x0400 -#define IEEE80211_FCTL_RETRY 0x0800 -#define IEEE80211_FCTL_PM 0x1000 -#define IEEE80211_FCTL_MOREDATA 0x2000 -#define IEEE80211_FCTL_WEP 0x4000 -#define IEEE80211_FCTL_ORDER 0x8000 - -#define IEEE80211_FTYPE_MGMT 0x0000 -#define IEEE80211_FTYPE_CTL 0x0004 -#define IEEE80211_FTYPE_DATA 0x0008 - -/* management */ -#define IEEE80211_STYPE_ASSOC_REQ 0x0000 -#define IEEE80211_STYPE_ASSOC_RESP 0x0010 -#define IEEE80211_STYPE_REASSOC_REQ 0x0020 -#define IEEE80211_STYPE_REASSOC_RESP 0x0030 -#define IEEE80211_STYPE_PROBE_REQ 0x0040 -#define IEEE80211_STYPE_PROBE_RESP 0x0050 -#define IEEE80211_STYPE_BEACON 0x0080 -#define IEEE80211_STYPE_ATIM 0x0090 -#define IEEE80211_STYPE_DISASSOC 0x00A0 -#define IEEE80211_STYPE_AUTH 0x00B0 -#define IEEE80211_STYPE_DEAUTH 0x00C0 -#define IEEE80211_STYPE_MANAGE_ACT 0x00D0 - -/* control */ -#define IEEE80211_STYPE_PSPOLL 0x00A0 -#define IEEE80211_STYPE_RTS 0x00B0 -#define IEEE80211_STYPE_CTS 0x00C0 -#define IEEE80211_STYPE_ACK 0x00D0 -#define IEEE80211_STYPE_CFEND 0x00E0 -#define IEEE80211_STYPE_CFENDACK 0x00F0 - -/* data */ -#define IEEE80211_STYPE_DATA 0x0000 -#define IEEE80211_STYPE_DATA_CFACK 0x0010 -#define IEEE80211_STYPE_DATA_CFPOLL 0x0020 -#define IEEE80211_STYPE_DATA_CFACKPOLL 0x0030 -#define IEEE80211_STYPE_NULLFUNC 0x0040 -#define IEEE80211_STYPE_CFACK 0x0050 -#define IEEE80211_STYPE_CFPOLL 0x0060 -#define IEEE80211_STYPE_CFACKPOLL 0x0070 -#define IEEE80211_STYPE_QOS_DATA 0x0080 //added for WMM 2006/8/2 -#define IEEE80211_STYPE_QOS_NULL 0x00C0 - - -#define IEEE80211_SCTL_FRAG 0x000F -#define IEEE80211_SCTL_SEQ 0xFFF0 - - -/* debug macros */ - -#ifdef CONFIG_IEEE80211_DEBUG -extern u32 ieee80211_debug_level; -#define IEEE80211_DEBUG(level, fmt, args...) \ -do { if (ieee80211_debug_level & (level)) \ - printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ - in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0) -#else -#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) -#endif /* CONFIG_IEEE80211_DEBUG */ - -/* - * To use the debug system; - * - * If you are defining a new debug classification, simply add it to the #define - * list here in the form of: - * - * #define IEEE80211_DL_xxxx VALUE - * - * shifting value to the left one bit from the previous entry. xxxx should be - * the name of the classification (for example, WEP) - * - * You then need to either add a IEEE80211_xxxx_DEBUG() macro definition for your - * classification, or use IEEE80211_DEBUG(IEEE80211_DL_xxxx, ...) whenever you want - * to send output to that classification. - * - * To add your debug level to the list of levels seen when you perform - * - * % cat /proc/net/ipw/debug_level - * - * you simply need to add your entry to the ipw_debug_levels array. - * - * If you do not see debug_level in /proc/net/ipw then you do not have - * CONFIG_IEEE80211_DEBUG defined in your kernel configuration - * - */ - -#define IEEE80211_DL_INFO (1<<0) -#define IEEE80211_DL_WX (1<<1) -#define IEEE80211_DL_SCAN (1<<2) -#define IEEE80211_DL_STATE (1<<3) -#define IEEE80211_DL_MGMT (1<<4) -#define IEEE80211_DL_FRAG (1<<5) -#define IEEE80211_DL_EAP (1<<6) -#define IEEE80211_DL_DROP (1<<7) - -#define IEEE80211_DL_TX (1<<8) -#define IEEE80211_DL_RX (1<<9) - -#define IEEE80211_ERROR(f, a...) printk(KERN_ERR "ieee80211: " f, ## a) -#define IEEE80211_WARNING(f, a...) printk(KERN_WARNING "ieee80211: " f, ## a) -#define IEEE80211_DEBUG_INFO(f, a...) IEEE80211_DEBUG(IEEE80211_DL_INFO, f, ## a) - -#define IEEE80211_DEBUG_WX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_WX, f, ## a) -#define IEEE80211_DEBUG_SCAN(f, a...) IEEE80211_DEBUG(IEEE80211_DL_SCAN, f, ## a) -//#define IEEE_DEBUG_SCAN IEEE80211_WARNING -#define IEEE80211_DEBUG_STATE(f, a...) IEEE80211_DEBUG(IEEE80211_DL_STATE, f, ## a) -#define IEEE80211_DEBUG_MGMT(f, a...) IEEE80211_DEBUG(IEEE80211_DL_MGMT, f, ## a) -#define IEEE80211_DEBUG_FRAG(f, a...) IEEE80211_DEBUG(IEEE80211_DL_FRAG, f, ## a) -#define IEEE80211_DEBUG_EAP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_EAP, f, ## a) -#define IEEE80211_DEBUG_DROP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_DROP, f, ## a) -#define IEEE80211_DEBUG_TX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_TX, f, ## a) -#define IEEE80211_DEBUG_RX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a) -#include <linux/netdevice.h> -#include <linux/wireless.h> -#include <linux/if_arp.h> /* ARPHRD_ETHER */ - -#ifndef WIRELESS_SPY -#define WIRELESS_SPY // enable iwspy support -#endif -#include <net/iw_handler.h> // new driver API - -#ifndef ETH_P_PAE -#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ -#endif /* ETH_P_PAE */ - -#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */ - -#ifndef ETH_P_80211_RAW -#define ETH_P_80211_RAW (ETH_P_ECONET + 1) -#endif - -/* IEEE 802.11 defines */ - -#define P80211_OUI_LEN 3 - -struct ieee80211_snap_hdr { - - u8 dsap; /* always 0xAA */ - u8 ssap; /* always 0xAA */ - u8 ctrl; /* always 0x03 */ - u8 oui[P80211_OUI_LEN]; /* organizational universal id */ - -} __attribute__ ((packed)); - -#define SNAP_SIZE sizeof(struct ieee80211_snap_hdr) - -#define WLAN_FC_GET_TYPE(fc) ((fc) & IEEE80211_FCTL_FTYPE) -#define WLAN_FC_GET_STYPE(fc) ((fc) & IEEE80211_FCTL_STYPE) - -#define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG) -#define WLAN_GET_SEQ_SEQ(seq) ((seq) & IEEE80211_SCTL_SEQ) - -/* Authentication algorithms */ -#define WLAN_AUTH_OPEN 0 -#define WLAN_AUTH_SHARED_KEY 1 - -#define WLAN_AUTH_CHALLENGE_LEN 128 - -#define WLAN_CAPABILITY_BSS (1<<0) -#define WLAN_CAPABILITY_IBSS (1<<1) -#define WLAN_CAPABILITY_CF_POLLABLE (1<<2) -#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) -#define WLAN_CAPABILITY_PRIVACY (1<<4) -#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5) -#define WLAN_CAPABILITY_PBCC (1<<6) -#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7) -#define WLAN_CAPABILITY_SHORT_SLOT (1<<10) - -/* Status codes */ -#define WLAN_STATUS_SUCCESS 0 -#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 -#define WLAN_STATUS_CAPS_UNSUPPORTED 10 -#define WLAN_STATUS_REASSOC_NO_ASSOC 11 -#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 -#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 -#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 -#define WLAN_STATUS_CHALLENGE_FAIL 15 -#define WLAN_STATUS_AUTH_TIMEOUT 16 -#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 -#define WLAN_STATUS_ASSOC_DENIED_RATES 18 -/* 802.11b */ -#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19 -#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20 -#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21 - -/* Reason codes */ -#define WLAN_REASON_UNSPECIFIED 1 -#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 -#define WLAN_REASON_DEAUTH_LEAVING 3 -#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -#define WLAN_REASON_DISASSOC_AP_BUSY 5 -#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 -#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 - - -/* Information Element IDs */ -#define WLAN_EID_SSID 0 -#define WLAN_EID_SUPP_RATES 1 -#define WLAN_EID_FH_PARAMS 2 -#define WLAN_EID_DS_PARAMS 3 -#define WLAN_EID_CF_PARAMS 4 -#define WLAN_EID_TIM 5 -#define WLAN_EID_IBSS_PARAMS 6 -#define WLAN_EID_CHALLENGE 16 -#define WLAN_EID_RSN 48 -#define WLAN_EID_GENERIC 221 - -#define IEEE80211_MGMT_HDR_LEN 24 -#define IEEE80211_DATA_HDR3_LEN 24 -#define IEEE80211_DATA_HDR4_LEN 30 - - -#define IEEE80211_STATMASK_SIGNAL (1<<0) -#define IEEE80211_STATMASK_RSSI (1<<1) -#define IEEE80211_STATMASK_NOISE (1<<2) -#define IEEE80211_STATMASK_RATE (1<<3) -#define IEEE80211_STATMASK_WEMASK 0x7 - - -#define IEEE80211_CCK_MODULATION (1<<0) -#define IEEE80211_OFDM_MODULATION (1<<1) - -#define IEEE80211_24GHZ_BAND (1<<0) -#define IEEE80211_52GHZ_BAND (1<<1) - -#define IEEE80211_CCK_RATE_LEN 4 -#define IEEE80211_CCK_RATE_1MB 0x02 -#define IEEE80211_CCK_RATE_2MB 0x04 -#define IEEE80211_CCK_RATE_5MB 0x0B -#define IEEE80211_CCK_RATE_11MB 0x16 -#define IEEE80211_OFDM_RATE_LEN 8 -#define IEEE80211_OFDM_RATE_6MB 0x0C -#define IEEE80211_OFDM_RATE_9MB 0x12 -#define IEEE80211_OFDM_RATE_12MB 0x18 -#define IEEE80211_OFDM_RATE_18MB 0x24 -#define IEEE80211_OFDM_RATE_24MB 0x30 -#define IEEE80211_OFDM_RATE_36MB 0x48 -#define IEEE80211_OFDM_RATE_48MB 0x60 -#define IEEE80211_OFDM_RATE_54MB 0x6C -#define IEEE80211_BASIC_RATE_MASK 0x80 - -#define IEEE80211_CCK_RATE_1MB_MASK (1<<0) -#define IEEE80211_CCK_RATE_2MB_MASK (1<<1) -#define IEEE80211_CCK_RATE_5MB_MASK (1<<2) -#define IEEE80211_CCK_RATE_11MB_MASK (1<<3) -#define IEEE80211_OFDM_RATE_6MB_MASK (1<<4) -#define IEEE80211_OFDM_RATE_9MB_MASK (1<<5) -#define IEEE80211_OFDM_RATE_12MB_MASK (1<<6) -#define IEEE80211_OFDM_RATE_18MB_MASK (1<<7) -#define IEEE80211_OFDM_RATE_24MB_MASK (1<<8) -#define IEEE80211_OFDM_RATE_36MB_MASK (1<<9) -#define IEEE80211_OFDM_RATE_48MB_MASK (1<<10) -#define IEEE80211_OFDM_RATE_54MB_MASK (1<<11) - -#define IEEE80211_CCK_RATES_MASK 0x0000000F -#define IEEE80211_CCK_BASIC_RATES_MASK (IEEE80211_CCK_RATE_1MB_MASK | \ - IEEE80211_CCK_RATE_2MB_MASK) -#define IEEE80211_CCK_DEFAULT_RATES_MASK (IEEE80211_CCK_BASIC_RATES_MASK | \ - IEEE80211_CCK_RATE_5MB_MASK | \ - IEEE80211_CCK_RATE_11MB_MASK) - -#define IEEE80211_OFDM_RATES_MASK 0x00000FF0 -#define IEEE80211_OFDM_BASIC_RATES_MASK (IEEE80211_OFDM_RATE_6MB_MASK | \ - IEEE80211_OFDM_RATE_12MB_MASK | \ - IEEE80211_OFDM_RATE_24MB_MASK) -#define IEEE80211_OFDM_DEFAULT_RATES_MASK (IEEE80211_OFDM_BASIC_RATES_MASK | \ - IEEE80211_OFDM_RATE_9MB_MASK | \ - IEEE80211_OFDM_RATE_18MB_MASK | \ - IEEE80211_OFDM_RATE_36MB_MASK | \ - IEEE80211_OFDM_RATE_48MB_MASK | \ - IEEE80211_OFDM_RATE_54MB_MASK) -#define IEEE80211_DEFAULT_RATES_MASK (IEEE80211_OFDM_DEFAULT_RATES_MASK | \ - IEEE80211_CCK_DEFAULT_RATES_MASK) - -#define IEEE80211_NUM_OFDM_RATES 8 -#define IEEE80211_NUM_CCK_RATES 4 -#define IEEE80211_OFDM_SHIFT_MASK_A 4 - - - - -/* NOTE: This data is for statistical purposes; not all hardware provides this - * information for frames received. Not setting these will not cause - * any adverse affects. */ -struct ieee80211_rx_stats { - u32 mac_time[2]; - u8 signalstrength; - s8 rssi; - u8 signal; - u8 noise; - u16 rate; /* in 100 kbps */ - u8 received_channel; - u8 control; - u8 mask; - u8 freq; - u16 len; - u8 nic_type; -}; - -/* IEEE 802.11 requires that STA supports concurrent reception of at least - * three fragmented frames. This define can be increased to support more - * concurrent frames, but it should be noted that each entry can consume about - * 2 kB of RAM and increasing cache size will slow down frame reassembly. */ -#define IEEE80211_FRAG_CACHE_LEN 4 - -struct ieee80211_frag_entry { - unsigned long first_frag_time; - unsigned int seq; - unsigned int last_frag; - struct sk_buff *skb; - u8 src_addr[ETH_ALEN]; - u8 dst_addr[ETH_ALEN]; -}; - -struct ieee80211_stats { - unsigned int tx_unicast_frames; - unsigned int tx_multicast_frames; - unsigned int tx_fragments; - unsigned int tx_unicast_octets; - unsigned int tx_multicast_octets; - unsigned int tx_deferred_transmissions; - unsigned int tx_single_retry_frames; - unsigned int tx_multiple_retry_frames; - unsigned int tx_retry_limit_exceeded; - unsigned int tx_discards; - unsigned int rx_unicast_frames; - unsigned int rx_multicast_frames; - unsigned int rx_fragments; - unsigned int rx_unicast_octets; - unsigned int rx_multicast_octets; - unsigned int rx_fcs_errors; - unsigned int rx_discards_no_buffer; - unsigned int tx_discards_wrong_sa; - unsigned int rx_discards_undecryptable; - unsigned int rx_message_in_msg_fragments; - unsigned int rx_message_in_bad_msg_fragments; -}; - -struct ieee80211_softmac_stats{ - unsigned int rx_ass_ok; - unsigned int rx_ass_err; - unsigned int rx_probe_rq; - unsigned int tx_probe_rs; - unsigned int tx_beacons; - unsigned int rx_auth_rq; - unsigned int rx_auth_rs_ok; - unsigned int rx_auth_rs_err; - unsigned int tx_auth_rq; - unsigned int no_auth_rs; - unsigned int no_ass_rs; - unsigned int tx_ass_rq; - unsigned int rx_ass_rq; - unsigned int tx_probe_rq; - unsigned int reassoc; - unsigned int swtxstop; - unsigned int swtxawake; -}; - -struct ieee80211_device; - -#include "ieee80211_crypt.h" - -#define SEC_KEY_1 (1<<0) -#define SEC_KEY_2 (1<<1) -#define SEC_KEY_3 (1<<2) -#define SEC_KEY_4 (1<<3) -#define SEC_ACTIVE_KEY (1<<4) -#define SEC_AUTH_MODE (1<<5) -#define SEC_UNICAST_GROUP (1<<6) -#define SEC_LEVEL (1<<7) -#define SEC_ENABLED (1<<8) - -#define SEC_LEVEL_0 0 /* None */ -#define SEC_LEVEL_1 1 /* WEP 40 and 104 bit */ -#define SEC_LEVEL_2 2 /* Level 1 + TKIP */ -#define SEC_LEVEL_2_CKIP 3 /* Level 1 + CKIP */ -#define SEC_LEVEL_3 4 /* Level 2 + CCMP */ - -#define WEP_KEYS 4 -#define WEP_KEY_LEN 13 - -#define WEP_KEY_LEN_MODIF 32 - -struct ieee80211_security { - u16 active_key:2, - enabled:1, - auth_mode:2, - auth_algo:4, - unicast_uses_group:1; - u8 key_sizes[WEP_KEYS]; - u8 keys[WEP_KEYS][WEP_KEY_LEN_MODIF]; - u8 level; - u16 flags; -} __attribute__ ((packed)); - - -/* - - 802.11 data frame from AP - - ,-------------------------------------------------------------------. -Bytes | 2 | 2 | 6 | 6 | 6 | 2 | 0..2312 | 4 | - |------|------|---------|---------|---------|------|---------|------| -Desc. | ctrl | dura | DA/RA | TA | SA | Sequ | frame | fcs | - | | tion | (BSSID) | | | ence | data | | - `-------------------------------------------------------------------' - -Total: 28-2340 bytes - -*/ - -struct ieee80211_header_data { - u16 frame_ctl; - u16 duration_id; - u8 addr1[6]; - u8 addr2[6]; - u8 addr3[6]; - u16 seq_ctrl; -}; - -#define BEACON_PROBE_SSID_ID_POSITION 12 - -/* Management Frame Information Element Types */ -#define MFIE_TYPE_SSID 0 -#define MFIE_TYPE_RATES 1 -#define MFIE_TYPE_FH_SET 2 -#define MFIE_TYPE_DS_SET 3 -#define MFIE_TYPE_CF_SET 4 -#define MFIE_TYPE_TIM 5 -#define MFIE_TYPE_IBSS_SET 6 -#define MFIE_TYPE_COUNTRY 7 //+YJ,080625 -#define MFIE_TYPE_CHALLENGE 16 -#define MFIE_TYPE_ERP 42 -#define MFIE_TYPE_RSN 48 -#define MFIE_TYPE_RATES_EX 50 -#define MFIE_TYPE_GENERIC 221 - -#ifdef ENABLE_DOT11D -typedef enum -{ - COUNTRY_CODE_FCC = 0, - COUNTRY_CODE_IC = 1, - COUNTRY_CODE_ETSI = 2, - COUNTRY_CODE_SPAIN = 3, - COUNTRY_CODE_FRANCE = 4, - COUNTRY_CODE_MKK = 5, - COUNTRY_CODE_MKK1 = 6, - COUNTRY_CODE_ISRAEL = 7, - COUNTRY_CODE_TELEC = 8, - COUNTRY_CODE_GLOBAL_DOMAIN = 9, - COUNTRY_CODE_WORLD_WIDE_13_INDEX = 10 -}country_code_type_t; -#endif - -struct ieee80211_info_element_hdr { - u8 id; - u8 len; -} __attribute__ ((packed)); - -struct ieee80211_info_element { - u8 id; - u8 len; - u8 data[0]; -} __attribute__ ((packed)); - -/* - * These are the data types that can make up management packets - * - u16 auth_algorithm; - u16 auth_sequence; - u16 beacon_interval; - u16 capability; - u8 current_ap[ETH_ALEN]; - u16 listen_interval; - struct { - u16 association_id:14, reserved:2; - } __attribute__ ((packed)); - u32 time_stamp[2]; - u16 reason; - u16 status; -*/ - -#define IEEE80211_DEFAULT_TX_ESSID "Penguin" -#define IEEE80211_DEFAULT_BASIC_RATE 10 - -struct ieee80211_authentication { - struct ieee80211_header_data header; - u16 algorithm; - u16 transaction; - u16 status; - //struct ieee80211_info_element_hdr info_element; -} __attribute__ ((packed)); - - -struct ieee80211_probe_response { - struct ieee80211_header_data header; - u32 time_stamp[2]; - u16 beacon_interval; - u16 capability; - struct ieee80211_info_element info_element; -} __attribute__ ((packed)); - -struct ieee80211_probe_request { - struct ieee80211_header_data header; - /*struct ieee80211_info_element info_element;*/ -} __attribute__ ((packed)); - -struct ieee80211_assoc_request_frame { - struct ieee80211_hdr_3addr header; - u16 capability; - u16 listen_interval; - //u8 current_ap[ETH_ALEN]; - struct ieee80211_info_element_hdr info_element; -} __attribute__ ((packed)); - -struct ieee80211_assoc_response_frame { - struct ieee80211_hdr_3addr header; - u16 capability; - u16 status; - u16 aid; - struct ieee80211_info_element info_element; /* supported rates */ -} __attribute__ ((packed)); - -struct ieee80211_disassoc_frame{ - struct ieee80211_hdr_3addr header; - u16 reasoncode; -}__attribute__ ((packed)); - -struct ieee80211_txb { - u8 nr_frags; - u8 encrypted; - u16 reserved; - u16 frag_size; - u16 payload_size; - struct sk_buff *fragments[0]; -}; - -struct ieee80211_wmm_ac_param { - u8 ac_aci_acm_aifsn; - u8 ac_ecwmin_ecwmax; - u16 ac_txop_limit; -}; - -struct ieee80211_wmm_ts_info { - u8 ac_dir_tid; - u8 ac_up_psb; - u8 reserved; -} __attribute__ ((packed)); - -struct ieee80211_wmm_tspec_elem { - struct ieee80211_wmm_ts_info ts_info; - u16 norm_msdu_size; - u16 max_msdu_size; - u32 min_serv_inter; - u32 max_serv_inter; - u32 inact_inter; - u32 suspen_inter; - u32 serv_start_time; - u32 min_data_rate; - u32 mean_data_rate; - u32 peak_data_rate; - u32 max_burst_size; - u32 delay_bound; - u32 min_phy_rate; - u16 surp_band_allow; - u16 medium_time; -}__attribute__((packed)); - -enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame}; -#define MAX_SP_Len (WMM_all_frame << 4) -#define IEEE80211_QOS_TID 0x0f -#define QOS_CTL_NOTCONTAIN_ACK (0x01 << 5) - -/* SWEEP TABLE ENTRIES NUMBER*/ -#define MAX_SWEEP_TAB_ENTRIES 42 -#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7 -/* MAX_RATES_LENGTH needs to be 12. The spec says 8, and many APs - * only use 8, and then use extended rates for the remaining supported - * rates. Other APs, however, stick all of their supported rates on the - * main rates information element... */ -#define MAX_RATES_LENGTH ((u8)12) -#define MAX_RATES_EX_LENGTH ((u8)16) -#define MAX_NETWORK_COUNT 128 -//#define MAX_CHANNEL_NUMBER 161 -#define MAX_CHANNEL_NUMBER 165 //YJ,modified,080625 -#define MAX_IE_LEN 0xFF //+YJ,080625 - -typedef struct _CHANNEL_LIST{ - u8 Channel[MAX_CHANNEL_NUMBER + 1]; - u8 Len; -}CHANNEL_LIST, *PCHANNEL_LIST; - -#define IEEE80211_SOFTMAC_SCAN_TIME 100//400 -//(HZ / 2) -//by amy for ps -#define IEEE80211_WATCH_DOG_TIME 2000 -//by amy for ps -//by amy for antenna -#define ANTENNA_DIVERSITY_TIMER_PERIOD 1000 // 1000 m -//by amy for antenna -#define IEEE80211_SOFTMAC_ASSOC_RETRY_TIME (HZ * 2) - -#define CRC_LENGTH 4U - -#define MAX_WPA_IE_LEN 64 - -#define NETWORK_EMPTY_ESSID (1<<0) -#define NETWORK_HAS_OFDM (1<<1) -#define NETWORK_HAS_CCK (1<<2) - -#define IEEE80211_DTIM_MBCAST 4 -#define IEEE80211_DTIM_UCAST 2 -#define IEEE80211_DTIM_VALID 1 -#define IEEE80211_DTIM_INVALID 0 - -#define IEEE80211_PS_DISABLED 0 -#define IEEE80211_PS_UNICAST IEEE80211_DTIM_UCAST -#define IEEE80211_PS_MBCAST IEEE80211_DTIM_MBCAST -#define IEEE80211_PS_ENABLE IEEE80211_DTIM_VALID -//added by David for QoS 2006/6/30 -//#define WMM_Hang_8187 -#ifdef WMM_Hang_8187 -#undef WMM_Hang_8187 -#endif - -#define WME_AC_BE 0x00 -#define WME_AC_BK 0x01 -#define WME_AC_VI 0x02 -#define WME_AC_VO 0x03 -#define WME_ACI_MASK 0x03 -#define WME_AIFSN_MASK 0x03 -#define WME_AC_PRAM_LEN 16 - -//UP Mapping to AC, using in MgntQuery_SequenceNumber() and maybe for DSCP -//#define UP2AC(up) ((up<3) ? ((up==0)?1:0) : (up>>1)) -#define UP2AC(up) ( \ - ((up) < 1) ? WME_AC_BE : \ - ((up) < 3) ? WME_AC_BK : \ - ((up) < 4) ? WME_AC_BE : \ - ((up) < 6) ? WME_AC_VI : \ - WME_AC_VO) -//AC Mapping to UP, using in Tx part for selecting the corresponding TX queue -#define AC2UP(_ac) ( \ - ((_ac) == WME_AC_VO) ? 6 : \ - ((_ac) == WME_AC_VI) ? 5 : \ - ((_ac) == WME_AC_BK) ? 1 : \ - 0) - -#define ETHER_ADDR_LEN 6 /* length of an Ethernet address */ -struct ether_header { - u8 ether_dhost[ETHER_ADDR_LEN]; - u8 ether_shost[ETHER_ADDR_LEN]; - u16 ether_type; -} __attribute__((packed)); - -#ifndef ETHERTYPE_PAE -#define ETHERTYPE_PAE 0x888e /* EAPOL PAE/802.1x */ -#endif -#ifndef ETHERTYPE_IP -#define ETHERTYPE_IP 0x0800 /* IP protocol */ -#endif - -struct ieee80211_network { - /* These entries are used to identify a unique network */ - u8 bssid[ETH_ALEN]; - u8 channel; - /* Ensure null-terminated for any debug msgs */ - u8 ssid[IW_ESSID_MAX_SIZE + 1]; - u8 ssid_len; - - /* These are network statistics */ - struct ieee80211_rx_stats stats; - u16 capability; - u8 rates[MAX_RATES_LENGTH]; - u8 rates_len; - u8 rates_ex[MAX_RATES_EX_LENGTH]; - u8 rates_ex_len; - unsigned long last_scanned; - u8 mode; - u8 flags; - u32 last_associate; - u32 time_stamp[2]; - u16 beacon_interval; - u16 listen_interval; - u16 atim_window; - u8 wpa_ie[MAX_WPA_IE_LEN]; - size_t wpa_ie_len; - u8 rsn_ie[MAX_WPA_IE_LEN]; - size_t rsn_ie_len; - u8 dtim_period; - u8 dtim_data; - u32 last_dtim_sta_time[2]; - struct list_head list; - //appeded for QoS - u8 wmm_info; - struct ieee80211_wmm_ac_param wmm_param[4]; - u8 QoS_Enable; - u8 SignalStrength; -//by amy 080312 - u8 HighestOperaRate; -//by amy 080312 -#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 { - - /* the card is not linked at all */ - IEEE80211_NOLINK = 0, - - /* IEEE80211_ASSOCIATING* are for BSS client mode - * the driver shall not perform RX filtering unless - * the state is LINKED. - * The driver shall just check for the state LINKED and - * defaults to NOLINK for ALL the other states (including - * LINKED_SCANNING) - */ - - /* the association procedure will start (wq scheduling)*/ - IEEE80211_ASSOCIATING, - IEEE80211_ASSOCIATING_RETRY, - - /* the association procedure is sending AUTH request*/ - IEEE80211_ASSOCIATING_AUTHENTICATING, - - /* the association procedure has successfully authentcated - * and is sending association request - */ - IEEE80211_ASSOCIATING_AUTHENTICATED, - - /* the link is ok. the card associated to a BSS or linked - * to a ibss cell or acting as an AP and creating the bss - */ - IEEE80211_LINKED, - - /* same as LINKED, but the driver shall apply RX filter - * rules as we are in NO_LINK mode. As the card is still - * logically linked, but it is doing a syncro site survey - * then it will be back to LINKED state. - */ - IEEE80211_LINKED_SCANNING, - -}; - -#define DEFAULT_MAX_SCAN_AGE (15 * HZ) -#define DEFAULT_FTS 2346 -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] - - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)) -extern inline int is_multicast_ether_addr(const u8 *addr) -{ - return ((addr[0] != 0xff) && (0x01 & addr[0])); -} -#endif - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)) -extern inline int is_broadcast_ether_addr(const u8 *addr) -{ - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); -} -#endif - -#define CFG_IEEE80211_RESERVE_FCS (1<<0) -#define CFG_IEEE80211_COMPUTE_FCS (1<<1) - -typedef struct tx_pending_t{ - int frag; - struct ieee80211_txb *txb; -}tx_pending_t; - - -struct ieee80211_device { - struct net_device *dev; - - /* Bookkeeping structures */ - struct net_device_stats stats; - struct ieee80211_stats ieee_stats; - struct ieee80211_softmac_stats softmac_stats; - - /* Probe / Beacon management */ - struct list_head network_free_list; - struct list_head network_list; - struct ieee80211_network *networks; - int scans; - int scan_age; - - int iw_mode; /* operating mode (IW_MODE_*) */ - - spinlock_t lock; - spinlock_t wpax_suitlist_lock; - - int tx_headroom; /* Set to size of any additional room needed at front - * of allocated Tx SKBs */ - u32 config; - - /* WEP and other encryption related settings at the device level */ - int open_wep; /* Set to 1 to allow unencrypted frames */ - - int reset_on_keychange; /* Set to 1 if the HW needs to be reset on - * WEP key changes */ - - /* If the host performs {en,de}cryption, then set to 1 */ - int host_encrypt; - int host_decrypt; - int ieee802_1x; /* is IEEE 802.1X used */ - - /* WPA data */ - int wpa_enabled; - int drop_unencrypted; - int tkip_countermeasures; - int privacy_invoked; - size_t wpa_ie_len; - u8 *wpa_ie; - - u8 ap_mac_addr[6]; - u16 pairwise_key_type; - u16 broadcast_key_type; - - struct list_head crypt_deinit_list; - struct ieee80211_crypt_data *crypt[WEP_KEYS]; - int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */ - struct timer_list crypt_deinit_timer; - - int bcrx_sta_key; /* use individual keys to override default keys even - * with RX of broad/multicast frames */ - - /* Fragmentation structures */ - // each streaming contain a entry - struct ieee80211_frag_entry frag_cache[17][IEEE80211_FRAG_CACHE_LEN]; - unsigned int frag_next_idx[17]; - u16 fts; /* Fragmentation Threshold */ - - /* This stores infos for the current network. - * Either the network we are associated in INFRASTRUCTURE - * or the network that we are creating in MASTER mode. - * ad-hoc is a mixture ;-). - * Note that in infrastructure mode, even when not associated, - * fields bssid and essid may be valid (if wpa_set and essid_set - * are true) as thy carry the value set by the user via iwconfig - */ - struct ieee80211_network current_network; - - - enum ieee80211_state state; - - int short_slot; - int mode; /* A, B, G */ - int modulation; /* CCK, OFDM */ - int freq_band; /* 2.4Ghz, 5.2Ghz, Mixed */ - int abg_true; /* ABG flag */ - - /* used for forcing the ibss workqueue to terminate - * without wait for the syncro scan to terminate - */ - 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; - //FIXME: pleace callback, see if redundant with softmac_features - short active_scan; - - /* this contains flags for selectively enable softmac support */ - u16 softmac_features; - - /* if the sequence control field is not filled by HW */ - u16 seq_ctrl[5]; - - /* association procedure transaction sequence number */ - u16 associate_seq; - - /* AID for RTXed association responses */ - u16 assoc_id; - - /* power save mode related*/ - short ps; - short sta_sleep; - int ps_timeout; - struct tasklet_struct ps_task; - u32 ps_th; - u32 ps_tl; - - short raw_tx; - /* used if IEEE_SOFTMAC_TX_QUEUE is set */ - short queue_stop; - short scanning; - short proto_started; - - struct semaphore wx_sem; - struct semaphore scan_sem; - - spinlock_t mgmt_tx_lock; - spinlock_t beacon_lock; - - short beacon_txing; - - short wap_set; - short ssid_set; - - u8 wpax_type_set; //{added by David, 2006.9.28} - u32 wpax_type_notify; //{added by David, 2006.9.26} - - /* QoS related flag */ - char init_wmmparam_flag; - - /* for discarding duplicated packets in IBSS */ - struct list_head ibss_mac_hash[IEEE_IBSS_MAC_HASH_SIZE]; - - /* for discarding duplicated packets in BSS */ - u16 last_rxseq_num[17]; /* rx seq previous per-tid */ - u16 last_rxfrag_num[17];/* tx frag previous per-tid */ - unsigned long last_packet_time[17]; - - /* for PS mode */ - unsigned long last_rx_ps_time; - - /* used if IEEE_SOFTMAC_SINGLE_QUEUE is set */ - struct sk_buff *mgmt_queue_ring[MGMT_QUEUE_NUM]; - int mgmt_queue_head; - int mgmt_queue_tail; - - - /* used if IEEE_SOFTMAC_TX_QUEUE is set */ - struct tx_pending_t tx_pending; - - /* used if IEEE_SOFTMAC_ASSOCIATE is set */ - struct timer_list associate_timer; - - /* used if IEEE_SOFTMAC_BEACONS is set */ - struct timer_list beacon_timer; - - struct work_struct associate_complete_wq; -// struct work_struct associate_retry_wq; - struct work_struct associate_procedure_wq; -// struct work_struct softmac_scan_wq; - struct work_struct wx_sync_scan_wq; - struct work_struct wmm_param_update_wq; - struct work_struct ps_request_tx_ack_wq;//for ps -// struct work_struct hw_wakeup_wq; -// struct work_struct hw_sleep_wq; -// struct work_struct watch_dog_wq; - bool bInactivePs; - bool actscanning; - bool beinretry; - u16 ListenInterval; - unsigned long NumRxDataInPeriod; //YJ,add,080828 - unsigned long NumRxBcnInPeriod; //YJ,add,080828 - unsigned long NumRxOkTotal; - unsigned long NumRxUnicast;//YJ,add,080828,for keep alive - bool bHwRadioOff; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) - struct delayed_work softmac_scan_wq; - struct delayed_work associate_retry_wq; - struct delayed_work hw_wakeup_wq; - struct delayed_work hw_sleep_wq;//+by amy 080324 - struct delayed_work watch_dog_wq; - struct delayed_work sw_antenna_wq; - struct delayed_work start_ibss_wq; -//by amy for rate adaptive 080312 - struct delayed_work rate_adapter_wq; -//by amy for rate adaptive - struct delayed_work hw_dig_wq; - struct delayed_work tx_pw_wq; - -//Added for RF power on power off by lizhaoming 080512 - struct delayed_work GPIOChangeRFWorkItem; -#else - - struct work_struct start_ibss_wq; - struct work_struct softmac_scan_wq; - struct work_struct associate_retry_wq; - struct work_struct hw_wakeup_wq; - struct work_struct hw_sleep_wq; - struct work_struct watch_dog_wq; - struct work_struct sw_antenna_wq; -//by amy for rate adaptive 080312 - struct work_struct rate_adapter_wq; -//by amy for rate adaptive - struct work_struct hw_dig_wq; - struct work_struct tx_pw_wq; - -//Added for RF power on power off by lizhaoming 080512 - struct work_struct GPIOChangeRFWorkItem; -#endif - struct workqueue_struct *wq; - - /* Callback functions */ - void (*set_security)(struct net_device *dev, - struct ieee80211_security *sec); - - /* Used to TX data frame by using txb structs. - * this is not used if in the softmac_features - * is set the flag IEEE_SOFTMAC_TX_QUEUE - */ - int (*hard_start_xmit)(struct ieee80211_txb *txb, - struct net_device *dev); - - int (*reset_port)(struct net_device *dev); - - /* Softmac-generated frames (mamagement) are TXed via this - * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is - * not set. As some cards may have different HW queues that - * one might want to use for data and management frames - * the option to have two callbacks might be useful. - * This fucntion can't sleep. - */ - int (*softmac_hard_start_xmit)(struct sk_buff *skb, - struct net_device *dev); - - /* used instead of hard_start_xmit (not softmac_hard_start_xmit) - * if the IEEE_SOFTMAC_TX_QUEUE feature is used to TX data - * frames. I the option IEEE_SOFTMAC_SINGLE_QUEUE is also set - * then also management frames are sent via this callback. - * This function can't sleep. - */ - void (*softmac_data_hard_start_xmit)(struct sk_buff *skb, - struct net_device *dev,int rate); - - /* stops the HW queue for DATA frames. Useful to avoid - * waste time to TX data frame when we are reassociating - * This function can sleep. - */ - void (*data_hard_stop)(struct net_device *dev); - - /* OK this is complementar to data_poll_hard_stop */ - void (*data_hard_resume)(struct net_device *dev); - - /* ask to the driver to retune the radio . - * This function can sleep. the driver should ensure - * the radio has been swithced before return. - */ - void (*set_chan)(struct net_device *dev,short ch); - - /* These are not used if the ieee stack takes care of - * scanning (IEEE_SOFTMAC_SCAN feature set). - * In this case only the set_chan is used. - * - * The syncro version is similar to the start_scan but - * does not return until all channels has been scanned. - * this is called in user context and should sleep, - * it is called in a work_queue when swithcing to ad-hoc mode - * or in behalf of iwlist scan when the card is associated - * and root user ask for a scan. - * the fucntion stop_scan should stop both the syncro and - * background scanning and can sleep. - * The fucntion start_scan should initiate the background - * scanning and can't sleep. - */ - void (*scan_syncro)(struct net_device *dev); - void (*start_scan)(struct net_device *dev); - void (*stop_scan)(struct net_device *dev); - - /* indicate the driver that the link state is changed - * for example it may indicate the card is associated now. - * Driver might be interested in this to apply RX filter - * rules or simply light the LINK led - */ - void (*link_change)(struct net_device *dev); - - /* these two function indicates to the HW when to start - * and stop to send beacons. This is used when the - * IEEE_SOFTMAC_BEACONS is not set. For now the - * stop_send_bacons is NOT guaranteed to be called only - * after start_send_beacons. - */ - void (*start_send_beacons) (struct net_device *dev); - void (*stop_send_beacons) (struct net_device *dev); - - /* power save mode related */ - void (*sta_wake_up) (struct net_device *dev); - void (*ps_request_tx_ack) (struct net_device *dev); - void (*enter_sleep_state) (struct net_device *dev, u32 th, u32 tl); - short (*ps_is_queue_empty) (struct net_device *dev); - - /* QoS related */ - //void (*wmm_param_update) (struct net_device *dev, u8 *ac_param); - //void (*wmm_param_update) (struct ieee80211_device *ieee); - - /* This must be the last item so that it points to the data - * allocated beyond this structure by alloc_ieee80211 */ - u8 priv[0]; -}; - -#define IEEE_A (1<<0) -#define IEEE_B (1<<1) -#define IEEE_G (1<<2) -#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) - -/* Generate a 802.11 header */ - -/* Uses the channel change callback directly - * instead of [start/stop] scan callbacks - */ -#define IEEE_SOFTMAC_SCAN (1<<2) - -/* Perform authentication and association handshake */ -#define IEEE_SOFTMAC_ASSOCIATE (1<<3) - -/* Generate probe requests */ -#define IEEE_SOFTMAC_PROBERQ (1<<4) - -/* Generate respones to probe requests */ -#define IEEE_SOFTMAC_PROBERS (1<<5) - -/* The ieee802.11 stack will manages the netif queue - * wake/stop for the driver, taking care of 802.11 - * fragmentation. See softmac.c for details. */ -#define IEEE_SOFTMAC_TX_QUEUE (1<<7) - -/* Uses only the softmac_data_hard_start_xmit - * even for TX management frames. - */ -#define IEEE_SOFTMAC_SINGLE_QUEUE (1<<8) - -/* Generate beacons. The stack will enqueue beacons - * to the card - */ -#define IEEE_SOFTMAC_BEACONS (1<<6) - - - -static inline void *ieee80211_priv(struct net_device *dev) -{ - return ((struct ieee80211_device *)netdev_priv(dev))->priv; -} - -extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len) -{ - /* Single white space is for Linksys APs */ - if (essid_len == 1 && essid[0] == ' ') - return 1; - - /* Otherwise, if the entire essid is 0, we assume it is hidden */ - while (essid_len) { - essid_len--; - if (essid[essid_len] != '\0') - return 0; - } - - return 1; -} - -extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode) -{ - /* - * It is possible for both access points and our device to support - * combinations of modes, so as long as there is one valid combination - * of ap/device supported modes, then return success - * - */ - if ((mode & IEEE_A) && - (ieee->modulation & IEEE80211_OFDM_MODULATION) && - (ieee->freq_band & IEEE80211_52GHZ_BAND)) - return 1; - - if ((mode & IEEE_G) && - (ieee->modulation & IEEE80211_OFDM_MODULATION) && - (ieee->freq_band & IEEE80211_24GHZ_BAND)) - return 1; - - if ((mode & IEEE_B) && - (ieee->modulation & IEEE80211_CCK_MODULATION) && - (ieee->freq_band & IEEE80211_24GHZ_BAND)) - return 1; - - return 0; -} - -extern inline int ieee80211_get_hdrlen(u16 fc) -{ - int hdrlen = 24; - - switch (WLAN_FC_GET_TYPE(fc)) { - case IEEE80211_FTYPE_DATA: - if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS)) - hdrlen = 30; /* Addr4 */ - if(IEEE80211_QOS_HAS_SEQ(fc)) - hdrlen += 2; /* QOS ctrl*/ - break; - case IEEE80211_FTYPE_CTL: - switch (WLAN_FC_GET_STYPE(fc)) { - case IEEE80211_STYPE_CTS: - case IEEE80211_STYPE_ACK: - hdrlen = 10; - break; - default: - hdrlen = 16; - break; - } - break; - } - - return hdrlen; -} - - - -/* ieee80211.c */ -extern void free_ieee80211(struct net_device *dev); -extern struct net_device *alloc_ieee80211(int sizeof_priv); - -extern int ieee80211_set_encryption(struct ieee80211_device *ieee); - -/* ieee80211_tx.c */ - -extern int ieee80211_encrypt_fragment( - struct ieee80211_device *ieee, - struct sk_buff *frag, - int hdr_len); - -extern int ieee80211_xmit(struct sk_buff *skb, - struct net_device *dev); -extern void ieee80211_txb_free(struct ieee80211_txb *); - - -/* ieee80211_rx.c */ -extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, - struct ieee80211_rx_stats *rx_stats); -extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, - struct ieee80211_hdr *header, - struct ieee80211_rx_stats *stats); - -/* ieee80211_wx.c */ -extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *key); -extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *key); -extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *key); -extern int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data* wrqu, char *extra); -int ieee80211_wx_set_auth(struct ieee80211_device *ieee, - struct iw_request_info *info, - struct iw_param *data, char *extra); -int ieee80211_wx_set_mlme(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len); -/* ieee80211_softmac.c */ -extern short ieee80211_is_54g(struct ieee80211_network net); -extern short ieee80211_is_shortslot(struct ieee80211_network net); -extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, - struct ieee80211_rx_stats *rx_stats, u16 type, - u16 stype); -extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net); - -extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee); -extern void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee); -extern void ieee80211_start_bss(struct ieee80211_device *ieee); -extern void ieee80211_start_master_bss(struct ieee80211_device *ieee); -extern void ieee80211_start_ibss(struct ieee80211_device *ieee); -extern void ieee80211_softmac_init(struct ieee80211_device *ieee); -extern void ieee80211_softmac_free(struct ieee80211_device *ieee); -extern void ieee80211_associate_abort(struct ieee80211_device *ieee); -extern void ieee80211_disassociate(struct ieee80211_device *ieee); -extern void ieee80211_stop_scan(struct ieee80211_device *ieee); -extern void ieee80211_start_scan_syncro(struct ieee80211_device *ieee); -extern void ieee80211_check_all_nets(struct ieee80211_device *ieee); -extern void ieee80211_start_protocol(struct ieee80211_device *ieee); -extern void ieee80211_stop_protocol(struct ieee80211_device *ieee); -extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee); -extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee); -extern void ieee80211_reset_queue(struct ieee80211_device *ieee); -extern void ieee80211_wake_queue(struct ieee80211_device *ieee); -extern void ieee80211_stop_queue(struct ieee80211_device *ieee); -extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee); -extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee); -extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee); -extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p); -extern void notify_wx_assoc_event(struct ieee80211_device *ieee); -extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success); -extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn); -extern void ieee80211_start_scan(struct ieee80211_device *ieee); - -//Add for RF power on power off by lizhaoming 080512 -extern void SendDisassociation(struct ieee80211_device *ieee, - u8* asSta, - u8 asRsn); - -/* ieee80211_crypt_ccmp&tkip&wep.c */ -extern void ieee80211_tkip_null(void); -extern void ieee80211_wep_null(void); -extern void ieee80211_ccmp_null(void); -/* ieee80211_softmac_wx.c */ - -extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *ext); - -extern int ieee80211_wx_set_wap(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *awrq, - char *extra); - -extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b); - -extern int ieee80211_wx_set_rate(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -extern int ieee80211_wx_get_rate(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a, - union iwreq_data *wrqu, char *b); - -extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a, - union iwreq_data *wrqu, char *b); - -extern int ieee80211_wx_set_essid(struct ieee80211_device *ieee, - struct iw_request_info *a, - union iwreq_data *wrqu, char *extra); - -extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a, - union iwreq_data *wrqu, char *b); - -extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a, - union iwreq_data *wrqu, char *b); - -extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a, - union iwreq_data *wrqu, char *b); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) -extern void ieee80211_wx_sync_scan_wq(struct work_struct *work); -#else - extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee); -#endif -//extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee); - -extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -extern int ieee80211_wx_get_name(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -extern int ieee80211_wx_set_power(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -extern int ieee80211_wx_get_power(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); - -extern void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee); - -extern void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr); - -extern const long ieee80211_wlan_frequencies[]; - -extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee) -{ - ieee->scans++; -} - -extern inline int ieee80211_get_scans(struct ieee80211_device *ieee) -{ - return ieee->scans; -} - -static inline const char *escape_essid(const char *essid, u8 essid_len) { - static char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; - const char *s = essid; - char *d = escaped; - - if (ieee80211_is_empty_essid(essid, essid_len)) { - memcpy(escaped, "<hidden>", sizeof("<hidden>")); - return escaped; - } - - essid_len = min(essid_len, (u8)IW_ESSID_MAX_SIZE); - while (essid_len--) { - if (*s == '\0') { - *d++ = '\\'; - *d++ = '0'; - s++; - } else { - *d++ = *s++; - } - } - *d = '\0'; - return escaped; -} -#endif /* IEEE80211_H */ diff --git a/drivers/staging/rtl8187se/ieee80211/dot11d.c b/drivers/staging/rtl8187se/ieee80211/dot11d.c index 54bcdcf1d330..309bb8bf287e 100644 --- a/drivers/staging/rtl8187se/ieee80211/dot11d.c +++ b/drivers/staging/rtl8187se/ieee80211/dot11d.c @@ -1,4 +1,3 @@ -#ifdef ENABLE_DOT11D //----------------------------------------------------------------------------- // File: // Dot11d.c @@ -130,16 +129,6 @@ Dot11d_UpdateCountryIe( pDot11dInfo->State = DOT11D_STATE_LEARNED; } -void dump_chnl_map(u8 * channel_map) -{ - int i; - printk("Channel List:"); - for(i=1; i<= MAX_CHANNEL_NUMBER; i++) - if(channel_map[i] > 0) - printk(" %d(%d)", i, channel_map[i]); - printk("\n"); -} - u8 DOT11D_GetMaxTxPwrInDbm( struct ieee80211_device *dev, @@ -233,14 +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 -#endif diff --git a/drivers/staging/rtl8187se/ieee80211/dot11d.h b/drivers/staging/rtl8187se/ieee80211/dot11d.h index 82576b519cc5..029c2cab1e00 100644 --- a/drivers/staging/rtl8187se/ieee80211/dot11d.h +++ b/drivers/staging/rtl8187se/ieee80211/dot11d.h @@ -97,6 +97,4 @@ int ToLegalChannel( struct ieee80211_device * dev, u8 channel ); - -void dump_chnl_map(u8 * channel_map); #endif // #ifndef __INC_DOT11D_H diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index 58336080ad50..3222c22152fb 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h @@ -29,37 +29,14 @@ #include <linux/jiffies.h> #include <linux/timer.h> #include <linux/sched.h> - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) #include <linux/wireless.h> -#endif - -/* -#ifndef bool -#define bool int -#endif - -#ifndef true -#define true 1 -#endif +#include <linux/ieee80211.h> -#ifndef false -#define false 0 -#endif -*/ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) -#ifndef bool -typedef enum{false = 0, true} bool; -#endif -#endif -//#ifdef JOHN_HWSEC #define KEY_TYPE_NA 0x0 #define KEY_TYPE_WEP40 0x1 #define KEY_TYPE_TKIP 0x2 #define KEY_TYPE_CCMP 0x4 #define KEY_TYPE_WEP104 0x5 -//#endif - #define aSifsTime 10 @@ -112,58 +89,6 @@ typedef enum{false = 0, true} bool; #define IEEE_CRYPT_ALG_NAME_LEN 16 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)) -#define ieee80211_wx_get_scan ieee80211_wx_get_scan_rtl -#define ieee80211_wx_set_encode ieee80211_wx_set_encode_rtl -#define ieee80211_wx_get_encode ieee80211_wx_get_encode_rtl -//////////////////////////////// -// added for kernel conflict under FC5 -#define ieee80211_wx_get_name ieee80211_wx_get_name_rtl -#define free_ieee80211 free_ieee80211_rtl -#define alloc_ieee80211 alloc_ieee80211_rtl -/////////////////////////////// -#endif -//error in ubuntu2.6.22,so add these -#define ieee80211_wake_queue ieee80211_wake_queue_rtl -#define ieee80211_stop_queue ieee80211_stop_queue_rtl - -#define ieee80211_rx ieee80211_rx_rtl - -#define ieee80211_register_crypto_ops ieee80211_register_crypto_ops_rtl -#define ieee80211_unregister_crypto_ops ieee80211_unregister_crypto_ops_rtl -#define ieee80211_get_crypto_ops ieee80211_get_crypto_ops_rtl -#define ieee80211_crypt_deinit_entries ieee80211_crypt_deinit_entries_rtl -#define ieee80211_crypt_deinit_handler ieee80211_crypt_deinit_handler_rtl -#define ieee80211_crypt_delayed_deinit ieee80211_crypt_delayed_deinit_rtl - -#define ieee80211_txb_free ieee80211_txb_free_rtl -#define ieee80211_wx_get_essid ieee80211_wx_get_essid_rtl -#define ieee80211_wx_set_essid ieee80211_wx_set_essid_rtl -#define ieee80211_wx_set_rate ieee80211_wx_set_rate_rtl -#define ieee80211_wx_get_rate ieee80211_wx_get_rate_rtl -#define ieee80211_wx_set_wap ieee80211_wx_set_wap_rtl -#define ieee80211_wx_get_wap ieee80211_wx_get_wap_rtl -#define ieee80211_wx_set_mode ieee80211_wx_set_mode_rtl -#define ieee80211_wx_get_mode ieee80211_wx_get_mode_rtl -#define ieee80211_wx_set_scan ieee80211_wx_set_scan_rtl -#define ieee80211_wx_get_freq ieee80211_wx_get_freq_rtl -#define ieee80211_wx_set_freq ieee80211_wx_set_freq_rtl -#define ieee80211_wx_set_rawtx ieee80211_wx_set_rawtx_rtl -#define ieee80211_wx_set_power ieee80211_wx_set_power_rtl -#define ieee80211_wx_get_power ieee80211_wx_get_power_rtl -#define ieee80211_wlan_frequencies ieee80211_wlan_frequencies_rtl -#define ieee80211_softmac_stop_protocol ieee80211_softmac_stop_protocol_rtl -#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rtl -#define ieee80211_start_protocol ieee80211_start_protocol_rtl -#define ieee80211_stop_protocol ieee80211_stop_protocol_rtl -#define ieee80211_rx_mgt ieee80211_rx_mgt_rtl - -#define ieee80211_wx_set_auth ieee80211_wx_set_auth_rtl -//by amy for ps -#define notify_wx_assoc_event notify_wx_assoc_event_rtl -#define ieee80211_stop_send_beacons ieee80211_stop_send_beacons_rtl -#define ieee80211_disassociate ieee80211_disassociate_rtl -#define ieee80211_start_scan ieee80211_start_scan_rtl //by amy for ps typedef struct ieee_param { u32 cmd; @@ -196,32 +121,8 @@ typedef struct ieee_param { }ieee_param; -#if WIRELESS_EXT < 17 -#define IW_QUAL_QUAL_INVALID 0x10 -#define IW_QUAL_LEVEL_INVALID 0x20 -#define IW_QUAL_NOISE_INVALID 0x40 -#define IW_QUAL_QUAL_UPDATED 0x1 -#define IW_QUAL_LEVEL_UPDATED 0x2 -#define IW_QUAL_NOISE_UPDATED 0x4 -#endif - -// linux under 2.6.9 release may not support it, so modify it for common use -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)) -#define MSECS(t) (1000 * ((t) / HZ) + 1000 * ((t) % HZ) / HZ) -static inline unsigned long msleep_interruptible_rtl(unsigned int msecs) -{ - unsigned long timeout = MSECS(msecs) + 1; - - while (timeout) { - set_current_state(TASK_UNINTERRUPTIBLE); - timeout = schedule_timeout(timeout); - } - return timeout; -} -#else #define MSECS(t) msecs_to_jiffies(t) #define msleep_interruptible_rtl msleep_interruptible -#endif #define IEEE80211_DATA_LEN 2304 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section @@ -232,162 +133,21 @@ static inline unsigned long msleep_interruptible_rtl(unsigned int msecs) represents the 2304 bytes of real data, plus a possible 8 bytes of WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */ - -#define IEEE80211_HLEN 30 -#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) - -/* this is stolen and modified from the madwifi driver*/ -#define IEEE80211_FC0_TYPE_MASK 0x0c -#define IEEE80211_FC0_TYPE_DATA 0x08 -#define IEEE80211_FC0_SUBTYPE_MASK 0xB0 -#define IEEE80211_FC0_SUBTYPE_QOS 0x80 - -#define IEEE80211_QOS_HAS_SEQ(fc) \ - (((fc) & (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) == \ - (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS)) - -/* this is stolen from ipw2200 driver */ -#define IEEE_IBSS_MAC_HASH_SIZE 31 -struct ieee_ibss_seq { - u8 mac[ETH_ALEN]; - u16 seq_num[17]; - u16 frag_num[17]; - unsigned long packet_time[17]; - struct list_head list; -}; - -struct ieee80211_hdr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u8 addr4[ETH_ALEN]; -} __attribute__ ((packed)); - -struct ieee80211_hdr_QOS { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u8 addr4[ETH_ALEN]; - u16 QOS_ctl; -} __attribute__ ((packed)); - -struct ieee80211_hdr_3addr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; -} __attribute__ ((packed)); - -struct ieee80211_hdr_3addr_QOS { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; - u16 QOS_ctl; -} __attribute__ ((packed)); - -enum eap_type { - EAP_PACKET = 0, - EAPOL_START, - EAPOL_LOGOFF, - EAPOL_KEY, - EAPOL_ENCAP_ASF_ALERT -}; - -static const char *eap_types[] = { - [EAP_PACKET] = "EAP-Packet", - [EAPOL_START] = "EAPOL-Start", - [EAPOL_LOGOFF] = "EAPOL-Logoff", - [EAPOL_KEY] = "EAPOL-Key", - [EAPOL_ENCAP_ASF_ALERT] = "EAPOL-Encap-ASF-Alert" -}; - -static inline const char *eap_get_type(int type) -{ - return (type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type]; -} - -struct eapol { - u8 snap[6]; - u16 ethertype; - u8 version; - u8 type; - u16 length; -} __attribute__ ((packed)); - #define IEEE80211_3ADDR_LEN 24 #define IEEE80211_4ADDR_LEN 30 #define IEEE80211_FCS_LEN 4 +#define IEEE80211_HLEN IEEE80211_4ADDR_LEN +#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN) +#define IEEE80211_MGMT_HDR_LEN 24 +#define IEEE80211_DATA_HDR3_LEN 24 +#define IEEE80211_DATA_HDR4_LEN 30 #define MIN_FRAG_THRESHOLD 256U #define MAX_FRAG_THRESHOLD 2346U /* Frame control field constants */ -#define IEEE80211_FCTL_VERS 0x0002 -#define IEEE80211_FCTL_FTYPE 0x000c -#define IEEE80211_FCTL_STYPE 0x00f0 -#define IEEE80211_FCTL_TODS 0x0100 -#define IEEE80211_FCTL_FROMDS 0x0200 #define IEEE80211_FCTL_DSTODS 0x0300 //added by david -#define IEEE80211_FCTL_MOREFRAGS 0x0400 -#define IEEE80211_FCTL_RETRY 0x0800 -#define IEEE80211_FCTL_PM 0x1000 -#define IEEE80211_FCTL_MOREDATA 0x2000 #define IEEE80211_FCTL_WEP 0x4000 -#define IEEE80211_FCTL_ORDER 0x8000 - -#define IEEE80211_FTYPE_MGMT 0x0000 -#define IEEE80211_FTYPE_CTL 0x0004 -#define IEEE80211_FTYPE_DATA 0x0008 - -/* management */ -#define IEEE80211_STYPE_ASSOC_REQ 0x0000 -#define IEEE80211_STYPE_ASSOC_RESP 0x0010 -#define IEEE80211_STYPE_REASSOC_REQ 0x0020 -#define IEEE80211_STYPE_REASSOC_RESP 0x0030 -#define IEEE80211_STYPE_PROBE_REQ 0x0040 -#define IEEE80211_STYPE_PROBE_RESP 0x0050 -#define IEEE80211_STYPE_BEACON 0x0080 -#define IEEE80211_STYPE_ATIM 0x0090 -#define IEEE80211_STYPE_DISASSOC 0x00A0 -#define IEEE80211_STYPE_AUTH 0x00B0 -#define IEEE80211_STYPE_DEAUTH 0x00C0 -#define IEEE80211_STYPE_MANAGE_ACT 0x00D0 - -/* control */ -#define IEEE80211_STYPE_PSPOLL 0x00A0 -#define IEEE80211_STYPE_RTS 0x00B0 -#define IEEE80211_STYPE_CTS 0x00C0 -#define IEEE80211_STYPE_ACK 0x00D0 -#define IEEE80211_STYPE_CFEND 0x00E0 -#define IEEE80211_STYPE_CFENDACK 0x00F0 - -/* data */ -#define IEEE80211_STYPE_DATA 0x0000 -#define IEEE80211_STYPE_DATA_CFACK 0x0010 -#define IEEE80211_STYPE_DATA_CFPOLL 0x0020 -#define IEEE80211_STYPE_DATA_CFACKPOLL 0x0030 -#define IEEE80211_STYPE_NULLFUNC 0x0040 -#define IEEE80211_STYPE_CFACK 0x0050 -#define IEEE80211_STYPE_CFPOLL 0x0060 -#define IEEE80211_STYPE_CFACKPOLL 0x0070 -#define IEEE80211_STYPE_QOS_DATA 0x0080 //added for WMM 2006/8/2 -#define IEEE80211_STYPE_QOS_NULL 0x00C0 - - -#define IEEE80211_SCTL_FRAG 0x000F -#define IEEE80211_SCTL_SEQ 0xFFF0 - /* debug macros */ @@ -401,6 +161,10 @@ do { if (ieee80211_debug_level & (level)) \ #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) #endif /* CONFIG_IEEE80211_DEBUG */ +#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" +#define MAC_ARG(x) ((u8 *)(x))[0], ((u8 *)(x))[1], ((u8 *)(x))[2], \ + ((u8 *)(x))[3], ((u8 *)(x))[4], ((u8 *)(x))[5] + /* * To use the debug system; * @@ -493,68 +257,9 @@ struct ieee80211_snap_hdr { #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG) #define WLAN_GET_SEQ_SEQ(seq) ((seq) & IEEE80211_SCTL_SEQ) -/* Authentication algorithms */ -#define WLAN_AUTH_OPEN 0 -#define WLAN_AUTH_SHARED_KEY 1 - -#define WLAN_AUTH_CHALLENGE_LEN 128 - #define WLAN_CAPABILITY_BSS (1<<0) -#define WLAN_CAPABILITY_IBSS (1<<1) -#define WLAN_CAPABILITY_CF_POLLABLE (1<<2) -#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) -#define WLAN_CAPABILITY_PRIVACY (1<<4) -#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5) -#define WLAN_CAPABILITY_PBCC (1<<6) -#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7) #define WLAN_CAPABILITY_SHORT_SLOT (1<<10) -/* Status codes */ -#define WLAN_STATUS_SUCCESS 0 -#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 -#define WLAN_STATUS_CAPS_UNSUPPORTED 10 -#define WLAN_STATUS_REASSOC_NO_ASSOC 11 -#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 -#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 -#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 -#define WLAN_STATUS_CHALLENGE_FAIL 15 -#define WLAN_STATUS_AUTH_TIMEOUT 16 -#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 -#define WLAN_STATUS_ASSOC_DENIED_RATES 18 -/* 802.11b */ -#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19 -#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20 -#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21 - -/* Reason codes */ -#define WLAN_REASON_UNSPECIFIED 1 -#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 -#define WLAN_REASON_DEAUTH_LEAVING 3 -#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -#define WLAN_REASON_DISASSOC_AP_BUSY 5 -#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 -#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 - - -/* Information Element IDs */ -#define WLAN_EID_SSID 0 -#define WLAN_EID_SUPP_RATES 1 -#define WLAN_EID_FH_PARAMS 2 -#define WLAN_EID_DS_PARAMS 3 -#define WLAN_EID_CF_PARAMS 4 -#define WLAN_EID_TIM 5 -#define WLAN_EID_IBSS_PARAMS 6 -#define WLAN_EID_CHALLENGE 16 -#define WLAN_EID_RSN 48 -#define WLAN_EID_GENERIC 221 - -#define IEEE80211_MGMT_HDR_LEN 24 -#define IEEE80211_DATA_HDR3_LEN 24 -#define IEEE80211_DATA_HDR4_LEN 30 - - #define IEEE80211_STATMASK_SIGNAL (1<<0) #define IEEE80211_STATMASK_RSSI (1<<1) #define IEEE80211_STATMASK_NOISE (1<<2) @@ -621,8 +326,25 @@ struct ieee80211_snap_hdr { #define IEEE80211_NUM_CCK_RATES 4 #define IEEE80211_OFDM_SHIFT_MASK_A 4 +/* this is stolen and modified from the madwifi driver*/ +#define IEEE80211_FC0_TYPE_MASK 0x0c +#define IEEE80211_FC0_TYPE_DATA 0x08 +#define IEEE80211_FC0_SUBTYPE_MASK 0xB0 +#define IEEE80211_FC0_SUBTYPE_QOS 0x80 +#define IEEE80211_QOS_HAS_SEQ(fc) \ + (((fc) & (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) == \ + (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS)) +/* this is stolen from ipw2200 driver */ +#define IEEE_IBSS_MAC_HASH_SIZE 31 +struct ieee_ibss_seq { + u8 mac[ETH_ALEN]; + u16 seq_num[17]; + u16 frag_num[17]; + unsigned long packet_time[17]; + struct list_head list; +}; /* NOTE: This data is for statistical purposes; not all hardware provides this * information for frames received. Not setting these will not cause @@ -681,26 +403,6 @@ struct ieee80211_stats { unsigned int rx_message_in_bad_msg_fragments; }; -struct ieee80211_softmac_stats{ - unsigned int rx_ass_ok; - unsigned int rx_ass_err; - unsigned int rx_probe_rq; - unsigned int tx_probe_rs; - unsigned int tx_beacons; - unsigned int rx_auth_rq; - unsigned int rx_auth_rs_ok; - unsigned int rx_auth_rs_err; - unsigned int tx_auth_rq; - unsigned int no_auth_rs; - unsigned int no_ass_rs; - unsigned int tx_ass_rq; - unsigned int rx_ass_rq; - unsigned int tx_probe_rq; - unsigned int reassoc; - unsigned int swtxstop; - unsigned int swtxawake; -}; - struct ieee80211_device; #include "ieee80211_crypt.h" @@ -754,6 +456,23 @@ Total: 28-2340 bytes */ +/* Management Frame Information Element Types */ +enum { + MFIE_TYPE_SSID = 0, + MFIE_TYPE_RATES = 1, + MFIE_TYPE_FH_SET = 2, + MFIE_TYPE_DS_SET = 3, + MFIE_TYPE_CF_SET = 4, + MFIE_TYPE_TIM = 5, + MFIE_TYPE_IBSS_SET = 6, + MFIE_TYPE_COUNTRY = 7, + MFIE_TYPE_CHALLENGE = 16, + MFIE_TYPE_ERP = 42, + MFIE_TYPE_RSN = 48, + MFIE_TYPE_RATES_EX = 50, + MFIE_TYPE_GENERIC = 221, +}; + struct ieee80211_header_data { u16 frame_ctl; u16 duration_id; @@ -763,39 +482,45 @@ struct ieee80211_header_data { u16 seq_ctrl; }; -#define BEACON_PROBE_SSID_ID_POSITION 12 +struct ieee80211_hdr_3addr { + u16 frame_ctl; + u16 duration_id; + u8 addr1[ETH_ALEN]; + u8 addr2[ETH_ALEN]; + u8 addr3[ETH_ALEN]; + u16 seq_ctl; +} __attribute__ ((packed)); -/* Management Frame Information Element Types */ -#define MFIE_TYPE_SSID 0 -#define MFIE_TYPE_RATES 1 -#define MFIE_TYPE_FH_SET 2 -#define MFIE_TYPE_DS_SET 3 -#define MFIE_TYPE_CF_SET 4 -#define MFIE_TYPE_TIM 5 -#define MFIE_TYPE_IBSS_SET 6 -#define MFIE_TYPE_COUNTRY 7 //+YJ,080625 -#define MFIE_TYPE_CHALLENGE 16 -#define MFIE_TYPE_ERP 42 -#define MFIE_TYPE_RSN 48 -#define MFIE_TYPE_RATES_EX 50 -#define MFIE_TYPE_GENERIC 221 - -#ifdef ENABLE_DOT11D -typedef enum -{ - COUNTRY_CODE_FCC = 0, - COUNTRY_CODE_IC = 1, - COUNTRY_CODE_ETSI = 2, - COUNTRY_CODE_SPAIN = 3, - COUNTRY_CODE_FRANCE = 4, - COUNTRY_CODE_MKK = 5, - COUNTRY_CODE_MKK1 = 6, - COUNTRY_CODE_ISRAEL = 7, - COUNTRY_CODE_TELEC = 8, - COUNTRY_CODE_GLOBAL_DOMAIN = 9, - COUNTRY_CODE_WORLD_WIDE_13_INDEX = 10 -}country_code_type_t; -#endif +struct ieee80211_hdr_4addr { + u16 frame_ctl; + u16 duration_id; + u8 addr1[ETH_ALEN]; + u8 addr2[ETH_ALEN]; + u8 addr3[ETH_ALEN]; + u16 seq_ctl; + u8 addr4[ETH_ALEN]; +} __attribute__ ((packed)); + +struct ieee80211_hdr_3addrqos { + u16 frame_ctl; + u16 duration_id; + u8 addr1[ETH_ALEN]; + u8 addr2[ETH_ALEN]; + u8 addr3[ETH_ALEN]; + u16 seq_ctl; + u16 qos_ctl; +} __attribute__ ((packed)); + +struct ieee80211_hdr_4addrqos { + u16 frame_ctl; + u16 duration_id; + u8 addr1[ETH_ALEN]; + u8 addr2[ETH_ALEN]; + u8 addr3[ETH_ALEN]; + u16 seq_ctl; + u8 addr4[ETH_ALEN]; + u16 qos_ctl; +} __attribute__ ((packed)); struct ieee80211_info_element_hdr { u8 id; @@ -808,26 +533,6 @@ struct ieee80211_info_element { u8 data[0]; } __attribute__ ((packed)); -/* - * These are the data types that can make up management packets - * - u16 auth_algorithm; - u16 auth_sequence; - u16 beacon_interval; - u16 capability; - u8 current_ap[ETH_ALEN]; - u16 listen_interval; - struct { - u16 association_id:14, reserved:2; - } __attribute__ ((packed)); - u32 time_stamp[2]; - u16 reason; - u16 status; -*/ - -#define IEEE80211_DEFAULT_TX_ESSID "Penguin" -#define IEEE80211_DEFAULT_BASIC_RATE 10 - struct ieee80211_authentication { struct ieee80211_header_data header; u16 algorithm; @@ -836,6 +541,15 @@ struct ieee80211_authentication { //struct ieee80211_info_element_hdr info_element; } __attribute__ ((packed)); +struct ieee80211_disassoc_frame { + struct ieee80211_hdr_3addr header; + u16 reasoncode; +} __attribute__ ((packed)); + +struct ieee80211_probe_request { + struct ieee80211_header_data header; + /* struct ieee80211_info_element info_element; */ +} __attribute__ ((packed)); struct ieee80211_probe_response { struct ieee80211_header_data header; @@ -845,11 +559,6 @@ struct ieee80211_probe_response { struct ieee80211_info_element info_element; } __attribute__ ((packed)); -struct ieee80211_probe_request { - struct ieee80211_header_data header; - /*struct ieee80211_info_element info_element;*/ -} __attribute__ ((packed)); - struct ieee80211_assoc_request_frame { struct ieee80211_hdr_3addr header; u16 capability; @@ -866,11 +575,6 @@ struct ieee80211_assoc_response_frame { struct ieee80211_info_element info_element; /* supported rates */ } __attribute__ ((packed)); -struct ieee80211_disassoc_frame{ - struct ieee80211_hdr_3addr header; - u16 reasoncode; -}__attribute__ ((packed)); - struct ieee80211_txb { u8 nr_frags; u8 encrypted; @@ -880,6 +584,32 @@ struct ieee80211_txb { struct sk_buff *fragments[0]; }; +/* SWEEP TABLE ENTRIES NUMBER */ +#define MAX_SWEEP_TAB_ENTRIES 42 +#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7 + +/* MAX_RATES_LENGTH needs to be 12. The spec says 8, and many APs + * only use 8, and then use extended rates for the remaining supported + * rates. Other APs, however, stick all of their supported rates on the + * main rates information element... */ +#define MAX_RATES_LENGTH ((u8)12) +#define MAX_RATES_EX_LENGTH ((u8)16) + +#define MAX_NETWORK_COUNT 128 + +#define MAX_CHANNEL_NUMBER 165 + +#define IEEE80211_SOFTMAC_SCAN_TIME 100 /* (HZ / 2) */ +#define IEEE80211_SOFTMAC_ASSOC_RETRY_TIME (HZ * 2) + +#define CRC_LENGTH 4U + +#define MAX_WPA_IE_LEN 64 + +#define NETWORK_EMPTY_ESSID (1 << 0) +#define NETWORK_HAS_OFDM (1 << 1) +#define NETWORK_HAS_CCK (1 << 2) + struct ieee80211_wmm_ac_param { u8 ac_aci_acm_aifsn; u8 ac_ecwmin_ecwmax; @@ -911,23 +641,82 @@ struct ieee80211_wmm_tspec_elem { u16 medium_time; }__attribute__((packed)); +enum eap_type { + EAP_PACKET = 0, + EAPOL_START, + EAPOL_LOGOFF, + EAPOL_KEY, + EAPOL_ENCAP_ASF_ALERT +}; + +static const char *eap_types[] = { + [EAP_PACKET] = "EAP-Packet", + [EAPOL_START] = "EAPOL-Start", + [EAPOL_LOGOFF] = "EAPOL-Logoff", + [EAPOL_KEY] = "EAPOL-Key", + [EAPOL_ENCAP_ASF_ALERT] = "EAPOL-Encap-ASF-Alert" +}; + +static inline const char *eap_get_type(int type) +{ + return (type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type]; +} + +struct eapol { + u8 snap[6]; + u16 ethertype; + u8 version; + u8 type; + u16 length; +} __attribute__ ((packed)); + +struct ieee80211_softmac_stats { + unsigned int rx_ass_ok; + unsigned int rx_ass_err; + unsigned int rx_probe_rq; + unsigned int tx_probe_rs; + unsigned int tx_beacons; + unsigned int rx_auth_rq; + unsigned int rx_auth_rs_ok; + unsigned int rx_auth_rs_err; + unsigned int tx_auth_rq; + unsigned int no_auth_rs; + unsigned int no_ass_rs; + unsigned int tx_ass_rq; + unsigned int rx_ass_rq; + unsigned int tx_probe_rq; + unsigned int reassoc; + unsigned int swtxstop; + unsigned int swtxawake; +}; + +#define BEACON_PROBE_SSID_ID_POSITION 12 + +/* + * These are the data types that can make up management packets + * + u16 auth_algorithm; + u16 auth_sequence; + u16 beacon_interval; + u16 capability; + u8 current_ap[ETH_ALEN]; + u16 listen_interval; + struct { + u16 association_id:14, reserved:2; + } __attribute__ ((packed)); + u32 time_stamp[2]; + u16 reason; + u16 status; +*/ + +#define IEEE80211_DEFAULT_TX_ESSID "Penguin" +#define IEEE80211_DEFAULT_BASIC_RATE 10 + enum {WMM_all_frame, WMM_two_frame, WMM_four_frame, WMM_six_frame}; #define MAX_SP_Len (WMM_all_frame << 4) #define IEEE80211_QOS_TID 0x0f #define QOS_CTL_NOTCONTAIN_ACK (0x01 << 5) -/* SWEEP TABLE ENTRIES NUMBER*/ -#define MAX_SWEEP_TAB_ENTRIES 42 -#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7 -/* MAX_RATES_LENGTH needs to be 12. The spec says 8, and many APs - * only use 8, and then use extended rates for the remaining supported - * rates. Other APs, however, stick all of their supported rates on the - * main rates information element... */ -#define MAX_RATES_LENGTH ((u8)12) -#define MAX_RATES_EX_LENGTH ((u8)16) -#define MAX_NETWORK_COUNT 128 -//#define MAX_CHANNEL_NUMBER 161 -#define MAX_CHANNEL_NUMBER 165 //YJ,modified,080625 #define MAX_IE_LEN 0xFF //+YJ,080625 typedef struct _CHANNEL_LIST{ @@ -935,23 +724,12 @@ typedef struct _CHANNEL_LIST{ u8 Len; }CHANNEL_LIST, *PCHANNEL_LIST; -#define IEEE80211_SOFTMAC_SCAN_TIME 100//400 -//(HZ / 2) //by amy for ps #define IEEE80211_WATCH_DOG_TIME 2000 //by amy for ps //by amy for antenna #define ANTENNA_DIVERSITY_TIMER_PERIOD 1000 // 1000 m //by amy for antenna -#define IEEE80211_SOFTMAC_ASSOC_RETRY_TIME (HZ * 2) - -#define CRC_LENGTH 4U - -#define MAX_WPA_IE_LEN 64 - -#define NETWORK_EMPTY_ESSID (1<<0) -#define NETWORK_HAS_OFDM (1<<1) -#define NETWORK_HAS_CCK (1<<2) #define IEEE80211_DTIM_MBCAST 4 #define IEEE80211_DTIM_UCAST 2 @@ -1044,13 +822,9 @@ struct ieee80211_network { //by amy 080312 u8 HighestOperaRate; //by amy 080312 -#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 { @@ -1094,24 +868,6 @@ enum ieee80211_state { #define DEFAULT_MAX_SCAN_AGE (15 * HZ) #define DEFAULT_FTS 2346 -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] - - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11)) -extern inline int is_multicast_ether_addr(const u8 *addr) -{ - return ((addr[0] != 0xff) && (0x01 & addr[0])); -} -#endif - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)) -extern inline int is_broadcast_ether_addr(const u8 *addr) -{ - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); -} -#endif #define CFG_IEEE80211_RESERVE_FCS (1<<0) #define CFG_IEEE80211_COMPUTE_FCS (1<<1) @@ -1121,6 +877,19 @@ typedef struct tx_pending_t{ struct ieee80211_txb *txb; }tx_pending_t; +enum { + COUNTRY_CODE_FCC = 0, + COUNTRY_CODE_IC = 1, + COUNTRY_CODE_ETSI = 2, + COUNTRY_CODE_SPAIN = 3, + COUNTRY_CODE_FRANCE = 4, + COUNTRY_CODE_MKK = 5, + COUNTRY_CODE_MKK1 = 6, + COUNTRY_CODE_ISRAEL = 7, + COUNTRY_CODE_TELEC = 8, + COUNTRY_CODE_GLOBAL_DOMAIN = 9, + COUNTRY_CODE_WORLD_WIDE_13_INDEX = 10 +}; struct ieee80211_device { struct net_device *dev; @@ -1207,18 +976,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; @@ -1313,7 +1076,6 @@ struct ieee80211_device { unsigned long NumRxOkTotal; unsigned long NumRxUnicast;//YJ,add,080828,for keep alive bool bHwRadioOff; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) struct delayed_work softmac_scan_wq; struct delayed_work associate_retry_wq; struct delayed_work hw_wakeup_wq; @@ -1329,24 +1091,7 @@ struct ieee80211_device { //Added for RF power on power off by lizhaoming 080512 struct delayed_work GPIOChangeRFWorkItem; -#else - - struct work_struct start_ibss_wq; - struct work_struct softmac_scan_wq; - struct work_struct associate_retry_wq; - struct work_struct hw_wakeup_wq; - struct work_struct hw_sleep_wq; - struct work_struct watch_dog_wq; - struct work_struct sw_antenna_wq; -//by amy for rate adaptive 080312 - struct work_struct rate_adapter_wq; -//by amy for rate adaptive - struct work_struct hw_dig_wq; - struct work_struct tx_pw_wq; -//Added for RF power on power off by lizhaoming 080512 - struct work_struct GPIOChangeRFWorkItem; -#endif struct workqueue_struct *wq; /* Callback functions */ @@ -1582,7 +1327,7 @@ extern void ieee80211_txb_free(struct ieee80211_txb *); extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats); extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, - struct ieee80211_hdr *header, + struct ieee80211_hdr_4addr *header, struct ieee80211_rx_stats *stats); /* ieee80211_wx.c */ @@ -1690,12 +1435,8 @@ extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_reques extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a, union iwreq_data *wrqu, char *b); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) + extern void ieee80211_wx_sync_scan_wq(struct work_struct *work); -#else - extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee); -#endif -//extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee); extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, struct iw_request_info *info, diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c index 7370296225e1..013c3e19ae25 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c @@ -19,10 +19,6 @@ #include <asm/string.h> #include <asm/errno.h> -#if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,18)) -#include<linux/config.h> -#endif - #include "ieee80211.h" MODULE_AUTHOR("Jouni Malinen"); @@ -251,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); diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c index 08add385790f..172e8f3ae6c1 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c @@ -24,28 +24,13 @@ #include "ieee80211.h" -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else #include <linux/crypto.h> -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - #include <asm/scatterlist.h> -#else - #include <linux/scatterlist.h> -#endif - -//#include <asm/scatterlist.h> +#include <linux/scatterlist.h> MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP crypt: CCMP"); MODULE_LICENSE("GPL"); -#ifdef OPENSUSE_SLED -#ifndef IN_OPENSUSE_SLED -#define IN_OPENSUSE_SLED 1 -#endif -#endif #define AES_BLOCK_LEN 16 #define CCMP_HDR_LEN 8 @@ -77,21 +62,7 @@ struct ieee80211_ccmp_data { void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm, const u8 pt[16], u8 ct[16]) { - #if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))||(IN_OPENSUSE_SLED)) crypto_cipher_encrypt_one((void *)tfm, ct, pt); - #else - struct scatterlist src, dst; - - src.page = virt_to_page(pt); - src.offset = offset_in_page(pt); - src.length = AES_BLOCK_LEN; - - dst.page = virt_to_page(ct); - dst.offset = offset_in_page(ct); - dst.length = AES_BLOCK_LEN; - - crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN); - #endif } static void * ieee80211_ccmp_init(int key_idx) @@ -104,33 +75,20 @@ static void * ieee80211_ccmp_init(int key_idx) memset(priv, 0, sizeof(*priv)); priv->key_idx = key_idx; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!IN_OPENSUSE_SLED)) - priv->tfm = crypto_alloc_tfm("aes", 0); - if (priv->tfm == NULL) { - printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate " - "crypto API aes\n"); - goto fail; - } - #else - priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); + priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tfm)) { printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate " "crypto API aes\n"); priv->tfm = NULL; goto fail; } - #endif + return priv; fail: if (priv) { if (priv->tfm) - //#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!IN_OPENSUSE_SLED)) - crypto_free_tfm(priv->tfm); - #else crypto_free_cipher((void *)priv->tfm); - #endif kfree(priv); } @@ -141,13 +99,9 @@ fail: static void ieee80211_ccmp_deinit(void *priv) { struct ieee80211_ccmp_data *_priv = priv; + if (_priv && _priv->tfm) - //#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!IN_OPENSUSE_SLED)) - crypto_free_tfm(_priv->tfm); - #else crypto_free_cipher((void *)_priv->tfm); - #endif kfree(priv); } @@ -159,9 +113,8 @@ static inline void xor_block(u8 *b, u8 *a, size_t len) b[i] ^= a[i]; } -#ifndef JOHN_CCMP static void ccmp_init_blocks(struct crypto_tfm *tfm, - struct ieee80211_hdr *hdr, + struct ieee80211_hdr_4addr *hdr, u8 *pn, size_t dlen, u8 *b0, u8 *auth, u8 *s0) { @@ -237,22 +190,20 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, b0[14] = b0[15] = 0; ieee80211_ccmp_aes_encrypt(tfm, b0, s0); } -#endif static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct ieee80211_ccmp_data *key = priv; int data_len, i; u8 *pos; - struct ieee80211_hdr *hdr; -#ifndef JOHN_CCMP + struct ieee80211_hdr_4addr *hdr; int blocks, last, len; u8 *mic; u8 *b0 = key->tx_b0; u8 *b = key->tx_b; u8 *e = key->tx_e; u8 *s0 = key->tx_s0; -#endif + if (skb_headroom(skb) < CCMP_HDR_LEN || skb_tailroom(skb) < CCMP_MIC_LEN || skb->len < hdr_len) @@ -281,8 +232,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) *pos++ = key->tx_pn[1]; *pos++ = key->tx_pn[0]; - hdr = (struct ieee80211_hdr *) skb->data; -#ifndef JOHN_CCMP + hdr = (struct ieee80211_hdr_4addr *)skb->data; //mic is moved to here by john mic = skb_put(skb, CCMP_MIC_LEN); @@ -306,7 +256,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) for (i = 0; i < CCMP_MIC_LEN; i++) mic[i] = b[i] ^ s0[i]; -#endif + return 0; } @@ -315,22 +265,21 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct ieee80211_ccmp_data *key = priv; u8 keyidx, *pos; - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; u8 pn[6]; -#ifndef JOHN_CCMP size_t data_len = skb->len - hdr_len - CCMP_HDR_LEN - CCMP_MIC_LEN; u8 *mic = skb->data + skb->len - CCMP_MIC_LEN; u8 *b0 = key->rx_b0; u8 *b = key->rx_b; u8 *a = key->rx_a; int i, blocks, last, len; -#endif + if (skb->len < hdr_len + CCMP_HDR_LEN + CCMP_MIC_LEN) { key->dot11RSNAStatsCCMPFormatErrors++; return -1; } - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; pos = skb->data + hdr_len; keyidx = pos[3]; if (!(keyidx & (1 << 5))) { @@ -376,7 +325,6 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) return -4; } -#ifndef JOHN_CCMP ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b); xor_block(mic, b, CCMP_MIC_LEN); @@ -407,7 +355,6 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) memcpy(key->rx_pn, pn, CCMP_PN_LEN); -#endif /* Remove hdr and MIC */ memmove(skb->data + CCMP_HDR_LEN, skb->data, hdr_len); skb_pull(skb, CCMP_HDR_LEN); @@ -520,14 +467,3 @@ void ieee80211_crypto_ccmp_exit(void) { ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp); } - -#if 0 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) -EXPORT_SYMBOL(ieee80211_ccmp_null); -#else -EXPORT_SYMBOL_NOVERS(ieee80211_ccmp_null); -#endif -#endif - -//module_init(ieee80211_crypto_ccmp_init); -//module_exit(ieee80211_crypto_ccmp_exit); diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c index de97bbec0da5..e6d8385e1d88 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c @@ -23,29 +23,14 @@ #include "ieee80211.h" -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else #include <linux/crypto.h> -#endif -//#include <asm/scatterlist.h> -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) - #include <asm/scatterlist.h> -#else - #include <linux/scatterlist.h> -#endif - +#include <linux/scatterlist.h> #include <linux/crc32.h> MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP crypt: TKIP"); MODULE_LICENSE("GPL"); -#ifdef OPENSUSE_SLED -#ifndef IN_OPENSUSE_SLED -#define IN_OPENSUSE_SLED 1 -#endif -#endif struct ieee80211_tkip_data { #define TKIP_KEY_LEN 32 @@ -70,13 +55,10 @@ struct ieee80211_tkip_data { int key_idx; - #if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))||(IN_OPENSUSE_SLED)) - struct crypto_blkcipher *rx_tfm_arc4; - struct crypto_hash *rx_tfm_michael; - struct crypto_blkcipher *tx_tfm_arc4; - struct crypto_hash *tx_tfm_michael; - #endif - + struct crypto_blkcipher *rx_tfm_arc4; + struct crypto_hash *rx_tfm_michael; + struct crypto_blkcipher *tx_tfm_arc4; + struct crypto_hash *tx_tfm_michael; struct crypto_tfm *tfm_arc4; struct crypto_tfm *tfm_michael; @@ -94,22 +76,6 @@ static void * ieee80211_tkip_init(int key_idx) memset(priv, 0, sizeof(*priv)); priv->key_idx = key_idx; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - priv->tfm_arc4 = crypto_alloc_tfm("arc4", 0); - if (priv->tfm_arc4 == NULL) { - printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate " - "crypto API arc4\n"); - goto fail; - } - - priv->tfm_michael = crypto_alloc_tfm("michael_mic", 0); - if (priv->tfm_michael == NULL) { - printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate " - "crypto API michael_mic\n"); - goto fail; - } - - #else priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tx_tfm_arc4)) { @@ -145,17 +111,11 @@ static void * ieee80211_tkip_init(int key_idx) priv->rx_tfm_michael = NULL; goto fail; } - #endif + return priv; fail: if (priv) { - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - if (priv->tfm_michael) - crypto_free_tfm(priv->tfm_michael); - if (priv->tfm_arc4) - crypto_free_tfm(priv->tfm_arc4); - #else if (priv->tx_tfm_michael) crypto_free_hash(priv->tx_tfm_michael); if (priv->tx_tfm_arc4) @@ -164,7 +124,6 @@ fail: crypto_free_hash(priv->rx_tfm_michael); if (priv->rx_tfm_arc4) crypto_free_blkcipher(priv->rx_tfm_arc4); - #endif kfree(priv); } @@ -175,12 +134,7 @@ fail: static void ieee80211_tkip_deinit(void *priv) { struct ieee80211_tkip_data *_priv = priv; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - if (_priv && _priv->tfm_michael) - crypto_free_tfm(_priv->tfm_michael); - if (_priv && _priv->tfm_arc4) - crypto_free_tfm(_priv->tfm_arc4); - #else + if (_priv) { if (_priv->tx_tfm_michael) crypto_free_hash(_priv->tx_tfm_michael); @@ -191,7 +145,6 @@ static void ieee80211_tkip_deinit(void *priv) if (_priv->rx_tfm_arc4) crypto_free_blkcipher(_priv->rx_tfm_arc4); } - #endif kfree(priv); } @@ -281,7 +234,6 @@ static inline u16 _S_(u16 v) return Sbox[Lo8(v)] ^ ((t << 8) | (t >> 8)); } -#ifndef JOHN_TKIP #define PHASE1_LOOP_COUNT 8 static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32) @@ -351,21 +303,17 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK, } #endif } -#endif + static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct ieee80211_tkip_data *tkey = priv; - #if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))||(IN_OPENSUSE_SLED)) struct blkcipher_desc desc = {.tfm = tkey->tx_tfm_arc4}; - #endif int len; u8 *pos; - struct ieee80211_hdr *hdr; -#ifndef JOHN_TKIP + struct ieee80211_hdr_4addr *hdr; u8 rc4key[16],*icv; u32 crc; struct scatterlist sg; -#endif int ret; ret = 0; @@ -373,20 +321,8 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) skb->len < hdr_len) return -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 + hdr = (struct ieee80211_hdr_4addr *)skb->data; -#ifndef JOHN_TKIP if (!tkey->tx_phase1_done) { tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2, tkey->tx_iv32); @@ -394,95 +330,56 @@ printk("%x\n", ((u32*)tkey->key)[7]); } tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16); -#else - tkey->tx_phase1_done = 1; -#endif /*JOHN_TKIP*/ - len = skb->len - hdr_len; pos = skb_push(skb, 8); memmove(pos, pos + 8, hdr_len); pos += hdr_len; -#ifdef JOHN_TKIP - *pos++ = Hi8(tkey->tx_iv16); - *pos++ = (Hi8(tkey->tx_iv16) | 0x20) & 0x7F; - *pos++ = Lo8(tkey->tx_iv16); -#else *pos++ = rc4key[0]; *pos++ = rc4key[1]; *pos++ = rc4key[2]; -#endif *pos++ = (tkey->key_idx << 6) | (1 << 5) /* Ext IV included */; *pos++ = tkey->tx_iv32 & 0xff; *pos++ = (tkey->tx_iv32 >> 8) & 0xff; *pos++ = (tkey->tx_iv32 >> 16) & 0xff; *pos++ = (tkey->tx_iv32 >> 24) & 0xff; -#ifndef JOHN_TKIP + icv = skb_put(skb, 4); -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, len); -#else - crc = ~ether_crc_le(len, pos); -#endif icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; icv[3] = crc >> 24; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16); - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; - crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4); - #else crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16); - #if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; - #else - sg_init_one(&sg, pos, len+4); - #endif + sg_init_one(&sg, pos, len + 4); ret= crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4); - #endif -#endif + tkey->tx_iv16++; if (tkey->tx_iv16 == 0) { tkey->tx_phase1_done = 0; tkey->tx_iv32++; } -#ifndef JOHN_TKIP - #if((LINUX_VERSION_CODE <KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - return 0; - #else return ret; - #endif -#else - return 0; -#endif } static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) { - struct ieee80211_tkip_data *tkey = priv; - #if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) ||(IN_OPENSUSE_SLED)) - struct blkcipher_desc desc = {.tfm = tkey->rx_tfm_arc4}; - #endif + struct ieee80211_tkip_data *tkey = priv; + struct blkcipher_desc desc = { .tfm = tkey->rx_tfm_arc4 }; u8 keyidx, *pos; u32 iv32; u16 iv16; - struct ieee80211_hdr *hdr; -#ifndef JOHN_TKIP + struct ieee80211_hdr_4addr *hdr; u8 icv[4]; u32 crc; struct scatterlist sg; u8 rc4key[16]; int plen; -#endif + if (skb->len < hdr_len + 8 + 4) return -1; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; pos = skb->data + hdr_len; keyidx = pos[3]; if (!(keyidx & (1 << 5))) { @@ -509,7 +406,6 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) iv16 = (pos[0] << 8) | pos[2]; iv32 = pos[4] | (pos[5] << 8) | (pos[6] << 16) | (pos[7] << 24); pos += 8; -#ifndef JOHN_TKIP if (iv32 < tkey->rx_iv32 || (iv32 == tkey->rx_iv32 && iv16 <= tkey->rx_iv16)) { @@ -530,21 +426,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) tkip_mixing_phase2(rc4key, tkey->key, tkey->rx_ttak, iv16); plen = skb->len - hdr_len - 12; - #if((LINUX_VERSION_CODE <KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16); - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = plen + 4; - crypto_cipher_decrypt(tkey->tfm_arc4, &sg, &sg, plen + 4); - #else crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16); - #if(LINUX_VERSION_CODE <KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = plen + 4; - #else - sg_init_one(&sg, pos, plen+4); - #endif + sg_init_one(&sg, pos, plen + 4); if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) { if (net_ratelimit()) { printk(KERN_DEBUG ": TKIP: failed to decrypt " @@ -553,13 +436,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) } return -7; } - #endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, plen); -#else - crc = ~ether_crc_le(plen, pos); -#endif icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; @@ -578,8 +456,6 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) return -5; } -#endif /* JOHN_TKIP */ - /* Update real counters only after Michael MIC verification has * completed */ tkey->rx_iv32_new = iv32; @@ -590,67 +466,9 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) skb_pull(skb, 8); skb_trim(skb, skb->len - 4); -//john's test -#ifdef JOHN_DUMP -if( ((u16*)skb->data)[0] & 0x4000){ - printk("@@ rx decrypted skb->data"); - int i; - for(i=0;i<skb->len;i++){ - if( (i%24)==0 ) printk("\n"); - printk("%2x ", ((u8*)skb->data)[i]); - } - printk("\n"); -} -#endif /*JOHN_DUMP*/ return keyidx; } -#if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!IN_OPENSUSE_SLED)) -static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr, - u8 *data, size_t data_len, u8 *mic) -{ - struct scatterlist sg[2]; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) - struct hash_desc desc; - int ret=0; -#endif - if (tkey->tfm_michael == NULL) { - printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n"); - return -1; - } - sg[0].page = virt_to_page(hdr); - sg[0].offset = offset_in_page(hdr); - sg[0].length = 16; - - sg[1].page = virt_to_page(data); - sg[1].offset = offset_in_page(data); - sg[1].length = data_len; - - //crypto_digest_init(tkey->tfm_michael); - //crypto_digest_setkey(tkey->tfm_michael, key, 8); - //crypto_digest_update(tkey->tfm_michael, sg, 2); - //crypto_digest_final(tkey->tfm_michael, mic); - - //return 0; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - crypto_digest_init(tkey->tfm_michael); - crypto_digest_setkey(tkey->tfm_michael, key, 8); - crypto_digest_update(tkey->tfm_michael, sg, 2); - crypto_digest_final(tkey->tfm_michael, mic); - - return 0; -#else -if (crypto_hash_setkey(tkey->tfm_michael, key, 8)) - return -1; - -// return 0; - desc.tfm = tkey->tfm_michael; - desc.flags = 0; - ret = crypto_hash_digest(&desc, sg, data_len + 16, mic); - return ret; -#endif -} -#else static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, u8 * data, size_t data_len, u8 * mic) { @@ -661,18 +479,10 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n"); return -1; } - #if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg[0].page = virt_to_page(hdr); - sg[0].offset = offset_in_page(hdr); - sg[0].length = 16; - sg[1].page = virt_to_page(data); - sg[1].offset = offset_in_page(data); - sg[1].length = data_len; - #else - sg_init_table(sg, 2); - sg_set_buf(&sg[0], hdr, 16); - sg_set_buf(&sg[1], data, data_len); - #endif + + sg_init_table(sg, 2); + sg_set_buf(&sg[0], hdr, 16); + sg_set_buf(&sg[1], data, data_len); if (crypto_hash_setkey(tfm_michael, key, 8)) return -1; @@ -681,15 +491,12 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr, desc.flags = 0; return crypto_hash_digest(&desc, sg, data_len + 16, mic); } -#endif - - static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr) { - struct ieee80211_hdr *hdr11; + struct ieee80211_hdr_4addr *hdr11; - hdr11 = (struct ieee80211_hdr *) skb->data; + hdr11 = (struct ieee80211_hdr_4addr *)skb->data; switch (le16_to_cpu(hdr11->frame_ctl) & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) { case IEEE80211_FCTL_TODS: @@ -720,9 +527,9 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri { struct ieee80211_tkip_data *tkey = priv; u8 *pos; - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; if (skb_tailroom(skb) < 8 || skb->len < hdr_len) { printk(KERN_DEBUG "Invalid packet for Michael MIC add " @@ -740,22 +547,16 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri } // } pos = skb_put(skb, 8); - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - if (michael_mic(tkey, &tkey->key[16], tkey->tx_hdr, + + if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr, skb->data + hdr_len, skb->len - 8 - hdr_len, pos)) - #else - if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr, - skb->data + hdr_len, skb->len - 8 - hdr_len, pos)) - #endif return -1; return 0; } - -#if WIRELESS_EXT >= 18 static void ieee80211_michael_mic_failure(struct net_device *dev, - struct ieee80211_hdr *hdr, + struct ieee80211_hdr_4addr *hdr, int keyidx) { union iwreq_data wrqu; @@ -774,39 +575,15 @@ static void ieee80211_michael_mic_failure(struct net_device *dev, wrqu.data.length = sizeof(ev); wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev); } -#elif WIRELESS_EXT >= 15 -static void ieee80211_michael_mic_failure(struct net_device *dev, - struct ieee80211_hdr *hdr, - int keyidx) -{ - union iwreq_data wrqu; - char buf[128]; - - /* TODO: needed parameters: count, keyid, key type, TSC */ - sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr=" - MAC_FMT ")", keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni", - MAC_ARG(hdr->addr2)); - memset(&wrqu, 0, sizeof(wrqu)); - wrqu.data.length = strlen(buf); - wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); -} -#else /* WIRELESS_EXT >= 15 */ -static inline void ieee80211_michael_mic_failure(struct net_device *dev, - struct ieee80211_hdr *hdr, - int keyidx) -{ -} -#endif /* WIRELESS_EXT >= 15 */ - static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx, int hdr_len, void *priv) { struct ieee80211_tkip_data *tkey = priv; u8 mic[8]; - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; if (!tkey->key_set) return -1; @@ -818,17 +595,14 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx, tkey->rx_hdr[12] = *(skb->data + hdr_len - 2) & 0x07; } // } - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - if (michael_mic(tkey, &tkey->key[24], tkey->rx_hdr, - skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) - #else + if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr, - skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) - #endif - return -1; + skb->data + hdr_len, skb->len - 8 - hdr_len, mic)) + return -1; + if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) { - struct ieee80211_hdr *hdr; - hdr = (struct ieee80211_hdr *) skb->data; + struct ieee80211_hdr_4addr *hdr; + hdr = (struct ieee80211_hdr_4addr *)skb->data; printk(KERN_DEBUG "%s: Michael MIC verification failed for " "MSDU from " MAC_FMT " keyidx=%d\n", skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2), @@ -854,29 +628,19 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv) { struct ieee80211_tkip_data *tkey = priv; int keyidx; - #if ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - struct crypto_tfm *tfm = tkey->tfm_michael; - struct crypto_tfm *tfm2 = tkey->tfm_arc4; - #else struct crypto_hash *tfm = tkey->tx_tfm_michael; struct crypto_blkcipher *tfm2 = tkey->tx_tfm_arc4; struct crypto_hash *tfm3 = tkey->rx_tfm_michael; struct crypto_blkcipher *tfm4 = tkey->rx_tfm_arc4; - #endif keyidx = tkey->key_idx; memset(tkey, 0, sizeof(*tkey)); tkey->key_idx = keyidx; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - tkey->tfm_michael = tfm; - tkey->tfm_arc4 = tfm2; - #else tkey->tx_tfm_michael = tfm; tkey->tx_tfm_arc4 = tfm2; tkey->rx_tfm_michael = tfm3; tkey->rx_tfm_arc4 = tfm4; - #endif if (len == TKIP_KEY_LEN) { memcpy(tkey->key, key, TKIP_KEY_LEN); @@ -987,15 +751,3 @@ void ieee80211_tkip_null(void) // printk("============>%s()\n", __func__); return; } - -#if 0 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) -EXPORT_SYMBOL(ieee80211_tkip_null); -#else -EXPORT_SYMBOL_NOVERS(ieee80211_tkip_null); -#endif -#endif - - -//module_init(ieee80211_crypto_tkip_init); -//module_exit(ieee80211_crypto_tkip_exit); diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c index 68a22b32fcf0..c6c3bc38459b 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c @@ -20,29 +20,14 @@ #include "ieee80211.h" -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -#include "rtl_crypto.h" -#else #include <linux/crypto.h> -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - #include <asm/scatterlist.h> -#else - #include <linux/scatterlist.h> -#endif -//#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/crc32.h> MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP crypt: WEP"); MODULE_LICENSE("GPL"); -#ifdef OPENSUSE_SLED -#ifndef IN_OPENSUSE_SLED -#define IN_OPENSUSE_SLED 1 -#endif -#endif struct prism2_wep_data { @@ -51,12 +36,8 @@ struct prism2_wep_data { u8 key[WEP_KEY_LEN + 1]; u8 key_len; u8 key_idx; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - struct crypto_tfm *tfm; - #else struct crypto_blkcipher *tx_tfm; struct crypto_blkcipher *rx_tfm; - #endif }; @@ -69,14 +50,6 @@ static void * prism2_wep_init(int keyidx) goto fail; memset(priv, 0, sizeof(*priv)); priv->key_idx = keyidx; - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - priv->tfm = crypto_alloc_tfm("arc4", 0); - if (priv->tfm == NULL) { - printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate " - "crypto API arc4\n"); - goto fail; - } - #else priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); if (IS_ERR(priv->tx_tfm)) { printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate " @@ -91,7 +64,6 @@ static void * prism2_wep_init(int keyidx) priv->rx_tfm = NULL; goto fail; } - #endif /* start WEP IV from a random value */ get_random_bytes(&priv->iv, 4); @@ -99,14 +71,6 @@ static void * prism2_wep_init(int keyidx) return priv; fail: - //#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - if (priv) { - if (priv->tfm) - crypto_free_tfm(priv->tfm); - kfree(priv); - } - #else if (priv) { if (priv->tx_tfm) crypto_free_blkcipher(priv->tx_tfm); @@ -114,7 +78,7 @@ fail: crypto_free_blkcipher(priv->rx_tfm); kfree(priv); } - #endif + return NULL; } @@ -122,18 +86,14 @@ fail: static void prism2_wep_deinit(void *priv) { struct prism2_wep_data *_priv = priv; - //#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - if (_priv && _priv->tfm) - crypto_free_tfm(_priv->tfm); - #else + if (_priv) { if (_priv->tx_tfm) crypto_free_blkcipher(_priv->tx_tfm); if (_priv->rx_tfm) crypto_free_blkcipher(_priv->rx_tfm); } - #endif + kfree(priv); } @@ -147,18 +107,14 @@ static void prism2_wep_deinit(void *priv) static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct prism2_wep_data *wep = priv; -//#if(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))||(IN_OPENSUSE_SLED)) - struct blkcipher_desc desc = {.tfm = wep->tx_tfm}; -#endif + struct blkcipher_desc desc = { .tfm = wep->tx_tfm }; u32 klen, len; u8 key[WEP_KEY_LEN + 3]; u8 *pos; -#ifndef JOHN_HWSEC u32 crc; u8 *icv; struct scatterlist sg; -#endif + if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 || skb->len < hdr_len) return -1; @@ -190,41 +146,18 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) /* Copy rest of the WEP key (the secret part) */ memcpy(key + 3, wep->key, wep->key_len); -#ifndef JOHN_HWSEC /* Append little-endian CRC32 and encrypt it to produce ICV */ -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, len); -#else - crc = ~ether_crc_le(len, pos); -#endif icv = skb_put(skb, 4); icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; icv[3] = crc >> 24; - //#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) - #if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - crypto_cipher_setkey(wep->tfm, key, klen); - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; - crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4); - - return 0; - #else crypto_blkcipher_setkey(wep->tx_tfm, key, klen); - #if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; - #else - sg_init_one(&sg, pos, len+4); - #endif + sg_init_one(&sg, pos, len + 4); + return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4); - #endif -#endif /* JOHN_HWSEC */ - return 0; } @@ -238,18 +171,14 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) { struct prism2_wep_data *wep = priv; - //#if(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) - #if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))||(IN_OPENSUSE_SLED)) - struct blkcipher_desc desc = {.tfm = wep->rx_tfm}; - #endif + struct blkcipher_desc desc = { .tfm = wep->rx_tfm }; u32 klen, plen; u8 key[WEP_KEY_LEN + 3]; u8 keyidx, *pos; -#ifndef JOHN_HWSEC u32 crc; u8 icv[4]; struct scatterlist sg; -#endif + if (skb->len < hdr_len + 8) return -1; @@ -268,32 +197,14 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) /* Apply RC4 to data and compute CRC32 over decrypted data */ plen = skb->len - hdr_len - 8; -#ifndef JOHN_HWSEC -//#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) -#if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21))&&(!IN_OPENSUSE_SLED)) - crypto_cipher_setkey(wep->tfm, key, klen); - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = plen + 4; - crypto_cipher_decrypt(wep->tfm, &sg, &sg, plen + 4); -#else + crypto_blkcipher_setkey(wep->rx_tfm, key, klen); - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = plen + 4; - #else - sg_init_one(&sg, pos, plen+4); - #endif + sg_init_one(&sg, pos, plen + 4); + if (crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4)) return -7; -#endif -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) crc = ~crc32_le(~0, pos, plen); -#else - crc = ~ether_crc_le(plen, pos); -#endif icv[0] = crc; icv[1] = crc >> 8; icv[2] = crc >> 16; @@ -303,7 +214,6 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv) /* ICV mismatch - drop frame */ return -2; } -#endif /* JOHN_HWSEC */ /* Remove IV and ICV */ memmove(skb->data + 4, skb->data, hdr_len); @@ -383,12 +293,3 @@ void ieee80211_wep_null(void) // printk("============>%s()\n", __func__); return; } -#if 0 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) -EXPORT_SYMBOL(ieee80211_wep_null); -#else -EXPORT_SYMBOL_NOVERS(ieee80211_wep_null); -#endif -#endif -//module_init(ieee80211_crypto_wep_init); -//module_exit(ieee80211_crypto_wep_exit); diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c index c2b61e648e4e..6fbe4890cb66 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c @@ -210,91 +210,3 @@ void free_ieee80211(struct net_device *dev) free_netdev(dev); } - -//#ifdef CONFIG_IEEE80211_DEBUG -#if 0 - -static int debug = 0; -u32 ieee80211_debug_level = 0; -struct proc_dir_entry *ieee80211_proc = NULL; - -static int show_debug_level(char *page, char **start, off_t offset, - int count, int *eof, void *data) -{ - return snprintf(page, count, "0x%08X\n", ieee80211_debug_level); -} - -static int store_debug_level(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - char buf[] = "0x00000000"; - unsigned long len = min(sizeof(buf) - 1, (u32)count); - char *p = (char *)buf; - unsigned long val; - - if (copy_from_user(buf, buffer, len)) - return count; - buf[len] = 0; - if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') { - p++; - if (p[0] == 'x' || p[0] == 'X') - p++; - val = simple_strtoul(p, &p, 16); - } else - val = simple_strtoul(p, &p, 10); - if (p == buf) - printk(KERN_INFO DRV_NAME - ": %s is not in hex or decimal form.\n", buf); - else - ieee80211_debug_level = val; - - return strnlen(buf, count); -} - -static int __init ieee80211_init(void) -{ - struct proc_dir_entry *e; - - ieee80211_debug_level = debug; - ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, proc_net); - if (ieee80211_proc == NULL) { - IEEE80211_ERROR("Unable to create " DRV_NAME - " proc directory\n"); - return -EIO; - } - e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR, - ieee80211_proc); - if (!e) { - remove_proc_entry(DRV_NAME, proc_net); - ieee80211_proc = NULL; - return -EIO; - } - e->read_proc = show_debug_level; - e->write_proc = store_debug_level; - e->data = NULL; - - return 0; -} - -static void __exit ieee80211_exit(void) -{ - if (ieee80211_proc) { - remove_proc_entry("debug_level", ieee80211_proc); - remove_proc_entry(DRV_NAME, proc_net); - ieee80211_proc = NULL; - } -} - -#include <linux/moduleparam.h> -module_param(debug, int, 0444); -MODULE_PARM_DESC(debug, "debug output mask"); - - -module_exit(ieee80211_exit); -module_init(ieee80211_init); -#endif - -#if 0 -EXPORT_SYMBOL(alloc_ieee80211); -EXPORT_SYMBOL(free_ieee80211); -#endif diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c index 4d4ee563275e..5e2e79b1e341 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c @@ -44,22 +44,17 @@ #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) { - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + struct ieee80211_hdr_4addr *hdr = + (struct ieee80211_hdr_4addr *)skb->data; u16 fc = le16_to_cpu(hdr->frame_ctl); skb->dev = ieee->dev; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) - skb_reset_mac_header(skb); -#else - skb->mac.raw = skb->data; -#endif + skb_reset_mac_header(skb); skb_pull(skb, ieee80211_get_hdrlen(fc)); skb->pkt_type = PACKET_OTHERHOST; skb->protocol = __constant_htons(ETH_P_80211_RAW); @@ -101,7 +96,7 @@ ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq, /* Called only as a tasklet (software IRQ) */ static struct sk_buff * ieee80211_frag_cache_get(struct ieee80211_device *ieee, - struct ieee80211_hdr *hdr) + struct ieee80211_hdr_4addr *hdr) { struct sk_buff *skb = NULL; u16 fc = le16_to_cpu(hdr->frame_ctl); @@ -109,25 +104,18 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee, unsigned int frag = WLAN_GET_SEQ_FRAG(sc); unsigned int seq = WLAN_GET_SEQ_SEQ(sc); struct ieee80211_frag_entry *entry; - struct ieee80211_hdr_3addr_QOS *hdr_3addr_QoS; - struct ieee80211_hdr_QOS *hdr_4addr_QoS; + struct ieee80211_hdr_3addrqos *hdr_3addrqos; + struct ieee80211_hdr_4addrqos *hdr_4addrqos; u8 tid; -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - { - tid = (hdr->addr2[ETH_ALEN-2] ^ hdr->addr2[ETH_ALEN-1]) & IEEE80211_QOS_TID; - } - else -#endif if (((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) { - hdr_4addr_QoS = (struct ieee80211_hdr_QOS *)hdr; - tid = le16_to_cpu(hdr_4addr_QoS->QOS_ctl) & IEEE80211_QOS_TID; + hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr; + tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID; tid = UP2AC(tid); tid ++; } else if (IEEE80211_QOS_HAS_SEQ(fc)) { - hdr_3addr_QoS = (struct ieee80211_hdr_3addr_QOS *)hdr; - tid = le16_to_cpu(hdr_3addr_QoS->QOS_ctl) & IEEE80211_QOS_TID; + hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr; + tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID; tid = UP2AC(tid); tid ++; } else { @@ -137,7 +125,7 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee, if (frag == 0) { /* Reserve enough space to fit maximum frame length */ skb = dev_alloc_skb(ieee->dev->mtu + - sizeof(struct ieee80211_hdr) + + sizeof(struct ieee80211_hdr_4addr) + 8 /* LLC */ + 2 /* alignment */ + 8 /* WEP */ + @@ -177,31 +165,24 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee, /* Called only as a tasklet (software IRQ) */ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee, - struct ieee80211_hdr *hdr) + struct ieee80211_hdr_4addr *hdr) { u16 fc = le16_to_cpu(hdr->frame_ctl); u16 sc = le16_to_cpu(hdr->seq_ctl); unsigned int seq = WLAN_GET_SEQ_SEQ(sc); struct ieee80211_frag_entry *entry; - struct ieee80211_hdr_3addr_QOS *hdr_3addr_QoS; - struct ieee80211_hdr_QOS *hdr_4addr_QoS; + struct ieee80211_hdr_3addrqos *hdr_3addrqos; + struct ieee80211_hdr_4addrqos *hdr_4addrqos; u8 tid; -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - { - tid = (hdr->addr2[ETH_ALEN-2] ^ hdr->addr2[ETH_ALEN-1]) & IEEE80211_QOS_TID; - } - else -#endif if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) { - hdr_4addr_QoS = (struct ieee80211_hdr_QOS *)hdr; - tid = le16_to_cpu(hdr_4addr_QoS->QOS_ctl) & IEEE80211_QOS_TID; + hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)hdr; + tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID; tid = UP2AC(tid); tid ++; } else if (IEEE80211_QOS_HAS_SEQ(fc)) { - hdr_3addr_QoS = (struct ieee80211_hdr_3addr_QOS *)hdr; - tid = le16_to_cpu(hdr_3addr_QoS->QOS_ctl) & IEEE80211_QOS_TID; + hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)hdr; + tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID; tid = UP2AC(tid); tid ++; } else { @@ -234,17 +215,18 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats, u16 type, u16 stype) { - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; // cheat the the hdr type - hdr = (struct ieee80211_hdr *)skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; /* On the struct stats definition there is written that * this is not mandatory.... but seems that the probe * response parser uses it */ rx_stats->len = skb->len; - ieee80211_rx_mgt(ieee,(struct ieee80211_hdr *)skb->data,rx_stats); + ieee80211_rx_mgt(ieee, (struct ieee80211_hdr_4addr *)skb->data, + rx_stats); if((ieee->state == IEEE80211_LINKED)&&(memcmp(hdr->addr3,ieee->current_network.bssid,ETH_ALEN))) { dev_kfree_skb_any(skb); @@ -257,51 +239,6 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb, return 0; - #ifdef NOT_YET - if (ieee->iw_mode == IW_MODE_MASTER) { - printk(KERN_DEBUG "%s: Master mode not yet suppported.\n", - ieee->dev->name); - return 0; -/* - hostap_update_sta_ps(ieee, (struct hostap_ieee80211_hdr *) - skb->data);*/ - } - - if (ieee->hostapd && type == IEEE80211_TYPE_MGMT) { - if (stype == WLAN_FC_STYPE_BEACON && - ieee->iw_mode == IW_MODE_MASTER) { - struct sk_buff *skb2; - /* Process beacon frames also in kernel driver to - * update STA(AP) table statistics */ - skb2 = skb_clone(skb, GFP_ATOMIC); - if (skb2) - hostap_rx(skb2->dev, skb2, rx_stats); - } - - /* send management frames to the user space daemon for - * processing */ - ieee->apdevstats.rx_packets++; - ieee->apdevstats.rx_bytes += skb->len; - prism2_rx_80211(ieee->apdev, skb, rx_stats, PRISM2_RX_MGMT); - return 0; - } - - if (ieee->iw_mode == IW_MODE_MASTER) { - if (type != WLAN_FC_TYPE_MGMT && type != WLAN_FC_TYPE_CTRL) { - printk(KERN_DEBUG "%s: unknown management frame " - "(type=0x%02x, stype=0x%02x) dropped\n", - skb->dev->name, type, stype); - return -1; - } - - hostap_rx(skb->dev, skb, rx_stats); - return 0; - } - - printk(KERN_DEBUG "%s: hostap_rx_frame_mgmt: management frame " - "received in non-Host AP mode\n", skb->dev->name); - return -1; - #endif } @@ -321,13 +258,13 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee, { struct net_device *dev = ieee->dev; u16 fc, ethertype; - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; u8 *pos; if (skb->len < 24) return 0; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; fc = le16_to_cpu(hdr->frame_ctl); /* check that the frame is unicast frame to us */ @@ -361,20 +298,13 @@ static inline int ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb, struct ieee80211_crypt_data *crypt) { - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; int res, hdrlen; if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL) return 0; - hdr = (struct ieee80211_hdr *) skb->data; -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && (ieee->ext_patch_ieee80211_rx_frame_get_hdrlen)) - { - hdrlen = ieee->ext_patch_ieee80211_rx_frame_get_hdrlen(ieee, skb); - } - else -#endif + hdr = (struct ieee80211_hdr_4addr *)skb->data; hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); #ifdef CONFIG_IEEE80211_CRYPT_TKIP @@ -413,20 +343,13 @@ static inline int ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb, int keyidx, struct ieee80211_crypt_data *crypt) { - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_4addr *hdr; int res, hdrlen; if (crypt == NULL || crypt->ops->decrypt_msdu == NULL) return 0; - hdr = (struct ieee80211_hdr *) skb->data; -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && (ieee->ext_patch_ieee80211_rx_frame_get_hdrlen)) - { - hdrlen = ieee->ext_patch_ieee80211_rx_frame_get_hdrlen(ieee, skb); - } - else -#endif + hdr = (struct ieee80211_hdr_4addr *)skb->data; hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); atomic_inc(&crypt->refcnt); @@ -446,7 +369,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *s /* this function is stolen from ipw2200 driver*/ #define IEEE_PACKET_RETRY_TIME (5*HZ) static int is_duplicate_packet(struct ieee80211_device *ieee, - struct ieee80211_hdr *header) + struct ieee80211_hdr_4addr *header) { u16 fc = le16_to_cpu(header->frame_ctl); u16 sc = le16_to_cpu(header->seq_ctl); @@ -454,26 +377,19 @@ static int is_duplicate_packet(struct ieee80211_device *ieee, u16 frag = WLAN_GET_SEQ_FRAG(sc); u16 *last_seq, *last_frag; unsigned long *last_time; - struct ieee80211_hdr_3addr_QOS *hdr_3addr_QoS; - struct ieee80211_hdr_QOS *hdr_4addr_QoS; + struct ieee80211_hdr_3addrqos *hdr_3addrqos; + struct ieee80211_hdr_4addrqos *hdr_4addrqos; u8 tid; -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - { - tid = (header->addr2[ETH_ALEN-2] ^ header->addr2[ETH_ALEN-1]) & IEEE80211_QOS_TID; - } - else -#endif //TO2DS and QoS if(((fc & IEEE80211_FCTL_DSTODS) == IEEE80211_FCTL_DSTODS)&&IEEE80211_QOS_HAS_SEQ(fc)) { - hdr_4addr_QoS = (struct ieee80211_hdr_QOS *)header; - tid = le16_to_cpu(hdr_4addr_QoS->QOS_ctl) & IEEE80211_QOS_TID; + hdr_4addrqos = (struct ieee80211_hdr_4addrqos *)header; + tid = le16_to_cpu(hdr_4addrqos->qos_ctl) & IEEE80211_QOS_TID; tid = UP2AC(tid); tid ++; } else if(IEEE80211_QOS_HAS_SEQ(fc)) { //QoS - hdr_3addr_QoS = (struct ieee80211_hdr_3addr_QOS*)header; - tid = le16_to_cpu(hdr_3addr_QoS->QOS_ctl) & IEEE80211_QOS_TID; + hdr_3addrqos = (struct ieee80211_hdr_3addrqos *)header; + tid = le16_to_cpu(hdr_3addrqos->qos_ctl) & IEEE80211_QOS_TID; tid = UP2AC(tid); tid ++; } else { // no QoS @@ -519,16 +435,6 @@ static int is_duplicate_packet(struct ieee80211_device *ieee, break; default: -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - { - last_seq = &ieee->last_rxseq_num[tid]; - last_frag = &ieee->last_rxfrag_num[tid]; - last_time = &ieee->last_packet_time[tid]; - break; - } - else -#endif return 0; } @@ -569,8 +475,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, { struct net_device *dev = ieee->dev; //struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - struct ieee80211_hdr *hdr; - //struct ieee80211_hdr_3addr_QOS *hdr; + struct ieee80211_hdr_4addr *hdr; size_t hdrlen; u16 fc, type, stype, sc; @@ -578,28 +483,14 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, unsigned int frag; u8 *payload; u16 ethertype; -#ifdef NOT_YET - struct net_device *wds = NULL; - struct sk_buff *skb2 = NULL; - struct net_device *wds = NULL; - int frame_authorized = 0; - int from_assoc_ap = 0; - void *sta = NULL; -#endif -// u16 QOS_ctl = 0; u8 dst[ETH_ALEN]; u8 src[ETH_ALEN]; u8 bssid[ETH_ALEN]; struct ieee80211_crypt_data *crypt = NULL; int keyidx = 0; - //Added for mesh by Lawrence. -#ifdef _RTL8187_EXT_PATCH_ - u8 status; - u32 flags; -#endif // cheat the the hdr type - hdr = (struct ieee80211_hdr *)skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; stats = &ieee->stats; if (skb->len < 10) { @@ -632,63 +523,21 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, } //YJ,add,080828,for keep alive,end -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && (ieee->ext_patch_ieee80211_rx_frame_get_hdrlen)) - { - hdrlen = ieee->ext_patch_ieee80211_rx_frame_get_hdrlen(ieee, skb); - if(skb->len < hdrlen) - goto rx_dropped; - } - else -#endif hdrlen = ieee80211_get_hdrlen(fc); -#ifdef NOT_YET -#if WIRELESS_EXT > 15 - /* Put this code here so that we avoid duplicating it in all - * Rx paths. - Jean II */ -#ifdef IW_WIRELESS_SPY /* defined in iw_handler.h */ - /* If spy monitoring on */ - if (iface->spy_data.spy_number > 0) { - struct iw_quality wstats; - wstats.level = rx_stats->signal; - wstats.noise = rx_stats->noise; - wstats.updated = 6; /* No qual value */ - /* Update spy records */ - wireless_spy_update(dev, hdr->addr2, &wstats); - } -#endif /* IW_WIRELESS_SPY */ -#endif /* WIRELESS_EXT > 15 */ - hostap_update_rx_stats(local->ap, hdr, rx_stats); -#endif -#if WIRELESS_EXT > 15 if (ieee->iw_mode == IW_MODE_MONITOR) { ieee80211_monitor_rx(ieee, skb, rx_stats); stats->rx_packets++; stats->rx_bytes += skb->len; return 1; } -#endif + if (ieee->host_decrypt) { int idx = 0; if (skb->len >= hdrlen + 3) idx = skb->data[hdrlen + 3] >> 6; crypt = ieee->crypt[idx]; -#ifdef NOT_YET - sta = NULL; - - /* Use station specific key to override default keys if the - * receiver address is a unicast address ("individual RA"). If - * bcrx_sta_key parameter is set, station specific key is used - * even with broad/multicast targets (this is against IEEE - * 802.11, but makes it easier to use different keys with - * stations that do not support WEP key mapping). */ - - if (!(hdr->addr1[0] & 0x01) || local->bcrx_sta_key) - (void) hostap_handle_sta_crypto(local, hdr, &crypt, - &sta); -#endif /* allow NULL decrypt to indicate an station specific override * for default encryption */ @@ -712,47 +561,17 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, if (skb->len < IEEE80211_DATA_HDR3_LEN) goto rx_dropped; -#ifdef _RTL8187_EXT_PATCH_ - if( ieee->iw_mode == ieee->iw_ext_mode && ieee->ext_patch_ieee80211_rx_mgt_update_expire ) - ieee->ext_patch_ieee80211_rx_mgt_update_expire( ieee, skb ); -#endif - // if QoS enabled, should check the sequence for each of the AC if (is_duplicate_packet(ieee, hdr)) goto rx_dropped; if (type == IEEE80211_FTYPE_MGMT) { - - #if 0 - if ( stype == IEEE80211_STYPE_AUTH && - fc & IEEE80211_FCTL_WEP && ieee->host_decrypt && - (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) - { - printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " - "from " MAC_FMT "\n", dev->name, - MAC_ARG(hdr->addr2)); - /* TODO: could inform hostapd about this so that it - * could send auth failure report */ - goto rx_dropped; - } - #endif - - if (ieee80211_rx_frame_mgmt(ieee, skb, rx_stats, type, stype)) goto rx_dropped; else goto rx_exit; } -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_on_rx) - { - if(ieee->ext_patch_ieee80211_rx_on_rx(ieee, skb, rx_stats, type, stype)==0) - { - goto rx_exit; - } - } -#endif /* Data frame - extract src/dst addresses */ switch (fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) { @@ -780,55 +599,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, break; } -#ifdef NOT_YET - if (hostap_rx_frame_wds(ieee, hdr, fc, &wds)) - goto rx_dropped; - if (wds) { - skb->dev = dev = wds; - stats = hostap_get_stats(dev); - } - - if (ieee->iw_mode == IW_MODE_MASTER && !wds && - (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS && - ieee->stadev && - memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) { - /* Frame from BSSID of the AP for which we are a client */ - skb->dev = dev = ieee->stadev; - stats = hostap_get_stats(dev); - from_assoc_ap = 1; - } -#endif dev->last_rx = jiffies; -#ifdef NOT_YET - if ((ieee->iw_mode == IW_MODE_MASTER || - ieee->iw_mode == IW_MODE_REPEAT) && - !from_assoc_ap) { - switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats, - wds != NULL)) { - case AP_RX_CONTINUE_NOT_AUTHORIZED: - frame_authorized = 0; - break; - case AP_RX_CONTINUE: - frame_authorized = 1; - break; - case AP_RX_DROP: - goto rx_dropped; - case AP_RX_EXIT: - goto rx_exit; - } - } -#endif -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_is_valid_framectl) - { - if(ieee->ext_patch_ieee80211_rx_is_valid_framectl(ieee, fc, type, stype)==0) - goto rx_dropped; - } - else -#endif /* Nullfunc frames may have PS-bit set, so they must be passed to * hostap_handle_sta_rx() before being dropped here. */ if (stype != IEEE80211_STYPE_DATA && @@ -857,7 +631,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, (keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0) goto rx_dropped; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; /* skb: hdr + (possibly fragmented) plaintext payload */ // PR: FIXME: hostap has additional conditions in the "if" below: @@ -910,7 +684,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, /* this was the last fragment and the frame will be * delivered, so remove skb from fragment cache */ skb = frag_skb; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; ieee80211_frag_cache_invalidate(ieee, hdr); } @@ -920,7 +694,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt)) goto rx_dropped; - hdr = (struct ieee80211_hdr *) skb->data; + hdr = (struct ieee80211_hdr_4addr *)skb->data; if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep) { if (/*ieee->ieee802_1x &&*/ ieee80211_is_eapol_frame(ieee, skb, hdrlen)) { @@ -970,47 +744,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, payload = skb->data + hdrlen; ethertype = (payload[6] << 8) | payload[7]; -#ifdef NOT_YET - /* If IEEE 802.1X is used, check whether the port is authorized to send - * the received frame. */ - if (ieee->ieee802_1x && ieee->iw_mode == IW_MODE_MASTER) { - if (ethertype == ETH_P_PAE) { - printk(KERN_DEBUG "%s: RX: IEEE 802.1X frame\n", - dev->name); - if (ieee->hostapd && ieee->apdev) { - /* Send IEEE 802.1X frames to the user - * space daemon for processing */ - prism2_rx_80211(ieee->apdev, skb, rx_stats, - PRISM2_RX_MGMT); - ieee->apdevstats.rx_packets++; - ieee->apdevstats.rx_bytes += skb->len; - goto rx_exit; - } - } else if (!frame_authorized) { - printk(KERN_DEBUG "%s: dropped frame from " - "unauthorized port (IEEE 802.1X): " - "ethertype=0x%04x\n", - dev->name, ethertype); - goto rx_dropped; - } - } -#endif - -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_process_dataframe) - { - //Added for mesh rx interrupt. - //spin_lock_irqsave(&ieee->lock,flags); - status = ieee->ext_patch_ieee80211_rx_process_dataframe(ieee, skb, rx_stats); - //spin_unlock_irqrestore(&ieee->lock,flags); - - if(status) -// if(ieee->ext_patch_ieee80211_rx_process_dataframe(ieee, skb, rx_stats)) - goto rx_exit; - else - goto rx_dropped; - } -#endif /* convert hdr + possible LLC headers into Ethernet header */ if (skb->len - hdrlen >= 8 && @@ -1032,51 +765,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN); } -#ifdef NOT_YET - if (wds && ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == - IEEE80211_FCTL_TODS) && - skb->len >= ETH_HLEN + ETH_ALEN) { - /* Non-standard frame: get addr4 from its bogus location after - * the payload */ - memcpy(skb->data + ETH_ALEN, - skb->data + skb->len - ETH_ALEN, ETH_ALEN); - skb_trim(skb, skb->len - ETH_ALEN); - } -#endif stats->rx_packets++; stats->rx_bytes += skb->len; -#ifdef NOT_YET - if (ieee->iw_mode == IW_MODE_MASTER && !wds && - ieee->ap->bridge_packets) { - if (dst[0] & 0x01) { - /* copy multicast frame both to the higher layers and - * to the wireless media */ - ieee->ap->bridged_multicast++; - skb2 = skb_clone(skb, GFP_ATOMIC); - if (skb2 == NULL) - printk(KERN_DEBUG "%s: skb_clone failed for " - "multicast frame\n", dev->name); - } else if (hostap_is_sta_assoc(ieee->ap, dst)) { - /* send frame directly to the associated STA using - * wireless media and not passing to higher layers */ - ieee->ap->bridged_unicast++; - skb2 = skb; - skb = NULL; - } - } - - if (skb2 != NULL) { - /* send to wireless media */ - skb2->protocol = __constant_htons(ETH_P_802_3); - skb2->mac.raw = skb2->nh.raw = skb2->data; - /* skb2->nh.raw = skb2->data + ETH_HLEN; */ - skb2->dev = dev; - dev_queue_xmit(skb2); - } - -#endif if (skb) { skb->protocol = eth_type_trans(skb, dev); memset(skb->cb, 0, sizeof(skb->cb)); @@ -1087,10 +779,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, } rx_exit: -#ifdef NOT_YET - if (sta) - hostap_handle_sta_release(sta); -#endif return 1; rx_dropped: @@ -1102,41 +790,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, return 0; } -#ifdef _RTL8187_EXT_PATCH_ -int ieee_ext_skb_p80211_to_ether(struct sk_buff *skb, int hdrlen, u8 *dst, u8 *src) -{ - u8 *payload; - u16 ethertype; - - /* skb: hdr + (possible reassembled) full plaintext payload */ - payload = skb->data + hdrlen; - ethertype = (payload[6] << 8) | payload[7]; - - /* convert hdr + possible LLC headers into Ethernet header */ - if (skb->len - hdrlen >= 8 && - ((memcmp(payload, rfc1042_header, SNAP_SIZE) == 0 && - ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) || - memcmp(payload, bridge_tunnel_header, SNAP_SIZE) == 0)) { - /* remove RFC1042 or Bridge-Tunnel encapsulation and - * replace EtherType */ - skb_pull(skb, hdrlen + SNAP_SIZE); - memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN); - memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN); - } else { - u16 len; - /* Leave Ethernet header part of hdr and full payload */ - skb_pull(skb, hdrlen); - len = htons(skb->len); - memcpy(skb_push(skb, 2), &len, 2); - memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN); - memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN); - } - - return 1; -} -#endif // _RTL8187_EXT_PATCH_ - - #define MGMT_FRAME_FIXED_PART_LENGTH 0x24 static inline int ieee80211_is_ofdm_rate(u8 rate) @@ -1211,7 +864,6 @@ static inline int ieee80211_SignalStrengthTranslate( return RetSS; } -#ifdef ENABLE_DOT11D static inline void ieee80211_extract_country_ie( struct ieee80211_device *ieee, struct ieee80211_info_element *info_element, @@ -1219,15 +871,6 @@ static inline void ieee80211_extract_country_ie( u8 * addr2 ) { -#if 0 - u32 i = 0; - u8 * p = (u8*)info_element->data; - printk("-----------------------\n"); - printk("%s Country IE:", network->ssid); - for(i=0; i<info_element->len; i++) - printk("\t%2.2x", *(p+i)); - printk("\n-----------------------\n"); -#endif if(IS_DOT11D_ENABLE(ieee)) { if(info_element->len!= 0) @@ -1253,7 +896,6 @@ static inline void ieee80211_extract_country_ie( } } -#endif int ieee80211_TranslateToDbm( @@ -1302,13 +944,9 @@ inline int ieee80211_network_init( //by amy 080312 network->HighestOperaRate = 0; //by amy 080312 -#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) */ @@ -1424,11 +1062,8 @@ inline int ieee80211_network_init( if(ieee->state != IEEE80211_LINKED) break; -#if 0 - network->last_dtim_sta_time[0] = stats->mac_time[0]; -#else + network->last_dtim_sta_time[0] = jiffies; -#endif network->last_dtim_sta_time[1] = stats->mac_time[1]; network->dtim_data = IEEE80211_DTIM_VALID; @@ -1483,7 +1118,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 && @@ -1492,7 +1126,6 @@ inline int ieee80211_network_init( info_element->data[4] == 0x02) { network->Turbo_Enable = 1; } -#endif if (1 == stats->nic_type) {//nic 87 break; } @@ -1533,14 +1166,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); @@ -1576,9 +1207,7 @@ inline int ieee80211_network_init( if (ieee80211_is_empty_essid(network->ssid, network->ssid_len)) network->flags |= NETWORK_EMPTY_ESSID; -#if 0 - stats->signal = ieee80211_SignalStrengthTranslate(stats->signal); -#endif + stats->signal = ieee80211_TranslateToDbm(stats->signalstrength); //stats->noise = stats->signal - stats->noise; stats->noise = ieee80211_TranslateToDbm(100 - stats->signalstrength) - 25; @@ -1688,13 +1317,9 @@ inline void update_network(struct ieee80211_network *dst, dst->QoS_Enable = 1;//for Rtl8187 simulation #endif dst->SignalStrength = src->SignalStrength; -#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 } @@ -1715,13 +1340,6 @@ inline void ieee80211_process_probe_response( u8 is_beacon = (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == IEEE80211_STYPE_BEACON)? 1:0; //YJ,add,080819,for hidden ap memset(&network, 0, sizeof(struct ieee80211_network)); -//rz -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_process_probe_response_1) { - ieee->ext_patch_ieee80211_process_probe_response_1(ieee, beacon, stats); - return; - } -#endif IEEE80211_DEBUG_SCAN( "'%s' (" MAC_FMT "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", @@ -1743,21 +1361,7 @@ inline void ieee80211_process_probe_response( (beacon->capability & (1<<0x2)) ? '1' : '0', (beacon->capability & (1<<0x1)) ? '1' : '0', (beacon->capability & (1<<0x0)) ? '1' : '0'); -#if 0 - if(strcmp(escape_essid(beacon->info_element.data, beacon->info_element.len), "rtl_softap") == 0) - { - if(WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == IEEE80211_STYPE_BEACON) - { - u32 i = 0, len = stats->len; - u8 * p = (u8*)beacon; - printk("-----------------------\n"); - printk("rtl_softap Beacon:"); - for(i=0; i<len; i++) - printk("\t%2.2x", *(p+i)); - printk("\n-----------------------\n"); - } - } -#endif + if (ieee80211_network_init(ieee, beacon, &network, stats)) { IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n", escape_essid(info_element->data, @@ -1769,7 +1373,6 @@ inline void ieee80211_process_probe_response( return; } -#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. @@ -1823,7 +1426,6 @@ inline void ieee80211_process_probe_response( } } } -#endif /* The network parsed correctly -- so now we scan our known networks * to see if we can find it in our list. * @@ -1886,9 +1488,6 @@ inline void ieee80211_process_probe_response( "PROBE RESPONSE" : "BEACON"); #endif -#ifdef _RTL8187_EXT_PATCH_ - network.ext_entry = target->ext_entry; -#endif memcpy(target, &network, sizeof(*target)); list_add_tail(&target->list, &ieee->network_list); if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) @@ -1926,7 +1525,7 @@ inline void ieee80211_process_probe_response( } void ieee80211_rx_mgt(struct ieee80211_device *ieee, - struct ieee80211_hdr *header, + struct ieee80211_hdr_4addr *header, struct ieee80211_rx_stats *stats) { switch (WLAN_FC_GET_STYPE(header->frame_ctl)) { @@ -1946,26 +1545,5 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee, ieee80211_process_probe_response( ieee, (struct ieee80211_probe_response *)header, stats); break; -//rz -#ifdef _RTL8187_EXT_PATCH_ - case IEEE80211_STYPE_PROBE_REQ: - IEEE80211_DEBUG_MGMT("received PROBE REQUEST (%d)\n", - WLAN_FC_GET_STYPE(header->frame_ctl)); - IEEE80211_DEBUG_SCAN("Probe request\n"); - /// - if( ieee->iw_mode == ieee->iw_ext_mode && ieee->ext_patch_ieee80211_rx_mgt_on_probe_req ) - ieee->ext_patch_ieee80211_rx_mgt_on_probe_req( ieee, (struct ieee80211_probe_request *)header, stats); - break; -#endif // _RTL8187_EXT_PATCH_ - } } - -#if 0 -EXPORT_SYMBOL(ieee80211_rx_mgt); -EXPORT_SYMBOL(ieee80211_rx); -EXPORT_SYMBOL(ieee80211_network_init); -#ifdef _RTL8187_EXT_PATCH_ -EXPORT_SYMBOL(ieee_ext_skb_p80211_to_ether); -#endif -#endif diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 80f9cc7137c2..59b2ab48cdcf 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c @@ -21,9 +21,7 @@ #include <linux/version.h> #include <asm/uaccess.h> -#ifdef ENABLE_DOT11D #include "dot11d.h" -#endif u8 rsn_authen_cipher_suite[16][4] = { {0x00,0x0F,0xAC,0x00}, //Use group key, //Reserved {0x00,0x0F,0xAC,0x01}, //WEP-40 //RSNA default @@ -129,7 +127,6 @@ void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p) { *tag_p = tag; } -#ifdef THOMAS_TURBO void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) { u8 *tag = *tag_p; @@ -146,7 +143,6 @@ void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) { *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) { @@ -325,27 +321,12 @@ inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee) struct sk_buff *skb; struct ieee80211_probe_request *req; -#ifdef _RTL8187_EXT_PATCH_ - short extMore = 0; - if(ieee->ext_patch_ieee80211_probe_req_1) - extMore = ieee->ext_patch_ieee80211_probe_req_1(ieee); -#endif - len = ieee->current_network.ssid_len; rate_len = ieee80211_MFIE_rate_len(ieee); -#ifdef _RTL8187_EXT_PATCH_ - if(!extMore) -#endif skb = dev_alloc_skb(sizeof(struct ieee80211_probe_request) + 2 + len + rate_len); -#ifdef _RTL8187_EXT_PATCH_ - else - skb = dev_alloc_skb(sizeof(struct ieee80211_probe_request) + - 2 + len + rate_len+128); // MESHID + CAP -#endif - if (!skb) return NULL; @@ -366,24 +347,13 @@ inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee) ieee80211_MFIE_Brate(ieee,&tag); ieee80211_MFIE_Grate(ieee,&tag); -#ifdef _RTL8187_EXT_PATCH_ - if(extMore) - ieee->ext_patch_ieee80211_probe_req_2(ieee, skb, tag); -#endif return skb; } struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee); -//#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) -//void ext_ieee80211_send_beacon_wq(struct work_struct *work) -//{ -// struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, ext_send_beacon_wq); -//#else void ext_ieee80211_send_beacon_wq(struct ieee80211_device *ieee) { -//#endif - struct sk_buff *skb; //unsigned long flags; @@ -443,79 +413,10 @@ void ieee80211_send_beacon_cb(unsigned long _ieee) spin_unlock_irqrestore(&ieee->beacon_lock, flags); } -#ifdef _RTL8187_EXT_PATCH_ - -inline struct sk_buff *ieee80211_probe_req_with_SSID(struct ieee80211_device *ieee, char *ssid, int len_ssid) -{ - unsigned int len,rate_len; - u8 *tag; - struct sk_buff *skb; - struct ieee80211_probe_request *req; - -#ifdef _RTL8187_EXT_PATCH_ - short extMore = 0; - if(ieee->ext_patch_ieee80211_probe_req_1) - extMore = ieee->ext_patch_ieee80211_probe_req_1(ieee); -#endif - - len = len_ssid; - - rate_len = ieee80211_MFIE_rate_len(ieee); - -#ifdef _RTL8187_EXT_PATCH_ - if(!extMore) -#endif - skb = dev_alloc_skb(sizeof(struct ieee80211_probe_request) + - 2 + len + rate_len); -#ifdef _RTL8187_EXT_PATCH_ - else - skb = dev_alloc_skb(sizeof(struct ieee80211_probe_request) + - 2 + len + rate_len+128); // MESHID + CAP -#endif - - if (!skb) - return NULL; - - req = (struct ieee80211_probe_request *) skb_put(skb,sizeof(struct ieee80211_probe_request)); - req->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); - req->header.duration_id = 0; //FIXME: is this OK ? - - memset(req->header.addr1, 0xff, ETH_ALEN); - memcpy(req->header.addr2, ieee->dev->dev_addr, ETH_ALEN); - memset(req->header.addr3, 0xff, ETH_ALEN); - - tag = (u8 *) skb_put(skb,len+2+rate_len); - - *tag++ = MFIE_TYPE_SSID; - *tag++ = len; - if(len) - { - memcpy(tag, ssid, len); - tag += len; - } - - ieee80211_MFIE_Brate(ieee,&tag); - ieee80211_MFIE_Grate(ieee,&tag); - -#ifdef _RTL8187_EXT_PATCH_ - if(extMore) - ieee->ext_patch_ieee80211_probe_req_2(ieee, skb, tag); -#endif - return skb; -} - -#endif // _RTL8187_EXT_PATCH_ - - void ieee80211_send_probe(struct ieee80211_device *ieee) { struct sk_buff *skb; -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - skb = ieee80211_probe_req_with_SSID(ieee, NULL, 0); - else -#endif skb = ieee80211_probe_req(ieee); if (skb){ softmac_mgmt_xmit(skb, ieee); @@ -538,13 +439,10 @@ void ieee80211_send_probe_requests(struct ieee80211_device *ieee) void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) { short ch = 0; -#ifdef ENABLE_DOT11D u8 channel_map[MAX_CHANNEL_NUMBER+1]; memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); -#endif down(&ieee->scan_sem); // printk("==================> Sync scan\n"); -// dump_chnl_map(channel_map); while(1) { @@ -554,11 +452,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) if (ch > MAX_CHANNEL_NUMBER) goto out; /* scan completed */ -#ifdef ENABLE_DOT11D }while(!channel_map[ch]); -#else - }while(!ieee->channel_map[ch]); -#endif /* this fuction can be called in two situations * 1- We have switched to ad-hoc mode and we are * performing a complete syncro scan before conclude @@ -583,9 +477,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) ieee->set_chan(ieee->dev, ch); // printk("=====>channel=%d ",ch); -#ifdef ENABLE_DOT11D if(channel_map[ch] == 1) -#endif { // printk("====send probe request\n"); ieee80211_send_probe_requests(ieee); @@ -603,20 +495,16 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) out: ieee->sync_scan_hurryup = 0; up(&ieee->scan_sem); -#ifdef ENABLE_DOT11D if(IS_DOT11D_ENABLE(ieee)) DOT11D_ScanComplete(ieee); -#endif } void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee) { int ch; unsigned int watch_dog = 0; -#ifdef ENABLE_DOT11D u8 channel_map[MAX_CHANNEL_NUMBER+1]; memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); -#endif down(&ieee->scan_sem); ch = ieee->current_network.channel; // if(ieee->sync_scan_hurryup) @@ -650,16 +538,12 @@ void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee) { goto out; } -#ifdef ENABLE_DOT11D if(channel_map[ieee->current_network.channel] > 0) -#endif { ieee->set_chan(ieee->dev, ieee->current_network.channel); // printk("======>channel=%d ",ieee->current_network.channel); } -#ifdef ENABLE_DOT11D if(channel_map[ieee->current_network.channel] == 1) -#endif { // printk("====send probe request\n"); ieee80211_send_probe_requests(ieee); @@ -678,11 +562,7 @@ void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee) goto out; /* scan completed */ ieee->current_network.channel = (ieee->current_network.channel + 1)%MAX_CHANNEL_NUMBER; -#ifdef ENABLE_DOT11D }while(!channel_map[ieee->current_network.channel]); -#else - }while(!ieee->channel_map[ieee->current_network.channel]); -#endif } out: //ieee->sync_scan_hurryup = 0; @@ -690,46 +570,17 @@ out: //ieee->current_network.channel = ch; ieee->actscanning = false; up(&ieee->scan_sem); -#ifdef ENABLE_DOT11D if(IS_DOT11D_ENABLE(ieee)) DOT11D_ScanComplete(ieee); -#endif } - -#if 0 -/* called both by wq with ieee->lock held */ -void ieee80211_softmac_scan(struct ieee80211_device *ieee) -{ - short watchdog = 0; - - do{ - ieee->current_network.channel = - (ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER; - if (watchdog++ > MAX_CHANNEL_NUMBER) - return; /* no good chans */ - - }while(!ieee->channel_map[ieee->current_network.channel]); - - - schedule_work(&ieee->softmac_scan_wq); -} -#endif -#ifdef ENABLE_IPS -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void ieee80211_softmac_scan_wq(struct work_struct *work) { struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq); -#else -void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee) -{ -#endif static short watchdog = 0; -#ifdef ENABLE_DOT11D u8 channel_map[MAX_CHANNEL_NUMBER+1]; memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); -#endif // printk("ieee80211_softmac_scan_wq ENABLE_IPS\n"); // printk("in %s\n",__func__); down(&ieee->scan_sem); @@ -740,11 +591,7 @@ void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee) if (watchdog++ > MAX_CHANNEL_NUMBER) goto out; /* no good chans */ -#ifdef ENABLE_DOT11D }while(!channel_map[ieee->current_network.channel]); -#else - }while(!ieee->channel_map[ieee->current_network.channel]); -#endif //printk("current_network.channel:%d\n", ieee->current_network.channel); if (ieee->scanning == 0 ) @@ -753,9 +600,7 @@ void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee) goto out; } ieee->set_chan(ieee->dev, ieee->current_network.channel); -#ifdef ENABLE_DOT11D if(channel_map[ieee->current_network.channel] == 1) -#endif ieee80211_send_probe_requests(ieee); queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME); @@ -767,77 +612,10 @@ out: ieee->scanning = 0; up(&ieee->scan_sem); -#ifdef ENABLE_DOT11D if(IS_DOT11D_ENABLE(ieee)) DOT11D_ScanComplete(ieee); -#endif return; } -#else -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) -void ieee80211_softmac_scan_wq(struct work_struct *work) -{ - struct delayed_work *dwork = to_delayed_work(work); - struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, softmac_scan_wq); -#else -void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee) -{ -#endif - - short watchdog = 0; -#ifdef ENABLE_DOT11D - u8 channel_map[MAX_CHANNEL_NUMBER+1]; - memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); -#endif -// printk("enter scan wq,watchdog is %d\n",watchdog); - down(&ieee->scan_sem); - - do{ - ieee->current_network.channel = - (ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER; - if (watchdog++ > MAX_CHANNEL_NUMBER) - goto out; /* no good chans */ - -#ifdef ENABLE_DOT11D - }while(!channel_map[ieee->current_network.channel]); -#else - }while(!ieee->channel_map[ieee->current_network.channel]); -#endif - -// printk("current_network.channel:%d\n", ieee->current_network.channel); - if (ieee->scanning == 0 ) - { - printk("error out, scanning = 0\n"); - goto out; - } - ieee->set_chan(ieee->dev, ieee->current_network.channel); -#ifdef ENABLE_DOT11D - if(channel_map[ieee->current_network.channel] == 1) -#endif - ieee80211_send_probe_requests(ieee); - - queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME); -out: - up(&ieee->scan_sem); -#ifdef ENABLE_DOT11D - if(IS_DOT11D_ENABLE(ieee)) - DOT11D_ScanComplete(ieee); -#endif -} - -#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -void ieee80211_softmac_scan_cb(unsigned long _dev) -{ - unsigned long flags; - struct ieee80211_device *ieee = (struct ieee80211_device *)_dev; - - spin_lock_irqsave(&ieee->lock, flags); - ieee80211_softmac_scan(ieee); - spin_unlock_irqrestore(&ieee->lock, flags); -} -#endif - void ieee80211_beacons_start(struct ieee80211_device *ieee) { @@ -913,7 +691,6 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee) /* called with ieee->lock held */ void ieee80211_start_scan(struct ieee80211_device *ieee) { -#ifdef ENABLE_DOT11D if(IS_DOT11D_ENABLE(ieee) ) { if(IS_COUNTRY_IE_VALID(ieee)) @@ -921,7 +698,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee) RESET_CIE_WATCHDOG(ieee); } } -#endif if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){ if (ieee->scanning == 0) { @@ -941,7 +717,6 @@ void ieee80211_start_scan(struct ieee80211_device *ieee) /* called with wx_sem held */ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee) { -#ifdef ENABLE_DOT11D if(IS_DOT11D_ENABLE(ieee) ) { if(IS_COUNTRY_IE_VALID(ieee)) @@ -949,7 +724,6 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee) RESET_CIE_WATCHDOG(ieee); } } -#endif ieee->sync_scan_hurryup = 0; if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) @@ -1110,138 +884,6 @@ static struct sk_buff* ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d skb->dev = ieee->dev; return skb; } -#ifdef _RTL8187_EXT_PATCH_ -struct sk_buff* ieee80211_ext_probe_resp_by_net(struct ieee80211_device *ieee, u8 *dest, struct ieee80211_network *net) -{ - u8 *tag; - int beacon_size; - struct ieee80211_probe_response *beacon_buf; - struct sk_buff *skb; - int encrypt; - int atim_len,erp_len; - struct ieee80211_crypt_data* crypt; - u8 broadcast_addr[] = {0xff,0xff,0xff,0xff,0xff,0xff}; - int wpa_ie_len = ieee->wpa_ie_len; - char *ssid = net->ssid; - int ssid_len = net->ssid_len; - - int rate_len = ieee->current_network.rates_len+2; - int rate_ex_len = ieee->current_network.rates_ex_len; - if(rate_ex_len > 0) rate_ex_len+=2; - - if( ieee->meshScanMode&4) - ieee->current_network.channel = ieee->ext_patch_ieee80211_ext_stop_scan_wq_set_channel(ieee); - if( ieee->meshScanMode&6) - { - -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) - queue_work(ieee->wq, &ieee->ext_stop_scan_wq); -#else - schedule_task(&ieee->ext_stop_scan_wq); -#endif - } - if(ieee->current_network.capability & WLAN_CAPABILITY_IBSS) // use current_network here - atim_len = 4; - else - atim_len = 0; - - if(ieee80211_is_54g(*net)) - erp_len = 3; - else - erp_len = 0; - - beacon_size = sizeof(struct ieee80211_probe_response)+ - ssid_len - +3 //channel - +rate_len - +rate_ex_len - +atim_len - +erp_len; -//b - skb = dev_alloc_skb(beacon_size+196); - - if (!skb) - return NULL; - - beacon_buf = (struct ieee80211_probe_response*) skb_put(skb, beacon_size); - - memcpy (beacon_buf->header.addr1, dest,ETH_ALEN); - memcpy (beacon_buf->header.addr2, ieee->dev->dev_addr, ETH_ALEN); - memcpy (beacon_buf->header.addr3, ieee->current_network.bssid, ETH_ALEN); - - beacon_buf->header.duration_id = 0; //FIXME - - beacon_buf->beacon_interval = - cpu_to_le16(ieee->current_network.beacon_interval); // use current_network here - beacon_buf->capability = - cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_IBSS); - - if(ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT)) - cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT)); - - crypt = ieee->crypt[ieee->tx_keyidx]; - - encrypt = ieee->host_encrypt && crypt && crypt->ops && - ((0 == strcmp(crypt->ops->name, "WEP"))||wpa_ie_len); - - if (encrypt) - beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY); - - - beacon_buf->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_RESP); - - beacon_buf->info_element.id = MFIE_TYPE_SSID; - beacon_buf->info_element.len = ssid_len; - - tag = (u8*) beacon_buf->info_element.data; - - // brocad cast / probe rsp - if(memcmp(dest, broadcast_addr, ETH_ALEN )) - memcpy(tag, ssid, ssid_len); - else - ssid_len=0; - - tag += ssid_len; - -//get_bssrate_set(priv, _SUPPORTEDRATES_IE_, &pbssrate, &bssrate_len); -//pbuf = set_ie(pbuf, _SUPPORTEDRATES_IE_, bssrate_len, pbssrate, &frlen); - - *(tag++) = MFIE_TYPE_RATES; - *(tag++) = rate_len-2; - memcpy(tag,ieee->current_network.rates,rate_len-2); - tag+=rate_len-2; - - *(tag++) = MFIE_TYPE_DS_SET; - *(tag++) = 1; - *(tag++) = ieee->current_network.channel; // use current_network here - - - if(atim_len){ - *(tag++) = MFIE_TYPE_IBSS_SET; - *(tag++) = 2; - *((u16*)(tag)) = cpu_to_le16(ieee->current_network.atim_window); // use current_network here - tag+=2; - } - - if(erp_len){ - *(tag++) = MFIE_TYPE_ERP; - *(tag++) = 1; - *(tag++) = 0; - } - - if(rate_ex_len){ - *(tag++) = MFIE_TYPE_RATES_EX; - *(tag++) = rate_ex_len-2; - memcpy(tag,ieee->current_network.rates_ex,rate_ex_len-2); - tag+=rate_ex_len-2; - } - if (wpa_ie_len) - memcpy(tag, ieee->wpa_ie, ieee->wpa_ie_len); - - skb->dev = ieee->dev; - return skb; -} -#endif // _RTL8187_EXT_PATCH_ struct sk_buff* ieee80211_assoc_resp(struct ieee80211_device *ieee, u8 *dest) { @@ -1314,12 +956,7 @@ struct sk_buff* ieee80211_auth_resp(struct ieee80211_device *ieee,int status, u8 auth->transaction = cpu_to_le16(2); auth->algorithm = cpu_to_le16(WLAN_AUTH_OPEN); -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - memcpy(auth->header.addr3, dest, ETH_ALEN); -#else memcpy(auth->header.addr3, ieee->dev->dev_addr, ETH_ALEN); -#endif memcpy(auth->header.addr2, ieee->dev->dev_addr, ETH_ALEN); memcpy(auth->header.addr1, dest, ETH_ALEN); auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH); @@ -1412,9 +1049,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco #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; @@ -1432,7 +1067,6 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco wpa_len = 0; } } -#ifdef THOMAS_TURBO len = sizeof(struct ieee80211_assoc_request_frame)+ + beacon->ssid_len//essid tagged val + rate_len//rates tagged val @@ -1440,20 +1074,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco + 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 -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode) - skb = dev_alloc_skb(len+256); // stanley - else -#endif skb = dev_alloc_skb(len); if (!skb) @@ -1479,11 +1100,6 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco if(ieee->short_slot) hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT); -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_association_req_1) - ieee->ext_patch_ieee80211_association_req_1(hdr); -#endif - hdr->listen_interval = 0xa; //FIXME hdr->info_element.id = MFIE_TYPE_SSID; @@ -1499,221 +1115,18 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco //add rsn==0 condition for ap's mix security mode(wpa+wpa2), john2007.8.9 //choose AES encryption as default algorithm while using mixed mode -#if 0 - if(rsn_len == 0){ - - tag = skb_put(skb,wpa_len); - - if(wpa_len) { - - //{add by david. 2006.8.31 - //fix linksys compatibility bug - //} - if(wpa_len > 24) {//22+2, mean include the capability - beacon->wpa_ie[wpa_len - 2] = 0; - } - //multicast cipher OUI - if( beacon->wpa_ie[11]==0x2 ){ //0x0050f202 is the oui of tkip - ieee->broadcast_key_type = KEY_TYPE_TKIP; - } - else if( beacon->wpa_ie[11]==0x4 ){//0x0050f204 is the oui of ccmp - ieee->broadcast_key_type = KEY_TYPE_CCMP; - } - //unicast cipher OUI - if( beacon->wpa_ie[14]==0 - && beacon->wpa_ie[15]==0x50 - && beacon->wpa_ie[16]==0xf2 - && beacon->wpa_ie[17]==0x2 ){ //0x0050f202 is the oui of tkip - ieee->pairwise_key_type = KEY_TYPE_TKIP; - } - - else if( beacon->wpa_ie[14]==0 - && beacon->wpa_ie[15]==0x50 - && beacon->wpa_ie[16]==0xf2 - && beacon->wpa_ie[17]==0x4 ){//0x0050f204 is the oui of ccmp - ieee->pairwise_key_type = KEY_TYPE_CCMP; - } - //indicate the wpa_ie content to WPA_SUPPLICANT - buff = kmalloc(IW_CUSTOM_MAX, GFP_ATOMIC); - memset(buff, 0, IW_CUSTOM_MAX); - p=buff; - p += sprintf(p, "ASSOCINFO(ReqIEs="); - for(i=0;i<wpa_len;i++){ - p += sprintf(p, "%02x", beacon->wpa_ie[i]); - } - p += sprintf(p, ")"); - memset(&wrqu, 0, sizeof(wrqu) ); - wrqu.data.length = p - buff; - - wireless_send_event(dev, IWEVCUSTOM, &wrqu, buff); - memcpy(tag,beacon->wpa_ie,wpa_len); - } - - } - - if(rsn_len > 22) { - - if( beacon->rsn_ie[4]==0x0 && - beacon->rsn_ie[5]==0xf && - beacon->rsn_ie[6]==0xac){ - - switch(beacon->rsn_ie[7]){ - case 0x1: - ieee->broadcast_key_type = KEY_TYPE_WEP40; - break; - case 0x2: - ieee->broadcast_key_type = KEY_TYPE_TKIP; - break; - case 0x4: - ieee->broadcast_key_type = KEY_TYPE_CCMP; - break; - case 0x5: - ieee->broadcast_key_type = KEY_TYPE_WEP104; - break; - default: - printk("fault suite type in RSN broadcast key\n"); - break; - } - } - - if( beacon->rsn_ie[10]==0x0 && - beacon->rsn_ie[11]==0xf && - beacon->rsn_ie[12]==0xac){ - if(beacon->rsn_ie[8]==1){//not mixed mode - switch(beacon->rsn_ie[13]){ - case 0x2: - ieee->pairwise_key_type = KEY_TYPE_TKIP; - break; - case 0x4: - ieee->pairwise_key_type = KEY_TYPE_CCMP; - break; - default: - printk("fault suite type in RSN pairwise key\n"); - break; - } - } - else if(beacon->rsn_ie[8]==2){//mixed mode - ieee->pairwise_key_type = KEY_TYPE_CCMP; - } - } - - - - tag = skb_put(skb,22); - memcpy(tag,(beacon->rsn_ie + info_addr),8); - tag[1] = 20; - tag += 8; - info_addr += 8; - - spin_lock_irqsave(&ieee->wpax_suitlist_lock,flags); - for (i = 0; i < 2; i++) { - tag[0] = 1; - tag[1] = 0; - tag += 2; - suite_count = beacon->rsn_ie[info_addr] + \ - (beacon->rsn_ie[info_addr + 1] << 8); - info_addr += 2; - if(1 == suite_count) { - memcpy(tag,(beacon->rsn_ie + info_addr),4); - info_addr += 4; - } else { - // if the wpax_type_notify has been set by the application, - // just use it, otherwise just use the default one. - if(ieee->wpax_type_set) { - suit_select = ((0 == i) ? pairwise_type:authen_type)&0x0f ; - memcpy(tag,rsn_authen_cipher_suite[suit_select],4); - } else { - //default set as ccmp, or none authentication - if(i == 0) { - memcpy(tag,rsn_authen_cipher_suite[4],4); - } else { - memcpy(tag,rsn_authen_cipher_suite[2],4); - } - - } - - info_addr += (suite_count * 4); - } - tag += 4; - } - spin_unlock_irqrestore(&ieee->wpax_suitlist_lock,flags); - - tag[0] = 0; - tag[1] = beacon->rsn_ie[info_addr+1]; - - } else { - tag = skb_put(skb,rsn_len); - if(rsn_len) { - - - if( beacon->rsn_ie[4]==0x0 && - beacon->rsn_ie[5]==0xf && - beacon->rsn_ie[6]==0xac){ - switch(beacon->rsn_ie[7]){ - case 0x1: - ieee->broadcast_key_type = KEY_TYPE_WEP40; - break; - case 0x2: - ieee->broadcast_key_type = KEY_TYPE_TKIP; - break; - case 0x4: - ieee->broadcast_key_type = KEY_TYPE_CCMP; - break; - case 0x5: - ieee->broadcast_key_type = KEY_TYPE_WEP104; - break; - default: - printk("fault suite type in RSN broadcast key\n"); - break; - } - } - if( beacon->rsn_ie[10]==0x0 && - beacon->rsn_ie[11]==0xf && - beacon->rsn_ie[12]==0xac){ - if(beacon->rsn_ie[8]==1){//not mixed mode - switch(beacon->rsn_ie[13]){ - case 0x2: - ieee->pairwise_key_type = KEY_TYPE_TKIP; - break; - case 0x4: - ieee->pairwise_key_type = KEY_TYPE_CCMP; - break; - default: - printk("fault suite type in RSN pairwise key\n"); - break; - } - - } - else if(beacon->rsn_ie[8]==2){//mixed mode - ieee->pairwise_key_type = KEY_TYPE_CCMP; - } - } - - - beacon->rsn_ie[rsn_len - 2] = 0; - memcpy(tag,beacon->rsn_ie,rsn_len); - } - } -#else tag = skb_put(skb,ieee->wpa_ie_len); memcpy(tag,ieee->wpa_ie,ieee->wpa_ie_len); -#endif + tag = skb_put(skb,wmm_info_len); if(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 - -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_association_req_2) - ieee->ext_patch_ieee80211_association_req_2(ieee, beacon, skb); -#endif return skb; } @@ -1761,13 +1174,6 @@ void ieee80211_associate_step1(struct ieee80211_device *ieee) IEEE80211_DEBUG_MGMT("Stopping scan\n"); ieee->softmac_stats.tx_auth_rq++; skb=ieee80211_authentication_req(beacon, ieee, 0); -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->iw_mode == ieee->iw_ext_mode ) { - if(skb) - softmac_mgmt_xmit(skb, ieee); - return; - }else -#endif if (!skb){ ieee80211_associate_abort(ieee); @@ -1824,105 +1230,6 @@ void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int kfree(challenge); } -#ifdef _RTL8187_EXT_PATCH_ - -// based on ieee80211_assoc_resp -struct sk_buff* ieee80211_assoc_resp_by_net(struct ieee80211_device *ieee, u8 *dest, unsigned short status, struct ieee80211_network *pstat, int pkt_type) -{ - struct sk_buff *skb; - u8* tag; - - struct ieee80211_crypt_data* crypt; - struct ieee80211_assoc_response_frame *assoc; - short encrypt; - - unsigned int rate_len = ieee80211_MFIE_rate_len(ieee); - int len = sizeof(struct ieee80211_assoc_response_frame) + rate_len; - - if(ieee->iw_mode == ieee->iw_ext_mode) - skb = dev_alloc_skb(len+256); // stanley - else - skb = dev_alloc_skb(len); - - if (!skb) - return NULL; - - assoc = (struct ieee80211_assoc_response_frame *) - skb_put(skb,sizeof(struct ieee80211_assoc_response_frame)); - - assoc->header.frame_ctl = cpu_to_le16(pkt_type); - - memcpy(assoc->header.addr1, dest,ETH_ALEN); - memcpy(assoc->header.addr3, ieee->dev->dev_addr, ETH_ALEN); - memcpy(assoc->header.addr2, ieee->dev->dev_addr, ETH_ALEN); - assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ? - WLAN_CAPABILITY_BSS : WLAN_CAPABILITY_IBSS); - - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_assoc_resp_by_net_1) - ieee->ext_patch_ieee80211_assoc_resp_by_net_1(assoc); - - if(ieee->short_slot) - assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT); - - if (ieee->host_encrypt) - crypt = ieee->crypt[ieee->tx_keyidx]; - else crypt = NULL; - - encrypt = ( crypt && crypt->ops); - - if (encrypt) - assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY); - - assoc->status = 0; - assoc->aid = cpu_to_le16(ieee->assoc_id); - if (ieee->assoc_id == 0x2007) ieee->assoc_id=0; - else ieee->assoc_id++; - - assoc->info_element.id = 230; // Stanley, an unused id (just a hot fix) - assoc->info_element.len = 0; - - tag = (u8*) skb_put(skb, rate_len); - - ieee80211_MFIE_Brate(ieee, &tag); - ieee80211_MFIE_Grate(ieee, &tag); - - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_assoc_resp_by_net_2) - ieee->ext_patch_ieee80211_assoc_resp_by_net_2(ieee, pstat, pkt_type, skb); - - return skb; -} - -// based on ieee80211_resp_to_assoc_rq -void ieee80211_ext_issue_assoc_rsp(struct ieee80211_device *ieee, u8 *dest, unsigned short status, struct ieee80211_network *pstat, int pkt_type) -{ - struct sk_buff *buf = ieee80211_assoc_resp_by_net(ieee, dest, status, pstat, pkt_type); - - if (buf) - softmac_mgmt_xmit(buf, ieee); -} - -// based on ieee80211_associate_step2 -void ieee80211_ext_issue_assoc_req(struct ieee80211_device *ieee, struct ieee80211_network *pstat) -{ - - struct sk_buff* skb; - - // printk("@@@@@ ieee80211_ext_issue_assoc_req on channel: %d\n", ieee->current_network.channel); - - ieee->softmac_stats.tx_ass_rq++; - skb=ieee80211_association_req(pstat, ieee); - if (skb) - softmac_mgmt_xmit(skb, ieee); -} - -void ieee80211_ext_issue_disassoc(struct ieee80211_device *ieee, struct ieee80211_network *pstat, int reason, unsigned char extReason) -{ - // do nothing - // printk("@@@@@ ieee80211_ext_issue_disassoc\n"); - return; -} -#endif // _RTL8187_EXT_PATCH_ - void ieee80211_associate_step2(struct ieee80211_device *ieee) { struct sk_buff* skb; @@ -1945,14 +1252,10 @@ void ieee80211_associate_step2(struct ieee80211_device *ieee) } } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void ieee80211_associate_complete_wq(struct work_struct *work) { struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq); -#else -void ieee80211_associate_complete_wq(struct ieee80211_device *ieee) -{ -#endif + printk(KERN_INFO "Associated successfully\n"); if(ieee80211_is_54g(ieee->current_network) && (ieee->modulation & IEEE80211_OFDM_MODULATION)){ @@ -1984,14 +1287,10 @@ void ieee80211_associate_complete(struct ieee80211_device *ieee) queue_work(ieee->wq, &ieee->associate_complete_wq); } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void ieee80211_associate_procedure_wq(struct work_struct *work) { struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_procedure_wq); -#else -void ieee80211_associate_procedure_wq(struct ieee80211_device *ieee) -{ -#endif + ieee->sync_scan_hurryup = 1; down(&ieee->wx_sem); @@ -2006,55 +1305,6 @@ void ieee80211_associate_procedure_wq(struct ieee80211_device *ieee) up(&ieee->wx_sem); } -#ifdef _RTL8187_EXT_PATCH_ -// based on ieee80211_associate_procedure_wq - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) -void ieee80211_ext_stop_scan_wq(struct work_struct *work) -{ - struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, ext_stop_scan_wq); -#else -void ieee80211_ext_stop_scan_wq(struct ieee80211_device *ieee) -{ -#endif - if (ieee->scanning == 0) - { - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_ext_stop_scan_wq_set_channel - && ( ieee->current_network.channel == ieee->ext_patch_ieee80211_ext_stop_scan_wq_set_channel(ieee) ) ) - return; - } - - ieee->sync_scan_hurryup = 1; - - down(&ieee->wx_sem); - - // printk("@@@@@@@@@@ ieee80211_ext_stop_scan_wq\n"); - if (ieee->data_hard_stop) - ieee->data_hard_stop(ieee->dev); - - ieee80211_stop_scan(ieee); - - // set channel - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_ext_stop_scan_wq_set_channel) - ieee->set_chan(ieee->dev, ieee->ext_patch_ieee80211_ext_stop_scan_wq_set_channel(ieee)); - else - ieee->set_chan(ieee->dev, ieee->current_network.channel); - // - up(&ieee->wx_sem); -} - - -void ieee80211_ext_send_11s_beacon(struct ieee80211_device *ieee) -{ - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) - queue_work(ieee->wq, &ieee->ext_send_beacon_wq); - #else - schedule_task(&ieee->ext_send_beacon_wq); - #endif - -} - -#endif // _RTL8187_EXT_PATCH_ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net) { @@ -2324,12 +1574,6 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb) } printk(KERN_INFO"New client associated: "MAC_FMT"\n", MAC_ARG(dest)); - //FIXME - #if 0 - spin_lock_irqsave(&ieee->lock,flags); - add_associate(ieee,dest); - spin_unlock_irqrestore(&ieee->lock,flags); - #endif } @@ -2347,11 +1591,8 @@ void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr) short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *time_l) { -#if 0 - int timeout = ieee->ps_timeout; -#else int timeout = 0; -#endif + u8 dtim; /*if(ieee->ps == IEEE80211_PS_DISABLED || ieee->iw_mode != IW_MODE_INFRA || @@ -2382,13 +1623,7 @@ short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *ti if((ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE ) && (ieee->mgmt_queue_tail != ieee->mgmt_queue_head)) return 0; -#if 0 - if(time_l){ - *time_l = ieee->current_network.last_dtim_sta_time[0] - + (ieee->current_network.beacon_interval - * ieee->current_network.dtim_period) * 1000; - } -#else + if(time_l){ *time_l = ieee->current_network.last_dtim_sta_time[0] + MSECS((ieee->current_network.beacon_interval)); @@ -2396,7 +1631,6 @@ short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *ti //printk("beacon_interval:%x, dtim_period:%x, totol to Msecs:%x, HZ:%x\n", ieee->current_network.beacon_interval, ieee->current_network.dtim_period, MSECS(((ieee->current_network.beacon_interval * ieee->current_network.dtim_period))), HZ); } -#endif if(time_h){ *time_h = ieee->current_network.last_dtim_sta_time[1]; if(time_l && *time_l < ieee->current_network.last_dtim_sta_time[0]) @@ -2638,12 +1872,6 @@ associate_complete: ieee80211_associate_abort(ieee); } } -#ifdef _RTL8187_EXT_PATCH_ - else if ((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_frame_softmac_on_assoc_rsp) - { - ieee->ext_patch_ieee80211_rx_frame_softmac_on_assoc_rsp(ieee, skb); - } -#endif break; case IEEE80211_STYPE_ASSOC_REQ: @@ -2653,21 +1881,10 @@ associate_complete: ieee->iw_mode == IW_MODE_MASTER) ieee80211_rx_assoc_rq(ieee, skb); -#ifdef _RTL8187_EXT_PATCH_ - else if ((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_frame_softmac_on_assoc_req) - { - ieee->ext_patch_ieee80211_rx_frame_softmac_on_assoc_req(ieee, skb); - } -#endif break; case IEEE80211_STYPE_AUTH: -#ifdef _RTL8187_EXT_PATCH_ -printk("IEEE80211_STYPE_AUTH\n"); - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_frame_softmac_on_auth) - if( ieee->ext_patch_ieee80211_rx_frame_softmac_on_auth(ieee, skb, rx_stats) ); -#endif if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE){ if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING && ieee->iw_mode == IW_MODE_INFRA){ @@ -2707,11 +1924,6 @@ printk("IEEE80211_STYPE_AUTH\n"); case IEEE80211_STYPE_DISASSOC: case IEEE80211_STYPE_DEAUTH: -#ifdef _RTL8187_EXT_PATCH_ -printk("IEEE80211_STYPE_DEAUTH\n"); - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_rx_frame_softmac_on_deauth) - if( ieee->ext_patch_ieee80211_rx_frame_softmac_on_deauth(ieee, skb, rx_stats) ) ; -#endif /* FIXME for now repeat all the association procedure * both for disassociation and deauthentication */ @@ -2764,41 +1976,9 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * unsigned long flags; int i; -#ifdef _RTL8187_EXT_PATCH_ - int rate = ieee->rate; -#endif spin_lock_irqsave(&ieee->lock,flags); - #if 0 - if(ieee->queue_stop){ - IEEE80211DMESG("EE: IEEE hard_start_xmit invoked when kernel queue should be stopped"); - netif_stop_queue(ieee->dev); - ieee->ieee_stats.swtxstop++; - //dev_kfree_skb_any(skb); - err = 1; - goto exit; - } - - ieee->stats.tx_bytes+=skb->len; - - - txb=ieee80211_skb_to_txb(ieee,skb); - - - if(txb==NULL){ - IEEE80211DMESG("WW: IEEE stack failed to provide txb"); - //dev_kfree_skb_any(skb); - err = 1; - goto exit; - } - #endif -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_ieee80211_softmac_xmit_get_rate && txb->nr_frags) - { - rate = ieee->ext_patch_ieee80211_softmac_xmit_get_rate(ieee, txb->fragments[0]); - } -#endif /* called with 2nd parm 0, no tx mgmt lock required */ ieee80211_sta_wakeup(ieee,0); @@ -2811,11 +1991,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * }else{ ieee->softmac_data_hard_start_xmit( txb->fragments[i], -#ifdef _RTL8187_EXT_PATCH_ - ieee->dev, rate); -#else ieee->dev,ieee->rate); -#endif //(i+1)<txb->nr_frags); ieee->stats.tx_packets++; ieee->stats.tx_bytes += txb->fragments[i]->len; @@ -2977,15 +2153,11 @@ void ieee80211_start_monitor_mode(struct ieee80211_device *ieee) netif_carrier_on(ieee->dev); } } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) + void ieee80211_start_ibss_wq(struct work_struct *work) { struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq); -#else -void ieee80211_start_ibss_wq(struct ieee80211_device *ieee) -{ -#endif /* iwconfig mode ad-hoc will schedule this and return * on the other hand this will block further iwconfig SET @@ -3007,10 +2179,8 @@ void ieee80211_start_ibss_wq(struct ieee80211_device *ieee) /* check if we have this cell in our network list */ ieee80211_softmac_check_all_nets(ieee); -#ifdef ENABLE_DOT11D if(ieee->state == IEEE80211_NOLINK) ieee->current_network.channel = 10; -#endif /* if not then the state is not linked. Maybe the user swithced to * ad-hoc mode just after being in monitor mode, or just after * being very few time in managed mode (so the card have had no @@ -3099,7 +2269,6 @@ inline void ieee80211_start_ibss(struct ieee80211_device *ieee) void ieee80211_start_bss(struct ieee80211_device *ieee) { unsigned long flags; -#ifdef ENABLE_DOT11D // // Ref: 802.11d 11.1.3.3 // STA shall not start a BSS unless properly formed Beacon frame including a Country IE. @@ -3111,7 +2280,6 @@ void ieee80211_start_bss(struct ieee80211_device *ieee) return; } } -#endif /* check if we have already found the net we * are interested in (if any). * if not (we are disassociated and we are not @@ -3150,24 +2318,17 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) if (ieee->data_hard_stop) ieee->data_hard_stop(ieee->dev); -#ifdef ENABLE_DOT11D if(IS_DOT11D_ENABLE(ieee)) Dot11d_Reset(ieee); -#endif ieee->state = IEEE80211_NOLINK; ieee->link_change(ieee->dev); notify_wx_assoc_event(ieee); } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void ieee80211_associate_retry_wq(struct work_struct *work) { struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq); -#else -void ieee80211_associate_retry_wq(struct ieee80211_device *ieee) -{ -#endif unsigned long flags; down(&ieee->wx_sem); if(!ieee->proto_started) @@ -3217,16 +2378,7 @@ struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee) struct sk_buff *skb = NULL; struct ieee80211_probe_response *b; -//rz -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) && ieee->ext_patch_get_beacon_get_probersp ) - skb = ieee->ext_patch_get_beacon_get_probersp(ieee, broadcast_addr, &(ieee->current_network)); - else - skb = ieee80211_probe_resp(ieee, broadcast_addr); -#else skb = ieee80211_probe_resp(ieee, broadcast_addr); -#endif -// if (!skb) return NULL; @@ -3273,17 +2425,6 @@ void ieee80211_stop_protocol(struct ieee80211_device *ieee) ieee->proto_started = 0; -#ifdef _RTL8187_EXT_PATCH_ - if(ieee->ext_patch_ieee80211_stop_protocol) - ieee->ext_patch_ieee80211_stop_protocol(ieee); -//if call queue_delayed_work,can call this,or do nothing.. -//edit by lawrence,20071118 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) -// cancel_delayed_work(&ieee->ext_stop_scan_wq); -// cancel_delayed_work(&ieee->ext_send_beacon_wq); -#endif -#endif // _RTL8187_EXT_PATCH_ - ieee80211_stop_send_beacons(ieee); if((ieee->iw_mode == IW_MODE_INFRA)&&(ieee->state == IEEE80211_LINKED)) { SendDisassociation(ieee,NULL,WLAN_REASON_DISASSOC_STA_HAS_LEFT); @@ -3320,11 +2461,7 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) if (ch > MAX_CHANNEL_NUMBER) return; /* no channel found */ -#ifdef ENABLE_DOT11D }while(!GET_DOT11D_INFO(ieee)->channel_map[ch]); -#else - }while(!ieee->channel_map[ch]); -#endif ieee->current_network.channel = ch; } @@ -3368,92 +2505,8 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) break; default: -#ifdef _RTL8187_EXT_PATCH_ - if((ieee->iw_mode == ieee->iw_ext_mode) &&\ - ieee->ext_patch_ieee80211_start_protocol &&\ - ieee->ext_patch_ieee80211_start_protocol(ieee)) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) - queue_work(ieee->wq, &ieee->ext_stop_scan_wq); -#endif - // By default, WMM function will be disabled in - // EXTENSION mode - ieee->current_network.QoS_Enable = 0; - - if(ieee->modulation & IEEE80211_CCK_MODULATION){ - ieee->current_network.rates_len = 4; - ieee->current_network.rates[0] = \ - IEEE80211_BASIC_RATE_MASK | \ - IEEE80211_CCK_RATE_1MB; - ieee->current_network.rates[1] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_CCK_RATE_2MB; - ieee->current_network.rates[2] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_CCK_RATE_5MB; - ieee->current_network.rates[3] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_CCK_RATE_11MB; - }else - ieee->current_network.rates_len = 0; - - if(ieee->modulation & IEEE80211_OFDM_MODULATION){ - ieee->current_network.rates_ex_len = 8; - ieee->current_network.rates_ex[0] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_6MB; - ieee->current_network.rates_ex[1] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_9MB; - ieee->current_network.rates_ex[2] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_12MB; - ieee->current_network.rates_ex[3] = \ - IEEE80211_BASIC_RATE_MASK | \ - IEEE80211_OFDM_RATE_18MB; - ieee->current_network.rates_ex[4] =\ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_24MB; - ieee->current_network.rates_ex[5] =\ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_36MB; - ieee->current_network.rates_ex[6] = \ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_48MB; - ieee->current_network.rates_ex[7] =\ - IEEE80211_BASIC_RATE_MASK |\ - IEEE80211_OFDM_RATE_54MB; - ieee->rate = 540; - }else{ - ieee->current_network.rates_ex_len = 0; - ieee->rate = 110; - } - - /* - spin_lock_irqsave(&ieee->lock, flags); - if (ieee->state == IEEE80211_NOLINK) - ieee80211_start_scan(ieee); - // ieee->set_chan(ieee->dev, 8); - - spin_unlock_irqrestore(&ieee->lock, flags); - */ - memcpy(ieee->current_network.bssid, ieee->dev->dev_addr,\ - ETH_ALEN); - ieee->link_change(ieee->dev); - notify_wx_assoc_event(ieee); - - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - - netif_carrier_on(ieee->dev); - } else { - ieee->iw_mode = IW_MODE_INFRA; - ieee80211_start_bss(ieee); - } -#else ieee->iw_mode = IW_MODE_INFRA; ieee80211_start_bss(ieee); - -#endif break; } } @@ -3497,16 +2550,9 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) ieee->beinretry = false; ieee->bHwRadioOff = false; //by amy -#ifdef _RTL8187_EXT_PATCH_ - ieee->iw_ext_mode = 999; -#endif init_mgmt_queue(ieee); -#if 0 - init_timer(&ieee->scan_timer); - ieee->scan_timer.data = (unsigned long)ieee; - ieee->scan_timer.function = ieee80211_softmac_scan_cb; -#endif + ieee->tx_pending.txb = NULL; init_timer(&ieee->associate_timer); @@ -3522,7 +2568,6 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) #else ieee->wq = create_workqueue(DRV_NAME); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)//added by lawrence,070702 INIT_DELAYED_WORK(&ieee->start_ibss_wq,(void*) ieee80211_start_ibss_wq); INIT_WORK(&ieee->associate_complete_wq,(void*) ieee80211_associate_complete_wq); INIT_WORK(&ieee->associate_procedure_wq,(void*) ieee80211_associate_procedure_wq); @@ -3530,26 +2575,7 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) INIT_DELAYED_WORK(&ieee->associate_retry_wq,(void*) ieee80211_associate_retry_wq); INIT_WORK(&ieee->wx_sync_scan_wq,(void*) ieee80211_wx_sync_scan_wq); // INIT_WORK(&ieee->watch_dog_wq,(void*) ieee80211_watch_dog_wq); -//added by lawrence,20071118 -#ifdef _RTL8187_EXT_PATCH_ - INIT_WORK(&ieee->ext_stop_scan_wq,(void*) ieee80211_ext_stop_scan_wq); - //INIT_WORK(&ieee->ext_send_beacon_wq,(void*) ieee80211_beacons_start,ieee); - INIT_WORK(&ieee->ext_send_beacon_wq,(void*) ext_ieee80211_send_beacon_wq); -#endif //_RTL8187_EXT_PATCH_ -#else - INIT_WORK(&ieee->start_ibss_wq,(void*) ieee80211_start_ibss_wq,ieee); - INIT_WORK(&ieee->associate_retry_wq,(void*) ieee80211_associate_retry_wq,ieee); - INIT_WORK(&ieee->associate_complete_wq,(void*) ieee80211_associate_complete_wq,ieee); - INIT_WORK(&ieee->associate_procedure_wq,(void*) ieee80211_associate_procedure_wq,ieee); - INIT_WORK(&ieee->softmac_scan_wq,(void*) ieee80211_softmac_scan_wq,ieee); - INIT_WORK(&ieee->wx_sync_scan_wq,(void*) ieee80211_wx_sync_scan_wq,ieee); -// INIT_WORK(&ieee->watch_dog_wq,(void*) ieee80211_watch_dog_wq,ieee); -#ifdef _RTL8187_EXT_PATCH_ - INIT_WORK(&ieee->ext_stop_scan_wq,(void*) ieee80211_ext_stop_scan_wq,ieee); - //INIT_WORK(&ieee->ext_send_beacon_wq,(void*) ieee80211_beacons_start,ieee); - INIT_WORK(&ieee->ext_send_beacon_wq,(void*) ext_ieee80211_send_beacon_wq,ieee); -#endif -#endif + sema_init(&ieee->wx_sem, 1); sema_init(&ieee->scan_sem, 1); @@ -3559,9 +2585,7 @@ void ieee80211_softmac_init(struct ieee80211_device *ieee) tasklet_init(&ieee->ps_task, (void(*)(unsigned long)) ieee80211_sta_ps, (unsigned long)ieee); -#ifdef ENABLE_DOT11D ieee->pDot11dInfo = kmalloc(sizeof(RT_DOT11D_INFO), GFP_ATOMIC); -#endif } void ieee80211_softmac_free(struct ieee80211_device *ieee) @@ -3575,15 +2599,9 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee) //add for RF power on power of by lizhaoming 080512 cancel_delayed_work(&ieee->GPIOChangeRFWorkItem); -#ifdef _RTL8187_EXT_PATCH_ - cancel_delayed_work(&ieee->ext_stop_scan_wq); - cancel_delayed_work(&ieee->ext_send_beacon_wq); -#endif destroy_workqueue(ieee->wq); -#ifdef ENABLE_DOT11D if(NULL != ieee->pDot11dInfo) kfree(ieee->pDot11dInfo); -#endif up(&ieee->wx_sem); } @@ -3992,38 +3010,3 @@ void notify_wx_assoc_event(struct ieee80211_device *ieee) memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN); wireless_send_event(ieee->dev, SIOCGIWAP, &wrqu, NULL); } - - -#if 0 -EXPORT_SYMBOL(ieee80211_get_beacon); -EXPORT_SYMBOL(ieee80211_wake_queue); -EXPORT_SYMBOL(ieee80211_stop_queue); -EXPORT_SYMBOL(ieee80211_reset_queue); -EXPORT_SYMBOL(ieee80211_softmac_stop_protocol); -EXPORT_SYMBOL(ieee80211_softmac_start_protocol); -EXPORT_SYMBOL(ieee80211_is_shortslot); -EXPORT_SYMBOL(ieee80211_is_54g); -EXPORT_SYMBOL(ieee80211_wpa_supplicant_ioctl); -EXPORT_SYMBOL(ieee80211_ps_tx_ack); -EXPORT_SYMBOL(ieee80211_start_protocol); -EXPORT_SYMBOL(ieee80211_stop_protocol); -EXPORT_SYMBOL(notify_wx_assoc_event); -EXPORT_SYMBOL(ieee80211_stop_send_beacons); -EXPORT_SYMBOL(SendDisassociation); -EXPORT_SYMBOL(ieee80211_disassociate); -EXPORT_SYMBOL(ieee80211_start_scan); -EXPORT_SYMBOL(ieee80211_softmac_ips_scan_syncro); -#ifdef _RTL8187_EXT_PATCH_ -EXPORT_SYMBOL(ieee80211_ext_issue_assoc_req); -EXPORT_SYMBOL(ieee80211_ext_issue_disassoc); -EXPORT_SYMBOL(ieee80211_ext_issue_assoc_rsp); -EXPORT_SYMBOL(softmac_mgmt_xmit); -EXPORT_SYMBOL(ieee80211_ext_probe_resp_by_net); -EXPORT_SYMBOL(ieee80211_start_scan); -EXPORT_SYMBOL(ieee80211_stop_scan); -EXPORT_SYMBOL(ieee80211_ext_send_11s_beacon); -EXPORT_SYMBOL(ieee80211_rx_auth_rq); -EXPORT_SYMBOL(ieee80211_associate_step1); -#endif // _RTL8187_EXT_PATCH_ -EXPORT_SYMBOL(ieee80211_sta_ps_send_null_frame); -#endif diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c index 54b4b718f84a..f1d6cb452563 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c @@ -270,16 +270,9 @@ out: } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) void ieee80211_wx_sync_scan_wq(struct work_struct *work) { struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, wx_sync_scan_wq); -#else -void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee) -{ -#endif -//void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee) -//{ short chan; chan = ieee->current_network.channel; @@ -379,11 +372,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee, if (wrqu->essid.flags && wrqu->essid.length) { //YJ,modified,080819 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE; -#else len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length) : IW_ESSID_MAX_SIZE; -#endif memset(ieee->current_network.ssid, 0, ieee->current_network.ssid_len); //YJ,add,080819 strncpy(ieee->current_network.ssid, extra, len); ieee->current_network.ssid_len = len; @@ -581,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 diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c index 1294e05fcf13..e2945db61795 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c @@ -192,11 +192,11 @@ int ieee80211_encrypt_fragment( return -1; #ifdef CONFIG_IEEE80211_CRYPT_TKIP - struct ieee80211_hdr *header; + struct ieee80211_hdr_4addr *header; if (ieee->tkip_countermeasures && crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) { - header = (struct ieee80211_hdr *) frag->data; + header = (struct ieee80211_hdr_4addr *)frag->data; if (net_ratelimit()) { printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " "TX packet to " MAC_FMT "\n", @@ -304,245 +304,23 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network) return(wme_UP); } -#ifdef _RTL8187_EXT_PATCH_ -// based on part of ieee80211_xmit. Mainly allocate txb. ieee->lock is held -struct ieee80211_txb *ieee80211_ext_alloc_txb(struct sk_buff *skb, struct net_device *dev, struct ieee80211_hdr_3addr *header, int hdr_len, u8 isQoS, u16 *pQOS_ctl, int isEncrypt, struct ieee80211_crypt_data* crypt) -{ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) - struct ieee80211_device *ieee = netdev_priv(dev); -#else - struct ieee80211_device *ieee = (struct ieee80211_device *)dev->priv; -#endif - struct ieee80211_txb *txb = NULL; - struct ieee80211_hdr_3addr *frag_hdr; - int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size; - int ether_type; - int bytes, QOS_ctl; - struct sk_buff *skb_frag; - - ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto); - - /* Advance the SKB to the start of the payload */ - skb_pull(skb, sizeof(struct ethhdr)); - - /* Determine total amount of storage required for TXB packets */ - bytes = skb->len + SNAP_SIZE + sizeof(u16); - - /* Determine fragmentation size based on destination (multicast - * and broadcast are not fragmented) */ - // if (is_multicast_ether_addr(dest) || - // is_broadcast_ether_addr(dest)) { - if (is_multicast_ether_addr(header->addr1) || - is_broadcast_ether_addr(header->addr1)) { - frag_size = MAX_FRAG_THRESHOLD; - QOS_ctl = QOS_CTL_NOTCONTAIN_ACK; - } - else { - //printk(KERN_WARNING "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&frag_size = %d\n", frag_size); - frag_size = ieee->fts;//default:392 - QOS_ctl = 0; - } - - if(isQoS) { - QOS_ctl |= skb->priority; //set in the ieee80211_classify - *pQOS_ctl = cpu_to_le16(QOS_ctl); - } - //printk(KERN_WARNING "header size = %d, QOS_ctl = %x\n", hdr_len,QOS_ctl); - /* Determine amount of payload per fragment. Regardless of if - * this stack is providing the full 802.11 header, one will - * eventually be affixed to this fragment -- so we must account for - * it when determining the amount of payload space. */ - //bytes_per_frag = frag_size - (IEEE80211_3ADDR_LEN + (ieee->current_network->QoS_Enable ? 2:0)); - bytes_per_frag = frag_size - hdr_len; - if (ieee->config & - (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) - bytes_per_frag -= IEEE80211_FCS_LEN; - - /* Each fragment may need to have room for encryptiong pre/postfix */ - if (isEncrypt) - bytes_per_frag -= crypt->ops->extra_prefix_len + - crypt->ops->extra_postfix_len; - - /* Number of fragments is the total bytes_per_frag / - * payload_per_fragment */ - nr_frags = bytes / bytes_per_frag; - bytes_last_frag = bytes % bytes_per_frag; - if (bytes_last_frag) - nr_frags++; - else - bytes_last_frag = bytes_per_frag; - - /* When we allocate the TXB we allocate enough space for the reserve - * and full fragment bytes (bytes_per_frag doesn't include prefix, - * postfix, header, FCS, etc.) */ - txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC); - if (unlikely(!txb)) { - printk(KERN_WARNING "%s: Could not allocate TXB\n", - ieee->dev->name); - return NULL; - } - txb->encrypted = isEncrypt; - txb->payload_size = bytes; - - for (i = 0; i < nr_frags; i++) { - skb_frag = txb->fragments[i]; - skb_frag->priority = UP2AC(skb->priority); - if (isEncrypt) - skb_reserve(skb_frag, crypt->ops->extra_prefix_len); - - frag_hdr = (struct ieee80211_hdr_3addr *)skb_put(skb_frag, hdr_len); - memcpy(frag_hdr, (void *)header, hdr_len); - - /* If this is not the last fragment, then add the MOREFRAGS - * bit to the frame control */ - if (i != nr_frags - 1) { - frag_hdr->frame_ctl = cpu_to_le16( - header->frame_ctl | IEEE80211_FCTL_MOREFRAGS); - bytes = bytes_per_frag; - - } else { - /* The last fragment takes the remaining length */ - bytes = bytes_last_frag; - } - - frag_hdr->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0]<<4 | i); - //frag_hdr->seq_ctl = cpu_to_le16(ieee->seq_ctrl<<4 | i); - // - - /* Put a SNAP header on the first fragment */ - if (i == 0) { - ieee80211_put_snap( - skb_put(skb_frag, SNAP_SIZE + sizeof(u16)), ether_type); - bytes -= SNAP_SIZE + sizeof(u16); - } - - memcpy(skb_put(skb_frag, bytes), skb->data, bytes); - - /* Advance the SKB... */ - skb_pull(skb, bytes); - - /* Encryption routine will move the header forward in order - * to insert the IV between the header and the payload */ - if (isEncrypt) - ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); - if (ieee->config & - (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) - skb_put(skb_frag, 4); - } - // Advance sequence number in data frame. - //printk(KERN_WARNING "QoS Enalbed? %s\n", ieee->current_network.QoS_Enable?"Y":"N"); - if (ieee->seq_ctrl[0] == 0xFFF) - ieee->seq_ctrl[0] = 0; - else - ieee->seq_ctrl[0]++; - // stanley, just for debug -/* -{ - int j=0; - for(j=0;j<nr_frags;j++) - { - int i; - struct sk_buff *skb = txb->fragments[j]; - printk("send(%d): ", j); - for (i=0;i<skb->len;i++) - printk("%02X ", skb->data[i]&0xff); - printk("\n"); - } -} -*/ - - return txb; -} - - -// based on part of ieee80211_xmit. Mainly allocate txb. ieee->lock is held -// Assume no encryption, no FCS computing -struct ieee80211_txb *ieee80211_ext_reuse_txb(struct sk_buff *skb, struct net_device *dev, struct ieee80211_hdr_3addr *header, int hdr_len, u8 isQoS, u16 *pQOS_ctl, int isEncrypt, struct ieee80211_crypt_data* crypt) -{ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) - struct ieee80211_device *ieee = netdev_priv(dev); -#else - struct ieee80211_device *ieee = (struct ieee80211_device *)dev->priv; -#endif - struct ieee80211_txb *txb = NULL; - struct ieee80211_hdr_3addr *frag_hdr; - int ether_type; - int bytes, QOS_ctl; - - ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto); - - /* Advance the SKB to the start of the payload */ - skb_pull(skb, sizeof(struct ethhdr)); - - /* Determine total amount of storage required for TXB packets */ - bytes = skb->len + SNAP_SIZE + sizeof(u16); - - if (is_multicast_ether_addr(header->addr1) || - is_broadcast_ether_addr(header->addr1)) { - QOS_ctl = QOS_CTL_NOTCONTAIN_ACK; - } - else { - QOS_ctl = 0; - } - - if(isQoS) { - QOS_ctl |= skb->priority; //set in the ieee80211_classify - *pQOS_ctl = cpu_to_le16(QOS_ctl); - } - - txb = kmalloc( sizeof(struct ieee80211_txb) + sizeof(u8*), GFP_ATOMIC ); - if (unlikely(!txb)) { - printk(KERN_WARNING "%s: Could not allocate TXB\n", - ieee->dev->name); - return NULL; - } - - txb->nr_frags = 1; - txb->frag_size = bytes; - txb->encrypted = isEncrypt; - txb->payload_size = bytes; - - txb->fragments[0] = skb; - ieee80211_put_snap( - skb_push(skb, SNAP_SIZE + sizeof(u16)), ether_type); - frag_hdr = (struct ieee80211_hdr_3addr *)skb_push(skb, hdr_len); - memcpy(frag_hdr, (void *)header, hdr_len); - frag_hdr->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0]<<4 | 0); - skb->priority = UP2AC(skb->priority); - - // Advance sequence number in data frame. - //printk(KERN_WARNING "QoS Enalbed? %s\n", ieee->current_network.QoS_Enable?"Y":"N"); - if (ieee->seq_ctrl[0] == 0xFFF) - ieee->seq_ctrl[0] = 0; - else - ieee->seq_ctrl[0]++; - - return txb; -} - -#endif // _RTL8187_EXT_PATCH_ - /* SKBs are added to the ieee->tx_queue. */ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) { struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_txb *txb = NULL; - struct ieee80211_hdr_3addr_QOS *frag_hdr; + struct ieee80211_hdr_3addrqos *frag_hdr; int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size; unsigned long flags; struct net_device_stats *stats = &ieee->stats; int ether_type, encrypt; - int bytes, fc, QOS_ctl, hdr_len; + int bytes, fc, qos_ctl, hdr_len; struct sk_buff *skb_frag; - //struct ieee80211_hdr header = { /* Ensure zero initialized */ - // .duration_id = 0, - // .seq_ctl = 0 - //}; - struct ieee80211_hdr_3addr_QOS header = { /* Ensure zero initialized */ + struct ieee80211_hdr_3addrqos header = { /* Ensure zero initialized */ .duration_id = 0, .seq_ctl = 0, - .QOS_ctl = 0 + .qos_ctl = 0 }; u8 dest[ETH_ALEN], src[ETH_ALEN]; @@ -569,16 +347,6 @@ int ieee80211_xmit(struct sk_buff *skb, goto success; } - -#ifdef _RTL8187_EXT_PATCH_ - // note, skb->priority which was set by ieee80211_classify, and used by physical tx - if((ieee->iw_mode == ieee->iw_ext_mode) && (ieee->ext_patch_ieee80211_xmit)) - { - txb = ieee->ext_patch_ieee80211_xmit(skb, dev); - goto success; - } -#endif - ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto); crypt = ieee->crypt[ieee->tx_keyidx]; @@ -651,22 +419,23 @@ int ieee80211_xmit(struct sk_buff *skb, if (is_multicast_ether_addr(header.addr1) || is_broadcast_ether_addr(header.addr1)) { frag_size = MAX_FRAG_THRESHOLD; - QOS_ctl = QOS_CTL_NOTCONTAIN_ACK; + qos_ctl = QOS_CTL_NOTCONTAIN_ACK; } else { //printk(KERN_WARNING "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&frag_size = %d\n", frag_size); frag_size = ieee->fts;//default:392 - QOS_ctl = 0; + qos_ctl = 0; } if (ieee->current_network.QoS_Enable) { hdr_len = IEEE80211_3ADDR_LEN + 2; - QOS_ctl |= skb->priority; //set in the ieee80211_classify - header.QOS_ctl = cpu_to_le16(QOS_ctl); + /* skb->priority is set in the ieee80211_classify() */ + qos_ctl |= skb->priority; + header.qos_ctl = cpu_to_le16(qos_ctl); } else { hdr_len = IEEE80211_3ADDR_LEN; } - //printk(KERN_WARNING "header size = %d, QOS_ctl = %x\n", hdr_len,QOS_ctl); + /* Determine amount of payload per fragment. Regardless of if * this stack is providing the full 802.11 header, one will * eventually be affixed to this fragment -- so we must account for @@ -709,7 +478,7 @@ int ieee80211_xmit(struct sk_buff *skb, if (encrypt) skb_reserve(skb_frag, crypt->ops->extra_prefix_len); - frag_hdr = (struct ieee80211_hdr_3addr_QOS *)skb_put(skb_frag, hdr_len); + frag_hdr = (struct ieee80211_hdr_3addrqos *)skb_put(skb_frag, hdr_len); memcpy(frag_hdr, &header, hdr_len); /* If this is not the last fragment, then add the MOREFRAGS @@ -790,10 +559,6 @@ int ieee80211_xmit(struct sk_buff *skb, success: spin_unlock_irqrestore(&ieee->lock, flags); -#ifdef _RTL8187_EXT_PATCH_ - // Sometimes, extension mode can reuse skb (by txb->fragments[0]) - if( ! ((ieee->iw_mode == ieee->iw_ext_mode) && txb && (txb->fragments[0] == skb)) ) -#endif dev_kfree_skb_any(skb); if (txb) { if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE){ @@ -802,13 +567,13 @@ int ieee80211_xmit(struct sk_buff *skb, if ((*ieee->hard_start_xmit)(txb, dev) == 0) { stats->tx_packets++; stats->tx_bytes += txb->payload_size; - return 0; + return NETDEV_TX_OK; } ieee80211_txb_free(txb); } } - return 0; + return NETDEV_TX_OK; failed: spin_unlock_irqrestore(&ieee->lock, flags); @@ -817,12 +582,3 @@ int ieee80211_xmit(struct sk_buff *skb, return NETDEV_TX_BUSY; } - -#if 0 -EXPORT_SYMBOL(ieee80211_txb_free); -#ifdef _RTL8187_EXT_PATCH_ -EXPORT_SYMBOL(ieee80211_alloc_txb); -EXPORT_SYMBOL(ieee80211_ext_alloc_txb); -EXPORT_SYMBOL(ieee80211_ext_reuse_txb); -#endif // _RTL8187_EXT_PATCH_ -#endif diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c index d1295e56fd42..8d8bdd0a130e 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c @@ -39,12 +39,6 @@ static const char *ieee80211_modes[] = { "?", "a", "b", "ab", "g", "ag", "bg", "abg" }; -#ifdef FEDORACORE_9 -#define IN_FEDORACORE_9 1 -#else -#define IN_FEDORACORE_9 0 -#endif - #define MAX_CUSTOM_LEN 64 static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, char *start, char *stop, @@ -61,11 +55,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, iwe.cmd = SIOCGIWAP; iwe.u.ap_addr.sa_family = ARPHRD_ETHER; memcpy(iwe.u.ap_addr.sa_data, network->bssid, ETH_ALEN); -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN); -#else - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_ADDR_LEN); -#endif /* Remaining entries will be displayed in the order we provide them */ @@ -77,28 +67,16 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, if (network->ssid_len == 0) { //YJ,modified,080903,end iwe.u.data.length = sizeof("<hidden>"); -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, "<hidden>"); -#else - start = iwe_stream_add_point(start, stop, &iwe, "<hidden>"); -#endif } else { iwe.u.data.length = min(network->ssid_len, (u8)32); -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid); -#else - start = iwe_stream_add_point(start, stop, &iwe, network->ssid); -#endif } //printk("ESSID: %s\n",network->ssid); /* Add the protocol name */ iwe.cmd = SIOCGIWNAME; snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s", ieee80211_modes[network->mode]); -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN); -#else - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN); -#endif /* Add mode */ iwe.cmd = SIOCGIWMODE; @@ -109,11 +87,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, else iwe.u.mode = IW_MODE_ADHOC; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN); -#else - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN); -#endif } /* Add frequency/channel */ @@ -123,11 +97,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, iwe.u.freq.m = network->channel; iwe.u.freq.e = 0; iwe.u.freq.i = 0; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN); -#else - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN); -#endif /* Add encryption capability */ iwe.cmd = SIOCGIWENCODE; @@ -136,11 +106,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, else iwe.u.data.flags = IW_ENCODE_DISABLED; iwe.u.data.length = 0; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid); -#else - start = iwe_stream_add_point(start, stop, &iwe, network->ssid); -#endif /* Add basic and extended rates */ max_rate = 0; @@ -169,20 +135,12 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, iwe.cmd = SIOCGIWRATE; iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; iwe.u.bitrate.value = max_rate * 500000; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN); -#else - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_PARAM_LEN); -#endif iwe.cmd = IWEVCUSTOM; iwe.u.data.length = p - custom; if (iwe.u.data.length) -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, custom); -#else - start = iwe_stream_add_point(start, stop, &iwe, custom); -#endif /* Add quality statistics */ /* TODO: Fix these values... */ @@ -201,92 +159,35 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL)) iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID; iwe.u.qual.updated = 7; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN); -#else - start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN); -#endif iwe.cmd = IWEVCUSTOM; p = custom; iwe.u.data.length = p - custom; if (iwe.u.data.length) -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, custom); -#else - start = iwe_stream_add_point(start, stop, &iwe, custom); -#endif - -#if 0 - if (ieee->wpa_enabled && network->wpa_ie_len){ - char buf[MAX_WPA_IE_LEN * 2 + 30]; - // printk("WPA IE\n"); - u8 *p = buf; - p += sprintf(p, "wpa_ie="); - for (i = 0; i < network->wpa_ie_len; i++) { - p += sprintf(p, "%02x", network->wpa_ie[i]); - } memset(&iwe, 0, sizeof(iwe)); - iwe.cmd = IWEVCUSTOM; - iwe.u.data.length = strlen(buf); -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) - start = iwe_stream_add_point(info, start, stop, &iwe, buf); -#else - start = iwe_stream_add_point(start, stop, &iwe, buf); -#endif - } - - if (ieee->wpa_enabled && network->rsn_ie_len){ - char buf[MAX_WPA_IE_LEN * 2 + 30]; - - u8 *p = buf; - p += sprintf(p, "rsn_ie="); - for (i = 0; i < network->rsn_ie_len; i++) { - p += sprintf(p, "%02x", network->rsn_ie[i]); - } - - -#else - memset(&iwe, 0, sizeof(iwe)); if (network->wpa_ie_len) { // printk("wpa_ie_len:%d\n", network->wpa_ie_len); char buf[MAX_WPA_IE_LEN]; memcpy(buf, network->wpa_ie, network->wpa_ie_len); iwe.cmd = IWEVGENIE; iwe.u.data.length = network->wpa_ie_len; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, buf); -#else - start = iwe_stream_add_point(start, stop, &iwe, buf); -#endif } memset(&iwe, 0, sizeof(iwe)); if (network->rsn_ie_len) { // printk("=====>rsn_ie_len:\n", network->rsn_ie_len); - #if 0 - { - int i; - for (i=0; i<network->rsn_ie_len; i++); - printk("%2x ", network->rsn_ie[i]); - printk("\n"); - } - #endif char buf[MAX_WPA_IE_LEN]; memcpy(buf, network->rsn_ie, network->rsn_ie_len); iwe.cmd = IWEVGENIE; iwe.u.data.length = network->rsn_ie_len; -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, buf); -#else - start = iwe_stream_add_point(start, stop, &iwe, buf); -#endif } -#endif - /* Add EXTRA: Age to display seconds since last beacon/probe response * for given network. */ iwe.cmd = IWEVCUSTOM; @@ -295,11 +196,7 @@ static inline char *rtl818x_translate_scan(struct ieee80211_device *ieee, " Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100)); iwe.u.data.length = p - custom; if (iwe.u.data.length) -#if((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))||IN_FEDORACORE_9) start = iwe_stream_add_point(info, start, stop, &iwe, custom); -#else - start = iwe_stream_add_point(start, stop, &iwe, custom); -#endif return start; } @@ -638,12 +535,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, sec.enabled = 1; // sec.encrypt = 1; -#if 0 - if (group_key ? !ieee->host_mc_decrypt : - !(ieee->host_encrypt || ieee->host_decrypt || - ieee->host_encrypt_msdu)) - goto skip_host_crypt; -#endif + switch (ext->alg) { case IW_ENCODE_ALG_WEP: alg = "WEP"; @@ -829,15 +721,6 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee, #if 1 int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) { -#if 0 - printk("====>%s()\n", __func__); - { - int i; - for (i=0; i<len; i++) - printk("%2x ", ie[i]&0xff); - printk("\n"); - } -#endif u8 *buf = NULL; if (len>MAX_WPA_IE_LEN || (len && ie == NULL)) @@ -872,13 +755,3 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) } #endif - -#if 0 -EXPORT_SYMBOL(ieee80211_wx_set_gen_ie); -EXPORT_SYMBOL(ieee80211_wx_set_mlme); -EXPORT_SYMBOL(ieee80211_wx_set_auth); -EXPORT_SYMBOL(ieee80211_wx_set_encode_ext); -EXPORT_SYMBOL(ieee80211_wx_get_scan); -EXPORT_SYMBOL(ieee80211_wx_set_encode); -EXPORT_SYMBOL(ieee80211_wx_get_encode); -#endif diff --git a/drivers/staging/rtl8187se/ieee80211/internal.h b/drivers/staging/rtl8187se/ieee80211/internal.h deleted file mode 100644 index ddc22350d006..000000000000 --- a/drivers/staging/rtl8187se/ieee80211/internal.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Cryptographic API. - * - * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - */ -#ifndef _CRYPTO_INTERNAL_H -#define _CRYPTO_INTERNAL_H - - -//#include <linux/crypto.h> -#include "rtl_crypto.h" -#include <linux/mm.h> -#include <linux/highmem.h> -#include <linux/init.h> -#include <asm/hardirq.h> -#include <asm/softirq.h> -#include <asm/kmap_types.h> - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) -#define list_for_each_entry(pos, head, member) \ - for (pos = list_entry((head)->next, typeof(*pos), member), \ - prefetch(pos->member.next); \ - &pos->member != (head); \ - pos = list_entry(pos->member.next, typeof(*pos), member), \ - prefetch(pos->member.next)) - -static inline void cond_resched(void) -{ - if (need_resched()) { - set_current_state(TASK_RUNNING); - schedule(); - } -} -#endif - -extern enum km_type crypto_km_types[]; - -static inline enum km_type crypto_kmap_type(int out) -{ - return crypto_km_types[(in_softirq() ? 2 : 0) + out]; -} - -static inline void *crypto_kmap(struct page *page, int out) -{ - return kmap_atomic(page, crypto_kmap_type(out)); -} - -static inline void crypto_kunmap(void *vaddr, int out) -{ - kunmap_atomic(vaddr, crypto_kmap_type(out)); -} - -static inline void crypto_yield(struct crypto_tfm *tfm) -{ - if (!in_softirq()) - cond_resched(); -} - -static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm) -{ - return (void *)&tfm[1]; -} - -struct crypto_alg *crypto_alg_lookup(const char *name); - -#ifdef CONFIG_KMOD -void crypto_alg_autoload(const char *name); -struct crypto_alg *crypto_alg_mod_lookup(const char *name); -#else -static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name) -{ - return crypto_alg_lookup(name); -} -#endif - -#ifdef CONFIG_CRYPTO_HMAC -int crypto_alloc_hmac_block(struct crypto_tfm *tfm); -void crypto_free_hmac_block(struct crypto_tfm *tfm); -#else -static inline int crypto_alloc_hmac_block(struct crypto_tfm *tfm) -{ - return 0; -} - -static inline void crypto_free_hmac_block(struct crypto_tfm *tfm) -{ } -#endif - -#ifdef CONFIG_PROC_FS -void __init crypto_init_proc(void); -#else -static inline void crypto_init_proc(void) -{ } -#endif - -int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags); -int crypto_init_cipher_flags(struct crypto_tfm *tfm, u32 flags); -int crypto_init_compress_flags(struct crypto_tfm *tfm, u32 flags); - -int crypto_init_digest_ops(struct crypto_tfm *tfm); -int crypto_init_cipher_ops(struct crypto_tfm *tfm); -int crypto_init_compress_ops(struct crypto_tfm *tfm); - -void crypto_exit_digest_ops(struct crypto_tfm *tfm); -void crypto_exit_cipher_ops(struct crypto_tfm *tfm); -void crypto_exit_compress_ops(struct crypto_tfm *tfm); - -#endif /* _CRYPTO_INTERNAL_H */ - diff --git a/drivers/staging/rtl8187se/ieee80211/rtl_crypto.h b/drivers/staging/rtl8187se/ieee80211/rtl_crypto.h deleted file mode 100644 index 9ed0ca420857..000000000000 --- a/drivers/staging/rtl8187se/ieee80211/rtl_crypto.h +++ /dev/null @@ -1,399 +0,0 @@ -/* - * Scatterlist Cryptographic API. - * - * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> - * Copyright (c) 2002 David S. Miller (davem@redhat.com) - * - * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no> - * and Nettle, by Niels Mé°ˆler. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - */ -#ifndef _LINUX_CRYPTO_H -#define _LINUX_CRYPTO_H - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/list.h> -#include <linux/string.h> -#include <asm/page.h> -#include <asm/errno.h> - -#define crypto_register_alg crypto_register_alg_rtl -#define crypto_unregister_alg crypto_unregister_alg_rtl -#define crypto_alloc_tfm crypto_alloc_tfm_rtl -#define crypto_free_tfm crypto_free_tfm_rtl -#define crypto_alg_available crypto_alg_available_rtl - -/* - * Algorithm masks and types. - */ -#define CRYPTO_ALG_TYPE_MASK 0x000000ff -#define CRYPTO_ALG_TYPE_CIPHER 0x00000001 -#define CRYPTO_ALG_TYPE_DIGEST 0x00000002 -#define CRYPTO_ALG_TYPE_COMPRESS 0x00000004 - -/* - * Transform masks and values (for crt_flags). - */ -#define CRYPTO_TFM_MODE_MASK 0x000000ff -#define CRYPTO_TFM_REQ_MASK 0x000fff00 -#define CRYPTO_TFM_RES_MASK 0xfff00000 - -#define CRYPTO_TFM_MODE_ECB 0x00000001 -#define CRYPTO_TFM_MODE_CBC 0x00000002 -#define CRYPTO_TFM_MODE_CFB 0x00000004 -#define CRYPTO_TFM_MODE_CTR 0x00000008 - -#define CRYPTO_TFM_REQ_WEAK_KEY 0x00000100 -#define CRYPTO_TFM_RES_WEAK_KEY 0x00100000 -#define CRYPTO_TFM_RES_BAD_KEY_LEN 0x00200000 -#define CRYPTO_TFM_RES_BAD_KEY_SCHED 0x00400000 -#define CRYPTO_TFM_RES_BAD_BLOCK_LEN 0x00800000 -#define CRYPTO_TFM_RES_BAD_FLAGS 0x01000000 - -/* - * Miscellaneous stuff. - */ -#define CRYPTO_UNSPEC 0 -#define CRYPTO_MAX_ALG_NAME 64 - -struct scatterlist; - -/* - * Algorithms: modular crypto algorithm implementations, managed - * via crypto_register_alg() and crypto_unregister_alg(). - */ -struct cipher_alg { - unsigned int cia_min_keysize; - unsigned int cia_max_keysize; - int (*cia_setkey)(void *ctx, const u8 *key, - unsigned int keylen, u32 *flags); - void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src); - void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src); -}; - -struct digest_alg { - unsigned int dia_digestsize; - void (*dia_init)(void *ctx); - void (*dia_update)(void *ctx, const u8 *data, unsigned int len); - void (*dia_final)(void *ctx, u8 *out); - int (*dia_setkey)(void *ctx, const u8 *key, - unsigned int keylen, u32 *flags); -}; - -struct compress_alg { - int (*coa_init)(void *ctx); - void (*coa_exit)(void *ctx); - int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); - int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); -}; - -#define cra_cipher cra_u.cipher -#define cra_digest cra_u.digest -#define cra_compress cra_u.compress - -struct crypto_alg { - struct list_head cra_list; - u32 cra_flags; - unsigned int cra_blocksize; - unsigned int cra_ctxsize; - const char cra_name[CRYPTO_MAX_ALG_NAME]; - - union { - struct cipher_alg cipher; - struct digest_alg digest; - struct compress_alg compress; - } cra_u; - - struct module *cra_module; -}; - -/* - * Algorithm registration interface. - */ -int crypto_register_alg(struct crypto_alg *alg); -int crypto_unregister_alg(struct crypto_alg *alg); - -/* - * Algorithm query interface. - */ -int crypto_alg_available(const char *name, u32 flags); - -/* - * Transforms: user-instantiated objects which encapsulate algorithms - * and core processing logic. Managed via crypto_alloc_tfm() and - * crypto_free_tfm(), as well as the various helpers below. - */ -struct crypto_tfm; - -struct cipher_tfm { - void *cit_iv; - unsigned int cit_ivsize; - u32 cit_mode; - int (*cit_setkey)(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen); - int (*cit_encrypt)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes); - int (*cit_encrypt_iv)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv); - int (*cit_decrypt)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes); - int (*cit_decrypt_iv)(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv); - void (*cit_xor_block)(u8 *dst, const u8 *src); -}; - -struct digest_tfm { - void (*dit_init)(struct crypto_tfm *tfm); - void (*dit_update)(struct crypto_tfm *tfm, - struct scatterlist *sg, unsigned int nsg); - void (*dit_final)(struct crypto_tfm *tfm, u8 *out); - void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg, - unsigned int nsg, u8 *out); - int (*dit_setkey)(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen); -#ifdef CONFIG_CRYPTO_HMAC - void *dit_hmac_block; -#endif -}; - -struct compress_tfm { - int (*cot_compress)(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); - int (*cot_decompress)(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen); -}; - -#define crt_cipher crt_u.cipher -#define crt_digest crt_u.digest -#define crt_compress crt_u.compress - -struct crypto_tfm { - - u32 crt_flags; - - union { - struct cipher_tfm cipher; - struct digest_tfm digest; - struct compress_tfm compress; - } crt_u; - - struct crypto_alg *__crt_alg; -}; - -/* - * Transform user interface. - */ - -/* - * crypto_alloc_tfm() will first attempt to locate an already loaded algorithm. - * If that fails and the kernel supports dynamically loadable modules, it - * will then attempt to load a module of the same name or alias. A refcount - * is grabbed on the algorithm which is then associated with the new transform. - * - * crypto_free_tfm() frees up the transform and any associated resources, - * then drops the refcount on the associated algorithm. - */ -struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags); -void crypto_free_tfm(struct crypto_tfm *tfm); - -/* - * Transform helpers which query the underlying algorithm. - */ -static inline const char *crypto_tfm_alg_name(struct crypto_tfm *tfm) -{ - return tfm->__crt_alg->cra_name; -} - -static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm) -{ - struct crypto_alg *alg = tfm->__crt_alg; - - if (alg->cra_module) - return alg->cra_module->name; - else - return NULL; -} - -static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm) -{ - return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK; -} - -static inline unsigned int crypto_tfm_alg_min_keysize(struct crypto_tfm *tfm) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->__crt_alg->cra_cipher.cia_min_keysize; -} - -static inline unsigned int crypto_tfm_alg_max_keysize(struct crypto_tfm *tfm) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->__crt_alg->cra_cipher.cia_max_keysize; -} - -static inline unsigned int crypto_tfm_alg_ivsize(struct crypto_tfm *tfm) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->crt_cipher.cit_ivsize; -} - -static inline unsigned int crypto_tfm_alg_blocksize(struct crypto_tfm *tfm) -{ - return tfm->__crt_alg->cra_blocksize; -} - -static inline unsigned int crypto_tfm_alg_digestsize(struct crypto_tfm *tfm) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); - return tfm->__crt_alg->cra_digest.dia_digestsize; -} - -/* - * API wrappers. - */ -static inline void crypto_digest_init(struct crypto_tfm *tfm) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); - tfm->crt_digest.dit_init(tfm); -} - -static inline void crypto_digest_update(struct crypto_tfm *tfm, - struct scatterlist *sg, - unsigned int nsg) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); - tfm->crt_digest.dit_update(tfm, sg, nsg); -} - -static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); - tfm->crt_digest.dit_final(tfm, out); -} - -static inline void crypto_digest_digest(struct crypto_tfm *tfm, - struct scatterlist *sg, - unsigned int nsg, u8 *out) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); - tfm->crt_digest.dit_digest(tfm, sg, nsg, out); -} - -static inline int crypto_digest_setkey(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); - if (tfm->crt_digest.dit_setkey == NULL) - return -ENOSYS; - return tfm->crt_digest.dit_setkey(tfm, key, keylen); -} - -static inline int crypto_cipher_setkey(struct crypto_tfm *tfm, - const u8 *key, unsigned int keylen) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->crt_cipher.cit_setkey(tfm, key, keylen); -} - -static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes); -} - -static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB); - return tfm->crt_cipher.cit_encrypt_iv(tfm, dst, src, nbytes, iv); -} - -static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes); -} - -static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm, - struct scatterlist *dst, - struct scatterlist *src, - unsigned int nbytes, u8 *iv) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB); - return tfm->crt_cipher.cit_decrypt_iv(tfm, dst, src, nbytes, iv); -} - -static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm, - const u8 *src, unsigned int len) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - memcpy(tfm->crt_cipher.cit_iv, src, len); -} - -static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm, - u8 *dst, unsigned int len) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - memcpy(dst, tfm->crt_cipher.cit_iv, len); -} - -static inline int crypto_comp_compress(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS); - return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen); -} - -static inline int crypto_comp_decompress(struct crypto_tfm *tfm, - const u8 *src, unsigned int slen, - u8 *dst, unsigned int *dlen) -{ - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS); - return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen); -} - -/* - * HMAC support. - */ -#ifdef CONFIG_CRYPTO_HMAC -void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen); -void crypto_hmac_update(struct crypto_tfm *tfm, - struct scatterlist *sg, unsigned int nsg); -void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key, - unsigned int *keylen, u8 *out); -void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen, - struct scatterlist *sg, unsigned int nsg, u8 *out); -#endif /* CONFIG_CRYPTO_HMAC */ - -#endif /* _LINUX_CRYPTO_H */ - diff --git a/drivers/staging/rtl8187se/ieee80211_crypt.h b/drivers/staging/rtl8187se/ieee80211_crypt.h deleted file mode 100644 index b58a3bcc0dc0..000000000000 --- a/drivers/staging/rtl8187se/ieee80211_crypt.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Original code based on Host AP (software wireless LAN access point) driver - * for Intersil Prism2/2.5/3. - * - * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen - * <jkmaline@cc.hut.fi> - * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> - * - * Adaption to a generic IEEE 802.11 stack by James Ketrenos - * <jketreno@linux.intel.com> - * - * Copyright (c) 2004, Intel Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. See README and COPYING for - * more details. - */ - -/* - * This file defines the interface to the ieee80211 crypto module. - */ -#ifndef IEEE80211_CRYPT_H -#define IEEE80211_CRYPT_H - -#include <linux/skbuff.h> - -struct ieee80211_crypto_ops { - const char *name; - - /* init new crypto context (e.g., allocate private data space, - * select IV, etc.); returns NULL on failure or pointer to allocated - * private data on success */ - void * (*init)(int keyidx); - - /* deinitialize crypto context and free allocated private data */ - void (*deinit)(void *priv); - - /* encrypt/decrypt return < 0 on error or >= 0 on success. The return - * value from decrypt_mpdu is passed as the keyidx value for - * decrypt_msdu. skb must have enough head and tail room for the - * encryption; if not, error will be returned; these functions are - * called for all MPDUs (i.e., fragments). - */ - int (*encrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv); - int (*decrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv); - - /* These functions are called for full MSDUs, i.e. full frames. - * These can be NULL if full MSDU operations are not needed. */ - int (*encrypt_msdu)(struct sk_buff *skb, int hdr_len, void *priv); - int (*decrypt_msdu)(struct sk_buff *skb, int keyidx, int hdr_len, - void *priv); - - int (*set_key)(void *key, int len, u8 *seq, void *priv); - int (*get_key)(void *key, int len, u8 *seq, void *priv); - - /* procfs handler for printing out key information and possible - * statistics */ - char * (*print_stats)(char *p, void *priv); - - /* maximum number of bytes added by encryption; encrypt buf is - * allocated with extra_prefix_len bytes, copy of in_buf, and - * extra_postfix_len; encrypt need not use all this space, but - * the result must start at the beginning of the buffer and correct - * length must be returned */ - int extra_prefix_len, extra_postfix_len; - - struct module *owner; -}; - -struct ieee80211_crypt_data { - struct list_head list; /* delayed deletion list */ - struct ieee80211_crypto_ops *ops; - void *priv; - atomic_t refcnt; -}; - -int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops); -int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops); -struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name); -void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int); -void ieee80211_crypt_deinit_handler(unsigned long); -void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee, - struct ieee80211_crypt_data **crypt); - -#endif diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index db446b7e2e08..8216d7e96d60 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h @@ -41,7 +41,7 @@ #include <linux/timer.h> #include <linux/proc_fs.h> // Necessary because we use the proc fs #include <linux/if_arp.h> -#include "ieee80211.h" +#include "ieee80211/ieee80211.h" #include <asm/io.h> //#include <asm/semaphore.h> @@ -52,31 +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 -#ifdef CONFIG_RTL8185B - -#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 @@ -199,7 +184,6 @@ typedef union _ThreeWire{ u16 longData; }ThreeWireReg; -#endif typedef struct buffer { @@ -659,7 +643,6 @@ typedef struct r8180_priv short ack_tx_to_ieee; u8 PowerProfile; -#ifdef CONFIG_RTL8185B u32 CSMethod; u8 cck_txpwr_base; u8 ofdm_txpwr_base; @@ -675,7 +658,6 @@ typedef struct r8180_priv u32 IntrMask; struct ChnlAccessSetting ChannelAccessSetting; -#endif }r8180_priv; #define MANAGE_PRIORITY 0 @@ -750,11 +732,7 @@ void rtl8185b_irq_enable(struct net_device *dev); void fix_rx_fifo(struct net_device *dev); void fix_tx_fifo(struct net_device *dev); void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch); -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) void rtl8180_rate_adapter(struct work_struct * work); -#else -void rtl8180_rate_adapter(struct net_device *dev); -#endif //#endif bool MgntActSet_RF_State(struct net_device *dev, RT_RF_POWER_STATE StateToSet, u32 ChangeSource); diff --git a/drivers/staging/rtl8187se/r8180_93cx6.h b/drivers/staging/rtl8187se/r8180_93cx6.h index a028a51b23f0..36ae100f3f16 100644 --- a/drivers/staging/rtl8187se/r8180_93cx6.h +++ b/drivers/staging/rtl8187se/r8180_93cx6.h @@ -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 diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 7e2fecae813c..53e654d0d4fa 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c @@ -22,69 +22,24 @@ A big big thanks goes also to Realtek corp. for their help in my attempt to add RTL8185 and RTL8225 support, and to David Young also. -*/ - -#if 0 -double __floatsidf (int i) { return i; } -unsigned int __fixunsdfsi (double d) { return d; } -double __adddf3(double a, double b) { return a+b; } -double __addsf3(float a, float b) { return a+b; } -double __subdf3(double a, double b) { return a-b; } -double __extendsfdf2(float a) {return a;} -#endif + Power management interface routines. + Written by Mariusz Matuszek. +*/ -#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 - -//#define CONFIG_RTL8180_IO_MAP + #include <linux/syscalls.h> -//#include <linux/fcntl.h> -//#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" -#ifdef CONFIG_RTL8180_PM -#include "r8180_pm.h" -#endif - -#ifdef ENABLE_DOT11D -#include "dot11d.h" -#endif - -#ifdef CONFIG_RTL8185B -//#define CONFIG_RTL8180_IO_MAP -#endif +#include "ieee80211/dot11d.h" #ifndef PCI_VENDOR_ID_BELKIN #define PCI_VENDOR_ID_BELKIN 0x1799 @@ -96,42 +51,11 @@ double __extendsfdf2(float a) {return a;} 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, .driver_data = 0, }, -#if 0 - { - .vendor = PCI_VENDOR_ID_BELKIN, - .device = 0x6001, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - .driver_data = 1, - }, - { /* Belkin F5D6020 v3 */ - .vendor = PCI_VENDOR_ID_BELKIN, - .device = 0x6020, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - .driver_data = 2, - }, - { /* D-Link DWL-610 */ - .vendor = PCI_VENDOR_ID_DLINK, - .device = 0x3300, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - .driver_data = 3, - }, - { - .vendor = PCI_VENDOR_ID_REALTEK, - .device = 0x8185, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - .driver_data = 4, - }, -#endif { .vendor = 0, .device = 0, @@ -144,7 +68,6 @@ static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = { static char* ifname = "wlan%d"; static int hwseqnum = 0; -//static char* ifname = "ath%d"; static int hwwep = 0; static int channels = 0x3fff; @@ -156,35 +79,12 @@ MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>"); MODULE_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"); -*/ - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9) 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); -#else -MODULE_PARM(ifname, "s"); -MODULE_PARM(hwseqnum,"i"); -MODULE_PARM(hwwep,"i"); -MODULE_PARM(channels,"i"); -#endif 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"); @@ -203,56 +103,73 @@ static void rtl8180_shutdown (struct pci_dev *pdev) pci_disable_device(pdev); } -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 */ -#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, -}; +static int rtl8180_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct net_device *dev = pci_get_drvdata(pdev); + if (!netif_running(dev)) + goto out_pci_suspend; + if (dev->netdev_ops->ndo_stop) + dev->netdev_ops->ndo_stop(dev); -#ifdef CONFIG_RTL8180_IO_MAP + netif_device_detach(dev); -u8 read_nic_byte(struct net_device *dev, int x) -{ - return 0xff&inb(dev->base_addr +x); +out_pci_suspend: + pci_save_state(pdev); + pci_disable_device(pdev); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); + return 0; } -u32 read_nic_dword(struct net_device *dev, int x) +static int rtl8180_resume(struct pci_dev *pdev) { - return inl(dev->base_addr +x); -} + struct net_device *dev = pci_get_drvdata(pdev); + int err; + u32 val; -u16 read_nic_word(struct net_device *dev, int x) -{ - return inw(dev->base_addr +x); -} + pci_set_power_state(pdev, PCI_D0); -void write_nic_byte(struct net_device *dev, int x,u8 y) -{ - outb(y&0xff,dev->base_addr +x); -} + err = pci_enable_device(pdev); + if (err) { + printk(KERN_ERR "%s: pci_enable_device failed on resume\n", + dev->name); -void write_nic_word(struct net_device *dev, int x,u16 y) -{ - outw(y,dev->base_addr +x); -} + return err; + } -void write_nic_dword(struct net_device *dev, int x,u32 y) -{ - outl(y,dev->base_addr +x); + 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 + * from interfering with C3 CPU state. pci_restore_state won't help + * here since it only restores the first 64 bytes pci config header. + */ + pci_read_config_dword(pdev, 0x40, &val); + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + + 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; } -#else /* RTL_IO_MAP */ +static struct pci_driver rtl8180_pci_driver = { + .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) { @@ -287,21 +204,12 @@ void write_nic_word(struct net_device *dev, int x,u16 y) udelay(20); } -#endif /* RTL_IO_MAP */ - - - - - inline void force_pci_posting(struct net_device *dev) { read_nic_byte(dev,EPROM_CMD); -#ifndef CONFIG_RTL8180_IO_MAP mb(); -#endif } - 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); @@ -309,10 +217,6 @@ static struct net_device_stats *rtl8180_stats(struct net_device *dev); 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, @@ -320,33 +224,22 @@ static int proc_get_registers(char *page, char **start, 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 (n = 0; n <= max;) { + 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)); - - // 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); @@ -355,56 +248,12 @@ static int proc_get_stats_hw(char *page, char **start, 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; -#ifdef CONFIG_RTL8185B -#else - len += snprintf(page + len, count - len, - "NIC int: %lu\n" - "Total int: %lu\n" - "--------------------\n" - "LP avail desc %d\n" - "NP avail desc %d\n" - "--------------------\n" - "LP phys dma addr %x\n" - "LP NIC ptr %x\n" - "LP virt 32base %x\n" - "LP virt 32tail %x\n" - "--------------------\n" - "NP phys dma addr %x\n" - "NP NIC ptr %x\n" - "NP virt 32base %x\n" - "NP virt 32tail %x\n" - "--------------------\n" - "BP phys dma addr %x\n" - "BP NIC ptr %x\n" - "BP virt 32base %x\n" - "BP virt 32tail %x\n", - priv->stats.ints, - priv->stats.shints, - get_curr_tx_free_desc(dev,LOW_PRIORITY), - get_curr_tx_free_desc(dev,NORM_PRIORITY), - (u32)priv->txvipringdma, - read_nic_dword(dev,TLPDA), - (u32)priv->txvipring, - (u32)priv->txvipringtail, - (u32)priv->txvopringdma, - read_nic_dword(dev,TNPDA), - (u32)priv->txvopring, - (u32)priv->txvopringtail, - (u32)priv->txbeaconringdma, - read_nic_dword(dev,TBDA), - (u32)priv->txbeaconring, - (u32)priv->txbeaconringtail); -#endif *eof = 1; return len; } - static int proc_get_stats_rx(char *page, char **start, off_t offset, int count, int *eof, void *data) @@ -415,30 +264,6 @@ static int proc_get_stats_rx(char *page, char **start, 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" @@ -457,82 +282,6 @@ static int proc_get_stats_rx(char *page, char **start, return len; } -#if 0 -static int proc_get_stats_ieee(char *page, char **start, - 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; - - len += snprintf(page + len, count - len, - "TXed association requests: %u\n" - "TXed authentication requests: %u\n" - "RXed successful association response: %u\n" - "RXed failed association response: %u\n" - "RXed successful authentication response: %u\n" - "RXed failed authentication response: %u\n" - "Association requests without response: %u\n" - "Authentication requests without response: %u\n" - "TX probe response: %u\n" - "RX probe request: %u\n" - "TX probe request: %lu\n" - "RX authentication requests: %lu\n" - "RX association requests: %lu\n" - "Reassociations: %lu\n", - priv->ieee80211->ieee_stats.tx_ass, - priv->ieee80211->ieee_stats.tx_aut, - priv->ieee80211->ieee_stats.rx_ass_ok, - priv->ieee80211->ieee_stats.rx_ass_err, - priv->ieee80211->ieee_stats.rx_aut_ok, - priv->ieee80211->ieee_stats.rx_aut_err, - priv->ieee80211->ieee_stats.ass_noresp, - priv->ieee80211->ieee_stats.aut_noresp, - priv->ieee80211->ieee_stats.tx_probe, - priv->ieee80211->ieee_stats.rx_probe, - priv->ieee80211->ieee_stats.tx_probe_rq, - priv->ieee80211->ieee_stats.rx_auth_rq, - priv->ieee80211->ieee_stats.rx_assoc_rq, - priv->ieee80211->ieee_stats.reassoc); - - *eof = 1; - return len; -} -#endif -#if 0 -static int proc_get_stats_ap(char *page, char **start, - off_t offset, int count, - int *eof, void *data) -{ - struct net_device *dev = data; - struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - struct mac_htable_t *list; - int i; - int len = 0; - - if(priv->ieee80211->iw_mode != IW_MODE_MASTER){ - len += snprintf(page + len, count - len, - "Card is not acting as AP...\n" - ); - }else{ - len += snprintf(page + len, count - len, - "List of associated STA:\n" - ); - - for(i=0;i<MAC_HTABLE_ENTRY;i++) - for (list = priv->ieee80211->assoc_htable[i]; list!=NULL; list = list->next){ - len += snprintf(page + len, count - len, - MACSTR"\n",MAC2STR(list->adr)); - } - - } - *eof = 1; - return len; -} -#endif - static int proc_get_stats_tx(char *page, char **start, off_t offset, int count, int *eof, void *data) @@ -545,36 +294,6 @@ static int proc_get_stats_tx(char *page, char **start, 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" @@ -591,36 +310,17 @@ static int proc_get_stats_tx(char *page, char **start, return len; } - -#if WIRELESS_EXT < 17 -static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - - return &priv->wstats; -} -#endif void rtl8180_proc_module_init(void) { DMESG("Initializing proc filesystem"); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - rtl8180_proc=create_proc_entry(RTL8180_MODULE_NAME, S_IFDIR, proc_net); -#else rtl8180_proc=create_proc_entry(RTL8180_MODULE_NAME, S_IFDIR, init_net.proc_net); -#endif } - void rtl8180_proc_module_remove(void) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - remove_proc_entry(RTL8180_MODULE_NAME, proc_net); -#else remove_proc_entry(RTL8180_MODULE_NAME, init_net.proc_net); -#endif } - void rtl8180_proc_remove_one(struct net_device *dev) { struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); @@ -628,19 +328,17 @@ void rtl8180_proc_remove_one(struct net_device *dev) 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", @@ -650,7 +348,6 @@ void rtl8180_proc_init_one(struct net_device *dev) 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", @@ -659,7 +356,6 @@ void rtl8180_proc_init_one(struct net_device *dev) 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", @@ -669,45 +365,21 @@ void rtl8180_proc_init_one(struct net_device *dev) 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", dev->name); } - #if 0 - e = create_proc_read_entry("stats-ieee", S_IFREG | S_IRUGO, - priv->dir_dev, proc_get_stats_ieee, dev); - - if (!e) { - DMESGE("Unable to initialize " - "/proc/net/rtl8180/%s/stats-ieee\n", - dev->name); - } - #endif - #if 0 - e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO, - priv->dir_dev, proc_get_stats_ap, dev); - - if (!e) { - DMESGE("Unable to initialize " - "/proc/net/rtl8180/%s/stats-ap\n", - dev->name); - } - #endif 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 @@ -716,10 +388,6 @@ void rtl8180_proc_init_one(struct net_device *dev) short 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){ @@ -751,7 +419,6 @@ short buffer_add(struct buffer **buffer, u32 *buf, dma_addr_t dma, return 0; } - void buffer_free(struct net_device *dev,struct buffer **buffer,int len,short consistent) { @@ -759,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){ @@ -785,7 +450,6 @@ consistent) *buffer=NULL; } - void print_buffer(u32 *buffer, int len) { int i; @@ -804,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); @@ -841,39 +504,33 @@ int get_curr_tx_free_desc(struct net_device *dev, int priority) return -1; } - //DMESG("%x %x", head, tail); - - /* FIXME FIXME FIXME FIXME */ - -#if 0 - if( head <= tail ) return priv->txringcount-1 - (tail - head)/8; - return (head - tail)/8/4; -#else - 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; -#endif } - 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 */ @@ -881,172 +538,12 @@ short check_nic_enought_desc(struct net_device *dev, int priority) 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; - -#ifdef CONFIG_RTL8185B - rx_desc_size = 8; -#else - rx_desc_size = 4; -#endif - - 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++){ @@ -1087,9 +584,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; @@ -1122,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); @@ -1130,16 +624,7 @@ void fix_rx_fifo(struct net_device *dev) struct buffer *rxbuf; u8 rx_desc_size; -#ifdef CONFIG_RTL8185B rx_desc_size = 8; // 4*8 = 32 bytes -#else - rx_desc_size = 4; -#endif - -#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); @@ -1150,50 +635,40 @@ 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; 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; @@ -1289,8 +764,6 @@ void rtl8180_RSSI_calc(struct net_device *dev, u8 *rssi, u8 *qual){ } } break; - - /* case 4 */ case RFCHIPID_MAXIM: lsb = temp2 & 1; temp2 &= 0x7e; @@ -1315,38 +788,27 @@ void rtl8180_RSSI_calc(struct net_device *dev, u8 *rssi, u8 *qual){ return; } - 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); -#ifdef CONFIG_RTL8185B write_nic_dword(dev,IMR,0); -#else - write_nic_word(dev,INTA_MASK,0); -#endif force_pci_posting(dev); 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); @@ -1388,28 +850,21 @@ void rtl8180_update_msr(struct net_device *dev) write_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; @@ -1423,8 +878,8 @@ void rtl8180_rx_enable(struct net_device *dev) 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){ @@ -1435,11 +890,6 @@ void rtl8180_rx_enable(struct net_device *dev) 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); @@ -1449,84 +899,61 @@ void rtl8180_rx_enable(struct net_device *dev) if( 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); -#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)); - - /* 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; @@ -1534,12 +961,10 @@ void rtl8180_tx_enable(struct net_device *dev) u8 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); @@ -1550,26 +975,12 @@ void rtl8180_tx_enable(struct net_device *dev) 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 @@ -1584,80 +995,52 @@ void rtl8180_tx_enable(struct net_device *dev) 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); -#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)); -// 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); rtl8180_set_mode(dev,EPROM_CMD_CONFIG); -#ifdef CONFIG_RTL8185B priv->dma_poll_stop_mask &= ~(TPPOLLSTOP_BQ); write_nic_byte(dev,TPPollStop, priv->dma_poll_mask); -#else - priv->dma_poll_mask &=~(1<<TX_DMA_STOP_BEACON_SHIFT); - write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask); -#endif rtl8180_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); rtl8180_set_mode(dev,EPROM_CMD_CONFIG); -#ifdef CONFIG_RTL8185B priv->dma_poll_stop_mask |= TPPOLLSTOP_BQ; write_nic_byte(dev,TPPollStop, priv->dma_poll_stop_mask); -#else - priv->dma_poll_mask |= (1<<TX_DMA_STOP_BEACON_SHIFT); - write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask); -#endif rtl8180_set_mode(dev,EPROM_CMD_NORMAL); } - void rtl8180_rtx_disable(struct net_device *dev) { u8 cmd; @@ -1668,42 +1051,11 @@ void rtl8180_rtx_disable(struct net_device *dev) ((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); } -#if 0 -int alloc_tx_beacon_desc_ring(struct net_device *dev, int count) -{ - int i; - u32 *tmp; - struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - - priv->txbeaconring = (u32*)pci_alloc_consistent(priv->pdev, - sizeof(u32)*8*count, - &priv->txbeaconringdma); - if (!priv->txbeaconring) return -1; - for (tmp=priv->txbeaconring,i=0;i<count;i++){ - *tmp = *tmp &~ (1<<31); // descriptor empty, owned by the drv - /* - *(tmp+2) = (u32)dma_tmp; - *(tmp+3) = bufsize; - */ - if(i+1<count) - *(tmp+4) = (u32)priv->txbeaconringdma+((i+1)*8*4); - else - *(tmp+4) = (u32)priv->txbeaconringdma; - - tmp=tmp+8; - } - return 0; -} -#endif - short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, int addr) { @@ -1721,51 +1073,30 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, } 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; - switch(addr) { -#if 0 - case TX_NORMPRIORITY_RING_ADDR: - if(-1 == buffer_add(&(priv->txnpbufs),buf,dma_tmp,NULL)){ - DMESGE("Unable to allocate mem for buffer NP"); - return -ENOMEM; - } - break; + tmp = desc; - case TX_LOWPRIORITY_RING_ADDR: - if(-1 == buffer_add(&(priv->txlpbufs),buf,dma_tmp,NULL)){ - DMESGE("Unable to allocate mem for buffer LP"); - return -ENOMEM; - } - break; + for (i = 0; i < count; i++) { + buf = (void *)pci_alloc_consistent(pdev, bufsize, &dma_tmp); + if (buf == NULL) + return -ENOMEM; - case TX_HIGHPRIORITY_RING_ADDR: - if(-1 == buffer_add(&(priv->txhpbufs),buf,dma_tmp,NULL)){ - DMESGE("Unable to allocate mem for buffer HP"); - return -ENOMEM; - } - break; -#else + switch(addr) { case TX_MANAGEPRIORITY_RING_ADDR: if(-1 == buffer_add(&(priv->txmapbufs),buf,dma_tmp,NULL)){ DMESGE("Unable to allocate mem for buffer NP"); return -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"); @@ -1778,7 +1109,6 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, return -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"); @@ -1791,7 +1121,6 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, return -ENOMEM; } break; -#endif case TX_HIGHPRIORITY_RING_ADDR: if(-1 == buffer_add(&(priv->txhpbufs),buf,dma_tmp,NULL)){ DMESGE("Unable to allocate mem for buffer HP"); @@ -1822,32 +1151,26 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, 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; @@ -1855,17 +1178,11 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, } -#ifdef DEBUG_TX - DMESG("Tx dma physical address: %x",dma_desc); -#endif - return 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; @@ -1900,41 +1217,18 @@ void free_tx_desc_rings(struct net_device *dev) buffer_free(dev,&(priv->txbeaconbufs),priv->txbuffsize,1); } -#if 0 -void free_beacon_desc_ring(struct net_device *dev,int count) -{ - - struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - struct pci_dev *pdev=priv->pdev; - - pci_free_consistent(pdev, sizeof(u32)*8*count+256, - priv->txbeaconring, priv->txbeaconringdma); - - if (priv->beacon_buf) - pci_free_consistent(priv->pdev, - priv->master_beaconsize,priv->beacon_buf,priv->beacondmabuf); - -} -#endif void free_rx_desc_ring(struct net_device *dev) { struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); struct pci_dev *pdev = priv->pdev; - int count = priv->rxringcount; -#ifdef CONFIG_RTL8185B pci_free_consistent(pdev, sizeof(u32)*8*count+256, priv->rxring, priv->rxringdma); -#else - pci_free_consistent(pdev, sizeof(u32)*4*count+256, - priv->rxring, priv->rxringdma); -#endif buffer_free(dev,&(priv->rxbuffer),priv->rxbuffersize,0); } - short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) { int i; @@ -1946,11 +1240,7 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) void *buf; u8 rx_desc_size; -#ifdef CONFIG_RTL8185B rx_desc_size = 8; // 4*8 = 32 bytes -#else - rx_desc_size = 4; -#endif if((bufsize & 0xfff) != bufsize){ DMESGE ("RX buffer allocation too large"); @@ -1960,21 +1250,18 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) 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; @@ -1983,12 +1270,6 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) 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))){ DMESGE("Unable to allocate mem RX buf"); @@ -1999,21 +1280,11 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) *(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; } @@ -2023,24 +1294,16 @@ void set_nic_rxring(struct net_device *dev) u8 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); @@ -2057,83 +1320,80 @@ void rtl8180_reset(struct net_device *dev) else 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); @@ -2141,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 @@ -2192,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); @@ -2269,6 +1491,7 @@ TranslateToDbm8185( return SignalPower; } + // // Description: // Perform signal smoothing for dynamic mechanism. @@ -2277,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} @@ -2333,108 +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_4addr *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, }; -#ifdef CONFIG_RTL8185B stats.nic_type = NIC_8185B; rx_desc_size = 8; -#else - stats.nic_type = NIC_8185; - rx_desc_size = 4; -#endif - //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{*/ - - #if 0 - /* Maybe it is possible that the NIC has skipped some descriptors or - * it has reset its internal pointer to the beginning of the ring - * we search for the first filled descriptor in the ring, or we break - * putting again the pointer in the old location if we do not found any. - * This is quite dangerous, what does happen if the nic writes - * two descriptor (say A and B) when we have just checked the descriptor - * A and we are going to check the descriptor B..This might happen if the - * interrupt was dummy, there was not really filled descriptors and - * the NIC didn't lose pointer - */ - - //priv->stats.rxwrkaround++; - - tmp = priv->rxringtail; - while (*(priv->rxringtail) & (1<<31)){ - - priv->rxringtail+=4; - - if(priv->rxringtail >= - (priv->rxring)+(priv->rxringcount )*4) - priv->rxringtail=priv->rxring; - - priv->rxbuffer=(priv->rxbuffer->next); - - if(priv->rxringtail == tmp ){ - //DMESG("EE: Could not find RX pointer"); - priv->stats.rxnopointer++; - break; - } - } - #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; @@ -2444,8 +1576,6 @@ void rtl8180_rx(struct net_device *dev) }while(tmp != priv->rxring); if(tmp2) priv->rxringtail = tmp2; - #endif - //} } /* while there are filled descriptors */ @@ -2487,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) @@ -2501,7 +1630,6 @@ void rtl8180_rx(struct net_device *dev) len = priv->rxbuffersize; } -#ifdef CONFIG_RTL8185B if(first && last) { padding = ((*(priv->rxringtail+3))&(0x04000000))>>26; }else if(first) { @@ -2512,10 +1640,7 @@ 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){ @@ -2529,17 +1654,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 - -#ifdef CONFIG_RTL8185B signal=(unsigned char)(((*(priv->rxringtail+3))& (0x00ff0000))>>16); signal=(signal&0xfe)>>1; // Modify by hikaru 6.6 @@ -2550,22 +1664,11 @@ void rtl8180_rx(struct net_device *dev) rxpower =((char)(((*(priv->rxringtail+4))& (0x00ff0000))>>16))/2 - 42; RSSI = ((u8)(((*(priv->rxringtail+3)) & (0x0000ff00))>> 8)) & (0x7f); -#else - signal=((*(priv->rxringtail+1))& (0xff0000))>>16; - signal=(signal&0xfe)>>1; // Modify by hikaru 6.6 - - quality=((*(priv->rxringtail+1)) & (0xff)); - - stats.mac_time[0] = *(priv->rxringtail+2); - stats.mac_time[1] = *(priv->rxringtail+3); -#endif rate=((*(priv->rxringtail)) & ((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. @@ -2633,7 +1736,7 @@ void rtl8180_rx(struct net_device *dev) | (((*(priv->rxringtail))& (0x08000000)) != 0 )| (((~(*(priv->rxringtail)))& (0x10000000)) != 0 )| (((~(*(priv->rxringtail)))& (0x20000000)) != 0 ); bCRC = ((*(priv->rxringtail)) & (0x00002000)) >> 13; bICV = ((*(priv->rxringtail)) & (0x00001000)) >> 12; - hdr = (struct ieee80211_hdr *)priv->rxbuffer->buf; + hdr = (struct ieee80211_hdr_4addr *)priv->rxbuffer->buf; fc = le16_to_cpu(hdr->frame_ctl); type = WLAN_FC_GET_TYPE(fc); @@ -2670,59 +1773,20 @@ void rtl8180_rx(struct net_device *dev) } //by amy for antenna - - - - - - #ifndef DUMMY_RX if(first){ 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){ -#if 0 - priv->rx_skb = dev_alloc_skb(len+2+PRISM_HDR_SIZE); - if(! priv->rx_skb) goto drop; - - prism_hdr = (u32*) skb_put(priv->rx_skb,PRISM_HDR_SIZE); - prism_hdr[0]=htonl(0x80211001); //version - prism_hdr[1]=htonl(0x40); //length - prism_hdr[2]=htonl(stats.mac_time[1]); //mactime (HIGH) - prism_hdr[3]=htonl(stats.mac_time[0]); //mactime (LOW) - rdtsc(prism_hdr[5], prism_hdr[4]); //hostime (LOW+HIGH) - prism_hdr[4]=htonl(prism_hdr[4]); //Byte-Order aendern - prism_hdr[5]=htonl(prism_hdr[5]); //Byte-Order aendern - prism_hdr[6]=0x00; //phytype - prism_hdr[7]=htonl(priv->chan); //channel - prism_hdr[8]=htonl(stats.rate); //datarate - prism_hdr[9]=0x00; //antenna - prism_hdr[10]=0x00; //priority - prism_hdr[11]=0x00; //ssi_type - prism_hdr[12]=htonl(stats.signal); //ssi_signal - prism_hdr[13]=htonl(stats.noise); //ssi_noise - prism_hdr[14]=0x00; //preamble - prism_hdr[15]=0x00; //encoding - -#endif }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; @@ -2741,91 +1805,50 @@ 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) { -#ifdef CONFIG_RTL8185B if(padding) { memcpy(skb_put(priv->rx_skb,len), (((unsigned char *)priv->rxbuffer->buf) + 2),len); } else { -#endif memcpy(skb_put(priv->rx_skb,len), priv->rxbuffer->buf,len); -#ifdef CONFIG_RTL8185B } -#endif } -#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; } #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; @@ -2834,35 +1857,14 @@ drop: // this is used when we have not enought mem *(priv->rxringtail)= *(priv->rxringtail) | (1<<31); - //^empty descriptor - - //wmb(); - -#ifdef DEBUG_RX - DMESG("Current descriptor: %x",(u32)priv->rxringtail); -#endif - //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); - - - } @@ -2871,33 +1873,6 @@ void rtl8180_dma_kick(struct net_device *dev, int priority) struct 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); @@ -2905,53 +1880,26 @@ void rtl8180_dma_kick(struct net_device *dev, int priority) force_pci_posting(dev); } -#if 0 -void rtl8180_tx_queues_stop(struct net_device *dev) -{ - //struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - u8 dma_poll_mask = (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT); - dma_poll_mask |= (1<<TX_DMA_STOP_HIPRIORITY_SHIFT); - dma_poll_mask |= (1<<TX_DMA_STOP_NORMPRIORITY_SHIFT); - dma_poll_mask |= (1<<TX_DMA_STOP_BEACON_SHIFT); - - rtl8180_set_mode(dev,EPROM_CMD_CONFIG); - write_nic_byte(dev,TX_DMA_POLLING,dma_poll_mask); - rtl8180_set_mode(dev,EPROM_CMD_NORMAL); -} -#endif - void rtl8180_data_hard_stop(struct net_device *dev) { struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); rtl8180_set_mode(dev,EPROM_CMD_CONFIG); -#ifdef CONFIG_RTL8185B priv->dma_poll_stop_mask |= TPPOLLSTOP_AC_VIQ; write_nic_byte(dev,TPPollStop, priv->dma_poll_stop_mask); -#else - priv->dma_poll_mask |= (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT); - write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask); -#endif rtl8180_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); rtl8180_set_mode(dev,EPROM_CMD_CONFIG); -#ifdef CONFIG_RTL8185B priv->dma_poll_stop_mask &= ~(TPPOLLSTOP_AC_VIQ); write_nic_byte(dev,TPPollStop, priv->dma_poll_stop_mask); -#else - priv->dma_poll_mask &= ~(1<<TX_DMA_STOP_LOWPRIORITY_SHIFT); - write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask); -#endif rtl8180_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 */ @@ -2964,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; @@ -2976,11 +1923,7 @@ rate) * the ieee stack, or from the try_wake_queue (again trought * the ieee stack. */ -#ifdef CONFIG_RTL8185B priority = AC2Q(skb->priority); -#else - priority = LOW_PRIORITY; -#endif spin_lock_irqsave(&priv->tx_lock,flags); if(priv->ieee80211->bHwRadioOff) @@ -2990,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 @@ -3022,25 +1959,17 @@ 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; -#ifdef CONFIG_RTL8185B priority = MANAGE_PRIORITY; -#else - priority = NORM_PRIORITY; -#endif 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; + return NETDEV_TX_OK; } rtl8180_tx(dev, skb->data, skb->len, priority, @@ -3051,7 +1980,7 @@ int rtl8180_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) spin_unlock_irqrestore(&priv->tx_lock,flags); dev_kfree_skb_any(skb); - return 0; + return NETDEV_TX_OK; } // longpre 144+48 shortpre 72+24 @@ -3069,7 +1998,6 @@ u16 rtl8180_len2duration(u32 len, short rate,short* ext) if(drift ==0 ) break; duration++; break; - case 1://2mbps *ext=0; duration = ((len+4)<<4) /0x4; @@ -3077,7 +2005,6 @@ u16 rtl8180_len2duration(u32 len, short rate,short* ext) if(drift ==0 ) break; duration++; break; - case 2: //5.5mbps *ext=0; duration = ((len+4)<<4) /0xb; @@ -3086,7 +2013,6 @@ u16 rtl8180_len2duration(u32 len, short rate,short* ext) break; duration++; break; - default: case 3://11mbps *ext=0; @@ -3104,12 +2030,9 @@ u16 rtl8180_len2duration(u32 len, short rate,short* ext) return 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); @@ -3117,46 +2040,12 @@ void rtl8180_prepare_beacon(struct net_device *dev) 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, 0,0,ieeerate2rtlrate(priv->ieee80211->basic_rate)); dev_kfree_skb_any(skb); } - #if 0 - //DMESG("size %x",len); - if(*tail & (1<<31)){ - - //DMESG("No more beacon TX desc"); - return ; - - } - //while(! (*tail & (1<<31))){ - *tail= 0; // zeroes header - - *tail = *tail| (1<<29) ; //fist segment of the packet - *tail = (*tail) | (1<<28); // last segment - // *tail = *tail | (1<<18); // this is a beacon frame - *(tail+3)=*(tail+3) &~ 0xfff; - *(tail+3)=*(tail+3) | len; // buffer lenght - *tail = *tail |len; - // zeroes the second 32-bits dword of the descriptor - *(tail+1)= 0; - *tail = *tail | (rate << 24); - - duration = rtl8180_len2duration(len,rate,&ext); - - *(tail+1) = *(tail+1) | ((duration & 0x7fff)<<16); - - *tail = *tail | (1<<31); - //^ descriptor ready to be txed - if((tail - begin)/8 == priv->txbeaconcount-1) - tail=begin; - else - tail=tail+8; - //} -#endif } /* This function do the real dirty work: it enqueues a TX command @@ -3174,26 +2063,19 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, int remain; int buflen; int count; - //u16 AckCtsTime; - //u16 FrameTime; u16 duration; short ext; struct buffer* buflist; - //unsigned long flags; -#ifdef CONFIG_RTL8185B 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; u16 TxDescDuration = 0; u8 ownbit_flag = false; //added by david woo for sync Tx, 2007.12.14 -#endif switch(priority) { case MANAGE_PRIORITY: @@ -3202,56 +2084,47 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 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)) @@ -3264,20 +2137,13 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 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. @@ -3328,41 +2194,24 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, } // 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){ -#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); - //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++; -#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); - + 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 @@ -3375,14 +2224,10 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 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 -#ifdef DEBUG_TX_FRAG - DMESG("First descriptor"); -#endif *tail = *tail| (1<<29) ; //fist segment of the packet *tail = *tail |(len); } else { @@ -3401,9 +2246,8 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, // Use short preamble or not if (priv->ieee80211->current_network.capability&WLAN_CAPABILITY_SHORT_PREAMBLE) if (priv->plcp_preamble_mode==1 && rate!=0) // short mode now, not long! - // *tail |= (1<<16); // enable short preamble mode. + ;// *tail |= (1<<16); // enable short preamble mode. -#ifdef CONFIG_RTL8185B if(bCTSEnable) { *tail |= (1<<18); } @@ -3417,60 +2261,13 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, *(tail+3) |= ((TxDescDuration&0xffff)<<16); //DURATION // *(tail+3) |= (0xe6<<16); *(tail+5) |= (11<<8);//(priv->retry_data<<8); //retry lim ; -#else - //Use RTS or not -#ifdef CONFIG_RTL8187B - if ( (len>priv->rts) && priv->rts && priority!=MANAGE_PRIORITY){ -#else - if ( (len>priv->rts) && priv->rts && priority==LOW_PRIORITY){ -#endif - *tail |= (1<<23); //enalbe RTS function - *tail |= (0<<19); //use 1M bps send RTS packet - AckCtsTime = ComputeTxTime(14, 10,0, 0); // AckCTSLng = 14 use 1M bps send - FrameTime = ComputeTxTime(len + 4, rtl8180_rate2rate(rate), 0, *tail&(1<<16)); - // RTS/CTS time is calculate as follow - duration = FrameTime + 3*10 + 2*AckCtsTime; //10us is the SifsTime; - *(tail+1) |= duration; //Need to edit here! ----hikaru - }else{ - *(tail+1)= 0; // zeroes the second 32-bits dword of the descriptor - } -#endif *tail = *tail | ((rate&0xf) << 24); - //DMESG("rate %d",rate); - - if(priv->card_8185){ - - #if 0 - *(tail+5)&= ~(1<<24); /* tx ant 0 */ - - *(tail+5) &= ~(1<<23); /* random tx agc 23-16 */ - *(tail+5) |= (1<<22)|(1<<21)|(1<<20)|(1<<19)|(1<<18)|(1<<17)|(1<<16); - - *(tail+5) &= -~((1<<15)|(1<<14)|(1<<13)|(1<<12)|(1<<11)|(1<<10)|(1<<9)|(1<<8)); - *(tail+5) |= (7<<8); // Max retry limit - - *(tail+5) &= ~((1<<7)|(1<<6)|(1<<5)|(1<<4)|(1<<3)|(1<<2)|(1<<1)|(1<<0)); - *(tail+5) |= (8<<4); // Max contention window - *(tail+6) |= 4; // Min contention window - #endif - // *(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); - - -#ifdef DEBUG_TX - DMESG("PLCP duration %d",duration ); - //DMESG("drift %d",drift); - DMESG("extension %s", (ext==1) ? "on":"off"); -#endif + duration = rtl8180_len2duration(len, rate, &ext); *(tail+1) = *(tail+1) | ((duration & 0x7fff)<<16); if(ext) *(tail+1) = *(tail+1) |(1<<31); //plcp length extension } @@ -3478,10 +2275,6 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 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); @@ -3491,15 +2284,8 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, *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; - else tail=tail+8; @@ -3512,75 +2298,56 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 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; @@ -3588,46 +2355,14 @@ void rtl8180_link_change(struct net_device *dev) rtl8180_set_mode(dev, EPROM_CMD_NORMAL); - - /* - u16 atim = read_nic_dword(dev,ATIM); - u16 = u16 &~ ATIM_MASK; - u16 = u16 | beacon->atim; - */ -#if 0 - if (net->capability & WLAN_CAPABILITY_PRIVACY) { - if (priv->hw_wep) { - DMESG("Enabling hardware WEP support"); - rtl8180_set_hw_wep(dev); - priv->ieee80211->host_encrypt=0; - priv->ieee80211->host_decrypt=0; - } -#ifndef CONFIG_IEEE80211_NOWEP - else { - priv->ieee80211->host_encrypt=1; - priv->ieee80211->host_decrypt=1; - } -#endif - } -#ifndef CONFIG_IEEE80211_NOWEP - else{ - priv->ieee80211->host_encrypt=0; - priv->ieee80211->host_decrypt=0; - } -#endif -#endif - - 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; } @@ -3668,39 +2403,29 @@ short rtl8180_is_tx_queue_empty(struct net_device *dev){ void 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; @@ -3711,14 +2436,6 @@ void rtl8180_hw_sleep(struct net_device *dev, u32 th, u32 tl) */ 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 */ @@ -3729,13 +2446,9 @@ void rtl8180_hw_sleep(struct net_device *dev, u32 th, u32 tl) return; } -// 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 @@ -3743,34 +2456,21 @@ void rtl8180_hw_sleep(struct net_device *dev, u32 th, u32 tl) /* 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) -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) 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; -#else -void rtl8180_wmm_param_update(struct ieee80211_device *ieee) -{ - struct net_device *dev = ieee->dev; - struct r8180_priv *priv = ieee80211_priv(dev); -#endif u8 *ac_param = (u8 *)(ieee->current_network.wmm_param); u8 mode = ieee->current_network.mode; AC_CODING eACI; @@ -3778,10 +2478,6 @@ void rtl8180_wmm_param_update(struct ieee80211_device *ieee) PAC_PARAM pAcParam; u8 i; -#ifndef CONFIG_RTL8185B - //for legacy 8185 keep the PARAM unchange. - return; -#else if(!ieee->current_network.QoS_Enable){ //legacy ac_xx_param update AcParam.longData = 0; @@ -3806,19 +2502,15 @@ void rtl8180_wmm_param_update(struct ieee80211_device *ieee) case 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; @@ -3849,19 +2541,15 @@ void rtl8180_wmm_param_update(struct ieee80211_device *ieee) case 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; @@ -3869,63 +2557,26 @@ void rtl8180_wmm_param_update(struct ieee80211_device *ieee) } ac_param += (sizeof(AC_PARAM)); } -#endif } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_tx_irq_wq(struct work_struct *work); -#else -void rtl8180_tx_irq_wq(struct net_device *dev); -#endif - - - - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_restart_wq(struct work_struct *work); //void rtl8180_rq_tx_ack(struct work_struct *work); -#else - void rtl8180_restart_wq(struct net_device *dev); -//void rtl8180_rq_tx_ack(struct net_device *dev); -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_watch_dog_wq(struct work_struct *work); -#else -void rtl8180_watch_dog_wq(struct net_device *dev); -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_hw_wakeup_wq(struct work_struct *work); -#else -void rtl8180_hw_wakeup_wq(struct net_device *dev); -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_hw_sleep_wq(struct work_struct *work); -#else -void rtl8180_hw_sleep_wq(struct net_device *dev); -#endif - - - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_sw_antenna_wq(struct work_struct *work); -#else -void rtl8180_sw_antenna_wq(struct net_device *dev); -#endif - void rtl8180_watch_dog(struct net_device *dev); +void rtl8180_watch_dog(struct net_device *dev); + void 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)) @@ -3934,14 +2585,12 @@ void watch_dog_adaptive(unsigned long data) } #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 @@ -3950,20 +2599,14 @@ void watch_dog_adaptive(unsigned long data) queue_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"); } -#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 {{1,2,3,4,5,6,7,8,9,10,11},11}, //IC @@ -4038,20 +2681,15 @@ static void rtl8180_set_channel_map(u8 channel_plan, struct ieee80211_device *ie } } } -#endif -//Add for RF power on power off by lizhaoming 080512 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void GPIOChangeRFWorkItemCallBack(struct work_struct *work); -#else -void GPIOChangeRFWorkItemCallBack(struct ieee80211_device *ieee); -#endif //YJ,add,080828 static void rtl8180_statistics_init(struct Stats *pstats) { 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)); @@ -4070,40 +2708,14 @@ short rtl8180_init(struct net_device *dev) u16 tmpu16; int i, j; -#ifdef ENABLE_DOT11D -#if 0 - for(i=0;i<0xFF;i++) { - if(i%16 == 0) - printk("\n[%x]: ", i/16); - printk("\t%4.4x", eprom_read(dev,i)); - } -#endif priv->channel_plan = eprom_read(dev, EEPROM_COUNTRY_CODE>>1) & 0xFF; if(priv->channel_plan > COUNTRY_CODE_GLOBAL_DOMAIN){ printk("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); -#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)); //FIXME: these constants are placed in a bad pleace. priv->txbuffsize = 2048;//1024; @@ -4112,20 +2724,9 @@ short rtl8180_init(struct net_device *dev) 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) - */ -#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 priv->RFChangeInProgress = false; priv->SetRFPowerStateInProgress = false; priv->RFProgType = 0; @@ -4133,42 +2734,8 @@ short rtl8180_init(struct net_device *dev) priv->irq_enabled=0; -//YJ,modified,080828 -#if 0 - priv->stats.rxdmafail=0; - priv->stats.txrdu=0; - priv->stats.rxrdu=0; - priv->stats.rxnolast=0; - priv->stats.rxnodata=0; - //priv->stats.rxreset=0; - //priv->stats.rxwrkaround=0; - priv->stats.rxnopointer=0; - priv->stats.txnperr=0; - priv->stats.txresumed=0; - priv->stats.rxerr=0; - priv->stats.rxoverflow=0; - priv->stats.rxint=0; - priv->stats.txnpokint=0; - priv->stats.txhpokint=0; - priv->stats.txhperr=0; - priv->stats.ints=0; - priv->stats.shints=0; - priv->stats.txoverflow=0; - priv->stats.txbeacon=0; - priv->stats.txbeaconerr=0; - priv->stats.txlperr=0; - priv->stats.txlpokint=0; - priv->stats.txretry=0;//tony 20060601 - priv->stats.rxcrcerrmin=0; - priv->stats.rxcrcerrmid=0; - priv->stats.rxcrcerrmax=0; - priv->stats.rxicverr=0; -#else rtl8180_statistics_init(&priv->stats); rtl8180_link_detect_init(&priv->link_detect); -#endif -//YJ,modified,080828,end - priv->ack_tx_to_ieee = 0; priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL; @@ -4201,8 +2768,6 @@ short rtl8180_init(struct net_device *dev) 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; @@ -4258,13 +2823,10 @@ short rtl8180_init(struct net_device *dev) 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; @@ -4285,8 +2847,6 @@ short rtl8180_init(struct net_device *dev) 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); @@ -4295,59 +2855,30 @@ short rtl8180_init(struct net_device *dev) spin_lock_init(&priv->rf_ps_lock); sema_init(&priv->wx_sem,1); sema_init(&priv->rf_state,1); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) INIT_WORK(&priv->reset_wq,(void*) rtl8180_restart_wq); INIT_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); -#else - INIT_WORK(&priv->reset_wq,(void*) rtl8180_restart_wq,dev); - INIT_WORK(&priv->tx_irq_wq,(void*) rtl8180_tx_irq_wq,dev); - //INIT_WORK(&priv->ieee80211->watch_dog_wq,(void*) rtl8180_watch_dog_wq,dev); - INIT_WORK(&priv->ieee80211->hw_wakeup_wq,(void*) rtl8180_hw_wakeup_wq,dev); - INIT_WORK(&priv->ieee80211->hw_sleep_wq,(void*) rtl8180_hw_sleep_wq,dev); - //INIT_WORK(&priv->ieee80211->sw_antenna_wq,(void*) rtl8180_sw_antenna_wq,dev); - INIT_WORK(&priv->ieee80211->wmm_param_update_wq,(void*) rtl8180_wmm_param_update,priv->ieee80211); - INIT_WORK(&priv->ieee80211->rate_adapter_wq,(void*)rtl8180_rate_adapter,dev);//+by amy 080312 - INIT_WORK(&priv->ieee80211->hw_dig_wq,(void*)rtl8180_hw_dig_wq,dev);//+by amy 080312 - INIT_WORK(&priv->ieee80211->tx_pw_wq,(void*)rtl8180_tx_pw_wq,dev);//+by amy 080312 - - //add for RF power on power off by lizhaoming 080512 - INIT_WORK(&priv->ieee80211->GPIOChangeRFWorkItem,(void*) GPIOChangeRFWorkItemCallBack, priv->ieee80211); -#endif - //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; @@ -4362,7 +2893,6 @@ short rtl8180_init(struct net_device *dev) priv->ieee80211->stop_send_beacons = rtl8180_beacon_tx_disable; priv->ieee80211->fts = DEFAULT_FRAG_THRESHOLD; -#ifdef CONFIG_RTL8185B priv->MWIEnable = 0; priv->ShortRetryLimit = 7; @@ -4379,15 +2909,9 @@ short rtl8180_init(struct net_device *dev) (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. 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); @@ -4403,49 +2927,35 @@ short rtl8180_init(struct net_device *dev) IMR_RQoSOK; // <NOTE> ROK and RQoSOK are mutually exclusive, so, we must handle RQoSOK interrupt to receive QoS frames, 2005.12.09, by rcnjko. priv->InitialGain = 6; -#endif hw_version =( read_nic_dword(dev, TCR) & TCR_HWVERID_MASK)>>TCR_HWVERID_SHIFT; switch (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"); priv->card_8185 = 1; /* 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; @@ -4459,98 +2969,50 @@ short rtl8180_init(struct net_device *dev) /* you should not found any 8185 Ver B Card */ 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; -//by amy for antenna -#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 ) - { + 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); -#endif -#endif -//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; @@ -4558,42 +3020,26 @@ short rtl8180_init(struct net_device *dev) 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; -#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++){ - 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 + //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 @@ -4605,12 +3051,9 @@ short rtl8180_init(struct net_device *dev) if((tmpu16 & EEPROM_THERMAL_METER_ENABLE)>>13) priv->bTxPowerTrack = true; -//by amy 080312} -#ifdef CONFIG_RTL8185B word = eprom_read(dev,EPROM_TXPW_BASE); priv->cck_txpwr_base = word & 0xf; priv->ofdm_txpwr_base = (word>>4) & 0xf; -#endif version = eprom_read(dev,EPROM_VERSION); DMESG("EEPROM version %x",version); @@ -4646,142 +3089,15 @@ DMESG output to andreamrl@tiscali.it THANKS"); priv->rf_chip = 0xff & eprom_read(dev,RFCHIPID); } -#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"); DMESGW("**PLEASE** REPORT SUCCESSFUL/UNSUCCESSFUL TO Realtek!"); priv->rf_close = rtl8225z2_rf_close; 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; - -#else - /* check RF frontend chipset */ - switch (priv->rf_chip) { - - case RFCHIPID_RTL8225: - - if(priv->card_8185){ - DMESG("Card reports RF frontend Realtek 8225"); - DMESGW("This driver has EXPERIMENTAL support for this chipset."); - DMESGW("use it with care and at your own risk and"); - DMESGW("**PLEASE** REPORT SUCCESS/INSUCCESS TO andreamrl@tiscali.it"); - - priv->rf_close = rtl8225_rf_close; - priv->rf_init = rtl8225_rf_init; - priv->rf_set_chan = rtl8225_rf_set_chan; - priv->rf_set_sens = NULL; - priv->rf_sleep = rtl8225_rf_sleep; - priv->rf_wakeup = rtl8225_rf_wakeup; - - }else{ - DMESGW("Detected RTL8225 radio on a card recognized as RTL8180"); - DMESGW("This could not be... something went wrong...."); - return -ENODEV; - } - break; - - case RFCHIPID_RTL8255: - if(priv->card_8185){ - DMESG("Card reports RF frontend Realtek 8255"); - DMESGW("This driver has EXPERIMENTAL support for this chipset."); - DMESGW("use it with care and at your own risk and"); - DMESGW("**PLEASE** REPORT SUCCESS/INSUCCESS TO andreamrl@tiscali.it"); - - priv->rf_close = rtl8255_rf_close; - priv->rf_init = rtl8255_rf_init; - priv->rf_set_chan = rtl8255_rf_set_chan; - priv->rf_set_sens = NULL; - priv->rf_sleep = NULL; - priv->rf_wakeup = NULL; - - }else{ - DMESGW("Detected RTL8255 radio on a card recognized as RTL8180"); - DMESGW("This could not be... something went wrong...."); - return -ENODEV; - } - break; - - - case RFCHIPID_INTERSIL: - DMESGW("Card reports RF frontend by Intersil."); - DMESGW("This driver has NO support for this chipset."); - return -ENODEV; - break; - - case RFCHIPID_RFMD: - DMESGW("Card reports RF frontend by RFMD."); - DMESGW("This driver has NO support for this chipset."); - return -ENODEV; - break; - - case RFCHIPID_GCT: - DMESGW("Card reports RF frontend by GCT."); - DMESGW("This driver has EXPERIMENTAL support for this chipset."); - DMESGW("use it with care and at your own risk and"); - DMESGW("**PLEASE** REPORT SUCCESS/INSUCCESS TO andreamrl@tiscali.it"); - priv->rf_close = gct_rf_close; - priv->rf_init = gct_rf_init; - priv->rf_set_chan = gct_rf_set_chan; - priv->rf_set_sens = NULL; - priv->rf_sleep = NULL; - priv->rf_wakeup = NULL; - break; - - case RFCHIPID_MAXIM: - DMESGW("Card reports RF frontend by MAXIM."); - DMESGW("This driver has EXPERIMENTAL support for this chipset."); - DMESGW("use it with care and at your own risk and"); - DMESGW("**PLEASE** REPORT SUCCESS/INSUCCESS TO andreamrl@tiscali.it"); - priv->rf_close = maxim_rf_close; - priv->rf_init = maxim_rf_init; - priv->rf_set_chan = maxim_rf_set_chan; - priv->rf_set_sens = NULL; - priv->rf_sleep = NULL; - priv->rf_wakeup = NULL; - break; - - case RFCHIPID_PHILIPS: - DMESG("Card reports RF frontend by Philips."); - DMESG("OK! Philips SA2400 radio chipset is supported."); - priv->rf_close = sa2400_rf_close; - priv->rf_init = sa2400_rf_init; - priv->rf_set_chan = sa2400_rf_set_chan; - priv->rf_set_sens = sa2400_rf_set_sens; - priv->sens = SA2400_RF_DEF_SENS; /* default sensitivity */ - priv->max_sens = SA2400_RF_MAX_SENS; /* maximum sensitivity */ - priv->rf_sleep = NULL; - priv->rf_wakeup = NULL; - - if(priv->digphy){ - DMESGW("Digital PHY found"); - DMESGW("Philips DIGITAL PHY is untested! *Please*\ - report success/failure to <andreamrl@tiscali.it>"); - }else{ - DMESG ("Analog PHY found"); - } - - break; - - default: - DMESGW("Unknown RF module %x",priv->rf_chip); - DMESGW("Exiting..."); - return -1; - - } -#endif - if(!priv->card_8185){ if(priv->antb) @@ -4828,11 +3144,7 @@ DMESG output to andreamrl@tiscali.it THANKS"); 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 @@ -4855,21 +3167,14 @@ DMESG output to andreamrl@tiscali.it THANKS"); DMESG("IRQ %d",dev->irq); } -#ifdef DEBUG_EPROM - dump_eprom(dev); -#endif - 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); @@ -4877,19 +3182,9 @@ void rtl8180_no_hw_wep(struct net_device *dev) 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); @@ -4908,10 +3203,6 @@ void rtl8180_set_hw_wep(struct net_device *dev) write_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); @@ -4923,8 +3214,6 @@ void rtl8180_set_hw_wep(struct net_device *dev) DMESG("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; } @@ -4933,10 +3222,8 @@ void rtl8185_rf_pins_enable(struct net_device *dev) // 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; @@ -4950,10 +3237,8 @@ void rtl8185_set_anaparam2(struct net_device *dev, u32 a) 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; @@ -4969,7 +3254,6 @@ void rtl8180_set_anaparam(struct net_device *dev, u32 a) rtl8180_set_mode(dev, EPROM_CMD_NORMAL); } - void rtl8185_tx_antenna(struct net_device *dev, u8 ant) { write_nic_byte(dev, TX_ANTENNA, ant); @@ -4977,55 +3261,38 @@ void rtl8185_tx_antenna(struct net_device *dev, u8 ant) mdelay(1); } - void rtl8185_write_phy(struct net_device *dev, u8 adr, u32 data) { - //u8 phyr; u32 phyw; - //int i; adr |= 0x80; phyw= ((data<<8) | adr); -#if 0 - - write_nic_dword(dev, PHY_ADR, phyw); - //read_nic_dword(dev, PHY_ADR); - for(i=0;i<10;i++){ - write_nic_dword(dev, PHY_ADR, 0xffffff7f & phyw); - phyr = read_nic_byte(dev, PHY_READ); - if(phyr == (data&0xff)) break; - - } -#else // Note that, we must write 0xff7c after 0x7d-0x7f to write BB register. write_nic_byte(dev, 0x7f, ((phyw & 0xff000000) >> 24)); write_nic_byte(dev, 0x7e, ((phyw & 0x00ff0000) >> 16)); write_nic_byte(dev, 0x7d, ((phyw & 0x0000ff00) >> 8)); write_nic_byte(dev, 0x7c, ((phyw & 0x000000ff) )); -#endif + /* this is ok to fail when we write AGC table. check for AGC table might be * done by masking with 0x7f instead of 0xff */ //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 */ @@ -5054,9 +3321,6 @@ void write_phy(struct net_device *dev, u8 adr, u8 data) if(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); @@ -5072,55 +3336,32 @@ void rtl8185_set_rate(struct net_device *dev) u16 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 */ @@ -5152,8 +3393,6 @@ void rtl8180_adapter_start(struct net_device *dev) /* 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); @@ -5174,9 +3413,6 @@ void rtl8180_adapter_start(struct net_device *dev) rtl8180_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) { @@ -5191,7 +3427,6 @@ void rtl8180_adapter_start(struct net_device *dev) write_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); } @@ -5201,28 +3436,23 @@ void rtl8180_adapter_start(struct net_device *dev) if(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); @@ -5232,51 +3462,23 @@ void rtl8180_adapter_start(struct net_device *dev) rtl8180_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); -#if 0 - rtl8180_set_mode(dev,EPROM_CMD_CONFIG); - //write_nic_byte(dev,0x9d,0x20); //DMA Poll - //write_nic_word(dev,0x7a,0); - //write_nic_word(dev,0x7a,0x8000); -#if 0 - word = read_nic_word(dev, BcnItv); - word &= ~BcnItv_BcnItv; // clear Bcn_Itv - word |= priv->ieee80211->current_network.beacon_interval;//0x64; - write_nic_word(dev, BcnItv, word); -#endif -#endif 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; @@ -5286,30 +3488,11 @@ void rtl8180_start_tx_beacon(struct net_device *dev) */ write_nic_word(dev, BintrItv, word); - rtl8180_set_mode(dev, EPROM_CMD_NORMAL); -// rtl8180_beacon_tx_enable(dev); -#ifdef CONFIG_RTL8185B rtl8185b_irq_enable(dev); -#else - rtl8180_irq_enable(dev); -#endif - /* 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); @@ -5326,121 +3509,49 @@ 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. -#if 0 - if(priv->dot11PowerSaveMode == eMaxPs) - { - priv->ieee80211->ListenInterval = 10; - } - else - { - priv->ieee80211->ListenInterval = 2; - } -#endif + 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); - } } } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) + 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; -#else -void rtl8180_hw_wakeup_wq(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); -#endif -// printk("dev is %d\n",dev); -// printk("&*&(^*(&(&=========>%s()\n", __func__); rtl8180_hw_wakeup(dev); - } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) 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; -#else -void rtl8180_hw_sleep_wq(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); -#endif rtl8180_hw_sleep_down(dev); } -//YJ,add,080828,for KeepAlive static void MgntLinkKeepAlive(struct r8180_priv *priv ) { if (priv->keepAliveLevel == 0) @@ -5451,7 +3562,6 @@ static void MgntLinkKeepAlive(struct r8180_priv *priv ) // // 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 && @@ -5477,9 +3587,9 @@ static void MgntLinkKeepAlive(struct r8180_priv *priv ) 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); @@ -5488,20 +3598,18 @@ void rtl8180_watch_dog(struct net_device *dev) u32 TotalRxNum = 0; u16 SlotIndex = 0; u16 i = 0; -#ifdef ENABLE_IPS if(priv->ieee80211->actscanning == false){ if((priv->ieee80211->iw_mode != IW_MODE_ADHOC) && (priv->ieee80211->state == IEEE80211_NOLINK) && (priv->ieee80211->beinretry == false) && (priv->eRFPowerState == eRfOn)){ IPSEnter(dev); } } -#endif //YJ,add,080828,for link state check if((priv->ieee80211->state == IEEE80211_LINKED) && (priv->ieee80211->iw_mode == IW_MODE_INFRA)){ SlotIndex = (priv->link_detect.SlotIndex++) % priv->link_detect.SlotNum; 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); @@ -5513,47 +3621,13 @@ void rtl8180_watch_dog(struct net_device *dev) //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 -#if 0 -#ifndef ENABLE_LPS - if(priv->ieee80211->state == IEEE80211_LINKED){ - if( priv->NumRxOkInPeriod> 666 || - priv->NumTxOkInPeriod > 666 ) { - bBusyTraffic = true; - } - if((priv->ieee80211->NumRxData + priv->NumTxOkInPeriod)<8) { - bEnterPS= true; - } - if(bEnterPS) { - LeisurePSEnter(priv); - } - else { - LeisurePSLeave(priv); - } - } - else { - LeisurePSLeave(priv); - } -#endif - priv->NumRxOkInPeriod = 0; - priv->NumTxOkInPeriod = 0; - priv->ieee80211->NumRxData = 0; -#else -#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); @@ -5564,74 +3638,50 @@ void rtl8180_watch_dog(struct net_device *dev) if(((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; priv->link_detect.NumTxOkInPeriod = 0; priv->ieee80211->NumRxDataInPeriod = 0; priv->ieee80211->NumRxBcnInPeriod = 0; -#endif } + int _rtl8180_up(struct net_device *dev) { struct r8180_priv *priv = ieee80211_priv(dev); - //int i; priv->up=1; DMESG("Bringing up iface"); -#ifdef CONFIG_RTL8185B rtl8185b_adapter_start(dev); rtl8185b_rx_enable(dev); rtl8185b_tx_enable(dev); -#else - rtl8180_adapter_start(dev); - rtl8180_rx_enable(dev); - rtl8180_tx_enable(dev); -#endif -#ifdef ENABLE_IPS if(priv->bInactivePs){ if(priv->ieee80211->iw_mode == IW_MODE_ADHOC) 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); @@ -5641,10 +3691,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); @@ -5654,7 +3702,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); @@ -5665,14 +3712,14 @@ int rtl8180_close(struct net_device *dev) up(&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; @@ -5683,33 +3730,24 @@ 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; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_restart_wq(struct work_struct *work) { struct r8180_priv *priv = container_of(work, struct r8180_priv, reset_wq); struct net_device *dev = priv->dev; -#else -void rtl8180_restart_wq(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); -#endif + down(&priv->wx_sem); rtl8180_commit(dev); @@ -5720,26 +3758,20 @@ void rtl8180_restart_wq(struct net_device *dev) void 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); @@ -5751,39 +3783,19 @@ void rtl8180_commit(struct net_device *dev) _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); } -#if 0 -/* this is called by the kernel when it needs to TX a 802.3 encapsulated frame*/ -int rtl8180_8023_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - int ret; - unsigned long flags; - - spin_lock_irqsave(&priv->tx_lock,flags); - ret = ieee80211_r8180_8023_hardstartxmit(skb,priv->ieee80211); - spin_unlock_irqrestore(&priv->tx_lock,flags); - return ret; -} -#endif - int r8180_set_mac_adr(struct net_device *dev, void *mac) { struct r8180_priv *priv = ieee80211_priv(dev); @@ -5810,27 +3822,20 @@ int r8180_set_mac_adr(struct net_device *dev, void *mac) int 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, @@ -5850,14 +3855,9 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, unsigned long ioaddr = 0; struct net_device *dev = NULL; struct r8180_priv *priv= NULL; - //u8 *ptr; u8 unit = 0; -#ifdef CONFIG_RTL8180_IO_MAP - unsigned long pio_start, pio_len, pio_flags; -#else unsigned long pmem_start, pmem_len, pmem_flags; -#endif //end #ifdef RTL_IO_MAP DMESG("Configuring chip resources"); @@ -5867,7 +3867,6 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, } 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)); @@ -5876,38 +3875,11 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, priv = ieee80211_priv(dev); priv->ieee80211 = netdev_priv(dev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - SET_MODULE_OWNER(dev); -#endif pci_set_drvdata(pdev, dev); SET_NETDEV_DEV(dev, &pdev->dev); priv = ieee80211_priv(dev); -// memset(priv,0,sizeof(struct r8180_priv)); - priv->pdev=pdev; - - -#ifdef CONFIG_RTL8180_IO_MAP - - pio_start = (unsigned long)pci_resource_start (pdev, 0); - pio_len = (unsigned long)pci_resource_len (pdev, 0); - pio_flags = (unsigned long)pci_resource_flags (pdev, 0); - - if (!(pio_flags & IORESOURCE_IO)) { - DMESG("region #0 not a PIO resource, aborting"); - goto fail; - } - - //DMESG("IO space @ 0x%08lx", pio_start ); - if( ! request_region( pio_start, pio_len, RTL8180_MODULE_NAME ) ){ - DMESG("request_region failed!"); - goto fail; - } - - ioaddr = pio_start; - dev->base_addr = ioaddr; // device I/O address - -#else + priv->pdev = pdev; pmem_start = pci_resource_start(pdev, 1); pmem_len = pci_resource_len(pdev, 1); @@ -5918,31 +3890,22 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, 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 -#endif //end #ifdef RTL_IO_MAP - -#ifdef CONFIG_RTL8185B - //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)); -#endif dev->irq = pdev->irq; priv->irq = 0; @@ -5950,24 +3913,15 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, dev->netdev_ops = &rtl8180_netdev_ops; dev->wireless_handlers = &r8180_wx_handlers_def; -#if WIRELESS_EXT >= 12 -#if WIRELESS_EXT < 17 - dev->get_wireless_stats = r8180_get_wireless_stats; -#endif - dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def; -#endif - dev->type=ARPHRD_ETHER; dev->watchdog_timeo = HZ*3; //added by david woo, 2007.12.13 if (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; @@ -5981,28 +3935,14 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, DMESG("Driver probe completed\n"); return 0; - fail1: - -#ifdef CONFIG_RTL8180_IO_MAP - - if( dev->base_addr != 0 ){ - - release_region(dev->base_addr, - pci_resource_len(pdev, 0) ); - } -#else 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) ); } -#endif //end #ifdef RTL_IO_MAP - - fail: if(dev){ - if (priv->irq) { free_irq(dev->irq, dev); dev->irq=0; @@ -6015,57 +3955,38 @@ 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); rtl8180_proc_remove_one(dev); rtl8180_down(dev); priv->rf_close(dev); rtl8180_reset(dev); - //rtl8180_rtx_disable(dev); - //rtl8180_irq_disable(dev); mdelay(10); - //write_nic_word(dev,INTA,read_nic_word(dev,INTA)); - //force_pci_posting(dev); - //mdelay(10); if(priv->irq){ - DMESG("Freeing irq %d",dev->irq); free_irq(dev->irq, dev); priv->irq=0; - } free_rx_desc_ring(dev); free_tx_desc_rings(dev); - // free_beacon_desc_ring(dev,priv->txbeaconcount); - -#ifdef CONFIG_RTL8180_IO_MAP - if( dev->base_addr != 0 ){ - - release_region(dev->base_addr, - pci_resource_len(pdev, 0) ); - } -#else 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) ); } -#endif /*end #ifdef RTL_IO_MAP*/ free_ieee80211(dev); } @@ -6074,7 +3995,6 @@ static void __devexit rtl8180_pci_remove(struct pci_dev *pdev) DMESG("wlan driver removed\n"); } - /* fun with the built-in ieee80211 stack... */ extern int ieee80211_crypto_init(void); extern void ieee80211_crypto_deinit(void); @@ -6117,21 +4037,13 @@ static int __init rtl8180_pci_module_init(void) DMESG("Wireless extensions version %d", WIRELESS_EXT); rtl8180_proc_module_init(); -#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)) - if(0!=pci_module_init(&rtl8180_pci_driver)) -#else - if(0!=pci_register_driver(&rtl8180_pci_driver)) -#endif - //if(0!=pci_module_init(&rtl8180_pci_driver)) - { + if (pci_register_driver(&rtl8180_pci_driver)) { DMESG("No device found"); - /*pci_unregister_driver (&rtl8180_pci_driver);*/ return -ENODEV; } return 0; } - static void __exit rtl8180_pci_module_exit(void) { pci_unregister_driver (&rtl8180_pci_driver); @@ -6143,7 +4055,6 @@ static void __exit rtl8180_pci_module_exit(void) DMESG("Exiting"); } - void rtl8180_try_wake_queue(struct net_device *dev, int pri) { unsigned long flags; @@ -6158,25 +4069,17 @@ void rtl8180_try_wake_queue(struct net_device *dev, int pri) ieee80211_wake_queue(priv->ieee80211); } -/***************************************************************************** - -----------------------------IRQ STUFF--------------------------- -******************************************************************************/ - void rtl8180_tx_isr(struct net_device *dev, int pri,short error) { struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); - u32 *tail; //tail virtual addr u32 *head; //head virtual addr u32 *begin;//start of ring virtual addr u32 *nicv; //nic pointer virtual addr -// u32 *txdv; //packet just TXed u32 nic; //nic pointer physical addr u32 nicbegin;// start of ring physical addr -// short txed; unsigned long flag; /* physical addr are ok on 32 bits since we set DMA mask*/ - int offs; int j,i; int hd; @@ -6190,7 +4093,6 @@ void rtl8180_tx_isr(struct net_device *dev, int pri,short error) nic = read_nic_dword(dev,TX_MANAGEPRIORITY_RING_ADDR); nicbegin = priv->txmapringdma; break; - case BK_PRIORITY: tail = priv->txbkpringtail; begin = priv->txbkpring; @@ -6198,7 +4100,6 @@ void rtl8180_tx_isr(struct net_device *dev, int pri,short error) nic = read_nic_dword(dev,TX_BKPRIORITY_RING_ADDR); nicbegin = priv->txbkpringdma; break; - case BE_PRIORITY: tail = priv->txbepringtail; begin = priv->txbepring; @@ -6206,7 +4107,6 @@ void rtl8180_tx_isr(struct net_device *dev, int pri,short error) nic = read_nic_dword(dev,TX_BEPRIORITY_RING_ADDR); nicbegin = priv->txbepringdma; break; - case VI_PRIORITY: tail = priv->txvipringtail; begin = priv->txvipring; @@ -6214,7 +4114,6 @@ void rtl8180_tx_isr(struct net_device *dev, int pri,short error) nic = read_nic_dword(dev,TX_VIPRIORITY_RING_ADDR); nicbegin = priv->txvipringdma; break; - case VO_PRIORITY: tail = priv->txvopringtail; begin = priv->txvopring; @@ -6222,7 +4121,6 @@ void rtl8180_tx_isr(struct net_device *dev, int pri,short error) nic = read_nic_dword(dev,TX_VOPRIORITY_RING_ADDR); nicbegin = priv->txvopringdma; break; - case HI_PRIORITY: tail = priv->txhpringtail; begin = priv->txhpring; @@ -6235,21 +4133,11 @@ void rtl8180_tx_isr(struct net_device *dev, int pri,short error) spin_unlock_irqrestore(&priv->tx_lock,flag); return ; } -/* DMESG("%x %s %x %x",((int)nic & 0xfff)/8/4, - *(priv->txnpring + ((int)nic&0xfff)/4/8) & (1<<31) ? "filled" : "empty", - (priv->txnpringtail - priv->txnpring)/8,(priv->txnpringhead - -priv->txnpring)/8); -*/ - //nicv = (u32*) ((nic - nicbegin) + (int)begin); + 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; @@ -6259,69 +4147,39 @@ priv->txnpring)/8); * but not the currenly pointed by the nic (the next to be txed) * and the previous of the pointed (might be in process ??) */ - //if (head == nic) return; - //DMESG("%x %x",head,nic); offs = (nic - nicbegin); - //DMESG("%x %x %x",nic ,(u32)nicbegin, (int)nic -nicbegin); - offs = offs / 8 /4; - hd = (head - begin) /8; if(offs >= hd) j = offs - hd; else j = offs + (priv->txringcount -1 -hd); - // j= priv->txringcount -1- (hd - offs); j-=2; if(j<0) j=0; - for(i=0;i<j;i++) { -// printk("+++++++++++++check status desc\n"); if((*head) & (1<<31)) break; if(((*head)&(0x10000000)) != 0){ -// printk("++++++++++++++last desc,retry count is %d\n",((*head) & (0x000000ff))); priv->CurrRetryCnt += (u16)((*head) & (0x000000ff)); -#if 1 - if(!error) - { + if (!error) priv->NumTxOkTotal++; -// printk("NumTxOkTotal is %d\n",priv->NumTxOkTotal++); - } -#endif - // printk("in function %s:curr_retry_count is %d\n",__func__,((*head) & (0x000000ff))); } - if(!error){ + + if (!error) priv->NumTxOkBytesTotal += (*(head+3)) & (0x00000fff); - } -// printk("in function %s:curr_txokbyte_count is %d\n",__func__,(*(head+3)) & (0x00000fff)); + *head = *head &~ (1<<31); if((head - begin)/8 == priv->txringcount-1) head=begin; - else head+=8; } -#if 0 - if(nicv == begin) - txdv = begin + (priv->txringcount -1)*8; - else - txdv = nicv - 8; - - txed = !(txdv[0] &(1<<31)); - if(txed){ - if(!(txdv[0] & (1<<15))) error = 1; - //if(!(txdv[0] & (1<<30))) error = 1; - if(error)DMESG("%x",txdv[0]); - } -#endif - //DMESG("%x",txdv[0]); /* the head has been moved to the last certainly TXed * (or at least processed by the nic) packet. * The driver take forcefully owning of all these packets @@ -6334,63 +4192,41 @@ priv->txnpring)/8); switch(pri) { case MANAGE_PRIORITY: priv->txmapringhead = head; - //printk("1==========================================> priority check!\n"); + if(priv->ack_tx_to_ieee){ - // try to implement power-save mode 2008.1.22 - // printk("2==========================================> priority check!\n"); -#if 1 if(rtl8180_is_tx_queue_empty(dev)){ - // printk("tx queue empty, after send null sleep packet, try to sleep !\n"); priv->ack_tx_to_ieee = 0; ieee80211_ps_tx_ack(priv->ieee80211,!error); } -#endif } break; - case BK_PRIORITY: priv->txbkpringhead = head; break; - case BE_PRIORITY: priv->txbepringhead = head; break; - case VI_PRIORITY: priv->txvipringhead = head; break; - case VO_PRIORITY: priv->txvopringhead = head; break; - case HI_PRIORITY: priv->txhpringhead = head; break; } - /*DMESG("%x %x %x", (priv->txnpringhead - priv->txnpring) /8 , - (priv->txnpringtail - priv->txnpring) /8, - offs ); - */ - spin_unlock_irqrestore(&priv->tx_lock,flag); - } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_tx_irq_wq(struct work_struct *work) { - //struct r8180_priv *priv = container_of(work, struct r8180_priv, reset_wq); struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device * ieee = (struct ieee80211_device*) container_of(dwork, struct ieee80211_device, watch_dog_wq); struct net_device *dev = ieee->dev; -#else -void rtl8180_tx_irq_wq(struct net_device *dev) -{ - //struct r8180_priv *priv = ieee80211_priv(dev); -#endif + rtl8180_tx_isr(dev,MANAGE_PRIORITY,0); } irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs) @@ -6405,19 +4241,12 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs) spin_lock_irqsave(&priv->irq_th_lock,flags); -#ifdef CONFIG_RTL8185B //ISR: 4bytes inta = read_nic_dword(dev, ISR);// & priv->IntrMask; write_nic_dword(dev,ISR,inta); // reset int situation -#else - inta = read_nic_word(dev,INTA) & priv->irq_mask; - write_nic_word(dev,INTA,inta); // reset int situation -#endif priv->stats.shints++; - //DMESG("Enter interrupt, ISR value = 0x%08x", inta); - if(!inta){ spin_unlock_irqrestore(&priv->irq_th_lock,flags); return IRQ_HANDLED; @@ -6427,60 +4256,38 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs) */ } - if(inta == 0xffff){ - /* HW disappared */ - spin_unlock_irqrestore(&priv->irq_th_lock,flags); - return IRQ_HANDLED; + if (inta == 0xffff) { + /* HW disappared */ + spin_unlock_irqrestore(&priv->irq_th_lock, flags); + return IRQ_HANDLED; } priv->stats.ints++; -#ifdef DEBUG_IRQ - DMESG("NIC irq %x",inta); -#endif - //priv->irqpending = inta; - if(!netif_running(dev)) { spin_unlock_irqrestore(&priv->irq_th_lock,flags); return IRQ_HANDLED; } - if(inta & ISR_TimeOut){ + if (inta & ISR_TimeOut) write_nic_dword(dev, TimerInt, 0); - //DMESG("=================>waking up"); -// rtl8180_hw_wakeup(dev); - } - if(inta & ISR_TBDOK){ + if (inta & ISR_TBDOK) priv->stats.txbeacon++; - } - if(inta & ISR_TBDER){ + if (inta & ISR_TBDER) priv->stats.txbeaconerr++; - } - if(inta & IMR_TMGDOK ) { -// priv->NumTxOkTotal++; + if (inta & IMR_TMGDOK) rtl8180_tx_isr(dev,MANAGE_PRIORITY,0); -// schedule_work(&priv->tx_irq_wq); - - } 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 priv->stats.txhpokint++; rtl8180_tx_isr(dev,HI_PRIORITY,0); @@ -6488,18 +4295,10 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs) if(inta & ISR_RER) { priv->stats.rxerr++; -#ifdef DEBUG_RX - DMESGW("RX error int"); -#endif } -#ifdef CONFIG_RTL8185B 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); } @@ -6507,113 +4306,65 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs) if(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); } -#endif if(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); -#ifdef CONFIG_RTL8185B rtl8180_try_wake_queue(dev, NORM_PRIORITY); -#endif } if(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); } if(inta & ISR_BcnInt) { - //DMESG("Preparing Beacons"); rtl8180_prepare_beacon(dev); } 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); } - if(inta & ISR_TXFOVW) priv->stats.txoverflow++; + if (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 - // priv->ieee80211->stats.tx_packets++; priv->stats.txnpokint++; rtl8180_tx_isr(dev,NORM_PRIORITY,0); } 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 - // priv->ieee80211->stats.tx_packets++; priv->stats.txlpokint++; rtl8180_tx_isr(dev,LOW_PRIORITY,0); rtl8180_try_wake_queue(dev, LOW_PRIORITY); } -#ifdef CONFIG_RTL8185B if(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 rtl8180_tx_isr(dev,BK_PRIORITY,0); rtl8180_try_wake_queue(dev, BE_PRIORITY); @@ -6621,63 +4372,26 @@ irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs) if(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 rtl8180_tx_isr(dev,BE_PRIORITY,0); rtl8180_try_wake_queue(dev, BE_PRIORITY); } -#endif force_pci_posting(dev); spin_unlock_irqrestore(&priv->irq_th_lock,flags); return IRQ_HANDLED; } - void rtl8180_irq_rx_tasklet(struct r8180_priv* priv) { -// unsigned long flags; - -/* spin_lock_irqsave(&priv->irq_lock, flags); - priv->irq_mask &=~IMR_ROK; - priv->irq_mask &=~IMR_RDU; - - rtl8180_irq_enable(priv->dev); - spin_unlock_irqrestore(&priv->irq_lock, flags); -*/ rtl8180_rx(priv->dev); - -/* spin_lock_irqsave(&priv->irq_lock, flags); - priv->irq_mask |= IMR_ROK; - priv->irq_mask |= IMR_RDU; - rtl8180_irq_enable(priv->dev); - spin_unlock_irqrestore(&priv->irq_lock, flags); -*/ } -/**************************************************************************** -lizhaoming--------------------------- RF power on/power off ----------------- -*****************************************************************************/ - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void GPIOChangeRFWorkItemCallBack(struct work_struct *work) { - //struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, GPIOChangeRFWorkItem.work); struct net_device *dev = ieee->dev; struct r8180_priv *priv = ieee80211_priv(dev); -#else -void GPIOChangeRFWorkItemCallBack(struct ieee80211_device *ieee) -{ - struct net_device *dev = ieee->dev; - struct r8180_priv *priv = ieee80211_priv(dev); -#endif - - //u16 tmp2byte; u8 btPSR; u8 btConfig0; RT_RF_POWER_STATE eRfPowerStateToSet; @@ -6687,7 +4401,6 @@ void GPIOChangeRFWorkItemCallBack(struct ieee80211_device *ieee) static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh"; static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL}; static int readf_count = 0; - //printk("============>%s in \n", __func__); #ifdef ENABLE_LPS if(readf_count % 10 == 0) @@ -6695,14 +4408,6 @@ void GPIOChangeRFWorkItemCallBack(struct ieee80211_device *ieee) readf_count = (readf_count+1)%0xffff; #endif -#if 0 - if(priv->up == 0)//driver stopped - { - printk("\nDo nothing..."); - goto out; - } - else -#endif { // We should turn off LED before polling FF51[4]. @@ -6750,54 +4455,13 @@ void GPIOChangeRFWorkItemCallBack(struct ieee80211_device *ieee) call_usermodehelper(RadioPowerPath,argv,envp,1); } - } - } static u8 read_acadapter_file(char *filename) { -//#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)) -#if 0 - int fd; - char buf[1]; - char ret[50]; - int i = 0; - int n = 0; - mm_segment_t old_fs = get_fs(); - set_fs(KERNEL_DS); - - fd = sys_open(filename, O_RDONLY, 0); - if (fd >= 0) { - while (sys_read(fd, buf, 1) == 1) - { - i++; - if(i>10) - { - if(buf[0]!=' ') - { - ret[n]=buf[0]; - n++; - } - } - } - sys_close(fd); - } - ret[n]='\0'; -// printk("%s \n", ret); - set_fs(old_fs); - - if(strncmp(ret, "off-line",8) == 0) - { - return 1; - } -#endif return 0; } -/*************************************************************************** - ------------------- module init / exit stubs ---------------- -****************************************************************************/ module_init(rtl8180_pci_module_init); module_exit(rtl8180_pci_module_exit); - diff --git a/drivers/staging/rtl8187se/r8180_dm.c b/drivers/staging/rtl8187se/r8180_dm.c index e772f0f6b67c..b6eeeeccff9e 100644 --- a/drivers/staging/rtl8187se/r8180_dm.c +++ b/drivers/staging/rtl8187se/r8180_dm.c @@ -126,7 +126,6 @@ DoTxHighPower( // Because of some event happend, e.g. CCX TPC, High Power Mechanism, // We update Tx power of current channel again. // -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_tx_pw_wq (struct work_struct *work) { // struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq); @@ -135,11 +134,6 @@ void rtl8180_tx_pw_wq (struct work_struct *work) struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,tx_pw_wq); struct net_device *dev = ieee->dev; -#else -void rtl8180_tx_pw_wq(struct net_device *dev) -{ - // struct r8180_priv *priv = ieee80211_priv(dev); -#endif // printk("----> UpdateTxPowerWorkItemCallback()\n"); @@ -308,7 +302,6 @@ DynamicInitGain( } } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_hw_dig_wq (struct work_struct *work) { // struct r8180_priv *priv = container_of(work, struct r8180_priv, watch_dog_wq); @@ -317,11 +310,6 @@ void rtl8180_hw_dig_wq (struct work_struct *work) struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_dig_wq); struct net_device *dev = ieee->dev; -#else -void rtl8180_hw_dig_wq(struct net_device *dev) -{ - -#endif struct r8180_priv *priv = ieee80211_priv(dev); // Read CCK and OFDM False Alarm. @@ -529,7 +517,6 @@ MgntIsCckRate( return bReturn; } -#ifdef CONFIG_RTL818X_S // // Description: // Tx Power tracking mechanism routine on 87SE. @@ -1246,18 +1233,11 @@ SetInitialGain: priv->ieee80211->rate = priv->CurrentOperaRate * 5; } -#endif -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) void rtl8180_rate_adapter(struct work_struct * work) { struct delayed_work *dwork = to_delayed_work(work); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,rate_adapter_wq); struct net_device *dev = ieee->dev; -#else -void rtl8180_rate_adapter(struct net_device *dev) -{ - -#endif //struct r8180_priv *priv = ieee80211_priv(dev); // DMESG("---->rtl8180_rate_adapter"); StaRateAdaptive87SE(dev); @@ -1277,10 +1257,8 @@ void timer_rate_adaptive(unsigned long data) (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); @@ -1337,22 +1315,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; break; @@ -1368,21 +1336,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; break; @@ -1422,14 +1380,6 @@ SwitchAntenna( if(priv->CurrAntennaIndex == 0) { -#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"); @@ -1437,14 +1387,6 @@ SwitchAntenna( } else { -#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"); diff --git a/drivers/staging/rtl8187se/r8180_dm.h b/drivers/staging/rtl8187se/r8180_dm.h index b2736c8e521d..84f46728c3de 100644 --- a/drivers/staging/rtl8187se/r8180_dm.h +++ b/drivers/staging/rtl8187se/r8180_dm.h @@ -11,30 +11,12 @@ void SwAntennaDiversity(struct net_device *dev ); void SwAntennaDiversityTimerCallback(struct net_device *dev); bool CheckDig(struct net_device *dev); bool CheckHighPower(struct net_device *dev); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_hw_dig_wq (struct work_struct *work); -#else -void rtl8180_hw_dig_wq(struct net_device *dev); -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) void rtl8180_tx_pw_wq (struct work_struct *work); -#else -void rtl8180_tx_pw_wq(struct net_device *dev); -#endif -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) void rtl8180_rate_adapter(struct work_struct * work); - -#else -void rtl8180_rate_adapter(struct net_device *dev); - -#endif void TxPwrTracking87SE(struct net_device *dev); bool CheckTxPwrTracking(struct net_device *dev); -#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) void rtl8180_rate_adapter(struct work_struct * work); -#else -void rtl8180_rate_adapter(struct net_device *dev); -#endif void timer_rate_adaptive(unsigned long data); diff --git a/drivers/staging/rtl8187se/r8180_gct.c b/drivers/staging/rtl8187se/r8180_gct.c deleted file mode 100644 index 86cb427a7a40..000000000000 --- a/drivers/staging/rtl8187se/r8180_gct.c +++ /dev/null @@ -1,296 +0,0 @@ -/* - This files contains GCT radio frontend programming routines. - - This is part of rtl8180 OpenSource driver - Copyright (C) Andrea Merello 2004-2005 <andreamrl@tiscali.it> - 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. - - Code from Rtw8180 NetBSD driver by David Young has been really useful to - understand some things and gets some ideas - - Code from rtl8181 project has been useful to me to understand some things. - - Some code from 'Deuce' work - - We want to tanks the Authors of such projects and the Ndiswrapper - project Authors. -*/ - - -#include "r8180.h" -#include "r8180_hw.h" -#include "r8180_gct.h" - - -//#define DEBUG_GCT - -/* the following experiment are just experiments. - * this means if you enable them you can have every kind - * of result, included damage the RF chip, so don't - * touch them if you don't know what you are doing. - * In any case, if you do it, do at your own risk - */ - -//#define GCT_EXPERIMENT1 //improve RX sensivity - -//#define GCT_EXPERIMENT2 - -//#define GCT_EXPERIMENT3 //iprove a bit RX signal quality ? - -//#define GCT_EXPERIMENT4 //maybe solve some brokeness with experiment1 ? - -//#define GCT_EXPERIMENT5 - -//#define GCT_EXPERIMENT6 //not good - - -u32 gct_chan[] = { - 0x0, //dummy channel 0 - 0x0, //1 - 0x1, //2 - 0x2, //3 - 0x3, //4 - 0x4, //5 - 0x5, //6 - 0x6, //7 - 0x7, //8 - 0x8, //9 - 0x9, //10 - 0xa, //11 - 0xb, //12 - 0xc, //13 - 0xd, //14 -}; - -int gct_encode[16] = { - 0, 8, 4, 0xC, - 2, 0xA, 6, 0xE, - 1, 9, 5, 0xD, - 3, 0xB, 7, 0xF -}; - -void gct_rf_stabilize(struct net_device *dev) -{ - force_pci_posting(dev); - mdelay(3); //for now use a great value.. we may optimize in future -} - - -void write_gct(struct net_device *dev, u8 adr, u32 data) -{ -// struct r8180_priv *priv = ieee80211_priv(dev); - u32 phy_config; - - phy_config = gct_encode[(data & 0xf00) >> 8]; - phy_config |= gct_encode[(data & 0xf0) >> 4 ] << 4; - phy_config |= gct_encode[(data & 0xf) ] << 8; - phy_config |= gct_encode[(adr >> 1) & 0xf ] << 12; - phy_config |= (adr & 1 ) << 16; - phy_config |= gct_encode[(data & 0xf000)>>12] << 24; - - phy_config |= 0x90000000; // MAC will bang bits to the chip - - - write_nic_dword(dev,PHY_CONFIG,phy_config); -#ifdef DEBUG_GCT - DMESG("Writing GCT: %x (adr %x)",phy_config,adr); -#endif - gct_rf_stabilize(dev); -} - - - -void gct_write_phy_antenna(struct net_device *dev,short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u8 ant; - - ant = GCT_ANTENNA; - if(priv->antb) /*default antenna is antenna B */ - ant |= BB_ANTENNA_B; - if(ch == 14) - ant |= BB_ANTATTEN_CHAN14; - write_phy(dev,0x10,ant); - //DMESG("BB antenna %x ",ant); -} - - -void gct_rf_set_chan(struct net_device *dev, short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u32 txpw = 0xff & priv->chtxpwr[ch]; - u32 chan = gct_chan[ch]; - - //write_phy(dev,3,txpw); -#ifdef DEBUG_GCT - DMESG("Gct set channel"); -#endif - /* set TX power */ - write_gct(dev,0x15,0); - write_gct(dev,6, txpw); - write_gct(dev,0x15, 0x10); - write_gct(dev,0x15,0); - - /*set frequency*/ - write_gct(dev,7, 0); - write_gct(dev,0xB, chan); - write_gct(dev,7, 0x1000); - -#ifdef DEBUG_GCT - DMESG("Gct set channel > write phy antenna"); -#endif - - - gct_write_phy_antenna(dev,ch); - -} - - -void gct_rf_close(struct net_device *dev) -{ - u32 anaparam; - - anaparam = read_nic_dword(dev,ANAPARAM); - anaparam &= 0x000fffff; - anaparam |= 0x3f900000; - rtl8180_set_anaparam(dev, anaparam); - - write_gct(dev, 0x7, 0); - write_gct(dev, 0x1f, 0x45); - write_gct(dev, 0x1f, 0x5); - write_gct(dev, 0x0, 0x8e4); -} - - -void gct_rf_init(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - //u32 anaparam; - - - write_nic_byte(dev,PHY_DELAY,0x6); //this is general - write_nic_byte(dev,CARRIER_SENSE_COUNTER,0x4c); //this is general - - //DMESG("%x", read_nic_dword(dev,ANAPARAM)); - /* we should set anaparm here*/ - //rtl8180_set_anaparam(dev,anaparam); - - write_gct(dev,0x1f,0); - write_gct(dev,0x1f,0); - write_gct(dev,0x1f,0x40); - write_gct(dev,0x1f,0x60); - write_gct(dev,0x1f,0x61); - write_gct(dev,0x1f,0x61); - write_gct(dev,0x0,0xae4); - write_gct(dev,0x1f,0x1); - write_gct(dev,0x1f,0x41); - write_gct(dev,0x1f,0x61); - write_gct(dev,0x1,0x1a23); - write_gct(dev,0x2,0x4971); - write_gct(dev,0x3,0x41de); - write_gct(dev,0x4,0x2d80); -#ifdef GCT_EXPERIMENT1 - //write_gct(dev,0x5,0x6810); // from zydas driver. sens+ but quite slow - //write_gct(dev,0x5,0x681f); //good+ (somewhat stable, better sens, performance decent) - write_gct(dev,0x5,0x685f); //good performances, not sure sens is really so beeter - //write_gct(dev,0x5,0x687f); //good performances, maybe sens is not improved - //write_gct(dev,0x5,0x689f); //like above - //write_gct(dev,0x5,0x685e); //bad - //write_gct(dev,0x5,0x68ff); //good+ (somewhat stable, better sens(?), performance decent) - //write_gct(dev,0x5,0x68f0); //bad - //write_gct(dev,0x5,0x6cff); //sens+ but not so good - //write_gct(dev,0x5,0x6dff); //sens+,apparentely very good but broken - //write_gct(dev,0x5,0x65ff); //sens+,good - //write_gct(dev,0x5,0x78ff); //sens + but almost broken - //write_gct(dev,0x5,0x7810); //- //snes + but broken - //write_gct(dev,0x5,0x781f); //-- //sens + - //write_gct(dev,0x5,0x78f0); //low sens -#else - write_gct(dev,0x5,0x61ff); //best performance but weak sensitivity -#endif -#ifdef GCT_EXPERIMENT2 - write_gct(dev,0x6,0xe); -#else - write_gct(dev,0x6,0x0); -#endif - write_gct(dev,0x7,0x0); - write_gct(dev,0x8,0x7533); - write_gct(dev,0x9,0xc401); - write_gct(dev,0xa,0x0); - write_gct(dev,0xc,0x1c7); - write_gct(dev,0xd,0x29d3); - write_gct(dev,0xe,0x2e8); - write_gct(dev,0x10,0x192); -#ifdef GCT_EXPERIMENT3 - write_gct(dev,0x11,0x246); -#else - write_gct(dev,0x11,0x248); -#endif - write_gct(dev,0x12,0x0); - write_gct(dev,0x13,0x20c4); -#ifdef GCT_EXPERIMENT4 - write_gct(dev,0x14,0xf488); -#else - write_gct(dev,0x14,0xf4fc); -#endif -#ifdef GCT_EXPERIMENT5 - write_gct(dev,0x15,0xb152); -#else - write_gct(dev,0x15,0x0); -#endif -#ifdef GCT_EXPERIMENT6 - write_gct(dev,0x1e,0x1); -#endif - write_gct(dev,0x16,0x1500); - - write_gct(dev,0x7,0x1000); - /*write_gct(dev,0x15,0x0); - write_gct(dev,0x6,0x15); - write_gct(dev,0x15,0x8); - write_gct(dev,0x15,0x0); -*/ - write_phy(dev,0,0xa8); - -/* write_gct(dev,0x15,0x0); - write_gct(dev,0x6,0x12); - write_gct(dev,0x15,0x8); - write_gct(dev,0x15,0x0); -*/ - write_phy(dev,3,0x0); - write_phy(dev,4,0xc0); /* lna det*/ - write_phy(dev,5,0x90); - write_phy(dev,6,0x1e); - write_phy(dev,7,0x64); - -#ifdef DEBUG_GCT - DMESG("Gct init> write phy antenna"); -#endif - - gct_write_phy_antenna(dev,priv->chan); - - write_phy(dev,0x11,0x88); - if(!priv->diversity) - write_phy(dev,0x12,0xc0); - else - write_phy(dev,0x12,0x40); - - write_phy(dev,0x13,0x90 | priv->cs_treshold ); - - write_phy(dev,0x19,0x0); - write_phy(dev,0x1a,0xa0); - write_phy(dev,0x1b,0x44); - -#ifdef DEBUG_GCT - DMESG("Gct init > set channel2"); -#endif - - gct_rf_set_chan(dev,priv->chan); -} diff --git a/drivers/staging/rtl8187se/r8180_gct.h b/drivers/staging/rtl8187se/r8180_gct.h deleted file mode 100644 index fe965ca64304..000000000000 --- a/drivers/staging/rtl8187se/r8180_gct.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - This is part of rtl8180 OpenSource driver - v 0.20 - Copyright (C) Andrea Merello 2004 <andreamrl@tiscali.it> - 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); diff --git a/drivers/staging/rtl8187se/r8180_hw.h b/drivers/staging/rtl8187se/r8180_hw.h index bf38934bc090..db296911ec77 100644 --- a/drivers/staging/rtl8187se/r8180_hw.h +++ b/drivers/staging/rtl8187se/r8180_hw.h @@ -20,8 +20,6 @@ #ifndef R8180_HW #define R8180_HW -#define CONFIG_RTL8185B //support for rtl8185B, xiong-2006-11-15 -#define CONFIG_RTL818X_S #define BIT0 0x00000001 #define BIT1 0x00000002 @@ -31,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 @@ -59,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 @@ -98,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) @@ -113,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 @@ -133,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)) @@ -160,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 @@ -191,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 @@ -216,91 +169,38 @@ * 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 -#ifdef CONFIG_RTL8185B #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 #define IMR 0x006C #define ISR 0x003C -#else -#define BRSR 0x002C -#define BRSR_END 0x002D - -/* 0x0034 - 0x0034 - reserved */ -#define EIFS 0x0035 - -#define IMR 0x003C -#define IMR_END 0x003D -#define ISR 0x003E -#define ISR_END 0x003F -#endif #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 #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,49 +208,20 @@ #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 -/* 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 @@ -382,108 +253,12 @@ #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 */ - -#ifdef CONFIG_RTL818X_S #define PHYPR 0xDA //0xDA - 0x0B PHY Parameter Register. -#endif - -#define CWR 0x00DC -#define CWR_END 0x00DD - -#define RetryCTR 0x00DE - -/* 0x00DF - 0x00E3 - reserved */ - -#define RDSAR 0x00E4 -#define RDSAR_END 0x00E7 -/* 0x00E8 - 0x00EF - reserved */ -#ifdef CONFIG_RTL818X_S -#define LED_CONTROL 0xED -#endif - -#define FER 0x00F0 -#define FER_END 0x00F3 - -#ifdef CONFIG_RTL8185B #define FEMR 0x1D4 // Function Event Mask register -#else -#define FEMR 0x00F4 -#define FEMR_END 0x00F7 -#endif - -#define FPSR 0x00F8 -#define FPSR_END 0x00FB #define FFER 0x00FC #define FFER_END 0x00FF @@ -510,7 +285,6 @@ #define CR_TE ((1<< 2)) #define CR_MulRW ((1<< 0)) -#ifdef CONFIG_RTL8185B #define IMR_Dot11hInt ((1<< 25)) // 802.11h Measurement Interrupt #define IMR_BcnDmaInt ((1<< 24)) // Beacon DMA Interrupt // What differenct between BcnDmaInt and BcnInt??? #define IMR_WakeInt ((1<< 23)) // Wake Up Interrupt @@ -573,49 +347,12 @@ #define ISR_TimeOut ISR_TimeOut1 #define ISR_RXFOVW ISR_FOVW -#else -#define IMR_TXFOVW ((1<<15)) -#define IMR_TimeOut ((1<<14)) -#define IMR_BcnInt ((1<<13)) -#define IMR_ATIMInt ((1<<12)) -#define IMR_TBDER ((1<<11)) -#define IMR_TBDOK ((1<<10)) -#define IMR_THPDER ((1<< 9)) -#define IMR_THPDOK ((1<< 8)) -#define IMR_TNPDER ((1<< 7)) -#define IMR_TNPDOK ((1<< 6)) -#define IMR_RXFOVW ((1<< 5)) -#define IMR_RDU ((1<< 4)) -#define IMR_TLPDER ((1<< 3)) -#define IMR_TLPDOK ((1<< 2)) -#define IMR_RER ((1<< 1)) -#define IMR_ROK ((1<< 0)) - -#define ISR_TXFOVW ((1<<15)) -#define ISR_TimeOut ((1<<14)) -#define ISR_BcnInt ((1<<13)) -#define ISR_ATIMInt ((1<<12)) -#define ISR_TBDER ((1<<11)) -#define ISR_TBDOK ((1<<10)) -#define ISR_THPDER ((1<< 9)) -#define ISR_THPDOK ((1<< 8)) -#define ISR_TNPDER ((1<< 7)) -#define ISR_TNPDOK ((1<< 6)) -#define ISR_RXFOVW ((1<< 5)) -#define ISR_RDU ((1<< 4)) -#define ISR_TLPDER ((1<< 3)) -#define ISR_TLPDOK ((1<< 2)) -#define ISR_RER ((1<< 1)) -#define ISR_ROK ((1<< 0)) -#endif #define HW_VERID_R8180_F 3 #define HW_VERID_R8180_ABCD 2 #define HW_VERID_R8185_ABC 4 #define HW_VERID_R8185_D 5 -#ifdef CONFIG_RTL8185B #define HW_VERID_R8185B_B 6 -#endif #define TCR_CWMIN ((1<<31)) #define TCR_SWSEQ ((1<<30)) @@ -671,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 @@ -726,54 +420,19 @@ #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)) -#ifdef CONFIG_RTL8185B // Three wire mode. #define SW_THREE_WIRE 0 #define HW_THREE_WIRE 2 @@ -790,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 @@ -814,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 @@ -827,11 +473,7 @@ #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,33 +482,14 @@ #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) -//---------------------------------------------------------------------------- -#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) @@ -885,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 @@ -916,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 @@ -934,23 +555,19 @@ //{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 #define EEPROM_COUNTRY_CODE 0x2E //YJ,add,080630,end -#endif #endif diff --git a/drivers/staging/rtl8187se/r8180_max2820.c b/drivers/staging/rtl8187se/r8180_max2820.c deleted file mode 100644 index cea08463d5ee..000000000000 --- a/drivers/staging/rtl8187se/r8180_max2820.c +++ /dev/null @@ -1,240 +0,0 @@ -/* - This files contains MAXIM MAX2820 radio frontend programming routines. - - This is part of rtl8180 OpenSource driver - Copyright (C) Andrea Merello 2004-2005 <andreamrl@tiscali.it> - 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. - - NetBSD rtl8180 driver from Dave Young has been really useful to - understand how to program the MAXIM radio. Thanks a lot!!! - - 'The Deuce' tested this and fixed some bugs. - - Code from rtl8181 project has been useful to me to understand some things. - - We want to tanks the Authors of such projects and the Ndiswrapper - project Authors. -*/ - - -#include "r8180.h" -#include "r8180_hw.h" -#include "r8180_max2820.h" - - -//#define DEBUG_MAXIM - -u32 maxim_chan[] = { - 0, //dummy channel 0 - 12, //1 - 17, //2 - 22, //3 - 27, //4 - 32, //5 - 37, //6 - 42, //7 - 47, //8 - 52, //9 - 57, //10 - 62, //11 - 67, //12 - 72, //13 - 84, //14 -}; - -#if 0 -/* maxim expects 4 bit address MSF, then 12 bit data MSF*/ -void write_maxim(struct net_device *dev,u8 adr, u32 data) -{ - - int shift; - short bit; - u16 word; - - adr = adr &0xf; - word = (u16)data & 0xfff; - word |= (adr<<12); - /*write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | BB_HOST_BANG_EN); - read_nic_dword(dev,PHY_CONFIG); - mdelay(1); - - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | BB_HOST_BANG_EN | BB_HOST_BANG_CLK); - read_nic_dword(dev,PHY_CONFIG); - mdelay(1); - */ - - /* MAX2820 will sample data on rising edge of clock */ - for(shift = 15;shift >=0; shift--){ - bit = word>>shift & 1; - - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | (bit<<BB_HOST_BANG_DATA)); - - read_nic_dword(dev,PHY_CONFIG); - mdelay(2); - - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | - (bit<<BB_HOST_BANG_DATA) | BB_HOST_BANG_CLK); /* sample data */ - - read_nic_dword(dev,PHY_CONFIG); - mdelay(1); - - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | - (bit<<BB_HOST_BANG_DATA)); - - read_nic_dword(dev,PHY_CONFIG); - mdelay(2); - - } - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | (bit<<BB_HOST_BANG_DATA)| - BB_HOST_BANG_EN); - read_nic_dword(dev,PHY_CONFIG); - mdelay(2); - - /* The shift register fill flush to the requested register the - * last 12 bits data shifted in - */ - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | (bit<<BB_HOST_BANG_DATA)| - BB_HOST_BANG_EN | BB_HOST_BANG_CLK); - read_nic_dword(dev,PHY_CONFIG); - mdelay(2); - - write_nic_dword(dev,PHY_CONFIG,BB_HOST_BANG | (bit<<BB_HOST_BANG_DATA)| - BB_HOST_BANG_EN); - read_nic_dword(dev,PHY_CONFIG); - mdelay(2); - - -#ifdef DEBUG_MAXIM - DMESG("Writing maxim: %x (adr %x)",phy_config,adr); -#endif - -} -#endif - -void write_maxim(struct net_device *dev,u8 adr, u32 data) { - u32 temp; - temp = 0x90 + (data & 0xf); - temp <<= 16; - temp += adr; - temp <<= 8; - temp += (data >> 4) & 0xff; -#ifdef DEBUG_MAXIM - DMESG("write_maxim: %08x", temp); -#endif - write_nic_dword(dev, PHY_CONFIG, temp); - force_pci_posting(dev); - mdelay(1); -} - - -void maxim_write_phy_antenna(struct net_device *dev,short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u8 ant; - - ant = MAXIM_ANTENNA; - if(priv->antb) /*default antenna is antenna B */ - ant |= BB_ANTENNA_B; - if(ch == 14) - ant |= BB_ANTATTEN_CHAN14; - write_phy(dev,0x10,ant); - //DMESG("BB antenna %x ",ant); -} - - -void maxim_rf_set_chan(struct net_device *dev, short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u32 txpw = 0xff & priv->chtxpwr[ch]; - u32 chan = maxim_chan[ch]; - - /*While philips SA2400 drive the PA bias - *seems that for MAXIM we delegate this - *to the BB - */ - - //write_maxim(dev,5,txpw); - write_phy(dev,3,txpw); - - maxim_write_phy_antenna(dev,ch); - write_maxim(dev,3,chan); -} - - -void maxim_rf_close(struct net_device *dev) -{ - write_phy(dev, 3, 0x8); - write_maxim(dev, 1, 0); -} - - -void maxim_rf_init(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u32 anaparam; - - write_nic_byte(dev,PHY_DELAY,0x6); //this is general - write_nic_byte(dev,CARRIER_SENSE_COUNTER,0x4c); //this is general - - /*these are maxim specific*/ - anaparam = read_nic_dword(dev,ANAPARAM); - anaparam = anaparam &~ (ANAPARAM_TXDACOFF_SHIFT); - anaparam = anaparam &~ANAPARAM_PWR1_MASK; - anaparam = anaparam &~ANAPARAM_PWR0_MASK; - anaparam |= (MAXIM_ANAPARAM_PWR1_ON<<ANAPARAM_PWR1_SHIFT); - anaparam |= (MAXIM_ANAPARAM_PWR0_ON<<ANAPARAM_PWR0_SHIFT); - - //rtl8180_set_anaparam(dev,anaparam); - - /* MAXIM from netbsd driver */ - - write_maxim(dev,0, 7); /* test mode as indicated in datasheet*/ - write_maxim(dev,1, 0x1e); /* enable register*/ - write_maxim(dev,2, 1); /* synt register */ - - - maxim_rf_set_chan(dev,priv->chan); - - write_maxim(dev,4, 0x313); /* rx register*/ - - /* PA is driven directly by the BB, we keep the MAXIM bias - * at the highest value in the boubt tha pleacing it to lower - * values may introduce some further attenuation somewhere.. - */ - - write_maxim(dev,5, 0xf); - - - /*baseband configuration*/ - write_phy(dev,0,0x88); //sys1 - write_phy(dev,3,0x8); //txagc - write_phy(dev,4,0xf8); // lnadet - write_phy(dev,5,0x90); // ifagcinit - write_phy(dev,6,0x1a); // ifagclimit - write_phy(dev,7,0x64); // ifagcdet - - /*Should be done something more here??*/ - - maxim_write_phy_antenna(dev,priv->chan); - - write_phy(dev,0x11,0x88); //trl - if(priv->diversity) - write_phy(dev,0x12,0xc7); - else - write_phy(dev,0x12,0x47); - - write_phy(dev,0x13,0x9b); - - write_phy(dev,0x19,0x0); //CHESTLIM - write_phy(dev,0x1a,0x9f); //CHSQLIM - - maxim_rf_set_chan(dev,priv->chan); -} diff --git a/drivers/staging/rtl8187se/r8180_max2820.h b/drivers/staging/rtl8187se/r8180_max2820.h deleted file mode 100644 index 5d4fb5504841..000000000000 --- a/drivers/staging/rtl8187se/r8180_max2820.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - This is part of rtl8180 OpenSource driver - Copyright (C) Andrea Merello 2004-2005 <andreamrl@tiscali.it> - 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); diff --git a/drivers/staging/rtl8187se/r8180_pm.c b/drivers/staging/rtl8187se/r8180_pm.c deleted file mode 100644 index 2b3d642db77f..000000000000 --- a/drivers/staging/rtl8187se/r8180_pm.c +++ /dev/null @@ -1,92 +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 <andreamrl@tiscali.it> - Released under the terms of GPL (General Public Licence) -*/ - -#ifdef CONFIG_RTL8180_PM - - -#include "r8180_hw.h" -#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) -{ - struct net_device *dev = pci_get_drvdata(pdev); -// struct r8180_priv *priv = ieee80211_priv(dev); - - if (!netif_running(dev)) - goto out_pci_suspend; - - if (dev->netdev_ops->ndo_stop) - dev->netdev_ops->ndo_stop(dev); - - netif_device_detach(dev); - -out_pci_suspend: - pci_save_state(pdev); - pci_disable_device(pdev); - pci_set_power_state(pdev,pci_choose_state(pdev,state)); - return 0; -} - -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) { - 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 - * from interfering with C3 CPU state. pci_restore_state won't help - * here since it only restores the first 64 bytes pci config header. - */ - pci_read_config_dword(pdev, 0x40, &val); - if ((val & 0x0000ff00) != 0) - pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); - - 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); -} - - - -#endif //CONFIG_RTL8180_PM diff --git a/drivers/staging/rtl8187se/r8180_pm.h b/drivers/staging/rtl8187se/r8180_pm.h deleted file mode 100644 index 7958b3a734db..000000000000 --- a/drivers/staging/rtl8187se/r8180_pm.h +++ /dev/null @@ -1,28 +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 <andreamrl@tiscali.it> - Released under the terms of GPL (General Public Licence) - -*/ - -#ifdef CONFIG_RTL8180_PM - -#ifndef R8180_PM_H -#define R8180_PM_H - -#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 - -#endif // CONFIG_RTL8180_PM diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.c b/drivers/staging/rtl8187se/r8180_rtl8225.c deleted file mode 100644 index 96ed029ed64a..000000000000 --- a/drivers/staging/rtl8187se/r8180_rtl8225.c +++ /dev/null @@ -1,933 +0,0 @@ -/* - This is part of the rtl8180-sa2400 driver - released under the GPL (See file COPYING for details). - Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it> - - This files contains programming code for the rtl8225 - radio frontend. - - *Many* thanks to Realtek Corp. for their great support! - -*/ - - - -#include "r8180_hw.h" -#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 -}; - -#if 0 -u8 rtl8225_init_gain[]={ - //0x00,0x00,0x00,0x00,//0x00,0x00,0x00,0x00, - 0x33,0x80,0x6c,0xc5,//0x00,0x49,0x06,0xb5,//Gain = 0 ~ -78dbm - 0x43,0x78,0x69,0xc5,//0x00,0x45,0x06,0xb1,//Gain = 1 ~ -74dbm - 0x53,0x60,0x66,0xc5,//0x00,0x41,0x06,0xab,//Gain = 2 ~ -70dbm - 0x63,0x58,0x63,0xc5,//0x00,0x3d,0x06,0xa5,//Gain = 3 ~ -66dbm - 0x73,0x50,0x62,0xc5,//0x00,0x39,0x06,0xa1,//Gain = 4 ~ -62dbm - 0x83,0x43,0x61,0xc5,//0x00,0x35,0x06,0x9b,//Gain = 5 ~ -58dbm - 0x93,0x38,0x5a,0xc5,//0x00,0x31,0x06,0x99,//Gain = 6 ~ -54dbm -}; -#endif -#ifdef CONFIG_RTL818X_S -u32 rtl8225_chan[] ={ - 0, - 0x0080, //ch1 - 0x0100, //ch2 - 0x0180, //ch3 - 0x0200, //ch4 - 0x0280, - 0x0300, - 0x0380, - 0x0400, - 0x0480, - 0x0500, - 0x0580, - 0x0600, - 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, - 0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541, - 0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583, - 0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, - 0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688, - 0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745, - 0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789, - 0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793, - 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, - 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, - 0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07b0, 0x07b1, 0x07b2, 0x07b3, - 0x07b4, 0x07b5, 0x07b8, 0x07b9, 0x07ba, 0x07bb, 0x07bb - -}; - - -#if 0 -u16 rtl8225bc_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, - 0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, - 0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688, - 0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745, - 0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789, - 0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793, - 0x0794, 0x0795, 0x0798, 0x0799, 0x039a, 0x039b, 0x039c, 0x039d, - 0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a8, 0x03a9, - 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3, - 0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb - -}; - - -u16 rtl8225a_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, - 0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, - 0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688, - 0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745, - 0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789, - 0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793, - 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, - 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, - 0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07ad, 0x07ad, 0x07ad, 0x07ad, - 0x07ad, 0x07ad, 0x07ad, 0x07ad, 0x07ad, 0x07ad, 0x07ad -}; -#endif - -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_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[]={ - 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]); - write_phy_ofdm(dev, 0x23, rtl8225_gain[gain * 4 + 1]); - write_phy_ofdm(dev, 0x1b, rtl8225_gain[gain * 4 + 2]); - write_phy_ofdm(dev, 0x1d, rtl8225_gain[gain * 4 + 3]); -} -#if 0 - -void rtl8225_set_gain(struct net_device *dev, short gain) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); - - if(priv->card_8185 == 2) - write_phy_ofdm(dev, 0x21, 0x27); - else - write_phy_ofdm(dev, 0x21, 0x37); - - write_phy_ofdm(dev, 0x25, 0x20); - write_phy_ofdm(dev, 0x11, 0x6); - - if(priv->card_8185 == 1 && priv->card_8185_Bversion) - write_phy_ofdm(dev, 0x27, 0x8); - else - write_phy_ofdm(dev, 0x27, 0x88); - - write_phy_ofdm(dev, 0x14, 0); - write_phy_ofdm(dev, 0x16, 0); - write_phy_ofdm(dev, 0x15, 0x40); - write_phy_ofdm(dev, 0x17, 0x40); - - write_phy_ofdm(dev, 0x0d, rtl8225_gain[gain * 4]); - write_phy_ofdm(dev, 0x23, rtl8225_gain[gain * 4 + 1]); - write_phy_ofdm(dev, 0x1b, rtl8225_gain[gain * 4 + 2]); - write_phy_ofdm(dev, 0x1d, rtl8225_gain[gain * 4 + 3]); - //rtl8225_set_gain_usb(dev, gain); -} -#endif - - -void write_rtl8225(struct net_device *dev, u8 adr, u16 data) -{ - int i; - 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)); - - select = read_nic_word(dev, RFPinsSelect); - - write_nic_word(dev, RFPinsSelect, select | 0x7 | - ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO)); - - force_pci_posting(dev); - udelay(10); - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff); - - force_pci_posting(dev); - udelay(2); - - write_nic_word(dev, RFPinsOutput, out); - - force_pci_posting(dev); - udelay(10); - - - for(i=15; i>=0;i--){ - - bit = (bangdata & (1<<i)) >> i; - - write_nic_word(dev, RFPinsOutput, bit | out); - - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - - 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); - - write_nic_word(dev, RFPinsOutput, bit | out); - - } - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); - - force_pci_posting(dev); - udelay(10); - - write_nic_word(dev, RFPinsOutput, out | - ((priv->card_type == USB) ? 4 : BB_HOST_BANG_EN)); - - write_nic_word(dev, RFPinsSelect, select | - ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO)); - - if(priv->card_type == USB) - mdelay(2); - else - rtl8185_rf_pins_enable(dev); -} - -void rtl8225_rf_close(struct net_device *dev) -{ - write_rtl8225(dev, 0x4, 0x1f); - - force_pci_posting(dev); - mdelay(1); - - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_OFF); - rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_OFF); -} - -void rtl8225_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 max_ofdm_power_level; - u8 min_ofdm_power_level; - u8 cck_power_level = 0xff & priv->chtxpwr[ch]; - u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdm[ch]; - - if(priv->card_type == USB){ - max_cck_power_level = 11; - max_ofdm_power_level = 25; // 12 -> 25 - min_ofdm_power_level = 10; - }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) - cck_power_level = max_cck_power_level; - 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++){ - - power = cck_power_table[GainIdx * 8 + i]; - write_phy_cck(dev, 0x44 + i, power); - } - - /* FIXME Is this delay really needeed ? */ - 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; - 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); -// } - - - power = rtl8225_tx_power_ofdm[GainIdx]; - - write_phy_ofdm(dev, 0x5, power); - write_phy_ofdm(dev, 0x7, power); - - force_pci_posting(dev); - mdelay(1); - //write_nic_byte(dev, TX_AGC_CONTROL,4); -} -#if 0 -/* switch between mode B and G */ -void rtl8225_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 rtl8225_rf_set_chan(struct net_device *dev, short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - short gset = (priv->ieee80211->state == IEEE80211_LINKED && - ieee80211_is_54g(priv->ieee80211->current_network)) || - priv->ieee80211->iw_mode == IW_MODE_MONITOR; - - rtl8225_SetTXPowerLevel(dev, ch); - - write_rtl8225(dev, 0x7, rtl8225_chan[ch]); - - force_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(priv->ieee80211->state == IEEE80211_LINKED && - ieee80211_is_shortslot(priv->ieee80211->current_network)) - write_nic_byte(dev,SLOT,0x9); //SLOT: 9 - - else - write_nic_byte(dev,SLOT,0x14); //SLOT: 20 (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"); - } - - -} - -void rtl8225_host_pci_init(struct net_device *dev) -{ - write_nic_word(dev, RFPinsOutput, 0x480); - - rtl8185_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_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) -{ - #if 0 - write_nic_byte(dev,RFPinsSelect+1,0); - - write_nic_byte(dev,GPIO,0); - - write_nic_byte_E(dev,0x53,read_nic_byte_E(dev,0x53) | (1<<7)); - - write_nic_byte(dev,RFPinsSelect+1,4); - - write_nic_byte(dev,GPIO,0x20); - - write_nic_byte(dev,GP_ENABLE,0); - - - /* Config BB & RF */ - write_nic_word(dev, RFPinsOutput, 0x80); - - write_nic_word(dev, RFPinsSelect, 0x80); - - write_nic_word(dev, RFPinsEnable, 0x80); - - - mdelay(100); - - mdelay(1000); -#endif - -} - -void rtl8225_rf_sleep(struct net_device *dev) -{ - write_rtl8225(dev,0x4,0xdff); - force_pci_posting(dev); - mdelay(1); - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_SLEEP); - rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_SLEEP); - force_pci_posting(dev); -} - -void rtl8225_rf_wakeup(struct net_device *dev) -{ - write_rtl8225(dev,0x4,0x9ff); - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); - rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON); - force_pci_posting(dev); -} - -void rtl8225_rf_init(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - int i; - short channel = 1; - u16 brsr; - - priv->chan = channel; - - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); - - - if(priv->card_type == USB) - rtl8225_host_usb_init(dev); - else - rtl8225_host_pci_init(dev); - - write_nic_dword(dev, RF_TIMING, 0x000a8008); - - brsr = read_nic_word(dev, BRSR); - - write_nic_word(dev, BRSR, 0xffff); - - #if 0 - if(priv->card_8185 == 1){/* version C or B */ - if(priv->card_8185_Bversion) /* version B*/ - write_nic_dword(dev, RF_PARA, 0x44); - else /* version C */ - write_nic_dword(dev, RF_PARA, 0x100044); - }else{ /* version D */ - if(priv->enable_gpio0) - write_nic_dword(dev, RF_PARA, 0x20100044); - else /* also USB */ - write_nic_dword(dev, RF_PARA, 0x100044); - } - #endif - - 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 - - if(priv->card_type == USB){ - rtl8185_rf_pins_enable(dev); - - mdelay(1000); - } - - write_rtl8225(dev, 0x0, 0x67); mdelay(1); - - - write_rtl8225(dev, 0x1, 0xfe0); mdelay(1); - - write_rtl8225(dev, 0x2, 0x44d); mdelay(1); - - write_rtl8225(dev, 0x3, 0x441); mdelay(1); - - if(priv->card_type == USB) - write_rtl8225(dev, 0x4, 0x486); - else - write_rtl8225(dev, 0x4, 0x8be); - - mdelay(1); - - - #if 0 - }else if(priv->phy_ver == 1){ - /* version A */ - write_rtl8225(dev, 0x5, 0xbc0 + 2); - }else{ - #endif - /* version B & C */ - - if(priv->card_type == USB) - write_rtl8225(dev, 0x5, 0xbc0); - else if(priv->card_type == MINIPCI) - write_rtl8225(dev, 0x5, 0xbc0 + 3 +(6<<3)); - else - write_rtl8225(dev, 0x5, 0xbc0 + (6<<3)); - - mdelay(1); -// } - - write_rtl8225(dev, 0x6, 0xae6); mdelay(1); - - write_rtl8225(dev, 0x7, ((priv->card_type == USB)? 0x82a : rtl8225_chan[channel])); mdelay(1); - - write_rtl8225(dev, 0x8, 0x1f); mdelay(1); - - write_rtl8225(dev, 0x9, 0x334); mdelay(1); - - write_rtl8225(dev, 0xa, 0xfd4); mdelay(1); - - write_rtl8225(dev, 0xb, 0x391); mdelay(1); - - write_rtl8225(dev, 0xc, 0x50); mdelay(1); - - - write_rtl8225(dev, 0xd, 0x6db); mdelay(1); - - write_rtl8225(dev, 0xe, 0x29); mdelay(1); - - write_rtl8225(dev, 0xf, 0x914); - - if(priv->card_type == USB){ - //force_pci_posting(dev); - mdelay(100); - } - - write_rtl8225(dev, 0x2, 0xc4d); - - if(priv->card_type == USB){ - // force_pci_posting(dev); - 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) - */ - force_pci_posting(dev); - - mdelay(100); //200 for 8187 - - //if(priv->card_type != USB) /* maybe not needed even for 8185 */ -// write_rtl8225(dev, 0x7, rtl8225_chan[channel]); - - write_rtl8225(dev, 0x0, 0x127); - - for(i=0;i<95;i++){ - write_rtl8225(dev, 0x1, (u8)(i+1)); - - #if 0 - if(priv->phy_ver == 1) - /* version A */ - write_rtl8225(dev, 0x2, rtl8225a_rxgain[i]); - else - #endif - /* version B & C & D*/ - - write_rtl8225(dev, 0x2, rtl8225bcd_rxgain[i]); - } - - write_rtl8225(dev, 0x0, 0x27); - - -// //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); -// //} - - write_rtl8225(dev, 0x0, 0x22f); - - if(priv->card_type != USB) - rtl8185_rf_pins_enable(dev); - - for(i=0;i<128;i++){ - write_phy_ofdm(dev, 0xb, rtl8225_agc[i]); - - mdelay(1); - write_phy_ofdm(dev, 0xa, (u8)i+ 0x80); - - 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); - - #if 0 - if(priv->card_type == USB){ - write_phy_ofdm(dev, 0xa, 0x9); - }else{ - if(priv->card_8185 == 1 && priv->card_8185_Bversion){ - /* Ver B - * maybe later version can accept this also? - */ - write_phy_ofdm(dev, 0xa, 0x6); - write_phy_ofdm(dev, 0x18, 0x6f); - }else{ - #endif - /* ver C & D */ - write_phy_ofdm(dev, 0xa, 0x9); 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, 0x33); // <> - - write_phy_ofdm(dev, 0xe, 0xd3);mdelay(1); - - - #if 0 - if(priv->card_8185 == 1){ - if(priv->card_8185_Bversion) - write_phy_ofdm(dev, 0xf, 0x20);/*ver B*/ - else - write_phy_ofdm(dev, 0xf, 0x28);/*ver C*/ - }else{ - #endif - 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, 0x06);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); - -#if 0 - }else{ - /* Ver B & C*/ - write_phy_ofdm(dev, 0x12, 0x0); - write_phy_ofdm(dev, 0x13, 0x0); - } -#endif - write_phy_ofdm(dev, 0x14, 0x0); mdelay(1); - write_phy_ofdm(dev, 0x15, 0x40); mdelay(1); - write_phy_ofdm(dev, 0x16, 0x0); 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, 0x19, 0x19); mdelay(1); - write_phy_ofdm(dev, 0x1a, 0x20); mdelay(1); - -// if (priv->card_type != USB){ -// if(priv->card_8185 == 1 && priv->card_8185_Bversion) -// write_phy_ofdm(dev, 0x1b, 0x66); /* Ver B */ -// else - write_phy_ofdm(dev, 0x1b, 0x76);mdelay(1); - /* Ver C & D */ //FIXME:MAYBE not needed -// } - - write_phy_ofdm(dev, 0x1c, 0x4);mdelay(1); - -#if 0 - if(priv->card_8185 == 1){ - if(priv->card_8185_Bversion){ - /*ver B*/ - write_phy_ofdm(dev, 0x1e, 0x95); - write_phy_ofdm(dev, 0x1f, 0x55); - }else{ - /*ver C*/ - write_phy_ofdm(dev, 0x1e, 0x90); - write_phy_ofdm(dev, 0x1f, 0x34); - - } - }else{ -#endif - /*ver D & 8187*/ - 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, 0x27);mdelay(1); - - write_phy_ofdm(dev, 0x22, 0x16);mdelay(1); - -// if(priv->card_type != USB) - //write_phy_ofdm(dev, 0x23, 0x43); //FIXME maybe not needed // <> - - write_phy_ofdm(dev, 0x24, 0x46); mdelay(1); - write_phy_ofdm(dev, 0x25, 0x20); mdelay(1); - write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); -#if 0 - if(priv->card_8185 == 1 && priv->card_8185_Bversion) - write_phy_ofdm(dev, 0x27, 0x08); /* Ver B. might work also fo ver C&D ?*/ - else -#endif - write_phy_ofdm(dev, 0x27, 0x88); mdelay(1); -/* Ver C & D & 8187*/ - - // <> Set init. gain to m74dBm. - write_phy_ofdm(dev, 0x0d, 0x43); mdelay(1); - write_phy_ofdm(dev, 0x1b, 0x76); mdelay(1); - write_phy_ofdm(dev, 0x1d, 0xc5); mdelay(1); - write_phy_ofdm(dev, 0x23, 0x78); mdelay(1); - - //if(priv->card_type == USB); - // rtl8225_set_gain_usb(dev, 1); /* FIXME this '2' is random */ - - write_phy_cck(dev, 0x0, 0x98); mdelay(1); - write_phy_cck(dev, 0x3, 0x20); mdelay(1); - write_phy_cck(dev, 0x4, 0x7e); mdelay(1); - write_phy_cck(dev, 0x5, 0x12); mdelay(1); - write_phy_cck(dev, 0x6, 0xfc); mdelay(1); -#if 0 - if(priv->card_8185 == 1 && priv->card_8185_Bversion) - write_phy_cck(dev, 0x7, 0xd8); /* Ver B */ - else -#endif - write_phy_cck(dev, 0x7, 0x78);mdelay(1); - /* Ver C & D & 8187*/ - - 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); -#if 0 - if(priv->card_8185 == 1 && priv->card_8185_Bversion) - write_phy_cck(dev, 0x13, 0x98); /* Ver B */ - else -#endif - write_phy_cck(dev, 0x13, 0xd0); /* Ver C & D & 8187*/ - - write_phy_cck(dev, 0x19, 0x0); - write_phy_cck(dev, 0x1a, 0xa0); - write_phy_cck(dev, 0x1b, 0x8); - write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */ - - 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, 0x1f); mdelay(1); - write_phy_cck(dev, 0x45, 0x1e); mdelay(1); - write_phy_cck(dev, 0x46, 0x1a); mdelay(1); - write_phy_cck(dev, 0x47, 0x15); mdelay(1); - write_phy_cck(dev, 0x48, 0x10); mdelay(1); - write_phy_cck(dev, 0x49, 0xa); mdelay(1); - write_phy_cck(dev, 0x4a, 0x5); mdelay(1); - write_phy_cck(dev, 0x4b, 0x2); mdelay(1); - write_phy_cck(dev, 0x4c, 0x5);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); -// //} - - rtl8225_SetTXPowerLevel(dev, channel); - - write_phy_cck(dev, 0x10, 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 */ - - /* switch to high-speed 3-wire - * last digit. 2 for both cck and ofdm - */ - if(priv->card_type == USB) - write_nic_dword(dev, 0x94, 0x3dc00002); - else{ - write_nic_dword(dev, 0x94, 0x15c00002); - rtl8185_rf_pins_enable(dev); - } - -// if(priv->card_type != USB) -// rtl8225_set_gain(dev, 4); /* FIXME this '1' is random */ // <> -// 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); - -} diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.h b/drivers/staging/rtl8187se/r8180_rtl8225.h index 458de6629ad0..ed35db59e1f3 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225.h +++ b/drivers/staging/rtl8187se/r8180_rtl8225.h @@ -19,23 +19,13 @@ #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); -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); 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); -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); diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c index 4136b9429597..b648751cdaa3 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c +++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c @@ -14,64 +14,76 @@ #include "r8180_rtl8225.h" #include "r8180_93cx6.h" -#ifdef ENABLE_DOT11D -#include "dot11d.h" -#endif +#include "ieee80211/dot11d.h" -#ifdef CONFIG_RTL8185B -extern u8 rtl8225_agc[]; +static void write_rtl8225(struct net_device *dev, u8 adr, u16 data) +{ + int i; + u16 out, select; + u8 bit; + u32 bangdata = (data << 4) | (adr & 0xf); + struct r8180_priv *priv = ieee80211_priv(dev); -extern u32 rtl8225_chan[]; + out = read_nic_word(dev, RFPinsOutput) & 0xfff3; -//2005.11.16 -u8 rtl8225z2_threshold[]={ - 0x8d, 0x8d, 0x8d, 0x8d, 0x9d, 0xad, 0xbd, -}; + write_nic_word(dev, RFPinsEnable, + (read_nic_word(dev, RFPinsEnable) | 0x7)); -// 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 -}; + select = read_nic_word(dev, RFPinsSelect); -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 -}; -#if 0 -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 + write_nic_word(dev, RFPinsSelect, select | 0x7 | + ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO)); + + force_pci_posting(dev); + udelay(10); + + write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); + + force_pci_posting(dev); + udelay(2); + + write_nic_word(dev, RFPinsOutput, out); + + force_pci_posting(dev); + udelay(10); + + for (i = 15; i >= 0; i--) { + bit = (bangdata & (1 << i)) >> i; + + write_nic_word(dev, RFPinsOutput, bit | out); -//- -u16 rtl8225z2_rxgain[]={ + write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); + write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); + + 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); + + write_nic_word(dev, RFPinsOutput, bit | out); + + } + + write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); + + force_pci_posting(dev); + udelay(10); + + write_nic_word(dev, RFPinsOutput, out | + ((priv->card_type == USB) ? 4 : BB_HOST_BANG_EN)); + + write_nic_word(dev, RFPinsSelect, select | + ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO)); + + if (priv->card_type == USB) + mdelay(2); + else + rtl8185_rf_pins_enable(dev); +} + +static const 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, @@ -82,127 +94,234 @@ u16 rtl8225z2_rxgain[]={ 0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793, 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, - 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3, - 0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb + 0x07aa, 0x07ab, 0x07ac, 0x07ad, 0x07b0, 0x07b1, 0x07b2, 0x07b3, + 0x07b4, 0x07b5, 0x07b8, 0x07b9, 0x07ba, 0x07bb, 0x07bb }; -//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 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, }; -#if 0 -//- -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, -}; -#endif -/* - from 0 to 0x23 -u8 rtl8225_tx_gain_cck_ofdm[]={ - 0x02,0x06,0x0e,0x1e,0x3e,0x7e +static const 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 rtl8225z2_tx_power_ofdm[]={ - 0x42,0x00,0x40,0x00,0x40 +static const u8 rtl8225_tx_gain_cck_ofdm[] = { + 0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x7e }; - -//- -u8 rtl8225z2_tx_power_cck_ch14[]={ - 0x36,0x35,0x2e,0x1b,0x00,0x00,0x00,0x00 +static const 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 }; +static const 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 rtl8225z2_tx_power_cck[]={ - 0x36,0x35,0x2e,0x25,0x1c,0x12,0x09,0x04 +static const u8 rtl8225_tx_power_ofdm[] = { + 0x80, 0x90, 0xa2, 0xb5, 0xcb, 0xe4 }; +static const u32 rtl8225_chan[] = { + 0, + 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, + 0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x074A, +}; -void rtl8225z2_set_gain(struct net_device *dev, short gain) +static void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch) { - u8* rtl8225_gain; struct r8180_priv *priv = ieee80211_priv(dev); + int GainIdx; + int GainSetting; + int i; + u8 power; + const u8 *cck_power_table; + u8 max_cck_power_level; + u8 max_ofdm_power_level; + u8 min_ofdm_power_level; + u8 cck_power_level = 0xff & priv->chtxpwr[ch]; + u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdm[ch]; + + if (priv->card_type == USB) { + max_cck_power_level = 11; + max_ofdm_power_level = 25; + min_ofdm_power_level = 10; + } else { + max_cck_power_level = 35; + max_ofdm_power_level = 35; + min_ofdm_power_level = 0; + } - u8 mode = priv->ieee80211->mode; + if (cck_power_level > max_cck_power_level) + cck_power_level = max_cck_power_level; - if(mode == IEEE_B || mode == IEEE_G) - rtl8225_gain = rtl8225z2_gain_bg; + GainIdx = cck_power_level % 6; + GainSetting = cck_power_level / 6; + + if (ch == 14) + cck_power_table = rtl8225_tx_power_cck_ch14; else - rtl8225_gain = rtl8225z2_gain_a; + cck_power_table = rtl8225_tx_power_cck; - //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, 0x21, 0x37); + 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); + } + + /* FIXME Is this delay really needeed ? */ + force_pci_posting(dev); + mdelay(1); + + 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) + ofdm_power_level = 35; + + 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, 5, power); + write_phy_ofdm(dev, 7, power); + + force_pci_posting(dev); + mdelay(1); } -#if 0 +static const u8 rtl8225z2_threshold[] = { + 0x8d, 0x8d, 0x8d, 0x8d, 0x9d, 0xad, 0xbd, +}; -void rtl8225_set_gain(struct net_device *dev, short gain) -{ - struct r8180_priv *priv = ieee80211_priv(dev); +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 */ +}; - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); +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 */ +}; - if(priv->card_8185 == 2) - write_phy_ofdm(dev, 0x21, 0x27); - else - write_phy_ofdm(dev, 0x21, 0x37); +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, + 0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, + 0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688, + 0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745, + 0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789, + 0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793, + 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, + 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, + 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3, + 0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb - write_phy_ofdm(dev, 0x25, 0x20); - write_phy_ofdm(dev, 0x11, 0x6); +}; + +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, +}; + +static const u8 rtl8225z2_tx_power_ofdm[] = { + 0x42, 0x00, 0x40, 0x00, 0x40 +}; + +static const u8 rtl8225z2_tx_power_cck_ch14[] = { + 0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00 +}; - if(priv->card_8185 == 1 && priv->card_8185_Bversion) - write_phy_ofdm(dev, 0x27, 0x8); +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) +{ + const u8 *rtl8225_gain; + struct r8180_priv *priv = ieee80211_priv(dev); + u8 mode = priv->ieee80211->mode; + + if (mode == IEEE_B || mode == IEEE_G) + rtl8225_gain = rtl8225z2_gain_bg; else - write_phy_ofdm(dev, 0x27, 0x88); - - write_phy_ofdm(dev, 0x14, 0); - write_phy_ofdm(dev, 0x16, 0); - write_phy_ofdm(dev, 0x15, 0x40); - write_phy_ofdm(dev, 0x17, 0x40); - - write_phy_ofdm(dev, 0x0d, rtl8225_gain[gain * 4]); - write_phy_ofdm(dev, 0x23, rtl8225_gain[gain * 4 + 1]); - write_phy_ofdm(dev, 0x1b, rtl8225_gain[gain * 4 + 2]); - write_phy_ofdm(dev, 0x1d, rtl8225_gain[gain * 4 + 3]); - //rtl8225_set_gain_usb(dev, gain); + rtl8225_gain = rtl8225z2_gain_a; + + 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); } -#endif -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; @@ -225,8 +344,8 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) rw = 0; mask = (low2high) ? 0x01 : (((u32)0x01)<<(32-1)); - for(i = 0; i < wLength/2; i++) - { + + for (i = 0; i < wLength/2; i++) { bit = ((data2Write&mask) != 0) ? 1 : 0; write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(1); @@ -235,8 +354,7 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) mask = (low2high) ? (mask<<1): (mask>>1); - if(i == 2) - { + if (i == 2) { rw = BB_HOST_BANG_RW; write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2); write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(2); @@ -253,17 +371,16 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) mask = (low2high) ? (mask<<1) : (mask>>1); } - //twreg.struc.clk = 0; - //twreg.struc.data = 0; write_nic_word(dev, RFPinsOutput, rw|oval); udelay(2); mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1)); - // We must set data pin to HW controled, otherwise RF can't driver it and - // value RF register won't be able to read back properly. 2006.06.13, by rcnjko. + /* + * We must set data pin to HW controled, otherwise RF can't driver it + * and value RF register won't be able to read back properly. + */ write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01))); - for(i = 0; i < rLength; i++) - { + for (i = 0; i < rLength; i++) { write_nic_word(dev, RFPinsOutput, rw|oval); udelay(1); write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2); @@ -281,144 +398,27 @@ u32 read_rtl8225(struct net_device *dev, u8 adr) write_nic_word(dev, RFPinsOutput, BB_HOST_BANG_EN|BB_HOST_BANG_RW|oval); udelay(2); write_nic_word(dev, RFPinsEnable, oval2); - write_nic_word(dev, RFPinsSelect, oval3); // Set To SW Switch + write_nic_word(dev, RFPinsSelect, oval3); /* Set To SW Switch */ write_nic_word(dev, RFPinsOutput, 0x3a0); return dataRead; - -} -#if 0 -void write_rtl8225(struct net_device *dev, u8 adr, u16 data) -{ - int i; - 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)); - - select = read_nic_word(dev, RFPinsSelect); - - write_nic_word(dev, RFPinsSelect, select | 0x7 | - ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO)); - - force_pci_posting(dev); - udelay(10); - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff); - - force_pci_posting(dev); - udelay(2); - - write_nic_word(dev, RFPinsOutput, out); - - force_pci_posting(dev); - udelay(10); - - - for(i=15; i>=0;i--){ - - bit = (bangdata & (1<<i)) >> i; - - write_nic_word(dev, RFPinsOutput, bit | out); - - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - - 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); - - write_nic_word(dev, RFPinsOutput, bit | out); - - } - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); - - force_pci_posting(dev); - udelay(10); - - write_nic_word(dev, RFPinsOutput, out | - ((priv->card_type == USB) ? 4 : BB_HOST_BANG_EN)); - - write_nic_word(dev, RFPinsSelect, select | - ((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO)); - - if(priv->card_type == USB) - mdelay(2); - else - rtl8185_rf_pins_enable(dev); } -#endif 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 0 - for(i = 0; i <= 0xf; i++) - printk(KERN_WARNING "%08x,", read_rtl8225(dev, i)); - //printk(KERN_WARNING "reg[9]@pg1 = 0x%x\n", read_rtl8225(dev, 0x0F)); - -// printk(KERN_WARNING "RF:\n"); -#endif - if( read_rtl8225(dev, 8) != 0x588) - vz2 = 0; + 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; - -} - -#if 0 -void rtl8225_rf_close(struct net_device *dev) -{ - write_rtl8225(dev, 0x4, 0x1f); - - force_pci_posting(dev); - mdelay(1); - - rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_OFF); - rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_OFF); } -#endif -#if 0 -short rtl8225_rf_set_sens(struct net_device *dev, short sens) -{ - if (sens <0 || sens > 6) return -1; - - if(sens > 4) - write_rtl8225(dev, 0x0c, 0x850); - else - write_rtl8225(dev, 0x0c, 0x50); - - sens= 6-sens; - rtl8225_set_gain(dev, sens); - - write_phy_cck(dev, 0x41, rtl8225_threshold[sens]); - return 0; - -} -#endif - void rtl8225z2_rf_close(struct net_device *dev) { @@ -431,70 +431,55 @@ void rtl8225z2_rf_close(struct net_device *dev) rtl8185_set_anaparam2(dev, RTL8225z2_ANAPARAM2_OFF); } -#ifdef ENABLE_DOT11D -// -// 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; -#ifdef CONFIG_RTL818X_S - // - // 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; } } -#endif - - // - // 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; @@ -502,302 +487,140 @@ DbmToTxPwrIdx( return TxPwrIdx; } -#endif 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 0 - // - // CCX 2 S31, AP control of client transmit power: - // 1. We shall not exceed Cell Power Limit as possible as we can. - // 2. Tolerance is +/- 5dB. - // 3. 802.11h Power Contraint takes higher precedence over CCX Cell Power Limit. - // - // TODO: - // 1. 802.11h power contraint - // - // 071011, by rcnjko. - // - if( priv->OpMode == RT_OP_MODE_INFRASTRUCTURE && - priv->bWithCcxCellPwr && - ch == priv->dot11CurrentChannelNumber) - { - u8 CckCellPwrIdx = DbmToTxPwrIdx(dev, WIRELESS_MODE_B, pMgntInfo->CcxCellPwr); - u8 OfdmCellPwrIdx = DbmToTxPwrIdx(dev, WIRELESS_MODE_G, pMgntInfo->CcxCellPwr); - - printk("CCX Cell Limit: %d dBm => CCK Tx power index : %d, OFDM Tx power index: %d\n", - priv->CcxCellPwr, CckCellPwrIdx, OfdmCellPwrIdx); - printk("EEPROM channel(%d) => CCK Tx power index: %d, OFDM Tx power index: %d\n", - channel, CckTxPwrIdx, OfdmTxPwrIdx); - - if(cck_power_level > CckCellPwrIdx) - cck_power_level = CckCellPwrIdx; - if(ofdm_power_level > OfdmCellPwrIdx) - ofdm_power_level = OfdmCellPwrIdx; - - printk("Altered CCK Tx power index : %d, OFDM Tx power index: %d\n", - CckTxPwrIdx, OfdmTxPwrIdx); - } -#endif -#ifdef ENABLE_DOT11D - 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; -#endif - max_cck_power_level = 15; - max_ofdm_power_level = 25; // 12 -> 25 + max_ofdm_power_level = 25; min_ofdm_power_level = 10; -#ifdef CONFIG_RTL8185B -#ifdef CONFIG_RTL818X_S - - 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); - mdelay(1); -#else - - /* CCK power setting */ - if(cck_power_level > max_cck_power_level) - cck_power_level = max_cck_power_level; - - cck_power_level += priv->cck_txpwr_base; - - if(cck_power_level > 35) - cck_power_level = 35; - - if(ch == 14) - cck_power_table = rtl8225z2_tx_power_cck_ch14; - else - cck_power_table = rtl8225z2_tx_power_cck; - - - for(i=0;i<8;i++){ - - power = cck_power_table[i]; - write_phy_cck(dev, 0x44 + i, power); - } - - //write_nic_byte(dev, TX_GAIN_CCK, power); - //2005.11.17, - write_nic_byte(dev, CCK_TXAGC, ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)cck_power_level]); + write_nic_byte(dev, CCK_TXAGC, + (ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)cck_power_level])); force_pci_posting(dev); mdelay(1); -#endif -#endif - /* 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, -#ifdef CONFIG_RTL818X_S - write_nic_byte(dev, OFDM_TXAGC, ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)ofdm_power_level]); -#else - write_nic_byte(dev, OFDM_TXAGC, ZEBRA2_CCK_OFDM_GAIN_SETTING[(u8)ofdm_power_level]*2); -#endif - 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); - -} -#if 0 -/* switch between mode B and G */ -void rtl8225_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 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); force_pci_posting(dev); mdelay(10); -//deleted by David : 2006/8/9 -#if 0 - write_nic_byte(dev,SIFS,0x22);// SIFS: 0x22 - - if(gset) - write_nic_byte(dev,DIFS,20); //DIFS: 20 - else - write_nic_byte(dev,DIFS,0x24); //DIFS: 36 - - if(priv->ieee80211->state == IEEE80211_LINKED && - ieee80211_is_shortslot(priv->ieee80211->current_network)) - write_nic_byte(dev,SLOT,0x9); //SLOT: 9 - - else - write_nic_byte(dev,SLOT,0x14); //SLOT: 20 (0x14) - - - if(gset){ - write_nic_byte(dev,EIFS,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,91 - 0x24); // EIFS: 91 (0x5B) - write_nic_byte(dev,CW_VAL,0xa5); //CW VALUE: 0x37 - //DMESG("using B net params"); - } -#endif - } -#if 0 -void rtl8225_host_pci_init(struct net_device *dev) + +static void rtl8225_host_pci_init(struct net_device *dev) { write_nic_word(dev, RFPinsOutput, 0x480); rtl8185_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 */ - - + /* bit 6 is for RF on/off detection */ + write_nic_word(dev, GP_ENABLE, 0xff & (~(1 << 6))); } -void rtl8225_host_usb_init(struct net_device *dev) +static void rtl8225_rf_set_chan(struct net_device *dev, short ch) { - write_nic_byte(dev,RFPinsSelect+1,0); - - write_nic_byte(dev,GPIO,0); - - write_nic_byte_E(dev,0x53,read_nic_byte_E(dev,0x53) | (1<<7)); - - write_nic_byte(dev,RFPinsSelect+1,4); - - write_nic_byte(dev,GPIO,0x20); - - write_nic_byte(dev,GP_ENABLE,0); - - - /* Config BB & RF */ - write_nic_word(dev, RFPinsOutput, 0x80); - - write_nic_word(dev, RFPinsSelect, 0x80); + struct r8180_priv *priv = ieee80211_priv(dev); + short gset = (priv->ieee80211->state == IEEE80211_LINKED && + ieee80211_is_54g(priv->ieee80211->current_network)) || + priv->ieee80211->iw_mode == IW_MODE_MONITOR; - write_nic_word(dev, RFPinsEnable, 0x80); + rtl8225_SetTXPowerLevel(dev, ch); + write_rtl8225(dev, 0x7, rtl8225_chan[ch]); - mdelay(100); + force_pci_posting(dev); + mdelay(10); - mdelay(1000); + 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); + else + write_nic_byte(dev, SLOT, 0x14); + + 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); + } } -#endif + void rtl8225z2_rf_init(struct net_device *dev) { struct r8180_priv *priv = ieee80211_priv(dev); @@ -808,12 +631,7 @@ void rtl8225z2_rf_init(struct net_device *dev) priv->chan = channel; -// rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); - - - if(priv->card_type == USB) - rtl8225_host_usb_init(dev); - else + if (priv->card_type != USB) rtl8225_host_pci_init(dev); write_nic_dword(dev, RF_TIMING, 0x000a8008); @@ -822,80 +640,40 @@ void rtl8225z2_rf_init(struct net_device *dev) write_nic_word(dev, BRSR, 0xffff); - write_nic_dword(dev, RF_PARA, 0x100044); - #if 1 //0->1 rtl8180_set_mode(dev, EPROM_CMD_CONFIG); write_nic_byte(dev, CONFIG3, 0x44); rtl8180_set_mode(dev, EPROM_CMD_NORMAL); - #endif - rtl8185_rf_pins_enable(dev); -// mdelay(1000); - write_rtl8225(dev, 0x0, 0x2bf); mdelay(1); - - write_rtl8225(dev, 0x1, 0xee0); mdelay(1); - write_rtl8225(dev, 0x2, 0x44d); mdelay(1); - write_rtl8225(dev, 0x3, 0x441); mdelay(1); - - - write_rtl8225(dev, 0x4, 0x8c3);mdelay(1); - - - - write_rtl8225(dev, 0x5, 0xc72);mdelay(1); -// } - + write_rtl8225(dev, 0x4, 0x8c3); mdelay(1); + write_rtl8225(dev, 0x5, 0xc72); mdelay(1); write_rtl8225(dev, 0x6, 0xe6); mdelay(1); - write_rtl8225(dev, 0x7, ((priv->card_type == USB)? 0x82a : rtl8225_chan[channel])); mdelay(1); - write_rtl8225(dev, 0x8, 0x3f); mdelay(1); - - write_rtl8225(dev, 0x9, 0x335); mdelay(1); - - write_rtl8225(dev, 0xa, 0x9d4); mdelay(1); - - write_rtl8225(dev, 0xb, 0x7bb); mdelay(1); - - write_rtl8225(dev, 0xc, 0x850); mdelay(1); - - - write_rtl8225(dev, 0xd, 0xcdf); mdelay(1); - + write_rtl8225(dev, 0x9, 0x335); mdelay(1); + write_rtl8225(dev, 0xa, 0x9d4); mdelay(1); + write_rtl8225(dev, 0xb, 0x7bb); mdelay(1); + write_rtl8225(dev, 0xc, 0x850); mdelay(1); + write_rtl8225(dev, 0xd, 0xcdf); mdelay(1); write_rtl8225(dev, 0xe, 0x2b); mdelay(1); - write_rtl8225(dev, 0xf, 0x114); - mdelay(100); - - //if(priv->card_type != USB) /* maybe not needed even for 8185 */ -// write_rtl8225(dev, 0x7, rtl8225_chan[channel]); - write_rtl8225(dev, 0x0, 0x1b7); - for(i=0;i<95;i++){ - write_rtl8225(dev, 0x1, (u8)(i+1)); - - #if 0 - if(priv->phy_ver == 1) - /* version A */ - write_rtl8225(dev, 0x2, rtl8225a_rxgain[i]); - else - #endif - /* 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); @@ -903,185 +681,90 @@ void rtl8225z2_rf_init(struct net_device *dev) write_rtl8225(dev, 0x2, 0xc4d); - if(priv->card_type == USB){ - // force_pci_posting(dev); + if (priv->card_type == USB) { mdelay(200); write_rtl8225(dev, 0x2, 0x44d); - - // force_pci_posting(dev); mdelay(100); + } - }//End of if(priv->card_type == USB) /* FIXME!! rtl8187 we have to check if calibrarion * is successful and eventually cal. again (repeat * the two write on reg 2) - */ - // Check for calibration status, 2005.11.17, - data = read_rtl8225(dev, 6); - if (!(data&0x00000080)) - { - write_rtl8225(dev, 0x02, 0x0c4d); - force_pci_posting(dev); mdelay(200); - write_rtl8225(dev, 0x02, 0x044d); - force_pci_posting(dev); mdelay(100); - data = read_rtl8225(dev, 6); - if (!(data&0x00000080)) - { - DMESGW("RF Calibration Failed!!!!\n"); - } - } - //force_pci_posting(dev); - - mdelay(200); //200 for 8187 - + */ + data = read_rtl8225(dev, 6); + if (!(data & 0x00000080)) { + write_rtl8225(dev, 0x02, 0x0c4d); + force_pci_posting(dev); mdelay(200); + write_rtl8225(dev, 0x02, 0x044d); + force_pci_posting(dev); mdelay(100); + data = read_rtl8225(dev, 6); + if (!(data & 0x00000080)) + DMESGW("RF Calibration Failed!!!!\n"); + } -// //if(priv->card_type != USB){ -// write_rtl8225(dev, 0x2, 0x44d); -// write_rtl8225(dev, 0x7, rtl8225_chan[channel]); -// write_rtl8225(dev, 0x2, 0x47d); -// -// force_pci_posting(dev); -// mdelay(100); -// -// write_rtl8225(dev, 0x2, 0x44d); -// //} + mdelay(200); write_rtl8225(dev, 0x0, 0x2bf); - if(priv->card_type != USB) + if (priv->card_type != USB) rtl8185_rf_pins_enable(dev); - //set up ZEBRA AGC table, 2005.11.17, - for(i=0;i<128;i++){ - data = rtl8225_agc[i]; - - addr = i + 0x80; //enable writing AGC table - write_phy_ofdm(dev, 0xb, data); - mdelay(1); - write_phy_ofdm(dev, 0xa, addr); - - mdelay(1); - } -#if 0 - for(i=0;i<128;i++){ - write_phy_ofdm(dev, 0xb, rtl8225_agc[i]); + for (i = 0; i < 128; i++) { + data = rtl8225_agc[i]; + addr = i + 0x80; /* enable writing AGC table */ + write_phy_ofdm(dev, 0xb, data); mdelay(1); - write_phy_ofdm(dev, 0xa, (u8)i+ 0x80); + write_phy_ofdm(dev, 0xa, addr); mdelay(1); } -#endif 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); - - - #if 0 - if(priv->card_8185 == 1){ - if(priv->card_8185_Bversion) - write_phy_ofdm(dev, 0xf, 0x20);/*ver B*/ - else - write_phy_ofdm(dev, 0xf, 0x28);/*ver C*/ - }else{ - #endif - 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); - -#if 0 - }else{ - /* Ver B & C*/ - write_phy_ofdm(dev, 0x12, 0x0); - write_phy_ofdm(dev, 0x13, 0x0); - } -#endif - 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); @@ -1089,101 +772,57 @@ void rtl8225z2_rf_init(struct net_device *dev) write_phy_cck(dev, 0x4, 0x7e); mdelay(1); write_phy_cck(dev, 0x5, 0x12); mdelay(1); write_phy_cck(dev, 0x6, 0xfc); mdelay(1); - - write_phy_cck(dev, 0x7, 0x78);mdelay(1); - /* Ver C & D & 8187*/ - - write_phy_cck(dev, 0x8, 0x2e);mdelay(1); - + write_phy_cck(dev, 0x7, 0x78); mdelay(1); + write_phy_cck(dev, 0x8, 0x2e); mdelay(1); write_phy_cck(dev, 0x10, ((priv->card_type == USB) ? 0x9b: 0x93)); mdelay(1); write_phy_cck(dev, 0x11, 0x88); mdelay(1); write_phy_cck(dev, 0x12, 0x47); mdelay(1); -#if 0 - if(priv->card_8185 == 1 && priv->card_8185_Bversion) - write_phy_cck(dev, 0x13, 0x98); /* Ver B */ - else -#endif - 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); -#ifdef CONFIG_RTL818X_S - write_phy_cck(dev, 0x11, 0x9b); mdelay(1); /* Rx ant A, 0xdb for B */ -#else - write_phy_cck(dev, 0x10, 0x9b); mdelay(1); /* Rx ant A, 0xdb for B */ -#endif - 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); } -// if(priv->card_type != USB) -// rtl8225_set_gain(dev, 4); /* FIXME this '1' is random */ // <> -// 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); @@ -1199,8 +838,7 @@ void rtl8225z2_rf_set_mode(struct net_device *dev) write_phy_ofdm(dev,0x17, 0x40); write_nic_dword(dev, 0x94,0x10000000); - }else{ - + } else { write_rtl8225(dev, 0x5, 0x1864); write_nic_dword(dev, RF_PARA, 0x10044); write_nic_dword(dev, RF_TIMING, 0xa8008); @@ -1219,46 +857,35 @@ void rtl8225z2_rf_set_mode(struct net_device *dev) } } -//lzm mod 080826 -//#define MAX_DOZE_WAITING_TIMES_85B 64 -//#define MAX_POLLING_24F_TIMES_87SE 5 #define MAX_DOZE_WAITING_TIMES_85B 20 -#define MAX_POLLING_24F_TIMES_87SE 10 +#define MAX_POLLING_24F_TIMES_87SE 10 #define LPS_MAX_SLEEP_WAITING_TIMES_87SE 5 -bool -SetZebraRFPowerState8185( - struct net_device *dev, - RT_RF_POWER_STATE eRFPowerState - ) +bool SetZebraRFPowerState8185(struct net_device *dev, + RT_RF_POWER_STATE eRFPowerState) { struct r8180_priv *priv = ieee80211_priv(dev); u8 btCR9346, btConfig3; - bool bActionAllowed= true, bTurnOffBB = true;//lzm mod 080826 - //u32 DWordContent; + bool bActionAllowed = true, bTurnOffBB = true; u8 u1bTmp; int i; - //u16 u2bTFPC = 0; bool bResult = true; u8 QueueID; - if(priv->SetRFPowerStateInProgress == true) + if (priv->SetRFPowerStateInProgress == true) return false; priv->SetRFPowerStateInProgress = true; - // enable EEM0 and EEM1 in 9346CR btCR9346 = read_nic_byte(dev, CR9346); - write_nic_byte(dev, CR9346, (btCR9346|0xC0) ); - // enable PARM_En in Config3 + write_nic_byte(dev, CR9346, (btCR9346 | 0xC0)); + btConfig3 = read_nic_byte(dev, CONFIG3); - write_nic_byte(dev, CONFIG3, (btConfig3|CONFIG3_PARM_En) ); + write_nic_byte(dev, CONFIG3, (btConfig3 | CONFIG3_PARM_En)); - switch( priv->rf_chip ) - { + switch (priv->rf_chip) { case RF_ZEBRA2: - switch( eRFPowerState ) - { + switch (eRFPowerState) { case eRfOn: RF_WriteReg(dev,0x4,0x9FF); @@ -1267,247 +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; - } -#if 0 //reserved amy - else if(priv->NdisAdapter.CurrentPowerState != NdisDeviceStateD0) - { - RT_TRACE(COMP_POWER, DBG_LOUD, ("eRfSleep: %d times TcbBusyQueue[%d] !=0 but lower power state!\n", (pMgntInfo->TxPollingTimes+1), QueueID)); - break; - } -#endif - 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; - } -#if 0 - else if(Adapter->NdisAdapter.CurrentPowerState != NdisDeviceStateD0) - { - RT_TRACE(COMP_POWER, DBG_LOUD, ("%d times TcbBusyQueue[%d] !=0 but lower power state!\n", (i+1), QueueID)); - break; - } -#endif - 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); @@ -1516,72 +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; -#if 0 - switch(priv->eRFPowerState) - { - case eRfOff: - // - //If Rf off reason is from IPS, Led should blink with no link, by Maddest 071015 - // - if(priv->RfOffReason==RF_CHANGE_BY_IPS ) - { - Adapter->HalFunc.LedControlHandler(Adapter,LED_CTL_NO_LINK); - } - else - { - // Turn off LED if RF is not ON. - Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_POWER_OFF); - } - break; - - case eRfOn: - // Turn on RF we are still linked, which might happen when - // we quickly turn off and on HW RF. 2006.05.12, by rcnjko. - if( pMgntInfo->bMediaConnect == TRUE ) - { - Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_LINK); - } - break; - - default: - // do nothing. - break; - } -#endif - - } 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); } -#endif - diff --git a/drivers/staging/rtl8187se/r8180_rtl8255.c b/drivers/staging/rtl8187se/r8180_rtl8255.c deleted file mode 100644 index 1a62444dcc50..000000000000 --- a/drivers/staging/rtl8187se/r8180_rtl8255.c +++ /dev/null @@ -1,1838 +0,0 @@ -/* - This is part of the rtl8180-sa2400 driver - released under the GPL (See file COPYING for details). - Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it> - - This files contains programming code for the rtl8255 - radio frontend. - - *Many* thanks to Realtek Corp. for their great support! - -*/ - -#define BAND_A 1 -#define BAND_BG 2 - -#include "r8180.h" -#include "r8180_hw.h" -#include "r8180_rtl8255.h" - -u32 rtl8255_chan[] = { - 0, //dummy channel 0 - 0x13, //1 - 0x115, //2 - 0x217, //3 - 0x219, //4 - 0x31b, //5 - 0x41d, //6 - 0x41f, //7 - 0x621, //8 - 0x623, //9 - 0x625, //10 - 0x627, //11 - 0x829, //12 - 0x82b, //13 - 0x92f, // 14 -}; - -static short rtl8255_gain_2G[]={ - 0x33, 0x17, 0x7c, 0xc5,//-78 - 0x43, 0x17, 0x7a, 0xc5,//-74 - 0x53, 0x17, 0x78, 0xc5,//-70 - 0x63, 0x17, 0x76, 0xc5,//-66 -}; - - -static short rtl8255_agc[]={ - 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, - - 0x1, 0x1, 0x2, 0x2, 0x3, 0x3, 0x4, 0x4, 0x5, 0x5, - 0x6, 0x6, 0x7, 0x7, 0x8, 0x8, 0x9, 0x9, 0xa, 0xa, - 0xb, 0xb, 0xc, 0xc, 0xd, 0xd, 0xe, 0xe, 0xf, 0xf, - - 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, - 0x15, 0x15, 0x16, 0x16, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, - 0x1a, 0x1a, 0x1b, 0x1b, 0x1c, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, - 0x1f, 0x1f, - - 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, - 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, - 0x2a, 0x2a, - - 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, - 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, - 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, - 0x2a, 0x2a, 0x2a, 0x2a - -}; - -void rtl8255_set_gain(struct net_device *dev, short gain) -{ - -// struct r8180_priv *priv = ieee80211_priv(dev); - - write_phy_ofdm(dev, 0x0d, rtl8255_gain_2G[gain * 4]); - write_phy_ofdm(dev, 0x23, rtl8255_gain_2G[gain * 4 + 1]); - write_phy_ofdm(dev, 0x1b, rtl8255_gain_2G[gain * 4 + 2]); - write_phy_ofdm(dev, 0x1d, rtl8255_gain_2G[gain * 4 + 3]); - //rtl8225_set_gain_usb(dev, gain); -} - -void write_rtl8255_reg0c(struct net_device *dev, u32 d1, u32 d2, u32 d3, u32 d4, -u32 d5, u32 d6, u32 d7, u32 d8, u32 d9, u32 d10) -{ - int i,j; - u16 out,select; - u8 bit; - u32 bangdata; -// struct r8180_priv *priv = ieee80211_priv(dev); - - write_nic_word(dev,RFPinsEnable, - (read_nic_word(dev,RFPinsEnable) | 0x7)); - - select = read_nic_word(dev, RFPinsSelect); - - write_nic_word(dev, RFPinsSelect, select | 0x7 | SW_CONTROL_GPIO); - - out = read_nic_word(dev, RFPinsOutput) & 0xfff3; - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff); - - force_pci_posting(dev); - udelay(2); - - write_nic_word(dev, RFPinsOutput, out); - - force_pci_posting(dev); - udelay(2); - - for(j=0;j<10;j++) - { - switch(j) - { - case 9: - bangdata = d10 | 0x0c; - break; - case 8: - bangdata = d9; - break; - case 7: - bangdata = d8; - break; - case 6: - bangdata = d7; - break; - case 5: - bangdata = d6; - break; - case 4: - bangdata = d5; - break; - case 3: - bangdata = d4; - break; - case 2: - bangdata = d3; - break; - case 1: - bangdata = d2; - break; - case 0: - bangdata = d1; - break; - default: - bangdata=0xbadc0de; /* avoid gcc complaints */ - break; - } - - for(i=31; i>=0;i--){ - - bit = (bangdata & (1<<i)) >> i; - - write_nic_word(dev, RFPinsOutput, bit | out); - force_pci_posting(dev); - udelay(1); - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - force_pci_posting(dev); - udelay(1); - // write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - i--; - bit = (bangdata & (1<<i)) >> i; - - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - force_pci_posting(dev); - udelay(1); - // write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - write_nic_word(dev, RFPinsOutput, bit | out); - force_pci_posting(dev); - udelay(1); - } - } - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); - force_pci_posting(dev); - udelay(10); - -// write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); - write_nic_word(dev, RFPinsSelect, select | SW_CONTROL_GPIO); -// rtl8185_rf_pins_enable(dev); - -} - -void write_rtl8255(struct net_device *dev, u8 adr, u16 data) -{ - int i; - 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)); - - select = read_nic_word(dev, RFPinsSelect); - - write_nic_word(dev, RFPinsSelect, select | 0x7 | SW_CONTROL_GPIO); - - force_pci_posting(dev); - udelay(10); - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff); - - force_pci_posting(dev); - udelay(2); - - write_nic_word(dev, RFPinsOutput, out); - - force_pci_posting(dev); - udelay(10); - - - for(i=15; i>=0;i--){ - - bit = (bangdata & (1<<i)) >> i; - - write_nic_word(dev, RFPinsOutput, bit | out); - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK); - 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); - write_nic_word(dev, RFPinsOutput, bit | out); - } - - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); - - force_pci_posting(dev); - udelay(10); - - write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN); - write_nic_word(dev, RFPinsSelect, select | SW_CONTROL_GPIO); - - rtl8185_rf_pins_enable(dev); -} - -void rtl8255_rf_close(struct net_device *dev) -{ - -// rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_OFF); -// rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_OFF); -} - -void rtl8255_SetTXPowerLevel(struct net_device *dev, short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - - u8 cck_power_level = 0xff & priv->chtxpwr[ch]; - u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdm[ch]; - write_nic_byte(dev, TX_GAIN_OFDM, ofdm_power_level); - write_nic_byte(dev, TX_GAIN_CCK, cck_power_level); - force_pci_posting(dev); - 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) -{ - //write_rtl8225(dev, 0x7, rtl8225_chan[1]); - write_rtl8255(dev, 0x5, 0x65); - write_rtl8255(dev, 0x6, rtl8255_chan[ch]); - write_rtl8255(dev, 0x7, 0x7c); - write_rtl8255(dev, 0x8, 0x6); - - - force_pci_posting(dev); - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ); -// rtl8225_set_mode_B(dev); - - rtl8255_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) -{ - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804187cf, 0x40000027, - 0x92402ac0, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc00); - write_rtl8255(dev, 0x4, 0xe00); - write_rtl8255(dev, 0x4, 0xc00); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x800); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa00); - write_rtl8255(dev, 0x4, 0x800); - write_rtl8255(dev, 0x4, 0x400); - write_rtl8255(dev, 0x3, 0x26); - write_rtl8255(dev, 0x2, 0x27); - write_rtl8255(dev, 0x4, 0x600); - write_rtl8255(dev, 0x4, 0x400); - write_rtl8255(dev, 0x4, 0x400); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x600); - write_rtl8255(dev, 0x4, 0x400); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804187ce, 0x80000027, - 0x92402ac0, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc01); - write_rtl8255(dev, 0x4, 0xe01); - write_rtl8255(dev, 0x4, 0xc01); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x801); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa01); - write_rtl8255(dev, 0x4, 0x801); - write_rtl8255(dev, 0x4, 0x401); - write_rtl8255(dev, 0x3, 0x26); - write_rtl8255(dev, 0x2, 0x27); - write_rtl8255(dev, 0x4, 0x601); - write_rtl8255(dev, 0x4, 0x401); - write_rtl8255(dev, 0x4, 0x401); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x601); - write_rtl8255(dev, 0x4, 0x401); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80418bdf, 0x40000027, - 0x92402ac4, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc02); - write_rtl8255(dev, 0x4, 0xe02); - write_rtl8255(dev, 0x4, 0xc02); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x802); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa02); - write_rtl8255(dev, 0x4, 0x802); - write_rtl8255(dev, 0x4, 0x402); - write_rtl8255(dev, 0x3, 0x26); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x602); - write_rtl8255(dev, 0x4, 0x402); - write_rtl8255(dev, 0x4, 0x402); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x602); - write_rtl8255(dev, 0x4, 0x402); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80418bbf, 0x40000027, - 0x92402ac4, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc03); - write_rtl8255(dev, 0x4, 0xe03); - write_rtl8255(dev, 0x4, 0xc03); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x803); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa03); - write_rtl8255(dev, 0x4, 0x803); - write_rtl8255(dev, 0x4, 0x403); - write_rtl8255(dev, 0x3, 0x26); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x603); - write_rtl8255(dev, 0x4, 0x403); - write_rtl8255(dev, 0x4, 0x403); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x603); - write_rtl8255(dev, 0x4, 0x403); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80418b9f, 0x40000027, - 0x92402ac8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc04); - write_rtl8255(dev, 0x4, 0xe04); - write_rtl8255(dev, 0x4, 0xc04); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x804); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa04); - write_rtl8255(dev, 0x4, 0x804); - write_rtl8255(dev, 0x4, 0x404); - write_rtl8255(dev, 0x3, 0x26); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x604); - write_rtl8255(dev, 0x4, 0x404); - write_rtl8255(dev, 0x4, 0x404); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x604); - write_rtl8255(dev, 0x4, 0x404); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804183df, 0x40000027, - 0x92402ac8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc05); - write_rtl8255(dev, 0x4, 0xe05); - write_rtl8255(dev, 0x4, 0xc05); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x805); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa05); - write_rtl8255(dev, 0x4, 0x805); - write_rtl8255(dev, 0x4, 0x405); - write_rtl8255(dev, 0x3, 0x26); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x605); - write_rtl8255(dev, 0x4, 0x405); - write_rtl8255(dev, 0x4, 0x405); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x605); - write_rtl8255(dev, 0x4, 0x405); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804183cf, 0x27, - 0x92402acc, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc06); - write_rtl8255(dev, 0x4, 0xe06); - write_rtl8255(dev, 0x4, 0xc06); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x806); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa06); - write_rtl8255(dev, 0x4, 0x806); - write_rtl8255(dev, 0x4, 0x406); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x606); - write_rtl8255(dev, 0x4, 0x406); - write_rtl8255(dev, 0x4, 0x406); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x606); - write_rtl8255(dev, 0x4, 0x406); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804183af, 0x27, - 0x92402acc, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc07); - write_rtl8255(dev, 0x4, 0xe07); - write_rtl8255(dev, 0x4, 0xc07); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x807); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa07); - write_rtl8255(dev, 0x4, 0x807); - write_rtl8255(dev, 0x4, 0x407); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x607); - write_rtl8255(dev, 0x4, 0x407); - write_rtl8255(dev, 0x4, 0x407); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x607); - write_rtl8255(dev, 0x4, 0x407); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804083d7, 0x40000027, - 0x92402ad0, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc08); - write_rtl8255(dev, 0x4, 0xe08); - write_rtl8255(dev, 0x4, 0xc08); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x808); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa08); - write_rtl8255(dev, 0x4, 0x808); - write_rtl8255(dev, 0x4, 0x408); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x608); - write_rtl8255(dev, 0x4, 0x408); - write_rtl8255(dev, 0x4, 0x408); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x608); - write_rtl8255(dev, 0x4, 0x408); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804083c7, 0x27, - 0x92402ad0, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc09); - write_rtl8255(dev, 0x4, 0xe09); - write_rtl8255(dev, 0x4, 0xc09); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x809); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa09); - write_rtl8255(dev, 0x4, 0x809); - write_rtl8255(dev, 0x4, 0x409); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x609); - write_rtl8255(dev, 0x4, 0x409); - write_rtl8255(dev, 0x4, 0x409); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x609); - write_rtl8255(dev, 0x4, 0x409); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804043d7, 0x40000027, - 0x92402ad4, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc0a); - write_rtl8255(dev, 0x4, 0xe0a); - write_rtl8255(dev, 0x4, 0xc0a); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x80a); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa0a); - write_rtl8255(dev, 0x4, 0x80a); - write_rtl8255(dev, 0x4, 0x40a); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x60a); - write_rtl8255(dev, 0x4, 0x40a); - write_rtl8255(dev, 0x4, 0x40a); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x60a); - write_rtl8255(dev, 0x4, 0x40a); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804043d7, 0x40000027, - 0x92402ad4, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc0b); - write_rtl8255(dev, 0x4, 0xe0b); - write_rtl8255(dev, 0x4, 0xc0b); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x80b); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa0b); - write_rtl8255(dev, 0x4, 0x80b); - write_rtl8255(dev, 0x4, 0x40b); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x60b); - write_rtl8255(dev, 0x4, 0x40b); - write_rtl8255(dev, 0x4, 0x40b); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x60b); - write_rtl8255(dev, 0x4, 0x40b); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804043c7, 0x27, - 0x92402ad8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc0c); - write_rtl8255(dev, 0x4, 0xe0c); - write_rtl8255(dev, 0x4, 0xc0c); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x80c); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa0c); - write_rtl8255(dev, 0x4, 0x80c); - write_rtl8255(dev, 0x4, 0x40c); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x60c); - write_rtl8255(dev, 0x4, 0x40c); - write_rtl8255(dev, 0x4, 0x40c); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x60c); - write_rtl8255(dev, 0x4, 0x40c); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804043a7, 0x27, - 0x92402ad8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc0d); - write_rtl8255(dev, 0x4, 0xe0d); - write_rtl8255(dev, 0x4, 0xc0d); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x80d); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa0d); - write_rtl8255(dev, 0x4, 0x80d); - write_rtl8255(dev, 0x4, 0x40d); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x60d); - write_rtl8255(dev, 0x4, 0x40d); - write_rtl8255(dev, 0x4, 0x40d); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x60d); - write_rtl8255(dev, 0x4, 0x40d); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404387, 0x27, - 0x92402aa8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc0e); - write_rtl8255(dev, 0x4, 0xe0e); - write_rtl8255(dev, 0x4, 0xc0e); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x80e); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa0e); - write_rtl8255(dev, 0x4, 0x80e); - write_rtl8255(dev, 0x4, 0x40e); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x60e); - write_rtl8255(dev, 0x4, 0x40e); - write_rtl8255(dev, 0x4, 0x40e); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x60e); - write_rtl8255(dev, 0x4, 0x40e); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804041c7, 0x27, - 0x92402aa8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc0f); - write_rtl8255(dev, 0x4, 0xe0f); - write_rtl8255(dev, 0x4, 0xc0f); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x80f); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa0f); - write_rtl8255(dev, 0x4, 0x80f); - write_rtl8255(dev, 0x4, 0x40f); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x60f); - write_rtl8255(dev, 0x4, 0x40f); - write_rtl8255(dev, 0x4, 0x40f); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x60f); - write_rtl8255(dev, 0x4, 0x40f); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x804041a7, 0x27, - 0x92402aac, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc10); - write_rtl8255(dev, 0x4, 0xe10); - write_rtl8255(dev, 0x4, 0xc10); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x810); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa10); - write_rtl8255(dev, 0x4, 0x810); - write_rtl8255(dev, 0x4, 0x410); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x610); - write_rtl8255(dev, 0x4, 0x410); - write_rtl8255(dev, 0x4, 0x410); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x610); - write_rtl8255(dev, 0x4, 0x410); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404187, 0x27, - 0x92402aac, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc11); - write_rtl8255(dev, 0x4, 0xe11); - write_rtl8255(dev, 0x4, 0xc11); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x811); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa11); - write_rtl8255(dev, 0x4, 0x811); - write_rtl8255(dev, 0x4, 0x411); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x611); - write_rtl8255(dev, 0x4, 0x411); - write_rtl8255(dev, 0x4, 0x411); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x611); - write_rtl8255(dev, 0x4, 0x411); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404186, 0x80000027, - 0x92402ab0, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc12); - write_rtl8255(dev, 0x4, 0xe12); - write_rtl8255(dev, 0x4, 0xc12); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x812); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa12); - write_rtl8255(dev, 0x4, 0x812); - write_rtl8255(dev, 0x4, 0x412); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x612); - write_rtl8255(dev, 0x4, 0x412); - write_rtl8255(dev, 0x4, 0x412); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x612); - write_rtl8255(dev, 0x4, 0x412); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404186, 0x27, - 0x92402ab0, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc13); - write_rtl8255(dev, 0x4, 0xe13); - write_rtl8255(dev, 0x4, 0xc13); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x813); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa13); - write_rtl8255(dev, 0x4, 0x813); - write_rtl8255(dev, 0x4, 0x413); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x613); - write_rtl8255(dev, 0x4, 0x413); - write_rtl8255(dev, 0x4, 0x413); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x613); - write_rtl8255(dev, 0x4, 0x413); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404146, 0x27, - 0x92402ab4, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc14); - write_rtl8255(dev, 0x4, 0xe14); - write_rtl8255(dev, 0x4, 0xc14); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x814); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa14); - write_rtl8255(dev, 0x4, 0x814); - write_rtl8255(dev, 0x4, 0x414); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x614); - write_rtl8255(dev, 0x4, 0x414); - write_rtl8255(dev, 0x4, 0x414); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x614); - write_rtl8255(dev, 0x4, 0x414); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404126, 0x27, - 0x92402ab4, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc15); - write_rtl8255(dev, 0x4, 0xe15); - write_rtl8255(dev, 0x4, 0xc15); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x815); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa15); - write_rtl8255(dev, 0x4, 0x815); - write_rtl8255(dev, 0x4, 0x415); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x615); - write_rtl8255(dev, 0x4, 0x415); - write_rtl8255(dev, 0x4, 0x415); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x615); - write_rtl8255(dev, 0x4, 0x415); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404106, 0x27, - 0x92402ab8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc16); - write_rtl8255(dev, 0x4, 0xe16); - write_rtl8255(dev, 0x4, 0xc16); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x816); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa16); - write_rtl8255(dev, 0x4, 0x816); - write_rtl8255(dev, 0x4, 0x416); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x616); - write_rtl8255(dev, 0x4, 0x416); - write_rtl8255(dev, 0x4, 0x416); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x616); - write_rtl8255(dev, 0x4, 0x416); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404105, 0x27, - 0x92402ab8, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc17); - write_rtl8255(dev, 0x4, 0xe17); - write_rtl8255(dev, 0x4, 0xc17); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x817); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa17); - write_rtl8255(dev, 0x4, 0x817); - write_rtl8255(dev, 0x4, 0x417); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x617); - write_rtl8255(dev, 0x4, 0x417); - write_rtl8255(dev, 0x4, 0x417); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x617); - write_rtl8255(dev, 0x4, 0x417); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404104, 0x80000027, - 0x92402a88, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc18); - write_rtl8255(dev, 0x4, 0xe18); - write_rtl8255(dev, 0x4, 0xc18); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x818); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa18); - write_rtl8255(dev, 0x4, 0x818); - write_rtl8255(dev, 0x4, 0x418); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x618); - write_rtl8255(dev, 0x4, 0x418); - write_rtl8255(dev, 0x4, 0x418); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x618); - write_rtl8255(dev, 0x4, 0x418); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404104, 0x27, - 0x92402a88, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc19); - write_rtl8255(dev, 0x4, 0xe19); - write_rtl8255(dev, 0x4, 0xc19); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x819); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa19); - write_rtl8255(dev, 0x4, 0x819); - write_rtl8255(dev, 0x4, 0x419); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x619); - write_rtl8255(dev, 0x4, 0x419); - write_rtl8255(dev, 0x4, 0x419); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x619); - write_rtl8255(dev, 0x4, 0x419); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404044, 0x27, - 0x92402a8c, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc1a); - write_rtl8255(dev, 0x4, 0xe1a); - write_rtl8255(dev, 0x4, 0xc1a); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x81a); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa1a); - write_rtl8255(dev, 0x4, 0x81a); - write_rtl8255(dev, 0x4, 0x41a); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x61a); - write_rtl8255(dev, 0x4, 0x41a); - write_rtl8255(dev, 0x4, 0x41a); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x61a); - write_rtl8255(dev, 0x4, 0x41a); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404024, 0x27, - 0x92402a8c, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc1b); - write_rtl8255(dev, 0x4, 0xe1b); - write_rtl8255(dev, 0x4, 0xc1b); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x81b); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa1b); - write_rtl8255(dev, 0x4, 0x81b); - write_rtl8255(dev, 0x4, 0x41b); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x61b); - write_rtl8255(dev, 0x4, 0x41b); - write_rtl8255(dev, 0x4, 0x41b); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x61b); - write_rtl8255(dev, 0x4, 0x41b); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404004, 0x27, - 0x92402a90, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc1c); - write_rtl8255(dev, 0x4, 0xe1c); - write_rtl8255(dev, 0x4, 0xc1c); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x81c); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa1c); - write_rtl8255(dev, 0x4, 0x81c); - write_rtl8255(dev, 0x4, 0x41c); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x61c); - write_rtl8255(dev, 0x4, 0x41c); - write_rtl8255(dev, 0x4, 0x41c); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x61c); - write_rtl8255(dev, 0x4, 0x41c); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404001, 0x27, - 0x92402a90, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc1d); - write_rtl8255(dev, 0x4, 0xe1d); - write_rtl8255(dev, 0x4, 0xc1d); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x81d); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa1d); - write_rtl8255(dev, 0x4, 0x81d); - write_rtl8255(dev, 0x4, 0x41d); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x61d); - write_rtl8255(dev, 0x4, 0x41d); - write_rtl8255(dev, 0x4, 0x41d); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x61d); - write_rtl8255(dev, 0x4, 0x41d); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a94, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc1e); - write_rtl8255(dev, 0x4, 0xe1e); - write_rtl8255(dev, 0x4, 0xc1e); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x81e); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa1e); - write_rtl8255(dev, 0x4, 0x81e); - write_rtl8255(dev, 0x4, 0x41e); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x61e); - write_rtl8255(dev, 0x4, 0x41e); - write_rtl8255(dev, 0x4, 0x41e); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x61e); - write_rtl8255(dev, 0x4, 0x41e); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x27, - 0x92402a94, 0xf0009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc1f); - write_rtl8255(dev, 0x4, 0xe1f); - write_rtl8255(dev, 0x4, 0xc1f); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x81f); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa1f); - write_rtl8255(dev, 0x4, 0x81f); - write_rtl8255(dev, 0x4, 0x41f); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x61f); - write_rtl8255(dev, 0x4, 0x41f); - write_rtl8255(dev, 0x4, 0x41f); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x61f); - write_rtl8255(dev, 0x4, 0x41f); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404020, 0x80000027, - 0x92402a98, 0xf8009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc20); - write_rtl8255(dev, 0x4, 0xe20); - write_rtl8255(dev, 0x4, 0xc20); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x820); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa20); - write_rtl8255(dev, 0x4, 0x820); - write_rtl8255(dev, 0x4, 0x420); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x620); - write_rtl8255(dev, 0x4, 0x420); - write_rtl8255(dev, 0x4, 0x420); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x620); - write_rtl8255(dev, 0x4, 0x420); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404020, 0x27, - 0x92402a98, 0xf8009, 0x28000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc21); - write_rtl8255(dev, 0x4, 0xe21); - write_rtl8255(dev, 0x4, 0xc21); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x821); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa21); - write_rtl8255(dev, 0x4, 0x821); - write_rtl8255(dev, 0x4, 0x421); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x621); - write_rtl8255(dev, 0x4, 0x421); - write_rtl8255(dev, 0x4, 0x421); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x621); - write_rtl8255(dev, 0x4, 0x421); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a68, 0xf0009, 0x10028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc22); - write_rtl8255(dev, 0x4, 0xe22); - write_rtl8255(dev, 0x4, 0xc22); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x822); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa22); - write_rtl8255(dev, 0x4, 0x822); - write_rtl8255(dev, 0x4, 0x422); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x622); - write_rtl8255(dev, 0x4, 0x422); - write_rtl8255(dev, 0x4, 0x422); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x622); - write_rtl8255(dev, 0x4, 0x422); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404010, 0x80000027, - 0x92402a68, 0xf0009, 0x20028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc23); - write_rtl8255(dev, 0x4, 0xe23); - write_rtl8255(dev, 0x4, 0xc23); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x823); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa23); - write_rtl8255(dev, 0x4, 0x823); - write_rtl8255(dev, 0x4, 0x423); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x623); - write_rtl8255(dev, 0x4, 0x423); - write_rtl8255(dev, 0x4, 0x423); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x623); - write_rtl8255(dev, 0x4, 0x423); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404010, 0x80000027, - 0x92402a6c, 0xf0009, 0x30028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc24); - write_rtl8255(dev, 0x4, 0xe24); - write_rtl8255(dev, 0x4, 0xc24); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x824); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa24); - write_rtl8255(dev, 0x4, 0x824); - write_rtl8255(dev, 0x4, 0x424); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x624); - write_rtl8255(dev, 0x4, 0x424); - write_rtl8255(dev, 0x4, 0x424); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x624); - write_rtl8255(dev, 0x4, 0x424); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404010, 0x80000027, - 0x92402a6c, 0xf0009, 0x40028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc25); - write_rtl8255(dev, 0x4, 0xe25); - write_rtl8255(dev, 0x4, 0xc25); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x825); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa25); - write_rtl8255(dev, 0x4, 0x825); - write_rtl8255(dev, 0x4, 0x425); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x625); - write_rtl8255(dev, 0x4, 0x425); - write_rtl8255(dev, 0x4, 0x425); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x625); - write_rtl8255(dev, 0x4, 0x425); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a70, 0xf0009, 0x60028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc26); - write_rtl8255(dev, 0x4, 0xe26); - write_rtl8255(dev, 0x4, 0xc26); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x826); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa26); - write_rtl8255(dev, 0x4, 0x826); - write_rtl8255(dev, 0x4, 0x426); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x626); - write_rtl8255(dev, 0x4, 0x426); - write_rtl8255(dev, 0x4, 0x426); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x626); - write_rtl8255(dev, 0x4, 0x426); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404031, 0x40000027, - 0x92402a70, 0xf0011, 0x60028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc27); - write_rtl8255(dev, 0x4, 0xe27); - write_rtl8255(dev, 0x4, 0xc27); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x827); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa27); - write_rtl8255(dev, 0x4, 0x827); - write_rtl8255(dev, 0x4, 0x427); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x627); - write_rtl8255(dev, 0x4, 0x427); - write_rtl8255(dev, 0x4, 0x427); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x627); - write_rtl8255(dev, 0x4, 0x427); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404011, 0x40000027, - 0x92402a74, 0xf0011, 0x60028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc28); - write_rtl8255(dev, 0x4, 0xe28); - write_rtl8255(dev, 0x4, 0xc28); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x828); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa28); - write_rtl8255(dev, 0x4, 0x828); - write_rtl8255(dev, 0x4, 0x428); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x628); - write_rtl8255(dev, 0x4, 0x428); - write_rtl8255(dev, 0x4, 0x428); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x628); - write_rtl8255(dev, 0x4, 0x428); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404010, 0xc0000027, - 0x92402a74, 0xf0011, 0x60028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc29); - write_rtl8255(dev, 0x4, 0xe29); - write_rtl8255(dev, 0x4, 0xc29); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x829); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa29); - write_rtl8255(dev, 0x4, 0x829); - write_rtl8255(dev, 0x4, 0x429); - write_rtl8255(dev, 0x3, 0x25); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x629); - write_rtl8255(dev, 0x4, 0x429); - write_rtl8255(dev, 0x4, 0x429); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x629); - write_rtl8255(dev, 0x4, 0x429); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a78, 0xf0011, 0x60028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc2a); - write_rtl8255(dev, 0x4, 0xe2a); - write_rtl8255(dev, 0x4, 0xc2a); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x82a); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa2a); - write_rtl8255(dev, 0x4, 0x82a); - write_rtl8255(dev, 0x4, 0x42a); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x62a); - write_rtl8255(dev, 0x4, 0x42a); - write_rtl8255(dev, 0x4, 0x42a); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x62a); - write_rtl8255(dev, 0x4, 0x42a); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a78, 0xf0011, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc2b); - write_rtl8255(dev, 0x4, 0xe2b); - write_rtl8255(dev, 0x4, 0xc2b); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x82b); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa2b); - write_rtl8255(dev, 0x4, 0x82b); - write_rtl8255(dev, 0x4, 0x42b); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x62b); - write_rtl8255(dev, 0x4, 0x42b); - write_rtl8255(dev, 0x4, 0x42b); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x62b); - write_rtl8255(dev, 0x4, 0x42b); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a48, 0xf0019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc2c); - write_rtl8255(dev, 0x4, 0xe2c); - write_rtl8255(dev, 0x4, 0xc2c); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x82c); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa2c); - write_rtl8255(dev, 0x4, 0x82c); - write_rtl8255(dev, 0x4, 0x42c); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x62c); - write_rtl8255(dev, 0x4, 0x42c); - write_rtl8255(dev, 0x4, 0x42c); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x62c); - write_rtl8255(dev, 0x4, 0x42c); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a48, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc2d); - write_rtl8255(dev, 0x4, 0xe2d); - write_rtl8255(dev, 0x4, 0xc2d); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x82d); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa2d); - write_rtl8255(dev, 0x4, 0x82d); - write_rtl8255(dev, 0x4, 0x42d); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x62d); - write_rtl8255(dev, 0x4, 0x42d); - write_rtl8255(dev, 0x4, 0x42d); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x62d); - write_rtl8255(dev, 0x4, 0x42d); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a4c, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc2e); - write_rtl8255(dev, 0x4, 0xe2e); - write_rtl8255(dev, 0x4, 0xc2e); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x82e); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa2e); - write_rtl8255(dev, 0x4, 0x82e); - write_rtl8255(dev, 0x4, 0x42e); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x62e); - write_rtl8255(dev, 0x4, 0x42e); - write_rtl8255(dev, 0x4, 0x42e); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x62e); - write_rtl8255(dev, 0x4, 0x42e); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a4c, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc2f); - write_rtl8255(dev, 0x4, 0xe2f); - write_rtl8255(dev, 0x4, 0xc2f); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x82f); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa2f); - write_rtl8255(dev, 0x4, 0x82f); - write_rtl8255(dev, 0x4, 0x42f); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x62f); - write_rtl8255(dev, 0x4, 0x42f); - write_rtl8255(dev, 0x4, 0x42f); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x62f); - write_rtl8255(dev, 0x4, 0x42f); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a50, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc30); - write_rtl8255(dev, 0x4, 0xe30); - write_rtl8255(dev, 0x4, 0xc30); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x830); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa30); - write_rtl8255(dev, 0x4, 0x830); - write_rtl8255(dev, 0x4, 0x430); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x630); - write_rtl8255(dev, 0x4, 0x430); - write_rtl8255(dev, 0x4, 0x430); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x630); - write_rtl8255(dev, 0x4, 0x430); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a50, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc31); - write_rtl8255(dev, 0x4, 0xe31); - write_rtl8255(dev, 0x4, 0xc31); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x831); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa31); - write_rtl8255(dev, 0x4, 0x831); - write_rtl8255(dev, 0x4, 0x431); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x631); - write_rtl8255(dev, 0x4, 0x431); - write_rtl8255(dev, 0x4, 0x431); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x631); - write_rtl8255(dev, 0x4, 0x431); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a54, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc32); - write_rtl8255(dev, 0x4, 0xe32); - write_rtl8255(dev, 0x4, 0xc32); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x832); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa32); - write_rtl8255(dev, 0x4, 0x832); - write_rtl8255(dev, 0x4, 0x432); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x632); - write_rtl8255(dev, 0x4, 0x432); - write_rtl8255(dev, 0x4, 0x432); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x632); - write_rtl8255(dev, 0x4, 0x432); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a54, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc33); - write_rtl8255(dev, 0x4, 0xe33); - write_rtl8255(dev, 0x4, 0xc33); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x833); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa33); - write_rtl8255(dev, 0x4, 0x833); - write_rtl8255(dev, 0x4, 0x433); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x633); - write_rtl8255(dev, 0x4, 0x433); - write_rtl8255(dev, 0x4, 0x433); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x633); - write_rtl8255(dev, 0x4, 0x433); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a58, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc34); - write_rtl8255(dev, 0x4, 0xe34); - write_rtl8255(dev, 0x4, 0xc34); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x834); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa34); - write_rtl8255(dev, 0x4, 0x834); - write_rtl8255(dev, 0x4, 0x434); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x634); - write_rtl8255(dev, 0x4, 0x434); - write_rtl8255(dev, 0x4, 0x434); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x634); - write_rtl8255(dev, 0x4, 0x434); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a58, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc35); - write_rtl8255(dev, 0x4, 0xe35); - write_rtl8255(dev, 0x4, 0xc35); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x835); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa35); - write_rtl8255(dev, 0x4, 0x835); - write_rtl8255(dev, 0x4, 0x435); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x4, 0x635); - write_rtl8255(dev, 0x4, 0x435); - write_rtl8255(dev, 0x4, 0x435); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x635); - write_rtl8255(dev, 0x4, 0x435); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a24, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc36); - write_rtl8255(dev, 0x4, 0xe36); - write_rtl8255(dev, 0x4, 0xc36); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x836); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa36); - write_rtl8255(dev, 0x4, 0x836); - write_rtl8255(dev, 0x4, 0x436); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x25); - write_rtl8255(dev, 0x4, 0x636); - write_rtl8255(dev, 0x4, 0x436); - write_rtl8255(dev, 0x4, 0x436); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x636); - write_rtl8255(dev, 0x4, 0x436); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a24, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc37); - write_rtl8255(dev, 0x4, 0xe37); - write_rtl8255(dev, 0x4, 0xc37); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x837); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa37); - write_rtl8255(dev, 0x4, 0x837); - write_rtl8255(dev, 0x4, 0x437); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x25); - write_rtl8255(dev, 0x4, 0x637); - write_rtl8255(dev, 0x4, 0x437); - write_rtl8255(dev, 0x4, 0x437); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x637); - write_rtl8255(dev, 0x4, 0x437); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a28, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc38); - write_rtl8255(dev, 0x4, 0xe38); - write_rtl8255(dev, 0x4, 0xc38); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x838); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa38); - write_rtl8255(dev, 0x4, 0x838); - write_rtl8255(dev, 0x4, 0x438); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x25); - write_rtl8255(dev, 0x4, 0x638); - write_rtl8255(dev, 0x4, 0x438); - write_rtl8255(dev, 0x4, 0x438); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x638); - write_rtl8255(dev, 0x4, 0x438); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a28, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc39); - write_rtl8255(dev, 0x4, 0xe39); - write_rtl8255(dev, 0x4, 0xc39); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x839); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa39); - write_rtl8255(dev, 0x4, 0x839); - write_rtl8255(dev, 0x4, 0x439); - write_rtl8255(dev, 0x3, 0x24); - write_rtl8255(dev, 0x2, 0x25); - write_rtl8255(dev, 0x4, 0x639); - write_rtl8255(dev, 0x4, 0x439); - write_rtl8255(dev, 0x4, 0x439); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x639); - write_rtl8255(dev, 0x4, 0x439); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a00, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc3a); - write_rtl8255(dev, 0x4, 0xe3a); - write_rtl8255(dev, 0x4, 0xc3a); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x83a); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa3a); - write_rtl8255(dev, 0x4, 0x83a); - write_rtl8255(dev, 0x4, 0x43a); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0x63a); - write_rtl8255(dev, 0x4, 0x43a); - write_rtl8255(dev, 0x4, 0x43a); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x63a); - write_rtl8255(dev, 0x4, 0x43a); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a00, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc3b); - write_rtl8255(dev, 0x4, 0xe3b); - write_rtl8255(dev, 0x4, 0xc3b); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x83b); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa3b); - write_rtl8255(dev, 0x4, 0x83b); - write_rtl8255(dev, 0x4, 0x43b); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0x63b); - write_rtl8255(dev, 0x4, 0x43b); - write_rtl8255(dev, 0x4, 0x43b); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x63b); - write_rtl8255(dev, 0x4, 0x43b); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a00, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc3c); - write_rtl8255(dev, 0x4, 0xe3c); - write_rtl8255(dev, 0x4, 0xc3c); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x83c); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa3c); - write_rtl8255(dev, 0x4, 0x83c); - write_rtl8255(dev, 0x4, 0x43c); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0x63c); - write_rtl8255(dev, 0x4, 0x43c); - write_rtl8255(dev, 0x4, 0x43c); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x63c); - write_rtl8255(dev, 0x4, 0x43c); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a00, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc3d); - write_rtl8255(dev, 0x4, 0xe3d); - write_rtl8255(dev, 0x4, 0xc3d); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x83d); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa3d); - write_rtl8255(dev, 0x4, 0x83d); - write_rtl8255(dev, 0x4, 0x43d); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0x63d); - write_rtl8255(dev, 0x4, 0x43d); - write_rtl8255(dev, 0x4, 0x43d); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x63d); - write_rtl8255(dev, 0x4, 0x43d); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a00, 0xf8019, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc3e); - write_rtl8255(dev, 0x4, 0xe3e); - write_rtl8255(dev, 0x4, 0xc3e); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x83e); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa3e); - write_rtl8255(dev, 0x4, 0x83e); - write_rtl8255(dev, 0x4, 0x43e); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0x63e); - write_rtl8255(dev, 0x4, 0x43e); - write_rtl8255(dev, 0x4, 0x43e); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x63e); - write_rtl8255(dev, 0x4, 0x43e); - write_rtl8255_reg0c(dev, 0x1554, 0xa800403b, 0xf6d44278, 0x80404000, 0x80000027, - 0x92402a00, 0xf8011, 0x70028000, 0xc00, 0x0); - write_rtl8255(dev, 0x1, 0x807); - write_rtl8255(dev, 0x4, 0xc3f); - write_rtl8255(dev, 0x4, 0xe3f); - write_rtl8255(dev, 0x4, 0xc3f); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255(dev, 0x4, 0x83f); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0xa3f); - write_rtl8255(dev, 0x4, 0x83f); - write_rtl8255(dev, 0x4, 0x43f); - write_rtl8255(dev, 0x3, 0x0); - write_rtl8255(dev, 0x2, 0x0); - write_rtl8255(dev, 0x4, 0x63f); - write_rtl8255(dev, 0x4, 0x43f); - write_rtl8255(dev, 0x4, 0x43f); - write_rtl8255(dev, 0x3, 0x100); - write_rtl8255(dev, 0x4, 0x63f); - write_rtl8255(dev, 0x4, 0x43f); - write_rtl8255(dev, 0x4, 0x0); - write_rtl8255(dev, 0x1, 0x0); - write_rtl8255_reg0c(dev, 0x3539, 0x70000c03, 0xfef46178, 0x408000, 0x403307, - 0x924f80c0, 0xf955c, 0x8400, 0x429200, 0x1ce20); - write_rtl8255(dev, 0x1, 0x1c7); - write_rtl8255(dev, 0x2, 0x26); - write_rtl8255(dev, 0x3, 0x27); - write_rtl8255(dev, 0x1, 0x47); - write_rtl8255(dev, 0x4, 0x98c); - write_rtl8255(dev, 0x5, 0x65); - write_rtl8255(dev, 0x6, 0x13); - write_rtl8255(dev, 0x7, 0x7c); - write_rtl8255(dev, 0x8, 0x6); - write_rtl8255(dev, 0x8, 0x7); - write_rtl8255(dev, 0x8, 0x6); - write_rtl8255(dev, 0x9, 0xce2); - write_rtl8255(dev, 0xb, 0x1c5); - write_rtl8255(dev, 0xd, 0xd7f); - write_rtl8255(dev, 0xe, 0x369); - write_rtl8255(dev, 0xa, 0xd56); - write_rtl8255(dev, 0xa, 0xd57); - mdelay(20); - write_rtl8255(dev, 0xd, 0xd7e); - -} - - -void rtl8255_set_band_param(struct net_device *dev, short band) -{ - if(band != BAND_A){ - write_nic_dword(dev, 0x94, 0x3dc00002); - write_nic_dword(dev, 0x88, 0x00100040); - - write_phy_cck(dev, 0x13, 0xd0); - - write_phy_cck(dev, 0x41, 0x9d); - write_nic_dword(dev, 0x8c, 0x00082205); - write_nic_byte(dev, 0xb4, 0x66); - } -} - -void rtl8255_rf_init(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - int i; - u16 brsr; -// short channel /*= priv->chan*/ = 1; - priv->chan = 1; - - write_nic_word(dev, RFPinsOutput, 0x80); - write_nic_word(dev, RFPinsSelect, 0x80 | SW_CONTROL_GPIO); - write_nic_word(dev, RFPinsEnable, 0x80); - write_nic_word(dev, RFPinsSelect, SW_CONTROL_GPIO); - - write_nic_dword(dev, RF_TIMING, 0x000f800f); - - brsr = read_nic_word(dev, BRSR); - - write_nic_word(dev, 0x2c, 0xffff); - - - rtl8180_set_anaparam(dev, RTL8255_ANAPARAM_ON); - rtl8185_set_anaparam2(dev, RTL8255_ANAPARAM2_ON); - - write_nic_dword(dev, 0x94, 0x11c00002); - - write_nic_dword(dev, RF_PARA, 0x100040); - - rtl8185_rf_pins_enable(dev); - - rtl8255_init_BGband(dev); - rtl8255_set_band_param(dev,BAND_BG); - - write_phy_cck(dev, 0x0, 0x98); - write_phy_cck(dev, 0x3, 0x20); - write_phy_cck(dev, 0x4, 0x2e); - write_phy_cck(dev, 0x5, 0x12); - write_phy_cck(dev, 0x6, 0xfc); - write_phy_cck(dev, 0x7, 0xd8); - write_phy_cck(dev, 0x8, 0x2e); - write_phy_cck(dev, 0x10, 0xd3); - write_phy_cck(dev, 0x11, 0x88); - write_phy_cck(dev, 0x12, 0x47); - write_phy_cck(dev, 0x13, 0xd0); /* Ver C & D & 8187*/ - - write_phy_cck(dev, 0x19, 0x0); - write_phy_cck(dev, 0x1a, 0xa0); - write_phy_cck(dev, 0x1b, 0x8); - write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */ - write_phy_cck(dev, 0x41, 0x9d); /* Energy Threshold */ - //write_phy_cck(dev, 0x42, 0x0); - write_phy_cck(dev, 0x43, 0x8); - - write_nic_byte(dev, TESTR,0x8); - - for(i=0;i<128;i++){ - write_phy_ofdm(dev, 0x4b, rtl8255_agc[i]); - write_phy_ofdm(dev, 0x4a, (u8)i+ 0x80); - } - - - write_phy_ofdm(dev, 0x0, 0x1); - write_phy_ofdm(dev, 0x1, 0x2); - write_phy_ofdm(dev, 0x2, 0x43); - write_phy_ofdm(dev, 0x3, 0x0); - write_phy_ofdm(dev, 0x4, 0x0); - write_phy_ofdm(dev, 0x5, 0x0); - write_phy_ofdm(dev, 0x6, 0x40); - write_phy_ofdm(dev, 0x7, 0x0); - write_phy_ofdm(dev, 0x8, 0x40); - write_phy_ofdm(dev, 0x9, 0xfe); - write_phy_ofdm(dev, 0xa, 0x9); - write_phy_ofdm(dev, 0xb, 0x80); - write_phy_ofdm(dev, 0xc, 0x1); - write_phy_ofdm(dev, 0xd, 0x43); - write_phy_ofdm(dev, 0xe, 0xd3); - write_phy_ofdm(dev, 0xf, 0x38); - write_phy_ofdm(dev, 0x10, 0x4); - write_phy_ofdm(dev, 0x11, 0x06);/*agc resp time 700*/ - write_phy_ofdm(dev, 0x12, 0x20); - write_phy_ofdm(dev, 0x13, 0x20); - write_phy_ofdm(dev, 0x14, 0x0); - write_phy_ofdm(dev, 0x15, 0x40); - write_phy_ofdm(dev, 0x16, 0x0); - write_phy_ofdm(dev, 0x17, 0x40); - write_phy_ofdm(dev, 0x18, 0xef); - write_phy_ofdm(dev, 0x19, 0x25); - write_phy_ofdm(dev, 0x1a, 0x20); - write_phy_ofdm(dev, 0x1b, 0x7a); - write_phy_ofdm(dev, 0x1c, 0x84); - write_phy_ofdm(dev, 0x1e, 0x95); - write_phy_ofdm(dev, 0x1f, 0x75); - write_phy_ofdm(dev, 0x20, 0x1f); - write_phy_ofdm(dev, 0x21, 0x17); - write_phy_ofdm(dev, 0x22, 0x16); - write_phy_ofdm(dev, 0x23, 0x70); //FIXME maybe not needed - write_phy_ofdm(dev, 0x24, 0x70); - write_phy_ofdm(dev, 0x25, 0x0); - write_phy_ofdm(dev, 0x26, 0x10); - write_phy_ofdm(dev, 0x27, 0x88); - - - write_nic_dword(dev, 0x94, 0x3dc00002); //BAND DEPEND. -// write_nic_dword(dev, 0x94, 0x15c00002); //BAND DEPEND. - - write_phy_cck(dev, 0x4, 0x18); - write_phy_cck(dev, 0x43, 0x18); - write_phy_cck(dev, 0x6, 0xdc); - write_phy_cck(dev, 0x44, 0x2b); - write_phy_cck(dev, 0x45, 0x2b); - write_phy_cck(dev, 0x46, 0x25); - write_phy_cck(dev, 0x47, 0x15); - write_phy_cck(dev, 0x48, 0x0); - write_phy_cck(dev, 0x49, 0x0); - 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); - - write_phy_cck(dev, 0x10, 0x93 |0x4); /* Rx ant B, 0xd3 for A */ - write_phy_ofdm(dev, 0x26, 0x90); /* Rx ant B, 0x10 for A */ - - rtl8185_tx_antenna(dev, 0x3); /* TX ant B, 0x0 for A*/ - /* make sure is waken up! */ - rtl8180_set_anaparam(dev, RTL8255_ANAPARAM_ON); - rtl8185_set_anaparam2(dev, RTL8255_ANAPARAM2_ON); - - rtl8255_set_band_param(dev,BAND_BG); - - write_phy_cck(dev, 0x41, 0x9d); - - rtl8255_set_gain(dev, 4); - //rtl8255_set_energy_threshold(dev); - write_phy_cck(dev, 0x41, 0x9d); - rtl8255_rf_set_chan(dev, priv->chan); - - write_nic_word(dev, BRSR, brsr); -} - diff --git a/drivers/staging/rtl8187se/r8180_rtl8255.h b/drivers/staging/rtl8187se/r8180_rtl8255.h deleted file mode 100644 index be44ca6eb1d3..000000000000 --- a/drivers/staging/rtl8187se/r8180_rtl8255.h +++ /dev/null @@ -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 <andreamrl@tiscali.it> - - 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); diff --git a/drivers/staging/rtl8187se/r8180_sa2400.c b/drivers/staging/rtl8187se/r8180_sa2400.c deleted file mode 100644 index d6495601715f..000000000000 --- a/drivers/staging/rtl8187se/r8180_sa2400.c +++ /dev/null @@ -1,233 +0,0 @@ -/* - This files contains PHILIPS SA2400 radio frontend programming routines. - - This is part of rtl8180 OpenSource driver - Copyright (C) Andrea Merello 2004-2005 <andreamrl@tiscali.it> - 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. - - Code at http://che.ojctech.com/~dyoung/rtw/ has been useful to me to - understand some things. - - Code from rtl8181 project has been useful to me to understand some things. - - We want to tanks the Authors of such projects and the Ndiswrapper - project Authors. -*/ - - -#include "r8180.h" -#include "r8180_hw.h" -#include "r8180_sa2400.h" - - -//#define DEBUG_SA2400 - -u32 sa2400_chan[] = { - 0x0, //dummy channel 0 - 0x00096c, //1 - 0x080970, //2 - 0x100974, //3 - 0x180978, //4 - 0x000980, //5 - 0x080984, //6 - 0x100988, //7 - 0x18098c, //8 - 0x000994, //9 - 0x080998, //10 - 0x10099c, //11 - 0x1809a0, //12 - 0x0009a8, //13 - 0x0009b4, //14 -}; - - -void rf_stabilize(struct net_device *dev) -{ - force_pci_posting(dev); - mdelay(3); //for now use a great value.. we may optimize in future -} - - -void write_sa2400(struct net_device *dev,u8 adr, u32 data) -{ -// struct r8180_priv *priv = ieee80211_priv(dev); - u32 phy_config; - - // philips sa2400 expects 24 bits data - - /*if(adr == 4 && priv->digphy){ - phy_config=0x60000000; - }else{ - phy_config=0xb0000000; - }*/ - - phy_config = 0xb0000000; // MAC will bang bits to the sa2400 - - phy_config |= (((u32)(adr&0xf))<< 24); - phy_config |= (data & 0xffffff); - write_nic_dword(dev,PHY_CONFIG,phy_config); -#ifdef DEBUG_SA2400 - DMESG("Writing sa2400: %x (adr %x)",phy_config,adr); -#endif - rf_stabilize(dev); -} - - - -void sa2400_write_phy_antenna(struct net_device *dev,short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u8 ant; - - ant = SA2400_ANTENNA; - if(priv->antb) /*default antenna is antenna B */ - ant |= BB_ANTENNA_B; - if(ch == 14) - ant |= BB_ANTATTEN_CHAN14; - write_phy(dev,0x10,ant); - //DMESG("BB antenna %x ",ant); -} - - -/* from the rtl8181 embedded driver */ -short sa2400_rf_set_sens(struct net_device *dev, short sens) -{ - u8 finetune = 0; - if ((sens > 85) || (sens < 54)) return -1; - - write_sa2400(dev,5,0x1dfb | (sens-54) << 15 |(finetune<<20)); // AGC 0xc9dfb - - return 0; -} - - -void sa2400_rf_set_chan(struct net_device *dev, short ch) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u32 txpw = 0xff & priv->chtxpwr[ch]; - u32 chan = sa2400_chan[ch]; - - write_sa2400(dev,7,txpw); - //write_phy(dev,0x10,0xd1); - sa2400_write_phy_antenna(dev,ch); - write_sa2400(dev,0,chan); - write_sa2400(dev,1,0xbb50); - write_sa2400(dev,2,0x80); - write_sa2400(dev,3,0); -} - - -void sa2400_rf_close(struct net_device *dev) -{ - write_sa2400(dev, 4, 0); -} - - -void sa2400_rf_init(struct net_device *dev) -{ - struct r8180_priv *priv = ieee80211_priv(dev); - u32 anaparam; - u8 firdac; - - write_nic_byte(dev,PHY_DELAY,0x6); //this is general - write_nic_byte(dev,CARRIER_SENSE_COUNTER,0x4c); //this is general - - /*these are philips sa2400 specific*/ - anaparam = read_nic_dword(dev,ANAPARAM); - anaparam = anaparam &~ (1<<ANAPARAM_TXDACOFF_SHIFT); - - anaparam = anaparam &~ANAPARAM_PWR1_MASK; - anaparam = anaparam &~ANAPARAM_PWR0_MASK; - if(priv->digphy){ - anaparam |= (SA2400_DIG_ANAPARAM_PWR1_ON<<ANAPARAM_PWR1_SHIFT); - anaparam |= (SA2400_ANAPARAM_PWR0_ON<<ANAPARAM_PWR0_SHIFT); - }else{ - anaparam |= (SA2400_ANA_ANAPARAM_PWR1_ON<<ANAPARAM_PWR1_SHIFT); - } - - rtl8180_set_anaparam(dev,anaparam); - - firdac = (priv->digphy) ? (1<<SA2400_REG4_FIRDAC_SHIFT) : 0; - write_sa2400(dev,0,sa2400_chan[priv->chan]); - write_sa2400(dev,1,0xbb50); - write_sa2400(dev,2,0x80); - write_sa2400(dev,3,0); - write_sa2400(dev,4,0x19340 | firdac); - write_sa2400(dev,5,0xc9dfb); // AGC - write_sa2400(dev,4,0x19348 | firdac); //calibrates VCO - - if(priv->digphy) - write_sa2400(dev,4,0x1938c); /*???*/ - - write_sa2400(dev,4,0x19340 | firdac); - - write_sa2400(dev,0,sa2400_chan[priv->chan]); - write_sa2400(dev,1,0xbb50); - write_sa2400(dev,2,0x80); - write_sa2400(dev,3,0); - write_sa2400(dev,4,0x19344 | firdac); //calibrates filter - - /* new from rtl8180 embedded driver (rtl8181 project) */ - write_sa2400(dev,6,0x13ff | (1<<23)); // MANRX - write_sa2400(dev,8,0); //VCO - - if(!priv->digphy) - { - rtl8180_set_anaparam(dev, anaparam | \ - (1<<ANAPARAM_TXDACOFF_SHIFT)); - - rtl8180_conttx_enable(dev); - - write_sa2400(dev, 4, 0x19341); // calibrates DC - - /* a 5us sleep is required here, - we rely on the 3ms delay introduced in write_sa2400 - */ - write_sa2400(dev, 4, 0x19345); - /* a 20us sleep is required here, - we rely on the 3ms delay introduced in write_sa2400 - */ - rtl8180_conttx_disable(dev); - - rtl8180_set_anaparam(dev, anaparam); - } - /* end new */ - - write_sa2400(dev,4,0x19341 | firdac ); //RTX MODE - - // Set tx power level !? - - - /*baseband configuration*/ - write_phy(dev,0,0x98); - write_phy(dev,3,0x38); - write_phy(dev,4,0xe0); - write_phy(dev,5,0x90); - write_phy(dev,6,0x1a); - write_phy(dev,7,0x64); - - /*Should be done something more here??*/ - - sa2400_write_phy_antenna(dev,priv->chan); - - write_phy(dev,0x11,0x80); - if(priv->diversity) - write_phy(dev,0x12,0xc7); - else - write_phy(dev,0x12,0x47); - - write_phy(dev,0x13,0x90 | priv->cs_treshold ); - - write_phy(dev,0x19,0x0); - write_phy(dev,0x1a,0xa0); - - sa2400_rf_set_chan(dev,priv->chan); -} diff --git a/drivers/staging/rtl8187se/r8180_sa2400.h b/drivers/staging/rtl8187se/r8180_sa2400.h deleted file mode 100644 index 683a69b96af4..000000000000 --- a/drivers/staging/rtl8187se/r8180_sa2400.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - This is part of rtl8180 OpenSource driver - v 0.7 - Copyright (C) Andrea Merello 2004 <andreamrl@tiscali.it> - 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); diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index 979ba0b5f331..766892e31f52 100644 --- a/drivers/staging/rtl8187se/r8180_wx.c +++ b/drivers/staging/rtl8187se/r8180_wx.c @@ -20,17 +20,14 @@ #include "r8180.h" #include "r8180_hw.h" -#include "r8180_sa2400.h" -#ifdef ENABLE_DOT11D -#include "dot11d.h" -#endif +#include "ieee80211/dot11d.h" //#define RATE_COUNT 4 u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000, 6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000}; -#define RATE_COUNT (sizeof(rtl8180_rates)/sizeof(rtl8180_rates[0])) +#define RATE_COUNT ARRAY_SIZE(rtl8180_rates) static CHANNEL_LIST DefaultChannelPlan[] = { // {{1,2,3,4,5,6,7,8,9,10,11,12,13,14},14}, //Default channel plan @@ -197,13 +194,11 @@ static int r8180_wx_set_mode(struct net_device *dev, struct iw_request_info *a, return 0; down(&priv->wx_sem); -#ifdef ENABLE_IPS // printk("set mode ENABLE_IPS\n"); if(priv->bInactivePs){ if(wrqu->mode == IW_MODE_ADHOC) IPSLeave(dev); } -#endif ret = ieee80211_wx_set_mode(priv->ieee80211,a,wrqu,b); //rtl8180_commit(dev); @@ -313,11 +308,7 @@ static int rtl8180_wx_get_range(struct net_device *dev, for (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; @@ -370,7 +361,6 @@ static int r8180_wx_set_scan(struct net_device *dev, struct iw_request_info *a, down(&priv->wx_sem); if(priv->up){ -#ifdef ENABLE_IPS // printk("set scan ENABLE_IPS\n"); priv->ieee80211->actscanning = true; if(priv->bInactivePs && (priv->ieee80211->state != IEEE80211_LINKED)){ @@ -393,7 +383,6 @@ static int r8180_wx_set_scan(struct net_device *dev, struct iw_request_info *a, ret = 0; } else -#endif { //YJ,add,080828, prevent scan in BusyTraffic //FIXME: Need to consider last scan time @@ -446,11 +435,9 @@ static int r8180_wx_set_essid(struct net_device *dev, return 0; down(&priv->wx_sem); -#ifdef ENABLE_IPS //printk("set essid ENABLE_IPS\n"); if(priv->bInactivePs) IPSLeave(dev); -#endif // printk("haha:set essid %s essid_len = %d essid_flgs = %d\n",b, wrqu->essid.length, wrqu->essid.flags); ret = ieee80211_wx_set_essid(priv->ieee80211,a,wrqu,b); @@ -1189,20 +1176,12 @@ static int r8180_wx_set_channelplan(struct net_device *dev, // 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); @@ -1543,7 +1522,6 @@ static iw_handler r8180_private_handler[] = { r8180_wx_set_forcerate, }; -#if WIRELESS_EXT >= 17 static inline int is_same_network(struct ieee80211_network *src, struct ieee80211_network *dst, struct ieee80211_device *ieee) @@ -1584,36 +1562,7 @@ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev) 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; @@ -1626,18 +1575,14 @@ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev) wstats->qual.updated = IW_QUAL_ALL_UPDATED| IW_QUAL_DBM; return wstats; } -#endif - struct iw_handler_def r8180_wx_handlers_def={ .standard = r8180_wx_handlers, - .num_standard = sizeof(r8180_wx_handlers) / sizeof(iw_handler), + .num_standard = ARRAY_SIZE(r8180_wx_handlers), .private = r8180_private_handler, - .num_private = sizeof(r8180_private_handler) / sizeof(iw_handler), + .num_private = ARRAY_SIZE(r8180_private_handler), .num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args), -#if WIRELESS_EXT >= 17 .get_wireless_stats = r8180_get_wireless_stats, -#endif .private_args = (struct iw_priv_args *)r8180_private_args, }; diff --git a/drivers/staging/rtl8187se/r8180_wx.h b/drivers/staging/rtl8187se/r8180_wx.h index b20a67d33411..735d03dceed3 100644 --- a/drivers/staging/rtl8187se/r8180_wx.h +++ b/drivers/staging/rtl8187se/r8180_wx.h @@ -15,7 +15,7 @@ #ifndef R8180_WX_H #define R8180_WX_H #include <linux/wireless.h> -#include "ieee80211.h" +#include "ieee80211/ieee80211.h" extern struct iw_handler_def r8180_wx_handlers_def; #endif diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c index 4b885a2319ee..cd07059b25b5 100644 --- a/drivers/staging/rtl8187se/r8185b_init.c +++ b/drivers/staging/rtl8187se/r8185b_init.c @@ -22,28 +22,16 @@ 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" -#ifdef CONFIG_RTL8180_PM -#include "r8180_pm.h" -#endif - -#ifdef ENABLE_DOT11D -#include "dot11d.h" -#endif +#include "ieee80211/dot11d.h" -#ifdef CONFIG_RTL8185B //#define CONFIG_RTL8180_IO_MAP #define TC_3W_POLL_MAX_TRY_CNT 5 -#ifdef CONFIG_RTL818X_S static u8 MAC_REG_TABLE[][2]={ //PAGA 0: // 0x34(BRSR), 0xBE(RATE_FALLBACK_CTL), 0x1E0(ARFR) would set in HwConfigureRTL8185() @@ -124,97 +112,6 @@ static u8 OFDM_CONFIG[]={ 0xC0, 0xC1, 0x58, 0xF1, 0x00, 0xC4, 0x90, 0x3e, 0xD8, 0x3C, 0x7B, 0x10, 0x10 }; -#else - static u8 MAC_REG_TABLE[][2]={ - //PAGA 0: - {0xf0, 0x32}, {0xf1, 0x32}, {0xf2, 0x00}, {0xf3, 0x00}, {0xf4, 0x32}, - {0xf5, 0x43}, {0xf6, 0x00}, {0xf7, 0x00}, {0xf8, 0x46}, {0xf9, 0xa4}, - {0xfa, 0x00}, {0xfb, 0x00}, {0xfc, 0x96}, {0xfd, 0xa4}, {0xfe, 0x00}, - {0xff, 0x00}, - - //PAGE 1: - {0x5e, 0x01}, - {0x58, 0x4b}, {0x59, 0x00}, {0x5a, 0x4b}, {0x5b, 0x00}, {0x60, 0x4b}, - {0x61, 0x09}, {0x62, 0x4b}, {0x63, 0x09}, {0xce, 0x0f}, {0xcf, 0x00}, - {0xe0, 0xff}, {0xe1, 0x0f}, {0xe2, 0x00}, {0xf0, 0x4e}, {0xf1, 0x01}, - {0xf2, 0x02}, {0xf3, 0x03}, {0xf4, 0x04}, {0xf5, 0x05}, {0xf6, 0x06}, - {0xf7, 0x07}, {0xf8, 0x08}, - - - //PAGE 2: - {0x5e, 0x02}, - {0x0c, 0x04}, {0x21, 0x61}, {0x22, 0x68}, {0x23, 0x6f}, {0x24, 0x76}, - {0x25, 0x7d}, {0x26, 0x84}, {0x27, 0x8d}, {0x4d, 0x08}, {0x4e, 0x00}, - {0x50, 0x05}, {0x51, 0xf5}, {0x52, 0x04}, {0x53, 0xa0}, {0x54, 0x1f}, - {0x55, 0x23}, {0x56, 0x45}, {0x57, 0x67}, {0x58, 0x08}, {0x59, 0x08}, - {0x5a, 0x08}, {0x5b, 0x08}, {0x60, 0x08}, {0x61, 0x08}, {0x62, 0x08}, - {0x63, 0x08}, {0x64, 0xcf}, {0x72, 0x56}, {0x73, 0x9a}, - - //PAGA 0: - {0x5e, 0x00}, - {0x34, 0xff}, {0x35, 0x0f}, {0x5b, 0x40}, {0x84, 0x88}, {0x85, 0x24}, - {0x88, 0x54}, {0x8b, 0xb8}, {0x8c, 0x07}, {0x8d, 0x00}, {0x94, 0x1b}, - {0x95, 0x12}, {0x96, 0x00}, {0x97, 0x06}, {0x9d, 0x1a}, {0x9f, 0x10}, - {0xb4, 0x22}, {0xbe, 0x80}, {0xdb, 0x00}, {0xee, 0x00}, {0x5b, 0x42}, - {0x91, 0x03}, - - //PAGE 2: - {0x5e, 0x02}, - {0x4c, 0x03}, - - //PAGE 0: - {0x5e, 0x00}, - - //PAGE 3: - {0x5e, 0x03}, - {0x9f, 0x00}, - - //PAGE 0: - {0x5e, 0x00}, - {0x8c, 0x01}, {0x8d, 0x10},{0x8e, 0x08}, {0x8f, 0x00} - }; - - -static u8 ZEBRA_AGC[]={ - 0, - 0x5e,0x5e,0x5e,0x5e,0x5d,0x5b,0x59,0x57,0x55,0x53,0x51,0x4f,0x4d,0x4b,0x49,0x47, - 0x45,0x43,0x41,0x3f,0x3d,0x3b,0x39,0x37,0x35,0x33,0x31,0x2f,0x2d,0x2b,0x29,0x27, - 0x25,0x23,0x21,0x1f,0x1d,0x1b,0x19,0x17,0x15,0x13,0x11,0x0f,0x0d,0x0b,0x09,0x07, - 0x05,0x03,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, - 0x19,0x19,0x19,0x019,0x19,0x19,0x19,0x19,0x19,0x19,0x1e,0x1f,0x20,0x21,0x21,0x22, - 0x23,0x24,0x24,0x25,0x25,0x26,0x26,0x27,0x27,0x28,0x28,0x28,0x29,0x2a,0x2a,0x2b, - 0x2b,0x2b,0x2c,0x2c,0x2c,0x2d,0x2d,0x2d,0x2e,0x2e,0x2f,0x30,0x31,0x31,0x31,0x31, - 0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31 - }; - -static u32 ZEBRA_RF_RX_GAIN_TABLE[]={ - 0, - 0x0400,0x0401,0x0402,0x0403,0x0404,0x0405,0x0408,0x0409, - 0x040a,0x040b,0x0502,0x0503,0x0504,0x0505,0x0540,0x0541, - 0x0542,0x0543,0x0544,0x0545,0x0580,0x0581,0x0582,0x0583, - 0x0584,0x0585,0x0588,0x0589,0x058a,0x058b,0x0643,0x0644, - 0x0645,0x0680,0x0681,0x0682,0x0683,0x0684,0x0685,0x0688, - 0x0689,0x068a,0x068b,0x068c,0x0742,0x0743,0x0744,0x0745, - 0x0780,0x0781,0x0782,0x0783,0x0784,0x0785,0x0788,0x0789, - 0x078a,0x078b,0x078c,0x078d,0x0790,0x0791,0x0792,0x0793, - 0x0794,0x0795,0x0798,0x0799,0x079a,0x079b,0x079c,0x079d, - 0x07a0,0x07a1,0x07a2,0x07a3,0x07a4,0x07a5,0x07a8,0x07a9, - 0x03aa,0x03ab,0x03ac,0x03ad,0x03b0,0x03b1,0x03b2,0x03b3, - 0x03b4,0x03b5,0x03b8,0x03b9,0x03ba,0x03bb,0x03bb -}; - -// 2006.07.13, SD3 szuyitasi: -// OFDM.0x03=0x0C (original is 0x0F) -// Use the new SD3 given param, by shien chang, 2006.07.14 -static u8 OFDM_CONFIG[]={ - 0x10, 0x0d, 0x01, 0x0C, 0x14, 0xfb, 0x0f, 0x60, 0x00, 0x60, - 0x00, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, - 0x00, 0x00, 0xa8, 0x46, 0xb2, 0x33, 0x07, 0xa5, 0x6f, 0x55, - 0xc8, 0xb3, 0x0a, 0xe1, 0x1c, 0x8a, 0xb6, 0x83, 0x34, 0x0f, - 0x4f, 0x23, 0x6f, 0xc2, 0x6b, 0x40, 0x80, 0x00, 0xc0, 0xc1, - 0x58, 0xf1, 0x00, 0xe4, 0x90, 0x3e, 0x6d, 0x3c, 0xff, 0x07 -}; -#endif /*--------------------------------------------------------------- * Hardware IO @@ -228,37 +125,9 @@ PlatformIOWrite1Byte( u8 data ) { -#ifndef CONFIG_RTL8180_IO_MAP write_nic_byte(dev, offset, data); read_nic_byte(dev, offset); // To make sure write operation is completed, 2005.11.09, by rcnjko. -#else // Port IO - u32 Page = (offset >> 8); - - switch(Page) - { - case 0: // Page 0 - write_nic_byte(dev, offset, data); - break; - - case 1: // Page 1 - case 2: // Page 2 - case 3: // Page 3 - { - u8 psr = read_nic_byte(dev, PSR); - - write_nic_byte(dev, PSR, ((psr & 0xfc) | (u8)Page)); // Switch to page N. - write_nic_byte(dev, (offset & 0xff), data); - write_nic_byte(dev, PSR, (psr & 0xfc)); // Switch to page 0. - } - break; - - default: - // Illegal page number. - DMESGE("PlatformIOWrite1Byte(): illegal page number: %d, offset: %#X", Page, offset); - break; - } -#endif } void @@ -268,38 +137,10 @@ PlatformIOWrite2Byte( u16 data ) { -#ifndef CONFIG_RTL8180_IO_MAP write_nic_word(dev, offset, data); read_nic_word(dev, offset); // To make sure write operation is completed, 2005.11.09, by rcnjko. -#else // Port IO - u32 Page = (offset >> 8); - - switch(Page) - { - case 0: // Page 0 - write_nic_word(dev, offset, data); - break; - - case 1: // Page 1 - case 2: // Page 2 - case 3: // Page 3 - { - u8 psr = read_nic_byte(dev, PSR); - - write_nic_byte(dev, PSR, ((psr & 0xfc) | (u8)Page)); // Switch to page N. - write_nic_word(dev, (offset & 0xff), data); - write_nic_byte(dev, PSR, (psr & 0xfc)); // Switch to page 0. - } - break; - - default: - // Illegal page number. - DMESGE("PlatformIOWrite2Byte(): illegal page number: %d, offset: %#X", Page, offset); - break; - } -#endif } u8 PlatformIORead1Byte(struct net_device *dev, u32 offset); @@ -310,7 +151,6 @@ PlatformIOWrite4Byte( u32 data ) { -#ifndef CONFIG_RTL8180_IO_MAP //{by amy 080312 if (offset == PhyAddr) {//For Base Band configuration. @@ -354,33 +194,6 @@ if (offset == PhyAddr) write_nic_dword(dev, offset, data); read_nic_dword(dev, offset); // To make sure write operation is completed, 2005.11.09, by rcnjko. } -#else // Port IO - u32 Page = (offset >> 8); - - switch(Page) - { - case 0: // Page 0 - write_nic_word(dev, offset, data); - break; - - case 1: // Page 1 - case 2: // Page 2 - case 3: // Page 3 - { - u8 psr = read_nic_byte(dev, PSR); - - write_nic_byte(dev, PSR, ((psr & 0xfc) | (u8)Page)); // Switch to page N. - write_nic_dword(dev, (offset & 0xff), data); - write_nic_byte(dev, PSR, (psr & 0xfc)); // Switch to page 0. - } - break; - - default: - // Illegal page number. - DMESGE("PlatformIOWrite4Byte(): illegal page number: %d, offset: %#X", Page, offset); - break; - } -#endif } u8 @@ -391,36 +204,8 @@ PlatformIORead1Byte( { u8 data = 0; -#ifndef CONFIG_RTL8180_IO_MAP data = read_nic_byte(dev, offset); -#else // Port IO - u32 Page = (offset >> 8); - - switch(Page) - { - case 0: // Page 0 - data = read_nic_byte(dev, offset); - break; - - case 1: // Page 1 - case 2: // Page 2 - case 3: // Page 3 - { - u8 psr = read_nic_byte(dev, PSR); - - write_nic_byte(dev, PSR, ((psr & 0xfc) | (u8)Page)); // Switch to page N. - data = read_nic_byte(dev, (offset & 0xff)); - write_nic_byte(dev, PSR, (psr & 0xfc)); // Switch to page 0. - } - break; - - default: - // Illegal page number. - DMESGE("PlatformIORead1Byte(): illegal page number: %d, offset: %#X", Page, offset); - break; - } -#endif return data; } @@ -433,36 +218,8 @@ PlatformIORead2Byte( { u16 data = 0; -#ifndef CONFIG_RTL8180_IO_MAP data = read_nic_word(dev, offset); -#else // Port IO - u32 Page = (offset >> 8); - - switch(Page) - { - case 0: // Page 0 - data = read_nic_word(dev, offset); - break; - - case 1: // Page 1 - case 2: // Page 2 - case 3: // Page 3 - { - u8 psr = read_nic_byte(dev, PSR); - - write_nic_byte(dev, PSR, ((psr & 0xfc) | (u8)Page)); // Switch to page N. - data = read_nic_word(dev, (offset & 0xff)); - write_nic_byte(dev, PSR, (psr & 0xfc)); // Switch to page 0. - } - break; - - default: - // Illegal page number. - DMESGE("PlatformIORead2Byte(): illegal page number: %d, offset: %#X", Page, offset); - break; - } -#endif return data; } @@ -475,36 +232,8 @@ PlatformIORead4Byte( { u32 data = 0; -#ifndef CONFIG_RTL8180_IO_MAP data = read_nic_dword(dev, offset); -#else // Port IO - u32 Page = (offset >> 8); - - switch(Page) - { - case 0: // Page 0 - data = read_nic_dword(dev, offset); - break; - - case 1: // Page 1 - case 2: // Page 2 - case 3: // Page 3 - { - u8 psr = read_nic_byte(dev, PSR); - - write_nic_byte(dev, PSR, ((psr & 0xfc) | (u8)Page)); // Switch to page N. - data = read_nic_dword(dev, (offset & 0xff)); - write_nic_byte(dev, PSR, (psr & 0xfc)); // Switch to page 0. - } - break; - - default: - // Illegal page number. - DMESGE("PlatformIORead4Byte(): illegal page number: %d, offset: %#X\n", Page, offset); - break; - } -#endif return data; } @@ -542,12 +271,10 @@ ZEBRA_RFSerialWrite( u16 UshortBuffer; u8 u1bTmp; -#ifdef CONFIG_RTL818X_S // RTL8187S HSSI Read/Write Function u1bTmp = read_nic_byte(dev, RF_SW_CONFIG); u1bTmp |= RF_SW_CFG_SI; //reg08[1]=1 Serial Interface(SI) write_nic_byte(dev, RF_SW_CONFIG, u1bTmp); -#endif UshortBuffer = read_nic_word(dev, RFPinsOutput); oval = UshortBuffer & 0xfff8; // We shall clear bit0, 1, 2 first, 2005.10.28, by rcnjko. @@ -918,7 +645,6 @@ RF_WriteReg( 1); // bWrite } break; - #ifdef CONFIG_RTL818X_S case HW_THREE_WIRE_PI: //Parallel Interface { // Pure HW 3-wire. data2Write = (data << 4) | (u32)(offset & 0x0f); @@ -952,7 +678,6 @@ RF_WriteReg( // printk(" exit ZEBRA_RFSerialWrite\n "); } break; - #endif default: @@ -985,13 +710,11 @@ ZEBRA_RFSerialRead( u8 u1bTmp; ThreeWireReg tdata; //PHAL_DATA_8187 pHalData = GetHalData8187(pAdapter); -#ifdef CONFIG_RTL818X_S { // RTL8187S HSSI Read/Write Function u1bTmp = read_nic_byte(dev, RF_SW_CONFIG); u1bTmp |= RF_SW_CFG_SI; //reg08[1]=1 Serial Interface(SI) write_nic_byte(dev, RF_SW_CONFIG, u1bTmp); } -#endif wReg80 = oval = read_nic_word(dev, RFPinsOutput); oval2 = read_nic_word(dev, RFPinsEnable); @@ -1115,7 +838,6 @@ RF_ReadReg( case RF_ZEBRA4: switch(priv->RegThreeWireMode) { -#ifdef CONFIG_RTL818X_S case HW_THREE_WIRE_PI: // For 87S Parallel Interface. { data2Write = ((u32)(offset&0x0f)); @@ -1145,7 +867,6 @@ RF_ReadReg( } break; -#endif // Perform SW 3-wire programming by driver. default: { @@ -1204,7 +925,6 @@ ReadBBPortUchar( return RegisterContent; } //{by amy 080312 -#ifdef CONFIG_RTL818X_S // // Description: // Perform Antenna settings with antenna diversity on 87SE. @@ -1286,7 +1006,6 @@ SetAntennaConfig87SE( priv->CurrAntennaIndex = DefaultAnt; // Update default settings. return bAntennaSwitched; } -#endif //by amy 080312 /*--------------------------------------------------------------- * Hardware Initialization. @@ -1305,7 +1024,6 @@ ZEBRA_Config_85BASIC_HardCode( u32 u4bRegOffset, u4bRegValue, u4bRF23, u4bRF24; u8 u1b24E; -#ifdef CONFIG_RTL818X_S //============================================================================= // 87S_PCIE :: RADIOCFG.TXT @@ -1470,11 +1188,6 @@ ZEBRA_Config_85BASIC_HardCode( RF_WriteReg(dev, 0x05, 0x05ab); mdelay(1); // Rx mode//+edward RF_WriteReg(dev, 0x00, 0x009f); mdelay(1); // Rx mode//+edward -#if 0//-edward - RF_WriteReg(dev, 0x00, 0x0197); mdelay(1); - RF_WriteReg(dev, 0x05, 0x05ab); mdelay(1); - RF_WriteReg(dev, 0x00, 0x009F); mdelay(1); -#endif RF_WriteReg(dev, 0x01, 0x0000); mdelay(1); // Rx mode//+edward RF_WriteReg(dev, 0x02, 0x0000); mdelay(1); // Rx mode//+edward //power save parameters. @@ -1494,14 +1207,7 @@ ZEBRA_Config_85BASIC_HardCode( CCK reg0x06[3]=1'b1: turn off unused circuits before cca = 1 CCK reg0x06[2]=1'b1: turn off cck's circuit if macrst =0 */ -#if 0 - write_nic_dword(dev, PHY_ADR, 0x0100c880); - write_nic_dword(dev, PHY_ADR, 0x01001c86); - write_nic_dword(dev, PHY_ADR, 0x01007890); - write_nic_dword(dev, PHY_ADR, 0x0100d0ae); - write_nic_dword(dev, PHY_ADR, 0x010006af); - write_nic_dword(dev, PHY_ADR, 0x01004681); -#endif + write_phy_cck(dev,0x00,0xc8); write_phy_cck(dev,0x06,0x1c); write_phy_cck(dev,0x10,0x78); @@ -1513,72 +1219,6 @@ ZEBRA_Config_85BASIC_HardCode( write_nic_byte(dev, CCK_TXAGC, 0x10); write_nic_byte(dev, OFDM_TXAGC, 0x1B); write_nic_byte(dev, ANTSEL, 0x03); -#else - //============================================================================= - // RADIOCFG.TXT - //============================================================================= - - RF_WriteReg(dev, 0x00, 0x00b7); mdelay(1); - RF_WriteReg(dev, 0x01, 0x0ee0); mdelay(1); - RF_WriteReg(dev, 0x02, 0x044d); mdelay(1); - RF_WriteReg(dev, 0x03, 0x0441); mdelay(1); - RF_WriteReg(dev, 0x04, 0x08c3); mdelay(1); - RF_WriteReg(dev, 0x05, 0x0c72); mdelay(1); - RF_WriteReg(dev, 0x06, 0x00e6); mdelay(1); - RF_WriteReg(dev, 0x07, 0x082a); mdelay(1); - RF_WriteReg(dev, 0x08, 0x003f); mdelay(1); - RF_WriteReg(dev, 0x09, 0x0335); mdelay(1); - RF_WriteReg(dev, 0x0a, 0x09d4); mdelay(1); - RF_WriteReg(dev, 0x0b, 0x07bb); mdelay(1); - RF_WriteReg(dev, 0x0c, 0x0850); mdelay(1); - RF_WriteReg(dev, 0x0d, 0x0cdf); mdelay(1); - RF_WriteReg(dev, 0x0e, 0x002b); mdelay(1); - RF_WriteReg(dev, 0x0f, 0x0114); mdelay(1); - - RF_WriteReg(dev, 0x00, 0x01b7); mdelay(1); - - - for(i=1;i<=95;i++) - { - RF_WriteReg(dev, 0x01, i); mdelay(1); - RF_WriteReg(dev, 0x02, ZEBRA_RF_RX_GAIN_TABLE[i]); mdelay(1); - //DbgPrint("RF - 0x%x = 0x%x", i, ZEBRA_RF_RX_GAIN_TABLE[i]); - } - - RF_WriteReg(dev, 0x03, 0x0080); mdelay(1); // write reg 18 - RF_WriteReg(dev, 0x05, 0x0004); mdelay(1); // write reg 20 - RF_WriteReg(dev, 0x00, 0x00b7); mdelay(1); // switch to reg0-reg15 - //0xfd - //0xfd - //0xfd - RF_WriteReg(dev, 0x02, 0x0c4d); mdelay(1); - mdelay(100); // Deay 100 ms. //0xfe - mdelay(100); // Deay 100 ms. //0xfe - RF_WriteReg(dev, 0x02, 0x044d); mdelay(1); - RF_WriteReg(dev, 0x00, 0x02bf); mdelay(1); //0x002f disable 6us corner change, 06f--> enable - - //============================================================================= - - //============================================================================= - // CCKCONF.TXT - //============================================================================= - - //============================================================================= - - //============================================================================= - // Follow WMAC RTL8225_Config() - //============================================================================= - - // power control - write_nic_byte(dev, CCK_TXAGC, 0x03); - write_nic_byte(dev, OFDM_TXAGC, 0x07); - write_nic_byte(dev, ANTSEL, 0x03); - - //============================================================================= - - // OFDM BBP setup -// SetOutputEnableOfRfPins(dev);//by amy -#endif @@ -1633,69 +1273,9 @@ ZEBRA_Config_85BASIC_HardCode( //by amy for antenna //============================================================================= //{by amy 080312 -#ifdef CONFIG_RTL818X_S // Config Sw/Hw Combinational Antenna Diversity. Added by Roger, 2008.02.26. SetAntennaConfig87SE(dev, priv->bDefaultAntenna1, priv->bSwAntennaDiverity); -#endif //by amy 080312} -#if 0 - // Config Sw/Hw Antenna Diversity - if( priv->bSwAntennaDiverity ) // Use SW+Hw Antenna Diversity - { - if( priv->bDefaultAntenna1 == true ) // aux antenna - { - // Mac register, aux antenna - write_nic_byte(dev, ANTSEL, 0x00); - // Config CCK RX antenna. - write_phy_cck(dev, 0x11, 0xbb); // Reg11 : bb - write_phy_cck(dev, 0x0c, 0x09); // Reg0c : 09 - write_phy_cck(dev, 0x01, 0xc7); // Reg01 : c7 - // Config OFDM RX antenna. - write_phy_ofdm(dev, 0x0d, 0x54); // Reg0d : 54 - write_phy_ofdm(dev, 0x18, 0xb2); // Reg18 : b2 - } - else // main antenna - { - // Mac register, main antenna - write_nic_byte(dev, ANTSEL, 0x03); - //base band - // Config CCK RX antenna. - write_phy_cck(dev, 0x11, 0x9b); // Reg11 : 9b - write_phy_cck(dev, 0x0c, 0x09); // Reg0c : 09 - write_phy_cck(dev, 0x01, 0xc7); // Reg01 : c7 - // Config OFDM RX antenna. - write_phy_ofdm(dev, 0x0d, 0x5c); // Reg0d : 5c - write_phy_ofdm(dev, 0x18, 0xb2); // Reg18 : b2 - } - } - else // Disable Antenna Diversity - { - if( priv->bDefaultAntenna1 == true ) // aux Antenna - { - // Mac register, aux antenna - write_nic_byte(dev, ANTSEL, 0x00); - // Config CCK RX antenna. - write_phy_cck(dev, 0x11, 0xbb); // Reg11 : bb - write_phy_cck(dev, 0x0c, 0x09); // Reg0c : 09 - write_phy_cck(dev, 0x01, 0x47); // Reg01 : 47 - // Config OFDM RX antenna. - write_phy_ofdm(dev, 0x0d, 0x54); // Reg0d : 54 - write_phy_ofdm(dev, 0x18, 0x32); // Reg18 : 32 - } - else // main Antenna - { - // Mac register, main antenna - write_nic_byte(dev, ANTSEL, 0x03); - // Config CCK RX antenna. - write_phy_cck(dev, 0x11, 0x9b); // Reg11 : 9b - write_phy_cck(dev, 0x0c, 0x09); // Reg0c : 09 - write_phy_cck(dev, 0x01, 0x47); // Reg01 : 47 - // Config OFDM RX antenna. - write_phy_ofdm(dev, 0x0d, 0x5c); // Reg0d : 5c - write_phy_ofdm(dev, 0x18, 0x32); // Reg18 : 32 - } - } -#endif //by amy for antenna } @@ -1722,69 +1302,6 @@ UpdateInitialGain( switch(priv->rf_chip) { -#if 0 - case RF_ZEBRA2: - // Dynamic set initial gain, by shien chang, 2006.07.14 - switch(priv->InitialGain) - { - case 1: //m861dBm - DMESG("RTL8185B + 8225 Initial Gain State 1: -82 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x2697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0x86a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfa85); mdelay(1); - break; - - case 2: //m862dBm - DMESG("RTL8185B + 8225 Initial Gain State 2: -82 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x2697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0x86a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfb85); mdelay(1); - break; - - case 3: //m863dBm - DMESG("RTL8185B + 8225 Initial Gain State 3: -82 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x2697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0x96a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfb85); mdelay(1); - break; - - case 4: //m864dBm - DMESG("RTL8185B + 8225 Initial Gain State 4: -78 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x2697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xa6a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfb85); mdelay(1); - break; - - case 5: //m82dBm - DMESG("RTL8185B + 8225 Initial Gain State 5: -74 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x3697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xa6a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfb85); mdelay(1); - break; - - case 6: //m78dBm - DMESG("RTL8185B + 8225 Initial Gain State 6: -70 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x4697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xa6a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfb85); mdelay(1); - break; - - case 7: //m74dBm - DMESG("RTL8185B + 8225 Initial Gain State 7: -66 dBm \n"); - write_nic_dword(dev, PhyAddr, 0x5697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xa6a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfb85); mdelay(1); - break; - - default: //MP - DMESG("RTL8185B + 8225 Initial Gain State 1: -82 dBm (default)\n"); - write_nic_dword(dev, PhyAddr, 0x2697); mdelay(1); - write_nic_dword(dev, PhyAddr, 0x86a4); mdelay(1); - write_nic_dword(dev, PhyAddr, 0xfa85); mdelay(1); - break; - } - break; -#endif case RF_ZEBRA4: // Dynamic set initial gain, follow 87B switch(priv->InitialGain) @@ -1861,7 +1378,6 @@ UpdateInitialGain( break; } } -#ifdef CONFIG_RTL818X_S // // Description: // Tx Power tracking mechanism routine on 87SE. @@ -1882,7 +1398,6 @@ InitTxPwrTracking87SE( RF_WriteReg(dev, 0x02, u4bRfReg|PWR_METER_EN); mdelay(1); } -#endif void PhyConfig8185( struct net_device *dev @@ -1900,7 +1415,6 @@ PhyConfig8185( break; } //{by amy 080312 -#ifdef CONFIG_RTL818X_S // Set default initial gain state to 4, approved by SD3 DZ, by Bruce, 2007-06-06. if(priv->bDigMechanism) { @@ -1917,7 +1431,6 @@ PhyConfig8185( if(priv->bTxPowerTrack) InitTxPwrTracking87SE(dev); -#endif //by amy 080312} priv->InitialGainBackUp= priv->InitialGain; UpdateInitialGain(dev); @@ -2005,16 +1518,8 @@ HwConfigureRTL8185( // <RJ_TODO_8185B> We shall set up the ARFR according to user's setting. //write_nic_word(dev, ARFR, 0x0fff); // set 1M ~ 54M //by amy -#if 0 - PlatformIOWrite2Byte(dev, ARFR, 0x0fff); // set 1M ~ 54M -#endif -#ifdef CONFIG_RTL818X_S // Aadded by Roger, 2007.11.15. PlatformIOWrite2Byte(dev, ARFR, 0x0fff); //set 1M ~ 54Mbps. -#else - PlatformIOWrite2Byte(dev, ARFR, 0x0c00); //set 48Mbps, 54Mbps. - // By SD3 szuyi's request. by Roger, 2007.03.26. -#endif //by amy } else @@ -2084,10 +1589,6 @@ MacConfig_85BASIC( // Asked for by SD3 CM Lin, 2006.06.27, by rcnjko. //PlatformIOWrite4Byte(dev, RFTiming, 0x00004001); //by amy -#if 0 - write_nic_dword(dev, RFTiming, 0x00004001); -#endif -#ifdef CONFIG_RTL818X_S // power save parameter based on "87SE power save parameters 20071127.doc", as follow. //Enable DA10 TX power saving @@ -2108,9 +1609,6 @@ MacConfig_85BASIC( write_nic_word(dev, 0x37C, 0x00EC); // write_nic_word(dev, 0x37E, 0x00FE);//-edward write_nic_word(dev, 0x37E, 0x00EC);//+edward -#else - write_nic_dword(dev, RFTiming, 0x00004003); -#endif write_nic_byte(dev, 0x24E,0x01); //by amy @@ -2231,11 +1729,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; @@ -2477,16 +1973,6 @@ MgntDisconnectIBSS( notify_wx_assoc_event(priv->ieee80211); // Stop SW Beacon.Use hw beacon so do not need to do so.by amy -#if 0 - if(pMgntInfo->bEnableSwBeaconTimer) - { - // SwBeaconTimer will stop if pMgntInfo->mIbss==FALSE, see SwBeaconCallback() for details. -// comment out by haich, 2007.10.01 -//#if DEV_BUS_TYPE==USB_INTERFACE - PlatformCancelTimer( Adapter, &pMgntInfo->SwBeaconTimer); -//#endif - } -#endif // MgntIndicateMediaStatus( Adapter, RT_MEDIA_DISCONNECT, GENERAL_INDICATE ); @@ -2576,10 +2062,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 ) { @@ -2844,19 +2328,7 @@ InactivePowerSave( // // To solve CAM values miss in RF OFF, rewrite CAM values after RF ON. By Bruce, 2007-09-20. // -#if 0 - while( index < 4 ) - { - if( ( pMgntInfo->SecurityInfo.PairwiseEncAlgorithm == WEP104_Encryption ) || - (pMgntInfo->SecurityInfo.PairwiseEncAlgorithm == WEP40_Encryption) ) - { - if( pMgntInfo->SecurityInfo.KeyLen[index] != 0) - pAdapter->HalFunc.SetKeyHandler(pAdapter, index, 0, FALSE, pMgntInfo->SecurityInfo.PairwiseEncAlgorithm, TRUE, FALSE); - } - index++; - } -#endif priv->bSwRfProcessing = false; } @@ -2981,22 +2453,14 @@ void rtl8185b_adapter_start(struct net_device *dev) write_nic_byte(dev, CR9346, 0xc0); // enable config register write //by amy tmpu8 = read_nic_byte(dev, CONFIG3); -#ifdef CONFIG_RTL818X_S write_nic_byte(dev, CONFIG3, (tmpu8 |CONFIG3_PARM_En) ); -#else - write_nic_byte(dev, CONFIG3, (tmpu8 |CONFIG3_PARM_En | CONFIG3_CLKRUN_En) ); -#endif //by amy // Turn on Analog power. // Asked for by William, otherwise, MAC 3-wire can't work, 2006.06.27, by rcnjko. write_nic_dword(dev, ANAPARAM2, ANAPARM2_ASIC_ON); write_nic_dword(dev, ANAPARAM, ANAPARM_ASIC_ON); //by amy -#ifdef CONFIG_RTL818X_S write_nic_word(dev, ANAPARAM3, 0x0010); -#else - write_nic_byte(dev, ANAPARAM3, 0x00); -#endif //by amy write_nic_byte(dev, CONFIG3, tmpu8); @@ -3082,7 +2546,6 @@ void rtl8185b_adapter_start(struct net_device *dev) InitWirelessMode = ieee->mode; } //by amy for power save -#ifdef ENABLE_IPS // printk("initialize ENABLE_IPS\n"); priv->eRFPowerState = eRfOff; priv->RfOffReason = 0; @@ -3107,7 +2570,6 @@ void rtl8185b_adapter_start(struct net_device *dev) // printk("rf off cost jiffies:%lx\n", (tmp2-tmp)*1000/HZ); } -#endif // IPSEnter(dev); //by amy for power save #ifdef TODO @@ -3151,58 +2613,6 @@ void rtl8185b_rx_enable(struct net_device *dev) //u32 rxconf; /* for now we accept data, management & ctl frame*/ struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); -#if 0 - rxconf=read_nic_dword(dev,RX_CONF); - rxconf = rxconf &~ MAC_FILTER_MASK; - rxconf = rxconf | (1<<ACCEPT_MNG_FRAME_SHIFT); - 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(priv->ieee80211->iw_mode == IW_MODE_MONITOR || \ - dev->flags & IFF_PROMISC){ - rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT); - }else{ - rxconf = rxconf | (1<<ACCEPT_NICMAC_FRAME_SHIFT); - if(priv->card_8185 == 0) - 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); - rxconf = rxconf | (1<<ACCEPT_PWR_FRAME_SHIFT); - } - - if( 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 | (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_CS_MASK; - if(!priv->card_8185) - rxconf |= (priv->rcr_csense<<RCR_CS_SHIFT); -// rxconf &=~ 0xfff00000; -// rxconf |= 0x90100000;//9014f76f; - write_nic_dword(dev, RX_CONF, rxconf); -#endif if (dev->flags & IFF_PROMISC) DMESG ("NIC in promisc mode"); @@ -3244,76 +2654,6 @@ void rtl8185b_tx_enable(struct net_device *dev) //u32 txconf; struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); -#if 0 - 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); - write_nic_byte(dev, CW_CONF, byte); - - tx_agc_ctl = read_nic_byte(dev, TX_AGC_CTL); - tx_agc_ctl &= ~(1<<TX_AGC_CTL_PERPACKET_GAIN_SHIFT); - 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){ - - txconf = txconf &~ (1<<TCR_PROBE_NOTIMESTAMP_SHIFT); - - }else{ - - if(hwseqnum) - txconf= txconf &~ (1<<TX_CONF_HEADER_AUTOICREMENT_SHIFT); - else - txconf= txconf | (1<<TX_CONF_HEADER_AUTOICREMENT_SHIFT); - } - - txconf = txconf &~ TX_LOOPBACK_MASK; - txconf = txconf | (TX_LOOPBACK_NONE <<TX_LOOPBACK_SHIFT); - txconf = txconf &~ TCR_DPRETRY_MASK; - txconf = txconf &~ TCR_RTSRETRY_MASK; - txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); - txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); - txconf = txconf &~ (1<<TX_NOCRC_SHIFT); - - if(priv->card_8185){ - if(priv->hw_plcp_len) - txconf = txconf &~ TCR_PLCP_LEN; - else - txconf = txconf | TCR_PLCP_LEN; - }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); - - write_nic_dword(dev,TX_CONF,txconf); -#endif - write_nic_dword(dev, TCR, priv->TransmitConfig); byte = read_nic_byte(dev, MSR); byte |= MSR_LINK_ENEDCA; @@ -3339,4 +2679,3 @@ void rtl8185b_tx_enable(struct net_device *dev) } -#endif |