diff options
author | Tom Tsou <tom.tsou@ettus.com> | 2016-06-22 16:09:44 -0700 |
---|---|---|
committer | Tom Tsou <tom.tsou@ettus.com> | 2016-07-01 03:03:03 -0700 |
commit | 05c6feb71dd2f66b74c9e1671d91570485479836 (patch) | |
tree | 952eea24a63b734a453894b67b5f68b8c5582bd2 /Transceiver52M/radioDevice.h | |
parent | 2e4ed1072227350ab8dd31a8458316e2a9355453 (diff) |
radioInterface: Convert diversity argument to general type
Rather than a simple bool type, convert the diversity switch
to the device interface specifer:
enum InterfaceType {
NORMAL,
RESAMP_64M,
RESAMP_100M,
DIVERSITY,
};
The more general specifier allows passing in special cases
other then selection diversity such as multi-ARFCN support.
Signed-off-by: Tom Tsou <tom.tsou@ettus.com>
Diffstat (limited to 'Transceiver52M/radioDevice.h')
-rw-r--r-- | Transceiver52M/radioDevice.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Transceiver52M/radioDevice.h b/Transceiver52M/radioDevice.h index 6d7ea72..a992483 100644 --- a/Transceiver52M/radioDevice.h +++ b/Transceiver52M/radioDevice.h @@ -35,10 +35,15 @@ class RadioDevice { enum TxWindowType { TX_WINDOW_USRP1, TX_WINDOW_FIXED }; /* Radio interface types */ - enum RadioInterfaceType { NORMAL, RESAMP_64M, RESAMP_100M, DIVERSITY }; - - static RadioDevice *make(size_t tx_sps, size_t rx_sps = 1, size_t chans = 1, - bool diversity = false, double offset = 0.0); + enum InterfaceType { + NORMAL, + RESAMP_64M, + RESAMP_100M, + DIVERSITY, + }; + + static RadioDevice *make(size_t tx_sps, size_t rx_sps, InterfaceType type, + size_t chans = 1, double offset = 0.0); /** Initialize the USRP */ virtual int open(const std::string &args = "", bool extref = false, bool swap_channels = false)=0; |