Commit Graph
287 Commits
Author SHA1 Message Date
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 7462e43c02 merge develop-nr 2018-08-29 04:38:46 -07:00
WEI-TAI CHEN dee115da18 Change the dl/ul_channel_bandwidth to dl/ul_carrier_bandwidth 2018-08-29 04:31:10 -07:00
Raymond Knopp 2932d172a5 dlsim and ulsim are functional 2018-08-25 21:09:58 +02: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
hongzhi wang 0c22058d5e ue bug fix and workaround for pdcch test 2018-08-22 17:18:14 +02:00
Hongzhi Wang 25a136afca ue adding pdsch procedure 2018-08-16 15:01:16 +02:00
hongzhi wang cb6c7824ee ue improve sync stability 2018-08-09 12:22:06 +02:00
Cedric Roux 43ffecb1a1 remove warnings 2018-08-07 09:53:57 +02:00
WEI-TAI CHEN 9b7143ca86 merge develop 2018-08-05 06:19:32 -07:00
Cedric Roux 409b3d5c20 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w31 2018-08-03 09:45:26 +02:00
Cedric Roux 50815ab6bf Merge remote-tracking branch 'origin/issue332-dft-initializations' into develop_integration_2018_w31 2018-08-03 09:45:11 +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
Wang Tsu-Han aa00a4734a reset for remerging 2018-07-30 11:24:08 +02:00
Calvin HSU 94d14b4325 CMake: modify nr-uesoftmodem compiling target libraries
NR_LTE_UE_REUSE_LIB: set of files need to be update from LTE to NR version.
2018-07-27 18:26:34 +02:00
Raymond Knopp a787da5d83 Merge remote-tracking branch 'origin/develop' into issue332-dft-initializations 2018-07-27 09:01:38 +02:00
Raymond Knopp 76f15d6249 testing with dlsim 2018-07-22 21:00:41 +02:00
WEI-TAI CHEN b0bc5e65e2 merge develop-nr 2018-07-10 08:57:08 -07:00
WEI-TAI CHEN f95989e7e2 Adding function NR_UL_indication 2018-07-10 07:02:07 -07:00
Guy De Souza bedee9e37c RRC branch merge fix 2018-07-10 14:50:16 +02:00
WEI-TAI CHEN b7de9abb04 merge nr-develop 2018-07-10 01:45:04 -07:00
Guy De Souza 89d0971d31 PBCH payload interleaving 2018-07-09 14:59:45 +02:00
Raymond Knopp 494348e2f0 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-07-06 06:24:31 +02:00
Raphael Defosseux 21fd147cd8 Merge branch '312-minor-modifications-to-crc-code' into 'develop'
Resolve "Minor modifications to CRC code"

See merge request oai/openairinterface5g!319
2018-07-03 14:45:24 +02:00
WEI-TAI CHEN b3f68c7203 Solve the conflicting types 2018-07-03 03:33:18 -07:00
WEI-TAI CHEN 4c6a31b44e Merge develop-nr 2018-07-03 02:25:04 -07:00
WEI-TAI CHEN 73339bc7f3 Amend to nfapi_nr_config_request_t 2018-07-02 08:08:59 -07:00
WEI-TAI CHEN 4323aa482a Amend L1 instant 2018-07-02 06:22:12 -07:00
WEI-TAI CHEN bd88e8b4b1 Amend L1 instant to nr 2018-07-02 05:03:00 -07:00
WEI-TAI CHEN 84f238fdea Solve the Segmentation Fault in fill_rf_config function in nr-ru.c 2018-07-02 04:08:27 -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
Sebastian Wagner 4a523a394d Arrays for CRC calculation are defined as constants. 2018-06-26 12:05:30 +02:00
bruno mongazon b016bc229a fixed #320 issue 2018-06-25 18:23:36 +02:00
hongzhi wang d091e84694 ue nr pbch bug fix 2018-06-25 11:54:18 +02:00
WEI-TAI CHEN a98bf76d19 -Solving some of warning
"implicit declaration of function"
"incompatible pointer type'
2018-06-22 05:42:50 -07:00
WEI-TAI CHEN 5eb919e201 Modify nr_phy_config_request for testing config. module 2018-06-22 01:37:55 -07:00
hongzhi wang 227216f023 ue add pbch demodulation 2018-06-21 15:39:58 +02:00
Hongzhi Wang 1ecb006291 ue adding nr polar decoder 2018-06-19 15:38:30 +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 bc691f05c5 bug fix for QPSK modulation 2018-06-08 19:29:12 +02:00
hongzhi wang 0fb133830c nr parms bug fix 2018-06-06 18:16:01 +02:00
hongzhi wang f0c5dfd603 UE nr parms init bug fix 2018-06-05 16:02:00 +02:00
Hongzhi Wang e164b980b4 UE nr parms init 2018-06-04 15:23:15 +02:00
Hongzhi Wang bb78f964cf UE missing file nr_init 2018-06-01 15:10:42 +02:00
Raymond Knopp fa8b42c0d5 debugging of --siml1 2018-05-31 13:57:48 +02:00
Guy De Souza 860c99071d Polar encoding init 2018-05-18 09:23:15 +02:00
Guy De Souza 3ac00170b2 Compiling version- Merge with UE directory split 2018-05-16 11:37:57 +02: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