From: Toni Wilen <twilen@winuae.net>
Date: Sat, 27 Apr 2019 17:56:08 +0000 (+0300)
Subject: target_calibrate_spin fix
X-Git-Tag: 4300~230
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=b6c1085c86ebf9e6ae44e8dc9d73a7c531657b96;p=francis%2Fwinuae.git

target_calibrate_spin fix
---

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 0c8804c7..9ed3c8b5 100644
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -303,9 +303,9 @@ void target_calibrate_spin(void)
 	struct amigadisplay *ad = &adisplays[0];
 	struct apmode *ap = ad->picasso_on ? &currprefs.gfx_apmode[1] : &currprefs.gfx_apmode[0];
 	int vp;
+	const int cntlines = 1;
 	uae_u64 sc;
 
-	sc = 0;
 	spincount = 0;
 	if (!ap->gfx_vsyncmode)
 		return;
@@ -323,27 +323,30 @@ void target_calibrate_spin(void)
 			if (vp >= 1 && vp < vsync_activeheight - 10)
 				break;
 		}
-		int vp3 = target_get_display_scanline(-1);
+		uae_u64 v1;
+		int vp2;
 		for (;;) {
-			int vp2 = target_get_display_scanline(-1);
+			v1 = __rdtsc();
+			vp2 = target_get_display_scanline(-1);
 			if (vp2 <= -10)
 				goto fail;
-			if (vp2 == vp + 1)
+			if (vp2 == vp + cntlines)
 				break;
-			if (vp2 != vp)
+			if (vp2 < vp || vp2 > vp + cntlines)
 				goto trynext;
 		}
-		uae_u64 v1 = __rdtsc();
 		for (;;) {
 			int vp2 = target_get_display_scanline(-1);
 			if (vp2 <= -10)
 				goto fail;
-			if (vp2 == vp + 2) {
-				uae_u64 sc = __rdtsc() - v1;
-				if (sc > sc)
-					sc = sc;
+			if (vp2 == vp + cntlines * 2) {
+				uae_u64 scd = (__rdtsc() - v1) / cntlines;
+				if (sc > scd)
+					sc = scd;
 			}
-			if (vp2 != vp + 1)
+			if (vp2 < vp)
+				break;
+			if (vp2 > vp + cntlines * 2)
 				break;
 		}
 trynext:;