Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/devices/imagedev/floppy.cpp

hash/bml3_flop.xml

@@ -3,7 +3,7 @@
 <!--
 license:CC0-1.0
 
-Compaibility flags:
+Compatibility flags:
 3: needs MP1805 fdc
 5: needs MP1802 fdc
 
@@ -40,20 +40,20 @@ Compaibility flags:
 		</part>
 	</software>
 
-	<software name="ma5370" supported="no"><!-- mame crashes in the floppy subsystem -->
-		<description>MA5370</description>
+	<software name="ma5370">
+		<description>MA-5370 Disk BASIC (Version 1.1)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<sharedfeat name="compatibility" value="3" />
 		<part name="disk" interface="floppy_3">
 			<dataarea name="flop" size="0x2d2b0">
-				<rom name="ma5370.d88" size="0x2d2b0" crc="04bfeb8a" sha1="e273c53286144d2cbdc1a9616945bf2c2f5267d5" />
+				<rom name="ma5370.d88" size="0x2d2b0" crc="ebbd9f99" sha1="052d942af0d5ae97a838f4df96a4d6cf10cc7553" status="baddump" /><!-- all tracks hacked to single density -->
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="dbu">
-		<description>Disk Basic and Utilities</description>
+		<description>Disk BASIC and Utilities</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<sharedfeat name="compatibility" value="5" />

hash/lk3000.xml

@@ -25,6 +25,7 @@ LK-3100: English-Polish
 LK-3110: English-Portuguese
 LK-3120: English-Russian
 LK-3130: English-Greek
+LK-3160: English-Japanese
 LK-3200: English-Spanish-French-German-Italian-Greek
 LK-3500: Electronic Notebook
 LK-3900: Calculator
@@ -33,12 +34,11 @@ unreleased?:
 
 LK-3140: English-Arabic
 LK-3150: English-Hebrew
-LK-3160: English-Japanese
 LK-3170: English-Chinese
 
 -->
 
-<softwarelist name="lk3000" description="LK-3000 Cartridges">
+<softwarelist name="lk3000" description="LK-3000 cartridges">
 
 	<software name="calc">
 		<description>Calculator</description>

hash/supracan.xml

