USB: pxa27x_udc: add otg transceiver support

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / mds_s.h

diff --git a/drivers/staging/winbond/mds_s.h b/drivers/staging/winbond/mds_s.h
index 4738279d5f39b32645c155dbc6d98ae54721d440..ebf61e3ce1dcf74e87dbd10e652291bd454204b6 100644 (file)
--- a/drivers/staging/winbond/mds_s.h
+++ b/drivers/staging/winbond/mds_s.h
@@ -1,9 +1,19 @@
+#ifndef __WINBOND_MDS_H
+#define __WINBOND_MDS_H
+
+#include <linux/timer.h>
+#include <linux/types.h>
+#include <asm/atomic.h>
+
+#include "localpara.h"
+#include "mac_structures.h"
+#include "scan_s.h"
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 #define MAX_USB_TX_DESCRIPTOR          15              // IS89C35 ability
 #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
 
@@ -21,20 +31,19 @@
 #define CURRENT_PAIRWISE_KEY                   psSME->tx_mic_key
 #define CURRENT_GROUP_KEY                              psSME->group_tx_mic_key
 #define CURRENT_ENCRYPT_STATUS                 psSME->encrypt_status
-#define CURRENT_WEP_ID                                 Adapter->sSmePara._dot11WEPDefaultKeyID
-#define CURRENT_CONTROL_PORT_BLOCK             ( psSME->wpa_ok!=1 || (Adapter->Mds.boCounterMeasureBlock==1 && (CURRENT_ENCRYPT_STATUS==ENCRYPT_TKIP)) )
-#define CURRENT_FRAGMENT_THRESHOLD             (Adapter->Mds.TxFragmentThreshold & ~0x1)
+#define CURRENT_WEP_ID                                 adapter->sSmePara._dot11WEPDefaultKeyID
+#define CURRENT_CONTROL_PORT_BLOCK             ( psSME->wpa_ok!=1 || (adapter->Mds.boCounterMeasureBlock==1 && (CURRENT_ENCRYPT_STATUS==ENCRYPT_TKIP)) )
+#define CURRENT_FRAGMENT_THRESHOLD             (adapter->Mds.TxFragmentThreshold & ~0x1)
 #define CURRENT_PREAMBLE_MODE                  psLOCAL->boShortPreamble?WLAN_PREAMBLE_TYPE_SHORT:WLAN_PREAMBLE_TYPE_LONG
-#define CURRENT_LINK_ON                                        OS_LINK_STATUS
-#define CURRENT_TX_RATE                                        Adapter->sLocalPara.CurrentTxRate
-#define CURRENT_FALL_BACK_TX_RATE              Adapter->sLocalPara.CurrentTxFallbackRate
-#define CURRENT_TX_RATE_FOR_MNG                        Adapter->sLocalPara.CurrentTxRateForMng
+#define CURRENT_TX_RATE                                        adapter->sLocalPara.CurrentTxRate
+#define CURRENT_FALL_BACK_TX_RATE              adapter->sLocalPara.CurrentTxFallbackRate
+#define CURRENT_TX_RATE_FOR_MNG                        adapter->sLocalPara.CurrentTxRateForMng
 #define CURRENT_PROTECT_MECHANISM              psLOCAL->boProtectMechanism
-#define CURRENT_RTS_THRESHOLD                  Adapter->Mds.TxRTSThreshold
+#define CURRENT_RTS_THRESHOLD                  adapter->Mds.TxRTSThreshold
 
-#define MIB_GS_XMIT_OK_INC                             Adapter->sLocalPara.GS_XMIT_OK++
-#define MIB_GS_RCV_OK_INC                              Adapter->sLocalPara.GS_RCV_OK++
-#define MIB_GS_XMIT_ERROR_INC                  Adapter->sLocalPara.GS_XMIT_ERROR
+#define MIB_GS_XMIT_OK_INC                             adapter->sLocalPara.GS_XMIT_OK++
+#define MIB_GS_RCV_OK_INC                              adapter->sLocalPara.GS_RCV_OK++
+#define MIB_GS_XMIT_ERROR_INC                  adapter->sLocalPara.GS_XMIT_ERROR
 
 //---------- TX -----------------------------------
 #define ETHERNET_TX_DESCRIPTORS         MAX_USB_TX_BUFFER_NUMBER
@@ -86,7 +95,7 @@ typedef struct _MDS
 {
        // For Tx usage
        u8      TxOwner[ ((MAX_USB_TX_BUFFER_NUMBER + 3) & ~0x03) ];
-       PUCHAR  pTxBuffer;
+       u8      *pTxBuffer;
        u16     TxBufferSize[ ((MAX_USB_TX_BUFFER_NUMBER + 1) & ~0x01) ];
        u8      TxDesFrom[ ((MAX_USB_TX_DESCRIPTOR + 3) & ~0x03) ];//931130.4.u // 1: MLME 2: NDIS control 3: NDIS data
        u8      TxCountInBuffer[ ((MAX_USB_TX_DESCRIPTOR + 3) & ~0x03) ]; // 20060928
@@ -96,14 +105,14 @@ typedef struct _MDS
        u8      ScanTxPause;    //data Tx pause because the scanning is progressing, but probe request Tx won't.
        u8      TxPause;//For pause the Mds_Tx modult
 
-       OS_ATOMIC       TxThreadCount;//For thread counting 931130.4.v
+       atomic_t        TxThreadCount;//For thread counting 931130.4.v
 //950301 delete due to HW
-//     OS_ATOMIC       TxConcurrentCount;//931130.4.w
+//     atomic_t        TxConcurrentCount;//931130.4.w
 
        u16     TxResult[ ((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01) ];//Collect the sending result of Mpdu
 
        u8      MicRedundant[8]; // For tmp use
-       PUCHAR  MicWriteAddress[2]; //The start address to fill the Mic, use 2 point due to Mic maybe fragment
+       u8      *MicWriteAddress[2]; //The start address to fill the Mic, use 2 point due to Mic maybe fragment
 
        u16     MicWriteSize[2]; //931130.4.x
 
@@ -133,9 +142,6 @@ typedef struct _MDS
        u8              boCounterMeasureBlock;
        u8              reserved_4[2];
 
-       //NDIS_MINIPORT_TIMER   nTimer;
-       OS_TIMER        nTimer;
-
        u32     TxTsc; // 20060214
        u32     TxTsc_2; // 20060214
 
@@ -144,7 +150,7 @@ typedef struct _MDS
 
 typedef struct _RxBuffer
 {
-    PUCHAR  pBufferAddress;     // Pointer the received data buffer.
+    u8 * pBufferAddress;     // Pointer the received data buffer.
        u16     BufferSize;
        u8      RESERVED;
        u8      BufferIndex;// Only 1 byte
@@ -176,8 +182,8 @@ typedef struct _RXLAYER1
        /////////////////////////////////////////////////////////////////////////////////////////////
        // For brand-new Rx system
        u8      ReservedBuffer[ 2400 ];//If Buffer ID is reserved one, it must copy the data into this area
-       PUCHAR  ReservedBufferPoint;// Point to the next availabe address of reserved buffer
+       u8      *ReservedBufferPoint;// Point to the next availabe address of reserved buffer
 
 }RXLAYER1, * PRXLAYER1;
 
-
+#endif