diff options
| author | pr.jung <pr.jung@samsung.com> | 2018-07-04 17:52:07 +0900 |
|---|---|---|
| committer | pr.jung <pr.jung@samsung.com> | 2018-07-04 17:52:33 +0900 |
| commit | eee00b58bff931796d2e50df5ab85f3bb3a7b933 (patch) | |
| tree | c08ee6d3724ced6b8aaedd4ae1d6c6f040023d6b | |
| parent | 2dd1f10b29d69c16625c38218826c382a9d5fed1 (diff) | |
| download | settings-tizen_5.0.tar.gz settings-tizen_5.0.tar.bz2 settings-tizen_5.0.zip | |
Change mmc mount/unmount/format apissubmit/tizen_5.0/20181106.000001submit/tizen_5.0/20181101.000008submit/tizen/20180705.064054accepted/tizen/unified/20180705.172751accepted/tizen/5.0/unified/20181106.202107tizen_5.0accepted/tizen_5.0_unified
- Use libstorage internal apis instead libdeviced
Change-Id: I843754f0eae055aeb02bd50a932a2b5d66034fe8
Signed-off-by: pr.jung <pr.jung@samsung.com>
| -rwxr-xr-x | setting-storage/include/setting-storage.h | 2 | ||||
| -rwxr-xr-x | setting-storage/src/setting-storage-SD.c | 12 | ||||
| -rw-r--r-- | setting-time/include/setting-time-engine.h | 1 | ||||
| -rwxr-xr-x | setting-time/src/setting-time-main.c | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/setting-storage/include/setting-storage.h b/setting-storage/include/setting-storage.h index 0cdbc55..a72e871 100755 --- a/setting-storage/include/setting-storage.h +++ b/setting-storage/include/setting-storage.h @@ -26,7 +26,7 @@ #include <pthread.h> #include <Elementary.h> -#include <dd-deviced.h> +#include <storage-internal.h> #include <package-manager.h> #include <media_content.h> diff --git a/setting-storage/src/setting-storage-SD.c b/setting-storage/src/setting-storage-SD.c index afdeddb..0370e98 100755 --- a/setting-storage/src/setting-storage-SD.c +++ b/setting-storage/src/setting-storage-SD.c @@ -62,9 +62,9 @@ static void storage_SD_unmount(SettingStorage *ad, storage_mmc_cb cb) ad->mmc_content.mmc_cb = cb; ad->mmc_content.user_data = ad; - ret = deviced_request_unmount_mmc(&ad->mmc_content, MNT_FORCE); + ret = storage_request_unmount_mmc(&ad->mmc_content, MNT_FORCE); if (ret == -1) { - SETTING_TRACE_ERROR("deviced_request_unmount_mmc() Fail"); + SETTING_TRACE_ERROR("storage_request_unmount_mmc() Fail"); storage_fail_popup(ad); } ad->sd_request = STORAGE_SD_REQ_UNMOUNT; @@ -113,10 +113,10 @@ static void storage_SD_handle_mount_unmount(void *data) ad->mmc_content.mmc_cb = storage_SD_finish_progress; ad->mmc_content.user_data = ad; - ret = deviced_request_mount_mmc(&ad->mmc_content); + ret = storage_request_mount_mmc(&ad->mmc_content); /* if fail, popup failed info */ if (ret == -1) { - SETTING_TRACE_ERROR("deviced_request_mount_mmc() Fail"); + SETTING_TRACE_ERROR("storage_request_mount_mmc() Fail"); storage_fail_popup(ad); return; } @@ -165,9 +165,9 @@ static void storage_SD_format(int result, void *data) ad->mmc_content.mmc_cb = storage_SD_finish_format; ad->mmc_content.user_data = ad; - ret = deviced_request_format_mmc(&ad->mmc_content); + ret = storage_request_format_mmc(&ad->mmc_content); if (ret == -1) { - SETTING_TRACE_ERROR("fail to call deviced_request_format_mmc"); + SETTING_TRACE_ERROR("fail to call storage_request_format_mmc"); storage_fail_popup(ad); } ad->sd_request = STORAGE_SD_REQ_FORMAT; diff --git a/setting-time/include/setting-time-engine.h b/setting-time/include/setting-time-engine.h index d0571ef..5bc1e74 100644 --- a/setting-time/include/setting-time-engine.h +++ b/setting-time/include/setting-time-engine.h @@ -22,7 +22,6 @@ #define __SETTING_TIME_ENGINE_H__ #include <setting-time.h> -#include <dd-deviced.h> #define SETTING_TIME_ENGINE_TIME_STR_LEN 15 diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c index 105bdf1..102a0ee 100755 --- a/setting-time/src/setting-time-main.c +++ b/setting-time/src/setting-time-main.c @@ -21,8 +21,6 @@ #include <alarm.h> #include <setting-time-main.h> -#include <dd-deviced-managed.h> -#include <dd-deviced.h> #include <efl_extension.h> |