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
Elena Lukashova
e161c30c75
Merge branch 'develop' into mmse_receiver
2018-07-11 16:27:40 +02:00
Elena Lukashova
240c429956
1. Adding lapack-dev and lapacke-dev into the build script.
...
2. Remove get_pmi from PHY_SRC_UE and add it instead to PHY_SRC_COMMON.
3. Linking lte-uesoftmodem and lte-uesoftmodem-nos1 targets with ${ATLAS_LIBRARIES}.
2018-07-10 17:58:14 +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
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
Wang Tsu-Han
7e00727ce7
using accelarated modulation
2018-05-31 14:27:54 +02: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
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
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
Raymond Knopp
eee7673893
warning remove
2018-04-06 15:57:23 +02:00
Raymond Knopp
846268fdd3
bug fix for qpsk modulation
2018-03-20 18:02:52 +01:00
Raymond Knopp
b2cc1252c6
Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
...
Conflicts:
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
targets/ARCH/COMMON/common_lib.c
targets/COMMON/create_tasks.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.h
2018-03-12 12:10:48 +01:00
Wang Tsu-Han
869b9a5c6f
fix for phy-test UL and adding wakeup_txfh
2018-02-20 15:05:00 +01:00
Raymond Knopp
e9d536972c
updated dlsim to FAPI interfaces
2018-02-13 07:18:52 -08:00
jftt_wangshanshan
9c820805fa
TDD config1 initial merge
2018-02-05 15:43:20 +08:00
Florian Kaltenberger
13c8931bf2
bugfix in modulation
2018-01-25 16:20:25 +01:00
Eurecom
30d5f151c3
specified modulation for QPSK
2018-01-22 18:02:02 +01:00
Cedric Roux
7757b9e7e7
import NFAPI work from David Price from Cisco (non-working commit, do not use it)
...
It has been chosen to not include the full history of commits
from David. He included a binary version of wireshark, probably
a modified one that understands NFAPI. Wireshark is released under
the GPL license, we cannot include it in the repository. We could
have done a next commit to remove this binary. But then it would
still be present in the history of commits, which may not be allowed.
And it would take space on disk. We could edit the history to remove
wireshark entirely. But this operation is too complicated.
There was also a pcap capture file, which has nothing to do in
the history of commits and would take space on disk. There again,
it's too difficult to edit the history to remove it.
There was a file .gitignore that was also removed.
The original history can be found on David's repository:
https://gitlab.eurecom.fr/daveprice/openairinterface5g/
The branch is: nfapi-ru-rau-split.
A copy of that branch has been included in the internal OAI
repository, for those who have access to it.
The branch is the same. The last commit ID is
9106438239e0bc626ff1fa1d97d911caadd0fbb9.
You can compare the current commit with the commit 9106...
to see what differs.
The current commit has to be considered non-working.
The commit following the current commit will fix problems with
the work in the current commit.
If you use git bisect, don't spend time analyzing the current
commit.
2018-01-15 11:32:30 +01:00
Florian Kaltenberger
ecee5edcce
enabling new modulation
2017-10-27 16:16:05 +02:00
Cedric Roux
b4a48e199e
Merge remote-tracking branch 'origin/update-license' into RU-RAU-split
...
Conflicts:
openair1/PHY/CODING/rate_matching.c
openair1/PHY/LTE_REFSIG/primary_synch.h
openair2/LAYER2/layer2_top.c
openair2/RRC/LITE/rrc_config.c
2017-10-23 15:00:30 +02:00
Cedric Roux
1b1f941e3c
upgrade license to version 1.1
2017-10-23 12:22:13 +02:00
Raymond Knopp
ae884afe24
integration of LTE-M SIB1/SI interfaces and scheduling
2017-07-24 16:19:24 -07:00
Raymond Knopp
d56525c807
NFAPI UL indications added and full UE connection tested.
2017-07-19 03:07:40 -07:00
Raymond Knopp
8da1c4b5bb
Note: this commit is work in progress. Contains initial integration of NFAPI data structures which are tested for TX path. RX path to follow.
2017-07-06 08:18:32 -07:00
Raymond Knopp
d23697aef3
Merge branch 'develop' into RU-RAU-split
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if5_tools.c
openair1/PHY/LTE_TRANSPORT/if5_tools.h
openair1/PHY/LTE_TRANSPORT/pcfich.c
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/rar_tools.c
openair1/PHY/LTE_TRANSPORT/srs_modulation.c
openair1/PHY/defs.h
openair1/PHY/impl_defs_lte.h
openair1/PHY/impl_defs_top.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_ue.c
openair2/COMMON/mac_rrc_primitives.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_mch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/main.c
openair2/LAYER2/MAC/proto.h
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.h
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LITE/rrc_eNB.c
targets/ARCH/COMMON/common_lib.c
targets/ARCH/COMMON/common_lib.h
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
targets/RT/USER/rt_wrapper.h
targets/SIMU/USER/channel_sim.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2017-06-05 15:33:38 -07:00
Cedric Roux
ce08fa8e9e
integration fix: remove various warnings
2017-05-15 15:57:26 +02:00
Raymond Knopp
b42aed9ed9
initial testing version of L1L-L1H split (RRU-RAU)
2017-04-17 10:40:23 -07:00
Cedric Roux
1789b3de59
compilation warning removal
2017-03-24 12:00:58 +01:00
Cedric Roux
e82c6764f9
compilation warning removal
2017-03-24 12:00:23 +01:00
Cedric Roux
bf3a4f6464
compilation warning removal
2017-03-24 12:00:04 +01:00
Cedric Roux
d8627b5e3f
compilation warning removal
2017-03-24 11:59:27 +01:00
Cedric Roux
2291f4ebec
compilation warning removal
2017-03-24 11:58:01 +01:00
Cedric Roux
216cd0bf02
compilation warning removal
2017-03-24 11:56:34 +01:00
Cedric Roux
8dd8a97c34
compilation warning removal
2017-03-24 11:55:32 +01:00
Cedric Roux
11856c6b00
compilation warning removal: allocate_REs set but not used
...
I removed this variable entirely because it's not used.
Maybe the bug is that it's not used after being set?
To be checked and fixed at some point.
2017-03-24 11:53:34 +01:00
Elena_Lukashova
b2c57f42fc
Fixing bug in modulation for TM4 64QAM.
2017-03-02 22:40:54 +01:00
Elena_Lukashova
2ef3dd8ff7
Adjusting power level for TM4,5,6.
...
Before that the scaling was aplied in precoder.
Now it is done in sqrt_rho_a and sqrt_rho_b.
For TM4 there still remains 1/sqrt(2) instead of
1/2 both at the transmitter and receievr side.
2017-02-24 23:35:30 +01:00
Elena_Lukashova
bf6a3b522d
Removing dlsch1 from arguments of dlsch_modulation_SIC
2017-02-24 23:30:35 +01:00
Florian Kaltenberger
e0b8998def
fixing bug in PDSCH power allocation for TM2
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/power_control.c
2017-02-07 10:02:49 +01:00
Elena_Lukashova
a51c30f459
Merge branch 'develop' into feature-59-tm4
...
dlsim_tm4 works fine.
dlsim has a bug in llr processing after llr computations (see XFORMS).
2017-01-30 13:37:24 +01:00
Elena_Lukashova
b98bb25fba
Merge branch 'feature-60-tm4-fork' into feature-59-tm4
...
1. TM4 works on dlsim_tm4.c with full HARQ support for both PIA and SIC.
2017-01-27 10:36:10 +01:00
Cedric Roux
22942608fa
fix 'unused variables' warning
2017-01-11 15:53:41 +01:00
Florian Kaltenberger
7715900222
some more bugfixes (old and introcuded by merge) plus ability too use phy-test for tm7
2016-11-24 14:42:59 +01:00
Xiwen JIANG
eab744f6f9
add in allocate_REs_in_RB the TM7 case
2016-11-22 14:57:11 +01:00
Xiwen JIANG
60a1f34a5a
cosmetic changes
2016-11-22 12:29:18 +01:00