diff options
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 |
commit | 2027d59e7f36129e86b4e4cf2c32b18268c337b8 (patch) | |
tree | 97a01f3b9ff70dbfd860c57885880f8021600f6b /src/mame/machine | |
parent | e311c17406f0b6a304e0df44d0f5ae2c317dcfd7 (diff) |
Do not use FUNC in delegate where applicable (nw)
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/archimds.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/at.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/bbc.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/coco.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/dc.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/fd1094.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/mm1kb.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/n64.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/namcoic.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/segaic16.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/tecmosys.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/ti85.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/victor9k_fdc.cpp | 8 | ||||
-rw-r--r-- | src/mame/machine/z80ne.cpp | 18 |
14 files changed, 27 insertions, 27 deletions
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)); } } |