From eee00b58bff931796d2e50df5ab85f3bb3a7b933 Mon Sep 17 00:00:00 2001
From: "pr.jung" <pr.jung@samsung.com>
Date: Wed, 4 Jul 2018 17:52:07 +0900
Subject: [PATCH] Change mmc mount/unmount/format apis

- Use libstorage internal apis instead libdeviced

Change-Id: I843754f0eae055aeb02bd50a932a2b5d66034fe8
Signed-off-by: pr.jung <pr.jung@samsung.com>
---
 setting-storage/include/setting-storage.h  |  2 +-
 setting-storage/src/setting-storage-SD.c   | 12 ++++++------
 setting-time/include/setting-time-engine.h |  1 -
 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>
 
-- 
2.34.1