Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 09:28:51 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

From: Atari Ace [mailto:atari_ace@verizon.net]

Browse Source 
Subject: [patch] Remove more Machine globals, #include "deprecat.h"

Hi mamedev,

The attached patch goes through and converts a number of Machine
globals to machine locals, and then removes #include "deprecat.h" if
appropriate.  The script that generated it is included, since the
patch itself is rather large and would have been time consuming to
produce otherwise.

The script doesn't convert cases of Machine that aren't in common
macros.  I'll try to tackle those later if someone doesn't beat me to
it.

~aa
This commit is contained in:
Aaron Giles 2008-04-24 06:15:00 +00:00
parent 737ff53930
commit 6a955fc076
580 changed files with 951 additions and 1308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/cpu/adsp2100/adsp2100.c
View File

@ -96,7 +96,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "adsp2100.h"

1
src/emu/cpu/alph8201/alph8201.c
View File

@ -144,7 +144,6 @@ Timming
****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "alph8201.h"
/* instruction cycle count */

1
src/emu/cpu/apexc/apexc.c
View File

@ -325,7 +325,6 @@ field: X address D Function Y address D (part 2)
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "apexc.h"
typedef struct

1
src/emu/cpu/arm/arm.c
View File

@ -16,7 +16,6 @@
*/
#include "arm.h"
#include "deprecat.h"
#include "debugger.h"
#define READ8(addr) cpu_read8(addr)

1
src/emu/cpu/arm7/arm7.c
View File

@ -35,7 +35,6 @@
**
*****************************************************************************/
#include "arm7.h"
#include "deprecat.h"
#include "debugger.h"
#include "arm7core.h" //include arm7 core

1
src/emu/cpu/asap/asap.c
View File

@ -10,7 +10,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "asap.h"

1
src/emu/cpu/ccpu/ccpu.c
View File

@ -9,7 +9,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "ccpu.h"

1
src/emu/cpu/cop400/cop410.c
View File

@ -20,7 +20,6 @@
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "cop400.h"
/* The opcode table now is a combination of cycle counts and function pointers */

1
src/emu/cpu/cop400/cop420.c
View File

@ -20,7 +20,6 @@
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "cop400.h"
/* The opcode table now is a combination of cycle counts and function pointers */

1
src/emu/cpu/dsp32/dsp32.c
View File

@ -28,7 +28,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "dsp32.h"

1
src/emu/cpu/dsp56k/dsp56k.c
View File

@ -19,7 +19,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "dsp56k.h"
// #define PC_E000

1
src/emu/cpu/e132xs/e132xs.c
View File

@ -212,7 +212,6 @@
*********************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "eminline.h"
#include "e132xs.h"
#include "osd_cpu.h"

1
src/emu/cpu/f8/f8.c
View File

@ -27,7 +27,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "f8.h"
#define S 0x01

1
src/emu/cpu/g65816/g65816cm.h
View File

@ -10,7 +10,6 @@
/* ======================================================================== */
#include "g65816.h"
#include "deprecat.h"
#include <limits.h>

1
src/emu/cpu/h6280/h6280.c
View File

@ -108,7 +108,6 @@
******************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "h6280.h"
static int h6280_ICount = 0;

1
src/emu/cpu/i8039/i8039.c
View File

@ -35,7 +35,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "i8039.h"

6
src/emu/cpu/i8051/i8051.c
View File

