Commit Graph
2165 Commits
Author SHA1 Message Date
Thomas Schlichter e239e94154 Fix PDCP and RLC for MBMS
Also add output of MBMS multicast IP packets to the network.

This commit was developed at Fraunhofer IIS (https://www.iis.fraunhofer.de) by Javier Morgade, Ph.D.
2018-08-14 17:09:08 +02:00
Thomas Schlichter 1b53fd402d mcch logical channel properly decoded
This commit was developed at Fraunhofer IIS (https://www.iis.fraunhofer.de) by Javier Morgade, Ph.D.
2018-08-14 17:09:08 +02:00
Cedric Roux 409b3d5c20 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w31 2018-08-03 09:45:26 +02:00
frtabu 6c23bdec60 fix compilation errors in ETHERNET or noS1 mode 2018-07-31 00:42:53 +02:00
frtabu 30509955c2 remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX 2018-07-30 20:07:22 +02:00
frtabu b85cbddeec log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common 2018-07-30 20:07:22 +02:00
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
Cedric Roux ccdf1aff7a fix 2018-07-20 17:01:48 +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 d89dbb4882 Merge remote-tracking branch 'origin/feature-s1ap-r14-based-on-new-asn1c' into develop_integration_2018_w29
Conflicts:
	targets/SIMU/PROC/channel_sim_proc.c
	targets/SIMU/USER/oaisim_pad.c
2018-07-20 12:10:15 +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
Bi-Ruei, Chiu 0071fb6173 Add ASN files of LTE-RRC, S1AP and X2AP of 2018 Jun release 2018-07-13 10:04:46 +08:00
Bi-Ruei, Chiu a247907d3a Use an un-official community collaboration version of asn1c
1. It's no need to modify LTE-RRC's ASN.1 file for enabling option group
   feature in generate_asn1.
2. It's no need to patch the C header files generated from
   LTE-RRC/S1AP/X2AP's ASN.1 in fix_asn1.
3. It's no need to pre-process S1AP/X2AP's ASN.1 for enabling information
   object class feature by asn1tostruct.py.

This commit requires an un-official version of asn1c which are
collaboration of asn1c community members and `build_helper` is modified
in this commit accordingly :

  https://github.com/brchiu/asn1c/tree/velichkov_s1ap_plus_option_group

This asn1c can also convert ASN.1 of 5G NR RRC (38.331, v15.1.0) and
generate C files with -findirect-choice command line option without
tweaking ASN.1 file.

Examples for how to use this asn1c for S1AP are in S1AP files, e.g.
s1ap_eNB_nas_procedures.c and s1ap_eNB_handler.c.

There is an modified openair-cn (based on tag 0.5.0) with this new asn1c at :

  https://github.com/brchiu/openair-cn/tree/new-asn1c

Basic S1AP interaction and data transfer operation between OAI eNB and
this modified openair-cn has been tested.

Note: Community version of asn1c is keeping evolved to provide better usage.
2018-07-13 10:04:46 +08:00
Bi-Ruei, Chiu df1e5b21c8 Change 'RRC/LITE' to 'RRC/LTE' 2018-07-12 15:33:31 +08:00
Raphael Defosseux 3c3e928fb6 Merge remote-tracking branch 'origin/develop' into issue324_gccwarnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-07-11 15:01:41 +02:00
Raphael Defosseux e8ea2f10cc Merge branch 'remove_wrong_prototypes_rlc_pdcp' into 'develop'
Remove wrong prototypes rlc pdcp

See merge request oai/openairinterface5g!338
2018-07-11 14:19:09 +02:00
oai 719762ccab fix basic_simulator compilation failure 2018-07-06 15:30:02 +02: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
laurent d9bf7c8c6b fix in megre 2018-07-03 15:42:26 +02:00
laurent 912e579100 merge with others 2018-07-03 15:31:29 +02:00
laurent d76ac32759 remove public/protected macros in lists, mem_blocks 2018-07-03 14:54:55 +02:00
laurent 45599fe4a2 full remove of prototype macros in rlc and dpcp 2018-07-03 13:50:59 +02:00
laurent fcd4aba0de after correct compile 2018-07-03 12:56:20 +02:00
Raphael Defosseux 12a4de374c Merge branch '320-code-cleanup-removal-of-if-0' into 'develop'
Resolve "Code cleanup - removal of "#if 0""

See merge request oai/openairinterface5g!329
2018-07-03 12:01:22 +02:00
Cedric Roux e5d8179b76 hotfix: clear memory after allocation
(cherry picked from commit 71dacd442d)
2018-07-03 10:21:33 +09:00
Haruki NAOI ab451412de fix: pdcp_update_stats() function stalls when eNB is compiled with "--mu" options. 2018-07-02 19:15:06 +09:00
Haruki NAOI 9696e229c1 fix: round is not match between layer1 and layer2. 2018-06-29 17:45:15 +09:00
Raymond Knopp 5a808cb1ca Merge branch 'develop' into enhancement-rfsim
Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:54:15 -07:00
Raymond Knopp d0926ec041 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
Conflicts:
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:49:23 -07: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
Cedric Roux 71dacd442d hotfix: clear memory after allocation 2018-06-27 18:02:58 +02:00
Haruki NAOI c8bff02efa fix: assertion occurs in nack_or_dtx_reported() function when RRCConnectionSetup moves. 2018-06-27 17:39:43 +09:00
bruno mongazon 7a5c40c130 fix issue #320 after having to merge with develop again since committed in the meantime 2018-06-26 15:08:49 +02:00
Haruki NAOI 76282a84b8 fix: nb_rbs is not correctly pass to per-prosessor when fairRR scheduler is used. 2018-06-26 15:23:15 +09: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
Raymond Knopp fb4d10c83a Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2018-06-21 23:13:47 -07: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 b6fd23caaf fix: revert increasing size of MEM_MNGT_MB5_NB_BLOCKS
This commit reverts the change coming from
675fd0af4e.

On a test machine, running the basic simulator (both eNB, UE
and T tracer) with 100 RBs eats too much of memory on a computer
with 8GB of RAM, leading to a reboot because the computer
was not responsive anymore.

Other solutions are needed to solve the memory issues, but
multiplying by 50 this number is not a good one, at least
not in the basic mode of operation. If this value needs
to be that big, a #ifdef #else #endif may be used.
2018-06-20 11:00:56 +02:00