add c64/128 (extra)

python/machines.py

@@ -69,6 +69,9 @@ MACHINES_EXTRA = MACHINES + (
 	# acorn
 	"bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron",
 
+	# commodore
+	"c64", "c64c", "c128",
+
 
 	# amiga
 	"a500", "a500n", "a1000", "a1000n", "a2000", "a2000n",
@@ -131,6 +134,9 @@ SLOTS = (
 
 	# coco/trs
 	"ext", "floppy0", "floppy1", "floppy2", "floppy3",
+
+	# commodore
+	"user", "iec4", "iec8", "iec9", "iec10", "iec11", "tape"
 )
 
 SLOT_NAMES = {
@@ -223,6 +229,19 @@ SLOT_NAMES = {
 	"floppy1":    "Floppy 2",
 	"floppy2":    "Floppy 3",
 	"floppy3":    "Floppy 4",
+
+	# commodore
+	"user":       "User",
+	"tape":       "Tape",
+	"iec4":       "IEC 4",
+	"iec5":       "IEC 5",
+	"iec6":       "IEC 6",
+	"iec7":       "IEC 7",
+	"iec8":       "IEC 8",
+	"iec9":       "IEC 9",
+	"iec10":      "IEC 10",
+	"iec11":      "IEC 11",
+	"iec12":      "IEC 12",
 }
 
 

python/mkmachines.py

@@ -114,6 +114,9 @@ def load_machine_recursive(name):
 			if devname in processed: continue
 			pending.add(devname)
 
+		# also include if there's a bios...
+		if m.find('./biosset') is not None: count = count + 1
+
 		if count:
 			# print("    slots: {}".format(name))
 			submachines[name] = m
@@ -273,17 +276,33 @@ def find_media(parent, include_slots=False):
 	# special case for the pc transporter.  not in the xml but it adds 2 5.25" floppies
 	# n.b. - floppies are 5.25" 360k or 180k.  not bootable, not usable from prodos
 	# without special prodos file or loading driver into pc transporter ram.
-	if parent.get("name") == "pcxport":
+
+	name = parent.get("name")
+	sourcefile = parent.get("sourcefile")
+	if name == "pcxport":
 		media["floppy_5_25"] = media.get("floppy_5_25", 0) + 2
 
+	# special case for commodore disk drives...
+	if sourcefile.endswith("/cbmiec/c1541.cpp"):
+		media["floppy_5_25"] = media.get("floppy_5_25", 0) + 1
+
+	if sourcefile.endswith("/cbmiec/c1571.cpp"):
+		media["floppy_5_25"] = media.get("floppy_5_25", 0) + 1
+
+	if sourcefile.endswith("/cbmiec/c1581.cpp"):
+		media["floppy_3_5"] = media.get("floppy_3_5", 0) + 1
+
+	if sourcefile.endswith("/cbmiec/fd2000.cpp"):
+		media["floppy_3_5"] = media.get("floppy_3_5", 0) + 1
+
 
 	# special case for a2romusr
-	if parent.get("name") == "a2romusr":
+	if name == "a2romusr":
 		media["rom"] = media.get("rom", 0) + 1
 
 
 	# scsibus:1 is special cd-rom
-	if parent.get("name") == "a2scsi":
+	if name == "a2scsi":
 		media["cdrom"] = media.get("cdrom", 0) + 1
 
 	if not media: return None

python/mkmodels.py

@@ -68,6 +68,7 @@ oric_children = [
 amiga_children = ["a500", "a500n", "a1000", "a1000n", "a2000", "a2000n" ]
 
 acorn_children = [ "bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron" ]
+commodore_children = ["c64", "c64c", "c128"]
 
 dec_vt_children = ["vt52", "vt100", "vt101", "vt102", "vt240"]
 dec_children = ["ds2100", "ds3100", "ds5k133", "pdp11qb", "pdp11ub", "pdp11ub2"]
@@ -108,6 +109,7 @@ TREE = [
 TREE_EXTRA = TREE + [
 	("Acorn", None, acorn_children),
 	("Amiga", None, amiga_children),
+	("Commodore", "c64", commodore_children),
 	("DEC VT", None, dec_vt_children),
 	("DEC", None, dec_children),
 	("HP 9000", None, hp_9000_children),