From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:53:04 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A8D2DA9; Mon, 31 Dec 2012 06:53:04 +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 0E2348FC0C; Mon, 31 Dec 2012 06:53:04 +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 qBV6r32g077956; Mon, 31 Dec 2012 06:53:03 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6r3Ww077954; Mon, 31 Dec 2012 06:53:03 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310653.qBV6r3Ww077954@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:53:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244895 - user/adrian/ath_radar_stuff/src/spectral_fft 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: Mon, 31 Dec 2012 06:53:04 -0000 Author: adrian Date: Mon Dec 31 06:53:03 2012 New Revision: 244895 URL: http://svnweb.freebsd.org/changeset/base/244895 Log: Break out the includes! Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.h Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 06:49:42 2012 (r244894) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 06:53:03 2012 (r244895) @@ -30,47 +30,7 @@ #include #include -typedef int8_t s8; -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint64_t u64; - -/* taken from ath9k.h */ -#define SPECTRAL_HT20_NUM_BINS 56 - -enum ath_fft_sample_type { - ATH_FFT_SAMPLE_HT20 = 0 -}; - -struct fft_sample_tlv { - u8 type; /* see ath_fft_sample */ - u16 length; - /* type dependent data follows */ -} __attribute__((packed)); - -struct fft_sample_ht20 { - struct fft_sample_tlv tlv; - - u8 __alignment; - - u16 freq; - s8 rssi; - s8 noise; - - u16 max_magnitude; - u8 max_index; - u8 bitmap_weight; - - u64 tsf; - - u16 data[SPECTRAL_HT20_NUM_BINS]; -} __attribute__((packed)); - - -struct scanresult { - struct fft_sample_ht20 sample; - struct scanresult *next; -}; +#include "fft_eval.h" #define WIDTH 1600 #define HEIGHT 650 Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.h Mon Dec 31 06:53:03 2012 (r244895) @@ -0,0 +1,46 @@ +#ifndef __FFT_EVAL_H__ +#define __FFT_EVAL_H__ + +typedef int8_t s8; +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint64_t u64; + +/* taken from ath9k.h */ +#define SPECTRAL_HT20_NUM_BINS 56 + +enum ath_fft_sample_type { + ATH_FFT_SAMPLE_HT20 = 0 +}; + +struct fft_sample_tlv { + u8 type; /* see ath_fft_sample */ + u16 length; + /* type dependent data follows */ +} __attribute__((packed)); + +struct fft_sample_ht20 { + struct fft_sample_tlv tlv; + + u8 __alignment; + + u16 freq; + s8 rssi; + s8 noise; + + u16 max_magnitude; + u8 max_index; + u8 bitmap_weight; + + u64 tsf; + + u16 data[SPECTRAL_HT20_NUM_BINS]; +} __attribute__((packed)); + + +struct scanresult { + struct fft_sample_ht20 sample; + struct scanresult *next; +}; + +#endif /* __FFT_EVAL_H__ */