maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,999 Commits 5 Branches 0 Tags
a3329b562cf5098fde4ce0d9a32c55f853b00bcd
Commit Graph
1841 Commits
Author SHA1 Message Date
Masayuki HARADA fb054e6523 Merge branch 'sp3_master' into scd_refactoring 
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
 2018-05-29 14:24:25 +09:00
Masayuki HARADA 91db46b6ba Merge branch 'rm917_bugfix' into sp3_master 2018-05-24 17:06:10 +09:00
Wu Jing a37c29eb80 fix rm971 bug(delete #if 0) 2018-05-24 16:44:28 +09:00
Masayuki HARADA 44210a0a88 Fix PUSCH decode failure when recieve power is too high situation. 2018-05-24 13:21:37 +09:00
Wu Jing fadba8a1ed fix rm917 bug 2018-05-22 18:42:35 +09:00
Masayuki HARADA ff604660fe delete UE_EXPANSION route 2018-05-18 10:58:26 +09:00
Masayuki HARADA f55bd83d55 select scheduler by config file 2018-05-17 18:27:09 +09:00
Masayuki HARADA 677ad4298c Devide source file of scheduler 2018-05-17 10:48:39 +09:00
Masayuki HARADA de1996ec3e change compile option from UE_EXPANSION to UE_EXPANSION,PHY_TX_THREAD,PRE_SCD_THREAD. 2018-05-15 17:37:43 +09:00
Haruki NAOI bb6d116551 Merge remote-tracking branch 'remotes/origin/rm902_bugfix_sp3_master_base' into sp3_master 2018-05-10 12:52:43 +09:00
Wu Jing 7807e677e7 fix RM902 base on sp3_master 2018-05-10 11:53:06 +09:00
Haruki NAOI 54a36ff54d Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master 2018-05-10 11:40:16 +09:00
Haruki NAOI 11d9a286c1 Merge remote-tracking branch 'remotes/origin/rm894_assertion' into sp3_master 2018-05-09 20:29:14 +09:00
jftt_wangshanshan 0928f049bb Fix cqi_req_flag, to prevent continously schedule cqi after set it to 1 and before actually receive it at the right subframe. 2018-05-09 18:22:22 +08:00
Haruki NAOI f2db393923 Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master 2018-05-09 17:36:06 +09:00
jftt_wangshanshan f1cd05c1e0 Fix ul config pdu info setting missing problem 2018-05-09 11:56:45 +08:00
jftt_wangshanshan ebbc7fadd0 add previous fix to non-ue-extension 2018-04-26 09:29:29 +08:00
jftt_wangshanshan a60ac11320 fix ul config pdu type while there are cqi,harq and ulsch at the same time. 2018-04-25 17:05:12 +08:00
Haruki NAOI a3f5e632ea Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master 2018-04-23 19:12:31 +09:00
jftt_wangshanshan c5b3aaa2dd Fix a bug in log 2018-04-23 14:26:43 +08:00
Haruki NAOI 9a8ea23f9f Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master 2018-04-23 11:21:15 +09:00
Haruki NAOI 20fd63b1e2 Merge remote-tracking branch 'remotes/origin/rm898_bugfix' into sp3_master 2018-04-23 11:20:05 +09:00
jftt_wangshanshan ef5ff53ecf change log level to debug 2018-04-23 09:58:50 +08:00
jftt_wangshanshan 0889d79969 Modify CQI scheduling strategy 2018-04-23 09:45:08 +08:00
Haruki NAOI c8267c2cf9 Revert "Merge branch 'rm884_bugfix' into 'sp3_master'" 
This reverts commit fad303fe37, reversing
changes made to e35921cf96.
 2018-04-20 18:41:35 +09:00
Wu Jing e2a1b98658 fix rm898 SecurityModeFailure 2018-04-20 17:56:47 +09:00
tomita 2bf209e469 Delete LOG_I . 2018-04-19 18:25:34 +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
shono.takafumi e2741d2b3d Merge branch 'sp3_master' into rm894_assertion 2018-04-19 11:38:42 +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
Haruki NAOI b0798357b9 Merge branch 'sp3_rlc_assertion' into sp3_master 2018-04-12 20:16:01 +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
Haruki NAOI afcdb1e6a9 enb-log-mem_sp2.patch into closed_item 
(cherry picked from commit 3432385280c3155ee63a54be7c2e4846a17299de)

# Conflicts:
#	openair2/UTIL/LOG/log.c
 2018-04-12 10:53:44 +09:00
Haruki NAOI 597890ab61 eNB RLC Assertions(assert macros) skip & fix warning. 2018-04-11 19:01:43 +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 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
teramoto.genki c5310874fa Merge branch 'sp3_rlc_assertion' of http://10.37.145.15:8000/gitlab/vran/release_enb into sp3_rlc_assertion 
# Conflicts:
#	openair2/LAYER2/RLC/rlc.c
 2018-04-09 21:12:02 +09:00
teramoto.genki 43382defec eNB RLC Assertions skip. 2018-04-09 21:00:13 +09:00
Masayuki HARADA 5e4f0a924d Merge branch 'ues_test' into sp3_tdd_config1 
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
 2018-04-09 20:21:24 +09:00
Masayuki HARADA f8f149fd1b Fix calculation of ul_total_buffer. 2018-04-09 20:05:45 +09:00
Masayuki HARADA b58ecfc5d8 Change SCH_PAYLOAD_SIZE_MAX from 4096 to 8192. 2018-04-09 20:01:38 +09:00
Haruki NAOI 8b44c8bfb6 modify: skip RLC assertion. 2018-04-09 19:57:33 +09:00
Masayuki HARADA 7ced1a2eb1 Remove nb_rb = 64 form rb_table in SCD. Because PHY UL cannot decode nb_rb = 64. 2018-04-09 19:56:33 +09:00
Wu Jing dbddecb775 fix Paging bug when PO=subframe0 and sfn_sf error 2018-04-04 18:56:56 +09:00