Florian Kaltenberger
e470e2d3bd
Merge remote-tracking branch 'origin/develop' into feature-21-TM7-tmp
...
Conflicts:
targets/RT/USER/lte-enb.c
2016-12-07 09:40:20 +01:00
Xenofon Foukas
8def47c488
Changed old licenses in FlexRAN agent source files
2016-12-05 22:04:12 +02:00
Rohit Gupta
045c947015
Merge branch 'develop' into feature-68-enb-agent
2016-11-25 10:08:53 +01:00
Florian Kaltenberger
abab672e49
Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7
...
Conflicts:
openair1/PHY/INIT/lte_init.c
2016-11-23 15:26:02 +01:00
Florian Kaltenberger
f446a5ea17
Merge branch 'develop' into feature-21-TM7
2016-11-22 18:24:40 +01:00
Cedric Roux
b526ef7b47
T: update a trace
...
add ndi to trace ENB_MAC_UE_DL_SDU
2016-11-22 12:04:06 +01:00
Cedric Roux
6bb69e1964
hotfix: correct Msg3 ressource blocks reservation
...
The Msg3 ressource blocks used by random access procedure
were not correctly handled. The MAC scheduler could wrongly
allocate a ressource block for both random access Msg3 and
a regular UE.
This hotfix hopefully fixes the problem.
A new function "set_msg3_subframe" has been added in the
interface between PHY and MAC.
2016-11-22 10:38:18 +01:00
Xiwen JIANG
033513034f
Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/ENB_APP/enb_config.c
2016-11-18 16:58:31 +01:00
Florian Kaltenberger
8769024922
Merge remote-tracking branch 'origin/develop' into feature-21-TM7
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/initial_sync.c
openair1/PHY/LTE_TRANSPORT/pbch.c
openair1/PHY/LTE_TRANSPORT/pilots.c
openair1/PHY/LTE_TRANSPORT/pmch.c
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/mbmssim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
openair2/ENB_APP/enb_config.c
openair2/RRC/LITE/rrc_eNB.c
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
targets/RT/USER/sched_rx_pdsch.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim_functions.c
2016-11-18 15:35:21 +01:00
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
Xenofon Foukas
c0ad88e537
Fixed bug in the creation of MAC PDUs in the local flexran scheduler
2016-11-16 16:12:30 +02:00
Xenofon Foukas
1c86e23edf
Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent
2016-11-11 08:54:56 +02:00
Xenofon Foukas
2078a9e57c
Added macros for enabling FlexRAN agent operation
2016-11-09 12:09:02 +02:00
Xenofon Foukas
cf59e0d891
Added notification messages for control delegation in dl_scheduler VSF
2016-11-08 14:40:34 +02:00
Rohit Gupta
1a99e785a0
remove warnings
2016-11-08 03:14:01 +01:00
Xenofon Foukas
83929d42f2
Refactored local FlexRAN scheduler to make further use of FlexRAN API
2016-11-05 14:09:48 +02:00
Xenofon Foukas
5864cc08cd
Integrated scheduler to overall FlexRAN agent functionality
2016-11-04 17:49:39 +02:00
Xenofon Foukas
92ef1739b1
Restructured FlexRAN agent file hierarchy
2016-11-04 17:36:45 +02:00
Xenofon Foukas
8baf3e7e57
Changed naming convention for flexran related calls
2016-11-04 17:28:04 +02:00
Xenofon Foukas
0cee514c73
Fixed problem with comment causing a bug in compilation
2016-11-04 13:19:08 +02:00
Xenofon Foukas
92fda18ab6
Added brief documentation of agent API functions
2016-11-04 12:42:10 +02:00
Xenofon Foukas
b6c7909d03
Fixed bugs related to MAC padding and RLC requests in AM mode
2016-10-24 19:14:07 +03:00
Xenofon Foukas
b218128862
Moved agent and protocol to flexran naming convention
2016-10-20 16:37:45 +03:00
Xenofon Foukas
93b9b73582
Merge remote-tracking branch 'oai/develop' into oai-integration
...
Conflicts:
cmake_targets/tools/build_helper
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/eNB_scheduler.c
2016-10-18 16:27:56 +03:00
Rohit Gupta
5725374ed4
Merge branch 'develop' into bugfix-137-uplink-fixes
2016-10-17 21:25:56 +02:00
Raymond Knopp
2e688c69ca
small bugfixes to avoid segfault in rx_sdu
2016-10-12 23:31:31 -07:00
Rohit Gupta
e084e58388
merge from develop
2016-10-11 18:52:14 +02:00
Rohit Gupta
057d7619f6
Merge branch 'feature-131-new-license' into develop
2016-10-11 17:39:26 +02:00
Rohit Gupta
4c100a291b
add license to autotest framework + delete files not used in project
2016-10-11 14:10:40 +02:00
Cedric Roux
ef67b3a0a9
hotfix: reserve RBs in Random Access Response case
...
The RBs were not marked as used. A later UE downlink scheduling
could use those RBs, messing up everything.
Not sure this is the right place to mark them used. Maybe better
to do it in the "if (!CCE_allocation_infeasible" test.
2016-10-11 12:29:15 +02:00
Rohit Gupta
b481bfd985
Merge branch 'develop' into feature-131-new-license
2016-10-10 19:25:02 +02:00
Cedric Roux
5894f3e6c2
issue 137 - remove hack: MCS reduction in case of CQI reporting
...
This hack was probably put in place in an attempt to circumvent
problems solved by previous commits.
As far as I checked (with my knowledge of the day) we can't exhaust
uplink physical bits with ULSCH data bits when there is CQI reporting
at the same time.
To be refined if this idea is proved wrong.
2016-10-10 16:40:42 +02:00
Navid Nikaein
6277038d7f
remove the OMG SUMO related files and update te top-level OMG and cmakefiles
2016-10-10 13:32:16 +02:00
Rohit Gupta
c51edecdee
Merge branch 'bugfix-136-OAI-UE-Attach-fixes' into 'develop'
...
[OAI-UE] issue#136 attach fixes:
- pusch/pucch power control
- pucch encoding call
- srb/drb add with default value
See merge request !44
2016-10-10 12:03:51 +02:00
Raymond Knopp
81ae8fb2ff
cleaned up formatting of CCE table trace in eNB_scheduler_primitives.c
2016-10-07 23:41:51 -07:00
fnabet
310a87ea90
[OAI-UE] issue#136 attach fixes:
...
- pusch/pucch power control
- pucch encoding call
- srb/drb add with default value
2016-10-07 18:30:55 +02:00
Rohit Gupta
4787c975ec
delete files with GPL License + modify build scripts
2016-10-07 18:19:43 +02:00
Rohit Gupta
73aa265793
Merge branch 'develop' into feature-131-new-license
2016-10-07 13:58:08 +02:00
Tien-Thinh Nguyen
e395164a4c
fix issues to work with multiple carriers (conga-ercom)
2016-10-04 17:02:50 +02:00
Rohit Gupta
c1490bb88d
Merge branch 'develop' into enhancement-10-harmony
2016-10-03 15:44:40 +02:00
Cedric Roux
e196210a51
remove warning: rrc_ue_generate_MeasurementReport had const qualifier
...
rrc_ue_generate_MeasurementReport calls pdcp_data_req which changes
the content of ctxt_pP.
I'm not sure of the logic at play here, so maybe removing 'const' is not
the right solution and there is a real bug...
2016-10-03 11:20:52 +02:00
Cedric Roux
494e0dc276
bugfix: forgot to reprocess files in the previous commit
2016-10-03 10:41:29 +02:00
Rohit Gupta
ec7d0ff2c3
fix compilation warnings
2016-10-02 00:24:25 +02:00
Rohit Gupta
4ac71a6e46
fixes for automatic version detection of nettle for 14.04/16.04
2016-10-01 15:03:56 +02:00
laurent
402bd21bd7
merge harmony
2016-09-30 14:40:39 +02:00
laurent
5822c850cb
small2
2016-09-30 12:34:57 +02:00
Cedric Roux
1410b3f343
hotfix: fields DLSCH_DCI and ULSCH_DCI of UE_TEMPLATE had wrong size
...
The old value was 6, it should be 8 because those fields are
casted to 'struct DCI0_5MHz_FDD' and the like and those have
a size multiple of 32 bits, that is 4 or 8 bytes as of today.
(MAX_DCI_SIZE_BITS is 45, all the shifts, muls and adds lead
to a value of 8 after this commit and 6 before.)
The problem manifested itself with a 20MHz eNB. Push the traffic,
after a while the DL harq process 0 is not used anymore.
This is because DLSCH_DCI is directly followed by nb_rb in
the structure UE_TEMPLATE and setting a value for harq process 7
did overwrite nb_rb[0], putting much too big values in there,
leading to the scheduler to always refuse to reschedule because
the required RBs are impossibly huge (I saw values of 32744, 16384,
and others).
2016-09-28 16:51:28 +02:00
Cedric Roux
b0662e4bbe
update licensing information in remaining files
...
The text has been updated in all those files.
modified: README.txt
modified: cmake_targets/CMakeLists.txt
modified: cmake_targets/at_commands/CMakeLists.txt
modified: cmake_targets/autotests/core.py
modified: cmake_targets/autotests/log.py
modified: cmake_targets/autotests/openair.py
modified: cmake_targets/autotests/run_exec_autotests.bash
modified: cmake_targets/autotests/run_exec_lte-softmodem_tests.py
modified: cmake_targets/autotests/tools/configure_cots_bandrich_ue.py
modified: cmake_targets/autotests/tools/configure_cots_huaweiE398_ue.py
modified: cmake_targets/autotests/tools/configure_usrpb210.py
modified: cmake_targets/autotests/tools/find_usb_path.bash
modified: cmake_targets/autotests/tools/free_mem.bash
modified: cmake_targets/autotests/tools/iperf3_script
modified: cmake_targets/autotests/tools/iperf3_script_phone
modified: cmake_targets/autotests/tools/iperf_script
modified: cmake_targets/autotests/tools/iperf_script_phone
modified: cmake_targets/autotests/tools/lib_autotest.py
modified: cmake_targets/autotests/tools/search_repl.py
modified: cmake_targets/build_oai
modified: cmake_targets/tools/asn1tostruct.py
modified: cmake_targets/tools/build_helper
modified: cmake_targets/tools/build_test_epc_tools
modified: cmake_targets/tools/example_enb_exmimo_mme_hss.txt
modified: cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt
modified: cmake_targets/tools/indent_source_code
modified: cmake_targets/tools/init_exmimo2
modified: cmake_targets/tools/init_nas_nos1
modified: cmake_targets/tools/perf_oai.bash
modified: cmake_targets/tools/run_enb_s1_exmimo
modified: cmake_targets/tools/run_enb_s1_usrp
modified: cmake_targets/tools/run_enb_ue_virt_noS1
modified: cmake_targets/tools/run_enb_ue_virt_s1
modified: openair2/DOCS/TEMPLATES/README/Readme.doxy
modified: openair2/DOCS/TEMPLATES/README/readme.txt
modified: openair2/Makefile
modified: openair2/UTIL/OCG/Readme.doxy
modified: openair2/UTIL/OCG/readme.txt
modified: openair2/UTIL/OSD/recep.php
modified: openair2/X2AP/MESSAGES/ASN1/asn1tostruct.py
modified: openair3/DOCS/DOXYGEN/Makefile.am
modified: openair3/DOCS/Latex/EPC/Makefile
modified: openair3/DOCS/Makefile.am
modified: openair3/GTPV1-U/Makefile.am
modified: openair3/GTPV1-U/Makefile.eNB
modified: openair3/NAS/TEST/AS_SIMULATOR/Makefile
modified: openair3/NAS/TEST/NETWORK/Makefile
modified: openair3/NAS/TEST/USER/Makefile
modified: openair3/NAS/TOOLS/Makefile
modified: openair3/NAS/UE/API/USER/Makefile
modified: openair3/NAS/UE/API/USER/tst/Makefile
modified: openair3/NAS/UE/API/USIM/Makefile
modified: openair3/S1AP/MESSAGES/ASN1/asn1tostruct.py
modified: openair3/TEST/Makefile.am
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/gpib_send.cc
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_config_exmimo.cc
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_get_frame.cc
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_get_num_detected_cards.cc
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_send_frame.cc
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_stop.cc
modified: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/oarf_stop_without_reset.cc
modified: targets/PROJECTS/E-MBMS/build_all.bash
modified: targets/PROJECTS/E-MBMS/start_enb.bash
modified: targets/PROJECTS/E-MBMS/start_ue.bash
modified: targets/PROJECTS/E-MBMS/utils.bash
modified: targets/PROJECTS/GENERIC-LTE-EPC/interfaces.bash
modified: targets/PROJECTS/GENERIC-LTE-EPC/networks.bash
modified: targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
modified: targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
modified: targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
modified: targets/PROJECTS/GENERIC-LTE-EPC/virtual_box.bash
modified: targets/SCRIPTS/install_asn1c_0.9.24.modified.bash
modified: targets/TEST/OAI/case01.py
modified: targets/TEST/OAI/case02.py
modified: targets/TEST/OAI/case03.py
modified: targets/TEST/OAI/case04.py
modified: targets/TEST/OAI/case05.py
modified: targets/TEST/OAI/case11.py
modified: targets/TEST/OAI/case12.py
modified: targets/TEST/OAI/case13.py
modified: targets/TEST/OAI/core.py
modified: targets/TEST/OAI/log.py
modified: targets/TEST/OAI/openair.py
modified: targets/TEST/OAI/test01.py
modified: targets/TEST/OAI/test02.py
modified: targets/TEST/PDCP/readme.txt
modified: targets/build_helper.bash
modified: targets/build_oai.bash
modified: targets/perf_oai.bash
2016-09-28 11:17:33 +02:00
Cedric Roux
74316f6b69
remove COPYING files
...
Most of them were the GPL.
It is useless to have a copy of the license in every
sub-directory.
From now on, there is only the LICENSE in the top
directory of the distribution.
deleted: common/utils/COPYING
deleted: common/utils/hashtable/COPYING
deleted: common/utils/itti/COPYING
deleted: common/utils/itti_analyzer/COPYING
deleted: common/utils/itti_analyzer/common/COPYING
deleted: common/utils/itti_analyzer/libbuffers/COPYING
deleted: common/utils/itti_analyzer/libparser/COPYING
deleted: common/utils/itti_analyzer/libresolver/COPYING
deleted: common/utils/itti_analyzer/libui/COPYING
deleted: openair1/COPYING
deleted: openair1/PHY/CODING/COPYING
deleted: openair1/PHY/CODING/TESTBENCH/COPYING
deleted: openair1/PHY/COPYING
deleted: openair1/PHY/INIT/COPYING
deleted: openair1/PHY/LTE_ESTIMATION/COPYING
deleted: openair1/PHY/LTE_REFSIG/COPYING
deleted: openair1/PHY/LTE_TRANSPORT/COPYING
deleted: openair1/PHY/MODULATION/COPYING
deleted: openair1/PHY/TOOLS/COPYING
deleted: openair1/SCHED/COPYING
deleted: openair1/SIMULATION/COPYING
deleted: openair1/SIMULATION/ETH_TRANSPORT/COPYING
deleted: openair1/SIMULATION/LTE_PHY/COPYING
deleted: openair1/SIMULATION/RF/COPYING
deleted: openair1/SIMULATION/TOOLS/COPYING
deleted: openair2/COMMON/COPYING
deleted: openair2/DOCS/TEMPLATES/CODE/COPYING
deleted: openair2/LAYER2/COPYING
deleted: openair2/LAYER2/MAC/COPYING
deleted: openair2/LAYER2/PDCP_v10.1.0/COPYING
deleted: openair2/LAYER2/RLC/AM_v9.3.0/COPYING
deleted: openair2/LAYER2/RLC/COPYING
deleted: openair2/LAYER2/RLC/TM_v9.3.0/COPYING
deleted: openair2/LAYER2/RLC/UM_v9.3.0/COPYING
deleted: openair2/NETWORK_DRIVER/LITE/COPYING
deleted: openair2/NETWORK_DRIVER/MESH/COPYING
deleted: openair2/NETWORK_DRIVER/UE_IP/COPYING
deleted: openair2/PHY_INTERFACE/COPYING
deleted: openair2/RRC/L2_INTERFACE/COPYING
deleted: openair2/RRC/LITE/COPYING
deleted: openair2/RRC/LITE/MESSAGES/COPYING
deleted: openair2/RRC/NAS/COPYING
deleted: openair2/RRM_4_RRC_LITE/COPYING
deleted: openair2/RRM_4_RRC_LITE/src/COPYING
deleted: openair2/RRM_4_RRC_LITE/src/radio_resources/COPYING
deleted: openair2/UTIL/BIGPHYS/COPYING
deleted: openair2/UTIL/CLI/COPYING
deleted: openair2/UTIL/FIFO/COPYING
deleted: openair2/UTIL/LISTS/COPYING
deleted: openair2/UTIL/LOG/COPYING
deleted: openair2/UTIL/MATH/COPYING
deleted: openair2/UTIL/MEM/COPYING
deleted: openair2/UTIL/OCG/COPYING
deleted: openair2/UTIL/OMG/COPYING
deleted: openair2/UTIL/OMV/COPYING
deleted: openair2/UTIL/OPT/COPYING
deleted: openair2/UTIL/OSA/COPYING
deleted: openair2/UTIL/OSD/COPYING
deleted: openair2/UTIL/OTG/COPYING
deleted: openair2/UTIL/SCTP/COPYING
deleted: openair2/UTIL/TIMER/COPYING
deleted: openair2/UTIL/TRACE/COPYING
deleted: openair2/X2AP/COPYING
deleted: openair3/COPYING
deleted: openair3/DOCS/COPYING
deleted: openair3/DOCS/DOXYGEN/COPYING
deleted: openair3/DOCS/Latex/COPYING
deleted: openair3/DOCS/Latex/DefaultBearer/COPYING
deleted: openair3/DOCS/Latex/EPC/COPYING
deleted: openair3/NAS/COMMON/API/NETWORK/COPYING
deleted: openair3/NAS/COMMON/COPYING
deleted: openair3/NAS/COMMON/EMM/MSG/COPYING
deleted: openair3/NAS/COMMON/ESM/MSG/COPYING
deleted: openair3/NAS/COMMON/IES/COPYING
deleted: openair3/NAS/COMMON/UTIL/COPYING
deleted: openair3/NAS/COPYING
deleted: openair3/NAS/TEST/AS_SIMULATOR/COPYING
deleted: openair3/NAS/TEST/COPYING
deleted: openair3/NAS/TEST/MSC/COPYING
deleted: openair3/NAS/TEST/NETWORK/COPYING
deleted: openair3/NAS/TEST/USER/COPYING
deleted: openair3/NAS/TOOLS/COPYING
deleted: openair3/NAS/UE/API/USER/COPYING
deleted: openair3/NAS/UE/API/USIM/COPYING
deleted: openair3/NAS/UE/EMM/SAP/COPYING
deleted: openair3/NAS/UE/ESM/SAP/COPYING
deleted: openair3/S1AP/COPYING
deleted: openair3/S1AP/MESSAGES/ASN1/COPYING
deleted: openair3/S1AP/MESSAGES/ASN1/R10.5/COPYING
deleted: openair3/S1AP/MESSAGES/ASN1/R8.10/COPYING
deleted: openair3/S1AP/MESSAGES/ASN1/R9.8/COPYING
deleted: openair3/S1AP/MESSAGES/COPYING
deleted: openair3/SCTP/COPYING
deleted: openair3/SECU/COPYING
deleted: openair3/TEST/COPYING
deleted: openair3/UTILS/COPYING
deleted: targets/ARCH/COMMON/COPYING
deleted: targets/ARCH/ETHERNET/USERSPACE/LIB/COPYING
deleted: targets/ARCH/EXMIMO/DEFS/COPYING
deleted: targets/ARCH/EXMIMO/DRIVER/eurecom/COPYING
deleted: targets/ARCH/EXMIMO/DRIVER/exmimo3/COPYING
deleted: targets/ARCH/EXMIMO/DRIVER/telecomparistech/COPYING
deleted: targets/ARCH/EXMIMO/USERSPACE/LIB/COPYING
deleted: targets/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT/COPYING
deleted: targets/ARCH/EXMIMO/USERSPACE/OCTAVE/COPYING
deleted: targets/ARCH/USRP/USERSPACE/LIB/COPYING
deleted: targets/COMMON/COPYING
deleted: targets/COPYING
deleted: targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/COPYING
deleted: targets/PROJECTS/COPYING
deleted: targets/PROJECTS/GENERIC-LTE-EPC/COPYING
deleted: targets/RT/USER/COPYING
deleted: targets/SIMU/PROC/COPYING
deleted: targets/SIMU/USER/COPYING
2016-09-28 10:45:02 +02:00
Cedric Roux
5ab5c3ebbd
delete bsearch.c and bsearch.h from source tree
...
they are not referenced in CMakeLists.txt (so says grep)
2016-09-27 17:01:54 +02:00