WEI-TAI CHEN
b9037d1566
Complete merge develop into nr-rrc-additions
...
First build command : ./build_oai --gNB -w USRP -I
2018-08-07 05:31:52 -07:00
WEI-TAI CHEN
9b7143ca86
merge develop
2018-08-05 06:19:32 -07:00
Jacques
b2e49fd0a3
nr ue : integration pucch_uci and unit tests
2018-07-25 10:11:19 +02:00
Cedric Roux
d05ec7e826
hot dirty fix - TODO: fix it properly
2018-07-20 16:40:09 +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
e7ea9e7611
Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w29
...
Conflicts:
cmake_targets/CMakeLists.txt
2018-07-20 12:11:52 +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
Raymond Knopp
3539761c28
Log review step 1: legacy VCD removal, LOG macro modified, TTracer enabled at build time by default, in a way it, by default configuration, provides console logs, as in previous versions
2018-07-13 16:43:34 +02:00
Haruki NAOI
eb030b6a29
fix: compile error using "--mu" build option.
2018-07-13 14:53:14 +09: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
Raphael Defosseux
f3b5f5433c
Merge branch 'develop' into '322-code-cleanup-log_m-to-replace-write_output'
...
# Conflicts:
# openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
2018-07-03 15:48:19 +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
bruno mongazon
94611edefe
fix issue #322
2018-06-28 14:15:15 +02:00
Haruki NAOI
fa56147570
fix some warnings.
2018-06-28 21:06:31 +09:00
WEI-TAI CHEN
f701c02fdd
Add Log for NR
2018-06-27 01:53:37 -07:00
bruno mongazon
b016bc229a
fixed #320 issue
2018-06-25 18:23:36 +02:00
WEI-TAI CHEN
a98bf76d19
-Solving some of warning
...
"implicit declaration of function"
"incompatible pointer type'
2018-06-22 05:42:50 -07:00
WEI-TAI CHEN
73cfa6bbb6
- Maintain The Configuration Module
...
- Create task for GAB_APP and GAN_RRC
- Create the NR FAPI for P5 interface
- *It could be build, but still have a lot of warning need to maintain
2018-06-14 06:02:26 -07: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
c2ad982b76
vcd debugging for RF simulator
2018-06-05 05:47:43 -07:00
Raymond Knopp
eb363157c6
moved simulation target into lte-uesoftmodem with --simL1 option
2018-05-30 17:49:55 -07:00
Cedric Roux
ad46183e23
fix rdtsc usage
...
One user had a problem compiling oaisim.
This commit fixes it.
The compilation log was saying:
targets/RT/USER/lte-ue.c:
In function UE_thread_rxn_txnp4:
openair2/UTIL/LOG/log.h:370:3:
error: inconsistent operand constraints in an asm
__asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));
^
2018-05-11 14:21:05 +02:00
Haruki NAOI
afcdb1e6a9
enb-log-mem_sp2.patch into closed_item
...
(cherry picked from commit 3432385280c3155ee63a54be7c2e4846a17299de)
# Conflicts:
# openair2/UTIL/LOG/log.c
2018-04-12 10:53:44 +09: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
oai
45302792ee
config module fix and extensions for Nb-IoT, shared lib loader and telnet server implementation
2018-03-08 17:24:23 +01: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
922b5b595a
Fix NFAPI integration
...
This commit fixes issues introduced by the previous commit.
Summary of work:
- cleanup:
- fix LOG_XX to be less verbose
- fix cmake_targets/CMakeLists.txt
- fix oaienv
- remove dead code
- bug fixes:
- in openair1/SCHED/fapi_l1.c we had:
eNB->pdcch_vars[subframe&1].num_dci = number_dci;
should be:
eNB->pdcch_vars[subframe&1].num_dci = 0;
This bug let the PHY send more DCIs than what should have been
sent because num_dci is incremented later on in the code.
This fix may be a problem for fapi mode, to be checked.
- add new T VCD traces
- revert openair1/PHY/TOOLS/file_output.c to 'develop' version
- remove thread_id in logRecord/logRecord_mt
- revert (and adapt) configuration files
- be careful when doing frame++, we need to % 1024
- revert target_rx_power in openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- NFAPI:
- the open-nFAPI code has been included in the repository. See nfapi/README.
Maybe we should "git clone" the Cisco repository instead. We have to be
careful of availability though.
What has been tested:
- monolithic eNB FDD 5/10MHz with one UE, iperf UDP/TCP uplink/downlink
Anything else may fail to work, especially the FAPI mode, which has not
been tested at all.
2018-01-15 15:24:50 +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
bruno mongazon
afcc9aabd8
Fix #582 , USER_MODE flag removed
2018-01-11 16:50:50 +01:00
Florian Kaltenberger
bcb6f1715f
patch from francois UE config
2017-11-22 09:56:43 +01:00
Wang Tsu-Han
caef8c6e56
fixing the sleep delay problem for tx
2017-11-03 12:27:39 +01: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
frtabu
d88b72498d
remove getopt call in configuration module, it changes the argv order. Fix configuration module bugs (command line arguments sometimes not properly processed
2017-10-01 19:19:36 +02:00
oai
4ceb5916ca
log utility configuration enhancement
2017-09-28 20:08:47 +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
Cedric Roux
309ca06685
fix vcd
...
several problems were present:
- there was no comma after "ue0_trx_write_ns_missing" in the array
eurecomVariablesNames;
comma was put, and also commas for the last element in the array,
which doesn't hurt and will prevent future problems
- bad order of values in eurecomVariablesNames, which
was different from the enum vcd_signal_dump_variables;
order was checked and fixed
- strange/wrong use of VCD_SIGNAL_DUMPER_MODULE_END/LAST;
the whole logic was removed/simplified
2017-08-07 10:41:37 +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
Raymond Knopp
413df163d8
first working version with oaisim. This is prior to MAC interface reworking
2017-06-04 02:44:26 -07:00
Cedric Roux
00242daa6b
Merge remote-tracking branch 'origin/feature-143-support-enterprise-linux-7' into develop_integration_w22
2017-06-02 18:06:54 +02:00
Frank A. Zdarsky
633fda9a6e
minor fixes and add building drivers from source for CentOS7
...
Signed-off-by: Frank A. Zdarsky <fzdarsky@redhat.com >
2017-06-02 12:32:15 +02:00
Cedric Roux
60c4b5ecd7
integration fixes
...
- rename UE_NO_LOG to DISABLE_LOG_X
because the name is misleading. The full software
is impacted, not only the UE part
- same for compilation option ---ue-no-log
that becomes --disable-log
- keep LOG_X for the standard case, that is the
case without DISABLE_LOG_X where printf has been
put. Two reasons:
* printf is not realtime friendly
* keep behavior similar for other users who may
be troubled by different logs that don't add
any benefit to previous logs
2017-06-02 11:24:22 +02:00
gabrielC
8758d3d4cf
--ue-no-log, add printf to verify attach is ok
2017-05-22 17:26:03 +02:00
gabrielC
16acea57cc
Merge tag '2017.w20' into UE_logging
2017-05-22 11:31:18 +02:00
gabrielC
abf30c20b1
Remove some logs
2017-05-19 16:01:38 +02:00
gabrielC
fe350d5b6f
UE logging change :
...
--ue-trace : Enabling UE trace for debug
--ue-timing : Enabling UE timing trace
--ue-no-log : Disabling all LOG_X traces
2017-05-19 14:28:34 +02:00