From owner-svn-src-user@FreeBSD.ORG Fri Jan 4 05:53:18 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 56DBF992; Fri, 4 Jan 2013 05:53:18 +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 455A1CC4; Fri, 4 Jan 2013 05:53:18 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r045rIhq064881; Fri, 4 Jan 2013 05:53:18 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r045rH7u064879; Fri, 4 Jan 2013 05:53:17 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201301040553.r045rH7u064879@svn.freebsd.org> From: Adrian Chadd Date: Fri, 4 Jan 2013 05:53:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245030 - user/adrian/ath_radar_stuff/lib/libradarpkt X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2013 05:53:18 -0000 Author: adrian Date: Fri Jan 4 05:53:17 2013 New Revision: 245030 URL: http://svnweb.freebsd.org/changeset/base/245030 Log: Add pri/sec frequency and channel width fields; remove the hard-coded channel 1. Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c ============================================================================== --- user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c Fri Jan 4 05:51:08 2013 (r245029) +++ user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c Fri Jan 4 05:53:17 2013 (r245030) @@ -300,7 +300,7 @@ ar9280_radar_decode(struct ieee80211_rad //re->re_rssi = pri_rssi; /* XXX extension rssi? */ re->re_rssi = comb_rssi; /* XXX comb for spectral scan? or not? */ re->re_dur = pkt[len - 3]; /* XXX extension duration? */ - re->re_freq = 2412; /* XXX DO this! */ + re->re_freq = 0; re->re_num_spectral_entries = 0; /* XXX flags? */ Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h ============================================================================== --- user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h Fri Jan 4 05:51:08 2013 (r245029) +++ user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h Fri Jan 4 05:53:17 2013 (r245030) @@ -62,7 +62,16 @@ struct radar_fft_entry { struct radar_entry { uint64_t re_timestamp; + + /* Primary frequency */ uint32_t re_freq; + + /* Secondary channel frequency, if applicable */ + uint32_t re_freq_sec; + + /* Channel width */ + uint32_t re_freqwidth; + /* * The hardware may give it to us as a negative number; * eg CCK decode which can use self-correlation to decode