maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,791 Commits 5 Branches 0 Tags
8f2d79709e6d117fe714107e99ab5b077830606f
Commit Graph
1224 Commits
Author SHA1 Message Date
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 9ba0355000 add switch tdd config to Msg4 timing setting 2018-02-08 18:04:23 +08:00
Cedric Roux f3e7a72e55 Merge remote-tracking branch 'origin/fix-cqi-update-2018-w06' into develop_integration_2018_w06 
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
 2018-02-08 11:03:50 +01:00
Cedric Roux 724970e2ef Merge remote-tracking branch 'origin/fix-ul-buffer-info-2018-w06' into develop_integration_2018_w06 
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
 2018-02-08 10:59:19 +01: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
Cedric Roux f6345f048e Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06 
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
 2018-02-07 15:12:08 +01:00
naoi 0efa1185f3 fix: UE dosen't respond to pdcch order(contention based) 2018-02-07 20:40:06 +09:00
Cedric Roux c0bcd78673 bugfix: don't take into account report CQI in case of NACK or DTX 
The problem that may happen is that when the UE does not transmit
on PUCCH (for whatever reason) we may get no signal at all, and
thus compute a very low CQI. Later on we may ask the UE to transmit
louder which may lead to saturation and more problems.

The solution is simple: don't care about CQI in case of DTX
(and NACK also, as done for PUSCH).

Only FDD case done.
For TDD it seems that:
- nfapi structures are not correct. See nfapi_harq_indication_tdd_rel13_t
  in nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h, all the cases
  (bundling, multiplex, ...) use nfapi_harq_indication_tdd_harq_data_t
- the function extract_harq does not handle TDD
 2018-02-07 12:31:26 +01:00
Cedric Roux 9b7364a3ca minor: fix AssertFatal 2018-02-07 12:30:00 +01:00
Cedric Roux eccb96c4c2 bugfix: fix UL over scheduling 
There is too much UL scheduling because the buffer status is
overestimated.

This commit tries to make things simpler.
 2018-02-06 14:37:03 +01: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
Xu Bo 5c76360c2d Fix special subframe only use 2 symbols to transmit pdcch 2018-02-06 11:01:05 +09:00
Cedric Roux a21c0b809f bugfix: fix RRC Release 10 compilation 
The following compilation did not work anymore:

    ./build_oai --eNB -w USRP -r Rel10 -c

(Rel8 still does not work.)
 2018-02-05 17:21:40 +01:00
Xu Bo f9f20c7300 allocate_CCEs only called on dl subframes 2018-02-05 20:17:53 +09: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
Raymond Knopp 01f06bcf09 compilation success 2018-02-03 08:11:48 -08:00
Raymond Knopp 4af41d2a26 more correction of indentation 2018-02-03 07:53:33 -08:00
Raymond Knopp 2c8443121d Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into mac-indentation-fix 
Conflicts:
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
 2018-02-03 06:23:55 -08:00
Raymond Knopp 1a082041b8 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 
Conflicts:
	openair2/LAYER2/MAC/config.c
 2018-02-03 06:03:04 -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
shahab SHARIAT BAGHERI 2c8dd796e8 Scheduler must send FlexRAN stats updates 2018-01-31 16:49:24 +01:00
Robert Schmidt 1576b7bd08 bugfix: max_rbs_allowed_slice is array over CC, not LCID 2018-01-31 16:49:24 +01:00
Robert Schmidt 6a6729bdac fix various compilaton errors due to merge 2018-01-31 16:48:29 +01:00
Robert Schmidt dfece3ff58 correct scheduler typedefs 2018-01-31 16:42:01 +01:00
Robert Schmidt 9b4d3bbae7 move scheduler function pointer typedef to proto.h 2018-01-31 16:42:01 +01:00
Robert Schmidt a03877e7f7 delete unnecessary code 2018-01-31 16:42:01 +01:00
Robert Schmidt 7dfac059b0 Review Navid: UL Scheduler: make slice aware 2018-01-31 16:42:01 +01:00
Robert Schmidt a6098dbf09 delete unnecessary FlexRAN source files 
all the FlexRAN scheduling code is now also handled by the general OAI
scheduling code
 2018-01-31 16:42:01 +01: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
Wang Tsu-Han 3efaa38394 adjustable thread structure 2018-01-26 18:05:17 +01: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
Raymond Knopp fe1912a193 correcting issues after merge with develop 2018-01-25 06:54:01 -08:00
Raymond Knopp 8b052dadd5 Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/RRC/LITE/rrc_UE.c
	openair2/RRC/LITE/rrc_common.c
	targets/SIMU/USER/oaisim_functions.c
 2018-01-25 00:00:24 -08:00
Raymond Knopp f8b0cd5bd4 Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair2/RRC/LITE/rrc_UE.c
 2018-01-24 23:36:39 -08:00