Bing-Kai Hong
9f098a3461
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-09-10 15:33:03 +02:00
Raymond Knopp
1daed67012
Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
...
Conflicts:
common/utils/T/T_IDs.h
common/utils/T/T_messages.txt
2018-09-04 09:28:35 +02:00
Raymond Knopp
c56eb9eda7
addition of configuration (DU) for F1AP and filling of F1AP_SET_REQ parameters
2018-09-04 07:40:04 +02:00
Bing-Kai Hong
3021cf114d
F1 & MAC:
...
1. Fix UE_CONTEXT_SETUP_REQUEST and CONTEXT_MODIFICATION_REQUEST encode/decode
2. Add gNB_DU_CONFIGURATION_UPDATE and gNB_CU_CONFIGURATION_UPDATE procedure
3. Add C_RNTI_TO_BIT_STRING function
4. Add INITIAL_UL_RRC_MESSAGE_TRANSFER procedure and with mac_du_data_ind (MSG3)
5. Add GNB-CUSystemInformation extension part for the F1SetupResponse procedure
2018-08-31 15:55:42 +02:00
Cedric Roux
c22180ff31
Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
2018-08-31 12:55:28 +02:00
Cedric Roux
7654f8a208
Merge remote-tracking branch 'origin/issue_344_segv_trace_wireshark' into develop_integration_2018_w35
2018-08-31 12:43:33 +02:00
Cedric Roux
d52de8e482
Merge remote-tracking branch 'origin/341-modulation-bugfix' into develop_integration_2018_w35
2018-08-31 12:12:53 +02:00
Cedric Roux
536b4a88b1
Merge remote-tracking branch 'origin/cqiSchedule' into develop_integration_2018_w35
2018-08-31 12:04:28 +02:00
Cedric Roux
27322602e9
Merge remote-tracking branch 'origin/336-fhg-embms-changes' into develop_integration_2018_w35
2018-08-31 11:42:26 +02:00
Rajeev Gangula
9f6d466fff
Uncommemnt rrc_mac remove function.
2018-08-27 14:43:32 +02:00
Raymond Knopp
9399dd9735
try to merge with issue 341 to pass USRP/FDD test
2018-08-25 02:22:44 +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
WANG Tsu-Han
f65c390226
warning removal
2018-08-23 18:34:50 +02:00
laurent
d5f28018ed
fix 344
2018-08-23 13:06:17 +02:00
Raphael Defosseux
d12a54a774
Removed unused variable
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-08-23 10:40:28 +02:00
WANG Tsu-Han
30cc9c1c66
adding half fill mechanism into accelorated modulation
2018-08-22 15:36:43 +02:00
WANG Tsu-Han
f1e041ad98
bug fix for 25RBs with new modulation scheme and add config for 5 & 10 MHz with phy-test
2018-08-21 15:18:05 +02:00
Rajeev Gangula
849be5f9f7
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2018-08-20 16:11:44 +02:00
Rajeev Gangula
86f4d8c18f
Remiving CQI scheduling on special SFs.
2018-08-20 14:17:19 +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
Robert Schmidt
44e444b3a2
Add missing break in switch statement in set_ul_DAI()
2018-08-13 14:38:32 +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
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
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
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
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
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
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
laurent
912e579100
merge with others
2018-07-03 15:31:29 +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
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
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
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
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
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
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