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

[fix]:fix log format and reopen with a different oflag issue (#9452) 

fix log format and reopen with a different oflag issue
This commit is contained in:
milo 2024-09-19 18:15:55 +08:00 committed by GitHub
parent 29c0357ff8
commit 2a8aba4c8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/drivers/core/device.c
View File

@ -13,6 +13,8 @@
* 2013-07-09 Grissiom add ref_count support * 2013-07-09 Grissiom add ref_count support
* 2016-04-02 Bernard fix the open_flag initialization issue. * 2016-04-02 Bernard fix the open_flag initialization issue.
* 2021-03-19 Meco Man remove rt_device_init_all() * 2021-03-19 Meco Man remove rt_device_init_all()
* 2024-09-15 milo fix log format issue
* fix reopen with a different oflag issue
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -195,8 +197,8 @@ rt_err_t rt_device_init(rt_device_t dev)
result = device_init(dev); result = device_init(dev);
if (result != RT_EOK) if (result != RT_EOK)
{ {
LOG_E("To initialize device:%s failed. The error code is %d", LOG_E("To initialize device:%.*s failed. The error code is %d",
dev->parent.name, result); RT_NAME_MAX, dev->parent.name, result);
} }
else else
{ {
@ -233,8 +235,8 @@ rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
result = device_init(dev); result = device_init(dev);
if (result != RT_EOK) if (result != RT_EOK)
{ {
LOG_E("To initialize device:%s failed. The error code is %d", LOG_E("To initialize device:%.*s failed. The error code is %d",
dev->parent.name, result); RT_NAME_MAX, dev->parent.name, result);
return result; return result;
} }
@ -252,7 +254,7 @@ rt_err_t rt_device_open(rt_device_t dev, rt_uint16_t oflag)
/* device is not opened or opened by other oflag, call device_open interface */ /* device is not opened or opened by other oflag, call device_open interface */
if (!(dev->open_flag & RT_DEVICE_OFLAG_OPEN) || if (!(dev->open_flag & RT_DEVICE_OFLAG_OPEN) ||
((dev->open_flag & RT_DEVICE_OFLAG_MASK) != (oflag & RT_DEVICE_OFLAG_MASK))) ((dev->open_flag & RT_DEVICE_OFLAG_MASK) != ((oflag & RT_DEVICE_OFLAG_MASK) | RT_DEVICE_OFLAG_OPEN)))
{ {
if (device_open != RT_NULL) if (device_open != RT_NULL)
{ {