Commit 041902f6 authored by Yangxiong Peng's avatar Yangxiong Peng Committed by Jerome PERALDI

Bug #126995: 1. Fill SFN/SLOT for 5G trace msg 2. Use same data structure for SFN/SLOT in 4G and 5G

parent 06ef6f8b
...@@ -292,7 +292,7 @@ typedef struct { ...@@ -292,7 +292,7 @@ typedef struct {
uint64_t dump_mask; uint64_t dump_mask;
#if 1 #if 1
uint16_t sfn; uint16_t sfn;
uint8_t sf; uint32_t sf;
#endif #endif
} log_t; } log_t;
......
...@@ -440,9 +440,9 @@ TRACEPOINT_EVENT( ...@@ -440,9 +440,9 @@ TRACEPOINT_EVENT(
), ),
TP_FIELDS( TP_FIELDS(
ctf_string(MODNAME, component) ctf_string(MODNAME, component)
ctf_integer(uint32_t, EVENTID, event_id) ctf_integer(int32_t, EVENTID, event_id)
ctf_integer(uint32_t, SFN, sfn) ctf_integer(int32_t, SFN, sfn)
ctf_integer(uint32_t, SF, sf) ctf_integer(int32_t, SF, sf)
ctf_string(FUNCTION, funcName) ctf_string(FUNCTION, funcName)
ctf_integer(uint32_t, LINE, lineNo) ctf_integer(uint32_t, LINE, lineNo)
ctf_integer(uint8_t, RLCMODE, rlc_pkt.rlcMode) ctf_integer(uint8_t, RLCMODE, rlc_pkt.rlcMode)
......
...@@ -2280,7 +2280,7 @@ void *ss_eNB_sys_process_itti_msg(void *notUsed) ...@@ -2280,7 +2280,7 @@ void *ss_eNB_sys_process_itti_msg(void *notUsed)
SS_context.sf = tinfo.sf; SS_context.sf = tinfo.sf;
g_log->sfn = tinfo.sfn; g_log->sfn = tinfo.sfn;
g_log->sf = tinfo.sf; g_log->sf = (uint32_t)tinfo.sf;
} }
break; break;
......
...@@ -427,7 +427,7 @@ void *ss_gNB_sys_process_itti_msg(void *notUsed) ...@@ -427,7 +427,7 @@ void *ss_gNB_sys_process_itti_msg(void *notUsed)
{ {
MessageDef *received_msg = NULL; MessageDef *received_msg = NULL;
int result; int result;
static ss_nrset_timinfo_t tinfo = {.sfn = 0xFFFF, .slot = 0xFF}; static ss_nrset_timinfo_t tinfo = {.sfn = 0xFFFF, .slot = 0xFFFFFFFF};
itti_receive_msg(TASK_SYS_GNB, &received_msg); itti_receive_msg(TASK_SYS_GNB, &received_msg);
...@@ -441,6 +441,8 @@ void *ss_gNB_sys_process_itti_msg(void *notUsed) ...@@ -441,6 +441,8 @@ void *ss_gNB_sys_process_itti_msg(void *notUsed)
LOG_D(GNB_APP, "TASK_SYS_GNB received SS_NRUPD_TIM_INFO with sfn=%d slot=%d\n", SS_NRUPD_TIM_INFO(received_msg).sfn, SS_NRUPD_TIM_INFO(received_msg).slot); LOG_D(GNB_APP, "TASK_SYS_GNB received SS_NRUPD_TIM_INFO with sfn=%d slot=%d\n", SS_NRUPD_TIM_INFO(received_msg).sfn, SS_NRUPD_TIM_INFO(received_msg).slot);
tinfo.slot = SS_NRUPD_TIM_INFO(received_msg).slot; tinfo.slot = SS_NRUPD_TIM_INFO(received_msg).slot;
tinfo.sfn = SS_NRUPD_TIM_INFO(received_msg).sfn; tinfo.sfn = SS_NRUPD_TIM_INFO(received_msg).sfn;
g_log->sfn = tinfo.sfn;
g_log->sf = tinfo.slot;
} }
break; break;
......
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