Remove block_type

block_type was used in the past to distinguish MMC and USB.
This distinction is no longer necessary.

Change-Id: Ic3b12478969b6fdcfe7e45f4a02a3bb2a279eeb6
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/src/common/include/media-common-system.h b/src/common/include/media-common-system.h
index 07608cc..ab2abb9 100644 (file)
--- a/src/common/include/media-common-system.h
+++ b/src/common/include/media-common-system.h
@@ -39,7 +39,6 @@ typedef enum {
 typedef struct ms_block_info_s {
        char *mount_path;
        int state;
-       int block_type;
        char *mount_uuid;
 } ms_block_info_s;
 

diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c
index 2351b05..0a8c9a4 100644 (file)
--- a/src/common/media-common-system.c
+++ b/src/common/media-common-system.c
@@ -155,12 +155,10 @@ static void __ms_block_changed(GDBusConnection *connection,
 {
        ms_block_info_s block_info = {0, };
 
-       g_variant_get_child(parameters, 0, "i", &block_info.block_type);
        g_variant_get_child(parameters, 6, "&s", &block_info.mount_uuid);
        g_variant_get_child(parameters, 8, "&s", &block_info.mount_path);
        g_variant_get_child(parameters, 9, "i", &block_info.state);
 
-       MS_DBG_INFO("block_type : %d", block_info.block_type);
        MS_DBG_INFO("mount_uuid : %s", block_info.mount_uuid);
        MS_DBG_SINFO("mount_point : %s", block_info.mount_path);
        MS_DBG_INFO("state : %d", block_info.state);
@@ -275,12 +273,11 @@ int ms_sys_get_device_list(GSList **dev_list)
 
                data = g_new0(ms_block_info_s, 1);
 
-               g_variant_get_child(block_device, 0, "i", &data->block_type);
                g_variant_get_child(block_device, 6, "s", &data->mount_uuid);
                g_variant_get_child(block_device, 8, "s", &data->mount_path);
                data->state = state;
 
-               MS_DBG_INFO("Block type[%d] uuid[%s] path[%s]", data->block_type, data->mount_uuid, data->mount_path);
+               MS_DBG_INFO("Block uuid[%s] path[%s]", data->mount_uuid, data->mount_path);
 
                *dev_list = g_slist_append(*dev_list, data);
                g_variant_unref(block_device);