michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: disk access: move to new logger

Browse source 
Move to the new logger.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-10-16 08:40:06 -04:00
commit 58134e0f78
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/disk/Kconfig
View file

@ -17,18 +17,9 @@ config DISK_ACCESS_MAX_VOLUMES
help
Maximum number of disk access interfaces supported
config SYS_LOG_DISK_LEVEL
int "Disk log level"
depends on SYS_LOG
default 0
help
Sets log level for Disk drivers.
Levels are:
- 0 OFF, do not write
- 1 ERROR, only write SYS_LOG_ERR
- 2 WARNING, write SYS_LOG_WRN in addition to previous level
- 3 INFO, write SYS_LOG_INF in addition to previous levels
- 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
module = DISK
module-str = disk
source "subsys/logging/Kconfig.template.log_config"
if DISK_ACCESS

17
subsys/disk/disk_access.c
View file

@ -13,8 +13,9 @@
#include <errno.h>
#include <device.h>
#define SYS_LOG_LEVEL CONFIG_SYS_LOG_DISK_LEVEL
#include <logging/sys_log.h>
#define LOG_LEVEL CONFIG_DISK_LOG_LEVEL
#include <logging/log.h>
LOG_MODULE_REGISTER(disk);
/* list of mounted file systems */
static sys_dlist_t disk_access_list;
@ -125,20 +126,20 @@ int disk_access_register(struct disk_info *disk)
k_mutex_lock(&mutex, K_FOREVER);
if ((disk == NULL) || (disk->name == NULL)) {
SYS_LOG_ERR("invalid disk interface!!");
LOG_ERR("invalid disk interface!!");
rc = -EINVAL;
goto reg_err;
}
if (disk_access_get_di(disk->name) != NULL) {
SYS_LOG_ERR("disk interface already registered!!");
LOG_ERR("disk interface already registered!!");
rc = -EINVAL;
goto reg_err;
}
/* append to the disk list */
sys_dlist_append(&disk_access_list, &disk->node);
SYS_LOG_DBG("disk interface(%s) registred", disk->name);
LOG_DBG("disk interface(%s) registred", disk->name);
reg_err:
k_mutex_unlock(&mutex);
return rc;
@ -150,19 +151,19 @@ int disk_access_unregister(struct disk_info *disk)
k_mutex_lock(&mutex, K_FOREVER);
if ((disk == NULL) || (disk->name == NULL)) {
SYS_LOG_ERR("invalid disk interface!!");
LOG_ERR("invalid disk interface!!");
rc = -EINVAL;
goto unreg_err;
}
if (disk_access_get_di(disk->name) == NULL) {
SYS_LOG_ERR("disk interface not registered!!");
LOG_ERR("disk interface not registered!!");
rc = -EINVAL;
goto unreg_err;
}
/* remove disk node from the list */
sys_dlist_remove(&disk->node);
SYS_LOG_DBG("disk interface(%s) unregistred", disk->name);
LOG_DBG("disk interface(%s) unregistred", disk->name);
unreg_err:
k_mutex_unlock(&mutex);
return rc;