diff --git a/Ample/Resources/agat7.plist b/Ample/Resources/agat7.plist
index 318da1d..f5e6d03 100644
--- a/Ample/Resources/agat7.plist
+++ b/Ample/Resources/agat7.plist
@@ -37,6 +37,41 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ v1
+ description
+ Version 1
+
+
+ value
+ v2
+ description
+ Version 2
+
+
+ value
+ debug
+ description
+ Debug
+
+
+
name
sl2
@@ -396,27 +431,6 @@
- bios
-
-
- value
- v1
- description
- Version 1
-
-
- value
- v2
- description
- Version 2
-
-
- value
- debug
- description
- Debug
-
-
devices
diff --git a/Ample/Resources/agat9.plist b/Ample/Resources/agat9.plist
index 5f46129..a3cc811 100644
--- a/Ample/Resources/agat9.plist
+++ b/Ample/Resources/agat9.plist
@@ -37,6 +37,35 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ v1
+ description
+ Version 1
+
+
+ value
+ v2
+ description
+ Version 2
+
+
+
name
sl1
@@ -492,21 +521,6 @@
- bios
-
-
- value
- v1
- description
- Version 1
-
-
- value
- v2
- description
- Version 2
-
-
devices
diff --git a/Ample/Resources/apple2.plist b/Ample/Resources/apple2.plist
index 455168d..8f3b6b3 100644
--- a/Ample/Resources/apple2.plist
+++ b/Ample/Resources/apple2.plist
@@ -117,6 +117,35 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ default
+ description
+ Original Monitor
+
+
+ value
+ autostart
+ description
+ Autostart Monitor
+
+
+
name
sl0
@@ -3880,21 +3909,6 @@
- bios
-
-
- value
- default
- description
- Original Monitor
-
-
- value
- autostart
- description
- Autostart Monitor
-
-
devices
diff --git a/Ample/Resources/apple3.plist b/Ample/Resources/apple3.plist
index 1ee14f9..8e95ba3 100644
--- a/Ample/Resources/apple3.plist
+++ b/Ample/Resources/apple3.plist
@@ -55,6 +55,35 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ original
+ description
+ Apple /// boot ROM
+
+
+ value
+ soshd
+ description
+ Rob Justice SOSHDBOOT
+
+
+
name
smartport
@@ -602,21 +631,6 @@
- bios
-
-
- value
- original
- description
- Apple /// boot ROM
-
-
- value
- soshd
- description
- Rob Justice SOSHDBOOT
-
-
devices
diff --git a/Ample/Resources/ceci.plist b/Ample/Resources/ceci.plist
index 21a4a99..c6a9080 100644
--- a/Ample/Resources/ceci.plist
+++ b/Ample/Resources/ceci.plist
@@ -37,6 +37,41 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ default
+ description
+ ver 1.21
+
+
+ value
+ older
+ description
+ ver 1.1
+
+
+ value
+ diag
+ description
+ self test
+
+
+
name
smartport
@@ -3193,27 +3228,6 @@
- bios
-
-
- value
- default
- description
- ver 1.21
-
-
- value
- older
- description
- ver 1.1
-
-
- value
- diag
- description
- self test
-
-
devices
diff --git a/Ample/Resources/laser128.plist b/Ample/Resources/laser128.plist
index 0c9dec1..de14f56 100644
--- a/Ample/Resources/laser128.plist
+++ b/Ample/Resources/laser128.plist
@@ -77,6 +77,41 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ 871222
+ description
+ v4.3
+
+
+ value
+ 870917
+ description
+ v4.2
+
+
+ value
+ 870724
+ description
+ v4.1
+
+
+
name
sl5
@@ -1642,27 +1677,6 @@
- bios
-
-
- value
- 871222
- description
- v4.3
-
-
- value
- 870917
- description
- v4.2
-
-
- value
- 870724
- description
- v4.1
-
-
devices
diff --git a/Ample/Resources/laser128o.plist b/Ample/Resources/laser128o.plist
index 99e42b1..b2f2adb 100644
--- a/Ample/Resources/laser128o.plist
+++ b/Ample/Resources/laser128o.plist
@@ -37,6 +37,53 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ 871212
+ description
+ v3.3
+
+
+ value
+ 870320
+ description
+ v3.0
+
+
+ value
+ 870203
+ description
+ v2.9
+
+
+ value
+ 860915
+ description
+ 860915
+
+
+ value
+ 860801
+ description
+ 860801
+
+
+
name
sl5
@@ -1602,39 +1649,6 @@
- bios
-
-
- value
- 871212
- description
- v3.3
-
-
- value
- 870320
- description
- v3.0
-
-
- value
- 870203
- description
- v2.9
-
-
- value
- 860915
- description
- 860915
-
-
- value
- 860801
- description
- 860801
-
-
devices
diff --git a/Ample/Resources/mac512ke.plist b/Ample/Resources/mac512ke.plist
index 60ab8dd..2a2502f 100644
--- a/Ample/Resources/mac512ke.plist
+++ b/Ample/Resources/mac512ke.plist
@@ -35,6 +35,41 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ v3
+ description
+ Loud Harmonicas
+
+
+ value
+ v2
+ description
+ Lonely Heifers
+
+
+ value
+ v1
+ description
+ Lonely Hearts
+
+
+
name
smartport
@@ -55,27 +90,6 @@
- bios
-
-
- value
- v3
- description
- Loud Harmonicas
-
-
- value
- v2
- description
- Lonely Heifers
-
-
- value
- v1
- description
- Lonely Hearts
-
-
devices
diff --git a/Ample/Resources/macii.plist b/Ample/Resources/macii.plist
index 4693747..0269f60 100644
--- a/Ample/Resources/macii.plist
+++ b/Ample/Resources/macii.plist
@@ -85,6 +85,35 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ default
+ description
+ rev. B
+
+
+ value
+ original
+ description
+ rev. A
+
+
+
name
smartport
@@ -1007,21 +1036,6 @@
- bios
-
-
- value
- default
- description
- rev. B
-
-
- value
- original
- description
- rev. A
-
-
devices
diff --git a/Ample/Resources/maciihmu.plist b/Ample/Resources/maciihmu.plist
index 3bcfe02..e38f2f6 100644
--- a/Ample/Resources/maciihmu.plist
+++ b/Ample/Resources/maciihmu.plist
@@ -85,6 +85,35 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ default
+ description
+ rev. B
+
+
+ value
+ original
+ description
+ rev. A
+
+
+
name
smartport
@@ -1007,21 +1036,6 @@
- bios
-
-
- value
- default
- description
- rev. B
-
-
- value
- original
- description
- rev. A
-
-
devices
diff --git a/Ample/Resources/macplus.plist b/Ample/Resources/macplus.plist
index 9daf52a..d685513 100644
--- a/Ample/Resources/macplus.plist
+++ b/Ample/Resources/macplus.plist
@@ -65,6 +65,53 @@
+
+ name
+ bios
+ description
+ ROM
+ options
+
+
+ value
+
+ description
+ —Default—
+ default
+
+
+
+ value
+ v3
+ description
+ Loud Harmonicas
+
+
+ value
+ v2
+ description
+ Lonely Heifers
+
+
+ value
+ v1
+ description
+ Lonely Hearts
+
+
+ value
+ romdisk
+ description
+ mac68k.info self-boot (1/1/2015)
+
+
+ value
+ romdisk2
+ description
+ bigmessofwires.com ROMinator (2/25/2015)
+
+
+
name
smartport
@@ -85,39 +132,6 @@
- bios
-
-
- value
- v3
- description
- Loud Harmonicas
-
-
- value
- v2
- description
- Lonely Heifers
-
-
- value
- v1
- description
- Lonely Hearts
-
-
- value
- romdisk
- description
- mac68k.info self-boot (1/1/2015)
-
-
- value
- romdisk2
- description
- bigmessofwires.com ROMinator (2/25/2015)
-
-
devices
diff --git a/python/machines.py b/python/machines.py
index 0c9b9cc..f29bb39 100644
--- a/python/machines.py
+++ b/python/machines.py
@@ -56,6 +56,7 @@ SLOTS = (
SLOT_NAMES = {
"ramsize": "RAM",
+ "bios": "ROM",
"sl0": "Slot 0",
"sl1": "Slot 1",
"sl2": "Slot 2",
diff --git a/python/mkmachines.py b/python/mkmachines.py
index cf02d49..be3e819 100644
--- a/python/mkmachines.py
+++ b/python/mkmachines.py
@@ -415,6 +415,31 @@ def make_ram(machine):
"options": options
}
+
+
+def make_bios(m):
+
+ options = [
+ {
+ "value": x.get("name"),
+ "description": x.get("description")
+ }
+ for x in m.findall('./biosset')
+ ]
+
+ if not options: return None
+
+ options.insert(0, {"value": "", "description": "—Default—", "default": True })
+
+ return {
+ "name": "bios",
+ "description": SLOT_NAMES["bios"],
+ "options": options
+ }
+
+
+
+
def make_smartport(machine):
@@ -494,18 +519,6 @@ def make_slot(m, slotname, nodes):
}
-def make_bios(m):
-
- bios = []
- for x in m.findall('./biosset'):
- bios.append({
- "value": x.get("name"),
- "description": x.get("description")
- })
-
- return bios
-
-
devices = {}
@@ -559,9 +572,11 @@ for m in machines:
# ss = {}
slots = []
slots.append(make_ram(machine))
+ x = make_bios(machine)
+ if x: slots.append(x)
smartport = make_smartport(machine)
- if (smartport):
+ if smartport:
slots.append({
"name": "smartport",
"description": "Disk Drives",
@@ -583,9 +598,6 @@ for m in machines:
data["slots"] = slots
- bios = make_bios(machine)
- if bios: data["bios"] = bios
-
devices = make_devices()
if smartport: devices.insert(0, smartport)
data["devices"] = devices