move bios settings to be handled as a slot option.

master
Kelvin Sherlock 4 months ago
parent f52470eb2e
commit 4ffd8d1f44
  1. 56
      Ample/Resources/agat7.plist
  2. 44
      Ample/Resources/agat9.plist
  3. 44
      Ample/Resources/apple2.plist
  4. 44
      Ample/Resources/apple3.plist
  5. 56
      Ample/Resources/ceci.plist
  6. 56
      Ample/Resources/laser128.plist
  7. 80
      Ample/Resources/laser128o.plist
  8. 56
      Ample/Resources/mac512ke.plist
  9. 44
      Ample/Resources/macii.plist
  10. 44
      Ample/Resources/maciihmu.plist
  11. 80
      Ample/Resources/macplus.plist
  12. 1
      python/machines.py
  13. 44
      python/mkmachines.py

@ -37,6 +37,41 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Version 1</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Version 2</string>
</dict>
<dict>
<key>value</key>
<string>debug</string>
<key>description</key>
<string>Debug</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>sl2</string>
@ -396,27 +431,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Version 1</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Version 2</string>
</dict>
<dict>
<key>value</key>
<string>debug</string>
<key>description</key>
<string>Debug</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -37,6 +37,35 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Version 1</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Version 2</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>sl1</string>
@ -492,21 +521,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Version 1</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Version 2</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -117,6 +117,35 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>Original Monitor</string>
</dict>
<dict>
<key>value</key>
<string>autostart</string>
<key>description</key>
<string>Autostart Monitor</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>sl0</string>
@ -3880,21 +3909,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>Original Monitor</string>
</dict>
<dict>
<key>value</key>
<string>autostart</string>
<key>description</key>
<string>Autostart Monitor</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -55,6 +55,35 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>original</string>
<key>description</key>
<string>Apple /// boot ROM</string>
</dict>
<dict>
<key>value</key>
<string>soshd</string>
<key>description</key>
<string>Rob Justice SOSHDBOOT</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>smartport</string>
@ -602,21 +631,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>original</string>
<key>description</key>
<string>Apple /// boot ROM</string>
</dict>
<dict>
<key>value</key>
<string>soshd</string>
<key>description</key>
<string>Rob Justice SOSHDBOOT</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -37,6 +37,41 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>ver 1.21</string>
</dict>
<dict>
<key>value</key>
<string>older</string>
<key>description</key>
<string>ver 1.1</string>
</dict>
<dict>
<key>value</key>
<string>diag</string>
<key>description</key>
<string>self test</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>smartport</string>
@ -3193,27 +3228,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>ver 1.21</string>
</dict>
<dict>
<key>value</key>
<string>older</string>
<key>description</key>
<string>ver 1.1</string>
</dict>
<dict>
<key>value</key>
<string>diag</string>
<key>description</key>
<string>self test</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -77,6 +77,41 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>871222</string>
<key>description</key>
<string>v4.3</string>
</dict>
<dict>
<key>value</key>
<string>870917</string>
<key>description</key>
<string>v4.2</string>
</dict>
<dict>
<key>value</key>
<string>870724</string>
<key>description</key>
<string>v4.1</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>sl5</string>
@ -1642,27 +1677,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>871222</string>
<key>description</key>
<string>v4.3</string>
</dict>
<dict>
<key>value</key>
<string>870917</string>
<key>description</key>
<string>v4.2</string>
</dict>
<dict>
<key>value</key>
<string>870724</string>
<key>description</key>
<string>v4.1</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -37,6 +37,53 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>871212</string>
<key>description</key>
<string>v3.3</string>
</dict>
<dict>
<key>value</key>
<string>870320</string>
<key>description</key>
<string>v3.0</string>
</dict>
<dict>
<key>value</key>
<string>870203</string>
<key>description</key>
<string>v2.9</string>
</dict>
<dict>
<key>value</key>
<string>860915</string>
<key>description</key>
<string>860915</string>
</dict>
<dict>
<key>value</key>
<string>860801</string>
<key>description</key>
<string>860801</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>sl5</string>
@ -1602,39 +1649,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>871212</string>
<key>description</key>
<string>v3.3</string>
</dict>
<dict>
<key>value</key>
<string>870320</string>
<key>description</key>
<string>v3.0</string>
</dict>
<dict>
<key>value</key>
<string>870203</string>
<key>description</key>
<string>v2.9</string>
</dict>
<dict>
<key>value</key>
<string>860915</string>
<key>description</key>
<string>860915</string>
</dict>
<dict>
<key>value</key>
<string>860801</string>
<key>description</key>
<string>860801</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -35,6 +35,41 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>v3</string>
<key>description</key>
<string>Loud Harmonicas</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Lonely Heifers</string>
</dict>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Lonely Hearts</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>smartport</string>
@ -55,27 +90,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>v3</string>
<key>description</key>
<string>Loud Harmonicas</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Lonely Heifers</string>
</dict>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Lonely Hearts</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -85,6 +85,35 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>rev. B</string>
</dict>
<dict>
<key>value</key>
<string>original</string>
<key>description</key>
<string>rev. A</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>smartport</string>
@ -1007,21 +1036,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>rev. B</string>
</dict>
<dict>
<key>value</key>
<string>original</string>
<key>description</key>
<string>rev. A</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -85,6 +85,35 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>rev. B</string>
</dict>
<dict>
<key>value</key>
<string>original</string>
<key>description</key>
<string>rev. A</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>smartport</string>
@ -1007,21 +1036,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>default</string>
<key>description</key>
<string>rev. B</string>
</dict>
<dict>
<key>value</key>
<string>original</string>
<key>description</key>
<string>rev. A</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -65,6 +65,53 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>bios</string>
<key>description</key>
<string>ROM</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—Default—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>v3</string>
<key>description</key>
<string>Loud Harmonicas</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Lonely Heifers</string>
</dict>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Lonely Hearts</string>
</dict>
<dict>
<key>value</key>
<string>romdisk</string>
<key>description</key>
<string>mac68k.info self-boot (1/1/2015)</string>
</dict>
<dict>
<key>value</key>
<string>romdisk2</string>
<key>description</key>
<string>bigmessofwires.com ROMinator (2/25/2015)</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>smartport</string>
@ -85,39 +132,6 @@
</array>
</dict>
</array>
<key>bios</key>
<array>
<dict>
<key>value</key>
<string>v3</string>
<key>description</key>
<string>Loud Harmonicas</string>
</dict>
<dict>
<key>value</key>
<string>v2</string>
<key>description</key>
<string>Lonely Heifers</string>
</dict>
<dict>
<key>value</key>
<string>v1</string>
<key>description</key>
<string>Lonely Hearts</string>
</dict>
<dict>
<key>value</key>
<string>romdisk</string>
<key>description</key>
<string>mac68k.info self-boot (1/1/2015)</string>
</dict>
<dict>
<key>value</key>
<string>romdisk2</string>
<key>description</key>
<string>bigmessofwires.com ROMinator (2/25/2015)</string>
</dict>
</array>
<key>devices</key>
<array>
<dict>

@ -56,6 +56,7 @@ SLOTS = (
SLOT_NAMES = {
"ramsize": "RAM",
"bios": "ROM",
"sl0": "Slot 0",
"sl1": "Slot 1",
"sl2": "Slot 2",

@ -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

Loading…
Cancel
Save