pass: Fix information of dbus interface

This patch fixes the inappropriate information of dbus interface as following:
- Use the 'PASS' prefix instead of 'DEVICED'
- Remove the separate 'DEVICED_PATH_PASS' dbus interface
- Remove the 'DEVICED_PATH_CORE" dbus interface and method
- Use PASS_PATH_CORE dbus to start and stop the pass governor

Change-Id: Ib4a735bbe3ed8136a6be9b225f5feaa3c068c14b
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/core/boot.c b/src/core/boot.c
index 1c2ad7f..97c2458 100644 (file)
--- a/src/core/boot.c
+++ b/src/core/boot.c
@@ -107,8 +107,8 @@ static void booting_done_received(void *data, DBusMessage *msg)
        pm_unlock_internal(INTERNAL_LOCK_BOOTING, LCD_OFF, PM_SLEEP_MARGIN);
        */
 
-       broadcast_edbus_signal(DEVICED_PATH_CORE,
-                       DEVICED_INTERFACE_CORE,
+       broadcast_edbus_signal(PASS_PATH_CORE,
+                       PASS_INTERFACE_CORE,
                        SIGNAL_BOOTING_DONE,
                        NULL, NULL);
 

diff --git a/src/core/devices.c b/src/core/devices.c
index 51e66c2..1fce02c 100644 (file)
--- a/src/core/devices.c
+++ b/src/core/devices.c
@@ -63,26 +63,10 @@ int check_default(const struct device_ops *dev)
        return (dev == &default_ops);
 }
 
