From 88e5155cc0c2173bada08386fffaa9de1b4586f7 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 16 Mar 2014 11:19:57 +0000 Subject: [PATCH] Removed DEVCB_DEVICE_HANDLER. (nw) --- src/emu/devcb.h | 1 - src/mame/includes/amiga.h | 6 ++++++ src/mess/drivers/amiga.c | 34 +++++++++++++++------------------- src/mess/machine/amigacd.c | 4 ++-- src/mess/machine/amigacd.h | 2 -- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/emu/devcb.h b/src/emu/devcb.h index 964b1d6f861..9629c08ad6a 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -170,7 +170,6 @@ void devcb_stub64(device_t *device, address_space &space, offs_t offset, UINT64 // legacy calls, to be removed #define DEVCB_LINE(func) { DEVCB_TYPE_DEVICE, 0, "", #func, func, NULL, NULL } #define DEVCB_DEVICE_LINE(tag,func) { DEVCB_TYPE_DEVICE, 0, tag, #func, func, NULL, NULL } -#define DEVCB_DEVICE_HANDLER(tag,func) { DEVCB_TYPE_DEVICE, 0, tag, #func, NULL, func, NULL } // line or read/write handlers for the driver device #define DEVCB_DRIVER_LINE_MEMBER(cls,memb) { DEVCB_TYPE_DEVICE, 0, ":", #cls "::" #memb, &devcb_line_stub, NULL, NULL } diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 055568b0918..26277a9b8ff 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -497,6 +497,9 @@ public: TIMER_CALLBACK_MEMBER(finish_serial_write); DECLARE_WRITE_LINE_MEMBER(amiga_cia_0_irq); DECLARE_WRITE_LINE_MEMBER(amiga_cia_1_irq); + DECLARE_READ8_MEMBER( amiga_cia_0_portA_r ); + DECLARE_READ8_MEMBER( amiga_cia_0_cdtv_portA_r ); + DECLARE_WRITE8_MEMBER( amiga_cia_0_portA_w ); DECLARE_READ16_MEMBER( amiga_clock_r ); DECLARE_WRITE16_MEMBER( amiga_clock_w ); @@ -521,6 +524,9 @@ public: DECLARE_WRITE16_MEMBER( amiga_ar23_mode_w ); void amiga_ar23_init( running_machine &machine, int ar3 ); + DECLARE_READ8_MEMBER( amigacd_tpi6525_portc_r ); + DECLARE_WRITE8_MEMBER( amigacd_tpi6525_portb_w ); + int m_centronics_busy; int m_centronics_perror; int m_centronics_select; diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 35116c6db63..2398c190a40 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -97,9 +97,6 @@ public: -static DECLARE_READ8_DEVICE_HANDLER( amiga_cia_0_portA_r ); -static DECLARE_READ8_DEVICE_HANDLER( amiga_cia_0_cdtv_portA_r ); -static DECLARE_WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w ); /*************************************************************************** Battery Backed-Up Clock (MSM6264) @@ -513,8 +510,8 @@ static const legacy_mos6526_interface cia_0_ntsc_intf = DEVCB_DEVICE_LINE_MEMBER("centronics", centronics_device, write_strobe), /* pc_func */ DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("cia_0", amiga_cia_0_portA_r), - DEVCB_DEVICE_HANDLER("cia_0", amiga_cia_0_portA_w), /* port A */ + DEVCB_DRIVER_MEMBER(amiga_state, amiga_cia_0_portA_r), + DEVCB_DRIVER_MEMBER(amiga_state, amiga_cia_0_portA_w), /* port A */ DEVCB_NULL, DEVCB_DEVICE_MEMBER("cent_data_out", output_latch_device, write) /* port B */ }; @@ -525,8 +522,8 @@ static const legacy_mos6526_interface cia_0_pal_intf = DEVCB_DEVICE_LINE_MEMBER("centronics", centronics_device, write_strobe), /* pc_func */ DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("cia_0", amiga_cia_0_portA_r), - DEVCB_DEVICE_HANDLER("cia_0", amiga_cia_0_portA_w), /* port A */ + DEVCB_DRIVER_MEMBER(amiga_state, amiga_cia_0_portA_r), + DEVCB_DRIVER_MEMBER(amiga_state, amiga_cia_0_portA_w), /* port A */ DEVCB_NULL, DEVCB_DEVICE_MEMBER("cent_data_out", output_latch_device, write) /* port B */ }; @@ -549,8 +546,8 @@ static const legacy_mos6526_interface cia_0_cdtv_intf = DEVCB_DEVICE_LINE_MEMBER("centronics", centronics_device, write_strobe), /* pc_func */ DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("cia_0", amiga_cia_0_cdtv_portA_r), - DEVCB_DEVICE_HANDLER("cia_0", amiga_cia_0_portA_w), /* port A */ + DEVCB_DRIVER_MEMBER(amiga_state, amiga_cia_0_cdtv_portA_r), + DEVCB_DRIVER_MEMBER(amiga_state, amiga_cia_0_portA_w), /* port A */ DEVCB_NULL, DEVCB_DEVICE_MEMBER("cent_data_out", output_latch_device, write) /* port B */ }; @@ -573,8 +570,8 @@ static const tpi6525_interface cdtv_tpi_intf = DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_HANDLER("tpi6525", amigacd_tpi6525_portb_w), - DEVCB_DEVICE_HANDLER("tpi6525", amigacd_tpi6525_portc_r), + DEVCB_DRIVER_MEMBER(amiga_state, amigacd_tpi6525_portb_w), + DEVCB_DRIVER_MEMBER(amiga_state, amigacd_tpi6525_portc_r), DEVCB_NULL, DEVCB_NULL, DEVCB_NULL @@ -1035,7 +1032,7 @@ MACHINE_CONFIG_END ***************************************************************************/ -static READ8_DEVICE_HANDLER( amiga_cia_0_portA_r ) +READ8_MEMBER( amiga_state::amiga_cia_0_portA_r ) { UINT8 ret = space.machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ ret |= space.machine().device("fdc")->ciaapra_r(); @@ -1043,28 +1040,27 @@ static READ8_DEVICE_HANDLER( amiga_cia_0_portA_r ) } -static READ8_DEVICE_HANDLER( amiga_cia_0_cdtv_portA_r ) +READ8_MEMBER( amiga_state::amiga_cia_0_cdtv_portA_r ) { return space.machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ } -static WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w ) +WRITE8_MEMBER( amiga_state::amiga_cia_0_portA_w ) { - amiga_state *state = space.machine().driver_data(); /* switch banks as appropriate */ - state->m_bank1->set_entry(data & 1); + m_bank1->set_entry(data & 1); /* swap the write handlers between ROM and bank 1 based on the bit */ if ((data & 1) == 0) { - UINT32 mirror_mask = state->m_chip_ram.bytes(); + UINT32 mirror_mask = m_chip_ram.bytes(); while( (mirror_mask<<1) < 0x100000 ) { mirror_mask |= ( mirror_mask << 1 ); } /* overlay disabled, map RAM on 0x000000 */ - state->m_maincpu_program_space->install_write_bank(0x000000, state->m_chip_ram.bytes() - 1, 0, mirror_mask, "bank1"); + m_maincpu_program_space->install_write_bank(0x000000, m_chip_ram.bytes() - 1, 0, mirror_mask, "bank1"); /* if there is a cart region, check for cart overlay */ if (space.machine().root_device().memregion("user2")->base() != NULL) @@ -1072,7 +1068,7 @@ static WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w ) } else /* overlay enabled, map Amiga system ROM on 0x000000 */ - state->m_maincpu_program_space->unmap_write(0x000000, state->m_chip_ram.bytes() - 1); + m_maincpu_program_space->unmap_write(0x000000, m_chip_ram.bytes() - 1); set_led_status( space.machine(), 0, ( data & 2 ) ? 0 : 1 ); /* bit 2 = Power Led on Amiga */ output_set_value("power_led", ( data & 2 ) ? 0 : 1); diff --git a/src/mess/machine/amigacd.c b/src/mess/machine/amigacd.c index d2f3a0e7384..5319436db55 100644 --- a/src/mess/machine/amigacd.c +++ b/src/mess/machine/amigacd.c @@ -428,7 +428,7 @@ static const amiga_autoconfig_device dmac_device = ***************************************************************************/ -READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ) +READ8_MEMBER( amiga_state::amigacd_tpi6525_portc_r ) { int ret = 0; @@ -445,7 +445,7 @@ READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ) return ret; } -WRITE8_DEVICE_HANDLER( amigacd_tpi6525_portb_w ) +WRITE8_MEMBER( amiga_state::amigacd_tpi6525_portb_w ) { tpi6525_device *tpi = space.machine().device("tpi6525"); diff --git a/src/mess/machine/amigacd.h b/src/mess/machine/amigacd.h index a4223f70bd5..ef0c0c715e5 100644 --- a/src/mess/machine/amigacd.h +++ b/src/mess/machine/amigacd.h @@ -6,8 +6,6 @@ MACHINE_START( amigacd ); MACHINE_RESET( amigacd ); /* 6525tpi */ -DECLARE_READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ); -DECLARE_WRITE8_DEVICE_HANDLER( amigacd_tpi6525_portb_w ); WRITE_LINE_DEVICE_HANDLER( amigacd_tpi6525_irq );