projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove ath_hal_reg_read_target and OS_REG_READ
[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 a43652ecd7ba70e9ae93f2ba3ea8360c1d622ac4..242ac7f4707121c58a784cb7b5ade7a7c4ff1fb9 100755
(executable)
--- 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, \
#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) \
#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) \
#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) \
#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 */
/* wait for the register contents to have the specified value */