Commit Graph
5462 Commits
Author SHA1 Message Date
Xue Song 6a3b7b40a5 Merge branch 'master' into develop_SA_L3
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
yoshio.inoue c49220610d add TODO comments 2021-02-01 21:19:04 +09:00
Wu.Jing 37f0198944 Revert "remove the commented code from rrc_gNB.c"
This reverts commit 15caed4d54.
2021-02-01 16:02:47 +09:00
Wu.Jing c20fae1dea Merge branch 'develop_SA_SIM' into develop_SA_L3 2021-02-01 14:58:51 +09:00
He Shanyun 150221536c change output format for ran ue ngap id 2021-02-01 14:08:19 +09:00
Xue Song a85f261b54 add license text
fix some problems
2021-02-01 13:59:56 +09:00
yincong 15caed4d54 remove the commented code from rrc_gNB.c 2021-02-01 12:27:37 +09:00
hardy 5db5657df7 Merge remote-tracking branch 'origin/lte_uplink_improvement' into integration_2021_wk04_b 2021-01-29 07:41:47 +01:00
hardy 6e12f8f8d3 Merge remote-tracking branch 'origin/nr_ul_scfdma' into integration_2021_wk04_b 2021-01-29 07:40:42 +01:00
hardy 9c810b311d Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b 2021-01-29 07:40:07 +01:00
hardy 62aec337bf Merge remote-tracking branch 'origin/flexran-repair-mme-mgmt' into integration_2021_wk04_b 2021-01-29 07:39:49 +01:00
Xue Song 36487515c4 fix double definition in rrc_gNB_NGAP.c and nr_ngap_gnb.c 2021-01-28 14:20:35 +09:00
Laurent Thomas eddebae1e4 fix after code review 2021-01-21 13:47:18 +01:00
He Shanyun e4ff0d5b31 Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3 2021-01-20 01:51:32 +00:00
He Shanyun b425e6f495 fix cppcheck error and warning 2021-01-16 12:04:00 +09:00
Thomas Schlichter 691ad0bba0 Merge remote-tracking branch 'develop' into nr_ul_scfdma
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-01-15 14:54:37 +01: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
hardy fe7a5a2dbd Merge remote-tracking branch 'origin/NR_FR2_RA' into integration_2021_wk02 2021-01-11 14:53:36 +01:00
hardy df88b0493e Merge remote-tracking branch 'origin/rlc-v2-bugfix-status-reporting' into integration_2021_wk02 2021-01-11 14:51:18 +01:00
Laurent 3b0c43c04b fix memory allocation error 2021-01-10 21:41:22 +01:00
francescomani 6995eef871 moving initialization of msg3 frame and slot 2021-01-09 17:06:59 +01:00
rmagueta ab107c98dd Fix RA BWP at UE 2021-01-09 15:58:54 +00:00
rmagueta 223c8b9ad9 Fix REG mapping type for coreset0 2021-01-07 18:28:17 +00:00
Thomas Schlichter d99099f316 Merge remote-tracking branch 'develop' into NR_FR2_RA
Conflicts:
	openair1/PHY/NR_REFSIG/nr_gold_ue.c
2021-01-07 17:00:13 +01:00
Wu.Jing f22a779881 Merge branch 'master' into develop_SA_L3 2021-01-07 13:55:40 +09:00
rmagueta a6a56d23cb Fix in coreset0 transmission slot calculation 2021-01-06 14:39:09 +00:00
Laurent ebccfe5117 add raw capture from UHD examples and fix a rfsim bug 2021-01-02 18:58:13 +01:00
Laurent c4a91bcc62 scope, dirty replay 2020-12-29 19:00:51 +01:00
masayuki.harada bbaef50932 Fix est buffer. 2020-12-27 20:19:33 +09:00
Laurent d253301c1a intptr_t instead of int64_t for instance_t 2020-12-27 12:09:20 +01:00
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
dir c5bce98b48 RRC, MAC changes to enable RFSIM testing of feature transform precoding.
- Enable -Z option to test Transform precoding on ULSIM.
- Set msg3_transformPrecoder to 0 in uplinkcommonconfig params in conf file to test on RFSIM.
2020-12-21 16:10:27 +02:00
yaojie d5696baf71 Fix merge conflict 2020-12-21 12:25:36 +09: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
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
Wu.Jing 19118c13d1 Merge branch 'master' into develop_SA_L3 2020-12-18 11:52:59 +09:00
Xue Song a53d6795c8 fix some errors about rrcReestablishment 2020-12-17 12:21:06 +09:00
rmagueta dc4dd10d1a RA BWP fix at UE 2020-12-16 18:02:24 +00: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
masayuki.harada 50146dec06 Merge remote-tracking branch 'remotes/oai/develop' into lte_uplink_improvement
# Conflicts:
#	openair1/SCHED/phy_procedures_lte_eNb.c
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2020-12-15 19:01:43 +09:00
masayuki.harada b125b93e9e Fix log and minor bugs. 2020-12-15 18:19:22 +09: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
Francesco Mani 9fae23b625 quick fix for nb of rb allocated in phytest for ul 2020-12-11 18:14:06 +01:00
yaojie 7fa06a3a2b Add RRCReestablishment 2020-12-11 17:31:06 +09:00