diff options
Diffstat (limited to 'sys/dev/ic/rtw.c')
| -rw-r--r-- | sys/dev/ic/rtw.c | 67 |
1 files changed, 1 insertions, 66 deletions
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 9115ff8f7e2..e7ad270cb7f 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.12 2005/02/06 07:08:24 jsg Exp $ */ +/* $OpenBSD: rtw.c,v 1.13 2005/02/06 10:35:54 jsg Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -42,10 +42,6 @@ #include <sys/mbuf.h> #include <sys/malloc.h> #include <sys/kernel.h> -#if 0 -#include <sys/errno.h> -#include <sys/device.h> -#endif #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/time.h> @@ -806,9 +802,6 @@ rtw_srom_read(struct rtw_regs *regs, u_int32_t flags, struct rtw_srom *sr, /* make read_seeprom enter EEPROM read/write mode */ sd.sd_MS = ecr; sd.sd_RDY = 0; -#if 0 - sd.sd_clkdelay = 50; -#endif /* TBD bus barriers */ if (!read_seeprom(&sd, sr->sr_content, 0, sr->sr_size/2)) { @@ -880,39 +873,6 @@ rtw_set_rfprog(struct rtw_regs *regs, enum rtw_rfchipid rfchipid, RTW_READ8(regs, RTW_CONFIG4))); } -#if 0 -int -rtw_identify_rf(struct rtw_regs *regs, enum rtw_rftype *rftype, - const char *dvname) -{ - u_int8_t cfg4; - const char *name; - - cfg4 = RTW_READ8(regs, RTW_CONFIG4); - - switch (cfg4 & RTW_CONFIG4_RFTYPE_MASK) { - case RTW_CONFIG4_RFTYPE_PHILIPS: - *rftype = RTW_RFTYPE_PHILIPS; - name = "Philips"; - break; - case RTW_CONFIG4_RFTYPE_INTERSIL: - *rftype = RTW_RFTYPE_INTERSIL; - name = "Intersil"; - break; - case RTW_CONFIG4_RFTYPE_RFMD: - *rftype = RTW_RFTYPE_RFMD; - name = "RFMD"; - break; - default: - name = "<unknown>"; - return ENXIO; - } - - printf("%s: RF prog type %s\n", dvname, name); - return 0; -} -#endif - void rtw_init_channels(enum rtw_locale locale, struct ieee80211_channel (*chans)[IEEE80211_CHAN_MAX+1], @@ -2385,9 +2345,6 @@ rtw_init(struct ifnet *ifp) rtw_set_access(regs, RTW_ACCESS_ANAPARM); rtw_set_access(regs, RTW_ACCESS_NONE); -#if 0 - RTW_WRITE(regs, RTW_FEMR, RTW_FEMR_GWAKE|RTW_FEMR_WKUP|RTW_FEMR_INTR); -#endif /* XXX from reference sources */ RTW_WRITE(regs, RTW_FEMR, 0xffff); RTW_SYNC(regs, RTW_FEMR, RTW_FEMR); @@ -3382,19 +3339,6 @@ rtw_attach(struct rtw_softc *sc) struct rtw_txsoft_blk *tsb; int pri, rc; -#if 0 - CASSERT(RTW_DESC_ALIGNMENT % sizeof(struct rtw_txdesc) == 0, - "RTW_DESC_ALIGNMENT is not a multiple of " - "sizeof(struct rtw_txdesc)"); - - CASSERT(RTW_DESC_ALIGNMENT % sizeof(struct rtw_rxdesc) == 0, - "RTW_DESC_ALIGNMENT is not a multiple of " - "sizeof(struct rtw_rxdesc)"); - - CASSERT(RTW_DESC_ALIGNMENT % RTW_MAXPKTSEGS == 0, - "RTW_DESC_ALIGNMENT is not a multiple of RTW_MAXPKTSEGS"); -#endif - NEXT_ATTACH_STATE(sc, DETACHED); switch (RTW_READ(&sc->sc_regs, RTW_TCR) & RTW_TCR_HWVERID_MASK) { @@ -3527,15 +3471,6 @@ rtw_attach(struct rtw_softc *sc) goto err; } -#if 0 - if (rtw_identify_rf(&sc->sc_regs, &sc->sc_rftype, - sc->sc_dev.dv_xname) != 0) { - printf("%s: attach failed, unknown RF unidentified\n", - sc->sc_dev.dv_xname); - goto err; - } -#endif - NEXT_ATTACH_STATE(sc, FINISH_RF_ATTACH); sc->sc_phydelay = rtw_check_phydelay(&sc->sc_regs, sc->sc_rcr); |