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
Sebastian Wagner
9f85621977
Constant arrays in HEX
2018-06-26 14:29:24 +02:00
Sebastian Wagner
467eb9203e
Truncated long lines
2018-06-26 12:37:14 +02:00
Sebastian Wagner
4a523a394d
Arrays for CRC calculation are defined as constants.
2018-06-26 12:05:30 +02: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
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
4dfaf50977
fix compilation of dlsim/ulsim
...
The following command did not work anymore:
./build_oai --phy_simulators
2018-06-19 10:11:15 +02:00
Cedric Roux
b65af94d47
Merge remote-tracking branch 'origin/311-encapsulate-lte_gold_generic-functionality' into develop
2018-06-18 16:25: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
d579a74e54
Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop
2018-06-18 16:25:39 +02:00
Cedric Roux
9adf1999db
Merge remote-tracking branch 'origin/oai_ue_fixes' into develop
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2018-06-18 16:13:06 +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
a7db85a6c2
put back variables in the local stack
2018-06-15 12:31:56 +02:00
Cedric Roux
dde219c81b
bugfix: fix usage of bundling
...
Do not set 'bundling' for FDD, that breaks ULSCH decoding.
2018-06-14 16:49:58 +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
Florian Kaltenberger
432ad112c5
fixing implicit declaration warning
2018-06-04 07:45:28 -07:00
Sebastian Wagner
ee91f661fb
Added missing file lte_gold_generic.c
2018-06-04 16:27:17 +02:00
Sebastian Wagner
6742d6f471
Encapsulated lte_gold_generic functionality
2018-06-04 16:09:10 +02:00
bruno mongazon
acbd1f1f7d
fix issue 310 IQrecplay
2018-06-04 13:05:13 +02: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
Florian Kaltenberger
9edcd9b961
Merge remote-tracking branch 'origin/develop' into oai_ue_fixes
2018-05-29 01:06:54 -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
Raymond Knopp
b036b18afe
moved sidlink L1 functions to LTE_UE_TRANSPORT, corrected issue related to "find_dlsch" which is needed to compile UE and creates problem for unitary simulations (moved to lte-ue.c application)
2018-05-28 11:09:38 -07:00
Cedric Roux
ed49592754
integration fix: remove warnings
...
Remove warnings popping up on:
./build_oai --eNB -w USRP
Maybe not always the best solution.
2018-05-24 17:15:42 +02:00
Haruki NAOI
14740aec74
Merge remote-tracking branch 'remotes/origin/rm916_bugfix' into sp3_master
2018-05-24 21:22:38 +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
Masayuki HARADA
44210a0a88
Fix PUSCH decode failure when recieve power is too high situation.
2018-05-24 13:21:37 +09:00
Florian Kaltenberger
81ac396187
Merge branch 'develop' into oai_ue_fixes
2018-05-22 06:25:09 -07:00
jftt_wangshanshan
843e7c8fc4
Change SR detection for TDD for compliance with FDD. (try)
2018-05-21 16:43:12 +08:00
Masayuki HARADA
ff604660fe
delete UE_EXPANSION route
2018-05-18 10:58:26 +09:00
Masayuki HARADA
677ad4298c
Devide source file of scheduler
2018-05-17 10:48:39 +09: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
Cedric Roux
11a1dd090c
fix: hack to have the UE compile
...
This is a quick and dirty solution, something better is needed.
2018-05-15 09:55:11 +02: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
Cedric Roux
351ca5e726
Merge remote-tracking branch 'origin/basic-simulator' into develop_integration_2018_w19
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/prach.c
targets/RT/USER/lte-ue.c
2018-05-14 17:30:18 +02:00
Cedric Roux
7da4367cb7
Merge remote-tracking branch 'origin/fix-remove-lte-ran-file' into develop_integration_2018_w19
...
Conflicts:
openair1/PHY/defs_eNB.h
2018-05-14 16:34:50 +02: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
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