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
Firmware sometimes returns erroneous timestamps(2)
[open-ath9k-htc-firmware.git]
/
target_firmware
/
wlan
/
if_ath.c
diff --git
a/target_firmware/wlan/if_ath.c
b/target_firmware/wlan/if_ath.c
index 3cc61f7f29f094db4f2fa358e7668a0de3ba70ab..206b5c0e2c674d0a417f7db530791b130b19b2bb 100755
(executable)
--- a/
target_firmware/wlan/if_ath.c
+++ b/
target_firmware/wlan/if_ath.c
@@
-88,20
+88,13
@@
static u_int64_t ath_extend_tsf(struct ath_softc_tgt *sc, u_int32_t rstamp)
{
struct ath_hal *ah = sc->sc_ah;
u_int64_t tsf;
{
struct ath_hal *ah = sc->sc_ah;
u_int64_t tsf;
- u_int32_t tsf_low;
- u_int64_t tsf64;
tsf = ah->ah_getTsf64(ah);
tsf = ah->ah_getTsf64(ah);
- tsf_low = tsf & 0xffffffff;
- tsf64 = (tsf & ~0xffffffffULL) | rstamp;
- if (rstamp >
tsf_low && (rstamp - tsf_low > 0x10000000
))
- tsf
64
-= 0x100000000ULL;
+ if (rstamp >
(tsf & 0xffffffffULL
))
+ tsf -= 0x100000000ULL;
- if (rstamp < tsf_low && (tsf_low - rstamp > 0x10000000))
- tsf64 += 0x100000000ULL;
-
- return tsf64;
+ return ((tsf & ~0xffffffffULL) | rstamp);
}
static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
}
static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
@@
-1384,17
+1377,17
@@
static a_int32_t ath_reg_read_filter(struct ath_hal *ah, a_int32_t addr)
{
if ((addr & 0xffffe000) == 0x2000) {
/* SEEPROM registers */
{
if ((addr & 0xffffe000) == 0x2000) {
/* SEEPROM registers */
-
ath_hal_reg_read_target(ah,
addr);
+
ioread32_mac(
addr);
if (!ath_hal_wait(ah, 0x407c, 0x00030000, 0))
adf_os_print("SEEPROM Read fail: 0x%08x\n", addr);
if (!ath_hal_wait(ah, 0x407c, 0x00030000, 0))
adf_os_print("SEEPROM Read fail: 0x%08x\n", addr);
- return
(ath_hal_reg_read_target(ah, 0x407c) & 0x0000ffff)
;
+ return
ioread32_mac(0x407c) & 0x0000ffff
;
} else if (addr > 0xffff)
/* SoC registers */
} else if (addr > 0xffff)
/* SoC registers */
- return
HAL_WORD_REG_READ
(addr);
+ return
ioread32
(addr);
else
/* MAC registers */
else
/* MAC registers */
- return
ath_hal_reg_read_target(ah,
addr);
+ return
ioread32_mac(
addr);
}
static void ath_hal_reg_read_tgt(void *Context, A_UINT16 Command,
}
static void ath_hal_reg_read_tgt(void *Context, A_UINT16 Command,
@@
-1424,20
+1417,20
@@
static void ath_pll_reset_ones(struct ath_hal *ah)
if(reset_pll == 0) {
#if defined(PROJECT_K2)
/* here we write to core register */
if(reset_pll == 0) {
#if defined(PROJECT_K2)
/* here we write to core register */
-
HAL_WORD_REG_WRITE
(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x0);
+
iowrite32
(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x0);
/* and here to mac register */
/* and here to mac register */
-
ath_hal_reg_write_target(ah,
0x786c,
-
ath_hal_reg_read_target(ah,
0x786c) | 0x6000000);
-
ath_hal_reg_write_target(ah,
0x786c,
-
ath_hal_reg_read_target(ah,
0x786c) & (~0x6000000));
+
iowrite32_mac(
0x786c,
+
ioread32_mac(
0x786c) | 0x6000000);
+
iowrite32_mac(
0x786c,
+
ioread32_mac(
0x786c) & (~0x6000000));
-
HAL_WORD_REG_WRITE
(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x20);
+
iowrite32
(MAGPIE_REG_RST_PWDN_CTRL_ADDR, 0x20);
#elif defined(PROJECT_MAGPIE) && !defined (FPGA)
#elif defined(PROJECT_MAGPIE) && !defined (FPGA)
-
ath_hal_reg_write_target(ah,
0x7890,
-
ath_hal_reg_read_target(ah,
0x7890) | 0x1800000);
-
ath_hal_reg_write_target(ah,
0x7890,
-
ath_hal_reg_read_target(ah,
0x7890) & (~0x1800000));
+
iowrite32_mac(
0x7890,
+
ioread32_mac(
0x7890) | 0x1800000);
+
iowrite32_mac(
0x7890,
+
ioread32_mac(
0x7890) & (~0x1800000));
#endif
reset_pll = 1;
}
#endif
reset_pll = 1;
}
@@
-1447,7
+1440,7
@@
static void ath_hal_reg_write_filter(struct ath_hal *ah,
a_uint32_t reg, a_uint32_t val)
{
if(reg > 0xffff) {
a_uint32_t reg, a_uint32_t val)
{
if(reg > 0xffff) {
-
HAL_WORD_REG_WRITE
(reg, val);
+
iowrite32
(reg, val);
#if defined(PROJECT_K2)
if(reg == 0x50040) {
static uint8_t flg=0;
#if defined(PROJECT_K2)
if(reg == 0x50040) {
static uint8_t flg=0;
@@
-1466,7
+1459,7
@@
static void ath_hal_reg_write_filter(struct ath_hal *ah,
if(reg == 0x7014)
ath_pll_reset_ones(ah);
if(reg == 0x7014)
ath_pll_reset_ones(ah);
-
ath_hal_reg_write_target(ah,
reg, val);
+
iowrite32_mac(
reg, val);
}
}
}
}