summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/snk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/snk.cpp')
-rw-r--r--src/mame/drivers/snk.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp
index 039680dda14..f47f37c77bf 100644
--- a/src/mame/drivers/snk.cpp
+++ b/src/mame/drivers/snk.cpp
@@ -578,9 +578,9 @@ TODO:
#include "cpu/z80/z80.h"
#include "sound/snkwave.h"
#include "sound/ay8910.h"
-#include "sound/3526intf.h"
-#include "sound/3812intf.h"
-#include "sound/8950intf.h"
+#include "sound/y8950.h"
+#include "sound/ym3526.h"
+#include "sound/ym3812.h"
#include "speaker.h"
@@ -1760,10 +1760,10 @@ void snk_state::YM3526_YM3526_sound_map(address_map &map)
map(0x0000, 0xbfff).rom();
map(0xc000, 0xcfff).ram();
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- map(0xe800, 0xe800).rw("ym1", FUNC(ym3526_device::status_port_r), FUNC(ym3526_device::control_port_w));
- map(0xec00, 0xec00).w("ym1", FUNC(ym3526_device::write_port_w));
- map(0xf000, 0xf000).rw("ym2", FUNC(ym3526_device::status_port_r), FUNC(ym3526_device::control_port_w));
- map(0xf400, 0xf400).w("ym2", FUNC(ym3526_device::write_port_w));
+ map(0xe800, 0xe800).rw("ym1", FUNC(ym3526_device::status_r), FUNC(ym3526_device::address_w));
+ map(0xec00, 0xec00).w("ym1", FUNC(ym3526_device::data_w));
+ map(0xf000, 0xf000).rw("ym2", FUNC(ym3526_device::status_r), FUNC(ym3526_device::address_w));
+ map(0xf400, 0xf400).w("ym2", FUNC(ym3526_device::data_w));
map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w));
}
@@ -1772,8 +1772,8 @@ void snk_state::YM3812_sound_map(address_map &map)
map(0x0000, 0xbfff).rom();
map(0xc000, 0xcfff).ram();
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- map(0xe800, 0xe800).rw("ym1", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w));
- map(0xec00, 0xec00).w("ym1", FUNC(ym3812_device::write_port_w));
+ map(0xe800, 0xe800).rw("ym1", FUNC(ym3812_device::status_r), FUNC(ym3812_device::address_w));
+ map(0xec00, 0xec00).w("ym1", FUNC(ym3812_device::data_w));
map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w));
}
@@ -1782,10 +1782,10 @@ void snk_state::YM3526_Y8950_sound_map(address_map &map)
map(0x0000, 0xbfff).rom();
map(0xc000, 0xcfff).ram();
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- map(0xe800, 0xe800).rw("ym1", FUNC(ym3526_device::status_port_r), FUNC(ym3526_device::control_port_w));
- map(0xec00, 0xec00).w("ym1", FUNC(ym3526_device::write_port_w));
- map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_port_r), FUNC(y8950_device::control_port_w));
- map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::write_port_w));
+ map(0xe800, 0xe800).rw("ym1", FUNC(ym3526_device::status_r), FUNC(ym3526_device::address_w));
+ map(0xec00, 0xec00).w("ym1", FUNC(ym3526_device::data_w));
+ map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_r), FUNC(y8950_device::address_w));
+ map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::data_w));
map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w));
}
@@ -1794,10 +1794,10 @@ void snk_state::YM3812_Y8950_sound_map(address_map &map)
map(0x0000, 0xbfff).rom();
map(0xc000, 0xcfff).ram();
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- map(0xe800, 0xe800).rw("ym1", FUNC(ym3812_device::status_port_r), FUNC(ym3812_device::control_port_w));
- map(0xec00, 0xec00).w("ym1", FUNC(ym3812_device::write_port_w));
- map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_port_r), FUNC(y8950_device::control_port_w));
- map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::write_port_w));
+ map(0xe800, 0xe800).rw("ym1", FUNC(ym3812_device::status_r), FUNC(ym3812_device::address_w));
+ map(0xec00, 0xec00).w("ym1", FUNC(ym3812_device::data_w));
+ map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_r), FUNC(y8950_device::address_w));
+ map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::data_w));
map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w));
}
@@ -1806,8 +1806,8 @@ void snk_state::Y8950_sound_map(address_map &map)
map(0x0000, 0xbfff).rom();
map(0xc000, 0xcfff).ram();
map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_port_r), FUNC(y8950_device::control_port_w));
- map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::write_port_w));
+ map(0xf000, 0xf000).rw("ym2", FUNC(y8950_device::status_r), FUNC(y8950_device::address_w));
+ map(0xf400, 0xf400).w("ym2", FUNC(y8950_device::data_w));
map(0xf800, 0xf800).rw(FUNC(snk_state::snk_sound_status_r), FUNC(snk_state::snk_sound_status_w));
}
@@ -4216,7 +4216,7 @@ void snk_state::victroad(machine_config &config)
/* sound hardware */
y8950_device &ym2(Y8950(config.replace(), "ym2", XTAL(8'000'000)/2)); /* verified on pcb */
- ym2.irq().set(FUNC(snk_state::ymirq_callback_2));
+ ym2.irq_handler().set(FUNC(snk_state::ymirq_callback_2));
ym2.add_route(ALL_OUTPUTS, "mono", 2.0);
}
@@ -4260,7 +4260,7 @@ void snk_state::bermudat(machine_config &config)
ym1.add_route(ALL_OUTPUTS, "mono", 2.0);
y8950_device &ym2(Y8950(config, "ym2", XTAL(8'000'000)/2)); /* verified on pcb */
- ym2.irq().set(FUNC(snk_state::ymirq_callback_2));
+ ym2.irq_handler().set(FUNC(snk_state::ymirq_callback_2));
ym2.add_route(ALL_OUTPUTS, "mono", 2.0);
}
@@ -4342,7 +4342,7 @@ void snk_state::tdfever(machine_config &config)
ym1.add_route(ALL_OUTPUTS, "mono", 1.0);
y8950_device &ym2(Y8950(config, "ym2", 4000000));
- ym2.irq().set(FUNC(snk_state::ymirq_callback_2));
+ ym2.irq_handler().set(FUNC(snk_state::ymirq_callback_2));
ym2.add_route(ALL_OUTPUTS, "mono", 1.0);
}