maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,611 Commits 5 Branches 0 Tags
d45fcd6fc28f147eeeeac71fbb15acd95b0dffc5
Commit Graph
886 Commits
Author SHA1 Message Date
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
Cedric Roux 2e389d61a0 bugfix: bzero was not called if allocating memory 2018-06-18 11:32:57 +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
bruno mongazon acbd1f1f7d fix issue 310 IQrecplay 2018-06-04 13:05:13 +02:00
Raymond Knopp 8dd9cf3c86 creation of simulation data structure. some cleanup and testing with multiple UEs 2018-06-04 00:12:48 +02:00
Raymond Knopp 293110e2cc cleanup of warnings and default parameters for simulator target 2018-06-03 08:48:42 +02:00
Raymond Knopp 897de9f8e2 testing of rf simulation in UE 2018-06-02 10:10:35 -07:00
Bi-Ruei, Chiu f097cca7a5 Compare RRC_VERSION with MAKE_VERSION(x,y,z) macro to provide better SW configuration 
To minimize migration effort, we follow the logic of legacy macro Rel10 and Rel14 used
for conditional compilation of current code.

In the future, they might be changed to accommodate finer software configuration, e.g.
MAKE_VERSION(12,2,0) or MAKE_VERSION(13,1,0) .... etc.
 2018-05-29 18:00:58 +08:00
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
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
Cedric Roux b66b872928 integration fix: remove warnings 
Remove warnings found while running:
    ./build_oai --UE -c -w USRP

And:
    ./build_oai --basic-simulator -c
 2018-05-28 12:44:14 +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
Masayuki HARADA 91db46b6ba Merge branch 'rm917_bugfix' into sp3_master 2018-05-24 17:06:10 +09:00
Wu Jing a37c29eb80 fix rm971 bug(delete #if 0) 2018-05-24 16:44:28 +09:00
Masayuki HARADA 44210a0a88 Fix PUSCH decode failure when recieve power is too high situation. 2018-05-24 13:21:37 +09:00
Wu Jing fadba8a1ed fix rm917 bug 2018-05-22 18:42:35 +09: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
Masayuki HARADA f55bd83d55 select scheduler by config file 2018-05-17 18:27:09 +09:00
Masayuki HARADA 677ad4298c Devide source file of scheduler 2018-05-17 10:48:39 +09: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 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