svn commit: r245030 - user/adrian/ath_radar_stuff/lib/libradarpkt

[Adrian Chadd]

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