3 files changed, 17 insertions, 20 deletions

diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c
index cdb3f880e5..192dcc1738 100644
--- a/apps/plugins/grayscale.c
+++ b/apps/plugins/grayscale.c
@@ -164,6 +164,9 @@ int main(void)
     rb->lcd_puts(0, 0, pbuf);
     rb->lcd_update();
 
+#if !defined(SIMULATOR) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
+    rb->cpu_boost(true);
+#endif
     gray_show(true);          /* switch on greyscale overlay */
 
     time = *rb->current_tick; /* start time measurement */
@@ -223,6 +226,9 @@ int main(void)
                  time / 100, time % 100);
     rb->lcd_puts(0, 0, pbuf);
     gray_deferred_lcd_update();       /* schedule an lcd_update() */
+#if !defined(SIMULATOR) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
+    rb->cpu_boost(false);
+#endif
 
     /* drawing is now finished, play around with scrolling 
      * until you press OFF or connect USB
diff --git a/apps/plugins/lib/gray_core.c b/apps/plugins/lib/gray_core.c
index 02477b5b82..7fcd3dac80 100644
--- a/apps/plugins/lib/gray_core.c
+++ b/apps/plugins/lib/gray_core.c
@@ -226,38 +226,23 @@ void gray_release(void)
    lcd_set_invert_display(), lcd_set_flip(), lcd_roll() */
 void gray_show(bool enable)
 {
-#if (CONFIG_CPU == SH7034) && (CONFIG_LCD == LCD_SSD1815)
-    if (enable)
-    {
-        _gray_info.flags |= _GRAY_RUNNING;
-        _gray_rb->timer_register(1, NULL, FREQ / 67, 1, _timer_isr);
-        _gray_rb->screen_dump_set_hook(gray_screendump_hook);
-    }
-    else
-    {
-        _gray_rb->timer_unregister();
-        _gray_info.flags &= ~_GRAY_RUNNING;
-        _gray_rb->screen_dump_set_hook(NULL);
-        _gray_rb->lcd_update(); /* restore whatever there was before */
-    }
-#elif defined(CPU_COLDFIRE) && (CONFIG_LCD == LCD_S1D15E06)
     if (enable && !(_gray_info.flags & _GRAY_RUNNING))
     {
         _gray_info.flags |= _GRAY_RUNNING;
-        _gray_rb->cpu_boost(true);  /* run at 120 MHz to avoid freq changes */
-        _gray_rb->timer_register(1, NULL, *_gray_rb->cpu_frequency / 70, 1,
-                                 _timer_isr);
+#if CONFIG_LCD == LCD_SSD1815
+        _gray_rb->timer_register(1, NULL, CPU_FREQ / 67, 1, _timer_isr);
+#elif CONFIG_LCD == LCD_S1D15E06
+        _gray_rb->timer_register(1, NULL, CPU_FREQ / 70, 1, _timer_isr);
+#endif
         _gray_rb->screen_dump_set_hook(gray_screendump_hook);
     }
     else if (!enable && (_gray_info.flags & _GRAY_RUNNING))
     {
         _gray_rb->timer_unregister();
-        _gray_rb->cpu_boost(false);
         _gray_info.flags &= ~_GRAY_RUNNING;
         _gray_rb->screen_dump_set_hook(NULL);
         _gray_rb->lcd_update(); /* restore whatever there was before */
     }
-#endif
 }
 
 /* Update a rectangular area of the greyscale overlay */
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index 88f48d3f2b..8830d7ab33 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -370,6 +370,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     /* main loop */
     while (true) {
         if (redraw > REDRAW_NONE) {
+#if !defined(SIMULATOR) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
+            rb->cpu_boost(true);
+#endif
             if (redraw == REDRAW_FULL)
                 gray_ub_clear_display();
 
@@ -378,6 +381,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
             else
                 calc_mandelbrot_32();
 
+#if !defined(SIMULATOR) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
+            rb->cpu_boost(false);
+#endif
             px_min = 0;
             px_max = LCD_WIDTH;
             py_min = 0;