diff options
Diffstat (limited to 'drivers/staging/winbond/linux')
-rw-r--r-- | drivers/staging/winbond/linux/common.h | 21 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/sysdef.h | 29 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35reg.c | 3 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35reg_f.h | 7 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35reg_s.h | 9 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35rx.c | 3 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35rx_f.h | 9 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35tx.c | 5 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35tx_f.h | 7 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35tx_s.h | 10 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wbusb.c | 6 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wbusb_s.h | 12 |
12 files changed, 54 insertions, 67 deletions
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 | ||