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/osmo-trx.cpp | |
| 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/osmo-trx.cpp')
| -rw-r--r-- | Transceiver52M/osmo-trx.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 241e69c..9dcda5f 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -437,6 +437,7 @@ int main(int argc, char *argv[]) RadioDevice *usrp; RadioInterface *radio = NULL; Transceiver *trx = NULL; + RadioDevice::InterfaceType iface = RadioDevice::NORMAL; struct trx_config config; handle_options(argc, argv, &config); @@ -454,8 +455,8 @@ int main(int argc, char *argv[]) srandom(time(NULL)); /* Create the low level device object */ - usrp = RadioDevice::make(config.tx_sps, config.rx_sps, config.chans, - config.diversity, config.offset); + usrp = RadioDevice::make(config.tx_sps, config.rx_sps, iface, + config.chans, config.offset); type = usrp->open(config.dev_args, config.extref, config.swap_channels); if (type < 0) { LOG(ALERT) << "Failed to create radio device" << std::endl; |