From ef2732b2eeea49a53c10d8c07329d5abe933842e Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Tue, 5 Apr 2011 05:29:10 +0000 Subject: [PATCH] Put the ARGE_DEBUG behind a kernel config option. --- sys/conf/options.mips | 5 +++++ sys/mips/atheros/if_arge.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/conf/options.mips b/sys/conf/options.mips index 30f04ce9428..c3ba6b9e202 100644 --- a/sys/conf/options.mips +++ b/sys/conf/options.mips @@ -65,3 +65,8 @@ MAXMEM opt_global.h # OCTEON_VENDOR_LANNER opt_cvmx.h OCTEON_BOARD_CAPK_0100ND opt_cvmx.h + +# +# Options that control the Atheros SoC peripherals +# +ARGE_DEBUG opt_global.h diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c index b28bf04bd18..4b60e86044e 100644 --- a/sys/mips/atheros/if_arge.c +++ b/sys/mips/atheros/if_arge.c @@ -87,7 +87,6 @@ typedef enum { ARGE_DBG_INTR = 0x00000002 } arge_debug_flags; -#undef ARGE_DEBUG #ifdef ARGE_DEBUG #define ARGEDEBUG(_sc, _m, ...) \ do { \ @@ -213,9 +212,11 @@ arge_attach_sysctl(device_t dev) struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev); struct sysctl_oid *tree = device_get_sysctl_tree(dev); +#ifdef ARGE_DEBUG SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "debug", CTLFLAG_RW, &sc->arge_debug, 0, "arge interface debugging flags"); +#endif SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_pkts_aligned", CTLFLAG_RW, &sc->stats.tx_pkts_aligned, 0, @@ -225,9 +226,14 @@ arge_attach_sysctl(device_t dev) "tx_pkts_unaligned", CTLFLAG_RW, &sc->stats.tx_pkts_unaligned, 0, "number of TX unaligned packets"); - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_prod", CTLFLAG_RW, &sc->arge_cdata.arge_tx_prod, 0, ""); - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_cons", CTLFLAG_RW, &sc->arge_cdata.arge_tx_cons, 0, ""); - SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_cnt", CTLFLAG_RW, &sc->arge_cdata.arge_tx_cnt, 0, ""); +#ifdef ARGE_DEBUG + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_prod", + CTLFLAG_RW, &sc->arge_cdata.arge_tx_prod, 0, ""); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_cons", + CTLFLAG_RW, &sc->arge_cdata.arge_tx_cons, 0, ""); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tx_cnt", + CTLFLAG_RW, &sc->arge_cdata.arge_tx_cnt, 0, ""); +#endif } static int