X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah.c;h=6d91fc0e6127d8585011ae541afe341ad3b11d89;hb=HEAD;hp=71deb5ec646eda573320ef1ab78623a2141d279c;hpb=246c1039d7c3ab53180a634181918f19ea4d2f8b;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah.c b/target_firmware/wlan/ah.c
index 71deb5e..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,16 +47,13 @@ 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;
 }
 
 HAL_STATUS
-ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type,
-		      a_uint32_t capability, a_uint32_t *result)
-
+ath_hal_getcapability(struct ath_hal *ah, HAL_CAPABILITY_TYPE type)
 {
 	const HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
 	switch (type) {
@@ -113,7 +110,7 @@ ath_hal_computetxtime(struct ath_hal *ah,
 		numBits = frameLen << 3;
 		txTime = phyTime + ((numBits * 1000)/kbps);
 		/* TODO: make sure the same value of txTime can use in all device */
-		if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, AH_NULL) != HAL_OK)
+		if (ath_hal_getcapability(ah, HAL_CAP_HT) != HAL_OK)
 			txTime = txTime + CCK_SIFS_TIME;
 		break;
 	case IEEE80211_T_OFDM:
@@ -125,7 +122,7 @@ ath_hal_computetxtime(struct ath_hal *ah,
 		numSymbols = asf_howmany(numBits, bitsPerSymbol);
 		txTime = OFDM_PREAMBLE_TIME + (numSymbols * OFDM_SYMBOL_TIME);
 		/* TODO: make sure the same value of txTime can use in all device */
-		if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, AH_NULL) != HAL_OK)
+		if (ath_hal_getcapability(ah, HAL_CAP_HT) != HAL_OK)
 			txTime = txTime + OFDM_SIFS_TIME;
 		break;
 	default:
@@ -145,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,15 +177,15 @@ ath_hal_wait(struct ath_hal *ah, a_uint32_t reg, a_uint32_t mask, a_uint32_t val
 
 	a_int32_t i;
 
-	if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, AH_NULL) == HAL_OK) {
+	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);
 		}