@ -1785,14 +1785,14 @@ static WRITE8_HANDLER(internal_ram_write)
/* Different chip types handle differently, for speed, simply call the chip's handler */
static READ8_HANDLER(internal_ram_iread)
{
return i8051.iram_iread(Machine,offset);
return i8051.iram_iread(machine,offset);
}
/* Writes the contents of the Internal RAM memory (BUT CALLED FROM AN INDIRECT ADDRESSING MODE) */
/* Different chip types handle differently, for speed, simply call the chip's handler */
static WRITE8_HANDLER(internal_ram_iwrite)
{
i8051.iram_iwrite(Machine,offset,data);
i8051.iram_iwrite(machine,offset,data);
}
/*Generate an external ram address for read/writing using indirect addressing mode */
@ -1804,7 +1804,7 @@ static WRITE8_HANDLER(internal_ram_iwrite)
static READ32_HANDLER(external_ram_iaddr)
{
if(i8051.eram_iaddr_callback)
return i8051.eram_iaddr_callback(Machine,offset,mem_mask);
return i8051.eram_iaddr_callback(machine,offset,mem_mask);
else
LOG(("i8051 #%d: external ram address requested (8 bit offset=%02x), but no callback available! at PC:%04x\n", cpu_getactivecpu(), offset, PC));

1
src/emu/cpu/i8085/i8085.c
View File

@ -121,7 +121,6 @@
/*int survival_prot = 0; */
#include "debugger.h"
#include "deprecat.h"
#include "i8085.h"
#include "i8085cpu.h"
#include "i8085daa.h"

1
src/emu/cpu/i86/i286.c
View File

@ -4,7 +4,6 @@
****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "host.h"

1
src/emu/cpu/i86/i86.c
View File

@ -6,7 +6,6 @@
#include "debugger.h"
#include "cpuintrf.h"
#include "deprecat.h"
#include "host.h"
#include "i86.h"

1
src/emu/cpu/i8x41/i8x41.c
View File

@ -87,7 +87,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "i8x41.h"
typedef struct {

1
src/emu/cpu/i960/i960.c
View File

@ -1,5 +1,4 @@
#include "debugger.h"
#include "deprecat.h"
#include "i960.h"
#include "i960dis.h"
#include <math.h>

1
src/emu/cpu/konami/konami.c
View File

@ -35,7 +35,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "konami.h"
#define VERBOSE 0

1
src/emu/cpu/lh5801/lh5801.c
View File

@ -18,7 +18,6 @@
*
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "lh5801.h"

1
src/emu/cpu/m37710/m37710cm.h
View File

@ -12,7 +12,6 @@
#include <limits.h>
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "m37710.h"

1
src/emu/cpu/m6502/m4510.c
View File

@ -101,7 +101,6 @@ z: xxxx address bits a19 .. a16 for memory accesses with a15 1 ?
*/
#include "debugger.h"
#include "deprecat.h"
#include "m6502.h"
#include "m4510.h"

1
src/emu/cpu/m6502/m6502.c
View File

@ -30,7 +30,6 @@
#endif
#include "debugger.h"
#include "deprecat.h"
#include "m6502.h"
#include "ops02.h"
#include "ill02.h"

1
src/emu/cpu/m6502/m6509.c
View File

@ -38,7 +38,6 @@ addresses take place.
*/
#include "debugger.h"
#include "deprecat.h"
#include "m6509.h"
#include "ops02.h"

1
src/emu/cpu/m6502/m65ce02.c
View File

@ -38,7 +38,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "m65ce02.h"
#include "mincce02.h"

5
src/emu/cpu/m6800/m6800.c
View File

@ -74,7 +74,6 @@ TODO:
*/
#include "debugger.h"
#include "deprecat.h"
#include "m6800.h"
#define VERBOSE 0
@ -1965,12 +1964,12 @@ static WRITE8_HANDLER( m6803_internal_registers_w );
READ8_HANDLER( hd63701_internal_registers_r )
{
return m6803_internal_registers_r(Machine, offset);
return m6803_internal_registers_r(machine, offset);
}
WRITE8_HANDLER( hd63701_internal_registers_w )
{
m6803_internal_registers_w(Machine, offset,data);
m6803_internal_registers_w(machine, offset,data);
}
#endif

1
src/emu/cpu/m68000/m68kmame.h
View File

@ -6,7 +6,6 @@
/* ======================================================================== */
#include "debugger.h"
#include "deprecat.h"
#include "m68000.h"
/* Configuration switches (see m68kconf.h for explanation) */

1
src/emu/cpu/m6805/m6805.c
View File

@ -32,7 +32,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "m6805.h"
#define IRQ_LEVEL_DETECT 0

1
src/emu/cpu/m6809/m6809.c
View File

@ -71,7 +71,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "m6809.h"
/* Enable big switch statement for the main opcodes */

1
src/emu/cpu/mb86233/mb86233.c
View File

@ -14,7 +14,6 @@
***************************************************************************/
#include "mb86233.h"
#include "deprecat.h"
#include "debugger.h"
/***************************************************************************

1
src/emu/cpu/mb88xx/mb88xx.c
View File

@ -14,7 +14,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "mb88xx.h"
/***************************************************************************

1
src/emu/cpu/mc68hc11/mc68hc11.c
View File

@ -5,7 +5,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "mc68hc11.h"
enum {

1
src/emu/cpu/minx/minx.c
View File

@ -47,7 +47,6 @@ TODO:
#include "minx.h"
#include "debugger.h"
#include "deprecat.h"
#define FLAG_I 0x80
#define FLAG_D 0x40

1
src/emu/cpu/mips/mips3.c
View File

@ -10,7 +10,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "mips3com.h"

1
src/emu/cpu/mips/r3000.c
View File

@ -7,7 +7,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "r3000.h"

1
src/emu/cpu/nec/nec.c
View File

@ -104,7 +104,6 @@
****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
typedef UINT8 BOOLEAN;
typedef UINT8 BYTE;

1
src/emu/cpu/pdp1/pdp1.c
View File

@ -336,7 +336,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "pdp1.h"
#define LOG 0

1
src/emu/cpu/pdp1/tx0.c
View File

@ -11,7 +11,6 @@
#include "cpuintrf.h"
#include "debugger.h"
#include "tx0.h"
#include "deprecat.h"
#define LOG 0
#define LOG_EXTRA 0

1
src/emu/cpu/pic16c5x/pic16c5x.c
View File

@ -54,7 +54,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "pic16c5x.h"

1
src/emu/cpu/powerpc/ppc.c
View File

@ -3,7 +3,6 @@
#include <setjmp.h>
#include "ppc.h"
#include "debugger.h"
#include "deprecat.h"
#if (HAS_PPC603 || HAS_PPC601 || HAS_PPC604)
static void ppc603_exception(int exception);

1
src/emu/cpu/powerpc/ppcdrc.c
View File

@ -5,7 +5,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "ppc.h"
#include "cpu/x86drc.h"

1
src/emu/cpu/s2650/s2650.c
View File

@ -13,7 +13,6 @@
*************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "s2650.h"
#include "s2650cpu.h"

1
src/emu/cpu/saturn/saturn.c
View File

@ -20,7 +20,6 @@
*
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "saturn.h"
#include "sat.h"

1
src/emu/cpu/sc61860/sc61860.c
View File

@ -28,7 +28,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "sc61860.h"
#include "sc.h"

1
src/emu/cpu/se3208/se3208.c
View File

@ -1,5 +1,4 @@
#include "debugger.h"
#include "deprecat.h"
#include "se3208.h"
/*

1
src/emu/cpu/sharc/sharc.c
View File

@ -4,7 +4,6 @@
*/
#include "sharc.h"
#include "deprecat.h"
#include "debugger.h"
#ifdef ENABLE_DEBUGGER

1
src/emu/cpu/sm8500/sm8500.c
View File

@ -10,7 +10,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "sm8500.h"
#define FLAG_C 0x80

1
src/emu/cpu/spc700/spc700.c
View File

@ -62,7 +62,6 @@ Address Function Register R/W When Reset Remarks
#include <limits.h>
#include "debugger.h"
#include "deprecat.h"
#include "spc700.h"
/* ======================================================================== */

1
src/emu/cpu/ssp1601/ssp1601.c
View File

@ -18,7 +18,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "ssp1601.h"

1
src/emu/cpu/t11/t11.c
View File

@ -12,7 +12,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "t11.h"

1
src/emu/cpu/tlcs90/tlcs90.c
View File

@ -7,7 +7,6 @@
*************************************************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "tlcs90.h"
typedef struct

1
src/emu/cpu/tms32010/tms32010.c
View File

@ -54,7 +54,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "tms32010.h"

1
src/emu/cpu/tms32025/tms32025.c
View File

@ -119,7 +119,6 @@ Table 3-2. TMS32025/26 Memory Blocks
#include "debugger.h"
#include "deprecat.h"
#include "tms32025.h"

1
src/emu/cpu/tms32031/tms32031.c
View File

@ -7,7 +7,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "tms32031.h"
#include "eminline.h"

1
src/emu/cpu/tms32051/tms32051.c
View File

@ -5,7 +5,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "cpuintrf.h"
#include "tms32051.h"

1
src/emu/cpu/upd7810/upd7810.c
View File

@ -407,7 +407,6 @@ STOP 01001000 10111011 12 stop
#include "debugger.h"
#include "upd7810.h"
#include "deprecat.h"
static UPD7810 upd7810;
static int upd7810_icount;

1
src/emu/cpu/v30mz/v30mz.c
View File

@ -41,7 +41,6 @@
****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
typedef UINT8 BOOLEAN;
typedef UINT8 BYTE;

1
src/emu/cpu/v60/v60.c
View File

@ -4,7 +4,6 @@
// Portability fixes by Richter Belmont
#include "debugger.h"
#include "deprecat.h"
#include "v60.h"
// memory accessors

1
src/emu/cpu/v810/v810.c
View File

@ -17,7 +17,6 @@
********************************************/
#include "debugger.h"
#include "deprecat.h"
#include "v810.h"
#define clkIF 3

1
src/emu/cpu/z180/z180.c
View File

@ -77,7 +77,6 @@ Hitachi HD647180 series:
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "z180.h"
#include "cpu/z80/z80daisy.h"

1
src/emu/cpu/z80/z80.c
View File

@ -94,7 +94,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "z80.h"
#include "z80daisy.h"

1
src/emu/cpu/z8000/z8000.c
View File

@ -44,7 +44,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "z8000.h"
#include "z8000cpu.h"
#include "osd_cpu.h"

1
src/emu/cpu/z80gb/z80gb.c
View File

@ -37,7 +37,6 @@
/** **/
/*************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "z80gb.h"
#define FLAG_Z 0x80

1
src/emu/emupal.c
View File

@ -10,7 +10,6 @@
******************************************************************************/
#include "driver.h"
#include "deprecat.h"
#define VERBOSE 0

2
src/emu/machine/6522via.c
View File

@ -337,7 +337,7 @@ static TIMER_CALLBACK( via_t1_timeout )
UINT8 write_data = (v->out_b & v->ddr_b) | (v->ddr_b ^ 0xff);
if (v->intf->out_b_func)
v->intf->out_b_func(Machine, 0, write_data);
v->intf->out_b_func(machine, 0, write_data);
else
logerror("6522VIA chip %d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}

3
src/emu/machine/8042kbdc.c
View File

@ -175,7 +175,6 @@
#include "driver.h"
#include "memconv.h"
#include "deprecat.h"
#include "machine/pckeybrd.h"
#include "machine/8042kbdc.h"
@ -586,7 +585,7 @@ WRITE8_HANDLER(kbdc8042_8_w)
* the bits low set in the command byte. The only pulse that has
* an effect currently is bit 0, which pulses the CPU's reset line
*/
cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, PULSE_LINE);
cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, PULSE_LINE);
at_8042_set_outport(kbdc8042.outport | 0x02, 0);
break;
}

