Started moving nb1413m3 configuration to inline config. (nw)

This commit is contained in:
Wilbert Pol 2013-07-16 20:43:35 +00:00
parent 5df21a2102
commit cbb256526c
9 changed files with 91 additions and 134 deletions

View File

@ -29,17 +29,6 @@ Memo:
#include "machine/nvram.h"
DRIVER_INIT_MEMBER(hyhoo_state,hyhoo)
{
nb1413m3_type = NB1413M3_HYHOO;
}
DRIVER_INIT_MEMBER(hyhoo_state,hyhoo2)
{
nb1413m3_type = NB1413M3_HYHOO2;
}
static ADDRESS_MAP_START( hyhoo_map, AS_PROGRAM, 8, hyhoo_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("nvram")
@ -261,6 +250,7 @@ static MACHINE_CONFIG_START( hyhoo, hyhoo_state )
MCFG_SCREEN_UPDATE_DRIVER(hyhoo_state, screen_update_hyhoo)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HYHOO )
/* sound hardware */
@ -274,6 +264,12 @@ static MACHINE_CONFIG_START( hyhoo, hyhoo_state )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hyhoo2, hyhoo )
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HYHOO2 )
MACHINE_CONFIG_END
ROM_START( hyhoo )
ROM_REGION( 0x10000, "maincpu", 0 ) /* program */
ROM_LOAD( "hyhoo.1", 0x00000, 0x08000, CRC(c2852861) SHA1(ad23d8f5b196f15f863862010c8fb0dc4c072172) )
@ -317,5 +313,5 @@ ROM_START( hyhoo2 )
ROM_END
GAME( 1987, hyhoo, 0, hyhoo, hyhoo, hyhoo_state, hyhoo, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo (Japan)", 0 )
GAME( 1987, hyhoo2, 0, hyhoo, hyhoo2, hyhoo_state, hyhoo2, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo 2 (Japan)", 0 )
GAME( 1987, hyhoo, 0, hyhoo, hyhoo, driver_device, 0, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo (Japan)", 0 )
GAME( 1987, hyhoo2, 0, hyhoo2, hyhoo2, driver_device, 0, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo 2 (Japan)", 0 )

View File

@ -58,8 +58,6 @@ DRIVER_INIT_MEMBER(nbmj8900_state,ohpaipee)
ROM[0x025c] = 0x00;
ROM[0x025d] = 0x00;
#endif
nb1413m3_type = NB1413M3_OHPAIPEE;
}
DRIVER_INIT_MEMBER(nbmj8900_state,togenkyo)
@ -88,8 +86,6 @@ DRIVER_INIT_MEMBER(nbmj8900_state,togenkyo)
// ROM[0x025c] = 0x00;
// ROM[0x025d] = 0x00;
#endif
nb1413m3_type = NB1413M3_TOGENKYO;
}
@ -310,6 +306,7 @@ static MACHINE_CONFIG_START( ohpaipee, nbmj8900_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8900_state, irq0_line_hold)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OHPAIPEE )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@ -336,6 +333,9 @@ static MACHINE_CONFIG_DERIVED( togenkyo, ohpaipee )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(togenkyo_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TOGENKYO )
MACHINE_CONFIG_END

View File

@ -66,59 +66,12 @@ void nbmj8991_state::machine_reset()
}
}
DRIVER_INIT_MEMBER(nbmj8991_state,pstadium)
{
nb1413m3_type = NB1413M3_PSTADIUM;
}
DRIVER_INIT_MEMBER(nbmj8991_state,triplew1)
{
nb1413m3_type = NB1413M3_TRIPLEW1;
}
DRIVER_INIT_MEMBER(nbmj8991_state,triplew2)
{
nb1413m3_type = NB1413M3_TRIPLEW2;
}
DRIVER_INIT_MEMBER(nbmj8991_state,ntopstar)
{
nb1413m3_type = NB1413M3_NTOPSTAR;
}
DRIVER_INIT_MEMBER(nbmj8991_state,mjlstory)
{
nb1413m3_type = NB1413M3_MJLSTORY;
}
DRIVER_INIT_MEMBER(nbmj8991_state,vanilla)
{
nb1413m3_type = NB1413M3_VANILLA;
}
DRIVER_INIT_MEMBER(nbmj8991_state,finalbny)
{
UINT8 *ROM = memregion("maincpu")->base();
int i;
for (i = 0xf800; i < 0x10000; i++) ROM[i] = 0x00;
nb1413m3_type = NB1413M3_FINALBNY;
}
DRIVER_INIT_MEMBER(nbmj8991_state,qmhayaku)
{
nb1413m3_type = NB1413M3_QMHAYAKU;
}
DRIVER_INIT_MEMBER(nbmj8991_state,galkoku)
{
nb1413m3_type = NB1413M3_GALKOKU;
}
DRIVER_INIT_MEMBER(nbmj8991_state,hyouban)
{
nb1413m3_type = NB1413M3_HYOUBAN;
}
DRIVER_INIT_MEMBER(nbmj8991_state,galkaika)
@ -129,7 +82,6 @@ DRIVER_INIT_MEMBER(nbmj8991_state,galkaika)
// Patch to IM2 -> IM1
ROM[0x0002] = 0x56;
#endif
nb1413m3_type = NB1413M3_GALKAIKA;
}
DRIVER_INIT_MEMBER(nbmj8991_state,tokyogal)
@ -140,7 +92,6 @@ DRIVER_INIT_MEMBER(nbmj8991_state,tokyogal)
// Patch to IM2 -> IM1
ROM[0x0002] = 0x56;
#endif
nb1413m3_type = NB1413M3_TOKYOGAL;
}
DRIVER_INIT_MEMBER(nbmj8991_state,tokimbsj)
@ -151,32 +102,6 @@ DRIVER_INIT_MEMBER(nbmj8991_state,tokimbsj)
// Patch to IM2 -> IM1
ROM[0x0002] = 0x56;
#endif
nb1413m3_type = NB1413M3_TOKIMBSJ;
}
DRIVER_INIT_MEMBER(nbmj8991_state,mcontest)
{
nb1413m3_type = NB1413M3_MCONTEST;
}
DRIVER_INIT_MEMBER(nbmj8991_state,uchuuai)
{
nb1413m3_type = NB1413M3_UCHUUAI;
}
DRIVER_INIT_MEMBER(nbmj8991_state,mjgottub)
{
nb1413m3_type = NB1413M3_MJGOTTUB;
}
DRIVER_INIT_MEMBER(nbmj8991_state,av2mj1bb)
{
nb1413m3_type = NB1413M3_AV2MJ1BB;
}
DRIVER_INIT_MEMBER(nbmj8991_state,av2mj2rg)
{
nb1413m3_type = NB1413M3_AV2MJ2RG;
}
@ -1554,6 +1479,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( galkoku, nbmjdrv1 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_GALKOKU )
MACHINE_CONFIG_END
@ -1562,6 +1489,9 @@ static MACHINE_CONFIG_DERIVED( galkaika, nbmjdrv1 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(galkaika_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_GALKAIKA )
MACHINE_CONFIG_END
@ -1570,6 +1500,9 @@ static MACHINE_CONFIG_DERIVED( tokyogal, nbmjdrv1 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(tokyogal_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TOKYOGAL )
MACHINE_CONFIG_END
@ -1579,6 +1512,9 @@ static MACHINE_CONFIG_DERIVED( tokimbsj, nbmjdrv1 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(galkaika_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TOKIMBSJ )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@ -1586,12 +1522,16 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mcontest, nbmjdrv1 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MCONTEST )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( uchuuai, nbmjdrv1 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_UCHUUAI )
MACHINE_CONFIG_END
@ -1601,6 +1541,9 @@ static MACHINE_CONFIG_DERIVED( hyouban, nbmjdrv3 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(hyouban_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HYOUBAN )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@ -1608,6 +1551,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pstadium, nbmjdrv2 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_PSTADIUM )
MACHINE_CONFIG_END
@ -1616,6 +1561,9 @@ static MACHINE_CONFIG_DERIVED( triplew1, nbmjdrv2 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(triplew1_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TRIPLEW1 )
MACHINE_CONFIG_END
@ -1624,12 +1572,17 @@ static MACHINE_CONFIG_DERIVED( triplew2, nbmjdrv2 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(triplew2_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TRIPLEW2 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ntopstar, nbmjdrv2 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_NTOPSTAR )
MACHINE_CONFIG_END
@ -1638,18 +1591,26 @@ static MACHINE_CONFIG_DERIVED( mjlstory, nbmjdrv2 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(mjlstory_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJLSTORY )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vanilla, nbmjdrv2 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_VANILLA )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( finalbny, nbmjdrv2 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_FINALBNY )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@ -1657,6 +1618,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( qmhayaku, nbmjdrv2 )
/* basic machine hardware */
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_QMHAYAKU )
MACHINE_CONFIG_END
@ -1666,6 +1629,9 @@ static MACHINE_CONFIG_DERIVED( mjgottub, nbmjdrv2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(triplew1_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJGOTTUB )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@ -1676,6 +1642,9 @@ static MACHINE_CONFIG_DERIVED( av2mj1bb, nbmjdrv2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(av2mj1bb_map)
MCFG_CPU_IO_MAP(av2mj1bb_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_AV2MJ1BB )
MACHINE_CONFIG_END
@ -1685,6 +1654,9 @@ static MACHINE_CONFIG_DERIVED( av2mj2rg, nbmjdrv2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(av2mj2rg_map)
MCFG_CPU_IO_MAP(av2mj1bb_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_AV2MJ2RG )
MACHINE_CONFIG_END
@ -2182,21 +2154,21 @@ ROM_START( av2mj2rg )
ROM_END
GAME( 1989, galkoku, 0, galkoku, galkoku, nbmj8991_state, galkoku, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Gal no Kokuhaku (Japan)", 0 )
GAME( 1989, hyouban, galkoku, hyouban, hyouban, nbmj8991_state, hyouban, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Hyouban Musume [BET] (Japan)", 0 )
GAME( 1989, galkoku, 0, galkoku, galkoku, driver_device, 0, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Gal no Kokuhaku (Japan)", 0 )
GAME( 1989, hyouban, galkoku, hyouban, hyouban, driver_device, 0, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Hyouban Musume [BET] (Japan)", 0 )
GAME( 1989, galkaika, 0, galkaika, galkaika, nbmj8991_state, galkaika, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Gal no Kaika (Japan)", 0 )
GAME( 1989, tokyogal, 0, tokyogal, tokyogal, nbmj8991_state, tokyogal, ROT180, "Nichibutsu", "Tokyo Gal Zukan (Japan)", 0 )
GAME( 1989, tokimbsj, tokyogal, tokimbsj, tokimbsj, nbmj8991_state, tokimbsj, ROT180, "Nichibutsu", "Tokimeki Bishoujo [BET] (Japan)", 0 )
GAME( 1989, mcontest, 0, mcontest, mcontest, nbmj8991_state, mcontest, ROT180, "Nichibutsu", "Miss Mahjong Contest (Japan)", 0 )
GAME( 1989, uchuuai, 0, uchuuai, uchuuai, nbmj8991_state, uchuuai, ROT180, "Nichibutsu", "Mahjong Uchuu yori Ai wo komete (Japan)", 0 )
GAME( 1989, triplew1, 0, triplew1, triplew1, nbmj8991_state, triplew1, ROT180, "Nichibutsu", "Mahjong Triple Wars (Japan)", 0 )
GAME( 1990, pstadium, 0, pstadium, pstadium, nbmj8991_state, pstadium, ROT180, "Nichibutsu", "Mahjong Panic Stadium (Japan)", 0 )
GAME( 1990, triplew2, 0, triplew2, triplew1, nbmj8991_state, triplew2, ROT180, "Nichibutsu", "Mahjong Triple Wars 2 (Japan)", 0 )
GAME( 1990, ntopstar, 0, ntopstar, ntopstar, nbmj8991_state, ntopstar, ROT180, "Nichibutsu", "Mahjong Nerae! Top Star (Japan)", 0 )
GAME( 1991, mjlstory, 0, mjlstory, mjlstory, nbmj8991_state, mjlstory, ROT180, "Nichibutsu", "Mahjong Jikken Love Story (Japan)", 0 )
GAME( 1991, vanilla, 0, vanilla, vanilla, nbmj8991_state, vanilla, ROT180, "Nichibutsu", "Mahjong Vanilla Syndrome (Japan)", 0 )
GAME( 1989, mcontest, 0, mcontest, mcontest, driver_device, 0, ROT180, "Nichibutsu", "Miss Mahjong Contest (Japan)", 0 )
GAME( 1989, uchuuai, 0, uchuuai, uchuuai, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Uchuu yori Ai wo komete (Japan)", 0 )
GAME( 1989, triplew1, 0, triplew1, triplew1, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Triple Wars (Japan)", 0 )
GAME( 1990, pstadium, 0, pstadium, pstadium, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Panic Stadium (Japan)", 0 )
GAME( 1990, triplew2, 0, triplew2, triplew1, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Triple Wars 2 (Japan)", 0 )
GAME( 1990, ntopstar, 0, ntopstar, ntopstar, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Nerae! Top Star (Japan)", 0 )
GAME( 1991, mjlstory, 0, mjlstory, mjlstory, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Jikken Love Story (Japan)", 0 )
GAME( 1991, vanilla, 0, vanilla, vanilla, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Vanilla Syndrome (Japan)", 0 )
GAME( 1991, finalbny, vanilla, finalbny, finalbny, nbmj8991_state, finalbny, ROT180, "Nichibutsu", "Mahjong Final Bunny [BET] (Japan)", 0 )
GAME( 1991, qmhayaku, 0, qmhayaku, qmhayaku, nbmj8991_state, qmhayaku, ROT180, "Nichibutsu", "Quiz-Mahjong Hayaku Yatteyo! (Japan)", 0 )
GAME( 1991, mjgottub, 0, mjgottub, mjgottub, nbmj8991_state, mjgottub, ROT180, "Nichibutsu", "Medal Mahjong Gottsu ee-kanji [BET] (Japan)", 0 )
GAME( 1991, av2mj1bb, 0, av2mj1bb, av2mj1bb, nbmj8991_state, av2mj1bb, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.1 Bay Bridge no Seijo (Japan)", GAME_NOT_WORKING )
GAME( 1991, av2mj2rg, 0, av2mj2rg, av2mj2rg, nbmj8991_state, av2mj2rg, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.2 Rouge no Kaori (Japan)", GAME_NOT_WORKING )
GAME( 1991, qmhayaku, 0, qmhayaku, qmhayaku, driver_device, 0, ROT180, "Nichibutsu", "Quiz-Mahjong Hayaku Yatteyo! (Japan)", 0 )
GAME( 1991, mjgottub, 0, mjgottub, mjgottub, driver_device, 0, ROT180, "Nichibutsu", "Medal Mahjong Gottsu ee-kanji [BET] (Japan)", 0 )
GAME( 1991, av2mj1bb, 0, av2mj1bb, av2mj1bb, driver_device, 0, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.1 Bay Bridge no Seijo (Japan)", GAME_NOT_WORKING )
GAME( 1991, av2mj2rg, 0, av2mj2rg, av2mj2rg, driver_device, 0, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.2 Rouge no Kaori (Japan)", GAME_NOT_WORKING )

View File

@ -37,11 +37,6 @@ Memo:
DRIVER_INIT_MEMBER(pastelg_state,pastelg)
{
nb1413m3_type = NB1413M3_PASTELG;
}
READ8_MEMBER(pastelg_state::pastelg_sndrom_r)
{
UINT8 *ROM = memregion("voice")->base();
@ -417,6 +412,8 @@ static MACHINE_CONFIG_START( pastelg, pastelg_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", pastelg_state, irq0_line_assert) // nmiclock not written, chip is 1411M1 instead of 1413M3
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_PASTELG )
MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
@ -568,6 +565,6 @@ ROM_END
GAME( 1985, pastelg, 0, pastelg, pastelg, pastelg_state, pastelg, ROT0, "Nichibutsu", "Pastel Gal (Japan 851224)", 0 )
GAME( 1985, 3ds, 0, threeds, threeds, pastelg_state, pastelg, ROT0, "Nichibutsu", "Three Ds - Three Dealers Casino House", 0 )
GAME( 1985, galds, 3ds, threeds, galds, pastelg_state, pastelg, ROT0, "Nihon System Corp.", "Gals Ds - Three Dealers Casino House (bootleg?)", 0 )
GAME( 1985, pastelg, 0, pastelg, pastelg, driver_device, 0, ROT0, "Nichibutsu", "Pastel Gal (Japan 851224)", 0 )
GAME( 1985, 3ds, 0, threeds, threeds, driver_device, 0, ROT0, "Nichibutsu", "Three Ds - Three Dealers Casino House", 0 )
GAME( 1985, galds, 3ds, threeds, galds, driver_device, 0, ROT0, "Nihon System Corp.", "Gals Ds - Three Dealers Casino House (bootleg?)", 0 )

View File

@ -32,8 +32,6 @@ public:
DECLARE_WRITE8_MEMBER(hyhoo_blitter_w);
DECLARE_WRITE8_MEMBER(hyhoo_romsel_w);
DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_busyflag_r);
DECLARE_DRIVER_INIT(hyhoo2);
DECLARE_DRIVER_INIT(hyhoo);
virtual void video_start();
UINT32 screen_update_hyhoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void hyhoo_gfxdraw();

View File

@ -118,12 +118,21 @@ enum {
NB1413M3_PAIRSTEN
};
#define MCFG_NB1413M3_TYPE(_type) \
nb1413m3_device::set_type(*device, _type);
// TODO: Move this to m_nb1413m3_type
extern int nb1413m3_type;
class nb1413m3_device : public device_t
{
public:
nb1413m3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~nb1413m3_device() {}
// (static) configuration helpers
static void set_type(device_t &device, int type) { downcast<nb1413m3_device &>(device).m_nb1413m3_type = type; nb1413m3_type = type; }
DECLARE_WRITE8_MEMBER( nmi_clock_w );
DECLARE_READ8_MEMBER( sndrom_r );
DECLARE_WRITE8_MEMBER( sndrombank1_w );
@ -169,6 +178,7 @@ private:
int m_gfxradr_h;
int m_gfxrombank;
int m_outcoin_enable;
int m_nb1413m3_type;
TIMER_CALLBACK_MEMBER( timer_callback );
@ -179,8 +189,6 @@ INPUT_PORTS_EXTERN( nbmjcontrols );
INPUT_PORTS_EXTERN( nbhf1_ctrl );
INPUT_PORTS_EXTERN( nbhf2_ctrl );
extern int nb1413m3_type;
extern const device_type NB1413M3;

View File

@ -41,24 +41,10 @@ public:
DECLARE_READ8_MEMBER(nbmj8991_clut_r);
DECLARE_WRITE8_MEMBER(nbmj8991_clut_w);
DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_busyflag_r);
DECLARE_DRIVER_INIT(triplew1);
DECLARE_DRIVER_INIT(mjlstory);
DECLARE_DRIVER_INIT(mjgottub);
DECLARE_DRIVER_INIT(ntopstar);
DECLARE_DRIVER_INIT(galkoku);
DECLARE_DRIVER_INIT(triplew2);
DECLARE_DRIVER_INIT(uchuuai);
DECLARE_DRIVER_INIT(pstadium);
DECLARE_DRIVER_INIT(av2mj2rg);
DECLARE_DRIVER_INIT(galkaika);
DECLARE_DRIVER_INIT(hyouban);
DECLARE_DRIVER_INIT(vanilla);
DECLARE_DRIVER_INIT(av2mj1bb);
DECLARE_DRIVER_INIT(tokimbsj);
DECLARE_DRIVER_INIT(tokyogal);
DECLARE_DRIVER_INIT(mcontest);
DECLARE_DRIVER_INIT(finalbny);
DECLARE_DRIVER_INIT(qmhayaku);
virtual void machine_reset();
virtual void video_start();
UINT32 screen_update_nbmj8991_type1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);

View File

@ -44,7 +44,6 @@ public:
DECLARE_WRITE8_MEMBER(pastelg_romsel_w);
DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_busyflag_r);
DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_hackbusyflag_r);
DECLARE_DRIVER_INIT(pastelg);
virtual void video_start();
virtual void palette_init();
UINT32 screen_update_pastelg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);

View File

@ -61,6 +61,7 @@ void nb1413m3_device::device_start()
machine().scheduler().synchronize(timer_expired_delegate(FUNC(nb1413m3_device::timer_callback), this));
save_item(NAME(nb1413m3_type));
save_item(NAME(m_nb1413m3_type));
save_item(NAME(m_sndrombank1));
save_item(NAME(m_sndrombank2));
save_item(NAME(m_busyctr));