From 19f287cb030a2886acbc3b69e186b42c1ac3ffd9 Mon Sep 17 00:00:00 2001
From: adrian <adrian@FreeBSD.org>
Date: Wed, 7 Nov 2012 06:23:23 +0000
Subject: [PATCH] Add new HAL configuration features for the updated AR9300
 HAL.

---
 sys/dev/ath/ath_hal/ah.h          | 3 +++
 sys/dev/ath/ath_hal/ah_debug.h    | 1 +
 sys/dev/ath/ath_hal/ah_internal.h | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index bce46c93eb1a..12e92044b304 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -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;
 
 /*
diff --git a/sys/dev/ath/ath_hal/ah_debug.h b/sys/dev/ath/ath_hal/ah_debug.h
index 6cd262737cb1..c5aac604ac0a 100644
--- a/sys/dev/ath/ath_hal/ah_debug.h
+++ b/sys/dev/ath/ath_hal/ah_debug.h
@@ -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
diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h
index 416130cd695c..2d1087ab8aa9 100644
--- a/sys/dev/ath/ath_hal/ah_internal.h
+++ b/sys/dev/ath/ath_hal/ah_internal.h
@@ -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;