diff options
author | Charles Clément <caratorn@gmail.com> | 2010-06-24 14:02:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-24 17:23:17 -0400 |
commit | 0f4c60d61e9c10a0733eacd650c101189bdf75cd (patch) | |
tree | 88cd18c474739648e45ec68e303c0f7351ee546c /drivers/staging/vt6655/card.c | |
parent | 17701d14b613b8495cdd8b803c22d3f33d1face8 (diff) |
Staging: vt6655: remove DWORD typedef
Replace all occurrences with unsigned long type, except for pointer fields that
should be u32 in packed structures and 8-byte-aligned 8 byte long structure
QWORD.
Thanks to Jiri Slaby for pointing out that simply replacing by unsigned long is
wrong on x86-64 arch.
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/card.c')
-rw-r--r-- | drivers/staging/vt6655/card.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 747f8d3d142..3997206668c 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c | |||
@@ -1336,7 +1336,7 @@ CARDbSetQuiet ( | |||
1336 | pDevice->sQuiet[pDevice->uQuietEnqueue].bEnable = TRUE; | 1336 | pDevice->sQuiet[pDevice->uQuietEnqueue].bEnable = TRUE; |
1337 | pDevice->sQuiet[pDevice->uQuietEnqueue].byPeriod = byQuietPeriod; | 1337 | pDevice->sQuiet[pDevice->uQuietEnqueue].byPeriod = byQuietPeriod; |
1338 | pDevice->sQuiet[pDevice->uQuietEnqueue].wDuration = wQuietDuration; | 1338 | pDevice->sQuiet[pDevice->uQuietEnqueue].wDuration = wQuietDuration; |
1339 | pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime = (DWORD) byQuietCount; | 1339 | pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime = (unsigned long) byQuietCount; |
1340 | pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime *= pDevice->wBeaconInterval; | 1340 | pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime *= pDevice->wBeaconInterval; |
1341 | pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime += wQuietOffset; | 1341 | pDevice->sQuiet[pDevice->uQuietEnqueue].dwStartTime += wQuietOffset; |
1342 | pDevice->uQuietEnqueue++; | 1342 | pDevice->uQuietEnqueue++; |
@@ -1372,11 +1372,11 @@ CARDbStartQuiet ( | |||
1372 | { | 1372 | { |
1373 | PSDevice pDevice = (PSDevice) pDeviceHandler; | 1373 | PSDevice pDevice = (PSDevice) pDeviceHandler; |
1374 | unsigned int ii = 0; | 1374 | unsigned int ii = 0; |
1375 | DWORD dwStartTime = 0xFFFFFFFF; | 1375 | unsigned long dwStartTime = 0xFFFFFFFF; |
1376 | unsigned int uCurrentQuietIndex = 0; | 1376 | unsigned int uCurrentQuietIndex = 0; |
1377 | DWORD dwNextTime = 0; | 1377 | unsigned long dwNextTime = 0; |
1378 | DWORD dwGap = 0; | 1378 | unsigned long dwGap = 0; |
1379 | DWORD dwDuration = 0; | 1379 | unsigned long dwDuration = 0; |
1380 | 1380 | ||
1381 | for(ii=0;ii<MAX_QUIET_COUNT;ii++) { | 1381 | for(ii=0;ii<MAX_QUIET_COUNT;ii++) { |
1382 | if ((pDevice->sQuiet[ii].bEnable == TRUE) && | 1382 | if ((pDevice->sQuiet[ii].bEnable == TRUE) && |
@@ -1434,7 +1434,7 @@ CARDbStartQuiet ( | |||
1434 | pDevice->sQuiet[uCurrentQuietIndex].bEnable = FALSE; | 1434 | pDevice->sQuiet[uCurrentQuietIndex].bEnable = FALSE; |
1435 | } else { | 1435 | } else { |
1436 | // set next period start time | 1436 | // set next period start time |
1437 | dwNextTime = (DWORD) pDevice->sQuiet[uCurrentQuietIndex].byPeriod; | 1437 | dwNextTime = (unsigned long) pDevice->sQuiet[uCurrentQuietIndex].byPeriod; |
1438 | dwNextTime *= pDevice->wBeaconInterval; | 1438 | dwNextTime *= pDevice->wBeaconInterval; |
1439 | pDevice->sQuiet[uCurrentQuietIndex].dwStartTime = dwNextTime; | 1439 | pDevice->sQuiet[uCurrentQuietIndex].dwStartTime = dwNextTime; |
1440 | } | 1440 | } |
@@ -2063,8 +2063,8 @@ QWORD CARDqGetTSFOffset (BYTE byRxRate, QWORD qwTSF1, QWORD qwTSF2) | |||
2063 | HIDWORD(qwTSFOffset) = 0; | 2063 | HIDWORD(qwTSFOffset) = 0; |
2064 | LODWORD(qwTSFOffset) = 0; | 2064 | LODWORD(qwTSFOffset) = 0; |
2065 | wRxBcnTSFOffst = cwRXBCNTSFOff[byRxRate%MAX_RATE]; | 2065 | wRxBcnTSFOffst = cwRXBCNTSFOff[byRxRate%MAX_RATE]; |
2066 | (qwTSF2).u.dwLowDword += (DWORD)(wRxBcnTSFOffst); | 2066 | (qwTSF2).u.dwLowDword += (unsigned long)(wRxBcnTSFOffst); |
2067 | if ((qwTSF2).u.dwLowDword < (DWORD)(wRxBcnTSFOffst)) { | 2067 | if ((qwTSF2).u.dwLowDword < (unsigned long)(wRxBcnTSFOffst)) { |
2068 | (qwTSF2).u.dwHighDword++; | 2068 | (qwTSF2).u.dwHighDword++; |
2069 | } | 2069 | } |
2070 | LODWORD(qwTSFOffset) = LODWORD(qwTSF1) - LODWORD(qwTSF2); | 2070 | LODWORD(qwTSFOffset) = LODWORD(qwTSF1) - LODWORD(qwTSF2); |