Remove unused parameter

Change-Id: Id923988a83490b7e8aa9e88f5e925838e74c0087
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 03d4370..c5dcc6f 100755 (executable)
--- a/src/common/include/media-common-system.h
+++ b/src/common/include/media-common-system.h
@@ -35,13 +35,6 @@ typedef enum {
        MS_STG_MAX,
 } ms_stg_status_e;
 
-typedef enum {
-       MS_STG_TYPE_USB = 0,
-       MS_STG_TYPE_MMC = 1,
-       MS_STG_TYPE_ALL = 2,
-       MS_STG_TYPE_MAX,
-} ms_stg_type_e;
-
 typedef struct ms_block_info_s {
        char *mount_path;
        int state;
@@ -56,7 +49,7 @@ int ms_sys_set_device_block_event_cb(block_changed_cb usr_callback, void *usr_da
 int ms_sys_set_device_block_event_cb(usb_connected_cb usr_callback, void *usr_data);
 #endif
 void ms_sys_unset_device_block_event_cb(void);
-int ms_sys_get_device_list(ms_stg_type_e stg_type, GSList **dev_list);
+int ms_sys_get_device_list(GSList **dev_list);
 
 #ifdef _USE_DEVICED_DBUS
 typedef void (*power_off_cb)(void *user_data);

diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c
index fb86abe..48ff97f 100644 (file)
--- a/src/common/media-common-system.c
+++ b/src/common/media-common-system.c
@@ -35,19 +35,15 @@
 /// CHECK THE EXTERNAL STORATE STATE
 //////////////////////////////////////////////////////////////////////////////
 #ifdef _USE_DEVICED_DBUS
-#define DEVICED_BUS_NAME       "org.tizen.system.storage"
-#define DEVICED_OBJECT_PATH    "/Org/Tizen/System/Storage"
-#define DEVICED_INTERFACE_NAME DEVICED_BUS_NAME
+#define DEVICED_BUS_NAME               "org.tizen.system.storage"
+#define DEVICED_PATH                   "/Org/Tizen/System/Storage/Block/Manager"
+#define DEVICED_INTERFACE              DEVICED_BUS_NAME".BlockManager"
 
-#define DEVICED_PATH_BLOCK                  DEVICED_OBJECT_PATH"/Block"
-#define DEVICED_PATH_BLOCK_MANAGER          DEVICED_PATH_BLOCK"/Manager"
-#define DEVICED_INTERFACE_BLOCK_MANAGER     DEVICED_INTERFACE_NAME".BlockManager"
-#define BLOCK_DEVICE_CHANGED    "DeviceChanged"
-
-#define BLOCK_DEVICE_METHOD "GetDeviceList"
-#define BLOCK_DEVICE_USB "scsi"
-#define BLOCK_DEVICE_MMC "mmc"
-#define BLOCK_DEVICE_ALL "all"
+#define BLOCK_DEVICE_CHANGED   "DeviceChanged"
+#define BLOCK_DEVICE_METHOD            "GetDeviceList"
+#define BLOCK_DEVICE_USB       "scsi"
+#define BLOCK_DEVICE_MMC       "mmc"
+#define BLOCK_DEVICE_ALL       "all"
 
 static GDBusConnection *g_storage_bus;
 
@@ -107,7 +103,7 @@ static int __ms_sys_subscribe_device_block_event(block_changed_cb usr_callback,
        g_storage_handler = g_dbus_connection_signal_subscribe(
                                        g_storage_bus,
                                        NULL,
-                                       DEVICED_INTERFACE_BLOCK_MANAGER,
+                                       DEVICED_INTERFACE,
                                        BLOCK_DEVICE_CHANGED,
                                        NULL,
                                        NULL,
@@ -168,12 +164,7 @@ void ms_sys_unset_device_block_event_cb(void)
 #endif
 
 #ifdef _USE_DEVICED_DBUS
-#define DBUS_REPLY_TIMEOUT (-1)
-static int __ms_gdbus_method_sync(const char *dest,
-                                                               const char *path,
-                                                               const char *interface,
-                                                               const char *method,
-                                                               GSList **dev_list)
+int ms_sys_get_device_list(GSList **dev_list)
 {
        GDBusConnection *g_bus = NULL;
        GError *error = NULL;
@@ -193,14 +184,14 @@ static int __ms_gdbus_method_sync(const char *dest,
        }
 
        reply_var = g_dbus_connection_call_sync(g_bus,
-                                                                                       dest,
-                                                                                       path,
-                                                                                       interface,
-                                                                                       method,
+                                                                                       DEVICED_BUS_NAME,
+                                                                                       DEVICED_PATH,
+                                                                                       DEVICED_INTERFACE,
+                                                                                       BLOCK_DEVICE_METHOD,
                                                                                        g_variant_new("(s)", BLOCK_DEVICE_ALL),
                                                                                        NULL,
                                                                                        G_DBUS_SEND_MESSAGE_FLAGS_NONE,
-                                                                                       DBUS_REPLY_TIMEOUT,
+                                                                                       -1,
                                                                                        NULL,
                                                                                        &error);
        if (!reply_var) {
@@ -232,10 +223,7 @@ static int __ms_gdbus_method_sync(const char *dest,
                g_variant_get_child(block_device, 8, "s", &data->mount_path);
                data->state = state;
 
-               MS_DBG_INFO("block_type : %d", data->block_type);
-               MS_DBG_INFO("mount_uuid : %s", data->mount_uuid);
-               MS_DBG_SINFO("mount_point : %s", data->mount_path);
-               MS_DBG_INFO("state : %d", data->state);
+               MS_DBG_INFO("Block type[%d] uuid[%s] path[%s]", data->block_type, data->mount_uuid, data->mount_path);
 
                *dev_list = g_slist_append(*dev_list, data);
                g_variant_unref(block_device);
@@ -248,19 +236,8 @@ static int __ms_gdbus_method_sync(const char *dest,
 
        return MS_MEDIA_ERR_NONE;
 }
-#endif
-
-#ifdef _USE_DEVICED_DBUS
-int ms_sys_get_device_list(ms_stg_type_e stg_type,  GSList **dev_list)
-{
-       return __ms_gdbus_method_sync(DEVICED_BUS_NAME,
-                                                               DEVICED_PATH_BLOCK_MANAGER,
-                                                               DEVICED_INTERFACE_BLOCK_MANAGER,
-                                                               BLOCK_DEVICE_METHOD,
-                                                               dev_list);
-}
 #else
-int ms_sys_get_device_list(ms_stg_type_e stg_type, GSList **dev_list)
+int ms_sys_get_device_list(GSList **dev_list)
 {
        int i = 0;
        int count = 0;

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index cce9ee6..d3097ff 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -478,7 +478,7 @@ static void __ms_update_storage_status(void)
        int ret = MS_MEDIA_ERR_NONE;
        GSList *dev_list = NULL;
 
-       ret = ms_sys_get_device_list(MS_STG_TYPE_ALL, &dev_list);
+       ret = ms_sys_get_device_list(&dev_list);
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("ms_sys_get_device_list failed");
                return;