Skip to content

Build cleanly against UHD 4.10 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gretel wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Build cleanly against UHD 4.10 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe0b73
CMakeLists: bump CMAKE_CXX_STANDARD to 17 for UHD 4.10
gretel Apr 29, 2026
39be02b
Handle UHD 4.10 EVENT_CODE_OK and add 'override' on stream methods
gretel Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cmake_minimum_required(VERSION 2.8.12...3.10)
project(SoapyUHD CXX C)
enable_testing()

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)

#select the release build type by default to get optimization flags
if(NOT CMAKE_BUILD_TYPE)
Expand Down
3 changes: 3 additions & 0 deletions SoapyUHDDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@ class SoapyUHDDevice : public SoapySDR::Device

switch (md.event_code)
{
#if UHD_VERSION >= 4100000
case uhd::async_metadata_t::EVENT_CODE_OK: break;
#endif
case uhd::async_metadata_t::EVENT_CODE_BURST_ACK: flags |= SOAPY_SDR_END_BURST; break;
case uhd::async_metadata_t::EVENT_CODE_UNDERFLOW: return SOAPY_SDR_UNDERFLOW;
case uhd::async_metadata_t::EVENT_CODE_SEQ_ERROR: return SOAPY_SDR_CORRUPTION;
Expand Down
16 changes: 8 additions & 8 deletions UHDSoapyDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,12 +568,12 @@ class UHDSoapyRxStream : public uhd::rx_streamer
_device->closeStream(_stream);
}

size_t get_num_channels(void) const
size_t get_num_channels(void) const override
{
return _nchan;
}

size_t get_max_num_samps(void) const
size_t get_max_num_samps(void) const override
{
return _device->getStreamMTU(_stream);
}
Expand All @@ -584,7 +584,7 @@ class UHDSoapyRxStream : public uhd::rx_streamer
uhd::rx_metadata_t &md,
const double timeout = 0.1,
const bool one_packet = false
)
) override
{
size_t total = 0;
md.reset();
Expand Down Expand Up @@ -674,7 +674,7 @@ class UHDSoapyRxStream : public uhd::rx_streamer
return total;
}

void issue_stream_cmd(const uhd::stream_cmd_t &stream_cmd)
void issue_stream_cmd(const uhd::stream_cmd_t &stream_cmd) override
{
int flags = 0;
if (not stream_cmd.stream_now) flags |= SOAPY_SDR_HAS_TIME;
Expand Down Expand Up @@ -758,12 +758,12 @@ class UHDSoapyTxStream : public uhd::tx_streamer
_device->closeStream(_stream);
}

size_t get_num_channels(void) const
size_t get_num_channels(void) const override
{
return _nchan;
}

size_t get_max_num_samps(void) const
size_t get_max_num_samps(void) const override
{
return _device->getStreamMTU(_stream);
}
Expand All @@ -773,7 +773,7 @@ class UHDSoapyTxStream : public uhd::tx_streamer
size_t nsamps_per_buff,
const uhd::tx_metadata_t &md,
const double timeout = 0.1
)
) override
{
//perform activation at the latest/on the first call to send
if (not _active)
Expand Down Expand Up @@ -808,7 +808,7 @@ class UHDSoapyTxStream : public uhd::tx_streamer
return total;
}

bool recv_async_msg(uhd::async_metadata_t &md, double timeout = 0.1)
bool recv_async_msg(uhd::async_metadata_t &md, double timeout = 0.1) override
{
size_t chanMask = 0;
int flags = 0;
Expand Down