Raymond Knopp
7678f88a47
Merge branch 'develop' into enhancement-10-harmony
...
Conflicts:
cmake_targets/autotests/test_case_list.xml
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair2/ENB_APP/enb_config.h
openair2/RRC/LITE/rrc_eNB.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
targets/RT/USER/lte-softmodem.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2016-09-18 22:16:29 -07:00
Rohit Gupta
2efe981eb0
Merge from develop
2016-08-04 16:36:36 +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
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
nikaeinn
957707ad39
merge with the develop branch
2016-07-05 10:58:23 +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
Cedric Roux
26c3a6a039
forgot to include T.h
...
if you compile *without* T it fails because the T macro is interpreted
as a function call
2016-06-10 12:42: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
Cedric Roux
d7e072a413
MAC tracing in the code
2016-06-10 10:46:45 +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
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
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
Cedric Roux
77363df00b
remove #warning lines (comment them out)
2016-03-26 22:52:19 +01:00
Cedric Roux
04eed3bd6e
remove "unused variable" and "set but not used" warnings
2016-03-25 23:58:58 +01:00
Navid Nikaein
0f8c20f2f5
merge with develop
2016-03-22 11:51:31 +01:00
gauthier
e44146b708
handling of timing advance is improved. MAC retrieves timing advance from phy once prior to DL scheduling and clears the statistic in PHY. A timer for controlling the timing advance periodicity was introduced.
2016-01-06 11:37:26 +01:00
Raymond Knopp
cb0eabe7df
updated unitary simulations for new CCE interfaces. Cleaned up warnings in dlsim/pdcchsim/ulsim.
2015-12-05 02:28:21 -08:00
Raymond Knopp
1fc396f57d
Merge after bad rebase
...
Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/SCHED/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.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/proto.h
openair2/PHY_INTERFACE/defs.h
2015-11-29 01:06:14 -08:00
Raymond Knopp
f48d10ba3e
Added DLSCH scheduling for subframes 0 and 5. Changes in MAC scheduling data structure to keep track of VRB allocations from SI,RA when scheduling regular DLSCH
2015-11-29 00:37:04 -08:00
Raymond Knopp
b10937db82
Moved CCE allocations from PHY to MAC and updated MAC interfaces for BCCH/RA/UE-SPEC scheduling.
2015-11-24 14:35:20 -08:00
ABEILLE
4f35207900
merged in changes from abeille (modifications on final svn version)
2015-11-24 14:35:20 -08:00
Navid Nikaein
9ff6bb7a5d
Protocol implementation for dedicated E-RABSetup.
...
Test of dedicated bearer setup in both control and data plane.
2015-11-19 16:58:27 +01:00
Raymond Knopp
2fe218e91a
Moved CCE allocations from PHY to MAC and updated MAC interfaces for BCCH/RA/UE-SPEC scheduling.
2015-11-18 14:18:58 -08:00
Navid Nikaein
2a30567223
Additional RRC procedures (RRCConnectionReconfiguration) for dedicated bearer estatblishment triggered by S1AP messages.
...
eNB mac scheduler for dedicated DTCH.
UE MAC logical channel prioritization with additional DTCH.
S1AP messages for dedicated bearer establishment (eNB and UE).
2015-11-09 12:03:11 +01:00
ABEILLE
33860c1604
merged in changes from abeille (modifications on final svn version)
2015-10-19 19:29:04 +02:00
gauthier
c7518ecf42
SVN to GIT migration (removed EPC software, updated mailing list address in all files)
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7885 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-10-06 16:24:54 +00:00
knopp
1ad336faa8
commiting a patch on behalf of Raymond that fixes the some timing issues in the HARQ process
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7800 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-09-04 10:28:52 +00:00
navid
a7c0adc445
adjusting the log levels
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7647 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-24 09:41:36 +00:00
knopp
8bf9ba333f
some bugfixes for PUSCH and PUCCH power control
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7617 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-22 08:04:30 +00:00
knopp
550ef12a5e
FK/RK, added power control for PUCCH
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7613 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-06-20 18:46:55 +00:00
Navid Nikaein
920f56da11
few fixes in eNB scheduler contributed by INNOV
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7499 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-05-29 13:13:34 +00:00
Cedric Roux
7b94edd81f
Adding CC_id to LOG_* messages wherever it seemed pertinent.
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7464 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-05-22 13:48:16 +00:00
Navid Nikaein
24cbca8bf4
revert the eNB_index in MAC-RLC-PDCP-RRC APIs for cases when a UE is connected to more than 1 e
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7449 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-05-21 13:08:26 +00:00
Lionel Gauthier
737623201b
Sebastian Held patches15/0045-reformatted.patch
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7347 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-30 09:51:11 +00:00
Lionel Gauthier
b4a2c3a572
Sebastian Held patches15/0028-fix-compiler-warnings.patch
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7330 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-30 09:41:01 +00:00
Navid Nikaein
b6d8faefa9
Wireshark interface for MAC/RLC/PDCP/RRC of lte-softmodem (re-committing)
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7257 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-23 10:40:49 +00:00
Lionel Gauthier
2944c762a5
VCD can now become optional
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7159 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-14 10:44:50 +00:00
Lionel Gauthier
56c9000558
branch LG_PRE_RELEASE_0.3 reintegration
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7117 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-10 13:18:11 +00:00
Lionel Gauthier
059a0a3fdc
astyle --recursive --indent=spaces=2 --style=kr --indent-col1-comments --break-blocks --convert-tabs --max-code-length=200
...
This is done for better merging branch/LG_PRE_RELEASE_0.3 into trunk (same process is applied on this branch)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7073 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-04-09 09:29:12 +00:00
Navid Nikaein
e66f7865ce
* Wireshark support for MAC/RLC/PDCP/RRC of lte-softmodem (option -W, and -P [file])
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6930 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-03-27 15:40:27 +00:00
Raymond Knopp
59eaee007b
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6635 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-02-27 16:37:11 +00:00
Raymond Knopp
90346d26c0
fixed issues in subframe 5 RE allocation when PDSCH overlaps PSS/SSS, Basic UE functionality on USRP, RK
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6596 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-02-22 17:25:43 +00:00
Raymond Knopp
4ea7540131
Applications of S. Held (IMST) from 16.02.15, modifications in lte-ue.c for FDD transmission, patches from D. Panaitopol (Thales) in prach.c, RK
...
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6580 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-02-18 20:37:02 +00:00
Navid Nikaein
9ba19119a5
* adding additional tests for 10MHz and 20MHz channel BW
...
* applying patches 8 and 9 contributed from S. Held
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6536 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-02-12 15:03:13 +00:00
Florian Kaltenberger
3a5df0014c
enabling timing advance command by default
...
tweak in timing advance parameters
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6410 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-01-16 16:25:48 +00:00
Navid Nikaein
c76b846beb
* fix few bugs in oaisim and UL scheduling
...
* update the CBA operation (non standard feature)
* update OTG
* add a set of templates for different combination of packet sizes and inter-departure time
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6351 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2015-01-12 23:54:15 +00:00
Navid Nikaein
ee3d40640c
* add some functions for terminal localizations
...
* fix few issues with the pre-ci tests
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6253 818b1a75-f10b-46b9-bf7c-635c3b92a50f
2014-12-11 17:39:37 +00:00