From b8f31ad6992f2ff196e0ef59bbdd186792a87fe8 Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Tue, 21 Mar 2023 09:26:43 +0900 Subject: [PATCH] display: Relocate display plugin code before separating them into core Temporarily relocate header and source code: - src/display -> src/display/plugin-common All display code are actually included in translation unit of plugin and built into plugin shared lib. Move them into display/plugin-common in advance. And later, separate them from plugin translation unit. The directory, src/display, will comprise display core code, not plugin code. - src/display/plugin-common: Temporary directory for display plugin code. Those code will move into src/display. - src/display: Directory for display core code. Change-Id: I56831630db97d553e6803167e610cfa3d5371168 Signed-off-by: Youngjae Cho --- CMakeLists.txt | 4 ++++ plugins/iot-headed/display/CMakeLists.txt | 7 +++++-- plugins/iot-headed/display/device-interface.c | 10 +++++----- plugins/iot-headed/display/key-filter.c | 2 +- plugins/iot-headless/display/CMakeLists.txt | 3 +++ plugins/mobile/battery/battery-notification.c | 6 +++--- plugins/mobile/display/CMakeLists.txt | 7 +++++-- plugins/mobile/display/core.c | 2 +- plugins/mobile/display/device-interface.c | 10 +++++----- plugins/mobile/display/key-filter.c | 2 +- plugins/mobile/display/proximity.c | 2 +- plugins/tv/display/CMakeLists.txt | 7 +++++-- plugins/tv/display/device-interface.c | 10 +++++----- plugins/tv/display/key-filter.c | 2 +- plugins/wearable/battery/battery-notification.c | 2 +- plugins/wearable/display/CMakeLists.txt | 7 +++++-- plugins/wearable/display/auto-brightness-sensorhub.c | 8 ++++---- plugins/wearable/display/auto-brightness-sensorhub.h | 2 +- plugins/wearable/display/bezel.c | 6 +++--- plugins/wearable/display/core.c | 4 ++-- plugins/wearable/display/device-interface.c | 10 +++++----- plugins/wearable/display/display-handler.c | 12 ++++++------ plugins/wearable/display/enhance.c | 6 +++--- plugins/wearable/display/hbm.c | 8 ++++---- plugins/wearable/display/key-filter.c | 2 +- plugins/wearable/display/lbm.c | 8 ++++---- plugins/wearable/display/powersaver.c | 8 ++++---- plugins/wearable/display/swim.c | 6 +++--- plugins/wearable/display/weaks.h | 2 +- src/battery-monitor/battery-monitor.c | 2 +- src/battery-monitor/battery-monitor.h | 2 +- src/battery/battery-time.c | 2 +- src/battery/lowbat-handler.c | 6 +++--- src/battery/power-supply.c | 8 ++++---- src/core/main.c | 2 +- src/display/{ => plugin-common}/ambient-mode.c | 0 src/display/{ => plugin-common}/ambient-mode.h | 0 src/display/{ => plugin-common}/auto-brightness.c | 0 src/display/{ => plugin-common}/core.h | 0 src/display/{ => plugin-common}/device-interface.h | 0 src/display/{ => plugin-common}/display-actor.c | 0 src/display/{ => plugin-common}/display-actor.h | 0 src/display/{ => plugin-common}/display-backlight.c | 0 src/display/{ => plugin-common}/display-backlight.h | 0 src/display/{ => plugin-common}/display-dbus.c | 0 src/display/{ => plugin-common}/display-dpms.c | 8 ++++---- src/display/{ => plugin-common}/display-dpms.h | 0 src/display/{ => plugin-common}/display-input.c | 0 src/display/{ => plugin-common}/display-lock.c | 0 src/display/{ => plugin-common}/display-lock.h | 0 src/display/{ => plugin-common}/display-ops.c | 0 src/display/{ => plugin-common}/display-ops.h | 0 src/display/{ => plugin-common}/display-panel.c | 0 src/display/{ => plugin-common}/display-panel.h | 0 src/display/{ => plugin-common}/display-signal.c | 0 src/display/{ => plugin-common}/display-signal.h | 0 src/display/{ => plugin-common}/display.c | 0 src/display/{ => plugin-common}/display.h | 0 src/display/{ => plugin-common}/lock-detector.c | 0 src/display/{ => plugin-common}/lock-detector.h | 0 src/display/{ => plugin-common}/poll.c | 2 +- src/display/{ => plugin-common}/poll.h | 1 - src/display/{ => plugin-common}/setting.c | 0 src/display/{ => plugin-common}/setting.h | 0 src/display/{ => plugin-common}/slave-logging.c | 4 ++-- src/display/{ => plugin-common}/util.h | 0 src/extcon/cradle.c | 4 ++-- src/extcon/earjack.c | 4 ++-- src/extcon/hdmi.c | 4 ++-- src/led/touch-key.c | 6 +++--- src/power/power-boot.c | 4 ++-- src/power/power-doze.c | 2 +- src/power/power-off.c | 8 ++++---- src/power/power-suspend.c | 4 ++-- src/power/power-suspend.h | 2 +- src/shared/apps.h | 4 ++-- src/shared/plugin.h | 2 +- src/time/time-handler.c | 6 +++--- src/touchscreen/touchscreen.c | 4 ++-- src/usb-gadget/usb-gadget.c | 4 ++-- src/usb-host/usb-host.c | 4 ++-- 81 files changed, 141 insertions(+), 123 deletions(-) rename src/display/{ => plugin-common}/ambient-mode.c (100%) rename src/display/{ => plugin-common}/ambient-mode.h (100%) rename src/display/{ => plugin-common}/auto-brightness.c (100%) rename src/display/{ => plugin-common}/core.h (100%) rename src/display/{ => plugin-common}/device-interface.h (100%) rename src/display/{ => plugin-common}/display-actor.c (100%) rename src/display/{ => plugin-common}/display-actor.h (100%) rename src/display/{ => plugin-common}/display-backlight.c (100%) rename src/display/{ => plugin-common}/display-backlight.h (100%) rename src/display/{ => plugin-common}/display-dbus.c (100%) rename src/display/{ => plugin-common}/display-dpms.c (99%) rename src/display/{ => plugin-common}/display-dpms.h (100%) rename src/display/{ => plugin-common}/display-input.c (100%) rename src/display/{ => plugin-common}/display-lock.c (100%) rename src/display/{ => plugin-common}/display-lock.h (100%) rename src/display/{ => plugin-common}/display-ops.c (100%) rename src/display/{ => plugin-common}/display-ops.h (100%) rename src/display/{ => plugin-common}/display-panel.c (100%) rename src/display/{ => plugin-common}/display-panel.h (100%) rename src/display/{ => plugin-common}/display-signal.c (100%) rename src/display/{ => plugin-common}/display-signal.h (100%) rename src/display/{ => plugin-common}/display.c (100%) rename src/display/{ => plugin-common}/display.h (100%) rename src/display/{ => plugin-common}/lock-detector.c (100%) rename src/display/{ => plugin-common}/lock-detector.h (100%) rename src/display/{ => plugin-common}/poll.c (99%) rename src/display/{ => plugin-common}/poll.h (99%) rename src/display/{ => plugin-common}/setting.c (100%) rename src/display/{ => plugin-common}/setting.h (100%) rename src/display/{ => plugin-common}/slave-logging.c (97%) rename src/display/{ => plugin-common}/util.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aca3d1..2650e47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/deviced) +# FIXME: Temporary include path for separating display core and plugin +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/display/plugin-common) + SET(PKG_MODULES vconf dlog diff --git a/plugins/iot-headed/display/CMakeLists.txt b/plugins/iot-headed/display/CMakeLists.txt index a57a502..2d290d3 100644 --- a/plugins/iot-headed/display/CMakeLists.txt +++ b/plugins/iot-headed/display/CMakeLists.txt @@ -3,10 +3,13 @@ PROJECT(iot-headed-display C) FILE(GLOB ALL_SRCS "*.c") SET(SRCS ${ALL_SRCS}) -ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display COMMON_SRCS) +ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display/plugin-common COMMON_SRCS) SET(SRCS ${SRCS} ${COMMON_SRCS}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core) +# FIXME: Temporary include path for separating display core and plugin +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display/plugin-common) INCLUDE(FindPkgConfig) pkg_check_modules(libpkgs REQUIRED diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c index b79cfca..43fe79e 100644 --- a/plugins/iot-headed/display/device-interface.c +++ b/plugins/iot-headed/display/device-interface.c @@ -42,11 +42,11 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "display/display-dpms.h" -#include "display/display.h" -#include "display/display-lock.h" -#include "display/display-backlight.h" -#include "display/display-panel.h" +#include "display-dpms.h" +#include "display.h" +#include "display-lock.h" +#include "display-backlight.h" +#include "display-panel.h" #define TOUCH_ON 1 #define TOUCH_OFF 0 diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c index 08adddd..6990473 100644 --- a/plugins/iot-headed/display/key-filter.c +++ b/plugins/iot-headed/display/key-filter.c @@ -43,7 +43,7 @@ #include "power/power-off.h" #include "power/power-suspend.h" #include "led/touch-key.h" -#include "display/display-lock.h" +#include "display-lock.h" #ifndef KEY_SCREENLOCK #define KEY_SCREENLOCK 0x98 diff --git a/plugins/iot-headless/display/CMakeLists.txt b/plugins/iot-headless/display/CMakeLists.txt index 3d0a186..1daab28 100644 --- a/plugins/iot-headless/display/CMakeLists.txt +++ b/plugins/iot-headless/display/CMakeLists.txt @@ -4,6 +4,9 @@ PROJECT(iot-headless-display C) FILE(GLOB SRCS "*.c") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) +# FIXME: Temporary include path for separating display core and plugin +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display/plugin-common) INCLUDE(FindPkgConfig) pkg_check_modules(libpkgs REQUIRED diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c index b8a9578..a93fd5f 100644 --- a/plugins/mobile/battery/battery-notification.c +++ b/plugins/mobile/battery/battery-notification.c @@ -27,9 +27,9 @@ #include "power-supply.h" #include "lowbat-handler.h" #include "battery-ops.h" -#include "display/core.h" -#include "display/display-ops.h" -#include "display/poll.h" +#include "core.h" +#include "display-ops.h" +#include "poll.h" #include "shared/eventsystem.h" #include "shared/plugin.h" #include "shared/device-notifier.h" diff --git a/plugins/mobile/display/CMakeLists.txt b/plugins/mobile/display/CMakeLists.txt index 40e9dd0..1621bd6 100644 --- a/plugins/mobile/display/CMakeLists.txt +++ b/plugins/mobile/display/CMakeLists.txt @@ -3,10 +3,13 @@ PROJECT(mobile-display C) FILE(GLOB ALL_SRCS "*.c") SET(SRCS ${ALL_SRCS}) -ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display COMMON_SRCS) +ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display/plugin-common COMMON_SRCS) SET(SRCS ${SRCS} ${COMMON_SRCS}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core) +# FIXME: Temporary include path for separating display core and plugin +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display/plugin-common) INCLUDE(FindPkgConfig) pkg_check_modules(libpkgs REQUIRED diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index c8d64d6..cbd9c6e 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -59,7 +59,7 @@ #include "power/power-suspend.h" #include "power/power-boot.h" #include "power/power-doze.h" -#include "display/display-dpms.h" +#include "display-dpms.h" #include "proximity.h" #include "display-info.h" #include "display-signal.h" diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c index e2ca8a4..b4b0496 100644 --- a/plugins/mobile/display/device-interface.c +++ b/plugins/mobile/display/device-interface.c @@ -41,11 +41,11 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "display/display-dpms.h" -#include "display/display.h" -#include "display/display-lock.h" -#include "display/display-backlight.h" -#include "display/display-panel.h" +#include "display-dpms.h" +#include "display.h" +#include "display-lock.h" +#include "display-backlight.h" +#include "display-panel.h" #include "power/power-boot.h" #include "power/power-suspend.h" diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c index 5e218ef..df380ce 100644 --- a/plugins/mobile/display/key-filter.c +++ b/plugins/mobile/display/key-filter.c @@ -43,7 +43,7 @@ #include "power/power-off.h" #include "power/power-suspend.h" #include "led/touch-key.h" -#include "display/display-lock.h" +#include "display-lock.h" #ifndef KEY_SCREENLOCK #define KEY_SCREENLOCK 0x98 diff --git a/plugins/mobile/display/proximity.c b/plugins/mobile/display/proximity.c index 7c04036..4812a1b 100644 --- a/plugins/mobile/display/proximity.c +++ b/plugins/mobile/display/proximity.c @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "display/core.h" +#include "core.h" #include "shared/log-macro.h" #include "proximity.h" diff --git a/plugins/tv/display/CMakeLists.txt b/plugins/tv/display/CMakeLists.txt index b597429..300d89b 100644 --- a/plugins/tv/display/CMakeLists.txt +++ b/plugins/tv/display/CMakeLists.txt @@ -3,10 +3,13 @@ PROJECT(tv-display C) FILE(GLOB ALL_SRCS "*.c") SET(SRCS ${ALL_SRCS}) -ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display COMMON_SRCS) +ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display/plugin-common COMMON_SRCS) SET(SRCS ${SRCS} ${COMMON_SRCS}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core) +# FIXME: Temporary include path for separating display core and plugin +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display/plugin-common) INCLUDE(FindPkgConfig) pkg_check_modules(libpkgs REQUIRED diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c index e8eb6e4..b607cc3 100644 --- a/plugins/tv/display/device-interface.c +++ b/plugins/tv/display/device-interface.c @@ -41,12 +41,12 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "display/display-dpms.h" -#include "display/display-panel.h" -#include "display/display.h" -#include "display/display-backlight.h" +#include "display-dpms.h" +#include "display-panel.h" +#include "display.h" +#include "display-backlight.h" #include "power/power-suspend.h" -#include "display/display-lock.h" +#include "display-lock.h" #define TOUCH_ON 1 #define TOUCH_OFF 0 diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c index d5b6ee6..d992c7c 100644 --- a/plugins/tv/display/key-filter.c +++ b/plugins/tv/display/key-filter.c @@ -43,7 +43,7 @@ #include "power/power-off.h" #include "power/power-suspend.h" #include "led/touch-key.h" -#include "display/display-lock.h" +#include "display-lock.h" #ifndef KEY_SCREENLOCK #define KEY_SCREENLOCK 0x98 diff --git a/plugins/wearable/battery/battery-notification.c b/plugins/wearable/battery/battery-notification.c index 27c9b53..b743e22 100644 --- a/plugins/wearable/battery/battery-notification.c +++ b/plugins/wearable/battery/battery-notification.c @@ -19,7 +19,7 @@ #include #include -#include "display/core.h" +#include "core.h" #include "core/log.h" #include "shared/device-notifier.h" #include "power-supply.h" diff --git a/plugins/wearable/display/CMakeLists.txt b/plugins/wearable/display/CMakeLists.txt index 74c2816..c0c040f 100644 --- a/plugins/wearable/display/CMakeLists.txt +++ b/plugins/wearable/display/CMakeLists.txt @@ -3,10 +3,13 @@ PROJECT(wearable-display C) FILE(GLOB ALL_SRCS "*.c") SET(SRCS ${ALL_SRCS}) -ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display COMMON_SRCS) +ADD_SOURCE(${CMAKE_SOURCE_DIR}/src/display/plugin-common COMMON_SRCS) SET(SRCS ${SRCS} ${COMMON_SRCS}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/display ${CMAKE_SOURCE_DIR}/src/battery-monitor) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/battery-monitor) +# FIXME: Temporary include path for separating display core and plugin +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/display/plugin-common) INCLUDE(FindPkgConfig) pkg_check_modules(libpkgs REQUIRED diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c index 77e5030..806d01f 100644 --- a/plugins/wearable/display/auto-brightness-sensorhub.c +++ b/plugins/wearable/display/auto-brightness-sensorhub.c @@ -27,10 +27,10 @@ #include "hbm.h" #include "lbm.h" #include "auto-brightness-sensorhub.h" -#include "display/util.h" -#include "display/core.h" -#include "display/display-ops.h" -#include "display/display-backlight.h" +#include "util.h" +#include "core.h" +#include "display-ops.h" +#include "display-backlight.h" #include "shared/device-notifier.h" #include "battery/power-supply.h" #include "shared/plugin.h" diff --git a/plugins/wearable/display/auto-brightness-sensorhub.h b/plugins/wearable/display/auto-brightness-sensorhub.h index 0b8e3f8..7f26c4a 100644 --- a/plugins/wearable/display/auto-brightness-sensorhub.h +++ b/plugins/wearable/display/auto-brightness-sensorhub.h @@ -28,7 +28,7 @@ #define LBM_LEVEL 110 #define HBM_LEVEL 120 -#include "display/display.h" +#include "display.h" int prepare_level_handler(void); void exit_level_handler(void); diff --git a/plugins/wearable/display/bezel.c b/plugins/wearable/display/bezel.c index b2beefa..3d4c80b 100644 --- a/plugins/wearable/display/bezel.c +++ b/plugins/wearable/display/bezel.c @@ -22,9 +22,9 @@ #include "shared/devices.h" #include "shared/common.h" #include "shared/device-notifier.h" -#include "display/util.h" -#include "display/poll.h" -#include "display/core.h" +#include "util.h" +#include "poll.h" +#include "core.h" #include "display-ops.h" #include "shared/plugin.h" diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index adcb55b..06fd7af 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -60,10 +60,10 @@ #include "power/power-suspend.h" #include "power/power-boot.h" #include "power/power-doze.h" -#include "display/display-dpms.h" +#include "display-dpms.h" #include "display-info.h" #include "battery-monitor.h" -#include "display/display-signal.h" +#include "display-signal.h" #include "display-lock.h" #include "display-backlight.h" #include "display-panel.h" diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c index 0df0fdf..b2a1709 100644 --- a/plugins/wearable/display/device-interface.c +++ b/plugins/wearable/display/device-interface.c @@ -41,11 +41,11 @@ #include "device-interface.h" #include "vconf.h" #include "core.h" -#include "display/display-dpms.h" -#include "display/display.h" -#include "display/display-lock.h" -#include "display/display-backlight.h" -#include "display/display-panel.h" +#include "display-dpms.h" +#include "display.h" +#include "display-lock.h" +#include "display-backlight.h" +#include "display-panel.h" #include "battery-monitor.h" #include "battery/power-supply.h" #include "power/power-suspend.h" diff --git a/plugins/wearable/display/display-handler.c b/plugins/wearable/display/display-handler.c index 7fd9087..5fabbfb 100644 --- a/plugins/wearable/display/display-handler.c +++ b/plugins/wearable/display/display-handler.c @@ -24,14 +24,14 @@ #include "auto-brightness-sensorhub.h" #include "shared/device-notifier.h" -#include "display/util.h" -#include "display/core.h" -#include "display/poll.h" +#include "util.h" +#include "core.h" +#include "poll.h" #include "shared/common.h" #include "shared/devices.h" -#include "display/display-actor.h" -#include "display/display-backlight.h" -#include "display/display-ops.h" +#include "display-actor.h" +#include "display-backlight.h" +#include "display-ops.h" #include "display-info.h" #define CHARGER_LCD_NODE "/sys/class/power_supply/battery/lcd" diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c index 21dfb9c..769f91d 100644 --- a/plugins/wearable/display/enhance.c +++ b/plugins/wearable/display/enhance.c @@ -23,9 +23,9 @@ #include #include -#include "display/core.h" -#include "display/display-ops.h" -#include "display/display-panel.h" +#include "core.h" +#include "display-ops.h" +#include "display-panel.h" #include "shared/devices.h" #include "core/log.h" #include "shared/common.h" diff --git a/plugins/wearable/display/hbm.c b/plugins/wearable/display/hbm.c index 00ed147..f670d2f 100644 --- a/plugins/wearable/display/hbm.c +++ b/plugins/wearable/display/hbm.c @@ -23,10 +23,10 @@ #include "auto-brightness-sensorhub.h" #include "weaks.h" #include "display-info.h" -#include "display/util.h" -#include "display/core.h" -#include "display/display-ops.h" -#include "display/display-dpms.h" +#include "util.h" +#include "core.h" +#include "display-ops.h" +#include "display-dpms.h" #include "shared/common.h" #include "shared/device-notifier.h" diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index ac92106..c7d3c4a 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -43,7 +43,7 @@ #include "power/power-off.h" #include "power/power-suspend.h" #include "led/touch-key.h" -#include "display/display-lock.h" +#include "display-lock.h" #ifndef KEY_SCREENLOCK #define KEY_SCREENLOCK 0x98 diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c index f7f5fbd..75403c7 100644 --- a/plugins/wearable/display/lbm.c +++ b/plugins/wearable/display/lbm.c @@ -24,10 +24,10 @@ #include "auto-brightness-sensorhub.h" #include "lbm.h" #include "display-info.h" -#include "display/util.h" -#include "display/core.h" -#include "display/display-backlight.h" -#include "display/display-ops.h" +#include "util.h" +#include "core.h" +#include "display-backlight.h" +#include "display-ops.h" #include "shared/common.h" #include "shared/device-notifier.h" diff --git a/plugins/wearable/display/powersaver.c b/plugins/wearable/display/powersaver.c index 609a54f..2fa86bc 100644 --- a/plugins/wearable/display/powersaver.c +++ b/plugins/wearable/display/powersaver.c @@ -23,10 +23,10 @@ #include "shared/devices.h" #include "shared/device-notifier.h" #include "core/log.h" -#include "display/core.h" -#include "display/device-interface.h" -#include "display/display-backlight.h" -#include "display/display-ops.h" +#include "core.h" +#include "device-interface.h" +#include "display-backlight.h" +#include "display-ops.h" #include "display-info.h" #include "powersaver.h" #include "setting.h" diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c index 40c0928..e54cfd1 100644 --- a/plugins/wearable/display/swim.c +++ b/plugins/wearable/display/swim.c @@ -20,9 +20,9 @@ #include "shared/device-notifier.h" #include "shared/devices.h" -#include "display/core.h" -#include "display/util.h" -#include "display/display-ops.h" +#include "core.h" +#include "util.h" +#include "display-ops.h" #include "shared/plugin.h" #include diff --git a/plugins/wearable/display/weaks.h b/plugins/wearable/display/weaks.h index caf8693..3ad37b2 100644 --- a/plugins/wearable/display/weaks.h +++ b/plugins/wearable/display/weaks.h @@ -21,7 +21,7 @@ #define __DISPLAY_WEAKS_H__ #include "shared/common.h" -#include "display/core.h" +#include "core.h" bool __WEAK__ get_outdoor_setting(void); diff --git a/src/battery-monitor/battery-monitor.c b/src/battery-monitor/battery-monitor.c index b6d13ab..55b28d8 100644 --- a/src/battery-monitor/battery-monitor.c +++ b/src/battery-monitor/battery-monitor.c @@ -25,7 +25,7 @@ #include "core/log.h" #include "shared/devices.h" #include "shared/common.h" -#include "display/core.h" +#include "core.h" #define DBUS_DEVICED "org.tizen.system.deviced" #define DBUS_DEVICED_BM_PATH "/Org/Tizen/System/DeviceD/BatteryMonitor" diff --git a/src/battery-monitor/battery-monitor.h b/src/battery-monitor/battery-monitor.h index 542eb73..3693e91 100644 --- a/src/battery-monitor/battery-monitor.h +++ b/src/battery-monitor/battery-monitor.h @@ -20,7 +20,7 @@ #ifndef __BATTERY_MONITOR_H__ #define __BATTERY_MONITOR_H__ -#include "display/core.h" +#include "core.h" typedef struct { int (*update_bds_record)(enum state_t lcd_state); diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c index 39259a4..72ff11e 100644 --- a/src/battery/battery-time.c +++ b/src/battery/battery-time.c @@ -27,7 +27,7 @@ #include "shared/common.h" #include "shared/devices.h" #include "core/log.h" -#include "display/display-ops.h" +#include "display-ops.h" #include "power-supply.h" #include "shared/plugin.h" diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c index 0960194..93f4ec8 100644 --- a/src/battery/lowbat-handler.c +++ b/src/battery/lowbat-handler.c @@ -39,9 +39,9 @@ #include "shared/apps.h" #include "shared/eventsystem.h" #include "shared/plugin.h" -#include "display/setting.h" -#include "display/poll.h" -#include "display/display-ops.h" +#include "setting.h" +#include "poll.h" +#include "display-ops.h" #include "power/power.h" #include "power/power-off.h" #include "power-supply.h" diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index 197fabe..82e1ad8 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -30,13 +30,13 @@ #include "shared/device-notifier.h" #include "core/udev.h" #include "core/log.h" -#include "display/poll.h" -#include "display/setting.h" +#include "poll.h" +#include "setting.h" #include "shared/eventsystem.h" #include "shared/plugin.h" #include "shared/apps.h" -#include "display/core.h" -#include "display/display-ops.h" +#include "core.h" +#include "display-ops.h" #include "power-supply.h" #include "battery.h" #include "battery-ops.h" diff --git a/src/core/main.c b/src/core/main.c index 1f77e48..342da1e 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -27,7 +27,7 @@ #include #include -#include "display/core.h" +#include "core.h" #include "log.h" #include "shared/common.h" #include "shared/devices.h" diff --git a/src/display/ambient-mode.c b/src/display/plugin-common/ambient-mode.c similarity index 100% rename from src/display/ambient-mode.c rename to src/display/plugin-common/ambient-mode.c diff --git a/src/display/ambient-mode.h b/src/display/plugin-common/ambient-mode.h similarity index 100% rename from src/display/ambient-mode.h rename to src/display/plugin-common/ambient-mode.h diff --git a/src/display/auto-brightness.c b/src/display/plugin-common/auto-brightness.c similarity index 100% rename from src/display/auto-brightness.c rename to src/display/plugin-common/auto-brightness.c diff --git a/src/display/core.h b/src/display/plugin-common/core.h similarity index 100% rename from src/display/core.h rename to src/display/plugin-common/core.h diff --git a/src/display/device-interface.h b/src/display/plugin-common/device-interface.h similarity index 100% rename from src/display/device-interface.h rename to src/display/plugin-common/device-interface.h diff --git a/src/display/display-actor.c b/src/display/plugin-common/display-actor.c similarity index 100% rename from src/display/display-actor.c rename to src/display/plugin-common/display-actor.c diff --git a/src/display/display-actor.h b/src/display/plugin-common/display-actor.h similarity index 100% rename from src/display/display-actor.h rename to src/display/plugin-common/display-actor.h diff --git a/src/display/display-backlight.c b/src/display/plugin-common/display-backlight.c similarity index 100% rename from src/display/display-backlight.c rename to src/display/plugin-common/display-backlight.c diff --git a/src/display/display-backlight.h b/src/display/plugin-common/display-backlight.h similarity index 100% rename from src/display/display-backlight.h rename to src/display/plugin-common/display-backlight.h diff --git a/src/display/display-dbus.c b/src/display/plugin-common/display-dbus.c similarity index 100% rename from src/display/display-dbus.c rename to src/display/plugin-common/display-dbus.c diff --git a/src/display/display-dpms.c b/src/display/plugin-common/display-dpms.c similarity index 99% rename from src/display/display-dpms.c rename to src/display/plugin-common/display-dpms.c index 37b0ff2..e9bf433 100644 --- a/src/display/display-dpms.c +++ b/src/display/plugin-common/display-dpms.c @@ -28,10 +28,10 @@ #include "core/log.h" #include "shared/device-notifier.h" -#include "display/device-interface.h" -#include "display/util.h" -#include "display/display-dpms.h" -#include "display/device-interface.h" +#include "device-interface.h" +#include "util.h" +#include "display-dpms.h" +#include "device-interface.h" #include "core.h" #define DPMS_RESPONSE_TIMEOUT 10 /* second */ diff --git a/src/display/display-dpms.h b/src/display/plugin-common/display-dpms.h similarity index 100% rename from src/display/display-dpms.h rename to src/display/plugin-common/display-dpms.h diff --git a/src/display/display-input.c b/src/display/plugin-common/display-input.c similarity index 100% rename from src/display/display-input.c rename to src/display/plugin-common/display-input.c diff --git a/src/display/display-lock.c b/src/display/plugin-common/display-lock.c similarity index 100% rename from src/display/display-lock.c rename to src/display/plugin-common/display-lock.c diff --git a/src/display/display-lock.h b/src/display/plugin-common/display-lock.h similarity index 100% rename from src/display/display-lock.h rename to src/display/plugin-common/display-lock.h diff --git a/src/display/display-ops.c b/src/display/plugin-common/display-ops.c similarity index 100% rename from src/display/display-ops.c rename to src/display/plugin-common/display-ops.c diff --git a/src/display/display-ops.h b/src/display/plugin-common/display-ops.h similarity index 100% rename from src/display/display-ops.h rename to src/display/plugin-common/display-ops.h diff --git a/src/display/display-panel.c b/src/display/plugin-common/display-panel.c similarity index 100% rename from src/display/display-panel.c rename to src/display/plugin-common/display-panel.c diff --git a/src/display/display-panel.h b/src/display/plugin-common/display-panel.h similarity index 100% rename from src/display/display-panel.h rename to src/display/plugin-common/display-panel.h diff --git a/src/display/display-signal.c b/src/display/plugin-common/display-signal.c similarity index 100% rename from src/display/display-signal.c rename to src/display/plugin-common/display-signal.c diff --git a/src/display/display-signal.h b/src/display/plugin-common/display-signal.h similarity index 100% rename from src/display/display-signal.h rename to src/display/plugin-common/display-signal.h diff --git a/src/display/display.c b/src/display/plugin-common/display.c similarity index 100% rename from src/display/display.c rename to src/display/plugin-common/display.c diff --git a/src/display/display.h b/src/display/plugin-common/display.h similarity index 100% rename from src/display/display.h rename to src/display/plugin-common/display.h diff --git a/src/display/lock-detector.c b/src/display/plugin-common/lock-detector.c similarity index 100% rename from src/display/lock-detector.c rename to src/display/plugin-common/lock-detector.c diff --git a/src/display/lock-detector.h b/src/display/plugin-common/lock-detector.h similarity index 100% rename from src/display/lock-detector.h rename to src/display/plugin-common/lock-detector.h diff --git a/src/display/poll.c b/src/display/plugin-common/poll.c similarity index 99% rename from src/display/poll.c rename to src/display/plugin-common/poll.c index 600c2ef..9a82c4c 100644 --- a/src/display/poll.c +++ b/src/display/plugin-common/poll.c @@ -27,7 +27,7 @@ #include "util.h" #include "core.h" #include "poll.h" -#include "display/display-ops.h" +#include "display-ops.h" #include "shared/plugin.h" #define SHIFT_UNLOCK 4 diff --git a/src/display/poll.h b/src/display/plugin-common/poll.h similarity index 99% rename from src/display/poll.h rename to src/display/plugin-common/poll.h index 9328cac..5e03f6a 100644 --- a/src/display/poll.h +++ b/src/display/plugin-common/poll.h @@ -26,7 +26,6 @@ #ifndef __PM_POLL_H__ #define __PM_POLL_H__ -#include #include /** * @addtogroup POWER_MANAGER diff --git a/src/display/setting.c b/src/display/plugin-common/setting.c similarity index 100% rename from src/display/setting.c rename to src/display/plugin-common/setting.c diff --git a/src/display/setting.h b/src/display/plugin-common/setting.h similarity index 100% rename from src/display/setting.h rename to src/display/plugin-common/setting.h diff --git a/src/display/slave-logging.c b/src/display/plugin-common/slave-logging.c similarity index 97% rename from src/display/slave-logging.c rename to src/display/plugin-common/slave-logging.c index 4243804..149e551 100644 --- a/src/display/slave-logging.c +++ b/src/display/plugin-common/slave-logging.c @@ -21,8 +21,8 @@ #include "shared/common.h" #include "core/log.h" -#include "display/core.h" -#include "display/poll.h" +#include "core.h" +#include "poll.h" #define BUFF_MAX 255 #define LOCK_STR_MAX 20 diff --git a/src/display/util.h b/src/display/plugin-common/util.h similarity index 100% rename from src/display/util.h rename to src/display/plugin-common/util.h diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c index 5ab4fb5..b1ca644 100644 --- a/src/extcon/cradle.c +++ b/src/extcon/cradle.c @@ -24,8 +24,8 @@ #include "core/log.h" #include "shared/device-notifier.h" #include "core/udev.h" -#include "display/core.h" -#include "display/display-ops.h" +#include "core.h" +#include "display-ops.h" #include "extcon/extcon.h" #include "shared/plugin.h" diff --git a/src/extcon/earjack.c b/src/extcon/earjack.c index bc154cb..3cc6bdb 100644 --- a/src/extcon/earjack.c +++ b/src/extcon/earjack.c @@ -23,8 +23,8 @@ #include #include "core/log.h" -#include "display/poll.h" -#include "display/display-ops.h" +#include "poll.h" +#include "display-ops.h" #include "extcon/extcon.h" #include "shared/plugin.h" diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c index 56ffea6..34b11ef 100644 --- a/src/extcon/hdmi.c +++ b/src/extcon/hdmi.c @@ -23,8 +23,8 @@ #include "core/log.h" #include "shared/bitmap.h" #include "shared/device-notifier.h" -#include "display/core.h" -#include "display/display-ops.h" +#include "core.h" +#include "display-ops.h" #include "extcon.h" #include "shared/plugin.h" diff --git a/src/led/touch-key.c b/src/led/touch-key.c index b241481..7727ac3 100644 --- a/src/led/touch-key.c +++ b/src/led/touch-key.c @@ -25,9 +25,9 @@ #include "core/log.h" #include "shared/devices.h" #include "shared/device-notifier.h" -#include "display/core.h" -#include "display/setting.h" -#include "display/display-ops.h" +#include "core.h" +#include "setting.h" +#include "display-ops.h" #include "touch-key.h" #include "shared/plugin.h" diff --git a/src/power/power-boot.c b/src/power/power-boot.c index 0f39f4a..ca39916 100644 --- a/src/power/power-boot.c +++ b/src/power/power-boot.c @@ -30,8 +30,8 @@ #include "core/log.h" #include "shared/device-notifier.h" #include "shared/common.h" -#include "display/poll.h" -#include "display/display-ops.h" +#include "poll.h" +#include "display-ops.h" #include "shared/plugin.h" #include "power-doze.h" #include "power.h" diff --git a/src/power/power-doze.c b/src/power/power-doze.c index 6679381..9d400c5 100644 --- a/src/power/power-doze.c +++ b/src/power/power-doze.c @@ -20,7 +20,7 @@ #include "power-doze.h" #include "core/log.h" #include "shared/device-notifier.h" -#include "display/core.h" +#include "core.h" #define DOZE_DISABLED 0 #define DOZE_ENABLED 1 diff --git a/src/power/power-off.c b/src/power/power-off.c index 60994b4..9c454dd 100644 --- a/src/power/power-off.c +++ b/src/power/power-off.c @@ -43,10 +43,10 @@ #include "shared/device-notifier.h" #include "shared/common.h" #include "shared/devices.h" -#include "display/poll.h" -#include "display/setting.h" -#include "display/core.h" -#include "display/display-ops.h" +#include "poll.h" +#include "setting.h" +#include "core.h" +#include "display-ops.h" #include "power-off.h" #include "power.h" #include "power-boot.h" diff --git a/src/power/power-suspend.c b/src/power/power-suspend.c index aff5611..f1d97ef 100644 --- a/src/power/power-suspend.c +++ b/src/power/power-suspend.c @@ -38,8 +38,8 @@ #include "shared/device-notifier.h" #include "shared/time.h" #include "vconf.h" -#include "display/display-dpms.h" -#include "display/display.h" +#include "display-dpms.h" +#include "display.h" #include "power.h" #include "power-boot.h" #include "power-suspend.h" diff --git a/src/power/power-suspend.h b/src/power/power-suspend.h index 44eff02..3fac1a3 100644 --- a/src/power/power-suspend.h +++ b/src/power/power-suspend.h @@ -19,7 +19,7 @@ #ifndef __DEVICED_POWER_SUSPEND_H__ #define __DEVICED_POWER_SUSPEND_H__ -#include "display/core.h" +#include "core.h" #include #define POWER_AUTOSLEEP_PATH "/sys/power/autosleep" diff --git a/src/shared/apps.h b/src/shared/apps.h index 8e6ac23..92f753e 100644 --- a/src/shared/apps.h +++ b/src/shared/apps.h @@ -22,8 +22,8 @@ #include #include #include "shared/common.h" -#include "display/poll.h" -#include "display/display-ops.h" +#include "poll.h" +#include "display-ops.h" #define APP_POWERKEY "powerkey" #define APP_OVERHEAT "overheat" diff --git a/src/shared/plugin.h b/src/shared/plugin.h index b79b690..1d259cb 100644 --- a/src/shared/plugin.h +++ b/src/shared/plugin.h @@ -19,7 +19,7 @@ #ifndef __DD_PLUGIN_H__ #define __DD_PLUGIN_H__ -#include "display/display-ops.h" +#include "display-ops.h" #include "battery/battery-ops.h" struct display_plugin *get_var_display_plugin(void); diff --git a/src/time/time-handler.c b/src/time/time-handler.c index 6c7fa10..7daa9ed 100644 --- a/src/time/time-handler.c +++ b/src/time/time-handler.c @@ -35,9 +35,9 @@ #include "core/log.h" #include "shared/devices.h" -#include "display/poll.h" -#include "display/core.h" -#include "display/display-ops.h" +#include "poll.h" +#include "core.h" +#include "display-ops.h" #include "shared/common.h" #include "shared/device-notifier.h" #include "shared/plugin.h" diff --git a/src/touchscreen/touchscreen.c b/src/touchscreen/touchscreen.c index 5c76054..5f334cf 100644 --- a/src/touchscreen/touchscreen.c +++ b/src/touchscreen/touchscreen.c @@ -27,8 +27,8 @@ #include "core/log.h" #include "shared/device-notifier.h" #include "battery/power-supply.h" -#include "display/core.h" -#include "display/display-ops.h" +#include "core.h" +#include "display-ops.h" #include "power/power-boot.h" #include "shared/plugin.h" diff --git a/src/usb-gadget/usb-gadget.c b/src/usb-gadget/usb-gadget.c index bc551ea..341d934 100644 --- a/src/usb-gadget/usb-gadget.c +++ b/src/usb-gadget/usb-gadget.c @@ -22,8 +22,8 @@ #include "core/log.h" #include "core/udev.h" -#include "display/poll.h" -#include "display/display-ops.h" +#include "poll.h" +#include "display-ops.h" #include "shared/plugin.h" #include "usb-gadget.h" diff --git a/src/usb-host/usb-host.c b/src/usb-host/usb-host.c index 3dc6d78..f4057ef 100644 --- a/src/usb-host/usb-host.c +++ b/src/usb-host/usb-host.c @@ -31,8 +31,8 @@ #include "shared/apps.h" #include "core/udev.h" #include "extcon/extcon.h" -#include "display/display-ops.h" -#include "display/core.h" +#include "display-ops.h" +#include "core.h" #include "dd-usbhost.h" #include "shared/plugin.h" -- 2.7.4