diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/winbond/adapter.h | 17 | ||||
-rw-r--r-- | drivers/staging/winbond/common.h | 3 | ||||
-rw-r--r-- | drivers/staging/winbond/mds_s.h | 1 | ||||
-rw-r--r-- | drivers/staging/winbond/wbhal.c | 10 |
4 files changed, 8 insertions, 23 deletions
diff --git a/drivers/staging/winbond/adapter.h b/drivers/staging/winbond/adapter.h index 11df483c890..239cc3a5fa2 100644 --- a/drivers/staging/winbond/adapter.h +++ b/drivers/staging/winbond/adapter.h | |||
@@ -7,20 +7,9 @@ | |||
7 | #include "mto.h" | 7 | #include "mto.h" |
8 | #include "wbhal_s.h" | 8 | #include "wbhal_s.h" |
9 | 9 | ||
10 | #define OS_SET_SHUTDOWN( _A ) _A->shutdown=1 | 10 | #define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4) |
11 | #define OS_SET_RESUME( _A ) _A->shutdown=0 | ||
12 | #define OS_STOP( _A ) WBLINUX_stop( _A ) | ||
13 | 11 | ||
14 | #define OS_CURRENT_RX_BYTE( _A ) _A->RxByteCount | 12 | #define WB_MAX_LINK_NAME_LEN 40 |
15 | #define OS_CURRENT_TX_BYTE( _A ) _A->TxByteCount | ||
16 | #define OS_EVENT_INDICATE( _A, _B, _F ) | ||
17 | #define OS_PMKID_STATUS_EVENT( _A ) | ||
18 | #define OS_RECEIVE_802_1X_PACKET_INDICATE( _A, _D ) EAP_ReceivePacket( _A, _D ) | ||
19 | #define OS_SEND_RESULT( _A, _ID, _R ) | ||
20 | |||
21 | #define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4) | ||
22 | |||
23 | #define MAX_ANSI_STRING 40 | ||
24 | 13 | ||
25 | struct wb35_adapter { | 14 | struct wb35_adapter { |
26 | u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point | 15 | u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point |
@@ -49,7 +38,7 @@ struct wb35_adapter { | |||
49 | s32 netif_state_stop; // 1: stop 0: normal | 38 | s32 netif_state_stop; // 1: stop 0: normal |
50 | struct iw_statistics iw_stats; | 39 | struct iw_statistics iw_stats; |
51 | 40 | ||
52 | u8 LinkName[MAX_ANSI_STRING]; | 41 | u8 LinkName[WB_MAX_LINK_NAME_LEN]; |
53 | }; | 42 | }; |
54 | 43 | ||
55 | #endif | 44 | #endif |
diff --git a/drivers/staging/winbond/common.h b/drivers/staging/winbond/common.h index 2badc2984a3..c4d96041e9a 100644 --- a/drivers/staging/winbond/common.h +++ b/drivers/staging/winbond/common.h | |||
@@ -23,8 +23,5 @@ | |||
23 | #define WBDEBUG( _M ) 0 | 23 | #define WBDEBUG( _M ) 0 |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #define OS_EVENT_INDICATE( _A, _B, _F ) | ||
27 | #define OS_PMKID_STATUS_EVENT( _A ) | ||
28 | |||
29 | #endif // COMMON_DEF | 26 | #endif // COMMON_DEF |
30 | 27 | ||
diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h index 02b11822b2c..29f15689dcc 100644 --- a/drivers/staging/winbond/mds_s.h +++ b/drivers/staging/winbond/mds_s.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #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 |
15 | #define MAX_USB_TX_BUFFER 4096 // IS89C35 ability 4n alignment is required for hardware | 15 | #define MAX_USB_TX_BUFFER 4096 // IS89C35 ability 4n alignment is required for hardware |
16 | 16 | ||
17 | #define MDS_EVENT_INDICATE( _A, _B, _F ) OS_EVENT_INDICATE( _A, _B, _F ) | ||
18 | #define AUTH_REQUEST_PAIRWISE_ERROR 0 // _F flag setting | 17 | #define AUTH_REQUEST_PAIRWISE_ERROR 0 // _F flag setting |
19 | #define AUTH_REQUEST_GROUP_ERROR 1 // _F flag setting | 18 | #define AUTH_REQUEST_GROUP_ERROR 1 // _F flag setting |
20 | 19 | ||
diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c index da39eef7dce..1fb8c3d7846 100644 --- a/drivers/staging/winbond/wbhal.c +++ b/drivers/staging/winbond/wbhal.c | |||
@@ -223,8 +223,8 @@ static void hal_led_control(unsigned long data) | |||
223 | else | 223 | else |
224 | { | 224 | { |
225 | // Is transmitting/receiving ?? | 225 | // Is transmitting/receiving ?? |
226 | if( (OS_CURRENT_RX_BYTE( adapter ) != pHwData->RxByteCountLast ) || | 226 | if( (adapter->RxByteCount != pHwData->RxByteCountLast ) || |
227 | (OS_CURRENT_TX_BYTE( adapter ) != pHwData->TxByteCountLast ) ) | 227 | (adapter->TxByteCount != pHwData->TxByteCountLast ) ) |
228 | { | 228 | { |
229 | if( (reg->U1BC_LEDConfigure & 0x3000) != 0x3000 ) | 229 | if( (reg->U1BC_LEDConfigure & 0x3000) != 0x3000 ) |
230 | { | 230 | { |
@@ -233,8 +233,8 @@ static void hal_led_control(unsigned long data) | |||
233 | } | 233 | } |
234 | 234 | ||
235 | // Update variable | 235 | // Update variable |
236 | pHwData->RxByteCountLast = OS_CURRENT_RX_BYTE( adapter ); | 236 | pHwData->RxByteCountLast = adapter->RxByteCount; |
237 | pHwData->TxByteCountLast = OS_CURRENT_TX_BYTE( adapter ); | 237 | pHwData->TxByteCountLast = adapter->TxByteCount; |
238 | TimeInterval = 200; | 238 | TimeInterval = 200; |
239 | } | 239 | } |
240 | else | 240 | else |
@@ -849,7 +849,7 @@ void hal_surprise_remove(struct wb35_adapter *adapter) | |||
849 | #ifdef _PE_STATE_DUMP_ | 849 | #ifdef _PE_STATE_DUMP_ |
850 | WBDEBUG(("Calling hal_surprise_remove\n")); | 850 | WBDEBUG(("Calling hal_surprise_remove\n")); |
851 | #endif | 851 | #endif |
852 | OS_STOP( adapter ); | 852 | WBLINUX_stop( adapter ); |
853 | } | 853 | } |
854 | } | 854 | } |
855 | 855 | ||