From 828d818bd9131f66d24ff8201a6340cce97864dd Mon Sep 17 00:00:00 2001
From: David Banks <dave@hoglet.com>
Date: Fri, 7 Dec 2018 14:04:35 +0000
Subject: [PATCH] Pi Firmware: allow sampling/geometry instead of
 sampling06/geometry06 in cmdline.txt

Change-Id: I3abb70dfbb203bf1a74bba7819f63715b09a9834
---
 src/osd.c               | 16 ++++++++++++----
 src/scripts/cmdline.txt | 16 ++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/osd.c b/src/osd.c
index 448b230a..a5359fde 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -1244,12 +1244,20 @@ void osd_init() {
    for (int p = 0; p < 2; p++) {
       for (int m7 = 0; m7 <= 1; m7++) {
          char *propname;
-         if (p == 0) {
-            propname = m7 ? "sampling7" : "sampling06";
+         if (m7) {
+            // Mode 7 properties
+            propname = p ? "geometry7" : "sampling7";
+            prop = get_cmdline_prop(propname);
          } else {
-            propname = m7 ? "geometry7" : "geometry06";
+            // Default properties
+            propname = p ? "geometry" : "sampling";
+            prop = get_cmdline_prop(propname);
+            if (!prop) {
+               // All a fallback to an "06" suffix
+               propname = p ? "geometry06" : "sampling06";
+               prop = get_cmdline_prop(propname);
+            }
          }
-         prop = get_cmdline_prop(propname);
          if (prop) {
             cpld->set_mode(NULL, m7);
             geometry_set_mode(m7);
diff --git a/src/scripts/cmdline.txt b/src/scripts/cmdline.txt
index 97d369d1..13f5c1ff 100644
--- a/src/scripts/cmdline.txt
+++ b/src/scripts/cmdline.txt
@@ -2,7 +2,7 @@
 # cmdline.txt file for RGBtoHDMI (https://github.com/hoglet67/RGBtoHDMI)
 # ======================================================================
 #
-# sampling06: Sample points for modes 0..6
+# sampling06 (or just sampling): Sample points for other modes
 #
 # sampling7: Sample points for mode 7
 #
@@ -47,7 +47,7 @@
 #     - For Delay use the "Delay" value
 #
 #
-# geometry06: Geometry/mode configuration for modes 0..6
+# geometry06: (or just geometry): Geometry/mode configuration for other modes
 #
 # geometry7: Geometry/mode configuration for mode 7
 #
@@ -182,19 +182,19 @@ sampling06=3 sampling7=0,2,2,2,2,2,2,0,8,5 info=1 palette=0 deinterlace=6 scanli
 # sampling06=0,4,4,4,4,4,4,0,2 geometry06=37,28,80,256,640,512 info=1 palette=0 deinterlace=1 scanlines=0 mux=0 elk=0 vsync=0 vlockmode=0 nbuffers=2 debug=1 m7disable=0
 #
 # Here's an example that might work with a UK 101
-#sampling06=4 geometry06=23,26,100,270,800,540 info=1 palette=0 deinterlace=0 scanlines=0 mux=0 elk=0 vsync=0 vlockmode=0 nbuffers=2 debug=1 m7disable=1
+#sampling=4 geometry=23,26,100,270,800,540 info=1 palette=0 deinterlace=0 scanlines=0 mux=0 elk=0 vsync=0 vlockmode=0 nbuffers=2 debug=1 m7disable=1
 #
 # Here's an example that might work with an Atom (CPLDv1) (narrow border)
-#sampling06=0,5,5,5,5,5,5,0 geometry06=3,37,66,200,528,400,4,85909091,5472 nbuffers=2 m7disable=1
+#sampling=0,5,5,5,5,5,5,0 geometry=3,37,66,200,528,400,4,85909091,5472 nbuffers=2 m7disable=1
 #
 # Here's an example that might work with an Atom (CPLDv1) (wider border)
-#sampling06=0,5,5,5,5,5,5,0 geometry06=0,31,69,212,552,424,4,85909091,5472 nbuffers=2 m7disable=1
+#sampling=0,5,5,5,5,5,5,0 geometry=0,31,69,212,552,424,4,85909091,5472 nbuffers=2 m7disable=1
 #
 # Here's an example that might work with an Atom (CPLDv2) (even wider border)
-#sampling06=0,5,5,5,5,5,5,0 geometry06=24,16,76,240,608,480,4,85909091,5472 nbuffers=2 m7disable=1
+#sampling=0,5,5,5,5,5,5,0 geometry=24,16,76,240,608,480,4,85909091,5472 nbuffers=2 m7disable=1
 #
 # Here's an example that might work with an Atom (Atom CPLD)
-#sampling06=0 geometry06=19,11,76,240,608,480,8,57272720,3648 palette=10 nbuffers=2 m7disable=1 keymap=1233232
+#sampling=0 geometry=19,11,76,240,608,480,8,57272720,3648 palette=10 nbuffers=2 m7disable=1 keymap=1233232
 #
 # Here's an example that might work with a ZX80/ZX81
-#sampling06=0,4,4,4,4,4,4,0 geometry06=9,18,84,270,672,540,4,78000000,4968,20000 nbuffers=2 m7disable=1 keymap=1323232 return=0
+#sampling=0,4,4,4,4,4,4,0 geometry=9,18,84,270,672,540,4,78000000,4968,20000 nbuffers=2 m7disable=1 keymap=1323232 return=0