Florian Kaltenberger
7ff3705930
adding basic simulator support to nr softmodems. however, simulator not yet functional.
2018-09-14 00:13:19 -07: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
Raymond Knopp
21be856f58
lte-softmodem-nos1 / lte-uesoftmodem-nos1 functional
2018-08-28 00:16:38 +02:00
Raymond Knopp
3367cc9319
lte-softmodem compiles
2018-08-27 13:37:00 +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
Robert Schmidt
44e444b3a2
Add missing break in switch statement in set_ul_DAI()
2018-08-13 14:38:32 +02:00
WEI-TAI CHEN
616a66b7dd
Replace "#ifdef Rel14" by "#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))"
...
We can build Rel15 for LTE now
2018-08-09 06:08:33 -07: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
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
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
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
Cedric Roux
b1d0287327
Merge remote-tracking branch 'origin/issue321_tdd_config1' into develop_integration_2018_w29
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-07-20 12:26:13 +02:00
Cedric Roux
c836ef28f4
Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/UTIL/LOG/log.c
targets/RT/USER/lte-uesoftmodem.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2018-07-20 12:06:26 +02:00
Haruki NAOI
b033317286
Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1
...
# Conflicts:
# openair2/UTIL/LOG/log.c
2018-07-13 14:13:10 +09:00
Raphael Defosseux
3c3e928fb6
Merge remote-tracking branch 'origin/develop' into issue324_gccwarnings
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-07-11 15:01:41 +02:00
WEI-TAI CHEN
2070c982e7
Adding the NR MIB scheduler in eNB_ulsch_dlsch_scheduler, re-use LTE MAC
2018-07-09 04:27:26 -07:00
Raymond Knopp
494348e2f0
Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
2018-07-06 06:24:31 +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
Haruki NAOI
823c838d21
Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1
2018-07-05 11:15:30 +09:00
laurent
912e579100
merge with others
2018-07-03 15:31:29 +02:00
laurent
fcd4aba0de
after correct compile
2018-07-03 12:56:20 +02:00
Raphael Defosseux
12a4de374c
Merge branch '320-code-cleanup-removal-of-if-0' into 'develop'
...
Resolve "Code cleanup - removal of "#if 0""
See merge request oai/openairinterface5g!329
2018-07-03 12:01:22 +02:00
Cedric Roux
e5d8179b76
hotfix: clear memory after allocation
...
(cherry picked from commit 71dacd442d )
2018-07-03 10:21:33 +09:00
Haruki NAOI
9696e229c1
fix: round is not match between layer1 and layer2.
2018-06-29 17:45:15 +09: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
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
Cedric Roux
71dacd442d
hotfix: clear memory after allocation
2018-06-27 18:02:58 +02:00
Haruki NAOI
c8bff02efa
fix: assertion occurs in nack_or_dtx_reported() function when RRCConnectionSetup moves.
2018-06-27 17:39:43 +09:00
bruno mongazon
7a5c40c130
fix issue #320 after having to merge with develop again since committed in the meantime
2018-06-26 15:08:49 +02:00
Haruki NAOI
76282a84b8
fix: nb_rbs is not correctly pass to per-prosessor when fairRR scheduler is used.
2018-06-26 15:23:15 +09:00
bruno mongazon
107e256170
fixed #320 issue
2018-06-25 18:42:31 +02:00
bruno mongazon
b016bc229a
fixed #320 issue
2018-06-25 18:23:36 +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
matzakos
74d1853ef6
Minor modifications to make nfapi-L2-emulator work again and redundant logs removal.
2018-06-21 17:56:29 +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
d579a74e54
Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop
2018-06-18 16:25:39 +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
2e389d61a0
bugfix: bzero was not called if allocating memory
2018-06-18 11:32:57 +02:00
WEI-TAI CHEN
73cfa6bbb6
- Maintain The Configuration Module
...
- Create task for GAB_APP and GAN_RRC
- Create the NR FAPI for P5 interface
- *It could be build, but still have a lot of warning need to maintain
2018-06-14 06:02:26 -07:00
Haruki NAOI
e84fd27ec1
Fix: build fails when executing build with option "--mu"
2018-06-14 16:49:45 +09: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
bruno mongazon
acbd1f1f7d
fix issue 310 IQrecplay
2018-06-04 13:05:13 +02:00
Raymond Knopp
8dd9cf3c86
creation of simulation data structure. some cleanup and testing with multiple UEs
2018-06-04 00:12:48 +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
Bi-Ruei, Chiu
f097cca7a5
Compare RRC_VERSION with MAKE_VERSION(x,y,z) macro to provide better SW configuration
...
To minimize migration effort, we follow the logic of legacy macro Rel10 and Rel14 used
for conditional compilation of current code.
In the future, they might be changed to accommodate finer software configuration, e.g.
MAKE_VERSION(12,2,0) or MAKE_VERSION(13,1,0) .... etc.
2018-05-29 18:00:58 +08: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