Commit Graph
772 Commits
Author SHA1 Message Date
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07:00
Bi-Ruei, Chiu c7aa94c3fa Upgrade ASN.1 of NR-RRC to 15.3.0 2018-10-17 19:17:20 +08:00
Bi-Ruei, Chiu 99e8dea6d4 Upgrade ASN.1 of LTE-RRC to 15.3.0 2018-10-17 19:17:20 +08:00
Cedric Roux 27395c083d hotfix: hardcode PLMN selection in the UE to value 1 (was 2)
Fix the assertion:
Assertion ((instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity] == 3) || (instance_p->mnc_digit_length[ue_desc_p->selected_plmn_identity] == 2)) failed!
In s1ap_eNB_handle_nas_first_req() /home/ubuntu/tmp/openair3/S1AP/s1ap_eNB_nas_procedures.c:243

With this hotfix the UE selects the first PLMN sent by the eNodeB.

The UE has to select the correct PLMN from those received in SIB1. This
will be done with a later merge request.
2018-10-15 14:57:56 +02:00
Raphael Defosseux d254f5b522 Merge branch 'feature-s1-flex' into develop_integration_2018_w_41
Introduction of S1-flex. It handles multiple PLMN IDs (up to 6) in the SIB as well as the selection of an MME based on the selected PLMN identity.

Major impact: changes on the eNB configuration files:

tracking_area_code = 1;

plmn_list = (
  { mcc = 208; mnc = 94; mnc_length = 2; },
  { mcc = 208; mnc = 95; mnc_length = 2; }
)

See https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/s1-flex-conf-nnsf for more details.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-10-11 15:57:36 +02:00
yilmazt 97c65436f6 Merge branch 'nr_pdcch' into develop-nr 2018-10-11 15:37:50 +02:00
Robert Schmidt a4bc48a2f7 Fix in paging: iterate list of MCC/MNC/TAC 2018-09-28 11:46:11 +02:00
Robert Schmidt 81e70dfc25 NAS First REQ: Forward selected PLMN Identity 2018-09-28 11:46:06 +02:00
Robert Schmidt a52156cf26 Remove unused MCC/MNC in eNB_RRC_INST 2018-09-28 11:45:56 +02:00
Robert Schmidt 514b8d833a Use selectedPLMN_Identity IE to fill GUMMEI at NAS_FIRST_REQ 2018-09-28 11:45:56 +02:00
Robert Schmidt 413b307441 SIB1: Add all configured PLMN IDs in System Information 2018-09-28 11:45:52 +02:00
laurent d8472426c4 fix_issue_350_gtpu_init 2018-09-20 12:37:26 +02:00
Cedric Roux 2cb87ddd02 Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
Conflicts:
	openair2/ENB_APP/flexran_agent_common_internal.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Cedric Roux cbdc8f662a Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36 2018-09-07 16:04:05 +02:00
