mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 06:21:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename u32 to up32, u32 is a type in Linux

Browse Source 
This fixes compilation on sh64.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4027 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2009-05-24 05:00:20 +00:00
parent 1988f5f45e
commit 4f4275f9dc
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ath_hal/ar5210/ar5210_misc.c
View File

@ -330,11 +330,11 @@ ar5210WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
uint64_t uint64_t
ar5210GetTsf64(struct ath_hal *ah) ar5210GetTsf64(struct ath_hal *ah)
{ {
uint32_t low1, low2, u32; uint32_t low1, low2, up32;
/* sync multi-word read */ /* sync multi-word read */
low1 = OS_REG_READ(ah, AR_TSF_L32); low1 = OS_REG_READ(ah, AR_TSF_L32);
u32 = OS_REG_READ(ah, AR_TSF_U32); up32 = OS_REG_READ(ah, AR_TSF_U32);
low2 = OS_REG_READ(ah, AR_TSF_L32); low2 = OS_REG_READ(ah, AR_TSF_L32);
if (low2 < low1) { /* roll over */ if (low2 < low1) { /* roll over */
/* /*
@ -347,9 +347,9 @@ ar5210GetTsf64(struct ath_hal *ah)
* read which can be noticeable when doing things * read which can be noticeable when doing things
* like timestamping packets in monitor mode. * like timestamping packets in monitor mode.
*/ */
u32++; up32++;
} }
return (((uint64_t) u32) << 32) | ((uint64_t) low2); return (((uint64_t) up32) << 32) | ((uint64_t) low2);
} }
/* /*

8
ath_hal/ar5211/ar5211_misc.c
View File

@ -327,11 +327,11 @@ ar5211WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
uint64_t uint64_t
ar5211GetTsf64(struct ath_hal *ah) ar5211GetTsf64(struct ath_hal *ah)
{ {
uint32_t low1, low2, u32; uint32_t low1, low2, up32;
/* sync multi-word read */ /* sync multi-word read */
low1 = OS_REG_READ(ah, AR_TSF_L32); low1 = OS_REG_READ(ah, AR_TSF_L32);
u32 = OS_REG_READ(ah, AR_TSF_U32); up32 = OS_REG_READ(ah, AR_TSF_U32);
low2 = OS_REG_READ(ah, AR_TSF_L32); low2 = OS_REG_READ(ah, AR_TSF_L32);
if (low2 < low1) { /* roll over */ if (low2 < low1) { /* roll over */
/* /*
@ -344,9 +344,9 @@ ar5211GetTsf64(struct ath_hal *ah)
* read which can be noticeable when doing things * read which can be noticeable when doing things
* like timestamping packets in monitor mode. * like timestamping packets in monitor mode.
*/ */
u32++; up32++;
} }
return (((uint64_t) u32) << 32) | ((uint64_t) low2); return (((uint64_t) up32) << 32) | ((uint64_t) low2);
} }
/* /*

8
ath_hal/ar5212/ar5212_misc.c
View File

@ -235,11 +235,11 @@ ar5212WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
uint64_t uint64_t
ar5212GetTsf64(struct ath_hal *ah) ar5212GetTsf64(struct ath_hal *ah)
{ {
uint32_t low1, low2, u32; uint32_t low1, low2, up32;
/* sync multi-word read */ /* sync multi-word read */
low1 = OS_REG_READ(ah, AR_TSF_L32); low1 = OS_REG_READ(ah, AR_TSF_L32);
u32 = OS_REG_READ(ah, AR_TSF_U32); up32 = OS_REG_READ(ah, AR_TSF_U32);
low2 = OS_REG_READ(ah, AR_TSF_L32); low2 = OS_REG_READ(ah, AR_TSF_L32);
if (low2 < low1) { /* roll over */ if (low2 < low1) { /* roll over */
/* /*
@ -252,9 +252,9 @@ ar5212GetTsf64(struct ath_hal *ah)
* which can be noticeable when doing things like * which can be noticeable when doing things like
* timestamping packets in monitor mode. * timestamping packets in monitor mode.
*/ */
u32++; up32++;
} }
return (((uint64_t) u32) << 32) | ((uint64_t) low2); return (((uint64_t) up32) << 32) | ((uint64_t) low2);
} }
/* /*