firmware: enable encoder at startup (also move encoder service to pro…

…cessor)
timvideos · Sep 10, 2015 · 70f8e1e · 70f8e1e
1 parent e2950db
commit 70f8e1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/firmware/lm32/main.c b/firmware/lm32/main.c
@@ -27,17 +27,11 @@ int main(void)
 	ci_prompt();
 	config_init();
 	time_init();
-#ifdef ENCODER_BASE
-		encoder_enable(0);
-#endif
 	processor_init();
 	processor_start(config_get(CONFIG_KEY_RESOLUTION));
 	while(1) {
 		processor_service();
 		ci_service();
-#ifdef ENCODER_BASE
-		encoder_service();
-#endif
 /* XXX FIX DDR conflict between DMA and L2 cache */
 #if 0
 		pattern_service();

diff --git a/firmware/lm32/processor.c b/firmware/lm32/processor.c
@@ -10,6 +10,7 @@
 #include "hdmi_in0.h"
 #include "hdmi_in1.h"
 #include "pattern.h"
+#include "encoder.h"
 #include "edid.h"
 #include "pll.h"
 #include "processor.h"
@@ -355,6 +356,9 @@ void processor_init(void)
 	processor_hdmi_out0_source = VIDEO_IN_HDMI_IN0;
 	processor_hdmi_out1_source = VIDEO_IN_HDMI_IN0;
 	processor_encoder_source = VIDEO_IN_HDMI_IN0;
+#ifdef ENCODER_BASE
+		encoder_enable(1);
+#endif
 }
 
 void processor_start(int mode)
@@ -447,4 +451,7 @@ void processor_service(void)
 	hdmi_in0_service();
 	hdmi_in1_service();
 	processor_update();
+#ifdef ENCODER_BASE
+		encoder_service();
+#endif
 }