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

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index ea79d12..6d91fc0 100755
--- a/target_firmware/wlan/ah.c
+++ b/target_firmware/wlan/ah.c
@@ -37,8 +37,8 @@
 #include "ah_internal.h"
 #include <asf_bitmap.h>
 
-extern struct ath_hal *ar5416Attach(a_uint32_t devid,HAL_SOFTC sc, adf_os_device_t dev,
-				    a_uint32_t flags, HAL_STATUS *status);
+extern struct ath_hal *ar5416Attach(HAL_SOFTC sc, adf_os_device_t dev,
+									HAL_STATUS *status);
 
 struct ath_hal*
 ath_hal_attach_tgt(a_uint32_t devid,HAL_SOFTC sc,
@@ -47,8 +47,7 @@ ath_hal_attach_tgt(a_uint32_t devid,HAL_SOFTC sc,
 {
 	struct ath_hal *ah = AH_NULL;
 
-	devid = AR5416_DEVID_PCIE;
-	ah = ar5416Attach(devid, sc, dev, flags, error);
+	ah = ar5416Attach(sc, dev, error);
 
 	return ah;
 }
@@ -143,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;
@@ -180,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);
 		}