summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Michael Green <plugwash@raspbian.org>2020-03-22 08:18:54 +0000
committerRuben Undheim <ruben.undheim@gmail.com>2020-03-22 10:05:35 +0100
commit4c736801e77c6db67daa636b5f4aca5fc58ecda6 (patch)
treee6541b46773b724514b429ba4dd2c9fa7f9c26ea
parent70003e1e1a39179cc84195c9cc7f94d38a444826 (diff)
Fix build with uhd 3.14
Gbp-Pq: Name 0009-uhd-3.14.patch
-rw-r--r--lib/src/phy/rf/rf_uhd_imp.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/src/phy/rf/rf_uhd_imp.c b/lib/src/phy/rf/rf_uhd_imp.c
index 7fe2914..8021f9f 100644
--- a/lib/src/phy/rf/rf_uhd_imp.c
+++ b/lib/src/phy/rf/rf_uhd_imp.c
@@ -647,7 +647,7 @@ double rf_uhd_set_rx_srate(void *h, double freq)
{
rf_uhd_handler_t *handler = (rf_uhd_handler_t*) h;
if (handler->nof_rx_channels > 1) {
- time_t full;
+ int64_t full;
double frac;
uhd_usrp_get_time_now(handler->usrp, 0, &full, &frac);
frac += 0.100;
@@ -666,7 +666,7 @@ double rf_uhd_set_tx_srate(void *h, double freq)
{
rf_uhd_handler_t *handler = (rf_uhd_handler_t*) h;
if (handler->nof_tx_channels > 1) {
- time_t full;
+ int64_t full;
double frac;
uhd_usrp_get_time_now(handler->usrp, 0, &full, &frac);
frac += 0.100;
@@ -759,7 +759,9 @@ double rf_uhd_set_tx_freq(void *h, double freq)
void rf_uhd_get_time(void *h, time_t *secs, double *frac_secs) {
rf_uhd_handler_t *handler = (rf_uhd_handler_t*) h;
- uhd_usrp_get_time_now(handler->usrp, 0, secs, frac_secs);
+ uint64_t secs64;
+ uhd_usrp_get_time_now(handler->usrp, 0, &secs64, frac_secs);
+ *secs = secs64;
}
int rf_uhd_recv_with_time(void *h,
@@ -831,7 +833,9 @@ int rf_uhd_recv_with_time_multi(void *h,
}
}
if (secs && frac_secs) {
- uhd_rx_metadata_time_spec(handler->rx_md_first, secs, frac_secs);
+ uint64_t secs64;
+ uhd_rx_metadata_time_spec(handler->rx_md_first, &secs64, frac_secs);
+ *secs = secs64;
}
return nsamples;
}