diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/rtw.c | 26 | ||||
| -rw-r--r-- | sys/dev/ic/rtwreg.h | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 7f243103a49..c514065a25b 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.43 2005/10/23 12:57:42 jsg Exp $ */ +/* $OpenBSD: rtw.c,v 1.44 2005/10/24 02:41:58 reyk Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -404,13 +404,13 @@ rtw_txdac_enable(struct rtw_softc *sc, int enable) u_int32_t anaparm; struct rtw_regs *regs = &sc->sc_regs; - anaparm = RTW_READ(regs, RTW_ANAPARM); + anaparm = RTW_READ(regs, RTW_ANAPARM_0); if (enable) anaparm &= ~RTW_ANAPARM_TXDACOFF; else anaparm |= RTW_ANAPARM_TXDACOFF; - RTW_WRITE(regs, RTW_ANAPARM, anaparm); - RTW_SYNC(regs, RTW_ANAPARM, RTW_ANAPARM); + RTW_WRITE(regs, RTW_ANAPARM_0, anaparm); + RTW_SYNC(regs, RTW_ANAPARM_0, RTW_ANAPARM_0); } int @@ -1874,7 +1874,7 @@ rtw_maxim_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power, { u_int32_t anaparm; - anaparm = RTW_READ(regs, RTW_ANAPARM); + anaparm = RTW_READ(regs, RTW_ANAPARM_0); anaparm &= ~(RTW_ANAPARM_RFPOW_MASK | RTW_ANAPARM_TXDACOFF); switch (power) { @@ -1901,8 +1901,8 @@ rtw_maxim_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power, __func__, rtw_pwrstate_string(power), (before_rf) ? "before" : "after", anaparm)); - RTW_WRITE(regs, RTW_ANAPARM, anaparm); - RTW_SYNC(regs, RTW_ANAPARM, RTW_ANAPARM); + RTW_WRITE(regs, RTW_ANAPARM_0, anaparm); + RTW_SYNC(regs, RTW_ANAPARM_0, RTW_ANAPARM_0); } /* XXX I am using the RFMD settings gleaned from the reference @@ -1914,7 +1914,7 @@ rtw_rfmd_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power, { u_int32_t anaparm; - anaparm = RTW_READ(regs, RTW_ANAPARM); + anaparm = RTW_READ(regs, RTW_ANAPARM_0); anaparm &= ~(RTW_ANAPARM_RFPOW_MASK | RTW_ANAPARM_TXDACOFF); switch (power) { @@ -1941,8 +1941,8 @@ rtw_rfmd_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power, __func__, rtw_pwrstate_string(power), (before_rf) ? "before" : "after", anaparm)); - RTW_WRITE(regs, RTW_ANAPARM, anaparm); - RTW_SYNC(regs, RTW_ANAPARM, RTW_ANAPARM); + RTW_WRITE(regs, RTW_ANAPARM_0, anaparm); + RTW_SYNC(regs, RTW_ANAPARM_0, RTW_ANAPARM_0); } void @@ -1951,7 +1951,7 @@ rtw_philips_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power, { u_int32_t anaparm; - anaparm = RTW_READ(regs, RTW_ANAPARM); + anaparm = RTW_READ(regs, RTW_ANAPARM_0); anaparm &= ~(RTW_ANAPARM_RFPOW_MASK | RTW_ANAPARM_TXDACOFF); switch (power) { @@ -1983,8 +1983,8 @@ rtw_philips_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power, __func__, rtw_pwrstate_string(power), (before_rf) ? "before" : "after", anaparm)); - RTW_WRITE(regs, RTW_ANAPARM, anaparm); - RTW_SYNC(regs, RTW_ANAPARM, RTW_ANAPARM); + RTW_WRITE(regs, RTW_ANAPARM_0, anaparm); + RTW_SYNC(regs, RTW_ANAPARM_0, RTW_ANAPARM_0); } void diff --git a/sys/dev/ic/rtwreg.h b/sys/dev/ic/rtwreg.h index 65ad2ba47ba..67b61754bb6 100644 --- a/sys/dev/ic/rtwreg.h +++ b/sys/dev/ic/rtwreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwreg.h,v 1.9 2005/10/23 08:47:14 reyk Exp $ */ +/* $OpenBSD: rtwreg.h,v 1.10 2005/10/24 02:41:58 reyk Exp $ */ /* $NetBSD: rtwreg.h,v 1.12 2005/01/16 11:50:43 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -471,8 +471,8 @@ #define RTW_CONFIG2_PAPESIGN BIT(2) /* TBD, from EEPROM */ #define RTW_CONFIG2_PAPETIME_MASK BITS(1,0) /* TBD, from EEPROM */ -#define RTW_ANAPARM 0x54 /* Analog parameter, 32b */ -#define RTW8185_ANAPARM2 0x60 +#define RTW_ANAPARM_0 0x54 /* Analog parameter, 32b */ +#define RTW8185_ANAPARM_1 0x60 #define RTW_ANAPARM_RFPOW0_MASK BITS(30,28) /* undocumented bits * which appear to |