Merge pull request #57 from olerem/io_clean-2014.05.23

[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 ea79d12b835685b47ffe9618bda9b153d80eb81c..0011d320cb80bf56fc8641eeff7ea74afab88d7e 100755 (executable)
--- 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;
 }
@@ -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);
                }