display: Remove display-plugin

The display plugin has been replaced with the libsyscommon plugin api
for the several previous patches. And finally, it is now totally
replaced so remove the empty display-plugin from the deviced core.

Change-Id: Ia3e78a7ac8a9aeda637efd7aaa556560da018493
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 692bf6d663dc0a090c0494bf4c40ce221a711a34..aa24d582226344bec57d0d1c4b86d3a1aa4d3526 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -61,7 +61,6 @@
 #include "power/power-boot.h"
 #include "power/power-doze.h"
 #include "device-interface.h"
-#include "display-plugin.h"
 #include "display-info.h"
 #include "display-signal.h"
 #include "display-lock.h"
@@ -78,8 +77,6 @@
  * @{
  */
 
-static struct display_plugin *disp_plgn;
-
 #define LOCK_SCREEN_WATING_TIME                300     /* 0.3 second */
 #define LONG_PRESS_INTERVAL             400       /* 0.4 seconds */
 #define SAMPLING_INTERVAL              1       /* 1 sec */
@@ -127,9 +124,6 @@ inline const struct syscommon_deviced_display_config* get_var_display_config()
  */
 static int display_probe(void *data)
 {
-       struct display_plugin *dp = (struct display_plugin *) data;
-       assert(dp);
-
        return 0;
 }
 
@@ -152,13 +146,6 @@ static const struct device_ops display_plugin_device_ops = {
 };
 
 DEVICE_OPS_REGISTER(&display_plugin_device_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}
 /**
  * @}
  */

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index 7467cb1c82588f1dcefac281c43a5b24aca06702..bca17774ffd21e04ed037527611d4a7a9e306a87 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -61,7 +61,6 @@
 #include "power/power-boot.h"
 #include "power/power-doze.h"
 #include "device-interface.h"
-#include "display-plugin.h"
 #include "display-signal.h"
 #include "display-lock.h"
 #include "display-backlight.h"
@@ -77,8 +76,6 @@
  * @{
  */
 
-static struct display_plugin *disp_plgn;
-
 #define LOCK_SCREEN_WATING_TIME                300     /* 0.3 second */
 #define LONG_PRESS_INTERVAL             2       /* 2 seconds */
 #define SAMPLING_INTERVAL              1       /* 1 sec */
@@ -126,9 +123,6 @@ inline const struct syscommon_deviced_display_config* get_var_display_config()
  */
 static int display_probe(void *data)
 {
-       struct display_plugin *dp = (struct display_plugin *) data;
-       assert(dp);
-
        return 0;
 }
 
@@ -151,13 +145,6 @@ static const struct device_ops display_plugin_device_ops = {
 };
 
 DEVICE_OPS_REGISTER(&display_plugin_device_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}
 /**
  * @}
  */

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index f2e0eb0a31e34a70523e3618689a9387871934e7..99c80b8a0a00e071b32b00ce607323c80e9268ae 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -88,7 +88,6 @@ enum combination_process {
        COMBINATION_QUICKTALK   = KEY_COMBINATION_POWERKEY | KEY_COMBINATION_VOLUMEDOWN,
 };
 
-static struct display_plugin *disp_plgn;
 static struct timeval pressed_time;
 static guint longkey_timeout_id = 0;
 static guint longkey_restore_id = 0;
@@ -766,10 +765,6 @@ static struct syscommon_deviced_display_actor_ops display_menukey_actor = {
 
 static void __CONSTRUCTOR__ initialize(void)
 {
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-
        display_add_actor(&display_powerkey_actor);
        display_add_actor(&display_menukey_actor);
 

diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c
index 10c2d7ac2ccc00de6ebc8b2d225f6edd45f7d072..c06d40aad9f97d3e608bebd8f7a5fbc9a1fc5079 100644 (file)
--- a/plugins/wearable/display/auto-brightness-sensorhub.c
+++ b/plugins/wearable/display/auto-brightness-sensorhub.c
@@ -41,7 +41,6 @@
 
 #define LOWBATCAPACITY 5
 
-static struct display_plugin *disp_plgn;
 static int auto_brightness_state = SETTING_BRIGHTNESS_AUTOMATIC_OFF;
 static bool lbm, hbm, hold_brt, lowdim;
 
@@ -365,10 +364,3 @@ void exit_level_handler(void)
        syscommon_notifier_unsubscribe_notify(DEVICED_NOTIFIER_LCD_OFF, display_off_changed);
        syscommon_notifier_unsubscribe_notify(DEVICED_NOTIFIER_LCD_OFF_COMPLETE, display_off_complete_changed);
 }
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}

diff --git a/plugins/wearable/display/bezel.c b/plugins/wearable/display/bezel.c
index c67b2e1940206dba609f63eaeb226388ea24664d..46ab00d28d67b81a10cb1cb44558f2f554802866 100644 (file)
--- a/plugins/wearable/display/bezel.c
+++ b/plugins/wearable/display/bezel.c
@@ -47,7 +47,6 @@ enum bezel_type {
 
 static enum bezel_state bezel_wakeup_control(void);
 
-static struct display_plugin *disp_plgn;
 static bool bezel_dev_available = false;
 static int bezel_wakeup = 0;
 static int theater_mode = 0;
@@ -298,10 +297,3 @@ static const struct device_ops bezel_device_ops = {
 };
 
 DEVICE_OPS_REGISTER(&bezel_device_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 3755cea8dad7923f2bde81bc9ba653ccb7ed9c42..999c9a9d286878aeaf2a8aaf6b911a0e0898f622 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -64,7 +64,6 @@
 #include "power/power-boot.h"
 #include "power/power-doze.h"
 #include "device-interface.h"
-#include "display-plugin.h"
 #include "display-info.h"
 #include "battery-monitor.h"
 #include "display-signal.h"
@@ -88,8 +87,6 @@
  * @{
  */
 
-static struct display_plugin *disp_plgn;
-
 static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT;
 
 /*
@@ -854,9 +851,6 @@ static void init_lcd_operation(void)
  */
 static int display_probe(void *data)
 {
-       struct display_plugin *dp = (struct display_plugin *) data;
-       assert(dp);
-
        /**
         * FIXME: They should be connected via plugin interfaces
         *
@@ -964,14 +958,6 @@ static const struct device_ops display_plugin_device_ops = {
 
 DEVICE_OPS_REGISTER(&display_plugin_device_ops)
 
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-
-}
-
 /**
  * @}
  */

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index b3c142d312b9cacfffc34a5744ccb8b31064b1c0..16ce9eb3f4249c14c0a9eb1863825a0ed28a04af 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -89,7 +89,6 @@ enum combination_process {
        COMBINATION_QUICKTALK   = KEY_COMBINATION_POWERKEY | KEY_COMBINATION_VOLUMEDOWN,
 };
 
-static struct display_plugin *disp_plgn;
 static struct timeval pressed_time;
 static guint longkey_timeout_id = 0;
 static guint longkey_restore_id = 0;
@@ -694,10 +693,6 @@ static struct syscommon_deviced_display_actor_ops display_menukey_actor = {
 
 static void __CONSTRUCTOR__ initialize(void)
 {
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-
        display_add_actor(&display_powerkey_actor);
        display_add_actor(&display_menukey_actor);
 

diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c
index af0cb0da00d50b32b2b6f0c672a54a5d9bc12e9c..50f19ddf85a6aae48a9325de6613501480cd75c0 100644 (file)
--- a/plugins/wearable/display/swim.c
+++ b/plugins/wearable/display/swim.c
@@ -35,7 +35,6 @@
 #define DBUS_COREAPPS_SWIMMODE_INTERFACE       "org.tizen.coreapps.home.swimmode"
 #define DBUS_SWIMMODE_MEMBER_STATUS            "status"
 
-static struct display_plugin *disp_plgn;
 static const struct device_ops *touchscreen_ops;
 static int swimmode_status;
 
@@ -147,10 +146,3 @@ static const struct device_ops swim_device_ops = {
 };
 
 DEVICE_OPS_REGISTER(&swim_device_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}

diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c
index db087ea98f3801a04f16c07acc7b1e1caf405aed..45cde46287ea5d2e15c223d88f1d80ea0d002935 100644 (file)
--- a/src/battery/battery-time.c
+++ b/src/battery/battery-time.c
@@ -23,6 +23,7 @@
 #include <vconf.h>
 #include <hal/device/hal-battery.h>
 #include <libsyscommon/libgdbus.h>
+#include <system/syscommon-plugin-deviced-display-interface.h>
 
 #include "shared/common.h"
 #include "shared/devices.h"

diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index de47edc3ba04f6236e1058538a3ee86e08c23766..453abd617ccc2480d4de10f7f377894215440b79 100644 (file)
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -47,7 +47,6 @@
 #include "poll.h"
 #include "display-lock.h"
 #include "display-ops.h"
-#include "display-plugin.h"
 #include "display-state-transition.h"
 #include "power/power.h"
 #include "power/power-off.h"

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index a1a6a54177de8fb47a383347b85f7d711d5f2171..42a286e9a3f1c18948c283b5cb559e9170dde438 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -28,7 +28,6 @@
 #include <hal/device/hal-display.h>
 #include "shared/devices.h"
 #include "display-backlight.h"
-#include "display-plugin.h"
 
 #define FLAG_X_DPMS            0x2
 

diff --git a/src/display/display-backlight.c b/src/display/display-backlight.c
index fae32e4b869a5d9422fd7d2bf388916eb9043d4a..654e6c9961f16202d67d89811444b4c4be4f49a6 100644 (file)
--- a/src/display/display-backlight.c
+++ b/src/display/display-backlight.c
@@ -29,7 +29,6 @@
 #include "display-state-transition.h"
 #include "display-backlight.h"
 #include "display-panel.h"
-#include "display-plugin.h"
 
 #define DUMP_MODE_WAITING_TIME         600000  /* milisecond */
 #define LCD_PHASED_DELAY               10000   /* microsecond */

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index fcef9481fd1979169cb338d41b0d4504abf25454..f93d91668a335715f15208b37c4ba5ce8bc6fa77 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -74,7 +74,6 @@
 #define EXPIRED_POPUP_COMM   "_APP_COMM_"
 #define EXPIRED_POPUP_ID     "_REQUEST_ID_"
 
-static struct display_plugin *disp_plgn;
 static char *custom_change_name;
 
 static GVariant *dbus_start(GDBusConnection *conn,
@@ -1592,11 +1591,3 @@ int init_pm_dbus(void)
 
        return 0;
 }
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn) {
-               _E("Failed to get display plugin variable.");
-       }
-}

diff --git a/src/display/display-dpms.c b/src/display/display-dpms.c
index 77de7e56a10b912a64c49b261bcc89cd0b4a1f9b..17749b6e7fd980d3b0c64ad8b1ddfc2b2706157b 100644 (file)
--- a/src/display/display-dpms.c
+++ b/src/display/display-dpms.c
@@ -31,7 +31,6 @@
 #include "shared/device-notifier.h"
 #include "device-interface.h"
 #include "display-dpms.h"
-#include "display-plugin.h"
 #include "device-interface.h"
 #include "core.h"
 

diff --git a/src/display/display-lock.c b/src/display/display-lock.c
index e04648cf6e6da8dff85158bcbb92d84ebb1c2608..06fd15f28d1a8f740abd9d3382dc6799b96d5747 100644 (file)
--- a/src/display/display-lock.c
+++ b/src/display/display-lock.c
@@ -32,7 +32,6 @@
 #include "lock-detector.h"
 #include "display-lock.h"
 #include "display-panel.h"
-#include "display-plugin.h"
 #include "display-config.h"
 #include "display-misc.h"
 #include "display-state-transition.h"

diff --git a/src/display/display-misc.c b/src/display/display-misc.c
index 50c0256f2eee05d43e4be6d3980c961666c7de08..ccfa8c102ca76ea18fc7dd7543f60d1398bfdaea 100644 (file)
--- a/src/display/display-misc.c
+++ b/src/display/display-misc.c
@@ -34,7 +34,6 @@
 #include "display-lock.h"
 #include "display-misc.h"
 #include "display-panel.h"
-#include "display-plugin.h"
 #include "display-state-transition.h"
 #include "lock-detector.h"
 #include "poll.h"

diff --git a/src/display/display-ops.h b/src/display/display-ops.h
index 119c72d643da0a4194f1a2d412b8856feeb5efd4..492822a95219f48586e9fe8af93399d56b9b426c 100644 (file)
--- a/src/display/display-ops.h
+++ b/src/display/display-ops.h
@@ -21,7 +21,6 @@
 #define __DISPLAY_OPS_H__
 
 #include <errno.h>
-#include "display-plugin.h"
 #include "shared/common.h"
 #include "shared/devices.h"
 //#include "display.h"

diff --git a/src/display/display-panel.c b/src/display/display-panel.c
index 65d2befd38456fbdb78ccbbf099bc970dd22a554..603fc58ae7ce725704c9aebb1f16d5726494ae6a 100644 (file)
--- a/src/display/display-panel.c
+++ b/src/display/display-panel.c
@@ -29,7 +29,6 @@
 #include "display-lock.h"
 #include "display-misc.h"
 #include "display-panel.h"
-#include "display-plugin.h"
 #include "display-signal.h"
 #include "display-state-transition.h"
 #include "display-util.h"

diff --git a/src/display/display-plugin.c b/src/display/display-plugin.c
deleted file mode 100644 (file)
index 9fd0197..0000000
--- a/src/display/display-plugin.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * deviced
- *
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <errno.h>
-#include "display-plugin.h"
-#include "display-config.h"
-#include "shared/log-macro.h"
-
-struct display_plugin g_display_plugin;
\ No newline at end of file

diff --git a/src/display/display-plugin.h b/src/display/display-plugin.h
deleted file mode 100644 (file)
index 8e39b2f..0000000
--- a/src/display/display-plugin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * deviced
- *
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __DISPLAY_PLUGIN_H__
-#define __DISPLAY_PLUGIN_H__
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <system/syscommon-plugin-deviced-common-interface.h>
-
-#include "core.h"
-#include "display-config.h"
-#include "display-backlight.h"
-#include "shared/devices.h"
-
-struct display_plugin {
-};
-extern struct display_plugin g_display_plugin;
-
-#endif //__DISPLAY_PLUGIN_H__

diff --git a/src/display/display-signal.c b/src/display/display-signal.c
index 7f7d297694977b6b7612f7dde94207bf0d0197bd..ddeecf2ac52afcb47300550ecd2fa23e4e0603eb 100644 (file)
--- a/src/display/display-signal.c
+++ b/src/display/display-signal.c
@@ -37,7 +37,6 @@ static const char *lcdoff_sig_lookup[SIGNAL_MAX] = {
        [SIGNAL_POST] = "LCDOffCompleted",
 };
 
-static struct display_plugin *disp_plgn;
 static long displayoff_time;
 
 void broadcast_lcd_on(enum signal_type type, enum deviced_event reason)
@@ -139,10 +138,3 @@ void display_signal_unregister_display_brightness_notifier(void)
 {
        syscommon_notifier_unsubscribe_notify(DEVICED_NOTIFIER_DISPLAY_BRIGHTNESS, broadcast_brightness_changed);
 }
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}

diff --git a/src/display/display-state-transition.c b/src/display/display-state-transition.c
index e24678df92c3ce2b1929128e6192a52e19af2827..bd627f48ee4e615dd2ee688d09bf487005b72e4c 100644 (file)
--- a/src/display/display-state-transition.c
+++ b/src/display/display-state-transition.c
@@ -32,7 +32,6 @@
 #include "device-interface.h"
 #include "display-state-transition.h"
 #include "display-lock.h"
-#include "display-plugin.h"
 #include "display-signal.h"
 #include "display-util.h"
 #include "extcon/extcon.h"

diff --git a/src/display/display-util.c b/src/display/display-util.c
index 6670ed47630f3e0d45bd4c4b9c33829afc95a12b..a279a622ca4577c21327911a4cee38db5b08ca14 100644 (file)
--- a/src/display/display-util.c
+++ b/src/display/display-util.c
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+#include <system/syscommon-plugin-deviced-display-interface.h>
+
+#include "poll.h"
 #include "display-misc.h"
-#include "display-plugin.h"
 #include "display-util.h"
 
 int display_util_get_display_state(int s_bits)

diff --git a/src/display/display.c b/src/display/display.c
index 7f1864bf2ac690a3a82920fbc6997bb97761f1b9..1cd4a682ece7aafd22cd8fcd722caceae11de8c2 100644 (file)
--- a/src/display/display.c
+++ b/src/display/display.c
@@ -34,7 +34,6 @@
 #include "device-interface.h"
 #include "display.h"
 #include "display-lock.h"
-#include "display-plugin.h"
 #include "display-config.h"
 #include "display-misc.h"
 #include "display-ops.h"
@@ -514,7 +513,7 @@ static int display_probe(void *data)
                 */
                display_plugin_device_ops = find_device("display-plugin");
                if (display_plugin_device_ops && display_plugin_device_ops->probe) {
-                       ret = display_plugin_device_ops->probe(&g_display_plugin);
+                       ret = display_plugin_device_ops->probe(NULL);
                        if (ret < 0)
                                return ret;
                }

diff --git a/src/display/resource-display.c b/src/display/resource-display.c
index 4da97536b918477dde45fc1bdc57901b62cf6d2d..dca5edfdf554305e92f195ac5f38c6ffd249fb9a 100644 (file)
--- a/src/display/resource-display.c
+++ b/src/display/resource-display.c
@@ -31,7 +31,6 @@
 #include "device-interface.h"
 #include "display-misc.h"
 #include "display-lock.h"
-#include "display-plugin.h"
 
 typedef union {
        int32_t i32;
@@ -290,7 +289,7 @@ static int get_display_attr_data(int resource_id,
                break;
        case DEVICED_DISPLAY_ATTR_INT_CONFIG_POWERKEY_DOUBLEPRESS:
                /**
-                * FIXME: Directly access extern g_display_plugin. Fix it not to directly access
+                * FIXME: Directly access extern g_display_config. Fix it not to directly access
                 *        variable via extern.
                 */
                if (!g_display_config)
@@ -300,7 +299,7 @@ static int get_display_attr_data(int resource_id,
                break;
        case DEVICED_DISPLAY_ATTR_DOUBLE_CONFIG_LONGPRESS_INTERVAL:
                /**
-                * FIXME: Directly access extern g_display_plugin. Fix it not to directly access
+                * FIXME: Directly access extern g_display_config. Fix it not to directly access
                 *        variable via extern.
                 */
                if (!g_display_config)
@@ -310,7 +309,7 @@ static int get_display_attr_data(int resource_id,
                break;
        case DEVICED_DISPLAY_ATTR_INT_CONFIG_TOUCH_WAKEUP:
                /**
-                * FIXME: Directly access extern g_display_plugin. Fix it not to directly access
+                * FIXME: Directly access extern g_display_config. Fix it not to directly access
                 *        variable via extern.
                 */
                if (!g_display_config)

diff --git a/src/display/setting.c b/src/display/setting.c
index b361dffcdc75869b7c218289454d8d47777d0dd3..2c4a9ff27c63e883d4db26229898fcb226aa2137 100644 (file)
--- a/src/display/setting.c
+++ b/src/display/setting.c
@@ -27,7 +27,6 @@
 #include "setting.h"
 #include "display-misc.h"
 #include "display-ops.h"
-#include "display-plugin.h"
 #include "display-state-transition.h"
 #include "led/touch-key.h"
 #include "shared/log.h"
@@ -47,7 +46,6 @@ static const char *setting_keys[SETTING_GET_END] = {
        [SETTING_EXCLUSIVE_DIM_TIMEOUT] = VCONFKEY_SETAPPL_TIMEOUT_DIM,
 };
 
-static struct display_plugin *disp_plgn;
 static int lock_screen_state = VCONFKEY_IDLE_UNLOCK;
 static bool lock_screen_bg_state = false;
 static int force_lcdtimeout = 0;
@@ -429,9 +427,4 @@ static void __CONSTRUCTOR__ initialize(void)
        ret = vconf_get_int(VCONFKEY_SETAPPL_TIMEOUT_DIM, &exclusive_dim_timeout);
        if (ret < 0 || exclusive_dim_timeout < 0)
                exclusive_dim_timeout = EXCLUSIVE_DIM_TIMEOUT_UNSET;
-
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn) {
-               _E("Failed to get display plugin variable.");
-       }
 }

diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c
index d7c3e4d5c0cdb3065270701efc78be3a77b496d9..24a79531323a3520d8e3eee769ef1e15d656d6da 100644 (file)
--- a/src/extcon/cradle.c
+++ b/src/extcon/cradle.c
@@ -28,7 +28,6 @@
 #include "core.h"
 #include "display-lock.h"
 #include "display-ops.h"
-#include "display-plugin.h"
 #include "display-state-transition.h"
 #include "extcon/extcon.h"
 #include "shared/plugin.h"

diff --git a/src/extcon/earjack.c b/src/extcon/earjack.c
index 14b38f06838fd11cc347b91f1a2568191d8c3755..c18c0cf4bd797ffc1ae43b90bd20f6d81f286690 100644 (file)
--- a/src/extcon/earjack.c
+++ b/src/extcon/earjack.c
@@ -26,7 +26,6 @@
 #include "core/log.h"
 #include "poll.h"
 #include "display-ops.h"
-#include "display-plugin.h"
 #include "display-state-transition.h"
 #include "extcon/extcon.h"
 #include "shared/plugin.h"

diff --git a/src/led/touch-key.c b/src/led/touch-key.c
index b6f7f8eb06f910aa9693dbb81538fe6568244ee1..d285935f091aa62dbb4aed848bd17b42916f8925 100644 (file)
--- a/src/led/touch-key.c
+++ b/src/led/touch-key.c
@@ -30,7 +30,6 @@
 #include "core.h"
 #include "setting.h"
 #include "display-ops.h"
-#include "display-plugin.h"
 #include "touch-key.h"
 #include "shared/plugin.h"
 

diff --git a/src/shared/apps.c b/src/shared/apps.c
index 1727922e492c6cb97945be9a4a0df1a2fb28bf9a..fb6df4ffe4b35e6bf86377e9e5189ad456d67fc8 100644 (file)
--- a/src/shared/apps.c
+++ b/src/shared/apps.c
@@ -24,7 +24,6 @@
 #include "core/log.h"
 #include "shared/common.h"
 #include "apps.h"
-#include "display-plugin.h"
 #include "display-state-transition.h"
 
 #define POPUP_METHOD "PopupLaunch"

diff --git a/src/shared/plugin.c b/src/shared/plugin.c
index a31027b3db030d7cba40730a3f0a22c87191e14c..e5bf3a8587dcccdb1395a2c8c0f4f731c5a4b127 100644 (file)
--- a/src/shared/plugin.c
+++ b/src/shared/plugin.c
@@ -30,7 +30,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "display-plugin.h"
 #include "core/log.h"
 
 #ifndef LIBPATH
@@ -38,15 +37,9 @@
 #endif
 #define MODULE_PATH            LIBPATH"/deviced/"
 
-extern struct display_plugin g_display_plugin;
 static struct battery_plugin battery_plgn;
 static GList *plgn_list;
 
-inline struct display_plugin *get_var_display_plugin(void)
-{
-       return &g_display_plugin;
-}
-
 inline struct battery_plugin *get_var_battery_plugin(void)
 {
        return &battery_plgn;

diff --git a/src/shared/plugin.h b/src/shared/plugin.h
index 1d259cb04b9b2a6a705097756e1ef0107a6dfe98..c850041f57786db8ec38f02b4d40b611a02ae5e9 100644 (file)
--- a/src/shared/plugin.h
+++ b/src/shared/plugin.h
@@ -22,7 +22,6 @@
 #include "display-ops.h"
 #include "battery/battery-ops.h"
 
-struct display_plugin *get_var_display_plugin(void);
 struct battery_plugin *get_var_battery_plugin(void);
 
 int load_plugin(const char *id, void **h);

diff --git a/src/time/time-handler.c b/src/time/time-handler.c
index 5158f5aeef536cde083433cc3d4b4a074ebb3f04..c53c98ef4b2cda28d74db613cb6aa4705ba7fbff 100644 (file)
--- a/src/time/time-handler.c
+++ b/src/time/time-handler.c
@@ -39,7 +39,6 @@
 #include "poll.h"
 #include "core.h"
 #include "display-ops.h"
-#include "display-plugin.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 2bf2543c3ea7a3e8f3f06953dc7675581becf36f..66064bd3c0a2171e80156e92a69c956c076e7f2e 100644 (file)
--- a/src/touchscreen/touchscreen.c
+++ b/src/touchscreen/touchscreen.c
@@ -30,7 +30,6 @@
 #include "core.h"
 #include "display-ops.h"
 #include "display-panel.h"
-#include "display-plugin.h"
 #include "display-config.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 d6c42c7f14ce606f4f491754c2f00c8baa6cabbc..2df695127d1a1012b7939b617a56fa8471bccb82 100644 (file)
--- a/src/usb-gadget/usb-gadget.c
+++ b/src/usb-gadget/usb-gadget.c
@@ -26,7 +26,6 @@
 #include "poll.h"
 #include "display-lock.h"
 #include "display-ops.h"
-#include "display-plugin.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 86168c7adaad2ee6ecf00405c7f1508b86b9b45d..731b8e29757b8a5017700ca940f4618e72c8b565 100644 (file)
--- a/src/usb-host/usb-host.c
+++ b/src/usb-host/usb-host.c
@@ -34,7 +34,6 @@
 #include "core/udev.h"
 #include "extcon/extcon.h"
 #include "display-ops.h"
-#include "display-plugin.h"
 #include "display-config.h"
 #include "display-state-transition.h"
 #include "core.h"

diff --git a/tests/deviced-common-private-test/test-mock.c b/tests/deviced-common-private-test/test-mock.c
index df9d7feb21fd5992c3f150a486c057b3e65629d1..4b222481849ef5da40f10f1cdb5201df32eb4469 100644 (file)
--- a/tests/deviced-common-private-test/test-mock.c
+++ b/tests/deviced-common-private-test/test-mock.c
@@ -2,15 +2,11 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-/* FIXME: This would be replaced to plugin-api-deviced */
-#include "display-plugin.h"
 #include "display-state-transition.h"
 
 #include "test-main.h"
 #include "test-mock.h"
 
-struct display_plugin g_display_plugin;
-
 int __wrap_access(const char *pathname, int mode)
 {
        return mock_type(int);