diff options
author | Andreas Eversberg <jolly@eversberg.eu> | 2018-05-21 16:14:47 +0200 |
---|---|---|
committer | Andreas Eversberg <jolly@eversberg.eu> | 2018-05-21 19:39:09 +0200 |
commit | 0b504dbeb3a9f3f36103685761c11961f4545373 (patch) | |
tree | c4c283829d47aeccd55c25893f556769c96090e5 /src | |
parent | c774180082071385af8a7705912c16cbf542c2db (diff) |
SoapySDR: Flip initialization of RX and TX, so LimeSDR works with frequencies below 30 MHz
Diffstat (limited to 'src')
-rw-r--r-- | src/libsdr/soapy.c | 172 |
1 files changed, 86 insertions, 86 deletions
diff --git a/src/libsdr/soapy.c b/src/libsdr/soapy.c index 564be0d..9c33dfb 100644 --- a/src/libsdr/soapy.c +++ b/src/libsdr/soapy.c @@ -103,245 +103,245 @@ int soapy_open(size_t channel, const char *_device_args, const char *_stream_arg return -EIO; } - if (tx_frequency) { + if (rx_frequency) { /* get number of channels and check if requested channel is in range */ - num_channels = SoapySDRDevice_getNumChannels(sdr, SOAPY_SDR_TX); - PDEBUG(DSOAPY, DEBUG_DEBUG, "We have %d TX channel, selecting channel #%d\n", (int)num_channels, (int)channel); + num_channels = SoapySDRDevice_getNumChannels(sdr, SOAPY_SDR_RX); + PDEBUG(DSOAPY, DEBUG_DEBUG, "We have %d RX channel, selecting channel #%d\n", (int)num_channels, (int)channel); if (channel >= num_channels) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Requested channel #%d (capable of TX) does not exist. Please select channel %d..%d!\n", (int)channel, 0, (int)num_channels - 1); + PDEBUG(DSOAPY, DEBUG_ERROR, "Requested channel #%d (capable of RX) does not exist. Please select channel %d..%d!\n", (int)channel, 0, (int)num_channels - 1); soapy_close(); return -EIO; } /* antenna */ - if (tx_antenna && tx_antenna[0]) { - if (!strcasecmp(tx_antenna, "list")) { + if (rx_antenna && rx_antenna[0]) { + if (!strcasecmp(rx_antenna, "list")) { char **antennas; size_t antennas_length; int i; - antennas = SoapySDRDevice_listAntennas(sdr, SOAPY_SDR_TX, channel, &antennas_length); + antennas = SoapySDRDevice_listAntennas(sdr, SOAPY_SDR_RX, channel, &antennas_length); if (!antennas) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to request list of TX antennas!\n"); + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to request list of RX antennas!\n"); soapy_close(); return -EIO; } for (i = 0; i < (int)antennas_length; i++) - PDEBUG(DSOAPY, DEBUG_NOTICE, "TX Antenna: '%s'\n", antennas[i]); - got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_TX, channel); - PDEBUG(DSOAPY, DEBUG_NOTICE, "Default TX Antenna: '%s'\n", got_antenna); + PDEBUG(DSOAPY, DEBUG_NOTICE, "RX Antenna: '%s'\n", antennas[i]); + got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_RX, channel); + PDEBUG(DSOAPY, DEBUG_NOTICE, "Default RX Antenna: '%s'\n", got_antenna); soapy_close(); return 1; } - if (SoapySDRDevice_setAntenna(sdr, SOAPY_SDR_TX, channel, tx_antenna) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX antenna to '%s'\n", tx_antenna); + if (SoapySDRDevice_setAntenna(sdr, SOAPY_SDR_RX, channel, rx_antenna) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX antenna to '%s'\n", rx_antenna); soapy_close(); return -EIO; } - got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_TX, channel); - if (!!strcasecmp(tx_antenna, got_antenna)) { - PDEBUG(DSOAPY, DEBUG_NOTICE, "Given TX antenna '%s' was accepted, but driver claims to use '%s'\n", tx_antenna, got_antenna); + got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_RX, channel); + if (!!strcasecmp(rx_antenna, got_antenna)) { + PDEBUG(DSOAPY, DEBUG_NOTICE, "Given RX antenna '%s' was accepted, but driver claims to use '%s'\n", rx_antenna, got_antenna); soapy_close(); return -EINVAL; } } /* set rate */ - if (SoapySDRDevice_setSampleRate(sdr, SOAPY_SDR_TX, channel, rate) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX rate to %.0f Hz\n", rate); + if (SoapySDRDevice_setSampleRate(sdr, SOAPY_SDR_RX, channel, rate) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX rate to %.0f Hz\n", rate); soapy_close(); return -EIO; } /* see what rate actually is */ - got_rate = SoapySDRDevice_getSampleRate(sdr, SOAPY_SDR_TX, channel); + got_rate = SoapySDRDevice_getSampleRate(sdr, SOAPY_SDR_RX, channel); if (fabs(got_rate - rate) > 1.0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Given TX rate %.3f Hz is not supported, try %.3f Hz\n", rate, got_rate); + PDEBUG(DSOAPY, DEBUG_ERROR, "Given RX rate %.3f Hz is not supported, try %.3f Hz\n", rate, got_rate); soapy_close(); return -EINVAL; } - if (tx_gain) { + if (rx_gain) { /* set gain */ - if (SoapySDRDevice_setGain(sdr, SOAPY_SDR_TX, channel, tx_gain) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX gain to %.0f\n", tx_gain); + if (SoapySDRDevice_setGain(sdr, SOAPY_SDR_RX, channel, rx_gain) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX gain to %.0f\n", rx_gain); soapy_close(); return -EIO; } /* see what gain actually is */ - got_gain = SoapySDRDevice_getGain(sdr, SOAPY_SDR_TX, channel); - if (fabs(got_gain - tx_gain) > 0.001) { - PDEBUG(DSOAPY, DEBUG_NOTICE, "Given TX gain %.3f is not supported, we use %.3f\n", tx_gain, got_gain); - tx_gain = got_gain; + got_gain = SoapySDRDevice_getGain(sdr, SOAPY_SDR_RX, channel); + if (fabs(got_gain - rx_gain) > 0.001) { + PDEBUG(DSOAPY, DEBUG_NOTICE, "Given RX gain %.3f is not supported, we use %.3f\n", rx_gain, got_gain); + rx_gain = got_gain; } } + /* hack to make limesdr tune rx to tx */ + if (tx_frequency == rx_frequency) + rx_frequency += 1.0; + /* set frequency */ - if (SoapySDRDevice_setFrequency(sdr, SOAPY_SDR_TX, channel, tx_frequency, &tune_args) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX frequency to %.0f Hz\n", tx_frequency); + if (SoapySDRDevice_setFrequency(sdr, SOAPY_SDR_RX, channel, rx_frequency, &tune_args) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX frequency to %.0f Hz\n", rx_frequency); soapy_close(); return -EIO; } /* see what frequency actually is */ - got_frequency = SoapySDRDevice_getFrequency(sdr, SOAPY_SDR_TX, channel); - if (fabs(got_frequency - tx_frequency) > 100.0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Given TX frequency %.0f Hz is not supported, try %.0f Hz\n", tx_frequency, got_frequency); + got_frequency = SoapySDRDevice_getFrequency(sdr, SOAPY_SDR_RX, channel); + if (fabs(got_frequency - rx_frequency) > 100.0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Given RX frequency %.0f Hz is not supported, try %.0f Hz\n", rx_frequency, got_frequency); soapy_close(); return -EINVAL; } /* set bandwidth */ - if (SoapySDRDevice_setBandwidth(sdr, SOAPY_SDR_TX, channel, bandwidth) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX bandwidth to %.0f Hz\n", bandwidth); + if (SoapySDRDevice_setBandwidth(sdr, SOAPY_SDR_RX, channel, bandwidth) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX bandwidth to %.0f Hz\n", bandwidth); soapy_close(); return -EIO; } /* see what bandwidth actually is */ - got_bandwidth = SoapySDRDevice_getBandwidth(sdr, SOAPY_SDR_TX, channel); + got_bandwidth = SoapySDRDevice_getBandwidth(sdr, SOAPY_SDR_RX, channel); if (fabs(got_bandwidth - bandwidth) > 100.0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Given TX bandwidth %.0f Hz is not supported, try %.0f Hz\n", bandwidth, got_bandwidth); + PDEBUG(DSOAPY, DEBUG_ERROR, "Given RX bandwidth %.0f Hz is not supported, try %.0f Hz\n", bandwidth, got_bandwidth); soapy_close(); return -EINVAL; } /* set up streamer */ - if (SoapySDRDevice_setupStream(sdr, &txStream, SOAPY_SDR_TX, SOAPY_SDR_CF32, &channel, 1, &stream_args) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX streamer args\n"); + if (SoapySDRDevice_setupStream(sdr, &rxStream, SOAPY_SDR_RX, SOAPY_SDR_CF32, &channel, 1, &stream_args) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX streamer args\n"); soapy_close(); return -EIO; } /* get buffer sizes */ - tx_samps_per_buff = SoapySDRDevice_getStreamMTU(sdr, txStream); - if (tx_samps_per_buff == 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to get TX streamer sample buffer\n"); + rx_samps_per_buff = SoapySDRDevice_getStreamMTU(sdr, rxStream); + if (rx_samps_per_buff == 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to get RX streamer sample buffer\n"); soapy_close(); return -EIO; } } - if (rx_frequency) { + if (tx_frequency) { /* get number of channels and check if requested channel is in range */ - num_channels = SoapySDRDevice_getNumChannels(sdr, SOAPY_SDR_RX); - PDEBUG(DSOAPY, DEBUG_DEBUG, "We have %d RX channel, selecting channel #%d\n", (int)num_channels, (int)channel); + num_channels = SoapySDRDevice_getNumChannels(sdr, SOAPY_SDR_TX); + PDEBUG(DSOAPY, DEBUG_DEBUG, "We have %d TX channel, selecting channel #%d\n", (int)num_channels, (int)channel); if (channel >= num_channels) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Requested channel #%d (capable of RX) does not exist. Please select channel %d..%d!\n", (int)channel, 0, (int)num_channels - 1); + PDEBUG(DSOAPY, DEBUG_ERROR, "Requested channel #%d (capable of TX) does not exist. Please select channel %d..%d!\n", (int)channel, 0, (int)num_channels - 1); soapy_close(); return -EIO; } /* antenna */ - if (rx_antenna && rx_antenna[0]) { - if (!strcasecmp(rx_antenna, "list")) { + if (tx_antenna && tx_antenna[0]) { + if (!strcasecmp(tx_antenna, "list")) { char **antennas; size_t antennas_length; int i; - antennas = SoapySDRDevice_listAntennas(sdr, SOAPY_SDR_RX, channel, &antennas_length); + antennas = SoapySDRDevice_listAntennas(sdr, SOAPY_SDR_TX, channel, &antennas_length); if (!antennas) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to request list of RX antennas!\n"); + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to request list of TX antennas!\n"); soapy_close(); return -EIO; } for (i = 0; i < (int)antennas_length; i++) - PDEBUG(DSOAPY, DEBUG_NOTICE, "RX Antenna: '%s'\n", antennas[i]); - got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_RX, channel); - PDEBUG(DSOAPY, DEBUG_NOTICE, "Default RX Antenna: '%s'\n", got_antenna); + PDEBUG(DSOAPY, DEBUG_NOTICE, "TX Antenna: '%s'\n", antennas[i]); + got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_TX, channel); + PDEBUG(DSOAPY, DEBUG_NOTICE, "Default TX Antenna: '%s'\n", got_antenna); soapy_close(); return 1; } - if (SoapySDRDevice_setAntenna(sdr, SOAPY_SDR_RX, channel, rx_antenna) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX antenna to '%s'\n", rx_antenna); + if (SoapySDRDevice_setAntenna(sdr, SOAPY_SDR_TX, channel, tx_antenna) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX antenna to '%s'\n", tx_antenna); soapy_close(); return -EIO; } - got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_RX, channel); - if (!!strcasecmp(rx_antenna, got_antenna)) { - PDEBUG(DSOAPY, DEBUG_NOTICE, "Given RX antenna '%s' was accepted, but driver claims to use '%s'\n", rx_antenna, got_antenna); + got_antenna = SoapySDRDevice_getAntenna(sdr, SOAPY_SDR_TX, channel); + if (!!strcasecmp(tx_antenna, got_antenna)) { + PDEBUG(DSOAPY, DEBUG_NOTICE, "Given TX antenna '%s' was accepted, but driver claims to use '%s'\n", tx_antenna, got_antenna); soapy_close(); return -EINVAL; } } /* set rate */ - if (SoapySDRDevice_setSampleRate(sdr, SOAPY_SDR_RX, channel, rate) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX rate to %.0f Hz\n", rate); + if (SoapySDRDevice_setSampleRate(sdr, SOAPY_SDR_TX, channel, rate) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX rate to %.0f Hz\n", rate); soapy_close(); return -EIO; } /* see what rate actually is */ - got_rate = SoapySDRDevice_getSampleRate(sdr, SOAPY_SDR_RX, channel); + got_rate = SoapySDRDevice_getSampleRate(sdr, SOAPY_SDR_TX, channel); if (fabs(got_rate - rate) > 1.0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Given RX rate %.3f Hz is not supported, try %.3f Hz\n", rate, got_rate); + PDEBUG(DSOAPY, DEBUG_ERROR, "Given TX rate %.3f Hz is not supported, try %.3f Hz\n", rate, got_rate); soapy_close(); return -EINVAL; } - if (rx_gain) { + if (tx_gain) { /* set gain */ - if (SoapySDRDevice_setGain(sdr, SOAPY_SDR_RX, channel, rx_gain) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX gain to %.0f\n", rx_gain); + if (SoapySDRDevice_setGain(sdr, SOAPY_SDR_TX, channel, tx_gain) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX gain to %.0f\n", tx_gain); soapy_close(); return -EIO; } /* see what gain actually is */ - got_gain = SoapySDRDevice_getGain(sdr, SOAPY_SDR_RX, channel); - if (fabs(got_gain - rx_gain) > 0.001) { - PDEBUG(DSOAPY, DEBUG_NOTICE, "Given RX gain %.3f is not supported, we use %.3f\n", rx_gain, got_gain); - rx_gain = got_gain; + got_gain = SoapySDRDevice_getGain(sdr, SOAPY_SDR_TX, channel); + if (fabs(got_gain - tx_gain) > 0.001) { + PDEBUG(DSOAPY, DEBUG_NOTICE, "Given TX gain %.3f is not supported, we use %.3f\n", tx_gain, got_gain); + tx_gain = got_gain; } } - /* hack to make limesdr tune rx to tx */ - if (tx_frequency == rx_frequency) - rx_frequency += 1.0; - /* set frequency */ - if (SoapySDRDevice_setFrequency(sdr, SOAPY_SDR_RX, channel, rx_frequency, &tune_args) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX frequency to %.0f Hz\n", rx_frequency); + if (SoapySDRDevice_setFrequency(sdr, SOAPY_SDR_TX, channel, tx_frequency, &tune_args) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX frequency to %.0f Hz\n", tx_frequency); soapy_close(); return -EIO; } /* see what frequency actually is */ - got_frequency = SoapySDRDevice_getFrequency(sdr, SOAPY_SDR_RX, channel); - if (fabs(got_frequency - rx_frequency) > 100.0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Given RX frequency %.0f Hz is not supported, try %.0f Hz\n", rx_frequency, got_frequency); + got_frequency = SoapySDRDevice_getFrequency(sdr, SOAPY_SDR_TX, channel); + if (fabs(got_frequency - tx_frequency) > 100.0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Given TX frequency %.0f Hz is not supported, try %.0f Hz\n", tx_frequency, got_frequency); soapy_close(); return -EINVAL; } /* set bandwidth */ - if (SoapySDRDevice_setBandwidth(sdr, SOAPY_SDR_RX, channel, bandwidth) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX bandwidth to %.0f Hz\n", bandwidth); + if (SoapySDRDevice_setBandwidth(sdr, SOAPY_SDR_TX, channel, bandwidth) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX bandwidth to %.0f Hz\n", bandwidth); soapy_close(); return -EIO; } /* see what bandwidth actually is */ - got_bandwidth = SoapySDRDevice_getBandwidth(sdr, SOAPY_SDR_RX, channel); + got_bandwidth = SoapySDRDevice_getBandwidth(sdr, SOAPY_SDR_TX, channel); if (fabs(got_bandwidth - bandwidth) > 100.0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Given RX bandwidth %.0f Hz is not supported, try %.0f Hz\n", bandwidth, got_bandwidth); + PDEBUG(DSOAPY, DEBUG_ERROR, "Given TX bandwidth %.0f Hz is not supported, try %.0f Hz\n", bandwidth, got_bandwidth); soapy_close(); return -EINVAL; } /* set up streamer */ - if (SoapySDRDevice_setupStream(sdr, &rxStream, SOAPY_SDR_RX, SOAPY_SDR_CF32, &channel, 1, &stream_args) != 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set RX streamer args\n"); + if (SoapySDRDevice_setupStream(sdr, &txStream, SOAPY_SDR_TX, SOAPY_SDR_CF32, &channel, 1, &stream_args) != 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to set TX streamer args\n"); soapy_close(); return -EIO; } /* get buffer sizes */ - rx_samps_per_buff = SoapySDRDevice_getStreamMTU(sdr, rxStream); - if (rx_samps_per_buff == 0) { - PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to get RX streamer sample buffer\n"); + tx_samps_per_buff = SoapySDRDevice_getStreamMTU(sdr, txStream); + if (tx_samps_per_buff == 0) { + PDEBUG(DSOAPY, DEBUG_ERROR, "Failed to get TX streamer sample buffer\n"); soapy_close(); return -EIO; } |