summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-12 07:35:02 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-12 07:35:02 +0000
commit1e8d50a5d0132dc29689af02f12406b1b6a69c43 (patch)
tree1dc1dfbf0cba998bf1de0f33a0d08884854c9273 /src/mess
parent0b33df7a20e477de0bf047383f6cc28373d23238 (diff)
Get rid of devtag_reset macro.
Diffstat (limited to 'src/mess')
-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
10 files changed, 10 insertions, 11 deletions
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 )