Robert Schmidt
cc8da80fbc
Remove EXMIMO leftover
...
- Remove all files referencing EXMIMO
- Remove all targets/variables/defines that seem to be related to EXMIMO
2022-10-14 09:14:18 +02:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
francescomani
a1e3b5476b
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-05-27 11:52:12 +02:00
Melissa Elkadi
2c8aab0671
Included PHY channel parameter handling
...
Also, updated openairinterface5g_limits.h to match develop branch.
2021-02-17 16:04:00 -08:00
Melissa Elkadi
ecaa20ed14
Re-do fix for merge issues
2021-02-15 15:08:46 -08:00
Melissa Elkadi
bc524ea192
Minor fixes and new definitions for build success
2021-02-15 09:00:22 -08:00
Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +01:00
Raymond Knopp
edff477050
reduced 5G memory limits for CI
2021-02-07 09:40:22 +01:00
Raymond Knopp
7cbf24d36c
updates for tracing
2021-01-03 12:28:24 +01:00
Raymond Knopp
1b95baaf4c
update F1AP to R16.3.1. testing with OTA eNB
2021-01-01 21:45:23 +01:00
Michael Cook
cb84581678
Set max UEs to 40 (was 20)
2020-12-13 09:19:03 -08:00
masayuki.harada
be31d514b4
Fix warning and compile error.
2020-11-17 22:09:41 +09:00
Robert Schmidt
4c7035e6e3
Remove UESIM_EXPANSION
...
This completely removes the UESIM_EXPANSION define: it does not compile
at the moment. Its function was to multiplex multiple UEs on the same
TUN interface. However, this functionality is not needed since it is
possible to allocate many TUN devices (i.e., >= 32).
2020-10-13 09:07:46 +02:00
Andrew Burger
a67379ea52
platform constants change
2020-09-21 18:13:27 -07:00
Andrew Burger
516de3ae9c
fixing remove ul_config_req pdu func
2020-09-19 11:30:03 -07:00
Andrew Burger
915be291cb
Damn Fujitsu
2020-09-08 14:57:55 -07:00
Raymond Knopp
f3a27d762a
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-gnb.c
openair1/PHY/defs_gNB.h
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/COMMON/platform_constants.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/main.c
targets/COMMON/openairinterface5g_limits.h
2019-11-28 06:35:31 +01:00
Raymond Knopp
868b673915
removed NUMBER_NR_UE_MAX
2019-10-18 09:00:39 +02:00
Florian Kaltenberger
2f402b1055
reducing number of UEs to save memory
2019-09-06 18:11:54 +02:00
yilmazt
4967e1b1ac
develop&-nr up-to-date as of 30.7.19
2019-07-30 22:01:48 +02:00
Wu Jing
f8dc571bd9
fix assert issue when uci array is full if doing Attach/Detach
2019-06-13 11:34:08 +09:00
yilmazt
a2cad44f0f
Merging latest develop-nr commits
2019-06-06 21:44:15 +02:00
Florian Kaltenberger
7e57a8428e
fixing some more bad merges
2019-06-01 04:08:00 +02:00
yilmazt
ccd60195e0
Merging test-x310, ci-dev-nr-add-gnb-nr-ur-uspr-testing and nr-mimo-mode-clean branches
2019-05-20 21:32:34 +02:00
Raymond Knopp
da9b879112
Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
...
Conflicts:
openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
yilmazt
7719314983
Merge branch 'develop' into develop-nr
2019-05-17 17:11:31 +02:00
Laurent
7a5214c6b4
fix 4G merge issues
2019-05-14 16:16:57 +02:00
Raymond Knopp
069ce10a2e
NR FAPI interface additions for DLSCH (SDU pointer now does down to L1)
2019-05-11 23:57:11 +02:00
Florian Kaltenberger
40b52195fc
redefining max number of UEs for memory allocation. Using the PHYSIM macro, different allocations are used for phy_simulators and real-time modem.
2019-03-26 16:16:34 +01:00
Raphael Defosseux
8260607ed6
CI: fix in L2-simulator VM build start script
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-01-22 21:37:40 +01:00
Y_Tomita
b60e861b14
Add --musim option for L2 FAPI simulator.
2018-10-25 22:09:33 +09:00
Y_Tomita
66dad294a5
Change define NUMBER_OF_UE_MAX to avoid unexpected access.
2018-10-24 18:26:24 +09:00
Florian Kaltenberger
cc002b823f
Merge branch 'develop-nr-merge' into develop-nr
...
lte-softmodem, lte-uesoftmodem, nr-softmodem, nr-uesoftmodem, polartest, ldpctest, ulsim, dlsim all compile
functionality and performance to be tested by CI
2018-08-30 07:08:26 -07:00
Raymond Knopp
b93b7073ca
Merge remote-tracking branch 'origin/develop' into develop-nr
...
Conflicts:
ci-scripts/Jenkinsfile-gitlab
ci-scripts/buildOnVM.sh
ci-scripts/checkCodingFormattingRules.sh
ci-scripts/createVM.sh
ci-scripts/destroyAllRunningVM.sh
ci-scripts/reportBuildLocally.sh
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
cmake_targets/tools/build_helper
common/utils/LOG/log.h
openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
openair1/PHY/TOOLS/file_output.c
openair1/PHY/TOOLS/lte_dfts.c
openair1/PHY/TOOLS/tools_defs.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/COMMON/platform_constants.h
openair2/COMMON/platform_types.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/main.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/UTIL/LOG/log.c
openair3/S1AP/s1ap_common.h
openair3/S1AP/s1ap_eNB.c
openair3/S1AP/s1ap_eNB_context_management_procedures.c
openair3/S1AP/s1ap_eNB_decoder.c
openair3/S1AP/s1ap_eNB_decoder.h
openair3/S1AP/s1ap_eNB_handlers.c
openair3/S1AP/s1ap_eNB_nas_procedures.c
openair3/S1AP/s1ap_eNB_overload.c
openair3/S1AP/s1ap_eNB_trace.c
openair3/TEST/EPC_TEST/play_scenario_decode.c
openair3/TEST/EPC_TEST/play_scenario_s1ap.c
openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
targets/COMMON/openairinterface5g_limits.h
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
targets/RT/USER/lte-ran.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ue.c
targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
WEI-TAI CHEN
9b7143ca86
merge develop
2018-08-05 06:19:32 -07:00
Cedric Roux
5c6ad3142d
Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
...
The monolithic eNodeB is not fully functional in FDD.
The TDD mode has not been tested.
Do not consider this commit as functional.
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/pusch_pc.c
openair2/COMMON/platform_types.h
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.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/flexran_agent_scheduler_dlsch_ue.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc_rrc.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
openair2/UTIL/LOG/log.h
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
WEI-TAI CHEN
e9ce528ed7
Modified and fixed common config
2018-05-28 04:52:39 -07:00
root
6f290e7125
UE add RF board ZC706+AD9371
...
Conflicts:
cmake_targets/build_oai
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/SCHED/phy_procedures_lte_ue.c
targets/ARCH/COMMON/common_lib.h
targets/RT/USER/lte-softmodem.c
2018-04-06 01:28:22 -07:00
oai
da50d68b06
more NB-IoT integration
2018-03-08 17:35:35 +01:00
Xu Bo
3651852e16
1.NUMBER_OF_UE_MAX 16 -> 256 2.fix type of UE number from uint8_t to uint16_t
2017-12-07 11:40:52 +08:00
Raymond Knopp
d23697aef3
Merge branch 'develop' into RU-RAU-split
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/dlsch_decoding.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/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if5_tools.c
openair1/PHY/LTE_TRANSPORT/if5_tools.h
openair1/PHY/LTE_TRANSPORT/pcfich.c
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/rar_tools.c
openair1/PHY/LTE_TRANSPORT/srs_modulation.c
openair1/PHY/defs.h
openair1/PHY/impl_defs_lte.h
openair1/PHY/impl_defs_top.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_ue.c
openair2/COMMON/mac_rrc_primitives.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_mch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/main.c
openair2/LAYER2/MAC/proto.h
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.h
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LITE/rrc_eNB.c
targets/ARCH/COMMON/common_lib.c
targets/ARCH/COMMON/common_lib.h
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
targets/RT/USER/rt_wrapper.h
targets/SIMU/USER/channel_sim.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2017-06-05 15:33:38 -07:00
Cedric Roux
d2098da06c
fix targets/COMMON/openairinterface5g_limits.h
...
- LMSSDR was not handled
- bad #if usage
- bad indentation
still not very clean, but better
2017-03-24 12:27:46 +01:00
Cedric Roux
1cd46a75d7
add missing #ifndef #endif guards in header file
...
modified: targets/COMMON/openairinterface5g_limits.h
2017-01-27 15:49:00 +01:00
Imad ALAWE
b3ded7799a
openairinterface5g: Fix multi definition of UE/eNB NB_MAX
...
In openairinterface5g many definitions in many layers of UE or eNB NB_MAX.
We created a file called openairinterface5g_limits.h
located at openairinterface5g_dir/targets/COMMON/ declaring the number max
of UE and eNB to be used in ALL layers depending on launching conditions
(LARGE_SCALE for example).
2017-01-25 13:58:53 +01:00