From owner-svn-src-all@FreeBSD.ORG  Fri Aug 24 01:14:01 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 6E3FD106566C;
	Fri, 24 Aug 2012 01:14:01 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58F6A8FC0A;
	Fri, 24 Aug 2012 01:14:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7O1E1MV033126;
	Fri, 24 Aug 2012 01:14:01 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7O1E1Xf033124;
	Fri, 24 Aug 2012 01:14:01 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201208240114.q7O1E1Xf033124@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 24 Aug 2012 01:14:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239637 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 24 Aug 2012 01:14:01 -0000

Author: adrian
Date: Fri Aug 24 01:14:00 2012
New Revision: 239637
URL: http://svn.freebsd.org/changeset/base/239637

Log:
  Bring over some new EEPROM regulatory domain flags.
  
  Obtained from:	Qualcomm Atheros

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom.h

Modified: head/sys/dev/ath/ath_hal/ah_eeprom.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom.h	Fri Aug 24 01:12:07 2012	(r239636)
+++ head/sys/dev/ath/ath_hal/ah_eeprom.h	Fri Aug 24 01:14:00 2012	(r239637)
@@ -105,6 +105,10 @@ enum {
 	AR_EEP_TEMPSENSE_SLOPE,	/* int8_t* */
 	AR_EEP_TEMPSENSE_SLOPE_PAL_ON,	/* int8_t* */
 	AR_EEP_FRAC_N_5G,	/* uint8_t* */
+
+	/* New fields for AR9300 and later */
+	AR_EEP_DRIVE_STRENGTH,
+	AR_EEP_PAPRD_ENABLED,
 };
 
 typedef struct {
@@ -127,6 +131,30 @@ typedef struct {
 #define	CTL_2GHT40		7
 #define	CTL_5GHT40		8
 
+/* XXX must match what FCC/MKK/ETSI are defined as in ah_regdomain.h */
+#define	HAL_REG_DMN_MASK	0xf0
+#define	HAL_REGDMN_FCC		0x10
+#define	HAL_REGDMN_MKK		0x40
+#define	HAL_REGDMN_ETSI		0x30
+
+#define	is_reg_dmn_fcc(reg_dmn)	\
+	   (((reg_dmn & HAL_REG_DMN_MASK) == HAL_REGDMN_FCC) ? 1 : 0)
+#define	is_reg_dmn_etsi(reg_dmn)	\
+	    (((reg_dmn & HAL_REG_DMN_MASK) == HAL_REGDMN_ETSI) ? 1 : 0)
+#define	is_reg_dmn_mkk(reg_dmn)	\
+	    (((reg_dmn & HAL_REG_DMN_MASK) == HAL_REGDMN_MKK) ? 1 : 0)
+
+#define	AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND	0x0040
+#define	AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN	0x0080
+#define	AR_EEPROM_EEREGCAP_EN_KK_U2		0x0100
+#define	AR_EEPROM_EEREGCAP_EN_KK_MIDBAND	0x0200
+#define	AR_EEPROM_EEREGCAP_EN_KK_U1_ODD		0x0400
+#define	AR_EEPROM_EEREGCAP_EN_KK_NEW_11A	0x0800
+
+/* regulatory capabilities prior to eeprom version 4.0 */
+#define	AR_EEPROM_EEREGCAP_EN_KK_U1_ODD_PRE4_0  0x4000
+#define	AR_EEPROM_EEREGCAP_EN_KK_NEW_11A_PRE4_0 0x8000
+
 #define	AR_NO_SPUR		0x8000
 
 /* XXX exposed to chip code */