fix SD profile import and use default 480p preset for TP

software/sys_controller/ossc/firmware.h

@@ -24,10 +24,10 @@
 #include "sysconfig.h"
 
 #define FW_VER_MAJOR            1
-#define FW_VER_MINOR            01
+#define FW_VER_MINOR            02
 
 #define PROFILE_VER_MAJOR       1
-#define PROFILE_VER_MINOR       01
+#define PROFILE_VER_MINOR       02
 
 #define INITCFG_VER_MAJOR       1
 #define INITCFG_VER_MINOR       00

software/sys_controller/ossc/menu.c

@@ -494,10 +494,10 @@ static void vm_select() {
     tc_h_samplerate = video_modes_plm[vm_edit].timings.h_total;
     tc_h_samplerate_adj = (uint16_t)video_modes_plm[vm_edit].timings.h_total_adj;
     tc_h_synclen = (uint16_t)video_modes_plm[vm_edit].timings.h_synclen;
-    tc_h_bporch = (uint16_t)video_modes_plm[vm_edit].timings.h_backporch;
+    tc_h_bporch = video_modes_plm[vm_edit].timings.h_backporch;
     tc_h_active = video_modes_plm[vm_edit].timings.h_active;
     tc_v_synclen = (uint16_t)video_modes_plm[vm_edit].timings.v_synclen;
-    tc_v_bporch = (uint16_t)video_modes_plm[vm_edit].timings.v_backporch;
+    tc_v_bporch = video_modes_plm[vm_edit].timings.v_backporch;
     tc_v_active = video_modes_plm[vm_edit].timings.v_active;
     tc_sampler_phase = video_modes_plm[vm_edit].sampler_phase;
 }
@@ -508,11 +508,11 @@ static void vm_tweak(uint16_t *v) {
     if (active_mode) {
         if ((video_modes_plm[cm.id].timings.h_total != tc_h_samplerate) ||
             (video_modes_plm[cm.id].timings.h_total_adj != (uint8_t)tc_h_samplerate_adj) ||
-            (video_modes_plm[cm.id].timings.h_synclen != tc_h_synclen) ||
+            (video_modes_plm[cm.id].timings.h_synclen != (uint8_t)tc_h_synclen) ||
-            (video_modes_plm[cm.id].timings.h_backporch != (uint8_t)tc_h_bporch) ||
+            (video_modes_plm[cm.id].timings.h_backporch != tc_h_bporch) ||
             (video_modes_plm[cm.id].timings.h_active != tc_h_active) ||
-            (video_modes_plm[cm.id].timings.v_synclen != tc_v_synclen) ||
+            (video_modes_plm[cm.id].timings.v_synclen != (uint8_t)tc_v_synclen) ||
-            (video_modes_plm[cm.id].timings.v_backporch != (uint8_t)tc_v_bporch) ||
+            (video_modes_plm[cm.id].timings.v_backporch != tc_v_bporch) ||
             (video_modes_plm[cm.id].timings.v_active != tc_v_active))
             update_cur_vm = 1;
         if (video_modes_plm[cm.id].sampler_phase != tc_sampler_phase)
@@ -521,10 +521,10 @@ static void vm_tweak(uint16_t *v) {
     video_modes_plm[vm_edit].timings.h_total = tc_h_samplerate;
     video_modes_plm[vm_edit].timings.h_total_adj = (uint8_t)tc_h_samplerate_adj;
     video_modes_plm[vm_edit].timings.h_synclen = (uint8_t)tc_h_synclen;
-    video_modes_plm[vm_edit].timings.h_backporch = (uint8_t)tc_h_bporch;
+    video_modes_plm[vm_edit].timings.h_backporch = tc_h_bporch;
     video_modes_plm[vm_edit].timings.h_active = tc_h_active;
     video_modes_plm[vm_edit].timings.v_synclen = (uint8_t)tc_v_synclen;
-    video_modes_plm[vm_edit].timings.v_backporch = (uint8_t)tc_v_bporch;
+    video_modes_plm[vm_edit].timings.v_backporch = tc_v_bporch;
     video_modes_plm[vm_edit].timings.v_active = tc_v_active;
     video_modes_plm[vm_edit].sampler_phase = tc_sampler_phase;
 

software/sys_controller/ossc/userdata.c

@@ -322,7 +322,7 @@ int import_userdata()
 
         // Just blindly write the entry to flash
         retval = copy_sd_to_flash((512+n*SECTORSIZE)/SD_BLK_SIZE, (n*PAGES_PER_SECTOR)+(USERDATA_OFFSET/PAGESIZE),
-            (header.type == UDE_PROFILE) ? sizeof(ude_profile) : sizeof(ude_initcfg), databuf);
+            (header.type == UDE_PROFILE) ? (sizeof(ude_profile)+sizeof(video_modes_plm_default)) : sizeof(ude_initcfg), databuf);
         if (retval != 0) {
             printf("Copy from SD to flash failed (error %d)\n", retval);
             goto sd_disable;

software/sys_controller/ossc/video_modes.c

@@ -483,7 +483,7 @@ int get_vmode(vmode_t vmode_id, mode_data_t *vm_in, mode_data_t *vm_out, vm_proc
 {
     memset(vm_conf, 0, sizeof(vm_proc_config_t));
     memset(vm_in, 0, sizeof(mode_data_t));
-    memcpy(vm_out, &video_modes_plm[vmode_id], sizeof(mode_data_t));
+    memcpy(vm_out, &video_modes_plm_default[vmode_id], sizeof(mode_data_t));
 
     return 0;
 }

software/sys_controller/ossc/video_modes.h

@@ -115,7 +115,7 @@ typedef struct {
     uint16_t v_total;
     uint16_t h_backporch;
     uint16_t v_backporch;
-    uint16_t h_synclen;
+    uint8_t h_synclen;
     uint8_t v_synclen;
     uint8_t interlaced;
 } sync_timings_t;