maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit before merge

Browse Source
This commit is contained in:
Raymond Knopp
2022-05-30 10:35:04 +02:00
parent d0be523f6c
commit 29f84b815e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ru.c
+1 -1
View File
@@ -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), ru->nr_frame_parms->get_samples_per_slot(slot,ru->nr_frame_parms),
0); 0);
stop_meas(&ru->tx_fhaul); stop_meas(&ru->tx_fhaul);
LOG_D(PHY,"IF5 TX %d.%d\n",frame,slot);
} }
// southbound IF4p5 fronthaul // southbound IF4p5 fronthaul
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+5 -3
View File
@@ -334,9 +334,9 @@ int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, voi
} }
openair0_timestamp TS = timestamp + fhstate->TS0; 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; 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<nsamps;offset+=256,TS+=TSinc) { for (int offset=0;offset<nsamps;offset+=256,TS+=TSinc) {
// OAI modified SEQ_ID (4 bytes) // OAI modified SEQ_ID (4 bytes)
for (int aid=0;aid<ntx;aid++) { for (int aid=0;aid<ntx;aid++) {
@@ -384,6 +384,7 @@ int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, voi
} }
} }
} }
LOG_D(PHY,"Wrote %d samples @ %llu\n",nsamps,timestamp);
return (bytes_sent-APP_HEADER_SIZE_BYTES)>>2; return (bytes_sent-APP_HEADER_SIZE_BYTES)>>2;
} }
@@ -408,7 +409,7 @@ void *udp_read_thread(void *arg) {
aid = *(uint16_t*)(&buffer[ECPRICOMMON_BYTES]); aid = *(uint16_t*)(&buffer[ECPRICOMMON_BYTES]);
TS = *(openair0_timestamp *)(&buffer[ECPRICOMMON_BYTES+ECPRIPCID_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 // 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; if ((int)count <= 0) continue;
AssertFatal(aid < 8,"Cannot handle more than 8 antennas, got aid %d\n",aid); AssertFatal(aid < 8,"Cannot handle more than 8 antennas, got aid %d\n",aid);
fhstate->r[aid]=1; fhstate->r[aid]=1;
@@ -448,6 +449,7 @@ int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, uin
for (int i=1;i<device->openair0_cfg->rx_num_channels;i++) min_TS = min(min_TS,fhstate->TS[i]); for (int i=1;i<device->openair0_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; *timestamp = fhstate->TS_read;
fhstate->TS_read = prev_read_TS + nsamps; fhstate->TS_read = prev_read_TS + nsamps;
return (nsamps); return (nsamps);