diff options
| author | Jon Szymaniak <jon.szymaniak@gmail.com> | 2013-10-25 23:40:05 -0400 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-10-30 18:59:48 +0100 |
| commit | 03c42ef3206f5667459f78781f95d7fc5c322053 (patch) | |
| tree | d2d0c7fde68cedd99135243809493e5aa4859492 /lib/bladerf/bladerf_common.h | |
| parent | 46a241624a328e7107268a0c48a7bc364e4b523e (diff) | |
bladerf: Moved no longer "common" items out of bladerf_common
The gr_complex FIFO is no longer used on the TX side, so it doesn't
really make sense to have it in bladerf_common. The associated items
have been moved into bladerf_source, and some renaming has been done in
bladerf_sink to tidy up.
Pending further performance tests of the bladerf_source, the _fifo
member (boost::circular_buffer) may need to be replaced.
Diffstat (limited to 'lib/bladerf/bladerf_common.h')
| -rw-r--r-- | lib/bladerf/bladerf_common.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/bladerf/bladerf_common.h b/lib/bladerf/bladerf_common.h index e5152f5..7eb7da5 100644 --- a/lib/bladerf/bladerf_common.h +++ b/lib/bladerf/bladerf_common.h @@ -39,16 +39,6 @@ /* We currently read/write 1024 samples (pairs of 16-bit signed ints) */ #define BLADERF_SAMPLE_BLOCK_SIZE (1024) -/* - * Default size of sample FIFO, in entries. - * This can be overridden by the environment variable BLADERF_SAMPLE_FIFO_SIZE. - */ -#ifndef BLADERF_SAMPLE_FIFO_SIZE -# define BLADERF_SAMPLE_FIFO_SIZE (2 * 1024 * 1024) -#endif - -#define BLADERF_SAMPLE_FIFO_MIN_SIZE (3 * BLADERF_SAMPLE_BLOCK_SIZE) - typedef boost::shared_ptr<struct bladerf> bladerf_sptr; class bladerf_common @@ -78,12 +68,9 @@ protected: gr::thread::thread _thread; - boost::circular_buffer<gr_complex> *_fifo; - boost::mutex _fifo_lock; - boost::condition_variable _samp_avail; - osmosdr::gain_range_t _vga1_range; osmosdr::gain_range_t _vga2_range; + private: bool _is_running; boost::shared_mutex _state_lock; |