dbus name cleanup

diff --git a/src/shared/dbus_macro.h b/src/shared/dbus_macro.h
index edaf1e4..af7ea0c 100755 (executable)
--- a/src/shared/dbus_macro.h
+++ b/src/shared/dbus_macro.h
@@ -20,9 +20,13 @@
 #ifndef __STORAGED_DBUS_MACRO_H__
 #define __STORAGED_DBUS_MACRO_H__
 
-/*
+
+/*******************************************************************************
+ *
  * Template
  *
+ ******************************************************************************/
+/*
 #define XXX_BUS_NAME                        "org.tizen.system.XXX"
 #define XXX_OBJECT_PATH                     "/Org/Tizen/System/XXX"
 #define XXX_INTERFACE_NAME                  XXX_BUS_NAME
@@ -32,61 +36,69 @@
 #define XXX_METHOD_ZZZ                      "ZZZ"
  */
 
-/*
- * DBus daemon
- */
-#define DBUS_BUS_NAME                       "org.freedesktop.DBus"
-#define DBUS_OBJECT_PATH                    "/org/freedesktop/DBus"
-#define DBUS_INTERFACE_NAME                 DBUS_BUS_NAME
 
-/*
- * System daemon
- */
+/*******************************************************************************
+ *
+ * System daemon (systemd)
+ *
+ ******************************************************************************/
 #define SYSTEMD_DBUS_PATH                            "/org/freedesktop/systemd1"
 #define SYSTEMD_DBUS_DEST                            "org.freedesktop.systemd1"
 #define SYSTEMD_DBUS_IFACE_MANAGER                   SYSTEMD_DBUS_DEST ".Manager"
 #define SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED  "StartupFinished"
 
-/*
- * Device daemon
- */
+
+/*******************************************************************************
+ *
+ * Device daemon (deviced)
+ *
+ ******************************************************************************/
 #define DEVICED_BUS_NAME                    "org.tizen.system.deviced"
 #define DEVICED_OBJECT_PATH                 "/Org/Tizen/System/DeviceD"
 #define DEVICED_INTERFACE_NAME              DEVICED_BUS_NAME
-/* Core service: get/set device status operations about device */
-#define DEVICED_PATH_CORE                   DEVICED_OBJECT_PATH"/Core"
-#define DEVICED_INTERFACE_CORE              DEVICED_INTERFACE_NAME".core"
-/* Power service: set resetkey disable operations about power */
-#define DEVICED_PATH_POWER                  DEVICED_OBJECT_PATH"/Power"
-#define DEVICED_INTERFACE_POWER             DEVICED_INTERFACE_NAME".power"
+
 /* Poweroff service: get power off status operations about Poweroff */
 #define DEVICED_PATH_POWEROFF               DEVICED_OBJECT_PATH"/PowerOff"
 #define DEVICED_INTERFACE_POWEROFF          DEVICED_INTERFACE_NAME".PowerOff"
-/* Block service: manage block device */
+
+
+/*******************************************************************************
+ *
+ * Storage daemon (storaged)
+ *
+ ******************************************************************************/
 #define STORAGED_BUS_NAME                    "org.tizen.system.storage"
 #define STORAGED_OBJECT_PATH                 "/Org/Tizen/System/Storage"
 #define STORAGED_INTERFACE_NAME              STORAGED_BUS_NAME
+
+/* Block service */
 #define STORAGED_PATH_BLOCK                  STORAGED_OBJECT_PATH"/Block"
 #define STORAGED_PATH_BLOCK_MANAGER          STORAGED_PATH_BLOCK"/Manager"
 #define STORAGED_INTERFACE_BLOCK_MANAGER     STORAGED_INTERFACE_NAME".BlockManager"
+
 /* Storage service: get storage size operatioins about storage */
 #define STORAGED_PATH_STORAGE                STORAGED_OBJECT_PATH"/Storage"
 #define STORAGED_INTERFACE_STORAGE           STORAGED_INTERFACE_NAME".storage"
+
 /* Lowmem service: get critical low status operations about Lowmem */
 #define STORAGED_PATH_LOWMEM                 STORAGED_OBJECT_PATH"/Lowmem"
 #define STORAGED_INTERFACE_LOWMEM            STORAGED_INTERFACE_NAME".lowmem"
 
-/*
- * Popup launcher
- */
+
+/*******************************************************************************
+ *
+ * Popup launcher (system-popup)
+ *
+ ******************************************************************************/
 #define POPUP_BUS_NAME                      "org.tizen.system.popup"
 #define POPUP_OBJECT_PATH                   "/Org/Tizen/System/Popup"
 #define POPUP_INTERFACE_NAME                POPUP_BUS_NAME
+
 /* System */
 #define POPUP_PATH_SYSTEM                   POPUP_OBJECT_PATH"/System"
 #define POPUP_INTERFACE_SYSTEM              POPUP_INTERFACE_NAME".System"
 
-
+/* ODE */
 #define POPUP_METHOD_LAUNCH                 "PopupLaunch"
 #define POPUP_KEY_CONTENT                   "_SYSPOPUP_CONTENT_"
 #define POPUP_SDCARD_ID                     "_SDCARD_NUM_"