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
Masayuki HARADA
677ad4298c
Devide source file of scheduler
2018-05-17 10:48:39 +09:00
Raymond Knopp
551f32cc20
more splitting eNB/UE files/directories
2018-04-08 13:00:08 -07:00
Cedric Roux
a21c0b809f
bugfix: fix RRC Release 10 compilation
...
The following compilation did not work anymore:
./build_oai --eNB -w USRP -r Rel10 -c
(Rel8 still does not work.)
2018-02-05 17:21:40 +01:00
Wu Jing
ba8a111ea1
merge the latest develop branch into issue289
2018-02-01 19:25:29 +09:00
bruno mongazon
9c93307ab4
Fix #582 , merge from develop
2018-01-16 14:31:23 +01:00
bruno mongazon
cf0e9175dd
Fix #582 , RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed
2018-01-15 18:47:07 +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
Xu Bo
ad859ddf5e
modify for ue expansion
2017-11-16 12:11:21 +09:00
Xu Bo
34bc087707
modify function for issue271
2017-11-10 06:56:57 +09: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
bc9c587b48
Merge remote-tracking branch 'origin/develop' into RU-RAU-split
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/defs.h
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/defs.h
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/if5_tools.c
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/pusch_pc.c
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.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/pre_processor.c
openair2/LAYER2/MAC/ue_procedures.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-ue.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim_functions.c
2017-09-26 21:43:03 -07:00
Raymond Knopp
362f584d66
integration of remaining nFAPI messages
2017-09-14 07:15:49 -07:00
Raymond Knopp
5c0ea2b446
addition of MPDCCH format 5. X_u_br sequences for BL/CE UE support and bugfixes in rx_prach0 for eMTC.
2017-08-17 00:51:23 -07:00
Raymond.Knopp
ec6236f8c7
tests with monolithic eNB. runs fluidly. No UE stimulus yet
2017-08-11 01:44:22 +02:00
Raymond Knopp
ad98f5aa9e
L1/L2 scheduling extensions for BL/CE operation, BR random-access procedure, BR PRACH detection. Still untested, but compilation succeeds. Missing elements in L2 - PUSCH programming for Msg3, Msg4 retransmission programming for BL/CE. DLSCH/ULSCH programming for UE-specific DLSCH/ULSCH for BL/CE
2017-08-07 23:25:17 -07:00
gabrielC
f5be2be550
Correct DCIFormat and AgregationLevel to put them in pdcch structure
2017-07-28 16:39:25 +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
tct-labo4
bf7eb25cf5
[OAI-UE] timing measurements for slot0/slot1 parallelization
2017-06-28 12:15:25 +02:00
fnabet
cb637c033c
rebase from 2017.w25
2017-06-27 15:01:28 +02:00
hbilel
fdae0065ac
Make RX thread number configurable
2017-06-21 16:17:22 +02:00
hbilel
4aed32e786
[OAI-UE] slot0 / slot1 parallelization
2017-06-13 09:49:17 +02: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
4eefaffb47
minor: change files mode (from 755 to 644)
2017-05-18 11:12:11 +02:00
Raymond Knopp
b42aed9ed9
initial testing version of L1L-L1H split (RRU-RAU)
2017-04-17 10:40:23 -07:00
Florian Kaltenberger
7f24927c43
WIP: SRS configuration of PUSCH and PUCCH. No SRS detection yet. To be tested on HW
2017-03-10 12:42:04 +01:00
Raymond Knopp
71af8ce824
Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony-RU2
...
Conflicts:
openair1/PHY/defs.h
openair1/PHY/impl_defs_lte.h
openair1/PHY/vars.h
targets/RT/USER/lte-enb.c
2017-02-16 05:24:28 -08:00
Elena_Lukashova
b31282ae30
Merge branch 'develop' into feature-59-tm4
2017-02-09 18:03:16 +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
gabrielC
0dd076a37a
[OAI-UE] fix time tracking and channel interpolation
2017-01-25 17:23:32 +01:00
Cedric Roux
74d07a70f6
Merge branch 'enhancement-192-beamforming' into develop_integration_w03
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/MODULATION/beamforming.c
openair1/PHY/defs.h
targets/RT/USER/lte-enb.c
2017-01-20 16:58:29 +01:00
Cedric Roux
e6f3c9b899
Merge branch 'enhancement-10-harmony' into develop_integration_w03
...
Conflicts:
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-softmodem.c
2017-01-20 16:49:39 +01:00
Florian Kaltenberger
8a9ef14e4f
reduced the max number of antenna ports to 6 to save memory (we are not using antenna port >5 anyway)
...
mult_cpx_conj_vector can now also do multiply add
beam_precoding now uses mult_cpx_conj_vector
Conflicts:
openair1/PHY/MODULATION/beamforming.c
2017-01-18 09:15:57 +01:00
Raymond.Knopp
9ee29fb0b2
changes for S-subframe support in fronthaul
2017-01-14 14:35:19 +01:00
Cedric Roux
217eba6b6e
Merge branch 'bugfix-176' into develop_integration_wk01
...
There were some conflicts, manually resolved.
Conflicts:
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/SCHED/phy_procedures_lte_ue.c
2017-01-06 11:04:39 +01:00
Cedric Roux
02ecf9fd45
Merge branch 'bugfix-156' into develop_integration_wk01
2017-01-06 10:47:18 +01:00
Wilson W.K. Thong
2e7c28a591
fix incorrect PUCCH format causing no SR received by eNB in TDD
...
fix incorrect fss_pusch calculation
fix the incorrrect HARQ-PID checking
remove incorrect checking on downlink DCI HARQ PID value
fix incorrect downlink ACK/NACK feedback procedures in TDD
fix no activating PDSCH decoding when DL-DCI is indicating a downlink retransmission
see issue #176
2017-01-06 12:01:05 +08:00
gabrielC
f79dd53edf
Merge remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50
2016-12-15 11:39:04 +01:00
Wilson W.K. Thong
fce9f0b5d5
avoid detecting DCI0 at subframes where no DCI0s are sent by eNB. This happens only in TDD mode
...
issue !156
2016-12-15 16:57:21 +08:00
Raymond Knopp
7c3531d39a
temporary commit before merge
2016-11-22 07:15:59 -08:00
Florian Kaltenberger
8769024922
Merge remote-tracking branch 'origin/develop' into feature-21-TM7
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
openair1/PHY/LTE_TRANSPORT/dci.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/initial_sync.c
openair1/PHY/LTE_TRANSPORT/pbch.c
openair1/PHY/LTE_TRANSPORT/pilots.c
openair1/PHY/LTE_TRANSPORT/pmch.c
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/mbmssim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
openair2/ENB_APP/enb_config.c
openair2/RRC/LITE/rrc_eNB.c
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
targets/RT/USER/sched_rx_pdsch.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim_functions.c
2016-11-18 15:35:21 +01:00
Elena_Lukashova
9c65225869
Full Support for TM4 HARQ, excpept for PUSCH precoder at this moment.
2016-11-16 16:20:00 +01:00
hbilel
10ab1c3e8b
[OAI-UE] - PUCCH Format2 Periodic CQI/RI reporting
...
Handle SRS TX in case of CQI / SR / AN simultaneous transmission
2016-10-27 14:30:30 +02:00
hbilel
31fbc80520
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B
...
parent a6742020 - Commit 1fa2f76e61
Conflicts:
targets/RT/USER/lte-softmodem.c
2016-10-24 16:21:05 +02:00
Elena_Lukashova
64116b90e1
Adding HARQ support for TM4. No fallback to Alamouti yet.
...
Counting for the number of 2CWs or 1CW retransmissions.
Adding corresponding changes to the phy_scope.
2016-10-23 21:38:58 +02:00
Raymond Knopp
d8defff0fa
periodic cqi procedures
2016-10-20 06:32:33 -07:00