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
Robert Schmidt
fcddbc2b44
RAN API: add functions using UE_Capability
...
- flexran_get_half_duplex()
- flexran_get_intra_sf_hopping()
- flexran_get_type2_sb_1()
- flexran_get_ue_category()
- flexran_get_res_alloc_type1()
2018-01-31 16:49:24 +01:00
Robert Schmidt
6eeb257717
add UE_Capability to type eNB_RRC_UE_t and read it when received
2018-01-31 16:49:24 +01:00
Robert Schmidt
dd7d2ef63b
Navid: revise RRC
2018-01-31 16:49:24 +01:00
Robert Schmidt
e669f83dc1
Navid: revise RAN API
2018-01-31 16:49:24 +01:00
Robert Schmidt
6dcac9234c
Navid: revise FlexRAN
2018-01-31 16:49:24 +01:00
shahab SHARIAT BAGHERI
2c8dd796e8
Scheduler must send FlexRAN stats updates
2018-01-31 16:49:24 +01:00
Robert Schmidt
d5b8310fb9
add some logging for RRM command parsing
2018-01-31 16:49:24 +01:00
Robert Schmidt
3f043c7d73
FlexRAN: implement possibilty to await a configuration
...
Through configuration, the lte-softmodem can be halted to await a
reconfiguration from the lte-softmodem. A mutex and condition variable are used
to implement this.
Furthermore, the dependance of lte-softmodem.c on FlexRAN has been reduced to
one include and the flexran_agent_start() call.
2018-01-31 16:49:24 +01:00
Robert Schmidt
811ada2429
soft-restart (i.e. only layers PHY-RRC) the lte-softmodem
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
6179d9d748
Navid: fix access to non-existent harq_pid_* variables via RC read
2018-01-31 16:49:01 +01:00
Robert Schmidt
356d406cff
Navid: remove FlexRAN Agent MAC xface function callbacks for scheduling
2018-01-31 16:48:37 +01:00
Robert Schmidt
3740afecc7
consider changed RAN API
2018-01-31 16:48:36 +01:00
Robert Schmidt
56d4d0ebef
Bugfix: avoid cyclic header dependency, use FlexRAN variables instead
2018-01-31 16:48:36 +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
024904db90
repair enb_app.c after merge, delete unnecessary code
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
Robert Schmidt
b45a340b63
RAN API: no set_RC_vars(), check use RC directly, give error messages
2018-01-31 16:42:01 +01:00
Robert Schmidt
cdbf65f5af
revise RAN API
...
- when changing values RC.rrc[i]->configuration should be changed too
- then, RRC_RECONFIGURATION_REQ will pass the changed conf down until PHY
- give warnings at functions that are not implemented
- rename functions
flexran_get_tdd_ack_nack_feedback() -> flexran_get_tdd_ack_nack_feedback_mode()
flexran_get_ue_pmi() -> flexran_get_ue_wpmi()
2018-01-31 16:41:56 +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
Raymond Knopp
866a23a136
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2018-01-24 23:25:16 -08:00