diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/bus/vcs | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/bus/vcs')
-rw-r--r-- | src/devices/bus/vcs/dpc.cpp | 7 | ||||
-rw-r--r-- | src/devices/bus/vcs/harmony_melody.cpp | 9 | ||||
-rw-r--r-- | src/devices/bus/vcs/scharger.cpp | 18 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/devices/bus/vcs/dpc.cpp b/src/devices/bus/vcs/dpc.cpp index aa452ba2957..525f9e77085 100644 --- a/src/devices/bus/vcs/dpc.cpp +++ b/src/devices/bus/vcs/dpc.cpp @@ -266,9 +266,10 @@ void a26_rom_dpc_device::setup_addon_ptr(uint8_t *ptr) } -MACHINE_CONFIG_START(a26_rom_dpc_device::device_add_mconfig) - MCFG_DEVICE_ADD("dpc", ATARI_DPC, 0) -MACHINE_CONFIG_END +void a26_rom_dpc_device::device_add_mconfig(machine_config &config) +{ + ATARI_DPC(config, m_dpc, 0); +} READ8_MEMBER(a26_rom_dpc_device::read_rom) { diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp index 38f2b92dd94..a38d0c74fdc 100644 --- a/src/devices/bus/vcs/harmony_melody.cpp +++ b/src/devices/bus/vcs/harmony_melody.cpp @@ -82,10 +82,11 @@ void a26_rom_harmony_device::harmony_arm7_map(address_map &map) { } -MACHINE_CONFIG_START(a26_rom_harmony_device::device_add_mconfig) - MCFG_DEVICE_ADD("arm", LPC2103, 70000000) - MCFG_DEVICE_PROGRAM_MAP(harmony_arm7_map) -MACHINE_CONFIG_END +void a26_rom_harmony_device::device_add_mconfig(machine_config &config) +{ + LPC2103(config, m_cpu, 70000000); + m_cpu->set_addrmap(AS_PROGRAM, &a26_rom_harmony_device::harmony_arm7_map); +} // actually if the ARM code is doing this and providing every opcode to the main CPU based // on bus activity then we shouldn't be doing and of this here (if the ROM is actually diff --git a/src/devices/bus/vcs/scharger.cpp b/src/devices/bus/vcs/scharger.cpp index 36a9ee65acc..7c42fc9003c 100644 --- a/src/devices/bus/vcs/scharger.cpp +++ b/src/devices/bus/vcs/scharger.cpp @@ -87,15 +87,15 @@ void a26_rom_ss_device::device_reset() } -MACHINE_CONFIG_START(a26_rom_ss_device::device_add_mconfig) - MCFG_CASSETTE_ADD("cassette") - MCFG_CASSETTE_FORMATS(a26_cassette_formats) - MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) - MCFG_CASSETTE_INTERFACE("a2600_cass") - -// MCFG_SOUND_WAVE_ADD("wave", "cassette") -// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) -MACHINE_CONFIG_END +void a26_rom_ss_device::device_add_mconfig(machine_config &config) +{ + CASSETTE(config, m_cassette); + m_cassette->set_formats(a26_cassette_formats); + m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->set_interface("a2600_cass"); + +// WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25); +} inline uint8_t a26_rom_ss_device::read_byte(uint32_t offset) { |