maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,397 Commits 5 Branches 0 Tags
2f2f21d2aafbd8a01d4ec08c19c7667dab96acea
Commit Graph
3129 Commits
Author SHA1 Message Date
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
Cedric Roux 4ba4d43aa6 set proper default values for puSch10xSnr and puCch10xSnr 
20 was wrong, it means 2 dB.

200 is a bit high on my setup. Today the code hardcodes the noise
level as 30dB and a target of 20dB above noise is chosen by default.
Some more work is needed to estimate the real noise level. Some
more work is needed to set proper defaults.
 2018-06-18 12:51:02 +02:00
Cedric Roux 437bd9cbe1 minor: cleaner indentation 2018-06-18 11:33:47 +02:00
Cedric Roux 2e389d61a0 bugfix: bzero was not called if allocating memory 2018-06-18 11:32:57 +02:00
Bing-Kai Hong 05c0ab1a76 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-06-15 14:33:25 +02:00
Cedric Roux cce51f69bc set value of pucch_n1_AN to 0 everywhere by default 
Since now pucch_n1_AN is taken from the configuration file,
it has to be set to 0. Value 32 will not work well, at least
in FDD. This has to be handled properly at some point
(do not use uplink resource blocks used by PUCCH for PUSCH).
 2018-06-14 16:51:53 +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
Raymond Knopp c2ad982b76 vcd debugging for RF simulator 2018-06-05 05:47:43 -07:00
Raymond Knopp f1ddab49dc Merge branch 'enhancement-rfsim' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-rfsim 2018-06-05 01:36:58 -07:00
Raymond Knopp 74c7d3efc4 Merge branch 'develop' into enhancement-rfsim 
Conflicts:
	targets/RT/USER/lte-uesoftmodem.c
 2018-06-04 22:33:07 -07:00
Raymond Knopp 6416c6d4ea minor changes to remove global variable in dci handling 2018-06-04 22:31:43 -07:00
bruno mongazon acbd1f1f7d fix issue 310 IQrecplay 2018-06-04 13:05:13 +02:00
sharma 3c1c5a1508 merge in changes from local copy which were made just prior to Orange Research Day demonstration 2018-06-04 08:15:16 +02:00
Raymond Knopp 79de529592 removed undef in lte-softmodem.h 2018-06-04 01:36:11 +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
Raymond Knopp eb363157c6 moved simulation target into lte-uesoftmodem with --simL1 option 2018-05-30 17:49:55 -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
Florian Kaltenberger 9edcd9b961 Merge remote-tracking branch 'origin/develop' into oai_ue_fixes 2018-05-29 01:06:54 -07: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
Florian Kaltenberger 81ac396187 Merge branch 'develop' into oai_ue_fixes 2018-05-22 06:25:09 -07: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 ff604660fe delete UE_EXPANSION route 2018-05-18 10:58:26 +09: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 f9aac56e84 fix: let ue_ip.ko compile 
MAX_MOBILES_PER_ENB cannot be used to compile ue_ip
because it is defined in platform_constants.h and this
cannot be included to compile a kernel module.

Let's use NUMBER_OF_UE_MAX as it was before instead.
 2018-05-15 17:43:35 +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
Cedric Roux 96b1d47552 Merge remote-tracking branch 'origin/fix-rdtsc' into develop_integration_2018_w19 2018-05-15 15:30:53 +02:00
Cedric Roux a42e2de0e0 Merge remote-tracking branch 'origin/bugfix-add-error-indication-handling' into develop_integration_2018_w19 2018-05-15 15:23:00 +02:00
Wang Tsu-Han 7e10daaf14 bug fix for phy-test DL 2018-05-15 15:21:32 +02:00
Cedric Roux f7b3ea03a3 fix: hacks to have the UE functional again 
The new 'basic simulator' is now functional.
A proper solution is needed to deal with SIB18/19/21
for the D2D functionality.
 2018-05-15 12:09:31 +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 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 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
Rajeev Gangula 899f50456e Changed config files to update ul channel SNRs. 2018-05-14 10:28:30 +02:00
Cedric Roux ad46183e23 fix rdtsc usage 
One user had a problem compiling oaisim.
This commit fixes it.

The compilation log was saying:

    targets/RT/USER/lte-ue.c:
    In function UE_thread_rxn_txnp4:

    openair2/UTIL/LOG/log.h:370:3:
    error: inconsistent operand constraints in an asm

         __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));

         ^
 2018-05-11 14:21:05 +02:00
Haruki NAOI bb6d116551 Merge remote-tracking branch 'remotes/origin/rm902_bugfix_sp3_master_base' into sp3_master 2018-05-10 12:52:43 +09:00