Cedric Roux
922b5b595a
This commit fixes issues introduced by the previous commit.
Summary of work:
- cleanup:
- fix LOG_XX to be less verbose
- fix cmake_targets/CMakeLists.txt
- fix oaienv
- remove dead code
- bug fixes:
- in openair1/SCHED/fapi_l1.c we had:
eNB->pdcch_vars[subframe&1].num_dci = number_dci;
should be:
eNB->pdcch_vars[subframe&1].num_dci = 0;
This bug let the PHY send more DCIs than what should have been
sent because num_dci is incremented later on in the code.
This fix may be a problem for fapi mode, to be checked.
- add new T VCD traces
- revert openair1/PHY/TOOLS/file_output.c to 'develop' version
- remove thread_id in logRecord/logRecord_mt
- revert (and adapt) configuration files
- be careful when doing frame++, we need to % 1024
- revert target_rx_power in openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- NFAPI:
- the open-nFAPI code has been included in the repository. See nfapi/README.
Maybe we should "git clone" the Cisco repository instead. We have to be
careful of availability though.
What has been tested:
- monolithic eNB FDD 5/10MHz with one UE, iperf UDP/TCP uplink/downlink
Anything else may fail to work, especially the FAPI mode, which has not
been tested at all.
136 lines
3.7 KiB
C
136 lines
3.7 KiB
C
/*
|
|
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership.
|
|
* The OpenAirInterface Software Alliance licenses this file to You under
|
|
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.openairinterface.org/?page_id=698
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*-------------------------------------------------------------------------------
|
|
* For more information about the OpenAirInterface (OAI) Software Alliance:
|
|
* contact@openairinterface.org
|
|
*/
|
|
|
|
#if defined(ENABLE_ITTI)
|
|
# include "intertask_interface.h"
|
|
# include "create_tasks.h"
|
|
# include "log.h"
|
|
|
|
# ifdef OPENAIR2
|
|
# if defined(ENABLE_USE_MME)
|
|
# include "sctp_eNB_task.h"
|
|
# include "s1ap_eNB.h"
|
|
# include "nas_ue_task.h"
|
|
# include "udp_eNB_task.h"
|
|
# include "gtpv1u_eNB_task.h"
|
|
# endif
|
|
# if ENABLE_RAL
|
|
# include "lteRALue.h"
|
|
# include "lteRALenb.h"
|
|
# endif
|
|
# include "RRC/LITE/defs.h"
|
|
# endif
|
|
# include "enb_app.h"
|
|
|
|
int create_tasks(uint32_t enb_nb, uint32_t ue_nb)
|
|
{
|
|
LOG_D(ENB_APP, "%s(enb_nb:%d ue_nb:%d)\n", __FUNCTION__, enb_nb, ue_nb);
|
|
|
|
itti_wait_ready(1);
|
|
if (itti_create_task (TASK_L2L1, l2l1_task, NULL) < 0) {
|
|
LOG_E(PDCP, "Create task for L2L1 failed\n");
|
|
return -1;
|
|
}
|
|
|
|
if (enb_nb > 0) {
|
|
/* Last task to create, others task must be ready before its start */
|
|
if (itti_create_task (TASK_ENB_APP, eNB_app_task, NULL) < 0) {
|
|
LOG_E(ENB_APP, "Create task for eNB APP failed\n");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
# ifdef OPENAIR2
|
|
{
|
|
# if defined(ENABLE_USE_MME)
|
|
{
|
|
if (enb_nb > 0) {
|
|
if (itti_create_task (TASK_SCTP, sctp_eNB_task, NULL) < 0) {
|
|
LOG_E(SCTP, "Create task for SCTP failed\n");
|
|
return -1;
|
|
}
|
|
|
|
if (itti_create_task (TASK_S1AP, s1ap_eNB_task, NULL) < 0) {
|
|
LOG_E(S1AP, "Create task for S1AP failed\n");
|
|
return -1;
|
|
}
|
|
|
|
if (itti_create_task (TASK_UDP, udp_eNB_task, NULL) < 0) {
|
|
LOG_E(UDP_, "Create task for UDP failed\n");
|
|
return -1;
|
|
}
|
|
|
|
if (itti_create_task (TASK_GTPV1_U, >pv1u_eNB_task, NULL) < 0) {
|
|
LOG_E(GTPU, "Create task for GTPV1U failed\n");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
# if defined(NAS_BUILT_IN_UE)
|
|
if (ue_nb > 0) {
|
|
nas_user_container_t *users = calloc(1, sizeof(*users));
|
|
if (users == NULL) abort();
|
|
users->count = ue_nb;
|
|
if (itti_create_task (TASK_NAS_UE, nas_ue_task, users) < 0) {
|
|
LOG_E(NAS, "Create task for NAS UE failed\n");
|
|
return -1;
|
|
}
|
|
}
|
|
# endif
|
|
}
|
|
# endif
|
|
|
|
if (enb_nb > 0) {
|
|
LOG_I(RRC,"Creating RRC eNB Task\n");
|
|
|
|
if (itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL) < 0) {
|
|
LOG_E(RRC, "Create task for RRC eNB failed\n");
|
|
return -1;
|
|
}
|
|
|
|
}
|
|
|
|
if (ue_nb > 0) {
|
|
if (itti_create_task (TASK_RRC_UE, rrc_ue_task, NULL) < 0) {
|
|
LOG_E(RRC, "Create task for RRC UE failed\n");
|
|
return -1;
|
|
}
|
|
|
|
# if ENABLE_RAL
|
|
|
|
if (itti_create_task (TASK_RAL_UE, mRAL_task, NULL) < 0) {
|
|
LOG_E(RAL_UE, "Create task for RAL UE failed\n");
|
|
return -1;
|
|
}
|
|
|
|
# endif
|
|
}
|
|
}
|
|
# endif // openair2: NN: should be openair3
|
|
|
|
|
|
itti_wait_ready(0);
|
|
|
|
return 0;
|
|
}
|
|
#endif
|