From owner-svn-src-head@freebsd.org Sun Feb 28 06:30:41 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F823AAE22E; Sun, 28 Feb 2016 06:30:41 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E8852100A; Sun, 28 Feb 2016 06:30:40 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1S6Ud4C004709; Sun, 28 Feb 2016 06:30:39 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1S6UdVH004707; Sun, 28 Feb 2016 06:30:39 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201602280630.u1S6UdVH004707@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 28 Feb 2016 06:30:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296154 - head/tools/tools/ath/athregs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2016 06:30:41 -0000 Author: adrian Date: Sun Feb 28 06:30:39 2016 New Revision: 296154 URL: https://svnweb.freebsd.org/changeset/base/296154 Log: Migrate athregs over to use the new stats API. Modified: head/tools/tools/ath/athregs/Makefile head/tools/tools/ath/athregs/dumpregs.c Modified: head/tools/tools/ath/athregs/Makefile ============================================================================== --- head/tools/tools/ath/athregs/Makefile Sun Feb 28 06:29:25 2016 (r296153) +++ head/tools/tools/ath/athregs/Makefile Sun Feb 28 06:30:39 2016 (r296154) @@ -2,9 +2,12 @@ PROG= athregs +CFLAGS+= -I${.CURDIR}/../common/ + .PATH.c: ${.CURDIR}/../common SRCS= dumpregs.c +SRCS+= ctrl.c SRCS+= dumpregs_5210.c SRCS+= dumpregs_5211.c SRCS+= dumpregs_5212.c Modified: head/tools/tools/ath/athregs/dumpregs.c ============================================================================== --- head/tools/tools/ath/athregs/dumpregs.c Sun Feb 28 06:29:25 2016 (r296153) +++ head/tools/tools/ath/athregs/dumpregs.c Sun Feb 28 06:30:39 2016 (r296154) @@ -43,6 +43,8 @@ #include #include +#include "ctrl.h" + typedef struct { HAL_REVS revs; u_int32_t regdata[0xffff / sizeof(u_int32_t)]; @@ -93,11 +95,11 @@ main(int argc, char *argv[]) const char *ifname; u_int32_t *data; u_int32_t *dp, *ep; - int what, c, s, i; + int what, c, i; + struct ath_driver_req req; + + ath_driver_req_init(&req); - s = socket(AF_INET, SOCK_DGRAM, 0); - if (s < 0) - err(1, "socket"); ifname = getenv("ATH"); if (!ifname) ifname = ATH_DEFAULT; @@ -144,6 +146,16 @@ main(int argc, char *argv[]) usage(); /*NOTREACHED*/ } + + /* Initialise the driver interface */ + if (ath_driver_req_open(&req, ifname) < 0) { + exit(127); + } + + /* + * Whilst we're doing the ath_diag pieces, we have to set this + * ourselves. + */ strncpy(atd.ad_name, ifname, sizeof (atd.ad_name)); argc -= optind; @@ -154,7 +166,8 @@ main(int argc, char *argv[]) atd.ad_id = HAL_DIAG_REVS; atd.ad_out_data = (caddr_t) &state.revs; atd.ad_out_size = sizeof(state.revs); - if (ioctl(s, SIOCGATHDIAG, &atd) < 0) + + if (ath_driver_req_fetch_diag(&req, SIOCGATHDIAG, &atd) < 0) err(1, "%s", atd.ad_name); if (ath_hal_setupregs(&atd, what) == 0) @@ -172,7 +185,8 @@ main(int argc, char *argv[]) exit(-1); } atd.ad_id = HAL_DIAG_REGS | ATH_DIAG_IN | ATH_DIAG_DYN; - if (ioctl(s, SIOCGATHDIAG, &atd) < 0) + + if (ath_driver_req_fetch_diag(&req, SIOCGATHDIAG, &atd) < 0) err(1, "%s", atd.ad_name); /* @@ -238,6 +252,7 @@ main(int argc, char *argv[]) fprintf(stdout, "\n"); ath_hal_dumpbb(stdout, what); } + ath_driver_req_close(&req); return 0; }