diff options
Diffstat (limited to 'src/mame/drivers/sbasketb.cpp')
-rw-r--r-- | src/mame/drivers/sbasketb.cpp | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index 6ee0656f01c..a9730c684d7 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -43,7 +43,6 @@ CPU/Video Board Parts: #include "emu.h" #include "includes/sbasketb.h" #include "includes/konamipt.h" -#include "audio/trackfld.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" @@ -51,9 +50,8 @@ CPU/Video Board Parts: #include "machine/gen_latch.h" #include "machine/konami1.h" #include "machine/watchdog.h" -#include "sound/dac.h" #include "sound/volt_reg.h" -#include "screen.h" + #include "speaker.h" @@ -82,13 +80,13 @@ WRITE_LINE_MEMBER(sbasketb_state::irq_mask_w) void sbasketb_state::sbasketb_map(address_map &map) { map(0x2000, 0x2fff).ram(); - map(0x3000, 0x33ff).ram().w(this, FUNC(sbasketb_state::sbasketb_colorram_w)).share("colorram"); - map(0x3400, 0x37ff).ram().w(this, FUNC(sbasketb_state::sbasketb_videoram_w)).share("videoram"); - map(0x3800, 0x39ff).ram().share("spriteram"); + map(0x3000, 0x33ff).ram().w(this, FUNC(sbasketb_state::sbasketb_colorram_w)).share(m_colorram); + map(0x3400, 0x37ff).ram().w(this, FUNC(sbasketb_state::sbasketb_videoram_w)).share(m_videoram); + map(0x3800, 0x39ff).ram().share(m_spriteram); map(0x3a00, 0x3bff).ram(); /* Probably unused, but initialized */ map(0x3c00, 0x3c00).w("watchdog", FUNC(watchdog_timer_device::reset_w)); map(0x3c10, 0x3c10).nopr(); /* ???? */ - map(0x3c20, 0x3c20).writeonly().share("palettebank"); + map(0x3c20, 0x3c20).writeonly().share(m_palettebank); map(0x3c80, 0x3c87).w("mainlatch", FUNC(ls259_device::write_d0)); map(0x3d00, 0x3d00).w("soundlatch", FUNC(generic_latch_8_device::write)); map(0x3d80, 0x3d80).w(this, FUNC(sbasketb_state::sbasketb_sh_irqtrigger_w)); @@ -98,7 +96,7 @@ void sbasketb_state::sbasketb_map(address_map &map) map(0x3e03, 0x3e03).nopr(); map(0x3e80, 0x3e80).portr("DSW2"); map(0x3f00, 0x3f00).portr("DSW1"); - map(0x3f80, 0x3f80).writeonly().share("scroll"); + map(0x3f80, 0x3f80).writeonly().share(m_scroll); map(0x6000, 0xffff).rom(); } @@ -107,10 +105,10 @@ void sbasketb_state::sbasketb_sound_map(address_map &map) map(0x0000, 0x1fff).rom(); map(0x4000, 0x43ff).ram(); map(0x6000, 0x6000).r("soundlatch", FUNC(generic_latch_8_device::read)); - map(0x8000, 0x8000).r("trackfld_audio", FUNC(trackfld_audio_device::hyperspt_sh_timer_r)); + map(0x8000, 0x8000).r(m_soundbrd, FUNC(trackfld_audio_device::hyperspt_sh_timer_r)); map(0xa000, 0xa000).w(m_vlm, FUNC(vlm5030_device::data_w)); /* speech data */ - map(0xc000, 0xdfff).w("trackfld_audio", FUNC(trackfld_audio_device::hyperspt_sound_w)); /* speech and output control */ - map(0xe000, 0xe000).w("dac", FUNC(dac_byte_interface::write)); + map(0xc000, 0xdfff).w(m_soundbrd, FUNC(trackfld_audio_device::hyperspt_sound_w)); /* speech and output control */ + map(0xe000, 0xe000).w(m_dac, FUNC(dac_byte_interface::write)); map(0xe001, 0xe001).w(this, FUNC(sbasketb_state::konami_SN76496_latch_w)); /* Loads the snd command into the snd latch */ map(0xe002, 0xe002).w(this, FUNC(sbasketb_state::konami_SN76496_w)); /* This address triggers the SN chip to read the data port. */ } @@ -197,10 +195,10 @@ WRITE_LINE_MEMBER(sbasketb_state::vblank_irq) MACHINE_CONFIG_START(sbasketb_state::sbasketb) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", KONAMI1, 1400000) /* 1.400 MHz ??? */ + MCFG_DEVICE_ADD(m_maincpu, KONAMI1, 1400000) /* 1.400 MHz ??? */ MCFG_DEVICE_PROGRAM_MAP(sbasketb_map) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* 3.5795 MHz */ + MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(14'318'181) / 4) /* 3.5795 MHz */ MCFG_DEVICE_PROGRAM_MAP(sbasketb_sound_map) MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B3 @@ -215,17 +213,17 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb) MCFG_WATCHDOG_ADD("watchdog") /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD(m_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(sbasketb_state, screen_update_sbasketb) - MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_PALETTE(m_palette) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sbasketb_state, vblank_irq)) - MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbasketb) - MCFG_PALETTE_ADD("palette", 16*16+16*16*16) + MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_palette, gfx_sbasketb) + MCFG_PALETTE_ADD(m_palette, 16*16+16*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(256) MCFG_PALETTE_INIT_OWNER(sbasketb_state, sbasketb) @@ -234,23 +232,22 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_DEVICE_ADD("trackfld_audio", TRACKFLD_AUDIO, 0) + MCFG_DEVICE_ADD(m_soundbrd, TRACKFLD_AUDIO, 0, m_audiocpu, m_vlm) - MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC + MCFG_DEVICE_ADD(m_dac, DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 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) - MCFG_DEVICE_ADD("snsnd", SN76489, XTAL(14'318'181) / 8) + MCFG_DEVICE_ADD(m_sn, SN76489, XTAL(14'318'181) / 8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_DEVICE_ADD("vlm", VLM5030, XTAL(3'579'545)) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */ + MCFG_DEVICE_ADD(m_vlm, VLM5030, XTAL(3'579'545)) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END MACHINE_CONFIG_START(sbasketb_state::sbasketbu) sbasketb(config); - MCFG_DEVICE_REMOVE("maincpu") - MCFG_DEVICE_ADD("maincpu", MC6809E, 1400000) /* 6809E at 1.400 MHz ??? */ + MCFG_DEVICE_REPLACE(m_maincpu, MC6809E, 1400000) /* 6809E at 1.400 MHz ??? */ MCFG_DEVICE_PROGRAM_MAP(sbasketb_map) MACHINE_CONFIG_END |