Commit Graph
6070 Commits
Author SHA1 Message Date
Rajeev Gangula c5c66eeb4a Merge branch 'develop' into ulSNRs
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/mac.h
2018-05-29 09:50:05 +02:00
Haruki NAOI a3329b562c Merge commit '8471bd14e2e400887e7419d3307921a1401e2823' into mu_with_tdd1
# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/phy_procedures_lte_eNb.c
2018-05-29 14:52:19 +09:00
Haruki NAOI f5239e0905 Merge remote-tracking branch 'remotes/origin/ues_test' into mu_with_tdd1
# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/fapi_l1.c
#	openair1/SCHED/phy_procedures_lte_eNb.c
2018-05-29 14:32:13 +09:00
Masayuki HARADA 8471bd14e2 Merge remote-tracking branch 'origin/sp3_master' into scd_refactoring 2018-05-29 14:30:02 +09:00
Haruki NAOI 18bd37f913 Revert "Fix: TDD uci_procedures misdeal pucch format1a."
This reverts commit c652a883ff.
2018-05-29 14:29:00 +09:00
Masayuki HARADA fb054e6523 Merge branch 'sp3_master' into scd_refactoring
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2018-05-29 14:24:25 +09:00
Raymond Knopp b036b18afe moved sidlink L1 functions to LTE_UE_TRANSPORT, corrected issue related to "find_dlsch" which is needed to compile UE and creates problem for unitary simulations (moved to lte-ue.c application) 2018-05-28 11:09:38 -07:00
WEI-TAI CHEN 45519c9249 Merge feature-s1ap-r14-based-on-new-asn1c 2018-05-28 08:17:07 -07:00
Raymond Knopp d9568d2c06 bugfix after merge 2018-05-28 15:31:14 +02:00
WEI-TAI CHEN 33d67f2453 merge S1AP 2018-05-28 05:07:25 -07:00
Raymond Knopp 8a11946f73 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 2018-05-28 11:53:34 +02:00
yilmazt 054ac83d2b Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-24 18:53:08 +02:00
yilmazt 8b38bfc7c5 General modifications for polar coding, and deleting duplicate functions. 2018-05-24 18:44:01 +02:00
Cedric Roux ed49592754 integration fix: remove warnings
Remove warnings popping up on:
    ./build_oai --eNB -w USRP

Maybe not always the best solution.
2018-05-24 17:15:42 +02:00
Guy De Souza 065614f0a0 RE jump fix 2018-05-24 16:45:05 +02:00
Guy De Souza 5e980ccd37 PBCH RE mapping fix 2018-05-24 15:05:03 +02:00
Haruki NAOI 14740aec74 Merge remote-tracking branch 'remotes/origin/rm916_bugfix' into sp3_master 2018-05-24 21:22:38 +09:00
Haruki NAOI c652a883ff Fix: TDD uci_procedures misdeal pucch format1a. 2018-05-24 20:08:27 +09:00
Haruki NAOI ab32cefbe2 Revert "fix DLSCH no retransmission"
This reverts commit 24c669f394.
2018-05-24 20:01:37 +09:00
Guy De Souza 21fdaecfa0 Merge branch 'nr_initialsync' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_initialsync 2018-05-24 11:25:57 +02:00
Guy De Souza 12f4c55ff0 PBCH RE mapping 2018-05-24 11:25:15 +02:00
Masayuki HARADA 44210a0a88 Fix PUSCH decode failure when recieve power is too high situation. 2018-05-24 13:21:37 +09:00
Florian Kaltenberger 81ac396187 Merge branch 'develop' into oai_ue_fixes 2018-05-22 06:25:09 -07:00
jftt_wangshanshan 843e7c8fc4 Change SR detection for TDD for compliance with FDD. (try) 2018-05-21 16:43:12 +08:00
yilmazt cded3bd65b polartest sync update 2018-05-19 18:24:18 +02:00
Wang Tsu-Han a34dc257aa diable worning of MAC not having the rnit with phy-test mode 2018-05-18 16:57:15 +02:00
Guy De Souza 2ef63f24a9 PBCH generation/coding/Modulation 2018-05-18 16:38:41 +02:00
Guy De Souza 860c99071d Polar encoding init 2018-05-18 09:23:15 +02:00
Masayuki HARADA ff604660fe delete UE_EXPANSION route 2018-05-18 10:58:26 +09:00
Guy De Souza 5cf8d93a09 NR Polar imports 2018-05-17 11:50:47 +02:00
Guy De Souza 313cab3d56 nr_transport.h creation 2018-05-17 11:30:38 +02:00
Guy De Souza d6bbce2194 Minor changes: loop declarations 2018-05-17 10:46:51 +02:00
Guy De Souza 382348adf4 PBCH generation layout 2018-05-17 09:42:16 +02:00
Masayuki HARADA 677ad4298c Devide source file of scheduler 2018-05-17 10:48:39 +09:00
Guy De Souza 5b970ac4a0 lte-softmodem NB_timing fix 2018-05-16 17:21:15 +02:00
Wang Tsu-Han 4fdbfc31ee adding timing check for emulate-rf 2018-05-16 16:18:50 +02:00
Guy De Souza 3ac00170b2 Compiling version- Merge with UE directory split 2018-05-16 11:37:57 +02:00
Cedric Roux 343bbbac68 Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.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/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.c
	openair2/PHY_INTERFACE/defs.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/SIMU/USER/oaisim_functions.c
