From owner-svn-src-head@FreeBSD.ORG Fri Dec 7 06:34:47 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EABA6F47; Fri, 7 Dec 2012 06:34:46 +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 CEE438FC0C; Fri, 7 Dec 2012 06:34:46 +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 qB76YkbM035539; Fri, 7 Dec 2012 06:34:46 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB76YkH1035537; Fri, 7 Dec 2012 06:34:46 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212070634.qB76YkH1035537@svn.freebsd.org> From: Adrian Chadd Date: Fri, 7 Dec 2012 06:34:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243974 - in head: etc sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Dec 2012 06:34:47 -0000 Author: adrian Date: Fri Dec 7 06:34:46 2012 New Revision: 243974 URL: http://svnweb.freebsd.org/changeset/base/243974 Log: Add a new 900MHz GSM regulatory SKU for the Xagyl Communications XC900M. The XC900M acts as a Ubiquiti XR9 (and I _think_ SR9) by default; it uses the same 900MHz<->2.4GHz downconverter mapping. However it has an alternative frequency mapping which squeezes in a couple more half/quarter rate channels. Since the default HAL doesn't support fractional tuning (sub-1MHz) in 2.4GHz mode on the AR5413/AR5414, they implement it using a jumper. Datasheet: http://www.xagyl.com/download/XC900M_Datasheet.pdf Thankyou to Xagyl Communications for the XC900M NICs and Edgar Martinez for organising the donation. Tested: * XC900M <-> XC900M * Ubiquiti XR9 <-> XC900M TODO: * Test against SR9 and GZ901 if possible (the IEEE channel<->frequency mapping may not match up, thanks to the slightly different channels involved) Modified: head/etc/regdomain.xml head/sys/net80211/ieee80211_regdomain.h Modified: head/etc/regdomain.xml ============================================================================== --- head/etc/regdomain.xml Fri Dec 7 06:34:20 2012 (r243973) +++ head/etc/regdomain.xml Fri Dec 7 06:34:46 2012 (r243974) @@ -1303,6 +1303,29 @@ + + + XC900M + 0x29b + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + @@ -1896,6 +1919,25 @@ IEEE80211_CHAN_GSM + + 905 925 + 5 5 + IEEE80211_CHAN_GSM + IEEE80211_CHAN_QUARTER + + + 910 920 + 10 5 + IEEE80211_CHAN_GSM + IEEE80211_CHAN_HALF + + + 915 915 + 20 5 + IEEE80211_CHAN_GSM + + + Modified: head/sys/net80211/ieee80211_regdomain.h ============================================================================== --- head/sys/net80211/ieee80211_regdomain.h Fri Dec 7 06:34:20 2012 (r243973) +++ head/sys/net80211/ieee80211_regdomain.h Fri Dec 7 06:34:46 2012 (r243974) @@ -258,6 +258,17 @@ enum RegdomainCode { SKU_SR9 = 0x0298, /* Ubiquiti SR9 (900MHz/GSM) */ SKU_XR9 = 0x0299, /* Ubiquiti XR9 (900MHz/GSM) */ SKU_GZ901 = 0x029a, /* Zcomax GZ-901 (900MHz/GSM) */ + SKU_XC900M = 0x029b, /* Xagyl XC900M (900MHz/GSM) */ + /* + * The XC900M by default uses the + * same mapping as the XR9. It + * can optionally use a slightly + * offset channel spacing (905MHz- + * 925MHz) versus the XR9 (907MHz- + * 922MHz), giving an extra channel. + * This requires a jumper on the + * NIC to be changed. + */ }; #if defined(__KERNEL__) || defined(_KERNEL)