summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/senjyo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/senjyo.cpp')
-rw-r--r--src/mame/drivers/senjyo.cpp63
1 files changed, 33 insertions, 30 deletions
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp
index 552359d2af4..91184fa8cca 100644
--- a/src/mame/drivers/senjyo.cpp
+++ b/src/mame/drivers/senjyo.cpp
@@ -166,9 +166,9 @@ void senjyo_state::senjyo_sound_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x4000, 0x43ff).ram();
- map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write));
- map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write));
- map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write));
+ map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w));
+ map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w));
+ map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w));
map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w));
}
@@ -231,9 +231,9 @@ void senjyo_state::starforb_sound_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
map(0x4000, 0x43ff).ram();
- map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::write));
- map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::write));
- map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::write));
+ map(0x8000, 0x8000).w("sn1", FUNC(sn76496_device::command_w));
+ map(0x9000, 0x9000).w("sn2", FUNC(sn76496_device::command_w));
+ map(0xa000, 0xa000).w("sn3", FUNC(sn76496_device::command_w));
map(0xd000, 0xd000).w(FUNC(senjyo_state::volume_w));
map(0xf000, 0xffff).ram();
}
@@ -548,12 +548,12 @@ static GFXDECODE_START( gfx_senjyo )
GFXDECODE_END
-void senjyo_state::senjyo(machine_config &config)
-{
+MACHINE_CONFIG_START(senjyo_state::senjyo)
+
/* basic machine hardware */
- Z80(config, m_maincpu, 4000000); /* 4 MHz? */
- m_maincpu->set_addrmap(AS_PROGRAM, &senjyo_state::senjyo_map);
- m_maincpu->set_vblank_int("screen", FUNC(senjyo_state::irq0_line_assert));
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(senjyo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
z80_device& sub(Z80(config, "sub", 2000000)); /* 2 MHz? */
sub.set_daisy_config(senjyo_daisy_chain);
@@ -570,12 +570,12 @@ void senjyo_state::senjyo(machine_config &config)
ctc.zc_callback<2>().set(FUNC(senjyo_state::sound_line_clock));
/* video hardware */
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_refresh_hz(60);
- screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
- screen.set_size(32*8, 32*8);
- screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
- screen.set_screen_update(FUNC(senjyo_state::screen_update));
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_UPDATE_DRIVER(senjyo_state, screen_update)
GFXDECODE(config, m_gfxdecode, m_palette, gfx_senjyo);
@@ -585,17 +585,19 @@ void senjyo_state::senjyo(machine_config &config)
/* sound hardware */
SPEAKER(config, "speaker").front_center();
- SN76496(config, "sn1", 2000000).add_route(ALL_OUTPUTS, "speaker", 0.5);
+ MCFG_DEVICE_ADD("sn1", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- SN76496(config, "sn2", 2000000).add_route(ALL_OUTPUTS, "speaker", 0.5);
+ MCFG_DEVICE_ADD("sn2", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- SN76496(config, "sn3", 2000000).add_route(ALL_OUTPUTS, "speaker", 0.5);
+ MCFG_DEVICE_ADD("sn3", SN76496, 2000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- DAC_4BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.05); // unknown DAC
- voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
- vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
- vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-}
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
+ MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
+MACHINE_CONFIG_END
@@ -620,15 +622,16 @@ void senjyo_state::senjyox_a(machine_config &config)
}
-void senjyo_state::starforb(machine_config &config)
-{
+MACHINE_CONFIG_START(senjyo_state::starforb)
senjyox_e(config);
/* basic machine hardware */
- m_maincpu->set_addrmap(AS_PROGRAM, &senjyo_state::starforb_map);
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(starforb_map)
- subdevice<z80_device>("sub")->set_addrmap(AS_PROGRAM, &senjyo_state::starforb_sound_map);
-}
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(starforb_sound_map)
+MACHINE_CONFIG_END
/***************************************************************************