Javier Morgade
3056343c5b
Remove test code before CI
2019-05-18 16:11:55 +02:00
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +02:00
Louis Adrien Dufrene
5ae494e974
merge from develop
2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene
d7cddc2825
Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate
2019-04-15 10:57:39 +02:00
Louis Adrien Dufrene
4c931888e6
Add dci0_ongoing_timer. Commit to build and test.
2019-04-15 08:54:00 +02:00
frtabu
30b7c973e0
merge nfapi_cleanup
2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene
ca11800087
Cleanup of eNB_scheduler.c
2019-04-05 08:14:27 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
Robert Schmidt
024007716a
Check type of node using NODE_IS_CU/DU/MONOLITHIC macros
2019-03-26 13:15:02 +01:00
Robert Schmidt
1f590efe2b
Merge branch 'develop' into feature-127-protocol-split
2019-03-19 14:49:07 +01:00
OAI-admin
c22f10aa72
Add PHR/BSR to RRCConnectionSetup + add some debug for DLSCH scheduling
2019-02-26 12:44:59 +01:00
Louis Adrien Dufrene
9b9ef32a20
Fix RRC version variable to allow dlsch scheduling for eMTC
2019-02-26 11:04:55 +01:00
nepes
b28b14411e
modifications for LTE-M testing
2019-02-25 13:29:43 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Javier Morgade
46a8c83b6c
UE procedures for FeMBMS SIB1-MBMS (SystemInformationBlockType1-MBMS message)
...
-- asn1 dissectors ETSI TS 136 331 V14.2.2 (2017-05)
-- schedule_SI_MBMS
-- ue_decode_si_mbms
2019-02-14 15:35:00 +01:00
haswell
023b6ebc29
testing LTE-M configuration
2019-01-19 16:02:59 +01:00
Robert Schmidt
7df8257526
F1AP: when UL_sync failure, send UEContextRelReq
...
When a phone loses connection, it should not simply be removed but first
CU should be informed which will send a ContextRelCmd. Correspondingly,
when the RRC releases the UE, it does not send a UE Context Release Req
2019-01-18 16:44:01 +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
552bd6979d
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair2/RRC/LTE/MESSAGES/asn1_msg.c
2018-11-26 23:01:47 +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
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
Robert Schmidt
328448e875
Remove flexran_agent_send_update_stats() which is unnecessary
2018-11-07 10:54:34 +01:00
Robert Schmidt
5e0088fa52
Simplify RRC FlexRAN agent interface
2018-11-07 10:40:17 +01:00
frtabu
18ec5d8047
abort execution when an unknown option is passed via the command line: add config_check_cmdlineopt API to config module, create lte-softmodem-common.c source to remove duplicate code in lte-softmodem.c and lte-uesoftmodem.c, fix segfaults in exec_function of lte-uesoftmodem
2018-11-02 18:17:11 +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
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
Rajeev Gangula
9f6d466fff
Uncommemnt rrc_mac remove function.
2018-08-27 14:43:32 +02:00
frtabu
b85cbddeec
log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common
2018-07-30 20:07:22 +02:00
oai
bfecc0110b
Remove compilation warnings, also fix telnet server compilation failure and NB-IoT shared lib compilation failure introduced when reviewing L1 sources organization
2018-07-05 17:37:38 +02:00
bruno mongazon
b016bc229a
fixed #320 issue
2018-06-25 18:23:36 +02:00
Cedric Roux
2f639e45b6
Merge remote-tracking branch 'origin/ulSNRs' into develop
...
Conflicts:
openair2/ENB_APP/MACRLC_paramdef.h
openair2/LAYER2/MAC/mac.h
2018-06-18 16:01:25 +02:00
Cedric Roux
5c6ad3142d
Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
...
The monolithic eNodeB is not fully functional in FDD.
The TDD mode has not been tested.
Do not consider this commit as functional.
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/pusch_pc.c
openair2/COMMON/platform_types.h
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/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.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/flexran_agent_scheduler_dlsch_ue.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc_rrc.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
openair2/UTIL/LOG/log.h
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
sharma
3c1c5a1508
merge in changes from local copy which were made just prior to Orange Research Day demonstration
2018-06-04 08:15:16 +02:00
Rajeev Gangula
c5c66eeb4a
Merge branch 'develop' into ulSNRs
...
Conflicts:
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/mac.h
2018-05-29 09:50:05 +02:00
Cedric Roux
ed49592754
integration fix: remove warnings
...
Remove warnings popping up on:
./build_oai --eNB -w USRP
Maybe not always the best solution.
2018-05-24 17:15:42 +02:00
Masayuki HARADA
f55bd83d55
select scheduler by config file
2018-05-17 18:27:09 +09:00
Masayuki HARADA
677ad4298c
Devide source file of scheduler
2018-05-17 10:48:39 +09:00
Cedric Roux
343bbbac68
Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/print_stats.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/sched_common.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.c
openair2/PHY_INTERFACE/defs.h
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
targets/SIMU/USER/oaisim_functions.c
2018-05-15 17:43:12 +02:00
Masayuki HARADA
de1996ec3e
change compile option from UE_EXPANSION to UE_EXPANSION,PHY_TX_THREAD,PRE_SCD_THREAD.
2018-05-15 17:37:43 +09:00
Rajeev Gangula
dc9b0fa53a
Added uplink channels SNR in config file.
2018-05-09 15:55:36 +02:00
Raymond Knopp
ea784f2b4b
full IF4p5 simulation working
2018-04-29 09:35:23 -07:00
Raymond Knopp
83b2f1c01c
Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/mac.h
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-softmodem.h
2018-04-23 23:08:10 -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
Bi-Ruei, Chiu
5c23af773a
Compare version number using MAKE_VERSION macro to provide better SW configuration:
...
1. Previous SW configuration for different RRC version relies on whether macro Rel10,
Rel14 defined or not by checking #ifdef Rel14 or #if defined(Rel10) || defined(R14).
Whenever there is a newer RRC version, e.g. Rel15, it will be very a tedious and
error-prone job to add defined(Rel15) in every place.
2. Some RRC messages are defined in release 13 instead of release 14, NB-IoT
feature is one of such example. Our code shall reflect this fact instead of using
an afterward version number in software configuration.
3. Some RRC messages or some fields of certain RRC messages are added in the middle
a release, e.g. SystemInformationBlockType1_v1310_IEs_t defined in RRC 13.1.0
and RRC 9.2.0 made some changes to SIB12 and SIB13 so we have sib12_v920 and
sib13_v920 fields in SIB12 and SIB13's struct.
We need a finer grain of control when using ASN1 from different RRC version.
4. S1AP also has this problem that it use UPDATE_RELEASE_9 and UPDATE_RELEASE_10 to
differentiate between various S1AP version.
This commit propose using MAKE_VERSION(x,y,z) to designate the version number and
modify current conditional compilation accordingly.
Note: 2018/04/16, Modified based on Cedric's comment.
2018-04-16 12:32:29 +02:00
Cedric Roux
1f446432f6
Merge remote-tracking branch 'origin/develop-simL1-fixes' into develop_integration_2018_w15
2018-04-11 15:15:54 +02:00
Raymond Knopp
0ab2b2b261
modifications for simulator : power normalizations for UE TX, small changes to SNR targets for power control, default UE power (23 dBm now)
2018-04-06 10:27:23 -07:00
Raymond Knopp
be816fab6f
Merge branch 'develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
2018-04-06 15:12:46 +02:00
Cedric Roux
5fdc3077db
disable U-plane inactivity timer.
...
It is annoying and does not seem to work properly.
To be checked/reworked if needed.
Keep in mind that we also want oaisim to be functional.
2018-03-23 10:42:30 +01:00
Raymond Knopp
b2cc1252c6
Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
...
Conflicts:
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
targets/ARCH/COMMON/common_lib.c
targets/COMMON/create_tasks.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.h
2018-03-12 12:10:48 +01:00