summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/snes/event.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/snes/event.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/snes/event.cpp')
-rw-r--r--src/devices/bus/snes/event.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index 3591a2a679a..7131807edab 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -60,7 +60,7 @@ void sns_pfest94_device::device_reset()
mapper specific handlers
-------------------------------------------------*/
-uint8_t sns_pfest94_device::read_l(offs_t offset)
+READ8_MEMBER(sns_pfest94_device::read_l)
{
// menu
if ((offset & 0x208000) == 0x208000)
@@ -77,7 +77,7 @@ uint8_t sns_pfest94_device::read_l(offs_t offset)
}
}
-uint8_t sns_pfest94_device::read_h(offs_t offset)
+READ8_MEMBER(sns_pfest94_device::read_h)
{
// menu
if ((offset & 0x208000) == 0x208000)
@@ -103,7 +103,7 @@ uint8_t sns_pfest94_device::read_h(offs_t offset)
// these are used for two diff effects: both to select game from menu and to access the DSP when running SMK!
-uint8_t sns_pfest94_device::chip_read(offs_t offset)
+READ8_MEMBER( sns_pfest94_device::chip_read )
{
if (offset & 0x8000)
{
@@ -119,7 +119,7 @@ uint8_t sns_pfest94_device::chip_read(offs_t offset)
}
-void sns_pfest94_device::chip_write(offs_t offset, uint8_t data)
+WRITE8_MEMBER( sns_pfest94_device::chip_write )
{
if (offset & 0x8000)
{
@@ -186,12 +186,12 @@ void sns_pfest94_device::speedup_addon_bios_access()
// DSP dump contains prg at offset 0 and data at offset 0x2000
-uint32_t sns_pfest94_device::necdsp_prg_r(offs_t offset)
+READ32_MEMBER( sns_pfest94_device::necdsp_prg_r )
{
return get_prg(&m_bios[0], offset);
}
-uint16_t sns_pfest94_device::necdsp_data_r(offs_t offset)
+READ16_MEMBER( sns_pfest94_device::necdsp_data_r )
{
return get_data(&m_bios[0], offset + 0x2000/2);
}
@@ -221,12 +221,11 @@ void sns_pfest94_device::dsp_data_map_lorom(address_map &map)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-void sns_pfest94_device::device_add_mconfig(machine_config &config)
-{
- UPD7725(config, m_upd7725, 8000000);
- m_upd7725->set_addrmap(AS_PROGRAM, &sns_pfest94_device::dsp_prg_map_lorom);
- m_upd7725->set_addrmap(AS_DATA, &sns_pfest94_device::dsp_data_map_lorom);
-}
+MACHINE_CONFIG_START(sns_pfest94_device::device_add_mconfig)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
+MACHINE_CONFIG_END
//-------------------------------------------------
// Dipswitch