diff options
Diffstat (limited to 'drivers/staging/wlags49_h2')
-rw-r--r-- | drivers/staging/wlags49_h2/ap_h2.c | 16 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/man/wlags49.4 | 2 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_if.h | 133 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.c | 25 |
4 files changed, 81 insertions, 95 deletions
diff --git a/drivers/staging/wlags49_h2/ap_h2.c b/drivers/staging/wlags49_h2/ap_h2.c index eb8244c4d6f0..e524153e925d 100644 --- a/drivers/staging/wlags49_h2/ap_h2.c +++ b/drivers/staging/wlags49_h2/ap_h2.c @@ -25,10 +25,10 @@ */ -#include "hcfcfg.h" /* to get hcf_16 etc defined as well as */ +#include "hcfcfg.h" /* to get hcf_16 etc defined as well as */ /* possible settings which inluence mdd.h or dhf.h */ -#include "mdd.h" /* to get COMP_ID_STA etc defined */ -#include "dhf.h" /* used to be "fhfmem.h", to get memblock,plugrecord, */ +#include "mdd.h" /* to get COMP_ID_STA etc defined */ +#include "dhf.h" /* used to be "fhfmem.h", to get memblock,plugrecord, */ static const hcf_8 fw_image_1_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -3301,7 +3301,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = { COMP_ROLE_SUPL, COMP_ID_APF, { - { 2, 2, 4 } /* variant, bottom, top */ + { 2, 2, 4 } /* variant, bottom, top */ } }, { 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)), @@ -3309,9 +3309,9 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = { COMP_ROLE_ACT, COMP_ID_MFI, { - { 4, 6, 7 }, /* variant, bottom, top */ - { 5, 6, 7 }, /* variant, bottom, top */ - { 6, 6, 7 } /* variant, bottom, top */ + { 4, 6, 7 }, /* variant, bottom, top */ + { 5, 6, 7 }, /* variant, bottom, top */ + { 6, 6, 7 } /* variant, bottom, top */ } }, { 3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)), @@ -3319,7 +3319,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = { COMP_ROLE_ACT, COMP_ID_CFI, { - { 2, 1, 2 } /* variant, bottom, top */ + { 2, 1, 2 } /* variant, bottom, top */ } }, { 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } } /* endsentinel */ diff --git a/drivers/staging/wlags49_h2/man/wlags49.4 b/drivers/staging/wlags49_h2/man/wlags49.4 index a34588530740..37df99879183 100644 --- a/drivers/staging/wlags49_h2/man/wlags49.4 +++ b/drivers/staging/wlags49_h2/man/wlags49.4 @@ -108,7 +108,7 @@ with the I/O base address and MAC address used by the card. \- Card power management \- Support for Hermes-II & Hermes-II.5 based PCMCIA, Mini PCI, and CardBus cards \- Wired Equivalent Privacy (WEP) - \- WPA-PSK support (EXPERIMENTAL) + \- WPA-PSK support \- Driver utility interface (UIL) \- Wireless Extensions \- Software AP mode diff --git a/drivers/staging/wlags49_h2/wl_if.h b/drivers/staging/wlags49_h2/wl_if.h index 6d66dabf032c..425d3733b362 100644 --- a/drivers/staging/wlags49_h2/wl_if.h +++ b/drivers/staging/wlags49_h2/wl_if.h @@ -71,45 +71,39 @@ #define MAX_LTV_BUF_SIZE (512 - (sizeof(hcf_16) * 2)) #define HCF_TALLIES_SIZE (sizeof(CFG_HERMES_TALLIES_STRCT) + \ - (sizeof(hcf_16) * 2)) + (sizeof(hcf_16) * 2)) #define HCF_MAX_MULTICAST 16 #define HCF_MAX_NAME_LEN 32 -#define MAX_LINE_SIZE 256 +#define MAX_LINE_SIZE 256 #define HCF_NUM_IO_PORTS 0x80 #define TX_TIMEOUT ((800 * HZ) / 1000) -//#define HCF_MIN_COMM_QUALITY 0 -//#define HCF_MAX_COMM_QUALITY 92 -//#define HCF_MIN_SIGNAL_LEVEL 47 -//#define HCF_MAX_SIGNAL_LEVEL 138 -//#define HCF_MIN_NOISE_LEVEL 47 -//#define HCF_MAX_NOISE_LEVEL 138 -//#define HCF_0DBM_OFFSET 149 - -// PE1DNN -// Better data from the real world. Not scientific but empirical data gathered -// from a Thomson Speedtouch 110 which is identified as: -// PCMCIA Info: "Agere Systems" "Wireless PC Card Model 0110" -// Manufacture ID: 0156,0003 -// Lowest measurment for noise floor seen is value 54 -// Highest signal strength in close proximity to the AP seen is value 118 -// Very good must be around 100 (otherwise its never "full scale" -// All other constants are derrived from these. This makes the signal gauge -// work for me... +/* PE1DNN + * Better data from the real world. Not scientific but empirical data gathered + * from a Thomson Speedtouch 110 which is identified as: + * PCMCIA Info: "Agere Systems" "Wireless PC Card Model 0110" + * Manufacture ID: 0156,0003 + * Lowest measurment for noise floor seen is value 54 + * Highest signal strength in close proximity to the AP seen is value 118 + * Very good must be around 100 (otherwise its never "full scale" + * All other constants are derrived from these. This makes the signal gauge + * work for me... + */ #define HCF_MIN_SIGNAL_LEVEL 54 #define HCF_MAX_SIGNAL_LEVEL 100 #define HCF_MIN_NOISE_LEVEL HCF_MIN_SIGNAL_LEVEL #define HCF_MAX_NOISE_LEVEL HCF_MAX_SIGNAL_LEVEL #define HCF_0DBM_OFFSET (HCF_MAX_SIGNAL_LEVEL + 1) #define HCF_MIN_COMM_QUALITY 0 -#define HCF_MAX_COMM_QUALITY (HCF_MAX_SIGNAL_LEVEL - HCF_MIN_NOISE_LEVEL + 1) +#define HCF_MAX_COMM_QUALITY (HCF_MAX_SIGNAL_LEVEL - \ + HCF_MIN_NOISE_LEVEL + 1) /* For encryption (WEP) */ -#define MIN_KEY_SIZE 5 // 40 bits RC4 - WEP -#define MAX_KEY_SIZE 13 // 104 bits +#define MIN_KEY_SIZE 5 /* 40 bits RC4 - WEP */ +#define MAX_KEY_SIZE 13 /* 104 bits */ #define MAX_KEYS 4 #define RADIO_CHANNELS 14 @@ -121,12 +115,12 @@ #define MAX_RTS_BYTES 2347 #define MAX_RATES 8 -#define MEGABIT 1024*1024 +#define MEGABIT (1024 * 1024) #define HCF_FAILURE 0xFF #define UIL_FAILURE 0xFF -#define CFG_UIL_CONNECT 0xA123 // Define differently? -#define CFG_UIL_CONNECT_ACK_CODE 0x5653435A // VSCZ +#define CFG_UIL_CONNECT 0xA123 /* Define differently? */ +#define CFG_UIL_CONNECT_ACK_CODE 0x5653435A /* VSCZ */ #define WVLAN2_UIL_CONNECTED (0x01L << 0) #define WVLAN2_UIL_BUSY (0x01L << 1) @@ -154,15 +148,15 @@ UIL_FUN_GET_INFO UIL_FUN_PUT_INFO */ -#define SIOCSIWNETNAME SIOCDEVPRIVATE+1 -#define SIOCGIWNETNAME SIOCDEVPRIVATE+2 -#define SIOCSIWSTANAME SIOCDEVPRIVATE+3 -#define SIOCGIWSTANAME SIOCDEVPRIVATE+4 -#define SIOCSIWPORTTYPE SIOCDEVPRIVATE+5 -#define SIOCGIWPORTTYPE SIOCDEVPRIVATE+6 +#define SIOCSIWNETNAME (SIOCDEVPRIVATE + 1) +#define SIOCGIWNETNAME (SIOCDEVPRIVATE + 2) +#define SIOCSIWSTANAME (SIOCDEVPRIVATE + 3) +#define SIOCGIWSTANAME (SIOCDEVPRIVATE + 4) +#define SIOCSIWPORTTYPE (SIOCDEVPRIVATE + 5) +#define SIOCGIWPORTTYPE (SIOCDEVPRIVATE + 6) /* IOCTL code for the RTS interface */ -#define WL_IOCTL_RTS SIOCDEVPRIVATE+7 +#define WL_IOCTL_RTS (SIOCDEVPRIVATE + 7) /* IOCTL subcodes for WL_IOCTL_RTS */ #define WL_IOCTL_RTS_READ 1 @@ -174,61 +168,54 @@ UIL_FUN_PUT_INFO /******************************************************************************* * STRUCTURE DEFINITIONS ******************************************************************************/ -typedef struct -{ - __u16 length; - __u8 name[HCF_MAX_NAME_LEN]; +typedef struct { + __u16 length; + __u8 name[HCF_MAX_NAME_LEN]; } wvName_t; -typedef struct -{ - hcf_16 len; - hcf_16 typ; - union - { - hcf_8 u8[MAX_LTV_BUF_SIZE / sizeof(hcf_8)]; - hcf_16 u16[MAX_LTV_BUF_SIZE / sizeof(hcf_16)]; - hcf_32 u32[MAX_LTV_BUF_SIZE / sizeof(hcf_32)]; - } u; +typedef struct { + hcf_16 len; + hcf_16 typ; + union { + hcf_8 u8[MAX_LTV_BUF_SIZE / sizeof(hcf_8)]; + hcf_16 u16[MAX_LTV_BUF_SIZE / sizeof(hcf_16)]; + hcf_32 u32[MAX_LTV_BUF_SIZE / sizeof(hcf_32)]; + } u; } ltv_t; -struct uilreq -{ - union - { - char ifrn_name[IFNAMSIZ]; - } ifr_ifrn; +struct uilreq { + union { + char ifrn_name[IFNAMSIZ]; + } ifr_ifrn; - IFBP hcfCtx; - __u8 command; - __u8 result; + IFBP hcfCtx; + __u8 command; + __u8 result; - /* The data field in this structure is typically an LTV of some type. The - len field is the size of the buffer in bytes, as opposed to words (like - the L-field in the LTV */ - __u16 len; - void *data; + /* The data field in this structure is typically an LTV of some type. + The len field is the size of the buffer in bytes, as opposed to words + (like the L-field in the LTV */ + __u16 len; + void *data; }; -struct rtsreq -{ - union - { - char ifrn_name[IFNAMSIZ]; - } - ifr_ifrn; +struct rtsreq { + union { + char ifrn_name[IFNAMSIZ]; + } + ifr_ifrn; - __u16 typ; - __u16 reg; - __u16 len; - __u16 *data; + __u16 typ; + __u16 reg; + __u16 len; + __u16 *data; }; -#endif // __WAVELAN2_IF_H__ +#endif /* __WAVELAN2_IF_H__ */ diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index a09c3ac793a2..6226e5eebf3a 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c @@ -111,7 +111,7 @@ extern dbg_info_t *DbgInfo; #endif // DBG /* define the PCI device Table Cardname and id tables */ -static struct pci_device_id wl_pci_tbl[] __devinitdata = { +static struct pci_device_id wl_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), }, { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1), }, { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2), }, @@ -124,9 +124,9 @@ MODULE_DEVICE_TABLE(pci, wl_pci_tbl); /******************************************************************************* * function prototypes ******************************************************************************/ -int __devinit wl_pci_probe( struct pci_dev *pdev, +int wl_pci_probe( struct pci_dev *pdev, const struct pci_device_id *ent ); -void __devexit wl_pci_remove(struct pci_dev *pdev); +void wl_pci_remove(struct pci_dev *pdev); int wl_pci_setup( struct pci_dev *pdev ); void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev ); @@ -160,14 +160,13 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp ); /******************************************************************************* * PCI module function registration ******************************************************************************/ -static struct pci_driver wl_driver = -{ - name: MODULE_NAME, - id_table: wl_pci_tbl, - probe: wl_pci_probe, - remove: __devexit_p(wl_pci_remove), - suspend: NULL, - resume: NULL, +static struct pci_driver wl_driver = { + .name = MODULE_NAME, + .id_table = wl_pci_tbl, + .probe = wl_pci_probe, + .remove = wl_pci_remove, + .suspend = NULL, + .resume = NULL }; /******************************************************************************* @@ -399,7 +398,7 @@ int wl_adapter_is_open( struct net_device *dev ) * errno value otherwise * ******************************************************************************/ -int __devinit wl_pci_probe( struct pci_dev *pdev, +int wl_pci_probe( struct pci_dev *pdev, const struct pci_device_id *ent ) { int result; @@ -436,7 +435,7 @@ int __devinit wl_pci_probe( struct pci_dev *pdev, * N/A * ******************************************************************************/ -void __devexit wl_pci_remove(struct pci_dev *pdev) +void wl_pci_remove(struct pci_dev *pdev) { struct net_device *dev = NULL; /*------------------------------------------------------------------------*/ |