Louis Adrien Dufrene
5ae494e974
merge from develop
2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene
3406634b6b
This is version 1.0. To test. Cleanup of phy_procedures_lte_eNb.c eNB_scheduler_dlsch.c eNB_scheduler_ulsch.c pre_processor.c and asn1_msg.c
2019-04-10 08:48:37 +02:00
frtabu
30b7c973e0
merge nfapi_cleanup
2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
Robert Schmidt
1f590efe2b
Merge branch 'develop' into feature-127-protocol-split
2019-03-19 14:49:07 +01:00
Raphael Defosseux
2fcd4fcec1
Fixing error in LTE-M MAC scheduling
2019-03-18 11:40:38 +01:00
nepes
1d2ee01b6c
removal of logs
2019-02-28 18:28:35 +01:00
OAI-admin
c22f10aa72
Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling
2019-02-26 12:44:59 +01:00
Robert Schmidt
544d80c40d
Merge branch 'develop' into feature-127-protocol-split
2019-02-25 18:06:35 +01:00
Louis Adrien Dufrene
cddba97c21
remove CDRX related stuff
2019-02-25 10:03:19 +01:00
Louis Adrien Dufrene
55460eafe1
some format for eMTC schedulers
2019-02-25 09:45:58 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Louis Adrien Dufrene
db51a61c2e
Fix to remove cppcheck warnings
2019-02-19 07:56:32 +01:00
Louis Adrien Dufrene
c7bce0f8d7
Merge from develop
2019-02-13 09:01:51 +01:00
Stefan
1074a2cdc7
forme eNB_scheduler_dlsch
2019-01-23 16:22:55 +01:00
Stefan
485e83f9e6
modif scheduler_dlsch + primitives
2019-01-23 08:50:59 +01:00
Stefan
151873e987
pre_processor improvements
2019-01-18 17:04:57 +01:00
Cedric Roux
aea6b4b5a6
fix a lot of file mode
...
For whatever reason most of the files had their permission
changed from 644 to 755, which is not wanted.
2019-01-07 16:22:28 +01:00
Raymond Knopp
44a225c6b7
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
targets/RT/USER/lte-enb.c
2019-01-05 23:28:31 +01:00
Louis Adrien Dufrene
ed61d774f6
add test on ue_context
2018-11-21 17:03:52 +01:00
Raymond Knopp
7900864fe4
testing after integration of eMTC
2018-11-19 18:01:36 +01:00
Raymond Knopp
7474b69c29
added missing files. updates for testing in eMTC configuration after merge.
2018-11-19 09:26:03 +01:00
Raymond Knopp
6266d5c389
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Louis Adrien Dufrene
700437f184
astyle applied
2018-11-16 08:49:28 +01:00
Louis Adrien Dufrene
9a080adec5
RRC inactivity timer: first commit to DRX_master
2018-11-13 14:20:16 +01:00
Louis Adrien Dufrene
961a70a04e
Fusion wasn't ok, needed some modifications
2018-11-13 11:20:14 +01:00
Louis Adrien Dufrene
a409614185
Merge develop done, conflicts resolved
2018-11-13 10:49:20 +01:00
Louis Adrien Dufrene
287010f82f
RRC timer: last format done. Timer reset in scheduling of DTCH (DL/UL). Commit to test.
2018-11-13 10:21:38 +01:00
Louis Adrien Dufrene
76e1636258
RRC timer reset in scheduler: format of some functions before first test
2018-11-12 17:38:19 +01:00
Robert Schmidt
397d2f4815
Merge commit 'develop' into feature-127-protocol-split
...
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Raymond Knopp
f8d7ce3276
regular LTE functional (simulation)
2018-11-07 00:37:40 +01:00
Raymond Knopp
b27ed63fa9
lte-softmodem compiles, many memory faults during configuration ...
2018-11-03 22:51:24 +01:00
Raymond Knopp
d24f521a5a
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/print_stats.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/rar_tools.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/PHY_INTERFACE/IF_Module.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface_ue.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
2018-10-29 07:54:17 +01:00
Bi-Ruei, Chiu
f58ad3c39f
Add prefix LTE_ to LTE-RRC generated data types by ASN1C_PREFIX=LTE_
...
1. Modify all expressions using original LTE-RRC data types for new generated ones
2. Does not change any program logic
2018-10-17 15:46:12 +08:00
Raymond Knopp
eedc4226f0
modifications for SRB0 to allow multiple UE contexts in case of delayed CCCH reception in CU/DU split (moved SRB0 from carrier to UE context)
2018-09-15 22:42:10 +02:00
Cedric Roux
82ab88f546
integration fix: add missing break
...
This break was there and went away, for whatever reason...
2018-09-07 17:24:37 +02:00
Cedric Roux
2cb87ddd02
Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
...
Conflicts:
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Cedric Roux
cbdc8f662a
Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36
2018-09-07 16:04:05 +02:00
Robert Schmidt
71a9115abd
Iterate over actual number of CC, not NFAPI_CC_MAX
2018-09-03 18:10:28 +02:00
Robert Schmidt
21f6609472
FlexRAN: move slice param verification to agent
...
- until now, on every iteration, the scheduler checked for changed parameter
(and verified some)
- this functionality moves to the FlexRAN Agent, which verifies all parameters
* individually, e.g. Max MCS <= 28 for DL
* group-based, e.g. the sum of slice percentages is <= 100
- slice configuration changes are only applied if all verifications pass
- it is assumed in the scheduler, that configuration passed from outside is
correct and can be used "as-is"
fix accounting setting
2018-09-03 18:10:28 +02:00
Robert Schmidt
6b3dd8716b
FlexRAN: set values of removed slices to 0
2018-09-03 18:10:28 +02:00
Robert Schmidt
088b1d5a8d
refine MAC Debug output
...
- uncomment "Couldn't find RNTI for UE X" in UE_RNTI() and rb_alloc in
pre_processor_reset() as they only inflate the debug output with little
benefited
- "doing ue_schedule_spec" is now displayed for individual UEs (and individual
CCs)
- show messages when not scheduling UE in ue_schedule_spec() due to invalid
slice or if not in RRC_CONNECTED
2018-09-03 18:10:28 +02:00
Robert Schmidt
11e45be9c5
fix: resort UE_list after slice multiplexing
...
- slice multiplexing resorts UE_list for its purposes with restoring the
original order
- in order to keep the order in UE_list, resort to original order after
multiplexing
- ideally, this would happen in the multiplexing but currently, the slice_idx
is not passed to multiplexing (it does not care), so this cannot be done ATM
2018-09-03 18:10:28 +02:00
Robert Schmidt
8039cd40f5
share the allocation array rballoc_sub between slices
2018-09-03 18:10:28 +02:00
Robert Schmidt
de4ebe0914
remove warnings (comment concerned lines)
2018-09-03 18:10:28 +02:00
Robert Schmidt
b29e20d4dd
MAC sched slicing: sort only relevant slices
2018-09-03 18:10:28 +02:00
Robert Schmidt
59fc7832fa
bugfixes: set max UL MCS to 20, improve sched loading message
2018-09-03 18:10:28 +02:00
Robert Schmidt
8f2d79709e
MAC: change all slice_id_t to slice index variables
2018-09-03 18:10:28 +02:00
Robert Schmidt
568bf8ae35
bugfix: deactive slice_counter
...
slice_counter had a wrong condition, not scheduling in DLSCH if the number of
slices is greater than one
2018-09-03 18:10:28 +02:00
Robert Schmidt
048c4d29a2
add slice association in UE_list, test against it in slice_membership()
2018-09-03 18:10:28 +02:00