maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,865 Commits 5 Branches 0 Tags
671aa4e11af6462cb789f92157a0d2af20d6f7f3
Commit Graph
15 Commits
Author SHA1 Message Date
Raymond Knopp 671aa4e11a Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 2018-08-24 14:48:04 +02:00
Raymond Knopp b7b48fd6c7 beamforming debugging after fronthaul testing 2018-08-24 10:32:03 +02:00
Raymond Knopp f7dfb6c6b2 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement 
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.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
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
 2018-08-07 19:44:53 +02:00
Wang Tsu-Han aa00a4734a reset for remerging 2018-07-30 11:24:08 +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 5e991ecc3d fixed compilatiaon issues after merge with develop and enhancement-rfsim. Intitial testing with emulator. 2018-06-10 17:10:16 -07:00
Raymond Knopp 45dc7ed608 Merge branch 'enhancement-rfsim' into ru_rau_enhancement 
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_config.c
	targets/SIMU/USER/oaisim_functions.c
 2018-06-10 15:14:09 -07: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
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
Raymond Knopp 596736afae dlsim/ulsim functional. lte-softmodem/lte-uesoftmodem compile. 2018-04-24 22:14:20 -07:00
Raymond Knopp 68b86d5f6f fixes after merge with develop 2018-04-24 02:01:48 -07:00
Raymond Knopp 83b2f1c01c Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit 
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.h
 2018-04-23 23:08:10 -07:00
Raymond Knopp 861d06e855 UE directory splits, creation of UE-specific files, common UE/eNB files and extraction of UE/common components from eNodeB files. renaming of files to minimize common names across directories (i.e. defs.h, vars.h, extern.h) 2018-04-22 11:33:43 -07:00
Raymond Knopp 551f32cc20 more splitting eNB/UE files/directories 2018-04-08 13:00:08 -07:00