remove previous trace

- .._main.c : change function name suitably
- fota_gr_rw_common.c : remove cario not used

Change-Id: Ia3fc51a3064930cc66e94512f7a5582776c1c24f

diff --git a/fota_gui_common/fota_gui_ro_common_main.c b/fota_gui_common/fota_gui_ro_common_main.c
index 4d9a1b594d1a60540ba4e37df2efd37a9cf76d03..2f8331d820319bc72a9e23a9f52da1f2c2320647 100644 (file)
--- a/fota_gui_common/fota_gui_ro_common_main.c
+++ b/fota_gui_common/fota_gui_ro_common_main.c
@@ -44,7 +44,7 @@ int s_last_prog_percent = 0;
 
 int s_pid = -1;
 
-static int wait_ani_main_solis(void)
+static int wait_main_fota_ro(void)
 {
        int delay = 20000;
 
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 
        switch (index)  {
        case 0: {
-               int ret = wait_ani_main_solis();
+               int ret = wait_main_fota_ro();
                return ret;
                }
        case 1:
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
        }
 #else
        int ret = 0;
-       ret = wait_ani_main_solis();
+       ret = wait_main_fota_ro();
 #endif
        _exit_stdio();
        return 0;

diff --git a/fota_gui_wearable/fota_gui_ro_wearable_main.c b/fota_gui_wearable/fota_gui_ro_wearable_main.c
index 2d621e465736610aed15e533cd80f40b69cff4a4..fe7f7933cca000d1c6765208515b5f64c93568cd 100644 (file)
--- a/fota_gui_wearable/fota_gui_ro_wearable_main.c
+++ b/fota_gui_wearable/fota_gui_ro_wearable_main.c
@@ -44,7 +44,7 @@ int s_last_prog_percent = 0;
 
 int s_pid = -1;
 
-static int wait_ani_main_solis(void)
+static int wait_main_fota_ro(void)
 {
        int delay = 20000;
 
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 
        switch (index)  {
        case 0: {
-               int ret = wait_ani_main_solis();
+               int ret = wait_main_fota_ro();
                return ret;
                }
        case 1:
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
        }
 #else
        int ret = 0;
-       ret = wait_ani_main_solis();
+       ret = wait_main_fota_ro();
 #endif
        _exit_stdio();
        return 0;

diff --git a/recovery_gui_common/recovery_gui_common_main.c b/recovery_gui_common/recovery_gui_common_main.c
index 0aa619073e0c9d22bb46a62367932bfd93a4f0d3..2a64452763a54adf729a9c4df141a485629956a5 100644 (file)
--- a/recovery_gui_common/recovery_gui_common_main.c
+++ b/recovery_gui_common/recovery_gui_common_main.c
@@ -44,7 +44,7 @@ int s_last_prog_percent = 0;
 
 int s_pid = -1;
 
-static int wait_ani_main_solis(void)
+static int wait_main_system_recovery(void)
 {
        int delay = 20000;
 
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
 
        switch (index)  {
        case 0: {
-               int ret = wait_ani_main_solis();
+               int ret = wait_main_system_recovery();
                return ret;
                }
        case 1:
@@ -124,7 +124,7 @@ int main(int argc, char **argv)
        }
 #else
        int ret = 0;
-       ret = wait_ani_main_solis();
+       ret = wait_main_system_recovery();
 #endif
        _exit_stdio();
        return 0;

diff --git a/rw-update-ani-common/fota_gr_rw_common.c b/rw-update-ani-common/fota_gr_rw_common.c
index 4c1c0dc62b1bb315659de9d806f785bec5758adb..481888f44ebf4128af7bb064f5a031f27b4bd722 100644 (file)
--- a/rw-update-ani-common/fota_gr_rw_common.c
+++ b/rw-update-ani-common/fota_gr_rw_common.c
@@ -17,22 +17,14 @@
  */
 
 #include "fota_gr_rw_common.h"
-#if defined(USE_CAIRO)
-#include "fota_gr_cairo.h"
-#else
 #include "fota_gr_direct_rw_common.h"
-#endif
 
 /*-----------------------------------------------------------------------------
   fota_gr_init
  ----------------------------------------------------------------------------*/
 int fota_gr_init(void)
 {
-#if defined(USE_CAIRO)
-       return fota_gr_cairo_init();
-#else
        return fota_gr_direct_init();
-#endif
 }
 
 /*-----------------------------------------------------------------------------
@@ -40,11 +32,7 @@ int fota_gr_init(void)
  ----------------------------------------------------------------------------*/
 void fota_gr_deinit(void)
 {
-#if defined(USE_CAIRO)
-       fota_gr_cairo_deinit();
-#else
        fota_gr_direct_deinit();
-#endif
 }
 
 /*-----------------------------------------------------------------------------
@@ -52,11 +40,7 @@ void fota_gr_deinit(void)
  ----------------------------------------------------------------------------*/
 void fota_gr_clear_screen(u32 color)
 {
-#if defined(USE_CAIRO)
-       fota_gr_cairo_clear_screen(color);
-#else
        fota_gr_direct_clear_screen(color);
-#endif
 }
 
 /*-----------------------------------------------------------------------------
@@ -64,11 +48,6 @@ void fota_gr_clear_screen(u32 color)
  ----------------------------------------------------------------------------*/
 void fota_gr_update_progress(void)
 {
-#if defined(USE_CAIRO)
-       fota_gr_cairo_update_progress(percent);
-#else
-       //fota_gr_direct_update_progress(percent);
        fota_gr_direct_rw_update_progress();
-#endif
 }
 

diff --git a/rw-update-ani-common/fota_gui_rw_common_main.c b/rw-update-ani-common/fota_gui_rw_common_main.c
index a7be28c30977ee3b37bf2309213462ec45238c8e..2cc108f0dddf0cc58d400f2495e6b9008ccd91a5 100644 (file)
--- a/rw-update-ani-common/fota_gui_rw_common_main.c
+++ b/rw-update-ani-common/fota_gui_rw_common_main.c
@@ -51,7 +51,7 @@ int do_exit = 0;
 int s_pid = -1;
 
 
-static int wait_ani_main_solis(void)
+static int wait_main_fota_rw(void)
 {
        int delay = 20000;
 
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
 
        switch (index)  {
        case 0: {
-               int ret = wait_ani_main_solis();
+               int ret = wait_main_fota_rw();
                return ret;
                }
        case 1: