Commit Graph
369 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
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
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
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
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
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
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
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
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
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
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
Anta Huang afb5e36c69 * update the mapping of qci to DRB 2016-06-07 15:43:43 +02:00
Cedric Roux fb6746537a bugfix: include T.h or compilation fails when T unused
(the T macro is then undefined)
2016-06-02 12:38:33 +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
Cedric Roux 2e6c04cd3f add T traces to rrc_eNB.c 2016-05-27 18:38:56 +02:00
Cedric Roux f6bfd8a397 bugfix: T_ENB_RRC_CONNECTION_RECONFIGURATION was done at the wrong place 2016-05-27 18:38:25 +02:00
Cedric Roux 0feda7fdfe add some RRC logs
- adding T macros here and there
- modify the T_messages.txt
- modify enb.c to trace them in the RRC view
2016-05-25 17:38:44 +02:00
Cedric Roux 2138a47e41 more work on enb.c
plus add rrc connection setup complete tracing
2016-05-25 16:51:33 +02:00
Navid Nikaein 05c44f1c2a merge with the develop branch 2016-05-25 09:36:15 +02:00
Navid Nikaein 3430dbc41d merge with the develop branch 2016-05-03 15:51:07 +02:00
Rohit Gupta e59f659fad Merge from bugfix-48-L1L2Signalling to develop 2016-05-02 15:12:11 +02:00
Navid Nikaein ace9df1da3 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-04-22 14:58:26 +02:00
Navid Nikaein 0ddf4208b0 disabling localization flag in RRC 2016-04-21 18:26:25 +02:00
Navid Nikaein 65cf0940e0 Merge branch 'feature-44-dedicated-drb' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-04-20 13:14:20 +02:00
Navid Nikaein 4b8251838d enabling SRB2 2016-04-20 13:14:16 +02:00
Navid Nikaein b5e3fa0521 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb 2016-04-06 19:22:19 +02:00
Navid Nikaein 0a3a8a5daf fix the dedicated DRB setup with multiple E_RAB_SETUP_REQ 2016-04-06 19:21:53 +02:00
Raymond Knopp b511419090 resolved residual warnings after merge with develop (no warnings again for lte-softmodem) 2016-04-01 09:17:37 -07: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
Navid Nikaein 15d5095914 fix a compilation error 2016-03-30 15:22:14 +02:00
Navid Nikaein b65065fa68 merge with the develop 2016-03-30 12:25:56 +02:00
Navid Nikaein ba735d181f improve the S1AP e_rab setup messages 2016-03-30 09:45:40 +02:00
Cedric Roux 600cce17c7 more warning removals 2016-03-29 12:00:57 +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