radioInterface: Remove UmTRX 'diversity' option
The 'diversity' option was an experimental 2 antenna receiver
implementation for UmTRX. The implementation has not been
maintained and current working status is unknown.
In addition to code rot, Coverity is triggering errors in the
associated code sections.
Removal of code cleans up many cases of special handling that
were necessary to accommodate the implementation.
Change-Id: I46752ccf5dbcffbec806081dec03e69a0fbdcdb7
diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index f77cf9e..531e1a8 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -41,7 +41,6 @@
size_t mSPSTx;
size_t mSPSRx;
size_t mChans;
- size_t mMIMO;
std::vector<RadioBuffer *> sendBuffer;
std::vector<RadioBuffer *> recvBuffer;
@@ -86,8 +85,8 @@
/** constructor */
RadioInterface(RadioDevice* wRadio, size_t tx_sps, size_t rx_sps,
- size_t chans = 1, size_t diversity = 1,
- int receiveOffset = 3, GSM::Time wStartTime = GSM::Time(0));
+ size_t chans = 1, int receiveOffset = 3,
+ GSM::Time wStartTime = GSM::Time(0));
/** destructor */
virtual ~RadioInterface();
@@ -192,25 +191,3 @@
bool tuneRx(double freq, size_t chan);
double setRxGain(double dB, size_t chan);
};
-
-class RadioInterfaceDiversity : public RadioInterface {
-public:
- RadioInterfaceDiversity(RadioDevice* wRadio, size_t tx_sps, size_t chans);
-
- ~RadioInterfaceDiversity();
-
- bool init(int type);
- void close();
- bool tuneRx(double freq, size_t chan);
-
-private:
- Resampler *dnsampler;
- std::vector<float> phases;
- signalVector *outerRecvBuffer;
-
- bool mDiversity;
- double mFreqSpacing;
-
- bool setupDiversityChannels();
- void pullBuffer();
-};