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
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
Robert Schmidt
cbc78cd3db
Don't warn of ignoring sorting
2018-09-05 14:21:39 +02:00
Robert Schmidt
08b122e3ff
FlexRAN: update slice config array dimensions
2018-09-03 18:10:28 +02:00
Robert Schmidt
cca5c1b71a
FlexRAN: use correct identifiers for PDCP, RRC
...
* give the correct UE_id instead an index of the protobuf message (they can
diverge from each other)
* in the PDCP part of the RAN API, the RAN API has to make the conversion UE_id
(MAC) to UID (PDCP)
* a follow up commit could clean up the interfaces:
- the MAC functions take the UE_id
- the RRC functions take the RNTI
- the PDCP functions take the UID
this would mean the caller has to find those ID but would decrease
computations since the RAN API functions do not have to do that themselves
2018-09-03 18:10:28 +02:00
Robert Schmidt
3b80c73f93
FlexRAN: Loop over UEs using UE_id, not index
2018-09-03 18:10:28 +02:00
Robert Schmidt
9399bed23a
FlexRAN MAC: align allocated memory for lfds
2018-09-03 18:10:28 +02:00
Robert Schmidt
ef0d86564c
when sending config report, copy slice config to new mem
2018-09-03 18:10:28 +02:00
Robert Schmidt
7a0c00330b
put intra-/inter slice sharing within slice config
2018-09-03 18:10:28 +02:00
Robert Schmidt
44481a5649
FlexRAN: improve info messages
2018-09-03 18:10:28 +02:00
Robert Schmidt
472ebf5622
mark UL slice sorting overwriting as TODO
2018-09-03 18:10:28 +02:00
Robert Schmidt
e94b0bde51
FlexRAN fixes
...
* properly allocate memory for scheduler name/sorting
* free mem of sc_update, include todo for slice_config
* set has_x to one, add fct whether sorting update necessary
* set n_ul/n_dl to correct value after every loop iteration
* support for delete of multiple slices
* allocate memory for scheduler name in slice_config
* check that we really set the scheduler
2018-09-03 18:10:28 +02:00
Robert Schmidt
0c0e7b6ead
simplify control flow
2018-09-03 18:10:28 +02:00
Robert Schmidt
bd041a34aa
use changed RAN API, set scheduler for new slice
2018-09-03 18:10:28 +02:00
Robert Schmidt
6e5a2f45ce
FlexRAN: set deleted slice configuration to zero
2018-09-03 18:10:28 +02:00
Robert Schmidt
8804319322
FlexRAN MAC: before verifying slice params, set default vals
...
- in order to facilitate the steps as verification and parameter setting,
slices are "filled up" with default values:
* if it is an update, with the values of the concerned slice
* if it is a new one, with the parameters of slice 0
- because of this, it can be assumed that all slices have all parameters
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
5ceba4a2a6
FlexRAN: lock sc_update with mutex
...
Prevent sc_update from being changed by an incoming slice reconfiguration
change while writing data to the scheduler
2018-09-03 18:10:28 +02:00
Robert Schmidt
92a3b07bca
FlexRAN: send slice ID to which UE belongs + reformat
...
- flexran_agent_ue_config_reply() and flexran_agent_ue_state_change() send
slice_id
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
frtabu
24f8fcf346
Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements
2018-08-24 17:43:14 +02:00
frtabu
30509955c2
remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX
2018-07-30 20:07:22 +02:00
Raymond Knopp
ea784f2b4b
full IF4p5 simulation working
2018-04-29 09:35:23 -07:00
Raymond Knopp
861d06e855
UE directory splits, creation of UE-specific files, common UE/eNB files and extraction of UE/common components from eNodeB files. renaming of files to minimize common names across directories (i.e. defs.h, vars.h, extern.h)
2018-04-22 11:33:43 -07:00
Cedric Roux
92bb82eb2b
integration fix: fix license version to 1.1
2018-03-09 16:40:09 +01:00
Robert Schmidt
4924b18ebd
FlexRAN: send RNTI in protobuf mac_stats_reply message
2018-03-02 17:36:43 +01:00
Robert Schmidt
7d8d1588c3
remove unnecessary function declaration
...
has been introduced in commit 365ca71a4a
2018-03-01 09:04:41 +01:00
Cedric Roux
365ca71a4a
remove compilation warnings
2018-02-22 15:03:45 +01:00
Cedric Roux
8ca5fb4ef2
integration: cleanup
...
- remove spaces at the end of lines
- remove useless dead code
use: git show -p <this commit> -w
to see it clearly
2018-02-22 15:03:09 +01:00
shahab SHARIAT BAGHERI
9a9c867a75
additional Mac stats and Improvements
2018-02-20 15:09:24 +01:00
Robert Schmidt
12ac8b180d
prevent warnings: init Protocol__FlexHeader to NULL
2018-02-13 14:29:15 +01:00
Robert Schmidt
cf0a5ca920
fix RAN API due to merge + repair functions
2018-02-12 13:50:48 +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
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
fac968246d
define FlexRAN data in RAN context and use it
...
- defines RCconfig data structures
- adds method to read data
- use it in source files
2018-01-24 11:51:35 +01:00
Robert Schmidt
78dd80b086
Merge branch 'feature-68-enb-agent' into feature-merge-f68
...
Try to merge feature-68-enb-agent into develop
develop should be fast-forwarded later to this branch to complete the merge
This code does not compile yet. Among other things:
- the scheduler structure needs to be reworked for FlexRAN
- the config is structured differently. The files enb_config.{c,h} from develop
have been copied in here, the files with merge annotations are in
enb_config.{c,h}.before_merge
- the restart needs to be restructured, since the PHY vars data structure lives
in RC now
2018-01-24 11:47:28 +01:00
shahab SHARIAT BAGHERI
b1acde2007
Neighbouring cell RRC measurement + decrease warning
2017-12-21 13:55:37 +01:00
Navid Nikaein
d35f52a228
Add observation window to the PDCP stats
2017-12-14 15:15:00 +01:00
Navid Nikaein
33696a4e93
*Update RRC RSRP/RSRQ measurement reports for multiple UEs, and add the corresponding RAN APIs
...
*Fix the issue with the PDCP UE ID/RNTI management
2017-12-12 20:24:29 +01:00
Navid Nikaein
b7a1661855
Better management of frame counter and stats in PDCP
2017-12-12 11:57:24 +01:00
shahab
5e20c970e9
warning decreasing
2017-12-09 17:41:06 +01:00
Navid Nikaein
dc9cada6c2
Add PDCP stats and update agent and RAN APIs
2017-12-08 18:05:42 +01:00
Raymond Knopp
51a9107c14
Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
...
Conflicts:
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
targets/RT/USER/lte-ru.c
2017-10-25 00:40:20 +02:00
Cedric Roux
1b1f941e3c
upgrade license to version 1.1
2017-10-23 12:22:13 +02:00
khalidhamdy
d847f3cad5
solving some errors
2017-08-14 11:04:50 +02:00
shahab SHARIAT BAGHERI
4d3689a56c
warning reducing
2017-08-09 13:42:50 +02:00