1
src/emu/machine/idectrl.c
View File

@ -7,7 +7,6 @@
#include "driver.h"
#include "idectrl.h"
#include "debugger.h"
#include "deprecat.h"
/***************************************************************************

5
src/emu/machine/msm6242.c
View File

@ -5,7 +5,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "machine/msm6242.h"
static UINT8 msm6264_reg[3] = { 0, 0, 0 };
@ -41,7 +40,7 @@ READ8_HANDLER( msm6242_r )
}
else /* otherwise, use the current time */
{
mame_get_current_datetime(Machine, &curtime);
mame_get_current_datetime(machine, &curtime);
}
switch(offset)
@ -96,7 +95,7 @@ WRITE8_HANDLER( msm6242_w )
if ( data & 1 ) /* was Hold set? */
{
mame_get_current_datetime(Machine, &msm6264_hold_time);
mame_get_current_datetime(machine, &msm6264_hold_time);
}
return;

12
src/emu/machine/z80dma.c
View File

@ -489,42 +489,42 @@ DEVICE_GET_INFO( z80dma )
READ8_HANDLER( z80dma_0_r )
{
z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_0_TAG);
z80dma_t *z80dma = devtag_get_token(machine, Z80DMA, Z80DMA_DEV_0_TAG);
return z80dma_read(z80dma);
}
READ8_HANDLER( z80dma_1_r )
{
z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_1_TAG);
z80dma_t *z80dma = devtag_get_token(machine, Z80DMA, Z80DMA_DEV_1_TAG);
return z80dma_read(z80dma);
}
WRITE8_HANDLER( z80dma_0_w )
{
z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_0_TAG);
z80dma_t *z80dma = devtag_get_token(machine, Z80DMA, Z80DMA_DEV_0_TAG);
z80dma_write(z80dma, data);
}
WRITE8_HANDLER( z80dma_1_w )
{
z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_1_TAG);
z80dma_t *z80dma = devtag_get_token(machine, Z80DMA, Z80DMA_DEV_1_TAG);
z80dma_write(z80dma, data);
}
WRITE8_HANDLER( z80dma_0_rdy_w )
{
z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_0_TAG);
z80dma_t *z80dma = devtag_get_token(machine, Z80DMA, Z80DMA_DEV_0_TAG);
z80dma_rdy_write(z80dma, data);
}
WRITE8_HANDLER( z80dma_1_rdy_w )
{
z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_1_TAG);
z80dma_t *z80dma = devtag_get_token(machine, Z80DMA, Z80DMA_DEV_1_TAG);
z80dma_rdy_write(z80dma, data);
}

