laurent
3dbd596448
after testing
2018-09-27 15:09:59 +02:00
laurent
dd4f1ab73c
coarse gain cleaning
2018-09-27 14:13:52 +02:00
Cedric Roux
cbdc8f662a
Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36
2018-09-07 16:04:05 +02:00
Cedric Roux
23ca4cfbbe
Merge remote-tracking branch 'origin/T-fixes-w35' into develop_integration_2018_w35
2018-08-31 15:13:03 +02:00
Cedric Roux
31e472d235
T tracer: fix traces for TDD
2018-08-30 14:23:52 +02:00
Haruki NAOI
620d50d798
Fix: ulsim segmentation fault.
2018-08-30 20:47:40 +09:00
Haruki NAOI
37bab74e06
Fix: dlcqi re-transmission timing.
2018-08-27 19:26:39 +09:00
frtabu
77f70e77ea
MSC logging utility as a config option
2018-08-24 17:43:14 +02: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
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
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
oai
719762ccab
fix basic_simulator compilation failure
2018-07-06 15:30:02 +02:00
Raymond Knopp
230acb9e88
fixes to ulsim/dlsim and system simulator after merge
2018-07-06 07:42:57 +02:00
Raymond Knopp
b4be5a4460
fixed ulsim for testcases
2018-07-05 23:09:30 +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
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
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
6cd761589e
bugfix: fix T trace
2018-06-14 10:26:47 +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
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
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
Haruki NAOI
a3329b562c
Merge commit '8471bd14e2e400887e7419d3307921a1401e2823' into mu_with_tdd1
...
# Conflicts:
# common/utils/itti/intertask_interface.c
# openair1/SCHED/phy_procedures_lte_eNb.c
2018-05-29 14:52:19 +09:00
Haruki NAOI
f5239e0905
Merge remote-tracking branch 'remotes/origin/ues_test' into mu_with_tdd1
...
# Conflicts:
# common/utils/itti/intertask_interface.c
# openair1/SCHED/fapi_l1.c
# openair1/SCHED/phy_procedures_lte_eNb.c
2018-05-29 14:32:13 +09:00
Masayuki HARADA
8471bd14e2
Merge remote-tracking branch 'origin/sp3_master' into scd_refactoring
2018-05-29 14:30:02 +09:00
Haruki NAOI
18bd37f913
Revert "Fix: TDD uci_procedures misdeal pucch format1a."
...
This reverts commit c652a883ff .
2018-05-29 14:29:00 +09:00
Masayuki HARADA
fb054e6523
Merge branch 'sp3_master' into scd_refactoring
...
# Conflicts:
# openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2018-05-29 14:24:25 +09:00
Haruki NAOI
c652a883ff
Fix: TDD uci_procedures misdeal pucch format1a.
2018-05-24 20:08:27 +09:00
Haruki NAOI
ab32cefbe2
Revert "fix DLSCH no retransmission"
...
This reverts commit 24c669f394 .
2018-05-24 20:01:37 +09:00
jftt_wangshanshan
843e7c8fc4
Change SR detection for TDD for compliance with FDD. (try)
2018-05-21 16:43:12 +08: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
Wang Tsu-Han
7e10daaf14
bug fix for phy-test DL
2018-05-15 15:21:32 +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
Wu Jing
24c669f394
fix DLSCH no retransmission
2018-05-15 14:52:39 +09:00
Wu Jing
38363b10e3
fix rm916 bug
2018-05-15 14:42:33 +09:00
Wang Tsu-Han
db7b1f5903
phy test fix
2018-05-14 11:18:41 +02:00
Haruki NAOI
54a36ff54d
Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master
2018-05-10 11:40:16 +09:00
Rajeev Gangula
dc9b0fa53a
Added uplink channels SNR in config file.
2018-05-09 15:55:36 +02:00
jftt_wangshanshan
0928f049bb
Fix cqi_req_flag, to prevent continously schedule cqi after set it to 1 and before actually receive it at the right subframe.
2018-05-09 18:22:22 +08: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
Haruki NAOI
9a8ea23f9f
Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master
2018-04-23 11:21:15 +09:00
jftt_wangshanshan
ef5ff53ecf
change log level to debug
2018-04-23 09:58:50 +08:00
jftt_wangshanshan
0889d79969
Modify CQI scheduling strategy
2018-04-23 09:45:08 +08: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
Haruki NAOI
6e7db95981
clean log.
2018-04-16 16:54:02 +09:00
Wu Jing
aca800dae9
fix SegmentFault by harq_pid==8 after clean_dlsch_eNB
2018-04-10 17:19:52 +09:00
Raymond Knopp
8b1416b862
debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional.
2018-04-09 15:32:49 -07:00