summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-11-06 14:11:55 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-11-06 14:11:55 +0100
commit2027d59e7f36129e86b4e4cf2c32b18268c337b8 (patch)
tree97a01f3b9ff70dbfd860c57885880f8021600f6b /src/mame
parente311c17406f0b6a304e0df44d0f5ae2c317dcfd7 (diff)
Do not use FUNC in delegate where applicable (nw)
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/a2600.cpp2
-rw-r--r--src/mame/drivers/abc80x.cpp8
-rw-r--r--src/mame/drivers/atarisy4.cpp2
-rw-r--r--src/mame/drivers/atm.cpp2
-rw-r--r--src/mame/drivers/cobra.cpp14
-rw-r--r--src/mame/drivers/elwro800.cpp2
-rw-r--r--src/mame/drivers/firefox.cpp2
-rw-r--r--src/mame/drivers/gba.cpp2
-rw-r--r--src/mame/drivers/gottlieb.cpp4
-rw-r--r--src/mame/drivers/hp64k.cpp8
-rw-r--r--src/mame/drivers/konamigq.cpp4
-rw-r--r--src/mame/drivers/konamigv.cpp4
-rw-r--r--src/mame/drivers/ksys573.cpp6
-rw-r--r--src/mame/drivers/mc1000.cpp2
-rw-r--r--src/mame/drivers/mediagx.cpp2
-rw-r--r--src/mame/drivers/mpf1.cpp2
-rw-r--r--src/mame/drivers/mpz80.cpp2
-rw-r--r--src/mame/drivers/namcos12.cpp4
-rw-r--r--src/mame/drivers/namcos23.cpp8
-rw-r--r--src/mame/drivers/osi.cpp2
-rw-r--r--src/mame/drivers/pc88va.cpp4
-rw-r--r--src/mame/drivers/pdp1.cpp2
-rw-r--r--src/mame/drivers/pentagon.cpp2
-rw-r--r--src/mame/drivers/peoplepc.cpp8
-rw-r--r--src/mame/drivers/psx.cpp8
-rw-r--r--src/mame/drivers/rollext.cpp2
-rw-r--r--src/mame/drivers/sage2.cpp2
-rw-r--r--src/mame/drivers/saturn.cpp2
-rw-r--r--src/mame/drivers/scorpion.cpp2
-rw-r--r--src/mame/drivers/segahang.cpp2
-rw-r--r--src/mame/drivers/segas16a.cpp6
-rw-r--r--src/mame/drivers/segas16b.cpp20
-rw-r--r--src/mame/drivers/segaxbd.cpp14
-rw-r--r--src/mame/drivers/segaybd.cpp16
-rw-r--r--src/mame/drivers/statriv2.cpp4
-rw-r--r--src/mame/drivers/stv.cpp2
-rw-r--r--src/mame/drivers/taitopjc.cpp2
-rw-r--r--src/mame/drivers/taitosj.cpp2
-rw-r--r--src/mame/drivers/taitotz.cpp6
-rw-r--r--src/mame/drivers/twinkle.cpp4
-rw-r--r--src/mame/drivers/tx0.cpp2
-rw-r--r--src/mame/drivers/vcs80.cpp4
-rw-r--r--src/mame/drivers/wangpc.cpp8
-rw-r--r--src/mame/drivers/wpc_95.cpp4
-rw-r--r--src/mame/drivers/x68k.cpp4
-rw-r--r--src/mame/drivers/zn.cpp6
-rw-r--r--src/mame/machine/archimds.cpp2
-rw-r--r--src/mame/machine/at.cpp2
-rw-r--r--src/mame/machine/bbc.cpp4
-rw-r--r--src/mame/machine/coco.cpp2
-rw-r--r--src/mame/machine/dc.cpp2
-rw-r--r--src/mame/machine/fd1094.cpp2
-rw-r--r--src/mame/machine/mm1kb.cpp2
-rw-r--r--src/mame/machine/n64.cpp2
-rw-r--r--src/mame/machine/namcoic.cpp2
-rw-r--r--src/mame/machine/segaic16.cpp2
-rw-r--r--src/mame/machine/tecmosys.cpp2
-rw-r--r--src/mame/machine/ti85.cpp4
-rw-r--r--src/mame/machine/victor9k_fdc.cpp8
-rw-r--r--src/mame/machine/z80ne.cpp18
-rw-r--r--src/mame/video/apollo.cpp2
-rw-r--r--src/mame/video/atarirle.cpp2
-rw-r--r--src/mame/video/chihiro.cpp6
-rw-r--r--src/mame/video/gaelco3d.cpp6
-rw-r--r--src/mame/video/galastrm.cpp2
-rw-r--r--src/mame/video/hng64_3d.hxx2
-rw-r--r--src/mame/video/k001005.cpp10
-rw-r--r--src/mame/video/k052109.cpp2
-rw-r--r--src/mame/video/midvunit.cpp10
-rw-r--r--src/mame/video/midzeus.cpp6
-rw-r--r--src/mame/video/midzeus2.cpp8
-rw-r--r--src/mame/video/model2.cpp32
-rw-r--r--src/mame/video/model3.cpp14
-rw-r--r--src/mame/video/n64.cpp8
-rw-r--r--src/mame/video/namcofl.cpp2
-rw-r--r--src/mame/video/namconb1.cpp4
-rw-r--r--src/mame/video/namcos22.cpp4
-rw-r--r--src/mame/video/tc0780fpa.cpp12
78 files changed, 203 insertions, 203 deletions
diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp
index b99f56ec0d3..3613753f6e4 100644
--- a/src/mame/drivers/a2600.cpp
+++ b/src/mame/drivers/a2600.cpp
@@ -383,7 +383,7 @@ MACHINE_START_MEMBER(a2600_state,a2600)
case A26_F6:
case A26_DPC:
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1000, 0x1fff, read8_delegate(FUNC(vcs_cart_slot_device::read_rom),(vcs_cart_slot_device*)m_cart), write8_delegate(FUNC(vcs_cart_slot_device::write_bank),(vcs_cart_slot_device*)m_cart));
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(vcs_cart_slot_device::cart_opbase),(vcs_cart_slot_device*)m_cart));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&vcs_cart_slot_device::cart_opbase,(vcs_cart_slot_device*)m_cart));
break;
case A26_FE:
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1000, 0x1fff, read8_delegate(FUNC(vcs_cart_slot_device::read_rom),(vcs_cart_slot_device*)m_cart), write8_delegate(FUNC(vcs_cart_slot_device::write_ram),(vcs_cart_slot_device*)m_cart));
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index 207bba0a2c3..2330b3d22cb 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -1608,7 +1608,7 @@ DIRECT_UPDATE_MEMBER( abc800c_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc800c_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc800c_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&abc800c_state::direct_update_handler, this));
}
@@ -1642,7 +1642,7 @@ DIRECT_UPDATE_MEMBER( abc800m_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc800m_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc800m_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&abc800m_state::direct_update_handler, this));
}
@@ -1666,7 +1666,7 @@ DIRECT_UPDATE_MEMBER( abc802_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc802_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc802_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&abc802_state::direct_update_handler, this));
}
@@ -1700,7 +1700,7 @@ DIRECT_UPDATE_MEMBER( abc806_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc806_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc806_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&abc806_state::direct_update_handler, this));
}
diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp
index 924b1c0161b..ede54766efa 100644
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@@ -302,7 +302,7 @@ void atarisy4_renderer::draw_polygon(uint16_t color)
rectangle clip;
vertex_t v1, v2, v3;
atarisy4_polydata &extradata = object_data_alloc();
- render_delegate rd_scan = render_delegate(FUNC(atarisy4_renderer::draw_scanline), this);
+ render_delegate rd_scan = render_delegate(&atarisy4_renderer::draw_scanline, this);
clip.set(0, 511, 0, 511);
diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp
index 5ac43d436cf..0f944ac9d8b 100644
--- a/src/mame/drivers/atm.cpp
+++ b/src/mame/drivers/atm.cpp
@@ -147,7 +147,7 @@ MACHINE_RESET_MEMBER(atm_state,atm)
{
m_beta->enable();
}
- space.set_direct_update_handler(direct_update_delegate(FUNC(atm_state::atm_direct), this));
+ space.set_direct_update_handler(direct_update_delegate(&atm_state::atm_direct, this));
memset(messram,0,128*1024);
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 49be80ec9e0..1af6d4aa3a3 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -1060,7 +1060,7 @@ void cobra_state::cobra_video_exit()
void cobra_state::video_start()
{
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(cobra_state::cobra_video_exit), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&cobra_state::cobra_video_exit, this));
m_renderer = std::make_unique<cobra_renderer>(*m_screen);
m_renderer->gfx_init();
@@ -2531,7 +2531,7 @@ void cobra_renderer::gfx_fifo_exec()
{
if (w2 & 0x00200000)
{
- render_delegate rd = render_delegate(FUNC(cobra_renderer::render_texture_scan), this);
+ render_delegate rd = render_delegate(&cobra_renderer::render_texture_scan, this);
for (int i=2; i < units; i++)
{
render_triangle(visarea, rd, 8, vert[i-2], vert[i-1], vert[i]);
@@ -2539,7 +2539,7 @@ void cobra_renderer::gfx_fifo_exec()
}
else
{
- render_delegate rd = render_delegate(FUNC(cobra_renderer::render_color_scan), this);
+ render_delegate rd = render_delegate(&cobra_renderer::render_color_scan, this);
for (int i=2; i < units; i++)
{
render_triangle(visarea, rd, 5, vert[i-2], vert[i-1], vert[i]);
@@ -3331,7 +3331,7 @@ DRIVER_INIT_MEMBER(cobra_state, cobra)
8192,
"GFXFIFO_IN",
GFXFIFO_IN_VERBOSE != 0,
- cobra_fifo::event_delegate(FUNC(cobra_state::gfxfifo_in_event_callback), this))
+ cobra_fifo::event_delegate(&cobra_state::gfxfifo_in_event_callback, this))
);
m_gfxfifo_out = auto_alloc(machine(),
@@ -3339,7 +3339,7 @@ DRIVER_INIT_MEMBER(cobra_state, cobra)
8192,
"GFXFIFO_OUT",
GFXFIFO_OUT_VERBOSE != 0,
- cobra_fifo::event_delegate(FUNC(cobra_state::gfxfifo_out_event_callback), this))
+ cobra_fifo::event_delegate(&cobra_state::gfxfifo_out_event_callback, this))
);
m_m2sfifo = auto_alloc(machine(),
@@ -3347,7 +3347,7 @@ DRIVER_INIT_MEMBER(cobra_state, cobra)
2048,
"M2SFIFO",
M2SFIFO_VERBOSE != 0,
- cobra_fifo::event_delegate(FUNC(cobra_state::m2sfifo_event_callback), this))
+ cobra_fifo::event_delegate(&cobra_state::m2sfifo_event_callback, this))
);
m_s2mfifo = auto_alloc(machine(),
@@ -3355,7 +3355,7 @@ DRIVER_INIT_MEMBER(cobra_state, cobra)
2048,
"S2MFIFO",
S2MFIFO_VERBOSE != 0,
- cobra_fifo::event_delegate(FUNC(cobra_state::s2mfifo_event_callback), this))
+ cobra_fifo::event_delegate(&cobra_state::s2mfifo_event_callback, this))
);
m_maincpu->ppc_set_dcstore_callback(write32_delegate(FUNC(cobra_state::main_cpu_dc_store),this));
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index 4682eb5c3eb..845d063109a 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -507,7 +507,7 @@ MACHINE_RESET_MEMBER(elwro800_state,elwro800)
// this is a reset of ls175 in mmu
elwro800jr_mmu_w(0);
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(elwro800_state::elwro800_direct_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&elwro800_state::elwro800_direct_handler, this));
}
INTERRUPT_GEN_MEMBER(elwro800_state::elwro800jr_interrupt)
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 3d527bd39c5..3a99b06518b 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -512,7 +512,7 @@ void firefox_state::machine_start()
m_nvram_1c = machine().device<x2212_device>("nvram_1c");
m_nvram_1d = machine().device<x2212_device>("nvram_1d");
- m_laserdisc->set_data_ready_callback(phillips_22vp931_device::data_ready_delegate(FUNC(firefox_state::firq_gen), this));
+ m_laserdisc->set_data_ready_callback(phillips_22vp931_device::data_ready_delegate(&firefox_state::firq_gen, this));
m_control_num = 0;
m_sprite_bank = 0;
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index 60c5b11661f..e4ad9c227ea 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -1452,7 +1452,7 @@ DIRECT_UPDATE_MEMBER(gba_state::gba_direct)
DRIVER_INIT_MEMBER(gba_state,gbadv)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(gba_state::gba_direct), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&gba_state::gba_direct, this));
}
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index fbaf0f2cb1a..3c65b88ddcd 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -1803,7 +1803,7 @@ static MACHINE_CONFIG_DERIVED( g2laser, gottlieb_core )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_LASERDISC_PR8210_ADD("laserdisc")
- MCFG_LASERDISC_AUDIO(laserdisc_audio_delegate(FUNC(gottlieb_state::laserdisc_audio_process), (gottlieb_state*)owner))
+ MCFG_LASERDISC_AUDIO(laserdisc_audio_delegate(gottlieb_state::laserdisc_audio_process, (gottlieb_state*)owner))
MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb)
MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
@@ -1896,7 +1896,7 @@ static MACHINE_CONFIG_DERIVED( cobram3, gottlieb_core )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_LASERDISC_PR8210_ADD("laserdisc")
- MCFG_LASERDISC_AUDIO(laserdisc_audio_delegate(FUNC(gottlieb_state::laserdisc_audio_process), (gottlieb_state*)owner))
+ MCFG_LASERDISC_AUDIO(laserdisc_audio_delegate(gottlieb_state::laserdisc_audio_process, (gottlieb_state*)owner))
MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb)
MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index da247cd93ec..98fcc823baf 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -864,11 +864,11 @@ void hp64k_state::hp64k_update_drv_ctrl(void)
if (new_drive != m_current_floppy) {
m_fdc->set_floppy(new_drive);
- floppy0->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(hp64k_state::hp64k_floppy_idx_cb) , this));
- floppy1->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(hp64k_state::hp64k_floppy_idx_cb) , this));
+ floppy0->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(&hp64k_state::hp64k_floppy_idx_cb, this));
+ floppy1->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(&hp64k_state::hp64k_floppy_idx_cb, this));
- floppy0->setup_wpt_cb(floppy_image_device::wpt_cb(FUNC(hp64k_state::hp64k_floppy_wpt_cb) , this));
- floppy1->setup_wpt_cb(floppy_image_device::wpt_cb(FUNC(hp64k_state::hp64k_floppy_wpt_cb) , this));
+ floppy0->setup_wpt_cb(floppy_image_device::wpt_cb(&hp64k_state::hp64k_floppy_wpt_cb, this));
+ floppy1->setup_wpt_cb(floppy_image_device::wpt_cb(&hp64k_state::hp64k_floppy_wpt_cb, this));
m_current_floppy = new_drive;
}
diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp
index 62658e0bf4f..70440be9a9e 100644
--- a/src/mame/drivers/konamigq.cpp
+++ b/src/mame/drivers/konamigq.cpp
@@ -316,8 +316,8 @@ static MACHINE_CONFIG_START( konamigq, konamigq_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate( FUNC( konamigq_state::scsi_dma_read ), (konamigq_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate( FUNC( konamigq_state::scsi_dma_write ), (konamigq_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&konamigq_state::scsi_dma_read, (konamigq_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&konamigq_state::scsi_dma_write, (konamigq_state *) owner ) )
MCFG_CPU_ADD("soundcpu", M68000, XTAL_32MHz/4) /* 8MHz - measured */
MCFG_CPU_PROGRAM_MAP(konamigq_sound_map)
diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp
index ea47f2a2bfd..16e162e49fa 100644
--- a/src/mame/drivers/konamigv.cpp
+++ b/src/mame/drivers/konamigv.cpp
@@ -325,8 +325,8 @@ static MACHINE_CONFIG_START( konamigv, konamigv_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("2M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate( FUNC( konamigv_state::scsi_dma_read ), (konamigv_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate( FUNC( konamigv_state::scsi_dma_write ), (konamigv_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&konamigv_state::scsi_dma_read, (konamigv_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&konamigv_state::scsi_dma_write, (konamigv_state *) owner ) )
MCFG_DEVICE_ADD("mb89371", MB89371, 0)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index b6019514d81..cfd6a8f73bf 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -2025,8 +2025,8 @@ static MACHINE_CONFIG_START( konami573, ksys573_state )
MCFG_RAM_MODIFY( "maincpu:ram" )
MCFG_RAM_DEFAULT_SIZE( "4M" )
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate( FUNC( ksys573_state::cdrom_dma_read ), (ksys573_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate( FUNC( ksys573_state::cdrom_dma_write ), (ksys573_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&ksys573_state::cdrom_dma_read, (ksys573_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&ksys573_state::cdrom_dma_write, (ksys573_state *) owner ) )
MCFG_MACHINE_RESET_OVERRIDE( ksys573_state, konami573 )
@@ -2064,7 +2064,7 @@ static MACHINE_CONFIG_START( konami573, ksys573_state )
/* video hardware */
MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz )
- MCFG_PSXGPU_VBLANK_CALLBACK( vblank_state_delegate( FUNC( ksys573_state::sys573_vblank ), (ksys573_state *) owner ) )
+ MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&ksys573_state::sys573_vblank, (ksys573_state *) owner ))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO( "lspeaker", "rspeaker" )
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index 84810ed4cd9..7735c3124bb 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -586,7 +586,7 @@ DIRECT_UPDATE_MEMBER(mc1000_state::mc1000_direct_update_handler)
DRIVER_INIT_MEMBER(mc1000_state,mc1000)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mc1000_state::mc1000_direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&mc1000_state::mc1000_direct_update_handler, this));
}
/* System Drivers */
diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp
index 2d4d90959b8..cd40dea7e17 100644
--- a/src/mame/drivers/mediagx.cpp
+++ b/src/mame/drivers/mediagx.cpp
@@ -973,7 +973,7 @@ void mediagx_state::install_speedups(const speedup_entry *entries, int count)
}
#ifdef MAME_DEBUG
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(mediagx_state::report_speedups), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&mediagx_state::report_speedups, this));
#endif
}
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index cb5f0db7e9c..f3049cc686c 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -475,7 +475,7 @@ DIRECT_UPDATE_MEMBER(mpf1_state::mpf1_direct_update_handler)
DRIVER_INIT_MEMBER(mpf1_state,mpf1)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mpf1_state::mpf1_direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&mpf1_state::mpf1_direct_update_handler, this));
}
COMP( 1979, mpf1, 0, 0, mpf1, mpf1, mpf1_state, mpf1, "Multitech", "Micro Professor 1", 0)
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp
index 13b4c8d2732..e4310af2b8f 100644
--- a/src/mame/drivers/mpz80.cpp
+++ b/src/mame/drivers/mpz80.cpp
@@ -794,7 +794,7 @@ DIRECT_UPDATE_MEMBER(mpz80_state::mpz80_direct_update_handler)
DRIVER_INIT_MEMBER(mpz80_state,mpz80)
{
address_space &program = machine().device<cpu_device>(Z80_TAG)->space(AS_PROGRAM);
- program.set_direct_update_handler(direct_update_delegate(FUNC(mpz80_state::mpz80_direct_update_handler), this));
+ program.set_direct_update_handler(direct_update_delegate(&mpz80_state::mpz80_direct_update_handler, this));
}
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index 4a2f0a31255..c35f594f6c8 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1677,7 +1677,7 @@ static MACHINE_CONFIG_START( coh700, namcos12_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate( FUNC( namcos12_state::namcos12_rom_read ), (namcos12_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&namcos12_state::namcos12_rom_read, (namcos12_state *) owner ))
MCFG_CPU_ADD("sub", H83002, 16934400) // frequency based on research (superctr)
MCFG_CPU_PROGRAM_MAP(s12h8rwmap)
@@ -1700,7 +1700,7 @@ static MACHINE_CONFIG_START( coh700, namcos12_state )
/* video hardware */
MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8654Q, 0x200000, XTAL_53_693175MHz )
- MCFG_PSXGPU_VBLANK_CALLBACK( vblank_state_delegate( FUNC( namcos12_state::namcos12_sub_irq ), (namcos12_state *) owner ) )
+ MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&namcos12_state::namcos12_sub_irq, (namcos12_state *) owner ) )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 33add29d97b..133193de49c 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -2284,13 +2284,13 @@ void namcos23_renderer::render_flush(bitmap_rgb32& bitmap)
// We should probably split the polygons into triangles ourselves to insure everything is being rendered properly
if (p->vertex_count == 3)
- render_triangle(scissor, render_delegate(FUNC(namcos23_renderer::render_scanline), this), 4, p->pv[0], p->pv[1], p->pv[2]);
+ render_triangle(scissor, render_delegate(&namcos23_renderer::render_scanline, this), 4, p->pv[0], p->pv[1], p->pv[2]);
else if (p->vertex_count == 4)
- render_polygon<4>(scissor, render_delegate(FUNC(namcos23_renderer::render_scanline), this), 4, p->pv);
+ render_polygon<4>(scissor, render_delegate(&namcos23_renderer::render_scanline, this), 4, p->pv);
else if (p->vertex_count == 5)
- render_polygon<5>(scissor, render_delegate(FUNC(namcos23_renderer::render_scanline), this), 4, p->pv);
+ render_polygon<5>(scissor, render_delegate(&namcos23_renderer::render_scanline, this), 4, p->pv);
else if (p->vertex_count == 6)
- render_polygon<6>(scissor, render_delegate(FUNC(namcos23_renderer::render_scanline), this), 4, p->pv);
+ render_polygon<6>(scissor, render_delegate(&namcos23_renderer::render_scanline, this), 4, p->pv);
}
render.poly_count = 0;
}
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index 383009f271c..8559f07867d 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -690,7 +690,7 @@ void c1pmf_state::machine_start()
// drive select logic missing
if (m_floppy0->get_device())
- m_floppy0->get_device()->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(FUNC(sb2m600_state::floppy_index_callback), this));
+ m_floppy0->get_device()->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(&sb2m600_state::floppy_index_callback, this));
}
// disk format: 1 head, 36 tracks (? - manual displays a directory listing with 40 tracks),
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index 5f6244f9c7b..0afae61e590 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -1646,11 +1646,11 @@ void pc88va_state::machine_start()
floppy_image_device *floppy;
floppy = machine().device<floppy_connector>("upd765:0")->get_device();
if(floppy)
- floppy->setup_ready_cb(floppy_image_device::ready_cb(FUNC(pc88va_state::pc88va_fdc_update_ready), this));
+ floppy->setup_ready_cb(floppy_image_device::ready_cb(&pc88va_state::pc88va_fdc_update_ready, this));
floppy = machine().device<floppy_connector>("upd765:1")->get_device();
if(floppy)
- floppy->setup_ready_cb(floppy_image_device::ready_cb(FUNC(pc88va_state::pc88va_fdc_update_ready), this));
+ floppy->setup_ready_cb(floppy_image_device::ready_cb(&pc88va_state::pc88va_fdc_update_ready, this));
machine().device<floppy_connector>("upd765:0")->get_device()->set_rpm(300);
machine().device<floppy_connector>("upd765:1")->get_device()->set_rpm(300);
diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp
index 859b5d3e4b8..6fcb5a367e7 100644
--- a/src/mame/drivers/pdp1.cpp
+++ b/src/mame/drivers/pdp1.cpp
@@ -647,7 +647,7 @@ void pdp1_state::machine_start()
dst = memregion("gfx1")->base();
memcpy(dst, fontdata6x8, pdp1_fontdata_size);
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(pdp1_state::pdp1_machine_stop),this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&pdp1_state::pdp1_machine_stop,this));
m_tape_reader.timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pdp1_state::reader_callback),this));
m_tape_puncher.timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pdp1_state::puncher_callback),this));
diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp
index 9f0bb0697b1..725e3003b2c 100644
--- a/src/mame/drivers/pentagon.cpp
+++ b/src/mame/drivers/pentagon.cpp
@@ -212,7 +212,7 @@ MACHINE_RESET_MEMBER(pentagon_state,pentagon)
if (strcmp(machine().system().name, "pent1024")==0)
m_beta->enable();
}
- space.set_direct_update_handler(direct_update_delegate(FUNC(pentagon_state::pentagon_direct), this));
+ space.set_direct_update_handler(direct_update_delegate(&pentagon_state::pentagon_direct, this));
memset(messram,0,128*1024);
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp
index e194517c460..51ed69a429d 100644
--- a/src/mame/drivers/peoplepc.cpp
+++ b/src/mame/drivers/peoplepc.cpp
@@ -180,10 +180,10 @@ void peoplepc_state::machine_start()
m_dma0pg = 0;
// FIXME: cheat as there no docs about how or obvious ports that set to control the motor
- m_flop0->get_device()->setup_load_cb(floppy_image_device::load_cb(FUNC(peoplepc_state::floppy_load), this));
- m_flop0->get_device()->setup_unload_cb(floppy_image_device::unload_cb(FUNC(peoplepc_state::floppy_unload), this));
- m_flop1->get_device()->setup_load_cb(floppy_image_device::load_cb(FUNC(peoplepc_state::floppy_load), this));
- m_flop1->get_device()->setup_unload_cb(floppy_image_device::unload_cb(FUNC(peoplepc_state::floppy_unload), this));
+ m_flop0->get_device()->setup_load_cb(floppy_image_device::load_cb(&peoplepc_state::floppy_load, this));
+ m_flop0->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&peoplepc_state::floppy_unload, this));
+ m_flop1->get_device()->setup_load_cb(floppy_image_device::load_cb(&peoplepc_state::floppy_load, this));
+ m_flop1->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&peoplepc_state::floppy_unload, this));
}
static ADDRESS_MAP_START( peoplepc_map, AS_PROGRAM, 16, peoplepc_state )
diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp
index 10ead0cdd54..1b3536e4f50 100644
--- a/src/mame/drivers/psx.cpp
+++ b/src/mame/drivers/psx.cpp
@@ -124,8 +124,8 @@ static MACHINE_CONFIG_START( psj, psx1_state )
MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate( FUNC( psx1_state::cd_dma_read ), (psx1_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate( FUNC( psx1_state::cd_dma_write ), (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psu, psj )
@@ -170,8 +170,8 @@ static MACHINE_CONFIG_START( pse, psx1_state )
MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate( FUNC( psx1_state::cd_dma_read ), (psx1_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate( FUNC( psx1_state::cd_dma_write ), (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) )
MACHINE_CONFIG_END
ROM_START( psj )
diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp
index e77fa721a9f..016b6b5adfe 100644
--- a/src/mame/drivers/rollext.cpp
+++ b/src/mame/drivers/rollext.cpp
@@ -153,7 +153,7 @@ void rollext_renderer::process_display_list(uint32_t* disp_ram)
{
const rectangle& visarea = screen().visible_area();
- render_delegate rd = render_delegate(FUNC(rollext_renderer::render_texture_scan), this);
+ render_delegate rd = render_delegate(&rollext_renderer::render_texture_scan, this);
int num = disp_ram[0xffffc/4];
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 3276c2d0fc4..808679974a3 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -557,7 +557,7 @@ DIRECT_UPDATE_MEMBER(sage2_state::sage2_direct_update_handler)
DRIVER_INIT_MEMBER(sage2_state,sage2)
{
address_space &program = machine().device<cpu_device>(M68000_TAG)->space(AS_PROGRAM);
- program.set_direct_update_handler(direct_update_delegate(FUNC(sage2_state::sage2_direct_update_handler), this));
+ program.set_direct_update_handler(direct_update_delegate(&sage2_state::sage2_direct_update_handler, this));
}
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index 0ff04737435..ac2d1f2bd91 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -727,7 +727,7 @@ MACHINE_START_MEMBER(sat_console_state, saturn)
save_item(NAME(m_smpc.SR));
save_item(NAME(m_smpc.SMEM));
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(sat_console_state::stvcd_exit), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&sat_console_state::stvcd_exit, this));
m_smpc.rtc_data[0] = DectoBCD(systime.local_time.year /100);
m_smpc.rtc_data[1] = DectoBCD(systime.local_time.year %100);
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index 02aedba513f..80b8dca50de 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -196,7 +196,7 @@ MACHINE_RESET_MEMBER(scorpion_state,scorpion)
space.install_write_handler(0x0000, 0x3fff, write8_delegate(FUNC(scorpion_state::scorpion_0000_w),this));
m_beta->disable();
- space.set_direct_update_handler(direct_update_delegate(FUNC(scorpion_state::scorpion_direct), this));
+ space.set_direct_update_handler(direct_update_delegate(&scorpion_state::scorpion_direct, this));
memset(messram,0,256*1024);
diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp
index 33b13b57b82..0ef5a5d2ae2 100644
--- a/src/mame/drivers/segahang.cpp
+++ b/src/mame/drivers/segahang.cpp
@@ -1965,7 +1965,7 @@ DRIVER_INIT_MEMBER(segahang_state,sharrier)
{
DRIVER_INIT_CALL(generic);
m_sharrier_video = true;
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segahang_state::sharrier_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segahang_state::sharrier_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segahang_state,enduror)
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index 88378af9992..6c72db14c1d 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -3665,7 +3665,7 @@ DRIVER_INIT_MEMBER(segas16a_state,aceattaca)
DRIVER_INIT_MEMBER(segas16a_state,dumpmtmt)
{
DRIVER_INIT_CALL(generic);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16a_state::dumpmtmt_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16a_state::dumpmtmt_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16a_state,mjleague)
@@ -3683,7 +3683,7 @@ DRIVER_INIT_MEMBER(segas16a_state,passsht16a)
DRIVER_INIT_MEMBER(segas16a_state,quartet)
{
DRIVER_INIT_CALL(generic);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16a_state::quartet_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16a_state::quartet_i8751_sim, this);
}
@@ -3697,7 +3697,7 @@ DRIVER_INIT_MEMBER(segas16a_state,sjryukoa)
{
DRIVER_INIT_CALL(generic);
m_custom_io_r = read16_delegate(FUNC(segas16a_state::sjryuko_custom_io_r), this);
- m_lamp_changed_w = lamp_changed_delegate(FUNC(segas16a_state::sjryuko_lamp_changed_w), this);
+ m_lamp_changed_w = lamp_changed_delegate(&segas16a_state::sjryuko_lamp_changed_w, this);
}
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index 995cefe3be1..65f285a8ee2 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -8622,19 +8622,19 @@ DRIVER_INIT_MEMBER(segas16b_state,aliensyn7_5358_small)
DRIVER_INIT_MEMBER(segas16b_state,altbeast_5521)
{
DRIVER_INIT_CALL(generic_5521);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::altbeast_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::altbeast_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16b_state,altbeasj_5521)
{
DRIVER_INIT_CALL(generic_5521);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::altbeasj_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::altbeasj_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16b_state,altbeas5_5521)
{
DRIVER_INIT_CALL(generic_5521);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::altbeas5_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::altbeas5_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16b_state,altbeas4_5521)
@@ -8646,7 +8646,7 @@ DRIVER_INIT_MEMBER(segas16b_state,altbeas4_5521)
DRIVER_INIT_MEMBER(segas16b_state,ddux_5704)
{
DRIVER_INIT_CALL(generic_5704);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::ddux_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::ddux_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16b_state,dunkshot_5358_small)
@@ -8665,7 +8665,7 @@ DRIVER_INIT_MEMBER(segas16b_state,exctleag_5358)
DRIVER_INIT_MEMBER(segas16b_state,goldnaxe_5704)
{
DRIVER_INIT_CALL(generic_5704);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::goldnaxe_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::goldnaxe_i8751_sim, this);
static const uint8_t memory_control_5704[0x10] =
{ 0x02,0x00, 0x02,0x08, 0x00,0x1f, 0x00,0xff, 0x00,0x20, 0x01,0x10, 0x00,0x14, 0x00,0xc4 };
@@ -8675,7 +8675,7 @@ DRIVER_INIT_MEMBER(segas16b_state,goldnaxe_5704)
DRIVER_INIT_MEMBER(segas16b_state,goldnaxe_5797)
{
DRIVER_INIT_CALL(generic_5797);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::goldnaxe_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::goldnaxe_i8751_sim, this);
static const uint8_t memory_control_5797[0x10] =
{ 0x02,0x00, 0x00,0x1f, 0x00,0x1e, 0x00,0xff, 0x00,0x20, 0x01,0x10, 0x00,0x14, 0x00,0xc4 };
@@ -8749,13 +8749,13 @@ DRIVER_INIT_MEMBER(segas16b_state,timescan_5358_small)
DRIVER_INIT_MEMBER(segas16b_state,tturf_5704)
{
DRIVER_INIT_CALL(generic_5704);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::tturf_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::tturf_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16b_state,wb3_5704)
{
DRIVER_INIT_CALL(generic_5704);
- m_i8751_vblank_hook = i8751_sim_delegate(FUNC(segas16b_state::wb3_i8751_sim), this);
+ m_i8751_vblank_hook = i8751_sim_delegate(&segas16b_state::wb3_i8751_sim, this);
}
DRIVER_INIT_MEMBER(segas16b_state,snapper)
@@ -9430,7 +9430,7 @@ DRIVER_INIT_MEMBER(isgsm_state,shinfz)
memcpy(rom, &temp[0], 0x200000);
m_read_xor = 0x66;
- m_security_callback = security_callback_delegate(FUNC(isgsm_state::shinfz_security), this);
+ m_security_callback = security_callback_delegate(&isgsm_state::shinfz_security, this);
}
DRIVER_INIT_MEMBER(isgsm_state,tetrbx)
@@ -9444,7 +9444,7 @@ DRIVER_INIT_MEMBER(isgsm_state,tetrbx)
memcpy(rom, &temp[0], 0x80000);
m_read_xor = 0x73;
- m_security_callback = security_callback_delegate(FUNC(isgsm_state::tetrbx_security), this);
+ m_security_callback = security_callback_delegate(&isgsm_state::tetrbx_security, this);
}
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 2ab905b232b..c33521f6361 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -317,7 +317,7 @@ void segaxbd_state::device_start()
m_scanline_timer = timer_alloc(TID_SCANLINE);
// reset the custom handlers and other pointers
- m_iochip_custom_io_w[0][3] = iowrite_delegate(FUNC(segaxbd_state::generic_iochip0_lamps_w), this);
+ m_iochip_custom_io_w[0][3] = iowrite_delegate(&segaxbd_state::generic_iochip0_lamps_w, this);
// save state
@@ -4736,8 +4736,8 @@ ROM_END
void segaxbd_state::install_aburner2(void)
{
m_road_priority = 0;
- m_iochip_custom_io_r[0][0] = ioread_delegate(FUNC(segaxbd_state::aburner2_iochip0_motor_r), this);
- m_iochip_custom_io_w[0][1] = iowrite_delegate(FUNC(segaxbd_state::aburner2_iochip0_motor_w), this);
+ m_iochip_custom_io_r[0][0] = ioread_delegate(&segaxbd_state::aburner2_iochip0_motor_r, this);
+ m_iochip_custom_io_w[0][1] = iowrite_delegate(&segaxbd_state::aburner2_iochip0_motor_w, this);
}
DRIVER_INIT_MEMBER(segaxbd_new_state,aburner2)
@@ -4747,8 +4747,8 @@ DRIVER_INIT_MEMBER(segaxbd_new_state,aburner2)
void segaxbd_state::install_lastsurv(void)
{
- m_iochip_custom_io_r[1][1] = ioread_delegate(FUNC(segaxbd_state::lastsurv_iochip1_port_r), this);
- m_iochip_custom_io_w[0][3] = iowrite_delegate(FUNC(segaxbd_state::lastsurv_iochip0_muxer_w), this);
+ m_iochip_custom_io_r[1][1] = ioread_delegate(&segaxbd_state::lastsurv_iochip1_port_r, this);
+ m_iochip_custom_io_w[0][3] = iowrite_delegate(&segaxbd_state::lastsurv_iochip0_muxer_w, this);
}
DRIVER_INIT_MEMBER(segaxbd_new_state,lastsurv)
@@ -4773,8 +4773,8 @@ DRIVER_INIT_MEMBER(segaxbd_new_state,loffire)
void segaxbd_state::install_smgp(void)
{
- m_iochip_custom_io_r[0][0] = ioread_delegate(FUNC(segaxbd_state::smgp_iochip0_motor_r), this);
- m_iochip_custom_io_w[0][1] = iowrite_delegate(FUNC(segaxbd_state::smgp_iochip0_motor_w), this);
+ m_iochip_custom_io_r[0][0] = ioread_delegate(&segaxbd_state::smgp_iochip0_motor_r, this);
+ m_iochip_custom_io_w[0][1] = iowrite_delegate(&segaxbd_state::smgp_iochip0_motor_w, this);
// map /EXCS space
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2f0000, 0x2f3fff, read16_delegate(FUNC(segaxbd_state::smgp_excs_r), this), write16_delegate(FUNC(segaxbd_state::smgp_excs_w), this));
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index c06d9f3ad17..e456ba3d3a7 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -2754,16 +2754,16 @@ DRIVER_INIT_MEMBER(segaybd_state,generic)
DRIVER_INIT_MEMBER(segaybd_state,gforce2)
{
DRIVER_INIT_CALL(generic);
- m_output_cb1 = output_delegate(FUNC(segaybd_state::gforce2_output_cb1), this);
- m_output_cb2 = output_delegate(FUNC(segaybd_state::gforce2_output_cb2), this);
+ m_output_cb1 = output_delegate(&segaybd_state::gforce2_output_cb1, this);
+ m_output_cb2 = output_delegate(&segaybd_state::gforce2_output_cb2, this);
}
DRIVER_INIT_MEMBER(segaybd_state,gloc)
{
// because some of the output data isn't fully understood we need to "center" the rams
DRIVER_INIT_CALL(generic);
- m_output_cb1 = output_delegate(FUNC(segaybd_state::gloc_output_cb1), this);
- m_output_cb2 = output_delegate(FUNC(segaybd_state::gloc_output_cb2), this);
+ m_output_cb1 = output_delegate(&segaybd_state::gloc_output_cb1, this);
+ m_output_cb2 = output_delegate(&segaybd_state::gloc_output_cb2, this);
output().set_value("left_motor_position_nor", 16);
output().set_value("right_motor_position_nor", 16);
@@ -2772,21 +2772,21 @@ DRIVER_INIT_MEMBER(segaybd_state,gloc)
DRIVER_INIT_MEMBER(segaybd_state,r360)
{
DRIVER_INIT_CALL(generic);
- m_output_cb2 = output_delegate(FUNC(segaybd_state::r360_output_cb2), this);
+ m_output_cb2 = output_delegate(&segaybd_state::r360_output_cb2, this);
}
DRIVER_INIT_MEMBER(segaybd_state,pdrift)
{
// because some of the output data isn't fully understood we need to "center" the motor
DRIVER_INIT_CALL(generic);
- m_output_cb1 = output_delegate(FUNC(segaybd_state::pdrift_output_cb1), this);
- m_output_cb2 = output_delegate(FUNC(segaybd_state::pdrift_output_cb2), this);
+ m_output_cb1 = output_delegate(&segaybd_state::pdrift_output_cb1, this);
+ m_output_cb2 = output_delegate(&segaybd_state::pdrift_output_cb2, this);
}
DRIVER_INIT_MEMBER(segaybd_state,rchase)
{
DRIVER_INIT_CALL(generic);
- m_output_cb2 = output_delegate(FUNC(segaybd_state::rchase_output_cb2), this);
+ m_output_cb2 = output_delegate(&segaybd_state::rchase_output_cb2, this);
}
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index e82db5281c5..df7f437290d 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -1150,11 +1150,11 @@ DRIVER_INIT_MEMBER(statriv2_state,laserdisc)
result = 0x18;
osd_printf_debug("%s:ld read ($%02X) = %02X\n", machine().describe_context(), 0x28 + offset, result);
return result;
- }),
+ },"write_lambda"),
write8_delegate([this](address_space &space, offs_t offset, uint8_t data, uint8_t mem_mask)
{
osd_printf_debug("%s:ld write ($%02X) = %02X\n", machine().describe_context(), 0x28 + offset, data);
- })
+ },"read_lambda")
);
}
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index a347a848f93..c6ffc5efbc2 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -1182,7 +1182,7 @@ MACHINE_START_MEMBER(stv_state,stv)
stv_register_protection_savestates(); // machine/stvprot.c
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(stv_state::stvcd_exit), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&stv_state::stvcd_exit, this));
m_smpc.rtc_data[0] = DectoBCD(systime.local_time.year /100);
m_smpc.rtc_data[1] = DectoBCD(systime.local_time.year %100);
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index 022d5a1fee5..ab8a8877ddd 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -239,7 +239,7 @@ void taitopjc_state::video_start()
m_gfxdecode->set_gfx(0, std::make_unique<gfx_element>(*m_palette, char_layout, (uint8_t*)m_screen_ram.get(), 0, m_palette->entries() / 256, 0));
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(taitopjc_state::video_exit), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&taitopjc_state::video_exit, this));
}
uint32_t taitopjc_state::screen_update_taitopjc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index 75c0f6117e3..eeff2ff23e6 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -2788,7 +2788,7 @@ void taitosj_state::init_common()
save_item(NAME(m_input_port_4_f0));
save_item(NAME(m_kikstart_gears));
- machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(taitosj_state::reset_common), this));
+ machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(&taitosj_state::reset_common, this));
}
DRIVER_INIT_MEMBER(taitosj_state,taitosj)
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 61053858ade..1d6850148bd 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -768,7 +768,7 @@ void taitotz_state::video_start()
/* create renderer */
m_renderer = std::make_unique<taitotz_renderer>(*this, width, height, m_screen_ram.get(), m_texture_ram.get());
- //machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(taitotz_exit), &machine()));
+ //machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&taitotz_exit, &machine()));
}
static const float dot3_tex_table[32] =
@@ -1322,7 +1322,7 @@ void taitotz_renderer::render_tnl_object(uint32_t address, float scale, uint8_t
for (int i=2; i < num_verts; i++)
{
- render_triangle(m_cliprect, render_delegate(FUNC(taitotz_renderer::draw_scanline), this), 6, v[0], v[i-1], v[i]);
+ render_triangle(m_cliprect, render_delegate(&taitotz_renderer::draw_scanline, this), 6, v[0], v[i-1], v[i]);
}
}
while (!end);
@@ -1412,7 +1412,7 @@ void taitotz_renderer::push_direct_poly_fifo(uint32_t data)
for (int i=2; i < num_verts; i++)
{
- render_triangle(m_cliprect, render_delegate(FUNC(taitotz_renderer::draw_scanline_noz), this), 3, v[0], v[i-1], v[i]);
+ render_triangle(m_cliprect, render_delegate(&taitotz_renderer::draw_scanline_noz, this), 3, v[0], v[i-1], v[i]);
}
m_direct_fifo_ptr = 0;
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index 01c4286d446..051608c3d04 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -939,8 +939,8 @@ static MACHINE_CONFIG_START( twinkle, twinkle_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate( FUNC( scsi_dma_read ), (twinkle_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate( FUNC( scsi_dma_write ), (twinkle_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&scsi_dma_read, (twinkle_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&scsi_dma_write, (twinkle_state *) owner ) )
MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */
MCFG_CPU_PROGRAM_MAP( sound_map )
diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp
index c1e075a7623..13a7844c1d7 100644
--- a/src/mame/drivers/tx0.cpp
+++ b/src/mame/drivers/tx0.cpp
@@ -344,7 +344,7 @@ void tx0_state::machine_start()
m_typewriter.prt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(tx0_state::prt_callback),this));
m_dis_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(tx0_state::dis_callback),this));
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(tx0_state::tx0_machine_stop),this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&tx0_state::tx0_machine_stop,this));
}
diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp
index bbca57adb3f..e7bc50855ca 100644
--- a/src/mame/drivers/vcs80.cpp
+++ b/src/mame/drivers/vcs80.cpp
@@ -247,8 +247,8 @@ DIRECT_UPDATE_MEMBER(vcs80_state::vcs80_direct_update_handler)
DRIVER_INIT_MEMBER(vcs80_state,vcs80)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(vcs80_state::vcs80_direct_update_handler), this));
- m_maincpu->space(AS_IO).set_direct_update_handler(direct_update_delegate(FUNC(vcs80_state::vcs80_direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&vcs80_state::vcs80_direct_update_handler, this));
+ m_maincpu->space(AS_IO).set_direct_update_handler(direct_update_delegate(&vcs80_state::vcs80_direct_update_handler, this));
}
/* System Drivers */
diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp
index dac18d5e700..c6e70b61ac4 100644
--- a/src/mame/drivers/wangpc.cpp
+++ b/src/mame/drivers/wangpc.cpp
@@ -1178,10 +1178,10 @@ WRITE_LINE_MEMBER( wangpc_state::bus_irq2_w )
void wangpc_state::machine_start()
{
// connect floppy callbacks
- m_floppy0->setup_load_cb(floppy_image_device::load_cb(FUNC(wangpc_state::on_disk0_load), this));
- m_floppy0->setup_unload_cb(floppy_image_device::unload_cb(FUNC(wangpc_state::on_disk0_unload), this));
- m_floppy1->setup_load_cb(floppy_image_device::load_cb(FUNC(wangpc_state::on_disk1_load), this));
- m_floppy1->setup_unload_cb(floppy_image_device::unload_cb(FUNC(wangpc_state::on_disk1_unload), this));
+ m_floppy0->setup_load_cb(floppy_image_device::load_cb(&wangpc_state::on_disk0_load, this));
+ m_floppy0->setup_unload_cb(floppy_image_device::unload_cb(&wangpc_state::on_disk0_unload, this));
+ m_floppy1->setup_load_cb(floppy_image_device::load_cb(&wangpc_state::on_disk1_load, this));
+ m_floppy1->setup_unload_cb(floppy_image_device::unload_cb(&wangpc_state::on_disk1_unload, this));
// state saving
save_item(NAME(m_dma_page));
diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp
index ed1014c5658..6bc85f01c6d 100644
--- a/src/mame/drivers/wpc_95.cpp
+++ b/src/mame/drivers/wpc_95.cpp
@@ -376,7 +376,7 @@ DRIVER_INIT_MEMBER(wpc_95_state, afm)
pic->set_serial("541 123456 12345 123");
lamp->set_names(lamps_afm);
out->set_names(outputs_afm);
- out->set_handler(wpc_out_device::handler_t(FUNC(wpc_95_state::afm_led_handler), this));
+ out->set_handler(wpc_out_device::handler_t(&wpc_95_state::afm_led_handler, this));
init();
}
@@ -449,7 +449,7 @@ DRIVER_INIT_MEMBER(wpc_95_state, sc)
pic->set_serial("903 123456 12345 123");
lamp->set_names(lamps_sc);
out->set_names(outputs_sc);
- out->set_handler(wpc_out_device::handler_t(FUNC(wpc_95_state::sc_aux_lamps_handler), this));
+ out->set_handler(wpc_out_device::handler_t(&wpc_95_state::sc_aux_lamps_handler, this));
init();
}
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index 7bd67852e8e..d6c74f5640b 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -1563,8 +1563,8 @@ MACHINE_START_MEMBER(x68k_state,x68000)
floppy_image_device *floppy = m_upd72065->subdevice<floppy_connector>(devname)->get_device();
m_fdc.floppy[drive] = floppy;
if(floppy) {
- floppy->setup_load_cb(floppy_image_device::load_cb(FUNC(x68k_state::floppy_load), this));
- floppy->setup_unload_cb(floppy_image_device::unload_cb(FUNC(x68k_state::floppy_unload), this));
+ floppy->setup_load_cb(floppy_image_device::load_cb(&x68k_state::floppy_load, this));
+ floppy->setup_unload_cb(floppy_image_device::unload_cb(&x68k_state::floppy_unload, this));
}
}
m_fdc.motor = 0;
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp
index 816ee52fcee..5ebbf5253c4 100644
--- a/src/mame/drivers/zn.cpp
+++ b/src/mame/drivers/zn.cpp
@@ -1330,8 +1330,8 @@ static MACHINE_CONFIG_DERIVED( coh1000w, zn1_2mb_vram )
MCFG_VT83C461_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate( FUNC( zn_state::atpsx_dma_read ), (zn_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate( FUNC( zn_state::atpsx_dma_write ), (zn_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&zn_state::atpsx_dma_read, (zn_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&zn_state::atpsx_dma_write, (zn_state *) owner ) )
MACHINE_CONFIG_END
/*
@@ -1983,7 +1983,7 @@ static MACHINE_CONFIG_DERIVED( jdredd, coh1000a )
MCFG_CPU_PROGRAM_MAP(jdredd_map)
MCFG_DEVICE_MODIFY("gpu")
- MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate( FUNC( zn_state::jdredd_vblank ), (zn_state *) owner))
+ MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&zn_state::jdredd_vblank, (zn_state *) owner))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
diff --git a/src/mame/machine/archimds.cpp b/src/mame/machine/archimds.cpp
index 55b12034d4f..48457abeb56 100644
--- a/src/mame/machine/archimds.cpp
+++ b/src/mame/machine/archimds.cpp
@@ -432,7 +432,7 @@ void archimedes_state::archimedes_driver_init()
{
m_archimedes_memc_physmem = reinterpret_cast<uint32_t *>(memshare("physicalram")->ptr());
// address_space &space = m_maincpu->space(AS_PROGRAM);
-// space.set_direct_update_handler(direct_update_delegate(FUNC(a310_setopbase), &machine));
+// space.set_direct_update_handler(direct_update_delegate(&a310_setopbase, &machine));
}
static const char *const ioc_regnames[] =
diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp
index 43239c8095e..21f0ac46cc6 100644
--- a/src/mame/machine/at.cpp
+++ b/src/mame/machine/at.cpp
@@ -41,7 +41,7 @@ void at_mb_device::device_reset()
void at_mb_device::device_start()
{
if(!strncmp(m_maincpu->shortname(), "i80286", 6))
- i80286_cpu_device::static_set_a20_callback(*m_maincpu, i80286_cpu_device::a20_cb(FUNC(at_mb_device::a20_286), this));
+ i80286_cpu_device::static_set_a20_callback(*m_maincpu, i80286_cpu_device::a20_cb(&at_mb_device::a20_286, this));
}
MACHINE_CONFIG_FRAGMENT( at_softlists )
diff --git a/src/mame/machine/bbc.cpp b/src/mame/machine/bbc.cpp
index ef099311db6..7f8582dc0f1 100644
--- a/src/mame/machine/bbc.cpp
+++ b/src/mame/machine/bbc.cpp
@@ -1788,7 +1788,7 @@ MACHINE_START_MEMBER(bbc_state, bbcbp)
m_machinetype = BPLUS;
m_mc6850_clock = 0;
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcbp_direct_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&bbc_state::bbcbp_direct_handler, this));
bbc_setup_banks(m_bank4, 16, 0, 0x3000);
m_bank4->configure_entries(16, 1, m_region_maincpu->base() + 0x8000, 0x3000); // additional bank for paged ram
@@ -1816,7 +1816,7 @@ MACHINE_START_MEMBER(bbc_state, bbcm)
m_machinetype = MASTER;
m_mc6850_clock = 0;
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcm_direct_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&bbc_state::bbcm_direct_handler, this));
bbcm_setup_banks(m_bank4, 16, 0, 0x1000);
m_bank4->configure_entries(16, 1, m_region_maincpu->base() + 0x8000, 0x1000); // additional bank for paged ram
diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp
index 4945982c61b..4c89a8a8594 100644
--- a/src/mame/machine/coco.cpp
+++ b/src/mame/machine/coco.cpp
@@ -138,7 +138,7 @@ void coco_state::device_start()
m_diecom_lightgun_timer = timer_alloc(TIMER_DIECOM_LIGHTGUN);
/* cart base update */
- m_cococart->set_cart_base_update(cococart_base_update_delegate(FUNC(coco_state::update_cart_base), this));
+ m_cococart->set_cart_base_update(cococart_base_update_delegate(&coco_state::update_cart_base, this));
/* save state support */
save_item(NAME(m_dac_output));
diff --git a/src/mame/machine/dc.cpp b/src/mame/machine/dc.cpp
index d35ec8612cb..0541938f582 100644
--- a/src/mame/machine/dc.cpp
+++ b/src/mame/machine/dc.cpp
@@ -649,7 +649,7 @@ void dc_state::machine_start()
{
// dccons doesn't have a specific g1 device yet
if(m_naomig1)
- m_naomig1->set_dma_cb(naomi_g1_device::dma_cb(FUNC(dc_state::generic_dma), this));
+ m_naomig1->set_dma_cb(naomi_g1_device::dma_cb(&dc_state::generic_dma, this));
// save states
save_pointer(NAME(dc_sysctrl_regs), 0x200/4);
diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp
index 93cfe1d9a99..bdf0a430e5b 100644
--- a/src/mame/machine/fd1094.cpp
+++ b/src/mame/machine/fd1094.cpp
@@ -581,7 +581,7 @@ fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, dev
if ((opcode & 0xff80) == 0x4e80 || (opcode & 0xf0f8) == 0x50c8 || (opcode & 0xf000) == 0x6000)
m_masked_opcodes_lookup[1][opcode >> 4] |= 1 << ((opcode >> 1) & 7);
- m_state_change = state_change_delegate(FUNC(fd1094_device::default_state_change), this);
+ m_state_change = state_change_delegate(&fd1094_device::default_state_change, this);
}
diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp
index 3eefba9bf7d..157c1558e15 100644
--- a/src/mame/machine/mm1kb.cpp
+++ b/src/mame/machine/mm1kb.cpp
@@ -237,7 +237,7 @@ void mm1_keyboard_t::device_start()
m_scan_timer->adjust(attotime::from_hz(clock()), 0, attotime::from_hz(clock()));
// add notification request for system shut down (to play back the power switch sound once more)
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(mm1_keyboard_t::shut_down_mm1), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&mm1_keyboard_t::shut_down_mm1, this));
// state saving
save_item(NAME(m_sense));
diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp
index bf0ec04fb22..8171ab3e311 100644
--- a/src/mame/machine/n64.cpp
+++ b/src/mame/machine/n64.cpp
@@ -2740,7 +2740,7 @@ void n64_state::machine_start()
rsp->rsp_add_imem(m_rsp_imem);
/* add a hook for battery save */
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(n64_state::n64_machine_stop),this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&n64_state::n64_machine_stop,this));
}
void n64_state::machine_reset()
diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp
index 2fc579d8a0d..663e918902c 100644
--- a/src/mame/machine/namcoic.cpp
+++ b/src/mame/machine/namcoic.cpp
@@ -818,7 +818,7 @@ void namcos2_shared_state::c355_obj_init(int gfxbank, int pal_xor, c355_obj_code
if (!code2tile.isnull())
m_c355_obj_code2tile = code2tile;
else
- m_c355_obj_code2tile = c355_obj_code2tile_delegate(FUNC(namcos2_shared_state::c355_obj_default_code2tile), this);
+ m_c355_obj_code2tile = c355_obj_code2tile_delegate(&namcos2_shared_state::c355_obj_default_code2tile, this);
memset(m_c355_obj_ram, 0, sizeof(m_c355_obj_ram)); // needed for Nebulas Ray
memset(m_c355_obj_position, 0, sizeof(m_c355_obj_position));
diff --git a/src/mame/machine/segaic16.cpp b/src/mame/machine/segaic16.cpp
index fac72484c8a..11ec0dddc8c 100644
--- a/src/mame/machine/segaic16.cpp
+++ b/src/mame/machine/segaic16.cpp
@@ -538,7 +538,7 @@ void sega_315_5195_mapper_device::device_start()
fd1094_device *fd1094 = dynamic_cast<fd1094_device *>(m_cpu.target());
if (fd1094 != nullptr)
{
- fd1094->notify_state_change(fd1094_device::state_change_delegate(FUNC(sega_315_5195_mapper_device::fd1094_state_change), this));
+ fd1094->notify_state_change(fd1094_device::state_change_delegate(&sega_315_5195_mapper_device::fd1094_state_change, this));
for (auto & elem : m_banks)
elem.set_decrypt(fd1094);
}
diff --git a/src/mame/machine/tecmosys.cpp b/src/mame/machine/tecmosys.cpp
index 2b0553546b6..e119070d7d6 100644
--- a/src/mame/machine/tecmosys.cpp
+++ b/src/mame/machine/tecmosys.cpp
@@ -121,7 +121,7 @@ void tecmosys_state::prot_init(int which)
case 2: m_device_data = &tkdensha_data; break;
}
- machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(tecmosys_state::prot_reset),this));
+ machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(&tecmosys_state::prot_reset,this));
}
READ16_MEMBER(tecmosys_state::prot_status_r)
diff --git a/src/mame/machine/ti85.cpp b/src/mame/machine/ti85.cpp
index 3832b4b7395..654244bc102 100644
--- a/src/mame/machine/ti85.cpp
+++ b/src/mame/machine/ti85.cpp
@@ -311,7 +311,7 @@ MACHINE_START_MEMBER(ti85_state,ti83p)
m_model = TI83P;
//address_space &space = m_maincpu->space(AS_PROGRAM);
//m_bios = memregion("flash")->base();
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(ti85_state::ti83p_direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&ti85_state::ti83p_direct_update_handler, this));
m_timer_interrupt_mask = 0;
m_timer_interrupt_status = 0;
@@ -375,7 +375,7 @@ void ti85_state::ti8xpse_init_common()
m_flash_unlocked = 0;
ti85_state::update_ti83pse_memory();
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(ti85_state::ti83p_direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&ti85_state::ti83p_direct_update_handler, this));
machine().scheduler().timer_pulse(attotime::from_hz(256), timer_expired_delegate(FUNC(ti85_state::ti83_timer1_callback),this));
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index fcc1b262d1e..d0bd89baf2d 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -339,14 +339,14 @@ void victor_9000_fdc_t::device_reset()
// set floppy callbacks
if (m_floppy0->get_device())
{
- m_floppy0->get_device()->setup_load_cb(floppy_image_device::load_cb(FUNC(victor_9000_fdc_t::load0_cb), this));
- m_floppy0->get_device()->setup_unload_cb(floppy_image_device::unload_cb(FUNC(victor_9000_fdc_t::unload0_cb), this));
+ m_floppy0->get_device()->setup_load_cb(floppy_image_device::load_cb(&victor_9000_fdc_t::load0_cb, this));
+ m_floppy0->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&victor_9000_fdc_t::unload0_cb, this));
}
if (m_floppy1->get_device())
{
- m_floppy1->get_device()->setup_load_cb(floppy_image_device::load_cb(FUNC(victor_9000_fdc_t::load1_cb), this));
- m_floppy1->get_device()->setup_unload_cb(floppy_image_device::unload_cb(FUNC(victor_9000_fdc_t::unload1_cb), this));
+ m_floppy1->get_device()->setup_load_cb(floppy_image_device::load_cb(&victor_9000_fdc_t::load1_cb, this));
+ m_floppy1->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&victor_9000_fdc_t::unload1_cb, this));
}
}
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index b77d7a2f986..571dae53262 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -167,7 +167,7 @@ DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_nmi_delay_count)
if (!m_nmi_delay_counter)
{
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this));
m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
return address;
@@ -190,7 +190,7 @@ DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_reset_delay_count)
if (!m_reset_delay_counter)
{
/* remove this callback */
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this));
/* and switch to RAM bank at address 0x0000 */
m_bank1->set_entry( 0 ); /* RAM at 0x0000 (bank 1) */
}
@@ -211,7 +211,7 @@ void z80ne_state::reset_lx382_banking()
/* after the first 3 bytes have been read from ROM, switch the RAM back in */
m_reset_delay_counter = 2;
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_reset_delay_count), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_reset_delay_count, this));
}
void z80ne_state::reset_lx390_banking()
@@ -228,7 +228,7 @@ void z80ne_state::reset_lx390_banking()
m_bank4->set_entry(0); /* RAM at 0xF000 */
/* after the first 3 bytes have been read from ROM, switch the RAM back in */
m_reset_delay_counter = 2;
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_reset_delay_count), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_reset_delay_count, this));
break;
case 0x02: /* EP548 16k BASIC */
if (VERBOSE)
@@ -237,7 +237,7 @@ void z80ne_state::reset_lx390_banking()
m_bank2->set_entry(1); /* ep548 at 0x0400-0x3FFF */
m_bank3->set_entry(0); /* RAM at 0x8000 */
m_bank4->set_entry(0); /* RAM at 0xF000 */
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this));
break;
case 0x03: /* EP390 Boot Loader for 5.5k floppy BASIC */
if (VERBOSE)
@@ -246,7 +246,7 @@ void z80ne_state::reset_lx390_banking()
m_bank2->set_entry(0); /* RAM at 0x0400-0x3FFF */
m_bank3->set_entry(0); /* RAM at 0x8000 */
m_bank4->set_entry(1); /* ep390 at 0xF000 */
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this));
break;
case 0x04: /* EP1390 Boot Loader for NE DOS 1.0/1.5 */
if (VERBOSE)
@@ -255,7 +255,7 @@ void z80ne_state::reset_lx390_banking()
m_bank2->set_entry(0); /* RAM at 0x0400-0x3FFF */
m_bank3->set_entry(0); /* RAM at 0x8000 */
m_bank4->set_entry(2); /* ep1390 at 0xF000 */
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this));
break;
case 0x05: /* EP2390 Boot Loader for NE DOS G.1 */
if (VERBOSE)
@@ -264,7 +264,7 @@ void z80ne_state::reset_lx390_banking()
m_bank2->set_entry(0); /* RAM at 0x0400-0x3FFF */
m_bank3->set_entry(0); /* RAM at 0x8000 */
m_bank4->set_entry(3); /* ep2390 at 0xF000 */
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_default, this));
break;
}
@@ -467,7 +467,7 @@ WRITE8_MEMBER(z80ne_state::lx383_w)
{
/* after writing to port 0xF8 and the first ~M1 cycles strike a NMI for single step execution */
m_nmi_delay_counter = 1;
- m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_nmi_delay_count), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(&z80ne_state::z80ne_nmi_delay_count, this));
}
}
diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp
index 9b3f14a4d17..0de39c5d5a9 100644
--- a/src/mame/video/apollo.cpp
+++ b/src/mame/video/apollo.cpp
@@ -1698,7 +1698,7 @@ void apollo_graphics_15i::register_vblank_callback()
/* register for VBLANK callbacks */
screen_device *screen = (screen_device *)machine().device(VIDEO_SCREEN_TAG);
- screen->register_vblank_callback(vblank_state_delegate(FUNC(apollo_graphics_15i::vblank_state_changed),this));
+ screen->register_vblank_callback(vblank_state_delegate(&apollo_graphics_15i::vblank_state_changed,this));
}
diff --git a/src/mame/video/atarirle.cpp b/src/mame/video/atarirle.cpp
index 9891ebaf944..6c328eca057 100644
--- a/src/mame/video/atarirle.cpp
+++ b/src/mame/video/atarirle.cpp
@@ -196,7 +196,7 @@ void atari_rle_objects_device::device_start()
m_ram.set(*share, 2);
// register a VBLANK callback
- m_screen->register_vblank_callback(vblank_state_delegate(FUNC(atari_rle_objects_device::vblank_callback), this));
+ m_screen->register_vblank_callback(vblank_state_delegate(&atari_rle_objects_device::vblank_callback, this));
// build and allocate the generic tables
build_rle_tables();
diff --git a/src/mame/video/chihiro.cpp b/src/mame/video/chihiro.cpp
index 33ab36bece0..1028d4e615f 100644
--- a/src/mame/video/chihiro.cpp
+++ b/src/mame/video/chihiro.cpp
@@ -2900,13 +2900,13 @@ int nv2a_renderer::geforce_exec_method(address_space & space, uint32_t chanel, u
primitive_type = (NV2A_BEGIN_END)data;
if (data != 0) {
if (((channel[chanel][subchannel].object.method[0x1e60 / 4] & 7) > 0) && (combiner.used != 0)) {
- render_spans_callback = render_delegate(FUNC(nv2a_renderer::render_register_combiners), this);
+ render_spans_callback = render_delegate(&nv2a_renderer::render_register_combiners, this);
}
else if (texture[0].enabled) {
- render_spans_callback = render_delegate(FUNC(nv2a_renderer::render_texture_simple), this);
+ render_spans_callback = render_delegate(&nv2a_renderer::render_texture_simple, this);
}
else
- render_spans_callback = render_delegate(FUNC(nv2a_renderer::render_color), this);
+ render_spans_callback = render_delegate(&nv2a_renderer::render_color, this);
}
countlen--;
}
diff --git a/src/mame/video/gaelco3d.cpp b/src/mame/video/gaelco3d.cpp
index e8721eee36c..95644d1338a 100644
--- a/src/mame/video/gaelco3d.cpp
+++ b/src/mame/video/gaelco3d.cpp
@@ -185,15 +185,15 @@ void gaelco3d_renderer::render_poly(screen_device &screen, uint32_t *polydata)
/* special case: no Z buffering and no perspective correction */
if (color != 0x7f00 && z0 < 0 && ooz_dx == 0 && ooz_dy == 0)
- render_triangle_fan(visarea, render_delegate(FUNC(gaelco3d_renderer::render_noz_noperspective), this), 0, vertnum, &vert[0]);
+ render_triangle_fan(visarea, render_delegate(&gaelco3d_renderer::render_noz_noperspective, this), 0, vertnum, &vert[0]);
/* general case: non-alpha blended */
else if (color != 0x7f00)
- render_triangle_fan(visarea, render_delegate(FUNC(gaelco3d_renderer::render_normal), this), 0, vertnum, &vert[0]);
+ render_triangle_fan(visarea, render_delegate(&gaelco3d_renderer::render_normal, this), 0, vertnum, &vert[0]);
/* color 0x7f seems to be hard-coded as a 50% alpha blend */
else
- render_triangle_fan(visarea, render_delegate(FUNC(gaelco3d_renderer::render_alphablend), this), 0, vertnum, &vert[0]);
+ render_triangle_fan(visarea, render_delegate(&gaelco3d_renderer::render_alphablend, this), 0, vertnum, &vert[0]);
m_polygons += vertnum - 2;
}
diff --git a/src/mame/video/galastrm.cpp b/src/mame/video/galastrm.cpp
index ba2bcbe4d2a..d6bb17ce93c 100644
--- a/src/mame/video/galastrm.cpp
+++ b/src/mame/video/galastrm.cpp
@@ -408,7 +408,7 @@ void galastrm_renderer::tc0610_rotate_draw(bitmap_ind16 &srcbitmap, const rectan
gs_poly_data& extra = object_data_alloc();
extra.texbase = &srcbitmap;
- render_polygon<4>(clip, render_delegate(FUNC(galastrm_renderer::tc0610_draw_scanline), this), 2, vert);
+ render_polygon<4>(clip, render_delegate(&galastrm_renderer::tc0610_draw_scanline, this), 2, vert);
wait();
}
diff --git a/src/mame/video/hng64_3d.hxx b/src/mame/video/hng64_3d.hxx
index 30ee1157d8d..7f96c7412ad 100644
--- a/src/mame/video/hng64_3d.hxx
+++ b/src/mame/video/hng64_3d.hxx
@@ -1302,6 +1302,6 @@ void hng64_poly_renderer::drawShaded(polygon *p)
renderData = rOptions;
const rectangle& visibleArea = m_state.m_screen->visible_area();
- render_triangle(visibleArea, render_delegate(FUNC(hng64_poly_renderer::render_scanline), this), 7, pVert[0], pVert[1], pVert[2]);
+ render_triangle(visibleArea, render_delegate(&hng64_poly_renderer::render_scanline, this), 7, pVert[0], pVert[1], pVert[2]);
}
}
diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp
index 25db8f24c2c..837c88b94d1 100644
--- a/src/mame/video/k001005.cpp
+++ b/src/mame/video/k001005.cpp
@@ -151,11 +151,11 @@ void k001005_renderer::render_polygons()
float fog_density = 1.5f;
- render_delegate rd_scan_2d = render_delegate(FUNC(k001005_renderer::draw_scanline_2d), this);
- render_delegate rd_scan_tex2d = render_delegate(FUNC(k001005_renderer::draw_scanline_2d_tex), this);
- render_delegate rd_scan = render_delegate(FUNC(k001005_renderer::draw_scanline), this);
- render_delegate rd_scan_tex = render_delegate(FUNC(k001005_renderer::draw_scanline_tex), this);
- render_delegate rd_scan_gour_blend = render_delegate(FUNC(k001005_renderer::draw_scanline_gouraud_blend), this);
+ render_delegate rd_scan_2d = render_delegate(&k001005_renderer::draw_scanline_2d, this);
+ render_delegate rd_scan_tex2d = render_delegate(&k001005_renderer::draw_scanline_2d_tex, this);
+ render_delegate rd_scan = render_delegate(&k001005_renderer::draw_scanline, this);
+ render_delegate rd_scan_tex = render_delegate(&k001005_renderer::draw_scanline_tex, this);
+ render_delegate rd_scan_gour_blend = render_delegate(&k001005_renderer::draw_scanline_gouraud_blend, this);
do
{
diff --git a/src/mame/video/k052109.cpp b/src/mame/video/k052109.cpp
index e54d7c55757..a5aebd44abf 100644
--- a/src/mame/video/k052109.cpp
+++ b/src/mame/video/k052109.cpp
@@ -211,7 +211,7 @@ void k052109_device::device_start()
throw device_missing_dependencies();
// and register a callback for vblank state
- m_screen->register_vblank_callback(vblank_state_delegate(FUNC(k052109_device::vblank_callback), this));
+ m_screen->register_vblank_callback(vblank_state_delegate(&k052109_device::vblank_callback, this));
}
decode_gfx();
diff --git a/src/mame/video/midvunit.cpp b/src/mame/video/midvunit.cpp
index 2fb9ef2031d..3c2fd31ffb9 100644
--- a/src/mame/video/midvunit.cpp
+++ b/src/mame/video/midvunit.cpp
@@ -320,7 +320,7 @@ void midvunit_renderer::process_dma_queue()
/* handle flat-shaded quads here */
if (!textured)
{
- callback = render_delegate(FUNC(midvunit_renderer::render_flat), this);
+ callback = render_delegate(&midvunit_renderer::render_flat, this);
pixdata += (m_state.m_dma_data[0] & 0x00ff);
}
/* handle textured quads here */
@@ -339,23 +339,23 @@ void midvunit_renderer::process_dma_queue()
/* handle non-masked, non-transparent quads */
if ((m_state.m_dma_data[0] & 0xc00) == 0x000)
{
- callback = render_delegate(FUNC(midvunit_renderer::render_tex), this);
+ callback = render_delegate(&midvunit_renderer::render_tex, this);
}
/* handle non-masked, transparent quads */
else if ((m_state.m_dma_data[0] & 0xc00) == 0x800)
{
- callback = render_delegate(FUNC(midvunit_renderer::render_textrans), this);
+ callback = render_delegate(&midvunit_renderer::render_textrans, this);
}
/* handle masked, transparent quads */
else if ((m_state.m_dma_data[0] & 0xc00) == 0xc00)
{
- callback = render_delegate(FUNC(midvunit_renderer::render_textransmask), this);
+ callback = render_delegate(&midvunit_renderer::render_textransmask, this);
pixdata += (m_state.m_dma_data[0] & 0x00ff);
}
/* handle masked, non-transparent quads (invalid?) */
else
{
- callback = render_delegate(FUNC(midvunit_renderer::render_flat), this);
+ callback = render_delegate(&midvunit_renderer::render_flat, this);
pixdata += (m_state.m_dma_data[0] & 0x00ff);
}
}
diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp
index ac2280cd234..2b3b3062cbe 100644
--- a/src/mame/video/midzeus.cpp
+++ b/src/mame/video/midzeus.cpp
@@ -292,7 +292,7 @@ VIDEO_START_MEMBER(midzeus_state,midzeus)
poly = auto_alloc(machine(), midzeus_renderer(*this));
/* we need to cleanup on exit */
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(midzeus_state::exit_handler), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&midzeus_state::exit_handler, this));
yoffs = 0;
texel_width = 256;
@@ -1269,14 +1269,14 @@ void midzeus_renderer::zeus_draw_quad(int long_fmt, const uint32_t *databuffer,
// a poly_render_quad_fan. It appears as though the new code defaults to a fan if
// the template argument is 4, but keep an eye out for missing quads.
poly->render_polygon<4>(zeus_cliprect,
- render_delegate(FUNC(midzeus_renderer::render_poly), this),
+ render_delegate(&midzeus_renderer::render_poly, this),
4,
clipvert);
}
void midzeus_renderer::zeus_draw_debug_quad(const rectangle& rect, const vertex_t *vert)
{
- poly->render_polygon<4>(rect, render_delegate(FUNC(midzeus_renderer::render_poly_solid_fixedz), this), 0, vert);
+ poly->render_polygon<4>(rect, render_delegate(&midzeus_renderer::render_poly_solid_fixedz, this), 0, vert);
}
diff --git a/src/mame/video/midzeus2.cpp b/src/mame/video/midzeus2.cpp
index ff7690a6bd6..ca0a3e7e95a 100644
--- a/src/mame/video/midzeus2.cpp
+++ b/src/mame/video/midzeus2.cpp
@@ -282,7 +282,7 @@ VIDEO_START_MEMBER(midzeus2_state,midzeus2)
poly = auto_alloc(machine(), midzeus2_renderer(*this));
/* we need to cleanup on exit */
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(midzeus2_state::exit_handler2), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&midzeus2_state::exit_handler2, this));
zbase = 2.0f;
yoffs = 0;
@@ -1277,11 +1277,11 @@ In memory:
// tests, but the (numverts == 5) statement below may actually be a quad fan instead of a 5-sided
// polygon.
if (numverts == 3)
- render_triangle(zeus_cliprect, render_delegate(FUNC(midzeus2_renderer::render_poly_8bit), this), 4, clipvert[0], clipvert[1], clipvert[2]);
+ render_triangle(zeus_cliprect, render_delegate(&midzeus2_renderer::render_poly_8bit, this), 4, clipvert[0], clipvert[1], clipvert[2]);
else if (numverts == 4)
- render_polygon<4>(zeus_cliprect, render_delegate(FUNC(midzeus2_renderer::render_poly_8bit), this), 4, clipvert);
+ render_polygon<4>(zeus_cliprect, render_delegate(&midzeus2_renderer::render_poly_8bit, this), 4, clipvert);
else if (numverts == 5)
- render_polygon<5>(zeus_cliprect, render_delegate(FUNC(midzeus2_renderer::render_poly_8bit), this), 4, clipvert);
+ render_polygon<5>(zeus_cliprect, render_delegate(&midzeus2_renderer::render_poly_8bit, this), 4, clipvert);
}
diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp
index b6ce47a42d2..a98f05199df 100644
--- a/src/mame/video/model2.cpp
+++ b/src/mame/video/model2.cpp
@@ -823,28 +823,28 @@ void model2_renderer::model2_3d_render(triangle *tri, const rectangle &cliprect)
// I was unable to make it work when converting to the new polygon rasterizer interface.
switch (renderer)
{
- case 0: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_0), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 1: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_1), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 2: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_2), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 3: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_3), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 4: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_4), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 5: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_5), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 6: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_6), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
- case 7: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_7), this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 0: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_0, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 1: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_1, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 2: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_2, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 3: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_3, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 4: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_4, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 5: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_5, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 6: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_6, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 7: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_7, this), 3, tri->v[0], tri->v[1], tri->v[2]); break;
}
}
else
{
switch (renderer)
{
- case 0: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_0), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 1: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_1), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 2: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_2), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 3: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_3), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 4: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_4), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 5: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_5), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 6: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_6), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
- case 7: render_triangle(vp, render_delegate(FUNC(model2_renderer::model2_3d_render_7), this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 0: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_0, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 1: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_1, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 2: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_2, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 3: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_3, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 4: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_4, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 5: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_5, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 6: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_6, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
+ case 7: render_triangle(vp, render_delegate(&model2_renderer::model2_3d_render_7, this), 0, tri->v[0], tri->v[1], tri->v[2]); break;
}
}
}
diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp
index e8ec96fe7e6..259d2ebe53e 100644
--- a/src/mame/video/model3.cpp
+++ b/src/mame/video/model3.cpp
@@ -177,7 +177,7 @@ void model3_state::video_start()
m_tri_buffer = auto_alloc_array_clear(machine(), m3_triangle, TRI_BUFFER_SIZE);
m_tri_alpha_buffer = auto_alloc_array_clear(machine(), m3_triangle, TRI_ALPHA_BUFFER_SIZE);
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(model3_state::model3_exit), this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&model3_state::model3_exit, this));
m_m3_char_ram = make_unique_clear<uint64_t[]>(0x100000/8);
m_m3_tile_ram = make_unique_clear<uint64_t[]>(0x8000/8);
@@ -2106,14 +2106,14 @@ void model3_renderer::draw_opaque_triangles(const m3_triangle* tris, int num_tri
if (tri->param & TRI_PARAM_ALPHA_TEST)
{
- render_triangle(cliprect, render_delegate(FUNC(model3_renderer::draw_scanline_tex_contour), this), 5, v[0], v[1], v[2]);
+ render_triangle(cliprect, render_delegate(&model3_renderer::draw_scanline_tex_contour, this), 5, v[0], v[1], v[2]);
}
else
{
if (tri->param & TRI_PARAM_COLOR_MOD)
- render_triangle(cliprect, render_delegate(FUNC(model3_renderer::draw_scanline_tex_colormod), this), 5, v[0], v[1], v[2]);
+ render_triangle(cliprect, render_delegate(&model3_renderer::draw_scanline_tex_colormod, this), 5, v[0], v[1], v[2]);
else
- render_triangle(cliprect, render_delegate(FUNC(model3_renderer::draw_scanline_tex), this), 5, v[0], v[1], v[2]);
+ render_triangle(cliprect, render_delegate(&model3_renderer::draw_scanline_tex, this), 5, v[0], v[1], v[2]);
}
}
else
@@ -2129,7 +2129,7 @@ void model3_renderer::draw_opaque_triangles(const m3_triangle* tris, int num_tri
model3_polydata &extra = object_data_alloc();
extra.color = tri->color;
- render_triangle(cliprect, render_delegate(FUNC(model3_renderer::draw_scanline_solid), this), 2, v[0], v[1], v[2]);
+ render_triangle(cliprect, render_delegate(&model3_renderer::draw_scanline_solid, this), 2, v[0], v[1], v[2]);
}
}
}
@@ -2168,7 +2168,7 @@ void model3_renderer::draw_alpha_triangles(const m3_triangle* tris, int num_tris
extra.transparency = tri->transparency;
extra.texture_param = tri->param;
- render_triangle(cliprect, render_delegate(FUNC(model3_renderer::draw_scanline_tex_alpha), this), 5, v[0], v[1], v[2]);
+ render_triangle(cliprect, render_delegate(&model3_renderer::draw_scanline_tex_alpha, this), 5, v[0], v[1], v[2]);
}
else
{
@@ -2184,7 +2184,7 @@ void model3_renderer::draw_alpha_triangles(const m3_triangle* tris, int num_tris
extra.color = tri->color;
extra.transparency = tri->transparency;
- render_triangle(cliprect, render_delegate(FUNC(model3_renderer::draw_scanline_solid_trans), this), 2, v[0], v[1], v[2]);
+ render_triangle(cliprect, render_delegate(&model3_renderer::draw_scanline_solid_trans, this), 2, v[0], v[1], v[2]);
}
}
}
diff --git a/src/mame/video/n64.cpp b/src/mame/video/n64.cpp
index d24a9e68ecd..ac784a06431 100644
--- a/src/mame/video/n64.cpp
+++ b/src/mame/video/n64.cpp
@@ -3246,19 +3246,19 @@ void n64_rdp::render_spans(int32_t start, int32_t end, int32_t tilenum, bool fli
switch(m_other_modes.cycle_type)
{
case CYCLE_TYPE_1:
- render_triangle_custom(clip, render_delegate(FUNC(n64_rdp::span_draw_1cycle), this), start, (end - start) + 1, spans + offset);
+ render_triangle_custom(clip, render_delegate(&n64_rdp::span_draw_1cycle, this), start, (end - start) + 1, spans + offset);
break;
case CYCLE_TYPE_2:
- render_triangle_custom(clip, render_delegate(FUNC(n64_rdp::span_draw_2cycle), this), start, (end - start) + 1, spans + offset);
+ render_triangle_custom(clip, render_delegate(&n64_rdp::span_draw_2cycle, this), start, (end - start) + 1, spans + offset);
break;
case CYCLE_TYPE_COPY:
- render_triangle_custom(clip, render_delegate(FUNC(n64_rdp::span_draw_copy), this), start, (end - start) + 1, spans + offset);
+ render_triangle_custom(clip, render_delegate(&n64_rdp::span_draw_copy, this), start, (end - start) + 1, spans + offset);
break;
case CYCLE_TYPE_FILL:
- render_triangle_custom(clip, render_delegate(FUNC(n64_rdp::span_draw_fill), this), start, (end - start) + 1, spans + offset);
+ render_triangle_custom(clip, render_delegate(&n64_rdp::span_draw_fill, this), start, (end - start) + 1, spans + offset);
break;
}
wait("render spans");
diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp
index 3393c603851..4f9267c0a77 100644
--- a/src/mame/video/namcofl.cpp
+++ b/src/mame/video/namcofl.cpp
@@ -91,6 +91,6 @@ static int FLobjcode2tile( running_machine &machine, int code )
VIDEO_START_MEMBER(namcofl_state,namcofl)
{
namco_tilemap_init(NAMCOFL_TILEGFX, memregion(NAMCOFL_TILEMASKREGION)->base(), TilemapCB );
- c355_obj_init(NAMCOFL_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(FUNC(FLobjcode2tile), &machine()));
+ c355_obj_init(NAMCOFL_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&FLobjcode2tile, &machine()));
c169_roz_init(NAMCOFL_ROTGFX,NAMCOFL_ROTMASKREGION);
}
diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp
index f27f96f6d05..a51794ad84e 100644
--- a/src/mame/video/namconb1.cpp
+++ b/src/mame/video/namconb1.cpp
@@ -129,7 +129,7 @@ int namconb1_state::NB1objcode2tile( int code )
VIDEO_START_MEMBER(namconb1_state,namconb1)
{
namco_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), NB1TilemapCB );
- c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(FUNC(namconb1_state::NB1objcode2tile), this));
+ c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namconb1_state::NB1objcode2tile, this));
save_item(NAME(m_tilemap_tile_bank));
} /* namconb1 */
@@ -187,7 +187,7 @@ int namconb1_state::NB2objcode2tile( int code )
VIDEO_START_MEMBER(namconb1_state,namconb2)
{
namco_tilemap_init(NAMCONB1_TILEGFX, memregion(NAMCONB1_TILEMASKREGION)->base(), NB2TilemapCB );
- c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(FUNC(namconb1_state::NB2objcode2tile), this));
+ c355_obj_init(NAMCONB1_SPRITEGFX,0x0,namcos2_shared_state::c355_obj_code2tile_delegate(&namconb1_state::NB2objcode2tile, this));
c169_roz_init(NAMCONB1_ROTGFX,NAMCONB1_ROTMASKREGION);
save_item(NAME(m_tilemap_tile_bank));
diff --git a/src/mame/video/namcos22.cpp b/src/mame/video/namcos22.cpp
index 3b3c3535197..19cabcc08bd 100644
--- a/src/mame/video/namcos22.cpp
+++ b/src/mame/video/namcos22.cpp
@@ -497,7 +497,7 @@ void namcos22_renderer::poly3d_drawquad(screen_device &screen, bitmap_rgb32 &bit
}
}
- render_triangle_fan(m_cliprect, render_delegate(FUNC(namcos22_renderer::renderscanline_uvi_full), this), 4, clipverts, clipv);
+ render_triangle_fan(m_cliprect, render_delegate(&namcos22_renderer::renderscanline_uvi_full, this), 4, clipverts, clipv);
}
@@ -575,7 +575,7 @@ void namcos22_renderer::poly3d_drawsprite(
extra.fogcolor.set(0, m_state.m_fog_r, m_state.m_fog_g, m_state.m_fog_b);
}
- render_triangle_fan(m_cliprect, render_delegate(FUNC(namcos22_renderer::renderscanline_sprite), this), 2, 4, vert);
+ render_triangle_fan(m_cliprect, render_delegate(&namcos22_renderer::renderscanline_sprite, this), 2, 4, vert);
}
}
diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp
index 2f3c730cb72..e011d8640de 100644
--- a/src/mame/video/tc0780fpa.cpp
+++ b/src/mame/video/tc0780fpa.cpp
@@ -220,11 +220,11 @@ void tc0780fpa_renderer::render(uint16_t *polygon_fifo, int length)
vert[1].p[1] == vert[2].p[1])
{
// optimization: all colours the same -> render solid
- render_triangle(m_cliprect, render_delegate(FUNC(tc0780fpa_renderer::render_solid_scan), this), 2, vert[0], vert[1], vert[2]);
+ render_triangle(m_cliprect, render_delegate(&tc0780fpa_renderer::render_solid_scan, this), 2, vert[0], vert[1], vert[2]);
}
else
{
- render_triangle(m_cliprect, render_delegate(FUNC(tc0780fpa_renderer::render_shade_scan), this), 2, vert[0], vert[1], vert[2]);
+ render_triangle(m_cliprect, render_delegate(&tc0780fpa_renderer::render_shade_scan, this), 2, vert[0], vert[1], vert[2]);
}
}
break;
@@ -275,7 +275,7 @@ void tc0780fpa_renderer::render(uint16_t *polygon_fifo, int length)
if (vert[0].p[0] < 0x8000 && vert[1].p[0] < 0x8000 && vert[2].p[0] < 0x8000)
{
- render_triangle(m_cliprect, render_delegate(FUNC(tc0780fpa_renderer::render_texture_scan), this), 4, vert[0], vert[1], vert[2]);
+ render_triangle(m_cliprect, render_delegate(&tc0780fpa_renderer::render_texture_scan, this), 4, vert[0], vert[1], vert[2]);
}
break;
}
@@ -316,11 +316,11 @@ void tc0780fpa_renderer::render(uint16_t *polygon_fifo, int length)
vert[2].p[1] == vert[3].p[1])
{
// optimization: all colours the same -> render solid
- render_polygon<4>(m_cliprect, render_delegate(FUNC(tc0780fpa_renderer::render_solid_scan), this), 2, vert);
+ render_polygon<4>(m_cliprect, render_delegate(&tc0780fpa_renderer::render_solid_scan, this), 2, vert);
}
else
{
- render_polygon<4>(m_cliprect, render_delegate(FUNC(tc0780fpa_renderer::render_shade_scan), this), 2, vert);
+ render_polygon<4>(m_cliprect, render_delegate(&tc0780fpa_renderer::render_shade_scan, this), 2, vert);
}
}
break;
@@ -377,7 +377,7 @@ void tc0780fpa_renderer::render(uint16_t *polygon_fifo, int length)
if (vert[0].p[0] < 0x8000 && vert[1].p[0] < 0x8000 && vert[2].p[0] < 0x8000 && vert[3].p[0] < 0x8000)
{
- render_polygon<4>(m_cliprect, render_delegate(FUNC(tc0780fpa_renderer::render_texture_scan), this), 4, vert);
+ render_polygon<4>(m_cliprect, render_delegate(&tc0780fpa_renderer::render_texture_scan, this), 4, vert);
}
break;
}