maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,794 Commits 5 Branches 0 Tags
280249bb2acee5dfd6502677177f17d12f1e9907
Commit Graph
87 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wu.Jing e2d26d2a44 Merge branch 'master' into develop_SA_F1 2021-01-07 13:56:32 +09:00
Wu.Jing f22a779881 Merge branch 'master' into develop_SA_L3 2021-01-07 13:55:40 +09:00
Wu Jing 4a14c4c706 fix build waning 
(cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair3/S1AP/s1ap_eNB.c

# Conflicts:
#	openair3/S1AP/s1ap_eNB.c
 2021-01-06 19:52:37 +09:00
Wu.Jing 4c75866a54 Fix cppcheck warning 
(cherry picked from commit aaa4d390fdefc4e8071b80edc90a580907c9dec3)
 2021-01-06 19:51:46 +09:00
Wu.Jing 8c607fe85b Fix build error in --UE because of s1ap_eNB.c 
(cherry picked from commit 519e6628d572c9b6cf8031632d4e22e2f8dc5b93)
 2021-01-06 19:51:34 +09:00
Wu Jing cead17f2d8 Fix openair3/NAS/UE cppcheck error 2021-01-06 19:33:04 +09:00
Wu Jing df17a8dd4f merge NNSF feature based on v1.0.2 
(cherry picked from commit b9e93a16379cf261502d9451b60bd787c07da64e)
 2021-01-06 19:31:35 +09: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
wu.jing 0fdc671177 fix merge problems in ittisim 2020-11-24 10:44:09 +00:00
wu.jing c994c2ad8f Merge branch 'develop_SA_SIM' into develop_SA_L3 
Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/COMMON/gtpv1_u_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2020-11-24 09:15:52 +00:00
wu.jing 2473722717 fix ittisim build error after merge 2020-11-24 14:06:51 +08:00
wu.jing f3d51a58fb Merge branch 'develop_SA_RRC' into develop_SA_SIM 
Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2020-11-24 05:15:06 +00:00
wu.jing d987c0919f Merge branch 'master' into develop_SA_L3 2020-11-24 04:57:19 +00:00
Wu.Jing 66bc0bac1e Merge branch 'master' into develop_SA_L3 2020-10-26 09:04:03 +00:00
Wu.Jing 08e775559b Merge branch 'develop_SA_SIM' into develop_SA_L3 2020-10-26 09:02:18 +00:00
Wu.Jing a9b76b5341 Merge branch 'develop_SA_RRC' into develop_SA_SIM 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
 2020-10-26 07:30:18 +00:00
Wu.Jing 92ba7dc249 Merge branch 'develop_SA_NGAP' into develop_SA_RRC 2020-10-26 06:20:02 +00:00
Wu.Jing 0312db24b4 comment nnsf that it hasnot be test 2020-10-15 08:57:28 +00:00
Wu.Jing b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
Wu.Jing ac6262e82b fix gNB build error 2020-10-10 06:57:57 +00:00
Wu.Jing 079157eb55 cherry-pick 3efc7538ac 2020-10-10 11:26:40 +09:00
Wu Jing 3492f60407 Fix: dlsch RBG allocation issue. 2019-07-16 19:45:33 +09:00
Wu Jing a4214072aa Fix: setup release flag after all sdus of RRCConnectonRelease are scheduled. 2019-07-16 19:41:34 +09:00
Wu Jing 79eb2d7066 Fix: skip c-rnti and reestablishment before first attach is completed. 2019-07-16 19:40:09 +09:00
Wu Jing e4dfc07553 Fix: reestablishment timer when there are two reestablishmentrequest at a moment 2019-07-16 19:28:20 +09:00
Wu Jing 02532d044e x2 handover for tdd 2019-07-04 17:40:31 +09:00
Wu Jing 4239dacd02 Merge branch 'OAI_develop' into oai_develop_nfapi 2019-07-02 22:23:35 +09:00
Wu Jing 5d11ab5467 fix compile error in ue because cqi_indication_body_t 2019-07-02 17:33:14 +09:00
Wu Jing e0a670e9fe fix C-Plane NG because of the size of MSG4 and cqi struct 2019-06-18 20:15:42 +09:00
Wu Jing 91ffcd1fce fix issue that rru cannot release ue if doing attach/detach in nfapi mode 2019-06-14 14:08:29 +09:00
Wu Jing dc604f6ff1 add TAG in uci_harq_pdu in generate_Msg4 2019-06-13 11:37:08 +09:00
Wu Jing f8dc571bd9 fix assert issue when uci array is full if doing Attach/Detach 2019-06-13 11:34:08 +09:00
Wu Jing 28809cc98a donot start L1_thread_tx if it isnot L1_TRX_SPLIT 2019-06-08 13:41:28 +09:00
Wu Jing 2c7ee8cd20 avoid segfault in S1AP when doing ReleaseCommane s1ap_ue_context=NULL is possible 2019-06-08 13:40:19 +09:00
Wu Jing 4d66dba0d2 avoid segfault in RLC 2019-06-08 13:38:55 +09:00
Wu Jing 21d13ef419 fix the frame compute 2019-06-08 13:38:14 +09:00
Wu Jing b878b15473 add frame and subframe before sending DL_req,TX_req,HI_DCI0_req,UL_req 2019-06-08 13:37:16 +09:00
Wu Jing 5ee6fe727c fix issue that output hoping not to have mis-match between CRC ind and RX in VNF-PNF mode 2019-06-08 13:36:16 +09:00
Wu Jing be5bbbd86c clear rlc-am data after retransmission 5 times when doing rrcconnectionreestablishment 2019-06-08 13:34:58 +09:00
Wu Jing e11cf1ab20 fix stack smashing detected error that occurs after SecurityModeCommand 2019-06-08 13:33:30 +09:00
Wu Jing 4cd5d80d98 add log-mem function to collect log 2019-06-08 13:32:12 +09:00
Wu Jing d5d1c19588 add the tag in bch and dl in fairRR 2019-06-08 13:31:15 +09:00
Wu Jing 61fc53f851 skip crnti if c-plane is not completed 2019-06-08 13:30:09 +09:00
Wu Jing 6b1ab26cea fix issue that RRCConnectionSetupComplete does not come in nFAPI mode and fairRRSCD 2019-05-28 12:17:29 +09:00
Wu Jing a7bce4abd5 fix assertfatal cause by ue_type!=NOCE 2019-05-28 12:11:53 +09:00
Wu Jing 236c416fe2 fix segfault issue cause by num_pdcch_symbols=0 in nFAPI mode 2019-05-28 12:05:56 +09:00
Wu Jing 4f2f0f11ee fix issue that RCC calls phy_procedures_eNB_TX if PARALLEL_RU_L1_SPLIT 2019-05-23 18:08:21 +09:00
Wu Jing e9d04428ff fix segfault because RRU uses RC.mac 2019-05-23 18:07:01 +09:00
Wu Jing 2700c3aef9 fix NFAPI_MODE mistake when it is PNF because enum is NFAPI_MODE_PNF not NFAPI_PNF 2019-05-23 18:05:58 +09:00
Wu Jing ea40eeebdf start L1_thread and ru_thread if it is RCC or RRU by adding if(NFAPI==NFAPI_MODE_VNF||NFAPI_MODE_PNF) 2019-05-23 18:04:07 +09:00
Wu Jing 80e7531cfa fix segfault when using RC.rrc if it is RRU 2019-05-23 18:02:34 +09:00
Wu Jing adbe183166 fix issue when exchange NFAPI_TRACE level to OAI LOG level 2019-05-23 17:58:55 +09:00
Wu Jing a37c29eb80 fix rm971 bug(delete #if 0) 2018-05-24 16:44:28 +09:00
Wu Jing fadba8a1ed fix rm917 bug 2018-05-22 18:42:35 +09:00
Wu Jing 24c669f394 fix DLSCH no retransmission 2018-05-15 14:52:39 +09:00
Wu Jing 38363b10e3 fix rm916 bug 2018-05-15 14:42:33 +09:00
Wu Jing 7807e677e7 fix RM902 base on sp3_master 2018-05-10 11:53:06 +09:00
Wu Jing 6f4ee013d2 fix RM912 SegmentFault in dlsch_coding while using a UE which has been removed 2018-05-07 18:15:42 +09:00
Wu Jing e2a1b98658 fix rm898 SecurityModeFailure 2018-04-20 17:56:47 +09:00
Wu Jing 7813e898ba RM884 fix, when cqi received is 0, don not update dl_cqi 2018-04-19 12:26:20 +09:00
Wu Jing 22da1eac0c fix rm894 bug 2018-04-17 20:12:16 +09:00
Wu Jing 33b652c5df fix RM886 bug 2018-04-16 19:40:18 +09:00
Wu Jing a8ab765fe5 patch rrc_assertion.patch into closed_item 
# Conflicts:
#	openair2/RRC/LITE/rrc_eNB.c
 2018-04-12 20:05:04 +09:00
Wu Jing 675fd0af4e patch develop-get-freememblock.patch into closed_item 2018-04-12 20:02:36 +09:00
Wu Jing 5d06a1cabd RLC assert fix ct 2_114 bug 2018-04-12 11:06:35 +09:00
Wu Jing b27984349d fix ct test bug 2_37 2_72 2018-04-11 13:44:56 +09:00
Wu Jing a32857885a Merge branch 'sp3_tdd_config1' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_tdd_config1 2018-04-10 17:32:31 +09:00
Wu Jing b7a8889741 fix Assertion because of round==8 in extract_harq when re-establishment happen 2018-04-10 17:31:52 +09:00
Wu Jing aca800dae9 fix SegmentFault by harq_pid==8 after clean_dlsch_eNB 2018-04-10 17:19:52 +09:00
Wu Jing 7b0231f926 Merge branch 'sp3_rlc_assertion' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_rlc_assertion 2018-04-10 15:53:55 +09:00
Wu Jing 03232d30c2 RLC assertion 760~796 add 1428 1429 2018-04-10 15:37:30 +09:00
Wu Jing dbddecb775 fix Paging bug when PO=subframe0 and sfn_sf error 2018-04-04 18:56:56 +09:00
Wu Jing 6d21972e43 merge ues_test branch 2018-04-03 17:24:27 +09:00
Wu Jing d45572446c fix mcs when retranssmission 2018-03-08 12:38:54 +09:00
Wu Jing f58d4aa05f fix pdcch_alloc2ul_subframe when TDD config1 2018-03-08 12:26:39 +09:00
Wu Jing 8a89a16fde fix issue about att_rx and att_tx config 2018-03-08 12:01:43 +09:00
Wu Jing 45655197eb merge ues_test branch into sp3_tdd_config1 2018-03-07 13:42:05 +09:00
Wu Jing 54cf2d9aef fix TBS_UL data_type from uint8_t to uint16_t 2018-03-06 16:15:24 +09:00
Wu Jing 0504659eb8 fix RM778 PRACH failure by adding reset RA when CRNTI_ACK in extract_harq 2018-02-24 15:16:17 +09:00
Wu Jing ebecb55733 add if-else case for first_rb=3 when TDD config1 20MHz in ULSCH_pre_processor 2018-02-13 12:30:25 +09:00
Wu Jing c641f334bb fix total usable RBs when pucch rb=6 2018-02-12 18:38:26 +09:00
Wu Jing 8fffe90dbe fix hundreds_of_ues issue(n1_PUCCH_AN DAI) for TDD cofnig1 2018-02-08 02:24:54 +00:00
Wu Jing 069ce49e9c Merge remote-tracking branch 'other/issue289_tdd_config1' into sp3_master 2018-02-03 17:50:53 +09:00
Wu Jing ba8a111ea1 merge the latest develop branch into issue289 2018-02-01 19:25:29 +09:00