From owner-svn-src-user@FreeBSD.ORG  Wed Jan 21 00:56:28 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E3D0106564A;
	Wed, 21 Jan 2009 00:56:28 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E9648FC0A;
	Wed, 21 Jan 2009 00:56:28 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0L0uSRS061959;
	Wed, 21 Jan 2009 00:56:28 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0L0uSDm061958;
	Wed, 21 Jan 2009 00:56:28 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901210056.n0L0uSDm061958@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 21 Jan 2009 00:56:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187508 - user/sam/wifi/etc
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2009 00:56:28 -0000

Author: sam
Date: Wed Jan 21 00:56:28 2009
New Revision: 187508
URL: http://svn.freebsd.org/changeset/base/187508

Log:
  Remove gsm hacks now that we can do this "right":
  o no need for special country codes; it's sufficient to use the sku
  o no need to specify bands w/ 2.4G frequencies, use the real values
  o remove duplicate band specs

Modified:
  user/sam/wifi/etc/regdomain.xml

Modified: user/sam/wifi/etc/regdomain.xml
==============================================================================
--- user/sam/wifi/etc/regdomain.xml	Wed Jan 21 00:54:48 2009	(r187507)
+++ user/sam/wifi/etc/regdomain.xml	Wed Jan 21 00:56:28 2009	(r187508)
@@ -1084,7 +1084,6 @@
 <rd id="sr9">
   <name>SR9</name>
   <sku>0x0298</sku>
-  <defcc ref="SR9"/>
   <netband mode="11g">
     <band>
       <freqband ref="S1_907_922_5"/>
@@ -1107,20 +1106,19 @@
 <rd id="xr9">
   <name>XR9</name>
   <sku>0x299</sku>
-  <defcc ref="XR9"/>
   <netband mode="11g">
     <band>
-      <freqband ref="S2_907_922_5"/>
+      <freqband ref="S1_907_922_5"/>
       <maxpower>30</maxpower>
       <flags>IEEE80211_CHAN_G</flags>
     </band>
     <band>
-      <freqband ref="S2_907_922_10"/>
+      <freqband ref="S1_907_922_10"/>
       <maxpower>30</maxpower>
       <flags>IEEE80211_CHAN_G</flags>
     </band>
     <band>
-      <freqband ref="S2_912_917"/>
+      <freqband ref="S1_912_917"/>
       <maxpower>30</maxpower>
       <flags>IEEE80211_CHAN_G</flags>
     </band>
@@ -1130,7 +1128,6 @@
 <rd id="gz901">
   <name>GZ901</name>
   <sku>0x29a</sku>
-  <defcc ref="GZ901"/>
   <netband mode="11g">
     <band>
       <freqband ref="S1_908_923_5"/>
@@ -1270,9 +1267,6 @@
 <country id="GT">
   <isocc>320</isocc> <name>Guatemala</name> <rd ref="none"/>
 </country>
-<country id="GZ901">
-  <isocc>5002</isocc> <name>ZComax GZ-901</name> <rd ref="gz901"/>
-</country>
 <country id="HN">
   <isocc>340</isocc> <name>Honduras</name> <rd ref="none"/>
 </country>
@@ -1468,12 +1462,6 @@
 <country id="TR">
   <isocc>792</isocc> <name>Turkey</name> <rd ref="etsi"/>
 </country>
-<country id="SR9">
-  <isocc>5000</isocc> <name>Ubiquiti SR9</name> <rd ref="sr9"/>
-</country>
-<country id="XR9">
-  <isocc>5001</isocc> <name>Ubiquiti XR9</name> <rd ref="xr9"/>
-</country>
 <country id="UA">
   <isocc>804</isocc> <name>Ukraine</name> <rd ref="none"/>
 </country>
@@ -1659,55 +1647,37 @@
 </freqband>
 
 <freqband id="S1_907_922_5">
-  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <freqstart>907</freqstart> <freqend>922</freqend>
   <chanwidth>5</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
   <flags>IEEE80211_CHAN_QUARTER</flags>
 </freqband>
 <freqband id="S1_907_922_10">
-  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <freqstart>907</freqstart> <freqend>922</freqend>
   <chanwidth>10</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
   <flags>IEEE80211_CHAN_HALF</flags>
 </freqband>
 <freqband id="S1_912_917">
-  <freqstart>2427</freqstart> <freqend>2432</freqend>
-  <chanwidth>20</chanwidth> <chansep>5</chansep>
-  <flags>IEEE80211_CHAN_GSM</flags>
-</freqband>
-
-<freqband id="S2_907_922_5">
-  <freqstart>2427</freqstart> <freqend>2442</freqend>
-  <chanwidth>5</chanwidth> <chansep>5</chansep>
-  <flags>IEEE80211_CHAN_GSM</flags>
-  <flags>IEEE80211_CHAN_QUARTER</flags>
-</freqband>
-<freqband id="S2_907_922_10">
-  <freqstart>2427</freqstart> <freqend>2442</freqend>
-  <chanwidth>10</chanwidth> <chansep>5</chansep>
-  <flags>IEEE80211_CHAN_GSM</flags>
-  <flags>IEEE80211_CHAN_HALF</flags>
-</freqband>
-<freqband id="S2_912_917">
-  <freqstart>2432</freqstart> <freqend>2437</freqend>
+  <freqstart>912</freqstart> <freqend>917</freqend>
   <chanwidth>20</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
 </freqband>
 
 <freqband id="S1_908_923_5">
-  <freqstart>2447</freqstart> <freqend>2467</freqend>
+  <freqstart>908</freqstart> <freqend>923</freqend>
   <chanwidth>5</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
   <flags>IEEE80211_CHAN_QUARTER</flags>
 </freqband>
 <freqband id="S1_913_918_10">
-  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <freqstart>913</freqstart> <freqend>918</freqend>
   <chanwidth>10</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
   <flags>IEEE80211_CHAN_HALF</flags>
 </freqband>
 <freqband id="S1_913_918">
-  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <freqstart>913</freqstart> <freqend>918</freqend>
   <chanwidth>20</chanwidth> <chansep>5</chansep>
   <flags>IEEE80211_CHAN_GSM</flags>
 </freqband>