From fa5e9502cdd3d2bad2e32f4b0c12d7177277f89d Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 9 Aug 2014 18:17:16 +0000
Subject: [PATCH] Update athpoke/athregs to use the modified register read
 diagnostic API.

---
 tools/tools/ath/athpoke/athpoke.c  | 4 ++--
 tools/tools/ath/athregs/dumpregs.c | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/tools/ath/athpoke/athpoke.c b/tools/tools/ath/athpoke/athpoke.c
index 1749b7b52b7..9f19f47d60d 100644
--- a/tools/tools/ath/athpoke/athpoke.c
+++ b/tools/tools/ath/athpoke/athpoke.c
@@ -123,7 +123,7 @@ static uint32_t
 regread(int s, struct ath_diag *atd, uint32_t r)
 {
 	HAL_REGRANGE ra;
-	uint32_t v[2];
+	uint32_t v[3];
 
 	ra.start = r;
 	ra.end = 0;
@@ -135,7 +135,7 @@ regread(int s, struct ath_diag *atd, uint32_t r)
 	atd->ad_id = HAL_DIAG_REGS | ATH_DIAG_IN | ATH_DIAG_DYN;
 	if (ioctl(s, SIOCGATHDIAG, atd) < 0)
 		err(1, atd->ad_name);
-	return v[1];
+	return v[2];
 }
 
 static void
diff --git a/tools/tools/ath/athregs/dumpregs.c b/tools/tools/ath/athregs/dumpregs.c
index 50e8a1e0397..4a50726829d 100644
--- a/tools/tools/ath/athregs/dumpregs.c
+++ b/tools/tools/ath/athregs/dumpregs.c
@@ -182,8 +182,9 @@ main(int argc, char *argv[])
 	dp = (u_int32_t *)atd.ad_out_data;
 	ep = (u_int32_t *)(atd.ad_out_data + atd.ad_out_size);
 	while (dp < ep) {
-		u_int r = dp[0] >> 16;		/* start of range */
-		u_int e = dp[0] & 0xffff;	/* end of range */
+		u_int r = dp[0];	/* start of range */
+		u_int e = dp[1];	/* end of range */
+		dp++;
 		dp++;
 		/* convert offsets to indices */
 		r >>= 2; e >>= 2;
@@ -611,7 +612,7 @@ ath_hal_setupdiagregs(const HAL_REGRANGE regs[], u_int nr)
 
 	space = 0;
 	for (i = 0; i < nr; i++) {
-		u_int n = 2 * sizeof(u_int32_t);	/* reg range + first */
+		u_int n = sizeof(HAL_REGRANGE) + sizeof(u_int32_t);	/* reg range + first */
 		if (regs[i].end) {
 			if (regs[i].end < regs[i].start) {
 				fprintf(stderr, "%s: bad register range, "