summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-12-14 08:15:01 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-12-14 08:15:01 +0000
commitaf1273c18d6bdd5c6607554f524306cb5d9df771 (patch)
treea4af8d43d5864228033f735617ccdb9ca85e4543 /src
parent9acb30bcbea19c8f1704495358e7229169eee570 (diff)
From: Atari Ace [atari_ace@verizon.net]
Sent: Friday, December 12, 2008 9:28 AM To: submit@mamedev.org Cc: atariace@hotmail.com Subject: [patch] yet another small Machine cleanup Hi mamedev, This patch modifies the tms34010.h, pc16552.h, and tms34061.h interfaces to eliminate some more global Machine variables. Six more deprecat.h includes eliminated. FYI, 128u5 had 523 deprecat.h includes and ~1400 Machine variables, now were down to 374 and ~420 respectively, so progress is being made. ~aa
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpu/tms34010/34010gfx.c4
-rw-r--r--src/emu/cpu/tms34010/tms34010.c12
-rw-r--r--src/emu/cpu/tms34010/tms34010.h6
-rw-r--r--src/emu/machine/pc16552d.c7
-rw-r--r--src/emu/machine/pc16552d.h2
-rw-r--r--src/emu/video/tms34061.c37
-rw-r--r--src/emu/video/tms34061.h4
-rw-r--r--src/mame/drivers/artmagic.c5
-rw-r--r--src/mame/drivers/coolpool.c4
-rw-r--r--src/mame/drivers/firebeat.c4
-rw-r--r--src/mame/drivers/guab.c8
-rw-r--r--src/mame/drivers/jpmimpct.c5
-rw-r--r--src/mame/drivers/meritm.c2
-rw-r--r--src/mame/drivers/micro3d.c4
-rw-r--r--src/mame/drivers/xtheball.c9
-rw-r--r--src/mame/includes/artmagic.h4
-rw-r--r--src/mame/includes/btoads.h4
-rw-r--r--src/mame/includes/exterm.h8
-rw-r--r--src/mame/includes/harddriv.h8
-rw-r--r--src/mame/includes/jpmimpct.h4
-rw-r--r--src/mame/includes/midtunit.h4
-rw-r--r--src/mame/includes/midyunit.h4
-rw-r--r--src/mame/machine/harddriv.c18
-rw-r--r--src/mame/video/artmagic.c4
-rw-r--r--src/mame/video/btoads.c9
-rw-r--r--src/mame/video/capbowl.c4
-rw-r--r--src/mame/video/exterm.c8
-rw-r--r--src/mame/video/harddriv.c4
-rw-r--r--src/mame/video/itech8.c4
-rw-r--r--src/mame/video/jpmimpct.c4
-rw-r--r--src/mame/video/midtunit.c4
-rw-r--r--src/mame/video/midyunit.c4
32 files changed, 103 insertions, 109 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 */
};
diff --git a/src/emu/machine/pc16552d.c b/src/emu/machine/pc16552d.c
index c1136cda063..d37162840d9 100644
--- a/src/emu/machine/pc16552d.c
+++ b/src/emu/machine/pc16552d.c
@@ -6,7 +6,6 @@
*/
#include "driver.h"
-#include "deprecat.h"
#include "pc16552d.h"
#define REG_RECV_BUFFER 0x0 // Read
@@ -388,7 +387,7 @@ static void duart_w(running_machine *machine, int chip, int reg, UINT8 data)
/*****************************************************************************/
-void pc16552d_init(int chip, int frequency, void (* irq_handler)(running_machine *machine, int channel, int value), void (* tx_callback)(int channel, int count, UINT8* data))
+void pc16552d_init(running_machine *machine, int chip, int frequency, void (* irq_handler)(running_machine *machine, int channel, int value), void (* tx_callback)(int channel, int count, UINT8* data))
{
memset(&duart[chip], 0, sizeof(PC16552D_REGS));
@@ -401,10 +400,10 @@ void pc16552d_init(int chip, int frequency, void (* irq_handler)(running_machine
duart[chip].ch[1].pending_interrupt = 0;
// allocate transmit timers
- duart[chip].ch[0].tx_fifo_timer = timer_alloc(Machine, tx_fifo_timer_callback, NULL);
+ duart[chip].ch[0].tx_fifo_timer = timer_alloc(machine, tx_fifo_timer_callback, NULL);
timer_adjust_oneshot(duart[chip].ch[0].tx_fifo_timer, attotime_never, (chip * 2) + 0);
- duart[chip].ch[1].tx_fifo_timer = timer_alloc(Machine, tx_fifo_timer_callback, NULL);
+ duart[chip].ch[1].tx_fifo_timer = timer_alloc(machine, tx_fifo_timer_callback, NULL);
timer_adjust_oneshot(duart[chip].ch[1].tx_fifo_timer, attotime_never, (chip * 2) + 1);
}
diff --git a/src/emu/machine/pc16552d.h b/src/emu/machine/pc16552d.h
index a5d3520a533..58133ccc24e 100644
--- a/src/emu/machine/pc16552d.h
+++ b/src/emu/machine/pc16552d.h
@@ -1,7 +1,7 @@
#ifndef PC16552D_H
#define PC16552D_H
-void pc16552d_init(int chip, int frequency, void (* irq_handler)(running_machine *machine, int channel, int value), void (* tx_callback)(int channel, int count, UINT8* data));
+void pc16552d_init(running_machine *machine, int chip, int frequency, void (* irq_handler)(running_machine *machine, int channel, int value), void (* tx_callback)(int channel, int count, UINT8* data));
void pc16552d_rx_data(running_machine *machine, int chip, int channel, UINT8 data);
READ8_HANDLER(pc16552d_0_r);
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index a2fc989d4b1..fa40ac34f84 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -11,7 +11,6 @@
****************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "tms34061.h"
@@ -167,7 +166,7 @@ static TIMER_CALLBACK( tms34061_interrupt )
*
*************************************/
-static void register_w(offs_t offset, UINT8 data)
+static void register_w(const address_space *space, offs_t offset, UINT8 data)
{
int scanline;
int regnum = offset >> 2;
@@ -187,7 +186,7 @@ static void register_w(offs_t offset, UINT8 data)
}
/* log it */
- if (VERBOSE) logerror("%s:tms34061 %s = %04x\n", cpuexec_describe_context(Machine), regnames[regnum], tms34061.regs[regnum]);
+ if (VERBOSE) logerror("%s:tms34061 %s = %04x\n", cpuexec_describe_context(space->machine), regnames[regnum], tms34061.regs[regnum]);
/* update the state of things */
switch (regnum)
@@ -238,7 +237,7 @@ static void register_w(offs_t offset, UINT8 data)
*
*************************************/
-static UINT8 register_r(offs_t offset)
+static UINT8 register_r(const address_space *space, offs_t offset)
{
int regnum = offset >> 2;
UINT16 result;
@@ -265,7 +264,7 @@ static UINT8 register_r(offs_t offset)
}
/* log it */
- if (VERBOSE) logerror("%s:tms34061 %s read = %04X\n", cpuexec_describe_context(Machine), regnames[regnum], result);
+ if (VERBOSE) logerror("%s:tms34061 %s read = %04X\n", cpuexec_describe_context(space->machine), regnames[regnum], result);
return (offset & 0x02) ? (result >> 8) : result;
}
@@ -360,7 +359,7 @@ INLINE void adjust_xyaddress(int offset)
}
-static void xypixel_w(int offset, UINT8 data)
+static void xypixel_w(const address_space *space, int offset, UINT8 data)
{
/* determine the offset, then adjust it */
offs_t pixeloffs = tms34061.regs[TMS34061_XYADDRESS];
@@ -372,7 +371,7 @@ static void xypixel_w(int offset, UINT8 data)
/* mask to the VRAM size */
pixeloffs &= tms34061.vrammask;
- if (VERBOSE) logerror("%s:tms34061 xy (%04x) = %02x/%02x\n", cpuexec_describe_context(Machine), pixeloffs, data, tms34061.latchdata);
+ if (VERBOSE) logerror("%s:tms34061 xy (%04x) = %02x/%02x\n", cpuexec_describe_context(space->machine), pixeloffs, data, tms34061.latchdata);
/* set the pixel data */
tms34061.vram[pixeloffs] = data;
@@ -380,7 +379,7 @@ static void xypixel_w(int offset, UINT8 data)
}
-static UINT8 xypixel_r(int offset)
+static UINT8 xypixel_r(const address_space *space, int offset)
{
/* determine the offset, then adjust it */
offs_t pixeloffs = tms34061.regs[TMS34061_XYADDRESS];
@@ -405,7 +404,7 @@ static UINT8 xypixel_r(int offset)
*
*************************************/
-void tms34061_w(int col, int row, int func, UINT8 data)
+void tms34061_w(const address_space *space, int col, int row, int func, UINT8 data)
{
offs_t offs;
@@ -415,12 +414,12 @@ void tms34061_w(int col, int row, int func, UINT8 data)
/* both 0 and 2 map to register access */
case 0:
case 2:
- register_w(col, data);
+ register_w(space, col, data);
break;
/* function 1 maps to XY access; col is the address adjustment */
case 1:
- xypixel_w(col, data);
+ xypixel_w(space, col, data);
break;
/* function 3 maps to direct access */
@@ -428,7 +427,7 @@ void tms34061_w(int col, int row, int func, UINT8 data)
offs = ((row << tms34061.intf.rowshift) | col) & tms34061.vrammask;
if (tms34061.regs[TMS34061_CONTROL2] & 0x0040)
offs |= (tms34061.regs[TMS34061_CONTROL2] & 3) << 16;
- if (VERBOSE) logerror("%s:tms34061 direct (%04x) = %02x/%02x\n", cpuexec_describe_context(Machine), offs, data, tms34061.latchdata);
+ if (VERBOSE) logerror("%s:tms34061 direct (%04x) = %02x/%02x\n", cpuexec_describe_context(space->machine), offs, data, tms34061.latchdata);
if (tms34061.vram[offs] != data || tms34061.latchram[offs] != tms34061.latchdata)
{
tms34061.vram[offs] = data;
@@ -442,7 +441,7 @@ void tms34061_w(int col, int row, int func, UINT8 data)
if (tms34061.regs[TMS34061_CONTROL2] & 0x0040)
offs |= (tms34061.regs[TMS34061_CONTROL2] & 3) << 16;
offs &= tms34061.vrammask;
- if (VERBOSE) logerror("%s:tms34061 shiftreg write (%04x)\n", cpuexec_describe_context(Machine), offs);
+ if (VERBOSE) logerror("%s:tms34061 shiftreg write (%04x)\n", cpuexec_describe_context(space->machine), offs);
memcpy(&tms34061.vram[offs], tms34061.shiftreg, (size_t)1 << tms34061.intf.rowshift);
memset(&tms34061.latchram[offs], tms34061.latchdata, (size_t)1 << tms34061.intf.rowshift);
@@ -454,20 +453,20 @@ void tms34061_w(int col, int row, int func, UINT8 data)
if (tms34061.regs[TMS34061_CONTROL2] & 0x0040)
offs |= (tms34061.regs[TMS34061_CONTROL2] & 3) << 16;
offs &= tms34061.vrammask;
- if (VERBOSE) logerror("%s:tms34061 shiftreg read (%04x)\n", cpuexec_describe_context(Machine), offs);
+ if (VERBOSE) logerror("%s:tms34061 shiftreg read (%04x)\n", cpuexec_describe_context(space->machine), offs);
tms34061.shiftreg = &tms34061.vram[offs];
break;
/* log anything else */
default:
- logerror("%s:Unsupported TMS34061 function %d\n", cpuexec_describe_context(Machine), func);
+ logerror("%s:Unsupported TMS34061 function %d\n", cpuexec_describe_context(space->machine), func);
break;
}
}
-UINT8 tms34061_r(int col, int row, int func)
+UINT8 tms34061_r(const address_space *space, int col, int row, int func)
{
int result = 0;
offs_t offs;
@@ -478,12 +477,12 @@ UINT8 tms34061_r(int col, int row, int func)
/* both 0 and 2 map to register access */
case 0:
case 2:
- result = register_r(col);
+ result = register_r(space, col);
break;
/* function 1 maps to XY access; col is the address adjustment */
case 1:
- result = xypixel_r(col);
+ result = xypixel_r(space, col);
break;
/* funtion 3 maps to direct access */
@@ -515,7 +514,7 @@ UINT8 tms34061_r(int col, int row, int func)
/* log anything else */
default:
- logerror("%s:Unsupported TMS34061 function %d\n", cpuexec_describe_context(Machine),
+ logerror("%s:Unsupported TMS34061 function %d\n", cpuexec_describe_context(space->machine),
func);
break;
}
diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h
index 82eea0d08da..2bd0ff23157 100644
--- a/src/emu/video/tms34061.h
+++ b/src/emu/video/tms34061.h
@@ -59,8 +59,8 @@ struct tms34061_display
void tms34061_start(running_machine *machine, const struct tms34061_interface *interface);
/* reads/writes to the 34061 */
-UINT8 tms34061_r(int col, int row, int func);
-void tms34061_w(int col, int row, int func, UINT8 data);
+UINT8 tms34061_r(const address_space *space, int col, int row, int func);
+void tms34061_w(const address_space *space, int col, int row, int func, UINT8 data);
/* latch settings */
READ8_HANDLER( tms34061_latch_r );
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 153cbceb036..1a89ed86519 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -22,7 +22,6 @@
***************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
#include "artmagic.h"
@@ -62,10 +61,10 @@ static void update_irq_state(running_machine *machine)
}
-static void m68k_gen_int(int state)
+static void m68k_gen_int(const device_config *device, int state)
{
tms_irq = state;
- update_irq_state(Machine);
+ update_irq_state(device->machine);
}
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index c22b6c5c8b6..b3a33b72806 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -125,13 +125,13 @@ static void coolpool_scanline(const device_config *screen, bitmap_t *bitmap, int
*
*************************************/
-static void coolpool_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+static void coolpool_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &vram_base[TOWORD(address) & ~TOWORD(0xfff)], TOBYTE(0x1000));
}
-static void coolpool_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+static void coolpool_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&vram_base[TOWORD(address) & ~TOWORD(0xfff)], shiftreg, TOBYTE(0x1000));
}
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index f7dd31df5a8..525a3b2042e 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -2283,8 +2283,8 @@ static void init_firebeat(running_machine *machine)
rtc65271_init(machine, xram, NULL);
- pc16552d_init(0, 19660800, comm_uart_irq_callback, 0); // Network UART
- pc16552d_init(1, 24000000, midi_uart_irq_callback, 0); // MIDI UART
+ pc16552d_init(machine, 0, 19660800, comm_uart_irq_callback, 0); // Network UART
+ pc16552d_init(machine, 1, 24000000, midi_uart_irq_callback, 0); // MIDI UART
extend_board_irq_enable = 0x3f;
extend_board_irq_active = 0x00;
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 02c1f1f87a6..7d2c7ff0f63 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -103,10 +103,10 @@ static WRITE16_HANDLER( guab_tms34061_w )
col = offset <<= 1;
if (ACCESSING_BITS_8_15)
- tms34061_w(col, row, func, data >> 8);
+ tms34061_w(space, col, row, func, data >> 8);
if (ACCESSING_BITS_0_7)
- tms34061_w(col | 1, row, func, data & 0xff);
+ tms34061_w(space, col | 1, row, func, data & 0xff);
}
@@ -123,10 +123,10 @@ static READ16_HANDLER( guab_tms34061_r )
col = offset <<= 1;
if (ACCESSING_BITS_8_15)
- data |= tms34061_r(col, row, func) << 8;
+ data |= tms34061_r(space, col, row, func) << 8;
if (ACCESSING_BITS_0_7)
- data |= tms34061_r(col | 1, row, func);
+ data |= tms34061_r(space, col | 1, row, func);
return data;
}
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 6322853ab1f..e7f3e19af61 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -78,7 +78,6 @@
****************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "cpu/tms34010/tms34010.h"
#include "sound/upd7759.h"
#include "jpmimpct.h"
@@ -818,10 +817,10 @@ INPUT_PORTS_END
*
*************************************/
-static void jpmimpct_tms_irq(int state)
+static void jpmimpct_tms_irq(const device_config *device, int state)
{
tms_irq = state;
- update_irqs(Machine);
+ update_irqs(device->machine);
}
static const tms34010_config tms_config =
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 2ca30234b2b..4c3a74a4e60 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -872,7 +872,7 @@ static MACHINE_START(meritm_crt260)
meritm_psd_a15 = 0;
meritm_switch_banks();
MACHINE_START_CALL(merit_common);
- pc16552d_init(0, UART_CLK, NULL, pc16650d_tx_callback);
+ pc16552d_init(machine, 0, UART_CLK, NULL, pc16650d_tx_callback);
microtouch_init(machine, meritm_microtouch_tx_callback, meritm_touch_coord_transform);
state_save_register_global(machine, meritm_bank);
state_save_register_global(machine, meritm_psd_a15);
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 0771392a0bc..4a976b61a9f 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -396,9 +396,9 @@ static INPUT_PORTS_START( f15se )
INPUT_PORTS_END
-static void tms_interrupt(int state)
+static void tms_interrupt(const device_config *device, int state)
{
- m68901_int_gen(Machine, GPIP4);
+ m68901_int_gen(device->machine, GPIP4);
}
static INTERRUPT_GEN( micro3d_vblank )
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 7ff869d5ef6..23d2f147c8d 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -7,7 +7,6 @@
**************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
#include "machine/ticket.h"
@@ -95,25 +94,25 @@ static void xtheball_scanline_update(const device_config *screen, bitmap_t *bitm
*
*************************************/
-static void xtheball_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+static void xtheball_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (address >= 0x01000000 && address <= 0x010fffff)
memcpy(shiftreg, &vram_bg[TOWORD(address & 0xff000)], TOBYTE(0x1000));
else if (address >= 0x02000000 && address <= 0x020fffff)
memcpy(shiftreg, &vram_fg[TOWORD(address & 0xff000)], TOBYTE(0x1000));
else
- logerror("%s:xtheball_to_shiftreg(%08X)\n", cpuexec_describe_context(Machine), address);
+ logerror("%s:xtheball_to_shiftreg(%08X)\n", cpuexec_describe_context(space->machine), address);
}
-static void xtheball_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+static void xtheball_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (address >= 0x01000000 && address <= 0x010fffff)
memcpy(&vram_bg[TOWORD(address & 0xff000)], shiftreg, TOBYTE(0x1000));
else if (address >= 0x02000000 && address <= 0x020fffff)
memcpy(&vram_fg[TOWORD(address & 0xff000)], shiftreg, TOBYTE(0x1000));
else
- logerror("%s:xtheball_from_shiftreg(%08X)\n", cpuexec_describe_context(Machine), address);
+ logerror("%s:xtheball_from_shiftreg(%08X)\n", cpuexec_describe_context(space->machine), address);
}
diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h
index 0cc872b3263..27c799d0737 100644
--- a/src/mame/includes/artmagic.h
+++ b/src/mame/includes/artmagic.h
@@ -13,8 +13,8 @@ extern int artmagic_xor[16], artmagic_is_stoneball;
VIDEO_START( artmagic );
-void artmagic_to_shiftreg(offs_t address, UINT16 *data);
-void artmagic_from_shiftreg(offs_t address, UINT16 *data);
+void artmagic_to_shiftreg(const address_space *space, offs_t address, UINT16 *data);
+void artmagic_from_shiftreg(const address_space *space, offs_t address, UINT16 *data);
READ16_HANDLER( artmagic_blitter_r );
WRITE16_HANDLER( artmagic_blitter_w );
diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h
index 3d04338086c..9b84c5e948e 100644
--- a/src/mame/includes/btoads.h
+++ b/src/mame/includes/btoads.h
@@ -34,7 +34,7 @@ WRITE16_HANDLER( btoads_vram_fg_draw_w );
READ16_HANDLER( btoads_vram_fg_display_r );
READ16_HANDLER( btoads_vram_fg_draw_r );
-void btoads_to_shiftreg(UINT32 address, UINT16 *shiftreg);
-void btoads_from_shiftreg(UINT32 address, UINT16 *shiftreg);
+void btoads_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void btoads_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
void btoads_scanline_update(const device_config *screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h
index ab29fd209a9..f50ed063513 100644
--- a/src/mame/includes/exterm.h
+++ b/src/mame/includes/exterm.h
@@ -12,7 +12,7 @@ extern UINT16 *exterm_slave_videoram;
PALETTE_INIT( exterm );
void exterm_scanline_update(const device_config *screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
-void exterm_to_shiftreg_master(UINT32 address, UINT16* shiftreg);
-void exterm_from_shiftreg_master(UINT32 address, UINT16* shiftreg);
-void exterm_to_shiftreg_slave(UINT32 address, UINT16* shiftreg);
-void exterm_from_shiftreg_slave(UINT32 address, UINT16* shiftreg);
+void exterm_to_shiftreg_master(const address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_from_shiftreg_master(const address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_to_shiftreg_slave(const address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_from_shiftreg_slave(const address_space *space, UINT32 address, UINT16* shiftreg);
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index b0eb8534e7e..a0f12aafadb 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -55,8 +55,8 @@ MACHINE_RESET( harddriv );
INTERRUPT_GEN( hd68k_irq_gen );
WRITE16_HANDLER( hd68k_irq_ack_w );
-void hdgsp_irq_gen(int state);
-void hdmsp_irq_gen(int state);
+void hdgsp_irq_gen(const device_config *device, int state);
+void hdmsp_irq_gen(const device_config *device, int state);
READ16_HANDLER( hd68k_gsp_io_r );
WRITE16_HANDLER( hd68k_gsp_io_w );
@@ -224,8 +224,8 @@ extern UINT16 *hdgsp_paletteram_hi;
extern size_t hdgsp_vram_size;
VIDEO_START( harddriv );
-void hdgsp_write_to_shiftreg(UINT32 address, UINT16 *shiftreg);
-void hdgsp_read_from_shiftreg(UINT32 address, UINT16 *shiftreg);
+void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void hdgsp_read_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
READ16_HANDLER( hdgsp_control_lo_r );
WRITE16_HANDLER( hdgsp_control_lo_w );
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 598a5be5fa6..753bdd2cd02 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -11,8 +11,8 @@ extern UINT16 *tms_vram;
READ16_HANDLER( bt477_r );
WRITE16_HANDLER( bt477_w );
-void jpmimpct_to_shiftreg(UINT32 address, UINT16 *shiftreg);
-void jpmimpct_from_shiftreg(UINT32 address, UINT16 *shiftreg);
+void jpmimpct_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
void jpmimpct_scanline_update(const device_config *screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
VIDEO_START( jpmimpct );
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index dc3f92801ce..adb4868ab67 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -46,8 +46,8 @@ READ16_HANDLER( midtunit_vram_r );
READ16_HANDLER( midtunit_vram_data_r );
READ16_HANDLER( midtunit_vram_color_r );
-void midtunit_to_shiftreg(UINT32 address, UINT16 *shiftreg);
-void midtunit_from_shiftreg(UINT32 address, UINT16 *shiftreg);
+void midtunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void midtunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
WRITE16_HANDLER( midtunit_control_w );
WRITE16_HANDLER( midwunit_control_w );
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index 720c8031e58..c9311dcfa1e 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -52,8 +52,8 @@ READ16_HANDLER( midyunit_gfxrom_r );
WRITE16_HANDLER( midyunit_vram_w );
READ16_HANDLER( midyunit_vram_r );
-void midyunit_to_shiftreg(UINT32 address, UINT16 *shiftreg);
-void midyunit_from_shiftreg(UINT32 address, UINT16 *shiftreg);
+void midyunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void midyunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
WRITE16_HANDLER( midyunit_control_w );
WRITE16_HANDLER( midyunit_paletteram_w );
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index adb8d161feb..d4cd3c7745e 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -232,17 +232,17 @@ WRITE16_HANDLER( hd68k_irq_ack_w )
}
-void hdgsp_irq_gen(int state)
+void hdgsp_irq_gen(const device_config *device, int state)
{
gsp_irq_state = state;
- atarigen_update_interrupts(Machine);
+ atarigen_update_interrupts(device->machine);
}
-void hdmsp_irq_gen(int state)
+void hdmsp_irq_gen(const device_config *device, int state)
{
msp_irq_state = state;
- atarigen_update_interrupts(Machine);
+ atarigen_update_interrupts(device->machine);
}
@@ -757,14 +757,14 @@ static TIMER_CALLBACK( stmsp_sync_update )
}
-INLINE void stmsp_sync_w(int which, offs_t offset, UINT16 data, UINT16 mem_mask)
+INLINE void stmsp_sync_w(const address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask, int which)
{
UINT16 newdata = stmsp_sync[which][offset];
COMBINE_DATA(&newdata);
/* if being written from the 68000, synchronize on it */
if (hd34010_host_access)
- timer_call_after_resynch(Machine, NULL, newdata | (offset << 16) | (which << 28), stmsp_sync_update);
+ timer_call_after_resynch(space->machine, NULL, newdata | (offset << 16) | (which << 28), stmsp_sync_update);
/* otherwise, just update */
else
@@ -774,19 +774,19 @@ INLINE void stmsp_sync_w(int which, offs_t offset, UINT16 data, UINT16 mem_mask)
WRITE16_HANDLER( stmsp_sync0_w )
{
- stmsp_sync_w(0, offset, data, mem_mask);
+ stmsp_sync_w(space, offset, data, mem_mask, 0);
}
WRITE16_HANDLER( stmsp_sync1_w )
{
- stmsp_sync_w(1, offset, data, mem_mask);
+ stmsp_sync_w(space, offset, data, mem_mask, 1);
}
WRITE16_HANDLER( stmsp_sync2_w )
{
- stmsp_sync_w(2, offset, data, mem_mask);
+ stmsp_sync_w(space, offset, data, mem_mask, 2);
}
diff --git a/src/mame/video/artmagic.c b/src/mame/video/artmagic.c
index ac950fa3ecf..1da4e2f8e97 100644
--- a/src/mame/video/artmagic.c
+++ b/src/mame/video/artmagic.c
@@ -70,7 +70,7 @@ VIDEO_START( artmagic )
*
*************************************/
-void artmagic_to_shiftreg(offs_t address, UINT16 *data)
+void artmagic_to_shiftreg(const address_space *space, offs_t address, UINT16 *data)
{
UINT16 *vram = address_to_vram(&address);
if (vram)
@@ -78,7 +78,7 @@ void artmagic_to_shiftreg(offs_t address, UINT16 *data)
}
-void artmagic_from_shiftreg(offs_t address, UINT16 *data)
+void artmagic_from_shiftreg(const address_space *space, offs_t address, UINT16 *data)
{
UINT16 *vram = address_to_vram(&address);
if (vram)
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index 8451efddcfa..c60b7950a25 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -7,7 +7,6 @@
**************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
#include "btoads.h"
@@ -285,7 +284,7 @@ static void render_sprite_row(UINT16 *sprite_source, UINT32 address)
*
*************************************/
-void btoads_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+void btoads_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
address &= ~0x40000000;
@@ -308,11 +307,11 @@ void btoads_to_shiftreg(UINT32 address, UINT16 *shiftreg)
}
else
- logerror("%s:btoads_to_shiftreg(%08X)\n", cpuexec_describe_context(Machine), address);
+ logerror("%s:btoads_to_shiftreg(%08X)\n", cpuexec_describe_context(space->machine), address);
}
-void btoads_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+void btoads_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
address &= ~0x40000000;
@@ -333,7 +332,7 @@ void btoads_from_shiftreg(UINT32 address, UINT16 *shiftreg)
render_sprite_row(shiftreg, address);
else
- logerror("%s:btoads_from_shiftreg(%08X)\n", cpuexec_describe_context(Machine), address);
+ logerror("%s:btoads_from_shiftreg(%08X)\n", cpuexec_describe_context(space->machine), address);
}
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index cb868ea0a94..97a40a2b52b 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -67,7 +67,7 @@ WRITE8_HANDLER( capbowl_tms34061_w )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- tms34061_w(col, *capbowl_rowaddress, func, data);
+ tms34061_w(space, col, *capbowl_rowaddress, func, data);
}
@@ -82,7 +82,7 @@ READ8_HANDLER( capbowl_tms34061_r )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- return tms34061_r(col, *capbowl_rowaddress, func);
+ return tms34061_r(space, col, *capbowl_rowaddress, func);
}
diff --git a/src/mame/video/exterm.c b/src/mame/video/exterm.c
index 00daf3ef12f..09b1a46da7f 100644
--- a/src/mame/video/exterm.c
+++ b/src/mame/video/exterm.c
@@ -36,25 +36,25 @@ PALETTE_INIT( exterm )
*
*************************************/
-void exterm_to_shiftreg_master(UINT32 address, UINT16 *shiftreg)
+void exterm_to_shiftreg_master(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &exterm_master_videoram[TOWORD(address)], 256 * sizeof(UINT16));
}
-void exterm_from_shiftreg_master(UINT32 address, UINT16 *shiftreg)
+void exterm_from_shiftreg_master(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&exterm_master_videoram[TOWORD(address)], shiftreg, 256 * sizeof(UINT16));
}
-void exterm_to_shiftreg_slave(UINT32 address, UINT16 *shiftreg)
+void exterm_to_shiftreg_slave(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &exterm_slave_videoram[TOWORD(address)], 256 * 2 * sizeof(UINT8));
}
-void exterm_from_shiftreg_slave(UINT32 address, UINT16 *shiftreg)
+void exterm_from_shiftreg_slave(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&exterm_slave_videoram[TOWORD(address)], shiftreg, 256 * 2 * sizeof(UINT8));
}
diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c
index 91f4e198d77..bca6b7e75de 100644
--- a/src/mame/video/harddriv.c
+++ b/src/mame/video/harddriv.c
@@ -145,7 +145,7 @@ VIDEO_START( harddriv )
*
*************************************/
-void hdgsp_write_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
/* access to the 1bpp/2bpp area */
if (address >= 0x02000000 && address <= 0x020fffff)
@@ -171,7 +171,7 @@ void hdgsp_write_to_shiftreg(UINT32 address, UINT16 *shiftreg)
}
-void hdgsp_read_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+void hdgsp_read_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (!shiftreg_enable)
return;
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index 1c70322a972..ab8973cbe9f 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -549,7 +549,7 @@ WRITE8_HANDLER( itech8_tms34061_w )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- tms34061_w(col, 0xff, func, data);
+ tms34061_w(space, col, 0xff, func, data);
}
@@ -564,7 +564,7 @@ READ8_HANDLER( itech8_tms34061_r )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- return tms34061_r(col, 0xff, func);
+ return tms34061_r(space, col, 0xff, func);
}
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index f1d892ff723..7af6e632854 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -98,12 +98,12 @@ READ16_HANDLER( bt477_r )
*
*************************************/
-void jpmimpct_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+void jpmimpct_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &tms_vram[TOWORD(address)], 512 * sizeof(UINT16));
}
-void jpmimpct_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&tms_vram[TOWORD(address)], shiftreg, 512 * sizeof(UINT16));
}
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index 3f55b1fe3dd..e79fe372d86 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -220,13 +220,13 @@ READ16_HANDLER( midtunit_vram_color_r )
*
*************************************/
-void midtunit_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+void midtunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &local_videoram[address >> 3], 2 * 512 * sizeof(UINT16));
}
-void midtunit_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+void midtunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&local_videoram[address >> 3], shiftreg, 2 * 512 * sizeof(UINT16));
}
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index 87ae8d00cb9..cfb58747a91 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -203,13 +203,13 @@ READ16_HANDLER( midyunit_vram_r )
*
*************************************/
-void midyunit_to_shiftreg(UINT32 address, UINT16 *shiftreg)
+void midyunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &local_videoram[address >> 3], 2 * 512 * sizeof(UINT16));
}
-void midyunit_from_shiftreg(UINT32 address, UINT16 *shiftreg)
+void midyunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&local_videoram[address >> 3], shiftreg, 2 * 512 * sizeof(UINT16));
}