Change in osmo-trx[master]: usrp1: Fail in case of unsupported configuration

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9625 )

Change subject: usrp1: Fail in case of unsupported configuration
......................................................................

usrp1: Fail in case of unsupported configuration

There might be some configuration that's not supported by osmo-bts-usrp1,
and we should reject that properly.

Change-Id: Ic7308ce0c57439fe97668bd31801c4bf76b797ad
Closes: OS#3348
---
M Transceiver52M/device/usrp1/USRPDevice.cpp
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved
  Pau Espin Pedrol: Looks good to me, but someone else must approve



diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp
index 7a31c97..5705e22 100644
--- a/Transceiver52M/device/usrp1/USRPDevice.cpp
+++ b/Transceiver52M/device/usrp1/USRPDevice.cpp
@@ -655,5 +655,17 @@
 			       const std::vector<std::string>& tx_paths,
 			       const std::vector<std::string>& rx_paths)
 {
+	if (tx_sps != rx_sps) {
+		LOG(ERROR) << "USRP1 requires tx_sps == rx_sps";
+		return NULL;
+	}
+	if (chans != 1) {
+		LOG(ERROR) << "USRP1 supports only 1 channel";
+		return NULL;
+	}
+	if (lo_offset != 0.0) {
+		LOG(ERROR) << "USRP1 doesn't support lo_offset";
+		return NULL;
+	}
 	return new USRPDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths);
 }

-- 
To view, visit https://gerrit.osmocom.org/9625
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7308ce0c57439fe97668bd31801c4bf76b797ad
Gerrit-Change-Number: 9625
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180618/cfe4394d/attachment.htm>