Commit Graph
345 Commits
Author SHA1 Message Date
Florian Kaltenberger 7707bacc37 Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-21-TM7
Conflicts:
	openair1/PHY/INIT/lte_param_init.c
2016-08-29 11:26:55 +02:00
Florian Kaltenberger ecdf87f1ea Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-59-tm4 2016-08-29 11:25:01 +02:00
Florian Kaltenberger ba1f969bbe changed scaling of rx_pdcch (was not working well for 2 rx antennas)
oaisim parameter -y is now UE rx antennas
minor fixes to unitary sims
2016-08-29 10:58:40 +02:00
Raymond Knopp 1309358bb5 changes for oaisim to function with new threading architecture and trx_read/trx_write emulation. Tested for 5/10 MHz TM1. Multiple-antenna mode fails. 2016-08-24 23:14:44 -07:00
Florian Kaltenberger 804cf04180 updating testcases for oaisim 2016-08-23 21:24:34 +02:00
Florian Kaltenberger b8494221bd Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-21-TM7
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/INIT/lte_param_init.c
	openair1/PHY/INIT/lte_parms.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/defs.h
	openair2/RRC/LITE/rrc_eNB.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/init_lte.c
2016-08-23 15:13:55 +02:00
Xiwen JIANG 394c4cab6a antenna number bug fixed 2016-08-22 20:06:13 +02:00
Florian Kaltenberger 7098429e3a Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-59-tm4
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
2016-08-19 16:12:36 +02:00
Xiwen JIANG 1cbb2c5caa memory allocation for calibration coefficients and dlsch ue spec bf weight 2016-08-18 19:08:51 +02:00
Raymond Knopp 5056134772 debugging of IF4p5 RRU 2016-08-04 00:58:19 +02:00
Raymond Knopp 02051f1cd5 Merge branch 'develop' into enhancement-10-harmony
Conflicts:
	openair1/SCHED/phy_mac_stub.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/RT/USER/lte-softmodem.c
2016-07-24 03:14:29 -07:00
Raymond Knopp e0f0072023 oaisim with interfaces for lte-ue/lte-enb threading compiles and runs. 2016-07-24 01:21:35 -07:00
Raymond Knopp b1e633bb94 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
Conflicts:
	openair1/PHY/defs.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2016-07-23 01:23:06 -07:00
Raymond Knopp 6e4d361eb3 commit before merge 2016-07-23 01:17:59 -07:00
Raymond Knopp af489a783b addition of asynchronous RX threads and inter CC synchronization 2016-07-20 16:32:38 -07:00
Xiwen JIANG 4763438131 bug fixed for ue_spec_bf_weights initialisation 2016-07-15 16:48:41 +02:00
Raymond Knopp 7e2a39733e modifications for oaisim. oaisim_noS1 compiles at this point. 2016-07-15 00:04:04 -07:00
lukashov b8e9e188c1 Merge branch 'develop' into feature-59-tm4 2016-07-06 15:47:45 +02:00
Xiwen JIANG 802922dcf1 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7 2016-07-05 11:22:46 +02:00
nikaeinn 957707ad39 merge with the develop branch 2016-07-05 10:58:23 +02:00
Florian Kaltenberger 91193c2c8e add tm7 case into asn1 message
set transmission mode in phy_config_dedicated_[UE|eNB] after RRCConnectionReconfiguration(eNB) and RRCConnectionReconfigurationComplete(UE)

add ue_TransmissionMode in RrcConfigurationReq

added ue_transmission_mode and nb_antenna_ports to eNB config file

transmisison mode gets set with RRCReconfiguration
2016-07-01 13:48:10 +02:00
Florian Kaltenberger cd8cc1a35c added ue_transmission_mode and nb_antenna_ports to eNB config file
transmisison mode gets set with RRCReconfiguration
2016-07-01 13:19:18 +02:00
Xenofon Foukas 615da86332 Merge remote-tracking branch 'oai/develop' into oai-integration
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/tools/build_helper
	targets/SIMU/USER/oaisim.c
2016-06-29 12:31:56 +03:00
Cedric Roux 3d78e5a34b add option --T_dont_fork to tracee (lte-softmodem, oaisim)
The T has 2 processes: the tracee and the local tracer
if the tracee dies (segfault or whatever) the tracee
may still be running.

