Fix gdbus interface prefix and typo in xml

Changed gdbus interface prefix to 'org.tizen.peripheral_io'.

Change-Id: Iab717d474a9c01011fe08268999d7849433849b4
Signed-off-by: Hyeongsik Min <hyeongsik.min@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9d951a7ce77d00cc2131fac9ef10bbf9c3dd581..45ec9ac3bbfb8becbe5d3223622f5574d87cc3a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ EXEC_PROGRAM(${GDBUS_CODEGEN} ARGS
                 " \\
                 --generate-c-code ${CMAKE_SOURCE_DIR}/src/peripheral_io_gdbus \\
                 --c-namespace PeripheralIoGdbus \\
-                --interface-prefix org.tizen.system.peripheral_io. \\
+                --interface-prefix org.tizen.peripheral_io. \\
                 ${CMAKE_SOURCE_DIR}/src/peripheral_io.xml \\
                 ")
 

diff --git a/include/peripheral_dbus.h b/include/peripheral_dbus.h
index d21fb2a1d9587ba0d811c2f780c7acf6fb7bf3a7..557b2966d63eba50cefe3961fd0131bf0f3aea9c 100644 (file)
--- a/include/peripheral_dbus.h
+++ b/include/peripheral_dbus.h
@@ -18,12 +18,12 @@
 
 #include <gio/gio.h>
 
-#define PERIPHERAL_DBUS_INTERFACE      "org.tizen.system.peripheral_io"
-#define PERIPHERAL_DBUS_PATH           "/Org/Tizen/System/Peripheral_io"
-#define PERIPHERAL_DBUS_GPIO_PATH      "/Org/Tizen/System/Peripheral_io/Gpio"
-#define PERIPHERAL_DBUS_I2C_PATH       "/Org/Tizen/System/Peripheral_io/I2c"
-#define PERIPHERAL_DBUS_PWM_PATH       "/Org/Tizen/System/Peripheral_io/Pwm"
-#define PERIPHERAL_DBUS_NAME           "org.tizen.system.peripheral_io"
+#define PERIPHERAL_DBUS_INTERFACE      "org.tizen.peripheral_io"
+#define PERIPHERAL_DBUS_PATH           "/Org/Tizen/Peripheral_io"
+#define PERIPHERAL_DBUS_GPIO_PATH      "/Org/Tizen/Peripheral_io/Gpio"
+#define PERIPHERAL_DBUS_I2C_PATH       "/Org/Tizen/Peripheral_io/I2c"
+#define PERIPHERAL_DBUS_PWM_PATH       "/Org/Tizen/Peripheral_io/Pwm"
+#define PERIPHERAL_DBUS_NAME           "org.tizen.peripheral_io"
 
 #define PERIPHERAL_METHOD_GPIO "gpio"
 #define PERIPHERAL_METHOD_I2C  "i2c"

diff --git a/src/peripheral_io.xml b/src/peripheral_io.xml
index 07a006737740b6ddd87128436da8576e51194b52..40672ad07bcf25c19f450609e8144e03dbede4be 100644 (file)
--- a/src/peripheral_io.xml
+++ b/src/peripheral_io.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <node>
-       <interface name="org.tizen.system.peripheral_io.gpio">
+       <interface name="org.tizen.peripheral_io.gpio">
                <method name="Open">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="Close">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="GetDirection">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="direction" direction="out"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="SetDirection">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="direction" direction="in"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="Read">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="value" direction="out"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="Write">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="value" direction="in"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="GetEdgeMode">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="edge" direction="out"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
                <method name="SetEdgeMode">
-                       <arg type="i" name="pin" dyyirection="in"/>
+                       <arg type="i" name="pin" direction="in"/>
                        <arg type="i" name="edge" direction="in"/>
                        <arg type="i" name="result" direction="out"/>
                </method>
        </interface>
-       <interface name="org.tizen.system.peripheral_io.i2c">
+       <interface name="org.tizen.peripheral_io.i2c">
                <method name="Init">
                        <arg type="i" name="bus" direction="in"/>
                        <arg type="i" name="fd" direction="out"/>
@@ -72,7 +72,7 @@
                        <arg type="i" name="result" direction="out"/>
                </method>
        </interface>
-       <interface name="org.tizen.system.peripheral_io.pwm">
+       <interface name="org.tizen.peripheral_io.pwm">
                <method name="Open">
                        <arg type="i" name="device" direction="in"/>
                        <arg type="i" name="channel" direction="in"/>