diff options
Diffstat (limited to 'drivers')
41 files changed, 208 insertions, 94 deletions
diff --git a/drivers/staging/winbond/adapter.h b/drivers/staging/winbond/adapter.h index fb07c7b2793..e67e034e938 100644 --- a/drivers/staging/winbond/adapter.h +++ b/drivers/staging/winbond/adapter.h | |||
@@ -1,3 +1,12 @@ | |||
1 | #ifndef __WINBOND_ADAPTER_H | ||
2 | #define __WINBOND_ADAPTER_H | ||
3 | |||
4 | #include <linux/wireless.h> | ||
5 | |||
6 | #include "bssdscpt.h" | ||
7 | #include "mto.h" | ||
8 | #include "wbhal_s.h" | ||
9 | |||
1 | #define OS_SET_SHUTDOWN( _A ) _A->shutdown=1 | 10 | #define OS_SET_SHUTDOWN( _A ) _A->shutdown=1 |
2 | #define OS_SET_RESUME( _A ) _A->shutdown=0 | 11 | #define OS_SET_RESUME( _A ) _A->shutdown=0 |
3 | #define OS_STOP( _A ) WBLINUX_stop( _A ) | 12 | #define OS_STOP( _A ) WBLINUX_stop( _A ) |
@@ -45,3 +54,5 @@ struct wb35_adapter { | |||
45 | 54 | ||
46 | u8 LinkName[MAX_ANSI_STRING]; | 55 | u8 LinkName[MAX_ANSI_STRING]; |
47 | }; | 56 | }; |
57 | |||
58 | #endif | ||
diff --git a/drivers/staging/winbond/bss_f.h b/drivers/staging/winbond/bss_f.h index a7ef3deb5f7..feffe5f25f0 100644 --- a/drivers/staging/winbond/bss_f.h +++ b/drivers/staging/winbond/bss_f.h | |||
@@ -1,3 +1,10 @@ | |||
1 | #ifndef __WINBOND_BSS_F_H | ||
2 | #define __WINBOND_BSS_F_H | ||
3 | |||
4 | #include "adapter.h" | ||
5 | |||
6 | struct PMKID_Information_Element; | ||
7 | |||
1 | // | 8 | // |
2 | // BSS descriptor DataBase management global function | 9 | // BSS descriptor DataBase management global function |
3 | // | 10 | // |
@@ -53,7 +60,4 @@ u16 SearchPmkid(struct wb35_adapter * adapter, struct Management_Frame* msgHead | |||
53 | struct PMKID_Information_Element * AssoReq_PMKID ); | 60 | struct PMKID_Information_Element * AssoReq_PMKID ); |
54 | #endif | 61 | #endif |
55 | 62 | ||
56 | 63 | #endif | |
57 | |||
58 | |||
59 | |||
diff --git a/drivers/staging/winbond/bssdscpt.h b/drivers/staging/winbond/bssdscpt.h index 90b56829c5f..3a71d4efb89 100644 --- a/drivers/staging/winbond/bssdscpt.h +++ b/drivers/staging/winbond/bssdscpt.h | |||
@@ -1,3 +1,11 @@ | |||
1 | #ifndef __WINBOND_BSSDSCPT_H | ||
2 | #define __WINBOND_BSSDSCPT_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | #include "mds_s.h" | ||
7 | #include "mlme_s.h" | ||
8 | |||
1 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 9 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
2 | // bssdscpt.c | 10 | // bssdscpt.c |
3 | // BSS descriptor data base | 11 | // BSS descriptor data base |
@@ -153,4 +161,4 @@ typedef struct BSSDescriptionElement | |||
153 | 161 | ||
154 | #define psBSS(i) (&(adapter->asBSSDescriptElement[(i)])) | 162 | #define psBSS(i) (&(adapter->asBSSDescriptElement[(i)])) |
155 | 163 | ||
156 | 164 | #endif | |
diff --git a/drivers/staging/winbond/ds_tkip.h b/drivers/staging/winbond/ds_tkip.h index 6cfe3de449f..9c5c4e73f2c 100644 --- a/drivers/staging/winbond/ds_tkip.h +++ b/drivers/staging/winbond/ds_tkip.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_DS_TKIP_H | ||
2 | #define __WINBOND_DS_TKIP_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
1 | // Rotation functions on 32 bit values | 6 | // Rotation functions on 32 bit values |
2 | #define ROL32( A, n ) \ | 7 | #define ROL32( A, n ) \ |
3 | ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) ) | 8 | ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) ) |
@@ -29,5 +34,4 @@ typedef struct tkip | |||
29 | void Mds_MicGet( void* adapter, void* pRxLayer1, u8 *pKey, u8 *pMic ); | 34 | void Mds_MicGet( void* adapter, void* pRxLayer1, u8 *pKey, u8 *pMic ); |
30 | void Mds_MicFill( void* adapter, void* pDes, u8 *XmitBufAddress ); | 35 | void Mds_MicFill( void* adapter, void* pDes, u8 *XmitBufAddress ); |
31 | 36 | ||
32 | 37 | #endif | |
33 | |||
diff --git a/drivers/staging/winbond/gl_80211.h b/drivers/staging/winbond/gl_80211.h index 1806d817496..5a244c44a61 100644 --- a/drivers/staging/winbond/gl_80211.h +++ b/drivers/staging/winbond/gl_80211.h | |||
@@ -1,7 +1,8 @@ | |||
1 | |||
2 | #ifndef __GL_80211_H__ | 1 | #ifndef __GL_80211_H__ |
3 | #define __GL_80211_H__ | 2 | #define __GL_80211_H__ |
4 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
5 | /****************** CONSTANT AND MACRO SECTION ******************************/ | 6 | /****************** CONSTANT AND MACRO SECTION ******************************/ |
6 | 7 | ||
7 | /* BSS Type */ | 8 | /* BSS Type */ |
diff --git a/drivers/staging/winbond/linux/common.h b/drivers/staging/winbond/linux/common.h index 23853da3827..2badc2984a3 100644 --- a/drivers/staging/winbond/linux/common.h +++ b/drivers/staging/winbond/linux/common.h | |||
@@ -10,27 +10,6 @@ | |||
10 | #ifndef COMMON_DEF | 10 | #ifndef COMMON_DEF |
11 | #define COMMON_DEF | 11 | #define COMMON_DEF |
12 | 12 | ||
13 | #include <linux/version.h> | ||
14 | #include <linux/usb.h> | ||
15 | #include <linux/kernel.h> //need for kernel alert | ||
16 | #include <linux/autoconf.h> | ||
17 | #include <linux/sched.h> | ||
18 | #include <linux/signal.h> | ||
19 | #include <linux/slab.h> //memory allocate | ||
20 | #include <linux/module.h> | ||
21 | #include <linux/netdevice.h> | ||
22 | #include <linux/etherdevice.h> | ||
23 | #include <linux/init.h>//need for init and exit modules marco | ||
24 | #include <linux/ctype.h> | ||
25 | #include <linux/wait.h> | ||
26 | #include <linux/list.h> | ||
27 | #include <linux/wireless.h> | ||
28 | #include <linux/if_arp.h> | ||
29 | #include <asm/uaccess.h> | ||
30 | #include <net/iw_handler.h> | ||
31 | #include <linux/skbuff.h> | ||
32 | |||
33 | |||
34 | //#define DEBUG_ENABLED 1 | 13 | //#define DEBUG_ENABLED 1 |
35 | 14 | ||
36 | //================================================================================================== | 15 | //================================================================================================== |
diff --git a/drivers/staging/winbond/linux/sysdef.h b/drivers/staging/winbond/linux/sysdef.h index 4b35a972165..60e4c04f725 100644 --- a/drivers/staging/winbond/linux/sysdef.h +++ b/drivers/staging/winbond/linux/sysdef.h | |||
@@ -37,36 +37,7 @@ | |||
37 | #define _PE_USB_INI_DUMP_ | 37 | #define _PE_USB_INI_DUMP_ |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | |||
41 | |||
42 | #include "common.h" // Individual file depends on OS | ||
43 | |||
44 | #include "../wb35_ver.h" | ||
45 | #include "../mac_structures.h" | ||
46 | #include "../ds_tkip.h" | ||
47 | #include "../localpara.h" | ||
48 | #include "../sme_s.h" | ||
49 | #include "../scan_s.h" | ||
50 | #include "../mds_s.h" | ||
51 | #include "../mlme_s.h" | ||
52 | #include "../bssdscpt.h" | ||
53 | #include "../sme_api.h" | ||
54 | #include "../gl_80211.h" | ||
55 | #include "../mto.h" | ||
56 | #include "../wbhal_s.h" | ||
57 | |||
58 | |||
59 | #include "../adapter.h" | ||
60 | |||
61 | #include "../mlme_mib.h" | ||
62 | #include "../mds_f.h" | ||
63 | #include "../bss_f.h" | ||
64 | #include "../mlmetxrx_f.h" | ||
65 | #include "../mto_f.h" | ||
66 | #include "../wbhal_f.h" | ||
67 | #include "../wblinux_f.h" | ||
68 | // Kernel Timer resolution, NDIS is 10ms, 10000us | 40 | // Kernel Timer resolution, NDIS is 10ms, 10000us |
69 | #define MIN_TIMEOUT_VAL (10) //ms | 41 | #define MIN_TIMEOUT_VAL (10) //ms |
70 | 42 | ||
71 | |||
72 | #endif | 43 | #endif |
diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c index 6215e3ca418..4c9fd2b62d7 100644 --- a/drivers/staging/winbond/linux/wb35reg.c +++ b/drivers/staging/winbond/linux/wb35reg.c | |||
@@ -1,4 +1,7 @@ | |||
1 | #include "sysdef.h" | 1 | #include "sysdef.h" |
2 | #include "wb35reg_f.h" | ||
3 | |||
4 | #include <linux/usb.h> | ||
2 | 5 | ||
3 | extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency); | 6 | extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency); |
4 | 7 | ||
diff --git a/drivers/staging/winbond/linux/wb35reg_f.h b/drivers/staging/winbond/linux/wb35reg_f.h index fc940914e34..9a178b9fb6c 100644 --- a/drivers/staging/winbond/linux/wb35reg_f.h +++ b/drivers/staging/winbond/linux/wb35reg_f.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_WB35REG_F_H | ||
2 | #define __WINBOND_WB35REG_F_H | ||
3 | |||
4 | #include "../wbhal_s.h" | ||
5 | |||
1 | //==================================== | 6 | //==================================== |
2 | // Interface function declare | 7 | // Interface function declare |
3 | //==================================== | 8 | //==================================== |
@@ -53,4 +58,4 @@ void Wb35Reg_phy_calibration( phw_data_t pHwData ); | |||
53 | void Wb35Reg_Update( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ); | 58 | void Wb35Reg_Update( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ); |
54 | unsigned char adjust_TXVGA_for_iq_mag( phw_data_t pHwData ); | 59 | unsigned char adjust_TXVGA_for_iq_mag( phw_data_t pHwData ); |
55 | 60 | ||
56 | 61 | #endif | |
diff --git a/drivers/staging/winbond/linux/wb35reg_s.h b/drivers/staging/winbond/linux/wb35reg_s.h index 2f665d1b1a4..32ef4b8a2d2 100644 --- a/drivers/staging/winbond/linux/wb35reg_s.h +++ b/drivers/staging/winbond/linux/wb35reg_s.h | |||
@@ -1,3 +1,10 @@ | |||
1 | #ifndef __WINBOND_WB35REG_S_H | ||
2 | #define __WINBOND_WB35REG_S_H | ||
3 | |||
4 | #include <linux/spinlock.h> | ||
5 | #include <linux/types.h> | ||
6 | #include <asm/atomic.h> | ||
7 | |||
1 | //======================================================================================= | 8 | //======================================================================================= |
2 | /* | 9 | /* |
3 | HAL setting function | 10 | HAL setting function |
@@ -162,4 +169,4 @@ struct wb35_reg { | |||
162 | 169 | ||
163 | }; | 170 | }; |
164 | 171 | ||
165 | 172 | #endif | |
diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c index f690298dea2..15a06504736 100644 --- a/drivers/staging/winbond/linux/wb35rx.c +++ b/drivers/staging/winbond/linux/wb35rx.c | |||
@@ -8,7 +8,10 @@ | |||
8 | // Processing the Rx message from down layer | 8 | // Processing the Rx message from down layer |
9 | // | 9 | // |
10 | //============================================================================ | 10 | //============================================================================ |
11 | #include <linux/usb.h> | ||
12 | |||
11 | #include "sysdef.h" | 13 | #include "sysdef.h" |
14 | #include "wb35rx_f.h" | ||
12 | 15 | ||
13 | void Wb35Rx_start(phw_data_t pHwData) | 16 | void Wb35Rx_start(phw_data_t pHwData) |
14 | { | 17 | { |
diff --git a/drivers/staging/winbond/linux/wb35rx_f.h b/drivers/staging/winbond/linux/wb35rx_f.h index 565280e890b..752eec7f067 100644 --- a/drivers/staging/winbond/linux/wb35rx_f.h +++ b/drivers/staging/winbond/linux/wb35rx_f.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_WB35RX_F_H | ||
2 | #define __WINBOND_WB35RX_F_H | ||
3 | |||
4 | #include "../wbhal_s.h" | ||
5 | |||
1 | //==================================== | 6 | //==================================== |
2 | // Interface function declare | 7 | // Interface function declare |
3 | //==================================== | 8 | //==================================== |
@@ -12,6 +17,4 @@ void Wb35Rx_start( phw_data_t pHwData ); | |||
12 | void Wb35Rx( phw_data_t pHwData ); | 17 | void Wb35Rx( phw_data_t pHwData ); |
13 | void Wb35Rx_Complete(struct urb *urb); | 18 | void Wb35Rx_Complete(struct urb *urb); |
14 | 19 | ||
15 | 20 | #endif | |
16 | |||
17 | |||
diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/linux/wb35tx.c index a58a193ce2b..ec0e7b922da 100644 --- a/drivers/staging/winbond/linux/wb35tx.c +++ b/drivers/staging/winbond/linux/wb35tx.c | |||
@@ -8,8 +8,11 @@ | |||
8 | // Processing the Tx message and put into down layer | 8 | // Processing the Tx message and put into down layer |
9 | // | 9 | // |
10 | //============================================================================ | 10 | //============================================================================ |
11 | #include "sysdef.h" | 11 | #include <linux/usb.h> |
12 | 12 | ||
13 | #include "wb35tx_f.h" | ||
14 | #include "../mds_f.h" | ||
15 | #include "sysdef.h" | ||
13 | 16 | ||
14 | unsigned char | 17 | unsigned char |
15 | Wb35Tx_get_tx_buffer(phw_data_t pHwData, u8 **pBuffer) | 18 | Wb35Tx_get_tx_buffer(phw_data_t pHwData, u8 **pBuffer) |
diff --git a/drivers/staging/winbond/linux/wb35tx_f.h b/drivers/staging/winbond/linux/wb35tx_f.h index 1815c10b081..64b11a190af 100644 --- a/drivers/staging/winbond/linux/wb35tx_f.h +++ b/drivers/staging/winbond/linux/wb35tx_f.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_WB35TX_F_H | ||
2 | #define __WINBOND_WB35TX_F_H | ||
3 | |||
4 | #include "../wbhal_f.h" | ||
5 | |||
1 | //==================================== | 6 | //==================================== |
2 | // Interface function declare | 7 | // Interface function declare |
3 | //==================================== | 8 | //==================================== |
@@ -17,4 +22,4 @@ void Wb35Tx_reset_descriptor( phw_data_t pHwData ); | |||
17 | 22 | ||
18 | void Wb35Tx_CurrentTime( phw_data_t pHwData, u32 TimeCount ); | 23 | void Wb35Tx_CurrentTime( phw_data_t pHwData, u32 TimeCount ); |
19 | 24 | ||
20 | 25 | #endif | |
diff --git a/drivers/staging/winbond/linux/wb35tx_s.h b/drivers/staging/winbond/linux/wb35tx_s.h index 8cb449f7a38..b6ff6fdbc37 100644 --- a/drivers/staging/winbond/linux/wb35tx_s.h +++ b/drivers/staging/winbond/linux/wb35tx_s.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_WB35_TX_S_H | ||
2 | #define __WINBOND_WB35_TX_S_H | ||
3 | |||
4 | #include "../mds_s.h" | ||
5 | |||
1 | //==================================== | 6 | //==================================== |
2 | // IS89C35 Tx related definition | 7 | // IS89C35 Tx related definition |
3 | //==================================== | 8 | //==================================== |
@@ -41,7 +46,4 @@ typedef struct _WB35TX | |||
41 | 46 | ||
42 | } WB35TX, *PWB35TX; | 47 | } WB35TX, *PWB35TX; |
43 | 48 | ||
44 | 49 | #endif | |
45 | |||
46 | |||
47 | |||
diff --git a/drivers/staging/winbond/linux/wbusb.c b/drivers/staging/winbond/linux/wbusb.c index bd708a2d148..861a0e4c706 100644 --- a/drivers/staging/winbond/linux/wbusb.c +++ b/drivers/staging/winbond/linux/wbusb.c | |||
@@ -3,8 +3,12 @@ | |||
3 | * | 3 | * |
4 | * Distribute under GPLv2. | 4 | * Distribute under GPLv2. |
5 | */ | 5 | */ |
6 | #include "sysdef.h" | ||
7 | #include <net/mac80211.h> | 6 | #include <net/mac80211.h> |
7 | #include <linux/usb.h> | ||
8 | |||
9 | #include "../mlmetxrx_f.h" | ||
10 | #include "../wbhal_f.h" | ||
11 | #include "../wblinux_f.h" | ||
8 | 12 | ||
9 | MODULE_AUTHOR(DRIVER_AUTHOR); | 13 | MODULE_AUTHOR(DRIVER_AUTHOR); |
10 | MODULE_DESCRIPTION(DRIVER_DESC); | 14 | MODULE_DESCRIPTION(DRIVER_DESC); |
diff --git a/drivers/staging/winbond/linux/wbusb_s.h b/drivers/staging/winbond/linux/wbusb_s.h index 45e41b37194..1aa8ab10b62 100644 --- a/drivers/staging/winbond/linux/wbusb_s.h +++ b/drivers/staging/winbond/linux/wbusb_s.h | |||
@@ -11,6 +11,11 @@ | |||
11 | // | 11 | // |
12 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 12 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
13 | 13 | ||
14 | #ifndef __WINBOND_WBUSB_S_H | ||
15 | #define __WINBOND_WBUSB_S_H | ||
16 | |||
17 | #include <linux/types.h> | ||
18 | |||
14 | //--------------------------------------------------------------------------- | 19 | //--------------------------------------------------------------------------- |
15 | // RW_CONTEXT -- | 20 | // RW_CONTEXT -- |
16 | // | 21 | // |
@@ -23,16 +28,13 @@ typedef struct _RW_CONTEXT | |||
23 | void* pCallBackFunctionParameter; | 28 | void* pCallBackFunctionParameter; |
24 | } RW_CONTEXT, *PRW_CONTEXT; | 29 | } RW_CONTEXT, *PRW_CONTEXT; |
25 | 30 | ||
26 | |||
27 | |||
28 | |||
29 | #define DRIVER_AUTHOR "Original by: Jeff Lee<YY_Lee@issc.com.tw> Adapted to 2.6.x by Costantino Leandro (Rxart Desktop) <le_costantino@pixartargentina.com.ar>" | 31 | #define DRIVER_AUTHOR "Original by: Jeff Lee<YY_Lee@issc.com.tw> Adapted to 2.6.x by Costantino Leandro (Rxart Desktop) <le_costantino@pixartargentina.com.ar>" |
30 | #define DRIVER_DESC "IS89C35 802.11bg WLAN USB Driver" | 32 | #define DRIVER_DESC "IS89C35 802.11bg WLAN USB Driver" |
31 | 33 | ||
32 | |||
33 | |||
34 | typedef struct _WBUSB { | 34 | typedef struct _WBUSB { |
35 | u32 IsUsb20; | 35 | u32 IsUsb20; |
36 | struct usb_device *udev; | 36 | struct usb_device *udev; |
37 | u32 DetectCount; | 37 | u32 DetectCount; |
38 | } WBUSB, *PWBUSB; | 38 | } WBUSB, *PWBUSB; |
39 | |||
40 | #endif | ||
diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h index 087f4860717..a308ac276ba 100644 --- a/drivers/staging/winbond/localpara.h +++ b/drivers/staging/winbond/localpara.h | |||
@@ -1,6 +1,12 @@ | |||
1 | #ifndef __WINBOND_LOCALPARA_H | ||
2 | #define __WINBOND_LOCALPARA_H | ||
3 | |||
1 | //============================================================= | 4 | //============================================================= |
2 | // LocalPara.h - | 5 | // LocalPara.h - |
3 | //============================================================= | 6 | //============================================================= |
7 | |||
8 | #include "mac_structures.h" | ||
9 | |||
4 | //Define the local ability | 10 | //Define the local ability |
5 | 11 | ||
6 | #define LOCAL_DEFAULT_BEACON_PERIOD 100 //ms | 12 | #define LOCAL_DEFAULT_BEACON_PERIOD 100 //ms |
@@ -272,4 +278,4 @@ typedef struct LOCAL_PARA | |||
272 | 278 | ||
273 | } WB_LOCALDESCRIPT, *PWB_LOCALDESCRIPT; | 279 | } WB_LOCALDESCRIPT, *PWB_LOCALDESCRIPT; |
274 | 280 | ||
275 | 281 | #endif | |
diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h index 031d2cb6cd6..0d1619601c0 100644 --- a/drivers/staging/winbond/mac_structures.h +++ b/drivers/staging/winbond/mac_structures.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #ifndef _MAC_Structures_H_ | 21 | #ifndef _MAC_Structures_H_ |
22 | #define _MAC_Structures_H_ | 22 | #define _MAC_Structures_H_ |
23 | 23 | ||
24 | #include <linux/skbuff.h> | ||
24 | 25 | ||
25 | //========================================================= | 26 | //========================================================= |
26 | // Some miscellaneous definitions | 27 | // Some miscellaneous definitions |
@@ -115,10 +116,6 @@ | |||
115 | #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT ((u16) 6) | 116 | #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT ((u16) 6) |
116 | #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT ((u16) 2) | 117 | #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT ((u16) 2) |
117 | 118 | ||
118 | #ifdef WB_LINUX | ||
119 | #define UNALIGNED | ||
120 | #endif | ||
121 | |||
122 | //======================================================== | 119 | //======================================================== |
123 | typedef enum enum_PowerManagementMode | 120 | typedef enum enum_PowerManagementMode |
124 | { | 121 | { |
@@ -464,7 +461,7 @@ struct RSN_Information_Element | |||
464 | { | 461 | { |
465 | u8 Element_ID; | 462 | u8 Element_ID; |
466 | u8 Length; | 463 | u8 Length; |
467 | UNALIGNED SUITE_SELECTOR OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01 | 464 | SUITE_SELECTOR OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01 |
468 | u16 Version; | 465 | u16 Version; |
469 | SUITE_SELECTOR GroupKeySuite; | 466 | SUITE_SELECTOR GroupKeySuite; |
470 | u16 PairwiseKeySuiteCount; | 467 | u16 PairwiseKeySuiteCount; |
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c index 20008e35fe0..94f28ffff48 100644 --- a/drivers/staging/winbond/mds.c +++ b/drivers/staging/winbond/mds.c | |||
@@ -1,4 +1,11 @@ | |||
1 | #include "ds_tkip.h" | ||
2 | #include "gl_80211.h" | ||
3 | #include "mds_f.h" | ||
4 | #include "mlmetxrx_f.h" | ||
5 | #include "mto_f.h" | ||
1 | #include "os_common.h" | 6 | #include "os_common.h" |
7 | #include "wbhal_f.h" | ||
8 | #include "wblinux_f.h" | ||
2 | 9 | ||
3 | void | 10 | void |
4 | Mds_reset_descriptor(struct wb35_adapter * adapter) | 11 | Mds_reset_descriptor(struct wb35_adapter * adapter) |
diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h index 4258b3281d3..f243d7455c8 100644 --- a/drivers/staging/winbond/mds_f.h +++ b/drivers/staging/winbond/mds_f.h | |||
@@ -1,3 +1,9 @@ | |||
1 | #ifndef __WINBOND_MDS_F_H | ||
2 | #define __WINBOND_MDS_F_H | ||
3 | |||
4 | #include "wbhal_s.h" | ||
5 | #include "adapter.h" | ||
6 | |||
1 | unsigned char Mds_initial( struct wb35_adapter *adapter ); | 7 | unsigned char Mds_initial( struct wb35_adapter *adapter ); |
2 | void Mds_Destroy( struct wb35_adapter *adapter ); | 8 | void Mds_Destroy( struct wb35_adapter *adapter ); |
3 | void Mds_Tx( struct wb35_adapter *adapter ); | 9 | void Mds_Tx( struct wb35_adapter *adapter ); |
@@ -24,4 +30,4 @@ void MDS_GetNextPacketComplete( struct wb35_adapter *adapter, PDESCRIPTOR pDes | |||
24 | void MDS_SendResult( struct wb35_adapter *adapter, u8 PacketId, unsigned char SendOK ); | 30 | void MDS_SendResult( struct wb35_adapter *adapter, u8 PacketId, unsigned char SendOK ); |
25 | void MDS_EthernetPacketReceive( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1 ); | 31 | void MDS_EthernetPacketReceive( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1 ); |
26 | 32 | ||
27 | 33 | #endif | |
diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h index 04030b97d95..02b11822b2c 100644 --- a/drivers/staging/winbond/mds_s.h +++ b/drivers/staging/winbond/mds_s.h | |||
@@ -1,3 +1,14 @@ | |||
1 | #ifndef __WINBOND_MDS_H | ||
2 | #define __WINBOND_MDS_H | ||
3 | |||
4 | #include <linux/timer.h> | ||
5 | #include <linux/types.h> | ||
6 | #include <asm/atomic.h> | ||
7 | |||
8 | #include "localpara.h" | ||
9 | #include "mac_structures.h" | ||
10 | #include "scan_s.h" | ||
11 | |||
1 | //////////////////////////////////////////////////////////////////////////////////////////////////////// | 12 | //////////////////////////////////////////////////////////////////////////////////////////////////////// |
2 | #define MAX_USB_TX_DESCRIPTOR 15 // IS89C35 ability | 13 | #define MAX_USB_TX_DESCRIPTOR 15 // IS89C35 ability |
3 | #define MAX_USB_TX_BUFFER_NUMBER 4 // Virtual pre-buffer number of MAX_USB_TX_BUFFER | 14 | #define MAX_USB_TX_BUFFER_NUMBER 4 // Virtual pre-buffer number of MAX_USB_TX_BUFFER |
@@ -178,4 +189,4 @@ typedef struct _RXLAYER1 | |||
178 | 189 | ||
179 | }RXLAYER1, * PRXLAYER1; | 190 | }RXLAYER1, * PRXLAYER1; |
180 | 191 | ||
181 | 192 | #endif | |
diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h index 039fd408ba6..ea12684a2b1 100644 --- a/drivers/staging/winbond/mlme_s.h +++ b/drivers/staging/winbond/mlme_s.h | |||
@@ -1,3 +1,12 @@ | |||
1 | #ifndef __WINBOND_MLME_H | ||
2 | #define __WINBOND_MLME_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | #include <linux/spinlock.h> | ||
6 | |||
7 | #include "mac_structures.h" | ||
8 | #include "mds_s.h" | ||
9 | |||
1 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 10 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
2 | // Mlme.h | 11 | // Mlme.h |
3 | // Define the related definitions of MLME module | 12 | // Define the related definitions of MLME module |
@@ -192,4 +201,4 @@ typedef struct _RXDATA | |||
192 | 201 | ||
193 | }__attribute__ ((packed)) RXDATA, *psRXDATA; | 202 | }__attribute__ ((packed)) RXDATA, *psRXDATA; |
194 | 203 | ||
195 | 204 | #endif | |
diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c index a071855d744..ee80aed7f0b 100644 --- a/drivers/staging/winbond/mlmetxrx.c +++ b/drivers/staging/winbond/mlmetxrx.c | |||
@@ -17,6 +17,8 @@ | |||
17 | //============================================================================ | 17 | //============================================================================ |
18 | #include "os_common.h" | 18 | #include "os_common.h" |
19 | 19 | ||
20 | #include "mds_f.h" | ||
21 | |||
20 | void MLMEResetTxRx(struct wb35_adapter * adapter) | 22 | void MLMEResetTxRx(struct wb35_adapter * adapter) |
21 | { | 23 | { |
22 | s32 i; | 24 | s32 i; |
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h index 5f108d87f6e..0f264ed64ea 100644 --- a/drivers/staging/winbond/mlmetxrx_f.h +++ b/drivers/staging/winbond/mlmetxrx_f.h | |||
@@ -8,6 +8,8 @@ | |||
8 | #ifndef _MLMETXRX_H | 8 | #ifndef _MLMETXRX_H |
9 | #define _MLMETXRX_H | 9 | #define _MLMETXRX_H |
10 | 10 | ||
11 | #include "adapter.h" | ||
12 | |||
11 | void | 13 | void |
12 | MLMEProcThread( | 14 | MLMEProcThread( |
13 | struct wb35_adapter * adapter | 15 | struct wb35_adapter * adapter |
diff --git a/drivers/staging/winbond/mto.c b/drivers/staging/winbond/mto.c index f53db937496..c68c7f68597 100644 --- a/drivers/staging/winbond/mto.c +++ b/drivers/staging/winbond/mto.c | |||
@@ -23,6 +23,9 @@ | |||
23 | 23 | ||
24 | // LA20040210_DTO kevin | 24 | // LA20040210_DTO kevin |
25 | #include "os_common.h" | 25 | #include "os_common.h" |
26 | #include "sme_api.h" | ||
27 | #include "gl_80211.h" | ||
28 | #include "wbhal_f.h" | ||
26 | 29 | ||
27 | // Declare SQ3 to rate and fragmentation threshold table | 30 | // Declare SQ3 to rate and fragmentation threshold table |
28 | // Declare fragmentation thresholds table | 31 | // Declare fragmentation thresholds table |
diff --git a/drivers/staging/winbond/mto.h b/drivers/staging/winbond/mto.h index 4ed15b09e47..9a175449ce5 100644 --- a/drivers/staging/winbond/mto.h +++ b/drivers/staging/winbond/mto.h | |||
@@ -11,6 +11,8 @@ | |||
11 | #ifndef __MTO_H__ | 11 | #ifndef __MTO_H__ |
12 | #define __MTO_H__ | 12 | #define __MTO_H__ |
13 | 13 | ||
14 | #include <linux/types.h> | ||
15 | |||
14 | #define MTO_DEFAULT_TH_CNT 5 | 16 | #define MTO_DEFAULT_TH_CNT 5 |
15 | #define MTO_DEFAULT_TH_SQ3 112 //OLD IS 13 reference JohnXu | 17 | #define MTO_DEFAULT_TH_SQ3 112 //OLD IS 13 reference JohnXu |
16 | #define MTO_DEFAULT_TH_IDLE_SLOT 15 | 18 | #define MTO_DEFAULT_TH_IDLE_SLOT 15 |
diff --git a/drivers/staging/winbond/mto_f.h b/drivers/staging/winbond/mto_f.h index de3d8d491ee..ce4319da1f3 100644 --- a/drivers/staging/winbond/mto_f.h +++ b/drivers/staging/winbond/mto_f.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_MTO_F_H | ||
2 | #define __WINBOND_MTO_F_H | ||
3 | |||
4 | #include "adapter.h" | ||
5 | |||
1 | extern void MTO_Init(struct wb35_adapter *); | 6 | extern void MTO_Init(struct wb35_adapter *); |
2 | extern void MTO_PeriodicTimerExpired(struct wb35_adapter *); | 7 | extern void MTO_PeriodicTimerExpired(struct wb35_adapter *); |
3 | extern void MTO_SetDTORateRange(struct wb35_adapter *, u8 *, u8); | 8 | extern void MTO_SetDTORateRange(struct wb35_adapter *, u8 *, u8); |
@@ -5,3 +10,4 @@ extern u8 MTO_GetTxRate(MTO_FUNC_INPUT, u32 fpdu_len); | |||
5 | extern u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT); | 10 | extern u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT); |
6 | extern void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index); | 11 | extern void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index); |
7 | 12 | ||
13 | #endif | ||
diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c index b77c84318e5..6782552d366 100644 --- a/drivers/staging/winbond/phy_calibration.c +++ b/drivers/staging/winbond/phy_calibration.c | |||
@@ -12,6 +12,7 @@ | |||
12 | /****************** INCLUDE FILES SECTION ***********************************/ | 12 | /****************** INCLUDE FILES SECTION ***********************************/ |
13 | #include "os_common.h" | 13 | #include "os_common.h" |
14 | #include "phy_calibration.h" | 14 | #include "phy_calibration.h" |
15 | #include "wbhal_f.h" | ||
15 | 16 | ||
16 | 17 | ||
17 | /****************** DEBUG CONSTANT AND MACRO SECTION ************************/ | 18 | /****************** DEBUG CONSTANT AND MACRO SECTION ************************/ |
diff --git a/drivers/staging/winbond/phy_calibration.h b/drivers/staging/winbond/phy_calibration.h index b6a65d31301..03b820c6181 100644 --- a/drivers/staging/winbond/phy_calibration.h +++ b/drivers/staging/winbond/phy_calibration.h | |||
@@ -1,3 +1,8 @@ | |||
1 | #ifndef __WINBOND_PHY_CALIBRATION_H | ||
2 | #define __WINBOND_PHY_CALIBRATION_H | ||
3 | |||
4 | #include "wbhal_f.h" | ||
5 | |||
1 | // 20031229 Turbo add | 6 | // 20031229 Turbo add |
2 | #define REG_AGC_CTRL1 0x1000 | 7 | #define REG_AGC_CTRL1 0x1000 |
3 | #define REG_AGC_CTRL2 0x1004 | 8 | #define REG_AGC_CTRL2 0x1004 |
@@ -99,3 +104,4 @@ | |||
99 | void phy_set_rf_data( phw_data_t pHwData, u32 index, u32 value ); | 104 | void phy_set_rf_data( phw_data_t pHwData, u32 index, u32 value ); |
100 | #define phy_init_rf( _A ) //RFSynthesizer_initial( _A ) | 105 | #define phy_init_rf( _A ) //RFSynthesizer_initial( _A ) |
101 | 106 | ||
107 | #endif | ||
diff --git a/drivers/staging/winbond/reg.c b/drivers/staging/winbond/reg.c index 9e1c1ef2795..cd21272d7a9 100644 --- a/drivers/staging/winbond/reg.c +++ b/drivers/staging/winbond/reg.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #include "os_common.h" | 1 | #include "os_common.h" |
2 | #include "wbhal_f.h" | ||
2 | 3 | ||
3 | /////////////////////////////////////////////////////////////////////////////////////////////////// | 4 | /////////////////////////////////////////////////////////////////////////////////////////////////// |
4 | // Original Phy.h | 5 | // Original Phy.h |
diff --git a/drivers/staging/winbond/rxisr.c b/drivers/staging/winbond/rxisr.c index de49a493512..f5c98d915c7 100644 --- a/drivers/staging/winbond/rxisr.c +++ b/drivers/staging/winbond/rxisr.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #include "os_common.h" | 1 | #include "os_common.h" |
2 | #include "adapter.h" | ||
2 | 3 | ||
3 | static void RxTimerHandler(unsigned long data) | 4 | static void RxTimerHandler(unsigned long data) |
4 | { | 5 | { |
diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h index a95239665e3..726954684ce 100644 --- a/drivers/staging/winbond/scan_s.h +++ b/drivers/staging/winbond/scan_s.h | |||
@@ -1,3 +1,9 @@ | |||
1 | #ifndef __WINBOND_SCAN_S_H | ||
2 | #define __WINBOND_SCAN_S_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | #include "localpara.h" | ||
6 | |||
1 | // | 7 | // |
2 | // SCAN task global CONSTANTS, STRUCTURES, variables | 8 | // SCAN task global CONSTANTS, STRUCTURES, variables |
3 | // | 9 | // |
@@ -112,3 +118,4 @@ typedef struct _SCAN_PARAMETERS | |||
112 | //static void vScanTimerStart(struct wb35_adapter * adapter, int timeout_value); | 118 | //static void vScanTimerStart(struct wb35_adapter * adapter, int timeout_value); |
113 | //static void vScanTimerStop(struct wb35_adapter * adapter); | 119 | //static void vScanTimerStop(struct wb35_adapter * adapter); |
114 | 120 | ||
121 | #endif | ||
diff --git a/drivers/staging/winbond/sme_api.c b/drivers/staging/winbond/sme_api.c index 31c9673ea86..6452d156431 100644 --- a/drivers/staging/winbond/sme_api.c +++ b/drivers/staging/winbond/sme_api.c | |||
@@ -6,6 +6,7 @@ | |||
6 | // | 6 | // |
7 | //------------------------------------------------------------------------------------ | 7 | //------------------------------------------------------------------------------------ |
8 | #include "os_common.h" | 8 | #include "os_common.h" |
9 | #include <linux/kernel.h> | ||
9 | 10 | ||
10 | s8 sme_get_rssi(void *pcore_data, s32 *prssi) | 11 | s8 sme_get_rssi(void *pcore_data, s32 *prssi) |
11 | { | 12 | { |
diff --git a/drivers/staging/winbond/sme_api.h b/drivers/staging/winbond/sme_api.h index 745eb376bc7..33183dae59f 100644 --- a/drivers/staging/winbond/sme_api.h +++ b/drivers/staging/winbond/sme_api.h | |||
@@ -13,6 +13,10 @@ | |||
13 | #ifndef __SME_API_H__ | 13 | #ifndef __SME_API_H__ |
14 | #define __SME_API_H__ | 14 | #define __SME_API_H__ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include "localpara.h" | ||
19 | |||
16 | /****************** INCLUDE FILES SECTION ***********************************/ | 20 | /****************** INCLUDE FILES SECTION ***********************************/ |
17 | //#include "GL\gl_core.h" | 21 | //#include "GL\gl_core.h" |
18 | 22 | ||
diff --git a/drivers/staging/winbond/sme_s.h b/drivers/staging/winbond/sme_s.h index 33f5d2aa96f..1bd118f83d2 100644 --- a/drivers/staging/winbond/sme_s.h +++ b/drivers/staging/winbond/sme_s.h | |||
@@ -1,3 +1,11 @@ | |||
1 | #ifndef __WINBOND_SME_S_H | ||
2 | #define __WINBOND_SME_S_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | #include "mac_structures.h" | ||
7 | #include "localpara.h" | ||
8 | |||
1 | // | 9 | // |
2 | // SME_S.H - | 10 | // SME_S.H - |
3 | // SME task global CONSTANTS, STRUCTURES, variables | 11 | // SME task global CONSTANTS, STRUCTURES, variables |
@@ -225,3 +233,4 @@ typedef struct _SME_PARAMETERS | |||
225 | 233 | ||
226 | // Static function | 234 | // Static function |
227 | 235 | ||
236 | #endif | ||
diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c index 100a407f49c..1ee706a70a6 100644 --- a/drivers/staging/winbond/wbhal.c +++ b/drivers/staging/winbond/wbhal.c | |||
@@ -1,4 +1,6 @@ | |||
1 | #include "os_common.h" | 1 | #include "os_common.h" |
2 | #include "wbhal_f.h" | ||
3 | #include "wblinux_f.h" | ||
2 | 4 | ||
3 | void hal_get_ethernet_address( phw_data_t pHwData, u8 *current_address ) | 5 | void hal_get_ethernet_address( phw_data_t pHwData, u8 *current_address ) |
4 | { | 6 | { |
diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h index 7e6ebf2717b..ec66a998752 100644 --- a/drivers/staging/winbond/wbhal_f.h +++ b/drivers/staging/winbond/wbhal_f.h | |||
@@ -1,15 +1,11 @@ | |||
1 | //===================================================================== | 1 | //===================================================================== |
2 | // Device related include | 2 | // Device related include |
3 | //===================================================================== | 3 | //===================================================================== |
4 | #ifdef WB_LINUX | 4 | #include "linux/wb35reg_f.h" |
5 | #include "linux/wb35reg_f.h" | 5 | #include "linux/wb35tx_f.h" |
6 | #include "linux/wb35tx_f.h" | 6 | #include "linux/wb35rx_f.h" |
7 | #include "linux/wb35rx_f.h" | 7 | |
8 | #else | 8 | #include "adapter.h" |
9 | #include "wb35reg_f.h" | ||
10 | #include "wb35tx_f.h" | ||
11 | #include "wb35rx_f.h" | ||
12 | #endif | ||
13 | 9 | ||
14 | //==================================================================================== | 10 | //==================================================================================== |
15 | // Function declaration | 11 | // Function declaration |
diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h index 4eeb08926e2..af99713b314 100644 --- a/drivers/staging/winbond/wbhal_s.h +++ b/drivers/staging/winbond/wbhal_s.h | |||
@@ -1,3 +1,10 @@ | |||
1 | #ifndef __WINBOND_WBHAL_S_H | ||
2 | #define __WINBOND_WBHAL_S_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | #include "linux/common.h" | ||
7 | |||
1 | //[20040722 WK] | 8 | //[20040722 WK] |
2 | #define HAL_LED_SET_MASK 0x001c //20060901 Extend | 9 | #define HAL_LED_SET_MASK 0x001c //20060901 Extend |
3 | #define HAL_LED_SET_SHIFT 2 | 10 | #define HAL_LED_SET_SHIFT 2 |
@@ -612,4 +619,4 @@ typedef struct _HAL_RATE | |||
612 | u32 NumRate54M; | 619 | u32 NumRate54M; |
613 | } HAL_RATE, *PHAL_RATE; | 620 | } HAL_RATE, *PHAL_RATE; |
614 | 621 | ||
615 | 622 | #endif | |
diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c index bba222a68e3..1054098a641 100644 --- a/drivers/staging/winbond/wblinux.c +++ b/drivers/staging/winbond/wblinux.c | |||
@@ -8,7 +8,13 @@ | |||
8 | // Linux releated routines | 8 | // Linux releated routines |
9 | // | 9 | // |
10 | //============================================================================ | 10 | //============================================================================ |
11 | #include <linux/netdevice.h> | ||
12 | |||
13 | #include "mds_f.h" | ||
14 | #include "mto_f.h" | ||
11 | #include "os_common.h" | 15 | #include "os_common.h" |
16 | #include "wbhal_f.h" | ||
17 | #include "wblinux_f.h" | ||
12 | 18 | ||
13 | unsigned char | 19 | unsigned char |
14 | WBLINUX_Initial(struct wb35_adapter * adapter) | 20 | WBLINUX_Initial(struct wb35_adapter * adapter) |
diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h index bfa69d73832..a2b7e4cd09a 100644 --- a/drivers/staging/winbond/wblinux_f.h +++ b/drivers/staging/winbond/wblinux_f.h | |||
@@ -1,3 +1,9 @@ | |||
1 | #ifndef __WBLINUX_F_H | ||
2 | #define __WBLINUX_F_H | ||
3 | |||
4 | #include "adapter.h" | ||
5 | #include "mds_s.h" | ||
6 | |||
1 | //========================================================================= | 7 | //========================================================================= |
2 | // Copyright (c) 1996-2004 Winbond Electronic Corporation | 8 | // Copyright (c) 1996-2004 Winbond Electronic Corporation |
3 | // | 9 | // |
@@ -16,3 +22,4 @@ void WBLINUX_stop( struct wb35_adapter *adapter ); | |||
16 | void WbWlanHalt( struct wb35_adapter *adapter ); | 22 | void WbWlanHalt( struct wb35_adapter *adapter ); |
17 | unsigned char WbWLanInitialize(struct wb35_adapter *adapter); | 23 | unsigned char WbWLanInitialize(struct wb35_adapter *adapter); |
18 | 24 | ||
25 | #endif | ||