Skip to content

[kservice] optimize console_device #9767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 1 commit into from
Jan 5, 2025
Merged

[kservice] optimize console_device #9767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions src/kservice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,15 @@ RTM_EXPORT(rt_console_get_device);
*/
rt_device_t rt_console_set_device(const char *name)
{
rt_device_t new_device, old_device;
rt_device_t old_device = _console_device;
rt_device_t new_device = rt_device_find(name);

/* save old device */
old_device = _console_device;

/* find new console device */
new_device = rt_device_find(name);

/* check whether it's a same device */
if (new_device == old_device) return RT_NULL;

if (new_device != RT_NULL)
if (new_device != RT_NULL && new_device != old_device)
{
if (_console_device != RT_NULL)
if (old_device != RT_NULL)
{
/* close old console device */
rt_device_close(_console_device);
rt_device_close(old_device);
}

/* set new console device */
Expand Down Expand Up @@ -319,20 +311,23 @@ static void _console_release(void)
*/
static void _kputs(const char *str, long len)
{
RT_UNUSED(len);
#ifdef RT_USING_DEVICE
rt_device_t console_device = rt_console_get_device();
#endif /* RT_USING_DEVICE */

CONSOLE_TAKE;

#ifdef RT_USING_DEVICE
if (_console_device == RT_NULL)
if (console_device == RT_NULL)
{
rt_hw_console_output(str);
}
else
{
rt_device_write(_console_device, 0, str, len);
rt_device_write(console_device, 0, str, len);
}
#else
RT_UNUSED(len);
rt_hw_console_output(str);
#endif /* RT_USING_DEVICE */

Expand Down
Loading