Rename u32 to up32, u32 is a type in Linux

This fixes compilation on sh64.

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4027 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath_hal/ar5210/ar5210_misc.c b/ath_hal/ar5210/ar5210_misc.c
index a6739171cfb8971e26a35eb7c43f3f13734813c1..f22a51af1a9c705acd46ffe2e9a9195610a4f81c 100644 (file)
--- a/ath_hal/ar5210/ar5210_misc.c
+++ b/ath_hal/ar5210/ar5210_misc.c
@@ -330,11 +330,11 @@ ar5210WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
 uint64_t
 ar5210GetTsf64(struct ath_hal *ah)
 {
-       uint32_t low1, low2, u32;
+       uint32_t low1, low2, up32;
 
        /* sync multi-word read */
        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);
        if (low2 < low1) {      /* roll over */
                /*
@@ -347,9 +347,9 @@ ar5210GetTsf64(struct ath_hal *ah)
                 * read which can be noticeable when doing things
                 * like timestamping packets in monitor mode.
                 */
-               u32++;
+               up32++;
        }
-       return (((uint64_t) u32) << 32) | ((uint64_t) low2);
+       return (((uint64_t) up32) << 32) | ((uint64_t) low2);
 }
 
 /*

diff --git a/ath_hal/ar5211/ar5211_misc.c b/ath_hal/ar5211/ar5211_misc.c
index b16b4b8e01c06ecf5021ca06c53d4ead8c06ecf0..593db7848967bcf31164be1d56963017ec63db0e 100644 (file)
--- a/ath_hal/ar5211/ar5211_misc.c
+++ b/ath_hal/ar5211/ar5211_misc.c
@@ -327,11 +327,11 @@ ar5211WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
 uint64_t
 ar5211GetTsf64(struct ath_hal *ah)
 {
-       uint32_t low1, low2, u32;
+       uint32_t low1, low2, up32;
 
        /* sync multi-word read */
        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);
        if (low2 < low1) {      /* roll over */
                /*
@@ -344,9 +344,9 @@ ar5211GetTsf64(struct ath_hal *ah)
                 * read which can be noticeable when doing things
                 * like timestamping packets in monitor mode.
                 */
-               u32++;
+               up32++;
        }
-       return (((uint64_t) u32) << 32) | ((uint64_t) low2);
+       return (((uint64_t) up32) << 32) | ((uint64_t) low2);
 }
 
 /*

diff --git a/ath_hal/ar5212/ar5212_misc.c b/ath_hal/ar5212/ar5212_misc.c
index fa4f1ab23092cc2a22a881bb9f05d4b014cbe0b5..64cd3e4f252b0f3a888b1bae6938e0da0c8de91c 100644 (file)
--- a/ath_hal/ar5212/ar5212_misc.c
+++ b/ath_hal/ar5212/ar5212_misc.c
@@ -235,11 +235,11 @@ ar5212WriteAssocid(struct ath_hal *ah, const uint8_t *bssid, uint16_t assocId)
 uint64_t
 ar5212GetTsf64(struct ath_hal *ah)
 {
-       uint32_t low1, low2, u32;
+       uint32_t low1, low2, up32;
 
        /* sync multi-word read */
        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);
        if (low2 < low1) {      /* roll over */
                /*
@@ -252,9 +252,9 @@ ar5212GetTsf64(struct ath_hal *ah)
                 * which can be noticeable when doing things like
                 * timestamping packets in monitor mode.
                 */
-               u32++;
+               up32++;
        }
-       return (((uint64_t) u32) << 32) | ((uint64_t) low2);
+       return (((uint64_t) up32) << 32) | ((uint64_t) low2);
 }
 
 /*