2 files changed, 9 insertions, 12 deletions

diff --git a/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c b/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
index 939f7347c4..9940017dd9 100644
--- a/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
+++ b/firmware/target/coldfire/iaudio/lcd-remote-iaudio.c
@@ -18,8 +18,9 @@
  ****************************************************************************/
 #include "config.h"
 #include "system.h"
-#include "kernel.h"
+#include "file.h"
 #include "lcd-remote.h"
+#include "scroll_engine.h"
 
 /* The LCD in the iAudio M3/M5/X5 remote control is a Tomato LSI 0350 */
 
@@ -397,7 +398,6 @@ static void remote_tick(void)
 {
     static bool last_status = false;
     static int countdown = 0;
-    static int init_delay = 0;
     bool current_status;
 
     current_status = remote_detect();
@@ -416,20 +416,16 @@ static void remote_tick(void)
 
         if (current_status)
         {
-            if (!(countdown % 8))
+            if (!(countdown % 48))
             {
-                if (--init_delay <= 0)
-                {
-                    queue_post(&remote_scroll_queue, REMOTE_INIT_LCD, 0);
-                    init_delay = 6;
-                }
+                queue_broadcast(SYS_REMOTE_PLUGGED, 0);
             }
         }
         else
         {
             if (countdown == 0)
             {
-                queue_post(&remote_scroll_queue, REMOTE_DEINIT_LCD, 0);
+                queue_broadcast(SYS_REMOTE_UNPLUGGED, 0);
             }
         }
     }
diff --git a/firmware/target/coldfire/iriver/lcd-remote-iriver.c b/firmware/target/coldfire/iriver/lcd-remote-iriver.c
index cdc5acacca..29dbfad3db 100644
--- a/firmware/target/coldfire/iriver/lcd-remote-iriver.c
+++ b/firmware/target/coldfire/iriver/lcd-remote-iriver.c
@@ -19,8 +19,9 @@
 
 #include "config.h"
 #include "system.h"
-#include "kernel.h"
+#include "file.h"
 #include "lcd-remote.h"
+#include "scroll_engine.h"
 
 /*** definitions ***/
 
@@ -521,7 +522,7 @@ static void remote_tick(void)
 
                     if (--init_delay <= 0)
                     {
-                        queue_post(&remote_scroll_queue, REMOTE_INIT_LCD, 0);
+                        queue_broadcast(SYS_REMOTE_PLUGGED, 0);
                         init_delay = 6;
                     }
                 }
@@ -537,7 +538,7 @@ static void remote_tick(void)
             {
                 _remote_type = REMOTETYPE_UNPLUGGED;
 
-                queue_post(&remote_scroll_queue, REMOTE_DEINIT_LCD, 0);
+                queue_broadcast(SYS_REMOTE_UNPLUGGED, 0);
             }
         }
     }