libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[style] renaming to _console_take/release

This commit is contained in:
Shell 2024-01-11 13:02:24 +08:00 committed by Meco Man
parent 396a52cedb
commit e4be19eb8f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/kservice.c
View File

@ -1499,7 +1499,7 @@ rt_thread_t rt_console_current_user(void)
return _pr_curr_user; return _pr_curr_user;
} }
static void _acquire_console(void) static void _console_take(void)
{ {
rt_ubase_t level = rt_spin_lock_irqsave(&_pr_lock); rt_ubase_t level = rt_spin_lock_irqsave(&_pr_lock);
rt_thread_t self_thread = rt_thread_self(); rt_thread_t self_thread = rt_thread_self();
@ -1526,7 +1526,7 @@ static void _acquire_console(void)
rt_spin_unlock_irqrestore(&_pr_lock, level); rt_spin_unlock_irqrestore(&_pr_lock, level);
} }
static void _release_console(void) static void _console_release(void)
{ {
rt_ubase_t level = rt_spin_lock_irqsave(&_pr_lock); rt_ubase_t level = rt_spin_lock_irqsave(&_pr_lock);
rt_thread_t self_thread = rt_thread_self(); rt_thread_t self_thread = rt_thread_self();
@ -1542,16 +1542,16 @@ static void _release_console(void)
rt_spin_unlock_irqrestore(&_pr_lock, level); rt_spin_unlock_irqrestore(&_pr_lock, level);
} }
#define ACQUIRE_CONSOLE _acquire_console() #define CONSOLE_TAKE _console_take()
#define RELEASE_CONSOLE _release_console() #define CONSOLE_RELEASE _console_release()
#define ACQUIRE_PRINTF_BUFFER rt_ubase_t level = rt_spin_lock_irqsave(&_prf_lock) #define PRINTF_BUFFER_TAKE rt_ubase_t level = rt_spin_lock_irqsave(&_prf_lock)
#define RELEASE_PRINTF_BUFFER rt_spin_unlock_irqrestore(&_prf_lock, level) #define PRINTF_BUFFER_RELEASE rt_spin_unlock_irqrestore(&_prf_lock, level)
#else #else
#define ACQUIRE_CONSOLE #define CONSOLE_TAKE
#define RELEASE_CONSOLE #define CONSOLE_RELEASE
#define ACQUIRE_PRINTF_BUFFER #define PRINTF_BUFFER_TAKE
#define RELEASE_PRINTF_BUFFER #define PRINTF_BUFFER_RELEASE
#endif /* RT_USING_THREDSAFE_PRINTF */ #endif /* RT_USING_THREDSAFE_PRINTF */
/** /**
@ -1561,7 +1561,7 @@ static void _release_console(void)
*/ */
static void _kputs(const char *str, long len) static void _kputs(const char *str, long len)
{ {
ACQUIRE_CONSOLE; CONSOLE_TAKE;
#ifdef RT_USING_DEVICE #ifdef RT_USING_DEVICE
if (_console_device == RT_NULL) if (_console_device == RT_NULL)
@ -1576,7 +1576,7 @@ static void _kputs(const char *str, long len)
rt_hw_console_output(str); rt_hw_console_output(str);
#endif /* RT_USING_DEVICE */ #endif /* RT_USING_DEVICE */
RELEASE_CONSOLE; CONSOLE_RELEASE;
} }
/** /**
@ -1608,7 +1608,7 @@ rt_weak int rt_kprintf(const char *fmt, ...)
static char rt_log_buf[RT_CONSOLEBUF_SIZE]; static char rt_log_buf[RT_CONSOLEBUF_SIZE];
va_start(args, fmt); va_start(args, fmt);
ACQUIRE_PRINTF_BUFFER; PRINTF_BUFFER_TAKE;
/* the return value of vsnprintf is the number of bytes that would be /* the return value of vsnprintf is the number of bytes that would be
* written to buffer had if the size of the buffer been sufficiently * written to buffer had if the size of the buffer been sufficiently
@ -1623,7 +1623,7 @@ rt_weak int rt_kprintf(const char *fmt, ...)
_kputs(rt_log_buf, length); _kputs(rt_log_buf, length);
RELEASE_PRINTF_BUFFER; PRINTF_BUFFER_RELEASE;
va_end(args); va_end(args);
return length; return length;