Browse Source

update nrf log

master
zhaohe 1 year ago
parent
commit
45186701cd
  1. 13
      components/libraries/log/src/nrf_log_frontend.c
  2. 15
      components/libraries/log/src/nrf_log_internal.h

13
components/libraries/log/src/nrf_log_frontend.c

@ -663,6 +663,19 @@ void nrf_log_frontend_std_6(uint32_t severity_mid,
std_n(severity_mid, p_str, args, ARRAY_SIZE(args)); std_n(severity_mid, p_str, args, ARRAY_SIZE(args));
} }
void nrf_log_frontend_std_7(uint32_t severity_mid,
char const * const p_str,
uint32_t val0,
uint32_t val1,
uint32_t val2,
uint32_t val3,
uint32_t val4,
uint32_t val5,
uint32_t val6){
uint32_t args[] = {val0, val1, val2, val3, val4, val5, val6};
std_n(severity_mid, p_str, args, ARRAY_SIZE(args));
}
void nrf_log_frontend_hexdump(uint32_t severity_mid, void nrf_log_frontend_hexdump(uint32_t severity_mid,
const void * const p_data, const void * const p_data,

15
components/libraries/log/src/nrf_log_internal.h

@ -158,6 +158,9 @@
#define LOG_INTERNAL_6(type, str, arg0, arg1, arg2, arg3, arg4, arg5) \ #define LOG_INTERNAL_6(type, str, arg0, arg1, arg2, arg3, arg4, arg5) \
/*lint -save -e571*/nrf_log_frontend_std_6(type, str, (uint32_t)(arg0), \ /*lint -save -e571*/nrf_log_frontend_std_6(type, str, (uint32_t)(arg0), \
(uint32_t)(arg1), (uint32_t)(arg2), (uint32_t)(arg3), (uint32_t)(arg4), (uint32_t)(arg5))/*lint -restore*/ (uint32_t)(arg1), (uint32_t)(arg2), (uint32_t)(arg3), (uint32_t)(arg4), (uint32_t)(arg5))/*lint -restore*/
#define LOG_INTERNAL_7(type, str, arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
/*lint -save -e571*/nrf_log_frontend_std_7(type, str, (uint32_t)(arg0), \
(uint32_t)(arg1), (uint32_t)(arg2), (uint32_t)(arg3), (uint32_t)(arg4), (uint32_t)(arg5), (uint32_t)(arg6))/*lint -restore*/
#else //NRF_LOG_ENABLED #else //NRF_LOG_ENABLED
@ -176,6 +179,8 @@
(void)(_type); (void)(_str); (void)(_arg0); (void)(_arg1); (void)(_arg2); (void)(_arg3); (void)(_arg4) (void)(_type); (void)(_str); (void)(_arg0); (void)(_arg1); (void)(_arg2); (void)(_arg3); (void)(_arg4)
#define LOG_INTERNAL_6(_type, _str, _arg0, _arg1, _arg2, _arg3, _arg4, _arg5) \ #define LOG_INTERNAL_6(_type, _str, _arg0, _arg1, _arg2, _arg3, _arg4, _arg5) \
(void)(_type); (void)(_str); (void)(_arg0); (void)(_arg1); (void)(_arg2); (void)(_arg3); (void)(_arg4); (void)(_arg5) (void)(_type); (void)(_str); (void)(_arg0); (void)(_arg1); (void)(_arg2); (void)(_arg3); (void)(_arg4); (void)(_arg5)
#define LOG_INTERNAL_7(_type, _str, _arg0, _arg1, _arg2, _arg3, _arg4, _arg5, _arg6) \
(void)(_type); (void)(_str); (void)(_arg0); (void)(_arg1); (void)(_arg2); (void)(_arg3); (void)(_arg4); (void)(_arg5); (void)(_arg6)
#endif //NRF_LOG_ENABLED #endif //NRF_LOG_ENABLED
#define LOG_SEVERITY_MOD_ID(severity) ((severity) | NRF_LOG_MODULE_ID << NRF_LOG_MODULE_ID_POS) #define LOG_SEVERITY_MOD_ID(severity) ((severity) | NRF_LOG_MODULE_ID << NRF_LOG_MODULE_ID_POS)
@ -494,6 +499,16 @@ void nrf_log_frontend_std_6(uint32_t severity_mid,
uint32_t val4, uint32_t val4,
uint32_t val5); uint32_t val5);
void nrf_log_frontend_std_7(uint32_t severity_mid,
char const * const p_str,
uint32_t val0,
uint32_t val1,
uint32_t val2,
uint32_t val3,
uint32_t val4,
uint32_t val5,
uint32_t val6);
/** /**
* @brief A function for logging raw data. * @brief A function for logging raw data.
* *

Loading…
Cancel
Save