From 080e2b2b91244121adcea104bc7443bcf9b9edf6 Mon Sep 17 00:00:00 2001
From: marqs <mhiienka@niksula.hut.fi>
Date: Tue, 24 Oct 2023 00:21:32 +0300
Subject: [PATCH] fix upsample2x

---
 .../sys_controller/mem_init/sys_onchip_memory2_0.hex   | 10 +++++-----
 software/sys_controller/ossc/av_controller.c           |  2 +-
 software/sys_controller/ossc/firmware.h                |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/software/sys_controller/mem_init/sys_onchip_memory2_0.hex b/software/sys_controller/mem_init/sys_onchip_memory2_0.hex
index 81bd04d..68081d4 100644
--- a/software/sys_controller/mem_init/sys_onchip_memory2_0.hex
+++ b/software/sys_controller/mem_init/sys_onchip_memory2_0.hex
@@ -4936,7 +4936,7 @@
 :041347003C072783B5
 :0413480020239BEDD6
 :0413490064E53CF724
-:04134A00471D665D78
+:04134A004721665D74
 :04134B0006134685BA
 :04134C0045C5E106AC
 :04134D00214485139F
@@ -5425,7 +5425,7 @@
 :041530000136868377
 :0415310002D65C631F
 :04153200000285B777
-:041533004515419089
+:041533004519419085
 :041534008A3D826DFD
 :0415350002A60463A3
 :0415360016FD4190CD
@@ -5570,7 +5570,7 @@
 :0415C10045C1EB062F
 :0415C20010040513F9
 :0415C30008B000EF7D
-:0415C400471D665DFC
+:0415C4004721665DF8
 :0415C500061346853E
 :0415C60045C1EB46EA
 :0415C70011040513F3
@@ -7086,8 +7086,8 @@
 :041BAD00252E752547
 :041BAE006175322EFD
 :041BAF004F20402063
-:041BB0003120746309
-:041BB1003032203975
+:041BB0003220746308
+:041BB100303220347A
 :041BB20000003332CA
 :041BB300656E694CA6
 :041BB400746C756D6B
diff --git a/software/sys_controller/ossc/av_controller.c b/software/sys_controller/ossc/av_controller.c
index 0e165a9..88fd9f6 100644
--- a/software/sys_controller/ossc/av_controller.c
+++ b/software/sys_controller/ossc/av_controller.c
@@ -338,7 +338,7 @@ status_t get_status(tvp_sync_input_t syncinput)
         if (memcmp(&tc, &cm.cc, offsetof(avconfig_t, sl_mode)) || (update_cur_vm == 1))
             status = (status < MODE_CHANGE) ? MODE_CHANGE : status;
 
-        if ((vm_conf.si_pclk_mult > 1) && (pll_reconfig->pll_config_status.c_config_id != 5) && (vm_conf.si_pclk_mult-1 != pll_reconfig->pll_config_status.c_config_id))
+        if ((vm_conf.si_pclk_mult > 1) && (pll_reconfig->pll_config_status.c_config_id != 6) && (vm_conf.si_pclk_mult-1 != pll_reconfig->pll_config_status.c_config_id))
             status = (status < MODE_CHANGE) ? MODE_CHANGE : status;
 
         cm.totlines = totlines;
diff --git a/software/sys_controller/ossc/firmware.h b/software/sys_controller/ossc/firmware.h
index 5faae09..e50c44f 100644
--- a/software/sys_controller/ossc/firmware.h
+++ b/software/sys_controller/ossc/firmware.h
@@ -24,13 +24,13 @@
 #include "sysconfig.h"
 
 #define FW_VER_MAJOR            1
-#define FW_VER_MINOR            07
+#define FW_VER_MINOR            8
 
 #define PROFILE_VER_MAJOR       1
-#define PROFILE_VER_MINOR       06
+#define PROFILE_VER_MINOR       6
 
 #define INITCFG_VER_MAJOR       1
-#define INITCFG_VER_MINOR       00
+#define INITCFG_VER_MINOR       0
 
 #ifdef ENABLE_AUDIO
 #define FW_SUFFIX1              "a"