Modify dbus method object path and interface for haptic

Haptic module is seperated from deviced to deviced-vibrator,
and object path, interface, and bus name is changed

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

diff --git a/src/dbus.h b/src/dbus.h
index b912d8c..41a8805 100644 (file)
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -35,8 +35,12 @@
 #define DEVICED_INTERFACE_BATTERY           DEVICED_INTERFACE_NAME".Battery"
 
 /* Haptic service: operatioins about haptic */
-#define DEVICED_PATH_HAPTIC                 DEVICED_OBJECT_PATH"/Haptic"
-#define DEVICED_INTERFACE_HAPTIC            DEVICED_INTERFACE_NAME".haptic"
+#define VIBRATOR_BUS_NAME                   "org.tizen.system.vibrator"
+#define VIBRATOR_OBJECT_PATH                "/Org/Tizen/System/Vibrator"
+#define VIBRATOR_INTERFACE_NAME                    VIBRATOR_BUS_NAME
+
+#define VIBRATOR_PATH_HAPTIC                VIBRATOR_OBJECT_PATH"/Haptic"
+#define VIBRATOR_INTERFACE_HAPTIC           VIBRATOR_INTERFACE_NAME".haptic"
 
 /* Led service: play/stop led operations about led */
 #define DEVICED_PATH_LED                    DEVICED_OBJECT_PATH"/Led"

diff --git a/src/haptic.c b/src/haptic.c
index 5543c8f..2e08d54 100644 (file)
--- a/src/haptic.c
+++ b/src/haptic.c
@@ -49,8 +49,8 @@ int device_haptic_get_count(int *device_number)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        /* request to deviced to get haptic count */
-       ret = dbus_method_sync(DEVICED_BUS_NAME,
-                       DEVICED_PATH_HAPTIC, DEVICED_INTERFACE_HAPTIC,
+       ret = dbus_method_sync(VIBRATOR_BUS_NAME,
+                       VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_GET_COUNT, NULL, NULL);
        /**
         * there is no haptic method in no vibration model.
@@ -85,8 +85,8 @@ int device_haptic_open(int device_index, haptic_device_h *device_handle)
        arr[0] = str_index;
 
        /* request to deviced to open haptic device */
-       ret = dbus_method_sync(DEVICED_BUS_NAME,
-                       DEVICED_PATH_HAPTIC, DEVICED_INTERFACE_HAPTIC,
+       ret = dbus_method_sync(VIBRATOR_BUS_NAME,
+                       VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_OPEN_DEVICE, "i", arr);
        if (ret < 0)
                return errno_to_device_error(ret);
@@ -108,8 +108,8 @@ int device_haptic_close(haptic_device_h device_handle)
        arr[0] = str_handle;
 
        /* request to deviced to open haptic device */
-       ret = dbus_method_sync(DEVICED_BUS_NAME,
-                       DEVICED_PATH_HAPTIC, DEVICED_INTERFACE_HAPTIC,
+       ret = dbus_method_sync(VIBRATOR_BUS_NAME,
+                       VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_CLOSE_DEVICE, "u", arr);
        if (ret < 0)
                return errno_to_device_error(ret);
@@ -147,8 +147,8 @@ int device_haptic_vibrate(haptic_device_h device_handle, int duration, int feedb
        arr[3] = str_priority;
 
        /* request to deviced to vibrate haptic device */
-       ret = dbus_method_sync(DEVICED_BUS_NAME,
-                       DEVICED_PATH_HAPTIC, DEVICED_INTERFACE_HAPTIC,
+       ret = dbus_method_sync(VIBRATOR_BUS_NAME,
+                       VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_VIBRATE_MONOTONE, "uiii", arr);
        if (ret < 0)
                return errno_to_device_error(ret);
@@ -173,8 +173,8 @@ int device_haptic_stop(haptic_device_h device_handle, haptic_effect_h effect_han
        arr[0] = str_handle;
 
        /* request to deviced to open haptic device */
-       ret = dbus_method_sync(DEVICED_BUS_NAME,
-                       DEVICED_PATH_HAPTIC, DEVICED_INTERFACE_HAPTIC,
+       ret = dbus_method_sync(VIBRATOR_BUS_NAME,
+                       VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_STOP_DEVICE, "u", arr);
        if (ret < 0)
                return errno_to_device_error(ret);