svn commit: r248677 - head/sys/dev/ath/ath_hal/ah_regdomain

[Adrian Chadd]

Author: adrian
Date: Sun Mar 24 04:42:56 2013
New Revision: 248677
URL: http://svnweb.freebsd.org/changeset/base/248677

Log:
  Add new regulatory domain.
  
  Obtained from:	Qualcomm Atheros

Modified:
  head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
  head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h

Modified: head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h	Sun Mar 24 04:09:54 2013	(r248676)
+++ head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h	Sun Mar 24 04:42:56 2013	(r248677)
@@ -741,6 +741,31 @@ static REG_DOMAIN regDomains[] = {
 				      WG1_2467_2467),
 	 .chan11g_turbo		= BM1(T3_2437_2437)},
 
+	{.regDmnEnum		= WORC_WORLD,
+	 .conformanceTestLimit	= NO_CTL,
+	 .dfsMask		= DFS_FCC3 | DFS_ETSI,
+	 .pscan			= PSCAN_WWR,
+	 .flags			= ADHOC_PER_11D,
+	 .chan11a		= BM4(W1_5260_5320,
+				      W1_5180_5240,
+				      W1_5745_5825,
+				      W1_5500_5700),
+	 .chan11b		= BM7(W1_2412_2412,
+				      W1_2437_2442,
+				      W1_2462_2462,
+				      W1_2472_2472,
+				      W1_2417_2432,
+				      W1_2447_2457,
+				      W1_2467_2467),
+	 .chan11g		= BM7(WG1_2412_2412,
+				      WG1_2437_2442,
+				      WG1_2462_2462,
+				      WG1_2472_2472,
+				      WG1_2417_2432,
+				      WG1_2447_2457,
+				      WG1_2467_2467),
+	 .chan11g_turbo		= BM1(T3_2437_2437)},
+
 	{.regDmnEnum		= NULL1,
 	 .conformanceTestLimit	= NO_CTL,
 	}

Modified: head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h	Sun Mar 24 04:09:54 2013	(r248676)
+++ head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h	Sun Mar 24 04:42:56 2013	(r248677)
@@ -129,6 +129,7 @@ static REG_DMN_PAIR_MAPPING regDomainPai
 	{WOR9_WORLD,	WOR9_WORLD,	WOR9_WORLD,	DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
 	{WORA_WORLD,	WORA_WORLD,	WORA_WORLD,	DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
 	{WORB_WORLD,	WORB_WORLD,	WORB_WORLD,	DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
+	{WORC_WORLD,	WORC_WORLD,	WORC_WORLD,	NO_REQ, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
 };
 
 #endif