Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 205723
b: refs/heads/master
c: 412b2d0
h: refs/heads/master
i:
  205721: d907c05
  205719: ce37691
v: v3
  • Loading branch information
Charles Clément authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent 9ea856e commit aac438c
Show file tree
Hide file tree
Showing 14 changed files with 195 additions and 197 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dec572cbe67598080f7beb00279db1a5590cec35
refs/heads/master: 412b2d08b93165303d698267d1eeac19e14e67a4
30 changes: 15 additions & 15 deletions trunk/drivers/staging/vt6655/baseband.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,7 @@ BBvCaculateParameter (
* Return Value: TRUE if succeeded; FALSE if failed.
*
*/
BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
BOOL BBbReadEmbeded (unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
{
WORD ww;
BYTE byValue;
Expand Down Expand Up @@ -2058,7 +2058,7 @@ BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData)
* Return Value: TRUE if succeeded; FALSE if failed.
*
*/
BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData)
BOOL BBbWriteEmbeded (unsigned long dwIoBase, BYTE byBBAddr, BYTE byData)
{
WORD ww;
BYTE byValue;
Expand Down Expand Up @@ -2100,7 +2100,7 @@ BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData)
* Return Value: TRUE if all TestBits are set; FALSE otherwise.
*
*/
BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
BOOL BBbIsRegBitsOn (unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits)
{
BYTE byOrgData;

Expand All @@ -2123,7 +2123,7 @@ BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
* Return Value: TRUE if all TestBits are clear; FALSE otherwise.
*
*/
BOOL BBbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits)
BOOL BBbIsRegBitsOff (unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits)
{
BYTE byOrgData;

Expand All @@ -2150,7 +2150,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
{
BOOL bResult = TRUE;
int ii;
DWORD_PTR dwIoBase = pDevice->PortOffset;
unsigned long dwIoBase = pDevice->PortOffset;
BYTE byRFType = pDevice->byRFType;
BYTE byLocalID = pDevice->byLocalID;

Expand Down Expand Up @@ -2321,7 +2321,7 @@ BOOL BBbVT3253Init (PSDevice pDevice)
* Return Value: none
*
*/
void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs)
void BBvReadAllRegs (unsigned long dwIoBase, unsigned char *pbyBBRegs)
{
int ii;
BYTE byBase = 1;
Expand Down Expand Up @@ -2349,7 +2349,7 @@ void BBvReadAllRegs (DWORD_PTR dwIoBase, unsigned char *pbyBBRegs)
void BBvLoopbackOn (PSDevice pDevice)
{
BYTE byData;
DWORD_PTR dwIoBase = pDevice->PortOffset;
unsigned long dwIoBase = pDevice->PortOffset;

//CR C9 = 0x00
BBbReadEmbeded(dwIoBase, 0xC9, &pDevice->byBBCRc9);//CR201
Expand Down Expand Up @@ -2403,7 +2403,7 @@ void BBvLoopbackOn (PSDevice pDevice)
void BBvLoopbackOff (PSDevice pDevice)
{
BYTE byData;
DWORD_PTR dwIoBase = pDevice->PortOffset;
unsigned long dwIoBase = pDevice->PortOffset;

BBbWriteEmbeded(dwIoBase, 0xC9, pDevice->byBBCRc9);//CR201
BBbWriteEmbeded(dwIoBase, 0x88, pDevice->byBBCR88);//CR136
Expand Down Expand Up @@ -2495,7 +2495,7 @@ void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
*
*/
void
BBvSoftwareReset (DWORD_PTR dwIoBase)
BBvSoftwareReset (unsigned long dwIoBase)
{
BBbWriteEmbeded(dwIoBase, 0x50, 0x40);
BBbWriteEmbeded(dwIoBase, 0x50, 0);
Expand All @@ -2516,7 +2516,7 @@ BBvSoftwareReset (DWORD_PTR dwIoBase)
*
*/
void
BBvPowerSaveModeON (DWORD_PTR dwIoBase)
BBvPowerSaveModeON (unsigned long dwIoBase)
{
BYTE byOrgData;

Expand All @@ -2538,7 +2538,7 @@ BBvPowerSaveModeON (DWORD_PTR dwIoBase)
*
*/
void
BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
BBvPowerSaveModeOFF (unsigned long dwIoBase)
{
BYTE byOrgData;

Expand All @@ -2562,7 +2562,7 @@ BBvPowerSaveModeOFF (DWORD_PTR dwIoBase)
*/

void
BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
BBvSetTxAntennaMode (unsigned long dwIoBase, BYTE byAntennaMode)
{
BYTE byBBTxConf;

Expand Down Expand Up @@ -2604,7 +2604,7 @@ BBvSetTxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
*/

void
BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
BBvSetRxAntennaMode (unsigned long dwIoBase, BYTE byAntennaMode)
{
BYTE byBBRxConf;

Expand Down Expand Up @@ -2635,14 +2635,14 @@ BBvSetRxAntennaMode (DWORD_PTR dwIoBase, BYTE byAntennaMode)
*
*/
void
BBvSetDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
BBvSetDeepSleep (unsigned long dwIoBase, BYTE byLocalID)
{
BBbWriteEmbeded(dwIoBase, 0x0C, 0x17);//CR12
BBbWriteEmbeded(dwIoBase, 0x0D, 0xB9);//CR13
}

void
BBvExitDeepSleep (DWORD_PTR dwIoBase, BYTE byLocalID)
BBvExitDeepSleep (unsigned long dwIoBase, BYTE byLocalID)
{
BBbWriteEmbeded(dwIoBase, 0x0C, 0x00);//CR12
BBbWriteEmbeded(dwIoBase, 0x0D, 0x01);//CR13
Expand Down
24 changes: 12 additions & 12 deletions trunk/drivers/staging/vt6655/baseband.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,26 +137,26 @@ BBvCaculateParameter (
unsigned char *pbyPhySgn
);

BOOL BBbReadEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, unsigned char *pbyData);
BOOL BBbWriteEmbeded(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData);
BOOL BBbReadEmbeded(unsigned long dwIoBase, BYTE byBBAddr, unsigned char *pbyData);
BOOL BBbWriteEmbeded(unsigned long dwIoBase, BYTE byBBAddr, BYTE byData);

void BBvReadAllRegs(DWORD_PTR dwIoBase, unsigned char *pbyBBRegs);
void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs);
void BBvLoopbackOn(PSDevice pDevice);
void BBvLoopbackOff(PSDevice pDevice);
void BBvSetShortSlotTime(PSDevice pDevice);
BOOL BBbIsRegBitsOn(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits);
BOOL BBbIsRegBitsOff(DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits);
BOOL BBbIsRegBitsOn(unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits);
BOOL BBbIsRegBitsOff(unsigned long dwIoBase, BYTE byBBAddr, BYTE byTestBits);
void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData);

// VT3253 Baseband
BOOL BBbVT3253Init(PSDevice pDevice);
void BBvSoftwareReset(DWORD_PTR dwIoBase);
void BBvPowerSaveModeON(DWORD_PTR dwIoBase);
void BBvPowerSaveModeOFF(DWORD_PTR dwIoBase);
void BBvSetTxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
void BBvSetRxAntennaMode(DWORD_PTR dwIoBase, BYTE byAntennaMode);
void BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
void BBvSoftwareReset(unsigned long dwIoBase);
void BBvPowerSaveModeON(unsigned long dwIoBase);
void BBvPowerSaveModeOFF(unsigned long dwIoBase);
void BBvSetTxAntennaMode(unsigned long dwIoBase, BYTE byAntennaMode);
void BBvSetRxAntennaMode(unsigned long dwIoBase, BYTE byAntennaMode);
void BBvSetDeepSleep(unsigned long dwIoBase, BYTE byLocalID);
void BBvExitDeepSleep(unsigned long dwIoBase, BYTE byLocalID);

// timer for antenna diversity

Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/vt6655/card.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@ BYTE CARDbyGetPktType (void *pDeviceHandler)
* Return Value: none
*
*/
void CARDvSetLoopbackMode (DWORD_PTR dwIoBase, WORD wLoopbackMode)
void CARDvSetLoopbackMode (unsigned long dwIoBase, WORD wLoopbackMode)
{
switch(wLoopbackMode) {
case CARD_LB_NONE:
Expand Down Expand Up @@ -2092,7 +2092,7 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2)
* Return Value: TRUE if success; otherwise FALSE
*
*/
BOOL CARDbGetCurrentTSF (DWORD_PTR dwIoBase, PQWORD pqwCurrTSF)
BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF)
{
WORD ww;
BYTE byData;
Expand Down Expand Up @@ -2170,7 +2170,7 @@ QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval)
* Return Value: none
*
*/
void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval)
void CARDvSetFirstNextTBTT (unsigned long dwIoBase, WORD wBeaconInterval)
{

QWORD qwNextTBTT;
Expand Down Expand Up @@ -2203,7 +2203,7 @@ void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval)
* Return Value: none
*
*/
void CARDvUpdateNextTBTT (DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
void CARDvUpdateNextTBTT (unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
{

qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/vt6655/card.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ void vUpdateIFS(void *pDeviceHandler);
void CARDvUpdateBasicTopRate(void *pDeviceHandler);
BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler);
void CARDvSetLoopbackMode(DWORD_PTR dwIoBase, WORD wLoopbackMode);
void CARDvSetLoopbackMode(unsigned long dwIoBase, WORD wLoopbackMode);
BOOL CARDbSoftwareReset(void *pDeviceHandler);
void CARDvSetFirstNextTBTT(DWORD_PTR dwIoBase, WORD wBeaconInterval);
void CARDvUpdateNextTBTT(DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
BOOL CARDbGetCurrentTSF(DWORD_PTR dwIoBase, PQWORD pqwCurrTSF);
void CARDvSetFirstNextTBTT(unsigned long dwIoBase, WORD wBeaconInterval);
void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, WORD wBeaconInterval);
BOOL CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF);
QWORD CARDqGetNextTBTT(QWORD qwTSF, WORD wBeaconInterval);
QWORD CARDqGetTSFOffset(BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2);
BOOL CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower);
Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/staging/vt6655/key.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static int msglevel =MSG_LEVEL_INFO;

/*--------------------- Static Functions --------------------------*/
static void
s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
s_vCheckKeyTableValid (PSKeyManagement pTable, unsigned long dwIoBase)
{
int i;

Expand Down Expand Up @@ -96,7 +96,7 @@ s_vCheckKeyTableValid (PSKeyManagement pTable, DWORD_PTR dwIoBase)
* Return Value: none
*
*/
void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
void KeyvInitTable (PSKeyManagement pTable, unsigned long dwIoBase)
{
int i;
int jj;
Expand Down Expand Up @@ -197,7 +197,7 @@ BOOL KeybSetKey (
PQWORD pKeyRSC,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
unsigned long dwIoBase,
BYTE byLocalID
)
{
Expand Down Expand Up @@ -366,7 +366,7 @@ BOOL KeybRemoveKey (
PSKeyManagement pTable,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
DWORD_PTR dwIoBase
unsigned long dwIoBase
)
{
int i;
Expand Down Expand Up @@ -438,7 +438,7 @@ BOOL KeybRemoveKey (
BOOL KeybRemoveAllKey (
PSKeyManagement pTable,
unsigned char *pbyBSSID,
DWORD_PTR dwIoBase
unsigned long dwIoBase
)
{
int i,u;
Expand Down Expand Up @@ -473,7 +473,7 @@ BOOL KeybRemoveAllKey (
void KeyvRemoveWEPKey (
PSKeyManagement pTable,
DWORD dwKeyIndex,
DWORD_PTR dwIoBase
unsigned long dwIoBase
)
{

Expand All @@ -494,7 +494,7 @@ void KeyvRemoveWEPKey (

void KeyvRemoveAllWEPKey (
PSKeyManagement pTable,
DWORD_PTR dwIoBase
unsigned long dwIoBase
)
{
int i;
Expand Down Expand Up @@ -638,7 +638,7 @@ BOOL KeybSetDefaultKey (
PQWORD pKeyRSC,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
unsigned long dwIoBase,
BYTE byLocalID
)
{
Expand Down Expand Up @@ -745,7 +745,7 @@ BOOL KeybSetAllGroupKey (
PQWORD pKeyRSC,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
unsigned long dwIoBase,
BYTE byLocalID
)
{
Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/staging/vt6655/key.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ typedef struct tagSKeyManagement

/*--------------------- Export Functions --------------------------*/

void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase);
void KeyvInitTable(PSKeyManagement pTable, unsigned long dwIoBase);

BOOL KeybGetKey(
PSKeyManagement pTable,
Expand All @@ -118,7 +118,7 @@ BOOL KeybSetKey(
PQWORD pKeyRSC,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
unsigned long dwIoBase,
BYTE byLocalID
);

Expand All @@ -129,15 +129,15 @@ BOOL KeybSetDefaultKey(
PQWORD pKeyRSC,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
unsigned long dwIoBase,
BYTE byLocalID
);

BOOL KeybRemoveKey(
PSKeyManagement pTable,
unsigned char *pbyBSSID,
DWORD dwKeyIndex,
DWORD_PTR dwIoBase
unsigned long dwIoBase
);

BOOL KeybGetTransmitKey(
Expand All @@ -155,18 +155,18 @@ BOOL KeybCheckPairewiseKey(
BOOL KeybRemoveAllKey(
PSKeyManagement pTable,
unsigned char *pbyBSSID,
DWORD_PTR dwIoBase
unsigned long dwIoBase
);

void KeyvRemoveWEPKey(
PSKeyManagement pTable,
DWORD dwKeyIndex,
DWORD_PTR dwIoBase
unsigned long dwIoBase
);

void KeyvRemoveAllWEPKey(
PSKeyManagement pTable,
DWORD_PTR dwIoBase
unsigned long dwIoBase
);

BOOL KeybSetAllGroupKey (
Expand All @@ -176,7 +176,7 @@ BOOL KeybSetAllGroupKey (
PQWORD pKeyRSC,
unsigned char *pbyKey,
BYTE byKeyDecMode,
DWORD_PTR dwIoBase,
unsigned long dwIoBase,
BYTE byLocalID
);

Expand Down
Loading

0 comments on commit aac438c

Please sign in to comment.