From penberg@cs.helsinki.fi Mon Aug 17 12:58:52 2009 From: Pekka Enberg Date: Wed, 12 Aug 2009 11:03:36 +0300 Subject: Staging: w35und: Convert typedef DESCRIPTOR to struct wb35_descriptor To: gregkh@suse.de Cc: linux-kernel@vger.kernel.org, Pekka Enberg , Pavel Machek Message-ID: <1250064219-7372-4-git-send-email-penberg@cs.helsinki.fi> Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/mds.c | 12 ++++++------ drivers/staging/winbond/mds_f.h | 6 +++--- drivers/staging/winbond/mlmetxrx.c | 2 +- drivers/staging/winbond/mlmetxrx_f.h | 2 +- drivers/staging/winbond/wb35rx.c | 4 ++-- drivers/staging/winbond/wbhal_f.h | 2 +- drivers/staging/winbond/wbhal_s.h | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) --- 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 wbsof } // 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_pr 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; --- a/drivers/staging/winbond/mds_f.h +++ b/drivers/staging/winbond/mds_f.h @@ -8,7 +8,7 @@ unsigned char Mds_initial( struct wbsof 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_pri // 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 --- a/drivers/staging/winbond/mlmetxrx.c +++ b/drivers/staging/winbond/mlmetxrx.c @@ -45,7 +45,7 @@ u8 MLMESendFrame(struct wbsoft_priv * ad 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; --- 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); --- a/drivers/staging/winbond/wb35rx.c +++ b/drivers/staging/winbond/wb35rx.c @@ -44,7 +44,7 @@ static void packet_came(struct ieee80211 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 ieee80 { 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; --- 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 * pH 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 ) --- 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 le 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