2
src/emu/sound.c
View File

@ -661,7 +661,7 @@ static TIMER_CALLBACK( sound_update )
profiler_mark(PROFILER_SOUND);
/* force all the speaker streams to generate the proper number of samples */
for (curspeak = speaker_output_first(Machine->config); curspeak != NULL; curspeak = speaker_output_next(curspeak))
for (curspeak = speaker_output_first(machine->config); curspeak != NULL; curspeak = speaker_output_next(curspeak))
{
speaker_info *spk = curspeak->token;
const stream_sample_t *stream_buf;

3
src/emu/sound/es5503.c
View File

@ -35,7 +35,6 @@
#include <math.h>
#include "sndintrf.h"
#include "deprecat.h"
#include "cpuintrf.h"
#include "es5503.h"
#include "streams.h"
@ -377,7 +376,7 @@ READ8_HANDLER(ES5503_reg_0_r)
case 0xe2: // A/D converter
if (chip->adc_read)
{
return chip->adc_read(Machine, 0);
return chip->adc_read(machine, 0);
}
break;
}

2
src/emu/sound/scsp.c
View File

@ -1310,7 +1310,7 @@ WRITE16_HANDLER( SCSP_0_w )
case 0x42a:
if(stv_scu && !(stv_scu[40] & 0x40) /*&& scsp_regs[0x42c/2] & 0x20*/)/*Main CPU allow sound irq*/
{
cpunum_set_input_line_and_vector(Machine, 0, 9, HOLD_LINE , 0x46);
cpunum_set_input_line_and_vector(machine, 0, 9, HOLD_LINE , 0x46);
logerror("SCSP: Main CPU interrupt\n");
}
break;

