diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c index b453f9c58f5..114461beece 100644 --- a/src/emu/sound/bsmt2000.c +++ b/src/emu/sound/bsmt2000.c @@ -114,7 +114,7 @@ bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *tag, : device_t(mconfig, BSMT2000, "BSMT2000", "bsmt2000", tag, owner, clock), device_sound_interface(mconfig, *this), device_memory_interface(mconfig, *this), - m_space_config("samples", ENDIANNESS_LITTLE, 8, 32, 0, NULL, *ADDRESS_MAP_NAME(bsmt2000)), + m_space_config("samples", ENDIANNESS_LITTLE, 8, 32, 0, NULL), m_ready_callback(NULL), m_stream(NULL), m_direct(NULL), @@ -128,6 +128,7 @@ bsmt2000_device::bsmt2000_device(const machine_config &mconfig, const char *tag, m_write_pending(false) { m_shortname = "bsmt2000"; + m_address_map[0] = *ADDRESS_MAP_NAME(bsmt2000); } diff --git a/src/mame/audio/decobsmt.c b/src/mame/audio/decobsmt.c index fbfbccacfbf..5f5eccf4765 100644 --- a/src/mame/audio/decobsmt.c +++ b/src/mame/audio/decobsmt.c @@ -14,12 +14,6 @@ #define M6809_TAG "soundcpu" #define BSMT_TAG "bsmt" -/* - Overriding the child device's memory map fails when done from a parent device rather than the base driver. - Uncomment this out to observe. -*/ -//#define USE_OVERRIDE_MAP - static ADDRESS_MAP_START( decobsmt_map, AS_PROGRAM, 8, decobsmt_device ) AM_RANGE(0x0000, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x2001) AM_WRITE(bsmt_reset_w) @@ -30,15 +24,9 @@ static ADDRESS_MAP_START( decobsmt_map, AS_PROGRAM, 8, decobsmt_device ) AM_RANGE(0x2000, 0xffff) AM_ROM AM_REGION(":soundcpu", 0x2000) ADDRESS_MAP_END -#ifdef USE_OVERRIDE_MAP static ADDRESS_MAP_START( bsmt_map, AS_0, 8, decobsmt_device ) AM_RANGE(0x000000, 0xffffff) AM_ROM AM_REGION(":bsmt", 0) ADDRESS_MAP_END -#endif - -ROM_START( decobsmt ) - ROM_REGION(0x1000000, BSMT_TAG, ROMREGION_ERASE00) -ROM_END static INTERRUPT_GEN( decobsmt_firq_interrupt ) { @@ -57,10 +45,8 @@ MACHINE_CONFIG_FRAGMENT( decobsmt ) MCFG_CPU_PERIODIC_INT(decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_BSMT2000_ADD("bsmt", 24000000) -#ifdef USE_OVERRIDE_MAP + MCFG_BSMT2000_ADD(BSMT_TAG, 24000000) MCFG_DEVICE_ADDRESS_MAP(AS_0, bsmt_map) -#endif MCFG_BSMT2000_READY_CALLBACK(bsmt_ready_callback) MCFG_SOUND_ROUTE(0, "lspeaker", 2.0) MCFG_SOUND_ROUTE(1, "rspeaker", 2.0) @@ -83,11 +69,6 @@ machine_config_constructor decobsmt_device::device_mconfig_additions() const return MACHINE_CONFIG_NAME( decobsmt ); } -const rom_entry *decobsmt_device::device_rom_region() const -{ - return ROM_NAME( decobsmt ); -} - //************************************************************************** // LIVE DEVICE //************************************************************************** @@ -101,7 +82,6 @@ decobsmt_device::decobsmt_device(const machine_config &mconfig, const char *tag, m_ourcpu(*this, M6809_TAG), m_bsmt(*this, BSMT_TAG) { - m_shortname = "decobsmt"; } //------------------------------------------------- @@ -110,13 +90,6 @@ decobsmt_device::decobsmt_device(const machine_config &mconfig, const char *tag, void decobsmt_device::device_start() { -#ifndef USE_OVERRIDE_MAP - UINT8 *romsrc = machine().region("bsmt")->base(); - astring tempstring; - UINT8 *romdst = machine().region(subtag(tempstring, "bsmt"))->base(); - - memcpy(romdst, romsrc, 0x1000000); -#endif } //------------------------------------------------- diff --git a/src/mame/audio/decobsmt.h b/src/mame/audio/decobsmt.h index 691bc622abd..ab6aadd2947 100644 --- a/src/mame/audio/decobsmt.h +++ b/src/mame/audio/decobsmt.h @@ -24,7 +24,6 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; DECLARE_WRITE8_MEMBER(bsmt_reset_w); DECLARE_READ8_MEMBER(bsmt_status_r); diff --git a/src/mame/mame_dev.lst b/src/mame/mame_dev.lst index f5bd6f14d4a..80aad921547 100644 --- a/src/mame/mame_dev.lst +++ b/src/mame/mame_dev.lst @@ -39,7 +39,6 @@ ******************************************************************************/ BSMT2000 -DECOBSMT H63484 NAMCO_50XX NAMCO_51XX