Commit Graph
974 Commits
Author SHA1 Message Date
Xiwen JIANG fbfb756ca1 Merge branch 'master' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_config.c
2016-11-17 16:36:22 +01:00
Cedric Roux 64cd0076ba bugfix: print a warning when a configuration parameter is not found
If your configuration file does not contain a parameter
the softmodem only printed "Failed to parse eNB configuration file"
without telling you what parameter was not found.

This quick fix adds a warning in such cases.

It also exists at the first error rather than trying to
parse the rest of the configuration file.
2016-09-05 11:41:48 +02:00
Cedric Roux 85e562d0b9 hotfix: fix a silly bug 2016-09-01 12:18:19 +02:00
Xiwen JIANG 6072a8b0ef Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7
Conflicts:
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c
2016-08-30 16:22:18 +02:00
Florian Kaltenberger 35893b74bc Merge remote-tracking branch 'origin/develop' into enhancement-16-tm_rrc_reconfig
Conflicts:
	openair2/RRC/LITE/rrc_eNB.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
2016-08-30 15:53:46 +02:00
Navid Nikaein feb361b4d0 update the logging when the pdcp instance is not configured 2016-08-30 11:30:01 +02:00
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 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
Navid Nikaein 895775e52c revert the amount of mem block to its previous value 2016-08-27 21:23:04 +02:00
Rohit Gupta 56db03f76b Merge branch 'feature-44-dedicated-drb' of gitlab.eurecom.fr:oai/openairinterface5g into feature-44-dedicated-drb 2016-08-23 18:22:10 +02:00
Xiwen JIANG fc1e26d074 add VCD by function name for beam precoding and do_ofdm_l 2016-08-23 18:21:45 +02:00
Rohit Gupta de51b52b08 Merge branch 'develop' into feature-44-dedicated-drb 2016-08-23 18:15:17 +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
nikaeinn 94801f7966 add more memory blocks for RLC and remove some logs in S1AP 2016-08-23 13:29:38 +02:00
Florian Kaltenberger 2656709fcb Merge branch 'develop' into enhancement-16-tm_rrc_reconfig 2016-08-23 11:44:26 +02:00
Florian Kaltenberger 9bf890cc89 changed feedback mode for TM4
set CQI_report_periodic to <release/> (was NULL before)
use memcopy for configuration structure
2016-08-23 11:04:58 +02:00
nikaeinn 022ab574d2 fix the issue with the number of pending mme/s1ap connections 2016-08-22 17:20:00 +02:00
Florian Kaltenberger 0b4759202e added codebook subset restriction to antenna info in RRCConnectionReconfiguration message 2016-08-22 10:10:59 +02:00
Cedric Roux 4086c585d5 Merge branch 'bugfix-i17-s1ap-ue-capabilities' into 'develop'
Bugfix i17 s1ap ue capabilities



See merge request !39
2016-08-22 09:46:52 +02:00
Cedric Roux f4e97b50fa download asn1c from oai gitlab
the official asn1c repository at github posed problems to
some people in the past. It's better to have it locally
for such a critical piece of the software.
2016-08-18 15:29:33 +02:00
Cedric Roux 4b32194719 fix internal issue 17 2016-08-18 13:03:42 +02:00
nikaeinn bb02b07c0f Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-08-18 09:33:59 +02:00
Florian Kaltenberger 873eb05b37 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2016-08-12 09:41:39 +02:00
Cedric Roux 696d92f04d bugfix: forgot to include T.h 2016-08-10 17:13:31 +02:00
Cedric Roux 3d64a195ef T: add a trace (random access downlink msg4) 2016-08-10 17:09:15 +02:00
Florian Kaltenberger f565b9c22a Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2016-08-02 15:40:37 +02:00
Rohit Gupta 05192acbb0 Merge branch 'develop' into feature-44-dedicated-drb 2016-07-30 20:44:23 +02:00
Cedric Roux b07efe7a01 add trace ENB_MAC_UE_DL_PDU_WITH_DATA to trace downlink pdu 2016-07-27 11:36:35 +02:00
Cedric Roux 833714406c hotfix: RLC AM reported wrong number of bytes to retransmit
This was causing oaisim to fail way too often at the startup
of a connection.

Things should go better with this patch.

It may not be the end of the story, the use of retrans_num_bytes_to_retransmit
is not clear to me. The problem I see is: what if the max number of
retransimission has been reached (if that has a meaning at all in RLC AM)?
will this value be decreased or not?
2016-07-20 17:54:21 +02:00
Rohit Gupta da1d8230f0 Merge branch 'develop' into feature-44-dedicated-drb 2016-07-12 19:44:00 +02:00
Florian Kaltenberger c46eacadc5 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2016-07-11 22:24:38 +02:00
Cedric Roux d48c336934 hotfix: better management of s-tmsi reconnect
The code was changing the rnti in the red-black tree without
removing/reinserting the context. This is wrong because the
rnti is a key of the red-black tree and you cannot change the
key in a stored item at will.

There are also modifications of the function mac_eNB_rrc_ul_failure
which has to remove the UE in any case.

And rrc_mac_remove_ue has been changed for the case where
the UE is not found.
2016-07-11 12:47:31 +02:00
Aikaterini Trilyraki f9fda301fd adding two rules for run_enb_ue_virt_s1 script to resolve the issue of data path with simulated UE (contributed by A. Ksentini) 2016-07-08 12:37:55 +02:00
Aikaterini Trilyraki 49e6a2b720 add T for all lcids 2016-07-07 17:15:10 +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 7463f71b48 mostly bugfixes 2016-07-01 13:20:15 +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
Rohit Gupta 652fafd0ec Merge branch 'develop' into bugfix-9i-opt-wireshark 2016-06-29 12:19:18 +02:00
Cedric Roux d0c99c296e Merge branch 'develop' into T 2016-06-28 13:21:32 +02:00
Xiwen JIANG 224498cf3b add ue_TransmissionMode in RrcConfigurationReq 2016-06-24 18:13:02 +02:00
Xiwen JIANG 95808aec10 add ue_TransmissionMode in RrcConfigurationReq 2016-06-24 18:11:21 +02:00
Cedric Roux bc20616af7 minor: parameters missing to some LOG_ macros plus some cleanup 2016-06-24 17:51:00 +02:00
Xiwen JIANG 4fa0810cdd add tm7 case into asn1 message 2016-06-24 12:20:38 +02:00
Cedric Roux bfa749a7fa hotfix: rrc_mac_remove_ue was wrong 2016-06-24 10:58:29 +02:00
Cedric Roux 6445cc95f5 add T traces for MAC PDU/SDU including full buffers 2016-06-23 12:39:57 +02:00
Cedric Roux 0d6c4a31f9 hotfix: include T.h before redefining VCD macros 2016-06-23 09:53:26 +02:00
nikaeinn 641af1631f update rrc and oaisim for the dedicated bearers 2016-06-22 12:31:03 +02:00
Florian Kaltenberger 2e2f6f9c20 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-06-21 15:33:57 +02:00