Florian Kaltenberger
9574efbf19
Merge remote-tracking branch 'origin/nr_ssb_periodicity' into integration-nr-2019-w21
2019-05-22 23:27:27 +02:00
Francesco Mani
ef0056f1ea
merged with test-x310 and conflicts resolved
2019-05-20 17:16:13 +02:00
Raymond Knopp
c1152f30d3
testing merge with develop-nr. removal of pthread_mutex_timedlock, we were using the wrong time argument (needed to be absolute).
2019-05-19 01:23:03 +02:00
Raymond Knopp
da9b879112
Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
...
Conflicts:
openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
Francesco Mani
a81eafd0ae
merged with develop-nr and conflicts resolved
2019-05-14 14:00:39 +02:00
Florian Kaltenberger
b472d97b27
Merge remote-tracking branch 'origin/develop-nr' into test-x310
2019-05-14 09:47:39 +02:00
Florian Kaltenberger
01879c3e2b
Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
2019-05-14 09:20:16 +02:00
Raymond Knopp
26d5eb90b6
intermediate commit to synch machine
2019-05-03 13:37:22 +02:00
laurent
7368e4bfc4
fix compilation tests
2019-05-02 12:17:31 +02:00
Laurent
4d787625ab
still to compile
2019-04-30 14:25:42 +02:00
laurent
8a92138086
rework threads in 5G
2019-04-30 10:17:08 +02:00
yilmazt
5fa78b4d6e
Final --phy_simulators warning removals for this branch, and former polar coding function corrections
2019-04-16 17:24:58 +02:00
Raymond Knopp
99c6c9227e
cleanup after merge with develop-nr
2019-04-12 13:27:20 +02:00
Raymond Knopp
1ca00e40b5
Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
...
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/autotests/test_case_list.xml
cmake_targets/build_oai
openair1/PHY/CODING/TESTBENCH/polartest.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
openair1/PHY/CODING/nr_polar_init.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2019-04-04 09:14:37 +02:00
Francesco Mani
9f5140ae76
Merge branch 'develop-nr' into nr_ssb_periodicity
2019-03-29 16:51:49 +01:00
Florian Kaltenberger
d7403d4e61
Merge remote-tracking branch 'origin/develop-nr' into 409-merge-ulschsim-containing-pusch-encoding-and-decoding
2019-03-27 13:30:44 +01:00
Florian Kaltenberger
40b52195fc
redefining max number of UEs for memory allocation. Using the PHYSIM macro, different allocations are used for phy_simulators and real-time modem.
2019-03-26 16:16:34 +01:00
Francesco Mani
aa12c954c1
bugfix
2019-03-11 12:36:57 +01:00
Francesco Mani
6e33fcfe28
SSB periodicity at gNB from config file
2019-03-11 10:54:20 +01:00
Francesco Mani
c49f91444e
Conflicts solved after merge with develop-nr and modifications to simulators to compile
2019-02-25 15:03:32 +01:00
Francesco Mani
a5025d4c4f
SSB positions in burst from config file
2019-02-21 15:30:09 +01:00
yilmazt
9cbfe2e3fa
More warning removals
2019-02-17 17:43:33 +01:00
Francesco Mani
688830e83e
SSB pattern now hardcoded in rrc, to be taken from config file in the next commit
2019-02-15 17:01:58 +01:00
Francesco Mani
db1eb5d921
CellID taken from config file
2019-02-13 17:49:16 +01:00
Florian Kaltenberger
449da9ac17
adding detection of multiple PSS.
2019-01-23 12:15:54 +01:00
Raymond Knopp
81c1e1b309
tested with slot-based processing for 40 and 80 MHz channels
2018-12-30 00:32:57 +01:00
Raymond Knopp
adaa8e1337
debugging of DCI indication and UE-FAPI interface
2018-12-14 06:21:40 +01:00
Florian Kaltenberger
4bc8c6aaa0
Merge branch 'nr_pbchsim' into develop-nr-merge2
2018-10-26 11:59:35 -07:00
Florian Kaltenberger
83e9908adb
merging develop with develop-nr
2018-10-25 03:15:09 -07:00
Florian Kaltenberger
f755654918
Merge branch 'develop-nr' into nr_pdcch
2018-10-24 02:06:20 -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
Hongzhi
a8f94e7a84
Bug fixes
2018-10-11 17:43:41 +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