diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:48 -0800 |
| commit | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (patch) | |
| tree | 0495947ed407127111be30342b6ade46f6fc9d1b | |
| parent | 42c84bb4603d5a375b1c8dbbbef686d24e804807 (diff) | |
Staging: w35und: clean up adapter.h a bit
This patch cleans up adapter.h a bit in preparation for merging struct
wb35_adapter to struct wbsoft_priv.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 @@ #include "mto.h" #include "wbhal_s.h" -#define OS_SET_SHUTDOWN( _A ) _A->shutdown=1 -#define OS_SET_RESUME( _A ) _A->shutdown=0 -#define OS_STOP( _A ) WBLINUX_stop( _A ) +#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4) -#define OS_CURRENT_RX_BYTE( _A ) _A->RxByteCount -#define OS_CURRENT_TX_BYTE( _A ) _A->TxByteCount -#define OS_EVENT_INDICATE( _A, _B, _F ) -#define OS_PMKID_STATUS_EVENT( _A ) -#define OS_RECEIVE_802_1X_PACKET_INDICATE( _A, _D ) EAP_ReceivePacket( _A, _D ) -#define OS_SEND_RESULT( _A, _ID, _R ) - -#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4) - -#define MAX_ANSI_STRING 40 +#define WB_MAX_LINK_NAME_LEN 40 struct wb35_adapter { u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point @@ -49,7 +38,7 @@ struct wb35_adapter { s32 netif_state_stop; // 1: stop 0: normal struct iw_statistics iw_stats; - u8 LinkName[MAX_ANSI_STRING]; + u8 LinkName[WB_MAX_LINK_NAME_LEN]; }; #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 @@ #define WBDEBUG( _M ) 0 #endif -#define OS_EVENT_INDICATE( _A, _B, _F ) -#define OS_PMKID_STATUS_EVENT( _A ) - #endif // COMMON_DEF 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 @@ #define MAX_USB_TX_BUFFER_NUMBER 4 // Virtual pre-buffer number of MAX_USB_TX_BUFFER #define MAX_USB_TX_BUFFER 4096 // IS89C35 ability 4n alignment is required for hardware -#define MDS_EVENT_INDICATE( _A, _B, _F ) OS_EVENT_INDICATE( _A, _B, _F ) #define AUTH_REQUEST_PAIRWISE_ERROR 0 // _F flag setting #define AUTH_REQUEST_GROUP_ERROR 1 // _F flag setting 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) else { // Is transmitting/receiving ?? - if( (OS_CURRENT_RX_BYTE( adapter ) != pHwData->RxByteCountLast ) || - (OS_CURRENT_TX_BYTE( adapter ) != pHwData->TxByteCountLast ) ) + if( (adapter->RxByteCount != pHwData->RxByteCountLast ) || + (adapter->TxByteCount != pHwData->TxByteCountLast ) ) { if( (reg->U1BC_LEDConfigure & 0x3000) != 0x3000 ) { @@ -233,8 +233,8 @@ static void hal_led_control(unsigned long data) } // Update variable - pHwData->RxByteCountLast = OS_CURRENT_RX_BYTE( adapter ); - pHwData->TxByteCountLast = OS_CURRENT_TX_BYTE( adapter ); + pHwData->RxByteCountLast = adapter->RxByteCount; + pHwData->TxByteCountLast = adapter->TxByteCount; TimeInterval = 200; } else @@ -849,7 +849,7 @@ void hal_surprise_remove(struct wb35_adapter *adapter) #ifdef _PE_STATE_DUMP_ WBDEBUG(("Calling hal_surprise_remove\n")); #endif - OS_STOP( adapter ); + WBLINUX_stop( adapter ); } } |