Fix error while loading display.sosubmit/tizen/20190704.115311accepted/tizen/unified/20190705.041547

ex) Failed to open module: /usr/lib/deviced/display.so: undefined symbol: lcd_direct_control

Change-Id: I2f9ddc746fea3170bdaeb8faad10233595323733
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

8 files changed, 80 insertions, 25 deletions

diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c
index fe4d69ba..42ef795c 100644
--- a/plugins/iot/display/core.c
+++ b/plugins/iot/display/core.c
@@ -103,9 +103,9 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
 static int stay_touchscreen_off = false;
-static dd_list *lcdon_ops;
 static bool lcdon_broadcast = true;
 static bool touch_blocked = false;
+dd_list *lcdon_ops;
 
 /* default transition, action fuctions */
 static int default_trans(int evt);
diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index f07c7fda..d38d9ac6 100644
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -104,9 +104,9 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
 static int stay_touchscreen_off = false;
-static dd_list *lcdon_ops;
 static bool lcdon_broadcast = true;
 static bool touch_blocked = false;
+dd_list *lcdon_ops;
 
 /* default transition, action fuctions */
 static int default_trans(int evt);
diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index 5bf09f7c..75293499 100644
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -105,9 +105,9 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
 static int stay_touchscreen_off = false;
-static dd_list *lcdon_ops;
 static bool lcdon_broadcast = true;
 static bool touch_blocked = false;
+dd_list *lcdon_ops;
 
 /* default transition, action fuctions */
 static int default_trans(int evt);
diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 2c171f66..bf6ff623 100644
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -104,9 +104,9 @@ static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
 static int stay_touchscreen_off = false;
-static dd_list *lcdon_ops;
 static bool lcdon_broadcast = true;
 static bool touch_blocked = false;
+dd_list *lcdon_ops;
 
 /* default transition, action fuctions */
 static int default_trans(int evt);
@@ -383,26 +383,6 @@ bool touch_event_blocked(void)
 	return touch_blocked;
 }
 
-void lcd_direct_control(enum dpms_state state, int flags)
-{
-	const struct device_ops *ops = NULL;
-	dd_list *l = NULL;
-
-	switch (state) {
-	case DPMS_ON:
-		DD_LIST_FOREACH(lcdon_ops, l, ops)
-			ops->start(flags);
-		break;
-	case DPMS_OFF:
-		DD_LIST_FOREACH(lcdon_ops, l, ops)
-			ops->stop(flags);
-		break;
-	default:
-		_E("state is wrong value %d", state);
-		break;
-	}
-}
-
 void lcd_on_procedure(int state, enum device_flags flag)
 {
 	dd_list *l = NULL;
diff --git a/src/display/ambient-mode.c b/src/display/ambient-mode.c
index 4223dc59..92541000 100644
--- a/src/display/ambient-mode.c
+++ b/src/display/ambient-mode.c
@@ -23,6 +23,7 @@
 
 #include "util.h"
 #include "core.h"
+#include "display.h"
 #include "display-ops.h"
 #include "core/device-notifier.h"
 #include "core/devices.h"
diff --git a/src/display/core.h b/src/display/core.h
index a58543c3..1bb77df3 100644
--- a/src/display/core.h
+++ b/src/display/core.h
@@ -158,6 +158,7 @@ struct display_keyfilter_ops {
 };
 
 extern const struct display_keyfilter_ops *keyfilter_ops;
+extern dd_list *lcdon_ops;
 
 /* If the bit in a condition variable is set,
  *  we cannot transit the state until clear this bit. */
@@ -195,7 +196,6 @@ void set_lcd_paneloff_mode(int val);
 void lcd_on_direct(enum device_flags flags);
 void lcd_on_procedure(int state, enum device_flags flag);
 void lcd_off_procedure(enum device_flags flag);
-void lcd_direct_control(enum dpms_state state, int flags);
 int check_holdkey_block(enum state_t state);
 bool touch_event_blocked(void);
 int device_poweroff(void *data);
diff --git a/src/display/display.c b/src/display/display.c
new file mode 100644
index 00000000..de55369f
--- /dev/null
+++ b/src/display/display.c
@@ -0,0 +1,47 @@
+/*
+ * deviced
+ *
+ * Copyright (c) 2019 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 <stdio.h>
+
+#include "util.h"
+#include "core.h"
+#include "display-ops.h"
+#include "core/list.h"
+#include "core/common.h"
+
+void lcd_direct_control(enum dpms_state state, int flags)
+{
+	const struct device_ops *ops = NULL;
+	dd_list *l = NULL;
+
+	switch (state) {
+	case DPMS_ON:
+		DD_LIST_FOREACH(lcdon_ops, l, ops)
+			ops->start(flags);
+		break;
+	case DPMS_OFF:
+		DD_LIST_FOREACH(lcdon_ops, l, ops)
+			ops->stop(flags);
+		break;
+	default:
+		_E("state is wrong value %d", state);
+		break;
+	}
+}
+
diff --git a/src/display/display.h b/src/display/display.h
new file mode 100644
index 00000000..3b142410
--- /dev/null
+++ b/src/display/display.h
@@ -0,0 +1,27 @@
+/*
+ * deviced
+ *
+ * Copyright (c) 2019 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_H__
+#define __DISPLAY_H__
+
+#include "device-interface.h"
+#include "core/common.h"
+
+void lcd_direct_control(enum dpms_state state, int flags);
+#endif