Commit cd8da4db authored by jperaldi's avatar jperaldi

bad rebase done on VTP management

parent e12ddace
......@@ -2083,9 +2083,9 @@ set(SS_SRC
${OPENAIR3_DIR}/SS/ss_eNB_drb_task.c
${OPENAIR3_DIR}/SS/ss_eNB_vt_timer_task.c
${OPENAIR3_DIR}/SS/ss_gNB_srb_task.c
${OPENAIR3_DIR}/SS/ss_eNB_multicell_helper.c
${OPENAIR3_DIR}/SS/ss_gNB_port_man_task.c
${OPENAIR3_DIR}/SS/ss_gNB_sys_task.c
${OPENAIR3_DIR}/SS/ss_eNB_multicell_helper.c
)
file(GLOB ss_sidl ${SIDL_CMPLR}/src/*.c)
file(GLOB ss_acp ${SIDL_DIR}/acp/src/*.c)
......
......@@ -387,7 +387,7 @@ void *ss_eNB_vtp_process_itti_msg(void *notUsed)
}
LOG_A(ENB_APP, "[VTP] received VTP_UPD_TIM_INFO SFN: %d SF: %d\n", tinfo.sfn, tinfo.sf);
LOG_A(ENB_APP,"[VTP] received VTP_UPD_TIM_INFO SFN: %d SF: %d\n", tinfo.sfn, tinfo.sf);
if (SS_context.vtp_enabled == 1)
if (isConnected == true)
ss_vtp_send_tinfo(TASK_VTP, &tinfo);
}
break;
......@@ -494,7 +494,6 @@ void* ss_eNB_vtp_task(void *arg) {
ss_eNB_wait_first_msg();
SS_context.vtp_enabled = 1;
RC.ss.vtp_ready = 1;
ss_enable_vtp();
sleep(1);
......
......@@ -71,8 +71,6 @@ typedef struct ss_config_s {
int mac_rlc_data_ind_frame;
int mac_rlc_data_ind_subframe;
ss_l1macind_ctrl_t l1macind;
/** Cell Config Array */
ss_cell_config_t ss_cell_list[8];
} ss_config_t;
/**
typedef enum {
......
......@@ -277,7 +277,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
LOG_D(PHY, "[SS] SS_UPD_TIM_INFO from L1_Thread to SYS task itti_send_msg_to_task sfn %d sf %d",
eNB->UL_INFO.subframe, eNB->UL_INFO.frame); /** TODO: Need separate logging for SS */
}
MessageDef *message_p_vtp = itti_alloc_new_message(TASK_VTP, INSTANCE_DEFAULT, SS_UPD_TIM_INFO);
MessageDef *message_p_vtp = itti_alloc_new_message(TASK_ENB_APP, 0, SS_UPD_TIM_INFO);
if (message_p_vtp && RC.ss.vtp_ready)
{
SS_UPD_TIM_INFO(message_p_vtp).sf = eNB->UL_INFO.subframe;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment