Add oric.

python/machines.py

@@ -50,6 +50,10 @@ MACHINES = (
 	"trs80", "trs80l2",
 	"dragon32", "dragon64", "d64plus", "dragon200", "dragon200e", "tanodr64",
 
+	# oric
+	"oric1", "orica", "prav8d", "telstrat",
+	# mt65, micron, mt6809 -- need tanbus support...
+
 )
 
 
@@ -208,9 +212,12 @@ SLOT_NAMES = {
 	"fdc":        "Disk Drives",
 
 
-	"ext":        "Coco Cart",
+	# "ext":        "Coco Cart",
+	"ext":        "Expansion",
 	"floppy0":    "Floppy 1",
 	"floppy1":    "Floppy 2",
 	"floppy2":    "Floppy 3",
 	"floppy3":    "Floppy 4",
 }
+
+

python/mkmachines.py

@@ -45,6 +45,7 @@ import mame
 #
 
 
+
 # don't allow these for now. generally because they add floppy/hard drives
 # but don't work with normal disk images
 DISABLED = set((
@@ -315,9 +316,11 @@ DEVICE_MEDIA = {
 	'hdd': 'hard',
 	'harddisk': 'hard',
 	'525': 'floppy_5_25',
-	'35hd': 'floppy_3_5',
 	'35dd': 'floppy_3_5',
+	'35ed': 'floppy_3_5',
+	'35hd': 'floppy_3_5',
 	'35sd': 'floppy_3_5',
+	'35ssdd': 'floppy_3_5',
 	'midiin': 'midiin',
 	'midiout': 'midiout',
 	'aplcdsc': 'cdrom',
@@ -339,7 +342,11 @@ DEVICE_MEDIA = {
 	"8sssd": "floppy_8",
 
 	# trs dragon32, etc
-	"qd": "floppy_5_25"
+	"qd": "floppy_5_25",
+
+	# oric, amstrad, sinclair, etc, used a 3" disk. We'll round up.
+	"3dsdd": "floppy_3_5",
+	"3ssdd": "floppy_3_5",
 
 }
 

python/mkmodels.py

@@ -54,6 +54,10 @@ tandy_children = [
 	"dragon32", "dragon64", "d64plus", "dragon200", "dragon200e", "tanodr64",
 ]
 
+oric_children = [
+	"oric1", "orica", "prav8d", "telstrat",
+]
+
 
 amiga_children = ["a500", "a500n", "a1000", "a1000n", "a2000", "a2000n" ]
 
@@ -90,7 +94,8 @@ TREE = [
 	("Macintosh (Quadra)", None, mac_quadra_children),
 	("Macintosh (LC)", None, mac_lc_children),
 	("Atari ST", "st", atari_st_children),
-	("Tandy", None, tandy_children)
+	("Oric", None, oric_children),
+	("Tandy", None, tandy_children),
 ]
 
 TREE_EXTRA = TREE + [