So there is a third process that monitors those two others
and kill everything when one dies.

The problem is that this third process has to be the parent
of the two others. That makes debugging the tracee with gdb
impossible. This new option disables the third monitor process.
2016-06-28 12:50:58 +02:00
nikaeinn 641af1631f update rrc and oaisim for the dedicated bearers 2016-06-22 12:31:03 +02:00
Raymond Knopp 1f274a7b04 Merge remote-tracking branch 'origin' into enhancement-10-harmony
Merge in develop too.
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/CODING/3gpplte_sse.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
	openair1/SCHED/phy_mac_stub.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/RT/USER/lte-softmodem.c
2016-06-21 23:36:23 -07:00
Xiwen JIANG a04682d47a oaisim takes tx and rx antenna number from config file and transmission mode from the command line 2016-06-17 16:44:30 +02:00
lukashov 199434b92c Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-06-15 13:21:44 +02:00
Raymond Knopp 626d107978 Merge branch 'develop' into enhancement-10-harmony
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/SCHED/phy_mac_stub.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2016-06-14 05:41:18 -07:00
Cedric Roux 310b027acd Merge remote-tracking branch 'main/develop' into T
Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-softmodem.c
2016-06-10 11:49:59 +02:00
Cedric Roux e268281233 add T log ENB_MASTER_TICK 2016-06-09 10:40:53 +02:00
Cedric Roux d350ee329d improve the use of the variable "frame" in oaisim 2016-06-08 12:25:07 +02:00
Cedric Roux 358a37910c put local tracer in tracee
plus some cleanup here and there
2016-06-01 15:42:29 +02:00
Xiwen JIANG d621de7fb3 enable TM7 in oaisim 2016-05-30 18:38:52 +02:00
Xiwen JIANG b6e7f7ec51 tx_eNB -> ant_ports in oaisim 2016-05-30 17:58:31 +02:00
Xiwen JIANG 5370685740 Merge branch 'master' into feature-21-TM7 2016-05-30 17:13:09 +02:00
Navid Nikaein 3dc0e4dd86 * route DlInformationTransfer to SRB2 if it is active
* configure dedicated DRBs based on the transaction id
* fix the issue in oaisim to work with S1 interface
2016-05-30 13:17:34 +02:00
Raymond Knopp b188a5cfeb changed threading (acqusition is slot based). removal of eNB_thread. timing all based on received timestamp. 2016-05-26 15:14:57 -07:00
Xenofon Foukas 0f5b01457b Merge remote-tracking branch 'oai/develop' into oai-integration
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
2016-05-17 13:18:09 +01:00
Raymond Knopp d3d423f51e split phy_procedures_eNB_TX into sub-modules for better understanding. No functional differences. 2016-05-15 14:10:04 -07:00
Xenofon Foukas 104ed9ade1 Added fixes for multiple eNBs and simulation mode 2016-04-25 17:09:53 +01:00
Raymond Knopp ba020c807f oaisim compilation error, ulsim 20 MHz segfault. ulsim tests. 2016-04-21 22:28:21 -07:00
Florian Kaltenberger 2b213a0ccc Merge branch 'develop' into feature-59-tm4
Conflicts:
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-04-19 15:50:05 +02:00
Cedric Roux f9d740eee6 first commit of the T - review this commit, many things should
probably not be here.
2016-04-10 17:01:22 +02:00
Raymond Knopp 15cd4ab077 cleanup for Mdlharq usage/meaning 2016-04-06 11:27:19 +02:00
Xenofon Foukas 224ec7c4a1 Merge remote-tracking branch 'origin/develop' into agent-performance 2016-04-04 10:49:35 +01:00
Raymond Knopp e71aebc603 Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/openair2_proc.c
	openair2/RRC/LITE/rrc_eNB.c
	openair3/NAS/UE/API/USIM/usim_api.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
2016-03-31 14:36:12 -07:00
Florian Kaltenberger f5c798e48c transmission mode is now taken into account in RRC signalling
small bugfix in dlsch_demodulation
shunted out TM3-7 specific DCI generation in scheduler to enable basic operation. more work needed.
2016-03-31 11:34:32 +02:00
Cedric Roux 87d1424762 more warning removals 2016-03-29 11:50:29 +02:00
Cedric Roux 5f823b401a some more warning removals 2016-03-28 22:45:20 +02:00