diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-02-14 04:59:56 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2007-02-14 04:59:56 +0000 |
| commit | d562f42b8545efc925b551ca82a3f37a256775ab (patch) | |
| tree | 311a0d61c96300e5351acabc572aaba569846b5b /sys/dev/ic/rtw.c | |
| parent | 53abe004fc2a092a92dac0017bfe09369e002f10 (diff) | |
remove some unused goop
Diffstat (limited to 'sys/dev/ic/rtw.c')
| -rw-r--r-- | sys/dev/ic/rtw.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index f18d32ea2d8..6bcb85cc78d 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.57 2007/01/03 18:16:43 claudio Exp $ */ +/* $OpenBSD: rtw.c,v 1.58 2007/02/14 04:59:55 jsg Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -78,8 +78,6 @@ #include <dev/ic/smc93cx6var.h> int rtw_rfprog_fallback = 0; -int rtw_host_rfio = 0; -int rtw_xmtr_restart = 0; int rtw_do_chip_reset = 0; int rtw_dwelltime = 200; /* milliseconds per channel */ int rtw_macbangbits_timeout = 100; @@ -142,9 +140,7 @@ void rtw_txsofts_release(bus_dma_tag_t, struct ieee80211com *, struct rtw_txsoft_blk *); void rtw_hwring_setup(struct rtw_softc *); int rtw_swring_setup(struct rtw_softc *); -void rtw_txdesc_blk_reset(struct rtw_txdesc_blk *); void rtw_txdescs_reset(struct rtw_softc *); -void rtw_rxdescs_reset(struct rtw_softc *); void rtw_rfmd_pwrstate(struct rtw_regs *, enum rtw_pwrstate, int, int); int rtw_pwrstate(struct rtw_softc *, enum rtw_pwrstate); int rtw_tune(struct rtw_softc *); @@ -243,7 +239,6 @@ int rtw_grf5101_txpower(struct rtw_softc *, u_int8_t); int rtw_grf5101_tune(struct rtw_softc *, u_int); int rtw_rf_hostwrite(struct rtw_softc *, u_int, u_int32_t); int rtw_rf_macwrite(struct rtw_softc *, u_int, u_int32_t); -u_int8_t rtw_bbp_read(struct rtw_regs *, u_int); int rtw_bbp_write(struct rtw_regs *, u_int, u_int); u_int32_t rtw_grf5101_host_crypt(u_int, u_int32_t); u_int32_t rtw_maxim_swizzle(u_int, uint32_t); @@ -1954,6 +1949,7 @@ rtw_stop(struct ifnet *ifp, int disable) return; } +#ifdef RTW_DEBUG const char * rtw_pwrstate_string(enum rtw_pwrstate power) { @@ -1968,6 +1964,7 @@ rtw_pwrstate_string(enum rtw_pwrstate power) return "unknown"; } } +#endif /* XXX For Maxim, I am using the RFMD settings gleaned from the * reference driver, plus a magic Maxim "ON" value that comes from @@ -4609,18 +4606,6 @@ rtw_phy_init(struct rtw_softc *sc) * Generic PHY I/O functions */ - -u_int8_t -rtw_bbp_read(struct rtw_regs *regs, u_int addr) -{ - KASSERT((addr & ~PRESHIFT(RTW_BB_ADDR_MASK)) == 0); - RTW_WRITE(regs, RTW_BB, - LSHIFT(addr, RTW_BB_ADDR_MASK) | RTW_BB_RD_MASK | RTW_BB_WR_MASK); - delay(10); /* XXX */ - RTW_WBR(regs, RTW_BB, RTW_BB); - return MASK_AND_RSHIFT(RTW_READ(regs, RTW_BB), RTW_BB_RD_MASK); -} - int rtw_bbp_write(struct rtw_regs *regs, u_int addr, u_int val) { |