8
src/emu/video/generic.c
View File

@ -677,7 +677,7 @@ PALETTE_INIT( RRRRR_GGGGGG_BBBBB )
WRITE8_HANDLER( paletteram_RRRGGGBB_w )
{
paletteram[offset] = data;
palette_set_color_rgb(Machine, offset, pal3bit(data >> 5), pal3bit(data >> 2), pal2bit(data >> 0));
palette_set_color_rgb(machine, offset, pal3bit(data >> 5), pal3bit(data >> 2), pal2bit(data >> 0));
}
@ -688,7 +688,7 @@ WRITE8_HANDLER( paletteram_RRRGGGBB_w )
WRITE8_HANDLER( paletteram_BBGGGRRR_w )
{
paletteram[offset] = data;
palette_set_color_rgb(Machine, offset, pal3bit(data >> 0), pal3bit(data >> 3), pal2bit(data >> 6));
palette_set_color_rgb(machine, offset, pal3bit(data >> 0), pal3bit(data >> 3), pal2bit(data >> 6));
}
@ -701,7 +701,7 @@ WRITE8_HANDLER( paletteram_BBGGRRII_w )
int i = (data >> 0) & 3;
paletteram[offset] = data;
palette_set_color_rgb(Machine, offset, pal4bit(((data >> 0) & 0x0c) | i),
palette_set_color_rgb(machine, offset, pal4bit(((data >> 0) & 0x0c) | i),
pal4bit(((data >> 2) & 0x0c) | i),
pal4bit(((data >> 4) & 0x0c) | i));
}
@ -966,7 +966,7 @@ WRITE16_HANDLER( paletteram16_RRRRGGGGBBBBRGBx_word_w )
{
COMBINE_DATA(&paletteram16[offset]);
data = paletteram16[offset];
palette_set_color_rgb(Machine, offset, pal5bit(((data >> 11) & 0x1e) | ((data >> 3) & 0x01)),
palette_set_color_rgb(machine, offset, pal5bit(((data >> 11) & 0x1e) | ((data >> 3) & 0x01)),
pal5bit(((data >> 7) & 0x1e) | ((data >> 2) & 0x01)),
pal5bit(((data >> 3) & 0x1e) | ((data >> 1) & 0x01)));
}

1
src/mame/audio/aztarac.c
View File

@ -5,7 +5,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "aztarac.h"

2
src/mame/audio/cage.c
View File

@ -467,7 +467,7 @@ static READ32_HANDLER( cage_from_main_r )
logerror("%06X:CAGE read command = %04X\n", activecpu_get_pc(), cage_from_main);
cpu_to_cage_ready = 0;
update_control_lines();
cpunum_set_input_line(Machine, cage_cpu, TMS32031_IRQ0, CLEAR_LINE);
cpunum_set_input_line(machine, cage_cpu, TMS32031_IRQ0, CLEAR_LINE);
return cage_from_main;
}

