#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,
{
struct ath_hal *ah = AH_NULL;
- devid = AR5416_DEVID_PCIE;
- ah = ar5416Attach(devid, sc, dev, flags, error);
+ ah = ar5416Attach(sc, dev, error);
return 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;
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);
}