Skip to content

fix Compilation error in "driver.c", "completion_up.c", "syslog.c" and "dlmodule.c". #9093

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 6 commits into from
Jun 26, 2024
Merged

fix Compilation error in "driver.c", "completion_up.c", "syslog.c" and "dlmodule.c". #9093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
202bf7e
fix Compilation error in "driver.c", "completion_up.c" and "dlmodule.c".
1413577909 Jun 24, 2024
e1025b2
[components][syslog] fix issues of syslog interface.
1413577909 Jun 26, 2024
6b82349
Merge branch 'RT-Thread:master' into master
1413577909 Jun 26, 2024
eab0772
Revert "[components][syslog] fix issues of syslog interface."
1413577909 Jun 26, 2024
19113a4
[components][syslog] fix issues of syslog interface.
1413577909 Jun 26, 2024
bd1f0e2
Merge branch 'RT-Thread:master' into master
1413577909 Jun 26, 2024
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
2 changes: 1 addition & 1 deletion components/drivers/core/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ rt_err_t rt_driver_unregister(rt_driver_t drv)

return ret;
}
RTM_EXPORT(rt_driver_register);
RTM_EXPORT(rt_driver_unregister);
1 change: 0 additions & 1 deletion components/drivers/ipc/completion_up.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ rt_err_t rt_completion_wait_flags(struct rt_completion *completion,

return result;
}
RTM_EXPORT(rt_completion_wait);

/**
* @brief This function indicates a completion has done and wakeup the thread
Expand Down
6 changes: 3 additions & 3 deletions components/libc/posix/libdl/dlmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ static void _dlmodule_exit(void)
rt_thread_t thread = (rt_thread_t)object;

/* stop timer and suspend thread*/
if ((thread->stat & RT_THREAD_STAT_MASK) != RT_THREAD_CLOSE &&
(thread->stat & RT_THREAD_STAT_MASK) != RT_THREAD_INIT)
if ((RT_SCHED_CTX(thread).stat & RT_THREAD_STAT_MASK) != RT_THREAD_CLOSE &&
(RT_SCHED_CTX(thread).stat & RT_THREAD_STAT_MASK) != RT_THREAD_INIT)
{
rt_timer_stop(&(thread->thread_timer));
rt_thread_suspend(thread);
Expand Down Expand Up @@ -770,7 +770,7 @@ void dlmodule_exit(int ret_code)
/* the stat of module was changed to CLOSING in _dlmodule_exit */

thread = module->main_thread;
if ((thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_CLOSE)
if ((RT_SCHED_CTX(thread).stat & RT_THREAD_STAT_MASK) == RT_THREAD_CLOSE)
{
/* main thread already closed */
rt_exit_critical();
Expand Down
2 changes: 1 addition & 1 deletion components/utilities/ulog/syslog/syslog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void vsyslog(int priority, const char *format, va_list args)
priority |= local_facility;
}

ulog_voutput(priority, local_ident, RT_TRUE, format, args);
ulog_voutput(priority, local_ident, RT_TRUE, RT_NULL, 0, 0, 0, format, args);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions components/utilities/ulog/ulog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ void ulog_hexdump(const char *tag, rt_size_t width, const rt_uint8_t *buf, rt_si
/*
* Another log output API. This API is more difficult to use than LOG_X API.
*/
void ulog_voutput(rt_uint32_t level, const char *tag, rt_bool_t newline, const rt_uint8_t *hex_buf,
rt_size_t hex_size, rt_size_t hex_width, rt_base_t hex_addr, const char *format, va_list args);
void ulog_output(rt_uint32_t level, const char *tag, rt_bool_t newline, const char *format, ...);
void ulog_raw(const char *format, ...);

Expand Down