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
b635612305
Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-59-tm4
2016-08-23 11:08:44 +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
Rohit Gupta
ba9f88f7dc
Merge branch 'develop' into enhancement-10-harmony
2016-08-22 23:02:58 +02:00
Florian Kaltenberger
c2e106fe86
Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-59-tm4
2016-08-22 10:12:56 +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
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
Florian Kaltenberger
4d49b5d22b
Merge branch 'develop' into feature-59-tm4
2016-08-19 11:33:30 +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
Raymond Knopp
b9e550812a
addition of handling of UE list MAC when RRC cannot add a UE context.
2016-08-06 19:28:45 +02:00
Xenofon Foukas
849639f3a2
Merge remote-tracking branch 'oai/develop' into oai-integration
...
Conflicts:
cmake_targets/tools/build_helper
openair1/SCHED/phy_procedures_lte_eNb.c
2016-07-25 12:46:12 +03: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
da4e5fa7fd
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2016-07-24 02:40:07 -07:00
Raymond Knopp
89a9be9b9f
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
...
Conflicts:
openair1/SCHED/phy_procedures_lte_ue.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
2016-07-14 12:52: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
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
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
Xenofon Foukas
71c047d1ae
Revert to single eNodeB for simulation
2016-06-29 12:32:19 +03: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
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
Raymond Knopp
a3e1aed459
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2016-06-22 15:04:57 -07: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
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
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
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
Raymond Knopp
1654af9a63
removed some traces that flooded the screen. Added UE information in PHY/MAC/RRC to indicate status of active/failing UEs every 10.24 seconds.
2016-06-08 00:28:16 +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
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
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
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
d9761e7adc
added missing structure element in eNB_RRC_UE_t : ue_release_timer_thres
2016-05-16 05:47:02 -07:00
Raymond Knopp
7f9421e4ce
RRCConnectionSetupComplete-Timer
2016-05-13 02:15:09 -07:00