diff options
author | mooglyguy <therealmogminer@gmail.com> | 2018-09-07 19:58:49 +0200 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-09-07 19:59:02 +0200 |
commit | b89e5243299b6d943910f13c692604b2c81b374e (patch) | |
tree | e17abecff7798363943e65f74c744103010e5d6a | |
parent | 50fab6c310dc754d775d02c3f5c9da62189678b6 (diff) |
-m6m80011ap, mb14241, mb3773: De-MCFG, nw
-rw-r--r-- | src/devices/machine/m6m80011ap.h | 20 | ||||
-rw-r--r-- | src/devices/machine/mb14241.h | 11 | ||||
-rw-r--r-- | src/devices/machine/mb3773.h | 15 | ||||
-rw-r--r-- | src/mame/drivers/8080bw.cpp | 36 | ||||
-rw-r--r-- | src/mame/drivers/fgoal.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/mw8080bw.cpp | 36 | ||||
-rw-r--r-- | src/mame/drivers/nss.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/scyclone.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/segaxbd.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/segaybd.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/taitogn.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/zn.cpp | 6 |
12 files changed, 48 insertions, 88 deletions
diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h index 2f1d0e9102a..01ccfe2f31a 100644 --- a/src/devices/machine/m6m80011ap.h +++ b/src/devices/machine/m6m80011ap.h @@ -5,28 +5,12 @@ #pragma once - - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -/* TODO: frequency */ -#define MCFG_M6M80011AP_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, M6M80011AP, XTAL(32'768)) - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// ======================> m6m80011ap_device - class m6m80011ap_device : public device_t, public device_nvram_interface { public: // construction/destruction - m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 32'768); /* TODO: frequency */ // I/O operations DECLARE_READ_LINE_MEMBER( read_bit ); @@ -68,8 +52,6 @@ private: uint16_t m_eeprom_data[0x80]; }; - -// device type definition DECLARE_DEVICE_TYPE(M6M80011AP, m6m80011ap_device) #endif // MAME_MACHINE_M6M80011AP_H diff --git a/src/devices/machine/mb14241.h b/src/devices/machine/mb14241.h index 30ffce71424..378c3c75b7d 100644 --- a/src/devices/machine/mb14241.h +++ b/src/devices/machine/mb14241.h @@ -11,11 +11,10 @@ #pragma once - class mb14241_device : public device_t { public: - mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); DECLARE_WRITE8_MEMBER( shift_count_w ); DECLARE_WRITE8_MEMBER( shift_data_w ); @@ -35,12 +34,4 @@ private: DECLARE_DEVICE_TYPE(MB14241, mb14241_device) - -/*************************************************************************** - DEVICE CONFIGURATION MACROS -***************************************************************************/ - -#define MCFG_MB14241_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MB14241, 0) - #endif // MAME_MACHINE_MB14241_H diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h index 21dbb8fa548..e6f8bf4c955 100644 --- a/src/devices/machine/mb3773.h +++ b/src/devices/machine/mb3773.h @@ -13,22 +13,11 @@ #pragma once - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_MB3773_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MB3773, 0) - - -// ======================> mb3773_device - class mb3773_device : public device_t { public: // construction/destruction - mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ); + mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // I/O operations WRITE_LINE_MEMBER( write_line_ck ); @@ -48,8 +37,6 @@ private: int m_ck; }; - -// device type definition DECLARE_DEVICE_TYPE(MB3773, mb3773_device) #endif // MAME_MACHINE_MB3773_H diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index e0314984553..03b75eda25c 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -419,7 +419,7 @@ MACHINE_CONFIG_START(_8080bw_state::invadpt2) WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(_8080bw_state::spcewars) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* sound hardware */ invaders_samples_audio(config); @@ -945,7 +945,7 @@ MACHINE_CONFIG_START(_8080bw_state::invrvnge) MCFG_DEVICE_PROGRAM_MAP(invrvnge_sound_map) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) @@ -1123,7 +1123,7 @@ MACHINE_CONFIG_START(_8080bw_state::lrescue) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1155,7 +1155,7 @@ MACHINE_CONFIG_START(_8080bw_state::escmars) MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1256,7 +1256,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmicmo) WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* sound hardware */ invaders_audio(config); @@ -1404,7 +1404,7 @@ MACHINE_CONFIG_START(_8080bw_state::rollingc) MCFG_DEVICE_IO_MAP(rollingc_io_map) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1553,7 +1553,7 @@ MACHINE_CONFIG_START(_8080bw_state::schaser) MCFG_TIMER_DRIVER_ADD("schaser_sh_555", _8080bw_state, schaser_effect_555_cb) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1683,7 +1683,7 @@ MACHINE_CONFIG_START(_8080bw_state::schasercv) MCFG_MACHINE_START_OVERRIDE(_8080bw_state, schasercv) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1782,7 +1782,7 @@ MACHINE_CONFIG_START(_8080bw_state::sflush) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1887,7 +1887,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2057,7 +2057,7 @@ MACHINE_CONFIG_START(_8080bw_state::polaris) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,polaris) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2184,7 +2184,7 @@ MACHINE_CONFIG_START(_8080bw_state::ballbomb) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2433,7 +2433,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbt) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2459,7 +2459,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbtbr) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2534,7 +2534,7 @@ MACHINE_CONFIG_START(_8080bw_state::steelwkr) MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2962,7 +2962,7 @@ MACHINE_CONFIG_START(_8080bw_state::vortex) MCFG_SCREEN_UPDATE_DRIVER(_8080bw_state, screen_update_invaders) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ invaders_audio(config); @@ -3379,7 +3379,7 @@ MACHINE_CONFIG_START(_8080bw_state::attackfc) MCFG_DEVICE_IO_MAP(attackfc_io_map) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* sound hardware */ // TODO: custom discrete diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp index 134efc3cd08..3c2d146469d 100644 --- a/src/mame/drivers/fgoal.cpp +++ b/src/mame/drivers/fgoal.cpp @@ -373,7 +373,7 @@ MACHINE_CONFIG_START(fgoal_state::fgoal) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp index ea0ca1f9c62..972dedb478e 100644 --- a/src/mame/drivers/mw8080bw.cpp +++ b/src/mame/drivers/mw8080bw.cpp @@ -416,7 +416,7 @@ MACHINE_CONFIG_START(mw8080bw_state::seawolf) /* there is no watchdog */ /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ seawolf_audio(config); @@ -518,7 +518,7 @@ MACHINE_CONFIG_START(mw8080bw_state::gunfight) /* there is no watchdog */ /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ gunfight_audio(config); @@ -748,7 +748,7 @@ MACHINE_CONFIG_START(mw8080bw_state::tornbase) /* there is no watchdog */ /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ tornbase_audio(config); @@ -858,7 +858,7 @@ MACHINE_CONFIG_START(mw8080bw_state::zzzap) WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_MONOSTABLE(RES_M(1), CAP_U(1))); /* 1.1s */ /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ /* zzzap_audio(config); */ @@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(mw8080bw_state::boothill) WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))); /* 2.97s */ /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ boothill_audio(config); @@ -1301,7 +1301,7 @@ MACHINE_CONFIG_START(mw8080bw_state::desertgu) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ desertgu_audio(config); @@ -1503,7 +1503,7 @@ MACHINE_CONFIG_START(mw8080bw_state::dplay) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ dplay_audio(config); @@ -1600,7 +1600,7 @@ MACHINE_CONFIG_START(mw8080bw_state::gmissile) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ gmissile_audio(config); @@ -1695,7 +1695,7 @@ MACHINE_CONFIG_START(mw8080bw_state::m4) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ m4_audio(config); @@ -1865,7 +1865,7 @@ MACHINE_CONFIG_START(mw8080bw_state::clowns) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ clowns_audio(config); @@ -1962,7 +1962,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spacwalk) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ spacwalk_audio(config); @@ -2045,7 +2045,7 @@ MACHINE_CONFIG_START(mw8080bw_state::shuffle) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ shuffle_audio(config); @@ -2133,7 +2133,7 @@ MACHINE_CONFIG_START(mw8080bw_state::dogpatch) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ dogpatch_audio(config); @@ -2387,7 +2387,7 @@ MACHINE_CONFIG_START(mw8080bw_state::phantom2) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mw8080bw_state, screen_vblank_phantom2)) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ phantom2_audio(config); @@ -2523,7 +2523,7 @@ MACHINE_CONFIG_START(mw8080bw_state::bowler) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ bowler_audio(config); @@ -2740,7 +2740,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders) MCFG_SCREEN_UPDATE_DRIVER(mw8080bw_state, screen_update_invaders) /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ invaders_audio(config); @@ -2821,7 +2821,7 @@ MACHINE_CONFIG_START(mw8080bw_state::blueshrk) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ blueshrk_audio(config); @@ -2924,7 +2924,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invad2ct) WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ)); /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* audio hardware */ invad2ct_audio(config); diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index 5bbcbc0e13b..a4e8893d5b6 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -852,7 +852,7 @@ MACHINE_CONFIG_START(nss_state::nss) MCFG_M50458_ADD("m50458", 4000000, "osd") /* TODO: correct clock */ MCFG_S3520CF_ADD("s3520cf") /* RTC */ MCFG_RP5H01_ADD("rp5h01") - MCFG_M6M80011AP_ADD("m6m80011ap") + M6M80011AP(config, "m6m80011ap"); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp index 3266b40f400..cd6488158ea 100644 --- a/src/mame/drivers/scyclone.cpp +++ b/src/mame/drivers/scyclone.cpp @@ -625,7 +625,7 @@ MACHINE_CONFIG_START(scyclone_state::scyclone) MCFG_GENERIC_LATCH_8_ADD("soundlatch") /* add shifter */ - MCFG_MB14241_ADD("mb14241") + MB14241(config, "mb14241"); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index a03e3ed5b57..9ee3e36f26d 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -1678,7 +1678,7 @@ MACHINE_CONFIG_START(segaxbd_state::xboard_base_mconfig ) NVRAM(config, "backup2", nvram_device::DEFAULT_ALL_0); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MB3773_ADD("watchdog") + MB3773(config, "watchdog"); MCFG_SEGA_315_5248_MULTIPLIER_ADD("multiplier_main") MCFG_SEGA_315_5248_MULTIPLIER_ADD("multiplier_subx") diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp index 10a00750d66..dc3baf601a6 100644 --- a/src/mame/drivers/segaybd.cpp +++ b/src/mame/drivers/segaybd.cpp @@ -1290,7 +1290,7 @@ MACHINE_CONFIG_START(segaybd_state::yboard) NVRAM(config, "backupram", nvram_device::DEFAULT_ALL_0); MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MB3773_ADD("watchdog") // IC95 + MB3773(config, "watchdog"); // IC95 sega_315_5296_device &io(SEGA_315_5296(config, "io", MASTER_CLOCK/8)); io.in_pa_callback().set_ioport("P1"); diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp index 86415c7faa9..bc3cd545d24 100644 --- a/src/mame/drivers/taitogn.cpp +++ b/src/mame/drivers/taitogn.cpp @@ -720,7 +720,7 @@ MACHINE_CONFIG_START(taitogn_state::coh3002t) MCFG_DEVICE_ADD("pccard", PCCARD_SLOT, 0) MCFG_DEVICE_SLOT_INTERFACE(slot_ataflash, nullptr, false) - MCFG_MB3773_ADD("mb3773") + MB3773(config, "mb3773"); INTEL_TE28F160(config, "biosflash"); INTEL_E28F400B(config, "pgmflash"); diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index 55e4c17f4b5..5ba1a7e7dc7 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -1149,7 +1149,7 @@ MACHINE_CONFIG_START(zn_state::coh1000ta) ymsnd.add_route(1, "lspeaker", 1.0); ymsnd.add_route(2, "rspeaker", 1.0); - MCFG_MB3773_ADD("mb3773") + MB3773(config, "mb3773"); MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0) MCFG_TC0140SYT_MASTER_CPU("maincpu") @@ -1198,7 +1198,7 @@ MACHINE_CONFIG_START(zn_state::coh1000tb) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) NVRAM(config, "fm1208s", nvram_device::DEFAULT_ALL_1); - MCFG_MB3773_ADD("mb3773") + MB3773(config, "mb3773"); /* sound hardware */ MCFG_DEVICE_MODIFY("spu") @@ -1222,7 +1222,7 @@ MACHINE_CONFIG_START(zn_state::coh1002tb) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) NVRAM(config, "fm1208s", nvram_device::DEFAULT_ALL_1); - MCFG_MB3773_ADD("mb3773") + MB3773(config, "mb3773"); /* sound hardware */ MCFG_DEVICE_MODIFY("spu") |