Skip to content

修复 MMCSD 宏拼写错误+内核开启LOG_D编译问题 #10076

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
merged 3 commits into from
Mar 12, 2025
Merged

修复 MMCSD 宏拼写错误+内核开启LOG_D编译问题 #10076

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81a0842
fixed LOG bug
yixinghua121 Mar 5, 2025
500f024
macro spelling error with sdio
yixinghua121 Mar 5, 2025
13a89bb
modify RT_MMCSD_THREAD_PREORITY
yixinghua121 Mar 12, 2025
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 bsp/k230/rtconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
#define RT_SDIO_STACK_SIZE 8192
#define RT_SDIO_THREAD_PRIORITY 15
#define RT_MMCSD_STACK_SIZE 8192
#define RT_MMCSD_THREAD_PREORITY 22
#define RT_MMCSD_THREAD_PRIORITY 22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这块为啥要改成这个？我搜了下没有这个定义

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

单词拼写错了，顺手改的。。。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

单词拼写错了，顺手改的。。。

那麻烦都改掉吧，https://github.com/search?q=repo%3ART-Thread%2Frt-thread+RT_MMCSD_THREAD_PREORITY+&type=code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已经全部更改

#define RT_MMCSD_MAX_PARTITION 16
#define RT_USING_PIN
#define RT_USING_KTIME
Expand Down
2 changes: 1 addition & 1 deletion components/dfs/dfs_v2/src/dfs_dentry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static struct dfs_dentry *_dentry_create(struct dfs_mnt *mnt, char *path, rt_boo
rt_atomic_store(&(dentry->ref_count), 1);
dentry->flags |= DENTRY_IS_ALLOCED;

LOG_I("create a dentry:%p for %s", dentry, fullpath);
LOG_I("create a dentry:%p for %s", dentry, mnt->fullpath);
}

return dentry;
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/sdio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ config RT_USING_SDIO
int "The stack size for mmcsd thread"
default 1024

config RT_MMCSD_THREAD_PREORITY
config RT_MMCSD_THREAD_PRIORITY
int "The priority level value of mmcsd thread"
default 22

Expand Down
8 changes: 4 additions & 4 deletions components/drivers/sdio/dev_mmcsd_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
#ifndef RT_MMCSD_STACK_SIZE
#define RT_MMCSD_STACK_SIZE 1024
#endif
#ifndef RT_MMCSD_THREAD_PREORITY
#ifndef RT_MMCSD_THREAD_PRIORITY
#if (RT_THREAD_PRIORITY_MAX == 32)
#define RT_MMCSD_THREAD_PREORITY 0x16
#define RT_MMCSD_THREAD_PRIORITY 0x16
#else
#define RT_MMCSD_THREAD_PREORITY 0x40
#define RT_MMCSD_THREAD_PRIORITY 0x40
#endif
#endif

Expand Down Expand Up @@ -767,7 +767,7 @@ int rt_mmcsd_core_init(void)
RT_IPC_FLAG_FIFO);
RT_ASSERT(ret == RT_EOK);
ret = rt_thread_init(&mmcsd_detect_thread, "mmcsd_detect", mmcsd_detect, RT_NULL,
&mmcsd_stack[0], RT_MMCSD_STACK_SIZE, RT_MMCSD_THREAD_PREORITY, 20);
&mmcsd_stack[0], RT_MMCSD_STACK_SIZE, RT_MMCSD_THREAD_PRIORITY, 20);
if (ret == RT_EOK)
{
rt_thread_startup(&mmcsd_detect_thread);
Expand Down
4 changes: 2 additions & 2 deletions src/thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ rt_err_t rt_thread_startup(rt_thread_t thread)
RT_ASSERT(rt_object_get_type((rt_object_t)thread) == RT_Object_Class_Thread);

LOG_D("startup a thread:%s with priority:%d",
thread->parent.name, thread->current_priority);
thread->parent.name, RT_SCHED_PRIV(thread).current_priority);

/* calculate priority attribute and reset thread stat to suspend */
rt_sched_thread_startup(thread);
Expand Down Expand Up @@ -911,7 +911,7 @@ rt_err_t rt_thread_suspend_to_list(rt_thread_t thread, rt_list_t *susp_list, int
stat = rt_sched_thread_get_stat(thread);
if ((stat != RT_THREAD_READY) && (stat != RT_THREAD_RUNNING))
{
LOG_D("thread suspend: thread disorder, 0x%2x", thread->stat);
LOG_D("thread suspend: thread disorder, 0x%2x", RT_SCHED_CTX(thread).stat);
rt_sched_unlock(slvl);
return -RT_ERROR;
}
Expand Down