From b6e1558bf46cc798f156e425a982eab36346882e Mon Sep 17 00:00:00 2001 From: Hartmut Brandt Date: Tue, 29 Jul 2003 14:05:45 +0000 Subject: Remove the rather bogus statistics sysctl and merge it into the internal driver statistics sysctl. --- sys/dev/hatm/if_hatm.c | 21 ++++----------------- sys/dev/hatm/if_hatmvar.h | 4 ++++ 2 files changed, 8 insertions(+), 17 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c index e1704e757d94..9af2b4965690 100644 --- a/sys/dev/hatm/if_hatm.c +++ b/sys/dev/hatm/if_hatm.c @@ -1245,7 +1245,6 @@ hatm_init(void *p) } enum { - CTL_STATS, CTL_ISTATS, }; @@ -1262,10 +1261,6 @@ hatm_sysctl(SYSCTL_HANDLER_ARGS) switch (arg2) { - case CTL_STATS: - len = sizeof(uint32_t) * 4; - break; - case CTL_ISTATS: len = sizeof(sc->istats); break; @@ -1279,14 +1274,11 @@ hatm_sysctl(SYSCTL_HANDLER_ARGS) switch (arg2) { - case CTL_STATS: - ret[0] = READ4(sc, HE_REGO_MCC); - ret[1] = READ4(sc, HE_REGO_OEC); - ret[2] = READ4(sc, HE_REGO_DCC); - ret[3] = READ4(sc, HE_REGO_CEC); - break; - case CTL_ISTATS: + sc->istats.mcc += READ4(sc, HE_REGO_MCC); + sc->istats.oec += READ4(sc, HE_REGO_OEC); + sc->istats.dcc += READ4(sc, HE_REGO_DCC); + sc->istats.cec += READ4(sc, HE_REGO_CEC); bcopy(&sc->istats, ret, sizeof(sc->istats)); break; } @@ -1778,11 +1770,6 @@ hatm_attach(device_t dev) hatm_sysctl, "LU", "internal statistics") == NULL) goto failed; - if (SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), - OID_AUTO, "stats", CTLFLAG_RD | CTLTYPE_OPAQUE, sc, CTL_STATS, - hatm_sysctl, "LU", "card statistics") == NULL) - goto failed; - #ifdef HATM_DEBUG if (SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "tsr", CTLFLAG_RD | CTLTYPE_OPAQUE, sc, 0, diff --git a/sys/dev/hatm/if_hatmvar.h b/sys/dev/hatm/if_hatmvar.h index 92722d05a850..3cb941712779 100644 --- a/sys/dev/hatm/if_hatmvar.h +++ b/sys/dev/hatm/if_hatmvar.h @@ -58,6 +58,10 @@ struct istats { uint32_t itype_phys; uint32_t itype_err; uint32_t defrag; + uint32_t mcc; + uint32_t oec; + uint32_t dcc; + uint32_t cec; }; /* Card memory layout parameters */ -- cgit v1.3