Skip to content

L
linux
Commit 88adc104 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: rtl8187se: fix \r\n line ends 

Andrew pointed out that I forgot to convert some files to unix format
when adding them originally.  This patch runs dos2unix on the rtl8187se
files that needed them.
Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9c515551
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2215 additions and 2215 deletions
drivers/staging/rtl8187se/dot11d.h
View file @ 88adc104
#ifndef __INC_DOT11D_H #ifndef __INC_DOT11D_H
#define __INC_DOT11D_H #define __INC_DOT11D_H
#include "ieee80211.h" #include "ieee80211.h"
//#define ENABLE_DOT11D //#define ENABLE_DOT11D
//#define DOT11D_MAX_CHNL_NUM 83 //#define DOT11D_MAX_CHNL_NUM 83
typedef struct _CHNL_TXPOWER_TRIPLE { typedef struct _CHNL_TXPOWER_TRIPLE {
u8 FirstChnl; u8 FirstChnl;
u8 NumChnls; u8 NumChnls;
u8 MaxTxPowerInDbm; u8 MaxTxPowerInDbm;
}CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE; }CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE;
typedef enum _DOT11D_STATE { typedef enum _DOT11D_STATE {
DOT11D_STATE_NONE = 0, DOT11D_STATE_NONE = 0,
DOT11D_STATE_LEARNED, DOT11D_STATE_LEARNED,
DOT11D_STATE_DONE, DOT11D_STATE_DONE,
}DOT11D_STATE; }DOT11D_STATE;
typedef struct _RT_DOT11D_INFO { typedef struct _RT_DOT11D_INFO {
//DECLARE_RT_OBJECT(RT_DOT11D_INFO); //DECLARE_RT_OBJECT(RT_DOT11D_INFO);
bool bEnabled; // dot11MultiDomainCapabilityEnabled bool bEnabled; // dot11MultiDomainCapabilityEnabled
u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element. u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element.
u8 CountryIeBuf[MAX_IE_LEN]; u8 CountryIeBuf[MAX_IE_LEN];
u8 CountryIeSrcAddr[6]; // Source AP of the country IE. u8 CountryIeSrcAddr[6]; // Source AP of the country IE.
u8 CountryIeWatchdog; u8 CountryIeWatchdog;
u8 channel_map[MAX_CHANNEL_NUMBER+1]; //!!!Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) 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 ChnlListLen; // #Bytes valid in ChnlList[].
//u8 ChnlList[DOT11D_MAX_CHNL_NUM]; //u8 ChnlList[DOT11D_MAX_CHNL_NUM];
u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1]; u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1];
DOT11D_STATE State; DOT11D_STATE State;
}RT_DOT11D_INFO, *PRT_DOT11D_INFO; }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 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 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 GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO)((__pIeeeDev)->pDot11dInfo))
#define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled #define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled
#define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0) #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 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 UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)
#define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \ #define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \
(((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \ (((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \
FALSE : \ FALSE : \
(!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length))) (!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length)))
#define CIE_WATCHDOG_TH 1 #define CIE_WATCHDOG_TH 1
#define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog #define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog
#define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0 #define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0
#define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev) #define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev)
#define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE) #define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)
void void
Dot11d_Init( Dot11d_Init(
struct ieee80211_device *dev struct ieee80211_device *dev
); );
void void
Dot11d_Reset( Dot11d_Reset(
struct ieee80211_device *dev struct ieee80211_device *dev
); );
void void
Dot11d_UpdateCountryIe( Dot11d_UpdateCountryIe(
struct ieee80211_device *dev, struct ieee80211_device *dev,
u8 * pTaddr, u8 * pTaddr,
u16 CoutryIeLen, u16 CoutryIeLen,
u8 * pCoutryIe u8 * pCoutryIe
); );
u8 u8
DOT11D_GetMaxTxPwrInDbm( DOT11D_GetMaxTxPwrInDbm(
struct ieee80211_device *dev, struct ieee80211_device *dev,
u8 Channel u8 Channel
); );
void void
DOT11D_ScanComplete( DOT11D_ScanComplete(
struct ieee80211_device * dev struct ieee80211_device * dev
); );
int IsLegalChannel( int IsLegalChannel(
struct ieee80211_device * dev, struct ieee80211_device * dev,
u8 channel u8 channel
); );
int ToLegalChannel( int ToLegalChannel(
struct ieee80211_device * dev, struct ieee80211_device * dev,
u8 channel u8 channel
); );
#endif // #ifndef __INC_DOT11D_H #endif // #ifndef __INC_DOT11D_H
drivers/staging/rtl8187se/ieee80211/dot11d.h
View file @ 88adc104
#ifndef __INC_DOT11D_H #ifndef __INC_DOT11D_H
#define __INC_DOT11D_H #define __INC_DOT11D_H
#include "ieee80211.h" #include "ieee80211.h"
//#define ENABLE_DOT11D //#define ENABLE_DOT11D
//#define DOT11D_MAX_CHNL_NUM 83 //#define DOT11D_MAX_CHNL_NUM 83
typedef struct _CHNL_TXPOWER_TRIPLE { typedef struct _CHNL_TXPOWER_TRIPLE {
u8 FirstChnl; u8 FirstChnl;
u8 NumChnls; u8 NumChnls;
u8 MaxTxPowerInDbm; u8 MaxTxPowerInDbm;
}CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE; }CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE;
typedef enum _DOT11D_STATE { typedef enum _DOT11D_STATE {
DOT11D_STATE_NONE = 0, DOT11D_STATE_NONE = 0,
DOT11D_STATE_LEARNED, DOT11D_STATE_LEARNED,
DOT11D_STATE_DONE, DOT11D_STATE_DONE,
}DOT11D_STATE; }DOT11D_STATE;
typedef struct _RT_DOT11D_INFO { typedef struct _RT_DOT11D_INFO {
//DECLARE_RT_OBJECT(RT_DOT11D_INFO); //DECLARE_RT_OBJECT(RT_DOT11D_INFO);
bool bEnabled; // dot11MultiDomainCapabilityEnabled bool bEnabled; // dot11MultiDomainCapabilityEnabled
u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element. u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element.
u8 CountryIeBuf[MAX_IE_LEN]; u8 CountryIeBuf[MAX_IE_LEN];
u8 CountryIeSrcAddr[6]; // Source AP of the country IE. u8 CountryIeSrcAddr[6]; // Source AP of the country IE.
u8 CountryIeWatchdog; u8 CountryIeWatchdog;
u8 channel_map[MAX_CHANNEL_NUMBER+1]; //!!!Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) 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 ChnlListLen; // #Bytes valid in ChnlList[].
//u8 ChnlList[DOT11D_MAX_CHNL_NUM]; //u8 ChnlList[DOT11D_MAX_CHNL_NUM];
u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1]; u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1];
DOT11D_STATE State; DOT11D_STATE State;
}RT_DOT11D_INFO, *PRT_DOT11D_INFO; }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 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 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 GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO)((__pIeeeDev)->pDot11dInfo))
#define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled #define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled
#define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0) #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 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 UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)
#define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \ #define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \
(((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \ (((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \
FALSE : \ FALSE : \
(!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length))) (!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length)))
#define CIE_WATCHDOG_TH 1 #define CIE_WATCHDOG_TH 1
#define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog #define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog
#define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0 #define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0
#define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev) #define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev)
#define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE) #define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)
void void
Dot11d_Init( Dot11d_Init(
struct ieee80211_device *dev struct ieee80211_device *dev
); );
void void
Dot11d_Reset( Dot11d_Reset(
struct ieee80211_device *dev struct ieee80211_device *dev
); );
void void
Dot11d_UpdateCountryIe( Dot11d_UpdateCountryIe(
struct ieee80211_device *dev, struct ieee80211_device *dev,
u8 * pTaddr, u8 * pTaddr,
u16 CoutryIeLen, u16 CoutryIeLen,
u8 * pCoutryIe u8 * pCoutryIe
); );
u8 u8
DOT11D_GetMaxTxPwrInDbm( DOT11D_GetMaxTxPwrInDbm(
struct ieee80211_device *dev, struct ieee80211_device *dev,
u8 Channel u8 Channel
); );
void void
DOT11D_ScanComplete( DOT11D_ScanComplete(
struct ieee80211_device * dev struct ieee80211_device * dev
); );
int IsLegalChannel( int IsLegalChannel(
struct ieee80211_device * dev, struct ieee80211_device * dev,
u8 channel u8 channel
); );
int ToLegalChannel( int ToLegalChannel(
struct ieee80211_device * dev, struct ieee80211_device * dev,
u8 channel u8 channel
); );
void dump_chnl_map(u8 * channel_map); void dump_chnl_map(u8 * channel_map);
#endif // #ifndef __INC_DOT11D_H #endif // #ifndef __INC_DOT11D_H
drivers/staging/rtl8187se/r8180_dm.c
View file @ 88adc104
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/staging/rtl8187se/r8180_dm.h
View file @ 88adc104
#ifndef R8180_DM_H #ifndef R8180_DM_H
#define R8180_DM_H #define R8180_DM_H
#include "r8180.h" #include "r8180.h"
//#include "r8180_hw.h" //#include "r8180_hw.h"
//#include "r8180_93cx6.h" //#include "r8180_93cx6.h"
void SwAntennaDiversityRxOk8185(struct net_device *dev, u8 SignalStrength); void SwAntennaDiversityRxOk8185(struct net_device *dev, u8 SignalStrength);
bool SetAntenna8185(struct net_device *dev, u8 u1bAntennaIndex); bool SetAntenna8185(struct net_device *dev, u8 u1bAntennaIndex);
bool SwitchAntenna( struct net_device *dev); bool SwitchAntenna( struct net_device *dev);
void SwAntennaDiversity(struct net_device *dev ); void SwAntennaDiversity(struct net_device *dev );
void SwAntennaDiversityTimerCallback(struct net_device *dev); void SwAntennaDiversityTimerCallback(struct net_device *dev);
bool CheckDig(struct net_device *dev); bool CheckDig(struct net_device *dev);
bool CheckHighPower(struct net_device *dev); bool CheckHighPower(struct net_device *dev);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
void rtl8180_hw_dig_wq (struct work_struct *work); void rtl8180_hw_dig_wq (struct work_struct *work);
#else #else
void rtl8180_hw_dig_wq(struct net_device *dev); void rtl8180_hw_dig_wq(struct net_device *dev);
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
void rtl8180_tx_pw_wq (struct work_struct *work); void rtl8180_tx_pw_wq (struct work_struct *work);
#else #else
void rtl8180_tx_pw_wq(struct net_device *dev); void rtl8180_tx_pw_wq(struct net_device *dev);
#endif #endif
#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) #if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)
void rtl8180_rate_adapter(struct work_struct * work); void rtl8180_rate_adapter(struct work_struct * work);
#else #else
void rtl8180_rate_adapter(struct net_device *dev); void rtl8180_rate_adapter(struct net_device *dev);
#endif #endif
void TxPwrTracking87SE(struct net_device *dev); void TxPwrTracking87SE(struct net_device *dev);
bool CheckTxPwrTracking(struct net_device *dev); bool CheckTxPwrTracking(struct net_device *dev);
#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20) #if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)
void rtl8180_rate_adapter(struct work_struct * work); void rtl8180_rate_adapter(struct work_struct * work);
#else #else
void rtl8180_rate_adapter(struct net_device *dev); void rtl8180_rate_adapter(struct net_device *dev);
#endif #endif
void timer_rate_adaptive(unsigned long data); void timer_rate_adaptive(unsigned long data);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7