Raymond Knopp
4d0d4fcb29
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
rmagueta
d37552db4c
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
Raymond Knopp
9dd6e3bb82
Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
executables/nr-uesoftmodem.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/RRC/NR/L2_nr_interface.c
2021-03-18 07:50:08 +01:00
rmagueta
9456542678
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
2021-03-16 16:04:23 +00:00
Thomas Schlichter
b7ef903cb4
Merge remote-tracking branch 'develop' into NR_10MHz
2021-03-16 16:13:17 +01:00
luis_pereira87
fd9f2b8fe7
Build errors resolved
2021-03-15 17:44:23 +00:00
luis_pereira87
5ab73a228f
Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU
...
# Conflicts:
# executables/nr-softmodem.c
# executables/nr-uesoftmodem.c
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/main.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-03-15 12:44:16 +00:00
He Shanyun
8965dd782b
Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-11 14:39:36 +09:00
matzakos
906fd2b68f
Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS
2021-03-09 15:24:11 +01:00
Xue Song
834d6f1055
Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
Thomas Schlichter
7a6f789aed
Merge remote-tracking branch 'develop' into NR_FDD_FIX
2021-03-03 17:59:17 +01:00
luis_pereira87
d0b9146cd0
Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created)
2021-03-03 01:27:50 +00:00
francescomani
97ed2dfe5b
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-03-02 14:31:12 +01:00
Laurent Thomas
9ce7f94518
record/replay for 5G, nrscope bug fix
2021-02-28 21:39:53 +01:00
Raymond Knopp
4d9ebf0ac0
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00
cig
e023f67ed8
Compute and apply symbol rotation for DL and UL
...
- now done according to the proper DL/UL frequency
- this makes it compatible with FDD mode
2021-02-17 14:14:06 +01:00
Xue Song
bd765c7505
C-plane for rfsim with Free5GC + CU/DU separation is OK
2021-02-16 14:14:55 +09:00
Laurent Thomas
2c5bd9fa8c
improve rfsim
2021-02-10 17:49:14 +01:00
Xue Song
e1a92eadba
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-10 15:56:50 +09:00
Thomas Schlichter
3eb2b4d7b2
Generalize some frame parameter calculations
...
Enabling more numerology combinations and 100 MHz support with 3/4 sampling for USRP X300/X310, too.
2021-02-08 14:21:30 +01:00
Thomas Schlichter
3743ead91a
Merge remote-tracking branch 'develop' into NR_10MHz
2021-02-08 14:20:20 +01:00
Xue Song
52edf0c123
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_task.c
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_task.c
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/L2_interface_ue.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09:00
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +01:00
francescomani
8af407250d
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-01-29 12:16:43 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
Xue Song
76cb132f2d
u-plane is ok
2021-01-22 15:44:18 +09:00
Thomas Schlichter
c107b9b756
Merge remote-tracking branch 'develop'
2021-01-21 18:28:33 +01:00
Laurent Thomas
eddebae1e4
fix after code review
2021-01-21 13:47:18 +01:00
Xue Song
73ff5dec81
modify INITIAL_UL_RRC_MESSAGE_TRANSFER
...
fix build errors about nrUE
c-plane is ok
2021-01-20 15:13:49 +09:00
hardy
213c948d84
Merge remote-tracking branch 'origin/develop-sib1' into integration_2021_wk02_wMR988
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
2021-01-14 13:17:19 +01:00
Xue Song
e0419baeb3
Merge branch 'ngap-wf-1120-srb' into develop_SA_rfsim_for_F1
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
2021-01-12 05:37:09 +00:00
frtabu
6ec065fe2a
add tpool thread name parameter, review fixes
2021-01-08 18:19:29 +01:00
cig
895d97d0e8
Cleanup UE mac_enabled conditions
...
- skipping RA procedures when MAC is disabled
- added mac_enabled flag that allows to disable RA and TA at UE from CL
2020-12-27 19:28:13 +01:00
frtabu
58309dd730
simplify nrue command line parameter processing
2020-12-23 18:43:03 +01:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
frtabu
d3919b6af4
Merge branch 'develop' into cleanup_softmodem_main
2020-12-22 23:07:54 +01:00
rmagueta
0f3629ae92
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2020-12-18 13:43:48 +00:00
cig
427d2d3977
Cleanup nr-uesoftmodem
...
- moved configuration of UE parameters to set_options function
- removed redundant loop over CCs
2020-12-09 09:35:41 +01:00
frtabu
fdc1049a70
Fix phy simulators compilation, number of threads for dlsch configurable
2020-12-03 23:22:07 +01:00
rmagueta
61a0e4f7b2
Fix creation of rbconfig.raw and reconfig.raw files in standalone mode
2020-12-02 17:28:02 +00:00
Hongzhi Wang
aa3317a009
set less dlsch thread by default
2020-12-02 11:36:57 +01:00
Raymond Knopp
d9b7d43ec6
rebase and fix non paralellized errors
2020-12-01 18:26:07 +01:00
frtabu
0dcf4ef8f8
remove L2L1 task, parallelisation as config option
2020-11-27 17:37:45 +01:00
Francesco Mani
3efb077357
24 RB option in uesoftmodem
2020-11-21 11:11:28 +01:00
cig
7e1ac1fa49
Merge remote-tracking branch 'origin/develop' into fhg-fdd-custom-if
2020-11-10 10:41:10 +01:00
cig
6862affdf4
Cleanup RF HW configuration at UE side
...
- removed redundant initialisation of variables
- introduced two "RF helpers" function that are replacing shared code in the sync routines
- added a new .c file and updated the cmakelists and .h files
2020-10-27 11:09:17 +01:00
cig
95bd55d8b6
Cleanup redundant setting of duplex mode after sync
2020-10-27 10:43:24 +01:00
cig
3939406141
Logging fixes at UE and gNB
2020-10-27 10:43:24 +01:00
cig
8e7d69989b
Cleanup initialisation frame params UE and command line options
...
- got rid of global variable fp
- code cleanup, removed redundant and unused code
- removed unused command line options and variables
- grouped command line setting in set_options function
2020-10-27 10:43:24 +01:00
cig
eb3c6538ee
Moved N_TA offset setting to init function
2020-10-27 10:43:24 +01:00