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
Cedric Roux
b04ff22645
fix compilation of ue_ip kernel module
...
May not be the best solution. Maybe we can pass -DXX=XX
on the command line somehow.
2018-06-18 17:19:26 +02:00
Cedric Roux
0c445bedda
Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop
2018-06-18 16:25:48 +02:00
Cedric Roux
d579a74e54
Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop
2018-06-18 16:25:39 +02:00
Cedric Roux
9adf1999db
Merge remote-tracking branch 'origin/oai_ue_fixes' into develop
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2018-06-18 16:13:06 +02:00
Cedric Roux
2f639e45b6
Merge remote-tracking branch 'origin/ulSNRs' into develop
...
Conflicts:
openair2/ENB_APP/MACRLC_paramdef.h
openair2/LAYER2/MAC/mac.h
2018-06-18 16:01:25 +02:00
Cedric Roux
4ba4d43aa6
set proper default values for puSch10xSnr and puCch10xSnr
...
20 was wrong, it means 2 dB.
200 is a bit high on my setup. Today the code hardcodes the noise
level as 30dB and a target of 20dB above noise is chosen by default.
Some more work is needed to estimate the real noise level. Some
more work is needed to set proper defaults.
2018-06-18 12:51:02 +02:00
Cedric Roux
437bd9cbe1
minor: cleaner indentation
2018-06-18 11:33:47 +02:00
Cedric Roux
2e389d61a0
bugfix: bzero was not called if allocating memory
2018-06-18 11:32:57 +02:00
Cedric Roux
cce51f69bc
set value of pucch_n1_AN to 0 everywhere by default
...
Since now pucch_n1_AN is taken from the configuration file,
it has to be set to 0. Value 32 will not work well, at least
in FDD. This has to be handled properly at some point
(do not use uplink resource blocks used by PUCCH for PUSCH).
2018-06-14 16:51:53 +02:00
Haruki NAOI
e84fd27ec1
Fix: build fails when executing build with option "--mu"
2018-06-14 16:49:45 +09: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
Raymond Knopp
c2ad982b76
vcd debugging for RF simulator
2018-06-05 05:47:43 -07:00
Raymond Knopp
f1ddab49dc
Merge branch 'enhancement-rfsim' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-rfsim
2018-06-05 01:36:58 -07:00
Raymond Knopp
74c7d3efc4
Merge branch 'develop' into enhancement-rfsim
...
Conflicts:
targets/RT/USER/lte-uesoftmodem.c
2018-06-04 22:33:07 -07:00
Raymond Knopp
6416c6d4ea
minor changes to remove global variable in dci handling
2018-06-04 22:31:43 -07:00
bruno mongazon
acbd1f1f7d
fix issue 310 IQrecplay
2018-06-04 13:05:13 +02:00
Raymond Knopp
79de529592
removed undef in lte-softmodem.h
2018-06-04 01:36:11 +02:00