From bc17d64651fe9bd3b8800c876c51092062223bf8 Mon Sep 17 00:00:00 2001
From: David Kuder <davidk@thewaffleiron.net>
Date: Tue, 2 May 2023 15:08:04 -0400
Subject: [PATCH] Revert extended PIO pixel hold values

due to how the PIO program counter operates, the pixel holds are also used to shift the active area after a HSYNC. the larger values of pixel holds caused problems and had to be removed.
---
 vga/vga12.pio |  6 ------
 vga/vga9.pio  |  6 ------
 vga/vgaout.h  | 22 ++++++++--------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/vga/vga12.pio b/vga/vga12.pio
index 6f1904b..74af25f 100644
--- a/vga/vga12.pio
+++ b/vga/vga12.pio
@@ -37,12 +37,6 @@ public wait_vsync:
     wait 0 irq VSYNC_IRQ_NUM
 public wait_hsync:
     wait 0 irq HSYNC_IRQ_NUM  [1]
-public extend_31:                  ; 32 pixels / an extra 62 clocks (32+4+12+2+6+4+2)
-    nop  [31]
-public extend_15:                  ; 16 pixels / an extra 30 clocks (4+12+2+6+4+2)
-    nop  [3]
-public extend_13:                  ; 14 pixels / an extra 26 clocks (12+2+6+4+2)
-    nop  [11]
 public extend_7:                   ;  8 pixels / an extra 14 clocks (2+6+4+2)
     nop  [1]
 public extend_6:                   ;  7 pixels / an extra 12 clocks (6+4+2)
diff --git a/vga/vga9.pio b/vga/vga9.pio
index 148cde6..aba808c 100644
--- a/vga/vga9.pio
+++ b/vga/vga9.pio
@@ -37,12 +37,6 @@ public wait_vsync:
     wait 0 irq VSYNC_IRQ_NUM
 public wait_hsync:
     wait 0 irq HSYNC_IRQ_NUM  [1]
-public extend_31:                  ;public extend_31:                  ; 32 pixels / an extra 62 clocks (32+4+12+2+6+4+2)
-    nop  [31]
-public extend_15:                  ; 16 pixels / an extra 30 clocks (4+12+2+6+4+2)
-    nop  [3]
-public extend_13:                  ; 14 pixels / an extra 26 clocks (12+2+6+4+2)
-    nop  [11]
 public extend_7:                   ;  8 pixels / an extra 14 clocks (2+6+4+2)
     nop  [1]
 public extend_6:                   ;  7 pixels / an extra 12 clocks (6+4+2)
diff --git a/vga/vgaout.h b/vga/vgaout.h
index 47f5b69..d1ba8ae 100644
--- a/vga/vgaout.h
+++ b/vga/vgaout.h
@@ -9,23 +9,17 @@
 #ifdef ANALOG_GS
 #define THEN_WAIT_VSYNC (2 << 12)
 #define THEN_WAIT_HSYNC (3 << 12)
-#define THEN_EXTEND_31  (4 << 12)
-#define THEN_EXTEND_15  (5 << 12)
-#define THEN_EXTEND_13  (6 << 12)
-#define THEN_EXTEND_7   (7 << 12)
-#define THEN_EXTEND_6   (8 << 12)
-#define THEN_EXTEND_3   (9 << 12)
-#define THEN_EXTEND_1   (10 << 12)
+#define THEN_EXTEND_7   (4 << 12)
+#define THEN_EXTEND_6   (5 << 12)
+#define THEN_EXTEND_3   (6 << 12)
+#define THEN_EXTEND_1   (7 << 12)
 #else
 #define THEN_WAIT_VSYNC (2 << 9)
 #define THEN_WAIT_HSYNC (3 << 9)
-#define THEN_EXTEND_31  (4 << 9)
-#define THEN_EXTEND_15  (5 << 9)
-#define THEN_EXTEND_13  (6 << 9)
-#define THEN_EXTEND_7   (7 << 9)
-#define THEN_EXTEND_6   (8 << 9)
-#define THEN_EXTEND_3   (9 << 9)
-#define THEN_EXTEND_1   (10 << 9)
+#define THEN_EXTEND_7   (4 << 9)
+#define THEN_EXTEND_6   (5 << 9)
+#define THEN_EXTEND_3   (6 << 9)
+#define THEN_EXTEND_1   (7 << 9)
 #endif
 
 struct vga_scanline {