From: Pekka Enberg <penberg@cs.helsinki.fi>
To: greg@kroah.com
Cc: linux-kernel@vger.kernel.org,
Pekka Enberg <penberg@cs.helsinki.fi>,
Pavel Machek <pavel@suse.cz>
Subject: [PATCH] w35und: clean up adapter.h a bit
Date: Thu, 30 Oct 2008 16:14:37 +0200 [thread overview]
Message-ID: <1225376079-9592-3-git-send-email-penberg@cs.helsinki.fi> (raw)
In-Reply-To: <1225376079-9592-2-git-send-email-penberg@cs.helsinki.fi>
This patch cleans up adapter.h a bit in preparation for merging struct
wb35_adapter to struct wbsoft_priv.
Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
drivers/staging/winbond/adapter.h | 17 +++--------------
drivers/staging/winbond/common.h | 3 ---
drivers/staging/winbond/mds_s.h | 1 -
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 11df483..239cc3a 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 2badc29..c4d9604 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 02b1182..29f1568 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 3b7e90b..a7d25a6 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 );
}
}
--
1.5.3.7
next prev parent reply other threads:[~2008-10-30 14:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-30 14:14 [PATCH] w35und: move struct wbsoft_priv to core.h and use it Pekka Enberg
2008-10-30 14:14 ` [PATCH] w35und: remove ->adapter from struct _HW_DATA_T Pekka Enberg
2008-10-30 14:14 ` Pekka Enberg [this message]
2008-10-30 14:14 ` [PATCH] w35und: merge struct wb35_adapter to struct wbsoft_priv Pekka Enberg
2008-10-30 14:14 ` [PATCH] w35und: remove global struct ieee80211_hw Pekka Enberg
2008-10-30 19:12 ` Pavel Machek
2008-10-30 19:11 ` [PATCH] w35und: merge struct wb35_adapter to struct wbsoft_priv Pavel Machek
2008-10-30 19:10 ` [PATCH] w35und: clean up adapter.h a bit Pavel Machek
2008-10-30 19:09 ` [PATCH] w35und: remove ->adapter from struct _HW_DATA_T Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1225376079-9592-3-git-send-email-penberg@cs.helsinki.fi \
--to=penberg@cs.helsinki.fi \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®