diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-08-12 08:03:36 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 19:02:17 (GMT) |
commit | 27d4642105b3fc6781e9110c7f4d0741434985ca (patch) | |
tree | f7220f6e405fb6a597d56168871974156b073f1e /drivers/staging | |
parent | ef3bf091f33ea0358323da5a163e98e9c78bed32 (diff) | |
download | linux-fsl-qoriq-27d4642105b3fc6781e9110c7f4d0741434985ca.tar.xz |
Staging: w35und: Convert typedef DESCRIPTOR to struct wb35_descriptor
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/winbond/mds.c | 12 | ||||
-rw-r--r-- | drivers/staging/winbond/mds_f.h | 6 | ||||
-rw-r--r-- | drivers/staging/winbond/mlmetxrx.c | 2 | ||||
-rw-r--r-- | drivers/staging/winbond/mlmetxrx_f.h | 2 | ||||
-rw-r--r-- | drivers/staging/winbond/wb35rx.c | 4 | ||||
-rw-r--r-- | drivers/staging/winbond/wbhal_f.h | 2 | ||||
-rw-r--r-- | drivers/staging/winbond/wbhal_s.h | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c index 9550e1a..37e0c18 100644 --- a/drivers/staging/winbond/mds.c +++ b/drivers/staging/winbond/mds.c @@ -22,7 +22,7 @@ Mds_Destroy(struct wbsoft_priv * adapter) { } -static void Mds_DurationSet(struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 *buffer) +static void Mds_DurationSet(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes, u8 *buffer) { PT00_DESCRIPTOR pT00; PT01_DESCRIPTOR pT01; @@ -217,7 +217,7 @@ static void Mds_DurationSet(struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 } // The function return the 4n size of usb pk -static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 *TargetBuffer) +static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer) { PT00_DESCRIPTOR pT00; struct wb35_mds *pMds = &adapter->Mds; @@ -318,7 +318,7 @@ static u16 Mds_BodyCopy(struct wbsoft_priv *adapter, PDESCRIPTOR pDes, u8 *Targe return Size; } -static void Mds_HeaderCopy(struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *TargetBuffer) +static void Mds_HeaderCopy(struct wbsoft_priv * adapter, struct wb35_descriptor *pDes, u8 *TargetBuffer) { struct wb35_mds *pMds = &adapter->Mds; u8 *src_buffer = pDes->buffer_address[0];//931130.5.g @@ -418,8 +418,8 @@ Mds_Tx(struct wbsoft_priv * adapter) { struct hw_data * pHwData = &adapter->sHwData; struct wb35_mds *pMds = &adapter->Mds; - DESCRIPTOR TxDes; - PDESCRIPTOR pTxDes = &TxDes; + struct wb35_descriptor TxDes; + struct wb35_descriptor *pTxDes = &TxDes; u8 *XmitBufAddress; u16 XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold; u8 FillIndex, TxDesIndex, FragmentCount, FillCount; @@ -470,7 +470,7 @@ Mds_Tx(struct wbsoft_priv * adapter) BufferFilled = true; /* Leaves first u8 intact */ - memset((u8 *)pTxDes + 1, 0, sizeof(DESCRIPTOR) - 1); + memset((u8 *)pTxDes + 1, 0, sizeof(struct wb35_descriptor) - 1); TxDesIndex = pMds->TxDesIndex;//Get the current ID pTxDes->Descriptor_ID = TxDesIndex; diff --git a/drivers/staging/winbond/mds_f.h b/drivers/staging/winbond/mds_f.h index ee0f120..ab1ea53 100644 --- a/drivers/staging/winbond/mds_f.h +++ b/drivers/staging/winbond/mds_f.h @@ -8,7 +8,7 @@ unsigned char Mds_initial( struct wbsoft_priv *adapter ); void Mds_Destroy( struct wbsoft_priv *adapter ); void Mds_Tx( struct wbsoft_priv *adapter ); void Mds_SendComplete( struct wbsoft_priv *adapter, PT02_DESCRIPTOR pT02 ); -void Mds_MpduProcess( struct wbsoft_priv *adapter, PDESCRIPTOR pRxDes ); +void Mds_MpduProcess( struct wbsoft_priv *adapter, struct wb35_descriptor *pRxDes ); extern void DataDmp(u8 *pdata, u32 len, u32 offset); // For Asynchronous indicating. The routine collocates with USB. @@ -16,8 +16,8 @@ void Mds_MsduProcess( struct wbsoft_priv *adapter, PRXLAYER1 pRxLayer1, u8 Sl // For data frame sending 20060802 u16 MDS_GetPacketSize( struct wbsoft_priv *adapter ); -void MDS_GetNextPacket( struct wbsoft_priv *adapter, PDESCRIPTOR pDes ); -void MDS_GetNextPacketComplete( struct wbsoft_priv *adapter, PDESCRIPTOR pDes ); +void MDS_GetNextPacket( struct wbsoft_priv *adapter, struct wb35_descriptor *pDes ); +void MDS_GetNextPacketComplete( struct wbsoft_priv *adapter, struct wb35_descriptor *pDes ); void MDS_SendResult( struct wbsoft_priv *adapter, u8 PacketId, unsigned char SendOK ); #endif diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c index 643ceb0..f856b94 100644 --- a/drivers/staging/winbond/mlmetxrx.c +++ b/drivers/staging/winbond/mlmetxrx.c @@ -45,7 +45,7 @@ u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType) return true; } -void MLME_GetNextPacket(struct wbsoft_priv *adapter, PDESCRIPTOR desc) +void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc) { desc->InternalUsed = desc->buffer_start_index + desc->buffer_number; desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX; diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h index d69da41..6c04e3e 100644 --- a/drivers/staging/winbond/mlmetxrx_f.h +++ b/drivers/staging/winbond/mlmetxrx_f.h @@ -10,7 +10,7 @@ #include "core.h" -void MLME_GetNextPacket(struct wbsoft_priv *adapter, PDESCRIPTOR pDes); +void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes); u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 * pMMPDU, u16 len, u8 DataType); diff --git a/drivers/staging/winbond/wb35rx.c b/drivers/staging/winbond/wb35rx.c index b905e7b..4d41f6c 100644 --- a/drivers/staging/winbond/wb35rx.c +++ b/drivers/staging/winbond/wb35rx.c @@ -44,7 +44,7 @@ static void packet_came(struct ieee80211_hw *hw, char *pRxBufferAddress, int Pac ieee80211_rx_irqsafe(hw, skb); } -static void Wb35Rx_adjust(PDESCRIPTOR pRxDes) +static void Wb35Rx_adjust(struct wb35_descriptor *pRxDes) { u32 * pRxBufferAddress; u32 DecryptionMethod; @@ -84,7 +84,7 @@ static u16 Wb35Rx_indicate(struct ieee80211_hw *hw) { struct wbsoft_priv *priv = hw->priv; struct hw_data * pHwData = &priv->sHwData; - DESCRIPTOR RxDes; + struct wb35_descriptor RxDes; struct wb35_rx *pWb35Rx = &pHwData->Wb35Rx; u8 * pRxBufferAddress; u16 PacketSize; diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h index bfdf05d..64a008db 100644 --- a/drivers/staging/winbond/wbhal_f.h +++ b/drivers/staging/winbond/wbhal_f.h @@ -39,7 +39,7 @@ void hal_set_cwmax( struct hw_data * pHwData, u16 cwin_max ); void hal_set_rsn_wpa( struct hw_data * pHwData, u32 * RSN_IE_Bitmap , u32 * RSN_OUI_type , unsigned char bDesiredAuthMode); void hal_set_connect_info( struct hw_data * pHwData, unsigned char boConnect ); u8 hal_get_est_sq3( struct hw_data * pHwData, u8 Count ); -void hal_descriptor_indicate( struct hw_data * pHwData, PDESCRIPTOR pDes ); +void hal_descriptor_indicate( struct hw_data * pHwData, struct wb35_descriptor *pDes ); u8 hal_get_antenna_number( struct hw_data * pHwData ); u32 hal_get_bss_pk_cnt( struct hw_data * pHwData ); #define hal_get_region_from_EEPROM( _A ) ( (_A)->reg.EEPROMRegion ) diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h index 16d0e6f..372a05e 100644 --- a/drivers/staging/winbond/wbhal_s.h +++ b/drivers/staging/winbond/wbhal_s.h @@ -314,7 +314,7 @@ typedef struct _T02_DESCRIPTOR }; } T02_DESCRIPTOR, *PT02_DESCRIPTOR; -typedef struct _DESCRIPTOR { // Skip length = 8 DWORD +struct wb35_descriptor { // Skip length = 8 DWORD // ID for descriptor ---, The field doesn't be cleard in the operation of Descriptor definition u8 Descriptor_ID; //----------------------The above region doesn't be cleared by DESCRIPTOR_RESET------ @@ -368,7 +368,7 @@ typedef struct _DESCRIPTOR { // Skip length = 8 DWORD u16 buffer_size[ MAX_DESCRIPTOR_BUFFER_INDEX ]; void* buffer_address[ MAX_DESCRIPTOR_BUFFER_INDEX ];//931130.4.q -} DESCRIPTOR, *PDESCRIPTOR; +}; #define DEFAULT_NULL_PACKET_COUNT 180000 //20060828.1 Add. 180 seconds |