[src/trunk]: src/sys/dev/ic Remove useless debug sysctls.

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7357203c80fe
branches:  trunk
changeset: 572242:7357203c80fe
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Mon Dec 27 06:12:28 2004 +0000

description:
Remove useless debug sysctls.

For AP scanning, change the channel dwell time from 1 second to
1/5 second.

diffstat:

 sys/dev/ic/rtw.c      |  31 +++----------------------------
 sys/dev/ic/rtwphyio.c |  10 ++--------
 sys/dev/ic/rtwvar.h   |   4 +---
 3 files changed, 6 insertions(+), 39 deletions(-)

diffs (133 lines):

diff -r b3f6ff0c8bee -r 7357203c80fe sys/dev/ic/rtw.c
--- a/sys/dev/ic/rtw.c  Mon Dec 27 05:36:08 2004 +0000
+++ b/sys/dev/ic/rtw.c  Mon Dec 27 06:12:28 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.25 2004/12/27 01:51:49 mycroft Exp $ */
+/* $NetBSD: rtw.c,v 1.26 2004/12/27 06:12:28 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.25 2004/12/27 01:51:49 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.26 2004/12/27 06:12:28 dyoung Exp $");
 
 #include "bpfilter.h"
 
@@ -87,8 +87,6 @@
 
 int rtw_rfprog_fallback = 0;
 int rtw_host_rfio = 0;
-int rtw_flush_rfio = 1;
-int rtw_rfio_delay = 0;
 
 #ifdef RTW_DEBUG
 int rtw_debug = 0;
@@ -100,12 +98,11 @@
        sc->sc_attach_state = state;                            \
 } while (0)
 
-int rtw_dwelltime = 1000;      /* milliseconds */
+int rtw_dwelltime = 200;       /* milliseconds */
 
 static void rtw_start(struct ifnet *);
 
 static int rtw_sysctl_verify_rfio(SYSCTLFN_PROTO);
-static int rtw_sysctl_verify_rfio_delay(SYSCTLFN_PROTO);
 static int rtw_sysctl_verify_rfprog(SYSCTLFN_PROTO);
 #ifdef RTW_DEBUG
 static void rtw_print_txdesc(struct rtw_softc *, const char *,
@@ -152,14 +149,6 @@
            CTL_CREATE, CTL_EOL)) != 0)
                goto err;
 
-       /* force host to flush I/O by reading RTW_PHYADDR */
-       if ((rc = sysctl_createv(clog, 0, &rnode, &cnode,
-           CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
-           "flush_rfio", SYSCTL_DESCR("Enable RF I/O flushing"),
-           rtw_sysctl_verify_rfio, 0, &rtw_flush_rfio, 0,
-           CTL_CREATE, CTL_EOL)) != 0)
-               goto err;
-
        /* force host to control RF I/O bus */
        if ((rc = sysctl_createv(clog, 0, &rnode, &cnode,
            CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
@@ -168,14 +157,6 @@
            CTL_CREATE, CTL_EOL)) != 0)
                goto err;
 
-       /* control RF I/O delay */
-       if ((rc = sysctl_createv(clog, 0, &rnode, &cnode,
-           CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
-           "rfio_delay", SYSCTL_DESCR("Set RF I/O delay"),
-           rtw_sysctl_verify_rfio_delay, 0, &rtw_rfio_delay, 0,
-           CTL_CREATE, CTL_EOL)) != 0)
-               goto err;
-
        return;
 err:
        printf("%s: sysctl_createv failed (rc = %d)\n", __func__, rc);
@@ -203,12 +184,6 @@
 }
 
 static int
-rtw_sysctl_verify_rfio_delay(SYSCTLFN_ARGS)
-{
-       return rtw_sysctl_verify(SYSCTLFN_CALL(rnode), 0, 1000000);
-}
-
-static int
 rtw_sysctl_verify_rfprog(SYSCTLFN_ARGS)
 {
        return rtw_sysctl_verify(SYSCTLFN_CALL(rnode), 0,
diff -r b3f6ff0c8bee -r 7357203c80fe sys/dev/ic/rtwphyio.c
--- a/sys/dev/ic/rtwphyio.c     Mon Dec 27 05:36:08 2004 +0000
+++ b/sys/dev/ic/rtwphyio.c     Mon Dec 27 06:12:28 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.c,v 1.4 2004/12/25 06:58:37 dyoung Exp $ */
+/* $NetBSD: rtwphyio.c,v 1.5 2004/12/27 06:12:28 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.4 2004/12/25 06:58:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.5 2004/12/27 06:12:28 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -184,12 +184,6 @@
 
        RTW_WBR(regs, RTW_PHYCFG, RTW_PHYCFG);
 
-       if (rtw_flush_rfio)
-               RTW_READ(regs, RTW_PHYADDR);
-
-       if (rtw_rfio_delay > 0)
-               DELAY(rtw_rfio_delay);
-
        for (i = rtw_macbangbits_timeout; --i >= 0; delay(1)) {
                if ((RTW_READ(regs, RTW_PHYCFG) & RTW_PHYCFG_MAC_POLL) == 0) {
                        RTW_DPRINTF(RTW_DEBUG_PHY,
diff -r b3f6ff0c8bee -r 7357203c80fe sys/dev/ic/rtwvar.h
--- a/sys/dev/ic/rtwvar.h       Mon Dec 27 05:36:08 2004 +0000
+++ b/sys/dev/ic/rtwvar.h       Mon Dec 27 06:12:28 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwvar.h,v 1.10 2004/12/26 22:37:57 mycroft Exp $ */
+/* $NetBSD: rtwvar.h,v 1.11 2004/12/27 06:12:28 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
  *
@@ -443,8 +443,6 @@
 #define sc_txtap       sc_txtapu.tap
 
 extern int rtw_host_rfio;
-extern int rtw_flush_rfio;
-extern int rtw_rfio_delay;
 
 void rtw_txdac_enable(struct rtw_softc *, int);
 void rtw_anaparm_enable(struct rtw_regs *, int);