Louis Adrien Dufrene
32eafc1332
Some format before testing locally
2018-12-20 15:20:10 +01:00
Raymond Knopp
fb5201ba97
initialization of dfts for RU. moved init_dfts out from lte_init_top into lte_init_RU() and lte_init_ue_signal()
2018-11-26 21:02:41 +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
Cedric Roux
2cb87ddd02
Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
...
Conflicts:
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Cedric Roux
6270d94f91
bugfix: use correct comparison
...
The comparison in AssertFatal was not correct,
taking the opposite meaning to the one expected.
2018-09-04 12:43:29 +02:00
Robert Schmidt
088b1d5a8d
refine MAC Debug output
...
- uncomment "Couldn't find RNTI for UE X" in UE_RNTI() and rb_alloc in
pre_processor_reset() as they only inflate the debug output with little
benefited
- "doing ue_schedule_spec" is now displayed for individual UEs (and individual
CCs)
- show messages when not scheduling UE in ue_schedule_spec() due to invalid
slice or if not in RRC_CONNECTED
2018-09-03 18:10:28 +02:00
Robert Schmidt
8f2d79709e
MAC: change all slice_id_t to slice index variables
2018-09-03 18:10:28 +02:00
Robert Schmidt
048c4d29a2
add slice association in UE_list, test against it in slice_membership()
2018-09-03 18:10:28 +02:00
Robert Schmidt
58c2a00626
MAC: slicing conf struct in RC
...
- introduce structure in RC for slicing conf (UL/DL)
- move global variables regarding slice configuration into RC
- change ue_slice_membership(): consider UL/DL
- remove the unnecessary header files
- set default parameters: one slice
2018-09-03 18:10:28 +02:00
Niccolò Iardella
53c617cdcf
Move slicing configuration variables in header files
2018-09-03 18:10:28 +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
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
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
Haruki NAOI
9696e229c1
fix: round is not match between layer1 and layer2.
2018-06-29 17:45:15 +09: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
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
b016bc229a
fixed #320 issue
2018-06-25 18:23:36 +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
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
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
Wu Jing
7807e677e7
fix RM902 base on sp3_master
2018-05-10 11:53:06 +09:00
Raymond Knopp
ea784f2b4b
full IF4p5 simulation working
2018-04-29 09:35:23 -07:00
Raymond Knopp
596736afae
dlsim/ulsim functional. lte-softmodem/lte-uesoftmodem compile.
2018-04-24 22:14:20 -07:00
jftt_wangshanshan
c5b3aaa2dd
Fix a bug in log
2018-04-23 14:26:43 +08: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
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
Haruki NAOI
c8267c2cf9
Revert "Merge branch 'rm884_bugfix' into 'sp3_master'"
...
This reverts commit fad303fe37 , reversing
changes made to e35921cf96 .
2018-04-20 18:41:35 +09:00
tomita
2bf209e469
Delete LOG_I .
2018-04-19 18:25:34 +09:00
Wu Jing
7813e898ba
RM884 fix, when cqi received is 0, don not update dl_cqi
2018-04-19 12:26:20 +09: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
3da8cac59b
bugfix: try to release HARQ processes properly
...
The code is too complex. This commit may not be enough.
2018-03-15 10:48:16 +01:00
Wu Jing
45655197eb
merge ues_test branch into sp3_tdd_config1
2018-03-07 13:42:05 +09:00
naoi
4b02d81839
Fix: Random access information may not release if msg3_round initial value is not zero.
2018-03-01 16:21:32 +09:00
Wang.shanshan
5808ce3934
Fix:harq_pid for TDD is not completely fixed in pre processer.
2018-02-26 20:21:16 +09:00
jftt_wangshanshan
9f31d41b44
Add the setting ofharq_information_rel10_tdd.n_pucch_1_0 for tdd in allocate_CCEs
2018-02-26 17:31:43 +08:00
Wu Jing
0504659eb8
fix RM778 PRACH failure by adding reset RA when CRNTI_ACK in extract_harq
2018-02-24 15:16:17 +09:00
tomita
2f4c21ced3
Fix to avoid Segmemtation Fault in case of physicalConfigDedicated is NULL.
2018-02-22 17:10:21 +09:00
tomita
1008080e31
Bug fix for harq_pid calculation in MAC layer.
2018-02-22 16:40:27 +09:00
tomita
19509f08eb
Changed log level.
2018-02-20 18:40:05 +09:00
tomita
ea3aecf486
Bug fix about harq_pid calculation (harq_pid is calculated less than 0).
2018-02-19 19:42:06 +09:00
tomita
a53e22c294
Fixed harq_pid calculation.
2018-02-19 19:31:09 +09:00
Robert Schmidt
ceece5694d
rename flexran_slice_member() -> ue_slice_membership()
2018-02-12 13:50:48 +01:00
jftt_wangshanshan
19a2b37c75
Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting.
2018-02-12 16:52:48 +08:00