Commit 014296b9 authored by Manu Agrawal's avatar Manu Agrawal

Changes for 5G Enquire Timing

parent 1ce9e29a
...@@ -2082,6 +2082,8 @@ set(SS_SRC ...@@ -2082,6 +2082,8 @@ set(SS_SRC
${OPENAIR3_DIR}/SS/ss_eNB_drb_task.c ${OPENAIR3_DIR}/SS/ss_eNB_drb_task.c
${OPENAIR3_DIR}/SS/ss_eNB_vt_timer_task.c ${OPENAIR3_DIR}/SS/ss_eNB_vt_timer_task.c
${OPENAIR3_DIR}/SS/ss_gNB_srb_task.c ${OPENAIR3_DIR}/SS/ss_gNB_srb_task.c
${OPENAIR3_DIR}/SS/ss_gNB_port_man_task.c
${OPENAIR3_DIR}/SS/ss_gNB_sys_task.c
) )
file(GLOB ss_sidl ${SIDL_CMPLR}/src/*.c) file(GLOB ss_sidl ${SIDL_CMPLR}/src/*.c)
file(GLOB ss_acp ${SIDL_DIR}/acp/src/*.c) file(GLOB ss_acp ${SIDL_DIR}/acp/src/*.c)
......
...@@ -327,7 +327,9 @@ void *rrc_enb_process_msg(void *); ...@@ -327,7 +327,9 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_M3AP_MCE, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_M3AP_MCE, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN_5G_NR, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS_5G_NR, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SYSIND, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SS_SYSIND, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SS_SRB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \ TASK_DEF(TASK_SS_SRB_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
......
...@@ -244,6 +244,25 @@ void rx_func(void *param) { ...@@ -244,6 +244,25 @@ void rx_func(void *param) {
gNB->if_inst->NR_UL_indication(&gNB->UL_INFO); gNB->if_inst->NR_UL_indication(&gNB->UL_INFO);
pthread_mutex_unlock(&gNB->UL_INFO_mutex); pthread_mutex_unlock(&gNB->UL_INFO_mutex);
stop_meas(&gNB->ul_indication_stats); stop_meas(&gNB->ul_indication_stats);
if (RC.ss.mode >= SS_SOFTMODEM)
{
MessageDef *message_p = itti_alloc_new_message(TASK_SYS_5G_NR, INSTANCE_DEFAULT, SS_NRUPD_TIM_INFO);
if (message_p)
{
SS_NRUPD_TIM_INFO(message_p).slot = gNB->UL_INFO.slot;
SS_NRUPD_TIM_INFO(message_p).sfn = gNB->UL_INFO.frame;
int send_res = itti_send_msg_to_task(TASK_SYS_5G_NR, INSTANCE_DEFAULT, message_p);
if (send_res < 0)
{
printf("Error in itti_send_msg_to_task");
// LOG_E( PHY, "[SS] Error in L1_Thread itti_send_msg_to_task"); /** TODO: Need separate logging for SS */
}
LOG_D(PHY, "[SS] SS_NRUPD_TIM_INFO from L1_Thread to SYS task itti_send_msg_to_task sfn %d slot %d",
gNB->UL_INFO.slot, gNB->UL_INFO.frame); /** TODO: Need separate logging for SS */
}
}
if (tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT) { if (tx_slot_type == NR_DOWNLINK_SLOT || tx_slot_type == NR_MIXED_SLOT) {
notifiedFIFO_elt_t *res; notifiedFIFO_elt_t *res;
......
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
MESSAGE_DEF(SS_GET_TIM_INFO, MESSAGE_PRIORITY_MED, ss_get_timinfo_t , ss_get_timinfo) MESSAGE_DEF(SS_GET_TIM_INFO, MESSAGE_PRIORITY_MED, ss_get_timinfo_t , ss_get_timinfo)
MESSAGE_DEF(SS_SET_TIM_INFO, MESSAGE_PRIORITY_MED, ss_set_timinfo_t , ss_set_timinfo) MESSAGE_DEF(SS_SET_TIM_INFO, MESSAGE_PRIORITY_MED, ss_set_timinfo_t , ss_set_timinfo)
MESSAGE_DEF(SS_NRSET_TIM_INFO, MESSAGE_PRIORITY_MED, ss_nrset_timinfo_t , ss_nrset_timinfo)
MESSAGE_DEF(SS_RRC_PDU_REQ, MESSAGE_PRIORITY_MED, ss_rrc_pdu_req_t , ss_rrc_pdu_req) MESSAGE_DEF(SS_RRC_PDU_REQ, MESSAGE_PRIORITY_MED, ss_rrc_pdu_req_t , ss_rrc_pdu_req)
MESSAGE_DEF(SS_RRC_PDU_IND, MESSAGE_PRIORITY_MED, ss_rrc_pdu_ind_t , ss_rrc_pdu_ind) MESSAGE_DEF(SS_RRC_PDU_IND, MESSAGE_PRIORITY_MED, ss_rrc_pdu_ind_t , ss_rrc_pdu_ind)
MESSAGE_DEF(SS_DRB_PDU_REQ, MESSAGE_PRIORITY_MED, ss_drb_pdu_req_t , ss_drb_pdu_req) MESSAGE_DEF(SS_DRB_PDU_REQ, MESSAGE_PRIORITY_MED, ss_drb_pdu_req_t , ss_drb_pdu_req)
MESSAGE_DEF(SS_DRB_PDU_IND, MESSAGE_PRIORITY_MED, ss_drb_pdu_ind_t , ss_drb_pdu_ind) MESSAGE_DEF(SS_DRB_PDU_IND, MESSAGE_PRIORITY_MED, ss_drb_pdu_ind_t , ss_drb_pdu_ind)
MESSAGE_DEF(SS_UPD_TIM_INFO, MESSAGE_PRIORITY_MED, ss_upd_timinfo_t , ss_upd_timinfo) MESSAGE_DEF(SS_UPD_TIM_INFO, MESSAGE_PRIORITY_MED, ss_upd_timinfo_t , ss_upd_timinfo)
MESSAGE_DEF(SS_NRUPD_TIM_INFO, MESSAGE_PRIORITY_MED, ss_nrupd_timinfo_t , ss_nrupd_timinfo)
MESSAGE_DEF(SS_SYS_PORT_MSG_IND, MESSAGE_PRIORITY_MED, ss_sys_port_msg_ind_t , ss_sys_port_msg_ind) MESSAGE_DEF(SS_SYS_PORT_MSG_IND, MESSAGE_PRIORITY_MED, ss_sys_port_msg_ind_t , ss_sys_port_msg_ind)
MESSAGE_DEF(SS_SYS_PORT_MSG_CNF, MESSAGE_PRIORITY_MED, ss_sys_port_msg_cnf_t , ss_sys_port_msg_cnf) MESSAGE_DEF(SS_SYS_PORT_MSG_CNF, MESSAGE_PRIORITY_MED, ss_sys_port_msg_cnf_t , ss_sys_port_msg_cnf)
......
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
#define SS_GET_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_get_timinfo #define SS_GET_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_get_timinfo
#define SS_SET_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_set_timinfo #define SS_SET_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_set_timinfo
#define SS_NRSET_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_nrset_timinfo
#define SS_UPD_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_upd_timinfo #define SS_UPD_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_upd_timinfo
#define SS_NRUPD_TIM_INFO(mSGpTR) (mSGpTR)->ittiMsg.ss_nrupd_timinfo
#define SS_CELL_ATTN_LIST_IND(mSGpTR) (mSGpTR)->ittiMsg.ss_cell_attn_list_ind #define SS_CELL_ATTN_LIST_IND(mSGpTR) (mSGpTR)->ittiMsg.ss_cell_attn_list_ind
#define SS_CELL_ATTN_LIST_CNF(mSGpTR) (mSGpTR)->ittiMsg.ss_cell_attn_list_cnf #define SS_CELL_ATTN_LIST_CNF(mSGpTR) (mSGpTR)->ittiMsg.ss_cell_attn_list_cnf
...@@ -83,6 +85,13 @@ typedef struct ss_set_timinfo_s { ...@@ -83,6 +85,13 @@ typedef struct ss_set_timinfo_s {
typedef ss_set_timinfo_t ss_upd_timinfo_t; typedef ss_set_timinfo_t ss_upd_timinfo_t;
typedef struct ss_nrset_timinfo_s {
uint16_t sfn;
uint32_t slot;
} ss_nrset_timinfo_t;
typedef ss_nrset_timinfo_t ss_nrupd_timinfo_t;
typedef struct ss_get_timinfo_s { typedef struct ss_get_timinfo_s {
uint8_t EnquireTiming; uint8_t EnquireTiming;
} ss_get_timinfo_t; } ss_get_timinfo_t;
......
This diff is collapsed.
#ifndef SS_GNB_TASK_PORT_MAN_H_
#define SS_GNB_TASK_PORT_MAN_H_
void ss_gNB_port_man_init(void);
void *ss_gNB_port_man_task(void *arg);
#endif /* SS_ENB_TASK_PORT_MAN_H_ */
This diff is collapsed.
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#ifndef SS_GNB_TASK_H_
#define SS_GNB_TASK_H_
// void ss_eNB_init(void);
void *ss_gNB_sys_process_itti_msg(void *);
void *ss_gNB_sys_task(void *arg);
enum Proxy_Msg_Id
{
Cell_Attenuation_Req = 1,
Cell_Attenuation_Cnf = 2,
Cell_Config_Req = 3,
Cell_Config_Cnf = 4,
Max_Msg_Id = 5
};
typedef struct udpSockReq_s
{
uint32_t port;
char *address;
} udpSockReq_t;
#endif /* SS_ENB_TASK_H_ */
...@@ -61,6 +61,9 @@ typedef struct ss_config_s { ...@@ -61,6 +61,9 @@ typedef struct ss_config_s {
int SysIndport; int SysIndport;
/** DRB port number */ /** DRB port number */
int Drbport; int Drbport;
/** SYS Port NR number */
int SysportNR;
uint8_t configured;
/** State info */ /** State info */
int State; int State;
int vtp_ready; int vtp_ready;
......
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