diff --git a/components/vmm/vmm.c b/components/vmm/vmm.c index 19cbed681069c9dfba08f7e99bc828802596ed18..7d6f9875db3d99ed9749bce782f02517ab115bd2 100644 --- a/components/vmm/vmm.c +++ b/components/vmm/vmm.c @@ -24,14 +24,6 @@ extern void rt_application_init(void); void vmm_entry(struct vmm_entry_param* param) SECTION(".vmm_init"); -#ifdef RT_USING_LOGTRACE -#include -static struct log_trace_session _lgs = { - .id = {.name = "vmm"}, - .lvl = LOG_TRACE_LEVEL_VERBOSE, -}; -#endif - struct rt_thread vmm_thread SECTION(".bss.share.vmm"); extern rt_uint8_t vmm_stack_start; extern rt_uint8_t vmm_stack_end; @@ -122,15 +114,6 @@ void vmm_entry(struct vmm_entry_param *param) /* init board */ rt_hw_board_init(); -#ifdef RT_USING_LOGTRACE - /* Some parts of VMM use log_trace, so we need to init it right after - * board_init. */ - log_trace_init(); - log_trace_set_device(RT_CONSOLE_DEVICE_NAME); - - log_trace_register_session(&_lgs); -#endif - /* show version */ rt_show_version(); rt_kprintf("share ctx: %p(%x)\n", diff --git a/components/vmm/vmm.h b/components/vmm/vmm.h index 83773617ddbb213681e513a3cf6707202046f452..17bba8439bf2d852b9e3f6577fe50df9621abb7c 100644 --- a/components/vmm/vmm.h +++ b/components/vmm/vmm.h @@ -30,18 +30,13 @@ unsigned long vmm_find_iomap_by_pa(unsigned long pa); void vmm_vector_init(void); -#ifndef RT_USING_LOGTRACE /* If the rshell is run, we could not rt_kprintf in some situation because * write to a vbus channel *Would BLOCK*. So we cannot use it in interrupt * context, we cannot use it within the context of idle(vmm). */ #define vmm_debug(fmt, ...) #define vmm_verbose(fmt, ...) #define vmm_info(fmt, ...) -#else // have RT_USING_LOGTRACE -#define vmm_debug(fmt, ...) log_trace(LOG_TRACE_DEBUG "[vmm]"fmt, ##__VA_ARGS__) -#define vmm_verbose(fmt, ...) log_trace(LOG_TRACE_VERBOSE"[vmm]"fmt, ##__VA_ARGS__) -#define vmm_info(fmt, ...) log_trace(LOG_TRACE_INFO "[vmm]"fmt, ##__VA_ARGS__) -#endif // RT_USING_LOGTRACE + #endif #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))