Florian Kaltenberger
32eb84f120
Merge branch '375-syrtem-sdr-platform' into 'develop-nr'
...
Resolve "syrtem-sdr-platform"
See merge request oai/openairinterface5g!450
2018-11-23 11:56:27 +01:00
frobinet
c73a922c8d
SYRTEM SDR platform :
...
- remove size limitation of 307200 in trx_read_func (SYRIQ library)
- update to new openair0 interface (./targets/ARCH/COMMON/common_lib.h)
- add gNB band22 configuration file (./targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf)
please read ./targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme for more details
2018-11-16 15:40:32 +01:00
Florian Kaltenberger
e2fceb52e7
adding nr_dlsim (doing pdcch for the moment only)
2018-11-15 22:25:53 +01:00
WANG Tsu-Han
b6dc14f4e8
adding config file for 80MHz
2018-11-09 16:52:43 +01:00
Wang Tsu-Han
aa232879a3
adding VCD log in file
2018-11-06 15:15:56 +01:00
Florian Kaltenberger
aff8b57cce
adding support for N300 to gNB config
2018-10-25 04:28:24 -07:00
Florian Kaltenberger
83e9908adb
merging develop with develop-nr
2018-10-25 03:15:09 -07:00
Raphael Defosseux
d254f5b522
Merge branch 'feature-s1-flex' into develop_integration_2018_w_41
...
Introduction of S1-flex. It handles multiple PLMN IDs (up to 6) in the SIB as well as the selection of an MME based on the selected PLMN identity.
Major impact: changes on the eNB configuration files:
tracking_area_code = 1;
plmn_list = (
{ mcc = 208; mnc = 94; mnc_length = 2; },
{ mcc = 208; mnc = 95; mnc_length = 2; }
)
See https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/s1-flex-conf-nnsf for more details.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-10-11 15:57:36 +02:00
yilmazt
97c65436f6
Merge branch 'nr_pdcch' into develop-nr
2018-10-11 15:37:50 +02:00
Robert Schmidt
ee048120c4
Change remaining config files to plmn_list style
2018-09-28 17:40:37 +02:00
Robert Schmidt
f1cc914d4e
Change configuration to match new format
2018-09-28 11:46:11 +02:00
Wang Tsu-Han
d7fd3013a1
config file adding parallel configuration
2018-09-12 10:49:57 +02:00
Wang Tsu-Han
3005929bca
modify threading option into config file
2018-09-11 18:50:11 +02:00
Florian Kaltenberger
cc002b823f
Merge branch 'develop-nr-merge' into develop-nr
...
lte-softmodem, lte-uesoftmodem, nr-softmodem, nr-uesoftmodem, polartest, ldpctest, ulsim, dlsim all compile
functionality and performance to be tested by CI
2018-08-30 07:08:26 -07:00
WEI-TAI CHEN
a14450d2ac
fix segmentation fault
2018-08-28 04:23:27 -07:00
Raymond Knopp
b93b7073ca
Merge remote-tracking branch 'origin/develop' into develop-nr
...
Conflicts:
ci-scripts/Jenkinsfile-gitlab
ci-scripts/buildOnVM.sh
ci-scripts/checkCodingFormattingRules.sh
ci-scripts/createVM.sh
ci-scripts/destroyAllRunningVM.sh
ci-scripts/reportBuildLocally.sh
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
cmake_targets/tools/build_helper
common/utils/LOG/log.h
openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
openair1/PHY/TOOLS/file_output.c
openair1/PHY/TOOLS/lte_dfts.c
openair1/PHY/TOOLS/tools_defs.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/COMMON/platform_constants.h
openair2/COMMON/platform_types.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/main.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/UTIL/LOG/log.c
openair3/S1AP/s1ap_common.h
openair3/S1AP/s1ap_eNB.c
openair3/S1AP/s1ap_eNB_context_management_procedures.c
openair3/S1AP/s1ap_eNB_decoder.c
openair3/S1AP/s1ap_eNB_decoder.h
openair3/S1AP/s1ap_eNB_handlers.c
openair3/S1AP/s1ap_eNB_nas_procedures.c
openair3/S1AP/s1ap_eNB_overload.c
openair3/S1AP/s1ap_eNB_trace.c
openair3/TEST/EPC_TEST/play_scenario_decode.c
openair3/TEST/EPC_TEST/play_scenario_s1ap.c
openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
targets/COMMON/openairinterface5g_limits.h
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
targets/RT/USER/lte-ran.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ue.c
targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
Konstantinos Alexandris
3b3b971807
minor fixes for x2 + modify conf files
...
The configuration file has now to contain ENB_IPV4_ADDRESS_FOR_X2C and
ENB_PORT_FOR_X2C in the NETWORK_INTERFACES section.
For example:
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
2018-08-23 16:15:14 +02:00
WEI-TAI CHEN
4dd74fbd9c
Upata the loss config
2018-08-08 16:15:40 -07:00
WEI-TAI CHEN
9b7143ca86
merge develop
2018-08-05 06:19:32 -07:00
Guy De Souza
859aa1d28c
Initial BWP config
2018-08-03 11:27:08 +02:00
WEI-TAI CHEN
307b763b8d
-Uppdate RRC ASN1 Version to 38331-f21
...
But NR-RRC-Definitions.asn file only include the NR-RRC-Definitions DEFINITIONS section
If we include the NR-UE-Variables into asn file, it will can't be compile in asn tool
and also some of implict problem for new version asn file
2018-08-02 06:39:55 -07:00
Wang Tsu-Han
d45fcd6fc2
Merge branch 'develop' into parallel-phy-test-EMUFH
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
openair3/S1AP/MESSAGES/ASN1/R8/s1ap-8.10.0.asn1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/rfsim.h
2018-07-30 11:42:34 +02:00
Wang Tsu-Han
aa00a4734a
reset for remerging
2018-07-30 11:24:08 +02:00
Raymond Knopp
230acb9e88
fixes to ulsim/dlsim and system simulator after merge
2018-07-06 07:42:57 +02:00
Raymond Knopp
934373e1d9
bugfix in dci_tools_ue.c (check_format1_1a_coherency issue)
2018-06-29 15:31:23 -07:00
Raymond Knopp
5a808cb1ca
Merge branch 'develop' into enhancement-rfsim
...
Conflicts:
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/RRC/LTE/rrc_UE.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:54:15 -07:00
Raymond Knopp
ecfad451d8
added sample TDD configuration files
2018-06-28 14:45:50 -07:00
Raymond Knopp
27892e0935
Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
...
Conflicts:
cmake_targets/build_oai
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:44:47 -07:00
WEI-TAI CHEN
f767dea2a0
close GTP-U
2018-06-28 01:21:19 -07:00
WEI-TAI CHEN
f701c02fdd
Add Log for NR
2018-06-27 01:53:37 -07:00
WEI-TAI CHEN
89e39c8851
-Solve segmentation fault in do_MIB_NR
...
-Amend do_ServingCellConfigCommon function
2018-06-26 08:11:39 -07:00
Cedric Roux
d789166d4c
hotfix: disable phy_test_mode in default configuration file
2018-06-26 10:49:22 +02:00
WEI-TAI CHEN
302aea2f15
Amend gNB L1 inst to NR
2018-06-25 03:58:15 -07:00
WEI-TAI CHEN
041a7517b2
- Amend P5 interface structure to more like FAPI style in LTE
...
- Create PDCCH structre in FAPI, it will be one of P7 structure
- Maintain Configuration Module
2018-06-21 04:34:44 -07:00
Cedric Roux
45cf2e1b8b
set pucch_n1_AN to 0
...
Same idea as commit cce51f69bc .
2018-06-19 11:33:57 +02:00
Cedric Roux
0c445bedda
Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop
2018-06-18 16:25:48 +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
Wang Tsu-Han
0b405e3d2b
throughput fix for sdu and config file change back to 93
2018-06-15 12:14:34 +02:00
Cedric Roux
cce51f69bc
set value of pucch_n1_AN to 0 everywhere by default
...
Since now pucch_n1_AN is taken from the configuration file,
it has to be set to 0. Value 32 will not work well, at least
in FDD. This has to be handled properly at some point
(do not use uplink resource blocks used by PUCCH for PUSCH).
2018-06-14 16:51:53 +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
Wang Tsu-Han
e4a7318877
Merge branch 'develop' into parallel-phy-test-EMUFH
...
Conflicts:
openair1/PHY/defs_eNB.h
targets/RT/USER/lte-enb.c
2018-06-12 16:18:45 +02:00
Wang Tsu-Han
0915a0e66b
fixes for frequency adjustment at 20MHz and disableing decoding worker
2018-06-12 15:53:15 +02:00
bruno mongazon
acbd1f1f7d
fix issue 310 IQrecplay
2018-06-04 13:05:13 +02:00
Raymond Knopp
293110e2cc
cleanup of warnings and default parameters for simulator target
2018-06-03 08:48:42 +02:00
Raymond Knopp
897de9f8e2
testing of rf simulation in UE
2018-06-02 10:10:35 -07:00
WEI-TAI CHEN
5b94aeac77
Merge nr_initialsync
2018-05-29 03:13:08 -07: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
WEI-TAI CHEN
e9ce528ed7
Modified and fixed common config
2018-05-28 04:52:39 -07:00
WEI-TAI CHEN
6c1c711e08
1. NR gNB Application use ITTI transmit config. to RRC
...
2.NR RRC do_SERVINGCELLCONFIGCOMMON for all of common config. will be transmit to lower layer by rrc_mac_config_req_gNB"
2018-05-18 08:00:30 -07:00
Cedric Roux
68479fa4f8
Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19
...
Status so far:
- monolithic eNB compiles and is functional with 1 UE in FDD, 5/10/20MHz.
For 20MHz we don't have a nice TCP downlink (on haswell).
- oaisim does not compile
- UE does not compile
- phy simulators don't compile
- many new warnings
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/SCHED/pusch_pc.c
openair1/SCHED/sched_common.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_mch.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/ra_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_defs.h
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-ue.c
2018-05-14 16:28:04 +02:00