From 7767d538f639106d582ec7913e841ad3bfd46c19 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 26 May 2018 02:17:49 +0200 Subject: [PATCH] BladeRF: cleanup: removed useless fixed sample rates support --- devices/bladerf/devicebladerf.cpp | 55 ------------------------------- devices/bladerf/devicebladerf.h | 10 ------ 2 files changed, 65 deletions(-) diff --git a/devices/bladerf/devicebladerf.cpp b/devices/bladerf/devicebladerf.cpp index ffa065cb4..ff88ed756 100644 --- a/devices/bladerf/devicebladerf.cpp +++ b/devices/bladerf/devicebladerf.cpp @@ -84,61 +84,6 @@ struct bladerf *DeviceBladeRF::open_bladerf_from_serial(const char *serial) } } -const unsigned int BladerfSampleRates::m_nb_rates = 22; -const unsigned int BladerfSampleRates::m_rates[BladerfSampleRates::m_nb_rates] = { - 1536000, - 1600000, - 2000000, - 2304000, - 2400000, - 3072000, - 3200000, - 4333333, // for GSM - 4608000, - 4800000, - 6144000, - 7680000, - 9216000, - 9600000, - 10752000, - 12288000, - 18432000, - 19200000, - 24576000, - 30720000, - 36864000, - 39936000}; - -unsigned int BladerfSampleRates::getRate(unsigned int rate_index) -{ - if (rate_index < m_nb_rates) - { - return m_rates[rate_index]; - } - else - { - return m_rates[0]; - } -} - -unsigned int BladerfSampleRates::getRateIndex(unsigned int rate) -{ - for (unsigned int i=0; i < m_nb_rates; i++) - { - if (rate == m_rates[i]) - { - return i; - } - } - - return 0; -} - -unsigned int BladerfSampleRates::getNbRates() -{ - return BladerfSampleRates::m_nb_rates; -} - const unsigned int BladerfBandwidths::m_nb_halfbw = 16; const unsigned int BladerfBandwidths::m_halfbw[BladerfBandwidths::m_nb_halfbw] = { 750, diff --git a/devices/bladerf/devicebladerf.h b/devices/bladerf/devicebladerf.h index 20c2bab5a..09751ea93 100644 --- a/devices/bladerf/devicebladerf.h +++ b/devices/bladerf/devicebladerf.h @@ -30,16 +30,6 @@ private: static struct bladerf *open_bladerf_from_serial(const char *serial); }; -class BladerfSampleRates { -public: - static unsigned int getRate(unsigned int rate_index); - static unsigned int getRateIndex(unsigned int rate); - static unsigned int getNbRates(); -private: - static const unsigned int m_nb_rates; - static const unsigned int m_rates[]; -}; - class BladerfBandwidths { public: static unsigned int getBandwidth(unsigned int bandwidth_index);