From 1f4fe8a2643095477f9f3eed1d0e8e4f30a93140 Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Fri, 21 Dec 2018 04:42:10 +0800
Subject: [PATCH] Replace vscale_integer with vscale_mode with extended
 functionality.

---
 MiSTer.ini  |  6 ++++--
 cfg.cpp     |  2 +-
 cfg.h       |  2 +-
 user_io.cpp | 42 +++++++++++++++++++++++++-----------------
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/MiSTer.ini b/MiSTer.ini
index b0c9b67..7a6ee1b 100644
--- a/MiSTer.ini
+++ b/MiSTer.ini
@@ -7,9 +7,11 @@ vga_scaler=0           ; set to 1 to connect VGA to scaler output.
 hdmi_audio_96k=0       ; set to 1 for 96khz/16bit HDMI audio (48khz/16bit otherwise)
 keyrah_mode=0x18d80002 ; VIDPID of keyrah for special code translation (0x23418037 for Arduino Micro)
 volumectl=0            ; enable audio volume control by multimedia keys
-vscale_integer=0       ; set to 1 to use only integer vertical scaling
+vscale_mode=0          ; 0 - scale to fit the screen height.
+                       ; 1 - use integer scale only.
+                       ; 2 - use 0.5 steps of scale.
+                       ; 3 - use 0.25 steps of scale.
 vscale_border=0        ; set vertical border for TVs cutting the upper/bottom parts of screen (1-99)
-                       ; vscale_integer and vscale_border are mutually exclusive!
 ;bootscreen=0          ; uncomment to disable boot screen of some cores like Minimig. 
 ;mouse_throttle=10     ; 1-100 mouse speed divisor. Useful for very sensitive mouses
 
diff --git a/cfg.cpp b/cfg.cpp
index cb4fee7..aca8eca 100644
--- a/cfg.cpp
+++ b/cfg.cpp
@@ -40,7 +40,7 @@ const ini_var_t ini_vars[] = {
 	{ "MOUSE_THROTTLE", (void*)(&(cfg.mouse_throttle)), UINT8, 1, 100, 1 },
 	{ "BOOTSCREEN", (void*)(&(cfg.bootscreen)), UINT8, 0, 1, 1 },
 	{ "VOLUMECTL", (void*)(&(cfg.volumectl)), UINT8, 0, 1, 1 },
-	{ "VSCALE_INTEGER", (void*)(&(cfg.vscale_integer)), UINT8, 0, 1, 1 },
+	{ "VSCALE_MODE", (void*)(&(cfg.vscale_mode)), UINT8, 0, 3, 1 },
 	{ "VSCALE_BORDER", (void*)(&(cfg.vscale_border)), UINT8, 0, 100, 1 },
 };
 
diff --git a/cfg.h b/cfg.h
index e62e2b4..eab8d15 100644
--- a/cfg.h
+++ b/cfg.h
@@ -29,7 +29,7 @@ typedef struct {
 	uint8_t mouse_throttle;
 	uint8_t bootscreen;
 	uint8_t volumectl;
-	uint8_t vscale_integer;
+	uint8_t vscale_mode;
 	uint8_t vscale_border;
 	char video_conf[1024];
 } cfg_t;
diff --git a/user_io.cpp b/user_io.cpp
index c46d5b3..25fe8b0 100644
--- a/user_io.cpp
+++ b/user_io.cpp
@@ -3064,24 +3064,32 @@ static uint32_t show_video_info(int force)
 			Info(str, cfg.video_info * 1000);
 		}
 
-		if (cfg.vscale_border && height && (height <= vitems[5]))
+		uint32_t scrh = vitems[5];
+		if (height && scrh)
 		{
-			uint32_t border = cfg.vscale_border * 2;
-			if ((border + 100) > vitems[5]) border = vitems[5] - 100;
-			height = vitems[5] - border;
-			printf("Set vertical scaling to : %d\n", height);
-			spi_uio_cmd16(UIO_SETHEIGHT, height);
-		}
-		else if (cfg.vscale_integer && height && (height <= vitems[5]))
-		{
-			uint32_t mag = vitems[5] / height;
-			height *= mag;
-			printf("Set Integer V scaling: %d\n", height);
-			spi_uio_cmd16(UIO_SETHEIGHT, height);
-		}
-		else
-		{
-			spi_uio_cmd16(UIO_SETHEIGHT, 0);
+			if (cfg.vscale_border)
+			{
+				uint32_t border = cfg.vscale_border * 2;
+				if ((border + 100) > scrh) border = scrh - 100;
+				scrh -= border;
+			}
+
+			if (cfg.vscale_mode)
+			{
+				uint32_t div = 1 << (cfg.vscale_mode - 1);
+				uint32_t mag = (scrh*div) / height;
+				scrh = (height * mag) / div;
+			}
+
+			if(cfg.vscale_border || cfg.vscale_mode)
+			{
+				printf("*** Set vertical scaling to : %d\n", scrh);
+				spi_uio_cmd16(UIO_SETHEIGHT, scrh);
+			}
+			else
+			{
+				spi_uio_cmd16(UIO_SETHEIGHT, 0);
+			}
 		}
 
 		if (vtime && vtimeh) ret = vtime;