diff --git a/oaienv b/oaienv
index 1142976cd9952ca1b190597552562537b4b6a6f3..4aae35ca5be68fe0a4a6718c09d9b37ac6466172 100644
--- a/oaienv
+++ b/oaienv
@@ -14,7 +14,7 @@ alias oai1='cd $OPENAIR1_DIR'
alias oai2='cd $OPENAIR2_DIR'
alias oai3='cd $OPENAIR3_DIR'
alias oait='cd $OPENAIR_TARGETS'
-alias oaiu='cd $OPENAIR2_DIR/UTIL'
+alias oailte='cd $OPENAIR_TARGETS/RT/USER'
alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
alias oaicn='cd OPENAIRCN_DIR'
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index ed8273bcd1b918437300ca7a35b5d3abd157fead..37d687c7f8d721dee71e3a85a81a3e4f1e2703a7 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -348,7 +348,6 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
((DCI1A_20MHz_FDD_t*)&RA_template[i].RA_alloc_pdu2[0])->mcs=9;
TBsize = 57;
}
-
break;
}
}
@@ -383,17 +382,15 @@ void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,un
memcpy((void*)&eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0][(unsigned char)offset],
&eNB->common_channels[CC_id].CCCH_pdu.payload[0],
rrc_sdu_length);
-#if defined(USER_MODE) && defined(OAI_EMU)
-
- if (oai_emulation.info.opt_enabled) {
- trace_pdu(1, (uint8_t *)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
- rrc_sdu_length, UE_id, 3, UE_RNTI(module_idP, UE_id),
- eNB->subframe,0,0);
- LOG_D(OPT,"[eNB %d][DLSCH] Frame %d trace pdu for rnti %x with size %d\n",
- module_idP, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
- }
-#endif
+ if (opt_enabled==1){
+ trace_pdu(1, (uint8_t *)eNB->UE_list.DLSCH_pdu[CC_id][0][(unsigned char)UE_id].payload[0],
+ rrc_sdu_length, UE_id, 3, UE_RNTI(module_idP, UE_id),
+ eNB->subframe,0,0);
+ LOG_D(OPT,"[eNB %d][DLSCH] Frame %d trace pdu for rnti %x with size %d\n",
+ module_idP, frameP, UE_RNTI(module_idP,UE_id), rrc_sdu_length);
+ }
+
nprb[CC_id]= nprb[CC_id] + 3;
nCCE[CC_id] = nCCE[CC_id] + 4;
}
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_bch.c b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
index 6cbc3aa6d08643b4d495645653f5e5ef6f6212be..131e287cdbc0da202275b759813768a14d2e48a3 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_bch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_bch.c
@@ -164,9 +164,7 @@ schedule_SI(
}
}
-#if defined(USER_MODE) && defined(OAI_EMU)
-
- if (oai_emulation.info.opt_enabled) {
+ if (opt_enabled == 1) {
trace_pdu(1,
&eNB->common_channels[CC_id].BCCH_pdu.payload[0],
bcch_sdu_length,
@@ -176,11 +174,9 @@ schedule_SI(
eNB->subframe,
0,
0);
+ LOG_D(OPT,"[eNB %d][BCH] Frame %d trace pdu for rnti %x with size %d\n",
+ module_idP, frameP, 0xffff, bcch_sdu_length);
}
- LOG_D(OPT,"[eNB %d][BCH] Frame %d trace pdu for rnti %x with size %d\n",
- module_idP, frameP, 0xffff, bcch_sdu_length);
-#endif
-
if (PHY_vars_eNB_g[module_idP][CC_id]->lte_frame_parms.frame_type == TDD) {
LOG_D(MAC,"[eNB] Frame %d : Scheduling BCCH->DLSCH (TDD) for SI %d bytes (mcs %d, rb 3, TBS %d)\n",
frameP,
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index 8f286cecd0101f1dbe10f278ddf299a6240cd678..f3f9be377b940ab740ee4ac0d84ccd6ba410dec5 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -1104,18 +1104,14 @@ schedule_ue_spec(
}
//eNB_mac_inst[0].DLSCH_pdu[0][0].payload[0][offset+sdu_lengths[0]+j] = (char)(taus()&0xff);
-#if defined(USER_MODE) && defined(OAI_EMU)
-
- /* Tracing of PDU is done on UE side */
- if (oai_emulation.info.opt_enabled)
- trace_pdu(1, (uint8_t *)UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0],
- TBS, module_idP, 3, UE_RNTI(module_idP,UE_id),
- eNB->subframe,0,0);
- LOG_D(OPT,"[eNB %d][DLSCH] Frame %d rnti %x with size %d\n",
- module_idP, frameP, UE_RNTI(module_idP,UE_id), TBS);
-#endif
-
- aggregation = process_ue_cqi(module_idP,UE_id);
+ if (opt_enabled == 1){
+ trace_pdu(1, (uint8_t *)UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0],
+ TBS, module_idP, 3, UE_RNTI(module_idP,UE_id),
+ eNB->subframe,0,0);
+ LOG_D(OPT,"[eNB %d][DLSCH] Frame %d rnti %x with size %d\n",
+ module_idP, frameP, UE_RNTI(module_idP,UE_id), TBS);
+ }
+ aggregation = process_ue_cqi(module_idP,UE_id);
nCCE[CC_id]-=(1<<aggregation); // adjust the remaining nCCE
nCCE_used[CC_id]+=(1<<aggregation); // adjust the remaining nCCE
UE_list->UE_template[CC_id][UE_id].nb_rb[harq_pid] = nb_rb;
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_mch.c b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
index 63c5eb22cc25fedfd1b2d8ef8bc5a4f594eab154..c84c42f39b433c9fdfc6c358f98c4aaaf1ed413b 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_mch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
@@ -619,18 +619,14 @@ int schedule_MBMS(module_id_t module_idP, uint8_t CC_id, frame_t frameP, sub_fra
for (j=0; j<(TBS-sdu_length_total-offset); j++) {
eNB_mac_inst[module_idP].common_channels[CC_id].MCH_pdu.payload[offset+sdu_length_total+j] = (char)(taus()&0xff);
}
-
-#if defined(USER_MODE) && defined(OAI_EMU)
-
/* Tracing of PDU is done on UE side */
- if (oai_emulation.info.opt_enabled)
+ if (opt_enabled ==1 ){
trace_pdu(1, (uint8_t *)eNB_mac_inst[module_idP].common_channels[CC_id].MCH_pdu.payload,
- TBS, module_idP, 6, 0xffff, // M_RNTI = 6 in wirehsark
- eNB_mac_inst[module_idP].subframe,0,0);
+ TBS, module_idP, 6, 0xffff, // M_RNTI = 6 in wirehsark
+ eNB_mac_inst[module_idP].subframe,0,0);
LOG_D(OPT,"[eNB %d][MCH] Frame %d : MAC PDU with size %d\n",
- module_idP, frameP, TBS);
-#endif
-
+ module_idP, frameP, TBS);
+ }
/*
for (j=0;j<sdu_length_total;j++)
printf("%2x.",eNB_mac_inst[module_idP].MCH_pdu.payload[j+offset]);
diff --git a/openair2/UTIL/OPT/probe.c b/openair2/UTIL/OPT/probe.c
index 8d070eec551e4bd8457ad7063717d423061d7395..f2db12b4f484295ec562c0d4c72ce1e40fe64712 100644
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
@@ -562,18 +562,18 @@ int init_opt(char *path, char *ip, char *port, radio_type_t radio_type_p)
LOG_D(OPT, "Failed to open file \"%s\" for writing\n", in_path);
return (-1);
}
-
/* Write the file header */
fwrite(&file_header, sizeof(pcap_hdr_t), 1, file_fd);
break;
case OPT_TSHARK:
- LOG_D(OPT, "Tshark is currently not supported\n");
+ LOG_W(OPT, "Tshark is currently not supported\n");
opt_type = OPT_NONE;
break;
default:
opt_type = OPT_NONE;
+ LOG_W(OPT, "supported Option\n");
break;
}