device-notifier: separate functions from device

The device-notifier "device" should have treated device-notifier
"device" only. But it have covered device-notifier "functions" as
well. Seperate this "functions" from device-notifier "device" and
move these to shared library. And rename device-notifier "device"
to late-booting-done-notifier to more semantically fit to its role.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2d30f5..58e9a1e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ SET(SRCS
        src/apps/apps.c
        src/control/control.c
        src/core/device-idler.c
-       src/core/device-notifier.c
+       src/core/late-booting-done-notifier.c
        src/core/devices.c
        src/core/event-handler.c
        src/core/execute.c

diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c
index 9927e68..4974dec 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -48,7 +48,7 @@
 #include "lock-detector.h"
 #include "display-ops.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
 #include "core/launch.h"

diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c
index 68c032d..694e69b 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -37,7 +37,7 @@
 #include "core/log.h"
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "util.h"
 #include "device-interface.h"
 #include "vconf.h"

diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c
index 01a9e07..470b513 100644 (file)
--- a/plugins/iot-headed/display/key-filter.c
+++ b/plugins/iot-headed/display/key-filter.c
@@ -35,7 +35,7 @@
 #include "display-ops.h"
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
 #include "power/power-handler.h"

diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c
index c116a73..8b7b1e6 100644 (file)
--- a/plugins/mobile/battery/battery-notification.c
+++ b/plugins/mobile/battery/battery-notification.c
@@ -33,7 +33,7 @@
 #include "display/poll.h"
 #include "shared/eventsystem.h"
 #include "shared/plugin.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 
 #define METHOD_LOW_NOTI_ON          "BatteryLowNotiOn"

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 9d1bb66..079351f 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -47,7 +47,7 @@
 #include "lock-detector.h"
 #include "display-ops.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
 #include "core/launch.h"

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index 856883d..ba2b4e7 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -36,7 +36,7 @@
 #include "core/log.h"
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "util.h"
 #include "device-interface.h"
 #include "vconf.h"

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index 64321fa..17bca2c 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -35,7 +35,7 @@
 #include "display-ops.h"
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
 #include "power/power-handler.h"

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index fba894b..51b6f5d 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -47,7 +47,7 @@
 #include "lock-detector.h"
 #include "display-ops.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
 #include "core/launch.h"

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 3cb3077..d915779 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -36,7 +36,7 @@
 #include "core/log.h"
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "util.h"
 #include "device-interface.h"
 #include "vconf.h"

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index 0be1d72..b0667ec 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -35,7 +35,7 @@
 #include "display-ops.h"
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
 #include "power/power-handler.h"

diff --git a/plugins/tv/display/state-tv.c b/plugins/tv/display/state-tv.c
index a92a557..16aedab 100644 (file)
--- a/plugins/tv/display/state-tv.c
+++ b/plugins/tv/display/state-tv.c
@@ -22,7 +22,7 @@
 
 #include "shared/common.h"
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/devices.h"
 #include "display/display-ops.h"
 #include "display/display-lock.h"

diff --git a/plugins/wearable/battery/battery-notification.c b/plugins/wearable/battery/battery-notification.c
index 84ad217..27c9b53 100644 (file)
--- a/plugins/wearable/battery/battery-notification.c
+++ b/plugins/wearable/battery/battery-notification.c
@@ -21,7 +21,7 @@
 
 #include "display/core.h"
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "power-supply.h"
 #include "battery-ops.h"
 #include "battery.h"

diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c
index ee7ef57..9eda1a1 100644 (file)
--- a/plugins/wearable/display/auto-brightness-sensorhub.c
+++ b/plugins/wearable/display/auto-brightness-sensorhub.c
@@ -30,7 +30,7 @@
 #include "display/util.h"
 #include "display/core.h"
 #include "display/display-ops.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "battery/power-supply.h"
 #include "shared/plugin.h"
 

diff --git a/plugins/wearable/display/bezel.c b/plugins/wearable/display/bezel.c
index c6868bd..ea71119 100644 (file)
--- a/plugins/wearable/display/bezel.c
+++ b/plugins/wearable/display/bezel.c
@@ -21,7 +21,7 @@
 
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "display/util.h"
 #include "display/poll.h"
 #include "display/core.h"

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 2747156..08fc114 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -48,7 +48,7 @@
 #include "lock-detector.h"
 #include "display-ops.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
 #include "core/launch.h"

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 12f00d7..eb029de 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -36,7 +36,7 @@
 #include "core/log.h"
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "util.h"
 #include "device-interface.h"
 #include "vconf.h"

diff --git a/plugins/wearable/display/display-handler.c b/plugins/wearable/display/display-handler.c
index 3df1a22..3df2b75 100644 (file)
--- a/plugins/wearable/display/display-handler.c
+++ b/plugins/wearable/display/display-handler.c
@@ -22,7 +22,7 @@
 #include <error.h>
 
 #include "auto-brightness-sensorhub.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "display/util.h"
 #include "display/core.h"
 #include "display/poll.h"

diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c
index 8ad1418..a5606be 100644 (file)
--- a/plugins/wearable/display/enhance.c
+++ b/plugins/wearable/display/enhance.c
@@ -28,7 +28,7 @@
 #include "core/devices.h"
 #include "core/log.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 #define VCONF_HIGH_CONTRAST            VCONFKEY_SETAPPL_ACCESSIBILITY_HIGH_CONTRAST
 #define VCONF_GREYSCALE                        VCONFKEY_SETAPPL_ACCESSIBILITY_GREYSCALE

diff --git a/plugins/wearable/display/hbm.c b/plugins/wearable/display/hbm.c
index 4c4b18e..00ed147 100644 (file)
--- a/plugins/wearable/display/hbm.c
+++ b/plugins/wearable/display/hbm.c
@@ -28,7 +28,7 @@
 #include "display/display-ops.h"
 #include "display/display-dpms.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 #define BOARD_CONF_FILE "/etc/deviced/display.conf"
 

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index 0affed0..cc9a56b 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -35,7 +35,7 @@
 #include "display-ops.h"
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
 #include "power/power-handler.h"

diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c
index 3f74391..f60eea9 100644 (file)
--- a/plugins/wearable/display/lbm.c
+++ b/plugins/wearable/display/lbm.c
@@ -28,7 +28,7 @@
 #include "display/core.h"
 #include "display/display-ops.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 #define DISPLAY_CONF_FILE      "/etc/deviced/display.conf"
 

diff --git a/plugins/wearable/display/powersaver.c b/plugins/wearable/display/powersaver.c
index 7aa8f99..87d0d8a 100644 (file)
--- a/plugins/wearable/display/powersaver.c
+++ b/plugins/wearable/display/powersaver.c
@@ -21,7 +21,7 @@
 
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/log.h"
 #include "display/core.h"
 #include "display/device-interface.h"

diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c
index 6c510f0..cffed6f 100644 (file)
--- a/plugins/wearable/display/swim.c
+++ b/plugins/wearable/display/swim.c
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/devices.h"
 #include "display/core.h"
 #include "display/util.h"

diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index a423c50..22a7415 100644 (file)
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -35,7 +35,7 @@
 #include "core/log.h"
 #include "core/launch.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "core/udev.h"
 #include "shared/eventsystem.h"

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index bf09758..9537559 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -27,7 +27,7 @@
 #include <libsyscommon/ini-parser.h>
 
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "core/log.h"
 #include "display/poll.h"

diff --git a/src/core/event-handler.c b/src/core/event-handler.c
index 460a9da..a2448bc 100644 (file)
--- a/src/core/event-handler.c
+++ b/src/core/event-handler.c
@@ -23,7 +23,7 @@
 
 #include "shared/common.h"
 #include "devices.h"
-#include "device-notifier.h"
+#include "shared/device-notifier.h"
 #include "log.h"
 
 static device_notifier_state_e state = DEVICE_NOTIFIER_STATE_STOP;

diff --git a/src/core/late-booting-done-notifier.c b/src/core/late-booting-done-notifier.c
new file mode 100644 (file)
index 0000000..36f882a
--- /dev/null
+++ b/src/core/late-booting-done-notifier.c
@@ -0,0 +1,115 @@
+/*
+ * deviced
+ *
+ * Copyright (c) 2012 - 2013 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 "log.h"
+#include "shared/device-notifier.h"
+#include "shared/common.h"
+#include "core/devices.h"
+#include <libsyscommon/libgdbus.h>
+#include <libsyscommon/list.h>
+
+static guint late_init_timer;
+
+#define LATE_INIT_WAIT_TIME    30   /* second */
+#define DEFAULT_LATE_INIT_VALUE        (guint)0x0DEF0DEF
+
+static void late_init_stop(void)
+{
+       if (late_init_timer == 0 || late_init_timer == DEFAULT_LATE_INIT_VALUE)
+               return;
+
+       g_source_remove(late_init_timer);
+       late_init_timer = 0;
+}
+
+static int booting_done(void *data)
+{
+       static int done;
+
+       if (data == NULL)
+               goto out;
+
+       done = *(int *)data;
+       if (late_init_timer == 0)
+               return done;
+       late_init_stop();
+out:
+       return done;
+}
+
+static int early_booting_done(void *data)
+{
+       static int done;
+
+       if (data == NULL)
+               goto out;
+
+       done = *(int *)data;
+out:
+       return done;
+}
+
+static gboolean late_init_timer_cb(void *data)
+{
+       int done;
+
+       late_init_stop();
+       done = early_booting_done(NULL);
+       if (!done)
+               device_notify(DEVICE_NOTIFIER_EARLY_BOOTING_DONE, (void *)&done);
+       done = booting_done(NULL);
+       late_init_timer = 0;
+       if (done)
+               return G_SOURCE_REMOVE;
+       _I("late booting done");
+       done = TRUE;
+       device_notify_once(DEVICE_NOTIFIER_BOOTING_DONE, (void *)&done);
+       return G_SOURCE_REMOVE;
+}
+
+static void late_booting_done_notifier_init(void *data)
+{
+       int ret;
+
+       ret = check_systemd_active();
+       if (ret == TRUE) {
+               _I("restart booting done");
+               return;
+       }
+       register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
+       register_notifier(DEVICE_NOTIFIER_EARLY_BOOTING_DONE, early_booting_done);
+       late_init_timer = g_timeout_add_seconds(LATE_INIT_WAIT_TIME,
+                                               late_init_timer_cb, NULL);
+
+       if (!late_init_timer)
+               late_init_timer = DEFAULT_LATE_INIT_VALUE;
+}
+
+static void late_booting_done_notifier_exit(void *data)
+{
+
+}
+
+static const struct device_ops notifier_device_ops = {
+       DECLARE_NAME_LEN("late-booting-done-notifier"),
+       .init     = late_booting_done_notifier_init,
+       .exit     = late_booting_done_notifier_exit,
+};
+
+DEVICE_OPS_REGISTER(&notifier_device_ops)

diff --git a/src/core/log.c b/src/core/log.c
index fe0d3bf..515cf33 100644 (file)
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "log.h"
-#include "device-notifier.h"
+#include "shared/device-notifier.h"
 
 #ifdef DEBUG
 void __cyg_profile_func_enter(void *, void *)

diff --git a/src/core/main.c b/src/core/main.c
index da76606..24968d9 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -34,7 +34,7 @@
 #include "power/boot.h"
 #include "power/power-handler.h"
 #include "shared/plugin.h"
-#include "device-notifier.h"
+#include "shared/device-notifier.h"
 
 #define PIDFILE_PATH           "/var/run/.deviced.pid"
 #define WATCHDOG_REFRESH_TIME  5

diff --git a/src/core/udev.c b/src/core/udev.c
index 34fe171..8b1c581 100644 (file)
--- a/src/core/udev.c
+++ b/src/core/udev.c
@@ -24,7 +24,7 @@
 #include <libsyscommon/list.h>
 
 #include "log.h"
-#include "device-notifier.h"
+#include "shared/device-notifier.h"
 #include "devices.h"
 #include "udev.h"
 

diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c
index ff7c886..a53c73c 100644 (file)
--- a/src/cpu/pmqos.c
+++ b/src/cpu/pmqos.c
@@ -28,7 +28,7 @@
 #include "core/log.h"
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 #define DEFAULT_PMQOS_TIMER            3000
 

diff --git a/src/display/ambient-mode.c b/src/display/ambient-mode.c
index 8ab6f4c..fbd5131 100644 (file)
--- a/src/display/ambient-mode.c
+++ b/src/display/ambient-mode.c
@@ -25,7 +25,7 @@
 #include "core.h"
 #include "display.h"
 #include "display-ops.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/devices.h"
 #include "shared/plugin.h"
 

diff --git a/src/display/auto-brightness.c b/src/display/auto-brightness.c
index b13dafb..2128ab0 100644 (file)
--- a/src/display/auto-brightness.c
+++ b/src/display/auto-brightness.c
@@ -33,7 +33,7 @@
 #include "core.h"
 #include "display-ops.h"
 #include "setting.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include <libsyscommon/ini-parser.h>
 
 #define METHOD_CHECK_SUPPORTED "CheckSupported"

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index c2fb7f1..9503379 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -36,7 +36,7 @@
 #include "shared/common.h"
 #include "core/devices.h"
 #include "core/device-idler.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "apps/apps.h"
 #include "dd-display.h"
 #include "display-actor.h"

diff --git a/src/display/display-dpms.c b/src/display/display-dpms.c
index 258ec18..2b1b156 100644 (file)
--- a/src/display/display-dpms.c
+++ b/src/display/display-dpms.c
@@ -27,7 +27,7 @@
 #include <libsyscommon/list.h>
 
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "display/device-interface.h"
 #include "display/util.h"
 #include "display/display-dpms.h"

diff --git a/src/display/display-signal.h b/src/display/display-signal.h
index 6589590..1d0afe8 100644 (file)
--- a/src/display/display-signal.h
+++ b/src/display/display-signal.h
@@ -24,7 +24,7 @@
 
 #include "util.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 static inline long clock_gettime_to_long(void)
 {

diff --git a/src/display/lock-detector.c b/src/display/lock-detector.c
index 99a7b84..0b6ae12 100644 (file)
--- a/src/display/lock-detector.c
+++ b/src/display/lock-detector.c
@@ -34,7 +34,7 @@
 
 #include "util.h"
 #include "core.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 struct lock_info {
        unsigned long hash;

diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c
index 023d638..5ab4fb5 100644 (file)
--- a/src/extcon/cradle.c
+++ b/src/extcon/cradle.c
@@ -22,7 +22,7 @@
 #include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "display/core.h"
 #include "display/display-ops.h"

diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c
index 391bc88..0925f28 100644 (file)
--- a/src/extcon/extcon.c
+++ b/src/extcon/extcon.c
@@ -25,7 +25,7 @@
 #include "core/log.h"
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "extcon.h"
 

diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c
index e5bb737..79253b7 100644 (file)
--- a/src/extcon/hdmi.c
+++ b/src/extcon/hdmi.c
@@ -22,7 +22,7 @@
 #include <libsyscommon/list.h>
 #include "core/log.h"
 #include "core/bitmap.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "display/core.h"
 #include "display/display-ops.h"
 #include "extcon.h"

diff --git a/src/led/rgb.c b/src/led/rgb.c
index 5dc4901..fad7567 100644 (file)
--- a/src/led/rgb.c
+++ b/src/led/rgb.c
@@ -30,7 +30,7 @@
 #include "core/log.h"
 #include "shared/common.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 struct rgb_request {
        pid_t pid;

diff --git a/src/led/touch-key.c b/src/led/touch-key.c
index f816d9c..a86eff5 100644 (file)
--- a/src/led/touch-key.c
+++ b/src/led/touch-key.c
@@ -24,7 +24,7 @@
 
 #include "core/log.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "display/core.h"
 #include "display/setting.h"
 #include "display/display-ops.h"

diff --git a/src/power/boot.c b/src/power/boot.c
index e4121ae..458c79a 100644 (file)
--- a/src/power/boot.c
+++ b/src/power/boot.c
@@ -24,7 +24,7 @@
 #include <libsyscommon/libsystemd.h>
 
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "display/poll.h"
 #include "display/display-ops.h"

diff --git a/src/power/doze.c b/src/power/doze.c
index 3b1ae4e..572db6b 100644 (file)
--- a/src/power/doze.c
+++ b/src/power/doze.c
@@ -19,7 +19,7 @@
 
 #include "doze.h"
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "display/core.h"
 
 #define DOZE_DISABLED 0

diff --git a/src/power/power-control.c b/src/power/power-control.c
index 360fade..51f368e 100644 (file)
--- a/src/power/power-control.c
+++ b/src/power/power-control.c
@@ -35,7 +35,7 @@
 #include "core/log.h"
 #include "core/devices.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "vconf.h"
 #include "display/display-dpms.h"
 #include "display/display.h"

diff --git a/src/power/power-handler.c b/src/power/power-handler.c
index c529e82..1d78523 100644 (file)
--- a/src/power/power-handler.c
+++ b/src/power/power-handler.c
@@ -40,7 +40,7 @@
 #include "dd-deviced.h"
 #include "core/log.h"
 #include "core/launch.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/device-idler.h"
 #include "shared/common.h"
 #include "core/devices.h"

diff --git a/src/core/device-notifier.c b/src/shared/device-notifier.c
similarity index 72%
rename from src/core/device-notifier.c
rename to src/shared/device-notifier.c
index a967f44..e835a9c 100644 (file)
--- a/src/core/device-notifier.c
+++ b/src/shared/device-notifier.c
@@ -20,10 +20,11 @@
 #include "log.h"
 #include "device-notifier.h"
 #include "shared/common.h"
-#include "core/devices.h"
-#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
+#define __stringify_1(x...)    #x
+#define __stringify(x...)      __stringify_1(x)
+
 struct device_notifier {
        bool deleted;
        enum device_notifier_type type;
@@ -32,10 +33,7 @@ struct device_notifier {
 
 static GList *device_notifier_list;
 static guint idl;
-static guint late_init_timer;
 
-#define LATE_INIT_WAIT_TIME    30   /* second */
-#define DEFAULT_LATE_INIT_VALUE        (guint)0x0DEF0DEF
 
 #define FIND_NOTIFIER(a, b, d, e, f) \
        SYS_G_LIST_FOREACH(a, b, d) \
@@ -180,89 +178,3 @@ void device_notify_once(enum device_notifier_type type, void *data)
        if (!idl)
                idl = g_idle_add(delete_unused_notifier_cb, NULL);
 }
-
-static void late_init_stop(void)
-{
-       if (late_init_timer == 0 || late_init_timer == DEFAULT_LATE_INIT_VALUE)
-               return;
-
-       g_source_remove(late_init_timer);
-       late_init_timer = 0;
-}
-
-static int booting_done(void *data)
-{
-       static int done;
-
-       if (data == NULL)
-               goto out;
-
-       done = *(int *)data;
-       if (late_init_timer == 0)
-               return done;
-       late_init_stop();
-out:
-       return done;
-}
-
-static int early_booting_done(void *data)
-{
-       static int done;
-
-       if (data == NULL)
-               goto out;
-
-       done = *(int *)data;
-out:
-       return done;
-}
-
-static gboolean late_init_timer_cb(void *data)
-{
-       int done;
-
-       late_init_stop();
-       done = early_booting_done(NULL);
-       if (!done)
-               device_notify(DEVICE_NOTIFIER_EARLY_BOOTING_DONE, (void *)&done);
-       done = booting_done(NULL);
-       late_init_timer = 0;
-       if (done)
-               return G_SOURCE_REMOVE;
-       _I("late booting done");
-       done = TRUE;
-       device_notify_once(DEVICE_NOTIFIER_BOOTING_DONE, (void *)&done);
-       return G_SOURCE_REMOVE;
-}
-
-static void device_notifier_init(void *data)
-{
-       int ret;
-
-       ret = check_systemd_active();
-       if (ret == TRUE) {
-               _I("restart booting done");
-               return;
-       }
-       register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
-       register_notifier(DEVICE_NOTIFIER_EARLY_BOOTING_DONE, early_booting_done);
-       late_init_timer = g_timeout_add_seconds(LATE_INIT_WAIT_TIME,
-                                               late_init_timer_cb, NULL);
-
-       if (!late_init_timer)
-               late_init_timer = DEFAULT_LATE_INIT_VALUE;
-}
-
-static void device_notifier_exit(void *data)
-{
-
-}
-
-static const struct device_ops notifier_device_ops = {
-       DECLARE_NAME_LEN("notifier"),
-       .init     = device_notifier_init,
-       .exit     = device_notifier_exit,
-};
-
-DEVICE_OPS_REGISTER(&notifier_device_ops)
-

diff --git a/src/core/device-notifier.h b/src/shared/device-notifier.h
similarity index 100%
rename from src/core/device-notifier.h
rename to src/shared/device-notifier.h

diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c
index d50ad76..e3e32d5 100644 (file)
--- a/src/thermal/thermal.c
+++ b/src/thermal/thermal.c
@@ -26,7 +26,7 @@
 #include "apps/apps.h"
 #include "core/devices.h"
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/devices.h"
 #include "thermal.h"
 

diff --git a/src/time/time-handler.c b/src/time/time-handler.c
index b510fe8..0482eb6 100644 (file)
--- a/src/time/time-handler.c
+++ b/src/time/time-handler.c
@@ -39,7 +39,7 @@
 #include "display/core.h"
 #include "display/display-ops.h"
 #include "shared/common.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/plugin.h"
 
 #define PREDEF_SET_DATETIME            "set_datetime"

diff --git a/src/touchscreen/sensitivity.c b/src/touchscreen/sensitivity.c
index 3b383f4..b0e0da4 100644 (file)
--- a/src/touchscreen/sensitivity.c
+++ b/src/touchscreen/sensitivity.c
@@ -24,7 +24,7 @@
 #include "core/devices.h"
 #include "shared/common.h"
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 
 #ifndef VCONFKEY_SETAPPL_TOUCH_SENSITIVITY

diff --git a/src/touchscreen/touchscreen.c b/src/touchscreen/touchscreen.c
index 621c977..bcbe669 100644 (file)
--- a/src/touchscreen/touchscreen.c
+++ b/src/touchscreen/touchscreen.c
@@ -25,7 +25,7 @@
 #include "core/devices.h"
 #include "shared/common.h"
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "battery/power-supply.h"
 #include "display/core.h"
 #include "display/display-ops.h"

diff --git a/src/tzip/tzip.c b/src/tzip/tzip.c
index edf7faa..6f6a857 100644 (file)
--- a/src/tzip/tzip.c
+++ b/src/tzip/tzip.c
@@ -40,7 +40,7 @@
 
 #include "core/log.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "tzip-utility.h"
 

diff --git a/src/usb-host-test/usb-host-test.c b/src/usb-host-test/usb-host-test.c
index aa85476..7c16e39 100644 (file)
--- a/src/usb-host-test/usb-host-test.c
+++ b/src/usb-host-test/usb-host-test.c
@@ -29,7 +29,7 @@
 
 #include "core/log.h"
 #include "core/device-idler.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/devices.h"
 
 #define SYS_DUMMY_HCD_PATH "/sys/module/dummy_hcd"

diff --git a/src/usb/usb-debug.c b/src/usb/usb-debug.c
index 74398eb..0681742 100644 (file)
--- a/src/usb/usb-debug.c
+++ b/src/usb/usb-debug.c
@@ -23,7 +23,7 @@
 #include <hal/device/hal-usb_gadget-interface.h>
 
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 #include "usb.h"
 

diff --git a/src/usb/usb-tethering.c b/src/usb/usb-tethering.c
index c788586..e0ed34f 100644 (file)
--- a/src/usb/usb-tethering.c
+++ b/src/usb/usb-tethering.c
@@ -23,7 +23,7 @@
 #include <hal/device/hal-usb_gadget-interface.h>
 
 #include "core/log.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 
 #include "usb.h"
 

diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c
index d321efa..def3ba6 100644 (file)
--- a/src/usbhost/usb-host.c
+++ b/src/usbhost/usb-host.c
@@ -28,7 +28,7 @@
 
 #include "core/log.h"
 #include "core/devices.h"
-#include "core/device-notifier.h"
+#include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "core/device-idler.h"
 #include "apps/apps.h"