Skip to content

L
linux
Commit 996ff103 authored by David Gibson's avatar David Gibson Committed by Jeff Garzik
Browse files
Options

[PATCH] orinoco merge preliminaries - comment/whitespace/spelling updates 

Various trivial cleanups to the orinoco driver: whitespace changes,
spelling/capitalization errors corrected, some fairly insignificant
comments added, removed or reformatted.
Signed-off-by: default avatarDavid Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================
parent c56331db
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 243 deletions
drivers/net/wireless/hermes.c
View file @ 996ff103
...@@ -390,7 +390,6 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset) ...@@ -390,7 +390,6 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)
return -EIO; return -EIO;
} }
return 0; return 0;
} }
......
drivers/net/wireless/hermes.h
View file @ 996ff103
...@@ -124,22 +124,22 @@ ...@@ -124,22 +124,22 @@
/* /*
* Command codes * Command codes
*/ */
/*--- Controller Commands --------------------------*/ /*--- Controller Commands ----------------------------*/
#define HERMES_CMD_INIT (0x0000) #define HERMES_CMD_INIT (0x0000)
#define HERMES_CMD_ENABLE (0x0001) #define HERMES_CMD_ENABLE (0x0001)
#define HERMES_CMD_DISABLE (0x0002) #define HERMES_CMD_DISABLE (0x0002)
#define HERMES_CMD_DIAG (0x0003) #define HERMES_CMD_DIAG (0x0003)
/*--- Buffer Mgmt Commands --------------------------*/ /*--- Buffer Mgmt Commands ---------------------------*/
#define HERMES_CMD_ALLOC (0x000A) #define HERMES_CMD_ALLOC (0x000A)
#define HERMES_CMD_TX (0x000B) #define HERMES_CMD_TX (0x000B)
#define HERMES_CMD_CLRPRST (0x0012) #define HERMES_CMD_CLRPRST (0x0012)
/*--- Regulate Commands --------------------------*/ /*--- Regulate Commands ------------------------------*/
#define HERMES_CMD_NOTIFY (0x0010) #define HERMES_CMD_NOTIFY (0x0010)
#define HERMES_CMD_INQUIRE (0x0011) #define HERMES_CMD_INQUIRE (0x0011)
/*--- Configure Commands --------------------------*/ /*--- Configure Commands -----------------------------*/
#define HERMES_CMD_ACCESS (0x0021) #define HERMES_CMD_ACCESS (0x0021)
#define HERMES_CMD_DOWNLD (0x0022) #define HERMES_CMD_DOWNLD (0x0022)
...@@ -312,9 +312,11 @@ typedef struct hermes { ...@@ -312,9 +312,11 @@ typedef struct hermes {
#define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val)) #define hermes_write_regn(hw, name, val) hermes_write_reg((hw), HERMES_##name, (val))
/* Function prototypes */ /* Function prototypes */
void hermes_struct_init(hermes_t *hw, ulong address, int io_space, int reg_spacing); void hermes_struct_init(hermes_t *hw, ulong address, int io_space,
int reg_spacing);
int hermes_init(hermes_t *hw); int hermes_init(hermes_t *hw);
int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, hermes_response_t *resp); int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,
hermes_response_t *resp);
int hermes_allocate(hermes_t *hw, u16 size, u16 *fid); int hermes_allocate(hermes_t *hw, u16 size, u16 *fid);
int hermes_bap_pread(hermes_t *hw, int bap, void *buf, unsigned len, int hermes_bap_pread(hermes_t *hw, int bap, void *buf, unsigned len,
......
drivers/net/wireless/hermes_rid.h
View file @ 996ff103
...@@ -4,21 +4,21 @@ ...@@ -4,21 +4,21 @@
/* /*
* Configuration RIDs * Configuration RIDs
*/ */
#define HERMES_RID_CNFPORTTYPE 0xFC00 /* used */ #define HERMES_RID_CNFPORTTYPE 0xFC00
#define HERMES_RID_CNFOWNMACADDR 0xFC01 /* used */ #define HERMES_RID_CNFOWNMACADDR 0xFC01
#define HERMES_RID_CNFDESIREDSSID 0xFC02 /* used */ #define HERMES_RID_CNFDESIREDSSID 0xFC02
#define HERMES_RID_CNFOWNCHANNEL 0xFC03 /* used */ #define HERMES_RID_CNFOWNCHANNEL 0xFC03
#define HERMES_RID_CNFOWNSSID 0xFC04 /* used */ #define HERMES_RID_CNFOWNSSID 0xFC04
#define HERMES_RID_CNFOWNATIMWINDOW 0xFC05 #define HERMES_RID_CNFOWNATIMWINDOW 0xFC05
#define HERMES_RID_CNFSYSTEMSCALE 0xFC06 /* used */ #define HERMES_RID_CNFSYSTEMSCALE 0xFC06
#define HERMES_RID_CNFMAXDATALEN 0xFC07 #define HERMES_RID_CNFMAXDATALEN 0xFC07
#define HERMES_RID_CNFWDSADDRESS 0xFC08 #define HERMES_RID_CNFWDSADDRESS 0xFC08
#define HERMES_RID_CNFPMENABLED 0xFC09 /* used */ #define HERMES_RID_CNFPMENABLED 0xFC09
#define HERMES_RID_CNFPMEPS 0xFC0A #define HERMES_RID_CNFPMEPS 0xFC0A
#define HERMES_RID_CNFMULTICASTRECEIVE 0xFC0B /* used */ #define HERMES_RID_CNFMULTICASTRECEIVE 0xFC0B
#define HERMES_RID_CNFMAXSLEEPDURATION 0xFC0C /* used */ #define HERMES_RID_CNFMAXSLEEPDURATION 0xFC0C
#define HERMES_RID_CNFPMHOLDOVERDURATION 0xFC0D /* used */ #define HERMES_RID_CNFPMHOLDOVERDURATION 0xFC0D
#define HERMES_RID_CNFOWNNAME 0xFC0E /* used */ #define HERMES_RID_CNFOWNNAME 0xFC0E
#define HERMES_RID_CNFOWNDTIMPERIOD 0xFC10 #define HERMES_RID_CNFOWNDTIMPERIOD 0xFC10
#define HERMES_RID_CNFWDSADDRESS1 0xFC11 #define HERMES_RID_CNFWDSADDRESS1 0xFC11
#define HERMES_RID_CNFWDSADDRESS2 0xFC12 #define HERMES_RID_CNFWDSADDRESS2 0xFC12
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
#define HERMES_RID_CNFWDSADDRESS5 0xFC15 #define HERMES_RID_CNFWDSADDRESS5 0xFC15
#define HERMES_RID_CNFWDSADDRESS6 0xFC16 #define HERMES_RID_CNFWDSADDRESS6 0xFC16
#define HERMES_RID_CNFMULTICASTPMBUFFERING 0xFC17 #define HERMES_RID_CNFMULTICASTPMBUFFERING 0xFC17
#define HERMES_RID_CNFWEPENABLED_AGERE 0xFC20 /* used */ #define HERMES_RID_CNFWEPENABLED_AGERE 0xFC20
#define HERMES_RID_CNFMANDATORYBSSID_SYMBOL 0xFC21 #define HERMES_RID_CNFMANDATORYBSSID_SYMBOL 0xFC21
#define HERMES_RID_CNFWEPDEFAULTKEYID 0xFC23 /* used */ #define HERMES_RID_CNFWEPDEFAULTKEYID 0xFC23
#define HERMES_RID_CNFDEFAULTKEY0 0xFC24 /* used */ #define HERMES_RID_CNFDEFAULTKEY0 0xFC24
#define HERMES_RID_CNFDEFAULTKEY1 0xFC25 /* used */ #define HERMES_RID_CNFDEFAULTKEY1 0xFC25
#define HERMES_RID_CNFMWOROBUST_AGERE 0xFC25 /* used */ #define HERMES_RID_CNFMWOROBUST_AGERE 0xFC25
#define HERMES_RID_CNFDEFAULTKEY2 0xFC26 /* used */ #define HERMES_RID_CNFDEFAULTKEY2 0xFC26
#define HERMES_RID_CNFDEFAULTKEY3 0xFC27 /* used */ #define HERMES_RID_CNFDEFAULTKEY3 0xFC27
#define HERMES_RID_CNFWEPFLAGS_INTERSIL 0xFC28 /* used */ #define HERMES_RID_CNFWEPFLAGS_INTERSIL 0xFC28
#define HERMES_RID_CNFWEPKEYMAPPINGTABLE 0xFC29 #define HERMES_RID_CNFWEPKEYMAPPINGTABLE 0xFC29
#define HERMES_RID_CNFAUTHENTICATION 0xFC2A /* used */ #define HERMES_RID_CNFAUTHENTICATION 0xFC2A
#define HERMES_RID_CNFMAXASSOCSTA 0xFC2B #define HERMES_RID_CNFMAXASSOCSTA 0xFC2B
#define HERMES_RID_CNFKEYLENGTH_SYMBOL 0xFC2B #define HERMES_RID_CNFKEYLENGTH_SYMBOL 0xFC2B
#define HERMES_RID_CNFTXCONTROL 0xFC2C #define HERMES_RID_CNFTXCONTROL 0xFC2C
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
#define HERMES_RID_CNFTIMCTRL 0xFC40 #define HERMES_RID_CNFTIMCTRL 0xFC40
#define HERMES_RID_CNFTHIRTY2TALLY 0xFC42 #define HERMES_RID_CNFTHIRTY2TALLY 0xFC42
#define HERMES_RID_CNFENHSECURITY 0xFC43 #define HERMES_RID_CNFENHSECURITY 0xFC43
#define HERMES_RID_CNFGROUPADDRESSES 0xFC80 /* used */ #define HERMES_RID_CNFGROUPADDRESSES 0xFC80
#define HERMES_RID_CNFCREATEIBSS 0xFC81 /* used */ #define HERMES_RID_CNFCREATEIBSS 0xFC81
#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD 0xFC82 /* used */ #define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD 0xFC82
#define HERMES_RID_CNFRTSTHRESHOLD 0xFC83 /* used */ #define HERMES_RID_CNFRTSTHRESHOLD 0xFC83
#define HERMES_RID_CNFTXRATECONTROL 0xFC84 /* used */ #define HERMES_RID_CNFTXRATECONTROL 0xFC84
#define HERMES_RID_CNFPROMISCUOUSMODE 0xFC85 /* used */ #define HERMES_RID_CNFPROMISCUOUSMODE 0xFC85
#define HERMES_RID_CNFBASICRATES_SYMBOL 0xFC8A #define HERMES_RID_CNFBASICRATES_SYMBOL 0xFC8A
#define HERMES_RID_CNFPREAMBLE_SYMBOL 0xFC8C /* used */ #define HERMES_RID_CNFPREAMBLE_SYMBOL 0xFC8C
#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD0 0xFC90 #define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD0 0xFC90
#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD1 0xFC91 #define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD1 0xFC91
#define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD2 0xFC92 #define HERMES_RID_CNFFRAGMENTATIONTHRESHOLD2 0xFC92
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
#define HERMES_RID_CNFRTSTHRESHOLD5 0xFC9C #define HERMES_RID_CNFRTSTHRESHOLD5 0xFC9C
#define HERMES_RID_CNFRTSTHRESHOLD6 0xFC9D #define HERMES_RID_CNFRTSTHRESHOLD6 0xFC9D
#define HERMES_RID_CNFSHORTPREAMBLE 0xFCB0 #define HERMES_RID_CNFSHORTPREAMBLE 0xFCB0
#define HERMES_RID_CNFWEPKEYS_AGERE 0xFCB0 /* used */ #define HERMES_RID_CNFWEPKEYS_AGERE 0xFCB0
#define HERMES_RID_CNFEXCLUDELONGPREAMBLE 0xFCB1 #define HERMES_RID_CNFEXCLUDELONGPREAMBLE 0xFCB1
#define HERMES_RID_CNFTXKEY_AGERE 0xFCB1 /* used */ #define HERMES_RID_CNFTXKEY_AGERE 0xFCB1
#define HERMES_RID_CNFAUTHENTICATIONRSPTO 0xFCB2 #define HERMES_RID_CNFAUTHENTICATIONRSPTO 0xFCB2
#define HERMES_RID_CNFBASICRATES 0xFCB3 #define HERMES_RID_CNFBASICRATES 0xFCB3
#define HERMES_RID_CNFSUPPORTEDRATES 0xFCB4 #define HERMES_RID_CNFSUPPORTEDRATES 0xFCB4
#define HERMES_RID_CNFTICKTIME 0xFCE0 /* used */ #define HERMES_RID_CNFTICKTIME 0xFCE0
#define HERMES_RID_CNFSCANREQUEST 0xFCE1 #define HERMES_RID_CNFSCANREQUEST 0xFCE1
#define HERMES_RID_CNFJOINREQUEST 0xFCE2 #define HERMES_RID_CNFJOINREQUEST 0xFCE2
#define HERMES_RID_CNFAUTHENTICATESTATION 0xFCE3 #define HERMES_RID_CNFAUTHENTICATESTATION 0xFCE3
...@@ -100,26 +100,26 @@ ...@@ -100,26 +100,26 @@
#define HERMES_RID_NICID 0xFD0B #define HERMES_RID_NICID 0xFD0B
#define HERMES_RID_MFISUPRANGE 0xFD0C #define HERMES_RID_MFISUPRANGE 0xFD0C
#define HERMES_RID_CFISUPRANGE 0xFD0D #define HERMES_RID_CFISUPRANGE 0xFD0D
#define HERMES_RID_CHANNELLIST 0xFD10 /* used */ #define HERMES_RID_CHANNELLIST 0xFD10
#define HERMES_RID_REGULATORYDOMAINS 0xFD11 #define HERMES_RID_REGULATORYDOMAINS 0xFD11
#define HERMES_RID_TEMPTYPE 0xFD12 #define HERMES_RID_TEMPTYPE 0xFD12
#define HERMES_RID_CIS 0xFD13 #define HERMES_RID_CIS 0xFD13
#define HERMES_RID_STAID 0xFD20 /* used */ #define HERMES_RID_STAID 0xFD20
#define HERMES_RID_STASUPRANGE 0xFD21 #define HERMES_RID_STASUPRANGE 0xFD21
#define HERMES_RID_MFIACTRANGES 0xFD22 #define HERMES_RID_MFIACTRANGES 0xFD22
#define HERMES_RID_CFIACTRANGES2 0xFD23 #define HERMES_RID_CFIACTRANGES2 0xFD23
#define HERMES_RID_SECONDARYVERSION_SYMBOL 0xFD24 /* used */ #define HERMES_RID_SECONDARYVERSION_SYMBOL 0xFD24
#define HERMES_RID_PORTSTATUS 0xFD40 #define HERMES_RID_PORTSTATUS 0xFD40
#define HERMES_RID_CURRENTSSID 0xFD41 /* used */ #define HERMES_RID_CURRENTSSID 0xFD41
#define HERMES_RID_CURRENTBSSID 0xFD42 /* used */ #define HERMES_RID_CURRENTBSSID 0xFD42
#define HERMES_RID_COMMSQUALITY 0xFD43 /* used */ #define HERMES_RID_COMMSQUALITY 0xFD43
#define HERMES_RID_CURRENTTXRATE 0xFD44 /* used */ #define HERMES_RID_CURRENTTXRATE 0xFD44
#define HERMES_RID_CURRENTBEACONINTERVAL 0xFD45 #define HERMES_RID_CURRENTBEACONINTERVAL 0xFD45
#define HERMES_RID_CURRENTSCALETHRESHOLDS 0xFD46 #define HERMES_RID_CURRENTSCALETHRESHOLDS 0xFD46
#define HERMES_RID_PROTOCOLRSPTIME 0xFD47 #define HERMES_RID_PROTOCOLRSPTIME 0xFD47
#define HERMES_RID_SHORTRETRYLIMIT 0xFD48 /* used */ #define HERMES_RID_SHORTRETRYLIMIT 0xFD48
#define HERMES_RID_LONGRETRYLIMIT 0xFD49 /* used */ #define HERMES_RID_LONGRETRYLIMIT 0xFD49
#define HERMES_RID_MAXTRANSMITLIFETIME 0xFD4A /* used */ #define HERMES_RID_MAXTRANSMITLIFETIME 0xFD4A
#define HERMES_RID_MAXRECEIVELIFETIME 0xFD4B #define HERMES_RID_MAXRECEIVELIFETIME 0xFD4B
#define HERMES_RID_CFPOLLABLE 0xFD4C #define HERMES_RID_CFPOLLABLE 0xFD4C
#define HERMES_RID_AUTHENTICATIONALGORITHMS 0xFD4D #define HERMES_RID_AUTHENTICATIONALGORITHMS 0xFD4D
...@@ -133,10 +133,10 @@ ...@@ -133,10 +133,10 @@
#define HERMES_RID_OWNMACADDR 0xFD86 #define HERMES_RID_OWNMACADDR 0xFD86
#define HERMES_RID_SCANRESULTSTABLE 0xFD88 #define HERMES_RID_SCANRESULTSTABLE 0xFD88
#define HERMES_RID_PHYTYPE 0xFDC0 #define HERMES_RID_PHYTYPE 0xFDC0
#define HERMES_RID_CURRENTCHANNEL 0xFDC1 /* used */ #define HERMES_RID_CURRENTCHANNEL 0xFDC1
#define HERMES_RID_CURRENTPOWERSTATE 0xFDC2 #define HERMES_RID_CURRENTPOWERSTATE 0xFDC2
#define HERMES_RID_CCAMODE 0xFDC3 #define HERMES_RID_CCAMODE 0xFDC3
#define HERMES_RID_SUPPORTEDDATARATES 0xFDC6 /* used */ #define HERMES_RID_SUPPORTEDDATARATES 0xFDC6
#define HERMES_RID_BUILDSEQ 0xFFFE #define HERMES_RID_BUILDSEQ 0xFFFE
#define HERMES_RID_FWID 0xFFFF #define HERMES_RID_FWID 0xFFFF
......
drivers/net/wireless/ieee802_11.h
View file @ 996ff103
...@@ -76,4 +76,3 @@ struct ieee802_11_hdr { ...@@ -76,4 +76,3 @@ struct ieee802_11_hdr {
#define IEEE802_11_SCTL_SEQ 0xFFF0 #define IEEE802_11_SCTL_SEQ 0xFFF0
#endif /* _IEEE802_11_H */ #endif /* _IEEE802_11_H */
drivers/net/wireless/orinoco.c
View file @ 996ff103
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
* o Add PM timeout (holdover duration) * o Add PM timeout (holdover duration)
* o Enable "iwconfig eth0 key off" and friends (toggle flags) * o Enable "iwconfig eth0 key off" and friends (toggle flags)
* o Enable "iwconfig eth0 power unicast/all" (toggle flags) * o Enable "iwconfig eth0 power unicast/all" (toggle flags)
* o Try with an intel card. It report firmware 1.01, behave like * o Try with an Intel card. It report firmware 1.01, behave like
* an antiquated firmware, however on windows it says 2.00. Yuck ! * an antiquated firmware, however on windows it says 2.00. Yuck !
* o Workaround firmware bug in allocate buffer (Intel 1.01) * o Workaround firmware bug in allocate buffer (Intel 1.01)
* o Finish external renaming to orinoco... * o Finish external renaming to orinoco...
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
* o Update to Wireless 11 -> add retry limit/lifetime support * o Update to Wireless 11 -> add retry limit/lifetime support
* o Tested with a D-Link DWL 650 card, fill in firmware support * o Tested with a D-Link DWL 650 card, fill in firmware support
* o Warning on Vcc mismatch (D-Link 3.3v card in Lucent 5v only slot) * o Warning on Vcc mismatch (D-Link 3.3v card in Lucent 5v only slot)
* o Fixed the Prims2 WEP bugs that I introduced in v0.03 :-( * o Fixed the Prism2 WEP bugs that I introduced in v0.03 :-(
* It work on D-Link *only* after a tcpdump. Weird... * It works on D-Link *only* after a tcpdump. Weird...
* And still doesn't work on Intel card. Grrrr... * And still doesn't work on Intel card. Grrrr...
* o Update the mode after a setport3 * o Update the mode after a setport3
* o Add preamble setting for Symbol cards (not yet enabled) * o Add preamble setting for Symbol cards (not yet enabled)
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
* o Remove deferred power enabling code * o Remove deferred power enabling code
* *
* v0.05c -> v0.05d - 5/5/2001 - Jean II * v0.05c -> v0.05d - 5/5/2001 - Jean II
* o Workaround to SNAP decapsulate frame from LinkSys AP * o Workaround to SNAP decapsulate frame from Linksys AP
* original patch from : Dong Liu <dliu AT research.bell-labs.com> * original patch from : Dong Liu <dliu AT research.bell-labs.com>
* (note : the memcmp bug was mine - fixed) * (note : the memcmp bug was mine - fixed)
* o Remove set_retry stuff, no firmware support it (bloat--). * o Remove set_retry stuff, no firmware support it (bloat--).
...@@ -135,15 +135,15 @@ ...@@ -135,15 +135,15 @@
* *
* v0.06c -> v0.06d - 6/7/2001 - David Gibson * v0.06c -> v0.06d - 6/7/2001 - David Gibson
* o Change a bunch of KERN_INFO messages to KERN_DEBUG, as per Linus' * o Change a bunch of KERN_INFO messages to KERN_DEBUG, as per Linus'
* wishes to reduce the number of unecessary messages. * wishes to reduce the number of unnecessary messages.
* o Removed bogus message on CRC error. * o Removed bogus message on CRC error.
* o Merged fixeds for v0.08 Prism 2 firmware from William Waghorn * o Merged fixes for v0.08 Prism 2 firmware from William Waghorn
* <willwaghorn AT yahoo.co.uk> * <willwaghorn AT yahoo.co.uk>
* o Slight cleanup/re-arrangement of firmware detection code. * o Slight cleanup/re-arrangement of firmware detection code.
* *
* v0.06d -> v0.06e - 1/8/2001 - David Gibson * v0.06d -> v0.06e - 1/8/2001 - David Gibson
* o Removed some redundant global initializers (orinoco_cs.c). * o Removed some redundant global initializers (orinoco_cs.c).
* o Added some module metadataa * o Added some module metadata
* *
* v0.06e -> v0.06f - 14/8/2001 - David Gibson * v0.06e -> v0.06f - 14/8/2001 - David Gibson
* o Wording fix to license * o Wording fix to license
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
* o Turned has_big_wep on for Intersil cards. That's not true for all of * o Turned has_big_wep on for Intersil cards. That's not true for all of
* them but we should at least let the capable ones try. * them but we should at least let the capable ones try.
* o Wait for BUSY to clear at the beginning of hermes_bap_seek(). I * o Wait for BUSY to clear at the beginning of hermes_bap_seek(). I
* realised that my assumption that the driver's serialization * realized that my assumption that the driver's serialization
* would prevent the BAP being busy on entry was possibly false, because * would prevent the BAP being busy on entry was possibly false, because
* things other than seeks may make the BAP busy. * things other than seeks may make the BAP busy.
* o Use "alternate" (oui 00:00:00) encapsulation by default. * o Use "alternate" (oui 00:00:00) encapsulation by default.
...@@ -182,12 +182,12 @@ ...@@ -182,12 +182,12 @@
* o Don't try to make __initdata const (the version string). This can't * o Don't try to make __initdata const (the version string). This can't
* work because of the way the __initdata sectioning works. * work because of the way the __initdata sectioning works.
* o Added MODULE_LICENSE tags. * o Added MODULE_LICENSE tags.
* o Support for PLX (transparent PCMCIA->PCI brdge) cards. * o Support for PLX (transparent PCMCIA->PCI bridge) cards.
* o Changed to using the new type-facist min/max. * o Changed to using the new type-fascist min/max.
* *
* v0.08 -> v0.08a - 9/10/2001 - David Gibson * v0.08 -> v0.08a - 9/10/2001 - David Gibson
* o Inserted some missing acknowledgements/info into the Changelog. * o Inserted some missing acknowledgements/info into the Changelog.
* o Fixed some bugs in the normalisation of signel level reporting. * o Fixed some bugs in the normalization of signal level reporting.
* o Fixed bad bug in WEP key handling on Intersil and Symbol firmware, * o Fixed bad bug in WEP key handling on Intersil and Symbol firmware,
* which led to an instant crash on big-endian machines. * which led to an instant crash on big-endian machines.
* *
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
* o Bugfix in orinoco_stop() - it used to fail if hw_unavailable * o Bugfix in orinoco_stop() - it used to fail if hw_unavailable
* was set, which was usually true on PCMCIA hot removes. * was set, which was usually true on PCMCIA hot removes.
* o Track LINKSTATUS messages, silently drop Tx packets before * o Track LINKSTATUS messages, silently drop Tx packets before
* we are connected (avoids cofusing the firmware), and only * we are connected (avoids confusing the firmware), and only
* give LINKSTATUS printk()s if the status has changed. * give LINKSTATUS printk()s if the status has changed.
* *
* v0.13b -> v0.13c - 11 Mar 2003 - David Gibson * v0.13b -> v0.13c - 11 Mar 2003 - David Gibson
...@@ -398,7 +398,8 @@ ...@@ -398,7 +398,8 @@
* o Disconnect wireless extensions from fundamental configuration. * o Disconnect wireless extensions from fundamental configuration.
* o (maybe) Software WEP support (patch from Stano Meduna). * o (maybe) Software WEP support (patch from Stano Meduna).
* o (maybe) Use multiple Tx buffers - driver handling queue * o (maybe) Use multiple Tx buffers - driver handling queue
* rather than firmware. */ * rather than firmware.
*/
/* Locking and synchronization: /* Locking and synchronization:
* *
...@@ -415,7 +416,8 @@ ...@@ -415,7 +416,8 @@
* flag after taking the lock, and if it is set, give up on whatever * flag after taking the lock, and if it is set, give up on whatever
* they are doing and drop the lock again. The orinoco_lock() * they are doing and drop the lock again. The orinoco_lock()
* function handles this (it unlocks and returns -EBUSY if * function handles this (it unlocks and returns -EBUSY if
* hw_unavailable is non-zero). */ * hw_unavailable is non-zero).
*/
#include <linux/config.h> #include <linux/config.h>
...@@ -495,9 +497,10 @@ MODULE_PARM(suppress_linkstatus, "i"); ...@@ -495,9 +497,10 @@ MODULE_PARM(suppress_linkstatus, "i");
HERMES_MAX_MULTICAST : 0)*/ HERMES_MAX_MULTICAST : 0)*/
#define MAX_MULTICAST(priv) (HERMES_MAX_MULTICAST) #define MAX_MULTICAST(priv) (HERMES_MAX_MULTICAST)
#define ORINOCO_INTEN ( HERMES_EV_RX | HERMES_EV_ALLOC | HERMES_EV_TX | \ #define ORINOCO_INTEN (HERMES_EV_RX | HERMES_EV_ALLOC \
HERMES_EV_TXEXC | HERMES_EV_WTERR | HERMES_EV_INFO | \ | HERMES_EV_TX | HERMES_EV_TXEXC \
HERMES_EV_INFDROP ) | HERMES_EV_WTERR | HERMES_EV_INFO \
| HERMES_EV_INFDROP )
/********************************************************************/ /********************************************************************/
/* Data tables */ /* Data tables */
...@@ -510,7 +513,8 @@ const long channel_frequency[] = { ...@@ -510,7 +513,8 @@ const long channel_frequency[] = {
}; };
#define NUM_CHANNELS ARRAY_SIZE(channel_frequency) #define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
/* This tables gives the actual meanings of the bitrate IDs returned by the firmware. */ /* This tables gives the actual meanings of the bitrate IDs returned
* by the firmware. */
struct { struct {
int bitrate; /* in 100s of kilobits */ int bitrate; /* in 100s of kilobits */
int automatic; int automatic;
...@@ -574,8 +578,7 @@ static int orinoco_debug_dump_recs(struct net_device *dev); ...@@ -574,8 +578,7 @@ static int orinoco_debug_dump_recs(struct net_device *dev);
/* Internal helper functions */ /* Internal helper functions */
/********************************************************************/ /********************************************************************/
static inline void static inline void set_port_type(struct orinoco_private *priv)
set_port_type(struct orinoco_private *priv)
{ {
switch (priv->iw_mode) { switch (priv->iw_mode) {
case IW_MODE_INFRA: case IW_MODE_INFRA:
...@@ -640,16 +643,14 @@ int orinoco_stop(struct net_device *dev) ...@@ -640,16 +643,14 @@ int orinoco_stop(struct net_device *dev)
return err; return err;
} }
struct net_device_stats * struct net_device_stats *orinoco_get_stats(struct net_device *dev)
orinoco_get_stats(struct net_device *dev)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
return &priv->stats; return &priv->stats;
} }
struct iw_statistics * struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev)
orinoco_get_wireless_stats(struct net_device *dev)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
hermes_t *hw = &priv->hw; hermes_t *hw = &priv->hw;
...@@ -707,8 +708,7 @@ orinoco_get_wireless_stats(struct net_device *dev) ...@@ -707,8 +708,7 @@ orinoco_get_wireless_stats(struct net_device *dev)
return wstats; return wstats;
} }
static void static void orinoco_set_multicast_list(struct net_device *dev)
orinoco_set_multicast_list(struct net_device *dev)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
unsigned long flags; unsigned long flags;
...@@ -723,8 +723,7 @@ orinoco_set_multicast_list(struct net_device *dev) ...@@ -723,8 +723,7 @@ orinoco_set_multicast_list(struct net_device *dev)
orinoco_unlock(priv, &flags); orinoco_unlock(priv, &flags);
} }
static int static int orinoco_change_mtu(struct net_device *dev, int new_mtu)
orinoco_change_mtu(struct net_device *dev, int new_mtu)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
...@@ -744,8 +743,7 @@ orinoco_change_mtu(struct net_device *dev, int new_mtu) ...@@ -744,8 +743,7 @@ orinoco_change_mtu(struct net_device *dev, int new_mtu)
/* Tx path */ /* Tx path */
/********************************************************************/ /********************************************************************/
static int static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
...@@ -778,7 +776,6 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -778,7 +776,6 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n", printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n",
dev->name); dev->name);
TRACE_EXIT(dev->name); TRACE_EXIT(dev->name);
/* BUG(); */
return 1; return 1;
} }
...@@ -846,7 +843,8 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -846,7 +843,8 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
} }
/* Round up for odd length packets */ /* Round up for odd length packets */
err = hermes_bap_pwrite(hw, USER_BAP, p, ALIGN(data_len, 2), txfid, data_off); err = hermes_bap_pwrite(hw, USER_BAP, p, ALIGN(data_len, 2),
txfid, data_off);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d writing packet to BAP\n", printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
dev->name, err); dev->name, err);
...@@ -857,10 +855,12 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -857,10 +855,12 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
/* Finally, we actually initiate the send */ /* Finally, we actually initiate the send */
netif_stop_queue(dev); netif_stop_queue(dev);
err = hermes_docmd_wait(hw, HERMES_CMD_TX | HERMES_CMD_RECL, txfid, NULL); err = hermes_docmd_wait(hw, HERMES_CMD_TX | HERMES_CMD_RECL,
txfid, NULL);
if (err) { if (err) {
netif_start_queue(dev); netif_start_queue(dev);
printk(KERN_ERR "%s: Error %d transmitting packet\n", dev->name, err); printk(KERN_ERR "%s: Error %d transmitting packet\n",
dev->name, err);
stats->tx_errors++; stats->tx_errors++;
goto fail; goto fail;
} }
...@@ -885,7 +885,6 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -885,7 +885,6 @@ orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw) static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
u16 fid = hermes_read_regn(hw, ALLOCFID); u16 fid = hermes_read_regn(hw, ALLOCFID);
if (fid != priv->txfid) { if (fid != priv->txfid) {
...@@ -936,8 +935,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw) ...@@ -936,8 +935,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw)
hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID); hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID);
} }
static void static void orinoco_tx_timeout(struct net_device *dev)
orinoco_tx_timeout(struct net_device *dev)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
struct net_device_stats *stats = &priv->stats; struct net_device_stats *stats = &priv->stats;
...@@ -959,8 +957,7 @@ orinoco_tx_timeout(struct net_device *dev) ...@@ -959,8 +957,7 @@ orinoco_tx_timeout(struct net_device *dev)
/* Does the frame have a SNAP header indicating it should be /* Does the frame have a SNAP header indicating it should be
* de-encapsulated to Ethernet-II? */ * de-encapsulated to Ethernet-II? */
static inline int static inline int is_ethersnap(struct header_struct *hdr)
is_ethersnap(struct header_struct *hdr)
{ {
/* We de-encapsulate all packets which, a) have SNAP headers /* We de-encapsulate all packets which, a) have SNAP headers
* (i.e. SSAP=DSAP=0xaa and CTRL=0x3 in the 802.2 LLC header * (i.e. SSAP=DSAP=0xaa and CTRL=0x3 in the 802.2 LLC header
...@@ -988,8 +985,7 @@ static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac, ...@@ -988,8 +985,7 @@ static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac,
} }
} }
void void orinoco_stat_gather(struct net_device *dev,
orinoco_stat_gather(struct net_device *dev,
struct sk_buff *skb, struct sk_buff *skb,
struct hermes_rx_descriptor *desc) struct hermes_rx_descriptor *desc)
{ {
...@@ -1100,7 +1096,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) ...@@ -1100,7 +1096,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)
* For some reason, the SNAP frames sent by LinkSys APs * For some reason, the SNAP frames sent by LinkSys APs
* are not properly recognised by most firmwares. * are not properly recognised by most firmwares.
* So, check ourselves */ * So, check ourselves */
if(((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) || if (((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) ||
((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) || ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) ||
is_ethersnap(&hdr)) { is_ethersnap(&hdr)) {
/* These indicate a SNAP within 802.2 LLC within /* These indicate a SNAP within 802.2 LLC within
...@@ -1296,8 +1292,8 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) ...@@ -1296,8 +1292,8 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
} }
break; break;
default: default:
printk(KERN_DEBUG "%s: Unknown information frame received (type %04x).\n", printk(KERN_DEBUG "%s: Unknown information frame received "
dev->name, type); "(type %04x).\n", dev->name, type);
/* We don't actually do anything about it */ /* We don't actually do anything about it */
break; break;
} }
...@@ -1487,7 +1483,8 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv) ...@@ -1487,7 +1483,8 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv)
} }
/* Write the index of the key used in transmission */ /* Write the index of the key used in transmission */
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFWEPDEFAULTKEYID, err = hermes_write_wordrec(hw, USER_BAP,
HERMES_RID_CNFWEPDEFAULTKEYID,
priv->tx_key); priv->tx_key);
if (err) if (err)
return err; return err;
...@@ -1507,7 +1504,8 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv) ...@@ -1507,7 +1504,8 @@ static int __orinoco_hw_setup_wep(struct orinoco_private *priv)
err = hermes_write_wordrec(hw, USER_BAP, err = hermes_write_wordrec(hw, USER_BAP,
HERMES_RID_CNFAUTHENTICATION, auth_flag); HERMES_RID_CNFAUTHENTICATION,
auth_flag);
if (err) if (err)
return err; return err;
} }
...@@ -1543,14 +1541,17 @@ static int __orinoco_program_rids(struct net_device *dev) ...@@ -1543,14 +1541,17 @@ static int __orinoco_program_rids(struct net_device *dev)
err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR, err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFOWNMACADDR,
HERMES_BYTES_TO_RECLEN(ETH_ALEN), dev->dev_addr); HERMES_BYTES_TO_RECLEN(ETH_ALEN), dev->dev_addr);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting MAC address\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting MAC address\n",
dev->name, err);
return err; return err;
} }
/* Set up the link mode */ /* Set up the link mode */
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPORTTYPE, priv->port_type); err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPORTTYPE,
priv->port_type);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting port type\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting port type\n",
dev->name, err);
return err; return err;
} }
/* Set the channel/frequency */ /* Set the channel/frequency */
...@@ -1559,14 +1560,17 @@ static int __orinoco_program_rids(struct net_device *dev) ...@@ -1559,14 +1560,17 @@ static int __orinoco_program_rids(struct net_device *dev)
if (priv->createibss) if (priv->createibss)
priv->channel = 10; priv->channel = 10;
} }
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFOWNCHANNEL, priv->channel); err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFOWNCHANNEL,
priv->channel);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting channel\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting channel\n",
dev->name, err);
return err; return err;
} }
if (priv->has_ibss) { if (priv->has_ibss) {
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFCREATEIBSS, err = hermes_write_wordrec(hw, USER_BAP,
HERMES_RID_CNFCREATEIBSS,
priv->createibss); priv->createibss);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting CREATEIBSS\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting CREATEIBSS\n", dev->name, err);
...@@ -1575,8 +1579,8 @@ static int __orinoco_program_rids(struct net_device *dev) ...@@ -1575,8 +1579,8 @@ static int __orinoco_program_rids(struct net_device *dev)
if ((strlen(priv->desired_essid) == 0) && (priv->createibss) if ((strlen(priv->desired_essid) == 0) && (priv->createibss)
&& (!priv->has_ibss_any)) { && (!priv->has_ibss_any)) {
printk(KERN_WARNING "%s: This firmware requires an \ printk(KERN_WARNING "%s: This firmware requires an "
ESSID in IBSS-Ad-Hoc mode.\n", dev->name); "ESSID in IBSS-Ad-Hoc mode.\n", dev->name);
/* With wvlan_cs, in this case, we would crash. /* With wvlan_cs, in this case, we would crash.
* hopefully, this driver will behave better... * hopefully, this driver will behave better...
* Jean II */ * Jean II */
...@@ -1591,14 +1595,16 @@ ESSID in IBSS-Ad-Hoc mode.\n", dev->name); ...@@ -1591,14 +1595,16 @@ ESSID in IBSS-Ad-Hoc mode.\n", dev->name);
HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2), HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2),
&idbuf); &idbuf);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting OWNSSID\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting OWNSSID\n",
dev->name, err);
return err; return err;
} }
err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFDESIREDSSID, err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFDESIREDSSID,
HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2), HERMES_BYTES_TO_RECLEN(strlen(priv->desired_essid)+2),
&idbuf); &idbuf);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting DESIREDSSID\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting DESIREDSSID\n",
dev->name, err);
return err; return err;
} }
...@@ -1609,26 +1615,31 @@ ESSID in IBSS-Ad-Hoc mode.\n", dev->name); ...@@ -1609,26 +1615,31 @@ ESSID in IBSS-Ad-Hoc mode.\n", dev->name);
HERMES_BYTES_TO_RECLEN(strlen(priv->nick)+2), HERMES_BYTES_TO_RECLEN(strlen(priv->nick)+2),
&idbuf); &idbuf);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting nickname\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting nickname\n",
dev->name, err);
return err; return err;
} }
/* Set AP density */ /* Set AP density */
if (priv->has_sensitivity) { if (priv->has_sensitivity) {
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE, err = hermes_write_wordrec(hw, USER_BAP,
HERMES_RID_CNFSYSTEMSCALE,
priv->ap_density); priv->ap_density);
if (err) { if (err) {
printk(KERN_WARNING "%s: Error %d setting SYSTEMSCALE. " printk(KERN_WARNING "%s: Error %d setting SYSTEMSCALE. "
"Disabling sensitivity control\n", dev->name, err); "Disabling sensitivity control\n",
dev->name, err);
priv->has_sensitivity = 0; priv->has_sensitivity = 0;
} }
} }
/* Set RTS threshold */ /* Set RTS threshold */
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD, priv->rts_thresh); err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,
priv->rts_thresh);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting RTS threshold\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting RTS threshold\n",
dev->name, err);
return err; return err;
} }
...@@ -1642,20 +1653,23 @@ ESSID in IBSS-Ad-Hoc mode.\n", dev->name); ...@@ -1642,20 +1653,23 @@ ESSID in IBSS-Ad-Hoc mode.\n", dev->name);
HERMES_RID_CNFFRAGMENTATIONTHRESHOLD, HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,
priv->frag_thresh); priv->frag_thresh);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting framentation\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting fragmentation\n",
dev->name, err);
return err; return err;
} }
/* Set bitrate */ /* Set bitrate */
err = __orinoco_hw_set_bitrate(priv); err = __orinoco_hw_set_bitrate(priv);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting bitrate\n", dev->name, err); printk(KERN_ERR "%s: Error %d setting bitrate\n",
dev->name, err);
return err; return err;
} }
/* Set power management */ /* Set power management */
if (priv->has_pm) { if (priv->has_pm) {
err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFPMENABLED, err = hermes_write_wordrec(hw, USER_BAP,
HERMES_RID_CNFPMENABLED,
priv->pm_on); priv->pm_on);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d setting up PM\n", printk(KERN_ERR "%s: Error %d setting up PM\n",
...@@ -1851,7 +1865,7 @@ static void orinoco_reset(struct net_device *dev) ...@@ -1851,7 +1865,7 @@ static void orinoco_reset(struct net_device *dev)
if (err) if (err)
/* When the hardware becomes available again, whatever /* When the hardware becomes available again, whatever
* detects that is responsible for re-initializing * detects that is responsible for re-initializing
* it. So no need for anything further*/ * it. So no need for anything further */
return; return;
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -1870,8 +1884,8 @@ static void orinoco_reset(struct net_device *dev) ...@@ -1870,8 +1884,8 @@ static void orinoco_reset(struct net_device *dev)
if (priv->hard_reset) if (priv->hard_reset)
err = (*priv->hard_reset)(priv); err = (*priv->hard_reset)(priv);
if (err) { if (err) {
printk(KERN_ERR "%s: orinoco_reset: Error %d performing hard reset\n", printk(KERN_ERR "%s: orinoco_reset: Error %d "
dev->name, err); "performing hard reset\n", dev->name, err);
/* FIXME: shutdown of some sort */ /* FIXME: shutdown of some sort */
return; return;
} }
...@@ -1930,7 +1944,8 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1930,7 +1944,8 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/* These are used to detect a runaway interrupt situation */ /* These are used to detect a runaway interrupt situation */
/* If we get more than MAX_IRQLOOPS_PER_JIFFY iterations in a jiffy, /* If we get more than MAX_IRQLOOPS_PER_JIFFY iterations in a jiffy,
* we panic and shut down the hardware */ * we panic and shut down the hardware */
static int last_irq_jiffy = 0; /* jiffies value the last time we were called */ static int last_irq_jiffy = 0; /* jiffies value the last time
* we were called */
static int loops_this_jiffy = 0; static int loops_this_jiffy = 0;
unsigned long flags; unsigned long flags;
...@@ -2032,11 +2047,11 @@ static void determine_firmware(struct net_device *dev) ...@@ -2032,11 +2047,11 @@ static void determine_firmware(struct net_device *dev)
dev->name, err); dev->name, err);
memset(&sta_id, 0, sizeof(sta_id)); memset(&sta_id, 0, sizeof(sta_id));
} }
le16_to_cpus(&sta_id.id); le16_to_cpus(&sta_id.id);
le16_to_cpus(&sta_id.variant); le16_to_cpus(&sta_id.variant);
le16_to_cpus(&sta_id.major); le16_to_cpus(&sta_id.major);
le16_to_cpus(&sta_id.minor); le16_to_cpus(&sta_id.minor);
printk(KERN_DEBUG "%s: Station identity %04x:%04x:%04x:%04x\n", printk(KERN_DEBUG "%s: Station identity %04x:%04x:%04x:%04x\n",
dev->name, sta_id.id, sta_id.variant, dev->name, sta_id.id, sta_id.variant,
sta_id.major, sta_id.minor); sta_id.major, sta_id.minor);
...@@ -2149,8 +2164,7 @@ static void determine_firmware(struct net_device *dev) ...@@ -2149,8 +2164,7 @@ static void determine_firmware(struct net_device *dev)
} }
} }
static int static int orinoco_init(struct net_device *dev)
orinoco_init(struct net_device *dev)
{ {
struct orinoco_private *priv = netdev_priv(dev); struct orinoco_private *priv = netdev_priv(dev);
hermes_t *hw = &priv->hw; hermes_t *hw = &priv->hw;
...@@ -2239,7 +2253,8 @@ orinoco_init(struct net_device *dev) ...@@ -2239,7 +2253,8 @@ orinoco_init(struct net_device *dev)
err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD, err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFRTSTHRESHOLD,
&priv->rts_thresh); &priv->rts_thresh);
if (err) { if (err) {
printk(KERN_ERR "%s: failed to read RTS threshold!\n", dev->name); printk(KERN_ERR "%s: failed to read RTS threshold!\n",
dev->name);
goto out; goto out;
} }
...@@ -2252,7 +2267,8 @@ orinoco_init(struct net_device *dev) ...@@ -2252,7 +2267,8 @@ orinoco_init(struct net_device *dev)
err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFFRAGMENTATIONTHRESHOLD, err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFFRAGMENTATIONTHRESHOLD,
&priv->frag_thresh); &priv->frag_thresh);
if (err) { if (err) {
printk(KERN_ERR "%s: failed to read fragmentation settings!\n", dev->name); printk(KERN_ERR "%s: failed to read fragmentation settings!\n",
dev->name);
goto out; goto out;
} }
...@@ -2280,7 +2296,8 @@ orinoco_init(struct net_device *dev) ...@@ -2280,7 +2296,8 @@ orinoco_init(struct net_device *dev)
/* Preamble setup */ /* Preamble setup */
if (priv->has_preamble) { if (priv->has_preamble) {
err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFPREAMBLE_SYMBOL, err = hermes_read_wordrec(hw, USER_BAP,
HERMES_RID_CNFPREAMBLE_SYMBOL,
&priv->preamble); &priv->preamble);
if (err) if (err)
goto out; goto out;
...@@ -2329,18 +2346,20 @@ orinoco_init(struct net_device *dev) ...@@ -2329,18 +2346,20 @@ orinoco_init(struct net_device *dev)
return err; return err;
} }
struct net_device *alloc_orinocodev(int sizeof_card, int (*hard_reset)(struct orinoco_private *)) struct net_device *alloc_orinocodev(int sizeof_card,
int (*hard_reset)(struct orinoco_private *))
{ {
struct net_device *dev; struct net_device *dev;
struct orinoco_private *priv; struct orinoco_private *priv;
dev = alloc_etherdev(sizeof(struct orinoco_private) + sizeof_card); dev = alloc_etherdev(sizeof(struct orinoco_private) + sizeof_card);
if (!dev) if (! dev)
return NULL; return NULL;
priv = netdev_priv(dev); priv = netdev_priv(dev);
priv->ndev = dev; priv->ndev = dev;
if (sizeof_card) if (sizeof_card)
priv->card = (void *)((unsigned long)netdev_priv(dev) + sizeof(struct orinoco_private)); priv->card = (void *)((unsigned long)netdev_priv(dev)
+ sizeof(struct orinoco_private));
else else
priv->card = NULL; priv->card = NULL;
...@@ -2701,6 +2720,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er ...@@ -2701,6 +2720,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er
if ((index < 0) || (index >= ORINOCO_MAX_KEYS)) if ((index < 0) || (index >= ORINOCO_MAX_KEYS))
index = priv->tx_key; index = priv->tx_key;
/* Adjust key length to a supported value */
if (erq->length > SMALL_KEY_SIZE) { if (erq->length > SMALL_KEY_SIZE) {
xlen = LARGE_KEY_SIZE; xlen = LARGE_KEY_SIZE;
} else if (erq->length > 0) { } else if (erq->length > 0) {
...@@ -2742,14 +2762,14 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er ...@@ -2742,14 +2762,14 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er
if (erq->pointer) { if (erq->pointer) {
priv->keys[index].len = cpu_to_le16(xlen); priv->keys[index].len = cpu_to_le16(xlen);
memset(priv->keys[index].data, 0, sizeof(priv->keys[index].data)); memset(priv->keys[index].data, 0,
sizeof(priv->keys[index].data));
memcpy(priv->keys[index].data, keybuf, erq->length); memcpy(priv->keys[index].data, keybuf, erq->length);
} }
priv->tx_key = setindex; priv->tx_key = setindex;
priv->wep_on = enable; priv->wep_on = enable;
priv->wep_restrict = restricted; priv->wep_restrict = restricted;
out: out:
orinoco_unlock(priv, &flags); orinoco_unlock(priv, &flags);
...@@ -2975,7 +2995,8 @@ static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq) ...@@ -2975,7 +2995,8 @@ static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq)
err = orinoco_lock(priv, &flags); err = orinoco_lock(priv, &flags);
if (err) if (err)
return err; return err;
err = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_CNFSYSTEMSCALE, &val); err = hermes_read_wordrec(hw, USER_BAP,
HERMES_RID_CNFSYSTEMSCALE, &val);
orinoco_unlock(priv, &flags); orinoco_unlock(priv, &flags);
if (err) if (err)
...@@ -3461,7 +3482,6 @@ static int orinoco_ioctl_getport3(struct net_device *dev, struct iwreq *wrq) ...@@ -3461,7 +3482,6 @@ static int orinoco_ioctl_getport3(struct net_device *dev, struct iwreq *wrq)
*val = priv->prefer_port3; *val = priv->prefer_port3;
orinoco_unlock(priv, &flags); orinoco_unlock(priv, &flags);
return 0; return 0;
} }
......
drivers/net/wireless/orinoco.h
View file @ 996ff103
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/version.h> #include <linux/version.h>
#include "hermes.h" #include "hermes.h"
/* To enable debug messages */ /* To enable debug messages */
...@@ -50,7 +51,6 @@ struct orinoco_private { ...@@ -50,7 +51,6 @@ struct orinoco_private {
hermes_t hw; hermes_t hw;
u16 txfid; u16 txfid;
/* Capabilities of the hardware/firmware */ /* Capabilities of the hardware/firmware */
int firmware_type; int firmware_type;
#define FIRMWARE_TYPE_AGERE 1 #define FIRMWARE_TYPE_AGERE 1
...@@ -100,6 +100,10 @@ extern int orinoco_debug; ...@@ -100,6 +100,10 @@ extern int orinoco_debug;
#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", devname, __FUNCTION__); #define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", devname, __FUNCTION__);
#define TRACE_EXIT(devname) DEBUG(2, "%s: <- %s()\n", devname, __FUNCTION__); #define TRACE_EXIT(devname) DEBUG(2, "%s: <- %s()\n", devname, __FUNCTION__);
/********************************************************************/
/* Exported prototypes */
/********************************************************************/
extern struct net_device *alloc_orinocodev(int sizeof_card, extern struct net_device *alloc_orinocodev(int sizeof_card,
int (*hard_reset)(struct orinoco_private *)); int (*hard_reset)(struct orinoco_private *));
extern int __orinoco_up(struct net_device *dev); extern int __orinoco_up(struct net_device *dev);
......
drivers/net/wireless/orinoco_cs.c
View file @ 996ff103
...@@ -219,8 +219,7 @@ orinoco_cs_attach(void) ...@@ -219,8 +219,7 @@ orinoco_cs_attach(void)
* are freed. Otherwise, the structures will be freed when the device * are freed. Otherwise, the structures will be freed when the device
* is released. * is released.
*/ */
static void static void orinoco_cs_detach(dev_link_t *link)
orinoco_cs_detach(dev_link_t * link)
{ {
dev_link_t **linkp; dev_link_t **linkp;
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
...@@ -258,8 +257,9 @@ orinoco_cs_detach(dev_link_t * link) ...@@ -258,8 +257,9 @@ orinoco_cs_detach(dev_link_t * link)
* device available to the system. * device available to the system.
*/ */
#define CS_CHECK(fn, ret) \ #define CS_CHECK(fn, ret) do { \
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; \
} while (0)
static void static void
orinoco_cs_config(dev_link_t *link) orinoco_cs_config(dev_link_t *link)
...@@ -297,7 +297,8 @@ orinoco_cs_config(dev_link_t *link) ...@@ -297,7 +297,8 @@ orinoco_cs_config(dev_link_t *link)
link->state |= DEV_CONFIG; link->state |= DEV_CONFIG;
/* Look up the current Vcc */ /* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf)); CS_CHECK(GetConfigurationInfo,
pcmcia_get_configuration_info(handle, &conf));
link->conf.Vcc = conf.Vcc; link->conf.Vcc = conf.Vcc;
/* /*
...@@ -401,8 +402,9 @@ orinoco_cs_config(dev_link_t *link) ...@@ -401,8 +402,9 @@ orinoco_cs_config(dev_link_t *link)
pcmcia_release_io(link->handle, &link->io); pcmcia_release_io(link->handle, &link->io);
last_ret = pcmcia_get_next_tuple(handle, &tuple); last_ret = pcmcia_get_next_tuple(handle, &tuple);
if (last_ret == CS_NO_MORE_ITEMS) { if (last_ret == CS_NO_MORE_ITEMS) {
printk(KERN_ERR "GetNextTuple(). No matching CIS configuration, " printk(KERN_ERR "GetNextTuple(). No matching "
"maybe you need the ignore_cis_vcc=1 parameter.\n"); "CIS configuration, maybe you need the "
"ignore_cis_vcc=1 parameter.\n");
goto cs_failed; goto cs_failed;
} }
} }
...@@ -440,7 +442,8 @@ orinoco_cs_config(dev_link_t *link) ...@@ -440,7 +442,8 @@ orinoco_cs_config(dev_link_t *link)
* the I/O windows and the interrupt mapping, and putting the * the I/O windows and the interrupt mapping, and putting the
* card and host interface into "Memory and IO" mode. * card and host interface into "Memory and IO" mode.
*/ */
CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf)); CS_CHECK(RequestConfiguration,
pcmcia_request_configuration(link->handle, &link->conf));
/* Ok, we have the configuration, prepare to register the netdev */ /* Ok, we have the configuration, prepare to register the netdev */
dev->base_addr = link->io.BasePort1; dev->base_addr = link->io.BasePort1;
...@@ -659,4 +662,3 @@ exit_orinoco_cs(void) ...@@ -659,4 +662,3 @@ exit_orinoco_cs(void)
module_init(init_orinoco_cs); module_init(init_orinoco_cs);
module_exit(exit_orinoco_cs); module_exit(exit_orinoco_cs);
drivers/net/wireless/orinoco_pci.c
View file @ 996ff103
...@@ -206,18 +206,17 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, ...@@ -206,18 +206,17 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
if (! pci_iorange) if (! pci_iorange)
goto fail; goto fail;
/* Usual setup of structures */ /* Allocate network device */
dev = alloc_orinocodev(0, NULL); dev = alloc_orinocodev(0, NULL);
if (! dev) { if (! dev) {
err = -ENOMEM; err = -ENOMEM;
goto fail; goto fail;
} }
priv = netdev_priv(dev);
priv = netdev_priv(dev);
dev->base_addr = (unsigned long) pci_ioaddr; dev->base_addr = (unsigned long) pci_ioaddr;
dev->mem_start = pci_iorange; dev->mem_start = pci_iorange;
dev->mem_end = pci_iorange + pci_iolen - 1; dev->mem_end = pci_iorange + pci_iolen - 1;
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
...@@ -238,6 +237,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, ...@@ -238,6 +237,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
goto fail; goto fail;
} }
dev->irq = pdev->irq; dev->irq = pdev->irq;
/* Perform a COR reset to start the card */ /* Perform a COR reset to start the card */
if(orinoco_pci_cor_reset(priv) != 0) { if(orinoco_pci_cor_reset(priv) != 0) {
printk(KERN_ERR "%s: Failed to start the card\n", dev->name); printk(KERN_ERR "%s: Failed to start the card\n", dev->name);
...@@ -255,7 +255,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, ...@@ -255,7 +255,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
goto fail; goto fail;
} }
return 0; /* succeeded */ return 0;
fail: fail:
if (dev) { if (dev) {
if (dev->irq) if (dev->irq)
...@@ -357,7 +358,9 @@ static int orinoco_pci_resume(struct pci_dev *pdev) ...@@ -357,7 +358,9 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
} }
static struct pci_device_id orinoco_pci_pci_id_table[] = { static struct pci_device_id orinoco_pci_pci_id_table[] = {
/* Intersil Prism 3 */
{0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,}, {0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,},
/* Intersil Prism 2.5 */
{0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID,}, {0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID,},
{0,}, {0,},
}; };
......
drivers/net/wireless/orinoco_plx.c
View file @ 996ff103
...@@ -35,75 +35,78 @@ ...@@ -35,75 +35,78 @@
* Note: if everything gets detected fine but it doesn't actually send * Note: if everything gets detected fine but it doesn't actually send
* or receive packets, your first port of call should probably be to * or receive packets, your first port of call should probably be to
* try newer firmware in the card. Especially if you're doing Ad-Hoc * try newer firmware in the card. Especially if you're doing Ad-Hoc
* modes * modes.
* *
* The actual driving is done by orinoco.c, this is just resource * The actual driving is done by orinoco.c, this is just resource
* allocation stuff. The explanation below is courtesy of Ryan Niemi * allocation stuff. The explanation below is courtesy of Ryan Niemi
* on the linux-wlan-ng list at * on the linux-wlan-ng list at
* http://archives.neohapsis.com/archives/dev/linux-wlan/2001-q1/0026.html * http://archives.neohapsis.com/archives/dev/linux-wlan/2001-q1/0026.html
*
The PLX9052-based cards (WL11000 and several others) are a different * The PLX9052-based cards (WL11000 and several others) are a
beast than the usual PCMCIA-based PRISM2 configuration expected by * different beast than the usual PCMCIA-based PRISM2 configuration
wlan-ng. Here's the general details on how the WL11000 PCI adapter * expected by wlan-ng. Here's the general details on how the WL11000
works: * PCI adapter works:
*
- Two PCI I/O address spaces, one 0x80 long which contains the PLX9052 * - Two PCI I/O address spaces, one 0x80 long which contains the
registers, and one that's 0x40 long mapped to the PCMCIA slot I/O * PLX9052 registers, and one that's 0x40 long mapped to the PCMCIA
address space. * slot I/O address space.
*
- One PCI memory address space, mapped to the PCMCIA memory space * - One PCI memory address space, mapped to the PCMCIA memory space
(containing the CIS). * (containing the CIS).
*
After identifying the I/O and memory space, you can read through the * After identifying the I/O and memory space, you can read through
memory space to confirm the CIS's device ID or manufacturer ID to make * the memory space to confirm the CIS's device ID or manufacturer ID
sure it's the expected card. Keep in mind that the PCMCIA spec specifies * to make sure it's the expected card. qKeep in mind that the PCMCIA
the CIS as the lower 8 bits of each word read from the CIS, so to read the * spec specifies the CIS as the lower 8 bits of each word read from
bytes of the CIS, read every other byte (0,2,4,...). Passing that test, * the CIS, so to read the bytes of the CIS, read every other byte
you need to enable the I/O address space on the PCMCIA card via the PCMCIA * (0,2,4,...). Passing that test, you need to enable the I/O address
COR register. This is the first byte following the CIS. In my case * space on the PCMCIA card via the PCMCIA COR register. This is the
(which may not have any relation to what's on the PRISM2 cards), COR was * first byte following the CIS. In my case (which may not have any
at offset 0x800 within the PCI memory space. Write 0x41 to the COR * relation to what's on the PRISM2 cards), COR was at offset 0x800
register to enable I/O mode and to select level triggered interrupts. To * within the PCI memory space. Write 0x41 to the COR register to
confirm you actually succeeded, read the COR register back and make sure * enable I/O mode and to select level triggered interrupts. To
it actually got set to 0x41, incase you have an unexpected card inserted. * confirm you actually succeeded, read the COR register back and make
* sure it actually got set to 0x41, incase you have an unexpected
Following that, you can treat the second PCI I/O address space (the one * card inserted.
that's not 0x80 in length) as the PCMCIA I/O space. *
* Following that, you can treat the second PCI I/O address space (the
Note that in the Eumitcom's source for their drivers, they register the * one that's not 0x80 in length) as the PCMCIA I/O space.
interrupt as edge triggered when registering it with the Windows kernel. I *
don't recall how to register edge triggered on Linux (if it can be done at * Note that in the Eumitcom's source for their drivers, they register
all). But in some experimentation, I don't see much operational * the interrupt as edge triggered when registering it with the
difference between using either interrupt mode. Don't mess with the * Windows kernel. I don't recall how to register edge triggered on
interrupt mode in the COR register though, as the PLX9052 wants level * Linux (if it can be done at all). But in some experimentation, I
triggers with the way the serial EEPROM configures it on the WL11000. * don't see much operational difference between using either
* interrupt mode. Don't mess with the interrupt mode in the COR
There's some other little quirks related to timing that I bumped into, but * register though, as the PLX9052 wants level triggers with the way
I don't recall right now. Also, there's two variants of the WL11000 I've * the serial EEPROM configures it on the WL11000.
seen, revision A1 and T2. These seem to differ slightly in the timings *
configured in the wait-state generator in the PLX9052. There have also * There's some other little quirks related to timing that I bumped
been some comments from Eumitcom that cards shouldn't be hot swapped, * into, but I don't recall right now. Also, there's two variants of
apparently due to risk of cooking the PLX9052. I'm unsure why they * the WL11000 I've seen, revision A1 and T2. These seem to differ
believe this, as I can't see anything in the design that would really * slightly in the timings configured in the wait-state generator in
cause a problem, except for crashing drivers not written to expect it. And * the PLX9052. There have also been some comments from Eumitcom that
having developed drivers for the WL11000, I'd say it's quite tricky to * cards shouldn't be hot swapped, apparently due to risk of cooking
write code that will successfully deal with a hot unplug. Very odd things * the PLX9052. I'm unsure why they believe this, as I can't see
happen on the I/O side of things. But anyway, be warned. Despite that, * anything in the design that would really cause a problem, except
I've hot-swapped a number of times during debugging and driver development * for crashing drivers not written to expect it. And having developed
for various reasons (stuck WAIT# line after the radio card's firmware * drivers for the WL11000, I'd say it's quite tricky to write code
locks up). * that will successfully deal with a hot unplug. Very odd things
* happen on the I/O side of things. But anyway, be warned. Despite
Hope this is enough info for someone to add PLX9052 support to the wlan-ng * that, I've hot-swapped a number of times during debugging and
card. In the case of the WL11000, the PCI ID's are 0x1639/0x0200, with * driver development for various reasons (stuck WAIT# line after the
matching subsystem ID's. Other PLX9052-based manufacturers other than * radio card's firmware locks up).
Eumitcom (or on cards other than the WL11000) may have different PCI ID's. *
* Hope this is enough info for someone to add PLX9052 support to the
If anyone needs any more specific info, let me know. I haven't had time * wlan-ng card. In the case of the WL11000, the PCI ID's are
to implement support myself yet, and with the way things are going, might * 0x1639/0x0200, with matching subsystem ID's. Other PLX9052-based
not have time for a while.. * manufacturers other than Eumitcom (or on cards other than the
* WL11000) may have different PCI ID's.
---end of mail--- *
*/ * If anyone needs any more specific info, let me know. I haven't had
* time to implement support myself yet, and with the way things are
* going, might not have time for a while..
*/
#include <linux/config.h> #include <linux/config.h>
...@@ -134,10 +137,10 @@ not have time for a while.. ...@@ -134,10 +137,10 @@ not have time for a while..
static char dev_info[] = "orinoco_plx"; static char dev_info[] = "orinoco_plx";
#define COR_OFFSET (0x3e0 / 2) /* COR attribute offset of Prism2 PC card */ #define COR_OFFSET (0x3e0/2) /* COR attribute offset of Prism2 PC card */
#define COR_VALUE (COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */ #define COR_VALUE (COR_LEVEL_REQ | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */
#define PLX_INTCSR 0x4c /* Interrupt Control and Status Register */ #define PLX_INTCSR 0x4c /* Interrupt Control & Status Register */
#define PLX_INTCSR_INTEN (1<<6) /* Interrupt Enable bit */ #define PLX_INTCSR_INTEN (1<<6) /* Interrupt Enable bit */
static const u16 cis_magic[] = { static const u16 cis_magic[] = {
...@@ -223,6 +226,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, ...@@ -223,6 +226,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
goto fail; goto fail;
} }
/* Allocate network device */
dev = alloc_orinocodev(0, NULL); dev = alloc_orinocodev(0, NULL);
if (! dev) { if (! dev) {
err = -ENOMEM; err = -ENOMEM;
...@@ -234,15 +238,16 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, ...@@ -234,15 +238,16 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
printk(KERN_DEBUG printk(KERN_DEBUG "Detected Orinoco/Prism2 PLX device "
"Detected Orinoco/Prism2 PLX device at %s irq:%d, io addr:0x%lx\n", "at %s irq:%d, io addr:0x%lx\n", pci_name(pdev), pdev->irq,
pci_name(pdev), pdev->irq, pccard_ioaddr); pccard_ioaddr);
hermes_struct_init(&(priv->hw), dev->base_addr, hermes_struct_init(&(priv->hw), dev->base_addr, HERMES_IO,
HERMES_IO, HERMES_16BIT_REGSPACING); HERMES_16BIT_REGSPACING);
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ, dev->name, dev); err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
dev->name, dev);
if (err) { if (err) {
printk(KERN_ERR "orinoco_plx: Error allocating IRQ %d.\n", pdev->irq); printk(KERN_ERR "orinoco_plx: Error allocating IRQ %d.\n", pdev->irq);
err = -EBUSY; err = -EBUSY;
...@@ -254,7 +259,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, ...@@ -254,7 +259,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
if (err) if (err)
goto fail; goto fail;
return 0; /* succeeded */ return 0;
fail: fail:
printk(KERN_DEBUG "orinoco_plx: init_one(), FAIL!\n"); printk(KERN_DEBUG "orinoco_plx: init_one(), FAIL!\n");
...@@ -305,7 +310,7 @@ static struct pci_device_id orinoco_plx_pci_id_table[] = { ...@@ -305,7 +310,7 @@ static struct pci_device_id orinoco_plx_pci_id_table[] = {
{0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,}, /* Correga - does this work? */ {0x15e8, 0x0130, PCI_ANY_ID, PCI_ANY_ID,}, /* Correga - does this work? */
{0x1638, 0x1100, PCI_ANY_ID, PCI_ANY_ID,}, /* SMC EZConnect SMC2602W, {0x1638, 0x1100, PCI_ANY_ID, PCI_ANY_ID,}, /* SMC EZConnect SMC2602W,
Eumitcom PCI WL11000, Eumitcom PCI WL11000,
Addtron AWA-100*/ Addtron AWA-100 */
{0x16ab, 0x1100, PCI_ANY_ID, PCI_ANY_ID,}, /* Global Sun Tech GL24110P */ {0x16ab, 0x1100, PCI_ANY_ID, PCI_ANY_ID,}, /* Global Sun Tech GL24110P */
{0x16ab, 0x1101, PCI_ANY_ID, PCI_ANY_ID,}, /* Reported working, but unknown */ {0x16ab, 0x1101, PCI_ANY_ID, PCI_ANY_ID,}, /* Reported working, but unknown */
{0x16ab, 0x1102, PCI_ANY_ID, PCI_ANY_ID,}, /* Linksys WDT11 */ {0x16ab, 0x1102, PCI_ANY_ID, PCI_ANY_ID,}, /* Linksys WDT11 */
......
drivers/net/wireless/orinoco_tmd.c
View file @ 996ff103
...@@ -78,8 +78,7 @@ ...@@ -78,8 +78,7 @@
static char dev_info[] = "orinoco_tmd"; static char dev_info[] = "orinoco_tmd";
#define COR_VALUE (COR_LEVEL_REQ | COR_FUNC_ENA | COR_FUNC_ENA) /* Enable PC card with level triggered irqs and irq requests */ #define COR_VALUE (COR_LEVEL_REQ | COR_FUNC_ENA | COR_FUNC_ENA) /* Enable PC card with interrupt in level trigger */
static int orinoco_tmd_init_one(struct pci_dev *pdev, static int orinoco_tmd_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
...@@ -115,6 +114,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, ...@@ -115,6 +114,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
goto fail; goto fail;
} }
/* Allocate network device */
dev = alloc_orinocodev(0, NULL); dev = alloc_orinocodev(0, NULL);
if (! dev) { if (! dev) {
err = -ENOMEM; err = -ENOMEM;
...@@ -126,16 +126,16 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, ...@@ -126,16 +126,16 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
printk(KERN_DEBUG printk(KERN_DEBUG "Detected Orinoco/Prism2 TMD device "
"Detected Orinoco/Prism2 TMD device at %s irq:%d, io addr:0x%lx\n", "at %s irq:%d, io addr:0x%lx\n", pci_name(pdev), pdev->irq,
pci_name(pdev), pdev->irq, pccard_ioaddr); pccard_ioaddr);
hermes_struct_init(&(priv->hw), dev->base_addr, hermes_struct_init(&(priv->hw), dev->base_addr,
HERMES_IO, HERMES_16BIT_REGSPACING); HERMES_IO, HERMES_16BIT_REGSPACING);
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ, dev->name, err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
dev); dev->name, dev);
if (err) { if (err) {
printk(KERN_ERR "orinoco_tmd: Error allocating IRQ %d.\n", printk(KERN_ERR "orinoco_tmd: Error allocating IRQ %d.\n",
pdev->irq); pdev->irq);
...@@ -148,7 +148,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, ...@@ -148,7 +148,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
if (err) if (err)
goto fail; goto fail;
return 0; /* succeeded */ return 0;
fail: fail:
printk(KERN_DEBUG "orinoco_tmd: init_one(), FAIL!\n"); printk(KERN_DEBUG "orinoco_tmd: init_one(), FAIL!\n");
......
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