From dc67db2ce6bc0465915fa8abca9585233f632293 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Wed, 31 May 2023 17:23:04 -0400
Subject: [PATCH] fix Atari rom names

---
 Ample/Resources/roms.plist | 24 ++++++++++++------------
 python/mkmachines.py       |  4 ++--
 python/mkroms.py           |  5 +++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist
index 612580b..8b374d4 100644
--- a/Ample/Resources/roms.plist
+++ b/Ample/Resources/roms.plist
@@ -404,6 +404,18 @@
       <key>description</key>
       <string>Asante MC3NB Ethernet card</string>
     </dict>
+    <dict>
+      <key>value</key>
+      <string>megast</string>
+      <key>description</key>
+      <string>Atari MEGA ST (USA)</string>
+    </dict>
+    <dict>
+      <key>value</key>
+      <string>st</string>
+      <key>description</key>
+      <string>Atari ST (USA)</string>
+    </dict>
     <dict>
       <key>value</key>
       <string>st_kbd</string>
@@ -698,12 +710,6 @@
       <key>description</key>
       <string>M&amp;R Enterprises SUP'R'TERMINAL</string>
     </dict>
-    <dict>
-      <key>value</key>
-      <string>megast</string>
-      <key>description</key>
-      <string>MEGA ST (USA)</string>
-    </dict>
     <dict>
       <key>value</key>
       <string>mac128k</string>
@@ -1028,12 +1034,6 @@
       <key>description</key>
       <string>RasterOps Colorboard 264/SE30</string>
     </dict>
-    <dict>
-      <key>value</key>
-      <string>st</string>
-      <key>description</key>
-      <string>ST (USA)</string>
-    </dict>
     <dict>
       <key>value</key>
       <string>swtpc8212_device</string>
diff --git a/python/mkmachines.py b/python/mkmachines.py
index ba58cbf..406b695 100644
--- a/python/mkmachines.py
+++ b/python/mkmachines.py
@@ -488,7 +488,7 @@ def make_smartport(machine):
 		"slots": slots
 	}
 
-def fix_machine_description(x):
+def fix_machine_description(x, devname):
 	#
 	x = x.replace(", www.dreher.net","")
 	return x
@@ -505,7 +505,7 @@ def make_slot(m, slotname, nodes):
 		default = x.get("default") == "yes"
 		disabled = name in DISABLED or (m, name) in DISABLED
 
-		d = { "value": name, "description": fix_machine_description(desc) } # "devname": devname or ''}
+		d = { "value": name, "description": fix_machine_description(desc, devname) } # "devname": devname or ''}
 		if default: d["default"] = True
 		if disabled: d["disabled"] = True
 		if not disabled:
diff --git a/python/mkroms.py b/python/mkroms.py
index 9be1925..13c9c0d 100644
--- a/python/mkroms.py
+++ b/python/mkroms.py
@@ -110,9 +110,10 @@ EXCLUDE = set([
 
 ])
 
-def fix_machine_description(x):
+def fix_machine_description(x, devname):
 	# CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)
 	x = x.replace(", www.dreher.net","")
+	if devname in ("st", "megast"): x = "Atari " + x
 	return x
 
 def build_known_roms_list():
@@ -190,7 +191,7 @@ for m in machines:
 
 # if full: ROMS = list(mnames)
 # else: ROMS = list(mnames.difference(EXCLUDE))
-ROMS =  [{ 'value': k, 'description': fix_machine_description(v)} for k, v in mnames.items()];
+ROMS =  [{ 'value': k, 'description': fix_machine_description(v, k)} for k, v in mnames.items()];
 ROMS.sort(key=lambda x: x.get('description'))
 
 # data = []