X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.c;h=6d91fc0e6127d8585011ae541afe341ad3b11d89;hb=bcccc6c09d4478bd657f138dcad4ea7fe4f55e2f;hp=6f5be75939a1fb7b81f9552cb1063866dad99455;hpb=4eb431277283cbf284753f1702388cefad210864;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index 6f5be75..6d91fc0 100755
--- 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
-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))
-		return HAL_MODE_11NA; 
+		return HAL_MODE_11NA;
 
 	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 ((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++) {
-			if ((OS_REG_READ(ah, reg) & mask) == val)
+			if ((ioread32_mac(reg) & mask) == val)
 				return AH_TRUE;
 			OS_DELAY(10);
 		}