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
WEI-TAI CHEN
b3f68c7203
Solve the conflicting types
2018-07-03 03:33:18 -07: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
WEI-TAI CHEN
4c6a31b44e
Merge develop-nr
2018-07-03 02:25:04 -07:00
Cedric Roux
e5d8179b76
hotfix: clear memory after allocation
...
(cherry picked from commit 71dacd442d )
2018-07-03 10:21:33 +09:00
WEI-TAI CHEN
bd88e8b4b1
Amend L1 instant to nr
2018-07-02 05:03:00 -07:00
WEI-TAI CHEN
84f238fdea
Solve the Segmentation Fault in fill_rf_config function in nr-ru.c
2018-07-02 04:08:27 -07: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
Calvin HSU
a8709f0381
ue add MIB RX primitives and RRC
2018-06-29 10:14:02 +02: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
WEI-TAI CHEN
f767dea2a0
close GTP-U
2018-06-28 01:21:19 -07:00
Cedric Roux
71dacd442d
hotfix: clear memory after allocation
2018-06-27 18:02:58 +02:00
WEI-TAI CHEN
b4fcb04711
Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions
2018-06-27 06:00:46 -07:00
WEI-TAI CHEN
9b6c2ca4d7
init NR MAC instance
2018-06-27 05:59:56 -07:00
Calvin
91968d84fc
P5 message UL/DL BWP Common/Dedicated finish, primitibes of MIB RX/RRC decode done
2018-06-27 14:39:54 +02:00
WEI-TAI CHEN
7c77013552
Complete solve the Segmentation Fault on do_SERVINGCELLCONFIGCOMMON
2018-06-27 04:05:21 -07:00
WEI-TAI CHEN
f701c02fdd
Add Log for NR
2018-06-27 01:53:37 -07:00
Haruki NAOI
c8bff02efa
fix: assertion occurs in nack_or_dtx_reported() function when RRCConnectionSetup moves.
2018-06-27 17:39:43 +09:00
WEI-TAI CHEN
b57054b665
fix error in do_SERVINGCELLCONFIGCOMMON Function
2018-06-26 08:27:41 -07:00
WEI-TAI CHEN
89e39c8851
-Solve segmentation fault in do_MIB_NR
...
-Amend do_ServingCellConfigCommon function
2018-06-26 08:11:39 -07: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
Bing-Kai Hong
a21258ece7
Update the F1 messages and build scripts for proper generation of F1 messages
2018-06-26 10:58:46 +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
WEI-TAI CHEN
f35f127765
Add the function RCconfig_nr_gtpu
2018-06-25 04:47:10 -07:00
WEI-TAI CHEN
302aea2f15
Amend gNB L1 inst to NR
2018-06-25 03:58:15 -07:00
WEI-TAI CHEN
b1d1f4fefd
adding f10 asn1 file
2018-06-22 05:59:35 -07:00
WEI-TAI CHEN
a98bf76d19
-Solving some of warning
...
"implicit declaration of function"
"incompatible pointer type'
2018-06-22 05:42:50 -07:00
Agustin
4580ac1785
NR PDCCH development
2018-06-22 13:06:42 +02:00
WEI-TAI CHEN
5eb919e201
Modify nr_phy_config_request for testing config. module
2018-06-22 01:37:55 -07: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
WEI-TAI CHEN
041a7517b2
- Amend P5 interface structure to more like FAPI style in LTE
...
- Create PDCCH structre in FAPI, it will be one of P7 structure
- Maintain Configuration Module
2018-06-21 04:34:44 -07: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