3
src/mame/audio/carnival.c
View File

@ -37,7 +37,6 @@
/*****************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "cpu/i8039/i8039.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
@ -236,7 +235,7 @@ WRITE8_HANDLER( carnival_audio_2_w )
if ( bitsGoneHigh & OUT_PORT_2_MUSIC_RESET )
/* reset output is no longer asserted active low */
cpunum_set_input_line(Machine, CPU_MUSIC_ID, INPUT_LINE_RESET, PULSE_LINE );
cpunum_set_input_line(machine, CPU_MUSIC_ID, INPUT_LINE_RESET, PULSE_LINE );
}

2
src/mame/audio/cyberbal.c
View File

@ -63,7 +63,7 @@ WRITE8_HANDLER( cyberbal_sound_bank_select_w )
memory_set_bankptr(8, &bank_base[0x1000 * ((data >> 6) & 3)]);
coin_counter_w(1, (data >> 5) & 1);
coin_counter_w(0, (data >> 4) & 1);
cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
if (!(data & 0x01)) sndti_reset(SOUND_YM2151, 0);
}

6
src/mame/audio/dcs.c
View File

@ -1417,7 +1417,7 @@ WRITE32_HANDLER( dsio_idma_data_w )
if (dsio.start_on_next_write && --dsio.start_on_next_write == 0)
{
logerror("Starting DSIO CPU\n");
cpunum_set_input_line(Machine, dcs.cpunum, INPUT_LINE_HALT, CLEAR_LINE);
cpunum_set_input_line(machine, dcs.cpunum, INPUT_LINE_HALT, CLEAR_LINE);
}
}
@ -1555,7 +1555,7 @@ static WRITE16_HANDLER( input_latch_ack_w )
if (!dcs.last_input_empty && dcs.input_empty_cb)
(*dcs.input_empty_cb)(dcs.last_input_empty = 1);
SET_INPUT_EMPTY();
cpunum_set_input_line(Machine, dcs.cpunum, ADSP2105_IRQ2, CLEAR_LINE);
cpunum_set_input_line(machine, dcs.cpunum, ADSP2105_IRQ2, CLEAR_LINE);
}
@ -1827,7 +1827,7 @@ static WRITE16_HANDLER( adsp_control_w )
if (data & 0x0200)
{
logerror("%04X:Rebooting DCS due to SYSCONTROL write\n", activecpu_get_pc());
cpunum_set_input_line(Machine, dcs.cpunum, INPUT_LINE_RESET, PULSE_LINE);
cpunum_set_input_line(machine, dcs.cpunum, INPUT_LINE_RESET, PULSE_LINE);
dcs_boot();
dcs.control_regs[SYSCONTROL_REG] = 0;
}

2
src/mame/audio/exidy.c
View File

