projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #139 from olerem/gcc-7
[open-ath9k-htc-firmware.git]
/
target_firmware
/
wlan
/
ah.c
diff --git
a/target_firmware/wlan/ah.c
b/target_firmware/wlan/ah.c
index 6f5be75939a1fb7b81f9552cb1063866dad99455..6d91fc0e6127d8585011ae541afe341ad3b11d89 100755
(executable)
--- a/
target_firmware/wlan/ah.c
+++ b/
target_firmware/wlan/ah.c
@@
-142,14
+142,14
@@
ath_hal_computetxtime(struct ath_hal *ah,
#undef OFDM_SYMBOL_TIME
#ifdef MAGPIE_MERLIN
#undef OFDM_SYMBOL_TIME
#ifdef MAGPIE_MERLIN
-a_uint32_t
+a_uint32_t
ath_hal_get_curmode(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
{
if (!chan)
return HAL_MODE_11NG;
if (IS_CHAN_NA(chan))
ath_hal_get_curmode(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
{
if (!chan)
return HAL_MODE_11NG;
if (IS_CHAN_NA(chan))
- return HAL_MODE_11NA;
+ return HAL_MODE_11NA;
if (IS_CHAN_A(chan))
return HAL_MODE_11A;
if (IS_CHAN_A(chan))
return HAL_MODE_11A;
@@
-179,13
+179,13
@@
ath_hal_wait(struct ath_hal *ah, a_uint32_t reg, a_uint32_t mask, a_uint32_t val
if (ath_hal_getcapability(ah, HAL_CAP_HT) == HAL_OK) {
for (i = 0; i < AH_TIMEOUT_11N; i++) {
if (ath_hal_getcapability(ah, HAL_CAP_HT) == HAL_OK) {
for (i = 0; i < AH_TIMEOUT_11N; i++) {
- if ((
OS_REG_READ(ah,
reg) & mask) == val)
+ if ((
ioread32_mac(
reg) & mask) == val)
return AH_TRUE;
OS_DELAY(10);
}
} else {
for (i = 0; i < AH_TIMEOUT_11G; i++) {
return AH_TRUE;
OS_DELAY(10);
}
} else {
for (i = 0; i < AH_TIMEOUT_11G; i++) {
- if ((
OS_REG_READ(ah,
reg) & mask) == val)
+ if ((
ioread32_mac(
reg) & mask) == val)
return AH_TRUE;
OS_DELAY(10);
}
return AH_TRUE;
OS_DELAY(10);
}