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
Raymond Knopp
246ee327fb
rework of configuration for eMTC/Sidelink. Removal of warnings introduced by eMTC code. Validation of configuration component for eMTC and regular LTE. Sidelink is still not configured.
2018-11-18 20:17:18 +01:00
Cedric Roux
d6ce682b56
Merge remote-tracking branch 'origin/issuePHR' into develop_integration_2018_w46
2018-11-12 11:03:04 +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
Cedric Roux
e46031fec7
Merge remote-tracking branch 'origin/T-tracer-macpdu2wireshark_w43' into develop_integration_2018_w44
2018-11-02 10:31:04 +01:00
Cedric Roux
e4b0b3a7d6
Merge remote-tracking branch 'origin/multi-ue-fix-w42' into develop_integration_2018_w44
2018-11-02 10:30:47 +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
Cedric Roux
35a7e3a180
T: macpdu2wireshark: add RA preamble and RAR tracing
2018-10-23 16:08:29 +02:00
Cedric Roux
fdb16fae7d
T: macpdu2wireshark: add SIBs tracing
...
Only schedule_SI is done, not schedule_SIB1_BR and not schedule_SI_BR.
2018-10-23 10:19:51 +02:00
Cedric Roux
075a713de9
hotfix: fix a problem with multiple UEs
...
The symptom: when two UEs do uplink traffic at the same time, the
eNB fails to decode data sometimes. This has been seen with FDD
and 50 RBs. This generates a cascade of other problems leading to
disconnection/reconnection events seen in the log.
The problem: there are probably many, but one obvious bug was found
while analyzing some logs. Scheduling in the same TTI one UE's uplink
traffic and random access (msg3) was done in the same RB.
This commit fixes this simple case. It is probably not the end of
the story.
This is a hotfix, that does not change the code much.
We need to use vrb_map_UL properly all over the places. Today is
not used, but this is the way to go (most probably).
2018-10-18 16:42:32 +02: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
Raphael Defosseux
bb566eaeb8
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w39
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-28 17:00:21 +02:00
Rajeev Gangula
753a664c06
Corrected PHR calculation.
2018-09-25 15:07:22 +02:00
Konstantinos Alexandris
67cc97a42c
Merge remote-tracking branch 'origin/develop' into x2
2018-09-21 16:01:52 +02:00
Konstantinos Alexandris
2c27a38dc3
x2ap: implement x2setuprequest, x2setupresponse, x2setupfailure
2018-09-21 15:58:36 +02:00
Wang Tsu-Han
3005929bca
modify threading option into config file
2018-09-11 18:50:11 +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
2c9be8c102
Merge remote-tracking branch 'origin/fix-nfapi-in-scheduler' into develop_integration_2018_w36
2018-09-07 16:08:09 +02:00
Cedric Roux
b0eff6c0a6
Merge remote-tracking branch 'origin/scheduler-small-fix' into develop_integration_2018_w36
2018-09-07 16:07:23 +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
Masayuki HARADA
c1359a103f
Fix wrong slice_allocation loop in fairRR scheduler
2018-09-06 19:03:05 +02:00
Cedric Roux
8534982afe
bugfix: check that we are manipulating the structure for the correct RNTI
...
The bug popped up when one UE was doing TCP UL iperf and a second UE
attempted to connect. A crash of the eNB happened because we changed
the wrong NFAPI structure in a TTI where both UEs are scheduled.
Something like that.
2018-09-06 16:42:10 +02:00
Robert Schmidt
7162bf6895
Bugfix: Assure available_rbs is positive
2018-09-05 14:21:39 +02:00
Robert Schmidt
066ab90402
Bugfix: Give correct first_rb value to UE
2018-09-05 14:21:39 +02:00
Robert Schmidt
d798e03e9d
fix rb_table loop
2018-09-05 14:21:39 +02:00
Robert Schmidt
ff83dc7017
Fix greedy allocation: schedule not more than what slice has
2018-09-05 14:21:39 +02:00
Robert Schmidt
af83d352c8
Fix: use frame_subframe2_dl_harq_pid()
2018-09-05 14:21:39 +02:00
Robert Schmidt
9f04614304
Remove huge comment from sort_UEs()
...
Commit 7823858e2d11e8cabc1ca7bf7f507b9a050942d3 introduced this as a comment.
2018-09-05 14:21:38 +02:00
Robert Schmidt
07ad2470d1
Remove warnings pre_processor_fairRR
2018-09-05 14:21:36 +02:00
Cedric Roux
6270d94f91
bugfix: use correct comparison
...
The comparison in AssertFatal was not correct,
taking the opposite meaning to the one expected.
2018-09-04 12:43:29 +02:00
Robert Schmidt
49b167d6ae
Remove warnings pre_processor
2018-09-03 18:10:28 +02:00
Robert Schmidt
e1a598bc8d
Fix function parameter definition/order
...
Affects:
* store_dlsch_buffer()
* assign_rbs_required()
2018-09-03 18:10:28 +02:00
Robert Schmidt
21983a2028
Patch fairRR scheduler to use slice iface of pre-processor
2018-09-03 18:10:28 +02:00
Robert Schmidt
71a9115abd
Iterate over actual number of CC, not NFAPI_CC_MAX
2018-09-03 18:10:28 +02:00
Navid Nikaein
6c4f58a0a0
move UE_list/slice init in dedicated functions
2018-09-03 18:10:28 +02:00
Robert Schmidt
0bb6a19f71
only initialize RC.mac once
2018-09-03 18:10:28 +02:00
Robert Schmidt
da35afb01b
fix: repair RC.mac memory allocation
...
- there can be a race between the FlexRAN agent reading the RC.mac and its
allocation in main.c
- In order to circumvent this, change the allocation by allocating
everything "into" a local variable
- finally "make it visible" by storing the pointer in RC.mac
2018-09-03 18:10:28 +02:00
Robert Schmidt
328a464e37
remove update_sched slice param variables
...
- whether a scheduler callback has to be changed is now handled by the agent
2018-09-03 18:10:28 +02:00
Robert Schmidt
766e8a5bbe
link to scheduler function in mac init fct
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
44d1eb8015
preprocessor reset: avoid unnecessary iterations
2018-09-03 18:10:28 +02:00
Robert Schmidt
fcaf237182
FlexRAN: Handle slice configuration
...
Incoming slice configuration changes are buffered in an intermediate structure.
The MAC scheduler periodically polls the agent about changes. If there has been
a slice configuration change, apply it.
2018-09-03 18:10:28 +02:00
Robert Schmidt
de4ebe0914
remove warnings (comment concerned lines)
2018-09-03 18:10:28 +02:00