summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2012-09-12 07:35:02 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2012-09-12 07:35:02 +0000
commit1e8d50a5d0132dc29689af02f12406b1b6a69c43 (patch)
tree1dc1dfbf0cba998bf1de0f33a0d08884854c9273 /src
parent0b33df7a20e477de0bf047383f6cc28373d23238 (diff)
Get rid of devtag_reset macro.
Diffstat (limited to 'src')
-rw-r--r--src/emu/device.h3
-rw-r--r--src/mame/audio/atarijsa.c8
-rw-r--r--src/mame/audio/cyberbal.c2
-rw-r--r--src/mame/audio/exidy.c4
-rw-r--r--src/mame/drivers/atarisy2.c4
-rw-r--r--src/mame/drivers/bfm_sc2.c2
-rw-r--r--src/mame/drivers/djmain.c2
-rw-r--r--src/mame/drivers/gauntlet.c6
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/megatech.c2
-rw-r--r--src/mame/drivers/midvunit.c2
-rw-r--r--src/mame/drivers/qdrmfgp.c2
-rw-r--r--src/mame/drivers/rampart.c4
-rw-r--r--src/mame/drivers/segas24.c2
-rw-r--r--src/mame/drivers/taitogn.c4
-rw-r--r--src/mame/drivers/taitotz.c2
-rw-r--r--src/mame/drivers/viper.c2
-rw-r--r--src/mame/drivers/zn.c4
-rw-r--r--src/mame/machine/amiga.c4
-rw-r--r--src/mame/machine/mcr.c8
-rw-r--r--src/mame/machine/megadriv.c4
-rw-r--r--src/mame/machine/playch10.c2
-rw-r--r--src/mame/machine/toaplan1.c2
-rw-r--r--src/mess/drivers/dectalk.c2
-rw-r--r--src/mess/drivers/gizmondo.c2
-rw-r--r--src/mess/drivers/hp49gp.c2
-rw-r--r--src/mess/drivers/juicebox.c2
-rw-r--r--src/mess/drivers/mini2440.c2
-rw-r--r--src/mess/drivers/nc.c2
-rw-r--r--src/mess/drivers/palmz22.c2
-rw-r--r--src/mess/drivers/pes.c2
-rw-r--r--src/mess/machine/compis.c3
-rw-r--r--src/mess/machine/lisa.c2
33 files changed, 47 insertions, 51 deletions
diff --git a/src/emu/device.h b/src/emu/device.h
index c9ad7fb0cb0..049af4b20d8 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -55,9 +55,6 @@
// macro for specifying a clock derived from an owning device
#define DERIVED_CLOCK(num, den) (0xff000000 | ((num) << 12) | ((den) << 0))
-// shorthand for accessing devices by machine/type/tag
-#define devtag_reset(mach,tag) (mach).device(tag)->reset()
-
//**************************************************************************
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index da1b4d3e0fd..e2d74d4d549 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -298,7 +298,7 @@ static WRITE8_HANDLER( jsa1_io_w )
}
/* reset the YM2151 if needed */
- if ((data&1) == 0) devtag_reset(space->machine(), "ymsnd");
+ if ((data&1) == 0) space->machine().device("ymsnd")->reset();
/* coin counters */
coin_counter_w(space->machine(), 1, (data >> 5) & 1);
@@ -419,7 +419,7 @@ static WRITE8_HANDLER( jsa2_io_w )
*/
/* reset the YM2151 if needed */
- if ((data&1) == 0) devtag_reset(space->machine(), "ymsnd");
+ if ((data&1) == 0) space->machine().device("ymsnd")->reset();
/* update the bank */
memcpy(bank_base, &bank_source_data[0x1000 * ((data >> 6) & 3)], 0x1000);
@@ -544,7 +544,7 @@ static WRITE8_HANDLER( jsa3_io_w )
*/
/* reset the YM2151 if needed */
- if ((data&1) == 0) devtag_reset(space->machine(), "ymsnd");
+ if ((data&1) == 0) space->machine().device("ymsnd")->reset();
/* update the OKI bank */
if (oki6295 != NULL)
@@ -678,7 +678,7 @@ static WRITE8_HANDLER( jsa3s_io_w )
*/
/* reset the YM2151 if needed */
- if ((data&1) == 0) devtag_reset(space->machine(), "ymsnd");
+ if ((data&1) == 0) space->machine().device("ymsnd")->reset();
/* update the OKI bank */
space->machine().root_device().membank("bank12")->set_entry((space->machine().root_device().membank("bank12")->entry() & 2) | ((data >> 1) & 1));
diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c
index a3097b957a3..1276a25fc03 100644
--- a/src/mame/audio/cyberbal.c
+++ b/src/mame/audio/cyberbal.c
@@ -60,7 +60,7 @@ WRITE8_MEMBER(cyberbal_state::cyberbal_sound_bank_select_w)
coin_counter_w(machine(), 1, (data >> 5) & 1);
coin_counter_w(machine(), 0, (data >> 4) & 1);
machine().device("dac")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
- if (!(data & 0x01)) devtag_reset(machine(), "ymsnd");
+ if (!(data & 0x01)) machine().device("ymsnd")->reset();
}
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index 58d8c8027db..2e180a591c4 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -874,8 +874,8 @@ static DEVICE_RESET( venture_sound )
DEVICE_RESET_CALL(common_sh_reset);
/* PIA */
- devtag_reset(device->machine(), "pia0");
- devtag_reset(device->machine(), "pia1");
+ device->machine().device("pia0")->reset();
+ device->machine().device("pia1")->reset();
/* 6532 */
state->m_riot->reset();
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 59246c38cbc..6bbf86a5828 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -710,10 +710,10 @@ WRITE8_MEMBER(atarisy2_state::sound_reset_w)
/* a large number of signals are reset when this happens */
atarigen_sound_io_reset(machine().device("soundcpu"));
- devtag_reset(machine(), "ymsnd");
+ machine().device("ymsnd")->reset();
if (m_has_tms5220)
{
- devtag_reset(machine(), "tms"); // technically what happens is the tms5220 gets a long stream of 0xFF written to it when sound_reset_state is 0 which halts the chip after a few frames, but this works just as well, even if it isn't exactly true to hardware... The hardware may not have worked either, the resistors to pull input to 0xFF are fighting against the ls263 gate holding the latched value to be sent to the chip.
+ machine().device("tms")->reset(); // technically what happens is the tms5220 gets a long stream of 0xFF written to it when sound_reset_state is 0 which halts the chip after a few frames, but this works just as well, even if it isn't exactly true to hardware... The hardware may not have worked either, the resistors to pull input to 0xFF are fighting against the ls263 gate holding the latched value to be sent to the chip.
}
mixer_w(space, 0, 0);
}
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index e385c0db59b..bd2aa0d28a0 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -372,7 +372,7 @@ static void on_scorpion2_reset(running_machine &machine)
e2ram_reset(machine);
- devtag_reset(machine, "ymsnd");
+ machine.device("ymsnd")->reset();
// reset stepper motors /////////////////////////////////////////////////
{
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 29782e47077..8dd9f6922fa 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1423,7 +1423,7 @@ static MACHINE_RESET( djmain )
sndram_set_bank(machine);
/* reset the IDE controller */
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
/* reset LEDs */
set_led_status(machine, 0, 1);
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 98068690133..2a10c5ff472 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -214,8 +214,8 @@ WRITE16_MEMBER(gauntlet_state::sound_reset_w)
atarigen_sound_reset(machine());
if (m_sound_reset_val & 1)
{
- devtag_reset(machine(), "ymsnd");
- devtag_reset(machine(), "tms");
+ machine().device("ymsnd")->reset();
+ machine().device("tms")->reset();
tms5220_set_frequency(machine().device("tms"), ATARI_CLOCK_14MHz/2 / 11);
atarigen_set_ym2151_vol(machine(), 0);
atarigen_set_pokey_vol(machine(), 0);
@@ -258,7 +258,7 @@ WRITE8_MEMBER(gauntlet_state::sound_ctl_w)
switch (offset & 7)
{
case 0: /* music reset, bit D7, low reset */
- if (((data>>7)&1) == 0) devtag_reset(machine(), "ymsnd");
+ if (((data>>7)&1) == 0) machine().device("ymsnd")->reset();
break;
case 1: /* speech write, bit D7, active low */
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 4643a7f543d..feddb8bcd72 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1080,7 +1080,7 @@ static MACHINE_RESET(mediagx)
state->m_dmadac[0] = machine.device<dmadac_sound_device>("dac1");
state->m_dmadac[1] = machine.device<dmadac_sound_device>("dac2");
dmadac_enable(&state->m_dmadac[0], 2, 1);
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
}
/*************************************************************
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 9b5581c35ed..3765ca9f59b 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -258,7 +258,7 @@ static TIMER_CALLBACK( megatech_z80_stop_state )
machine.device("genesis_snd_z80")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
//machine.device("maincpu")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
//machine.device("genesis_snd_z80")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
- devtag_reset(machine, "ymsnd");
+ machine.device("ymsnd")->reset();
megadriv_stop_scanline_timer(machine);// stop the scanline timer for the genesis vdp... it can be restarted in video eof when needed
segae_md_sms_stop_scanline_timer();// stop the scanline timer for the sms vdp
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 5591e55b941..74e095090e8 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -83,7 +83,7 @@ static MACHINE_RESET( midvplus )
state->m_timer[0] = machine.device<timer_device>("timer0");
state->m_timer[1] = machine.device<timer_device>("timer1");
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
}
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 8838300d5a6..7c230fa1948 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -658,7 +658,7 @@ static MACHINE_RESET( qdrmfgp )
/* reset the IDE controller */
state->m_gp2_irq_control = 0;
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
}
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 44995515b24..5fef8c3ceb4 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -117,10 +117,10 @@ WRITE16_MEMBER(rampart_state::latch_w)
{
atarigen_set_oki6295_vol(machine(), (data & 0x0020) ? 100 : 0);
if (!(data & 0x0010))
- devtag_reset(machine(), "oki");
+ machine().device("oki")->reset();
atarigen_set_ym2413_vol(machine(), ((data >> 1) & 7) * 100 / 7);
if (!(data & 0x0001))
- devtag_reset(machine(), "ymsnd");
+ machine().device("ymsnd")->reset();
}
}
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index a80e6779b36..83576fe0741 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -696,7 +696,7 @@ void segas24_state::reset_reset()
machine().device("subcpu")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
if(changed & 4)
- devtag_reset(machine(), "ymsnd");
+ machine().device("ymsnd")->reset();
prev_resetcontrol = resetcontrol;
}
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index 93c33df0ebc..6d324275726 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -403,7 +403,7 @@ static void rf5c296_reg_w(ATTR_UNUSED running_machine &machine, UINT8 reg, UINT8
// Check for card reset
if (!(data & 0x40))
{
- devtag_reset(machine, ":card");
+ machine.device(":card")->reset();
state->m_locked = 0x1ff;
ide_set_gnet_readlock (machine.device(":card"), 1);
}
@@ -889,7 +889,7 @@ static MACHINE_RESET( coh3002t )
state->m_locked = 0x1ff;
install_handlers(machine, 0);
state->m_control = 0;
- devtag_reset(machine, ":card");
+ machine.device(":card")->reset();
ide_set_gnet_readlock(machine.device(":card"), 1);
// halt sound CPU since it has no valid program at start
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index a38027fbd75..e401d94cdf8 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -2425,7 +2425,7 @@ static void set_ide_drive_serial_number(device_t *device, int drive, const char
static MACHINE_RESET( taitotz )
{
taitotz_state *state = machine.driver_data<taitotz_state>();
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
if (state->m_hdd_serial_number != NULL)
{
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index db50217b56b..0e132c051fc 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -1954,7 +1954,7 @@ static MACHINE_START(viper)
static MACHINE_RESET(viper)
{
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
mpc8240_epic_reset();
UINT8 *ide_features = ide_get_features(machine.device("ide"), 0);
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 0e351f92cb9..74d49ecf192 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1520,7 +1520,7 @@ static MACHINE_RESET( coh1000w )
machine.root_device().membank( "bank1" )->set_base( machine.root_device().memregion( "user2" )->base() ); /* fixed game rom */
zn_machine_init(machine);
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
}
static const ide_config ide_intf =
@@ -2195,7 +2195,7 @@ static MACHINE_RESET( coh1000a )
if( ( !strcmp( machine.system().name, "jdredd" ) ) ||
( !strcmp( machine.system().name, "jdreddb" ) ) )
{
- devtag_reset(machine, "ide");
+ machine.device("ide")->reset();
}
}
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index 578a3112cfe..4cb6cac3d0c 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -266,8 +266,8 @@ static void amiga_m68k_reset(device_t *device)
logerror("Executed RESET at PC=%06x\n", space->device().safe_pc());
/* Initialize the various chips */
- devtag_reset(device->machine(), "cia_0");
- devtag_reset(device->machine(), "cia_1");
+ device->machine().device("cia_0")->reset();
+ device->machine().device("cia_1")->reset();
custom_reset(device->machine());
autoconfig_reset(device->machine());
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 69a6c7fc006..7d298e0fd4b 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -254,10 +254,10 @@ static TIMER_CALLBACK( ipu_watchdog_reset )
{
logerror("ipu_watchdog_reset\n");
machine.device("ipu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE);
- devtag_reset(machine, "ipu_ctc");
- devtag_reset(machine, "ipu_pio0");
- devtag_reset(machine, "ipu_pio1");
- devtag_reset(machine, "ipu_sio");
+ machine.device("ipu_ctc")->reset();
+ machine.device("ipu_pio0")->reset();
+ machine.device("ipu_pio1")->reset();
+ machine.device("ipu_sio")->reset();
}
diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c
index 58386f9eb0a..e32a8edddd5 100644
--- a/src/mame/machine/megadriv.c
+++ b/src/mame/machine/megadriv.c
@@ -684,9 +684,9 @@ static TIMER_CALLBACK( megadriv_z80_run_state )
/* Is the z80 RESET line pulled? */
if ( genz80.z80_is_reset )
{
- devtag_reset( machine, "genesis_snd_z80" );
+ machine.device("genesis_snd_z80" )->reset();
machine.device<cpu_device>( "genesis_snd_z80" )->suspend(SUSPEND_REASON_HALT, 1 );
- devtag_reset( machine, "ymsnd" );
+ machine.device("ymsnd" )->reset();
}
else
{
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 42372aa8500..cdbfa5cdc50 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -140,7 +140,7 @@ WRITE8_MEMBER(playch10_state::pc10_GAMESTOP_w)
WRITE8_MEMBER(playch10_state::pc10_PPURES_w)
{
if (data & 1)
- devtag_reset(machine(), "ppu");
+ machine().device("ppu")->reset();
}
READ8_MEMBER(playch10_state::pc10_detectclr_r)
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index 011f5624c75..14fc69f0bd1 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -314,7 +314,7 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_reset_sound)
if (ACCESSING_BITS_0_7 && (data == 0))
{
logerror("PC:%04x Resetting Sound CPU and Sound chip (%08x)\n", space.device().safe_pcbase(), data);
- devtag_reset(machine(), "ymsnd");
+ machine().device("ymsnd")->reset();
device_t *audiocpu = machine().device("audiocpu");
if (audiocpu != NULL && audiocpu->type() == Z80)
audiocpu->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE);
diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c
index ef62fa1a338..1c5c20e6fba 100644
--- a/src/mess/drivers/dectalk.c
+++ b/src/mess/drivers/dectalk.c
@@ -331,7 +331,7 @@ static void dectalk_reset(device_t *device)
dectalk_x2212_recall(device->machine()); // nvram recall
state->m_m68k_spcflags_latch = 1; // initial status is speech reset(d0) active and spc int(d6) disabled
state->m_m68k_tlcflags_latch = 0; // initial status is tone detect int(d6) off, answer phone(d8) off, ring detect int(d14) off
- devtag_reset(device->machine(), "duart68681"); // reset the DUART
+ device->machine().device("duart68681")->reset(); // reset the DUART
// stuff that is INDIRECTLY affected by the RESET line
dectalk_clear_all_fifos(device->machine()); // speech reset clears the fifos, though we have to do it explicitly here since we're not actually in the m68k_spcflags_w function.
dectalk_semaphore_w(device->machine(), 0); // on the original state->m_dectalk pcb revision, this is a semaphore for the INPUT fifo, later dec hacked on a check for the 3 output fifo chips to see if they're in sync, and set both of these latches if true.
diff --git a/src/mess/drivers/gizmondo.c b/src/mess/drivers/gizmondo.c
index d137d300648..f4a1842addb 100644
--- a/src/mess/drivers/gizmondo.c
+++ b/src/mess/drivers/gizmondo.c
@@ -145,7 +145,7 @@ static MACHINE_START( gizmondo )
static MACHINE_RESET( gizmondo )
{
- devtag_reset( machine, "maincpu");
+ machine.device("maincpu")->reset();
}
/*******************************************************************************
diff --git a/src/mess/drivers/hp49gp.c b/src/mess/drivers/hp49gp.c
index a2eab1ccc89..c2df527aecd 100644
--- a/src/mess/drivers/hp49gp.c
+++ b/src/mess/drivers/hp49gp.c
@@ -246,7 +246,7 @@ static MACHINE_START( hp49gp )
static MACHINE_RESET( hp49gp )
{
// hp49gp_state *hp49gp = machine.driver_data<hp49gp_state>();
- devtag_reset( machine, "maincpu");
+ machine.device("maincpu")->reset();
}
/***************************************************************************
diff --git a/src/mess/drivers/juicebox.c b/src/mess/drivers/juicebox.c
index 96dd3995ce2..8f4f8d6945c 100644
--- a/src/mess/drivers/juicebox.c
+++ b/src/mess/drivers/juicebox.c
@@ -255,7 +255,7 @@ static MACHINE_START( juicebox )
static MACHINE_RESET( juicebox )
{
- devtag_reset( machine, "maincpu");
+ machine.device("maincpu")->reset();
smc_reset( machine);
}
diff --git a/src/mess/drivers/mini2440.c b/src/mess/drivers/mini2440.c
index d8267ec2e5b..721cecc1c72 100644
--- a/src/mess/drivers/mini2440.c
+++ b/src/mess/drivers/mini2440.c
@@ -177,7 +177,7 @@ static MACHINE_START( mini2440 )
static MACHINE_RESET( mini2440 )
{
mini2440_state *state = machine.driver_data<mini2440_state>();
- devtag_reset( machine, "maincpu");
+ machine.device("maincpu")->reset();
memset( state->m_port, 0, sizeof( state->m_port));
}
diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c
index 4d10d61fd14..ece1d813f8b 100644
--- a/src/mess/drivers/nc.c
+++ b/src/mess/drivers/nc.c
@@ -786,7 +786,7 @@ WRITE8_MEMBER(nc_state::nc_uart_control_w)
/* changed uart from off to on */
if ((data & (1<<3))==0)
{
- devtag_reset(machine(), "uart");
+ machine().device("uart")->reset();
}
}
diff --git a/src/mess/drivers/palmz22.c b/src/mess/drivers/palmz22.c
index 19b2b99f0db..0eca42a26db 100644
--- a/src/mess/drivers/palmz22.c
+++ b/src/mess/drivers/palmz22.c
@@ -249,7 +249,7 @@ static MACHINE_START( palmz22 )
static MACHINE_RESET( palmz22 )
{
palmz22_state *state = machine.driver_data<palmz22_state>();
- devtag_reset( machine, "maincpu");
+ machine.device("maincpu")->reset();
memset( state->m_port, 0, sizeof( state->m_port));
}
diff --git a/src/mess/drivers/pes.c b/src/mess/drivers/pes.c
index 0ad6de6e14f..dc386c4e15e 100644
--- a/src/mess/drivers/pes.c
+++ b/src/mess/drivers/pes.c
@@ -218,7 +218,7 @@ void pes_state::machine_reset()
m_port3_state = 0; // reset the openbus state of port 3
//machine.device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); // this causes debugger to fail badly if included
- devtag_reset(machine(), "tms5220"); // reset the 5220
+ machine().device("tms5220")->reset(); // reset the 5220
}
/******************************************************************************
diff --git a/src/mess/machine/compis.c b/src/mess/machine/compis.c
index efd590297a0..7d129c1c951 100644
--- a/src/mess/machine/compis.c
+++ b/src/mess/machine/compis.c
@@ -82,8 +82,7 @@ enum COMPIS_INTERRUPT_REQUESTS
#ifdef UNUSED_FUNCTION
void compis_irq_set(UINT8 irq)
{
- cputag_set_input_line_vector(machine, "maincpu", 0, irq);
- machine.device("maincpu")->execute().set_input_line(0, HOLD_LINE);
+ machine.device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE, irq);
}
#endif
diff --git a/src/mess/machine/lisa.c b/src/mess/machine/lisa.c
index 58bea46d73e..b634e0c9ec2 100644
--- a/src/mess/machine/lisa.c
+++ b/src/mess/machine/lisa.c
@@ -1087,7 +1087,7 @@ MACHINE_RESET( lisa )
}
/* reset 68k to pick up proper vectors from MMU */
- devtag_reset(machine, "maincpu");
+ machine.device("maincpu")->reset();
}
INTERRUPT_GEN( lisa_interrupt )