X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fah_internal.h;h=242ac7f4707121c58a784cb7b5ade7a7c4ff1fb9;hb=0421b61b6a02eb61eaea125641ba69002d76ecf2;hp=64a54a0954aecf33bf29f1a42d4df51359057a29;hpb=ec1df849036cb0219c81c672ab80708d5e52334f;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ah_internal.h b/target_firmware/wlan/ah_internal.h
index 64a54a0..242ac7f 100755
--- a/target_firmware/wlan/ah_internal.h
+++ b/target_firmware/wlan/ah_internal.h
@@ -238,13 +238,15 @@ struct ath_hal_private {
 #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))
+		     (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))
+	OS_REG_WRITE(_a, _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)
+	OS_REG_WRITE(_a, _r, ioread32_mac(_r) | _f)
 #define OS_REG_CLR_BIT(_a, _r, _f)			\
-	OS_REG_WRITE(_a, _r, OS_REG_READ(_a, _r) &~ _f)
+	OS_REG_WRITE(_a, _r, ioread32_mac(_r) & ~_f)
 
 
 /* wait for the register contents to have the specified value */
@@ -260,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);