diff --git a/.gitattributes b/.gitattributes
index 5553f1c11e8..7e3dfdf0753 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4244,15 +4244,13 @@ src/mame/layout/armora.lay svneol=native#text/plain
src/mame/layout/atarifb.lay svneol=native#text/plain
src/mame/layout/atarifb4.lay svneol=native#text/plain
src/mame/layout/avalnche.lay svneol=native#text/plain
-src/mame/layout/awpdmd.lay svneol=native#text/plain
-src/mame/layout/awpvid14.lay svneol=native#text/plain
-src/mame/layout/awpvid16.lay svneol=native#text/plain
src/mame/layout/babydad.lay svneol=native#text/plain
src/mame/layout/babypkr.lay svneol=native#text/plain
src/mame/layout/beaminv.lay svneol=native#text/plain
src/mame/layout/bfm_sc1.lay svneol=native#text/plain
src/mame/layout/bfm_sc2.lay svneol=native#text/plain
src/mame/layout/bfm_sc4.lay svneol=native#text/native
+src/mame/layout/bfmsys85.lay svneol=native#text/plain
src/mame/layout/bigdeal.lay svneol=native#text/plain
src/mame/layout/bingowng.lay svneol=native#text/plain
src/mame/layout/blckjack.lay svneol=native#text/plain
@@ -4320,6 +4318,11 @@ src/mame/layout/invaders.lay svneol=native#text/plain
src/mame/layout/invrvnge.lay svneol=native#text/plain
src/mame/layout/jankenmn.lay svneol=native#text/plain
src/mame/layout/jollycrd.lay svneol=native#text/plain
+src/mame/layout/jpmimpct.lay svneol=native#text/plain
+src/mame/layout/jpmmps.lay svneol=native#text/plain
+src/mame/layout/jpms80.lay svneol=native#text/plain
+src/mame/layout/jpmsru.lay svneol=native#text/plain
+src/mame/layout/jpmsys5.lay svneol=native#text/plain
src/mame/layout/kas89.lay svneol=native#text/plain
src/mame/layout/kgbird.lay svneol=native#text/plain
src/mame/layout/kingdrby.lay svneol=native#text/plain
@@ -4332,11 +4335,13 @@ src/mame/layout/lucky8.lay svneol=native#text/plain
src/mame/layout/luckyrlt.lay svneol=native#text/plain
src/mame/layout/majorpkr.lay svneol=native#text/plain
src/mame/layout/maxaflex.lay svneol=native#text/plain
+src/mame/layout/maygay1b.lay svneol=native#text/plain
src/mame/layout/mdrawpkr.lay svneol=native#text/plain
src/mame/layout/megacd.lay svneol=native#text/plain
src/mame/layout/meybjack.lay svneol=native#text/plain
src/mame/layout/mil4000.lay svneol=native#text/plain
src/mame/layout/mpoker.lay svneol=native#text/plain
+src/mame/layout/mpu3.lay svneol=native#text/plain
src/mame/layout/mpu4.lay svneol=native#text/plain
src/mame/layout/mpu4ext.lay svneol=native#text/plain
src/mame/layout/mpu4plasma.lay svneol=native#text/plain
@@ -4365,6 +4370,7 @@ src/mame/layout/pmroulet.lay -text svneol=native#plain/text
src/mame/layout/poker41.lay svneol=native#text/plain
src/mame/layout/pokio.lay svneol=native#text/plain
src/mame/layout/polepos.lay svneol=native#text/plain
+src/mame/layout/proconn.lay svneol=native#text/plain
src/mame/layout/pulltabs.lay svneol=native#text/plain
src/mame/layout/pyramid.lay svneol=native#text/plain
src/mame/layout/quintoon.lay svneol=native#text/plain
@@ -4379,6 +4385,7 @@ src/mame/layout/rowamet.lay svneol=native#text/plain
src/mame/layout/royalcrd.lay svneol=native#text/plain
src/mame/layout/saiyukip.lay svneol=native#text/plain
src/mame/layout/sbrkout.lay svneol=native#text/plain
+src/mame/layout/sc2_dmd.lay svneol=native#text/plain
src/mame/layout/sc4_dmd.lay svneol=native#text/plain
src/mame/layout/sderby.lay svneol=native#text/plain
src/mame/layout/sgsafari.lay svneol=native#text/plain
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index a25126b830d..3f251b07a9b 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -99,7 +99,6 @@ Optional (on expansion card) (Viper)
#include "machine/bfm_comn.h"
#include "bfm_sc1.lh"
-
class bfm_sc1_state : public driver_device
{
public:
@@ -1104,7 +1103,7 @@ static MACHINE_CONFIG_START( scorpion1, bfm_sc1_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEFAULT_LAYOUT(layout_awpvid14)
+ MCFG_DEFAULT_LAYOUT(layout_bfm_sc1)
MACHINE_CONFIG_END
/////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 0a69e2ccd9b..cfac3fa6354 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -167,10 +167,8 @@ Adder hardware:
/* fruit machines only */
#include "video/bfm_dm01.h"
-#include "awpdmd.lh"
+#include "sc2_dmd.lh"
#include "drwho.lh"
-#include "awpvid14.lh"
-#include "awpvid16.lh"
#include "machine/bfm_comn.h"
@@ -3722,7 +3720,7 @@ static MACHINE_CONFIG_START( scorpion2, bfm_sc2_state )
MCFG_NVRAM_HANDLER(bfm_sc2)
/* video hardware */
- MCFG_DEFAULT_LAYOUT(layout_awpvid14)
+ MCFG_DEFAULT_LAYOUT(layout_bfm_sc2)
MACHINE_CONFIG_END
@@ -3754,7 +3752,7 @@ static MACHINE_CONFIG_START( scorpion2_dm01, bfm_sc2_state )
MCFG_NVRAM_HANDLER(bfm_sc2)
/* video hardware */
- MCFG_DEFAULT_LAYOUT(layout_awpdmd)
+ MCFG_DEFAULT_LAYOUT(layout_sc2_dmd)
MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap)
MCFG_CPU_PERIODIC_INT(bfm_dm01_vbl, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index 43b54368b2f..3d75f969a20 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -2,9 +2,6 @@
Bellfruit system85 driver, (under heavy construction !!!)
- M.A.M.E Core Copyright Nicola Salmoria and the MAME Team,
- used under license from http://mamedev.org
-
******************************************************************************************
@@ -68,6 +65,8 @@ ___________________________________________________________________________
#include "machine/nvram.h"
#include "machine/bfm_comn.h"
+#include "bfmsys85.lh"
+
class bfmsys85_state : public driver_device
{
public:
@@ -115,11 +114,6 @@ public:
INTERRUPT_GEN_MEMBER(timer_irq);
};
-
-#define VFD_RESET 0x20
-#define VFD_CLOCK1 0x80
-#define VFD_DATA 0x40
-
#define MASTER_CLOCK (XTAL_4MHz)
///////////////////////////////////////////////////////////////////////////
@@ -262,17 +256,18 @@ READ8_MEMBER(bfmsys85_state::mmtr_r)
WRITE8_MEMBER(bfmsys85_state::vfd_w)
{
+//reset 0x20, clock 0x80, data 0x40
- if (data & VFD_RESET)//inverted?
+ if (data & 0x20)//inverted?
{
- if (m_alpha_clock != (data & VFD_CLOCK1))
+ if (m_alpha_clock != (data & 0x80))
{
if (m_alpha_clock)//rising edge
{
- m_vfd->shift_data(data & VFD_DATA?1:0);
+ m_vfd->shift_data(data & 0x40?1:0);
}
}
- m_alpha_clock = (data & VFD_CLOCK1);
+ m_alpha_clock = (data & 0x80);
}
else
{
@@ -429,7 +424,7 @@ static MACHINE_CONFIG_START( bfmsys85, bfmsys85_state )
MCFG_NVRAM_ADD_0FILL("nvram") // load/save nv RAM
- MCFG_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_bfmsys85)
MACHINE_CONFIG_END
// input ports for system85 board /////////////////////////////////////////
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 2724d5203e3..a4950888911 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -93,6 +93,7 @@
#include "includes/jpmimpct.h"
#include "machine/meters.h"
#include "machine/nvram.h"
+#include "jpmimpct.lh"
/*************************************
*
@@ -1383,7 +1384,7 @@ static MACHINE_CONFIG_START( impctawp, jpmimpct_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_jpmimpct)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/jpmmps.c b/src/mame/drivers/jpmmps.c
index b6d3ff19b97..8eacd533c6a 100644
--- a/src/mame/drivers/jpmmps.c
+++ b/src/mame/drivers/jpmmps.c
@@ -662,7 +662,7 @@ ROM_END
ROM_START( j2hotpot )
ROM_REGION( 0x10000, "maincpu", 0 )
- ROM_LOAD( "hpv7-1.p1", 0x0000, 0x2000, CRC(bb43d2fa) SHA1(23a3fd7cf49fb4540467dc695973f943c6d659c7) )
+ ROM_LOAD( "hpv7-1.p1", 0x0000, 0x2000, CRC(bb43d2fa) SHA1(23a3fd7cf49fb4540467dc695973f943c6d659c7) )//3gbp token, v7.1
ROM_LOAD( "hpv7-2.p2", 0x2000, 0x2000, CRC(a3e59d08) SHA1(1f9872cfdc80216972fe071603bafb7caaf81bc8) )
ROM_LOAD( "hpv7-3.p3", 0x4000, 0x2000, CRC(1413c369) SHA1(e6d72ab545c74ee3cf8645f8719a798caa4d0f88) )
@@ -740,7 +740,7 @@ ROM_END
-ROM_START( j2litean )
+ROM_START( j2litean )//MPS2
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "lite_a_nudge_mk3_3_1.bin", 0x0000, 0x8000, CRC(2e4f176a) SHA1(c369ab233b4892a65fa885906bb52585c178aa1b) )
ROM_LOAD( "lite_a_nudge_mk3_3_2.bin", 0x8000, 0x8000, CRC(f427b39d) SHA1(24907b2c7936f178db183796543e338b7206c107) )
@@ -809,7 +809,7 @@ ROM_START( j2mongam )
ROM_LOAD( "mongam63.bin", 0x4000, 0x4000, CRC(4a8d11a0) SHA1(fe7e00cfb10d83d9f521cf6dcd27d51a561af916) )
ROM_REGION( 0x10000, "altrevs", 0 ) /* split later */
- // something else?
+ // something else? TTX dumps this as the MPS set
ROM_LOAD( "moneygame3.1.bin", 0x0000, 0x2000, CRC(14734a7e) SHA1(84bcfaaa3f59d8ef2acefe399b48f258e507f20a) )
ROM_LOAD( "moneygame3.2.bin", 0x0000, 0x2000, CRC(6c7ce60c) SHA1(c775925efbb44963d57aea5719d9a3aba181ab71) )
ROM_LOAD( "moneygame3.3.bin", 0x0000, 0x4000, CRC(1303e942) SHA1(3e9436408375c7ca0f636f9eb92bec48e3d1d05c) )
@@ -1450,7 +1450,7 @@ ROM_END
-ROM_START( j2montrp )
+ROM_START( j2montrp )//PCP conversion of Bank Raid cabinet
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "mtrap_p1.bin", 0x0000, 0x2000, CRC(8ae769ee) SHA1(ce738d817c040e3d2563c1a0af0f416aef12d465) )
ROM_LOAD( "mtrap_p2.bin", 0x2000, 0x2000, CRC(97861334) SHA1(05b63738884357ce91fb5dc9872ef3bc105b255c) )
diff --git a/src/mame/drivers/jpms80.c b/src/mame/drivers/jpms80.c
index efb3a25a256..125a950a819 100644
--- a/src/mame/drivers/jpms80.c
+++ b/src/mame/drivers/jpms80.c
@@ -1,4 +1,4 @@
-/* JPM MPS1/2 Hardware
+/* JPM System 80 Hardware
TMS9995 CPU
@@ -115,6 +115,12 @@ ROM_START( j80bac )
ROM_LOAD( "bankacoinp3.bin", 0x2000, 0x1000, CRC(0c3b2954) SHA1(4342a2a047496caf8569d4519dd8daad47e634e3) )
ROM_END
+ROM_START( j80blbnk )
+ ROM_REGION( 0x10000, "maincpu", 0 )
+ ROM_LOAD( "blankity-bank-p1.bin", 0x0000, 0x1000, CRC(8b2aeca6) SHA1(207db63d5130cb7a8eb9be41d116432f7b7728b0) )
+ ROM_LOAD( "blankity-bank-p2.bin", 0x1000, 0x1000, CRC(561262da) SHA1(d1f3e7815c5ea3ba7c26ed3b95a16c802f6af50f) )
+ ROM_LOAD( "blankity-bank-p3.bin", 0x2000, 0x1000, CRC(39925035) SHA1(0af8c8f8074c4873581250474d59d715178cded4) )
+ROM_END
ROM_START( j80bounc )
@@ -296,6 +302,9 @@ GAME(198?, j80topsp ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top
GAME(198?, j80topup ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top Up (JPM) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL )
GAME(198?, j80tumbl ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Tumble (JPM) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL )
GAME(198?, j80wsprt ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL )
+
+GAME(198?, j80blbnk ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "PCP","Blankity Bank (PCP) (SYSTEM80)", GAME_IS_SKELETON_MECHANICAL )
+
// these look like they're probably SYSTEM80, not 100% sure tho
GAME(198?, j80alad ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Aladdin's Cave (PCP)", GAME_IS_SKELETON_MECHANICAL )
GAME(198?, j80fortr ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Fortune Trail (JPM)", GAME_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/jpmsru.c b/src/mame/drivers/jpmsru.c
index 5809d0024b3..f1bcdeafbdc 100644
--- a/src/mame/drivers/jpmsru.c
+++ b/src/mame/drivers/jpmsru.c
@@ -34,7 +34,7 @@ public:
};
// blind guess
-#define MAIN_CLOCK 2000000
+#define MAIN_CLOCK 6000000
/* System with RAM at 0x0c00 */
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index a719f7c595e..11f0c3f0605 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -12,10 +12,10 @@
* Monopoly Deluxe
Known Issues:
- * Artwork support is needed as the monitor bezel illuminates
- to indicate progress through the games.
- * Features used by the AWP games such as lamps, reels and
- meters are not emulated.
+ * Some features used by the AWP games such as reels and meters
+ are not emulated.
+ * Timing for reels, and other opto devices is controlled by the same clock
+ as the lamps, in a weird daisychain setup.
AWP game notes:
The byte at 0x81 of the EVEN 68k rom appears to be some kind of
@@ -40,6 +40,7 @@
#include "machine/steppers.h"
#include "machine/roc10937.h"
+#include "jpmsys5.lh"
enum state { IDLE, START, DATA, STOP1, STOP2 };
@@ -97,6 +98,8 @@ public:
DECLARE_READ_LINE_MEMBER(a2_rx_r);
DECLARE_WRITE_LINE_MEMBER(a2_tx_w);
DECLARE_READ_LINE_MEMBER(a2_dcd_r);
+ DECLARE_READ16_MEMBER(mux_awp_r);
+ DECLARE_READ16_MEMBER(coins_awp_r);
void sys5_draw_lamps();
DECLARE_MACHINE_START(jpmsys5v);
DECLARE_MACHINE_RESET(jpmsys5v);
@@ -743,7 +746,36 @@ static MACHINE_CONFIG_START( jpmsys5v, jpmsys5_state )
MCFG_PTM6840_ADD("6840ptm", ptm_intf)
MACHINE_CONFIG_END
+READ16_MEMBER(jpmsys5_state::mux_awp_r)
+{
+ static const char *const portnames[] = { "DSW", "DSW2", "ROTARY", "STROBE0", "STROBE1", "STROBE2", "STROBE3", "STROBE4" };
+ if ((offset >0x7f) && (offset <0x8f))
+ {
+ return ioport(portnames[( (offset - 0x80) >>1)])->read();
+ }
+ else
+ {
+ return 0xffff;
+ }
+}
+
+READ16_MEMBER(jpmsys5_state::coins_awp_r)
+{
+ switch (offset)
+ {
+ case 2:
+ {
+ return ioport("COINS")->read() << 8;
+ }
+ break;
+ default:
+ {
+ logerror("coins read offset: %x",offset);
+ return 0xffff;
+ }
+ }
+}
static ADDRESS_MAP_START( 68000_awp_map, AS_PROGRAM, 16, jpmsys5_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
@@ -803,6 +835,28 @@ static INPUT_PORTS_START( popeye )
PORT_DIPSETTING( 0x40, "40%" )
PORT_DIPSETTING( 0xc0, "30%" )
+ PORT_START("DSW2")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+ PORT_START("ROTARY")//not everything has this hooked up, cna be used as a test switch internally
+ PORT_CONFNAME(0x0F, 0x0F, "Rotary Switch")
+ PORT_CONFSETTING( 0x0F, "0")
+ PORT_CONFSETTING( 0x0E, "1")
+ PORT_CONFSETTING( 0x0D, "2")
+ PORT_CONFSETTING( 0x0C, "3")
+ PORT_CONFSETTING( 0x0B, "4")
+ PORT_CONFSETTING( 0x0A, "5")
+ PORT_CONFSETTING( 0x09, "6")
+ PORT_CONFSETTING( 0x08, "7")
+ PORT_CONFSETTING( 0x06, "8")
+ PORT_CONFSETTING( 0x07, "9")
+ PORT_CONFSETTING( 0x05, "10")
+ PORT_CONFSETTING( 0x04, "11")
+ PORT_CONFSETTING( 0x03, "12")
+ PORT_CONFSETTING( 0x02, "13")
+ PORT_CONFSETTING( 0x01, "14")
+ PORT_CONFSETTING( 0x00, "15")
+
PORT_START("DIRECT")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Back door") PORT_CODE(KEYCODE_R) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Cash door") PORT_CODE(KEYCODE_T) PORT_TOGGLE
@@ -830,6 +884,23 @@ static INPUT_PORTS_START( popeye )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_NAME("100p")
PORT_BIT( 0xc3, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START("STROBE0")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+ PORT_START("STROBE1")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+ PORT_START("STROBE2")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+ PORT_START("STROBE3")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+ PORT_START("STROBE4")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+ PORT_START("STROBE5")
+ PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNKNOWN)
INPUT_PORTS_END
/*************************************
@@ -880,7 +951,7 @@ static MACHINE_CONFIG_START( jpmsys5, jpmsys5_state )
/* 6840 PTM */
MCFG_PTM6840_ADD("6840ptm", ptm_intf)
- MCFG_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_jpmsys5)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index b9d007f744b..69af4b52b5a 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -85,6 +85,8 @@
#include "sound/okim6376.h"
#include "machine/nvram.h"
+#include "maygay1b.lh"
+
#define VERBOSE 1
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
@@ -930,7 +932,7 @@ static MACHINE_CONFIG_START( m1, maygay1b_state )
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_maygay1b)
MACHINE_CONFIG_END
@@ -3017,10 +3019,9 @@ ROM_END_M1A_MCU
ROM_START( m1htclb )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_LOAD( "hitensionclubv1-2.rom", 0x0000, 0x010000, CRC(b33fa7a9) SHA1(9aa2b61bac96441a3aa9da254c54636d29a895e2) )
- ROM_LOAD( "hitensio.bin", 0x0000, 0x010000, CRC(b8c8edc9) SHA1(1f989a3a72fb7c7747fc6deeb08e06da429620ee) )
ROM_REGION( 0x20000, "altrevs", ROMREGION_ERASE00 )
- ROM_LOAD( "sc3-057.bin", 0x0000, 0x010000, CRC(b33fa7a9) SHA1(9aa2b61bac96441a3aa9da254c54636d29a895e2) )
+ ROM_LOAD( "hitensio.bin", 0x0000, 0x010000, CRC(b8c8edc9) SHA1(1f989a3a72fb7c7747fc6deeb08e06da429620ee) )
ROM_END_M1A_MCU
ROM_START( m1hotpot )
diff --git a/src/mame/drivers/mpu3.c b/src/mame/drivers/mpu3.c
index 525dc1444ae..ddb0a553f5e 100644
--- a/src/mame/drivers/mpu3.c
+++ b/src/mame/drivers/mpu3.c
@@ -93,6 +93,8 @@ TODO: - Distinguish door switches using manual
#include "machine/roc10937.h"
#include "machine/meters.h"
+#include "mpu3.lh"
+
#ifdef MAME_DEBUG
#define MPU3VERBOSE 1
#else
@@ -916,7 +918,7 @@ static MACHINE_CONFIG_START( mpu3base, mpu3_state )
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_mpu3)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c
index 0b133417a63..726d547c2f1 100644
--- a/src/mame/drivers/proconn.c
+++ b/src/mame/drivers/proconn.c
@@ -16,6 +16,8 @@
#include "video/awpvid.h"
#include "machine/roc10937.h"
+#include "proconn.lh"
+
class proconn_state : public driver_device
{
public:
@@ -379,7 +381,7 @@ static MACHINE_CONFIG_START( proconn, proconn_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_DEFAULT_LAYOUT(layout_awpvid16)
+ MCFG_DEFAULT_LAYOUT(layout_proconn)
MCFG_SOUND_ADD("aysnd", AY8910, 1000000) /* ?? Mhz */ // YM2149F on PC92?
MCFG_SOUND_CONFIG(ay8910_config)
diff --git a/src/mame/layout/bfmsys85.lay b/src/mame/layout/bfmsys85.lay
new file mode 100644
index 00000000000..94230768b93
--- /dev/null
+++ b/src/mame/layout/bfmsys85.lay
@@ -0,0 +1,530 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/awpvid16.lay b/src/mame/layout/jpmimpct.lay
similarity index 100%
rename from src/mame/layout/awpvid16.lay
rename to src/mame/layout/jpmimpct.lay
diff --git a/src/mame/layout/awpvid14.lay b/src/mame/layout/jpmmps.lay
similarity index 99%
rename from src/mame/layout/awpvid14.lay
rename to src/mame/layout/jpmmps.lay
index 063bef6fda4..2e790e23f2d 100644
--- a/src/mame/layout/awpvid14.lay
+++ b/src/mame/layout/jpmmps.lay
@@ -22,9 +22,9 @@
-
+
-
+
diff --git a/src/mame/layout/jpms80.lay b/src/mame/layout/jpms80.lay
new file mode 100644
index 00000000000..2e790e23f2d
--- /dev/null
+++ b/src/mame/layout/jpms80.lay
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/jpmsru.lay b/src/mame/layout/jpmsru.lay
new file mode 100644
index 00000000000..2e790e23f2d
--- /dev/null
+++ b/src/mame/layout/jpmsru.lay
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/jpmsys5.lay b/src/mame/layout/jpmsys5.lay
new file mode 100644
index 00000000000..2e790e23f2d
--- /dev/null
+++ b/src/mame/layout/jpmsys5.lay
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/maygay1b.lay b/src/mame/layout/maygay1b.lay
new file mode 100644
index 00000000000..2e790e23f2d
--- /dev/null
+++ b/src/mame/layout/maygay1b.lay
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/mpu3.lay b/src/mame/layout/mpu3.lay
new file mode 100644
index 00000000000..2e790e23f2d
--- /dev/null
+++ b/src/mame/layout/mpu3.lay
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/proconn.lay b/src/mame/layout/proconn.lay
new file mode 100644
index 00000000000..2e790e23f2d
--- /dev/null
+++ b/src/mame/layout/proconn.lay
@@ -0,0 +1,918 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mame/layout/awpdmd.lay b/src/mame/layout/sc2_dmd.lay
similarity index 100%
rename from src/mame/layout/awpdmd.lay
rename to src/mame/layout/sc2_dmd.lay
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 8ca2c7e977c..58a2b2e3226 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -11522,6 +11522,8 @@ j80topup // Top Up (JPM)
j80tumbl // Tumble (JPM)
j80wsprt // Winsprint (JPM)
+j80blbnk // Blankity Bank (PCP)
+
// Close to System 80
j80alad // Aladdin's Cave (PCP)
j80fortr // Fortune Trail (JPM)
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 02b17b16840..783f474f045 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1982,9 +1982,7 @@ $(DRIVERS)/beaminv.o: $(LAYOUT)/beaminv.lh
$(DRIVERS)/bfm_sc1.o: $(LAYOUT)/bfm_sc1.lh
$(DRIVERS)/bfm_sc2.o: $(LAYOUT)/bfm_sc2.lh \
- $(LAYOUT)/awpdmd.lh \
- $(LAYOUT)/awpvid14.lh \
- $(LAYOUT)/awpvid16.lh \
+ $(LAYOUT)/sc2_dmd.lh \
$(LAYOUT)/drwho.lh \
$(LAYOUT)/gldncrwn.lh \
$(LAYOUT)/quintoon.lh \
@@ -2001,6 +1999,8 @@ $(DRIVERS)/bfm_sc4.o: $(LAYOUT)/bfm_sc4.lh \
$(DRIVERS)/bfm_sc4h.o: $(LAYOUT)/bfm_sc4.lh \
$(LAYOUT)/sc4_dmd.lh
+$(DRIVERS)/bfmsys85.o: $(LAYOUT)/bfmsys85.lh
+
$(DRIVERS)/blockade.o: $(LAYOUT)/blockade.lh
$(DRIVERS)/buggychl.o: $(LAYOUT)/buggychl.lh
@@ -2075,9 +2075,9 @@ $(DRIVERS)/igspoker.o: $(LAYOUT)/igspoker.lh
$(DRIVERS)/jankenmn.o: $(LAYOUT)/jankenmn.lh
-$(DRIVERS)/jpmimpct.o: $(LAYOUT)/awpvid16.lh
+$(DRIVERS)/jpmimpct.o: $(LAYOUT)/jpmimpct.lh
-$(DRIVERS)/jpmsys5.o: $(LAYOUT)/awpvid16.lh
+$(DRIVERS)/jpmsys5.o: $(LAYOUT)/jpmsys5.lh
$(DRIVERS)/kas89.o: $(LAYOUT)/kas89.lh
@@ -2098,12 +2098,16 @@ $(DRIVERS)/majorpkr.o: $(LAYOUT)/majorpkr.lh
$(DRIVERS)/maxaflex.o: $(LAYOUT)/maxaflex.lh
+$(DRIVERS)/maygay1b.o: $(LAYOUT)/maygay1b.lh
+
$(DRIVERS)/mcr.o: $(LAYOUT)/dpoker.lh
$(DRIVERS)/mcr3.o: $(LAYOUT)/turbotag.lh
$(DRIVERS)/mpoker.o: $(LAYOUT)/mpoker.lh
+$(DRIVERS)/mpu3.o: $(LAYOUT)/mpu3.lh
+
$(DRIVERS)/mpu4mod2sw.o: $(LAYOUT)/connect4.lh \
$(DRIVERS)/mpu4mod4yam.o: $(LAYOUT)/gamball.lh \
@@ -2162,6 +2166,8 @@ $(DRIVERS)/peplus.o: $(LAYOUT)/peplus.lh \
$(DRIVERS)/polepos.o: $(LAYOUT)/polepos.lh \
$(LAYOUT)/topracer.lh
+$(DRIVERS)/proconn.o: $(LAYOUT)/proconn.lh
+
$(DRIVERS)/qix.o: $(LAYOUT)/elecyoyo.lh
$(DRIVERS)/quizshow.o: $(LAYOUT)/quizshow.lh
diff --git a/src/mame/video/awpvid.c b/src/mame/video/awpvid.c
index aab99ef8353..5cb2b7f82da 100644
--- a/src/mame/video/awpvid.c
+++ b/src/mame/video/awpvid.c
@@ -1,18 +1,19 @@
/*************************************************************************************
AWP Hardware video simulation system
- originally written for AGEMAME by J.Wallace
+ originally written for AGEMAME by J.Wallace, enhanced by D.Haywood
M.A.M.E Core Copyright Nicola Salmoria and the MAME Team.
This is a primitive handler for generating reels with multiple symbols visible
hanging off steppers.c .
+
+ TODO: Add any lamping persistance simulations we need.
**************************************************************************************/
#include "emu.h"
#include "awpvid.h"
-#include "rendlay.h"
#include "machine/steppers.h"
static UINT16 reelpos[MAX_STEPPERS];
diff --git a/src/mame/video/awpvid.h b/src/mame/video/awpvid.h
index 014a8adbe19..2f40938dc3a 100644
--- a/src/mame/video/awpvid.h
+++ b/src/mame/video/awpvid.h
@@ -6,8 +6,6 @@
#ifndef AWP_VIDEO
#define AWP_VIDEO
-extern const char layout_awpvid14[]; /* main layout positioning 6 reels, a lamp matrix and a 14seg VFD */
-extern const char layout_awpvid16[]; /* main layout positioning 6 reels, a lamp matrix and a 16seg VFD */
void awp_draw_reel(int rno);
#endif