Commits · 19a2b37c751445ef2a82ba41b0e21efc8124c19f · 常顺宇 / OpenXG-RAN

12 Feb, 2018 2 commits
- Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting. · 19a2b37c
  jftt_wangshanshan authored Feb 12, 2018
  
  19a2b37c
- Merge branch 'sp3_tdd_config1' of... · 5a461002
  jftt_wangshanshan authored Feb 12, 2018
```
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
```
  5a461002
11 Feb, 2018 4 commits
- Remove comments · bba24dc2
  jftt_wangshanshan authored Feb 11, 2018
  
  bba24dc2
- Move tdd config case 1 to top · 2974c20c
  jftt_wangshanshan authored Feb 11, 2018
  
  2974c20c
- set UL schedule period to 5Frame for TDD config1 · dcdda7ba
  Xu Bo authored Feb 11, 2018
  
  dcdda7ba
- Fix a bug in HI_DCI0_req clear · 4898d609
  jftt_wangshanshan authored Feb 11, 2018
  
  4898d609
08 Feb, 2018 5 commits
- Merge branch 'sp3_tdd_config1' of... · 1bc258a7
  jftt_wangshanshan authored Feb 08, 2018
```
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
```
  1bc258a7
- Fix bug in subframe2harq_pid. Remove if tdd condition while calling this... · 593ebc47
  jftt_wangshanshan authored Feb 08, 2018
```
Fix bug in subframe2harq_pid. Remove if tdd condition while calling this method since there is already if-else in the method.
```
  593ebc47
- add switch tdd config to Msg4 timing setting · 9ba03550
  jftt_wangshanshan authored Feb 08, 2018
  
  9ba03550
- Fix bug in schedule_ulsch · 89b261ef
  jftt_wangshanshan authored Feb 08, 2018
  
  89b261ef
- fix hundreds_of_ues issue(n1_PUCCH_AN DAI) for TDD cofnig1 · 8fffe90d
  wujing authored Feb 08, 2018
  
  8fffe90d
06 Feb, 2018 3 commits
- Don't use assert since the comment above said it's perfectly possible to have this NULL here. · e8300aa9
  jftt_wangshanshan authored Feb 06, 2018
  
  e8300aa9
- Fix merge bug in return value of ul_ACK_subframe2_dl_frame · 367e0763
  jftt_wangshanshan authored Feb 06, 2018
  
  367e0763
- Fix special subframe only use 2 symbols to transmit pdcch · 5c76360c
  Xu Bo authored Feb 06, 2018
  
  5c76360c
05 Feb, 2018 4 commits
- allocate_CCEs only called on dl subframes · f9f20c73
  Xu Bo authored Feb 05, 2018
  
  f9f20c73
- CRS only send on first symbol in special subframe config 0 · 5ece3937
  jftt_wangshanshan authored Feb 05, 2018
  
  5ece3937
- fix merge bug · 4387070c
  Xu Bo authored Feb 05, 2018
  
  4387070c
- TDD config1 initial merge · 9c820805
  jftt_wangshanshan authored Feb 05, 2018
  
  9c820805
03 Feb, 2018 2 commits
- fix merge error · 10d7599d
  Xu Bo authored Feb 03, 2018
  
  10d7599d
- Merge remote-tracking branch 'other/issue289_tdd_config1' into sp3_master · 069ce49e
  wujing authored Feb 02, 2018
  
  069ce49e
01 Feb, 2018 3 commits
- modify log. · 3ea62dbd
  naoi authored Feb 01, 2018
  
  3ea62dbd
- merge the latest develop branch into issue289 · ba8a111e
  wujing authored Feb 01, 2018
  
  ba8a111e
- fix CRNTI process · d42ddeac
  Xu Bo authored Feb 01, 2018
  
  d42ddeac
27 Jan, 2018 6 commits
- Merge branch 'issue255_256_257_tmp' into ues_test · ef4aee1e
  Xu Bo authored Jan 27, 2018
  
  ef4aee1e
- reduce UL failure timer log by change LOG_I to LOG_D · 0dcc3dce
  Xu Bo authored Jan 27, 2018
  
  0dcc3dce
- merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h · 664d1a4b
  Xu Bo authored Jan 27, 2018
  
  664d1a4b
- Merge branch 'issue271_hundreds_of_ues' into ues_test · 098a177d
  Xu Bo authored Jan 27, 2018
  
  098a177d
- fix issue that when RRCConnectionRelease happened by UL failure DL SCD doesn't... · dedd3c63
  Xu Bo authored Jan 27, 2018
```
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
```
  dedd3c63
- fix release timer by starting timer after SCD DCCH(RRCConnectionRelease) · b7e2a90e
  Xu Bo authored Jan 27, 2018
  
  b7e2a90e
26 Jan, 2018 6 commits
- Merge branch 'issue255_256_257_tmp' into ues_test · 260a2a7d
  Xu Bo authored Jan 26, 2018
  
  260a2a7d
- reset release_timer from 200ms to 100ms because of flightmode on/off issue,... · d9d28e32
  Xu Bo authored Jan 26, 2018
```
reset release_timer from 200ms to 100ms because of flightmode on/off issue, reduce ul failure timer log
```
  d9d28e32
- Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test · 1547a45e
  Xu Bo authored Jan 26, 2018
  
  1547a45e
- Merge remote-tracking branch 'remotes/origin/issue271_hundreds_of_ues' into ues_test · 0105373c
  Xu Bo authored Jan 26, 2018
  
  0105373c
- add remove ue info of pre_scd thread to freeList and for ru_thread to remove the UE in the freeList · b44c83ef
  Xu Bo authored Jan 26, 2018
  
  b44c83ef
- add remove ue info to freeList when RRCConnectionReestablish occurs and for... · 23b5b6ac
  Xu Bo authored Jan 26, 2018
```
add remove ue info to freeList when RRCConnectionReestablish occurs and for ru_thread to remove the info
```
  23b5b6ac
23 Jan, 2018 3 commits
- Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test · da94f64c
  Xu Bo authored Jan 23, 2018
  
  da94f64c
- fix issue about nb_rb=0 assertion failed · 573c703c
  Xu Bo authored Jan 23, 2018
  
  573c703c
- Merge remote-tracking branch 'origin/develop_integration_2018_w04' into develop · cd8e8458
  Cedric Roux authored Jan 23, 2018
```
Summary of changes:
- heavy code cleanup (#ifdef removal)
- bugfixes
```
  cd8e8458
22 Jan, 2018 2 commits

Merge remote-tracking branch... · ecd4aebb

Cedric Roux authored Jan 22, 2018

Merge remote-tracking branch 'origin/issue-285-connect-disconnect-multiple-time' into develop_integration_2018_w04

ecd4aebb

Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04 · 97ebc165

Cedric Roux authored Jan 22, 2018

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

97ebc165