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

warning removal

Browse Source
This commit is contained in:
Raymond Knopp
2022-08-05 07:44:22 +02:00
parent 87a51c9e18
commit 517970a445
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/if5_tools.c
+5 -5
View File
@@ -1052,7 +1052,7 @@ static inline int64_t clock_difftime_ns(struct timespec start, struct timespec e
void send_IF5(RU_t *ru, openair0_timestamp proc_timestamp, int tti, uint8_t *seqno, uint16_t packet_type) { void send_IF5(RU_t *ru, openair0_timestamp proc_timestamp, int tti, uint8_t *seqno, uint16_t packet_type) {
LTE_DL_FRAME_PARMS *fp=ru->frame_parms; LTE_DL_FRAME_PARMS *fp=ru->frame_parms;
int32_t *txp[ru->nb_tx], *rxp[ru->nb_rx]; int32_t *rxp[ru->nb_rx];
int32_t *tx_buffer=NULL; int32_t *tx_buffer=NULL;
uint16_t packet_id=0, i=0; uint16_t packet_id=0, i=0;
@@ -1184,7 +1184,7 @@ void recv_IF5(RU_t *ru, openair0_timestamp *proc_timestamp, int tti, uint16_t pa
openair0_timestamp timestamp[ru->nb_rx*spsf / spp_eth]; openair0_timestamp timestamp[ru->nb_rx*spsf / spp_eth];
long timein[ru->nb_rx*spsf/spp_eth]; long timein[ru->nb_rx*spsf/spp_eth];
long timeout[ru->nb_rx*spsf/spp_eth]; long timeout[ru->nb_rx*spsf/spp_eth];
long aid_list[ru->nb_rx*spsf/spp_eth]; int aid_list[ru->nb_rx*spsf/spp_eth];
struct timespec if_time; struct timespec if_time;
memset(timestamp, 0, sizeof(timestamp)); memset(timestamp, 0, sizeof(timestamp));
@@ -1312,14 +1312,14 @@ void recv_IF5(RU_t *ru, openair0_timestamp *proc_timestamp, int tti, uint16_t pa
} }
for (i=0; i < ru->nb_rx; i++) for (i=0; i < ru->nb_rx; i++)
rxp[i] = &ru->common.rxdata[i][offset]; rxp[i] = &ru->common.rxdata[i][offset];
int aid; int aid=0;
int firstTS=1; int firstTS=1;
openair0_timestamp oldTS=0; openair0_timestamp oldTS=0;
for (packet_id=0; packet_id < ru->nb_rx*siglen / spp_eth; packet_id++) { for (packet_id=0; packet_id < ru->nb_rx*siglen / spp_eth; packet_id++) {
//VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF5_PKT_ID, packet_id ); //VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SEND_IF5_PKT_ID, packet_id );
//VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ_IF0, 1 ); //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ_IF0, 1 );
for (i=0;i<ru->nb_rx;i++) _mm_prefetch((char*)rxp[i][packet_id*spp_eth],_MM_HINT_NTA); for (i=0;i<ru->nb_rx;i++) _mm_prefetch((const char*)&rxp[i][packet_id*spp_eth],_MM_HINT_NTA);
clock_gettime( CLOCK_MONOTONIC, &if_time); clock_gettime( CLOCK_MONOTONIC, &if_time);
timein[packet_id] = if_time.tv_nsec; timein[packet_id] = if_time.tv_nsec;
/* ru->ifdevice.trx_read_func2(&ru->ifdevice, /* ru->ifdevice.trx_read_func2(&ru->ifdevice,
@@ -1338,7 +1338,7 @@ void recv_IF5(RU_t *ru, openair0_timestamp *proc_timestamp, int tti, uint16_t pa
if (firstTS==1) firstTS=0; if (firstTS==1) firstTS=0;
else if (oldTS + spp_eth != timestamp[packet_id]) { else if (oldTS + spp_eth != timestamp[packet_id]) {
LOG_I(PHY,"oldTS %llu, newTS %llu, diff %llu, timediff %ld\n",(long long unsigned int)oldTS,(long long unsigned int)timestamp[packet_id],(long long unsigned int)timestamp[packet_id]-oldTS,-timein[packet_id]+timeout[packet_id]); LOG_I(PHY,"oldTS %llu, newTS %llu, diff %llu, timediff %ld\n",(long long unsigned int)oldTS,(long long unsigned int)timestamp[packet_id],(long long unsigned int)timestamp[packet_id]-oldTS,-timein[packet_id]+timeout[packet_id]);
for (int i=0;i<=packet_id;i++) LOG_I(PHY,"packet %d/%d aid %d TS %llu, timediff %ld\n",i,ru->nb_rx*siglen / spp_eth,aid_list[i],(long long unsigned int)timestamp[i],-timein[i]+timeout[i]); for (int i=0;i<=packet_id;i++) LOG_I(PHY,"packet %d/%d aid %d TS %llu, timediff %ld\n",i,ru->nb_rx*siglen / spp_eth,aid_list[i],(long long unsigned int)timestamp[i],(-timein[i]+timeout[i]));
AssertFatal(1==0,"fronthaul problem\n"); AssertFatal(1==0,"fronthaul problem\n");
} }
openair2/LAYER2/NR_MAC_gNB/config.c
-4
View File
@@ -514,12 +514,8 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int nr_slots_period = n; int nr_slots_period = n;
int nr_dl_slots = n; int nr_dl_slots = n;
int nr_ulstart_slot = 0; int nr_ulstart_slot = 0;
int nr_mix_slots;
int nr_dlmix_slots;
if (tdd) { if (tdd) {
nr_mix_slots = tdd->nrofDownlinkSymbols != 0 || tdd->nrofUplinkSymbols != 0;
nr_dlmix_slots = tdd->nrofDownlinkSlots + (tdd->nrofDownlinkSymbols != 0);
nr_ulstart_slot = tdd->nrofDownlinkSlots + (tdd->nrofUplinkSymbols == 0); nr_ulstart_slot = tdd->nrofDownlinkSlots + (tdd->nrofUplinkSymbols == 0);
nr_dl_slots = tdd->nrofDownlinkSlots + (tdd->nrofDownlinkSymbols != 0); nr_dl_slots = tdd->nrofDownlinkSlots + (tdd->nrofDownlinkSymbols != 0);