diff options
Diffstat (limited to 'src/emu/cpu/tms34010')
-rw-r--r-- | src/emu/cpu/tms34010/34010gfx.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/tms34010/tms34010.c | 12 | ||||
-rw-r--r-- | src/emu/cpu/tms34010/tms34010.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/emu/cpu/tms34010/34010gfx.c b/src/emu/cpu/tms34010/34010gfx.c index f3fe8cb476a..48bcbc625fe 100644 --- a/src/emu/cpu/tms34010/34010gfx.c +++ b/src/emu/cpu/tms34010/34010gfx.c @@ -205,7 +205,7 @@ static void shiftreg_w(const address_space *space, offs_t offset,UINT16 data) { tms34010_state *tms = space->cpu->token; if (tms->config->from_shiftreg) - (*tms->config->from_shiftreg)((UINT32)(offset << 3) & ~15, &tms->shiftreg[0]); + (*tms->config->from_shiftreg)(space, (UINT32)(offset << 3) & ~15, &tms->shiftreg[0]); else logerror("From ShiftReg function not set. PC = %08X\n", tms->pc); } @@ -214,7 +214,7 @@ static UINT16 shiftreg_r(const address_space *space, offs_t offset) { tms34010_state *tms = space->cpu->token; if (tms->config->to_shiftreg) - (*tms->config->to_shiftreg)((UINT32)(offset << 3) & ~15, &tms->shiftreg[0]); + (*tms->config->to_shiftreg)(space, (UINT32)(offset << 3) & ~15, &tms->shiftreg[0]); else logerror("To ShiftReg function not set. PC = %08X\n", tms->pc); return tms->shiftreg[0]; diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index f5ec3a8ad72..f9e6c6ee45e 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -313,7 +313,7 @@ static UINT32 read_pixel_32(tms34010_state *tms, offs_t offset) static UINT32 read_pixel_shiftreg(tms34010_state *tms, offs_t offset) { if (tms->config->to_shiftreg) - tms->config->to_shiftreg(offset, &tms->shiftreg[0]); + tms->config->to_shiftreg(tms->program, offset, &tms->shiftreg[0]); else fatalerror("To ShiftReg function not set. PC = %08X\n", tms->pc); return tms->shiftreg[0]; @@ -457,7 +457,7 @@ static void write_pixel_r_t_32(tms34010_state *tms, offs_t offset, UINT32 data) static void write_pixel_shiftreg(tms34010_state *tms, offs_t offset, UINT32 data) { if (tms->config->from_shiftreg) - tms->config->from_shiftreg(offset, &tms->shiftreg[0]); + tms->config->from_shiftreg(tms->program, offset, &tms->shiftreg[0]); else fatalerror("From ShiftReg function not set. PC = %08X\n", tms->pc); } @@ -1214,12 +1214,12 @@ WRITE16_HANDLER( tms34010_io_register_w ) if (!(oldreg & 0x0080) && (newreg & 0x0080)) { if (tms->config->output_int) - (*tms->config->output_int)(1); + (*tms->config->output_int)(space->cpu, 1); } else if ((oldreg & 0x0080) && !(newreg & 0x0080)) { if (tms->config->output_int) - (*tms->config->output_int)(0); + (*tms->config->output_int)(space->cpu, 0); } /* input interrupt? (should really be state-based, but the functions don't exist!) */ @@ -1365,12 +1365,12 @@ WRITE16_HANDLER( tms34020_io_register_w ) if (!(oldreg & 0x0080) && (newreg & 0x0080)) { if (tms->config->output_int) - (*tms->config->output_int)(1); + (*tms->config->output_int)(space->cpu, 1); } else if ((oldreg & 0x0080) && !(newreg & 0x0080)) { if (tms->config->output_int) - (*tms->config->output_int)(0); + (*tms->config->output_int)(space->cpu, 0); } /* input interrupt? (should really be state-based, but the functions don't exist!) */ diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h index 8389bb9064b..7bb13ac8c8d 100644 --- a/src/emu/cpu/tms34010/tms34010.h +++ b/src/emu/cpu/tms34010/tms34010.h @@ -196,9 +196,9 @@ struct _tms34010_config UINT32 pixclock; /* the pixel clock (0 means don't adjust screen size) */ int pixperclock; /* pixels per clock */ void (*scanline_callback)(const device_config *screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params); - void (*output_int)(int state); /* output interrupt callback */ - void (*to_shiftreg)(offs_t, UINT16 *); /* shift register write */ - void (*from_shiftreg)(offs_t, UINT16 *); /* shift register read */ + void (*output_int)(const device_config *device, int state); /* output interrupt callback */ + void (*to_shiftreg)(const address_space *space, offs_t, UINT16 *); /* shift register write */ + void (*from_shiftreg)(const address_space *space, offs_t, UINT16 *); /* shift register read */ }; |