@ -447,7 +447,7 @@ static WRITE8_HANDLER( exidy_shriot_w )
{
case 0: /* port A */
if (has_mc3417)
cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
riot_porta_data = (riot_porta_data & ~riot_porta_ddr) | (data & riot_porta_ddr);
break;

6
src/mame/audio/harddriv.c
View File

@ -118,8 +118,8 @@ WRITE16_HANDLER( hd68k_snd_data_w )
WRITE16_HANDLER( hd68k_snd_reset_w )
{
cpunum_set_input_line(Machine, hdcpu_sound, INPUT_LINE_RESET, ASSERT_LINE);
cpunum_set_input_line(Machine, hdcpu_sound, INPUT_LINE_RESET, CLEAR_LINE);
cpunum_set_input_line(machine, hdcpu_sound, INPUT_LINE_RESET, ASSERT_LINE);
cpunum_set_input_line(machine, hdcpu_sound, INPUT_LINE_RESET, CLEAR_LINE);
mainflag = soundflag = 0;
update_68k_interrupts(Machine);
logerror("%06X:Reset sound\n", activecpu_get_previouspc());
@ -222,7 +222,7 @@ WRITE16_HANDLER( hdsnd68k_latches_w )
case 4: /* RES320 */
logerror("%06X:RES320=%d\n", activecpu_get_previouspc(), data);
if (hdcpu_sounddsp != -1)
cpunum_set_input_line(Machine, hdcpu_sounddsp, INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(machine, hdcpu_sounddsp, INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE);
break;
case 7: /* LED */

2
src/mame/audio/irem.c
View File

@ -145,7 +145,7 @@ static WRITE8_HANDLER( ay8910_1_porta_w )
static WRITE8_HANDLER( sound_irq_ack_w )
{
cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
}

5
src/mame/audio/jedi.c
View File

@ -7,7 +7,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
#include "sound/5220intf.h"
#include "sound/pokey.h"
@ -61,7 +60,7 @@ static SOUND_RESET( jedi )
static WRITE8_HANDLER( irq_ack_w )
{
cpunum_set_input_line(Machine, 1, M6502_IRQ_LINE, CLEAR_LINE);
cpunum_set_input_line(machine, 1, M6502_IRQ_LINE, CLEAR_LINE);
}
@ -74,7 +73,7 @@ static WRITE8_HANDLER( irq_ack_w )
WRITE8_HANDLER( jedi_audio_reset_w )
{
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
}

4
src/mame/audio/leland.c
View File

@ -1660,14 +1660,14 @@ WRITE8_HANDLER( leland_80186_control_w )
}
/* /RESET */
cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, data & 0x80 ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, data & 0x80 ? CLEAR_LINE : ASSERT_LINE);
/* /NMI */
/* If the master CPU doesn't get a response by the time it's ready to send
the next command, it uses an NMI to force the issue; unfortunately, this
seems to really screw up the sound system. It turns out it's better to
just wait for the original interrupt to occur naturally */
/* cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, data & 0x40 ? CLEAR_LINE : ASSERT_LINE);*/
/* cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, data & 0x40 ? CLEAR_LINE : ASSERT_LINE);*/
/* INT0 */
if (data & 0x20)

2
src/mame/audio/mcr.c
View File

@ -322,7 +322,7 @@ static READ8_HANDLER( ssio_irq_clear )
{
/* a read here asynchronously resets the 14024 count, clearing /SINT */
ssio_14024_count = 0;
cpunum_set_input_line(Machine, ssio_sound_cpu, 0, CLEAR_LINE);
cpunum_set_input_line(machine, ssio_sound_cpu, 0, CLEAR_LINE);
return 0xff;
}

1
src/mame/audio/redalert.c
View File

@ -9,7 +9,6 @@
#include "driver.h"
#include "rescap.h"
#include "deprecat.h"
#include "cpu/i8085/i8085.h"
#include "machine/6821pia.h"
#include "sound/ay8910.h"

3
src/mame/audio/segag80r.c
View File

@ -9,7 +9,6 @@
#include "driver.h"
#include "streams.h"
#include "deprecat.h"
#include "cpu/i8039/i8039.h"
#include "segag80r.h"
#include "machine/8255ppi.h"
@ -938,7 +937,7 @@ static WRITE8_HANDLER( n7751_command_w )
D3 = /INT line
*/
n7751_command = data & 0x07;
cpunum_set_input_line(Machine, 1, 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE);
cpunum_set_input_line(machine, 1, 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE);
cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100));
}

8
src/mame/audio/seibu.c
View File

@ -323,7 +323,7 @@ static void update_irq_lines(running_machine *machine, int param)
WRITE8_HANDLER( seibu_irq_clear_w )
{
update_irq_lines(Machine, VECTOR_INIT);
update_irq_lines(machine, VECTOR_INIT);
}
WRITE8_HANDLER( seibu_rst10_ack_w )
@ -333,7 +333,7 @@ WRITE8_HANDLER( seibu_rst10_ack_w )
WRITE8_HANDLER( seibu_rst18_ack_w )
{
update_irq_lines(Machine, RST18_CLEAR);
update_irq_lines(machine, RST18_CLEAR);
}
void seibu_ym3812_irqhandler(int linestate)
@ -443,7 +443,7 @@ WRITE16_HANDLER( seibu_main_word_w )
main2sub[offset] = data;
break;
case 4:
update_irq_lines(Machine, RST18_ASSERT);
update_irq_lines(machine, RST18_ASSERT);
break;
case 6:
/* just a guess */
@ -474,7 +474,7 @@ WRITE16_HANDLER( seibu_main_mustb_w )
// logerror("seibu_main_mustb_w: %x -> %x %x\n", data, main2sub[0], main2sub[1]);
update_irq_lines(Machine, RST18_ASSERT);
update_irq_lines(machine, RST18_ASSERT);
}
/***************************************************************************/