@@ -9,9 +9,9 @@ license:CC0-1.0
 		<year>1995</year>
 		<publisher>AV Artisan Corp.</publisher>
 		<notes><![CDATA[
-Gameplay logic falls apart once either side attacks (side becomes unresponsive, pieces stop moving, collision won't work etc.)
-[video] priority issue on versus presentation screen
-[video] layer 0 won't show left side character, scrollx = 0x0080
+[video] intro uses circular clipping effect
+[video] layer 0 won't show left side character, scrollx = 0x0080 + global flip x
+[video] wrong tilemap paging for layer 1 on game over
 ]]></notes>
 		<info name="serial" value="F001" />
 		<info name="alt_title" value="福爾摩沙大對決" />
@@ -29,8 +29,11 @@ Gameplay logic falls apart once either side attacks (side becomes unresponsive,
 		<notes><![CDATA[
 [video] sprites may need buffering (noticeable on gameplay jumps)
 [video] intro raster effect is slightly off (btanb)
+[irq 5] 2nd fighter stage used with global flip y + mosaic (lake effect)
+[video] enables clipping effect during ending and credits
 ]]></notes>
 		<info name="serial" value="F002" />
+		<info name="alt_title" value="三國志 武將爭霸" />
 		<part name="cart" interface="supracan_cart">
 			<dataarea name="rom" width="16" endianness="big" size="3145728">
 				<rom loadflag="load16_word_swap" name="sangofgt.bin" size="3145728" crc="a4de6dde" sha1="f4bed63775130a75eb9c50b32e0cf50d1a7b8f50" offset="0" />
@@ -44,12 +47,14 @@ Gameplay logic falls apart once either side attacks (side becomes unresponsive,
 		<publisher>Funtech</publisher>
 		<notes><![CDATA[
 Uses [video] blending during attract and title screen
-Broken [video] ROZ during intro
-Broken [video] sprites during gameplay
+Wrong [video] ROZ paging for title screen
+Broken [video] during intro, uses bitmap mode
+[video] uses per-tile priority during gameplay
 ]]></notes>
 		<info name="serial" value="F003" />
 		<info name="alt_title" value="邪惡之子" />
 		<part name="cart" interface="supracan_cart">
+			<!-- TODO: sram -->
 			<dataarea name="rom" width="16" endianness="big" size="2097152">
 				<rom loadflag="load16_word_swap" name="16005.cu5" size="2097152" crc="9f6119a7" sha1="67ae9e7f99e1c3054ea54d53dbbba7792ef45134" offset="0" />
 			</dataarea>
@@ -63,7 +68,7 @@ Broken [video] sprites during gameplay
 		<notes><![CDATA[
 [video] intro should sprite clip against active display area.
 [video] title animation blanks some sprites.
-[video] concealed layer 0 priority during gameplay, and several tiles have wrong colors.
+[video] uses per-tile priority during gameplay
 ]]></notes>
 		<info name="serial" value="F004" />
 		<info name="alt_title" value="音速飛龍" />
@@ -79,13 +84,12 @@ Broken [video] sprites during gameplay
 		<year>1995</year>
 		<publisher>C&amp;E Soft</publisher>
 		<notes><![CDATA[
-Unresponsive [joy] inputs
-[video] garbage tiles during attract demo (cleares some after upper 1st inning)
-[video] ROZ is misaligned
+[video] ROZ is misaligned during intro, and initially concealed
 ]]></notes>
 		<info name="serial" value="F005" />
 		<info name="alt_title" value="超級中華職棒聯盟" />
 		<part name="cart" interface="supracan_cart">
+			<!-- TODO: sram -->
 			<dataarea name="rom" width="16" endianness="big" size="2097152">
 				<rom loadflag="load16_word_swap" name="16005.0" size="2097152" crc="ccf6829b" sha1="17a413803d8749fbe9643ca56d703afd64569b9f" offset="0" />
 			</dataarea>
@@ -96,6 +100,9 @@ Unresponsive [joy] inputs
 		<description>Journey to the Laugh ~ Xi You Ji</description>
 		<year>1995</year>
 		<publisher>Funtech</publisher>
+		<notes><![CDATA[
+Can potentially hang, [maincpu] tight loops for $e80300 bit 7 high
+]]></notes>
 		<info name="serial" value="F006" />
 		<info name="alt_title" value="嘻遊記" />
 		<part name="cart" interface="supracan_cart">
@@ -110,13 +117,13 @@ Unresponsive [joy] inputs
 		<year>1996</year>
 		<publisher>Kingformation</publisher>
 		<notes><![CDATA[
-Wrong [video] layer 1 priority and colors during intro
-[video] text layer is concealed and sprites are cutoff at character select
-[video] layer 0 draws garbage, should use 8bpp region
+[video] sprites are cutoff at character select
+[video] wrong position for text markers in load game screens
 ]]></notes>
 		<info name="serial" value="F007" />
 		<info name="alt_title" value="超級光明戰史" />
 		<part name="cart" interface="supracan_cart">
+			<!-- TODO: sram -->
 			<dataarea name="rom" width="16" endianness="big" size="3145728">
 				<rom loadflag="load16_word_swap" name="16007.0" size="2097152" crc="56c1c3fb" sha1="249e2ad6d8d40ecd31eda5a1bd5e5d0f47174a27" offset="000000" />
 				<rom loadflag="load16_word_swap" name="08007.1" size="1048576" crc="fc79f05f" sha1="7ce2e23ea3fd25764935708be4d47bf1a9843938" offset="0x200000" />
@@ -131,6 +138,7 @@ Wrong [video] layer 1 priority and colors during intro
 		<info name="serial" value="F008" />
 		<info name="alt_title" value="非洲探險" />
 		<part name="cart" interface="supracan_cart">
+			<!-- TODO: sram -->
 			<dataarea name="rom" width="16" endianness="big" size="1048576">
 				<rom loadflag="load16_word_swap" name="08003.bin" size="1048576" crc="dc3b7b84" sha1="6dcbd7923203da7892915595d65ee668afbf0339" offset="0" />
 			</dataarea>
@@ -142,8 +150,9 @@ Wrong [video] layer 1 priority and colors during intro
 		<year>1996</year>
 		<publisher>Funtech</publisher>
 		<notes><![CDATA[
-Missing [video] a sprites row cloud strip during intro
-Too fast in gameplay, controls [irq 3] as FRC
+[video] intro has a glitchy cloud row strip
+[video] intro shows some vertical strips of garbage when title screen dragon appears
+Erratic gameplay speed, controls [irq 3] as FRC, can potentially hang
 ]]></notes>
 		<info name="serial" value="F009" />
 		<info name="alt_title" value="賭霸" />
@@ -156,15 +165,13 @@ Too fast in gameplay, controls [irq 3] as FRC
 
 	<software name="magipool" supported="no">
 		<description>Magical Pool ~ Mo Bang Zhuang Qiu</description>
-		<year>199?</year>
+		<year>1996</year>
 		<publisher>Funtech</publisher>
 		<notes><![CDATA[
-Crashes after few seconds in attract, controls [irq 3] as FRC
-[video] should blend white, and use layer 1 as masking effect (sprites goes under it)
-[video] game select has missing table layer
+Erratic gameplay speed, controls [irq 3] as FRC
+[video] use layer 1 as clipping effect (sprites goes under it)
 [video] character select has misaligned sprites
-[video] gameplay has corrupted sprite markers
-[video] gameplay has wrong priority for layer 1
+[video] billiard cue sprite cut off left side (should wraparound)
 ]]></notes>
 		<info name="serial" value="F010" />
 		<info name="alt_title" value="魔棒撞球" />
@@ -179,6 +186,10 @@ Crashes after few seconds in attract, controls [irq 3] as FRC
 		<description>Boom Zoo ~ Bao Bao Dong Wu Yuan</description>
 		<year>1996</year>
 		<publisher>Funtech</publisher>
+		<notes><![CDATA[
+Uses [video] clipping for layer 1 during intro
+]]></notes>
+
 		<info name="serial" value="F011" />
 		<info name="alt_title" value="爆爆動物園" />
 		<part name="cart" interface="supracan_cart">

src/devices/bus/bml3/bml3mp1805.cpp

@@ -5,8 +5,7 @@
     bml3mp1805.c
 
     Hitachi MP-1805 floppy disk controller card for the MB-6890
-    Floppy drive is attached
-    TODO: make sure disk can be read
+    Floppy drive is attached (single-sided, single density)
 
 *********************************************************************/
 
@@ -32,11 +31,9 @@ ROM_START( mp1805 )
 	ROM_LOAD( "mp1805.rom", 0x000, 0x800, BAD_DUMP CRC(b532d8d9) SHA1(6f1160356d5bf64b5926b1fdb60db414edf65f22))
 ROM_END
 
-// Although the drive is single-sided, D88 images are double-sided,
-//  so we need to allocate enough space or MAME will crash.
 void bml3bus_mp1805_device::floppy_drives(device_slot_interface &device)
 {
-	device.option_add("mb_6890", FLOPPY_3_DSDD);
+	device.option_add("mb_6890", FLOPPY_3_SSSD);
 }
 
 

src/devices/bus/s100/vectordualmode.cpp

@@ -334,7 +334,7 @@ void s100_vector_dualmode_device::device_reset()
 
 static void vector4_floppies(device_slot_interface &device)
 {
-	device.option_add("525", FLOPPY_525_QD16);
+	device.option_add("525", FLOPPY_525_QD);
 }
 
 static void vector4_formats(format_registration &fr)
@@ -346,9 +346,13 @@ static void vector4_formats(format_registration &fr)
 void s100_vector_dualmode_device::device_add_mconfig(machine_config &config)
 {
 	FLOPPY_CONNECTOR(config, m_floppy[0], vector4_floppies, "525", vector4_formats).enable_sound(true);
+	m_floppy[0]->set_sectoring_type(floppy_image::H16);
 	FLOPPY_CONNECTOR(config, m_floppy[1], vector4_floppies, "525", vector4_formats).enable_sound(true);
+	m_floppy[1]->set_sectoring_type(floppy_image::H16);
 	FLOPPY_CONNECTOR(config, m_floppy[2], vector4_floppies, "525", vector4_formats).enable_sound(true);
+	m_floppy[2]->set_sectoring_type(floppy_image::H16);
 	FLOPPY_CONNECTOR(config, m_floppy[3], vector4_floppies, "525", vector4_formats).enable_sound(true);
+	m_floppy[3]->set_sectoring_type(floppy_image::H16);
 }
 
 DEFINE_DEVICE_TYPE(S100_VECTOR_DUALMODE, s100_vector_dualmode_device, "vectordualmode", "Vector Dual-Mode Disk Controller")

src/devices/cpu/h8/h8.h

@@ -24,6 +24,28 @@ class h8_device;
 
 class h8_device : public cpu_device, public device_nvram_interface {
 public:
+	enum {
+		H8_PC = 1,
+		H8_R0,
+		H8_R1,
+		H8_R2,
+		H8_R3,
+		H8_R4,
+		H8_R5,
+		H8_R6,
+		H8_R7,
+		H8_E0,
+		H8_E1,
+		H8_E2,
+		H8_E3,
+		H8_E4,
+		H8_E5,
+		H8_E6,
+		H8_E7,
+		H8_CCR,
+		H8_EXR
+	};
+
 	enum {
 		STATE_RESET              = 0x10000,
 		STATE_IRQ                = 0x10001,
@@ -438,26 +460,4 @@ class h8_device : public cpu_device, public device_nvram_interface {
 #undef O
 };
 
-enum {
-	H8_PC = 1,
-	H8_R0,
-	H8_R1,
-	H8_R2,
-	H8_R3,
-	H8_R4,
-	H8_R5,
-	H8_R6,
-	H8_R7,
-	H8_E0,
-	H8_E1,
-	H8_E2,
-	H8_E3,
-	H8_E4,
-	H8_E5,
-	H8_E6,
-	H8_E7,
-	H8_CCR,
-	H8_EXR
-};
-
 #endif // MAME_CPU_H8_H8_H

src/devices/cpu/hmcs40/hmcs40.cpp

@@ -572,7 +572,7 @@ void hmcs40_cpu_device::execute_run()
 		// handle opcode
 		switch (m_op)
 		{
-			/* 0x000 */
+			// 0x000
 
 			case 0x000: case 0x001: case 0x002: case 0x003:
 				op_xsp(); break;
@@ -647,7 +647,7 @@ void hmcs40_cpu_device::execute_run()
 				op_xamr(); break;
 
 
-			/* 0x100 */
+			// 0x100
 
 			case 0x110: case 0x111:
 				op_lmaiy(); break;
@@ -695,7 +695,7 @@ void hmcs40_cpu_device::execute_run()
 				op_br(); break;
 
 
-			/* 0x200 */
+			// 0x200
 
 			case 0x200: case 0x201: case 0x202: case 0x203:
 				op_tm(); break;
@@ -763,7 +763,8 @@ void hmcs40_cpu_device::execute_run()
 				op_lrb(); break;
 
 
-			/* 0x300 */
+			// 0x300
+
 			case 0x320:
 				op_comb(); break;
 			case 0x324:
@@ -797,6 +798,6 @@ void hmcs40_cpu_device::execute_run()
 
 			default:
 				op_illegal(); break;
-		} /* big switch */
+		} // big switch
 	}
 }