diff --git a/executables/nr-ru.c b/executables/nr-ru.c index d14b3f1a88..46e830199d 100644 --- a/executables/nr-ru.c +++ b/executables/nr-ru.c @@ -285,7 +285,7 @@ void fh_if5_south_out(RU_t *ru, int frame, int slot, uint64_t timestamp) { ru->nr_frame_parms->get_samples_per_slot(slot,ru->nr_frame_parms), 0); stop_meas(&ru->tx_fhaul); - + LOG_D(PHY,"IF5 TX %d.%d\n",frame,slot); } // southbound IF4p5 fronthaul diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c index dcb23b5970..e767b64c02 100644 --- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c +++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c @@ -334,9 +334,9 @@ int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, voi } openair0_timestamp TS = timestamp + fhstate->TS0; - TS = 6*device->sampling_rate_ratio_d*(TS/device->sampling_rate_ratio_n); + TS = (6*device->sampling_rate_ratio_d*TS)/device->sampling_rate_ratio_n; TS -= device->txrx_offset; - int TSinc = 6*256*device->sampling_rate_ratio_d/device->sampling_rate_ratio_n; + int TSinc = (6*256*device->sampling_rate_ratio_d)/device->sampling_rate_ratio_n; for (int offset=0;offset>2; } @@ -408,7 +409,7 @@ void *udp_read_thread(void *arg) { aid = *(uint16_t*)(&buffer[ECPRICOMMON_BYTES]); TS = *(openair0_timestamp *)(&buffer[ECPRICOMMON_BYTES+ECPRIPCID_BYTES]); // convert TS to samples, /6 for AW2S @ 30.72 Ms/s, this is converted for other sample rates in OAI application - TS = device->sampling_rate_ratio_n*(TS/(device->sampling_rate_ratio_d*6)); + TS = (device->sampling_rate_ratio_n*TS)/(device->sampling_rate_ratio_d*6); if ((int)count <= 0) continue; AssertFatal(aid < 8,"Cannot handle more than 8 antennas, got aid %d\n",aid); fhstate->r[aid]=1; @@ -448,6 +449,7 @@ int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, uin for (int i=1;iopenair0_cfg->rx_num_channels;i++) min_TS = min(min_TS,fhstate->TS[i]); } + LOG_D(PHY,"Read %d samples @ %llu\n",nsamps,fhstate->TS_read); *timestamp = fhstate->TS_read; fhstate->TS_read = prev_read_TS + nsamps; return (nsamps);