From owner-svn-src-head@FreeBSD.ORG  Sat Aug  9 18:15:29 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1CB6DF63
 for <svn-src-head@freebsd.org>; Sat,  9 Aug 2014 18:15:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7E682788
 for <svn-src-head@freebsd.org>; Sat,  9 Aug 2014 18:15:28 +0000 (UTC)
Received: from adrian (uid 753) (envelope-from adrian@FreeBSD.org) id 2642
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 18:15:28 +0000
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 9 Aug 2014 18:15:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269760 - head/sys/dev/ath/ath_hal
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e66540.2642.8d597fa@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2014 18:15:29 -0000

Author: adrian
Date: Sat Aug  9 18:15:28 2014
New Revision: 269760
URL: http://svnweb.freebsd.org/changeset/base/269760

Log:
  Bump the HAL_REGRANGE fields from 16 bit to 32 bit.
  
  The AR9380 and later chips have a 128KiB register window, so the register
  read diag api needs changing.
  
  The tools are about to be updated as well.  No, they're not backwards
  compatible.

Modified:
  head/sys/dev/ath/ath_hal/ah.c
  head/sys/dev/ath/ath_hal/ah_internal.h

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Sat Aug  9 17:13:02 2014	(r269759)
+++ head/sys/dev/ath/ath_hal/ah.c	Sat Aug  9 18:15:28 2014	(r269760)
@@ -850,10 +850,11 @@ ath_hal_getregdump(struct ath_hal *ah, c
 	int i;
 
 	for (i = 0; space >= 2*sizeof(uint32_t); i++) {
-		u_int r = regs[i].start;
-		u_int e = regs[i].end;
-		*dp++ = (r<<16) | e;
-		space -= sizeof(uint32_t);
+		uint32_t r = regs[i].start;
+		uint32_t e = regs[i].end;
+		*dp++ = r;
+		*dp++ = e;
+		space -= 2*sizeof(uint32_t);
 		do {
 			*dp++ = OS_REG_READ(ah, r);
 			r += sizeof(uint32_t);

Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h	Sat Aug  9 17:13:02 2014	(r269759)
+++ head/sys/dev/ath/ath_hal/ah_internal.h	Sat Aug  9 18:15:28 2014	(r269760)
@@ -50,8 +50,8 @@
 #endif
 
 typedef struct {
-	uint16_t	start;		/* first register */
-	uint16_t	end;		/* ending register or zero */
+	uint32_t	start;		/* first register */
+	uint32_t	end;		/* ending register or zero */
 } HAL_REGRANGE;
 
 typedef struct {