Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: w35und: clean up adapter.h a bit

Browse source 
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>
This commit is contained in:
Pekka Enberg 2008-10-30 16:14:37 +02:00 • committed by Greg Kroah-Hartman
parent 42c84bb460
commit ac418b8faa
4 changed files with 8 additions and 23 deletions
drivers/staging/winbond
adapter.hcommon.hmds_s.hwbhal.c

17
drivers/staging/winbond/adapter.h
View file

@ -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

3
drivers/staging/winbond/common.h
View file

@ -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

1
drivers/staging/winbond/mds_s.h
View file

@ -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

10
drivers/staging/winbond/wbhal.c
View file

@ -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 );
}
}