From 305ebf5c4b8904081a226e7a2fb85a3253d6f14c Mon Sep 17 00:00:00 2001
From: hbilel <haithem.bilel@alcatelonetouch.com>
Date: Wed, 8 Mar 2017 14:57:30 +0100
Subject: [PATCH] rebase branch to develop 2017.w09
---
openair1/PHY/LTE_TRANSPORT/dci_tools.c | 4 ++--
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c | 3 +--
openair3/NAS/TOOLS/network.h | 2 +-
openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf | 8 ++++----
openair3/NAS/UE/ESM/esm_ebr_context.c | 2 +-
targets/RT/USER/lte-ue.c | 1 -
6 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
index 0812e9c6dd..c4e379b45a 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -5710,9 +5710,9 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
if (TB0_active==0) {
dlsch0_harq->status = SCH_IDLE;
pdlsch0->active = 0;
-#ifdef DEBUG_HARQ
+ #ifdef DEBUG_HARQ
printf("[DCI UE]: TB0 is deactivated, retransmit TB1 transmit in TM6\n");
-#endif
+ #endif
}
if (TB1_active==0) {
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
index 65fc807aa8..72b486c042 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -1661,8 +1661,7 @@ void prec2A_TM3_128(__m128i *ch0,__m128i *ch1) {
__m128i tmp0,tmp1;
-
-//_mm_mulhi_epi16
+ //_mm_mulhi_epi16
// print_shorts("prec2A_TM3 ch0 (before):",ch0);
// print_shorts("prec2A_TM3 ch1 (before):",ch1);
diff --git a/openair3/NAS/TOOLS/network.h b/openair3/NAS/TOOLS/network.h
index d7044c8e51..0d60359c57 100644
--- a/openair3/NAS/TOOLS/network.h
+++ b/openair3/NAS/TOOLS/network.h
@@ -61,7 +61,7 @@ Description Defines a list of PLMN network operators
#define VDF5 11
-#define SELECTED_PLMN TEST1 //SFR1
+#define SELECTED_PLMN OAI_LTEBOX //SFR1
#define TEST_PLMN {0,0,0x0f,1,1,0} // 00101
#define SFR_PLMN_1 {0,2,0x0f,8,0,1} // 20810
diff --git a/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf b/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
index 05db6be4d1..84ec59a36b 100644
--- a/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
+++ b/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
@@ -86,14 +86,14 @@ UE0:
};
SIM: {
- MSIN="000001234";
- USIM_API_K="000102030405060708090A0B0C0D0E0F";
+ MSIN="0100001111";
+ USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
OPC="C42449363BBAD02B66D16BC975D77CC1";
- MSISDN="000000000000";//"33611123456";
+ MSISDN="33611123456";
};
# Home PLMN Selector with Access Technology
- HPLMN= "00101";
+ HPLMN= "20893";
# User controlled PLMN Selector with Access Technology
UCPLMN_LIST = ();
diff --git a/openair3/NAS/UE/ESM/esm_ebr_context.c b/openair3/NAS/UE/ESM/esm_ebr_context.c
index 31f215e359..bfa4a04cc8 100644
--- a/openair3/NAS/UE/ESM/esm_ebr_context.c
+++ b/openair3/NAS/UE/ESM/esm_ebr_context.c
@@ -286,7 +286,7 @@ int esm_ebr_context_create(
LOG_TRACE(INFO, "ESM-PROC - executing %s ",
command_line);
- //if (system(command_line)) ; /* TODO: what to do? */
+ if (system(command_line)) ; /* TODO: what to do? */
break;
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 1ddc06f33b..49093ed2de 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -574,7 +574,6 @@ static void *UE_thread_rxn_txnp4(void *arg) {
}
stop_meas(&UE->generic_stat);
- //printf("mac_xface->ue_scheduler %5.2f \n",UE->generic_stat.p_time/(cpuf*1000.0));
// Prepare the future Tx data
--
GitLab