Skip to content

O
OpenXG-RAN
Commit 58894c58 authored by David Kim's avatar David Kim
Browse files
Options

resolving conflict

parents 7c6e4ed0 9f3a2a1a
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @ 58894c58
...@@ -6491,11 +6491,11 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked ...@@ -6491,11 +6491,11 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
{ {
nfapi_rx_indication_body_t *value = (nfapi_rx_indication_body_t *)tlv; nfapi_rx_indication_body_t *value = (nfapi_rx_indication_body_t *)tlv;
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s value->tl.length in unpack: %u \n", __FUNCTION__, NFAPI_TRACE(NFAPI_TRACE_INFO, "%s value->tl.length in unpack: %u \n", __FUNCTION__,
value->tl.length); value->tl.length);
uint8_t *rxBodyEnd = *ppReadPackedMsg + value->tl.length; uint8_t *rxBodyEnd = *ppReadPackedMsg + value->tl.length;
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s rxBodyEnd: %p end: %p\n", __FUNCTION__, NFAPI_TRACE(NFAPI_TRACE_INFO, "%s rxBodyEnd: %p end: %p\n", __FUNCTION__,
rxBodyEnd, end); rxBodyEnd, end);
if (rxBodyEnd > end) if (rxBodyEnd > end)
{ {
...@@ -6527,10 +6527,10 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked ...@@ -6527,10 +6527,10 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
value->rx_pdu_list = 0; value->rx_pdu_list = 0;
} }
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s number_of_pdus = %u\n", __FUNCTION__, value->number_of_pdus); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s number_of_pdus = %u\n", __FUNCTION__, value->number_of_pdus);
for (int i = 0; i < value->number_of_pdus; i++) for (int i = 0; i < value->number_of_pdus; i++)
{ {
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s i = %u\n", __FUNCTION__, i); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s i = %u\n", __FUNCTION__, i);
nfapi_tl_t generic_tl; nfapi_tl_t generic_tl;
// NFAPI_RX_UE_INFORMATION_TAG // NFAPI_RX_UE_INFORMATION_TAG
...@@ -6540,7 +6540,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked ...@@ -6540,7 +6540,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
return 0; return 0;
} }
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s generic_tl.tag = 0x%x length = %u\n", __FUNCTION__, generic_tl.tag, generic_tl.length); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s generic_tl.tag = 0x%x length = %u\n", __FUNCTION__, generic_tl.tag, generic_tl.length);
if (generic_tl.tag != NFAPI_RX_UE_INFORMATION_TAG) if (generic_tl.tag != NFAPI_RX_UE_INFORMATION_TAG)
{ {
...@@ -6565,7 +6565,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked ...@@ -6565,7 +6565,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
return 0; return 0;
} }
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s generic_tl.tag = 0x%x length = %u\n", __FUNCTION__, generic_tl.tag, generic_tl.length); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s generic_tl.tag = 0x%x length = %u\n", __FUNCTION__, generic_tl.tag, generic_tl.length);
if (generic_tl.tag != NFAPI_RX_INDICATION_REL8_TAG) if (generic_tl.tag != NFAPI_RX_INDICATION_REL8_TAG)
{ {
...@@ -6589,7 +6589,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked ...@@ -6589,7 +6589,7 @@ static uint8_t unpack_rx_indication_body_value(void *tlv, uint8_t **ppReadPacked
return 0; return 0;
} }
NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s generic_tl.tag = 0x%x length = %u\n", __FUNCTION__, generic_tl.tag, generic_tl.length); NFAPI_TRACE(NFAPI_TRACE_INFO, "%s generic_tl.tag = 0x%x length = %u\n", __FUNCTION__, generic_tl.tag, generic_tl.length);
if (generic_tl.tag != NFAPI_RX_INDICATION_REL9_TAG) if (generic_tl.tag != NFAPI_RX_INDICATION_REL9_TAG)
{ {
......
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