summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/adsp2100/2100ops.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-12-09 07:13:21 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-12-09 07:13:21 +0000
commitb319755f9eba28bc3f5f7f1f9a528dfdaccb1b33 (patch)
treea10b06a76085f2417c9d81f6cc869b435126b269 /src/emu/cpu/adsp2100/2100ops.c
parent13bdc84ffffef1b27a22aecb0b759ee71a30eaa7 (diff)
Added wrappers for ADSP21xx callbacks. Added device parameters to them.
Updated IRQ setters to use generic_pulse_irq_line().
Diffstat (limited to 'src/emu/cpu/adsp2100/2100ops.c')
-rw-r--r--src/emu/cpu/adsp2100/2100ops.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/cpu/adsp2100/2100ops.c b/src/emu/cpu/adsp2100/2100ops.c
index 8ecbd3fc75d..dd7e3bee09d 100644
--- a/src/emu/cpu/adsp2100/2100ops.c
+++ b/src/emu/cpu/adsp2100/2100ops.c
@@ -90,8 +90,8 @@ INLINE void set_mstat(adsp2100_state *adsp, int new_value)
adsp->alt = temp;
}
if ((new_value ^ adsp->mstat) & MSTAT_TIMER)
- if (adsp->timer_fired_func)
- (*adsp->timer_fired_func)((new_value & MSTAT_TIMER) != 0);
+ if (adsp->timer_fired != NULL)
+ (*adsp->timer_fired)(adsp->device, (new_value & MSTAT_TIMER) != 0);
if (new_value & MSTAT_STICKYV)
adsp->astat_clear = ~(CFLAG | NFLAG | ZFLAG);
else
@@ -412,8 +412,8 @@ static void wr_ifc(adsp2100_state *adsp, INT32 val)
}
check_irqs(adsp);
}
-static void wr_tx0(adsp2100_state *adsp, INT32 val) { if (adsp->sport_tx_callback) (*adsp->sport_tx_callback)(0, val); }
-static void wr_tx1(adsp2100_state *adsp, INT32 val) { if (adsp->sport_tx_callback) (*adsp->sport_tx_callback)(1, val); }
+static void wr_tx0(adsp2100_state *adsp, INT32 val) { if (adsp->sport_tx_callback) (*adsp->sport_tx_callback)(adsp->device, 0, val); }
+static void wr_tx1(adsp2100_state *adsp, INT32 val) { if (adsp->sport_tx_callback) (*adsp->sport_tx_callback)(adsp->device, 1, val); }
static void wr_owrctr(adsp2100_state *adsp, INT32 val) { adsp->cntr = val & 0x3fff; }
static void wr_topstack(adsp2100_state *adsp, INT32 val) { pc_stack_push_val(adsp, val & 0x3fff); }
@@ -494,8 +494,8 @@ static INT32 rd_icntl(adsp2100_state *adsp) { return adsp->icntl; }
static INT32 rd_cntr(adsp2100_state *adsp) { return adsp->cntr; }
static INT32 rd_sb(adsp2100_state *adsp) { return adsp->core.sb.s; }
static INT32 rd_px(adsp2100_state *adsp) { return adsp->px; }
-static INT32 rd_rx0(adsp2100_state *adsp) { if (adsp->sport_rx_callback) return (*adsp->sport_rx_callback)(0); else return 0; }
-static INT32 rd_rx1(adsp2100_state *adsp) { if (adsp->sport_rx_callback) return (*adsp->sport_rx_callback)(1); else return 0; }
+static INT32 rd_rx0(adsp2100_state *adsp) { if (adsp->sport_rx_callback) return (*adsp->sport_rx_callback)(adsp->device, 0); else return 0; }
+static INT32 rd_rx1(adsp2100_state *adsp) { if (adsp->sport_rx_callback) return (*adsp->sport_rx_callback)(adsp->device, 1); else return 0; }
static INT32 rd_stacktop(adsp2100_state *adsp) { return pc_stack_pop_val(adsp); }
#define READ_REG(adsp,grp,reg) ((*rd_reg[grp][reg])(adsp))