3
src/mame/audio/spacefb.c
View File

@ -5,7 +5,6 @@
****************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "cpu/i8039/i8039.h"
#include "sound/dac.h"
#include "sound/samples.h"
@ -37,7 +36,7 @@ READ8_HANDLER( spacefb_audio_t1_r )
WRITE8_HANDLER( spacefb_port_1_w )
{
cpunum_set_input_line(Machine, 1, 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(machine, 1, 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE);
/* enemy killed */
if (!(data & 0x01) && (spacefb_sound_latch & 0x01)) sample_start(0,0,0);

7
src/mame/audio/starwars.c
View File

@ -8,7 +8,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
#include "sound/5220intf.h"
#include "includes/starwars.h"
@ -88,7 +87,7 @@ READ8_HANDLER( starwars_m6532_r )
case 5: /* 0x85 - Read Interrupt Flag Register */
if (irq_flag)
cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE);
cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, CLEAR_LINE);
temp = irq_flag;
irq_flag = 0; /* Clear int flags */
return temp;
@ -186,7 +185,7 @@ READ8_HANDLER( starwars_sin_r )
{
port_A &= 0x7f; /* ready to receive new commands from main */
if (PA7_irq)
cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE);
cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, CLEAR_LINE);
return sound_data;
}
@ -240,6 +239,6 @@ WRITE8_HANDLER( starwars_soundrst_w )
port_A &= 0x3f;
/* reset sound CPU here */
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE);
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE);
}

3
src/mame/audio/system16.c
View File

@ -1,6 +1,5 @@
// system 16 - 7751 emulation, based on monster bash code.
#include "driver.h"
#include "deprecat.h"
#include "cpu/i8039/i8039.h"
#include "sound/dac.h"
@ -39,7 +38,7 @@ WRITE8_HANDLER( sys16_7751_audio_8255_w )
if ((data & 0x0f) != 8)
{
cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, PULSE_LINE);
cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, PULSE_LINE);
timer_set(ATTOTIME_IN_USEC(300), NULL, data, trigger_7751_sound);
}
}

2
src/mame/audio/taito_en.c
View File

@ -97,7 +97,7 @@ READ16_HANDLER(f3_68681_r)
/* IRQ ack */
if (offset==0xf) {
cpunum_set_input_line(Machine, 1, 6, CLEAR_LINE);
cpunum_set_input_line(machine, 1, 6, CLEAR_LINE);
return 0;
}

4
src/mame/audio/taitosnd.c
View File

@ -99,10 +99,10 @@ WRITE8_HANDLER( taitosound_comm_w )
//#endif
/* this does a hi-lo transition to reset the sound cpu */
if (data)
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
else
{
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
cpu_spin(); /* otherwise no sound in driftout */
}
break;

3
src/mame/audio/timeplt.c
View File

@ -11,7 +11,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "sound/ay8910.h"
#include "sound/flt_rc.h"
#include "timeplt.h"
@ -110,7 +109,7 @@ WRITE8_HANDLER( timeplt_sh_irqtrigger_w )
if (timeplt_last_irq_state == 0 && data)
{
/* setting bit 0 low then high triggers IRQ on the sound CPU */
cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
timeplt_last_irq_state = data;

3
src/mame/audio/trackfld.c
View File

@ -1,5 +1,4 @@
#include "driver.h"
#include "deprecat.h"
#include "sound/vlm5030.h"
#include "sound/msm5205.h"
#include "sound/sn76496.h"
@ -90,7 +89,7 @@ WRITE8_HANDLER( konami_sh_irqtrigger_w )
if (last == 0 && data)
{
/* setting bit 0 low then high triggers IRQ on the sound CPU */
cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
last = data;

2
src/mame/drivers/40love.c
View File

@ -280,7 +280,7 @@ static WRITE8_HANDLER( nmi_enable_w )
sound_nmi_enable = 1;
if (pending_nmi)
{
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
pending_nmi = 0;
}
}

3
src/mame/drivers/88games.c
View File

@ -5,7 +5,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "cpu/konami/konami.h"
#include "cpu/z80/z80.h"
#include "video/konamiic.h"
@ -68,7 +67,7 @@ static WRITE8_HANDLER( k88games_5f84_w )
static WRITE8_HANDLER( k88games_sh_irqtrigger_w )
{
cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff);
cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff);
}
/* handle fake button for speed cheat for players 1 and 2 */

Some files were not shown because too many files have changed in this diff Show More