Commit 6fa541fe authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova

Merge remote-tracking branch 'origin/fix-reorder-errors' into integration_2026_w11 (!3980)

SDR reordering: correct warning, and USRP: return samples written

See commits for more information.
parents 888d4a91 61b3f3b5
...@@ -217,7 +217,7 @@ static void writerProcessWaitingQueue(nrue_ru_write_t nrue_ru_write, PHY_VARS_NR ...@@ -217,7 +217,7 @@ static void writerProcessWaitingQueue(nrue_ru_write_t nrue_ru_write, PHY_VARS_NR
else else
wroteSamples = device->trx_write_func(device, timestamp, txp, nsamps, nbAnt, flags); wroteSamples = device->trx_write_func(device, timestamp, txp, nsamps, nbAnt, flags);
if (wroteSamples != nsamps) if (wroteSamples != nsamps)
LOG_E(HW, "Failed to write to rf\n"); LOG_W(HW, "Failed to write to RF: wrote %d out of %d samples\n", wroteSamples, nsamps);
} }
ctx->nextTS = timestamp + nsamps; ctx->nextTS = timestamp + nsamps;
pthread_mutex_lock(&ctx->mutex_store); pthread_mutex_lock(&ctx->mutex_store);
...@@ -258,6 +258,8 @@ int openair0_write_reorder_common(nrue_ru_write_t nrue_ru_write, ...@@ -258,6 +258,8 @@ int openair0_write_reorder_common(nrue_ru_write_t nrue_ru_write,
wroteSamples = nrue_ru_write(UE, timestamp, txp, nsamps, nbAnt, flags); wroteSamples = nrue_ru_write(UE, timestamp, txp, nsamps, nbAnt, flags);
else else
wroteSamples = device->trx_write_func(device, timestamp, txp, nsamps, nbAnt, flags); wroteSamples = device->trx_write_func(device, timestamp, txp, nsamps, nbAnt, flags);
if (wroteSamples != nsamps)
LOG_W(HW, "Failed to write to RF: wrote %d out of %d samples\n", wroteSamples, nsamps);
} else } else
wroteSamples = nsamps; wroteSamples = nsamps;
ctx->nextTS = timestamp + nsamps; ctx->nextTS = timestamp + nsamps;
......
...@@ -553,7 +553,7 @@ static int trx_usrp_write(openair0_device_t *device, ...@@ -553,7 +553,7 @@ static int trx_usrp_write(openair0_device_t *device,
LOG_D(HW, "Signaling TX TS %llu\n", (unsigned long long)timestamp); LOG_D(HW, "Signaling TX TS %llu\n", (unsigned long long)timestamp);
pthread_cond_signal(&write_thread->cond_write); pthread_cond_signal(&write_thread->cond_write);
pthread_mutex_unlock(&write_thread->mutex_write); pthread_mutex_unlock(&write_thread->mutex_write);
return 0; return nsamps;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment