diff options
99 files changed, 405 insertions, 405 deletions
diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c index 43945f370db..d3ff82bd1ed 100644 --- a/src/emu/sound/sn76496.c +++ b/src/emu/sound/sn76496.c @@ -409,14 +409,14 @@ void sn76496_base_device::register_for_save_states() // save_item(NAME(m_freq0_is_max)); } -const device_type SN76496_NEW = &device_creator<sn76496_new_device>; -const device_type U8106_NEW = &device_creator<u8106_new_device>; -const device_type Y2404_NEW = &device_creator<y2404_new_device>; -const device_type SN76489_NEW = &device_creator<sn76489_new_device>; -const device_type SN76489A_NEW = &device_creator<sn76489a_new_device>; -const device_type SN76494_NEW = &device_creator<sn76494_new_device>; -const device_type SN94624_NEW = &device_creator<sn94624_new_device>; -const device_type NCR7496_NEW = &device_creator<ncr7496_new_device>; -const device_type GAMEGEAR_NEW = &device_creator<gamegear_new_device>; -const device_type SEGAPSG_NEW = &device_creator<segapsg_new_device>; +const device_type SN76496 = &device_creator<sn76496_device>; +const device_type U8106 = &device_creator<u8106_device>; +const device_type Y2404 = &device_creator<y2404_device>; +const device_type SN76489 = &device_creator<sn76489_device>; +const device_type SN76489A = &device_creator<sn76489a_device>; +const device_type SN76494 = &device_creator<sn76494_device>; +const device_type SN94624 = &device_creator<sn94624_device>; +const device_type NCR7496 = &device_creator<ncr7496_device>; +const device_type GAMEGEAR = &device_creator<gamegear_device>; +const device_type SEGAPSG = &device_creator<segapsg_device>; diff --git a/src/emu/sound/sn76496.h b/src/emu/sound/sn76496.h index 7012e5319c8..a832791d16a 100644 --- a/src/emu/sound/sn76496.h +++ b/src/emu/sound/sn76496.h @@ -4,16 +4,16 @@ #define __SN76496_H__ -extern const device_type SN76496_NEW; -extern const device_type U8106_NEW; -extern const device_type Y2404_NEW; -extern const device_type SN76489_NEW; -extern const device_type SN76489A_NEW; -extern const device_type SN76494_NEW; -extern const device_type SN94624_NEW; -extern const device_type NCR7496_NEW; -extern const device_type GAMEGEAR_NEW; -extern const device_type SEGAPSG_NEW; +extern const device_type SN76496; +extern const device_type U8106; +extern const device_type Y2404; +extern const device_type SN76489; +extern const device_type SN76489A; +extern const device_type SN76494; +extern const device_type SN94624; +extern const device_type NCR7496; +extern const device_type GAMEGEAR; +extern const device_type SEGAPSG; struct sn76496_config { @@ -68,92 +68,92 @@ private: }; // SN76496: Whitenoise verified, phase verified, periodic verified (by Michael Zapf) -class sn76496_new_device : public sn76496_base_device +class sn76496_device : public sn76496_base_device { public: - sn76496_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, SN76496_NEW, "SN76496_NEW", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock) + sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, SN76496, "SN76496", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock) { } }; // U8106 not verified yet. todo: verify; (a custom marked sn76489? only used on mr. do and maybe other universal games) -class u8106_new_device : public sn76496_base_device +class u8106_device : public sn76496_base_device { public: - u8106_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, U8106_NEW, "U8106_NEW", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock) + u8106_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, U8106, "U8106", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock) { } }; // Y2404 not verified yet. todo: verify; (don't be fooled by the Y, it's a TI chip, not Yamaha) -class y2404_new_device : public sn76496_base_device +class y2404_device : public sn76496_base_device { public: - y2404_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, Y2404_NEW, "Y2404_NEW", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock) + y2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, Y2404, "Y2404", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock) { } }; // SN76489 not verified yet. todo: verify; -class sn76489_new_device : public sn76496_base_device +class sn76489_device : public sn76496_base_device { public: - sn76489_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, SN76489_NEW, "SN76489_NEW", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock) + sn76489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, SN76489, "SN76489", tag, 0x4000, 0x01, 0x02, true, false, 8, true, owner, clock) { } }; // SN76489A: whitenoise verified, phase verified, periodic verified (by plgdavid) -class sn76489a_new_device : public sn76496_base_device +class sn76489a_device : public sn76496_base_device { public: - sn76489a_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, SN76489A_NEW, "SN76489A_NEW", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock) + sn76489a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, SN76489A, "SN76489A", tag, 0x10000, 0x04, 0x08, false, false, 8, true, owner, clock) { } }; // SN76494 not verified, (according to datasheet: same as sn76489a but without the /8 divider) -class sn76494_new_device : public sn76496_base_device +class sn76494_device : public sn76496_base_device { public: - sn76494_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, SN76494_NEW, "SN76494_NEW", tag, 0x10000, 0x04, 0x08, false, false, 1, true, owner, clock) + sn76494_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, SN76494, "SN76494", tag, 0x10000, 0x04, 0x08, false, false, 1, true, owner, clock) { } }; // SN94624 whitenoise verified, phase verified, period verified; verified by PlgDavid -class sn94624_new_device : public sn76496_base_device +class sn94624_device : public sn76496_base_device { public: - sn94624_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, SN94624_NEW, "SN94624_NEW", tag, 0x4000, 0x01, 0x02, true, false, 1, true, owner, clock) + sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, SN94624, "SN94624", tag, 0x4000, 0x01, 0x02, true, false, 1, true, owner, clock) { } }; // NCR7496 not verified; info from smspower wiki -class ncr7496_new_device : public sn76496_base_device +class ncr7496_device : public sn76496_base_device { public: - ncr7496_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, NCR7496_NEW, "NCR7496_NEW", tag, 0x8000, 0x02, 0x20, false, false, 8, true, owner, clock) + ncr7496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, NCR7496, "NCR7496", tag, 0x8000, 0x02, 0x20, false, false, 8, true, owner, clock) { } }; // Verified by Justin Kerk -class gamegear_new_device : public sn76496_base_device +class gamegear_device : public sn76496_base_device { public: - gamegear_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, GAMEGEAR_NEW, "Game Gear PSG_NEW", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock) + gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock) { } }; // todo: verify; from smspower wiki, assumed to have same invert as gamegear -class segapsg_new_device : public sn76496_base_device +class segapsg_device : public sn76496_base_device { public: - segapsg_new_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : sn76496_base_device(mconfig, SEGAPSG_NEW, "SEGA VDP PSG_NEW", tag, 0x8000, 0x01, 0x08, true, false, 8, false, owner, clock) + segapsg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : sn76496_base_device(mconfig, SEGAPSG, "SEGA VDP PSG", tag, 0x8000, 0x01, 0x08, true, false, 8, false, owner, clock) { } }; diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c index d951e100e6a..bda78f5edca 100644 --- a/src/mame/audio/qix.c +++ b/src/mame/audio/qix.c @@ -273,11 +273,11 @@ MACHINE_CONFIG_FRAGMENT( slither_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, SLITHER_CLOCK_OSC/4/4) + MCFG_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, SLITHER_CLOCK_OSC/4/4) + MCFG_SOUND_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index c7baf38dc84..57441754097 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -230,9 +230,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( main_portmap, AS_IO, 8, appoooh_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76489_new_device, write) - AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn3", sn76489_new_device, write) + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76489_device, write) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn3", sn76489_device, write) AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(appoooh_adpcm_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("BUTTON3") AM_WRITE(appoooh_out_w) AM_RANGE(0x05, 0x05) AM_WRITE(appoooh_scroll_w) /* unknown */ @@ -448,15 +448,15 @@ static MACHINE_CONFIG_START( appoooh_common, appoooh_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, 18432000/6) + MCFG_SOUND_ADD("sn1", SN76489, 18432000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 18432000/6) + MCFG_SOUND_ADD("sn2", SN76489, 18432000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489_NEW, 18432000/6) + MCFG_SOUND_ADD("sn3", SN76489, 18432000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 64efbd46f37..a257bce970a 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -217,9 +217,9 @@ static ADDRESS_MAP_START( atetrisb2_map, AS_PROGRAM, 8, atetris_state ) AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_SHARE("videoram") AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_byte_w) AM_SHARE("paletteram") AM_RANGE(0x2400, 0x25ff) AM_RAM_WRITE(nvram_w) AM_SHARE("nvram") - AM_RANGE(0x2802, 0x2802) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0x2804, 0x2804) AM_DEVWRITE("sn2", sn76496_new_device, write) - AM_RANGE(0x2806, 0x2806) AM_DEVWRITE("sn3", sn76496_new_device, write) + AM_RANGE(0x2802, 0x2802) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0x2804, 0x2804) AM_DEVWRITE("sn2", sn76496_device, write) + AM_RANGE(0x2806, 0x2806) AM_DEVWRITE("sn3", sn76496_device, write) AM_RANGE(0x2808, 0x2808) AM_READ_PORT("IN0") AM_RANGE(0x2818, 0x2818) AM_READ_PORT("IN1") AM_RANGE(0x3000, 0x3000) AM_WRITE(watchdog_reset_w) @@ -391,15 +391,15 @@ static MACHINE_CONFIG_START( atetrisb2, atetris_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, BOOTLEG_CLOCK/8) + MCFG_SOUND_ADD("sn1", SN76496, BOOTLEG_CLOCK/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, BOOTLEG_CLOCK/8) + MCFG_SOUND_ADD("sn2", SN76496, BOOTLEG_CLOCK/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76496_NEW, BOOTLEG_CLOCK/8) + MCFG_SOUND_ADD("sn3", SN76496, BOOTLEG_CLOCK/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index 0d4a76158ce..04a17eab14b 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -130,9 +130,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bankp_io_map, AS_IO, 8, bankp_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE("sn2", sn76489_new_device, write) - AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("sn3", sn76489_new_device, write) + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE("sn2", sn76489_device, write) + AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("sn3", sn76489_device, write) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_RANGE(0x05, 0x05) AM_WRITE(bankp_scroll_w) AM_RANGE(0x07, 0x07) AM_WRITE(bankp_out_w) @@ -317,15 +317,15 @@ static MACHINE_CONFIG_START( bankp, bankp_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, MASTER_CLOCK/6) + MCFG_SOUND_ADD("sn1", SN76489, MASTER_CLOCK/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, MASTER_CLOCK/6) + MCFG_SOUND_ADD("sn2", SN76489, MASTER_CLOCK/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489_NEW, MASTER_CLOCK/6) + MCFG_SOUND_ADD("sn3", SN76489, MASTER_CLOCK/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 17c46063bb7..fc9d2faa893 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -968,7 +968,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bullsdrt_port_map, AS_IO, 8, centiped_state ) AM_RANGE(0x00, 0x00) AM_WRITE(bullsdrt_sprites_bank_w) AM_RANGE(0x20, 0x3f) AM_WRITE(bullsdrt_tilesbank_w) AM_SHARE("bullsdrt_bank") - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE("snsnd", sn76496_new_device, write) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE("snsnd", sn76496_device, write) ADDRESS_MAP_END @@ -1926,7 +1926,7 @@ static MACHINE_CONFIG_START( bullsdrt, centiped_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76496_NEW, 12096000/8) + MCFG_SOUND_ADD("snsnd", SN76496, 12096000/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 084406325d0..5c7ae47e22a 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -378,11 +378,11 @@ static MACHINE_CONFIG_START( circusc, circusc_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("sn1", SN76496, XTAL_14_31818MHz/8) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 0) - MCFG_SOUND_ADD("sn2", SN76496_NEW, XTAL_14_31818MHz/8) + MCFG_SOUND_ADD("sn2", SN76496, XTAL_14_31818MHz/8) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE_EX(0, "fltdisc", 1.0, 1) diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index 96d72bfbc58..50132f415d9 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -228,10 +228,10 @@ static ADDRESS_MAP_START( docastle_map2, AS_PROGRAM, 8, docastle_state ) AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS") AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM") AM_RANGE(0xc084, 0xc084) AM_READWRITE(docastle_flipscreen_on_r, docastle_flipscreen_on_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("sn2", sn76489a_new_device, write) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("sn3", sn76489a_new_device, write) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76489a_new_device, write) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("sn2", sn76489a_device, write) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("sn3", sn76489a_device, write) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76489a_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( docastle_map3, AS_PROGRAM, 8, docastle_state ) @@ -264,10 +264,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( dorunrun_map2, AS_PROGRAM, 8, docastle_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn2", sn76489a_new_device, write) - AM_RANGE(0xa800, 0xa800) AM_DEVWRITE("sn3", sn76489a_new_device, write) - AM_RANGE(0xac00, 0xac00) AM_DEVWRITE("sn4", sn76489a_new_device, write) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("sn2", sn76489a_device, write) + AM_RANGE(0xa800, 0xa800) AM_DEVWRITE("sn3", sn76489a_device, write) + AM_RANGE(0xac00, 0xac00) AM_DEVWRITE("sn4", sn76489a_device, write) AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2") AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1") AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS") @@ -303,10 +303,10 @@ static ADDRESS_MAP_START( idsoccer_map2, AS_PROGRAM, 8, docastle_state ) AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS") AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM") AM_RANGE(0xc084, 0xc084) AM_READ_PORT("JOYS_RIGHT") AM_WRITE(docastle_flipscreen_on_w) - AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("sn2", sn76489a_new_device, write) - AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("sn3", sn76489a_new_device, write) - AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76489a_new_device, write) + AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xe400, 0xe400) AM_DEVWRITE("sn2", sn76489a_device, write) + AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("sn3", sn76489a_device, write) + AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76489a_device, write) ADDRESS_MAP_END /* Input Ports */ @@ -630,19 +630,19 @@ static MACHINE_CONFIG_START( docastle, docastle_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, XTAL_4MHz) + MCFG_SOUND_ADD("sn1", SN76489A, XTAL_4MHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, XTAL_4MHz) + MCFG_SOUND_ADD("sn2", SN76489A, XTAL_4MHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489A_NEW, XTAL_4MHz) + MCFG_SOUND_ADD("sn3", SN76489A, XTAL_4MHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn4", SN76489A_NEW, XTAL_4MHz) + MCFG_SOUND_ADD("sn4", SN76489A, XTAL_4MHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index e04447e2cdb..9da481df489 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -83,9 +83,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, AS_IO, 8, drmicro_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_new_device, write) - AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn3", sn76496_new_device, write) + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_device, write) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn3", sn76496_device, write) AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(pcm_set_w) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2") AM_WRITE(nmi_enable_w) AM_RANGE(0x05, 0x05) AM_NOP // unused? / watchdog? @@ -282,15 +282,15 @@ static MACHINE_CONFIG_START( drmicro, drmicro_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, MCLK/4) + MCFG_SOUND_ADD("sn1", SN76496, MCLK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, MCLK/4) + MCFG_SOUND_ADD("sn2", SN76496, MCLK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76496_NEW, MCLK/4) + MCFG_SOUND_ADD("sn3", SN76496, MCLK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index 3282821a8e9..b3c4a598340 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -55,8 +55,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, exedexes_state ) AM_RANGE(0x4000, 0x47ff) AM_RAM AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_byte_r) AM_RANGE(0x8000, 0x8001) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_data_w) - AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("sn2", sn76489_new_device, write) + AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("sn2", sn76489_device, write) ADDRESS_MAP_END @@ -256,11 +256,11 @@ static MACHINE_CONFIG_START( exedexes, exedexes_state ) MCFG_SOUND_ADD("aysnd", AY8910, 1500000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) - MCFG_SOUND_ADD("sn1", SN76489_NEW, 3000000) + MCFG_SOUND_ADD("sn1", SN76489, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 3000000) + MCFG_SOUND_ADD("sn2", SN76489, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index b01e00ff0fa..5f3968f8a43 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -105,7 +105,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, finalizr_state ) AM_RANGE(0x0813, 0x0813) AM_READ_PORT("DSW1") AM_RANGE(0x0818, 0x0818) AM_WRITE(watchdog_reset_w) AM_RANGE(0x0819, 0x0819) AM_WRITE(finalizr_coin_w) - AM_RANGE(0x081a, 0x081a) AM_DEVWRITE("snsnd", sn76489a_new_device, write) /* This address triggers the SN chip to read the data port. */ + AM_RANGE(0x081a, 0x081a) AM_DEVWRITE("snsnd", sn76489a_device, write) /* This address triggers the SN chip to read the data port. */ AM_RANGE(0x081b, 0x081b) AM_WRITENOP /* Loads the snd command into the snd latch */ AM_RANGE(0x081c, 0x081c) AM_WRITE(finalizr_i8039_irq_w) /* custom sound chip */ AM_RANGE(0x081d, 0x081d) AM_WRITE(soundlatch_byte_w) /* custom sound chip */ @@ -300,7 +300,7 @@ static MACHINE_CONFIG_START( finalizr, finalizr_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, XTAL_18_432MHz/12) + MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index e8526f701ab..8f3560a75b8 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -179,10 +179,10 @@ static ADDRESS_MAP_START( pbillrd_map, AS_PROGRAM, 8, freekick_state ) AM_RANGE(0xe800, 0xe800) AM_READ_PORT("IN1") AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW1") AM_WRITE(pbillrd_bankswitch_w) AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSW2") - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76489a_new_device, write) - AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76489a_new_device, write) - AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76489a_new_device, write) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76489a_device, write) + AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76489a_device, write) + AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76489a_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( freekickb_map, AS_PROGRAM, 8, freekick_state ) @@ -199,10 +199,10 @@ static ADDRESS_MAP_START( freekickb_map, AS_PROGRAM, 8, freekick_state ) AM_RANGE(0xf802, 0xf803) AM_WRITE(coin_w) AM_RANGE(0xf804, 0xf804) AM_WRITE(nmi_enable_w) AM_RANGE(0xf806, 0xf806) AM_WRITE(spinner_select_w) - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76489a_new_device, write) - AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76489a_new_device, write) - AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76489a_new_device, write) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76489a_device, write) + AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76489a_device, write) + AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76489a_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_map, AS_PROGRAM, 8, freekick_state ) @@ -218,10 +218,10 @@ static ADDRESS_MAP_START( gigas_map, AS_PROGRAM, 8, freekick_state ) AM_RANGE(0xe800, 0xe800) AM_READ_PORT("IN1") AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW1") AM_WRITENOP //bankswitch ? AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSW2") - AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76489a_new_device, write) - AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76489a_new_device, write) - AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76489a_new_device, write) + AM_RANGE(0xfc00, 0xfc00) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xfc01, 0xfc01) AM_DEVWRITE("sn2", sn76489a_device, write) + AM_RANGE(0xfc02, 0xfc02) AM_DEVWRITE("sn3", sn76489a_device, write) + AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76489a_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( gigas_io_map, AS_IO, 8, freekick_state ) @@ -654,19 +654,19 @@ static MACHINE_CONFIG_START( base, freekick_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, XTAL_12MHz/4) + MCFG_SOUND_ADD("sn1", SN76489A, XTAL_12MHz/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, XTAL_12MHz/4) + MCFG_SOUND_ADD("sn2", SN76489A, XTAL_12MHz/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489A_NEW, XTAL_12MHz/4) + MCFG_SOUND_ADD("sn3", SN76489A, XTAL_12MHz/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn4", SN76489A_NEW, XTAL_12MHz/4) + MCFG_SOUND_ADD("sn4", SN76489A, XTAL_12MHz/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index a69142764b3..ead162e3b8b 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -886,9 +886,9 @@ static ADDRESS_MAP_START( racknrol, AS_PROGRAM, 8, galaxold_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( racknrol_io, AS_IO, 8, galaxold_state ) - AM_RANGE(0x1d, 0x1d) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0x1e, 0x1e) AM_DEVWRITE("sn2", sn76496_new_device, write) - AM_RANGE(0x1f, 0x1f) AM_DEVWRITE("sn3", sn76496_new_device, write) + AM_RANGE(0x1d, 0x1d) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0x1e, 0x1e) AM_DEVWRITE("sn2", sn76496_device, write) + AM_RANGE(0x1f, 0x1f) AM_DEVWRITE("sn3", sn76496_device, write) AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_SHARE("racknrol_tbank") AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END @@ -910,7 +910,7 @@ READ8_MEMBER(galaxold_state::hexpoola_data_port_r) static ADDRESS_MAP_START( hexpoola_io, AS_IO, 8, galaxold_state ) AM_RANGE(0x00, 0x00) AM_READNOP AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_SHARE("racknrol_tbank") - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE("snsnd", sn76496_new_device, write) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE("snsnd", sn76496_device, write) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END @@ -938,7 +938,7 @@ READ8_MEMBER(galaxold_state::bullsdrtg_data_port_r) static ADDRESS_MAP_START( bullsdrtg_io_map, AS_IO, 8, galaxold_state ) AM_RANGE(0x00, 0x00) AM_READNOP AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_SHARE("racknrol_tbank") - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrtg_data_port_r) AM_DEVWRITE("snsnd", sn76496_new_device, write) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrtg_data_port_r) AM_DEVWRITE("snsnd", sn76496_device, write) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END @@ -2446,15 +2446,15 @@ static MACHINE_CONFIG_START( racknrol, galaxold_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, PIXEL_CLOCK/2) + MCFG_SOUND_ADD("sn1", SN76496, PIXEL_CLOCK/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, PIXEL_CLOCK/2) + MCFG_SOUND_ADD("sn2", SN76496, PIXEL_CLOCK/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76496_NEW, PIXEL_CLOCK/2) + MCFG_SOUND_ADD("sn3", SN76496, PIXEL_CLOCK/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END @@ -2504,7 +2504,7 @@ static MACHINE_CONFIG_START( hexpoola, galaxold_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76496_NEW, PIXEL_CLOCK/2) + MCFG_SOUND_ADD("snsnd", SN76496, PIXEL_CLOCK/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index 49444be96c1..616c22b74b6 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -341,7 +341,7 @@ static ADDRESS_MAP_START( gat_map, AS_PROGRAM, 8, gatron_state ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(gat_videoram_w) AM_SHARE("videoram") AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */ - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("snsnd", sn76496_new_device, write) /* PSG */ + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("snsnd", sn76496_device, write) /* PSG */ AM_RANGE(0xe000, 0xe000) AM_WRITE(output_port_0_w) /* lamps */ ADDRESS_MAP_END @@ -467,7 +467,7 @@ static MACHINE_CONFIG_START( gat, gatron_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76496_NEW, MASTER_CLOCK/8 ) /* 2 MHz, guess */ + MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8 ) /* 2 MHz, guess */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index fb7c6b76d44..927dff208c8 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -217,7 +217,7 @@ static ADDRESS_MAP_START( gberetb_map, AS_PROGRAM, 8, gberet_state ) AM_RANGE(0xe900, 0xe9ff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0xf000, 0xf000) AM_WRITENOP // coin counter not supported AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW2") - AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("snsnd", sn76489a_new_device, write) + AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("snsnd", sn76489a_device, write) AM_RANGE(0xf600, 0xf600) AM_READ_PORT("P2") AM_RANGE(0xf601, 0xf601) AM_READ_PORT("DSW1") AM_RANGE(0xf602, 0xf602) AM_READ_PORT("P1") @@ -444,7 +444,7 @@ static MACHINE_CONFIG_START( gberet, gberet_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, XTAL_18_432MHz/12) /* type verified on real and bootleg pcb */ + MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) /* type verified on real and bootleg pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END @@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( gberetb, gberet_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, XTAL_20MHz/12) // divider guessed + MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_20MHz/12) // divider guessed MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index b0aa15d7a02..197f2bdd84f 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -201,7 +201,7 @@ static ADDRESS_MAP_START( ncb3_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xf840, 0xf840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) // AM_RANGE(0xf850, 0xf850) AM_WRITE_LEGACY(ncb3_p1_flip_w) // need flip? // AM_RANGE(0xf860, 0xf860) AM_WRITE_LEGACY(ncb3_p2_flip_w) // need flip? - AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("snsnd", sn76489_new_device, write) /* guess... device is initialized, but doesn't seems to be used.*/ + AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("snsnd", sn76489_device, write) /* guess... device is initialized, but doesn't seems to be used.*/ ADDRESS_MAP_END static ADDRESS_MAP_START( ncb3_readwriteport, AS_IO, 8, goldstar_state ) @@ -377,7 +377,7 @@ static ADDRESS_MAP_START( lucky8_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0xb840, 0xb840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_new_device, write) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_device, write) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -422,7 +422,7 @@ static ADDRESS_MAP_START(magodds_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xb840, 0xb840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(magodds_outb850_w) //lamps AM_RANGE(0xb860, 0xb860) AM_WRITE(magodds_outb860_w) //watchdog - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_new_device, write) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_device, write) /* sound */ AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu",0xc000) ADDRESS_MAP_END @@ -444,7 +444,7 @@ static ADDRESS_MAP_START( kkotnoli_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xb830, 0xb830) AM_WRITENOP /* no ay8910 */ AM_RANGE(0xb840, 0xb840) AM_WRITENOP /* no ay8910 */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_new_device, write) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_device, write) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -482,7 +482,7 @@ static ADDRESS_MAP_START( ladylinr_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0xb840, 0xb840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) /* no sound... only use ports */ AM_RANGE(0xb850, 0xb850) AM_WRITENOP /* just turn off the lamps, if exist */ - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_new_device, write) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_device, write) /* sound */ AM_RANGE(0xf800, 0xffff) AM_RAM ADDRESS_MAP_END @@ -504,7 +504,7 @@ static ADDRESS_MAP_START( wcat3_map, AS_PROGRAM, 8, goldstar_state ) AM_RANGE(0xb830, 0xb830) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w) AM_RANGE(0xb840, 0xb840) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) - AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_new_device, write) /* sound */ + AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("snsnd", sn76489_device, write) /* sound */ // AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_3", i8255_device, read, write) /* Other PPI initialized? */ AM_RANGE(0xd000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xffff) AM_RAM @@ -6043,7 +6043,7 @@ static MACHINE_CONFIG_START( chrygld, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6085,7 +6085,7 @@ static MACHINE_CONFIG_START( cb3c, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6127,7 +6127,7 @@ static MACHINE_CONFIG_START( ncb3, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6284,7 +6284,7 @@ static MACHINE_CONFIG_START( lucky8, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6324,7 +6324,7 @@ static MACHINE_CONFIG_START( bingowng, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6364,7 +6364,7 @@ static MACHINE_CONFIG_START( bingownga, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6421,7 +6421,7 @@ static MACHINE_CONFIG_START( magodds, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) // shut up annoying whine MCFG_SOUND_CONFIG(psg_intf) @@ -6462,7 +6462,7 @@ static MACHINE_CONFIG_START( kkotnoli, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6499,7 +6499,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono' - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) @@ -6540,7 +6540,7 @@ static MACHINE_CONFIG_START( wcat3, goldstar_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, PSG_CLOCK) + MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index 09d50e35a5d..1cf37c1bc4d 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -80,7 +80,7 @@ public: m_sn(*this, "snsnd") { } /* devices */ - required_device<sn76489_new_device> m_sn; + required_device<sn76489_device> m_sn; struct ef9369 m_pal; emu_timer *m_fdc_timer; @@ -833,7 +833,7 @@ static MACHINE_CONFIG_START( guab, guab_state ) MCFG_SPEAKER_STANDARD_MONO("mono") /* TODO: Verify clock */ - MCFG_SOUND_ADD("snsnd", SN76489_NEW, 2000000) + MCFG_SOUND_ADD("snsnd", SN76489, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index e3f52f09690..c0436b92e98 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -535,7 +535,7 @@ static ADDRESS_MAP_START( mrokumei_map, AS_PROGRAM, 8, homedata_state ) AM_RANGE(0x8000, 0x8000) AM_WRITE(mrokumei_blitter_start_w) // in some games also ROM bank switch to access service ROM AM_RANGE(0x8001, 0x8001) AM_WRITE(mrokumei_keyboard_select_w) AM_RANGE(0x8002, 0x8002) AM_WRITE(mrokumei_sound_cmd_w) - AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("snsnd", sn76489a_new_device, write) + AM_RANGE(0x8003, 0x8003) AM_DEVWRITE("snsnd", sn76489a_device, write) AM_RANGE(0x8006, 0x8006) AM_WRITE(homedata_blitter_param_w) AM_RANGE(0x8007, 0x8007) AM_WRITE(mrokumei_blitter_bank_w) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -1145,7 +1145,7 @@ MACHINE_START_MEMBER(homedata_state,homedata) m_maincpu = machine().device<cpu_device>("maincpu"); m_audiocpu = machine().device<cpu_device>("audiocpu"); m_ym = machine().device("ymsnd"); - m_sn = machine().device<sn76489a_new_device>("snsnd"); + m_sn = machine().device<sn76489a_device>("snsnd"); m_dac = machine().device<dac_device>("dac"); save_item(NAME(m_visible_page)); @@ -1273,7 +1273,7 @@ static MACHINE_CONFIG_START( mrokumei, homedata_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, 16000000/4) // SN76489AN actually + MCFG_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) @@ -1393,7 +1393,7 @@ static MACHINE_CONFIG_START( pteacher, homedata_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, 16000000/4) // SN76489AN actually + MCFG_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index fbdb3f124eb..7a918b2a18b 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -320,7 +320,7 @@ static MACHINE_CONFIG_START( hyperspt, hyperspt_state ) MCFG_DAC_ADD("dac") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("snsnd", SN76496_NEW, XTAL_14_31818MHz/8) /* verified on pcb */ + MCFG_SOUND_ADD("snsnd", SN76496, XTAL_14_31818MHz/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index d3872bddefb..6ebb47c1c6a 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -64,8 +64,8 @@ static ADDRESS_MAP_START( ikki_cpu2, AS_PROGRAM, 8, ikki_state ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1") - AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_device, write) ADDRESS_MAP_END @@ -284,11 +284,11 @@ static MACHINE_CONFIG_START( ikki, ikki_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 8000000/4) + MCFG_SOUND_ADD("sn1", SN76496, 8000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 8000000/2) + MCFG_SOUND_ADD("sn2", SN76496, 8000000/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index f703dd399fc..5fd0620de97 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -142,7 +142,7 @@ static ADDRESS_MAP_START( jailbrek_map, AS_PROGRAM, 8, jailbrek_state ) AM_RANGE(0x2043, 0x2043) AM_WRITENOP /* ??? */ AM_RANGE(0x2044, 0x2044) AM_WRITE(ctrl_w) /* irq, nmi enable, screen flip */ AM_RANGE(0x3000, 0x307f) AM_RAM /* related to sprites? */ - AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE("snsnd", sn76489a_new_device, write) + AM_RANGE(0x3100, 0x3100) AM_READ_PORT("DSW2") AM_DEVWRITE("snsnd", sn76489a_device, write) AM_RANGE(0x3200, 0x3200) AM_READ_PORT("DSW3") AM_WRITENOP /* mirror of the previous? */ AM_RANGE(0x3300, 0x3300) AM_READ_PORT("SYSTEM") AM_WRITE(watchdog_reset_w) AM_RANGE(0x3301, 0x3301) AM_READ_PORT("P1") @@ -285,7 +285,7 @@ static MACHINE_CONFIG_START( jailbrek, jailbrek_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, MASTER_CLOCK/12) + MCFG_SOUND_ADD("snsnd", SN76489A, MASTER_CLOCK/12) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index fc4356f4d8b..c5aa054e230 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -333,8 +333,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( jantotsu_io, AS_IO, 8, jantotsu_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0x01, 0x01) AM_READ(jantotsu_dsw2_r) AM_DEVWRITE("sn2", sn76489a_new_device, write) + AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0x01, 0x01) AM_READ(jantotsu_dsw2_r) AM_DEVWRITE("sn2", sn76489a_device, write) AM_RANGE(0x02, 0x03) AM_WRITE(jan_adpcm_w) AM_RANGE(0x04, 0x04) AM_READWRITE(jantotsu_mux_r, jantotsu_mux_w) AM_RANGE(0x07, 0x07) AM_WRITE(bankaddr_w) @@ -536,11 +536,11 @@ static MACHINE_CONFIG_START( jantotsu, jantotsu_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, MAIN_CLOCK/4) + MCFG_SOUND_ADD("sn1", SN76489A, MAIN_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, MAIN_CLOCK/4) + MCFG_SOUND_ADD("sn2", SN76489A, MAIN_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/jpmmps.c b/src/mame/drivers/jpmmps.c index 8eacd533c6a..e88ed59184e 100644 --- a/src/mame/drivers/jpmmps.c +++ b/src/mame/drivers/jpmmps.c @@ -182,7 +182,7 @@ static MACHINE_CONFIG_START( jpmmps, jpmmps_state ) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn", SN76489_NEW, SOUND_CLOCK) + MCFG_SOUND_ADD("sn", SN76489, SOUND_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index ab4ddbb5b19..5d801bb11b6 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -54,8 +54,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, kncljoe_state ) AM_RANGE(0xd804, 0xd804) AM_READ_PORT("DSWB") AM_RANGE(0xd800, 0xd800) AM_WRITE(sound_cmd_w) AM_RANGE(0xd801, 0xd801) AM_WRITE(kncljoe_control_w) - AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0xd803, 0xd803) AM_DEVWRITE("sn2", sn76489_new_device, write) + AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0xd803, 0xd803) AM_DEVWRITE("sn2", sn76489_device, write) AM_RANGE(0xd807, 0xd807) AM_READNOP /* unknown read */ AM_RANGE(0xd817, 0xd817) AM_READNOP /* unknown read */ AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("spriteram") @@ -318,11 +318,11 @@ static MACHINE_CONFIG_START( kncljoe, kncljoe_state ) MCFG_SOUND_CONFIG(ay8910_config) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MCFG_SOUND_ADD("sn1", SN76489_NEW, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_SOUND_ADD("sn1", SN76489, XTAL_3_579545MHz) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_SOUND_ADD("sn2", SN76489, XTAL_3_579545MHz) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/kontest.c b/src/mame/drivers/kontest.c index be6c135956d..b261a915edd 100644 --- a/src/mame/drivers/kontest.c +++ b/src/mame/drivers/kontest.c @@ -167,8 +167,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kontest_io, AS_IO, 8, kontest_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0x04, 0x04) AM_DEVWRITE("sn2", sn76489a_new_device, write) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0x04, 0x04) AM_DEVWRITE("sn2", sn76489a_device, write) AM_RANGE(0x08, 0x08) AM_WRITE(control_w) AM_RANGE(0x0c, 0x0c) AM_READ_PORT("IN0") AM_RANGE(0x0d, 0x0d) AM_READ_PORT("IN1") @@ -280,11 +280,11 @@ static MACHINE_CONFIG_START( kontest, kontest_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, MAIN_CLOCK/16) + MCFG_SOUND_ADD("sn1", SN76489A, MAIN_CLOCK/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, MAIN_CLOCK/16) + MCFG_SOUND_ADD("sn2", SN76489A, MAIN_CLOCK/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index d4c31be5f02..eb3f53ef1f1 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -134,8 +134,8 @@ static ADDRESS_MAP_START( ladybug_map, AS_PROGRAM, 8, ladybug_state ) AM_RANGE(0x9002, 0x9002) AM_READ_PORT("DSW0") AM_RANGE(0x9003, 0x9003) AM_READ_PORT("DSW1") AM_RANGE(0xa000, 0xa000) AM_WRITE(ladybug_flipscreen_w) - AM_RANGE(0xb000, 0xbfff) AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("sn2", sn76489_new_device, write) + AM_RANGE(0xb000, 0xbfff) AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("sn2", sn76489_device, write) AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(ladybug_videoram_w) AM_SHARE("videoram") AM_RANGE(0xd400, 0xd7ff) AM_RAM_WRITE(ladybug_colorram_w) AM_SHARE("colorram") AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN2") @@ -172,11 +172,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sraider_cpu2_io_map, AS_IO, 8, ladybug_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x08, 0x08) AM_DEVWRITE("sn2", sn76489_new_device, write) - AM_RANGE(0x10, 0x10) AM_DEVWRITE("sn3", sn76489_new_device, write) - AM_RANGE(0x18, 0x18) AM_DEVWRITE("sn4", sn76489_new_device, write) - AM_RANGE(0x20, 0x20) AM_DEVWRITE("sn5", sn76489_new_device, write) + AM_RANGE(0x00, 0x00) AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x08, 0x08) AM_DEVWRITE("sn2", sn76489_device, write) + AM_RANGE(0x10, 0x10) AM_DEVWRITE("sn3", sn76489_device, write) + AM_RANGE(0x18, 0x18) AM_DEVWRITE("sn4", sn76489_device, write) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("sn5", sn76489_device, write) AM_RANGE(0x28, 0x3f) AM_WRITE(sraider_misc_w) // lots unknown ADDRESS_MAP_END @@ -799,11 +799,11 @@ static MACHINE_CONFIG_START( ladybug, ladybug_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn1", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn2", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END @@ -842,23 +842,23 @@ static MACHINE_CONFIG_START( sraider, ladybug_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn1", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn2", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn3", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn4", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn4", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn5", SN76489_NEW, 4000000) + MCFG_SOUND_ADD("sn5", SN76489, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index 2f12ee371ed..db7930a71e6 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -534,11 +534,11 @@ static MACHINE_CONFIG_START( base, lasso_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489.1", SN76489_NEW, 2000000) + MCFG_SOUND_ADD("sn76489.1", SN76489, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn76489.2", SN76489_NEW, 2000000) + MCFG_SOUND_ADD("sn76489.2", SN76489, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c index 2ff0f56e3b0..2b22b1f4258 100644 --- a/src/mame/drivers/lucky74.c +++ b/src/mame/drivers/lucky74.c @@ -924,11 +924,11 @@ static ADDRESS_MAP_START( lucky74_map, AS_PROGRAM, 8, lucky74_state ) AM_RANGE(0xf000, 0xf003) AM_DEVREADWRITE("ppi8255_0", i8255_device, read, write) /* Input Ports 0 & 1 */ AM_RANGE(0xf080, 0xf083) AM_DEVREADWRITE("ppi8255_2", i8255_device, read, write) /* DSW 1, 2 & 3 */ AM_RANGE(0xf0c0, 0xf0c3) AM_DEVREADWRITE("ppi8255_3", i8255_device, read, write) /* DSW 4 */ - AM_RANGE(0xf100, 0xf100) AM_DEVWRITE("sn1", sn76489_new_device, write) /* SN76489 #1 */ + AM_RANGE(0xf100, 0xf100) AM_DEVWRITE("sn1", sn76489_device, write) /* SN76489 #1 */ AM_RANGE(0xf200, 0xf203) AM_DEVREADWRITE("ppi8255_1", i8255_device, read, write) /* Input Ports 2 & 4 */ - AM_RANGE(0xf300, 0xf300) AM_DEVWRITE("sn2", sn76489_new_device, write) /* SN76489 #2 */ + AM_RANGE(0xf300, 0xf300) AM_DEVWRITE("sn2", sn76489_device, write) /* SN76489 #2 */ AM_RANGE(0xf400, 0xf400) AM_DEVWRITE_LEGACY("aysnd", ay8910_address_w) /* YM2149 control */ - AM_RANGE(0xf500, 0xf500) AM_DEVWRITE("sn3", sn76489_new_device, write) /* SN76489 #3 */ + AM_RANGE(0xf500, 0xf500) AM_DEVWRITE("sn3", sn76489_device, write) /* SN76489 #3 */ AM_RANGE(0xf600, 0xf600) AM_DEVREADWRITE_LEGACY("aysnd", ay8910_r, ay8910_data_w) /* YM2149 (Input Port 1) */ AM_RANGE(0xf700, 0xf701) AM_READWRITE(usart_8251_r, usart_8251_w) /* USART 8251 port */ AM_RANGE(0xf800, 0xf803) AM_READWRITE(copro_sm7831_r, copro_sm7831_w) /* SM7831 Co-Processor */ @@ -1388,15 +1388,15 @@ static MACHINE_CONFIG_START( lucky74, lucky74_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, C_06B49P_CLKOUT_03) /* 3 MHz. */ + MCFG_SOUND_ADD("sn1", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, C_06B49P_CLKOUT_03) /* 3 MHz. */ + MCFG_SOUND_ADD("sn2", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489_NEW, C_06B49P_CLKOUT_03) /* 3 MHz. */ + MCFG_SOUND_ADD("sn3", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c index 21d8642b0c0..0e89fd83a39 100644 --- a/src/mame/drivers/markham.c +++ b/src/mame/drivers/markham.c @@ -49,8 +49,8 @@ static ADDRESS_MAP_START( markham_slave_map, AS_PROGRAM, 8, markham_state ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share1") - AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0xc001, 0xc001) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0xc001, 0xc001) AM_DEVWRITE("sn2", sn76496_device, write) AM_RANGE(0xc002, 0xc002) AM_WRITENOP /* unknown */ AM_RANGE(0xc003, 0xc003) AM_WRITENOP /* unknown */ @@ -217,11 +217,11 @@ static MACHINE_CONFIG_START( markham, markham_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 8000000/2) + MCFG_SOUND_ADD("sn1", SN76496, 8000000/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 8000000/2) + MCFG_SOUND_ADD("sn2", SN76496, 8000000/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 86ffa05c755..6265d556f4d 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -602,7 +602,7 @@ ADDRESS_MAP_END /* basically from src/drivers/segasyse.c */ static ADDRESS_MAP_START( megaplay_bios_io_map, AS_IO, 8, mplay_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("sn2", sn76496_new_device, write) /* SN76489 */ + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("sn2", sn76496_device, write) /* SN76489 */ AM_RANGE(0xbe, 0xbe) AM_READWRITE_LEGACY(sms_vdp_data_r, sms_vdp_data_w) /* VDP */ AM_RANGE(0xbf, 0xbf) AM_READWRITE_LEGACY(sms_vdp_ctrl_r, sms_vdp_ctrl_w) /* VDP */ ADDRESS_MAP_END @@ -663,7 +663,7 @@ static MACHINE_CONFIG_START( megaplay, mplay_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_SOUND_ADD("sn2", SN76496_NEW, MASTER_CLOCK/15) + MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index e0f8c498840..34e84e5d4a9 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -539,7 +539,7 @@ static MACHINE_CONFIG_START( megatech, mtech_state ) MCFG_SCREEN_VBLANK_DRIVER(mtech_state, screen_eof_mtnew) /* sound hardware */ - MCFG_SOUND_ADD("sn2", SN76496_NEW, MASTER_CLOCK/15) + MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index dd0425a118b..85abdd673ce 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -121,9 +121,9 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, mikie_state ) AM_RANGE(0x4000, 0x43ff) AM_RAM AM_RANGE(0x8000, 0x8000) AM_WRITENOP // sound command latch AM_RANGE(0x8001, 0x8001) AM_WRITENOP // ??? - AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76489a_new_device, write) // trigger read of latch + AM_RANGE(0x8002, 0x8002) AM_DEVWRITE("sn1", sn76489a_device, write) // trigger read of latch AM_RANGE(0x8003, 0x8003) AM_READ(soundlatch_byte_r) - AM_RANGE(0x8004, 0x8004) AM_DEVWRITE("sn2", sn76489a_new_device, write) // trigger read of latch + AM_RANGE(0x8004, 0x8004) AM_DEVWRITE("sn2", sn76489a_device, write) // trigger read of latch AM_RANGE(0x8005, 0x8005) AM_READ(mikie_sh_timer_r) AM_RANGE(0x8079, 0x8079) AM_WRITENOP // ??? AM_RANGE(0xa003, 0xa003) AM_WRITENOP // ??? @@ -297,11 +297,11 @@ static MACHINE_CONFIG_START( mikie, mikie_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, XTAL/8) + MCFG_SOUND_ADD("sn1", SN76489A, XTAL/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, CLK) + MCFG_SOUND_ADD("sn2", SN76489A, CLK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index 0dcb4f822da..730dfebab53 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -233,8 +233,8 @@ static ADDRESS_MAP_START( mjkjidai_io_map, AS_IO, 8, mjkjidai_state ) AM_RANGE(0x10, 0x10) AM_WRITE(mjkjidai_ctrl_w) // rom bank, coin counter, flip screen etc AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0") AM_RANGE(0x12, 0x12) AM_READ_PORT("IN1") - AM_RANGE(0x20, 0x20) AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x30, 0x30) AM_DEVWRITE("sn2", sn76489_new_device, write) + AM_RANGE(0x20, 0x20) AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x30, 0x30) AM_DEVWRITE("sn2", sn76489_device, write) AM_RANGE(0x40, 0x40) AM_WRITE(adpcm_w) ADDRESS_MAP_END @@ -465,11 +465,11 @@ static MACHINE_CONFIG_START( mjkjidai, mjkjidai_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, 10000000/4) + MCFG_SOUND_ADD("sn1", SN76489, 10000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 10000000/4) + MCFG_SOUND_ADD("sn2", SN76489, 10000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index 434bb086f85..00e512d0c15 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -46,8 +46,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mrdo_state ) AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(mrdo_fgvideoram_w) AM_SHARE("fgvideoram") AM_RANGE(0x9000, 0x90ff) AM_WRITEONLY AM_SHARE("spriteram") AM_RANGE(0x9800, 0x9800) AM_WRITE(mrdo_flipscreen_w) /* screen flip + playfield priority */ - AM_RANGE(0x9801, 0x9801) AM_DEVWRITE("u8106_1", u8106_new_device, write) - AM_RANGE(0x9802, 0x9802) AM_DEVWRITE("u8106_2", u8106_new_device, write) + AM_RANGE(0x9801, 0x9801) AM_DEVWRITE("u8106_1", u8106_device, write) + AM_RANGE(0x9802, 0x9802) AM_DEVWRITE("u8106_2", u8106_device, write) AM_RANGE(0x9803, 0x9803) AM_READ(mrdo_SECRE_r) AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1") AM_RANGE(0xa001, 0xa001) AM_READ_PORT("P2") @@ -200,11 +200,11 @@ static MACHINE_CONFIG_START( mrdo, mrdo_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("u8106_1", U8106_NEW, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */ + MCFG_SOUND_ADD("u8106_1", U8106, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("u8106_2", U8106_NEW, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */ + MCFG_SOUND_ADD("u8106_2", U8106, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c index 50f6129d638..ff0bf3875f5 100644 --- a/src/mame/drivers/mrjong.c +++ b/src/mame/drivers/mrjong.c @@ -78,8 +78,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mrjong_io_map, AS_IO, 8, mrjong_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ_PORT("P2") AM_WRITE(mrjong_flipscreen_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW") AM_DEVWRITE("sn2", sn76489_new_device, write) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW") AM_DEVWRITE("sn2", sn76489_device, write) AM_RANGE(0x03, 0x03) AM_READ(io_0x03_r) // Unknown ADDRESS_MAP_END @@ -218,11 +218,11 @@ static MACHINE_CONFIG_START( mrjong, mrjong_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, 15468000/6) + MCFG_SOUND_ADD("sn1", SN76489, 15468000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 15468000/6) + MCFG_SOUND_ADD("sn2", SN76489, 15468000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index 6b84fc649ce..e3cae96050e 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -146,8 +146,8 @@ static ADDRESS_MAP_START( pachifev_map, AS_PROGRAM, 8, pachifev_state ) AM_RANGE(0xff08, 0xff08) AM_READ_PORT("DSW3") AM_RANGE(0xff10, 0xff10) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) AM_RANGE(0xff12, 0xff12) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write) - AM_RANGE(0xff20, 0xff20) AM_DEVWRITE("y2404_1", y2404_new_device, write) - AM_RANGE(0xff30, 0xff30) AM_DEVWRITE("y2404_2", y2404_new_device, write) + AM_RANGE(0xff20, 0xff20) AM_DEVWRITE("y2404_1", y2404_device, write) + AM_RANGE(0xff30, 0xff30) AM_DEVWRITE("y2404_2", y2404_device, write) AM_RANGE(0xff40, 0xff40) AM_WRITE(controls_w) AM_RANGE(0xff50, 0xff50) AM_WRITENOP /* unknown */ AM_RANGE(0xfffa, 0xfffb) AM_NOP /* decrementer */ @@ -393,10 +393,10 @@ static MACHINE_CONFIG_START( pachifev, pachifev_state ) MCFG_SOUND_CONFIG(msm5205_config) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) #endif - MCFG_SOUND_ADD("y2404_1", Y2404_NEW, XTAL_10_738635MHz/3) /* guess */ + MCFG_SOUND_ADD("y2404_1", Y2404, XTAL_10_738635MHz/3) /* guess */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("y2404_2", Y2404_NEW, XTAL_10_738635MHz/3) /* guess */ + MCFG_SOUND_ADD("y2404_2", Y2404, XTAL_10_738635MHz/3) /* guess */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 448589c517b..f5c575ffe25 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -1308,8 +1308,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vanvan_portmap, AS_IO, 8, pacman_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x01, 0x01) AM_DEVWRITE("namco", sn76496_new_device, write) - AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0x01, 0x01) AM_DEVWRITE("namco", sn76496_device, write) + AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn2", sn76496_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( dremshpr_portmap, AS_IO, 8, pacman_state ) @@ -1347,7 +1347,7 @@ static ADDRESS_MAP_START( bigbucks_portmap, AS_IO, 8, pacman_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( s2650games_writeport, AS_IO, 8, pacman_state ) - AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE("namco", sn76496_new_device, write) + AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE("namco", sn76496_device, write) ADDRESS_MAP_END static ADDRESS_MAP_START( drivfrcp_portmap, AS_IO, 8, pacman_state ) @@ -3418,10 +3418,10 @@ static MACHINE_CONFIG_DERIVED( vanvan, pacman ) MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1, 0*8, 28*8-1) /* sound hardware */ - MCFG_SOUND_REPLACE("namco", SN76496_NEW, 1789750) + MCFG_SOUND_REPLACE("namco", SN76496, 1789750) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 1789750) + MCFG_SOUND_ADD("sn2", SN76496, 1789750) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END @@ -3459,7 +3459,7 @@ static MACHINE_CONFIG_DERIVED( s2650games, pacman ) MCFG_VIDEO_START_OVERRIDE(pacman_state,s2650games) /* sound hardware */ - MCFG_SOUND_REPLACE("namco", SN76496_NEW, MASTER_CLOCK/6) /* 1H */ + MCFG_SOUND_REPLACE("namco", SN76496, MASTER_CLOCK/6) /* 1H */ MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index a25bcae31e9..d41111bb71b 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -96,7 +96,7 @@ static ADDRESS_MAP_START( pingpong_map, AS_PROGRAM, 8, pingpong_state ) AM_RANGE(0xa980, 0xa980) AM_READ_PORT("DSW2") AM_RANGE(0xa000, 0xa000) AM_WRITE(coin_w) /* coin counters + irq enables */ AM_RANGE(0xa200, 0xa200) AM_WRITENOP /* SN76496 data latch */ - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("snsnd", sn76496_new_device, write) /* trigger read */ + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("snsnd", sn76496_device, write) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( merlinmm_map, AS_PROGRAM, 8, pingpong_state ) AM_RANGE(0xa100, 0xa100) AM_READ_PORT("IN2") AM_RANGE(0xa180, 0xa180) AM_READ_PORT("IN3") AM_RANGE(0xa200, 0xa200) AM_WRITENOP /* SN76496 data latch */ - AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("snsnd", sn76496_new_device, write) /* trigger read */ + AM_RANGE(0xa400, 0xa400) AM_DEVWRITE("snsnd", sn76496_device, write) /* trigger read */ AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w) ADDRESS_MAP_END @@ -479,7 +479,7 @@ static MACHINE_CONFIG_START( pingpong, pingpong_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76496_NEW, 18432000/8) + MCFG_SOUND_ADD("snsnd", SN76496, 18432000/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index 027a9313c6f..571001d956f 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -137,8 +137,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, retofinv_state ) AM_RANGE(0x2000, 0x27ff) AM_RAM AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_byte_r) AM_RANGE(0x6000, 0x6000) AM_WRITE(cpu2_m6000_w) - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn2", sn76496_device, write) AM_RANGE(0xe000, 0xffff) AM_ROM /* space for diagnostic ROM */ ADDRESS_MAP_END @@ -395,11 +395,11 @@ static MACHINE_CONFIG_START( retofinv, retofinv_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 18432000/6) + MCFG_SOUND_ADD("sn1", SN76496, 18432000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 18432000/6) + MCFG_SOUND_ADD("sn2", SN76496, 18432000/6) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index f99a695dfbc..4f949b535e9 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -223,7 +223,7 @@ static MACHINE_CONFIG_START( sbasketb, sbasketb_state ) MCFG_DAC_ADD("dac") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("snsnd", SN76489_NEW, XTAL_14_31818MHz / 8) + MCFG_SOUND_ADD("snsnd", SN76489, XTAL_14_31818MHz / 8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 38a765221d7..874d719be67 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -116,8 +116,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sbugger_io_map, AS_IO, 8, sbugger_state ) AM_RANGE(0xe0, 0xe7) AM_DEVREADWRITE("i8156", i8155_device, io_r, io_w) - AM_RANGE(0xe8, 0xe8) AM_DEVWRITE("sn76489.1", sn76489_new_device, write) - AM_RANGE(0xe9, 0xe9) AM_DEVWRITE("sn76489.2", sn76489_new_device, write) + AM_RANGE(0xe8, 0xe8) AM_DEVWRITE("sn76489.1", sn76489_device, write) + AM_RANGE(0xe9, 0xe9) AM_DEVWRITE("sn76489.2", sn76489_device, write) ADDRESS_MAP_END @@ -262,11 +262,11 @@ static MACHINE_CONFIG_START( sbugger, sbugger_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489.1", SN76489_NEW, 3000000) + MCFG_SOUND_ADD("sn76489.1", SN76489, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn76489.2", SN76489_NEW, 3000000) + MCFG_SOUND_ADD("sn76489.2", SN76489, 3000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 57f84cdfa7f..cd830fd2bfb 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -1413,7 +1413,7 @@ static MACHINE_CONFIG_START( segac, segac2_state ) MCFG_SOUND_ROUTE(0, "mono", 0.50) /* right channel not connected */ - MCFG_SOUND_ADD("snsnd", SN76496_NEW, XL2_CLOCK/15) + MCFG_SOUND_ADD("snsnd", SN76496, XL2_CLOCK/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index c65c49584d2..c1ebd10ead3 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -425,8 +425,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, AS_IO, 8, systeme_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7b, 0x7b) AM_DEVWRITE("sn1", segapsg_new_device, write ) - AM_RANGE(0x7e, 0x7f) AM_DEVWRITE("sn2", segapsg_new_device, write ) + AM_RANGE(0x7b, 0x7b) AM_DEVWRITE("sn1", segapsg_device, write ) + AM_RANGE(0x7e, 0x7f) AM_DEVWRITE("sn2", segapsg_device, write ) AM_RANGE(0x7e, 0x7e) AM_DEVREAD( "vdp1", sega315_5124_device, vcount_read ) AM_RANGE(0xba, 0xba) AM_DEVREADWRITE( "vdp1", sega315_5124_device, vram_read, vram_write ) AM_RANGE(0xbb, 0xbb) AM_DEVREADWRITE( "vdp1", sega315_5124_device, register_read, register_write ) @@ -1132,11 +1132,11 @@ static MACHINE_CONFIG_START( systeme, systeme_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SEGAPSG_NEW, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD("sn1", SEGAPSG, XTAL_10_738635MHz/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SEGAPSG_NEW, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD("sn2", SEGAPSG, XTAL_10_738635MHz/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index 2adb760c07b..d65892f050f 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -946,11 +946,11 @@ static MACHINE_CONFIG_DERIVED( sindbadm, g80r_base ) MCFG_CPU_PERIODIC_INT_DRIVER(segag80r_state, irq0_line_hold, 4*60) /* sound hardware */ - MCFG_SOUND_ADD("sn1", SN76496_NEW, SINDBADM_SOUND_CLOCK/4) + MCFG_SOUND_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, SINDBADM_SOUND_CLOCK/2) + MCFG_SOUND_ADD("sn2", SN76496, SINDBADM_SOUND_CLOCK/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index 31872f46ac1..cdcd64144cb 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -160,9 +160,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( senjyo_sound_map, AS_PROGRAM, 8, senjyo_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("sn2", sn76496_new_device, write) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn3", sn76496_new_device, write) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("sn2", sn76496_device, write) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn3", sn76496_device, write) AM_RANGE(0xd000, 0xd000) AM_WRITE(senjyo_volume_w) #if 0 AM_RANGE(0xe000, 0xe000) AM_WRITE_LEGACY(unknown) @@ -228,9 +228,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( starforb_sound_map, AS_PROGRAM, 8, senjyo_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_RAM - AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("sn2", sn76496_new_device, write) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn3", sn76496_new_device, write) + AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("sn2", sn76496_device, write) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn3", sn76496_device, write) AM_RANGE(0xd000, 0xd000) AM_WRITE(senjyo_volume_w) #if 0 AM_RANGE(0xe000, 0xe000) AM_WRITE_LEGACY(unknown) @@ -597,15 +597,15 @@ static MACHINE_CONFIG_START( senjyo, senjyo_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn1", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn2", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn3", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index e9bf7b9292b..09b9f9da89e 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -146,7 +146,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( io_map, AS_IO, 8, sg1000a_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("snsnd", sn76489_new_device, write) + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("snsnd", sn76489_device, write) AM_RANGE(0xbe, 0xbe) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) AM_RANGE(0xbf, 0xbf) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write) AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) @@ -305,7 +305,7 @@ static MACHINE_CONFIG_START( sg1000a, sg1000a_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76489_NEW, XTAL_3_579545MHz) + MCFG_SOUND_ADD("snsnd", SN76489, XTAL_3_579545MHz) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c index be26f8db7c1..ff9371d7638 100644 --- a/src/mame/drivers/shaolins.c +++ b/src/mame/drivers/shaolins.c @@ -29,8 +29,8 @@ static ADDRESS_MAP_START( shaolins_map, AS_PROGRAM, 8, shaolins_state ) AM_RANGE(0x0000, 0x0000) AM_WRITE(shaolins_nmi_w) /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */ /* bit 3, bit 4 = coin counters */ AM_RANGE(0x0100, 0x0100) AM_WRITE(watchdog_reset_w) - AM_RANGE(0x0300, 0x0300) AM_DEVWRITE("sn1", sn76489a_new_device, write) /* trigger chip to read from latch. The program always */ - AM_RANGE(0x0400, 0x0400) AM_DEVWRITE("sn2", sn76489a_new_device, write) /* writes the same number as the latch, so we don't */ + AM_RANGE(0x0300, 0x0300) AM_DEVWRITE("sn1", sn76489a_device, write) /* trigger chip to read from latch. The program always */ + AM_RANGE(0x0400, 0x0400) AM_DEVWRITE("sn2", sn76489a_device, write) /* writes the same number as the latch, so we don't */ /* bother emulating them. */ AM_RANGE(0x0500, 0x0500) AM_READ_PORT("DSW1") AM_RANGE(0x0600, 0x0600) AM_READ_PORT("DSW2") @@ -223,11 +223,11 @@ static MACHINE_CONFIG_START( shaolins, shaolins_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, MASTER_CLOCK/12) /* verified on pcb */ + MCFG_SOUND_ADD("sn1", SN76489A, MASTER_CLOCK/12) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, MASTER_CLOCK/6) /* verified on pcb */ + MCFG_SOUND_ADD("sn2", SN76489A, MASTER_CLOCK/6) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END @@ -235,11 +235,11 @@ MACHINE_CONFIG_END #if 0 // a bootleg board was found with downgraded sound hardware, but is otherwise the same static MACHINE_CONFIG_DERIVED( shaolinb, shaolins ) - MCFG_SOUND_REPLACE("sn1", SN76489_NEW, MASTER_CLOCK/12) /* only type verified on pcb */ + MCFG_SOUND_REPLACE("sn1", SN76489, MASTER_CLOCK/12) /* only type verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_REPLACE("sn2", SN76489_NEW, MASTER_CLOCK/6) /* only type verified on pcb */ + MCFG_SOUND_REPLACE("sn2", SN76489, MASTER_CLOCK/6) /* only type verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 6c9d8da5bb2..573fa1146d4 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -443,15 +443,15 @@ static MACHINE_CONFIG_START( spaceg, spaceg_state ) /* sound hardware */ // MCFG_SPEAKER_STANDARD_MONO("mono") -// MCFG_SOUND_ADD("sn1", SN76496_NEW, 15468480/4) +// MCFG_SOUND_ADD("sn1", SN76496, 15468480/4) // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // MCFG_SOUND_CONFIG(psg_intf) -// MCFG_SOUND_ADD("sn2", SN76496_NEW, 15468480/4) +// MCFG_SOUND_ADD("sn2", SN76496, 15468480/4) // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // MCFG_SOUND_CONFIG(psg_intf) -// MCFG_SOUND_ADD("sn3", SN76496_NEW, 15468480/4) +// MCFG_SOUND_ADD("sn3", SN76496, 15468480/4) // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index 577569a3f51..696e45efd89 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -287,15 +287,15 @@ static MACHINE_CONFIG_START( spcforce, spcforce_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn1", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn2", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn3", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index e8af36f7516..15727574ecb 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -112,9 +112,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sprcros2_master_io_map, AS_IO, 8, sprcros2_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76489_new_device, write) - AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76489_new_device, write) - AM_RANGE(0x02, 0x02) AM_READ_PORT("EXTRA") AM_DEVWRITE("sn3", sn76489_new_device, write) + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76489_device, write) + AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76489_device, write) + AM_RANGE(0x02, 0x02) AM_READ_PORT("EXTRA") AM_DEVWRITE("sn3", sn76489_device, write) AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") AM_RANGE(0x05, 0x05) AM_READ_PORT("DSW2") AM_RANGE(0x07, 0x07) AM_WRITE(sprcros2_m_port7_w) @@ -304,15 +304,15 @@ static MACHINE_CONFIG_START( sprcros2, sprcros2_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489_NEW, 10000000/4) + MCFG_SOUND_ADD("sn1", SN76489, 10000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489_NEW, 10000000/4) + MCFG_SOUND_ADD("sn2", SN76489, 10000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn3", SN76489_NEW, 10000000/4) + MCFG_SOUND_ADD("sn3", SN76489, 10000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index c668ef12b6b..1f184f0b1bd 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -103,8 +103,8 @@ static ADDRESS_MAP_START( strnskil_map2, AS_PROGRAM, 8, strnskil_state ) AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1") - AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0xd801, 0xd801) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn2", sn76496_device, write) ADDRESS_MAP_END @@ -375,11 +375,11 @@ static MACHINE_CONFIG_START( strnskil, strnskil_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 8000000/4) + MCFG_SOUND_ADD("sn1", SN76496, 8000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 8000000/2) + MCFG_SOUND_ADD("sn2", SN76496, 8000000/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 5202859f15b..7674f1efa5d 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -215,7 +215,7 @@ static ADDRESS_MAP_START( superdq_io, AS_IO, 8, superdq_state ) AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW1") AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW2") - AM_RANGE(0x04, 0x04) AM_READ(superdq_ld_r) AM_DEVWRITE("snsnd", sn76496_new_device, write) + AM_RANGE(0x04, 0x04) AM_READ(superdq_ld_r) AM_DEVWRITE("snsnd", sn76496_device, write) AM_RANGE(0x08, 0x08) AM_WRITE(superdq_io_w) AM_RANGE(0x0c, 0x0d) AM_NOP /* HD46505S */ ADDRESS_MAP_END @@ -361,7 +361,7 @@ static MACHINE_CONFIG_START( superdq, superdq_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("snsnd", SN76496_NEW, MASTER_CLOCK/8) + MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index b5d8735e30b..4a74d19d460 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -45,8 +45,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, suprloco_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_DEVWRITE("sn1", sn76496_new_device, write) - AM_RANGE(0xc000, 0xc003) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0xa000, 0xa003) AM_DEVWRITE("sn1", sn76496_device, write) + AM_RANGE(0xc000, 0xc003) AM_DEVWRITE("sn2", sn76496_device, write) AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_byte_r) ADDRESS_MAP_END @@ -192,11 +192,11 @@ static MACHINE_CONFIG_START( suprloco, suprloco_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 4000000) + MCFG_SOUND_ADD("sn1", SN76496, 4000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 2000000) + MCFG_SOUND_ADD("sn2", SN76496, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index 4f4fdc5f385..d704a4246a4 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -770,8 +770,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, system1_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76489a_new_device, write) - AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1fff) AM_DEVWRITE("sn2", sn76489a_new_device, write) + AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76489a_device, write) + AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x1fff) AM_DEVWRITE("sn2", sn76489a_device, write) AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fff) AM_READ(sound_data_r) ADDRESS_MAP_END @@ -2171,11 +2171,11 @@ static MACHINE_CONFIG_START( sys1ppi, system1_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, SOUND_CLOCK/4) + MCFG_SOUND_ADD("sn1", SN76489A, SOUND_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, SOUND_CLOCK/2) /* selectable via jumper */ + MCFG_SOUND_ADD("sn2", SN76489A, SOUND_CLOCK/2) /* selectable via jumper */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index 7a25028e9b4..593ddbc599d 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -192,9 +192,9 @@ static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8, tp84_state ) AM_RANGE(0x8000, 0x8000) AM_READ(tp84_sh_timer_r) AM_RANGE(0xa000, 0xa1ff) AM_WRITE(tp84_filter_w) AM_RANGE(0xc000, 0xc000) AM_WRITENOP - AM_RANGE(0xc001, 0xc001) AM_DEVWRITE("y2404_1", y2404_new_device, write) - AM_RANGE(0xc003, 0xc003) AM_DEVWRITE("y2404_2", y2404_new_device, write) - AM_RANGE(0xc004, 0xc004) AM_DEVWRITE("y2404_3", y2404_new_device, write) + AM_RANGE(0xc001, 0xc001) AM_DEVWRITE("y2404_1", y2404_device, write) + AM_RANGE(0xc003, 0xc003) AM_DEVWRITE("y2404_2", y2404_device, write) + AM_RANGE(0xc004, 0xc004) AM_DEVWRITE("y2404_3", y2404_device, write) ADDRESS_MAP_END @@ -336,15 +336,15 @@ static MACHINE_CONFIG_START( tp84, tp84_state ) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("y2404_1", Y2404_NEW, XTAL_14_31818MHz/8) /* verified on pcb */ + MCFG_SOUND_ADD("y2404_1", Y2404, XTAL_14_31818MHz/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.75) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("y2404_2", Y2404_NEW, XTAL_14_31818MHz/8) /* verified on pcb */ + MCFG_SOUND_ADD("y2404_2", Y2404, XTAL_14_31818MHz/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 0.75) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("y2404_3", Y2404_NEW, XTAL_14_31818MHz/8) /* verified on pcb */ + MCFG_SOUND_ADD("y2404_3", Y2404, XTAL_14_31818MHz/8) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 0.75) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index 92f3186ed0b..d1a90f0d82c 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -942,7 +942,7 @@ static MACHINE_CONFIG_START( trackfld, trackfld_state ) MCFG_DAC_ADD("dac") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("snsnd", SN76496_NEW, SOUND_CLOCK/8) + MCFG_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) @@ -996,7 +996,7 @@ static MACHINE_CONFIG_START( yieartf, trackfld_state ) MCFG_DAC_ADD("dac") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("snsnd", SN76496_NEW, MASTER_CLOCK/6/2) + MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/6/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/wico.c b/src/mame/drivers/wico.c index b2419d1e4ed..22216526e44 100644 --- a/src/mame/drivers/wico.c +++ b/src/mame/drivers/wico.c @@ -67,7 +67,7 @@ static ADDRESS_MAP_START( hcpu_map, AS_PROGRAM, 8, wico_state ) AM_RANGE(0x1fe2, 0x1fe2) AM_WRITE(muxen_w) //AM_RANGE(0x1fe3, 0x1fe3) AM_WRITE(csols_w) AM_RANGE(0x1fe4, 0x1fe4) AM_READNOP //AM_WRITE(msols_w) - AM_RANGE(0x1fe5, 0x1fe5) AM_DEVWRITE("sn76494", sn76494_new_device, write) + AM_RANGE(0x1fe5, 0x1fe5) AM_DEVWRITE("sn76494", sn76494_device, write) AM_RANGE(0x1fe6, 0x1fe6) AM_WRITE(wdogcl_w) AM_RANGE(0x1fe7, 0x1fe7) AM_WRITE(zcres_w) AM_RANGE(0x1fe8, 0x1fe8) AM_WRITE(dled0_w) @@ -89,7 +89,7 @@ static ADDRESS_MAP_START( ccpu_map, AS_PROGRAM, 8, wico_state ) AM_RANGE(0x1fe2, 0x1fe2) AM_WRITE(muxen_w) // digit to display on diagnostic LED; d0=L will disable main displays //AM_RANGE(0x1fe3, 0x1fe3) AM_WRITE(csols_w) // solenoid column //AM_RANGE(0x1fe4, 0x1fe4) AM_READNOP AM_WRITE(msols_w) // solenoid row - AM_RANGE(0x1fe5, 0x1fe5) AM_DEVWRITE("sn76494", sn76494_new_device, write) + AM_RANGE(0x1fe5, 0x1fe5) AM_DEVWRITE("sn76494", sn76494_device, write) AM_RANGE(0x1fe6, 0x1fe6) AM_WRITE(wdogcl_w) // watchdog clear AM_RANGE(0x1fe7, 0x1fe7) AM_WRITE(zcres_w) // enable IRQ on hcpu AM_RANGE(0x1fe8, 0x1fe8) AM_WRITE(dled0_w) // turn off diagnostic LED @@ -405,7 +405,7 @@ static MACHINE_CONFIG_START( wico, wico_state ) /* Sound */ MCFG_FRAGMENT_ADD( genpin_audio ) - MCFG_SOUND_ADD("sn76494", SN76494_NEW, 10000000 / 64) + MCFG_SOUND_ADD("sn76494", SN76494, 10000000 / 64) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index a7ba09b9249..afcf402ab9c 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -140,8 +140,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map, AS_IO, 8, xyonix_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x20, 0x20) AM_READNOP AM_DEVWRITE("sn1", sn76496_new_device, write) /* SN76496 ready signal */ - AM_RANGE(0x21, 0x21) AM_READNOP AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0x20, 0x20) AM_READNOP AM_DEVWRITE("sn1", sn76496_device, write) /* SN76496 ready signal */ + AM_RANGE(0x21, 0x21) AM_READNOP AM_DEVWRITE("sn2", sn76496_device, write) AM_RANGE(0x40, 0x40) AM_WRITENOP /* NMI ack? */ AM_RANGE(0x50, 0x50) AM_WRITE(xyonix_irqack_w) AM_RANGE(0x60, 0x61) AM_WRITENOP /* mc6845 */ @@ -253,11 +253,11 @@ static MACHINE_CONFIG_START( xyonix, xyonix_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, 16000000/4) + MCFG_SOUND_ADD("sn1", SN76496, 16000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, 16000000/4) + MCFG_SOUND_ADD("sn2", SN76496, 16000000/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index 11a2d08cac1..56d9dd9a26e 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( yiear, yiear_state ) MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0) - MCFG_SOUND_ADD("snsnd", SN76489A_NEW, XTAL_18_432MHz/12) /* verified on pcb */ + MCFG_SOUND_ADD("snsnd", SN76489A, XTAL_18_432MHz/12) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index dc28213e16b..1f1072feff8 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -496,9 +496,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( congo_sound_map, AS_PROGRAM, 8, zaxxon_state ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_MIRROR(0x1800) AM_RAM - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76496_new_device, write) + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76496_device, write) AM_RANGE(0x8000, 0x8003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) - AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn2", sn76496_new_device, write) + AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn2", sn76496_device, write) ADDRESS_MAP_END @@ -1036,11 +1036,11 @@ static MACHINE_CONFIG_DERIVED( congo, root ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76496_NEW, SOUND_CLOCK) + MCFG_SOUND_ADD("sn1", SN76496, SOUND_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76496_NEW, SOUND_CLOCK/4) + MCFG_SOUND_ADD("sn2", SN76496, SOUND_CLOCK/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index ff39d0f9dbc..f78cd8616d7 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -38,8 +38,8 @@ public: /* devices */ cpu_device *m_audiocpu; - required_device<sn76496_new_device> m_sn_1; - required_device<sn76496_new_device> m_sn_2; + required_device<sn76496_device> m_sn_1; + required_device<sn76496_device> m_sn_2; dac_device *m_dac; required_device<discrete_device> m_discrete; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 9146d84498d..c0e762b39ae 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -28,7 +28,7 @@ public: optional_shared_ptr<UINT8> m_soundlatch; /* devices */ - required_device<sn76489a_new_device> m_sn; + required_device<sn76489a_device> m_sn; /* video-related */ tilemap_t * m_bg_tilemap; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 84e09023293..0e0c36716fb 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -40,7 +40,7 @@ public: cpu_device *m_audiocpu; dac_device *m_dac; device_t *m_ym; - sn76489a_new_device *m_sn; + sn76489a_device *m_sn; UINT8 m_prot_data; DECLARE_READ8_MEMBER(mrokumei_keyboard_r); DECLARE_WRITE8_MEMBER(mrokumei_keyboard_select_w); diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 578d9a48709..2e37e02201f 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -18,7 +18,7 @@ public: required_shared_ptr<UINT8> m_scroll; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; - optional_device<sn76496_new_device> m_sn; + optional_device<sn76496_device> m_sn; UINT8 * m_scroll2; UINT8 * m_spriteram2; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index b7a86e91cd0..7da5fdaf62f 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -41,8 +41,8 @@ public: /* devices */ cpu_device *m_maincpu; cpu_device *m_audiocpu; - optional_device<sn76489_new_device> m_sn_1; - optional_device<sn76489_new_device> m_sn_2; + optional_device<sn76489_device> m_sn_1; + optional_device<sn76489_device> m_sn_2; DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(pinbo_sound_command_w); DECLARE_READ8_MEMBER(sound_status_r); diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index c6d61c3cf3f..7942096bbb3 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -37,8 +37,8 @@ public: m_discrete(*this, "discrete") { } /* devices */ - optional_device<sn76489_new_device> m_sn1; - optional_device<sn76489_new_device> m_sn2; + optional_device<sn76489_device> m_sn1; + optional_device<sn76489_device> m_sn2; /* machine state */ optional_shared_ptr<UINT8> m_68705_port_out; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 770ad8ff220..6538c2674d9 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -22,7 +22,7 @@ public: required_shared_ptr<UINT8> m_palettebank; required_shared_ptr<UINT8> m_spriteram_select; required_shared_ptr<UINT8> m_scroll; - optional_device<sn76489_new_device> m_sn; + optional_device<sn76489_device> m_sn; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index d980e891d7e..87bc77a4bb7 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -20,8 +20,8 @@ public: required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_videoram; - optional_device<sn76496_new_device> m_sn1; - optional_device<sn76496_new_device> m_sn2; + optional_device<sn76496_device> m_sn1; + optional_device<sn76496_device> m_sn2; UINT8 m_sound_state[2]; UINT8 m_sound_rate; diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index 0a954da2b4e..d5583254182 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -17,9 +17,9 @@ public: required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; - required_device<sn76496_new_device> m_sn1; - required_device<sn76496_new_device> m_sn2; - required_device<sn76496_new_device> m_sn3; + required_device<sn76496_device> m_sn1; + required_device<sn76496_device> m_sn2; + required_device<sn76496_device> m_sn3; int m_sn76496_latch; int m_sn76496_select; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index f224e7e230d..7f988010191 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -27,7 +27,7 @@ public: required_shared_ptr<UINT8> m_scroll2; required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; - optional_device<sn76496_new_device> m_sn; + optional_device<sn76496_device> m_sn; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index ca8044a5b57..edd7a764a44 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -15,7 +15,7 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_spriteram2; required_shared_ptr<UINT8> m_videoram; - optional_device<sn76489a_new_device> m_sn; + optional_device<sn76489a_device> m_sn; /* video-related */ tilemap_t *m_bg_tilemap; diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index eb086f3f8e2..3bcaf0bcd94 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -822,7 +822,7 @@ static WRITE8_HANDLER( megadriv_z80_vdp_write ) case 0x13: case 0x15: case 0x17: - // accessed by either segapsg_new_device or sn76496_new_device + // accessed by either segapsg_device or sn76496_device space.machine().device<sn76496_base_device>("snsnd")->write(space, 0, data); break; @@ -1201,7 +1201,7 @@ MACHINE_CONFIG_FRAGMENT( md_ntsc ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ - MCFG_SOUND_ADD("snsnd", SEGAPSG_NEW, MASTER_CLOCK_NTSC/15) + MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ @@ -1256,7 +1256,7 @@ MACHINE_CONFIG_FRAGMENT( md_pal ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ - MCFG_SOUND_ADD("snsnd", SEGAPSG_NEW, MASTER_CLOCK_PAL/15) + MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_PAL/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ @@ -1283,7 +1283,7 @@ MACHINE_CONFIG_DERIVED( genesis_32x, megadriv ) MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2) /* sound hardware */ - MCFG_SOUND_ADD("snsnd", SEGAPSG_NEW, MASTER_CLOCK_NTSC/15) + MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2) @@ -1305,7 +1305,7 @@ MACHINE_CONFIG_DERIVED( genesis_32x_pal, megadpal ) MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2) /* sound hardware */ - MCFG_SOUND_ADD("snsnd", SEGAPSG_NEW, MASTER_CLOCK_NTSC/15) + MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2) diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c index a763dd27e97..b6155722283 100644 --- a/src/mame/machine/megavdp.c +++ b/src/mame/machine/megavdp.c @@ -855,7 +855,7 @@ WRITE16_MEMBER( sega_genesis_vdp_device::megadriv_vdp_w ) case 0x14: case 0x16: { - // accessed by either segapsg_new_device or sn76496_new_device + // accessed by either segapsg_device or sn76496_device sn76496_base_device *sn = space.machine().device<sn76496_base_device>(":snsnd"); if (ACCESSING_BITS_0_7) sn->write(space, 0, data & 0xff); //if (ACCESSING_BITS_8_15) sn->write(space, 0, (data>>8) & 0xff); diff --git a/src/mame/machine/segamsys.c b/src/mame/machine/segamsys.c index e96361ae819..f5edcf9ac20 100644 --- a/src/mame/machine/segamsys.c +++ b/src/mame/machine/segamsys.c @@ -1649,12 +1649,12 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine &machine, /* INIT THE PORTS *********************************************************************************************/ address_space &io = machine.device(tag)->memory().space(AS_IO); - sn76496_new_device *sn = machine.device<sn76496_new_device>("snsnd"); + sn76496_device *sn = machine.device<sn76496_device>("snsnd"); io.install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_port_r), FUNC(z80_unmapped_port_w)); io.install_legacy_read_handler (0x7e, 0x7e, FUNC(md_sms_vdp_vcounter_r)); - io.install_write_handler (0x7e, 0x7f, write8_delegate(FUNC(sn76496_new_device::write),sn)); + io.install_write_handler (0x7e, 0x7f, write8_delegate(FUNC(sn76496_device::write),sn)); io.install_legacy_readwrite_handler (0xbe, 0xbe, FUNC(md_sms_vdp_data_r), FUNC(md_sms_vdp_data_w)); io.install_legacy_readwrite_handler (0xbf, 0xbf, FUNC(md_sms_vdp_ctrl_r), FUNC(md_sms_vdp_ctrl_w)); @@ -1747,7 +1747,7 @@ MACHINE_CONFIG_START( sms, driver_device ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("snsnd", SN76496_NEW, 3579540) + MCFG_SOUND_ADD("snsnd", SN76496, 3579540) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END diff --git a/src/mess/drivers/adam.c b/src/mess/drivers/adam.c index a996695c877..6d0b40d7e81 100644 --- a/src/mess/drivers/adam.c +++ b/src/mess/drivers/adam.c @@ -1246,7 +1246,7 @@ static ADDRESS_MAP_START( adam_io, AS_IO, 8, adam_state ) AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1e) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) AM_RANGE(0xa1, 0xa1) AM_MIRROR(0x1e) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_WRITE(joystick_w) - AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1f) AM_DEVWRITE(SN76489A_TAG, sn76489a_new_device, write) + AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1f) AM_DEVWRITE(SN76489A_TAG, sn76489a_device, write) AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1d) AM_READ(input1_r) AM_RANGE(0xe2, 0xe2) AM_MIRROR(0x1d) AM_READ(input2_r) ADDRESS_MAP_END @@ -1725,7 +1725,7 @@ static MACHINE_CONFIG_START( adam, adam_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489A_TAG, SN76489A_NEW, XTAL_7_15909MHz/2) + MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL_7_15909MHz/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 9fff87304c0..5fe5093e307 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -287,7 +287,7 @@ static ADDRESS_MAP_START( apricot_io, AS_IO, 16, apricot_state ) AM_RANGE(0x00, 0x03) AM_DEVREADWRITE8_LEGACY("ic31", pic8259_r, pic8259_w, 0x00ff) AM_RANGE(0x40, 0x47) AM_DEVREADWRITE8_LEGACY("ic68", wd17xx_r, wd17xx_w, 0x00ff) AM_RANGE(0x48, 0x4f) AM_DEVREADWRITE8("ic17", i8255_device, read, write, 0x00ff) - AM_RANGE(0x50, 0x51) AM_MIRROR(0x06) AM_DEVWRITE8("ic7", sn76489_new_device, write, 0x00ff) + AM_RANGE(0x50, 0x51) AM_MIRROR(0x06) AM_DEVWRITE8("ic7", sn76489_device, write, 0x00ff) AM_RANGE(0x58, 0x5f) AM_DEVREADWRITE8_LEGACY("ic16", pit8253_r, pit8253_w, 0x00ff) AM_RANGE(0x60, 0x67) AM_DEVREADWRITE8("ic15", z80sio_device, read_alt, write_alt, 0x00ff) AM_RANGE(0x68, 0x69) AM_MIRROR(0x04) AM_DEVWRITE8("ic30", mc6845_device, address_w, 0x00ff) @@ -381,7 +381,7 @@ static MACHINE_CONFIG_START( apricot, apricot_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ic7", SN76489_NEW, XTAL_4MHz / 2) + MCFG_SOUND_ADD("ic7", SN76489, XTAL_4MHz / 2) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 388dae4a334..f1e27350000 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -318,7 +318,7 @@ static ADDRESS_MAP_START( fp_io, AS_IO, 16, fp_state ) AM_RANGE(0x020, 0x021) AM_DEVWRITE8(CENTRONICS_TAG, centronics_device, write, 0x00ff) AM_RANGE(0x022, 0x023) AM_WRITE8(pint_clr_w, 0x00ff) AM_RANGE(0x024, 0x025) AM_READ8(prtr_snd_r, 0x00ff) - AM_RANGE(0x026, 0x027) AM_DEVWRITE8(SN76489AN_TAG, sn76489a_new_device, write, 0x00ff) + AM_RANGE(0x026, 0x027) AM_DEVWRITE8(SN76489AN_TAG, sn76489a_device, write, 0x00ff) AM_RANGE(0x028, 0x029) AM_WRITE8(contrast_w, 0x00ff) AM_RANGE(0x02a, 0x02b) AM_WRITE8(palette_w, 0x00ff) AM_RANGE(0x02e, 0x02f) AM_WRITE(video_w) @@ -617,7 +617,7 @@ static MACHINE_CONFIG_START( fp, fp_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A_NEW, 2000000) + MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, 2000000) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index 05a1f1cf3f6..084d66a9a2e 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -864,7 +864,7 @@ static MACHINE_CONFIG_START( bbca, bbc_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489", SN76489_NEW, 4000000) /* 4 MHz */ + MCFG_SOUND_ADD("sn76489", SN76489, 4000000) /* 4 MHz */ MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) // MCFG_SOUND_ADD("tms5220", TMS5220, tms5220_interface) @@ -958,7 +958,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489", SN76489_NEW, 4000000) /* 4 MHz */ + MCFG_SOUND_ADD("sn76489", SN76489, 4000000) /* 4 MHz */ MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mess/drivers/coleco.c b/src/mess/drivers/coleco.c index 6bb8c985c82..6e9f09f3d0e 100644 --- a/src/mess/drivers/coleco.c +++ b/src/mess/drivers/coleco.c @@ -99,7 +99,7 @@ static ADDRESS_MAP_START( coleco_io_map, AS_IO, 8, coleco_state ) AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1e) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) AM_RANGE(0xa1, 0xa1) AM_MIRROR(0x1e) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_WRITE(paddle_on_w) - AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1f) AM_DEVWRITE("sn76489a", sn76489a_new_device, write) + AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1f) AM_DEVWRITE("sn76489a", sn76489a_device, write) AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1d) AM_READ(paddle_1_r) AM_RANGE(0xe2, 0xe2) AM_MIRROR(0x1d) AM_READ(paddle_2_r) ADDRESS_MAP_END @@ -116,7 +116,7 @@ static ADDRESS_MAP_START( czz50_io_map, AS_IO, 8, coleco_state ) AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1e) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) AM_RANGE(0xa1, 0xa1) AM_MIRROR(0x1e) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_WRITE(paddle_on_w) - AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1f) AM_DEVWRITE("sn76489a", sn76489a_new_device, write) + AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1f) AM_DEVWRITE("sn76489a", sn76489a_device, write) AM_RANGE(0xe0, 0xe0) AM_MIRROR(0x1d) AM_READ(paddle_1_r) AM_RANGE(0xe2, 0xe2) AM_MIRROR(0x1d) AM_READ(paddle_2_r) ADDRESS_MAP_END @@ -325,7 +325,7 @@ static MACHINE_CONFIG_START( coleco, coleco_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489a", SN76489A_NEW, XTAL_7_15909MHz/2) /* 3.579545 MHz */ + MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_7_15909MHz/2) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) @@ -354,7 +354,7 @@ static MACHINE_CONFIG_START( czz50, coleco_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489a", SN76489A_NEW, XTAL_7_15909MHz/2) // ??? + MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_7_15909MHz/2) // ??? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c index 5f15b23b35f..3e5373f2cf2 100644 --- a/src/mess/drivers/crvision.c +++ b/src/mess/drivers/crvision.c @@ -976,7 +976,7 @@ static MACHINE_CONFIG_START( creativision, crvision_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489_TAG, SN76489A_NEW, XTAL_2MHz) + MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL_2MHz) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) @@ -1043,7 +1043,7 @@ static MACHINE_CONFIG_START( lasr2001, laser2001_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489_TAG, SN76489A_NEW, XTAL_17_73447MHz/9) + MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL_17_73447MHz/9) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c index 95943dadfc2..df95cb12542 100644 --- a/src/mess/drivers/m5.c +++ b/src/mess/drivers/m5.c @@ -255,7 +255,7 @@ static ADDRESS_MAP_START( m5_io, AS_IO, 8, m5_state ) AM_RANGE(0x00, 0x03) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write) AM_RANGE(0x10, 0x10) AM_MIRROR(0x0e) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) AM_RANGE(0x11, 0x11) AM_MIRROR(0x0e) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write) - AM_RANGE(0x20, 0x20) AM_MIRROR(0x0f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_new_device, write) + AM_RANGE(0x20, 0x20) AM_MIRROR(0x0f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write) AM_RANGE(0x30, 0x30) AM_READ_PORT("Y0") // 64KBF bank select AM_RANGE(0x31, 0x31) AM_READ_PORT("Y1") AM_RANGE(0x32, 0x32) AM_READ_PORT("Y2") @@ -673,7 +673,7 @@ static MACHINE_CONFIG_START( m5, m5_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A_NEW, XTAL_14_31818MHz/4) + MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_14_31818MHz/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c index 210b814afb6..2cbcbcdb06f 100644 --- a/src/mess/drivers/mtx.c +++ b/src/mess/drivers/mtx.c @@ -370,7 +370,7 @@ static MACHINE_CONFIG_START( mtx512, mtx_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489A_TAG, SN76489A_NEW, XTAL_4MHz) + MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL_4MHz) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index c8ff58bd6ad..509fd83048f 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -84,7 +84,7 @@ public: required_device<device_t> m_wave; required_device<mc6845_device> m_crtc; required_device<device_t> m_fdc; - required_device<sn76489_new_device> m_audio; + required_device<sn76489_device> m_audio; required_device<msm5832_device> m_rtc; DECLARE_READ8_MEMBER( mycom_upper_r ); DECLARE_WRITE8_MEMBER( mycom_upper_w ); @@ -609,7 +609,7 @@ static MACHINE_CONFIG_START( mycom, mycom_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("sn1", SN76489_NEW, XTAL_10MHz / 4) + MCFG_SOUND_ADD("sn1", SN76489, XTAL_10MHz / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c index 703f2eda03d..845f9699daf 100644 --- a/src/mess/drivers/mz700.c +++ b/src/mess/drivers/mz700.c @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( mz800_io, AS_IO, 8, mz_state ) AM_RANGE(0xeb, 0xeb) AM_WRITE(mz800_ramaddr_w ) AM_RANGE(0xf0, 0xf0) AM_READ_PORT("atari_joy1") AM_WRITE(mz800_palette_w) AM_RANGE(0xf1, 0xf1) AM_READ_PORT("atari_joy2") - AM_RANGE(0xf2, 0xf2) AM_DEVWRITE("sn76489n", sn76489_new_device, write) + AM_RANGE(0xf2, 0xf2) AM_DEVWRITE("sn76489n", sn76489_device, write) AM_RANGE(0xfc, 0xff) AM_DEVREADWRITE("z80pio", z80pio_device, read, write) ADDRESS_MAP_END @@ -398,7 +398,7 @@ static MACHINE_CONFIG_DERIVED( mz800, mz700 ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz800) - MCFG_SOUND_ADD("sn76489n", SN76489_NEW, XTAL_17_73447MHz/5) + MCFG_SOUND_ADD("sn76489n", SN76489, XTAL_17_73447MHz/5) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index cfb98f3ff74..85f3d3e65a5 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -50,8 +50,8 @@ public: required_device<z80pio_device> m_pio; required_device<mc6845_device> m_crtc; required_device<device_t> m_fdc; - required_device<sn76489a_new_device> m_sn1; - required_device<sn76489a_new_device> m_sn2; + required_device<sn76489a_device> m_sn1; + required_device<sn76489a_device> m_sn2; DECLARE_READ8_MEMBER(vram_r); DECLARE_WRITE8_MEMBER(vram_w); DECLARE_WRITE8_MEMBER(pasopia7_memory_ctrl_w); @@ -1018,10 +1018,10 @@ static MACHINE_CONFIG_START( p7_base, pasopia7_state ) /* Audio */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, 1996800) // unknown clock / divider + MCFG_SOUND_ADD("sn1", SN76489A, 1996800) // unknown clock / divider MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) - MCFG_SOUND_ADD("sn2", SN76489A_NEW, 1996800) // unknown clock / divider + MCFG_SOUND_ADD("sn2", SN76489A, 1996800) // unknown clock / divider MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 640d03f9b11..26a0804bfe3 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -363,7 +363,7 @@ static ADDRESS_MAP_START(tandy1000_io, AS_IO, 8, pc_state ) AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE_LEGACY("pit8253", pit8253_r, pit8253_w) AM_RANGE(0x0060, 0x0063) AM_READWRITE_LEGACY(tandy1000_pio_r, tandy1000_pio_w) AM_RANGE(0x0080, 0x0087) AM_READWRITE(pc_page_r, pc_page_w) - AM_RANGE(0x00c0, 0x00c0) AM_DEVWRITE("sn76496", ncr7496_new_device, write) + AM_RANGE(0x00c0, 0x00c0) AM_DEVWRITE("sn76496", ncr7496_device, write) AM_RANGE(0x0200, 0x0207) AM_READWRITE_LEGACY(pc_JOY_r, pc_JOY_w) AM_RANGE(0x02f8, 0x02ff) AM_DEVREADWRITE("ins8250_1", ins8250_device, ins8250_r, ins8250_w) AM_RANGE(0x0378, 0x037f) AM_READWRITE_LEGACY(pc_t1t_p37x_r, pc_t1t_p37x_w) @@ -393,7 +393,7 @@ static ADDRESS_MAP_START(tandy1000_16_io, AS_IO, 16, pc_state ) AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8_LEGACY("pit8253", pit8253_r, pit8253_w, 0xffff) AM_RANGE(0x0060, 0x0063) AM_READWRITE8_LEGACY(tandy1000_pio_r, tandy1000_pio_w, 0xffff) AM_RANGE(0x0080, 0x0087) AM_READWRITE8(pc_page_r, pc_page_w, 0xffff) - AM_RANGE(0x00c0, 0x00c1) AM_DEVWRITE8("sn76496", ncr7496_new_device, write, 0xffff) + AM_RANGE(0x00c0, 0x00c1) AM_DEVWRITE8("sn76496", ncr7496_device, write, 0xffff) AM_RANGE(0x0200, 0x0207) AM_READWRITE8_LEGACY(pc_JOY_r, pc_JOY_w, 0xffff) AM_RANGE(0x02f8, 0x02ff) AM_DEVREADWRITE8("ins8250_1", ins8250_device, ins8250_r, ins8250_w, 0xffff) AM_RANGE(0x0378, 0x037f) AM_READWRITE8_LEGACY(pc_t1t_p37x_r, pc_t1t_p37x_w, 0xffff) @@ -424,7 +424,7 @@ static ADDRESS_MAP_START(tandy1000_286_io, AS_IO, 16, pc_state ) AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8_LEGACY("pit8253", pit8253_r, pit8253_w, 0xffff) AM_RANGE(0x0060, 0x0063) AM_READWRITE8_LEGACY(tandy1000_pio_r, tandy1000_pio_w, 0xffff) AM_RANGE(0x0080, 0x0087) AM_READWRITE8(pc_page_r, pc_page_w, 0xffff) - AM_RANGE(0x00c0, 0x00c1) AM_DEVWRITE8("sn76496", ncr7496_new_device, write, 0xffff) + AM_RANGE(0x00c0, 0x00c1) AM_DEVWRITE8("sn76496", ncr7496_device, write, 0xffff) AM_RANGE(0x0200, 0x0207) AM_READWRITE8_LEGACY(pc_JOY_r, pc_JOY_w, 0xffff) AM_RANGE(0x02f8, 0x02ff) AM_DEVREADWRITE8("ins8250_1", ins8250_device, ins8250_r, ins8250_w, 0xffff) AM_RANGE(0x0378, 0x037f) AM_READWRITE8_LEGACY(pc_t1t_p37x_r, pc_t1t_p37x_w, 0xffff) @@ -454,7 +454,7 @@ static ADDRESS_MAP_START(ibmpcjr_io, AS_IO, 8, pc_state ) AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) AM_RANGE(0x0080, 0x0087) AM_READWRITE(pc_page_r, pc_page_w) AM_RANGE(0x00a0, 0x00a0) AM_READWRITE(pcjr_nmi_enable_r, pc_nmi_enable_w ) - AM_RANGE(0x00c0, 0x00c0) AM_DEVWRITE("sn76496", sn76496_new_device, write) + AM_RANGE(0x00c0, 0x00c0) AM_DEVWRITE("sn76496", sn76496_device, write) AM_RANGE(0x00f0, 0x00f7) AM_READWRITE_LEGACY(pc_fdc_r, pcjr_fdc_w) AM_RANGE(0x0200, 0x0207) AM_READWRITE_LEGACY(pc_JOY_r, pc_JOY_w) AM_RANGE(0x02f8, 0x02ff) AM_DEVREADWRITE("ins8250_1", ins8250_device, ins8250_r, ins8250_w) @@ -1114,7 +1114,7 @@ static MACHINE_CONFIG_START( t1000hx, pc_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("sn76496", NCR7496_NEW, XTAL_14_31818MHz/4) + MCFG_SOUND_ADD("sn76496", NCR7496, XTAL_14_31818MHz/4) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -1163,7 +1163,7 @@ static MACHINE_CONFIG_START( t1000_16, pc_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("sn76496", NCR7496_NEW, XTAL_14_31818MHz/4) + MCFG_SOUND_ADD("sn76496", NCR7496, XTAL_14_31818MHz/4) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -1212,7 +1212,7 @@ static MACHINE_CONFIG_START( t1000_286, pc_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("sn76496", NCR7496_NEW, XTAL_14_31818MHz/4) + MCFG_SOUND_ADD("sn76496", NCR7496, XTAL_14_31818MHz/4) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -1281,7 +1281,7 @@ static MACHINE_CONFIG_START( ibmpcjr, pc_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("sn76496", SN76496_NEW, XTAL_14_31818MHz/4) + MCFG_SOUND_ADD("sn76496", SN76496, XTAL_14_31818MHz/4) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) diff --git a/src/mess/drivers/pv2000.c b/src/mess/drivers/pv2000.c index 904258d9f36..c2ae67a4029 100644 --- a/src/mess/drivers/pv2000.c +++ b/src/mess/drivers/pv2000.c @@ -190,7 +190,7 @@ static ADDRESS_MAP_START( pv2000_io_map, AS_IO, 8, pv2000_state ) AM_RANGE(0x20, 0x20) AM_READWRITE(pv2000_keys_lo_r, pv2000_keys_w) //sn76489a - AM_RANGE(0x40, 0x40) AM_READ(pv2000_keys_mod_r) AM_DEVWRITE("sn76489a", sn76489a_new_device, write) + AM_RANGE(0x40, 0x40) AM_READ(pv2000_keys_mod_r) AM_DEVWRITE("sn76489a", sn76489a_device, write) /* Cassette input. Gets hit a lot after a GLOAD command */ AM_RANGE(0x60, 0x60) AM_READWRITE(cass_in,cass_out) @@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( pv2000, pv2000_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489a", SN76489A_NEW, XTAL_7_15909MHz/2) /* 3.579545 MHz */ + MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL_7_15909MHz/2) /* 3.579545 MHz */ MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG) diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c index 62b0b58d47e..520454dffc7 100644 --- a/src/mess/drivers/rx78.c +++ b/src/mess/drivers/rx78.c @@ -278,7 +278,7 @@ static ADDRESS_MAP_START(rx78_io, AS_IO, 8, rx78_state) AM_RANGE(0xf5, 0xfb) AM_WRITE(vdp_reg_w) //vdp AM_RANGE(0xfc, 0xfc) AM_WRITE(vdp_bg_reg_w) //vdp AM_RANGE(0xfe, 0xfe) AM_WRITE(vdp_pri_mask_w) - AM_RANGE(0xff, 0xff) AM_DEVWRITE("sn1", sn76489a_new_device, write) //psg + AM_RANGE(0xff, 0xff) AM_DEVWRITE("sn1", sn76489a_device, write) //psg ADDRESS_MAP_END /* Input ports */ @@ -503,7 +503,7 @@ static MACHINE_CONFIG_START( rx78, rx78_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("sn1", SN76489A_NEW, XTAL_28_63636MHz/8) // unknown divider + MCFG_SOUND_ADD("sn1", SN76489A, XTAL_28_63636MHz/8) // unknown divider MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c index a316baf1821..1a0ccdffacf 100644 --- a/src/mess/drivers/sg1000.c +++ b/src/mess/drivers/sg1000.c @@ -151,7 +151,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sg1000_io_map, AS_IO, 8, sg1000_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_new_device, write) + AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3e) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, vram_read, vram_write) AM_RANGE(0x81, 0x81) AM_MIRROR(0x3e) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, register_read, register_write) AM_RANGE(0xdc, 0xdc) AM_READ_PORT("PA7") @@ -176,7 +176,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( omv_io_map, AS_IO, 8, sg1000_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_new_device, write) + AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3e) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, vram_read, vram_write) AM_RANGE(0x81, 0x81) AM_MIRROR(0x3e) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, register_read, register_write) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x38) AM_READ_PORT("C0") @@ -203,7 +203,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sc3000_io_map, AS_IO, 8, sg1000_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_new_device, write) + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write) AM_RANGE(0xbe, 0xbe) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, vram_read, vram_write) AM_RANGE(0xbf, 0xbf) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, register_read, register_write) AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE(UPD9255_TAG, i8255_device, read, write) @@ -213,7 +213,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sc3000_io_map, AS_IO, 8, sg1000_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_MIRROR(0xdf) AM_DEVREADWRITE(UPD9255_TAG, i8255_device, read, write) - AM_RANGE(0x00, 0x00) AM_MIRROR(0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_new_device, write) + AM_RANGE(0x00, 0x00) AM_MIRROR(0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write) AM_RANGE(0x00, 0x00) AM_MIRROR(0xae) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, vram_read, vram_write) AM_RANGE(0x01, 0x01) AM_MIRROR(0xae) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, register_read, register_write) AM_RANGE(0x60, 0x60) AM_MIRROR(0x9f) AM_READ(sc3000_r_r) @@ -235,7 +235,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sf7000_io_map, AS_IO, 8, sf7000_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x7f, 0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_new_device, write) + AM_RANGE(0x7f, 0x7f) AM_DEVWRITE(SN76489AN_TAG, sn76489a_device, write) AM_RANGE(0xbe, 0xbe) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, vram_read, vram_write) AM_RANGE(0xbf, 0xbf) AM_DEVREADWRITE(TMS9918A_TAG, tms9918a_device, register_read, register_write) AM_RANGE(0xdc, 0xdf) AM_DEVREADWRITE(UPD9255_0_TAG, i8255_device, read, write) @@ -1117,7 +1117,7 @@ static MACHINE_CONFIG_START( sg1000, sg1000_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A_NEW, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_10_738635MHz/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) @@ -1171,7 +1171,7 @@ static MACHINE_CONFIG_START( sc3000, sc3000_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A_NEW, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_10_738635MHz/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) @@ -1212,7 +1212,7 @@ static MACHINE_CONFIG_START( sf7000, sf7000_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A_NEW, XTAL_10_738635MHz/3) + MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL_10_738635MHz/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index dd682ee1779..7bf04bddc7d 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -36,7 +36,7 @@ public: m_sn(*this, "sn1") { } - optional_device<sn76489a_new_device> m_sn; + optional_device<sn76489a_device> m_sn; UINT16 m_cursor_addr; UINT16 m_cursor_raster; UINT8 m_keyb_press; @@ -1102,7 +1102,7 @@ static MACHINE_CONFIG_START( smc777, smc777_state ) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn1", SN76489A_NEW, MASTER_CLOCK) // unknown clock / divider + MCFG_SOUND_ADD("sn1", SN76489A, MASTER_CLOCK) // unknown clock / divider MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_CONFIG(psg_intf) diff --git a/src/mess/drivers/sms.c b/src/mess/drivers/sms.c index 32e4b8d2065..9d2aad4b491 100644 --- a/src/mess/drivers/sms.c +++ b/src/mess/drivers/sms.c @@ -116,7 +116,7 @@ static ADDRESS_MAP_START( sms_io, AS_IO, 8, sms_state ) AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(sms_bios_w) AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_WRITE(sms_io_control_w) AM_RANGE(0x40, 0x7f) AM_READ(sms_count_r) - AM_RANGE(0x40, 0x7f) AM_DEVWRITE("segapsg", segapsg_new_device, write) + AM_RANGE(0x40, 0x7f) AM_DEVWRITE("segapsg", segapsg_device, write) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3e) AM_DEVREADWRITE("sms_vdp", sega315_5124_device, vram_read, vram_write) AM_RANGE(0x81, 0x81) AM_MIRROR(0x3e) AM_DEVREADWRITE("sms_vdp", sega315_5124_device, register_read, register_write) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1e) AM_READ(sms_input_port_0_r) @@ -138,7 +138,7 @@ static ADDRESS_MAP_START( gg_io, AS_IO, 8, sms_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00, 0x00) AM_READ(gg_input_port_2_r) AM_RANGE(0x01, 0x05) AM_READWRITE(gg_sio_r, gg_sio_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE("gamegear", gamegear_new_device, stereo_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("gamegear", gamegear_device, stereo_w) AM_RANGE(0x07, 0x07) AM_WRITE(sms_io_control_w) AM_RANGE(0x08, 0x08) AM_MIRROR(0x06) AM_WRITE(sms_bios_w) AM_RANGE(0x09, 0x09) AM_MIRROR(0x06) AM_WRITE(sms_io_control_w) @@ -147,7 +147,7 @@ static ADDRESS_MAP_START( gg_io, AS_IO, 8, sms_state ) AM_RANGE(0x20, 0x20) AM_MIRROR(0x1e) AM_WRITE(sms_bios_w) AM_RANGE(0x21, 0x21) AM_MIRROR(0x1e) AM_WRITE(sms_io_control_w) AM_RANGE(0x40, 0x7f) AM_READ(sms_count_r) - AM_RANGE(0x40, 0x7f) AM_DEVWRITE("gamegear", gamegear_new_device, write) + AM_RANGE(0x40, 0x7f) AM_DEVWRITE("gamegear", gamegear_device, write) AM_RANGE(0x80, 0x80) AM_MIRROR(0x3e) AM_DEVREADWRITE("sms_vdp", sega315_5124_device, vram_read, vram_write) AM_RANGE(0x81, 0x81) AM_MIRROR(0x3e) AM_DEVREADWRITE("sms_vdp", sega315_5124_device, register_read, register_write) AM_RANGE(0xc0, 0xc0) AM_READ_PORT("PORT_DC") @@ -381,7 +381,7 @@ static MACHINE_CONFIG_START( sms_ntsc_base, sms_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("segapsg", SEGAPSG_NEW, XTAL_53_693175MHz/15) + MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL_53_693175MHz/15) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) @@ -492,7 +492,7 @@ static MACHINE_CONFIG_START( sms_pal_base, sms_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("segapsg", SEGAPSG_NEW, MASTER_CLOCK_PAL/15) + MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PAL/15) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) @@ -597,7 +597,7 @@ static MACHINE_CONFIG_START( gamegear, sms_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") - MCFG_SOUND_ADD("gamegear", GAMEGEAR_NEW, XTAL_53_693175MHz/15) + MCFG_SOUND_ADD("gamegear", GAMEGEAR, XTAL_53_693175MHz/15) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/mess/drivers/tutor.c b/src/mess/drivers/tutor.c index da26bfa762e..68a6356b108 100644 --- a/src/mess/drivers/tutor.c +++ b/src/mess/drivers/tutor.c @@ -552,7 +552,7 @@ static ADDRESS_MAP_START(tutor_memmap, AS_PROGRAM, 8, tutor_state) AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) /*VDP data*/ AM_RANGE(0xe002, 0xe002) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write)/*VDP status*/ AM_RANGE(0xe100, 0xe1ff) AM_READWRITE(tutor_mapper_r, tutor_mapper_w) /*cartridge mapper*/ - AM_RANGE(0xe200, 0xe200) AM_DEVWRITE("sn76489a", sn76489a_new_device, write) /*sound chip*/ + AM_RANGE(0xe200, 0xe200) AM_DEVWRITE("sn76489a", sn76489a_device, write) /*sound chip*/ AM_RANGE(0xe800, 0xe8ff) AM_READWRITE(tutor_printer_r, tutor_printer_w) /*printer*/ AM_RANGE(0xee00, 0xeeff) AM_READNOP AM_WRITE( tutor_cassette_w) /*cassette interface*/ @@ -566,7 +566,7 @@ static ADDRESS_MAP_START(pyuutajr_mem, AS_PROGRAM, 8, tutor_state) AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE("tms9928a", tms9928a_device, vram_read, vram_write) /*VDP data*/ AM_RANGE(0xe002, 0xe002) AM_DEVREADWRITE("tms9928a", tms9928a_device, register_read, register_write)/*VDP status*/ AM_RANGE(0xe100, 0xe1ff) AM_READWRITE(tutor_mapper_r, tutor_mapper_w) /*cartridge mapper*/ - AM_RANGE(0xe200, 0xe200) AM_DEVWRITE("sn76489a", sn76489a_new_device, write) /*sound chip*/ + AM_RANGE(0xe200, 0xe200) AM_DEVWRITE("sn76489a", sn76489a_device, write) /*sound chip*/ AM_RANGE(0xe800, 0xe800) AM_READ_PORT("LINE0") AM_RANGE(0xea00, 0xea00) AM_READ_PORT("LINE1") AM_RANGE(0xec00, 0xec00) AM_READ_PORT("LINE2") @@ -768,7 +768,7 @@ static MACHINE_CONFIG_START( tutor, tutor_state ) /* sound */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("sn76489a", SN76489A_NEW, 3579545) /* 3.579545 MHz */ + MCFG_SOUND_ADD("sn76489a", SN76489A, 3579545) /* 3.579545 MHz */ MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_WAVE_ADD(WAVE_TAG, CASSETTE_TAG) diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h index 3a1c57aacb6..0cbf9d6602b 100644 --- a/src/mess/includes/bbc.h +++ b/src/mess/includes/bbc.h @@ -35,7 +35,7 @@ public: { } required_device<cpu_device> m_maincpu; - optional_device<sn76489_new_device> m_sn; + optional_device<sn76489_device> m_sn; required_device<saa5050_device> m_trom; void check_interrupts(); diff --git a/src/mess/includes/mtx.h b/src/mess/includes/mtx.h index 33d85fa10f3..dec57af71c7 100644 --- a/src/mess/includes/mtx.h +++ b/src/mess/includes/mtx.h @@ -31,7 +31,7 @@ public: m_sn(*this, SN76489A_TAG) { } - required_device<sn76489a_new_device> m_sn; + required_device<sn76489a_device> m_sn; /* keyboard state */ UINT8 m_key_sense; diff --git a/src/mess/machine/a2alfam2.c b/src/mess/machine/a2alfam2.c index 0d91d1e0beb..6a11b71cca9 100644 --- a/src/mess/machine/a2alfam2.c +++ b/src/mess/machine/a2alfam2.c @@ -35,14 +35,14 @@ static const sn76496_config psg_intf = MACHINE_CONFIG_FRAGMENT( a2alfam2 ) MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r") - MCFG_SOUND_ADD(SN1_TAG, SN76489_NEW, XTAL_3_579545MHz) + MCFG_SOUND_ADD(SN1_TAG, SN76489, XTAL_3_579545MHz) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50) - MCFG_SOUND_ADD(SN2_TAG, SN76489_NEW, XTAL_3_579545MHz) + MCFG_SOUND_ADD(SN2_TAG, SN76489, XTAL_3_579545MHz) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50) - MCFG_SOUND_ADD(SN3_TAG, SN76489_NEW, XTAL_3_579545MHz) + MCFG_SOUND_ADD(SN3_TAG, SN76489, XTAL_3_579545MHz) MCFG_SOUND_CONFIG(psg_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50) MACHINE_CONFIG_END diff --git a/src/mess/machine/a2alfam2.h b/src/mess/machine/a2alfam2.h index 87895603254..b161dde3124 100644 --- a/src/mess/machine/a2alfam2.h +++ b/src/mess/machine/a2alfam2.h @@ -29,9 +29,9 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; - required_device<sn76489_new_device> m_sn1; - required_device<sn76489_new_device> m_sn2; - required_device<sn76489_new_device> m_sn3; + required_device<sn76489_device> m_sn1; + required_device<sn76489_device> m_sn2; + required_device<sn76489_device> m_sn3; protected: virtual void device_start(); diff --git a/src/mess/machine/ti99/videowrp.c b/src/mess/machine/ti99/videowrp.c index e42fb8960ea..e913c34e3c9 100644 --- a/src/mess/machine/ti99/videowrp.c +++ b/src/mess/machine/ti99/videowrp.c @@ -206,14 +206,14 @@ WRITE_LINE_MEMBER( ti_sound_system_device::sound_ready ) MACHINE_CONFIG_FRAGMENT( sn94624 ) MCFG_SPEAKER_STANDARD_MONO("sound_out") - MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN94624_NEW, 3579545/8) /* 3.579545 MHz */ + MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75) MCFG_SOUND_CONFIG(sound_config) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( sn76496 ) MCFG_SPEAKER_STANDARD_MONO("sound_out") - MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN76496_NEW, 3579545) /* 3.579545 MHz */ + MCFG_SOUND_ADD(TISOUNDCHIP_TAG, SN76496, 3579545) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75) MCFG_SOUND_CONFIG(sound_config) MACHINE_CONFIG_END diff --git a/src/mess/machine/wangpckb.c b/src/mess/machine/wangpckb.c index 2bc846daa8c..a7844a4026c 100644 --- a/src/mess/machine/wangpckb.c +++ b/src/mess/machine/wangpckb.c @@ -100,7 +100,7 @@ const rom_entry *wangpc_keyboard_device::device_rom_region() const static ADDRESS_MAP_START( wangpc_keyboard_io, AS_IO, 8, wangpc_keyboard_device ) //AM_RANGE(0x0000, 0xfeff) AM_READNOP AM_RANGE(0x47, 0x58) AM_MIRROR(0xff00) AM_READNOP - AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_DEVWRITE(SN76496_TAG, sn76496_new_device, write) + AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_DEVWRITE(SN76496_TAG, sn76496_device, write) AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(kb_p1_r, kb_p1_w) AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_WRITE(kb_p2_w) AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_WRITE(kb_p3_w) @@ -127,7 +127,7 @@ static MACHINE_CONFIG_FRAGMENT( wangpc_keyboard ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(SN76496_TAG, SN76496_NEW, 2000000) // ??? + MCFG_SOUND_ADD(SN76496_TAG, SN76496, 2000000) // ??? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_CONFIG(psg_intf) MACHINE_CONFIG_END |