Robert Schmidt
024007716a
Check type of node using NODE_IS_CU/DU/MONOLITHIC macros
2019-03-26 13:15:02 +01:00
Robert Schmidt
1f590efe2b
Merge branch 'develop' into feature-127-protocol-split
2019-03-19 14:49:07 +01:00
Cedric Roux
9456fe584a
x2ap: timers, cleanup
...
This commit introduces X2AP timers (t_reloc_prep, tx2_reloc_overall).
You need to set the values in the configuration file.
X2AP can be enabled or disabled in the configuration file too (disabled
by default).
Some deadcode was removed.
2019-03-13 15:28:37 +01:00
Robert Schmidt
f9c4c501e3
Merge branch 'develop' into feature-127-protocol-split
2019-03-05 14:17:38 +01:00
frtabu
fb46545526
Fix corrupted LOGs in L1L2simulator, introducing two new components NFAPI_VNF and NFAPI_pnf. Integrate Fujitsu fix for up to 50 UEs. Apply astyle to all modified files in the branch
2019-02-25 16:50:03 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
frtabu
38d772d8a2
nos1 et s1 execs identical, nos1 enforced based on exec name or --noS1 option
2019-02-17 23:46:45 +01:00
Raphael Defosseux
64144a8442
Merge remote-tracking branch 'origin/issue391-removeunusedcode_L2L1task' into develop_integration_2019_w04
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-24 15:33:19 +01:00
Raphael Defosseux
8260607ed6
CI: fix in L2-simulator VM build start script
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-22 21:37:40 +01:00
frtabu
9d0c70c9fe
remove L1L2 task, also remove some call to send messages to UNKNOWN_TASK, removed in new itti. Align LOG in rlc sources with new LOG code (remove DEBUG_RLC...)
2019-01-21 19:43:19 +01:00
Raphael Defosseux
d73685933c
Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-16 11:21:27 +01:00
Robert Schmidt
397d2f4815
Merge commit 'develop' into feature-127-protocol-split
...
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
frtabu
df6030540a
reduce compilation warnings in noS1 build to try to pass CI
2018-11-05 11:28:25 +01:00
frtabu
18ec5d8047
abort execution when an unknown option is passed via the command line: add config_check_cmdlineopt API to config module, create lte-softmodem-common.c source to remove duplicate code in lte-softmodem.c and lte-uesoftmodem.c, fix segfaults in exec_function of lte-uesoftmodem
2018-11-02 18:17:11 +01:00
Y_Tomita
b60e861b14
Add --musim option for L2 FAPI simulator.
2018-10-25 22:09:33 +09:00
Y_Tomita
66dad294a5
Change define NUMBER_OF_UE_MAX to avoid unexpected access.
2018-10-24 18:26:24 +09:00
Bing-Kai Hong
7f70860c24
Fix tag typo of PROTO_AGENT
2018-09-24 17:48:57 +02:00
Bing-Kai Hong
0372c9b289
Generate the DCCH and send from pdcp
2018-09-20 19:12:05 +02:00
Bing-Kai Hong
9f098a3461
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-09-10 15:33:03 +02:00
Bing-Kai Hong
ab412cb39d
Normalization of the file names for CU and DU
2018-09-10 13:39:48 +02:00
Robert Schmidt
5a74b790a2
Restructure code, CMakeLists fixes
...
- move the configuration reading code before task creation
- fix CMakeLists.txt so that lte-softmodem-nos1 compiles
2018-09-08 18:55:30 +02:00
Robert Schmidt
a1439effe3
Revert "Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC()"
...
This reverts commit 87093e1b55 .
2018-09-08 15:21:47 +02:00
Konstantinos Alexandris
938e0242e2
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/ENB_APP/enb_app.c
openair2/X2AP/x2ap_common.h
2018-09-07 15:30:49 +02:00
Robert Schmidt
87093e1b55
Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC()
2018-09-06 18:12:47 +02:00
Konstantinos Alexandris
1729b3dc66
X2AP: init funcs (register/association) + handler/management functions
...
SCTP: one to many sockets implementation
2018-09-06 15:49:59 +02:00
Calvin HSU
b58ef54608
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-08-28 12:22:59 +02:00
frtabu
51c86dd49e
fix noS1 build failure
2018-08-24 20:06:02 +02:00
frtabu
24f8fcf346
Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements
2018-08-24 17:43:14 +02:00
frtabu
79588a494e
LOG_F replaced by LOG_DUMPMSG. Add a generic function to dump a buffer or message. Go on with LOG_M implementation improvement. Remove redundant options to enable/disable logs.
2018-08-24 17:43:14 +02:00
Bing-Kai Hong
05c0ab1a76
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-06-15 14:33:25 +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
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
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
Nikos Makris
4195681fc9
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
Tested with one UE
Possibly broken FLEXRAN (different methods for configuring the link manager)
2018-04-05 13:22:12 +03: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
da50d68b06
more NB-IoT integration
2018-03-08 17:35:35 +01:00
Wang Tsu-Han
56a32a22d4
changing emulate-rf into an executional option instead of compiler option
2018-02-21 18:13:34 +01:00
Nikos Makris
fc43139e6a
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
Compile with ./build_oai --eNB -w USRP --pdcp-split
2018-02-07 19:31:51 +02:00
Nikos Makris
bc0f49cea0
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
OAISIM NoS1 broken, needs fixing (no linking of libraries for the UE code)
2018-02-02 20:21:34 +02:00
Wu Jing
ba8a111ea1
merge the latest develop branch into issue289
2018-02-01 19:25:29 +09:00
Rohit Gupta
046589e76d
fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.
...
tested with simulator.
2018-01-21 22:15:45 +01:00
Wang Tsu-Han
cfec3ffd56
adding EMULATE_RF into CMakelist
2018-01-16 15:50:57 +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
Xu Bo
3651852e16
1.NUMBER_OF_UE_MAX 16 -> 256 2.fix type of UE number from uint8_t to uint16_t
2017-12-07 11:40:52 +08:00
Wang Tsu-Han
8950c6ddd3
Bug fix for UDP loading
2017-11-17 16:42:17 +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
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