Skip to content

L
linux
Commit 2989e96f authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files
Options

Staging: vt6655: remove PBYTE typedef 

Use unsigned char * instead.
Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b2e876b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 503 additions and 503 deletions
drivers/staging/vt6655/80211hdr.h
View file @ 2989e96f
......@@ -282,8 +282,8 @@
#define WLAN_MGMT_GET_TIM_OFFSET(b) (((b) & ~BIT0) >> 1)
/* 3-Addr & 4-Addr */
#define WLAN_HDR_A3_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR3_LEN)
#define WLAN_HDR_A4_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR4_LEN)
#define WLAN_HDR_A3_DATA_PTR(p) (((unsigned char *)(p)) + WLAN_HDR_ADDR3_LEN)
#define WLAN_HDR_A4_DATA_PTR(p) (((unsigned char *)(p)) + WLAN_HDR_ADDR4_LEN)
/* IEEE ADDR */
#define IEEE_ADDR_UNIVERSAL 0x02
......
drivers/staging/vt6655/80211mgr.c
View file @ 2989e96f
......@@ -139,9 +139,9 @@ vMgrDecodeBeacon(
+ WLAN_BEACON_OFF_CAPINFO);
// Information elements
pItem = (PWLAN_IE)((PBYTE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))
pItem = (PWLAN_IE)((unsigned char *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))
+ WLAN_BEACON_OFF_SSID);
while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ){
while( ((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len) ){
switch (pItem->byElementID) {
case WLAN_EID_SSID:
......@@ -223,7 +223,7 @@ vMgrDecodeBeacon(
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
}
return;
......@@ -386,7 +386,7 @@ vMgrDecodeAssocRequest(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_ASSOCREQ_OFF_SSID);
while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while (((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID){
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
......@@ -418,7 +418,7 @@ vMgrDecodeAssocRequest(
pItem->byElementID);
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
}
return;
}
......@@ -488,9 +488,10 @@ vMgrDecodeAssocResponse(
+ WLAN_ASSOCRESP_OFF_SUPP_RATES);
pItem = (PWLAN_IE)(pFrame->pSuppRates);
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) &&
(pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);
}
......@@ -564,7 +565,7 @@ vMgrDecodeReassocRequest(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCREQ_OFF_SSID);
while(((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while(((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID){
case WLAN_EID_SSID:
......@@ -597,7 +598,7 @@ vMgrDecodeReassocRequest(
pItem->byElementID);
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
}
return;
}
......@@ -649,7 +650,7 @@ vMgrDecodeProbeRequest(
// Information elements
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)));
while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {
while( ((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len) ) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
......@@ -672,7 +673,7 @@ vMgrDecodeProbeRequest(
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
}
return;
}
......@@ -746,7 +747,7 @@ vMgrDecodeProbeResponse(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_PROBERESP_OFF_SSID);
while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {
while( ((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len) ) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
......@@ -821,7 +822,7 @@ vMgrDecodeProbeResponse(
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
}
return;
}
......@@ -890,7 +891,7 @@ vMgrDecodeAuthen(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_AUTHEN_OFF_CHALLENGE);
if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) {
if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) {
pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem;
}
......@@ -1017,9 +1018,10 @@ vMgrDecodeReassocResponse(
+ WLAN_REASSOCRESP_OFF_SUPP_RATES);
pItem = (PWLAN_IE)(pFrame->pSuppRates);
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((unsigned char *)pItem) + 2 + pItem->len);
if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
if ((((unsigned char *)pItem) < (pFrame->pBuf + pFrame->len)) &&
(pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
}
return;
......
drivers/staging/vt6655/80211mgr.h
View file @ 2989e96f
......@@ -497,7 +497,7 @@ typedef struct tagWLAN_FR_MGMT {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
} WLAN_FR_MGMT, *PWLAN_FR_MGMT;
......@@ -507,7 +507,7 @@ typedef struct tagWLAN_FR_BEACON {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
// fixed fields
PQWORD pqwTimestamp;
......@@ -539,7 +539,7 @@ typedef struct tagWLAN_FR_IBSSATIM {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
// fixed fields
......@@ -553,7 +553,7 @@ typedef struct tagWLAN_FR_DISASSOC {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PWORD pwReason;
......@@ -566,7 +566,7 @@ typedef struct tagWLAN_FR_ASSOCREQ {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PWORD pwCapInfo;
......@@ -587,7 +587,7 @@ typedef struct tagWLAN_FR_ASSOCRESP {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PWORD pwCapInfo;
......@@ -604,7 +604,7 @@ typedef struct tagWLAN_FR_REASSOCREQ {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
......@@ -626,7 +626,7 @@ typedef struct tagWLAN_FR_REASSOCRESP {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PWORD pwCapInfo;
......@@ -643,7 +643,7 @@ typedef struct tagWLAN_FR_PROBEREQ {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
/*-- info elements ----------*/
......@@ -658,7 +658,7 @@ typedef struct tagWLAN_FR_PROBERESP {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PQWORD pqwTimestamp;
......@@ -687,7 +687,7 @@ typedef struct tagWLAN_FR_AUTHEN {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PWORD pwAuthAlgorithm;
......@@ -703,7 +703,7 @@ typedef struct tagWLAN_FR_DEAUTHEN {
unsigned int uType;
unsigned int len;
PBYTE pBuf;
unsigned char *pBuf;
PUWLAN_80211HDR pHdr;
/*-- fixed fields -----------*/
PWORD pwReason;
......
drivers/staging/vt6655/IEEE11h.c
View file @ 2989e96f
......@@ -125,9 +125,9 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN);
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
pFrame = (PWLAN_FRAME_TPCREP)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
pFrame = (PWLAN_FRAME_TPCREP)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
pFrame->Header.wFrameCtl = ( WLAN_SET_FC_FTYPE(WLAN_FTYPE_MGMT) |
WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_ACTION)
......@@ -276,7 +276,7 @@ BOOL IEEE11hbMSRRepTx (
pTxPacket = (PSTxMgmtPacket)pMgmt->abyCurrentMSRRep;
memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN);
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
pMSRRep->Header.wFrameCtl = ( WLAN_SET_FC_FTYPE(WLAN_FTYPE_MGMT) |
......
drivers/staging/vt6655/aes_ccmp.c
View file @ 2989e96f
......@@ -243,7 +243,7 @@ BYTE abyRoundKey[16];
* Return Value: MIC compare result
*
*/
BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, WORD wFrameSize)
{
BYTE abyNonce[13];
BYTE MIC_IV[16];
......@@ -256,8 +256,8 @@ BYTE abyPlainText[16];
BYTE abyLastCipher[16];
PS802_11Header pMACHeader = (PS802_11Header) pbyFrame;
PBYTE pbyIV;
PBYTE pbyPayload;
unsigned char *pbyIV;
unsigned char *pbyPayload;
WORD wHLen = 22;
WORD wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC
BOOL bA4 = FALSE;
......
drivers/staging/vt6655/aes_ccmp.h
View file @ 2989e96f
......@@ -41,6 +41,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize);
BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, WORD wFrameSize);
#endif //__AES_H__
drivers/staging/vt6655/baseband.c
View file @ 2989e96f
......@@ -1850,8 +1850,8 @@ BBvCaculateParameter (
WORD wRate,
BYTE byPacketType,
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
unsigned char *pbyPhySrv,
unsigned char *pbyPhySgn
)
{
unsigned int cbBitCount;
......@@ -2015,7 +2015,7 @@ BBvCaculateParameter (
* Return Value: TRUE if succeeded; FALSE if failed.
*
*/
BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, PBYTE pbyData)
BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
{
WORD ww;
BYTE byValue;
......@@ -2321,7 +2321,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
* Return Value: none
*
*/
void BBvReadAllRegs (DWORD_PTR dwIoBase, PBYTE pbyBBRegs)
void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs)
{
int ii;
BYTE byBase = 1;
......
drivers/staging/vt6655/baseband.h
View file @ 2989e96f
......@@ -133,14 +133,14 @@ BBvCaculateParameter (
WORD wRate,
BYTE byPacketType,
PWORD pwPhyLen,
PBYTE pbyPhySrv,
PBYTE pbyPhySgn
unsigned char *pbyPhySrv,
unsigned char *pbyPhySgn
);
BOOL BBbReadEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, PBYTE pbyData);
BOOL BBbReadEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData);
BOOL BBbWriteEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData);
void BBvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyBBRegs);
void BBvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyBBRegs);
void BBvLoopbackOn(PSDevice pDevice);
void BBvLoopbackOff(PSDevice pDevice);
void BBvSetShortSlotTime(PSDevice pDevice);
......
drivers/staging/vt6655/bssdb.c
View file @ 2989e96f
......@@ -126,14 +126,14 @@ void s_vCheckPreEDThreshold(
PKnownBSS
BSSpSearchBSSList(
void *hDeviceContext,
PBYTE pbyDesireBSSID,
PBYTE pbyDesireSSID,
unsigned char *pbyDesireBSSID,
unsigned char *pbyDesireSSID,
CARD_PHY_TYPE ePhyType
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
PSMgmtObject pMgmt = pDevice->pMgmt;
PBYTE pbyBSSID = NULL;
unsigned char *pbyBSSID = NULL;
PWLAN_IE_SSID pSSID = NULL;
PKnownBSS pCurrBSS = NULL;
PKnownBSS pSelect = NULL;
......@@ -326,7 +326,7 @@ BSSvClearBSSList(
PKnownBSS
BSSpAddrIsInBSSList(
void *hDeviceContext,
PBYTE abyBSSID,
unsigned char *abyBSSID,
PWLAN_IE_SSID pSSID
)
{
......@@ -369,7 +369,7 @@ BSSpAddrIsInBSSList(
BOOL
BSSbInsertToBSSList (
void *hDeviceContext,
PBYTE abyBSSIDAddr,
unsigned char *abyBSSIDAddr,
QWORD qwTimestamp,
WORD wBeaconInterval,
WORD wCapInfo,
......@@ -383,7 +383,7 @@ BSSbInsertToBSSList (
PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet,
unsigned int uIELength,
PBYTE pbyIEs,
unsigned char *pbyIEs,
void *pRxPacketContext
)
{
......@@ -470,7 +470,7 @@ BSSbInsertToBSSList (
if (pRSNWPA != NULL) {
unsigned int uLen = pRSNWPA->len + 2;
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
pBSSList->wWPALen = uLen;
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
WPA_ParseRSN(pBSSList, pRSNWPA);
......@@ -481,7 +481,7 @@ BSSbInsertToBSSList (
if (pRSN != NULL) {
unsigned int uLen = pRSN->len + 2;
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
pBSSList->wRSNLen = uLen;
memcpy(pBSSList->byRSNIE, pRSN, uLen);
WPA2vParseRSN(pBSSList, pRSN);
......@@ -601,7 +601,7 @@ BSSbUpdateToBSSList (
PWLAN_IE_QUIET pIE_Quiet,
PKnownBSS pBSSList,
unsigned int uIELength,
PBYTE pbyIEs,
unsigned char *pbyIEs,
void *pRxPacketContext
)
{
......@@ -671,7 +671,7 @@ BSSbUpdateToBSSList (
if (pRSNWPA != NULL) {
unsigned int uLen = pRSNWPA->len + 2;
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
pBSSList->wWPALen = uLen;
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
WPA_ParseRSN(pBSSList, pRSNWPA);
......@@ -682,7 +682,7 @@ BSSbUpdateToBSSList (
if (pRSN != NULL) {
unsigned int uLen = pRSN->len + 2;
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {
if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
pBSSList->wRSNLen = uLen;
memcpy(pBSSList->byRSNIE, pRSN, uLen);
WPA2vParseRSN(pBSSList, pRSN);
......@@ -765,7 +765,7 @@ BSSbUpdateToBSSList (
BOOL
BSSDBbIsSTAInNodeDB(
void *pMgmtObject,
PBYTE abyDstAddr,
unsigned char *abyDstAddr,
PUINT puNodeIndex
)
{
......@@ -1393,7 +1393,7 @@ BSSvUpdateNodeTxCounter(
void *hDeviceContext,
BYTE byTsr0,
BYTE byTsr1,
PBYTE pbyBuffer,
unsigned char *pbyBuffer,
unsigned int uFIFOHeaderSize
)
{
......
drivers/staging/vt6655/bssdb.h
View file @ 2989e96f
......@@ -245,15 +245,15 @@ typedef struct tagKnownNodeDB {
PKnownBSS
BSSpSearchBSSList(
void *hDeviceContext,
PBYTE pbyDesireBSSID,
PBYTE pbyDesireSSID,
unsigned char *pbyDesireBSSID,
unsigned char *pbyDesireSSID,
CARD_PHY_TYPE ePhyType
);
PKnownBSS
BSSpAddrIsInBSSList(
void *hDeviceContext,
PBYTE abyBSSID,
unsigned char *abyBSSID,
PWLAN_IE_SSID pSSID
);
......@@ -266,7 +266,7 @@ BSSvClearBSSList(
BOOL
BSSbInsertToBSSList(
void *hDeviceContext,
PBYTE abyBSSIDAddr,
unsigned char *abyBSSIDAddr,
QWORD qwTimestamp,
WORD wBeaconInterval,
WORD wCapInfo,
......@@ -280,7 +280,7 @@ BSSbInsertToBSSList(
PWLAN_IE_COUNTRY pIE_Country,
PWLAN_IE_QUIET pIE_Quiet,
unsigned int uIELength,
PBYTE pbyIEs,
unsigned char *pbyIEs,
void *pRxPacketContext
);
......@@ -303,7 +303,7 @@ BSSbUpdateToBSSList(
PWLAN_IE_QUIET pIE_Quiet,
PKnownBSS pBSSList,
unsigned int uIELength,
PBYTE pbyIEs,
unsigned char *pbyIEs,
void *pRxPacketContext
);
......@@ -311,7 +311,7 @@ BSSbUpdateToBSSList(
BOOL
BSSDBbIsSTAInNodeDB(
void *hDeviceContext,
PBYTE abyDstAddr,
unsigned char *abyDstAddr,
PUINT puNodeIndex
);
......@@ -341,7 +341,7 @@ BSSvUpdateNodeTxCounter(
void *hDeviceContext,
BYTE byTsr0,
BYTE byTsr1,
PBYTE pbyBuffer,
unsigned char *pbyBuffer,
unsigned int uFIFOHeaderSize
);
......
drivers/staging/vt6655/card.c
View file @ 2989e96f
......@@ -427,8 +427,8 @@ void
s_vCaculateOFDMRParameter(
BYTE byRate,
CARD_PHY_TYPE ePHYType,
PBYTE pbyTxRate,
PBYTE pbyRsvTime
unsigned char *pbyTxRate,
unsigned char *pbyRsvTime
);
......@@ -499,8 +499,8 @@ void
s_vCaculateOFDMRParameter (
BYTE byRate,
CARD_PHY_TYPE ePHYType,
PBYTE pbyTxRate,
PBYTE pbyRsvTime
unsigned char *pbyTxRate,
unsigned char *pbyRsvTime
)
{
switch (byRate) {
......@@ -1296,7 +1296,7 @@ BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType)
* Return Value: TRUE if success; FALSE if failed.
*
*/
BOOL CARDbSetBSSID(void *pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode)
BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
......@@ -1522,7 +1522,7 @@ MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue
BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID)
BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
......@@ -1550,7 +1550,7 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID)
BOOL
CARDbAdd_PMKID_Candidate (
void *pDeviceHandler,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
BOOL bRSNCapExist,
WORD wRSNCap
)
......@@ -2129,8 +2129,8 @@ CARDvSetPowerConstraint (
void
CARDvGetPowerCapability (
void *pDeviceHandler,
PBYTE pbyMinPower,
PBYTE pbyMaxPower
unsigned char *pbyMinPower,
unsigned char *pbyMaxPower
)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
......@@ -2165,14 +2165,14 @@ CARDvGetPowerCapability (
BYTE
CARDbySetSupportChannels (
void *pDeviceHandler,
PBYTE pbyIEs
unsigned char *pbyIEs
)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
unsigned int ii;
BYTE byCount;
PWLAN_IE_SUPP_CH pIE = (PWLAN_IE_SUPP_CH) pbyIEs;
PBYTE pbyChTupple;
unsigned char *pbyChTupple;
BYTE byLen = 0;
......@@ -2267,7 +2267,7 @@ CARDbyGetTransmitPower (
BOOL
CARDbChannelGetList (
unsigned int uCountryCodeIdx,
PBYTE pbyChannelTable
unsigned char *pbyChannelTable
)
{
if (uCountryCodeIdx >= CCODE_MAX) {
......@@ -2308,8 +2308,8 @@ BOOL
CARDbGetChannelMapInfo(
void *pDeviceHandler,
unsigned int uChannelIndex,
PBYTE pbyChannelNumber,
PBYTE pbyMap
unsigned char *pbyChannelNumber,
unsigned char *pbyMap
)
{
// PSDevice pDevice = (PSDevice) pDeviceHandler;
......
drivers/staging/vt6655/card.h
View file @ 2989e96f
......@@ -116,7 +116,7 @@ BOOL CARDbUpdateTSF(void *pDeviceHandler, BYTE byRxRate, QWORD qwBSSTimestamp, Q
BOOL CARDbStopTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbStartTxPacket(void *pDeviceHandler, CARD_PKT_TYPE ePktType);
BOOL CARDbSetBeaconPeriod(void *pDeviceHandler, WORD wBeaconInterval);
BOOL CARDbSetBSSID(void *pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode);
BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode);
BOOL
CARDbPowerDown(
......@@ -129,12 +129,12 @@ BOOL CARDbSetTxDataRate(
);
BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID);
BOOL CARDbRemoveKey (void *pDeviceHandler, unsigned char *pbyBSSID);
BOOL
CARDbAdd_PMKID_Candidate (
void *pDeviceHandler,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
BOOL bRSNCapExist,
WORD wRSNCap
);
......@@ -195,14 +195,14 @@ CARDvSetPowerConstraint (
void
CARDvGetPowerCapability (
void *pDeviceHandler,
PBYTE pbyMinPower,
PBYTE pbyMaxPower
unsigned char *pbyMinPower,
unsigned char *pbyMaxPower
);
BYTE
CARDbySetSupportChannels (
void *pDeviceHandler,
PBYTE pbyIEs
unsigned char *pbyIEs
);
char
......@@ -213,7 +213,7 @@ CARDbyGetTransmitPower (
BOOL
CARDbChannelGetList (
unsigned int uCountryCodeIdx,
PBYTE pbyChannelTable
unsigned char *pbyChannelTable
);
void
......@@ -226,8 +226,8 @@ BOOL
CARDbGetChannelMapInfo(
void *pDeviceHandler,
unsigned int uChannelIndex,
PBYTE pbyChannelNumber,
PBYTE pbyMap
unsigned char *pbyChannelNumber,
unsigned char *pbyMap
);
void
......
drivers/staging/vt6655/datarate.c
View file @ 2989e96f
......@@ -203,8 +203,8 @@ RATEvParseMaxRate (
PWORD pwMaxBasicRate,
PWORD pwMaxSuppRate,
PWORD pwSuppRate,
PBYTE pbyTopCCKRate,
PBYTE pbyTopOFDMRate
unsigned char *pbyTopCCKRate,
unsigned char *pbyTopOFDMRate
)
{
PSDevice pDevice = (PSDevice) pDeviceHandler;
......
drivers/staging/vt6655/datarate.h
View file @ 2989e96f
......@@ -63,8 +63,8 @@ RATEvParseMaxRate(
PWORD pwMaxBasicRate,
PWORD pwMaxSuppRate,
PWORD pwSuppRate,
PBYTE pbyTopCCKRate,
PBYTE pbyTopOFDMRate
unsigned char *pbyTopCCKRate,
unsigned char *pbyTopOFDMRate
);
void
......
drivers/staging/vt6655/desc.h
View file @ 2989e96f
......@@ -350,7 +350,7 @@ STDES1;
typedef struct tagDEVICE_TD_INFO{
struct sk_buff* skb;
PBYTE buf;
unsigned char *buf;
dma_addr_t skb_dma;
dma_addr_t buf_dma;
dma_addr_t curr_desc;
......
drivers/staging/vt6655/device.h
View file @ 2989e96f
......@@ -324,7 +324,7 @@ typedef struct tagSDeFragControlBlock
BYTE abyAddr2[ETH_ALEN];
unsigned int uLifetime;
struct sk_buff* skb;
PBYTE pbyRxBuffer;
unsigned char *pbyRxBuffer;
unsigned int cbFrameLength;
BOOL bInUse;
} SDeFragControlBlock, *PSDeFragControlBlock;
......@@ -417,9 +417,9 @@ typedef struct __device_info {
dma_addr_t tx_bufs_dma1;
dma_addr_t tx_beacon_dma;
PBYTE tx0_bufs;
PBYTE tx1_bufs;
PBYTE tx_beacon_bufs;
unsigned char *tx0_bufs;
unsigned char *tx1_bufs;
unsigned char *tx_beacon_bufs;
CHIP_TYPE chip_id;
......@@ -507,7 +507,7 @@ typedef struct __device_info {
BYTE byTxAntennaMode;
BOOL bTxRxAntInv;
PBYTE pbyTmpBuff;
unsigned char *pbyTmpBuff;
unsigned int uSIFS; //Current SIFS
unsigned int uDIFS; //Current DIFS
unsigned int uEIFS; //Current EIFS
......
drivers/staging/vt6655/device_main.c
View file @ 2989e96f
......@@ -1699,13 +1699,13 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) {
STAvUpdateTDStatCounter(&pDevice->scStatistic,
byTsr0, byTsr1,
(PBYTE)(pTD->pTDInfo->buf + uFIFOHeaderSize),
(unsigned char *)(pTD->pTDInfo->buf + uFIFOHeaderSize),
uFrameSize, uIdx);
BSSvUpdateNodeTxCounter(pDevice,
byTsr0, byTsr1,
(PBYTE)(pTD->pTDInfo->buf),
(unsigned char *)(pTD->pTDInfo->buf),
uFIFOHeaderSize
);
......@@ -1756,7 +1756,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) {
BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
skb = pTD->pTDInfo->skb;
if (BSSDBbIsSTAInNodeDB(pMgmt, (PBYTE)(skb->data), &uNodeIndex)) {
if (BSSDBbIsSTAInNodeDB(pMgmt, (unsigned char *)(skb->data), &uNodeIndex)) {
if (pMgmt->sNodeDBTable[uNodeIndex].bPSEnable) {
skb_queue_tail(&pMgmt->sNodeDBTable[uNodeIndex].sTxPSQueue, skb);
pMgmt->sNodeDBTable[uNodeIndex].wEnQueueCnt++;
......@@ -2084,7 +2084,7 @@ device_release_WPADEV(pDevice);
static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) {
PSDevice pDevice=netdev_priv(dev);
PBYTE pbMPDU;
unsigned char *pbMPDU;
unsigned int cbMPDULen = 0;
......@@ -2154,7 +2154,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), ETH_HLEN);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (unsigned char *)(skb->data), ETH_HLEN);
cbFrameBodySize = skb->len - ETH_HLEN;
// 802.1H
......@@ -2228,7 +2228,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
}
vGenerateFIFOHeader(pDevice, byPktType, pDevice->pbyTmpBuff, bNeedEncryption,
cbFrameBodySize, TYPE_TXDMA0, pHeadTD,
&pDevice->sTxEthHeader, (PBYTE)skb->data, pTransmitKey, uNodeIndex,
&pDevice->sTxEthHeader, (unsigned char *)skb->data, pTransmitKey, uNodeIndex,
&uMACfragNum,
&cbHeaderSize
);
......@@ -2284,7 +2284,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
unsigned int ii;
BOOL bTKIP_UseGTK = FALSE;
BOOL bNeedDeAuth = FALSE;
PBYTE pbyBSSID;
unsigned char *pbyBSSID;
BOOL bNodeExist = FALSE;
......@@ -2309,7 +2309,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
spin_unlock_irq(&pDevice->lock);
return 0;
}
if (is_multicast_ether_addr((PBYTE)(skb->data))) {
if (is_multicast_ether_addr((unsigned char *)(skb->data))) {
uNodeIndex = 0;
bNodeExist = TRUE;
if (pMgmt->sNodeDBTable[0].bPSEnable) {
......@@ -2321,7 +2321,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
return 0;
}
}else {
if (BSSDBbIsSTAInNodeDB(pMgmt, (PBYTE)(skb->data), &uNodeIndex)) {
if (BSSDBbIsSTAInNodeDB(pMgmt, (unsigned char *)(skb->data), &uNodeIndex)) {
if (pMgmt->sNodeDBTable[uNodeIndex].bPSEnable) {
skb_queue_tail(&pMgmt->sNodeDBTable[uNodeIndex].sTxPSQueue, skb);
pMgmt->sNodeDBTable[uNodeIndex].wEnQueueCnt++;
......@@ -2358,7 +2358,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), ETH_HLEN);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (unsigned char *)(skb->data), ETH_HLEN);
cbFrameBodySize = skb->len - ETH_HLEN;
// 802.1H
if (ntohs(pDevice->sTxEthHeader.wType) > ETH_DATA_LEN) {
......@@ -2586,7 +2586,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate);
#endif
vGenerateFIFOHeader(pDevice, byPktType, pDevice->pbyTmpBuff, bNeedEncryption,
cbFrameBodySize, TYPE_AC0DMA, pHeadTD,
&pDevice->sTxEthHeader, (PBYTE)skb->data, pTransmitKey, uNodeIndex,
&pDevice->sTxEthHeader, (unsigned char *)skb->data, pTransmitKey, uNodeIndex,
&uMACfragNum,
&cbHeaderSize
);
......
drivers/staging/vt6655/dpc.c
View file @ 2989e96f
This diff is collapsed.
drivers/staging/vt6655/hostap.c
View file @ 2989e96f
......@@ -580,7 +580,7 @@ static int hostap_set_encryption(PSDevice pDevice,
dwKeyIndex & ~(USE_KEYRSC),
param->u.crypt.key_len,
(PQWORD) &(KeyRSC),
(PBYTE)abyKey,
(unsigned char *)abyKey,
KEY_CTL_WEP,
pDevice->PortOffset,
pDevice->byLocalID) == TRUE) {
......@@ -649,7 +649,7 @@ static int hostap_set_encryption(PSDevice pDevice,
dwKeyIndex,
param->u.crypt.key_len,
(PQWORD) &(KeyRSC),
(PBYTE)abyKey,
(unsigned char *)abyKey,
byKeyDecMode,
pDevice->PortOffset,
pDevice->byLocalID) == TRUE) {
......
drivers/staging/vt6655/ioctl.c
View file @ 2989e96f
......@@ -257,7 +257,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
dwKeyIndex,
sWEPCmd.auWepKeyLength[ii],
NULL,
(PBYTE)&sWEPCmd.abyWepKey[ii][0],
(unsigned char *)&sWEPCmd.abyWepKey[ii][0],
KEY_CTL_WEP,
pDevice->PortOffset,
pDevice->byLocalID);
......@@ -718,7 +718,7 @@ void
vConfigWEPKey (
PSDevice pDevice,
DWORD dwKeyIndex,
PBYTE pbyKey,
unsigned char *pbyKey,
unsigned long uKeyLength
)
{
......
drivers/staging/vt6655/ioctl.h
View file @ 2989e96f
......@@ -46,7 +46,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq);
void vConfigWEPKey (
PSDevice pDevice,
DWORD dwKeyIndex,
PBYTE pbyKey,
unsigned char *pbyKey,
unsigned long uKeyLength
);
*/
......
drivers/staging/vt6655/iwctl.c
View file @ 2989e96f
......@@ -2096,7 +2096,7 @@ int iwctl_siwmlme(struct net_device *dev,
switch(mlme->cmd){
case IW_MLME_DEAUTH:
//this command seems to be not complete,please test it --einsnliu
//bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (PBYTE)&reason);
//bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (unsigned char *)&reason);
break;
case IW_MLME_DISASSOC:
if(pDevice->bLinkPass == TRUE){
......
drivers/staging/vt6655/key.c
View file @ 2989e96f
......@@ -133,7 +133,7 @@ void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
*/
BOOL KeybGetKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
PSKeyItem *pKey
)
......@@ -191,11 +191,11 @@ BOOL KeybGetKey (
*/
BOOL KeybSetKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
BYTE byLocalID
......@@ -364,7 +364,7 @@ BOOL KeybSetKey (
*/
BOOL KeybRemoveKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
DWORD_PTR dwIoBase
)
......@@ -437,7 +437,7 @@ BOOL KeybRemoveKey (
*/
BOOL KeybRemoveAllKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD_PTR dwIoBase
)
{
......@@ -519,7 +519,7 @@ void KeyvRemoveAllWEPKey (
*/
BOOL KeybGetTransmitKey (
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyType,
PSKeyItem *pKey
)
......@@ -636,7 +636,7 @@ BOOL KeybSetDefaultKey (
DWORD dwKeyIndex,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
BYTE byLocalID
......@@ -743,7 +743,7 @@ BOOL KeybSetAllGroupKey (
DWORD dwKeyIndex,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
BYTE byLocalID
......
drivers/staging/vt6655/key.h
View file @ 2989e96f
......@@ -105,18 +105,18 @@ void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase);
BOOL KeybGetKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
PSKeyItem *pKey
);
BOOL KeybSetKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
BYTE byLocalID
......@@ -127,7 +127,7 @@ BOOL KeybSetDefaultKey(
DWORD dwKeyIndex,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
BYTE byLocalID
......@@ -135,14 +135,14 @@ BOOL KeybSetDefaultKey(
BOOL KeybRemoveKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
DWORD_PTR dwIoBase
);
BOOL KeybGetTransmitKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD dwKeyType,
PSKeyItem *pKey
);
......@@ -154,7 +154,7 @@ BOOL KeybCheckPairewiseKey(
BOOL KeybRemoveAllKey(
PSKeyManagement pTable,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
DWORD_PTR dwIoBase
);
......@@ -174,7 +174,7 @@ BOOL KeybSetAllGroupKey (
DWORD dwKeyIndex,
unsigned long uKeyLength,
PQWORD pKeyRSC,
PBYTE pbyKey,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
BYTE byLocalID
......
drivers/staging/vt6655/mac.c
View file @ 2989e96f
......@@ -103,7 +103,7 @@ static int msglevel =MSG_LEVEL_INFO;
* Return Value: none
*
*/
void MACvReadAllRegs (DWORD_PTR dwIoBase, PBYTE pbyMacRegs)
void MACvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyMacRegs)
{
int ii;
......@@ -342,7 +342,7 @@ void MACvSetRxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold)
* Return Value: none
*
*/
void MACvGetRxThreshold (DWORD_PTR dwIoBase, PBYTE pbyThreshold)
void MACvGetRxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold)
{
// get FCR0
VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold);
......@@ -388,7 +388,7 @@ void MACvSetTxThreshold (DWORD_PTR dwIoBase, BYTE byThreshold)
* Return Value: none
*
*/
void MACvGetTxThreshold (DWORD_PTR dwIoBase, PBYTE pbyThreshold)
void MACvGetTxThreshold (DWORD_PTR dwIoBase, unsigned char *pbyThreshold)
{
// get FCR0
VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyThreshold);
......@@ -434,7 +434,7 @@ void MACvSetDmaLength (DWORD_PTR dwIoBase, BYTE byDmaLength)
* Return Value: none
*
*/
void MACvGetDmaLength (DWORD_PTR dwIoBase, PBYTE pbyDmaLength)
void MACvGetDmaLength (DWORD_PTR dwIoBase, unsigned char *pbyDmaLength)
{
// get FCR0
VNSvInPortB(dwIoBase + MAC_REG_FCR0, pbyDmaLength);
......@@ -474,7 +474,7 @@ void MACvSetShortRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit)
* Return Value: none
*
*/
void MACvGetShortRetryLimit (DWORD_PTR dwIoBase, PBYTE pbyRetryLimit)
void MACvGetShortRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit)
{
// get SRT
VNSvInPortB(dwIoBase + MAC_REG_SRT, pbyRetryLimit);
......@@ -513,7 +513,7 @@ void MACvSetLongRetryLimit (DWORD_PTR dwIoBase, BYTE byRetryLimit)
* Return Value: none
*
*/
void MACvGetLongRetryLimit (DWORD_PTR dwIoBase, PBYTE pbyRetryLimit)
void MACvGetLongRetryLimit (DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit)
{
// get LRT
VNSvInPortB(dwIoBase + MAC_REG_LRT, pbyRetryLimit);
......@@ -643,7 +643,7 @@ void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType)
* Return Value: none
*
*/
void MACvSaveContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
void MACvSaveContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf)
{
int ii;
......@@ -676,7 +676,7 @@ void MACvSaveContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
* Return Value: none
*
*/
void MACvRestoreContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
void MACvRestoreContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf)
{
int ii;
......@@ -728,7 +728,7 @@ void MACvRestoreContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
* Return Value: TRUE if all values are the same; otherwise FALSE
*
*/
BOOL MACbCompareContext (DWORD_PTR dwIoBase, PBYTE pbyCxtBuf)
BOOL MACbCompareContext (DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf)
{
DWORD dwData;
......@@ -1456,7 +1456,7 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase)
*/
void MACvSetKeyEntry (DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,
unsigned int uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey, BYTE byLocalID)
unsigned int uKeyIdx, unsigned char *pbyAddr, PDWORD pdwKey, BYTE byLocalID)
{
WORD wOffset;
DWORD dwData;
......
drivers/staging/vt6655/mac.h
View file @ 2989e96f
......@@ -765,7 +765,7 @@
{ \
VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1); \
VNSvInPortB(dwIoBase + MAC_REG_BSSID0, \
(PBYTE)pbyEtherAddr); \
(unsigned char *)pbyEtherAddr); \
VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 1, \
pbyEtherAddr + 1); \
VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 2, \
......@@ -801,7 +801,7 @@
{ \
VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1); \
VNSvInPortB(dwIoBase + MAC_REG_PAR0, \
(PBYTE)pbyEtherAddr); \
(unsigned char *)pbyEtherAddr); \
VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 1, \
pbyEtherAddr + 1); \
VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 2, \
......@@ -1075,7 +1075,7 @@
/*--------------------- Export Functions --------------------------*/
extern WORD TxRate_iwconfig;//2008-5-8 <add> by chester
void MACvReadAllRegs(DWORD_PTR dwIoBase, PBYTE pbyMacRegs);
void MACvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyMacRegs);
BOOL MACbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits);
BOOL MACbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits);
......@@ -1088,28 +1088,28 @@ void MACvSetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
void MACvResetMultiAddrByHash(DWORD_PTR dwIoBase, BYTE byHashIdx);
void MACvSetRxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold);
void MACvGetRxThreshold(DWORD_PTR dwIoBase, PBYTE pbyThreshold);
void MACvGetRxThreshold(DWORD_PTR dwIoBase, unsigned char *pbyThreshold);
void MACvSetTxThreshold(DWORD_PTR dwIoBase, BYTE byThreshold);
void MACvGetTxThreshold(DWORD_PTR dwIoBase, PBYTE pbyThreshold);
void MACvGetTxThreshold(DWORD_PTR dwIoBase, unsigned char *pbyThreshold);
void MACvSetDmaLength(DWORD_PTR dwIoBase, BYTE byDmaLength);
void MACvGetDmaLength(DWORD_PTR dwIoBase, PBYTE pbyDmaLength);
void MACvGetDmaLength(DWORD_PTR dwIoBase, unsigned char *pbyDmaLength);
void MACvSetShortRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit);
void MACvGetShortRetryLimit(DWORD_PTR dwIoBase, PBYTE pbyRetryLimit);
void MACvGetShortRetryLimit(DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit);
void MACvSetLongRetryLimit(DWORD_PTR dwIoBase, BYTE byRetryLimit);
void MACvGetLongRetryLimit(DWORD_PTR dwIoBase, PBYTE pbyRetryLimit);
void MACvGetLongRetryLimit(DWORD_PTR dwIoBase, unsigned char *pbyRetryLimit);
void MACvSetLoopbackMode(DWORD_PTR dwIoBase, BYTE byLoopbackMode);
BOOL MACbIsInLoopbackMode(DWORD_PTR dwIoBase);
void MACvSetPacketFilter(DWORD_PTR dwIoBase, WORD wFilterType);
void MACvSaveContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
void MACvRestoreContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
BOOL MACbCompareContext(DWORD_PTR dwIoBase, PBYTE pbyCxtBuf);
void MACvSaveContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf);
void MACvRestoreContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf);
BOOL MACbCompareContext(DWORD_PTR dwIoBase, unsigned char *pbyCxtBuf);
BOOL MACbSoftwareReset(DWORD_PTR dwIoBase);
BOOL MACbSafeSoftwareReset(DWORD_PTR dwIoBase);
......@@ -1140,7 +1140,7 @@ BOOL MACbFlushSYNCFifo(DWORD_PTR dwIoBase);
BOOL MACbPSWakeup(DWORD_PTR dwIoBase);
void MACvSetKeyEntry(DWORD_PTR dwIoBase, WORD wKeyCtl, unsigned int uEntryIdx,
unsigned int uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey, BYTE byLocalID);
unsigned int uKeyIdx, unsigned char *pbyAddr, PDWORD pdwKey, BYTE byLocalID);
void MACvDisableKeyEntry(DWORD_PTR dwIoBase, unsigned int uEntryIdx);
void MACvSetDefaultKeyEntry(DWORD_PTR dwIoBase, unsigned int uKeyLen,
unsigned int uKeyIdx, PDWORD pdwKey, BYTE byLocalID);
......
drivers/staging/vt6655/mib.c
View file @ 2989e96f
......@@ -178,7 +178,7 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, DWORD dwIsr)
*/
void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRSR, BYTE byRxRate,
PBYTE pbyBuffer, unsigned int cbFrameLength)
unsigned char *pbyBuffer, unsigned int cbFrameLength)
{
//need change
PS802_11Header pHeader = (PS802_11Header)pbyBuffer;
......@@ -392,7 +392,7 @@ STAvUpdateRDStatCounterEx (
BYTE byRSR,
BYTE byNewRSR,
BYTE byRxRate,
PBYTE pbyBuffer,
unsigned char *pbyBuffer,
unsigned int cbFrameLength
)
{
......@@ -408,7 +408,7 @@ STAvUpdateRDStatCounterEx (
// rx length
pStatistic->dwCntRxFrmLength = cbFrameLength;
// rx pattern, we just see 10 bytes for sample
memcpy(pStatistic->abyCntRxPattern, (PBYTE)pbyBuffer, 10);
memcpy(pStatistic->abyCntRxPattern, (unsigned char *)pbyBuffer, 10);
}
......@@ -434,13 +434,13 @@ STAvUpdateTDStatCounter (
PSStatCounter pStatistic,
BYTE byTSR0,
BYTE byTSR1,
PBYTE pbyBuffer,
unsigned char *pbyBuffer,
unsigned int cbFrameLength,
unsigned int uIdx
)
{
PWLAN_80211HDR_A4 pHeader;
PBYTE pbyDestAddr;
unsigned char *pbyDestAddr;
BYTE byTSR0_NCR = byTSR0 & TSR0_NCR;
......@@ -522,7 +522,7 @@ STAvUpdateTDStatCounter (
void
STAvUpdateTDStatCounterEx (
PSStatCounter pStatistic,
PBYTE pbyBuffer,
unsigned char *pbyBuffer,
DWORD cbFrameLength
)
{
......
drivers/staging/vt6655/mib.h
View file @ 2989e96f
......@@ -348,18 +348,18 @@ void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, DWORD dwIsr);
void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRSR, BYTE byRxRate,
PBYTE pbyBuffer, unsigned int cbFrameLength);
unsigned char *pbyBuffer, unsigned int cbFrameLength);
void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic,
BYTE byRSR, BYTE byNewRsr, BYTE byRxRate,
PBYTE pbyBuffer, unsigned int cbFrameLength);
unsigned char *pbyBuffer, unsigned int cbFrameLength);
void STAvUpdateTDStatCounter(PSStatCounter pStatistic, BYTE byTSR0, BYTE byTSR1,
PBYTE pbyBuffer, unsigned int cbFrameLength, unsigned int uIdx);
unsigned char *pbyBuffer, unsigned int cbFrameLength, unsigned int uIdx);
void STAvUpdateTDStatCounterEx(
PSStatCounter pStatistic,
PBYTE pbyBuffer,
unsigned char *pbyBuffer,
DWORD cbFrameLength
);
......
drivers/staging/vt6655/michael.c
View file @ 2989e96f
......@@ -149,7 +149,7 @@ void MIC_vUnInit (void)
s_vClear();
}
void MIC_vAppend (PBYTE src, unsigned int nBytes)
void MIC_vAppend (unsigned char *src, unsigned int nBytes)
{
// This is simple
while (nBytes > 0)
......
drivers/staging/vt6655/michael.h
View file @ 2989e96f
......@@ -40,7 +40,7 @@ void MIC_vInit(DWORD dwK0, DWORD dwK1);
void MIC_vUnInit(void);
// Append bytes to the message to be MICed
void MIC_vAppend(PBYTE src, unsigned int nBytes);
void MIC_vAppend(unsigned char *src, unsigned int nBytes);
// Get the MIC result. Destination should accept 8 bytes of result.
// This also resets the message to empty.
......
drivers/staging/vt6655/power.c
View file @ 2989e96f
......@@ -262,7 +262,7 @@ PSvSendPSPOLL(
memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_HDR_ADDR2_LEN);
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
pTxPacket->p80211Header->sA2.wFrameCtl = cpu_to_le16(
(
WLAN_SET_FC_FTYPE(WLAN_TYPE_CTL) |
......@@ -329,7 +329,7 @@ PSbSendNullPacket(
memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN);
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
if (pDevice->bEnablePSMode) {
......
drivers/staging/vt6655/rc4.c
View file @ 2989e96f
......@@ -32,12 +32,12 @@
#include "rc4.h"
void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len)
void rc4_init(PRC4Ext pRC4, unsigned char *pbyKey, unsigned int cbKey_len)
{
unsigned int ust1, ust2;
unsigned int keyindex;
unsigned int stateindex;
PBYTE pbyst;
unsigned char *pbyst;
unsigned int idx;
pbyst = pRC4->abystate;
......@@ -63,7 +63,7 @@ unsigned int rc4_byte(PRC4Ext pRC4)
unsigned int ux;
unsigned int uy;
unsigned int ustx, usty;
PBYTE pbyst;
unsigned char *pbyst;
pbyst = pRC4->abystate;
ux = (pRC4->ux + 1) & 0xff;
......@@ -78,8 +78,8 @@ unsigned int rc4_byte(PRC4Ext pRC4)
return pbyst[(ustx + usty) & 0xff];
}
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
PBYTE pbySrc, unsigned int cbData_len)
void rc4_encrypt(PRC4Ext pRC4, unsigned char *pbyDest,
unsigned char *pbySrc, unsigned int cbData_len)
{
unsigned int ii;
for (ii = 0; ii < cbData_len; ii++)
......
drivers/staging/vt6655/rc4.h
View file @ 2989e96f
......@@ -40,8 +40,8 @@ typedef struct {
BYTE abystate[256];
} RC4Ext, *PRC4Ext;
void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len);
void rc4_init(PRC4Ext pRC4, unsigned char *pbyKey, unsigned int cbKey_len);
unsigned int rc4_byte(PRC4Ext pRC4);
void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, unsigned int cbData_len);
void rc4_encrypt(PRC4Ext pRC4, unsigned char *pbyDest, unsigned char *pbySrc, unsigned int cbData_len);
#endif //__RC4_H__
drivers/staging/vt6655/rxtx.c
View file @ 2989e96f
This diff is collapsed.
drivers/staging/vt6655/rxtx.h
View file @ 2989e96f
......@@ -43,7 +43,7 @@
void vGenerateMACHeader(
PSDevice pDevice,
DWORD dwTxBufferAddr,
PBYTE pbySkbData,
unsigned char *pbySkbData,
unsigned int cbPacketSize,
BOOL bDMA0Used,
PUINT pcbHeadSize,
......@@ -63,7 +63,7 @@ void vProcessRxMACHeader (
void
vGenerateMACHeader (
PSDevice pDevice,
PBYTE pbyBufferAddr,
unsigned char *pbyBufferAddr,
WORD wDuration,
PSEthernetHeader psEthHeader,
BOOL bNeedEncrypt,
......@@ -86,13 +86,13 @@ void
vGenerateFIFOHeader (
PSDevice pDevice,
BYTE byPktTyp,
PBYTE pbyTxBufferAddr,
unsigned char *pbyTxBufferAddr,
BOOL bNeedEncrypt,
unsigned int cbPayloadSize,
unsigned int uDMAIdx,
PSTxDesc pHeadTD,
PSEthernetHeader psEthHeader,
PBYTE pPacket,
unsigned char *pPacket,
PSKeyItem pTransmitKey,
unsigned int uNodeIndex,
PUINT puMACfragNum,
......@@ -100,7 +100,7 @@ vGenerateFIFOHeader (
);
void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, unsigned int cbMPDULen);
void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, unsigned int cbMPDULen);
CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
......
drivers/staging/vt6655/srom.c
View file @ 2989e96f
......@@ -266,7 +266,7 @@ BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits)
* Return Value: none
*
*/
void SROMvReadAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs)
void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs)
{
int ii;
......@@ -291,7 +291,7 @@ void SROMvReadAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs)
* Return Value: none
*
*/
void SROMvWriteAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs)
void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs)
{
int ii;
......@@ -315,7 +315,7 @@ void SROMvWriteAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs)
* Return Value: none
*
*/
void SROMvReadEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress)
void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress)
{
BYTE ii;
......@@ -340,7 +340,7 @@ void SROMvReadEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress)
* Return Value: none
*
*/
void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress)
void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress)
{
BYTE ii;
......@@ -366,9 +366,9 @@ void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress)
*/
void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, PDWORD pdwSubSysVenId)
{
PBYTE pbyData;
unsigned char *pbyData;
pbyData = (PBYTE)pdwSubSysVenId;
pbyData = (unsigned char *)pdwSubSysVenId;
/* sub vendor */
*pbyData = SROMbyReadEmbedded(dwIoBase, 6);
*(pbyData+1) = SROMbyReadEmbedded(dwIoBase, 7);
......
drivers/staging/vt6655/srom.h
View file @ 2989e96f
......@@ -144,11 +144,11 @@ void SROMvRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byBits);
BOOL SROMbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits);
BOOL SROMbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits);
void SROMvReadAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs);
void SROMvWriteAllContents(DWORD_PTR dwIoBase, PBYTE pbyEepromRegs);
void SROMvReadAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs);
void SROMvWriteAllContents(DWORD_PTR dwIoBase, unsigned char *pbyEepromRegs);
void SROMvReadEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress);
void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, PBYTE pbyEtherAddress);
void SROMvReadEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress);
void SROMvWriteEtherAddress(DWORD_PTR dwIoBase, unsigned char *pbyEtherAddress);
void SROMvReadSubSysVenId(DWORD_PTR dwIoBase, PDWORD pdwSubSysVenId);
......
drivers/staging/vt6655/tcrc.c
View file @ 2989e96f
......@@ -132,7 +132,7 @@ static const DWORD s_adwCrc32Table[256] = {
* Return Value: CRC-32
*
-*/
DWORD CRCdwCrc32 (PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed)
DWORD CRCdwCrc32 (unsigned char *pbyData, unsigned int cbByte, DWORD dwCrcSeed)
{
DWORD dwCrc;
......@@ -164,7 +164,7 @@ DWORD CRCdwCrc32 (PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed)
* Return Value: CRC-32
*
-*/
DWORD CRCdwGetCrc32 (PBYTE pbyData, unsigned int cbByte)
DWORD CRCdwGetCrc32 (unsigned char *pbyData, unsigned int cbByte)
{
return ~CRCdwCrc32(pbyData, cbByte, 0xFFFFFFFFL);
}
......@@ -190,7 +190,7 @@ DWORD CRCdwGetCrc32 (PBYTE pbyData, unsigned int cbByte)
* Return Value: CRC-32
*
-*/
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC)
DWORD CRCdwGetCrc32Ex(unsigned char *pbyData, unsigned int cbByte, DWORD dwPreCRC)
{
return CRCdwCrc32(pbyData, cbByte, dwPreCRC);
}
......
drivers/staging/vt6655/tcrc.h
View file @ 2989e96f
......@@ -43,9 +43,9 @@
/*--------------------- Export Functions --------------------------*/
DWORD CRCdwCrc32(PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed);
DWORD CRCdwGetCrc32(PBYTE pbyData, unsigned int cbByte);
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC);
DWORD CRCdwCrc32(unsigned char *pbyData, unsigned int cbByte, DWORD dwCrcSeed);
DWORD CRCdwGetCrc32(unsigned char *pbyData, unsigned int cbByte);
DWORD CRCdwGetCrc32Ex(unsigned char *pbyData, unsigned int cbByte, DWORD dwPreCRC);
#endif // __TCRC_H__
......
drivers/staging/vt6655/tether.c
View file @ 2989e96f
......@@ -61,7 +61,7 @@
* Return Value: Hash value
*
*/
BYTE ETHbyGetHashIndexByCrc32 (PBYTE pbyMultiAddr)
BYTE ETHbyGetHashIndexByCrc32 (unsigned char *pbyMultiAddr)
{
int ii;
BYTE byTmpHash;
......@@ -96,7 +96,7 @@ BYTE ETHbyGetHashIndexByCrc32 (PBYTE pbyMultiAddr)
* Return Value: TRUE if ok; FALSE if error.
*
*/
BOOL ETHbIsBufferCrc32Ok (PBYTE pbyBuffer, unsigned int cbFrameLength)
BOOL ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength)
{
DWORD dwCRC;
......
drivers/staging/vt6655/tether.h
View file @ 2989e96f
......@@ -193,9 +193,9 @@ S802_11Header, *PS802_11Header;
/*--------------------- Export Functions --------------------------*/
BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength);
BYTE ETHbyGetHashIndexByCrc32(unsigned char *pbyMultiAddr);
//BYTE ETHbyGetHashIndexByCrc(unsigned char *pbyMultiAddr);
BOOL ETHbIsBufferCrc32Ok(unsigned char *pbyBuffer, unsigned int cbFrameLength);
#endif // __TETHER_H__
......
drivers/staging/vt6655/tkip.c
View file @ 2989e96f
......@@ -184,11 +184,11 @@ unsigned int rotr1(unsigned int a)
*
*/
void TKIPvMixKey(
PBYTE pbyTKey,
PBYTE pbyTA,
unsigned char *pbyTKey,
unsigned char *pbyTA,
WORD wTSC15_0,
DWORD dwTSC47_16,
PBYTE pbyRC4Key
unsigned char *pbyRC4Key
)
{
unsigned int p1k[5];
......
drivers/staging/vt6655/tkip.h
View file @ 2989e96f
......@@ -47,11 +47,11 @@
/*--------------------- Export Functions --------------------------*/
void TKIPvMixKey(
PBYTE pbyTKey,
PBYTE pbyTA,
unsigned char *pbyTKey,
unsigned char *pbyTA,
WORD wTSC15_0,
DWORD dwTSC47_16,
PBYTE pbyRC4Key
unsigned char *pbyRC4Key
);
#endif // __TKIP_H__
......
drivers/staging/vt6655/ttype.h
View file @ 2989e96f
......@@ -92,8 +92,6 @@ typedef unsigned long DWORD_PTR; // 32-bit
// boolean pointer
typedef unsigned int * PUINT;
typedef BYTE * PBYTE;
typedef WORD * PWORD;
typedef DWORD * PDWORD;
......
drivers/staging/vt6655/upc.h
View file @ 2989e96f
......@@ -76,7 +76,7 @@
#define VNSvInPortB(dwIOAddress, pbyData) { \
volatile BYTE* pbyAddr = ((PBYTE)(dwIOAddress)); \
volatile BYTE* pbyAddr = ((unsigned char *)(dwIOAddress)); \
*(pbyData) = readb(pbyAddr); \
}
......@@ -93,7 +93,7 @@
#define VNSvOutPortB(dwIOAddress, byData) { \
volatile BYTE* pbyAddr = ((PBYTE)(dwIOAddress)); \
volatile BYTE* pbyAddr = ((unsigned char *)(dwIOAddress)); \
writeb((BYTE)byData, pbyAddr); \
}
......
drivers/staging/vt6655/vntwifi.c
View file @ 2989e96f
......@@ -497,10 +497,10 @@ VNTWIFIvGetNextBSS (
void
VNTWIFIvUpdateNodeTxCounter(
void *pMgmtHandle,
PBYTE pbyDestAddress,
unsigned char *pbyDestAddress,
BOOL bTxOk,
WORD wRate,
PBYTE pbyTxFailCount
unsigned char *pbyTxFailCount
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -532,11 +532,11 @@ VNTWIFIvUpdateNodeTxCounter(
void
VNTWIFIvGetTxRate(
void *pMgmtHandle,
PBYTE pbyDestAddress,
unsigned char *pbyDestAddress,
PWORD pwTxDataRate,
PBYTE pbyACKRate,
PBYTE pbyCCKBasicRate,
PBYTE pbyOFDMBasicRate
unsigned char *pbyACKRate,
unsigned char *pbyCCKBasicRate,
unsigned char *pbyOFDMBasicRate
)
{
PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
......@@ -721,11 +721,11 @@ VNTWIFIbMeasureReport(
BYTE byReportMode,
BYTE byBasicMap,
BYTE byCCAFraction,
PBYTE pbyRPIs
unsigned char *pbyRPIs
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
PBYTE pbyCurrentEID = (PBYTE) (pMgmt->pCurrMeasureEIDRep);
unsigned char *pbyCurrentEID = (unsigned char *) (pMgmt->pCurrMeasureEIDRep);
//spin_lock_irq(&pDevice->lock);
if ((pvMeasureEID != NULL) &&
......
drivers/staging/vt6655/vntwifi.h
View file @ 2989e96f
......@@ -229,21 +229,21 @@ VNTWIFIvGetNextBSS (
void
VNTWIFIvUpdateNodeTxCounter(
void *pMgmtHandle,
PBYTE pbyDestAddress,
unsigned char *pbyDestAddress,
BOOL bTxOk,
WORD wRate,
PBYTE pbyTxFailCount
unsigned char *pbyTxFailCount
);
void
VNTWIFIvGetTxRate(
void *pMgmtHandle,
PBYTE pbyDestAddress,
unsigned char *pbyDestAddress,
PWORD pwTxDataRate,
PBYTE pbyACKRate,
PBYTE pbyCCKBasicRate,
PBYTE pbyOFDMBasicRate
unsigned char *pbyACKRate,
unsigned char *pbyCCKBasicRate,
unsigned char *pbyOFDMBasicRate
);
/*
BOOL
......@@ -294,7 +294,7 @@ VNTWIFIbMeasureReport(
BYTE byReportMode,
BYTE byBasicMap,
BYTE byCCAFraction,
PBYTE pbyRPIs
unsigned char *pbyRPIs
);
BOOL
......
drivers/staging/vt6655/wcmd.c
View file @ 2989e96f
......@@ -77,7 +77,7 @@ PSTxMgmtPacket
s_MgrMakeProbeRequest(
PSDevice pDevice,
PSMgmtObject pMgmt,
PBYTE pScanBSSID,
unsigned char *pScanBSSID,
PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
......@@ -213,7 +213,7 @@ s_vProbeChannel(
//6M, 9M, 12M, 48M
BYTE abyCurrSuppRatesA[] = {WLAN_EID_SUPP_RATES, 8, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
BYTE abyCurrSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
PBYTE pbyRate;
unsigned char *pbyRate;
PSTxMgmtPacket pTxPacket;
PSMgmtObject pMgmt = pDevice->pMgmt;
unsigned int ii;
......@@ -269,7 +269,7 @@ PSTxMgmtPacket
s_MgrMakeProbeRequest(
PSDevice pDevice,
PSMgmtObject pMgmt,
PBYTE pScanBSSID,
unsigned char *pScanBSSID,
PWLAN_IE_SSID pSSID,
PWLAN_IE_SUPP_RATES pCurrRates,
PWLAN_IE_SUPP_RATES pCurrExtSuppRates
......@@ -282,8 +282,8 @@ s_MgrMakeProbeRequest(
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyMgmtPacketPool;
memset(pTxPacket, 0, sizeof(STxMgmtPacket) + WLAN_PROBEREQ_FR_MAXLEN);
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
sFrame.pBuf = (PBYTE)pTxPacket->p80211Header;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((unsigned char *)pTxPacket + sizeof(STxMgmtPacket));
sFrame.pBuf = (unsigned char *)pTxPacket->p80211Header;
sFrame.len = WLAN_PROBEREQ_FR_MAXLEN;
vMgrEncodeProbeRequest(&sFrame);
sFrame.pHdr->sA3.wFrameCtl = cpu_to_le16(
......@@ -982,7 +982,7 @@ s_bCommandComplete (
BOOL bScheduleCommand (
void *hDeviceContext,
CMD_CODE eCommand,
PBYTE pbyItem0
unsigned char *pbyItem0
)
{
PSDevice pDevice = (PSDevice)hDeviceContext;
......
drivers/staging/vt6655/wcmd.h
View file @ 2989e96f
......@@ -127,7 +127,7 @@ BOOL
bScheduleCommand(
void *hDeviceContext,
CMD_CODE eCommand,
PBYTE pbyItem0
unsigned char *pbyItem0
);
void
......
drivers/staging/vt6655/wctl.c
View file @ 2989e96f
......@@ -205,7 +205,7 @@ unsigned int uHeaderSize;
}
}
// reserve 4 byte to match MAC RX Buffer
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer = (PBYTE) (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].skb->data + 4);
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer = (unsigned char *) (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].skb->data + 4);
memcpy(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer, pMACHeader, cbFrameLength);
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength = cbFrameLength;
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += cbFrameLength;
......@@ -220,7 +220,7 @@ unsigned int uHeaderSize;
(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum == (pMACHeader->wSeqCtl & 0x000F)) &&
((pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength + cbFrameLength - uHeaderSize) < 2346)) {
memcpy(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer, ((PBYTE) (pMACHeader) + uHeaderSize), (cbFrameLength - uHeaderSize));
memcpy(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer, ((unsigned char *) (pMACHeader) + uHeaderSize), (cbFrameLength - uHeaderSize));
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength += (cbFrameLength - uHeaderSize);
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += (cbFrameLength - uHeaderSize);
pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++;
......
drivers/staging/vt6655/wmgr.c
View file @ 2989e96f
This diff is collapsed.
drivers/staging/vt6655/wmgr.h
View file @ 2989e96f
......@@ -332,7 +332,7 @@ typedef struct tagSMgmtObject
WORD wListenInterval;
WORD wCountToWakeUp;
BOOL bInTIMWake;
PBYTE pbyPSPacketPool;
unsigned char *pbyPSPacketPool;
BYTE byPSPacketPool[sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN];
BOOL bRxBeaconInTBTTWake;
BYTE abyPSTxMap[MAX_NODE_NUM + 1];
......@@ -342,7 +342,7 @@ typedef struct tagSMgmtObject
unsigned int uCmdHostAPBusy;
// management packet pool
PBYTE pbyMgmtPacketPool;
unsigned char *pbyMgmtPacketPool;
BYTE byMgmtPacketPool[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
......@@ -432,7 +432,7 @@ void
vMgrDisassocBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PBYTE abyDestAddress,
unsigned char *abyDestAddress,
WORD wReason,
PCMD_STATUS pStatus
);
......@@ -475,7 +475,7 @@ void
vMgrDeAuthenBeginSta(
void *hDeviceContext,
PSMgmtObject pMgmt,
PBYTE abyDestAddress,
unsigned char *abyDestAddress,
WORD wReason,
PCMD_STATUS pStatus
);
......@@ -490,7 +490,7 @@ bMgrPrepareBeaconToSend(
BOOL
bAdd_PMKID_Candidate (
void *hDeviceContext,
PBYTE pbyBSSID,
unsigned char *pbyBSSID,
PSRSNCapObject psRSNCapObj
);
......
drivers/staging/vt6655/wpa.c
View file @ 2989e96f
......@@ -112,7 +112,7 @@ WPA_ParseRSN (
{
PWLAN_IE_RSN_AUTH pIE_RSN_Auth = NULL;
int i, j, m, n = 0;
PBYTE pbyCaps;
unsigned char *pbyCaps;
WPA_ClearRSN(pBSSList);
......@@ -207,7 +207,7 @@ WPA_ParseRSN (
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"14+4+(m+n)*4: %d\n", 14+4+(m+n)*4);
if(pRSN->len+2 >= 14+4+(m+n)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*n)+Cap(2)
pbyCaps = (PBYTE)pIE_RSN_Auth->AuthKSList[n].abyOUI;
pbyCaps = (unsigned char *)pIE_RSN_Auth->AuthKSList[n].abyOUI;
pBSSList->byDefaultK_as_PK = (*pbyCaps) & WPA_GROUPFLAG;
pBSSList->byReplayIdx = 2 << ((*pbyCaps >> WPA_REPLAYBITSSHIFT) & WPA_REPLAYBITS);
pBSSList->sRSNCapObj.bRSNCapExist = TRUE;
......
drivers/staging/vt6655/wpa2.c
View file @ 2989e96f
......@@ -115,7 +115,7 @@ WPA2vParseRSN (
{
int i, j;
WORD m = 0, n = 0;
PBYTE pbyOUI;
unsigned char *pbyOUI;
BOOL bUseGK = FALSE;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len);
......@@ -268,7 +268,7 @@ WPA2uSetIEs(
)
{
PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
PBYTE pbyBuffer = NULL;
unsigned char *pbyBuffer = NULL;
unsigned int ii = 0;
PWORD pwPMKID = NULL;
......@@ -279,7 +279,7 @@ WPA2uSetIEs(
(pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
(pMgmt->pCurrBSS != NULL)) {
/* WPA2 IE */
pbyBuffer = (PBYTE) pRSNIEs;
pbyBuffer = (unsigned char *) pRSNIEs;
pRSNIEs->byElementID = WLAN_EID_RSN;
pRSNIEs->len = 6; //Version(2)+GK(4)
pRSNIEs->wVersion = 1;
......
drivers/staging/vt6655/wpactl.c
View file @ 2989e96f
......@@ -359,7 +359,7 @@ spin_lock_irq(&pDevice->lock);
dwKeyIndex,
param->u.wpa_key.key_len,
(PQWORD) &(KeyRSC),
(PBYTE)abyKey,
(unsigned char *)abyKey,
byKeyDecMode,
pDevice->PortOffset,
pDevice->byLocalID) == TRUE) &&
......@@ -367,7 +367,7 @@ spin_lock_irq(&pDevice->lock);
dwKeyIndex,
param->u.wpa_key.key_len,
(PQWORD) &(KeyRSC),
(PBYTE)abyKey,
(unsigned char *)abyKey,
byKeyDecMode,
pDevice->PortOffset,
pDevice->byLocalID) == TRUE) ) {
......@@ -400,7 +400,7 @@ spin_lock_irq(&pDevice->lock);
dwKeyIndex,
param->u.wpa_key.key_len,
(PQWORD) &(KeyRSC),
(PBYTE)abyKey,
(unsigned char *)abyKey,
byKeyDecMode,
pDevice->PortOffset,
pDevice->byLocalID) == TRUE) {
......@@ -613,13 +613,13 @@ static int wpa_get_scan(PSDevice pDevice,
PSMgmtObject pMgmt = pDevice->pMgmt;
PWLAN_IE_SSID pItemSSID;
PKnownBSS pBSS;
PBYTE pBuf;
unsigned char *pBuf;
int ret = 0;
u16 count = 0;
u16 ii, jj;
#if 1
PBYTE ptempBSS;
unsigned char *ptempBSS;
......@@ -713,7 +713,7 @@ static int wpa_get_scan(PSDevice pDevice,
scan_buf->rsn_ie_len = pBSS->wRSNLen;
memcpy(scan_buf->rsn_ie, pBSS->byRSNIE, pBSS->wRSNLen);
}
scan_buf = (struct viawget_scan_result *)((PBYTE)scan_buf + sizeof(struct viawget_scan_result));
scan_buf = (struct viawget_scan_result *)((unsigned char *)scan_buf + sizeof(struct viawget_scan_result));
jj ++;
}
}
......
drivers/staging/vt6655/wroute.c
View file @ 2989e96f
......@@ -65,7 +65,7 @@ static int msglevel =MSG_LEVEL_INFO;
* Return Value: TRUE if packet duplicate; otherwise FALSE
*
*/
BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex)
BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex)
{
PSMgmtObject pMgmt = pDevice->pMgmt;
PSTxDesc pHeadTD, pLastTD;
......@@ -77,7 +77,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, unsigned int uDataLen, uns
PSKeyItem pTransmitKey = NULL;
unsigned int cbHeaderSize;
unsigned int ii;
PBYTE pbyBSSID;
unsigned char *pbyBSSID;
......@@ -91,7 +91,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, unsigned int uDataLen, uns
pHeadTD->m_td1TD1.byTCR = (TCR_EDP|TCR_STP);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)pbySkbData, ETH_HLEN);
memcpy(pDevice->sTxEthHeader.abyDstAddr, (unsigned char *)pbySkbData, ETH_HLEN);
cbFrameBodySize = uDataLen - ETH_HLEN;
......
drivers/staging/vt6655/wroute.h
View file @ 2989e96f
......@@ -39,7 +39,7 @@
/*--------------------- Export Functions --------------------------*/
BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex);
BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex);
#endif // __WROUTE_H__
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7