-static DBusMessage *edbus_device_list(E_DBus_Object *obj, DBusMessage *msg)
-{
-       dd_list *elem;
-       const struct device_ops *dev;
-
-       DD_LIST_FOREACH(dev_head, elem, dev)
-               _I("%s", dev->name);
-
-       return dbus_message_new_method_return(msg);
-}
-
-static const struct edbus_method edbus_methods[] = {
-       { "DeviceList",          NULL,        NULL,        edbus_device_list },
-};
-
 void devices_init(void *data)
 {
        dd_list *elem, *elem_n;
        const struct device_ops *dev;
-       int ret;
 
        DD_LIST_FOREACH_SAFE(dev_head, elem, elem_n, dev) {
                if (dev->probe && dev->probe(data) != 0) {
@@ -94,11 +78,6 @@ void devices_init(void *data)
                if (dev->init)
                        dev->init(data);
        }
-
-       ret = register_edbus_method(DEVICED_PATH_CORE,
-                   edbus_methods, ARRAY_SIZE(edbus_methods));
-       if (ret < 0)
-               _E("Failed to register edbus method! %d", ret);
 }
 
 void devices_exit(void *data)

diff --git a/src/core/edbus-handler.c b/src/core/edbus-handler.c
index b97e9fe..6d06faa 100644 (file)
--- a/src/core/edbus-handler.c
+++ b/src/core/edbus-handler.c
@@ -47,9 +47,9 @@ static struct edbus_object {
        E_DBus_Object *obj;
        E_DBus_Interface *iface;
 } edbus_objects[] = {
-       { DEVICED_PATH_CORE   , DEVICED_INTERFACE_CORE   , NULL, NULL },
-       { DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, NULL, NULL },
-       { DEVICED_PATH_PMQOS  , DEVICED_INTERFACE_PMQOS    , NULL, NULL },
+       { PASS_PATH_CORE   , PASS_INTERFACE_CORE   , NULL, NULL },
+       { PASS_PATH_SYSNOTI, PASS_INTERFACE_SYSNOTI, NULL, NULL },
+       { PASS_PATH_PMQOS  , PASS_INTERFACE_PMQOS    , NULL, NULL },
        /* Add new object & interface here*/
 };
 
@@ -931,7 +931,7 @@ static void check_owner_list(void)
        char *name;
        char *entry;
 
-       pa[0] = DEVICED_BUS_NAME;
+       pa[0] = PASS_BUS_NAME;
        msg = dbus_method_sync_with_reply(E_DBUS_FDO_BUS,
                        E_DBUS_FDO_PATH,
                        E_DBUS_FDO_INTERFACE,
@@ -1035,7 +1035,7 @@ void edbus_init(void *data)
 
        retry = 0;
        do {
-               edbus_request_name = e_dbus_request_name(edbus_conn, DEVICED_BUS_NAME,
+               edbus_request_name = e_dbus_request_name(edbus_conn, PASS_BUS_NAME,
                                DBUS_NAME_FLAG_REPLACE_EXISTING, request_name_cb, NULL);
                if (edbus_request_name)
                        break;

diff --git a/src/core/udev.c b/src/core/udev.c
index 3413f05..262e12f 100644 (file)
--- a/src/core/udev.c
+++ b/src/core/udev.c
@@ -330,7 +330,7 @@ static void udev_init(void *data)
        register_notifier(DEVICE_NOTIFIER_POWEROFF, device_change_poweroff,
                        NULL);
 
-       ret = register_edbus_method(DEVICED_PATH_SYSNOTI,
+       ret = register_edbus_method(PASS_PATH_SYSNOTI,
                        edbus_methods, ARRAY_SIZE(edbus_methods));
        if (ret < 0)
                _E("fail to init edbus method(%d)", ret);

diff --git a/src/pass/pass.c b/src/pass/pass.c
index 0fbabd3..599ea46 100644 (file)
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -249,9 +249,7 @@ static void pass_init(void *data)
         * Initialzie D-Bus interface of PASS. User can be able to
         * turn on/off PASS through D-Bus interface.
         */
-       ret = register_edbus_interface_and_method(DEVICED_PATH_PASS,
-                                       DEVICED_INTERFACE_PASS,
-                                       edbus_methods,
+       ret = register_edbus_method(PASS_PATH_CORE, edbus_methods,
                                        ARRAY_SIZE(edbus_methods));
        if (ret < 0) {
                _I("cannot initialize PASS D-Bus (%d)", ret);

diff --git a/src/pmqos/pmqos.c b/src/pmqos/pmqos.c
index b39fb4d..2fed4a2 100644 (file)
--- a/src/pmqos/pmqos.c
+++ b/src/pmqos/pmqos.c
@@ -424,7 +424,7 @@ static int booting_done(void *data, void *user_data)
                goto out;
 
        /* register edbus methods */
-       ret = register_edbus_method(DEVICED_PATH_PMQOS, edbus_methods,
+       ret = register_edbus_method(PASS_PATH_PMQOS, edbus_methods,
                                        ARRAY_SIZE(edbus_methods));
        if (ret < 0)
                _E("fail to init edbus method(%d)", ret);
@@ -436,7 +436,7 @@ static int booting_done(void *data, void *user_data)
 
        /* register edbus methods for pmqos */
        if (methods) {
-               ret = register_edbus_method(DEVICED_PATH_PMQOS, methods, size);
+               ret = register_edbus_method(PASS_PATH_PMQOS, methods, size);
                if (ret < 0)
                        _E("fail to init edbus method from conf(%d)", ret);
                free(methods);

diff --git a/src/shared/dbus.h b/src/shared/dbus.h
index 975975e..4fdecbb 100644 (file)
--- a/src/shared/dbus.h
+++ b/src/shared/dbus.h
@@ -45,24 +45,21 @@
 /*
  * Device daemon
  */
-#define DEVICED_BUS_NAME                    "org.tizen.system.deviced"
-#define DEVICED_OBJECT_PATH                 "/Org/Tizen/System/Deviced"
-#define DEVICED_INTERFACE_NAME              DEVICED_BUS_NAME
+#define PASS_BUS_NAME                    "org.tizen.system.pass"
+#define PASS_OBJECT_PATH                 "/Org/Tizen/System/Pass"
+#define PASS_INTERFACE_NAME              PASS_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"
-/* PASS service: start/stop pass operations about pass */
-#define DEVICED_PATH_PASS                   DEVICED_OBJECT_PATH"/Pass"
-#define DEVICED_INTERFACE_PASS              DEVICED_INTERFACE_NAME".pass"
-
-#define DEVICED_PATH_CPU                    DEVICED_OBJECT_PATH"/Cpu"
-#define DEVICED_INTERFACE_CPU               DEVICED_INTERFACE_NAME".Cpu"
+#define PASS_PATH_CORE                   PASS_OBJECT_PATH"/Core"
+#define PASS_INTERFACE_CORE              PASS_INTERFACE_NAME".core"
+
 /* PmQos service: operations about pmqos */
-#define DEVICED_PATH_PMQOS                  DEVICED_OBJECT_PATH"/PmQos"
-#define DEVICED_INTERFACE_PMQOS             DEVICED_INTERFACE_NAME".PmQos"
+#define PASS_PATH_PMQOS                  PASS_OBJECT_PATH"/Pmqos"
+#define PASS_INTERFACE_PMQOS             PASS_INTERFACE_NAME".pmqos"
+
 /* Sysnoti service */
-#define DEVICED_PATH_SYSNOTI                DEVICED_OBJECT_PATH"/SysNoti"
-#define DEVICED_INTERFACE_SYSNOTI           DEVICED_INTERFACE_NAME".SysNoti"
+#define PASS_PATH_SYSNOTI                PASS_OBJECT_PATH"/Sysnoti"
+#define PASS_INTERFACE_SYSNOTI           PASS_INTERFACE_NAME".sysnoti"
 
 struct dbus_byte {
        const unsigned char *data;