Commit Graph
5341 Commits
Author SHA1 Message Date
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
Wu.Jing e2d26d2a44 Merge branch 'master' into develop_SA_F1 2021-01-07 13:56:32 +09:00
Xue Song b0a76fd662 add du handle f1ap setup response 2020-12-24 02:58:29 +00:00
Xue Song 1fcd879f97 modify F1 Setup Response
add rrc_gNB_process_f1_setup_req
2020-12-23 10:03:04 +00:00
Xue Song 1cc09da83f Merge branch 'develop_SA_L3' into develop_SA_F1
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
2020-12-23 15:11:17 +09:00
Xue Song cb0d7c3dd5 modify F1 Setup Request 2020-12-23 01:58:17 +00:00
Xue Song f09c6fbd0d Add RCconfig_NR_DU_F1
Initialize F1AP
2020-12-22 01:29:23 +00:00
Xue Song 8d5f99d088 fix the problem of ittiSIM compilation error 2020-12-21 16:12:58 +09:00
yaojie d5696baf71 Fix merge conflict 2020-12-21 12:25:36 +09:00
Xue Song d0be64cbd0 add DU_handle_F1_SETUP_FAILURE 2020-12-21 01:50:28 +00:00
Xue Song 08511b8207 fix some warnings
modify some issues
add f1ap ue context procedure
2020-12-20 08:59:50 +00:00
Xue Song ec29831e16 modify F1AP_DL_RRC_MESSAGE in RRC
add DU_handle_DL_NR_RRC_MESSAGE_TRANSFER
2020-12-18 11:17:12 +00:00
Wu.Jing 37d52bdf60 Merge branch 'develop_SA_SIM' into develop_SA_L3
Conflicts:
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-12-18 17:38:07 +09:00
Xue Song 7b859b7238 add F1AP_DL_RRC_MESSAGE in NR RRC 2020-12-18 03:06:08 +00:00
Wu.Jing 19118c13d1 Merge branch 'master' into develop_SA_L3 2020-12-18 11:52:59 +09:00
Xue Song 5936c80b0b RRCSetup docking with F1AP 2020-12-17 08:35:24 +00:00
Xue Song 45ec62f963 read config about f1 2020-12-17 05:50:57 +00:00
Xue Song a53d6795c8 fix some errors about rrcReestablishment 2020-12-17 12:21:06 +09:00
hardy 69cc0767c0 Merge remote-tracking branch 'origin/ldpc_short_codeword_fixes' into integration_2020_wk51_2 2020-12-16 11:09:56 +01:00
hardy 4d76288211 Merge remote-tracking branch 'origin/remove_nos1_hack_pdcp' into integration_2020_wk51_2 2020-12-16 11:09:31 +01:00
Thomas Schlichter 4626d507bd NR UE: fix compile error with UE_TIMING_TRACE enabled 2020-12-15 11:17:24 +01:00
yaojie 96cf622e9e fix errors and add RRCReestablishmentComplete of UE 2020-12-15 14:23:39 +09:00
hardy 02bb4ac913 Merge remote-tracking branch 'origin/fix_do_ra_data' into integration_2020_wk51 2020-12-14 13:33:38 +01:00
hardy 3bccd95755 Merge remote-tracking branch 'origin/256_QAM_demod' into integration_2020_wk51 2020-12-14 13:32:29 +01:00
Thomas Schlichter f905b29364 NR UE: decrease number of LOG_I() logging messages 2020-12-14 12:06:11 +01:00
Xue Song 40e3c0ce95 modify rrcReestablishmentRequest 2020-12-14 18:50:12 +09:00
yaojie 7fa06a3a2b Add RRCReestablishment 2020-12-11 17:31:06 +09:00
Xue Song 9dce92eafe implement rrcReestablishmentRequest 2020-12-11 14:59:34 +09:00
He Shanyun ec48bb8913 implement rrcReestablishmentComplete 2020-12-11 09:54:43 +09:00
Thomas Schlichter ac73df698d Merge branch 'develop' into 'fix_do_ra_data'
# Conflicts:
#   openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#   openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2020-12-10 13:40:08 +01:00
Remi Hardy 98fd8279bf Merge remote-tracking branch 'origin/develop-oriecpriupdates' into rh_wk50_debug 2020-12-09 14:16:19 +01:00
Remi Hardy 3d8be663a0 Merge remote-tracking branch 'origin/NR_FR2_RRC_SSB' into rh_wk50_debug
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2020-12-09 13:16:41 +01:00
Remi Hardy e9cf51f58d Merge remote-tracking branch 'origin/bugfix-nr-pdcp-sn-size' into rh_wk50_debug 2020-12-09 13:11:02 +01:00
Remi Hardy bc43ecd17f fix variable name after merge of MR980 and MR987 2020-12-09 09:55:50 +01:00
Remi Hardy 4a66c750ec Merge remote-tracking branch 'origin/pusch-mthread-scaling-fix' into rh_wk50_debug 2020-12-09 09:49:48 +01:00
Remi Hardy ec94adaef5 Merge remote-tracking branch 'origin/NR-PHY-MAC-IF-multi-UE' into rh_wk50_debug 2020-12-09 09:48:40 +01:00
Thomas Schlichter 1b2c8b3c56 Merge remote-tracking branch 'origin/develop' 2020-12-09 09:39:44 +01:00
He Shanyun 547d7b01b8 change the sleep location for the ittisim 2020-12-08 17:13:09 +09:00
Francesco Mani 29a56fe527 tentative fix for delayed RA procedure at UE 2020-12-04 16:21:45 +01:00
Sakthivel Velumani e5cd573ecb Added a local variable instead of global 2020-12-04 15:10:58 +01:00
Robert Schmidt 13f0571a65 Fix log message: add newline, format 2020-12-04 11:07:18 +01:00
Robert Schmidt 3ae4744679 Single definition and declaration of nr_slots_per_frame 2020-12-04 11:07:18 +01:00
Robert Schmidt 1d7065c29c Remove DLSCH_pdu as it is not needed anymore 2020-12-04 11:07:18 +01:00
Robert Schmidt 89fc1e6e54 handle_nr_ulsch() for multiple UEs 2020-12-04 11:07:18 +01:00
Robert Schmidt 35e723d090 handle_nr_uci() for multiple UEs 2020-12-04 09:41:34 +01:00
Robert Schmidt d9c7243ac1 Remove LTE/FlexRAN-related headers from NR MAC 2020-12-04 09:41:34 +01:00
Robert Schmidt c71772e325 Remove LTE-related headers from NR PHY-MAC IF 2020-12-04 09:41:34 +01:00
matzakos d64bc67b0c Add TDD configuration in ENDC X2 setup response message sent from eNB 2020-12-03 15:39:30 +01:00
Robert Schmidt 589ff862dc Improve retransmission messages in UL&DL 2020-12-03 09:52:41 +01:00
matzakos 103fc806b3 Remove hack in LTE PDCP for noS1 mode 2020-12-03 00:31:23 +01:00