PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soapy: reuse device args again as stream args

This commit is contained in:
Andre Puschmann 2020-04-17 17:06:38 +02:00
parent 8f79619efe
commit e7f28a57f3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/src/phy/rf/rf_soapy_imp.c
View File

@ -337,6 +337,9 @@ int rf_soapy_open_multi(char* args, void** h, uint32_t num_requested_channels)
handler->rx_stream_active = false;
handler->devname = devname;
// create stream args from device args
SoapySDRKwargs stream_args = SoapySDRKwargs_fromString(args);
// Setup Rx streamer
size_t num_available_channels = SoapySDRDevice_getNumChannels(handler->device, SOAPY_SDR_RX);
if ((num_available_channels > 0) && (num_requested_channels > 0)) {
@ -353,11 +356,10 @@ int rf_soapy_open_multi(char* args, void** h, uint32_t num_requested_channels)
SOAPY_SDR_CF32,
rx_channels,
handler->num_rx_channels,
NULL) != 0) {
&stream_args) != 0) {
#else
handler->rxStream = SoapySDRDevice_setupStream(
handler->device, SOAPY_SDR_RX, SOAPY_SDR_CF32, rx_channels, handler->num_rx_channels, NULL);
handler->device, SOAPY_SDR_RX, SOAPY_SDR_CF32, rx_channels, handler->num_rx_channels, &stream_args);
if (handler->rxStream == NULL) {
#endif
printf("Rx setupStream fail: %s\n", SoapySDRDevice_lastError());
@ -382,10 +384,10 @@ int rf_soapy_open_multi(char* args, void** h, uint32_t num_requested_channels)
SOAPY_SDR_CF32,
tx_channels,
handler->num_tx_channels,
NULL) != 0) {
&stream_args) != 0) {
#else
handler->txStream = SoapySDRDevice_setupStream(
handler->device, SOAPY_SDR_TX, SOAPY_SDR_CF32, tx_channels, handler->num_tx_channels, NULL);
handler->device, SOAPY_SDR_TX, SOAPY_SDR_CF32, tx_channels, handler->num_tx_channels, &stream_args);
if (handler->txStream == NULL) {
#endif
printf("Tx setupStream fail: %s\n", SoapySDRDevice_lastError());