From owner-svn-src-all@FreeBSD.ORG  Wed Nov  7 06:23:23 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AE9367DD;
 Wed,  7 Nov 2012 06:23:23 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 93B6B8FC08;
 Wed,  7 Nov 2012 06:23:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA76NNWd063823;
 Wed, 7 Nov 2012 06:23:23 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA76NN3W063819;
 Wed, 7 Nov 2012 06:23:23 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201211070623.qA76NN3W063819@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 7 Nov 2012 06:23:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242689 - 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
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2012 06:23:23 -0000

Author: adrian
Date: Wed Nov  7 06:23:23 2012
New Revision: 242689
URL: http://svnweb.freebsd.org/changeset/base/242689

Log:
  Add new HAL configuration features for the updated AR9300 HAL.

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

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Wed Nov  7 02:14:03 2012	(r242688)
+++ head/sys/dev/ath/ath_hal/ah.h	Wed Nov  7 06:23:23 2012	(r242689)
@@ -1215,6 +1215,9 @@ typedef struct
 	int ath_hal_enable_ani;	/* should set this.. */
 	int ath_hal_cwm_ignore_ext_cca;
 	int ath_hal_show_bb_panic;
+	int ath_hal_ant_ctrl_comm2g_switch_enable;
+	int ath_hal_ext_atten_margin_cfg;
+	int ath_hal_war70c;
 } HAL_OPS_CONFIG;
 
 /*

Modified: head/sys/dev/ath/ath_hal/ah_debug.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_debug.h	Wed Nov  7 02:14:03 2012	(r242688)
+++ head/sys/dev/ath/ath_hal/ah_debug.h	Wed Nov  7 06:23:23 2012	(r242689)
@@ -52,6 +52,7 @@ enum {
 	HAL_DEBUG_CHANNEL	= 0x02000000,
 	HAL_DEBUG_QUEUE		= 0x04000000,
 	HAL_DEBUG_PRINT_REG	= 0x08000000,
+	HAL_DEBUG_FCS_RTT	= 0x10000000,
 
 	HAL_DEBUG_UNMASKABLE	= 0x80000000,	/* always printed */
 	HAL_DEBUG_ANY		= 0xffffffff

Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h	Wed Nov  7 02:14:03 2012	(r242688)
+++ head/sys/dev/ath/ath_hal/ah_internal.h	Wed Nov  7 06:23:23 2012	(r242689)
@@ -276,7 +276,9 @@ typedef struct {
 			halApmEnable			: 1,
 			halIntrMitigation		: 1,
 			hal49GhzSupport			: 1,
-			halAntDivCombSupport		: 1;
+			halAntDivCombSupport		: 1,
+			halAntDivCombSupportOrg		: 1,
+			halRadioRetentionSupport	: 1;
 
 	uint32_t	halWirelessModes;
 	uint16_t	halTotalQueues;