Robert Schmidt 77f2ffcdfb FlexRAN: call the agent_rrc_xface with the mod_id 2018-09-03 18:10:28 +02:00
Niccolò Iardella 56405aeef0 Implement interslice_multiplexing, add new constants 2018-09-03 18:10:28 +02:00
Cedric Roux c22180ff31 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
2018-08-31 12:55:28 +02:00
Cedric Roux 536b4a88b1 Merge remote-tracking branch 'origin/cqiSchedule' into develop_integration_2018_w35 2018-08-31 12:04:28 +02:00
Florian Kaltenberger cc002b823f Merge branch 'develop-nr-merge' into develop-nr
lte-softmodem, lte-uesoftmodem, nr-softmodem, nr-uesoftmodem, polartest, ldpctest, ulsim, dlsim all compile
functionality and performance to be tested by CI
2018-08-30 07:08:26 -07:00
WEI-TAI CHEN c9eb16cc60 Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions 2018-08-29 04:31:20 -07:00
WEI-TAI CHEN 7475a22e1e EN-DC in gNB 2018-08-29 04:29:58 -07:00
WEI-TAI CHEN a14450d2ac fix segmentation fault 2018-08-28 04:23:27 -07:00
Haruki NAOI d44ef56e3b Fix: UE dose not respond to paging message. 2018-08-28 16:55:45 +09:00
Rajeev Gangula 9f6d466fff Uncommemnt rrc_mac remove function. 2018-08-27 14:43:32 +02:00
Raymond Knopp 3367cc9319 lte-softmodem compiles 2018-08-27 13:37:00 +02:00
Raymond Knopp bf407e6c34 rrc_eNB_S1AP.c compiles
L2_interface.c doesn't
2018-08-26 00:32:53 +02:00
Raymond Knopp 51c0c42207 rrc_eNB.c compiles
rrc_eNB_S1AP.c doesn't
2018-08-26 00:06:40 +02:00
Raymond Knopp efeb48e09e rrc_UE.c merged
rrc_eNB.c doesn't compile
2018-08-25 23:27:16 +02:00
Raymond Knopp 019149e565 intermediate step (rrc_UE.c doesn't compile) 2018-08-25 22:23:51 +02:00
Raymond Knopp b93b7073ca Merge remote-tracking branch 'origin/develop' into develop-nr
Conflicts:
	ci-scripts/Jenkinsfile-gitlab
	ci-scripts/buildOnVM.sh
	ci-scripts/checkCodingFormattingRules.sh
	ci-scripts/createVM.sh
	ci-scripts/destroyAllRunningVM.sh
	ci-scripts/reportBuildLocally.sh
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	cmake_targets/tools/build_helper
	common/utils/LOG/log.h
	openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
	openair1/PHY/TOOLS/file_output.c
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/tools_defs.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/COMMON/platform_constants.h
	openair2/COMMON/platform_types.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/main.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/UTIL/LOG/log.c
	openair3/S1AP/s1ap_common.h
	openair3/S1AP/s1ap_eNB.c
	openair3/S1AP/s1ap_eNB_context_management_procedures.c
	openair3/S1AP/s1ap_eNB_decoder.c
	openair3/S1AP/s1ap_eNB_decoder.h
	openair3/S1AP/s1ap_eNB_handlers.c
	openair3/S1AP/s1ap_eNB_nas_procedures.c
	openair3/S1AP/s1ap_eNB_overload.c
	openair3/S1AP/s1ap_eNB_trace.c
	openair3/TEST/EPC_TEST/play_scenario_decode.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
	targets/COMMON/openairinterface5g_limits.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
	targets/RT/USER/lte-ran.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
frtabu 51c86dd49e fix noS1 build failure 2018-08-24 20:06:02 +02:00
frtabu 24f8fcf346 Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements 2018-08-24 17:43:14 +02:00
frtabu 79588a494e LOG_F replaced by LOG_DUMPMSG. Add a generic function to dump a buffer or message. Go on with LOG_M implementation improvement. Remove redundant options to enable/disable logs. 2018-08-24 17:43:14 +02:00
Hongzhi 11c1256f5e Merge branch 'develop-nr' into nr_pdcch
Conflicts:
	cmake_targets/CMakeLists.txt
2018-08-23 10:03:12 +02:00
Guy De Souza cf7c7937da merge with develop-nr 2018-08-20 10:07:35 +02:00
Thomas Schlichter 1b53fd402d mcch logical channel properly decoded
This commit was developed at Fraunhofer IIS (https://www.iis.fraunhofer.de) by Javier Morgade, Ph.D.
2018-08-14 17:09:08 +02:00
WEI-TAI CHEN 616a66b7dd Replace "#ifdef Rel14" by "#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))"
We can build Rel15 for LTE now
2018-08-09 06:08:33 -07:00
WEI-TAI CHEN ef77d53de2 Done for do_RLC_BEARER, do_MAC_CELLGROUP, do_PHYSICALCELLGROUP function like do_MIB_NR and do_SERVINGCELLCONFIGCOMMON 2018-08-09 04:42:49 -07:00
WEI-TAI CHEN 272fa05fea new function in order to fill CellGroupConfig 2018-08-08 16:19:43 -07:00
WEI-TAI CHEN b9037d1566 Complete merge develop into nr-rrc-additions
First build command : ./build_oai --gNB -w USRP -I
2018-08-07 05:31:52 -07:00
WEI-TAI CHEN 3e354e2ece merge develop but not complete [unstable] 2018-08-06 01:46:19 -07:00
WEI-TAI CHEN 9b7143ca86 merge develop 2018-08-05 06:19:32 -07:00
WEI-TAI CHEN a6c95ca2da Define new structure for fill cellgroupconfig 2018-08-04 07:00:31 -07:00
WEI-TAI CHEN 09c00b291b merge develop-nr 2018-08-03 03:33:28 -07:00
WEI-TAI CHEN 037e37eab4 do_SERVINGCELLCONFIGCOMMON will be reuse for fill common config 2018-08-03 03:29:17 -07:00
WEI-TAI CHEN 02a602fad3 Update the 38331-f21 version 2018-08-02 09:17:00 -07:00
WEI-TAI CHEN 307b763b8d -Uppdate RRC ASN1 Version to 38331-f21
But NR-RRC-Definitions.asn file only include the NR-RRC-Definitions DEFINITIONS section
If we include the NR-UE-Variables into asn file, it will can't be compile in asn tool
and also some of implict problem for new version asn file
2018-08-02 06:39:55 -07:00
Calvin HSU df7acb2af7 silence asn1c warnings. UE: update rx_ind and fix type0-pdcch 2018-08-01 11:31:46 +02:00
frtabu 6c23bdec60 fix compilation errors in ETHERNET or noS1 mode 2018-07-31 00:42:53 +02:00
frtabu 30509955c2 remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX 2018-07-30 20:07:22 +02:00