2018-05-15 17:43:12 +02:00
Wang Tsu-Han 7e10daaf14 bug fix for phy-test DL 2018-05-15 15:21:32 +02:00
Masayuki HARADA de1996ec3e change compile option from UE_EXPANSION to UE_EXPANSION,PHY_TX_THREAD,PRE_SCD_THREAD. 2018-05-15 17:37:43 +09:00
Cedric Roux 11a1dd090c fix: hack to have the UE compile
This is a quick and dirty solution, something better is needed.
2018-05-15 09:55:11 +02:00
Wu Jing 24c669f394 fix DLSCH no retransmission 2018-05-15 14:52:39 +09:00
Wu Jing 38363b10e3 fix rm916 bug 2018-05-15 14:42:33 +09:00
Cedric Roux 351ca5e726 Merge remote-tracking branch 'origin/basic-simulator' into develop_integration_2018_w19
Conflicts:
	openair1/PHY/LTE_TRANSPORT/prach.c
	targets/RT/USER/lte-ue.c
2018-05-14 17:30:18 +02:00
Cedric Roux 7da4367cb7 Merge remote-tracking branch 'origin/fix-remove-lte-ran-file' into develop_integration_2018_w19
Conflicts:
	openair1/PHY/defs_eNB.h
2018-05-14 16:34:50 +02:00
Cedric Roux 68479fa4f8 Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19
Status so far:
- monolithic eNB compiles and is functional with 1 UE in FDD, 5/10/20MHz.
  For 20MHz we don't have a nice TCP downlink (on haswell).
- oaisim does not compile
- UE does not compile
- phy simulators don't compile
- many new warnings

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED/pusch_pc.c
	openair1/SCHED/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_mch.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/ra_procedures.c
	openair2/LAYER2/MAC/ue_procedures.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_defs.h
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
2018-05-14 16:28:04 +02:00
Wang Tsu-Han db7b1f5903 phy test fix 2018-05-14 11:18:41 +02:00
Raymond Knopp 0ad9ab947c dmrs-based OTA synchronization for RU 2018-05-13 15:53:59 -07:00
Raymond Knopp fe861bf49e compilation passes and 1 UE simulation ok. 2018-05-13 05:16:57 -07:00
Raymond Knopp 0b89046a81 Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement 2018-05-13 00:47:48 -07:00