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 @@
description
Asante MC3NB Ethernet card
+
+ value
+ megast
+ description
+ Atari MEGA ST (USA)
+
+
+ value
+ st
+ description
+ Atari ST (USA)
+
value
st_kbd
@@ -698,12 +710,6 @@
description
M&R Enterprises SUP'R'TERMINAL
-
- value
- megast
- description
- MEGA ST (USA)
-
value
mac128k
@@ -1028,12 +1034,6 @@
description
RasterOps Colorboard 264/SE30
-
- value
- st
- description
- ST (USA)
-
value
swtpc8212_device
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 = []