From 04503068e5448f9b551778212a58302087e53fe8 Mon Sep 17 00:00:00 2001 From: Segwon Date: Tue, 14 Nov 2017 17:54:05 +0900 Subject: [PATCH] gdbus: move gdbus files to top level gdbus folder Change-Id: If08e00e576cb8bdb099a740768870a6bdcf41d8b Signed-off-by: Segwon --- CMakeLists.txt | 17 +++++++++-------- include/{ => gdbus}/peripheral_gdbus.h | 0 include/{ => gdbus}/peripheral_gdbus_gpio.h | 0 include/{ => gdbus}/peripheral_gdbus_i2c.h | 0 include/{ => gdbus}/peripheral_gdbus_pwm.h | 0 include/{ => gdbus}/peripheral_gdbus_spi.h | 0 include/{ => gdbus}/peripheral_gdbus_uart.h | 0 src/{ => gdbus}/peripheral_gdbus_gpio.c | 0 src/{ => gdbus}/peripheral_gdbus_i2c.c | 0 src/{ => gdbus}/peripheral_gdbus_pwm.c | 0 src/{ => gdbus}/peripheral_gdbus_spi.c | 0 src/{ => gdbus}/peripheral_gdbus_uart.c | 0 src/{ => gdbus}/peripheral_io.xml | 0 src/peripheral_gpio.c | 2 +- 14 files changed, 10 insertions(+), 9 deletions(-) rename include/{ => gdbus}/peripheral_gdbus.h (100%) rename include/{ => gdbus}/peripheral_gdbus_gpio.h (100%) rename include/{ => gdbus}/peripheral_gdbus_i2c.h (100%) rename include/{ => gdbus}/peripheral_gdbus_pwm.h (100%) rename include/{ => gdbus}/peripheral_gdbus_spi.h (100%) rename include/{ => gdbus}/peripheral_gdbus_uart.h (100%) rename src/{ => gdbus}/peripheral_gdbus_gpio.c (100%) rename src/{ => gdbus}/peripheral_gdbus_i2c.c (100%) rename src/{ => gdbus}/peripheral_gdbus_pwm.c (100%) rename src/{ => gdbus}/peripheral_gdbus_spi.c (100%) rename src/{ => gdbus}/peripheral_gdbus_uart.c (100%) rename src/{ => gdbus}/peripheral_io.xml (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 335e42a..9b17fa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,14 +19,15 @@ SET(VERSION ${version}) FIND_PROGRAM(GDBUS_CODEGEN NAMES gdbus-codegen) EXEC_PROGRAM(${GDBUS_CODEGEN} ARGS " \\ - --generate-c-code ${CMAKE_SOURCE_DIR}/src/peripheral_io_gdbus \\ + --generate-c-code ${CMAKE_SOURCE_DIR}/src/gdbus/peripheral_io_gdbus \\ --c-namespace PeripheralIoGdbus \\ --interface-prefix org.tizen.peripheral_io. \\ - ${CMAKE_SOURCE_DIR}/src/peripheral_io.xml \\ + ${CMAKE_SOURCE_DIR}/src/gdbus/peripheral_io.xml \\ ") SET(INC_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}) +INCLUDE_DIRECTORIES(${INC_DIR}/gdbus) INCLUDE_DIRECTORIES(${INC_DIR}/interface) INCLUDE(FindPkgConfig) @@ -53,12 +54,12 @@ SET(SOURCES src/peripheral_gpio.c src/interface/peripheral_interface_pwm.c src/interface/peripheral_interface_spi.c src/interface/peripheral_interface_uart.c - src/peripheral_gdbus_gpio.c - src/peripheral_gdbus_i2c.c - src/peripheral_gdbus_pwm.c - src/peripheral_gdbus_uart.c - src/peripheral_gdbus_spi.c - src/peripheral_io_gdbus.c) + src/gdbus/peripheral_gdbus_gpio.c + src/gdbus/peripheral_gdbus_i2c.c + src/gdbus/peripheral_gdbus_pwm.c + src/gdbus/peripheral_gdbus_uart.c + src/gdbus/peripheral_gdbus_spi.c + src/gdbus/peripheral_io_gdbus.c) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) diff --git a/include/peripheral_gdbus.h b/include/gdbus/peripheral_gdbus.h similarity index 100% rename from include/peripheral_gdbus.h rename to include/gdbus/peripheral_gdbus.h diff --git a/include/peripheral_gdbus_gpio.h b/include/gdbus/peripheral_gdbus_gpio.h similarity index 100% rename from include/peripheral_gdbus_gpio.h rename to include/gdbus/peripheral_gdbus_gpio.h diff --git a/include/peripheral_gdbus_i2c.h b/include/gdbus/peripheral_gdbus_i2c.h similarity index 100% rename from include/peripheral_gdbus_i2c.h rename to include/gdbus/peripheral_gdbus_i2c.h diff --git a/include/peripheral_gdbus_pwm.h b/include/gdbus/peripheral_gdbus_pwm.h similarity index 100% rename from include/peripheral_gdbus_pwm.h rename to include/gdbus/peripheral_gdbus_pwm.h diff --git a/include/peripheral_gdbus_spi.h b/include/gdbus/peripheral_gdbus_spi.h similarity index 100% rename from include/peripheral_gdbus_spi.h rename to include/gdbus/peripheral_gdbus_spi.h diff --git a/include/peripheral_gdbus_uart.h b/include/gdbus/peripheral_gdbus_uart.h similarity index 100% rename from include/peripheral_gdbus_uart.h rename to include/gdbus/peripheral_gdbus_uart.h diff --git a/src/peripheral_gdbus_gpio.c b/src/gdbus/peripheral_gdbus_gpio.c similarity index 100% rename from src/peripheral_gdbus_gpio.c rename to src/gdbus/peripheral_gdbus_gpio.c diff --git a/src/peripheral_gdbus_i2c.c b/src/gdbus/peripheral_gdbus_i2c.c similarity index 100% rename from src/peripheral_gdbus_i2c.c rename to src/gdbus/peripheral_gdbus_i2c.c diff --git a/src/peripheral_gdbus_pwm.c b/src/gdbus/peripheral_gdbus_pwm.c similarity index 100% rename from src/peripheral_gdbus_pwm.c rename to src/gdbus/peripheral_gdbus_pwm.c diff --git a/src/peripheral_gdbus_spi.c b/src/gdbus/peripheral_gdbus_spi.c similarity index 100% rename from src/peripheral_gdbus_spi.c rename to src/gdbus/peripheral_gdbus_spi.c diff --git a/src/peripheral_gdbus_uart.c b/src/gdbus/peripheral_gdbus_uart.c similarity index 100% rename from src/peripheral_gdbus_uart.c rename to src/gdbus/peripheral_gdbus_uart.c diff --git a/src/peripheral_io.xml b/src/gdbus/peripheral_io.xml similarity index 100% rename from src/peripheral_io.xml rename to src/gdbus/peripheral_io.xml diff --git a/src/peripheral_gpio.c b/src/peripheral_gpio.c index 408ed0a..c80e9c9 100644 --- a/src/peripheral_gpio.c +++ b/src/peripheral_gpio.c @@ -19,12 +19,12 @@ #include #include #include +#include #include "peripheral_io.h" #include "peripheral_gdbus_gpio.h" #include "peripheral_common.h" #include "peripheral_internal.h" -#include "peripheral_io_gdbus.h" #define PERIPHERAL_IO_GPIO_FEATURE "http://tizen.org/feature/peripheral_io.gpio" -- 2.34.1