Author: adrian
Date: Wed Mar 2 16:03:19 2011
New Revision: 219180
URL: http://svn.freebsd.org/changeset/base/219180
Log:
Migrate the sysctl related routines (statistics, debugging, etc) out of
if_ath.c and into if_ath_sysctl.c .
Added:
head/sys/dev/ath/if_ath_sysctl.c (contents, props changed)
head/sys/dev/ath/if_ath_sysctl.h (contents, props changed)
Modified:
head/sys/conf/files
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_ath_misc.h
head/sys/modules/ath/Makefile
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Wed Mar 2 15:41:00 2011 (r219179)
+++ head/sys/conf/files Wed Mar 2 16:03:19 2011 (r219180)
@@ -578,6 +578,8 @@ dev/ath/if_ath_tx.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_tx_ht.c optional ath \
compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_sysctl.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_pci.c optional ath pci \
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/ah_osdep.c optional ath \
Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c Wed Mar 2 15:41:00 2011 (r219179)
+++ head/sys/dev/ath/if_ath.c Wed Mar 2 16:03:19 2011 (r219180)
@@ -92,6 +92,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ath/if_ath_debug.h>
#include <dev/ath/if_ath_misc.h>
#include <dev/ath/if_ath_tx.h>
+#include <dev/ath/if_ath_sysctl.h>
#ifdef ATH_TX99_DIAG
#include <dev/ath/ath_tx99/ath_tx99.h>
@@ -122,7 +123,6 @@ static void ath_init(void *);
static void ath_stop_locked(struct ifnet *);
static void ath_stop(struct ifnet *);
static void ath_start(struct ifnet *);
-static int ath_reset(struct ifnet *);
static int ath_reset_vap(struct ieee80211vap *, u_long);
static int ath_media_change(struct ifnet *);
static void ath_watchdog(void *);
@@ -204,9 +204,7 @@ static void ath_led_event(struct ath_sof
static int ath_rate_setup(struct ath_softc *, u_int mode);
static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode);
-static void ath_sysctlattach(struct ath_softc *);
static void ath_announce(struct ath_softc *);
-static void ath_sysctl_stats_attach(struct ath_softc *sc);
#ifdef IEEE80211_SUPPORT_TDMA
static void ath_tdma_settimers(struct ath_softc *sc, u_int32_t nexttbtt,
@@ -1650,7 +1648,7 @@ ath_stop(struct ifnet *ifp)
* operational state. Used to recover from various errors and
* to reset or reload hardware state.
*/
-static int
+int
ath_reset(struct ifnet *ifp)
{
struct ath_softc *sc = ifp->if_softc;
@@ -5614,391 +5612,6 @@ ath_ioctl(struct ifnet *ifp, u_long cmd,
#undef IS_RUNNING
}
-static int
-ath_sysctl_slottime(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int slottime = ath_hal_getslottime(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &slottime, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_setslottime(sc->sc_ah, slottime) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_acktimeout(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int acktimeout = ath_hal_getacktimeout(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &acktimeout, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_setacktimeout(sc->sc_ah, acktimeout) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_ctstimeout(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int ctstimeout = ath_hal_getctstimeout(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &ctstimeout, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_setctstimeout(sc->sc_ah, ctstimeout) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_softled(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- int softled = sc->sc_softled;
- int error;
-
- error = sysctl_handle_int(oidp, &softled, 0, req);
- if (error || !req->newptr)
- return error;
- softled = (softled != 0);
- if (softled != sc->sc_softled) {
- if (softled) {
- /* NB: handle any sc_ledpin change */
- ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin,
- HAL_GPIO_MUX_MAC_NETWORK_LED);
- ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin,
- !sc->sc_ledon);
- }
- sc->sc_softled = softled;
- }
- return 0;
-}
-
-static int
-ath_sysctl_ledpin(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- int ledpin = sc->sc_ledpin;
- int error;
-
- error = sysctl_handle_int(oidp, &ledpin, 0, req);
- if (error || !req->newptr)
- return error;
- if (ledpin != sc->sc_ledpin) {
- sc->sc_ledpin = ledpin;
- if (sc->sc_softled) {
- ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin,
- HAL_GPIO_MUX_MAC_NETWORK_LED);
- ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin,
- !sc->sc_ledon);
- }
- }
- return 0;
-}
-
-static int
-ath_sysctl_txantenna(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int txantenna = ath_hal_getantennaswitch(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &txantenna, 0, req);
- if (!error && req->newptr) {
- /* XXX assumes 2 antenna ports */
- if (txantenna < HAL_ANT_VARIABLE || txantenna > HAL_ANT_FIXED_B)
- return EINVAL;
- ath_hal_setantennaswitch(sc->sc_ah, txantenna);
- /*
- * NB: with the switch locked this isn't meaningful,
- * but set it anyway so things like radiotap get
- * consistent info in their data.
- */
- sc->sc_txantenna = txantenna;
- }
- return error;
-}
-
-static int
-ath_sysctl_rxantenna(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int defantenna = ath_hal_getdefantenna(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &defantenna, 0, req);
- if (!error && req->newptr)
- ath_hal_setdefantenna(sc->sc_ah, defantenna);
- return error;
-}
-
-static int
-ath_sysctl_diversity(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int diversity = ath_hal_getdiversity(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &diversity, 0, req);
- if (error || !req->newptr)
- return error;
- if (!ath_hal_setdiversity(sc->sc_ah, diversity))
- return EINVAL;
- sc->sc_diversity = diversity;
- return 0;
-}
-
-static int
-ath_sysctl_diag(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int32_t diag;
- int error;
-
- if (!ath_hal_getdiag(sc->sc_ah, &diag))
- return EINVAL;
- error = sysctl_handle_int(oidp, &diag, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_setdiag(sc->sc_ah, diag) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_tpscale(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- struct ifnet *ifp = sc->sc_ifp;
- u_int32_t scale;
- int error;
-
- (void) ath_hal_gettpscale(sc->sc_ah, &scale);
- error = sysctl_handle_int(oidp, &scale, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_settpscale(sc->sc_ah, scale) ? EINVAL :
- (ifp->if_drv_flags & IFF_DRV_RUNNING) ? ath_reset(ifp) : 0;
-}
-
-static int
-ath_sysctl_tpc(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int tpc = ath_hal_gettpc(sc->sc_ah);
- int error;
-
- error = sysctl_handle_int(oidp, &tpc, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_settpc(sc->sc_ah, tpc) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_rfkill(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- struct ifnet *ifp = sc->sc_ifp;
- struct ath_hal *ah = sc->sc_ah;
- u_int rfkill = ath_hal_getrfkill(ah);
- int error;
-
- error = sysctl_handle_int(oidp, &rfkill, 0, req);
- if (error || !req->newptr)
- return error;
- if (rfkill == ath_hal_getrfkill(ah)) /* unchanged */
- return 0;
- if (!ath_hal_setrfkill(ah, rfkill))
- return EINVAL;
- return (ifp->if_drv_flags & IFF_DRV_RUNNING) ? ath_reset(ifp) : 0;
-}
-
-static int
-ath_sysctl_rfsilent(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int rfsilent;
- int error;
-
- (void) ath_hal_getrfsilent(sc->sc_ah, &rfsilent);
- error = sysctl_handle_int(oidp, &rfsilent, 0, req);
- if (error || !req->newptr)
- return error;
- if (!ath_hal_setrfsilent(sc->sc_ah, rfsilent))
- return EINVAL;
- sc->sc_rfsilentpin = rfsilent & 0x1c;
- sc->sc_rfsilentpol = (rfsilent & 0x2) != 0;
- return 0;
-}
-
-static int
-ath_sysctl_tpack(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int32_t tpack;
- int error;
-
- (void) ath_hal_gettpack(sc->sc_ah, &tpack);
- error = sysctl_handle_int(oidp, &tpack, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_settpack(sc->sc_ah, tpack) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_tpcts(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- u_int32_t tpcts;
- int error;
-
- (void) ath_hal_gettpcts(sc->sc_ah, &tpcts);
- error = sysctl_handle_int(oidp, &tpcts, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_settpcts(sc->sc_ah, tpcts) ? EINVAL : 0;
-}
-
-static int
-ath_sysctl_intmit(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- int intmit, error;
-
- intmit = ath_hal_getintmit(sc->sc_ah);
- error = sysctl_handle_int(oidp, &intmit, 0, req);
- if (error || !req->newptr)
- return error;
- return !ath_hal_setintmit(sc->sc_ah, intmit) ? EINVAL : 0;
-}
-
-#ifdef IEEE80211_SUPPORT_TDMA
-static int
-ath_sysctl_setcca(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- int setcca, error;
-
- setcca = sc->sc_setcca;
- error = sysctl_handle_int(oidp, &setcca, 0, req);
- if (error || !req->newptr)
- return error;
- sc->sc_setcca = (setcca != 0);
- return 0;
-}
-#endif /* IEEE80211_SUPPORT_TDMA */
-
-static void
-ath_sysctlattach(struct ath_softc *sc)
-{
- struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev);
- struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
- struct ath_hal *ah = sc->sc_ah;
-
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "countrycode", CTLFLAG_RD, &sc->sc_eecc, 0,
- "EEPROM country code");
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "regdomain", CTLFLAG_RD, &sc->sc_eerd, 0,
- "EEPROM regdomain code");
-#ifdef ATH_DEBUG
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "debug", CTLFLAG_RW, &sc->sc_debug, 0,
- "control debugging printfs");
-#endif
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "slottime", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_slottime, "I", "802.11 slot time (us)");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "acktimeout", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_acktimeout, "I", "802.11 ACK timeout (us)");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "ctstimeout", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_ctstimeout, "I", "802.11 CTS timeout (us)");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "softled", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_softled, "I", "enable/disable software LED support");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "ledpin", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_ledpin, "I", "GPIO pin connected to LED");
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "ledon", CTLFLAG_RW, &sc->sc_ledon, 0,
- "setting to turn LED on");
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "ledidle", CTLFLAG_RW, &sc->sc_ledidle, 0,
- "idle time for inactivity LED (ticks)");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "txantenna", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_txantenna, "I", "antenna switch");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "rxantenna", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_rxantenna, "I", "default/rx antenna");
- if (ath_hal_hasdiversity(ah))
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "diversity", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_diversity, "I", "antenna diversity");
- sc->sc_txintrperiod = ATH_TXINTR_PERIOD;
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "txintrperiod", CTLFLAG_RW, &sc->sc_txintrperiod, 0,
- "tx descriptor batching");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "diag", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_diag, "I", "h/w diagnostic control");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "tpscale", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_tpscale, "I", "tx power scaling");
- if (ath_hal_hastpc(ah)) {
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "tpc", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_tpc, "I", "enable/disable per-packet TPC");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "tpack", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_tpack, "I", "tx power for ack frames");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "tpcts", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_tpcts, "I", "tx power for cts frames");
- }
- if (ath_hal_hasrfsilent(ah)) {
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "rfsilent", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_rfsilent, "I", "h/w RF silent config");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "rfkill", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_rfkill, "I", "enable/disable RF kill
switch");
- }
- if (ath_hal_hasintmit(ah)) {
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "intmit", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_intmit, "I", "interference mitigation");
- }
- sc->sc_monpass = HAL_RXERR_DECRYPT | HAL_RXERR_MIC;
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "monpass", CTLFLAG_RW, &sc->sc_monpass, 0,
- "mask of error frames to pass when monitoring");
-#ifdef IEEE80211_SUPPORT_TDMA
- if (ath_hal_macversion(ah) > 0x78) {
- sc->sc_tdmadbaprep = 2;
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "dbaprep", CTLFLAG_RW, &sc->sc_tdmadbaprep, 0,
- "TDMA DBA preparation time");
- sc->sc_tdmaswbaprep = 10;
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "swbaprep", CTLFLAG_RW, &sc->sc_tdmaswbaprep, 0,
- "TDMA SWBA preparation time");
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "guardtime", CTLFLAG_RW, &sc->sc_tdmaguard, 0,
- "TDMA slot guard time");
- SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "superframe", CTLFLAG_RD, &sc->sc_tdmabintval, 0,
- "TDMA calculated super frame");
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "setcca", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_setcca, "I", "enable CCA control");
- }
-#endif
-}
-
/*
* Announce various information on device/driver attach.
*/
@@ -6392,227 +6005,3 @@ ath_tdma_beacon_send(struct ath_softc *s
}
#endif /* IEEE80211_SUPPORT_TDMA */
-static int
-ath_sysctl_clearstats(SYSCTL_HANDLER_ARGS)
-{
- struct ath_softc *sc = arg1;
- int val = 0;
- int error;
-
- error = sysctl_handle_int(oidp, &val, 0, req);
- if (error || !req->newptr)
- return error;
- if (val == 0)
- return 0; /* Not clearing the stats is still valid */
- memset(&sc->sc_stats, 0, sizeof(sc->sc_stats));
- val = 0;
- return 0;
-}
-
-static void
-ath_sysctl_stats_attach_rxphyerr(struct ath_softc *sc, struct sysctl_oid_list
*parent)
-{
- struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev);
- struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
- struct sysctl_oid_list *child = SYSCTL_CHILDREN(tree);
- int i;
- char sn[8];
-
- tree = SYSCTL_ADD_NODE(ctx, parent, OID_AUTO, "rx_phy_err", CTLFLAG_RD,
NULL, "Per-code RX PHY Errors");
- child = SYSCTL_CHILDREN(tree);
- for (i = 0; i < 64; i++) {
- snprintf(sn, sizeof(sn), "%d", i);
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, sn, CTLFLAG_RD,
&sc->sc_stats.ast_rx_phy[i], 0, "");
- }
-}
-
-static void
-ath_sysctl_stats_attach(struct ath_softc *sc)
-{
- struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
- struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev);
- struct sysctl_oid_list *child = SYSCTL_CHILDREN(tree);
-
- /* Create "clear" node */
- SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "clear_stats", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
- ath_sysctl_clearstats, "I", "clear stats");
-
- /* Create stats node */
- tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD,
- NULL, "Statistics");
- child = SYSCTL_CHILDREN(tree);
-
- /* This was generated from if_athioctl.h */
-
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_watchdog", CTLFLAG_RD,
- &sc->sc_stats.ast_watchdog, 0, "device reset by watchdog");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_hardware", CTLFLAG_RD,
- &sc->sc_stats.ast_hardware, 0, "fatal hardware error interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_bmiss", CTLFLAG_RD,
- &sc->sc_stats.ast_bmiss, 0, "beacon miss interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_bmiss_phantom", CTLFLAG_RD,
- &sc->sc_stats.ast_bmiss_phantom, 0, "beacon miss interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_bstuck", CTLFLAG_RD,
- &sc->sc_stats.ast_bstuck, 0, "beacon stuck interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rxorn", CTLFLAG_RD,
- &sc->sc_stats.ast_rxorn, 0, "rx overrun interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rxeol", CTLFLAG_RD,
- &sc->sc_stats.ast_rxeol, 0, "rx eol interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_txurn", CTLFLAG_RD,
- &sc->sc_stats.ast_txurn, 0, "tx underrun interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_mib", CTLFLAG_RD,
- &sc->sc_stats.ast_mib, 0, "mib interrupts");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_intrcoal", CTLFLAG_RD,
- &sc->sc_stats.ast_intrcoal, 0, "interrupts coalesced");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_packets", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_packets, 0, "packet sent on the interface");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_mgmt", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_mgmt, 0, "management frames transmitted");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_discard", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_discard, 0, "frames discarded prior to assoc");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_qstop", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_qstop, 0, "output stopped 'cuz no buffer");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_encap", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_encap, 0, "tx encapsulation failed");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nonode", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_nonode, 0, "tx failed 'cuz no node");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nombuf", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_nombuf, 0, "tx failed 'cuz no mbuf");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nomcl", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_nomcl, 0, "tx failed 'cuz no cluster");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_linear", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_linear, 0, "tx linearized to cluster");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nodata", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_nodata, 0, "tx discarded empty frame");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_busdma", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_busdma, 0, "tx failed for dma resrcs");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_xretries", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_xretries, 0, "tx failed 'cuz too many
retries");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_fifoerr", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_fifoerr, 0, "tx failed 'cuz FIFO underrun");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_filtered", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_filtered, 0, "tx failed 'cuz xmit filtered");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_shortretry", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_shortretry, 0, "tx on-chip retries (short)");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_longretry", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_longretry, 0, "tx on-chip retries (long)");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_badrate", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_badrate, 0, "tx failed 'cuz bogus xmit rate");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_noack", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_noack, 0, "tx frames with no ack marked");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_rts", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_rts, 0, "tx frames with rts enabled");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_cts", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_cts, 0, "tx frames with cts enabled");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_shortpre", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_shortpre, 0, "tx frames with short preamble");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_altrate", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_altrate, 0, "tx frames with alternate rate");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_protect", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_protect, 0, "tx frames with protection");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_ctsburst", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_ctsburst, 0, "tx frames with cts and
bursting");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_ctsext", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_ctsext, 0, "tx frames with cts extension");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_nombuf", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_nombuf, 0, "rx setup failed 'cuz no mbuf");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_busdma", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_busdma, 0, "rx setup failed for dma resrcs");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_orn", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_orn, 0, "rx failed 'cuz of desc overrun");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_crcerr", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_crcerr, 0, "rx failed 'cuz of bad CRC");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_fifoerr", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_fifoerr, 0, "rx failed 'cuz of FIFO overrun");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_badcrypt", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_badcrypt, 0, "rx failed 'cuz decryption");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_badmic", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_badmic, 0, "rx failed 'cuz MIC failure");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_phyerr", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_phyerr, 0, "rx failed 'cuz of PHY err");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_tooshort", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_tooshort, 0, "rx discarded 'cuz frame too
short");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_toobig", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_toobig, 0, "rx discarded 'cuz frame too
large");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_packets", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_packets, 0, "packet recv on the interface");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_mgt", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_mgt, 0, "management frames received");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_ctl", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_ctl, 0, "rx discarded 'cuz ctl frame");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_be_xmit", CTLFLAG_RD,
- &sc->sc_stats.ast_be_xmit, 0, "beacons transmitted");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_be_nombuf", CTLFLAG_RD,
- &sc->sc_stats.ast_be_nombuf, 0, "beacon setup failed 'cuz no mbuf");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_per_cal", CTLFLAG_RD,
- &sc->sc_stats.ast_per_cal, 0, "periodic calibration calls");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_per_calfail", CTLFLAG_RD,
- &sc->sc_stats.ast_per_calfail, 0, "periodic calibration failed");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_per_rfgain", CTLFLAG_RD,
- &sc->sc_stats.ast_per_rfgain, 0, "periodic calibration rfgain
reset");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rate_calls", CTLFLAG_RD,
- &sc->sc_stats.ast_rate_calls, 0, "rate control checks");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rate_raise", CTLFLAG_RD,
- &sc->sc_stats.ast_rate_raise, 0, "rate control raised xmit rate");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rate_drop", CTLFLAG_RD,
- &sc->sc_stats.ast_rate_drop, 0, "rate control dropped xmit rate");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ant_defswitch", CTLFLAG_RD,
- &sc->sc_stats.ast_ant_defswitch, 0, "rx/default antenna switches");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ant_txswitch", CTLFLAG_RD,
- &sc->sc_stats.ast_ant_txswitch, 0, "tx antenna switches");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_cabq_xmit", CTLFLAG_RD,
- &sc->sc_stats.ast_cabq_xmit, 0, "cabq frames transmitted");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_cabq_busy", CTLFLAG_RD,
- &sc->sc_stats.ast_cabq_busy, 0, "cabq found busy");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_raw", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_raw, 0, "tx frames through raw api");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_txok", CTLFLAG_RD,
- &sc->sc_stats.ast_ff_txok, 0, "fast frames tx'd successfully");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_txerr", CTLFLAG_RD,
- &sc->sc_stats.ast_ff_txerr, 0, "fast frames tx'd w/ error");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_rx", CTLFLAG_RD,
- &sc->sc_stats.ast_ff_rx, 0, "fast frames rx'd");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ff_flush", CTLFLAG_RD,
- &sc->sc_stats.ast_ff_flush, 0, "fast frames flushed from staging
q");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_qfull", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_qfull, 0, "tx dropped 'cuz of queue limit");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nobuf", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_nobuf, 0, "tx dropped 'cuz no ath buffer");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_update", CTLFLAG_RD,
- &sc->sc_stats.ast_tdma_update, 0, "TDMA slot timing updates");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_timers", CTLFLAG_RD,
- &sc->sc_stats.ast_tdma_timers, 0, "TDMA slot update set beacon
timers");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_tsf", CTLFLAG_RD,
- &sc->sc_stats.ast_tdma_tsf, 0, "TDMA slot update set TSF");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tdma_ack", CTLFLAG_RD,
- &sc->sc_stats.ast_tdma_ack, 0, "TDMA tx failed 'cuz ACK required");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_raw_fail", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_raw_fail, 0, "raw tx failed 'cuz h/w down");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_nofrag", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_nofrag, 0, "tx dropped 'cuz no ath frag
buffer");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_be_missed", CTLFLAG_RD,
- &sc->sc_stats.ast_be_missed, 0, "number of -missed- beacons");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ani_cal", CTLFLAG_RD,
- &sc->sc_stats.ast_ani_cal, 0, "number of ANI polls");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_agg", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_agg, 0, "number of aggregate frames received");
-
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_halfgi", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_halfgi, 0, "number of frames received with
half-GI");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_2040", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_2040, 0, "number of HT/40 frames received");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_pre_crc_err", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_pre_crc_err, 0, "number of delimeter-CRC
errors detected");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_post_crc_err", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_post_crc_err, 0, "number of post-delimiter CRC
errors detected");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_decrypt_busy_err",
CTLFLAG_RD,
- &sc->sc_stats.ast_rx_decrypt_busy_err, 0, "number of frames
received w/ busy decrypt engine");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_hi_rx_chain", CTLFLAG_RD,
- &sc->sc_stats.ast_rx_hi_rx_chain, 0, "");
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_htprotect", CTLFLAG_RD,
- &sc->sc_stats.ast_tx_htprotect, 0, "HT tx frames with protection");
-
- /* Attach the RX phy error array */
- ath_sysctl_stats_attach_rxphyerr(sc, child);
-}
Modified: head/sys/dev/ath/if_ath_misc.h
==============================================================================
--- head/sys/dev/ath/if_ath_misc.h Wed Mar 2 15:41:00 2011
(r219179)
+++ head/sys/dev/ath/if_ath_misc.h Wed Mar 2 16:03:19 2011
(r219180)
@@ -53,4 +53,6 @@ extern int ath_tx_findrix(const struct a
extern struct ath_buf * ath_getbuf(struct ath_softc *sc);
extern struct ath_buf * _ath_getbuf_locked(struct ath_softc *sc);
+extern int ath_reset(struct ifnet *);
+
#endif
Added: head/sys/dev/ath/if_ath_sysctl.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/ath/if_ath_sysctl.c Wed Mar 2 16:03:19 2011
(r219180)
@@ -0,0 +1,709 @@
+/*-
+ * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ * redistribution must be conditioned upon including a substantially
+ * similar Disclaimer requirement for further binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Driver for the Atheros Wireless LAN controller.
+ *
+ * This software is derived from work of Atsushi Onoe; his contribution
+ * is greatly appreciated.
+ */
+
+#include "opt_inet.h"
+#include "opt_ath.h"
+#include "opt_wlan.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sysctl.h>
+#include <sys/mbuf.h>
+#include <sys/malloc.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/errno.h>
+#include <sys/callout.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+#include <sys/kthread.h>
+#include <sys/taskqueue.h>
+#include <sys/priv.h>
+
+#include <machine/bus.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_llc.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_regdomain.h>
+#ifdef IEEE80211_SUPPORT_SUPERG
+#include <net80211/ieee80211_superg.h>
+#endif
+#ifdef IEEE80211_SUPPORT_TDMA
+#include <net80211/ieee80211_tdma.h>
+#endif
+
+#include <net/bpf.h>
+
+#ifdef INET
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#endif
+
+#include <dev/ath/if_athvar.h>
+#include <dev/ath/ath_hal/ah_devid.h> /* XXX for softled */
+#include <dev/ath/ath_hal/ah_diagcodes.h>
+
+#include <dev/ath/if_ath_debug.h>
+#include <dev/ath/if_ath_misc.h>
+#include <dev/ath/if_ath_tx.h>
+#include <dev/ath/if_ath_sysctl.h>
+
+#ifdef ATH_TX99_DIAG
+#include <dev/ath/ath_tx99/ath_tx99.h>
+#endif
+
+static int
+ath_sysctl_slottime(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int slottime = ath_hal_getslottime(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &slottime, 0, req);
+ if (error || !req->newptr)
+ return error;
+ return !ath_hal_setslottime(sc->sc_ah, slottime) ? EINVAL : 0;
+}
+
+static int
+ath_sysctl_acktimeout(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int acktimeout = ath_hal_getacktimeout(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &acktimeout, 0, req);
+ if (error || !req->newptr)
+ return error;
+ return !ath_hal_setacktimeout(sc->sc_ah, acktimeout) ? EINVAL : 0;
+}
+
+static int
+ath_sysctl_ctstimeout(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int ctstimeout = ath_hal_getctstimeout(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &ctstimeout, 0, req);
+ if (error || !req->newptr)
+ return error;
+ return !ath_hal_setctstimeout(sc->sc_ah, ctstimeout) ? EINVAL : 0;
+}
+
+static int
+ath_sysctl_softled(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ int softled = sc->sc_softled;
+ int error;
+
+ error = sysctl_handle_int(oidp, &softled, 0, req);
+ if (error || !req->newptr)
+ return error;
+ softled = (softled != 0);
+ if (softled != sc->sc_softled) {
+ if (softled) {
+ /* NB: handle any sc_ledpin change */
+ ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin,
+ HAL_GPIO_MUX_MAC_NETWORK_LED);
+ ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin,
+ !sc->sc_ledon);
+ }
+ sc->sc_softled = softled;
+ }
+ return 0;
+}
+
+static int
+ath_sysctl_ledpin(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ int ledpin = sc->sc_ledpin;
+ int error;
+
+ error = sysctl_handle_int(oidp, &ledpin, 0, req);
+ if (error || !req->newptr)
+ return error;
+ if (ledpin != sc->sc_ledpin) {
+ sc->sc_ledpin = ledpin;
+ if (sc->sc_softled) {
+ ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin,
+ HAL_GPIO_MUX_MAC_NETWORK_LED);
+ ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin,
+ !sc->sc_ledon);
+ }
+ }
+ return 0;
+}
+
+static int
+ath_sysctl_txantenna(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int txantenna = ath_hal_getantennaswitch(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &txantenna, 0, req);
+ if (!error && req->newptr) {
+ /* XXX assumes 2 antenna ports */
+ if (txantenna < HAL_ANT_VARIABLE || txantenna > HAL_ANT_FIXED_B)
+ return EINVAL;
+ ath_hal_setantennaswitch(sc->sc_ah, txantenna);
+ /*
+ * NB: with the switch locked this isn't meaningful,
+ * but set it anyway so things like radiotap get
+ * consistent info in their data.
+ */
+ sc->sc_txantenna = txantenna;
+ }
+ return error;
+}
+
+static int
+ath_sysctl_rxantenna(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int defantenna = ath_hal_getdefantenna(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &defantenna, 0, req);
+ if (!error && req->newptr)
+ ath_hal_setdefantenna(sc->sc_ah, defantenna);
+ return error;
+}
+
+static int
+ath_sysctl_diversity(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int diversity = ath_hal_getdiversity(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &diversity, 0, req);
+ if (error || !req->newptr)
+ return error;
+ if (!ath_hal_setdiversity(sc->sc_ah, diversity))
+ return EINVAL;
+ sc->sc_diversity = diversity;
+ return 0;
+}
+
+static int
+ath_sysctl_diag(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int32_t diag;
+ int error;
+
+ if (!ath_hal_getdiag(sc->sc_ah, &diag))
+ return EINVAL;
+ error = sysctl_handle_int(oidp, &diag, 0, req);
+ if (error || !req->newptr)
+ return error;
+ return !ath_hal_setdiag(sc->sc_ah, diag) ? EINVAL : 0;
+}
+
+static int
+ath_sysctl_tpscale(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ struct ifnet *ifp = sc->sc_ifp;
+ u_int32_t scale;
+ int error;
+
+ (void) ath_hal_gettpscale(sc->sc_ah, &scale);
+ error = sysctl_handle_int(oidp, &scale, 0, req);
+ if (error || !req->newptr)
+ return error;
+ return !ath_hal_settpscale(sc->sc_ah, scale) ? EINVAL :
+ (ifp->if_drv_flags & IFF_DRV_RUNNING) ? ath_reset(ifp) : 0;
+}
+
+static int
+ath_sysctl_tpc(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int tpc = ath_hal_gettpc(sc->sc_ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &tpc, 0, req);
+ if (error || !req->newptr)
+ return error;
+ return !ath_hal_settpc(sc->sc_ah, tpc) ? EINVAL : 0;
+}
+
+static int
+ath_sysctl_rfkill(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ struct ifnet *ifp = sc->sc_ifp;
+ struct ath_hal *ah = sc->sc_ah;
+ u_int rfkill = ath_hal_getrfkill(ah);
+ int error;
+
+ error = sysctl_handle_int(oidp, &rfkill, 0, req);
+ if (error || !req->newptr)
+ return error;
+ if (rfkill == ath_hal_getrfkill(ah)) /* unchanged */
+ return 0;
+ if (!ath_hal_setrfkill(ah, rfkill))
+ return EINVAL;
+ return (ifp->if_drv_flags & IFF_DRV_RUNNING) ? ath_reset(ifp) : 0;
+}
+
+static int
+ath_sysctl_rfsilent(SYSCTL_HANDLER_ARGS)
+{
+ struct ath_softc *sc = arg1;
+ u_int rfsilent;
+ int error;
+
+ (void) ath_hal_getrfsilent(sc->sc_ah, &rfsilent);
+ error = sysctl_handle_int(oidp, &rfsilent, 0, req);
+ if (error || !req->newptr)
+ return error;
+ if (!ath_hal_setrfsilent(sc->sc_ah, rfsilent))
+ return EINVAL;
+ sc->sc_rfsilentpin = rfsilent & 0x1c;
+ sc->sc_rfsilentpol = (rfsilent & 0x2) != 0;
+ return 0;
+}
+
+static int
+ath_sysctl_tpack(SYSCTL_HANDLER_ARGS)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
