Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d46421 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: Convert typedef DESCRIPTOR to struct wb35_descriptor 



Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ef3bf091

drivers/staging/winbond/mds.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

drivers/staging/winbond/mds_f.h

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/staging/winbond/mlmetxrx.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/winbond/mlmetxrx_f.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/winbond/wb35rx.c

+2 −2
Original line number Diff line number Diff line
@@ -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;