OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: vt6655: bssdb/datarate/dpc/power/rxtx use struct vnt_private 

Replacing PSDevice.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-08-10 15:46:59 +01:00 committed by Greg Kroah-Hartman
parent 0ffc58742d
commit cf76dc4b85
7 changed files with 88 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/vt6655/bssdb.c
View File

@ -117,7 +117,7 @@ BSSpSearchBSSList(
CARD_PHY_TYPE ePhyType CARD_PHY_TYPE ePhyType
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned char *pbyBSSID = NULL; unsigned char *pbyBSSID = NULL;
PWLAN_IE_SSID pSSID = NULL; PWLAN_IE_SSID pSSID = NULL;
@ -240,7 +240,7 @@ BSSvClearBSSList(
bool bKeepCurrBSSID bool bKeepCurrBSSID
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int ii; unsigned int ii;
@ -280,7 +280,7 @@ BSSpAddrIsInBSSList(
PWLAN_IE_SSID pSSID PWLAN_IE_SSID pSSID
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
unsigned int ii; unsigned int ii;
@ -333,7 +333,7 @@ BSSbInsertToBSSList(
void *pRxPacketContext void *pRxPacketContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
@ -540,7 +540,7 @@ BSSbUpdateToBSSList(
) )
{ {
int ii; int ii;
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
long ldBm; long ldBm;
@ -715,7 +715,7 @@ BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr,
void void
BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex) BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int ii; unsigned int ii;
unsigned int BigestCount = 0; unsigned int BigestCount = 0;
@ -777,7 +777,7 @@ BSSvRemoveOneNode(
unsigned int uNodeIndex unsigned int uNodeIndex
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
struct sk_buff *skb; struct sk_buff *skb;
@ -810,7 +810,7 @@ BSSvUpdateAPNode(
PWLAN_IE_SUPP_RATES pExtSuppRates PWLAN_IE_SUPP_RATES pExtSuppRates
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN;
@ -861,7 +861,7 @@ BSSvAddMulticastNode(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
if (!pDevice->bEnableHostWEP) if (!pDevice->bEnableHostWEP)
@ -904,7 +904,7 @@ BSSvSecondCallBack(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int ii; unsigned int ii;
PWLAN_IE_SSID pItemSSID, pCurrSSID; PWLAN_IE_SSID pItemSSID, pCurrSSID;
@ -1207,7 +1207,7 @@ BSSvUpdateNodeTxCounter(
unsigned int uFIFOHeaderSize unsigned int uFIFOHeaderSize
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uNodeIndex = 0; unsigned int uNodeIndex = 0;
unsigned char byTxRetry = (byTsr0 & TSR0_NCR); unsigned char byTxRetry = (byTsr0 & TSR0_NCR);
@ -1360,7 +1360,7 @@ BSSvClearNodeDBTable(
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
struct sk_buff *skb; struct sk_buff *skb;
unsigned int ii; unsigned int ii;
@ -1385,7 +1385,7 @@ void s_vCheckSensitivity(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
int ii; int ii;
@ -1435,7 +1435,7 @@ BSSvClearAnyBSSJoinRecord(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int ii; unsigned int ii;
@ -1448,7 +1448,7 @@ void s_uCalculateLinkQual(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
unsigned long TxOkRatio, TxCnt; unsigned long TxOkRatio, TxCnt;
unsigned long RxOkRatio, RxCnt; unsigned long RxOkRatio, RxCnt;
unsigned long RssiRatio; unsigned long RssiRatio;
@ -1488,7 +1488,7 @@ void s_vCheckPreEDThreshold(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PKnownBSS pBSSList = NULL; PKnownBSS pBSSList = NULL;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

4
drivers/staging/vt6655/datarate.c
View File

@ -195,7 +195,7 @@ RATEvParseMaxRate(
unsigned char *pbyTopOFDMRate unsigned char *pbyTopOFDMRate
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
unsigned int ii; unsigned int ii;
unsigned char byHighSuppRate = 0; unsigned char byHighSuppRate = 0;
unsigned char byRate = 0; unsigned char byRate = 0;
@ -295,7 +295,7 @@ RATEvTxRateFallBack(
PKnownNodeDB psNodeDBTable PKnownNodeDB psNodeDBTable
) )
{ {
PSDevice pDevice = (PSDevice) pDeviceHandler; struct vnt_private *pDevice = pDeviceHandler;
unsigned short wIdxDownRate = 0; unsigned short wIdxDownRate = 0;
unsigned int ii; unsigned int ii;
bool bAutoRate[MAX_RATE] = {true, true, true, true, false, false, true, true, true, true, true, true}; bool bAutoRate[MAX_RATE] = {true, true, true, true, false, false, true, true, true, true, true, true};

23
drivers/staging/vt6655/dpc.c
View File

@ -79,18 +79,18 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
PSEthernetHeader psEthHeader); PSEthernetHeader psEthHeader);
static void static void
s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, s_vProcessRxMACHeader(struct vnt_private *pDevice, unsigned char *pbyRxBufferAddr,
unsigned int cbPacketSize, bool bIsWEP, bool bExtIV, unsigned int cbPacketSize, bool bIsWEP, bool bExtIV,
unsigned int *pcbHeadSize); unsigned int *pcbHeadSize);
static bool s_bAPModeRxCtl( static bool s_bAPModeRxCtl(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyFrame, unsigned char *pbyFrame,
int iSANodeIndex int iSANodeIndex
); );
static bool s_bAPModeRxData( static bool s_bAPModeRxData(
PSDevice pDevice, struct vnt_private *pDevice,
struct sk_buff *skb, struct sk_buff *skb,
unsigned int FrameSize, unsigned int FrameSize,
unsigned int cbHeaderOffset, unsigned int cbHeaderOffset,
@ -99,7 +99,7 @@ static bool s_bAPModeRxData(
); );
static bool s_bHandleRxEncryption( static bool s_bHandleRxEncryption(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyFrame, unsigned char *pbyFrame,
unsigned int FrameSize, unsigned int FrameSize,
unsigned char *pbyRsr, unsigned char *pbyRsr,
@ -112,7 +112,7 @@ static bool s_bHandleRxEncryption(
static bool s_bHostWepRxEncryption( static bool s_bHostWepRxEncryption(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyFrame, unsigned char *pbyFrame,
unsigned int FrameSize, unsigned int FrameSize,
unsigned char *pbyRsr, unsigned char *pbyRsr,
@ -145,7 +145,8 @@ static bool s_bHostWepRxEncryption(
* *
-*/ -*/
static void static void
s_vProcessRxMACHeader(PSDevice pDevice, unsigned char *pbyRxBufferAddr, s_vProcessRxMACHeader(struct vnt_private *pDevice,
unsigned char *pbyRxBufferAddr,
unsigned int cbPacketSize, bool bIsWEP, bool bExtIV, unsigned int cbPacketSize, bool bIsWEP, bool bExtIV,
unsigned int *pcbHeadSize) unsigned int *pcbHeadSize)
{ {
@ -270,7 +271,7 @@ s_vGetDASA(unsigned char *pbyRxBufferAddr, unsigned int *pcbHeaderSize,
bool bool
device_receive_frame( device_receive_frame(
PSDevice pDevice, struct vnt_private *pDevice,
PSRxDesc pCurrRD PSRxDesc pCurrRD
) )
{ {
@ -871,7 +872,7 @@ device_receive_frame(
} }
static bool s_bAPModeRxCtl( static bool s_bAPModeRxCtl(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyFrame, unsigned char *pbyFrame,
int iSANodeIndex int iSANodeIndex
) )
@ -969,7 +970,7 @@ static bool s_bAPModeRxCtl(
} }
static bool s_bHandleRxEncryption( static bool s_bHandleRxEncryption(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyFrame, unsigned char *pbyFrame,
unsigned int FrameSize, unsigned int FrameSize,
unsigned char *pbyRsr, unsigned char *pbyRsr,
@ -1106,7 +1107,7 @@ static bool s_bHandleRxEncryption(
} }
static bool s_bHostWepRxEncryption( static bool s_bHostWepRxEncryption(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyFrame, unsigned char *pbyFrame,
unsigned int FrameSize, unsigned int FrameSize,
unsigned char *pbyRsr, unsigned char *pbyRsr,
@ -1226,7 +1227,7 @@ static bool s_bHostWepRxEncryption(
} }
static bool s_bAPModeRxData( static bool s_bAPModeRxData(
PSDevice pDevice, struct vnt_private *pDevice,
struct sk_buff *skb, struct sk_buff *skb,
unsigned int FrameSize, unsigned int FrameSize,
unsigned int cbHeaderOffset, unsigned int cbHeaderOffset,

2
drivers/staging/vt6655/dpc.h
View File

@ -35,7 +35,7 @@
bool bool
device_receive_frame( device_receive_frame(
PSDevice pDevice, struct vnt_private *,
PSRxDesc pCurrRD PSRxDesc pCurrRD
); );

12
drivers/staging/vt6655/power.c
View File

@ -74,7 +74,7 @@ PSvEnablePowerSaving(
unsigned short wListenInterval unsigned short wListenInterval
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15; unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15;
@ -131,7 +131,7 @@ PSvDisablePowerSaving(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
// disable power saving hw function // disable power saving hw function
MACbPSWakeup(pDevice->PortOffset); MACbPSWakeup(pDevice->PortOffset);
@ -167,7 +167,7 @@ PSbConsiderPowerDown(
bool bCheckCountToWakeUp bool bCheckCountToWakeUp
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uIdx; unsigned int uIdx;
@ -229,7 +229,7 @@ PSvSendPSPOLL(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
@ -266,7 +266,7 @@ PSbSendNullPacket(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int uIdx; unsigned int uIdx;
@ -336,7 +336,7 @@ PSbIsNextTBTTWakeUp(
void *hDeviceContext void *hDeviceContext
) )
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; struct vnt_private *pDevice = hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt; PSMgmtObject pMgmt = pDevice->pMgmt;
bool bWakeUp = false; bool bWakeUp = false;

70
drivers/staging/vt6655/rxtx.c
View File

@ -112,7 +112,7 @@ static const unsigned short wFB_Opt1[2][5] = {
static static
void void
s_vFillTxKey( s_vFillTxKey(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyBuf, unsigned char *pbyBuf,
unsigned char *pbyIVHead, unsigned char *pbyIVHead,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
@ -124,7 +124,7 @@ s_vFillTxKey(
static static
void void
s_vFillRTSHead( s_vFillRTSHead(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pvRTS, void *pvRTS,
unsigned int cbFrameLength, unsigned int cbFrameLength,
@ -138,7 +138,7 @@ s_vFillRTSHead(
static static
void void
s_vGenerateTxParameter( s_vGenerateTxParameter(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pTxBufHead, void *pTxBufHead,
void *pvRrvTime, void *pvRrvTime,
@ -152,7 +152,7 @@ s_vGenerateTxParameter(
); );
static void s_vFillFragParameter( static void s_vFillFragParameter(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyBuffer, unsigned char *pbyBuffer,
unsigned int uTxType, unsigned int uTxType,
void *pvtdCurr, void *pvtdCurr,
@ -161,15 +161,17 @@ static void s_vFillFragParameter(
); );
static unsigned int static unsigned int
s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt, unsigned int uDMAIdx, PSTxDesc pHeadTD,
PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum); PSEthernetHeader psEthHeader, unsigned char *pPacket,
bool bNeedEncrypt, PSKeyItem pTransmitKey,
unsigned int uNodeIndex, unsigned int *puMACfragNum);
static static
unsigned int unsigned int
s_uFillDataHead( s_uFillDataHead(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pTxDataHead, void *pTxDataHead,
unsigned int cbFrameLength, unsigned int cbFrameLength,
@ -187,7 +189,7 @@ s_uFillDataHead(
static static
void void
s_vFillTxKey( s_vFillTxKey(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyBuf, unsigned char *pbyBuf,
unsigned char *pbyIVHead, unsigned char *pbyIVHead,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
@ -300,7 +302,7 @@ s_vFillTxKey(
static static
void void
s_vSWencryption( s_vSWencryption(
PSDevice pDevice, struct vnt_private *pDevice,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
unsigned char *pbyPayloadHead, unsigned char *pbyPayloadHead,
unsigned short wPayloadSize unsigned short wPayloadSize
@ -346,7 +348,7 @@ s_vSWencryption(
static static
unsigned int unsigned int
s_uGetTxRsvTime( s_uGetTxRsvTime(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
unsigned int cbFrameLength, unsigned int cbFrameLength,
unsigned short wRate, unsigned short wRate,
@ -371,7 +373,7 @@ s_uGetTxRsvTime(
static static
unsigned int unsigned int
s_uGetRTSCTSRsvTime( s_uGetRTSCTSRsvTime(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byRTSRsvType, unsigned char byRTSRsvType,
unsigned char byPktType, unsigned char byPktType,
unsigned int cbFrameLength, unsigned int cbFrameLength,
@ -409,7 +411,7 @@ s_uGetRTSCTSRsvTime(
static static
unsigned int unsigned int
s_uGetDataDuration( s_uGetDataDuration(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byDurType, unsigned char byDurType,
unsigned int cbFrameLength, unsigned int cbFrameLength,
unsigned char byPktType, unsigned char byPktType,
@ -568,7 +570,7 @@ s_uGetDataDuration(
static static
unsigned int unsigned int
s_uGetRTSCTSDuration( s_uGetRTSCTSDuration(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byDurType, unsigned char byDurType,
unsigned int cbFrameLength, unsigned int cbFrameLength,
unsigned char byPktType, unsigned char byPktType,
@ -661,7 +663,7 @@ s_uGetRTSCTSDuration(
static static
unsigned int unsigned int
s_uFillDataHead( s_uFillDataHead(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pTxDataHead, void *pTxDataHead,
unsigned int cbFrameLength, unsigned int cbFrameLength,
@ -790,7 +792,7 @@ s_uFillDataHead(
static static
void void
s_vFillRTSHead( s_vFillRTSHead(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pvRTS, void *pvRTS,
unsigned int cbFrameLength, unsigned int cbFrameLength,
@ -965,7 +967,7 @@ s_vFillRTSHead(
static static
void void
s_vFillCTSHead( s_vFillCTSHead(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned int uDMAIdx, unsigned int uDMAIdx,
unsigned char byPktType, unsigned char byPktType,
void *pvCTS, void *pvCTS,
@ -1063,7 +1065,7 @@ s_vFillCTSHead(
static static
void void
s_vGenerateTxParameter( s_vGenerateTxParameter(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char byPktType, unsigned char byPktType,
void *pTxBufHead, void *pTxBufHead,
void *pvRrvTime, void *pvRrvTime,
@ -1169,7 +1171,7 @@ s_vGenerateTxParameter(
static static
void void
s_vFillFragParameter( s_vFillFragParameter(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyBuffer, unsigned char *pbyBuffer,
unsigned int uTxType, unsigned int uTxType,
void *pvtdCurr, void *pvtdCurr,
@ -1205,10 +1207,12 @@ s_vFillFragParameter(
} }
static unsigned int static unsigned int
s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt, unsigned int uDMAIdx, PSTxDesc pHeadTD,
PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum) PSEthernetHeader psEthHeader, unsigned char *pPacket,
bool bNeedEncrypt, PSKeyItem pTransmitKey,
unsigned int uNodeIndex, unsigned int *puMACfragNum)
{ {
unsigned int cbMACHdLen; unsigned int cbMACHdLen;
unsigned int cbFrameSize; unsigned int cbFrameSize;
@ -1859,8 +1863,9 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT
} }
void void
vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, vGenerateFIFOHeader(struct vnt_private *pDevice, unsigned char byPktType,
bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, unsigned char *pbyTxBufferAddr, bool bNeedEncrypt,
unsigned int cbPayloadSize, unsigned int uDMAIdx,
PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket,
PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum,
unsigned int *pcbHeaderSize) unsigned int *pcbHeaderSize)
@ -1986,7 +1991,7 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb
void void
vGenerateMACHeader( vGenerateMACHeader(
PSDevice pDevice, struct vnt_private *pDevice,
unsigned char *pbyBufferAddr, unsigned char *pbyBufferAddr,
unsigned short wDuration, unsigned short wDuration,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
@ -2049,7 +2054,7 @@ vGenerateMACHeader(
pMACHeader->wFrameCtl |= FC_MOREFRAG; pMACHeader->wFrameCtl |= FC_MOREFRAG;
} }
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket)
{ {
PSTxDesc pFrstTD; PSTxDesc pFrstTD;
unsigned char byPktType; unsigned char byPktType;
@ -2334,7 +2339,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket)
return CMD_STATUS_PENDING; return CMD_STATUS_PENDING;
} }
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, PSTxMgmtPacket pPacket)
{ {
unsigned char byPktType; unsigned char byPktType;
unsigned char *pbyBuffer = (unsigned char *)pDevice->tx_beacon_bufs; unsigned char *pbyBuffer = (unsigned char *)pDevice->tx_beacon_bufs;
@ -2408,7 +2413,7 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket)
unsigned int unsigned int
cbGetFragCount( cbGetFragCount(
PSDevice pDevice, struct vnt_private *pDevice,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
unsigned int cbFrameBodySize, unsigned int cbFrameBodySize,
PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
@ -2485,8 +2490,9 @@ cbGetFragCount(
return uMACfragNum; return uMACfragNum;
} }
void void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb,
vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, unsigned int cbMPDULen) { unsigned char *pbMPDU, unsigned int cbMPDULen)
{
PSTxDesc pFrstTD; PSTxDesc pFrstTD;
unsigned char byPktType; unsigned char byPktType;
unsigned char *pbyTxBufferAddr; unsigned char *pbyTxBufferAddr;

22
drivers/staging/vt6655/rxtx.h
View File

@ -58,7 +58,7 @@ struct vnt_mic_hdr {
void void
vGenerateMACHeader( vGenerateMACHeader(
PSDevice pDevice, struct vnt_private *,
unsigned char *pbyBufferAddr, unsigned char *pbyBufferAddr,
unsigned short wDuration, unsigned short wDuration,
PSEthernetHeader psEthHeader, PSEthernetHeader psEthHeader,
@ -70,20 +70,24 @@ vGenerateMACHeader(
unsigned int unsigned int
cbGetFragCount( cbGetFragCount(
PSDevice pDevice, struct vnt_private *,
PSKeyItem pTransmitKey, PSKeyItem pTransmitKey,
unsigned int cbFrameBodySize, unsigned int cbFrameBodySize,
PSEthernetHeader psEthHeader PSEthernetHeader psEthHeader
); );
void void
vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktTyp, unsigned char *pbyTxBufferAddr, vGenerateFIFOHeader(struct vnt_private *, unsigned char byPktTyp,
bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, PSTxDesc pHeadTD, unsigned char *pbyTxBufferAddr, bool bNeedEncrypt,
PSEthernetHeader psEthHeader, unsigned char *pPacket, PSKeyItem pTransmitKey, unsigned int cbPayloadSize, unsigned int uDMAIdx,
unsigned int uNodeIndex, unsigned int *puMACfragNum, unsigned int *pcbHeaderSize); PSTxDesc pHeadTD, PSEthernetHeader psEthHeader,
unsigned char *pPacket, PSKeyItem pTransmitKey,
unsigned int uNodeIndex, unsigned int *puMACfragNum,
unsigned int *pcbHeaderSize);
void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, unsigned int cbMPDULen); void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb,
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); unsigned char *pbMPDU, unsigned int cbMPDULen);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); CMD_STATUS csMgmt_xmit(struct vnt_private *, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(struct vnt_private *, PSTxMgmtPacket pPacket);
#endif // __RXTX_H__ #endif // __RXTX_H__