Merge remote-tracking branch 'upstream/master'

Author: Robbbert

hash/videopac.xml

@@ -23,8 +23,6 @@ Undumped (or dumped but not public):
 
 Protos:
 - Catburglar (youtube.com/watch?v=DDsWDFxy0oE)
-- Spaans (Spanish to Dutch translator)
-- Melrep
 - Crazy Horses
 
 http://www.ozyr.com/rene/PICS/protos.jpg
@@ -57,7 +55,6 @@ http://www.ozyr.com/rene/PICS/odyssey3_set.jpg
 There is an Odyssey³ Command Center Voice Module, could be differences to released Odyssey² version.
 
 Do Videopac+/Odyssey3 versions exist?:
-- Syracuse (France)
 - Robot City (USA)
 - Interpol (USA)
 
@@ -834,7 +831,7 @@ distinguished by the changed copyright from Magnavox to N.A.P. (North American P
 		</part>
 	</software>
 
-	<software name="volley" supported="partial">
+	<software name="volley">
 		<description>Electronic Volleyball (Europe, USA)</description>
 		<year>1979</year>
 		<publisher>Philips</publisher>
@@ -849,7 +846,7 @@ distinguished by the changed copyright from Magnavox to N.A.P. (North American P
 		</part>
 	</software>
 
-	<software name="volleyf" cloneof="volley" supported="partial">
+	<software name="volleyf" cloneof="volley">
 		<description>Volleyball (France)</description>
 		<year>1979</year>
 		<publisher>Radiola</publisher>
@@ -2060,6 +2057,18 @@ distinguished by the changed copyright from Magnavox to N.A.P. (North American P
 		</part>
 	</software>
 
+	<software name="melrep">
+		<description>Melrep (Europe, prototype)</description>
+		<year>198?</year>
+		<publisher>Philips</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="0x800">
+				<rom name="pr_melrep.bin" size="0x800" crc="37b7b748" sha1="050a9aaa8877b0ff652ebbed72e11a36b085e9fa" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="pinball">
 		<!-- re-released at Classic Games Expo (2004 in Philadelphia) with Ralph Baer's autograph (as he was the designer) -->
 		<description>Pinball! (USA, prototype)</description>
@@ -2138,6 +2147,18 @@ distinguished by the changed copyright from Magnavox to N.A.P. (North American P
 		</part>
 	</software>
 
+	<software name="spaans">
+		<description>Spaans (Europe, prototype)</description>
+		<year>198?</year>
+		<publisher>Philips</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="0x800">
+				<rom name="pr_spaans.bin" size="0x800" crc="5e70dd5c" sha1="ef1a9dbe458a76946e1e898ef49174becace6e1e" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="spider">
 		<description>Spider-Man (Europe, prototype, set 1)</description>
 		<year>198?</year>
@@ -2542,6 +2563,18 @@ distinguished by the changed copyright from Magnavox to N.A.P. (North American P
 		</part>
 	</software>
 
+	<software name="syracusepl" cloneof="syracuse">
+		<description>Syracuse (France, plus, prototype)</description>
+		<year>198?</year>
+		<publisher>Brandt</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="0x2000">
+				<rom name="pr_syracusepl.bin" size="0x2000" crc="38269d8b" sha1="f57d17a9b5f8346ab67f6c46f82b4e8c70c80c9e" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="hawks" cloneof="timelord">
 		<description>Terrahawks (Europe, plus)</description>
 		<year>198?</year>

scripts/src/cpu.lua

@@ -2000,6 +2000,8 @@ if CPUS["M6805"] then
 		MAME_DIR .. "src/devices/cpu/m6805/m6805.h",
 		MAME_DIR .. "src/devices/cpu/m6805/m6805defs.h",
 		MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx",
+		MAME_DIR .. "src/devices/cpu/m6805/hd6305.cpp",
+		MAME_DIR .. "src/devices/cpu/m6805/hd6305.h",
 		MAME_DIR .. "src/devices/cpu/m6805/m68705.cpp",
 		MAME_DIR .. "src/devices/cpu/m6805/m68705.h",
 		MAME_DIR .. "src/devices/cpu/m6805/m68hc05.cpp",

scripts/target/mame/tiny.lua

@@ -154,12 +154,12 @@ files{
 	MAME_DIR .. "src/mame/shared/s11c_bg.h",
 	MAME_DIR .. "src/mame/shared/williamssound.cpp",
 	MAME_DIR .. "src/mame/shared/williamssound.h",
-	MAME_DIR .. "src/mame/midway/williamsblitter.cpp",
-	MAME_DIR .. "src/mame/midway/williamsblitter.h",
 	MAME_DIR .. "src/mame/midway/williams.cpp",
 	MAME_DIR .. "src/mame/midway/williams.h",
 	MAME_DIR .. "src/mame/midway/williams_m.cpp",
 	MAME_DIR .. "src/mame/midway/williams_v.cpp",
+	MAME_DIR .. "src/mame/midway/williamsblitter.cpp",
+	MAME_DIR .. "src/mame/midway/williamsblitter.h",
 	MAME_DIR .. "src/mame/gaelco/gaelco.cpp",
 	MAME_DIR .. "src/mame/gaelco/gaelco.h",
 	MAME_DIR .. "src/mame/gaelco/gaelco_v.cpp",