yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!272 m核lwip和hilog解耦，简化配置 

Merge pull request !272 from 刘建东/master
This commit is contained in:
openharmony_ci 2021-08-23 02:48:58 +00:00 committed by Gitee
parent 19aa1bb5bc be03374c3c
commit e4e3caccf2
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/net/lwip-2.1/porting/include/arch/cc.h
View File

@ -93,23 +93,15 @@
#define LWIP_RAND rand #define LWIP_RAND rand
extern void HilogPrintf(const char *fmt, ...); #ifndef LWIP_LOGGER
#define LWIP_LOGGER(msg)
#ifndef HILOG_INFO
#define HILOG_INFO(...)
#ifndef HILOG_MODULE_APP
#define HILOG_MODULE_APP 0
#endif
#endif #endif
#ifndef HILOG_ERROR extern void LwipLogPrintf(const char *fmt, ...);
#define HILOG_ERROR(...) #define LWIP_PLATFORM_DIAG(vars) LwipLogPrintf vars
#endif #define LWIP_PLATFORM_ASSERT(x) do { \
LWIP_PLATFORM_DIAG(("Assertion \"%s\" failed at line %d in %s\n", x, __LINE__, __FILE__)); \
#define LWIP_PLATFORM_DIAG(vars) HilogPrintf vars } while (0)
#define LWIP_PLATFORM_ASSERT(x) do {HILOG_ERROR(HILOG_MODULE_APP, \
"Assertion \"%s\" errno %d line %d in %s\n", \
x, errno, __LINE__, __FILE__);} while (0)
#define init_waitqueue_head(...) #define init_waitqueue_head(...)
#define poll_check_waiters(...) #define poll_check_waiters(...)

6
components/net/lwip-2.1/porting/src/sys_arch.c
View File

@ -324,7 +324,7 @@ void sys_mutex_set_invalid(sys_mutex_t *mutex)
*mutex = LOSCFG_BASE_IPC_MUX_LIMIT; *mutex = LOSCFG_BASE_IPC_MUX_LIMIT;
} }
void HilogPrintf(const char *fmt, ...) void LwipLogPrintf(const char *fmt, ...)
{ {
if ((fmt == NULL) || (strlen(fmt) == 0)) { if ((fmt == NULL) || (strlen(fmt) == 0)) {
return; return;
@ -337,8 +337,8 @@ void HilogPrintf(const char *fmt, ...)
len = vsprintf_s(buf, sizeof(buf) - 1, fmt, ap); len = vsprintf_s(buf, sizeof(buf) - 1, fmt, ap);
va_end(ap); va_end(ap);
if (len < 0) { if (len < 0) {
HILOG_INFO(HILOG_MODULE_APP, "log param invalid or buf is not enough."); LWIP_LOGGER("log param invalid or buf is not enough.");
return; return;
} }
HILOG_INFO(HILOG_MODULE_APP, buf); LWIP_LOGGER(buf);
} }