summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-12-13 07:01:40 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-12-13 07:01:40 +0000
commite643a688b356a61ea01350f4480fc9c829bd9082 (patch)
tree8e1b6f30d6b2587c29c0aa27a9ce69ddab51886e /src
parent59975ceb55b2face30b126f5132bbd97975b0129 (diff)
Fixed remaining crash regressions from recent changes.
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpu/sh4/sh4.h2
-rw-r--r--src/emu/cpuintrf.h2
-rw-r--r--src/mame/drivers/model2.c2
-rw-r--r--src/mame/drivers/namcond1.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h
index 0bd0db5d861..d10303f5783 100644
--- a/src/emu/cpu/sh4/sh4.h
+++ b/src/emu/cpu/sh4/sh4.h
@@ -62,7 +62,7 @@ enum
enum
{
- CPUINFO_PTR_SH4_FTCSR_READ_CALLBACK = CPUINFO_PTR_CPU_SPECIFIC,
+ CPUINFO_PTR_SH4_FTCSR_READ_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC,
CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA,
};
diff --git a/src/emu/cpuintrf.h b/src/emu/cpuintrf.h
index 75d8ebf4262..3a8e1059f8b 100644
--- a/src/emu/cpuintrf.h
+++ b/src/emu/cpuintrf.h
@@ -142,6 +142,8 @@ enum
CPUINFO_PTR_DEBUG_INIT, /* R/O: void (*debug_init)(const device_config *device) */
CPUINFO_PTR_VALIDITY_CHECK, /* R/O: int (*validity_check)(const game_driver *driver, const void *config) */
+ CPUINFO_FCT_CPU_SPECIFIC = DEVINFO_FCT_DEVICE_SPECIFIC, /* R/W: CPU-specific values start here */
+
/* --- the following bits of info are returned as NULL-terminated strings --- */
CPUINFO_STR_FIRST = DEVINFO_STR_FIRST,
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 40039eb440b..fff336894fc 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -889,7 +889,7 @@ static int snd_68k_ready_r(const address_space *space)
static void snd_latch_to_68k_w(const address_space *space, int data)
{
- while (!snd_68k_ready_r(space))
+ if (!snd_68k_ready_r(space))
{
cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(40));
}
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index b13c805a273..eb79e78aece 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -268,7 +268,7 @@ static INTERRUPT_GEN( mcu_interrupt )
{
if( namcond1_h8_irq5_enabled )
{
- cpu_set_input_line(device, H8_IRQ5, PULSE_LINE);
+ generic_pulse_irq_line(device, H8_IRQ5);
}
}