jftt_wangshanshan
831ce2e910
Fix frame_cnt to prevent it from getting too big
2018-02-13 17:08:32 +08:00
Wu Jing
c641f334bb
fix total usable RBs when pucch rb=6
2018-02-12 18:38:26 +09:00
jftt_wangshanshan
19a2b37c75
Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting.
2018-02-12 16:52:48 +08:00
jftt_wangshanshan
5a461002a1
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-12 14:01:46 +08:00
jftt_wangshanshan
bba24dc2fa
Remove comments
2018-02-11 20:33:07 +08:00
jftt_wangshanshan
2974c20c69
Move tdd config case 1 to top
2018-02-11 19:55:52 +08:00
Xu Bo
dcdda7ba35
set UL schedule period to 5Frame for TDD config1
2018-02-11 18:10:11 +09:00
jftt_wangshanshan
4898d609e6
Fix a bug in HI_DCI0_req clear
2018-02-11 16:42:12 +08:00
jftt_wangshanshan
1bc258a729
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-08 18:09:53 +08:00
jftt_wangshanshan
593ebc4732
Fix bug in subframe2harq_pid. Remove if tdd condition while calling this method since there is already if-else in the method.
2018-02-08 18:08:38 +08:00
jftt_wangshanshan
9ba0355000
add switch tdd config to Msg4 timing setting
2018-02-08 18:04:23 +08:00
jftt_wangshanshan
89b261efe5
Fix bug in schedule_ulsch
2018-02-08 16:28:13 +08:00
Wu Jing
8fffe90dbe
fix hundreds_of_ues issue(n1_PUCCH_AN DAI) for TDD cofnig1
2018-02-08 02:24:54 +00:00
jftt_wangshanshan
e8300aa944
Don't use assert since the comment above said it's perfectly possible to have this NULL here.
2018-02-06 16:50:27 +08:00
jftt_wangshanshan
367e076347
Fix merge bug in return value of ul_ACK_subframe2_dl_frame
2018-02-06 11:58:25 +08:00
Xu Bo
5c76360c2d
Fix special subframe only use 2 symbols to transmit pdcch
2018-02-06 11:01:05 +09:00
Xu Bo
f9f20c7300
allocate_CCEs only called on dl subframes
2018-02-05 20:17:53 +09:00
jftt_wangshanshan
5ece3937d4
CRS only send on first symbol in special subframe config 0
2018-02-05 17:37:34 +08:00
Xu Bo
4387070cda
fix merge bug
2018-02-05 17:25:57 +09:00
jftt_wangshanshan
9c820805fa
TDD config1 initial merge
2018-02-05 15:43:20 +08:00
Xu Bo
10d7599d08
fix merge error
2018-02-03 17:52:03 +09:00
Wu Jing
069ce49e9c
Merge remote-tracking branch 'other/issue289_tdd_config1' into sp3_master
2018-02-03 17:50:53 +09:00
naoi
3ea62dbdee
modify log.
2018-02-01 21:26:05 +09:00
Wu Jing
ba8a111ea1
merge the latest develop branch into issue289
2018-02-01 19:25:29 +09:00
Xu Bo
d42ddeac56
fix CRNTI process
2018-02-01 01:57:54 +00:00
Xu Bo
ef4aee1e28
Merge branch 'issue255_256_257_tmp' into ues_test
2018-01-27 04:14:06 +00:00
Xu Bo
0dcc3dceaf
reduce UL failure timer log by change LOG_I to LOG_D
2018-01-27 04:13:12 +00:00
Xu Bo
664d1a4b5f
merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h
2018-01-27 02:24:43 +00:00
Xu Bo
098a177d6f
Merge branch 'issue271_hundreds_of_ues' into ues_test
2018-01-27 02:12:47 +00:00
Xu Bo
dedd3c6344
fix issue that when RRCConnectionRelease happened by UL failure DL SCD doesn't send DCCH(RRCConnectionRelease) to UE because ul_out_of_sync is set to 1
2018-01-27 02:11:57 +00:00
Xu Bo
b7e2a90ef4
fix release timer by starting timer after SCD DCCH(RRCConnectionRelease)
2018-01-27 02:06:08 +00:00
Xu Bo
260a2a7d3d
Merge branch 'issue255_256_257_tmp' into ues_test
2018-01-26 17:08:09 +09:00
Xu Bo
d9d28e3209
reset release_timer from 200ms to 100ms because of flightmode on/off issue, reduce ul failure timer log
2018-01-26 08:00:57 +00:00
Xu Bo
1547a45eae
Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test
2018-01-26 07:15:45 +00:00
Xu Bo
0105373cdc
Merge remote-tracking branch 'remotes/origin/issue271_hundreds_of_ues' into ues_test
2018-01-26 06:43:41 +00:00
Xu Bo
b44c83ef46
add remove ue info of pre_scd thread to freeList and for ru_thread to remove the UE in the freeList
2018-01-26 06:15:28 +00:00
Xu Bo
23b5b6ac20
add remove ue info to freeList when RRCConnectionReestablish occurs and for ru_thread to remove the info
2018-01-26 05:57:37 +00:00
Xu Bo
da94f64c95
Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test
2018-01-23 09:37:15 +00:00
Xu Bo
573c703cd2
fix issue about nb_rb=0 assertion failed
2018-01-23 09:31:01 +00:00
Cedric Roux
cd8e8458cf
Merge remote-tracking branch 'origin/develop_integration_2018_w04' into develop
...
Summary of changes:
- heavy code cleanup (#ifdef removal)
- bugfixes
2018-01-23 09:30:04 +01:00
Cedric Roux
ecd4aebbe0
Merge remote-tracking branch 'origin/issue-285-connect-disconnect-multiple-time' into develop_integration_2018_w04
2018-01-22 18:44:32 +01:00
Cedric Roux
97ebc165cc
Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/SCHED/defs.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/RRC/LITE/rrc_eNB.c
2018-01-22 17:47:01 +01:00
Cedric Roux
b5513cadf1
hotfix: fix nfapi for correct compilation on ubuntu 17.10
2018-01-22 16:00:21 +01:00
Cedric Roux
4b5b556493
bugfix: fix issue 285 - connect/disconnect multiple time
...
As reported by Emad Alizade:
According to "Issue255 256 257 paging reesta release" that has been
merged in develop version, we have a question: In rrc_eNB_free_UE()
function only all ulsch related memory of user has been cleaned, but
I think not only ulsch memory but also dlsch memory must be cleaned.
I tested the latest develop version and with repetition UE attach-detach
procedures we find that the dlsch memory has not been cleaned and after
repeat this sequence (45 times) assertion with cause UE_id!=-1 (no free
or exiting dlsch_context, dci_tools.c: fill_dci_and_dlsch() ) occurred
and no UE will be attached to system.
The fixes in this commit are from Emad Alizade.
2018-01-22 15:32:41 +01:00
Xu Bo
70371e124d
fix issue about Arithmetic exception for pre_scd thread
2018-01-22 10:15:08 +00:00
Xu Bo
2efaf51280
modify pre_scd thread and add phy_tx thread and rf_tx thread
2018-01-22 05:58:14 +00:00
Xu Bo
b67c169145
Merge branch 'issue255_256_257_tmp' into ues_test
2018-01-22 13:58:56 +09:00
Xu Bo
38eacea022
fix noS1 compile error
2018-01-22 04:53:17 +00:00
Xu Bo
70da4b5902
modify pre_scd thread and add phy_tx and rf_tx thread
2018-01-22 03:59:04 +00:00
Xu Bo
f59a509ec7
fix RRCConnectionRelease timer from 100ms to 200ms and clear MSG3_round after schedule_RA
2018-01-22 02:38:17 +00:00