Change mmc mount/unmount/format apis

- Use libstorage internal apis instead libdeviced

Change-Id: I843754f0eae055aeb02bd50a932a2b5d66034fe8
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/setting-storage/include/setting-storage.h b/setting-storage/include/setting-storage.h
index 0cdbc55ca18bb535026b78a8248451b28918ecfc..a72e87168856f00426f2d6d4a85fff57387c5390 100755 (executable)
--- 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 afdeddba179ec1a0c2512d04a5788d0c11d911a5..0370e986f3d2fa05f42427c132d2f893a32c1e71 100755 (executable)
--- 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 d0571ef57547e4e45949c8448280e613cf5e2a81..5bc1e749275178bd78dcb67368ff30abd1fb565a 100644 (file)
--- 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 105bdf18c97fb6bb6cffc30495388de400dfdb3d..102a0eeaf2e25fabf399be582983fd28f0f811b2 100755 (executable)
--- 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>