|
@@ -21,38 +21,11 @@
|
|
#define RT_VBUS_RB_LOW_TICK (RT_VMM_RB_BLK_NR * 2 / 3)
|
|
#define RT_VBUS_RB_LOW_TICK (RT_VMM_RB_BLK_NR * 2 / 3)
|
|
#define RT_VBUS_RB_TICK_STEP (100)
|
|
#define RT_VBUS_RB_TICK_STEP (100)
|
|
|
|
|
|
-#ifndef RT_USING_LOGTRACE
|
|
|
|
/* console could be run on vbus. If we log on it, there will be oops. */
|
|
/* console could be run on vbus. If we log on it, there will be oops. */
|
|
#define vbus_debug(...)
|
|
#define vbus_debug(...)
|
|
#define vbus_verbose(...)
|
|
#define vbus_verbose(...)
|
|
#define vbus_info(...)
|
|
#define vbus_info(...)
|
|
#define vbus_error(...)
|
|
#define vbus_error(...)
|
|
-#else // have RT_USING_LOGTRACE
|
|
|
|
-#include <log_trace.h>
|
|
|
|
-
|
|
|
|
-#if defined(log_session_lvl)
|
|
|
|
-/* Define log_trace_session as const so the compiler could optimize some log
|
|
|
|
- * out. */
|
|
|
|
-const static struct log_trace_session _lgs = {
|
|
|
|
- .id = {.name = "vbus"},
|
|
|
|
- .lvl = LOG_TRACE_LEVEL_VERBOSE,
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
-#define vbus_debug(fmt, ...) log_session_lvl(&_lgs, LOG_TRACE_LEVEL_DEBUG, fmt, ##__VA_ARGS__)
|
|
|
|
-#define vbus_verbose(fmt, ...) log_session_lvl(&_lgs, LOG_TRACE_LEVEL_VERBOSE, fmt, ##__VA_ARGS__)
|
|
|
|
-#define vbus_info(fmt, ...) log_session_lvl(&_lgs, LOG_TRACE_LEVEL_INFO, fmt, ##__VA_ARGS__)
|
|
|
|
-#define vbus_error(fmt, ...) log_session_lvl(&_lgs, LOG_TRACE_LEVEL_ERROR, fmt, ##__VA_ARGS__)
|
|
|
|
-#else
|
|
|
|
-static struct log_trace_session _lgs = {
|
|
|
|
- .id = {.name = "vbus"},
|
|
|
|
- .lvl = LOG_TRACE_LEVEL_VERBOSE,
|
|
|
|
-};
|
|
|
|
-#define vbus_debug(fmt, ...) log_session(&_lgs, LOG_TRACE_DEBUG""fmt, ##__VA_ARGS__)
|
|
|
|
-#define vbus_verbose(fmt, ...) log_session(&_lgs, LOG_TRACE_VERBOSE""fmt, ##__VA_ARGS__)
|
|
|
|
-#define vbus_info(fmt, ...) log_session(&_lgs, LOG_TRACE_INFO""fmt, ##__VA_ARGS__)
|
|
|
|
-#define vbus_error(fmt, ...) log_session(&_lgs, LOG_TRACE_ERROR""fmt, ##__VA_ARGS__)
|
|
|
|
-#endif
|
|
|
|
-#endif // RT_USING_LOGTRACE
|
|
|
|
|
|
|
|
#ifndef ARRAY_SIZE
|
|
#ifndef ARRAY_SIZE
|
|
#define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
|
|
#define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
|
|
@@ -1158,10 +1131,6 @@ int rt_vbus_init(void *outr, void *inr)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
|
|
|
|
-#ifdef RT_USING_LOGTRACE
|
|
|
|
- log_trace_register_session(&_lgs);
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
if (outr > inr)
|
|
if (outr > inr)
|
|
{
|
|
{
|
|
RT_ASSERT((char*)outr - (char*)inr >= sizeof(struct rt_vbus_ring));
|
|
RT_ASSERT((char*)outr - (char*)inr >= sizeof(struct rt_vbus_ring));
|