Merge pull request #57 from olerem/io_clean-2014.05.23

[open-ath9k-htc-firmware.git] / target_firmware / wlan / ah_internal.h

diff --git a/target_firmware/wlan/ah_internal.h b/target_firmware/wlan/ah_internal.h
index a43c8eb43da58241c27cd6e2b0a5095cbb2f486c..0004a1c3bb429642da698eb78564ffd53ff75d4a 100755 (executable)
--- a/target_firmware/wlan/ah_internal.h
+++ b/target_firmware/wlan/ah_internal.h
@@ -126,8 +126,6 @@ typedef struct {
                halChanHalfRate         : 1,
                halChanQuarterRate      : 1,
                halHTSupport            : 1,
-               halRxStbcSupport        : 1,
-               halTxStbcSupport        : 1,
                halGTTSupport           : 1,
                halFastCCSupport        : 1,
                halExtChanDfsSupport    : 1,
@@ -239,22 +237,22 @@ struct ath_hal_private {
 #define SM(_v, _f)  (((_v) << _f##_S) & _f)
 #define MS(_v, _f)  (((_v) & _f) >> _f##_S)
 #define OS_REG_RMW_FIELD(_a, _r, _f, _v)                               \
-       OS_REG_WRITE(_a, _r,                                            \
-                    (OS_REG_READ(_a, _r) &~ _f) | (((_v) << _f##_S) & _f))
+       iowrite32_mac(_r,                                               \
+                    (ioread32_mac(_r) & ~_f)           \
+                     | (((_v) << _f##_S) & _f))
 #define OS_REG_RMW(_a, _r, _set, _clr)                                 \
-        OS_REG_WRITE(_a, _r, (OS_REG_READ(_a, _r) & ~(_clr)) | (_set))
+       iowrite32_mac(_r,                                               \
+                    (ioread32_mac(_r) & ~(_clr)) | (_set))
 #define OS_REG_SET_BIT(_a, _r, _f)                     \
-       OS_REG_WRITE(_a, _r, OS_REG_READ(_a, _r) | _f)
+       iowrite32_mac(_r, ioread32_mac(_r) | _f)
 #define OS_REG_CLR_BIT(_a, _r, _f)                     \
-       OS_REG_WRITE(_a, _r, OS_REG_READ(_a, _r) &~ _f)
+       iowrite32_mac(_r, ioread32_mac(_r) & ~_f)
 
 
 /* wait for the register contents to have the specified value */
 extern HAL_BOOL ath_hal_wait(struct ath_hal *, a_uint32_t reg,
                             a_uint32_t mask, a_uint32_t val);
 
-extern void ath_hal_vprintf(struct ath_hal *, const char*, __va_list);
-
 /* allocate and free memory */
 extern void *ath_hal_malloc(size_t);
 extern void ath_hal_free(void *);
@@ -264,8 +262,7 @@ extern void ath_hal_free(void *);
  * this routine to support chip-specific capabilities.
  */
 extern HAL_STATUS ath_hal_getcapability(struct ath_hal *ah,
-               HAL_CAPABILITY_TYPE type, a_uint32_t capability,
-               a_uint32_t *result);
+               HAL_CAPABILITY_TYPE type);
 extern HAL_BOOL ath_hal_setcapability(struct ath_hal *ah,
              HAL_CAPABILITY_TYPE type, a_uint32_t capability,
              a_uint32_t setting, HAL_STATUS *status);