diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c index 3917c2b453a..45b06b5380a 100644 --- a/src/emu/cpu/adsp2100/adsp2100.c +++ b/src/emu/cpu/adsp2100/adsp2100.c @@ -96,7 +96,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "adsp2100.h" diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c index e389c84a468..498618f0bb8 100644 --- a/src/emu/cpu/alph8201/alph8201.c +++ b/src/emu/cpu/alph8201/alph8201.c @@ -144,7 +144,6 @@ Timming ****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "alph8201.h" /* instruction cycle count */ diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c index ab78add0bd0..d9e31c2eca2 100644 --- a/src/emu/cpu/apexc/apexc.c +++ b/src/emu/cpu/apexc/apexc.c @@ -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 diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index c51c6523bac..69c0106ef16 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -16,7 +16,6 @@ */ #include "arm.h" -#include "deprecat.h" #include "debugger.h" #define READ8(addr) cpu_read8(addr) diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c index f7866e74f75..e22680cabf3 100644 --- a/src/emu/cpu/arm7/arm7.c +++ b/src/emu/cpu/arm7/arm7.c @@ -35,7 +35,6 @@ ** *****************************************************************************/ #include "arm7.h" -#include "deprecat.h" #include "debugger.h" #include "arm7core.h" //include arm7 core diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c index bd3d57267e6..54eb6c56831 100644 --- a/src/emu/cpu/asap/asap.c +++ b/src/emu/cpu/asap/asap.c @@ -10,7 +10,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "asap.h" diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index 17826941e8a..0af94355ba1 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -9,7 +9,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "ccpu.h" diff --git a/src/emu/cpu/cop400/cop410.c b/src/emu/cpu/cop400/cop410.c index 05185849622..2817f6c1fd9 100644 --- a/src/emu/cpu/cop400/cop410.c +++ b/src/emu/cpu/cop400/cop410.c @@ -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 */ diff --git a/src/emu/cpu/cop400/cop420.c b/src/emu/cpu/cop400/cop420.c index cff9a762be4..ed6d552f596 100644 --- a/src/emu/cpu/cop400/cop420.c +++ b/src/emu/cpu/cop400/cop420.c @@ -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 */ diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index 77a25637fc5..be7636431ba 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -28,7 +28,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "dsp32.h" diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c index 6b87df90028..d73bced71b4 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -19,7 +19,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "dsp56k.h" // #define PC_E000 diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c index 9865270fcd3..fc460f3ca28 100644 --- a/src/emu/cpu/e132xs/e132xs.c +++ b/src/emu/cpu/e132xs/e132xs.c @@ -212,7 +212,6 @@ *********************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "eminline.h" #include "e132xs.h" #include "osd_cpu.h" diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c index 9127628e29c..229779d10ff 100644 --- a/src/emu/cpu/f8/f8.c +++ b/src/emu/cpu/f8/f8.c @@ -27,7 +27,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "f8.h" #define S 0x01 diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h index 2913b2e7080..dfd0b586b03 100644 --- a/src/emu/cpu/g65816/g65816cm.h +++ b/src/emu/cpu/g65816/g65816cm.h @@ -10,7 +10,6 @@ /* ======================================================================== */ #include "g65816.h" -#include "deprecat.h" #include diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c index 7b1f5015426..a7b8a8568a6 100644 --- a/src/emu/cpu/h6280/h6280.c +++ b/src/emu/cpu/h6280/h6280.c @@ -108,7 +108,6 @@ ******************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "h6280.h" static int h6280_ICount = 0; diff --git a/src/emu/cpu/i8039/i8039.c b/src/emu/cpu/i8039/i8039.c index 511039c9a34..566baa41cda 100644 --- a/src/emu/cpu/i8039/i8039.c +++ b/src/emu/cpu/i8039/i8039.c @@ -35,7 +35,6 @@ #include "debugger.h" -#include "deprecat.h" #include "i8039.h" diff --git a/src/emu/cpu/i8051/i8051.c b/src/emu/cpu/i8051/i8051.c index b1619efbc10..7893883461d 100644 --- a/src/emu/cpu/i8051/i8051.c +++ b/src/emu/cpu/i8051/i8051.c @@ -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)); diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index b201e9a917a..2bd4a34337c 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -121,7 +121,6 @@ /*int survival_prot = 0; */ #include "debugger.h" -#include "deprecat.h" #include "i8085.h" #include "i8085cpu.h" #include "i8085daa.h" diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c index 35477340d25..8bd04979214 100644 --- a/src/emu/cpu/i86/i286.c +++ b/src/emu/cpu/i86/i286.c @@ -4,7 +4,6 @@ ****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "host.h" diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c index 09fba4c2406..add38604b7a 100644 --- a/src/emu/cpu/i86/i86.c +++ b/src/emu/cpu/i86/i86.c @@ -6,7 +6,6 @@ #include "debugger.h" #include "cpuintrf.h" -#include "deprecat.h" #include "host.h" #include "i86.h" diff --git a/src/emu/cpu/i8x41/i8x41.c b/src/emu/cpu/i8x41/i8x41.c index 34252a246f1..bcda28869bb 100644 --- a/src/emu/cpu/i8x41/i8x41.c +++ b/src/emu/cpu/i8x41/i8x41.c @@ -87,7 +87,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "i8x41.h" typedef struct { diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c index 8c36ca9ed35..267a096bf9a 100644 --- a/src/emu/cpu/i960/i960.c +++ b/src/emu/cpu/i960/i960.c @@ -1,5 +1,4 @@ #include "debugger.h" -#include "deprecat.h" #include "i960.h" #include "i960dis.h" #include diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index d2fd7c87e4f..b4460fa5054 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -35,7 +35,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "konami.h" #define VERBOSE 0 diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c index 5bd66429da9..3654e4b8a2a 100644 --- a/src/emu/cpu/lh5801/lh5801.c +++ b/src/emu/cpu/lh5801/lh5801.c @@ -18,7 +18,6 @@ * *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "lh5801.h" diff --git a/src/emu/cpu/m37710/m37710cm.h b/src/emu/cpu/m37710/m37710cm.h index 53a56de7288..1c429a8685e 100644 --- a/src/emu/cpu/m37710/m37710cm.h +++ b/src/emu/cpu/m37710/m37710cm.h @@ -12,7 +12,6 @@ #include #include "cpuintrf.h" #include "debugger.h" -#include "deprecat.h" #include "m37710.h" diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index 2b5fa0ea87a..4986bfcf411 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -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" diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index 1a09b6373bd..10bfcee86b9 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -30,7 +30,6 @@ #endif #include "debugger.h" -#include "deprecat.h" #include "m6502.h" #include "ops02.h" #include "ill02.h" diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c index fb4d2f61349..ba811d203ec 100644 --- a/src/emu/cpu/m6502/m6509.c +++ b/src/emu/cpu/m6502/m6509.c @@ -38,7 +38,6 @@ addresses take place. */ #include "debugger.h" -#include "deprecat.h" #include "m6509.h" #include "ops02.h" diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index 8a4b8e4c46c..c8a0bf00d45 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -38,7 +38,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "m65ce02.h" #include "mincce02.h" diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index 483b1599d70..f6368db6516 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -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 diff --git a/src/emu/cpu/m68000/m68kmame.h b/src/emu/cpu/m68000/m68kmame.h index b752d5129fc..29915aed12c 100644 --- a/src/emu/cpu/m68000/m68kmame.h +++ b/src/emu/cpu/m68000/m68kmame.h @@ -6,7 +6,6 @@ /* ======================================================================== */ #include "debugger.h" -#include "deprecat.h" #include "m68000.h" /* Configuration switches (see m68kconf.h for explanation) */ diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index d3958ee214a..822e5a078ff 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -32,7 +32,6 @@ #include "debugger.h" -#include "deprecat.h" #include "m6805.h" #define IRQ_LEVEL_DETECT 0 diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index 1c4bf8ed75d..53a64b0b8e7 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -71,7 +71,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "m6809.h" /* Enable big switch statement for the main opcodes */ diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c index c6e9dba84ff..3c8704f7f5c 100644 --- a/src/emu/cpu/mb86233/mb86233.c +++ b/src/emu/cpu/mb86233/mb86233.c @@ -14,7 +14,6 @@ ***************************************************************************/ #include "mb86233.h" -#include "deprecat.h" #include "debugger.h" /*************************************************************************** diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c index 088e3128184..534eae48f62 100644 --- a/src/emu/cpu/mb88xx/mb88xx.c +++ b/src/emu/cpu/mb88xx/mb88xx.c @@ -14,7 +14,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "mb88xx.h" /*************************************************************************** diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index 7da1510219f..b339ef9e115 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -5,7 +5,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "mc68hc11.h" enum { diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c index 6ea6311b39c..d34f08398d1 100644 --- a/src/emu/cpu/minx/minx.c +++ b/src/emu/cpu/minx/minx.c @@ -47,7 +47,6 @@ TODO: #include "minx.h" #include "debugger.h" -#include "deprecat.h" #define FLAG_I 0x80 #define FLAG_D 0x40 diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c index ce914b3ce18..66627996f67 100644 --- a/src/emu/cpu/mips/mips3.c +++ b/src/emu/cpu/mips/mips3.c @@ -10,7 +10,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "mips3com.h" diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c index 6449c5b3a87..57f795e974e 100644 --- a/src/emu/cpu/mips/r3000.c +++ b/src/emu/cpu/mips/r3000.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "r3000.h" diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index f04ef138bcb..ffb00ba993c 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -104,7 +104,6 @@ ****************************************************************************/ #include "debugger.h" -#include "deprecat.h" typedef UINT8 BOOLEAN; typedef UINT8 BYTE; diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c index d5188f474d7..057aec375f0 100644 --- a/src/emu/cpu/pdp1/pdp1.c +++ b/src/emu/cpu/pdp1/pdp1.c @@ -336,7 +336,6 @@ #include "debugger.h" -#include "deprecat.h" #include "pdp1.h" #define LOG 0 diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c index d7123b24aa0..7977b3c7d6a 100644 --- a/src/emu/cpu/pdp1/tx0.c +++ b/src/emu/cpu/pdp1/tx0.c @@ -11,7 +11,6 @@ #include "cpuintrf.h" #include "debugger.h" #include "tx0.h" -#include "deprecat.h" #define LOG 0 #define LOG_EXTRA 0 diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c index fdbad76d9ab..0a3cd253e80 100644 --- a/src/emu/cpu/pic16c5x/pic16c5x.c +++ b/src/emu/cpu/pic16c5x/pic16c5x.c @@ -54,7 +54,6 @@ #include "debugger.h" -#include "deprecat.h" #include "pic16c5x.h" diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c index 77650fa0c1f..b70785941ca 100644 --- a/src/emu/cpu/powerpc/ppc.c +++ b/src/emu/cpu/powerpc/ppc.c @@ -3,7 +3,6 @@ #include #include "ppc.h" #include "debugger.h" -#include "deprecat.h" #if (HAS_PPC603 || HAS_PPC601 || HAS_PPC604) static void ppc603_exception(int exception); diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c index 1ddd1f39ac7..398228e53b6 100644 --- a/src/emu/cpu/powerpc/ppcdrc.c +++ b/src/emu/cpu/powerpc/ppcdrc.c @@ -5,7 +5,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "ppc.h" #include "cpu/x86drc.h" diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c index 159a53b3c9f..e31ae2c2bad 100644 --- a/src/emu/cpu/s2650/s2650.c +++ b/src/emu/cpu/s2650/s2650.c @@ -13,7 +13,6 @@ *************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "s2650.h" #include "s2650cpu.h" diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index 5a386e873e1..684124e84f7 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -20,7 +20,6 @@ * *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "saturn.h" #include "sat.h" diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 986a19c9ca2..52f665e86b5 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -28,7 +28,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "sc61860.h" #include "sc.h" diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c index aa16b2ecb66..9e81fce8e8f 100644 --- a/src/emu/cpu/se3208/se3208.c +++ b/src/emu/cpu/se3208/se3208.c @@ -1,5 +1,4 @@ #include "debugger.h" -#include "deprecat.h" #include "se3208.h" /* diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 85f13571da3..dfbf8516d64 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -4,7 +4,6 @@ */ #include "sharc.h" -#include "deprecat.h" #include "debugger.h" #ifdef ENABLE_DEBUGGER diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c index ba15c40fff3..5f4bf5fb236 100644 --- a/src/emu/cpu/sm8500/sm8500.c +++ b/src/emu/cpu/sm8500/sm8500.c @@ -10,7 +10,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "sm8500.h" #define FLAG_C 0x80 diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index d3f7d482db6..6f2d1312e72 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -62,7 +62,6 @@ Address Function Register R/W When Reset Remarks #include #include "debugger.h" -#include "deprecat.h" #include "spc700.h" /* ======================================================================== */ diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c index 675d8d5d7a4..6546e76e22d 100644 --- a/src/emu/cpu/ssp1601/ssp1601.c +++ b/src/emu/cpu/ssp1601/ssp1601.c @@ -18,7 +18,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "ssp1601.h" diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c index db093c3b9f2..5536360fb1d 100644 --- a/src/emu/cpu/t11/t11.c +++ b/src/emu/cpu/t11/t11.c @@ -12,7 +12,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "t11.h" diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c index 465f1998554..4a3e844bbc2 100644 --- a/src/emu/cpu/tlcs90/tlcs90.c +++ b/src/emu/cpu/tlcs90/tlcs90.c @@ -7,7 +7,6 @@ *************************************************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "tlcs90.h" typedef struct diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index 825040ea2d7..308c3673333 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -54,7 +54,6 @@ #include "debugger.h" -#include "deprecat.h" #include "tms32010.h" diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index 1c1ac6b9125..ca2322a0df3 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -119,7 +119,6 @@ Table 3-2. TMS32025/26 Memory Blocks #include "debugger.h" -#include "deprecat.h" #include "tms32025.h" diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index dca1be5fa75..78d08f22481 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "tms32031.h" #include "eminline.h" diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c index 606d062a453..3f511c38618 100644 --- a/src/emu/cpu/tms32051/tms32051.c +++ b/src/emu/cpu/tms32051/tms32051.c @@ -5,7 +5,6 @@ */ #include "debugger.h" -#include "deprecat.h" #include "cpuintrf.h" #include "tms32051.h" diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index 5e649613321..1238ecba47f 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -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; diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index 671a744760d..cefd990851d 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -41,7 +41,6 @@ ****************************************************************************/ #include "debugger.h" -#include "deprecat.h" typedef UINT8 BOOLEAN; typedef UINT8 BYTE; diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index d1892b371e4..0e1f6f12b8e 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -4,7 +4,6 @@ // Portability fixes by Richter Belmont #include "debugger.h" -#include "deprecat.h" #include "v60.h" // memory accessors diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c index 51e108878f1..6223d90f856 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -17,7 +17,6 @@ ********************************************/ #include "debugger.h" -#include "deprecat.h" #include "v810.h" #define clkIF 3 diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index 9537543f52b..7f730e0d0b9 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -77,7 +77,6 @@ Hitachi HD647180 series: *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "z180.h" #include "cpu/z80/z80daisy.h" diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index 9239ada4eaa..734544f34d3 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -94,7 +94,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "z80.h" #include "z80daisy.h" diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index 7d1242e0608..dbc3448a973 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -44,7 +44,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "z8000.h" #include "z8000cpu.h" #include "osd_cpu.h" diff --git a/src/emu/cpu/z80gb/z80gb.c b/src/emu/cpu/z80gb/z80gb.c index 08a44d5e10c..54073dd8ae5 100644 --- a/src/emu/cpu/z80gb/z80gb.c +++ b/src/emu/cpu/z80gb/z80gb.c @@ -37,7 +37,6 @@ /** **/ /*************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "z80gb.h" #define FLAG_Z 0x80 diff --git a/src/emu/emupal.c b/src/emu/emupal.c index 7311e2d8c75..7488627e376 100644 --- a/src/emu/emupal.c +++ b/src/emu/emupal.c @@ -10,7 +10,6 @@ ******************************************************************************/ #include "driver.h" -#include "deprecat.h" #define VERBOSE 0 diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c index 2255c5b2260..4898efb2969 100644 --- a/src/emu/machine/6522via.c +++ b/src/emu/machine/6522via.c @@ -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); } diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c index 77db7608e28..0caf53e6d01 100644 --- a/src/emu/machine/8042kbdc.c +++ b/src/emu/machine/8042kbdc.c @@ -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; } diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index f3c8c1f4e3f..a927a510c36 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -7,7 +7,6 @@ #include "driver.h" #include "idectrl.h" #include "debugger.h" -#include "deprecat.h" /*************************************************************************** diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c index 141a0da0c4f..5ae525d50eb 100644 --- a/src/emu/machine/msm6242.c +++ b/src/emu/machine/msm6242.c @@ -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; diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index fdd9991075f..36957eba6bb 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -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); } diff --git a/src/emu/sound.c b/src/emu/sound.c index 555bcf9c415..7deabf91b7c 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -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; diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c index d645ba8f429..8c8967e3d7b 100644 --- a/src/emu/sound/es5503.c +++ b/src/emu/sound/es5503.c @@ -35,7 +35,6 @@ #include #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; } diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 6edc98a8fa5..e874432e251 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -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; diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index ca282b844be..0d7bdab1455 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -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))); } diff --git a/src/mame/audio/aztarac.c b/src/mame/audio/aztarac.c index 41bf6eeb19e..4ec536e9d14 100644 --- a/src/mame/audio/aztarac.c +++ b/src/mame/audio/aztarac.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "aztarac.h" diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 52a151994d3..89f4d898173 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -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; } diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c index c7c50ef49e1..7902ad599fc 100644 --- a/src/mame/audio/carnival.c +++ b/src/mame/audio/carnival.c @@ -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 ); } diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index fa8950f650d..0de664b126a 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -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); } diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 97940251184..8a1a8cc57f8 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -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; } diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index 74e0cb6a850..aa8270e8221 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -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; diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c index 501b64450a8..9d318f65d8b 100644 --- a/src/mame/audio/harddriv.c +++ b/src/mame/audio/harddriv.c @@ -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 */ diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 30ba9e0c78f..d41b4d2d4e0 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -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); } diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index 94b74b22e5c..9b2194561f7 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -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); } diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c index 305202ec49d..97d54f7ff3d 100644 --- a/src/mame/audio/leland.c +++ b/src/mame/audio/leland.c @@ -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) diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index edce41550d5..68fa397184e 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -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; } diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c index d49d3563f11..8808472be34 100644 --- a/src/mame/audio/redalert.c +++ b/src/mame/audio/redalert.c @@ -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" diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c index d853f4600bb..184d25d7b1b 100644 --- a/src/mame/audio/segag80r.c +++ b/src/mame/audio/segag80r.c @@ -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)); } diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index 1f5276d944c..f602d7e3408 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -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); } /***************************************************************************/ diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c index ad483bb4797..6b0b57afe90 100644 --- a/src/mame/audio/spacefb.c +++ b/src/mame/audio/spacefb.c @@ -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); diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c index 827e6bd316a..7a36ecc5468 100644 --- a/src/mame/audio/starwars.c +++ b/src/mame/audio/starwars.c @@ -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); } diff --git a/src/mame/audio/system16.c b/src/mame/audio/system16.c index d2ce54d2552..4d46bd9daf3 100644 --- a/src/mame/audio/system16.c +++ b/src/mame/audio/system16.c @@ -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); } } diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c index 247d28b81e4..c3b0a9695a3 100644 --- a/src/mame/audio/taito_en.c +++ b/src/mame/audio/taito_en.c @@ -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; } diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c index 1de5e3dfbf2..309aa5ce0b5 100644 --- a/src/mame/audio/taitosnd.c +++ b/src/mame/audio/taitosnd.c @@ -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; diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index d3b97185309..32d7b6e4d9b 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -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; diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c index 70ae9a2ba22..3c8f2217bac 100644 --- a/src/mame/audio/trackfld.c +++ b/src/mame/audio/trackfld.c @@ -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; diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 0af588f8f2b..35bdf05f3a7 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -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; } } diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 868234be680..39ec7a7a075 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -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 */ diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 1ee1a752bd0..4b43b7395f9 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -275,7 +275,7 @@ static READ8_HANDLER( devram_r ) static WRITE8_HANDLER( master_nmi_trigger_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } static void airbustr_bankswitch(int cpunum, int data) @@ -352,7 +352,7 @@ static WRITE8_HANDLER( airbustr_paletteram_w ) paletteram[offset] = data; val = (paletteram[offset | 1] << 8) | paletteram[offset & ~1]; - palette_set_color_rgb(Machine, offset/2, pal5bit(val >> 5), pal5bit(val >> 10), pal5bit(val >> 0)); + palette_set_color_rgb(machine, offset/2, pal5bit(val >> 5), pal5bit(val >> 10), pal5bit(val >> 0)); } static WRITE8_HANDLER( airbustr_coin_counter_w ) diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index 3e88a901b61..e6d20ad361d 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -8,7 +8,6 @@ Preliminary driver by: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */ #include "video/konamiic.h" #include "sound/k007232.h" diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index e31627c78b9..82361165327 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -10,7 +10,6 @@ colour, including the word "Konami" ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "cpu/z80/z80.h" #include "machine/eeprom.h" diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index d12bd40d53a..d7453577f2b 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -449,7 +449,7 @@ static WRITE8_HANDLER( profpac_banksw_w ) static STATE_POSTLOAD( profbank_banksw_restore ) { - profpac_banksw_w(Machine, 0, profpac_bank); + profpac_banksw_w(machine, 0, profpac_bank); } diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 61c362bf705..b4e07651536 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -124,7 +124,6 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/t11/t11.h" #include "machine/atarigen.h" #include "slapstic.h" @@ -591,7 +590,7 @@ static WRITE8_HANDLER( mixer_w ) if (!(data & 0x02)) rbott += 1.0/47; if (!(data & 0x04)) rbott += 1.0/22; gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); - atarigen_set_ym2151_vol(Machine, gain * 100); + atarigen_set_ym2151_vol(machine, gain * 100); /* bits 3-4 control the volume of the POKEYs, using 47k and 100k resistors */ rtop = 1.0/(1.0/100 + 1.0/100); @@ -599,7 +598,7 @@ static WRITE8_HANDLER( mixer_w ) if (!(data & 0x08)) rbott += 1.0/47; if (!(data & 0x10)) rbott += 1.0/22; gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); - atarigen_set_pokey_vol(Machine, gain * 100); + atarigen_set_pokey_vol(machine, gain * 100); /* bits 5-7 control the volume of the TMS5220, using 22k, 47k, and 100k resistors */ rtop = 1.0/(1.0/100 + 1.0/100); @@ -608,7 +607,7 @@ static WRITE8_HANDLER( mixer_w ) if (!(data & 0x40)) rbott += 1.0/47; if (!(data & 0x80)) rbott += 1.0/22; gain = (rbott == 0) ? 1.0 : ((1.0/rbott) / (rtop + (1.0/rbott))); - atarigen_set_tms5220_vol(Machine, gain * 100); + atarigen_set_tms5220_vol(machine, gain * 100); } diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index 63b3cf48504..4ff70c0c1f3 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -48,7 +48,6 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "slapstic.h" #include "atetris.h" @@ -93,7 +92,7 @@ static TIMER_CALLBACK( interrupt_gen ) static WRITE8_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index b703fa2d692..2bdb826f855 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -105,7 +105,6 @@ DIP locations verified for: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6800/m6800.h" #include "sound/namco.h" @@ -170,7 +169,7 @@ static WRITE8_HANDLER( baraduke_lamps_w ) static WRITE8_HANDLER( baraduke_irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 70e0d2213f7..6c5bf52806f 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -60,8 +60,8 @@ static WRITE8_HANDLER( battlane_cpu_command_w ) /* if (~battlane_cpu_control & 0x08) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, PULSE_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } */ @@ -69,7 +69,7 @@ static WRITE8_HANDLER( battlane_cpu_command_w ) CPU2's SWI will trigger an 6809 IRQ on the master by resetting 0x04 Master will respond by setting the bit back again */ - cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, data & 0x04 ? CLEAR_LINE : HOLD_LINE); + cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, data & 0x04 ? CLEAR_LINE : HOLD_LINE); /* Slave function call (e.g. ROM test): @@ -87,7 +87,7 @@ static WRITE8_HANDLER( battlane_cpu_command_w ) FA96: 27 FA BEQ $FA92 ; Wait for bit to be set */ - cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, data & 0x02 ? CLEAR_LINE : HOLD_LINE); + cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, data & 0x02 ? CLEAR_LINE : HOLD_LINE); } static ADDRESS_MAP_START( battlane_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 9b4fbec66a2..ebfa39cd639 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -11,7 +11,6 @@ Preliminary driver by: Manuel Abadia ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/hd6309/hd6309.h" #include "cpu/z80/z80.h" #include "video/konamiic.h" @@ -30,7 +29,7 @@ static INTERRUPT_GEN( battlnts_interrupt ) static WRITE8_HANDLER( battlnts_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); } static WRITE8_HANDLER( battlnts_bankswitch_w ) diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index faaf2cb5445..0ffb069aa79 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -711,7 +711,7 @@ static READ8_HANDLER( ramdac_r ) if (*count == 0) { rgb_t color; - color = palette_get_color(Machine, ramdac.addr_r); + color = palette_get_color(machine, ramdac.addr_r); ramdac.color_r[0] = RGB_RED(color); ramdac.color_r[1] = RGB_GREEN(color); @@ -755,7 +755,7 @@ static WRITE8_HANDLER( ramdac_w ) ramdac.color_w[ramdac.count_w] = pal6bit(data); if (++ramdac.count_w == 3) { - palette_set_color_rgb(Machine, ramdac.addr_w, ramdac.color_w[0], ramdac.color_w[1], ramdac.color_w[2]); + palette_set_color_rgb(machine, ramdac.addr_w, ramdac.color_w[0], ramdac.color_w[1], ramdac.color_w[2]); ramdac.count_w = 0; ramdac.addr_w++; } @@ -1292,7 +1292,7 @@ static MACHINE_RESET( bfcobra ) for (pal = 0; pal < 256; ++pal) { - palette_set_color_rgb(Machine, pal, pal3bit((pal>>5)&7), pal3bit((pal>>2)&7), pal2bit(pal&3)); + palette_set_color_rgb(machine, pal, pal3bit((pal>>5)&7), pal3bit((pal>>2)&7), pal2bit(pal&3)); } bank[0] = 1; @@ -1380,7 +1380,7 @@ static WRITE8_HANDLER( meter_w ) if (changed & (1 << i)) { Mechmtr_update(i, cycles, data & (1 << i) ); - cpunum_set_input_line(Machine, 1, M6809_FIRQ_LINE, PULSE_LINE ); + cpunum_set_input_line(machine, 1, M6809_FIRQ_LINE, PULSE_LINE ); } } } diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index a0868943c63..91aba3236c0 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -620,7 +620,7 @@ static WRITE8_HANDLER( mmtr_w ) } } } - if ( data & 0x1F ) cpunum_set_input_line(Machine, 0, M6809_FIRQ_LINE, ASSERT_LINE ); + if ( data & 0x1F ) cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE, ASSERT_LINE ); } /////////////////////////////////////////////////////////////////////////// @@ -1072,7 +1072,7 @@ static WRITE8_HANDLER( uart2data_w ) static WRITE8_HANDLER( vid_uart_tx_w ) { - send_to_adder(Machine, data); + send_to_adder(machine, data); } /////////////////////////////////////////////////////////////////////////// diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 0ec53ecbe8d..301045b2398 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -168,7 +168,7 @@ static WRITE8_HANDLER( nmi_enable_w ) sound_nmi_enable = 1; if (pending_nmi) { - cpunum_set_input_line(Machine, 2,INPUT_LINE_NMI,PULSE_LINE); + cpunum_set_input_line(machine, 2,INPUT_LINE_NMI,PULSE_LINE); pending_nmi = 0; } } diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 18f8d1b685f..c6564ff21b4 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -125,7 +125,7 @@ static WRITE16_HANDLER(colordac_w) if (ACCESSING_BITS_0_7) { colorram[clr_offset] = data; - palette_set_color_rgb(Machine, clr_offset/3, + palette_set_color_rgb(machine, clr_offset/3, pal6bit(colorram[(clr_offset/3)*3+0]), pal6bit(colorram[(clr_offset/3)*3+1]), pal6bit(colorram[(clr_offset/3)*3+2]) diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index 616a61c41e3..7dc653c67cb 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -16,7 +16,6 @@ DIP Locations verified for: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -214,7 +213,7 @@ static WRITE8_HANDLER( bking3_68705_portB_w ) if (~data & 0x02) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 2,0,CLEAR_LINE); main_sent = 0; } diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index bd8bbdc29ba..613d86963b2 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -20,7 +20,6 @@ found it. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */ #include "video/konamiic.h" #include "sound/2151intf.h" @@ -61,7 +60,7 @@ static WRITE8_HANDLER( bankedram_w ) static WRITE8_HANDLER( blockhl_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); } diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 98bd03f7add..04eb275058a 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -203,7 +203,7 @@ static WRITE16_HANDLER( bmc_RAMDAC_offset_w ) static WRITE16_HANDLER( bmc_RAMDAC_color_w ) { colorram[clr_offset]=data; - palette_set_color_rgb(Machine,clr_offset/3,pal6bit(colorram[(clr_offset/3)*3]),pal6bit(colorram[(clr_offset/3)*3+1]),pal6bit(colorram[(clr_offset/3)*3+2])); + palette_set_color_rgb(machine,clr_offset/3,pal6bit(colorram[(clr_offset/3)*3]),pal6bit(colorram[(clr_offset/3)*3+1]),pal6bit(colorram[(clr_offset/3)*3+2])); clr_offset=(clr_offset+1)%768; } diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 67af2761f91..afe383a1c66 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -97,7 +97,7 @@ static WRITE8_HANDLER( bottom9_1f90_w ) static WRITE8_HANDLER( bottom9_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); } static int nmienable; diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 72a4d026913..b0765c812e2 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -9,7 +9,6 @@ Atari Boxer (prototype) driver ***************************************************************************/ #include "driver.h" -#include "deprecat.h" extern UINT8* boxer_tile_ram; extern UINT8* boxer_sprite_ram; @@ -147,13 +146,13 @@ static WRITE8_HANDLER( boxer_pot_w ) pot_latch = data & 0x3f; - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); } static WRITE8_HANDLER( boxer_irq_reset_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index 6e11e4dea74..99ebd23c4a5 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -7,7 +7,6 @@ **************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms34010/tms34010.h" #include "video/tlc34076.h" #include "btoads.h" @@ -150,7 +149,7 @@ static WRITE8_HANDLER( sound_int_state_w ) sndti_reset(SOUND_BSMT2000, 0); /* also clears interrupts */ - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); sound_int_state = data; } diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index d0f35a3fcb4..a8d822bd299 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -325,7 +325,7 @@ WRITE8_HANDLER( bublbobl_68705_ddrB_w ); #if 0 // doesn't work for some reason static WRITE8_HANDLER(soundcpu_reset_w) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x01) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x01) ? ASSERT_LINE : CLEAR_LINE); } #endif diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 293c7f50805..15de75d3a38 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -147,7 +147,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; } } diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c index 776cf37f0b3..1546492b680 100644 --- a/src/mame/drivers/bwidow.c +++ b/src/mame/drivers/bwidow.c @@ -214,7 +214,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/vector.h" #include "video/avgdvg.h" #include "machine/atari_vg.h" @@ -327,7 +326,7 @@ static WRITE8_HANDLER( bwidow_misc_w ) static WRITE8_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 4878c4a8fc2..b328bb28027 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -119,16 +119,16 @@ static WRITE8_HANDLER( bwp1_ctrl_w ) switch (offset) { // MSSTB - case 0: cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, ASSERT_LINE); break; + case 0: cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, ASSERT_LINE); break; // IRQACK - case 1: cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, CLEAR_LINE); break; + case 1: cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, CLEAR_LINE); break; // FIRQACK - case 2: cpunum_set_input_line(Machine, 0, M6809_FIRQ_LINE, CLEAR_LINE); break; + case 2: cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE, CLEAR_LINE); break; // NMIACK - case 3: cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); break; + case 3: cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); break; // SWAP(bank-swaps sprite RAM between 1800 & 1900; ignored bc. they're treated as a single chunk.) case 4: break; @@ -136,7 +136,7 @@ static WRITE8_HANDLER( bwp1_ctrl_w ) // SNDREQ case 5: if (data == 0x80) // protection trick to screw CPU1 & 3 - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, ASSERT_LINE); // SNMI + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE); // SNMI else if (ffcount < MAX_SOUNDS) { @@ -163,13 +163,13 @@ static WRITE8_HANDLER( bwp2_ctrl_w ) { switch (offset) { - case 0: cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, ASSERT_LINE); break; // SMSTB + case 0: cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, ASSERT_LINE); break; // SMSTB - case 1: cpunum_set_input_line(Machine, 1, M6809_FIRQ_LINE, CLEAR_LINE); break; + case 1: cpunum_set_input_line(machine, 1, M6809_FIRQ_LINE, CLEAR_LINE); break; - case 2: cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE); break; + case 2: cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, CLEAR_LINE); break; - case 3: cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); break; + case 3: cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); break; } #if BW_DEBUG diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index b16007d3609..31851720d3c 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -113,7 +113,7 @@ static WRITE16_HANDLER( cabal_sound_irq_trigger_word_w ) static WRITE16_HANDLER( cabalbl_sound_irq_trigger_word_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE ); } diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 54b46adf256..24949ccd293 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -222,7 +222,7 @@ static WRITE16_HANDLER( sound_cmd_w ) // sound_flag1 = 1; // sound_flag2 = 1; soundlatch_word_w(machine,offset,data,mem_mask); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); // Allow the other cpu to reply } diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 9485fcd750d..64976cee4f1 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -120,7 +120,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/pokey.h" #include "ccastles.h" @@ -265,7 +264,7 @@ static WRITE8_HANDLER( irq_ack_w ) { if (irq_state) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); irq_state = 0; } } diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index d799f8f70f4..cb16faa3f5e 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -189,7 +189,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/segacrpt.h" #include "sound/ay8910.h" #include "sound/samples.h" diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 28fd9ecec0b..1f31774ec91 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -478,7 +478,7 @@ static MACHINE_RESET( magworm ) static WRITE8_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index b14c3d378e4..6024c26a6ec 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -66,7 +66,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -108,7 +107,7 @@ static CUSTOM_INPUT( champbas_watchdog_bit2 ) static WRITE8_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } @@ -129,14 +128,14 @@ static WRITE8_HANDLER( champbas_mcu_switch_w ) static WRITE8_HANDLER( champbas_mcu_halt_w ) { - int cpunum = mame_find_cpu_index(Machine, CPUTAG_MCU); + int cpunum = mame_find_cpu_index(machine, CPUTAG_MCU); // MCU not present/not used in champbas if (cpunum == -1) return; data &= 1; - cpunum_set_input_line(Machine, cpunum, INPUT_LINE_HALT, data ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, cpunum, INPUT_LINE_HALT, data ? ASSERT_LINE : CLEAR_LINE); } /* champbja another protection */ diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index f303b7ac4ed..3fd518a99d2 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -142,7 +142,7 @@ static WRITE8_HANDLER( chinagat_sub_bankswitch_w ) static WRITE8_HANDLER( chinagat_sub_IRQ_w ) { - cpunum_set_input_line(Machine, 1, sprite_irq, (sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE ); + cpunum_set_input_line(machine, 1, sprite_irq, (sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE ); } static WRITE8_HANDLER( chinagat_cpu_sound_cmd_w ) diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 8327c9207d5..47d6348263f 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -89,9 +89,9 @@ static WRITE8_HANDLER( chqflag_vreg_w ) /* the headlight (which have the shadow bit set) become highlights */ /* Maybe one of the bits inverts the SHAD line while the other darkens the background. */ if (data & 0x08) - palette_set_shadow_factor(Machine,1/PALETTE_DEFAULT_SHADOW_FACTOR); + palette_set_shadow_factor(machine,1/PALETTE_DEFAULT_SHADOW_FACTOR); else - palette_set_shadow_factor(Machine,PALETTE_DEFAULT_SHADOW_FACTOR); + palette_set_shadow_factor(machine,PALETTE_DEFAULT_SHADOW_FACTOR); if ((data & 0x80) != last) { @@ -102,7 +102,7 @@ static WRITE8_HANDLER( chqflag_vreg_w ) /* only affect the background */ for (i = 512;i < 1024;i++) - palette_set_brightness(Machine,i,brt); + palette_set_brightness(machine,i,brt); } //if ((data & 0xf8) && (data & 0xf8) != 0x88) @@ -135,7 +135,7 @@ static READ8_HANDLER( analog_read_r ) static WRITE8_HANDLER( chqflag_sh_irqtrigger_w ) { - cpunum_set_input_line(Machine, 1,0,HOLD_LINE); + cpunum_set_input_line(machine, 1,0,HOLD_LINE); } diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 541d277b8e2..c7b7bb8f863 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -14,7 +14,6 @@ To enter service mode, keep 1&2 pressed on reset ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/dac.h" #include "sound/sn76496.h" @@ -71,7 +70,7 @@ static READ8_HANDLER( circusc_sh_timer_r ) static WRITE8_HANDLER( circusc_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); } static WRITE8_HANDLER( circusc_coin_counter_w ) diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index e312b37004c..6ad803405d8 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -232,17 +232,17 @@ static WRITE16_HANDLER( bigrun_paletteram16_w ) int b = pal5bit(((word >> 3 ) & 0x1E ) | ((word >> 1) & 0x01)); // Scroll 0 - if ( (offset >= 0x0e00/2) && (offset <= 0x0fff/2) ) { palette_set_color(Machine, 0x000 + offset - 0x0e00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x0e00/2) && (offset <= 0x0fff/2) ) { palette_set_color(machine, 0x000 + offset - 0x0e00/2, MAKE_RGB(r,g,b) ); return;} // Scroll 1 - if ( (offset >= 0x1600/2) && (offset <= 0x17ff/2) ) { palette_set_color(Machine, 0x100 + offset - 0x1600/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x1600/2) && (offset <= 0x17ff/2) ) { palette_set_color(machine, 0x100 + offset - 0x1600/2, MAKE_RGB(r,g,b) ); return;} // Road 0 - if ( (offset >= 0x1800/2) && (offset <= 0x1fff/2) ) { palette_set_color(Machine, 0x200 + offset - 0x1800/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x1800/2) && (offset <= 0x1fff/2) ) { palette_set_color(machine, 0x200 + offset - 0x1800/2, MAKE_RGB(r,g,b) ); return;} // Road 1 - if ( (offset >= 0x2000/2) && (offset <= 0x27ff/2) ) { palette_set_color(Machine, 0x600 + offset - 0x2000/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x2000/2) && (offset <= 0x27ff/2) ) { palette_set_color(machine, 0x600 + offset - 0x2000/2, MAKE_RGB(r,g,b) ); return;} // Sprites - if ( (offset >= 0x2800/2) && (offset <= 0x2fff/2) ) { palette_set_color(Machine, 0xa00 + offset - 0x2800/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x2800/2) && (offset <= 0x2fff/2) ) { palette_set_color(machine, 0xa00 + offset - 0x2800/2, MAKE_RGB(r,g,b) ); return;} // Scroll 2 - if ( (offset >= 0x3600/2) && (offset <= 0x37ff/2) ) { palette_set_color(Machine, 0xe00 + offset - 0x3600/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x3600/2) && (offset <= 0x37ff/2) ) { palette_set_color(machine, 0xe00 + offset - 0x3600/2, MAKE_RGB(r,g,b) ); return;} } static ADDRESS_MAP_START( bigrun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -304,17 +304,17 @@ static WRITE16_HANDLER( cischeat_paletteram16_w ) int b = pal5bit(((word >> 3 ) & 0x1E ) | ((word >> 1) & 0x01)); // Scroll 0 - if ( (offset >= 0x1c00/2) && (offset <= 0x1fff/2) ) { palette_set_color(Machine, 0x000 + offset - 0x1c00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x1c00/2) && (offset <= 0x1fff/2) ) { palette_set_color(machine, 0x000 + offset - 0x1c00/2, MAKE_RGB(r,g,b) ); return;} // Scroll 1 - if ( (offset >= 0x2c00/2) && (offset <= 0x2fff/2) ) { palette_set_color(Machine, 0x200 + offset - 0x2c00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x2c00/2) && (offset <= 0x2fff/2) ) { palette_set_color(machine, 0x200 + offset - 0x2c00/2, MAKE_RGB(r,g,b) ); return;} // Scroll 2 - if ( (offset >= 0x6c00/2) && (offset <= 0x6fff/2) ) { palette_set_color(Machine, 0x400 + offset - 0x6c00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x6c00/2) && (offset <= 0x6fff/2) ) { palette_set_color(machine, 0x400 + offset - 0x6c00/2, MAKE_RGB(r,g,b) ); return;} // Road 0 - if ( (offset >= 0x3800/2) && (offset <= 0x3fff/2) ) { palette_set_color(Machine, 0x600 + offset - 0x3800/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x3800/2) && (offset <= 0x3fff/2) ) { palette_set_color(machine, 0x600 + offset - 0x3800/2, MAKE_RGB(r,g,b) ); return;} // Road 1 - if ( (offset >= 0x4800/2) && (offset <= 0x4fff/2) ) { palette_set_color(Machine, 0xa00 + offset - 0x4800/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x4800/2) && (offset <= 0x4fff/2) ) { palette_set_color(machine, 0xa00 + offset - 0x4800/2, MAKE_RGB(r,g,b) ); return;} // Sprites - if ( (offset >= 0x5000/2) && (offset <= 0x5fff/2) ) { palette_set_color(Machine, 0xe00 + offset - 0x5000/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x5000/2) && (offset <= 0x5fff/2) ) { palette_set_color(machine, 0xe00 + offset - 0x5000/2, MAKE_RGB(r,g,b) ); return;} } static ADDRESS_MAP_START( cischeat_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -372,17 +372,17 @@ static WRITE16_HANDLER( f1gpstar_paletteram16_w ) int b = pal5bit(((word >> 3 ) & 0x1E ) | ((word >> 1) & 0x01)); // Scroll 0 - if ( (offset >= 0x1e00/2) && (offset <= 0x1fff/2) ) { palette_set_color(Machine, 0x000 + offset - 0x1e00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x1e00/2) && (offset <= 0x1fff/2) ) { palette_set_color(machine, 0x000 + offset - 0x1e00/2, MAKE_RGB(r,g,b) ); return;} // Scroll 1 - if ( (offset >= 0x2e00/2) && (offset <= 0x2fff/2) ) { palette_set_color(Machine, 0x100 + offset - 0x2e00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x2e00/2) && (offset <= 0x2fff/2) ) { palette_set_color(machine, 0x100 + offset - 0x2e00/2, MAKE_RGB(r,g,b) ); return;} // Scroll 2 - if ( (offset >= 0x6e00/2) && (offset <= 0x6fff/2) ) { palette_set_color(Machine, 0x200 + offset - 0x6e00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x6e00/2) && (offset <= 0x6fff/2) ) { palette_set_color(machine, 0x200 + offset - 0x6e00/2, MAKE_RGB(r,g,b) ); return;} // Road 0 - if ( (offset >= 0x3800/2) && (offset <= 0x3fff/2) ) { palette_set_color(Machine, 0x300 + offset - 0x3800/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x3800/2) && (offset <= 0x3fff/2) ) { palette_set_color(machine, 0x300 + offset - 0x3800/2, MAKE_RGB(r,g,b) ); return;} // Road 1 - if ( (offset >= 0x4800/2) && (offset <= 0x4fff/2) ) { palette_set_color(Machine, 0x700 + offset - 0x4800/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x4800/2) && (offset <= 0x4fff/2) ) { palette_set_color(machine, 0x700 + offset - 0x4800/2, MAKE_RGB(r,g,b) ); return;} // Sprites - if ( (offset >= 0x5000/2) && (offset <= 0x5fff/2) ) { palette_set_color(Machine, 0xb00 + offset - 0x5000/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x5000/2) && (offset <= 0x5fff/2) ) { palette_set_color(machine, 0xb00 + offset - 0x5000/2, MAKE_RGB(r,g,b) ); return;} } /* F1 GP Star tests: @@ -485,11 +485,11 @@ static WRITE16_HANDLER( scudhamm_paletteram16_w ) int b = pal5bit(((newword >> 3 ) & 0x1E ) | ((newword >> 1) & 0x01)); // Scroll 0 - if ( (offset >= 0x1e00/2) && (offset <= 0x1fff/2) ) { palette_set_color(Machine, 0x000 + offset - 0x1e00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x1e00/2) && (offset <= 0x1fff/2) ) { palette_set_color(machine, 0x000 + offset - 0x1e00/2, MAKE_RGB(r,g,b) ); return;} // Scroll 2 - if ( (offset >= 0x4e00/2) && (offset <= 0x4fff/2) ) { palette_set_color(Machine, 0x100 + offset - 0x4e00/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x4e00/2) && (offset <= 0x4fff/2) ) { palette_set_color(machine, 0x100 + offset - 0x4e00/2, MAKE_RGB(r,g,b) ); return;} // Sprites - if ( (offset >= 0x3000/2) && (offset <= 0x3fff/2) ) { palette_set_color(Machine, 0x200 + offset - 0x3000/2, MAKE_RGB(r,g,b) ); return;} + if ( (offset >= 0x3000/2) && (offset <= 0x3fff/2) ) { palette_set_color(machine, 0x200 + offset - 0x3000/2, MAKE_RGB(r,g,b) ); return;} } diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 99a75d98438..e45bbdfee44 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -190,7 +190,7 @@ static WRITE8_HANDLER( cliff_coin_counter_w ) static READ8_HANDLER( cliff_irq_ack_r ) { /* deassert IRQ on the CPU */ - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); return 0x00; } diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index 665bb1e828b..ed380c0a91c 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -146,12 +146,12 @@ static WRITE8_HANDLER( cloak_custom_w ) static WRITE8_HANDLER( cloak_irq_reset_0_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( cloak_irq_reset_1_w ) { - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static WRITE8_HANDLER( cloak_nvram_enable_w ) diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index 94734c3d624..722cd923150 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -91,7 +91,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/pokey.h" #include "cloud9.h" @@ -228,7 +227,7 @@ static WRITE8_HANDLER( irq_ack_w ) { if (irq_state) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); irq_state = 0; } } diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 0a5c92e8995..924d461bb7e 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -96,8 +96,8 @@ static READ16_HANDLER( cninja_irq_r ) return cninja_scanline; case 2: /* Raster IRQ ACK - value read is not used */ - cpunum_set_input_line(Machine, 0, 3, CLEAR_LINE); - cpunum_set_input_line(Machine, 0, 4, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 3, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 4, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 46fb79c2d46..433c386ff54 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -282,24 +282,24 @@ static WRITE8_HANDLER( cntsteer_background_w ) static WRITE8_HANDLER( gekitsui_int_w ) { // if (errorlog) fprintf(errorlog,"%04x: CPU 2 causes NMI\n",cpu_get_pc()); - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, ASSERT_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( gekitsui_int2_w ) // not used.. { // if (errorlog) fprintf(errorlog,"%04x: CPU 1 causes IRQ\n",cpu_get_pc()); - cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, ASSERT_LINE); + cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, ASSERT_LINE); } #endif static WRITE8_HANDLER( gekitsui_sub_irq_ack ) { - cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, CLEAR_LINE); } #if 0 static WRITE8_HANDLER( cntsteer_int_w ) { - cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, ASSERT_LINE); + cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, ASSERT_LINE); } #endif @@ -311,11 +311,11 @@ static WRITE8_HANDLER( cntsteer_sound_w ) static WRITE8_HANDLER( zerotrgt_ctrl_w ) { logerror("CTRL: %04x: %04x: %04x\n",activecpu_get_pc(),offset,data); -// if (offset==0) cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); +// if (offset==0) cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); // Wrong - bits 0 & 1 used on this - if (offset==1) cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, ASSERT_LINE); -// if (offset==2) cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + if (offset==1) cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, ASSERT_LINE); +// if (offset==2) cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); } #if 0 diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 14c9af04bdd..e9da3705440 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -118,7 +118,6 @@ e000-e001 YM2203 ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/2203intf.h" #include "sound/upd7759.h" @@ -214,7 +213,7 @@ static WRITE8_HANDLER( protection_clock_w ) static WRITE8_HANDLER( combasc_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); } static WRITE8_HANDLER( combasc_play_w ) diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 980354dce1b..a79e55511aa 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -14,7 +14,6 @@ Credits: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/2151intf.h" @@ -50,7 +49,7 @@ static WRITE8_HANDLER( contra_bankswitch_w ) static WRITE8_HANDLER( contra_sh_irqtrigger_w ) { - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,HOLD_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,HOLD_LINE); } static WRITE8_HANDLER( contra_coin_counter_w ) diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index c155d1f7ef5..ed6d62c04ba 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -25,7 +25,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms34010/tms34010.h" #include "cpu/tms34010/34010ops.h" #include "cpu/tms32025/tms32025.h" @@ -221,7 +220,7 @@ static WRITE16_HANDLER( amerdart_misc_w ) coin_counter_w(0, ~data & 0x0001); coin_counter_w(1, ~data & 0x0002); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); /* bits 10-15 are counted down over time */ if (data & 0x0400) amerdart_iop_echo = 1; @@ -298,7 +297,7 @@ static WRITE16_HANDLER( coolpool_misc_w ) coin_counter_w(0, ~data & 0x0001); coin_counter_w(1, ~data & 0x0002); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); } @@ -331,7 +330,7 @@ static WRITE16_HANDLER( coolpool_iop_w ) static READ16_HANDLER( coolpool_iop_r ) { logerror("%08x:IOP read %04x\n",activecpu_get_pc(),iop_answer); - cpunum_set_input_line(Machine, 0, 1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 1, CLEAR_LINE); return iop_answer; } @@ -357,7 +356,7 @@ static WRITE16_HANDLER( dsp_answer_w ) { logerror("%08x:IOP answer %04x\n",activecpu_get_pc(),data); iop_answer = data; - cpunum_set_input_line(Machine, 0, 1, ASSERT_LINE); + cpunum_set_input_line(machine, 0, 1, ASSERT_LINE); } diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index 06cfe38ab6f..b9f91c16c03 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -50,7 +50,6 @@ Mighty Guy board layout: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/3812intf.h" diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index 430158121a6..80b6115e277 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -7,7 +7,6 @@ *************************************************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" #include "sound/2203intf.h" @@ -50,7 +49,7 @@ static VIDEO_UPDATE( cowrace ) static WRITE8_HANDLER( cowrace_soundlatch_w ) { soundlatch_w(0, data); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } #endif diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index c85fa4ef061..71030f2f413 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -27,7 +27,6 @@ WHO AM I? (In place of "ARIES ELECA") ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "crgolf.h" #include "sound/ay8910.h" #include "sound/msm5205.h" @@ -131,7 +130,7 @@ static WRITE8_HANDLER( main_to_sound_w ) static READ8_HANDLER( main_to_sound_r ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); return main_to_sound_data; } @@ -158,7 +157,7 @@ static WRITE8_HANDLER( sound_to_main_w ) static READ8_HANDLER( sound_to_main_r ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); return sound_to_main_data; } diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 585a1f60a48..6b9e7bd7cfc 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -242,14 +242,14 @@ static WRITE8_HANDLER(pal_w) { paletteram[offset]=data; offset&=0xff; - palette_set_color_rgb(Machine, offset, pal4bit(paletteram[offset] >> 4), pal4bit(paletteram[offset]), pal4bit(paletteram[offset+0x100])); + palette_set_color_rgb(machine, offset, pal4bit(paletteram[offset] >> 4), pal4bit(paletteram[offset]), pal4bit(paletteram[offset+0x100])); } static WRITE8_HANDLER(pal2_w) { paletteram[offset]=data; offset&=0x1ff; - palette_set_color_rgb(Machine, offset, pal4bit(paletteram[offset] >> 4), pal4bit(paletteram[offset]), pal4bit(paletteram[offset+0x200])); + palette_set_color_rgb(machine, offset, pal4bit(paletteram[offset] >> 4), pal4bit(paletteram[offset]), pal4bit(paletteram[offset+0x200])); } static READ8_HANDLER(pal_r) diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index e8bec329444..427243421ce 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -302,7 +302,7 @@ static WRITE16_HANDLER( io_w ) case 0: // sound data if (ACCESSING_BITS_0_7) - cpunum_set_input_line(Machine, 2, 0, HOLD_LINE); + cpunum_set_input_line(machine, 2, 0, HOLD_LINE); else LOG_UNKNOWN_WRITE break; diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index ea576890e41..1e964fe6def 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -12,7 +12,6 @@ ******************************************************************************/ #include "driver.h" -#include "deprecat.h" static UINT8 *bgvideoram,*fgvideoram; static int bg_bank = 0; @@ -54,9 +53,9 @@ static WRITE8_HANDLER( coins_w ) static WRITE8_HANDLER( snd_irq_w ) { if(data == 1) - cpunum_set_input_line_and_vector(Machine, 1, 0, ASSERT_LINE, 0x38); + cpunum_set_input_line_and_vector(machine, 1, 0, ASSERT_LINE, 0x38); else - cpunum_set_input_line_and_vector(Machine, 1, 0, CLEAR_LINE, 0x38); + cpunum_set_input_line_and_vector(machine, 1, 0, CLEAR_LINE, 0x38); } static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 923d96cafd9..7f1908750ba 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -178,8 +178,8 @@ static WRITE16_HANDLER( dassault_sound_w ) static READ16_HANDLER( dassault_irq_r ) { switch (offset) { - case 0: cpunum_set_input_line(Machine, 0, 5, CLEAR_LINE); break; - case 1: cpunum_set_input_line(Machine, 1, 6, CLEAR_LINE); break; + case 0: cpunum_set_input_line(machine, 0, 5, CLEAR_LINE); break; + case 1: cpunum_set_input_line(machine, 1, 6, CLEAR_LINE); break; } return shared_ram[(0xffc/2)+offset]; /* The values probably don't matter */ } @@ -187,8 +187,8 @@ static READ16_HANDLER( dassault_irq_r ) static WRITE16_HANDLER( dassault_irq_w ) { switch (offset) { - case 0: cpunum_set_input_line(Machine, 0, 5, ASSERT_LINE); break; - case 1: cpunum_set_input_line(Machine, 1, 6, ASSERT_LINE); break; + case 0: cpunum_set_input_line(machine, 0, 5, ASSERT_LINE); break; + case 1: cpunum_set_input_line(machine, 1, 6, ASSERT_LINE); break; } COMBINE_DATA(&shared_ram[(0xffc/2)+offset]); /* The values probably don't matter */ diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 83f2514eb54..ca1e4f9e2a4 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -282,7 +282,7 @@ static WRITE16_HANDLER( dblewing_prot_w ) if ((offset*2)==0x104) { dblwings_104_data = data; return; } // p1 inputs select screen OK if ((offset*2)==0x200) { dblwings_200_data = data; return; } if ((offset*2)==0x28c) { dblwings_28c_data = data; return; } - if ((offset*2)==0x380) { soundlatch_w(machine,0,data&0xff); /*cpunum_set_input_line(Machine, 1,0,HOLD_LINE);*/ return; } // sound write + if ((offset*2)==0x380) { soundlatch_w(machine,0,data&0xff); /*cpunum_set_input_line(machine, 1,0,HOLD_LINE);*/ return; } // sound write if ((offset*2)==0x38e) { dblwings_38e_data = data; return; } if ((offset*2)==0x406) { dblwings_406_data = data; return; } // p2 inputs select screen OK if ((offset*2)==0x408) { dblwings_408_data = data; return; } // 3rd player 1st level? diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 22258947037..99fdf47d301 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -135,7 +135,7 @@ static WRITE16_HANDLER( dbz_sound_command_w ) static WRITE16_HANDLER( dbz_sound_cause_nmi ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } static void dbz_sound_irq(int irq) diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 87b9ae24f9a..1d7805eec09 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -52,7 +52,6 @@ $842f = lives */ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" static INT32 char_bank = 0; diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 646aa3877af..86d8c7d4882 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -238,7 +238,7 @@ static WRITE8_HANDLER( gondo_i8751_w ) switch (offset) { case 0: /* High byte */ i8751_value=(i8751_value&0xff) | (data<<8); - if (int_enable) cpunum_set_input_line (Machine, 0, M6809_IRQ_LINE, HOLD_LINE); /* IRQ on *high* byte only */ + if (int_enable) cpunum_set_input_line (machine, 0, M6809_IRQ_LINE, HOLD_LINE); /* IRQ on *high* byte only */ break; case 1: /* Low byte */ i8751_value=(i8751_value&0xff00) | data; @@ -271,7 +271,7 @@ static WRITE8_HANDLER( shackled_i8751_w ) switch (offset) { case 0: /* High byte */ i8751_value=(i8751_value&0xff) | (data<<8); - cpunum_set_input_line (Machine, 1, M6809_FIRQ_LINE, HOLD_LINE); /* Signal main cpu */ + cpunum_set_input_line (machine, 1, M6809_FIRQ_LINE, HOLD_LINE); /* Signal main cpu */ break; case 1: /* Low byte */ i8751_value=(i8751_value&0xff00) | data; @@ -299,7 +299,7 @@ static WRITE8_HANDLER( lastmiss_i8751_w ) switch (offset) { case 0: /* High byte */ i8751_value=(i8751_value&0xff) | (data<<8); - cpunum_set_input_line (Machine, 0, M6809_FIRQ_LINE, HOLD_LINE); /* Signal main cpu */ + cpunum_set_input_line (machine, 0, M6809_FIRQ_LINE, HOLD_LINE); /* Signal main cpu */ break; case 1: /* Low byte */ i8751_value=(i8751_value&0xff00) | data; @@ -330,7 +330,7 @@ static WRITE8_HANDLER( csilver_i8751_w ) switch (offset) { case 0: /* High byte */ i8751_value=(i8751_value&0xff) | (data<<8); - cpunum_set_input_line (Machine, 0, M6809_FIRQ_LINE, HOLD_LINE); /* Signal main cpu */ + cpunum_set_input_line (machine, 0, M6809_FIRQ_LINE, HOLD_LINE); /* Signal main cpu */ break; case 1: /* Low byte */ i8751_value=(i8751_value&0xff00) | data; @@ -474,16 +474,16 @@ static WRITE8_HANDLER( oscar_int_w ) /* Deal with interrupts, coins also generate NMI to CPU 0 */ switch (offset) { case 0: /* IRQ2 */ - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,ASSERT_LINE); return; case 1: /* IRC 1 */ - cpunum_set_input_line(Machine, 0,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,CLEAR_LINE); return; case 2: /* IRQ 1 */ - cpunum_set_input_line(Machine, 0,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,ASSERT_LINE); return; case 3: /* IRC 2 */ - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,CLEAR_LINE); return; } } @@ -497,18 +497,18 @@ static WRITE8_HANDLER( shackled_int_w ) (The last interrupt has not finished and been ack'd when the new one occurs */ switch (offset) { case 0: /* CPU 2 - IRQ acknowledge */ - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,CLEAR_LINE); return; case 1: /* CPU 1 - IRQ acknowledge */ - cpunum_set_input_line(Machine, 0,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,CLEAR_LINE); return; case 2: /* i8751 - FIRQ acknowledge */ return; case 3: /* IRQ 1 */ - cpunum_set_input_line(Machine, 0,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,ASSERT_LINE); return; case 4: /* IRQ 2 */ - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,ASSERT_LINE); return; } #endif @@ -521,10 +521,10 @@ static WRITE8_HANDLER( shackled_int_w ) case 2: /* i8751 - FIRQ acknowledge */ return; case 3: /* IRQ 1 */ - cpunum_set_input_line (Machine, 0, M6809_IRQ_LINE, HOLD_LINE); + cpunum_set_input_line (machine, 0, M6809_IRQ_LINE, HOLD_LINE); return; case 4: /* IRQ 2 */ - cpunum_set_input_line (Machine, 1, M6809_IRQ_LINE, HOLD_LINE); + cpunum_set_input_line (machine, 1, M6809_IRQ_LINE, HOLD_LINE); return; } } diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 5f97319c8f3..38d47e3ae3a 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -16,7 +16,6 @@ extern void decrypt156(void); #include "driver.h" -#include "deprecat.h" #include "decocrpt.h" #include "deco32.h" #include "machine/eeprom.h" diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index b0f5f48bd9a..1a78a4e0c03 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -263,7 +263,7 @@ static READ32_HANDLER( deco32_irq_controller_r ) switch (offset) { case 2: /* Raster IRQ ACK - value read is not used */ - cpunum_set_input_line(Machine, 0, ARM_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 0, ARM_IRQ_LINE, CLEAR_LINE); return 0; case 3: /* Irq controller @@ -607,9 +607,9 @@ static WRITE32_HANDLER( tattass_control_w ) /* Sound board reset control */ if (data&0x80) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); /* bit 0x4 fade cancel? */ /* bit 0x8 ?? */ diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 1e46063c7aa..cd8ccc9731b 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -162,7 +162,7 @@ static WRITE32_HANDLER( avengrs_palette_w ) { COMBINE_DATA(&paletteram32[offset]); /* x bbbbb ggggg rrrrr */ - palette_set_color_rgb(Machine,offset,pal5bit(paletteram32[offset] >> 0),pal5bit(paletteram32[offset] >> 5),pal5bit(paletteram32[offset] >> 10)); + palette_set_color_rgb(machine,offset,pal5bit(paletteram32[offset] >> 0),pal5bit(paletteram32[offset] >> 5),pal5bit(paletteram32[offset] >> 10)); } static READ32_HANDLER( avengrs_sound_r ) @@ -218,7 +218,7 @@ static WRITE32_HANDLER( mlc_irq_w ) switch (offset*4) { case 0x10: /* IRQ ack. Value written doesn't matter */ - cpunum_set_input_line(Machine, 0, mainCpuIsArm ? ARM_IRQ_LINE : 1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, mainCpuIsArm ? ARM_IRQ_LINE : 1, CLEAR_LINE); return; break; case 0x14: /* Prepare scanline interrupt */ diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 30bbdbc18ec..e491027d831 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -87,7 +87,7 @@ static WRITE8_HANDLER( destroyr_cursor_load_w ) static WRITE8_HANDLER( destroyr_interrupt_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 62cb8566b67..0ace1eb13e1 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -202,7 +202,7 @@ static WRITE8_HANDLER( discoboy_port_01_w ) static WRITE8_HANDLER( discoboy_port_03_w ) // sfx? (to sound cpu) { // printf("unk discoboy_port_03_w %02x\n",data); -// cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,HOLD_LINE); +// cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,HOLD_LINE); soundlatch_w(machine,0,data); cpunum_set_input_line(machine, 1,0,HOLD_LINE); } diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index e0981ca1c47..09121844449 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -47,7 +47,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" extern UINT16 *diverboy_spriteram; diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 53e2c8bfc1a..353f64fc520 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -657,7 +657,7 @@ static DRIVER_INIT( djboyj ) static WRITE8_HANDLER( trigger_nmi_on_cpu0 ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE); } static WRITE8_HANDLER( cpu0_bankswitch_w ) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 9e21f7fd5dc..cd8301db8f6 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -86,7 +86,7 @@ static WRITE32_HANDLER( paletteram32_w ) g = (data >> 8) & 0xff; b = (data >> 16) & 0xff; - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); } @@ -232,7 +232,7 @@ static WRITE32_HANDLER( v_ctrl_w ) if (pending_vb_int && !DISABLE_VB_INT) { pending_vb_int = 0; - cpunum_set_input_line(Machine, 0, MC68000_IRQ_4, HOLD_LINE); + cpunum_set_input_line(machine, 0, MC68000_IRQ_4, HOLD_LINE); } } } diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index 996cfcd345b..1aa55cfe75a 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -31,12 +31,12 @@ static WRITE8_HANDLER( subirqtrigger_w ) /* bit 0 used but unknown */ if (data & 0x04) - cpunum_set_input_line(Machine, 1,0,ASSERT_LINE); + cpunum_set_input_line(machine, 1,0,ASSERT_LINE); } static WRITE8_HANDLER( sub_irqack_w ) { - cpunum_set_input_line(Machine, 1,0,CLEAR_LINE); + cpunum_set_input_line(machine, 1,0,CLEAR_LINE); } diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 879f5ccf1c9..a5fbfdb8825 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -37,7 +37,6 @@ Notes: */ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" #define MASTER_CLOCK 32000000 @@ -212,10 +211,10 @@ static WRITE32_HANDLER( dreamwld_palette_w ) color = offset*2; dat = paletteram32[offset]&0x7fff; - palette_set_color_rgb(Machine,color+1,pal5bit(dat >> 10),pal5bit(dat >> 5),pal5bit(dat >> 0)); + palette_set_color_rgb(machine,color+1,pal5bit(dat >> 10),pal5bit(dat >> 5),pal5bit(dat >> 0)); dat = (paletteram32[offset]>>16)&0x7fff; - palette_set_color_rgb(Machine,color,pal5bit(dat >> 10),pal5bit(dat >> 5),pal5bit(dat >> 0)); + palette_set_color_rgb(machine,color,pal5bit(dat >> 10),pal5bit(dat >> 5),pal5bit(dat >> 0)); } diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 501ea29d72f..4338273e152 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -26,7 +26,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/8255ppi.h" #include "dribling.h" @@ -99,7 +98,7 @@ static WRITE8_HANDLER( misc_w ) /* bit 7 = di */ di = (data >> 7) & 1; if (!di) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); /* bit 6 = parata */ diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 7763dd163f2..0d9c1199a18 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -50,7 +50,6 @@ Notes: *********************************************************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/okim6295.h" #include "sound/2413intf.h" @@ -310,7 +309,7 @@ static WRITE8_HANDLER( dunhuang_paldata_w ) { dunhuang_paldata[dunhuang_paloffs] = data; - palette_set_color_rgb( Machine, dunhuang_paloffs/3, + palette_set_color_rgb( machine, dunhuang_paloffs/3, pal6bit(dunhuang_paldata[(dunhuang_paloffs/3)*3+0]), pal6bit(dunhuang_paldata[(dunhuang_paloffs/3)*3+1]), pal6bit(dunhuang_paldata[(dunhuang_paloffs/3)*3+2]) diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index f69107ec0af..20035ebe984 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -331,7 +331,7 @@ static WRITE8_HANDLER( hnoridur_palette_w ) int r = BITSWAP8((x >> 0) & 0x1f, 7,6,5, 0,1,2,3,4 ); int g = BITSWAP8((x >> 5) & 0x1f, 7,6,5, 0,1,2,3,4 ); int b = BITSWAP8((x >> 10) & 0x1f, 7,6,5, 0,1,2,3,4 ); - palette_set_color_rgb(Machine,256*palbank + offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,256*palbank + offset,pal5bit(r),pal5bit(g),pal5bit(b)); } } @@ -386,7 +386,7 @@ static WRITE8_HANDLER( nanajign_palette_w ) int r = br & 0x1f; int g = bg & 0x1f; int b = ((bg & 0xc0)>>3) | ((br & 0xe0)>>5); - palette_set_color_rgb(Machine,256*palbank + offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,256*palbank + offset,pal5bit(r),pal5bit(g),pal5bit(b)); } } @@ -1263,7 +1263,7 @@ static WRITE8_HANDLER( tenkai_palette_w ) int r = br & 0x1f; int g = bg & 0x1f; int b = ((bg & 0xc0)>>3) | ((br & 0xe0)>>5); - palette_set_color_rgb(Machine, 256*palbank + ((offset&0xf)|((offset&0x1e0)>>1)) ,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine, 256*palbank + ((offset&0xf)|((offset&0x1e0)>>1)) ,pal5bit(r),pal5bit(g),pal5bit(b)); } } diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 19273838bd5..b68a56c6ac2 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -42,7 +42,6 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f */ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" static UINT8 *egghunt_bgram; diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index c0be17d800f..4a0a410f3c4 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -348,7 +348,7 @@ static WRITE8_HANDLER( sound_data_w ) if (!(data & 0x04) && (last_sound_data & 0x04)) sound_latch = (sound_latch << 1) | (~data & 0x01); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, (data & 0x02) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, (data & 0x02) ? ASSERT_LINE : CLEAR_LINE); last_sound_data = data; } diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 9e9508a7a71..f16e39ef50e 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -23,7 +23,6 @@ Todo: */ #include "driver.h" -#include "deprecat.h" #include "machine/laserdsc.h" /* From daphne */ @@ -134,9 +133,9 @@ static WRITE8_HANDLER(led_writes) static WRITE8_HANDLER(nmi_line_w) { if (data == 0x00) - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, ASSERT_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE); if (data == 0x01) - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); if (data != 0x00 && data != 0x01) logerror("NMI line got a weird value!\n"); diff --git a/src/mame/drivers/exctsccr.c b/src/mame/drivers/exctsccr.c index aaa4bfb1ccb..7401cbe11a9 100644 --- a/src/mame/drivers/exctsccr.c +++ b/src/mame/drivers/exctsccr.c @@ -48,7 +48,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -83,7 +82,7 @@ static WRITE8_HANDLER( exctsccr_DAC_data_w ) static WRITE8_HANDLER( exctsccr_mcu_halt_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, (data & 1) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, (data & 1) ? ASSERT_LINE : CLEAR_LINE); } /*************************************************************************** diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 50e577d36f6..5323e96c20a 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -223,7 +223,7 @@ INPUT_PORTS_END static WRITE16_HANDLER( galsnew_paletteram_w ) { data = COMBINE_DATA(&paletteram16[offset]); - palette_set_color_rgb(Machine,offset,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); + palette_set_color_rgb(machine,offset,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); } static WRITE16_HANDLER( galsnew_6295_bankswitch_w ) diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c index 5793f19db6e..12ba72e0cf4 100644 --- a/src/mame/drivers/exterm.c +++ b/src/mame/drivers/exterm.c @@ -61,7 +61,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms34010/tms34010.h" #include "cpu/m6502/m6502.h" #include "sound/dac.h" @@ -199,7 +198,7 @@ static WRITE16_HANDLER( exterm_output_port_0_w ) { /* Bit 13 = Resets the slave CPU */ if ((data & 0x2000) && !(last & 0x2000)) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); /* Bits 14-15 = Coin counters */ coin_counter_w(0, data & 0x8000); @@ -264,7 +263,7 @@ static WRITE8_HANDLER( sound_nmi_rate_w ) static READ8_HANDLER( sound_master_latch_r ) { /* read latch and clear interrupt */ - cpunum_set_input_line(Machine, 2, M6502_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 2, M6502_IRQ_LINE, CLEAR_LINE); return master_sound_latch; } @@ -272,7 +271,7 @@ static READ8_HANDLER( sound_master_latch_r ) static READ8_HANDLER( sound_slave_latch_r ) { /* read latch and clear interrupt */ - cpunum_set_input_line(Machine, 3, M6502_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 3, M6502_IRQ_LINE, CLEAR_LINE); return slave_sound_latch; } @@ -288,7 +287,7 @@ static WRITE8_HANDLER( sound_slave_dac_w ) static READ8_HANDLER( sound_nmi_to_slave_r ) { /* a read from here triggers an NMI pulse to the slave */ - cpunum_set_input_line(Machine, 3, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_NMI, PULSE_LINE); return 0xff; } diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index d45389925ec..16e81fa4528 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -132,7 +132,7 @@ static WRITE8_HANDLER( exzisus_sharedram_ac_w ) static WRITE8_HANDLER( exzisus_cpub_reset_w ) { - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, PULSE_LINE); } #if 0 diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c index d4c757c1066..e2dd213865c 100644 --- a/src/mame/drivers/fgoal.c +++ b/src/mame/drivers/fgoal.c @@ -17,7 +17,6 @@ Differences between these sets include ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "includes/fgoal.h" UINT8* fgoal_video_ram; @@ -129,7 +128,7 @@ static READ8_HANDLER( fgoal_switches_r ) static READ8_HANDLER( fgoal_nmi_reset_r ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); return 0; } @@ -137,7 +136,7 @@ static READ8_HANDLER( fgoal_nmi_reset_r ) static READ8_HANDLER( fgoal_irq_reset_r ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c index 16346f50e88..5d756821355 100644 --- a/src/mame/drivers/filetto.c +++ b/src/mame/drivers/filetto.c @@ -374,9 +374,9 @@ static READ8_HANDLER( undefined_r ) static WRITE8_HANDLER( nmi_enable_w ) { //if(data & 0x80) - //cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI,ASSERT_LINE); + //cpunum_set_input_line(machine, 0, INPUT_LINE_NMI,ASSERT_LINE); //if(!(data & 0x80)) - //cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI,CLEAR_LINE); + //cpunum_set_input_line(machine, 0, INPUT_LINE_NMI,CLEAR_LINE); } static READ8_HANDLER( kludge_r ) @@ -437,7 +437,7 @@ static READ8_HANDLER( port_a_r ) } else//keyboard emulation { - cpunum_set_input_line(Machine, 0,1,PULSE_LINE); + cpunum_set_input_line(machine, 0,1,PULSE_LINE); return 0x00;//Keyboard is disconnected //return 0xaa;//Keyboard code } @@ -470,7 +470,7 @@ static WRITE8_HANDLER( wss_2_w ) static WRITE8_HANDLER( sys_reset_w ) { - cpunum_set_input_line(Machine, 0,INPUT_LINE_RESET,PULSE_LINE); + cpunum_set_input_line(machine, 0,INPUT_LINE_RESET,PULSE_LINE); } diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index 060ec8a90ca..07ef03f8087 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -51,7 +51,7 @@ static WRITE8_HANDLER( finalizr_coin_w ) static WRITE8_HANDLER( finalizr_i8039_irq_w ) { - cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 1, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_w ) @@ -62,7 +62,7 @@ static WRITE8_HANDLER( i8039_irqen_w ) */ if ((data & 0x80) == 0) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static READ8_HANDLER( i8039_T1_r ) diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 52dddef5dac..b9e08ab3223 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -146,7 +146,7 @@ static WRITE8_HANDLER( firetrap_8751_w ) if (data==0x26) { i8751_current_command=0; i8751_return=0xff; /* This value is XOR'd and must equal 0 */ - cpunum_set_input_line_and_vector(Machine, 0,0,HOLD_LINE,0xff); + cpunum_set_input_line_and_vector(machine, 0,0,HOLD_LINE,0xff); return; } @@ -193,7 +193,7 @@ static WRITE8_HANDLER( firetrap_8751_w ) } /* Signal main cpu task is complete */ - cpunum_set_input_line_and_vector(Machine, 0,0,HOLD_LINE,0xff); + cpunum_set_input_line_and_vector(machine, 0,0,HOLD_LINE,0xff); i8751_current_command=data; } diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 5666aa797a1..1b4ba9683aa 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -11,7 +11,6 @@ TO DO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/hd6309/hd6309.h" #include "sound/2151intf.h" diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c index 8a220cf0dbd..9566a6f4605 100644 --- a/src/mame/drivers/flower.c +++ b/src/mame/drivers/flower.c @@ -54,7 +54,7 @@ WRITE8_HANDLER( flower_sound2_w ); static WRITE8_HANDLER( flower_irq_ack ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } @@ -64,13 +64,13 @@ static WRITE8_HANDLER( sn_irq_enable_w ) { sn_irq_enable = data & 1; - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE); } static INTERRUPT_GEN( sn_irq ) { if (sn_irq_enable) - cpunum_set_input_line(Machine, 2, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 2, 0, ASSERT_LINE); } static WRITE8_HANDLER( sn_nmi_enable_w ) diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 79e4edcfce1..c494b7bee76 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -104,7 +104,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; } } diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 5f59c856b9b..3d1d75fbaf2 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -244,13 +244,13 @@ static WRITE16_HANDLER( fromanc2_subcpu_w ) { fromanc2_datalatch1 = data; - cpunum_set_input_line(Machine, 2, 0, HOLD_LINE); + cpunum_set_input_line(machine, 2, 0, HOLD_LINE); fromanc2_subcpu_int_flag = 0; } static READ16_HANDLER( fromanc2_subcpu_r ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE); fromanc2_subcpu_nmi_flag = 0; return (fromanc2_datalatch_2h << 8) | fromanc2_datalatch_2l; diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index 712fabf0b0d..83c0962b8a9 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -49,7 +49,6 @@ Note: SW2, SW3 & SW4 not populated #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" /* video/funybubl.c */ diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index c5a13486c0a..2f5923d0698 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -195,7 +195,7 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) g = (paletteram32[offset] & 0x03e00000) >> (5+16); b = (paletteram32[offset] & 0x001f0000) >> (0+16); - palette_set_color_rgb(Machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b)); } if(ACCESSING_BITS_0_15) @@ -207,7 +207,7 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) g = (paletteram32[offset] & 0x000003e0) >> (5); b = (paletteram32[offset] & 0x0000001f) >> (0); - palette_set_color_rgb(Machine,offset*2+1,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset*2+1,pal5bit(r),pal5bit(g),pal5bit(b)); } } diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index cecc318f7b3..55223394722 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 65a801a10c3..ed31c980be8 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -250,7 +250,7 @@ static INTERRUPT_GEN( vblank_gen ) static WRITE16_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 2, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 2, CLEAR_LINE); } diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index 1282db8e63f..89f258ac33e 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -348,7 +348,6 @@ TO DO : ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/s2650/s2650.h" #include "galaxold.h" diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index bc585e1163b..25b1df143d6 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -150,7 +150,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/namcoio.h" #include "sound/namco.h" #include "sound/samples.h" @@ -275,7 +274,7 @@ static WRITE8_HANDLER( gaplus_irq_1_ctrl_w ) int bit = !BIT(offset,11); cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( gaplus_irq_3_ctrl_w ) @@ -283,7 +282,7 @@ static WRITE8_HANDLER( gaplus_irq_3_ctrl_w ) int bit = !BIT(offset,13); cpu_interrupt_enable(2,bit); if (!bit) - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE); } static WRITE8_HANDLER( gaplus_irq_2_ctrl_w ) @@ -291,14 +290,14 @@ static WRITE8_HANDLER( gaplus_irq_2_ctrl_w ) int bit = offset & 1; cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static WRITE8_HANDLER( gaplus_sreset_w ) { int bit = !BIT(offset,11); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); mappy_sound_enable(bit); } diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index a8b567739ca..4e7cf59c14d 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -8,7 +8,6 @@ Preliminary driver by: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */ #include "video/konamiic.h" #include "sound/2151intf.h" @@ -101,7 +100,7 @@ char baf[40]; static WRITE8_HANDLER( gbusters_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); } static WRITE8_HANDLER( gbusters_snd_bankswitch_w ) diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c index 5523398ced7..b5f2db837bc 100644 --- a/src/mame/drivers/genesis.c +++ b/src/mame/drivers/genesis.c @@ -217,7 +217,7 @@ WRITE16_HANDLER(genesis_ctrl_w) if (data == 0x100) { z80running = 0; - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); /* halt Z80 */ + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); /* halt Z80 */ /* logerror("z80 stopped by 68k BusReq\n"); */ } else @@ -225,7 +225,7 @@ WRITE16_HANDLER(genesis_ctrl_w) z80running = 1; // memory_set_bankptr(1, &genesis_z80_ram[0]); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); /* logerror("z80 started, BusReq ends\n"); */ } return; @@ -233,10 +233,10 @@ WRITE16_HANDLER(genesis_ctrl_w) case 0x100: /* Z80 CPU Reset */ if (data == 0x00) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); /* logerror("z80 reset, ram is %p\n", &genesis_z80_ram[0]); */ z80running = 0; return; diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index 41d21abe17a..23f852a0d89 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -328,7 +328,7 @@ static INTERRUPT_GEN( ginganin_sound_interrupt ) if (MC6809_CTR > S_TEMPO) { MC6809_CTR = 0; - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE); } else { diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 4304aa9405b..4f2063368bb 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -329,7 +329,7 @@ static WRITE8_HANDLER( gladiatr_flipscreen_w ) /* !!!!! patch to IRQ timming for 2nd CPU !!!!! */ static WRITE8_HANDLER( gladiatr_irq_patch_w ) { - cpunum_set_input_line(Machine, 1,0,HOLD_LINE); + cpunum_set_input_line(machine, 1,0,HOLD_LINE); } #endif diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index 997d34f5014..563c99a1ca1 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -9,7 +9,6 @@ The DS5002FP has up to 128KB undumped gameplay code making the game unplayable : ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" @@ -40,7 +39,7 @@ static WRITE16_HANDLER( clr_int_w ) static INTERRUPT_GEN( glass_interrupt ) { if (cause_interrupt){ - cpunum_set_input_line(Machine, 0, 6, HOLD_LINE); + cpunum_set_input_line(machine, 0, 6, HOLD_LINE); cause_interrupt = 0; } } diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 9de330bdb06..801f32b6518 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -257,7 +257,7 @@ static WRITE8_HANDLER( palette_write ) /* logerror("PAL WRITE index : %x rgb : %d %d %d (real %x) at %x\n", pal_index, r,g,b, data, offset); */ - palette_set_color(Machine, pal_index, MAKE_RGB(r, g, b)); + palette_set_color(machine, pal_index, MAKE_RGB(r, g, b)); } /* PROGRAM MAP */ diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index 4deb38036c0..2ad1007c3fd 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -98,7 +98,7 @@ static WRITE16_HANDLER( cpuA_ctrl_w ) gradius3_priority = data & 0x04; /* bit 3 enables cpu B */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); /* bit 5 enables irq */ irqAen = data & 0x20; @@ -153,7 +153,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( sound_irq_w ) { - cpunum_set_input_line_and_vector(Machine, 2,0,HOLD_LINE,0xff); + cpunum_set_input_line_and_vector(machine, 2,0,HOLD_LINE,0xff); } static WRITE8_HANDLER( sound_bank_w ) diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index 6adca623886..dcbbc9b1de8 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -63,7 +63,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "video/taitoic.h" #include "machine/eeprom.h" @@ -97,7 +96,7 @@ static WRITE32_HANDLER( color_ram_w ) g = (a &0xff00) >> 8; b = (a &0xff); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } } diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 481ced55230..f1d62f8d162 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -95,7 +95,6 @@ *********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" static UINT32 *gstream_vram; @@ -112,12 +111,12 @@ static WRITE32_HANDLER( gstream_palette_w ) { COMBINE_DATA(&paletteram32[offset]); - palette_set_color_rgb(Machine,offset*2,pal5bit(paletteram32[offset] >> (0+16)), + palette_set_color_rgb(machine,offset*2,pal5bit(paletteram32[offset] >> (0+16)), pal5bit(paletteram32[offset] >> (6+16)), pal5bit(paletteram32[offset] >> (11+16))); - palette_set_color_rgb(Machine,offset*2+1,pal5bit(paletteram32[offset] >> (0)), + palette_set_color_rgb(machine,offset*2+1,pal5bit(paletteram32[offset] >> (0)), pal5bit(paletteram32[offset] >> (6)), pal5bit(paletteram32[offset] >> (11))); } diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index c84314e3395..99e73c8121f 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -74,7 +74,7 @@ static WRITE32_HANDLER( paletteram32_w ) { COMBINE_DATA(&paletteram32[offset]); data = paletteram32[offset]; - palette_set_color_rgb(Machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); + palette_set_color_rgb(machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } static void voodoo_vblank_0(int param) @@ -349,11 +349,11 @@ static WRITE32_HANDLER( sysreg_w ) { if (data & 0x80000000) /* CG Board 1 IRQ Ack */ { - cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE); } if (data & 0x40000000) /* CG Board 0 IRQ Ack */ { - cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_IRQ0, CLEAR_LINE); } adc1038_di_w((data >> 24) & 1); diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index e459d70bb38..3892ef06f8c 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -181,7 +181,7 @@ static WRITE16_HANDLER( ef9369_w ) col = pal.clut[entry] & 0xfff; /* Update the MAME palette */ - palette_set_color_rgb(Machine, entry, pal4bit(col >> 0), pal4bit(col >> 4), pal4bit(col >> 8)); + palette_set_color_rgb(machine, entry, pal4bit(col >> 0), pal4bit(col >> 4), pal4bit(col >> 8)); } /* Address register auto-increment */ diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index 9c4df96449b..db14c3dc634 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -45,7 +45,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "video/taitoic.h" #include "audio/taitosnd.h" @@ -80,10 +79,10 @@ static WRITE32_HANDLER( gunbustr_palette_w ) COMBINE_DATA(&paletteram32[offset]); a = paletteram32[offset] >> 16; - palette_set_color_rgb(Machine,offset*2,pal5bit(a >> 10),pal5bit(a >> 5),pal5bit(a >> 0)); + palette_set_color_rgb(machine,offset*2,pal5bit(a >> 10),pal5bit(a >> 5),pal5bit(a >> 0)); a = paletteram32[offset] &0xffff; - palette_set_color_rgb(Machine,offset*2+1,pal5bit(a >> 10),pal5bit(a >> 5),pal5bit(a >> 0)); + palette_set_color_rgb(machine,offset*2+1,pal5bit(a >> 10),pal5bit(a >> 5),pal5bit(a >> 0)); } static READ32_HANDLER( gunbustr_input_r ) diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c index 9054931fa90..f905b538dad 100644 --- a/src/mame/drivers/hal21.c +++ b/src/mame/drivers/hal21.c @@ -53,7 +53,6 @@ AT08XX03: */ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "snk.h" #include "sound/ay8910.h" diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 7e183902d38..dc0c595c42d 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1002,7 +1002,7 @@ static WRITE8_HANDLER( blitter_w ) if (i==0 || (i==4 && !data)) { blitter_busy = 0; - if (firq_level) cpunum_set_input_line(Machine, 0, M6809_FIRQ_LINE, ASSERT_LINE); // make up delayed FIRQ's + if (firq_level) cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE, ASSERT_LINE); // make up delayed FIRQ's } else { @@ -1163,13 +1163,13 @@ static WRITE8_HANDLER( halleys_paletteram_IIRRGGBB_w ) g = d & 0x0c; g |= i; g = g<<4 | g; b = d<<2 & 0x0c; b |= i; b = b<<4 | b; - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); - palette_set_color(Machine, offset+SP_2BACK, MAKE_RGB(r, g, b)); - palette_set_color(Machine, offset+SP_ALPHA, MAKE_RGB(r, g, b)); - palette_set_color(Machine, offset+SP_COLLD, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset+SP_2BACK, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset+SP_ALPHA, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset+SP_COLLD, MAKE_RGB(r, g, b)); halleys_decode_rgb(&r, &g, &b, offset, 0); - palette_set_color(Machine, offset+0x20, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset+0x20, MAKE_RGB(r, g, b)); } @@ -1568,7 +1568,7 @@ static WRITE8_HANDLER( firq_ack_w ) io_ram[0x9c] = data; if (firq_level) firq_level--; - cpunum_set_input_line(Machine, 0, M6809_FIRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE, CLEAR_LINE); } diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index f21208b640b..fbc691d6c38 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -38,7 +38,7 @@ static WRITE8_HANDLER( hcastle_bankswitch_w ) static WRITE8_HANDLER( hcastle_soundirq_w ) { - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE ); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE ); } static WRITE8_HANDLER( hcastle_coin_w ) diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index b4d6d8c491a..233c8368fd6 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -626,7 +626,7 @@ static WRITE32_HANDLER( hng64_pal_w ) //if (a != 0) // popmessage("Alpha is not zero!") ; - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } static READ32_HANDLER( hng64_port_read ) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 3a483c351fc..3b857eb509e 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -217,7 +217,6 @@ Custom: GX61A01 ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "cpu/upd7810/upd7810.h" #include "homedata.h" diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 238c5e4219b..aa31e7e3272 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -416,14 +416,14 @@ static WRITE32_HANDLER(K037122_sram_w) } else if (offset >= 0x18000/4) { - update_palette_color(Machine, chip, 0x18000, offset - (0x18000/4)); + update_palette_color(machine, chip, 0x18000, offset - (0x18000/4)); } } else { if (offset < 0x8000/4) { - update_palette_color(Machine, chip, 0, offset); + update_palette_color(machine, chip, 0, offset); } else if (offset >= 0x8000/4 && offset < 0x18000/4) { @@ -643,11 +643,11 @@ static WRITE32_HANDLER( sysreg_w ) { if (data & 0x80) /* CG Board 1 IRQ Ack */ { - cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE); } if (data & 0x40) /* CG Board 0 IRQ Ack */ { - cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_IRQ0, CLEAR_LINE); } set_cgboard_id((data >> 4) & 0x3); } diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 0f9520ead1a..16cc62766bd 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -128,24 +128,24 @@ static WRITE16_HANDLER( hypr_subcpu_control_w ) { if (pc != 0x95f2) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); subcpu_resetline = 1; } else { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); subcpu_resetline = -1; } } } else { if (subcpu_resetline == 1 && (data != 0x0c)) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); subcpu_resetline = 0; if (pc == 0xbb0 || pc == 0x9d30 || pc == 0xb19c) cpu_spinuntil_time(ATTOTIME_IN_USEC(15000)); /* sync semaphore */ } else if (subcpu_resetline == -1) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); subcpu_resetline = 0; } } diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 10668071e35..e49bc7bb9f9 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -357,7 +357,7 @@ static WRITE16_HANDLER( igs_palette_w ) COMBINE_DATA(&paletteram16[offset]); rgb = (paletteram16[offset & 0x7ff] & 0xff) | ((paletteram16[offset | 0x800] & 0xff) << 8); - palette_set_color_rgb(Machine,offset & 0x7ff,pal5bit(rgb >> 0),pal5bit(rgb >> 5),pal5bit(rgb >> 10)); + palette_set_color_rgb(machine,offset & 0x7ff,pal5bit(rgb >> 0),pal5bit(rgb >> 5),pal5bit(rgb >> 10)); } diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index 2142ac7c2fb..2ce0b091f2f 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -113,7 +113,7 @@ static WRITE8_HANDLER( transmit_data_w ) } static READ8_HANDLER( trigger_slave_nmi_r ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); return 0; } diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index 93428f0f6a5..0cf16048953 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -83,12 +83,12 @@ static INTERRUPT_GEN( iqblock_interrupt ) static WRITE8_HANDLER( iqblock_irqack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static READ8_HANDLER( iqblock_irqack_r ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c index dc485542aff..93401b70018 100644 --- a/src/mame/drivers/irobot.c +++ b/src/mame/drivers/irobot.c @@ -75,7 +75,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/pokey.h" #include "irobot.h" @@ -103,13 +102,13 @@ static WRITE8_HANDLER( irobot_nvram_w ) static WRITE8_HANDLER( irobot_clearirq_w ) { - cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE ,CLEAR_LINE); + cpunum_set_input_line(machine, 0, M6809_IRQ_LINE ,CLEAR_LINE); } static WRITE8_HANDLER( irobot_clearfirq_w ) { - cpunum_set_input_line(Machine, 0, M6809_FIRQ_LINE ,CLEAR_LINE); + cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE ,CLEAR_LINE); } diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index b0ede4fe5fc..61890d80f8b 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -42,7 +42,7 @@ static INTERRUPT_GEN( ironhors_interrupt ) static WRITE8_HANDLER( ironhors_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); } static WRITE8_HANDLER( ironhors_filter_w ) diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index 7eac69c4a70..b4d6815c9e4 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -22,7 +22,6 @@ Todo: */ #include "driver.h" -#include "deprecat.h" #include "render.h" #include "machine/laserdsc.h" @@ -102,7 +101,7 @@ static WRITE8_HANDLER(z80_0_latch2_write) if (z80_2_nmi_enable) { logerror("Executing an NMI on CPU2\n"); - cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE); /* Maybe this is a ASSERT_LINE, CLEAR_LINE combo? */ + cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE); /* Maybe this is a ASSERT_LINE, CLEAR_LINE combo? */ z80_2_nmi_enable = 0; } } diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 643be158fe2..a4baaa9b65d 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -563,7 +563,7 @@ static WRITE32_HANDLER( sound_data32_w ) static READ8_HANDLER( sound_data_r ) { - cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, CLEAR_LINE); sound_int_state = 0; return sound_data; } @@ -669,7 +669,7 @@ static const struct via6522_interface drivedge_via_interface = static WRITE8_HANDLER( firq_clear_w ) { - cpunum_set_input_line(Machine, 1, M6809_FIRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 1, M6809_FIRQ_LINE, CLEAR_LINE); } @@ -682,8 +682,8 @@ static WRITE8_HANDLER( firq_clear_w ) static WRITE32_HANDLER( tms_reset_assert_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, ASSERT_LINE); - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, ASSERT_LINE); } @@ -692,13 +692,13 @@ static WRITE32_HANDLER( tms_reset_clear_w ) /* kludge to prevent crash on first boot */ if ((tms1_ram[0] & 0xff000000) == 0) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, CLEAR_LINE); - STOP_TMS_SPINNING(Machine, 0); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, CLEAR_LINE); + STOP_TMS_SPINNING(machine, 0); } if ((tms2_ram[0] & 0xff000000) == 0) { - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, CLEAR_LINE); - STOP_TMS_SPINNING(Machine, 1); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, CLEAR_LINE); + STOP_TMS_SPINNING(machine, 1); } } @@ -707,7 +707,7 @@ static WRITE32_HANDLER( tms1_68k_ram_w ) { COMBINE_DATA(&tms1_ram[offset]); if (offset == 0) COMBINE_DATA(tms1_boot); - if (offset == 0x382 && tms_spinning[0]) STOP_TMS_SPINNING(Machine, 0); + if (offset == 0x382 && tms_spinning[0]) STOP_TMS_SPINNING(machine, 0); if (!tms_spinning[0]) cpu_boost_interleave(ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20)); } @@ -716,7 +716,7 @@ static WRITE32_HANDLER( tms1_68k_ram_w ) static WRITE32_HANDLER( tms2_68k_ram_w ) { COMBINE_DATA(&tms2_ram[offset]); - if (offset == 0x382 && tms_spinning[1]) STOP_TMS_SPINNING(Machine, 1); + if (offset == 0x382 && tms_spinning[1]) STOP_TMS_SPINNING(machine, 1); if (!tms_spinning[1]) cpu_boost_interleave(ATTOTIME_IN_HZ(CPU020_CLOCK/256), ATTOTIME_IN_USEC(20)); } diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index e6380847cc8..21eec602edd 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -592,7 +592,7 @@ static INTERRUPT_GEN( generate_nmi ) static WRITE8_HANDLER( itech8_nmi_ack_w ) { /* doesn't seem to hold for every game (e.g., hstennis) */ -/* cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE);*/ +/* cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE);*/ } @@ -803,7 +803,7 @@ static WRITE8_HANDLER( gtg2_sound_data_w ) static READ8_HANDLER( sound_data_r ) { - 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; } diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 8005089291e..c1cb9ea850c 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -480,7 +480,7 @@ static WRITE16_HANDLER( main2sub_cmd_w ) { COMBINE_DATA(&main2sub_cmd); logerror("cpu #%d (PC=%06X): write cmd %04x to subcpu\n", cpu_getactivecpu(), activecpu_get_previouspc(), main2sub_cmd); - cpunum_set_input_line(Machine, 1, 4, HOLD_LINE); + cpunum_set_input_line(machine, 1, 4, HOLD_LINE); } static READ16_HANDLER ( main2sub_status_r ) { @@ -513,7 +513,7 @@ static WRITE16_HANDLER( sub2main_cmd_w ) { COMBINE_DATA(&sub2main_cmd); logerror("cpu #%d (PC=%06X): write cmd %04x to maincpu\n", cpu_getactivecpu(), activecpu_get_previouspc(), sub2main_cmd); - cpunum_set_input_line(Machine, 0, 3, HOLD_LINE); + cpunum_set_input_line(machine, 0, 3, HOLD_LINE); } static READ16_HANDLER ( sub2main_cmd_r ) { diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c index 78163908694..abd07a0b991 100644 --- a/src/mame/drivers/jcross.c +++ b/src/mame/drivers/jcross.c @@ -17,7 +17,6 @@ Could be bad dump ('final' romset is made of two sets marked as 'bad' ) */ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "snk.h" #include "sound/ay8910.h" @@ -67,7 +66,7 @@ static READ8_HANDLER( sound_command_r ) static READ8_HANDLER( sound_nmi_ack_r ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index f5c7369c98b..d7888904709 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -111,7 +111,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "jedi.h" @@ -142,7 +141,7 @@ static TIMER_CALLBACK( generate_interrupt ) static WRITE8_HANDLER( main_irq_ack_w ) { - cpunum_set_input_line(Machine, 0, M6502_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 0, M6502_IRQ_LINE, CLEAR_LINE); } diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 2b419714bd2..6abaf659d7b 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -99,7 +99,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "pacman.h" #include "sound/namco.h" @@ -107,7 +106,7 @@ static WRITE8_HANDLER( jrpacman_interrupt_vector_w ) { cpunum_set_input_line_vector(0, 0, data); - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index acc9e74a03d..cf247e90d3c 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -78,7 +78,6 @@ Blitter source graphics #include "driver.h" -#include "deprecat.h" #include "tutankhm.h" #include "cpu/m6809/m6809.h" #include "cpu/i8039/i8039.h" @@ -145,7 +144,7 @@ static WRITE8_HANDLER( junofrst_sh_irqtrigger_w ) if (last == 0 && data == 1) { /* 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; @@ -154,14 +153,14 @@ static WRITE8_HANDLER( junofrst_sh_irqtrigger_w ) static WRITE8_HANDLER( junofrst_i8039_irq_w ) { - cpunum_set_input_line(Machine, 2, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 2, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_and_status_w ) { if ((data & 0x80) == 0) - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE); i8039_status = (data & 0x70) >> 4; } diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 9fd778ad615..bf7a8681393 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -315,7 +315,7 @@ static WRITE16_HANDLER( karnov_control_w ) break; case 0xe: /* INTCLR (Interrupt ack for Level 7 vbl interrupt) */ - cpunum_set_input_line(Machine, 0,7,CLEAR_LINE); + cpunum_set_input_line(machine, 0,7,CLEAR_LINE); break; } } diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index 7006c33e0f5..73d8327e14e 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -119,7 +119,7 @@ static WRITE8_HANDLER( control_w ) { static WRITE8_HANDLER( sound_reset_w ) { if ( !( data & 1 ) ) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); } static WRITE8_HANDLER( sound_control_w ) { @@ -204,7 +204,7 @@ static ADDRESS_MAP_START( kc_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static READ8_HANDLER( sound_reset_r ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); return 0; } diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 7345d3d2285..4ec34ce9220 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -16,7 +16,6 @@ Main CPU: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/dac.h" diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index a85743baa4f..97979a33a96 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -129,7 +129,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/mips/mips3.h" #include "cpu/adsp2100/adsp2100.h" #include "machine/idectrl.h" diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 03d31374862..5d7bf3322f7 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -26,7 +26,6 @@ Updates: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6800/m6800.h" #include "sound/ay8910.h" #include "sound/sn76496.h" @@ -112,7 +111,7 @@ static READ8_HANDLER( m6803_port2_r ) 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); } static WRITE8_HANDLER(unused_w) @@ -257,7 +256,7 @@ static const struct AY8910interface ay8910_interface = static INTERRUPT_GEN (sound_nmi) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } static MACHINE_DRIVER_START( kncljoe ) diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 34c4496c439..9757eff247b 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -46,7 +46,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "cpu/mips/psx.h" #include "includes/psx.h" #include "machine/konamigx.h" @@ -67,7 +66,7 @@ static WRITE32_HANDLER( soundr3k_w ) sndto000[ ( offset << 1 ) + 1 ] = data >> 16; if( offset == 3 ) { - cpunum_set_input_line(Machine, 1, 1, HOLD_LINE ); + cpunum_set_input_line(machine, 1, 1, HOLD_LINE ); } } if( ACCESSING_BITS_0_15 ) @@ -141,7 +140,7 @@ static WRITE32_HANDLER( eeprom_w ) EEPROM_write_bit( ( data & 0x01 ) ? 1 : 0 ); EEPROM_set_clock_line( ( data & 0x04 ) ? ASSERT_LINE : CLEAR_LINE ); EEPROM_set_cs_line( ( data & 0x02 ) ? CLEAR_LINE : ASSERT_LINE ); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ( data & 0x40 ) ? CLEAR_LINE : ASSERT_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ( data & 0x40 ) ? CLEAR_LINE : ASSERT_LINE ); } static CUSTOM_INPUT( eeprom_bit_r ) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 87fa62f7e50..4563eeaf10c 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -440,7 +440,7 @@ static WRITE32_HANDLER( esc_w ) if (konamigx_wrport1_1 & 0x10) { gx_rdport1_3 &= ~8; - cpunum_set_input_line(Machine, 0, 4, HOLD_LINE); + cpunum_set_input_line(machine, 0, 4, HOLD_LINE); } } else @@ -559,13 +559,13 @@ static WRITE32_HANDLER( control_w ) { // enable 68k // clear the halt condition and reset the 68000 - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); } else { // disable 68k - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); } K053246_set_OBJCHA_line((data&0x100000) ? ASSERT_LINE : CLEAR_LINE); @@ -628,14 +628,14 @@ static WRITE32_HANDLER( ccu_w ) // vblank interrupt ACK if (ACCESSING_BITS_24_31) { - cpunum_set_input_line(Machine, 0, 1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 1, CLEAR_LINE); gx_syncen |= 0x20; } // hblank interrupt ACK if (ACCESSING_BITS_8_15) { - cpunum_set_input_line(Machine, 0, 2, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 2, CLEAR_LINE); gx_syncen |= 0x40; } } @@ -1096,7 +1096,7 @@ static WRITE32_HANDLER( type4_prot_w ) if (konamigx_wrport1_1 & 0x10) { gx_rdport1_3 &= ~8; - cpunum_set_input_line(Machine, 0, 4, HOLD_LINE); + cpunum_set_input_line(machine, 0, 4, HOLD_LINE); } // don't accidentally do a phony command diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index 2929edc7263..4330d192cd0 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -96,7 +96,6 @@ Notes: */ #include "driver.h" -#include "deprecat.h" #include "cdrom.h" #include "cpu/powerpc/ppc.h" @@ -228,7 +227,7 @@ static WRITE64_HANDLER(unk4_w) if (data & 0x800000) { mame_printf_debug("CPU%d: CPU1 IRQ at %08X\n", cpu_getactivecpu(), activecpu_get_pc()); - cpunum_set_input_line(Machine, 1, INPUT_LINE_IRQ0, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ0, ASSERT_LINE); } unk20004 = (UINT32)(data); @@ -323,7 +322,7 @@ static WRITE64_HANDLER(reset_w) { if (data & U64(0x100000000)) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, PULSE_LINE); unk3 = 0; } } diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 907b76d08dc..c5af7bdb35c 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -46,7 +46,7 @@ MACHINE_RESET( kyugo ) WRITE8_HANDLER( kyugo_sub_cpu_control_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index 959d7e67ab0..13c95337976 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -86,7 +86,7 @@ static WRITE8_HANDLER( to_main_w ) static WRITE8_HANDLER( sound_cpu_reset_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data&1 )? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data&1 )? ASSERT_LINE : CLEAR_LINE); } static TIMER_CALLBACK( nmi_callback ) @@ -111,7 +111,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; } } diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index 2dadf9af9bf..bd6111e60fe 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -72,7 +72,7 @@ static READ8_HANDLER( read_unk ) static WRITE8_HANDLER(palette_w) { - palette_set_color_rgb(Machine,offset,pal3bit(data>>5),pal3bit(data>>2),pal2bit(data)); + palette_set_color_rgb(machine,offset,pal3bit(data>>5),pal3bit(data>>2),pal2bit(data)); } static WRITE8_HANDLER(vrambank_w) diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index eff9453fe38..3c07046a558 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -28,7 +28,6 @@ DIP locations verified for: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "lasso.h" #include "sound/dac.h" diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 3cb527d25b4..62b19e34af6 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -132,7 +132,7 @@ static WRITE16_HANDLER(colordac_w) if (ACCESSING_BITS_0_7) { colorram[clr_offset] = data; - palette_set_color_rgb(Machine, clr_offset/3, + palette_set_color_rgb(machine, clr_offset/3, pal6bit(colorram[(clr_offset/3)*3+0]), pal6bit(colorram[(clr_offset/3)*3+1]), pal6bit(colorram[(clr_offset/3)*3+2]) diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index f181ccadea2..43c51ac324b 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -73,7 +73,6 @@ Preliminary COP MCU memory map ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "audio/seibu.h" #include "sound/3812intf.h" diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index 7782fa78a1a..d447c61776e 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -69,7 +69,7 @@ static WRITE16_HANDLER( lemmings_palette_24bit_w ) g = (paletteram16[offset+1] >> 8) & 0xff; r = (paletteram16[offset+1] >> 0) & 0xff; - palette_set_color(Machine,offset/2,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset/2,MAKE_RGB(r,g,b)); } static WRITE16_HANDLER( lemmings_sound_w ) @@ -80,7 +80,7 @@ static WRITE16_HANDLER( lemmings_sound_w ) static WRITE8_HANDLER( lemmings_sound_ack_w ) { - cpunum_set_input_line(Machine, 1,1,CLEAR_LINE); + cpunum_set_input_line(machine, 1,1,CLEAR_LINE); } /******************************************************************************/ diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index d797992e06d..82ae9cbce88 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -262,7 +262,7 @@ static WRITE8_HANDLER( sound_cmd_w ) static WRITE8_HANDLER( sound_irq_w ) { - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE); } static READ8_HANDLER( sound_status_r ) diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index d937458040d..0d9c0d72815 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -24,7 +24,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" #include "machine/eeprom.h" @@ -64,13 +63,13 @@ static WRITE32_HANDLER( limenko_paletteram_w ) if(ACCESSING_BITS_0_15) { paldata = paletteram32[offset] & 0x7fff; - palette_set_color_rgb(Machine, offset * 2 + 1, pal5bit(paldata >> 0), pal5bit(paldata >> 5), pal5bit(paldata >> 10)); + palette_set_color_rgb(machine, offset * 2 + 1, pal5bit(paldata >> 0), pal5bit(paldata >> 5), pal5bit(paldata >> 10)); } if(ACCESSING_BITS_16_31) { paldata = (paletteram32[offset] >> 16) & 0x7fff; - palette_set_color_rgb(Machine, offset * 2 + 0, pal5bit(paldata >> 0), pal5bit(paldata >> 5), pal5bit(paldata >> 10)); + palette_set_color_rgb(machine, offset * 2 + 0, pal5bit(paldata >> 0), pal5bit(paldata >> 5), pal5bit(paldata >> 10)); } } diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index 662048436eb..d5f5083cb34 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -76,7 +76,7 @@ static WRITE8_HANDLER( lkage_sh_nmi_enable_w ) sound_nmi_enable = 1; if (pending_nmi) { /* probably wrong but commands may go lost otherwise */ - 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; } } diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index 62b09433efb..14d983a1be1 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -65,9 +65,9 @@ static WRITE16_HANDLER( adrst_w ) lockon_ctrl_reg = data & 0xff; /* Bus mastering for shared access */ - cpunum_set_input_line(Machine, GROUND_CPU, INPUT_LINE_HALT, data & 0x04 ? ASSERT_LINE : CLEAR_LINE); - cpunum_set_input_line(Machine, OBJECT_CPU, INPUT_LINE_HALT, data & 0x20 ? ASSERT_LINE : CLEAR_LINE); - cpunum_set_input_line(Machine, SOUND_CPU, INPUT_LINE_HALT, data & 0x40 ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, GROUND_CPU, INPUT_LINE_HALT, data & 0x04 ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, OBJECT_CPU, INPUT_LINE_HALT, data & 0x20 ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, SOUND_CPU, INPUT_LINE_HALT, data & 0x40 ? CLEAR_LINE : ASSERT_LINE); } static READ16_HANDLER( main_gnd_r ) diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index d4b5aa61676..b0353d22489 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -14,7 +14,6 @@ *******************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "m107.h" #include "machine/irem_cpu.h" #include "sound/2151intf.h" @@ -146,7 +145,7 @@ static WRITE16_HANDLER( m107_sound_irq_ack_w ) static WRITE16_HANDLER( m107_sound_status_w ) { COMBINE_DATA(&sound_status); - cpunum_set_input_line_and_vector(Machine, 0, 0, HOLD_LINE, M107_IRQ_3); + cpunum_set_input_line_and_vector(machine, 0, 0, HOLD_LINE, M107_IRQ_3); } /*****************************************************************************/ diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index 666b1be05e3..e8503d48690 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -360,7 +360,7 @@ static WRITE16_HANDLER( m92_sound_irq_ack_w ) static WRITE16_HANDLER( m92_sound_status_w ) { COMBINE_DATA(&sound_status); - cpunum_set_input_line_and_vector(Machine, 0, 0, HOLD_LINE, M92_IRQ_3); + cpunum_set_input_line_and_vector(machine, 0, 0, HOLD_LINE, M92_IRQ_3); } /*****************************************************************************/ diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 8271bc50639..c597145f238 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -253,7 +253,7 @@ static WRITE32_HANDLER( paletteram32_macrossp_w ) g = ((paletteram32[offset] & 0x00ff0000) >>16); r = ((paletteram32[offset] & 0xff000000) >>24); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } @@ -280,7 +280,7 @@ static WRITE32_HANDLER( macrossp_soundcmd_w ) //logerror("%08x write soundcmd %08x (%08x)\n",activecpu_get_pc(),data,mem_mask); soundlatch_word_w(machine,0,data >> 16,0xffff); sndpending = 1; - cpunum_set_input_line(Machine, 1,2,HOLD_LINE); + cpunum_set_input_line(machine, 1,2,HOLD_LINE); /* spin for a while to let the sound CPU read the command */ cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); } diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index 3f61203d285..33dee8294fc 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "video/mc6845.h" #include "madalien.h" diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 8954023c5ce..f2e5afe757e 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -18,7 +18,6 @@ Magic's 10 instruction for the 1st boot: */ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" static tilemap *layer0_tilemap, *layer1_tilemap, *layer2_tilemap; @@ -46,7 +45,7 @@ static WRITE16_HANDLER( layer2_videoram_w ) static WRITE16_HANDLER( paletteram_w ) { data = COMBINE_DATA(&paletteram16[offset]); - palette_set_color_rgb( Machine, offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8)); + palette_set_color_rgb( machine, offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8)); } static WRITE16_HANDLER( magic10_misc_w ) diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c index 7da243951ea..50eeff46413 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -9,7 +9,6 @@ Additional tweaking by Jarek Burczynski ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "sound/ay8910.h" @@ -34,13 +33,13 @@ static WRITE16_HANDLER( magmax_sound_w ) if (ACCESSING_BITS_0_7) { sound_latch = (data & 0xff) << 1; - cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 1, 0, ASSERT_LINE); } } static READ8_HANDLER( magmax_sound_irq_ack ) { - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index f3ad53572e0..a00d3dd38c6 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -89,7 +89,7 @@ static WRITE8_HANDLER( mainevt_coin_w ) static WRITE8_HANDLER( mainevt_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); } static WRITE8_HANDLER( mainevt_sh_irqcontrol_w ) diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index 9d309cfc490..dd5cfed8ea0 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -71,7 +71,6 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k */ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/namco.h" @@ -100,7 +99,7 @@ static WRITE8_HANDLER( sound_command_w ) sound_fetched = 0; sound_command = data; sound_cpu_ready = 0; - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } static READ8_HANDLER( sound_command_r ) diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index 872a8f556dd..299fd760925 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -547,7 +547,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/namcoio.h" #include "sound/dac.h" #include "sound/namco.h" @@ -705,13 +704,13 @@ static WRITE8_HANDLER( superpac_latch_w ) case 0x00: /* INT ON 2 */ cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); break; case 0x02: /* INT ON */ cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); break; case 0x04: /* n.c. */ @@ -727,7 +726,7 @@ static WRITE8_HANDLER( superpac_latch_w ) break; case 0x0a: /* SUB RESET */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); break; case 0x0c: /* n.c. */ @@ -747,19 +746,19 @@ static WRITE8_HANDLER( phozon_latch_w ) case 0x00: cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); break; case 0x02: cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); break; case 0x04: cpu_interrupt_enable(2,bit); if (!bit) - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE); break; case 0x06: @@ -772,11 +771,11 @@ static WRITE8_HANDLER( phozon_latch_w ) break; case 0x0a: - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); break; case 0x0c: - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); break; case 0x0e: @@ -793,13 +792,13 @@ static WRITE8_HANDLER( mappy_latch_w ) case 0x00: /* INT ON 2 */ cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); break; case 0x02: /* INT ON */ cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); break; case 0x04: /* FLIP */ @@ -816,7 +815,7 @@ static WRITE8_HANDLER( mappy_latch_w ) break; case 0x0a: /* SUB RESET */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); break; case 0x0c: /* n.c. */ diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index 41eabe49df7..cd49fd451fc 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -79,14 +79,14 @@ static WRITE8_HANDLER( mcu_portB_w ) /* clear coin interrupt */ if (data & 0x04) - cpunum_set_input_line(Machine, 1, M6805_IRQ_LINE, CLEAR_LINE ); + cpunum_set_input_line(machine, 1, M6805_IRQ_LINE, CLEAR_LINE ); /* AUDMUTE */ sound_global_enable((data >> 5) & 1); /* RES600 */ if (diff & 0x10) - cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); /* latch for lamps */ if ((diff & 0x40) && !(data & 0x40)) diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 1a5f6753668..ee5ca2d2469 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -36,7 +36,6 @@ TO DO: ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" static UINT8 *cfb_ram; @@ -284,7 +283,7 @@ static WRITE8_HANDLER( cfb_zpu_int_req_set_w ) { zpu_int_vector &= ~2; /* clear D1 on INTA (interrupt acknowledge) */ - cpunum_set_input_line(Machine, 0, 0, ASSERT_LINE); /* main cpu interrupt (comes from CFB (generated at the start of INT routine on CFB) - vblank?) */ + cpunum_set_input_line(machine, 0, 0, ASSERT_LINE); /* main cpu interrupt (comes from CFB (generated at the start of INT routine on CFB) - vblank?) */ } static READ8_HANDLER( cfb_zpu_int_req_clr ) @@ -293,7 +292,7 @@ static READ8_HANDLER( cfb_zpu_int_req_clr ) /* clear the INT line when there are no more interrupt requests */ if (zpu_int_vector==0xff) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); return 0; } @@ -584,7 +583,7 @@ static WRITE8_HANDLER(cfb_backgnd_color_w) bit0 = (data >> 0) & 0x01; b = combine_3_weights(weights_b, bit0, bit1, bit2); - palette_set_color(Machine, 255, MAKE_RGB(r, g, b)); + palette_set_color(machine, 255, MAKE_RGB(r, g, b)); //logerror("background color (port 01) write=%02x\n",data); } } @@ -977,7 +976,7 @@ UINT8 * rom = memory_region(REGION_CPU3) + (gfx_rom_bank * 0x2000) + 0x10000; b = combine_3_weights(weights_b, bit0, bit1, bit2); if ((x+y*16)<255)//keep color 255 free for use as background color - palette_set_color(Machine, x+y*16, MAKE_RGB(r, g, b)); + palette_set_color(machine, x+y*16, MAKE_RGB(r, g, b)); lookup_RAM[ lookup_offs + x + y*16 ] = colour; } @@ -1114,11 +1113,11 @@ static INTERRUPT_GEN( sound_interrupt ) static WRITE8_HANDLER( sound_int_clear_w ) { - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static WRITE8_HANDLER( sound_nmi_clear_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } static WRITE8_HANDLER( gg_led_ctrl_w ) diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index ed9b3e49007..b70c4012757 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -2262,13 +2262,13 @@ static WRITE16_HANDLER( megadriv_68k_req_z80_bus ) { //logerror("%06x: 68000 request z80 Bus (byte MSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_has_bus=0; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_HALT, ASSERT_LINE); } else { //logerror("%06x: 68000 return z80 Bus (byte MSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_has_bus=1; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_HALT, CLEAR_LINE); } } @@ -2278,13 +2278,13 @@ static WRITE16_HANDLER( megadriv_68k_req_z80_bus ) { //logerror("%06x: 68000 request z80 Bus (byte LSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_has_bus=0; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_HALT, ASSERT_LINE); } else { //logerror("%06x: 68000 return z80 Bus (byte LSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_has_bus=1; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_HALT, CLEAR_LINE); } } else // word access @@ -2293,13 +2293,13 @@ static WRITE16_HANDLER( megadriv_68k_req_z80_bus ) { //logerror("%06x: 68000 request z80 Bus (word access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_has_bus=0; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_HALT, ASSERT_LINE); } else { //logerror("%06x: 68000 return z80 Bus (byte LSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_has_bus=1; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_HALT, CLEAR_LINE); } } } @@ -2312,13 +2312,13 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset ) { //logerror("%06x: 68000 clear z80 reset (byte MSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_is_reset=0; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_RESET, CLEAR_LINE); } else { //logerror("%06x: 68000 start z80 reset (byte MSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_is_reset=1; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_RESET, ASSERT_LINE); sndti_reset(SOUND_YM2612, 0); } } @@ -2328,13 +2328,13 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset ) { //logerror("%06x: 68000 clear z80 reset (byte LSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_is_reset=0; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_RESET, CLEAR_LINE); } else { //logerror("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_is_reset=1; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_RESET, ASSERT_LINE); sndti_reset(SOUND_YM2612, 0); } @@ -2345,13 +2345,13 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset ) { //logerror("%06x: 68000 clear z80 reset (word access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_is_reset=0; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_RESET, CLEAR_LINE ); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_RESET, CLEAR_LINE ); } else { //logerror("%06x: 68000 start z80 reset (byte LSB access) %04x %04x\n", activecpu_get_pc(),data,mem_mask); genz80.z80_is_reset=1; - cpunum_set_input_line(Machine, genz80.z80_cpunum, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, genz80.z80_cpunum, INPUT_LINE_RESET, ASSERT_LINE); sndti_reset(SOUND_YM2612, 0); } } diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 91819ad0a01..049c8f5fc61 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -512,7 +512,7 @@ static READ8_HANDLER( megaplay_bios_6404_r ) static WRITE8_HANDLER( megaplay_bios_6404_w ) { if(((bios_6404 & 0x0c) == 0x00) && ((data & 0x0c) == 0x0c)) - cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, PULSE_LINE); bios_6404 = data; // logerror("BIOS: 0x6404 write: 0x%02x\n",data); diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index d0562006384..137f6f707a6 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -286,7 +286,7 @@ static READ16_HANDLER( ip_select_r ) static WRITE16_HANDLER( ip_select_w ) { COMBINE_DATA(&ip_select); - cpunum_set_input_line(Machine, 0,2,HOLD_LINE); + cpunum_set_input_line(machine, 0,2,HOLD_LINE); } @@ -2956,7 +2956,7 @@ static WRITE16_HANDLER( protection_peekaboo_w ) } } - cpunum_set_input_line(Machine, 0,4,HOLD_LINE); + cpunum_set_input_line(machine, 0,4,HOLD_LINE); } diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 46c72003239..a2d6424e9b9 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -78,7 +78,6 @@ Sonic Hedgehog 2 171-6215A 837-6963-62 610-0239-62 MPR-1 */ #include "driver.h" -#include "deprecat.h" #include "genesis.h" #include "rendlay.h" #include "megadriv.h" @@ -443,7 +442,7 @@ static WRITE8_HANDLER( megatech_cart_select_w ) mt_cart_select_reg = data; - megatech_select_game(Machine, mt_cart_select_reg); + megatech_select_game(machine, mt_cart_select_reg); /* if (mt_cart_select_reg==2) diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 6361aeb09de..5bdff22a9b7 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -7,7 +7,6 @@ To enter service mode, keep 1&2 pressed on reset ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "cpu/i8039/i8039.h" #include "cpu/z80/z80.h" @@ -76,13 +75,13 @@ static WRITE8_HANDLER( megazone_portB_w ) static WRITE8_HANDLER( megazone_i8039_irq_w ) { - cpunum_set_input_line(Machine, 2, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 2, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_and_status_w ) { if ((data & 0x80) == 0) - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE); i8039_status = (data & 0x70) >> 4; } diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index b88b98aa7ba..991f20385e3 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -31,7 +31,6 @@ Notes: it's important that REGION_USER1 is 0xa0000 bytes with empty space filled */ #include "driver.h" -#include "deprecat.h" #include "machine/8255ppi.h" #include "sound/ay8910.h" @@ -137,7 +136,7 @@ static WRITE8_HANDLER( palette_w ) // int bit = (i & 0x300)>>8; offset = ((i & 0x7f)<<3) | ((i & 0x80) >> 5); - palette_set_color_rgb(Machine,i, + palette_set_color_rgb(machine,i, pal4bit(BIT(paletteram[offset],0)*0x1 + BIT(paletteram[offset+1],0)*0x2 + BIT(paletteram[offset+2],0)*0x4 + BIT(paletteram[offset+3],0)*0x8), pal4bit(BIT(paletteram[offset],1)*0x1 + BIT(paletteram[offset+1],1)*0x2 + BIT(paletteram[offset+2],1)*0x4 + BIT(paletteram[offset+3],1)*0x8), pal4bit(BIT(paletteram[offset],2)*0x1 + BIT(paletteram[offset+1],2)*0x2 + BIT(paletteram[offset+2],2)*0x4 + BIT(paletteram[offset+3],2)*0x8)); diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 8140cb12653..77e7721ee91 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -64,12 +64,12 @@ static WRITE8_HANDLER( sharedram_w ) { sharedram[offset] = data; } static WRITE8_HANDLER( metlclsh_cause_irq ) { - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,ASSERT_LINE); } static WRITE8_HANDLER( metlclsh_ack_nmi ) { - cpunum_set_input_line(Machine, 0,INPUT_LINE_NMI,CLEAR_LINE); + cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,CLEAR_LINE); } static ADDRESS_MAP_START( metlclsh_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -115,17 +115,17 @@ ADDRESS_MAP_END static WRITE8_HANDLER( metlclsh_cause_nmi2 ) { - cpunum_set_input_line(Machine, 0,INPUT_LINE_NMI,ASSERT_LINE); + cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,ASSERT_LINE); } static WRITE8_HANDLER( metlclsh_ack_irq2 ) { - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,CLEAR_LINE); } static WRITE8_HANDLER( metlclsh_ack_nmi2 ) { - cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,CLEAR_LINE); + cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,CLEAR_LINE); } static WRITE8_HANDLER( metlclsh_flipscreen_w ) diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 3646e96c5ce..dc887429c7e 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -513,7 +513,7 @@ switch(offset) case 0x03: M68681.TBA = value; // Fill transmit buffer M68681.SRA |=0x0400; // Data has been sent - TX ready for more. - if(M68681.IMR & 1) cpunum_set_input_line_and_vector(Machine, 0,3, HOLD_LINE, M68681.IVR); // Generate an interrupt, if allowed. + if(M68681.IMR & 1) cpunum_set_input_line_and_vector(machine, 0,3, HOLD_LINE, M68681.IVR); // Generate an interrupt, if allowed. #if HOST_MONITOR_DISPLAY mame_printf_debug("%c",value); // Port A - Monitor @@ -541,9 +541,9 @@ switch(offset) // Write to sound board if(M68681.IMR & 0x1000) { - cpunum_set_input_line_and_vector(Machine, 0,3, HOLD_LINE, M68681.IVR); // Generate an interrupt, if allowed. + cpunum_set_input_line_and_vector(machine, 0,3, HOLD_LINE, M68681.IVR); // Generate an interrupt, if allowed. } - cpunum_set_input_line(Machine, 2, I8051_RX_LINE, ASSERT_LINE); // Generate 8031 interrupt + cpunum_set_input_line(machine, 2, I8051_RX_LINE, ASSERT_LINE); // Generate 8031 interrupt mame_printf_debug("Sound board TX: %4X at PC=%4X\n",value,activecpu_get_pc()); break; diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 02da9b0904b..2235375e62b 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -19,7 +19,6 @@ **************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms32031/tms32031.h" #include "cpu/adsp2100/adsp2100.h" #include "audio/dcs.h" @@ -147,7 +146,7 @@ static READ32_HANDLER( midvunit_adc_r ) { if (!(control_data & 0x40)) { - cpunum_set_input_line(Machine, 0, 3, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 3, CLEAR_LINE); return adc_data << adc_shift; } else diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index 925d74dd581..d6e8f13b4f4 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -17,7 +17,6 @@ MAIN BOARD: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/sn76496.h" @@ -50,7 +49,7 @@ static WRITE8_HANDLER( mikie_sh_irqtrigger_w ) if (last == 0 && data == 1) { // 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; diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index 773d397c7f6..44fa90e255d 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -607,7 +607,7 @@ static WRITE8_HANDLER( missile_w ) /* color RAM */ else if (offset >= 0x4b00 && offset < 0x4c00) - palette_set_color_rgb(Machine, offset & 7, pal1bit(~data >> 3), pal1bit(~data >> 2), pal1bit(~data >> 1)); + palette_set_color_rgb(machine, offset & 7, pal1bit(~data >> 3), pal1bit(~data >> 2), pal1bit(~data >> 1)); /* watchdog */ else if (offset >= 0x4c00 && offset < 0x4d00) @@ -618,7 +618,7 @@ static WRITE8_HANDLER( missile_w ) { if (irq_state) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); irq_state = 0; } } diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 339d9f9a34e..5ab655607cd 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -78,7 +78,7 @@ static WRITE16_HANDLER(ml_subreset_w) { //wrong if(activecpu_get_pc()==0x822) - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, PULSE_LINE); } static WRITE8_HANDLER( sound_bankswitch_w ) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index d2a3da84a8f..169384d9e1f 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -880,7 +880,7 @@ static WRITE16_HANDLER( snd_latch_to_68k_w ) if (fifo_wptr >= FIFO_SIZE) fifo_wptr = 0; // signal the 68000 that there's data waiting - cpunum_set_input_line(Machine, 1, 2, HOLD_LINE); + cpunum_set_input_line(machine, 1, 2, HOLD_LINE); // give the 68k time to reply cpu_spinuntil_time(ATTOTIME_IN_USEC(40)); } diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 6d5909f6935..cb832158480 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -42,7 +42,6 @@ Bucky: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index fe541e9b761..f9dc2a5d981 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -46,7 +46,7 @@ static INTERRUPT_GEN( mouser_nmi_interrupt ) static WRITE8_HANDLER( mouser_sound_interrupt_w ) { mouser_sound_byte = data; - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE); } static READ8_HANDLER( mouser_sound_byte_r ) diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index b3dde1b28ab..644c00bd8f0 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -1071,7 +1071,7 @@ static WRITE16_HANDLER( ef9369_w ) col = pal.clut[entry] & 0xfff; /* Update the MAME palette */ - palette_set_color_rgb(Machine, entry, pal4bit(col >> 0), pal4bit(col >> 4), pal4bit(col >> 8)); + palette_set_color_rgb(machine, entry, pal4bit(col >> 0), pal4bit(col >> 4), pal4bit(col >> 8)); } /* Address register auto-increment */ diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 4e70a29b808..1278b73bab5 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -127,7 +127,7 @@ static WRITE8_HANDLER( mrflea_main_w ){ static WRITE8_HANDLER( mrflea_io_w ){ mrflea_status |= 0x08; // pending command to IO CPU mrflea_io = data; - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE ); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE ); } static READ8_HANDLER( mrflea_main_r ){ diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 7bce088e1b6..cb8318eb436 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -289,7 +289,7 @@ static READ32_HANDLER( ms32_sound_r ) static WRITE32_HANDLER( reset_sub_w ) { - if(data) cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); // 0 too ? + if(data) cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); // 0 too ? } diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 36b8aa84c40..4cc5461e2da 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -7,7 +7,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" @@ -83,7 +82,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; } } diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index ab50e56db58..c8b5dbf6ba9 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -64,7 +64,7 @@ static WRITE8_HANDLER( mnchmobl_soundlatch_w ) static WRITE8_HANDLER( sound_nmi_ack_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c index 7a6a7cf2248..bc64e67bca0 100644 --- a/src/mame/drivers/mw8080bw.c +++ b/src/mame/drivers/mw8080bw.c @@ -141,7 +141,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "rendlay.h" #include "rescap.h" #include "mw8080bw.h" diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index cb8362482d8..aee79954ebe 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -39,7 +39,6 @@ Notes: */ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" static tilemap *bg_tilemap, *mlow_tilemap, *mhigh_tilemap, *tx_tilemap; @@ -124,7 +123,7 @@ static WRITE16_HANDLER( mwarr_brightness_w ) brightness = (double)(data & 0xff); for (i=0;i<0x800;i++) { - palette_set_brightness(Machine, i, brightness/255); + palette_set_brightness(machine, i, brightness/255); } } diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index f98445f8a64..3167f9d2924 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -395,17 +395,17 @@ DRIVER_INIT( tankfrce ); static WRITE8_HANDLER( namcos1_sub_firq_w ) { - cpunum_set_input_line(Machine, 1, M6809_FIRQ_LINE, ASSERT_LINE); + cpunum_set_input_line(machine, 1, M6809_FIRQ_LINE, ASSERT_LINE); } static WRITE8_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, cpu_getactivecpu(), 0, CLEAR_LINE); + cpunum_set_input_line(machine, cpu_getactivecpu(), 0, CLEAR_LINE); } static WRITE8_HANDLER( firq_ack_w ) { - cpunum_set_input_line(Machine, cpu_getactivecpu(), M6809_FIRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, cpu_getactivecpu(), M6809_FIRQ_LINE, CLEAR_LINE); } diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index ca155f99396..dff93e39a76 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1244,7 +1244,7 @@ static WRITE16_HANDLER( winrun_dsp_complete_w ) if( data ) { winrun_flushpoly(); - cpunum_set_input_line(Machine, 4, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 4, INPUT_LINE_RESET, PULSE_LINE); namcos21_ClearPolyFrameBuffer(); } } diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index d79db7fea8e..20c67ba93cb 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -175,7 +175,6 @@ TODO: *******************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6800/m6800.h" #include "sound/2151intf.h" #include "sound/namco.h" @@ -266,12 +265,12 @@ static READ8_HANDLER( dsw1_r ) static WRITE8_HANDLER( int_ack1_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( int_ack2_w ) { - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 026166b5bb9..c2f3550850d 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -309,7 +309,7 @@ static void audio_cpu_assert_nmi(void) static WRITE8_HANDLER( audio_cpu_clear_nmi_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 05f023a1462..e30fc51a140 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -191,7 +191,7 @@ static WRITE8_HANDLER( robokid_bankselect_w ) static WRITE8_HANDLER( ninjakd2_soundreset_w ) { // bit 4 resets sound CPU - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); // bit 7 flips screen flip_screen_set(data & 0x80); diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index 65b7ed566fd..6a912d86d5d 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -192,7 +192,7 @@ READ8_HANDLER( nycaptor_videoram_r ); static WRITE8_HANDLER( sub_cpu_halt_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, (data )? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, (data )? ASSERT_LINE : CLEAR_LINE); } static UINT8 snd_data; @@ -240,7 +240,7 @@ static READ8_HANDLER( nycaptor_bx_r ) static WRITE8_HANDLER( sound_cpu_reset_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data&1 )? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data&1 )? ASSERT_LINE : CLEAR_LINE); } static int vol_ctrl[16]; @@ -284,7 +284,7 @@ static WRITE8_HANDLER( nmi_enable_w ) sound_nmi_enable = 1; if (pending_nmi) { - cpunum_set_input_line(Machine, 2,INPUT_LINE_NMI,PULSE_LINE); + cpunum_set_input_line(machine, 2,INPUT_LINE_NMI,PULSE_LINE); pending_nmi = 0; } } diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index 76de7701e99..0222159b9bf 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -217,7 +217,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/vector.h" #include "video/avgdvg.h" #include "sound/ay8910.h" diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index 461afe7790e..4a5a1bfd974 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -68,7 +68,7 @@ static READ16_HANDLER( calendar_r ) { mame_system_time systime; - mame_get_base_datetime(Machine, &systime); + mame_get_base_datetime(machine, &systime); switch (offset) { diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index b0ca85fe9d4..3890dd194ce 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -175,7 +175,7 @@ static WRITE16_HANDLER( cpuA_ctrl_w ) if (ACCESSING_BITS_0_7) { /* bit 0 probably enables the second 68000 */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); /* bit 1 is clear during service mode - function unknown */ @@ -237,17 +237,17 @@ static READ16_HANDLER( overdriv_sound_1_r ) static WRITE16_HANDLER( overdriv_soundirq_w ) { - cpunum_set_input_line(Machine, 2,M6809_IRQ_LINE,HOLD_LINE); + cpunum_set_input_line(machine, 2,M6809_IRQ_LINE,HOLD_LINE); } static WRITE16_HANDLER( overdriv_cpuB_irq5_w ) { - cpunum_set_input_line(Machine, 1,5,HOLD_LINE); + cpunum_set_input_line(machine, 1,5,HOLD_LINE); } static WRITE16_HANDLER( overdriv_cpuB_irq6_w ) { - cpunum_set_input_line(Machine, 1,6,HOLD_LINE); + cpunum_set_input_line(machine, 1,6,HOLD_LINE); } diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index 4fae06f6e7b..e4e99c0b3f2 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -173,7 +173,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6800/m6800.h" #include "sound/namco.h" @@ -194,7 +193,7 @@ VIDEO_UPDATE( pacland ); static WRITE8_HANDLER( pacland_subreset_w ) { int bit = !BIT(offset,11); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( pacland_flipscreen_w ) @@ -233,7 +232,7 @@ static WRITE8_HANDLER( pacland_irq_1_ctrl_w ) int bit = !BIT(offset,11); cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( pacland_irq_2_ctrl_w ) @@ -241,7 +240,7 @@ static WRITE8_HANDLER( pacland_irq_2_ctrl_w ) int bit = !BIT(offset,13); cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index d13de59c2c9..e611626a35c 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -388,7 +388,7 @@ static MACHINE_RESET( mschamp ) static WRITE8_HANDLER( pacman_interrupt_vector_w ) { cpunum_set_input_line_vector(0, 0, data); - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index 89a3fa1159d..f2df4cba78f 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -14,7 +14,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "cpu/i8039/i8039.h" @@ -55,7 +54,7 @@ static WRITE8_HANDLER( pandoras_int_control_w ){ other bytes unknown */ switch (offset){ - case 0x00: if (!data) cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, CLEAR_LINE); + case 0x00: if (!data) cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, CLEAR_LINE); irq_enable_a = data; break; case 0x02: coin_counter_w(0,data & 0x01); @@ -64,10 +63,10 @@ static WRITE8_HANDLER( pandoras_int_control_w ){ break; case 0x05: pandoras_flipscreen_w(machine, 0, data); break; - case 0x06: if (!data) cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE); + case 0x06: if (!data) cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, CLEAR_LINE); irq_enable_b = data; break; - case 0x07: cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE); + case 0x07: cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE); break; default: @@ -77,7 +76,7 @@ static WRITE8_HANDLER( pandoras_int_control_w ){ static WRITE8_HANDLER( pandoras_cpua_irqtrigger_w ){ if (!firq_old_data_a && data){ - cpunum_set_input_line(Machine, 0,M6809_FIRQ_LINE,HOLD_LINE); + cpunum_set_input_line(machine, 0,M6809_FIRQ_LINE,HOLD_LINE); } firq_old_data_a = data; @@ -85,7 +84,7 @@ static WRITE8_HANDLER( pandoras_cpua_irqtrigger_w ){ static WRITE8_HANDLER( pandoras_cpub_irqtrigger_w ){ if (!firq_old_data_b && data){ - cpunum_set_input_line(Machine, 1,M6809_FIRQ_LINE,HOLD_LINE); + cpunum_set_input_line(machine, 1,M6809_FIRQ_LINE,HOLD_LINE); } firq_old_data_b = data; @@ -93,14 +92,14 @@ static WRITE8_HANDLER( pandoras_cpub_irqtrigger_w ){ static WRITE8_HANDLER( pandoras_i8039_irqtrigger_w ) { - cpunum_set_input_line(Machine, 3, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 3, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_and_status_w ) { /* bit 7 enables IRQ */ if ((data & 0x80) == 0) - cpunum_set_input_line(Machine, 3, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 3, 0, CLEAR_LINE); /* bit 5 goes to 8910 port A */ i8039_status = (data & 0x20) >> 5; @@ -108,7 +107,7 @@ static WRITE8_HANDLER( i8039_irqen_and_status_w ) static WRITE8_HANDLER( pandoras_z80_irqtrigger_w ) { - cpunum_set_input_line_and_vector(Machine, 2,0,HOLD_LINE,0xff); + cpunum_set_input_line_and_vector(machine, 2,0,HOLD_LINE,0xff); } diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index f4c945bf67d..62292e5f0f8 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -100,7 +100,7 @@ static READ8_HANDLER( parodius_sound_r ) static WRITE8_HANDLER( parodius_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); } #if 0 @@ -122,7 +122,7 @@ static TIMER_CALLBACK( nmi_callback ) static WRITE8_HANDLER( sound_arm_nmi_w ) { // sound_nmi_enabled = 1; - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); timer_set(ATTOTIME_IN_USEC(50), NULL,0,nmi_callback); /* kludge until the K053260 is emulated correctly */ } diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 4ff081d2080..63808dd769d 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -72,7 +72,6 @@ Notes: *********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "sound/okim6295.h" @@ -114,10 +113,10 @@ static WRITE16_HANDLER( pasha2_palette_w ) offset &= 0xff; color = (paletteram16[offset] >> 8) | (paletteram16[offset+0x100] & 0xff00); - palette_set_color_rgb(Machine,offset*2+0,pal5bit(color),pal5bit(color >> 5),pal5bit(color >> 10)); + palette_set_color_rgb(machine,offset*2+0,pal5bit(color),pal5bit(color >> 5),pal5bit(color >> 10)); color = (paletteram16[offset] & 0xff) | ((paletteram16[offset+0x100] & 0xff) << 8); - palette_set_color_rgb(Machine,offset*2+1,pal5bit(color),pal5bit(color >> 5),pal5bit(color >> 10)); + palette_set_color_rgb(machine,offset*2+1,pal5bit(color),pal5bit(color >> 5),pal5bit(color >> 10)); } static WRITE16_HANDLER( vbuffer_set_w ) diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index bb4c6532537..4d7344e3556 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -151,7 +151,6 @@ Stephh's log (2007.11.28) : ***********************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "cpu/i8051/i8051.h" #include "machine/i2cmem.h" @@ -258,7 +257,7 @@ static WRITE8_HANDLER( peplus_bgcolor_w ) bit2 = 0; b = 0x21 * bit2 + 0x47 * bit1 + 0x97 * bit0; - palette_set_color(Machine, (15 + (i*16)), MAKE_RGB(r, g, b)); + palette_set_color(machine, (15 + (i*16)), MAKE_RGB(r, g, b)); } } @@ -494,7 +493,7 @@ static READ32_HANDLER( peplus_external_ram_iaddr ) /* Last Color in Every Palette is bgcolor */ static READ8_HANDLER( peplus_bgcolor_r ) { - return palette_get_color(Machine, 15); // Return bgcolor from First Palette + return palette_get_color(machine, 15); // Return bgcolor from First Palette } static READ8_HANDLER( peplus_dropdoor_r ) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 1b2ec707856..f1d878a5a9b 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -345,7 +345,7 @@ static WRITE32_HANDLER( arm7_latch_arm_w ) #ifdef PGMARM7SPEEDHACK // cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100)); if (data!=0xaa) cpu_spinuntil_trigger(1000); - cpu_trigger(Machine, 1002); + cpu_trigger(machine, 1002); #else cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100)); cpu_spinuntil_time(ATTOTIME_IN_CYCLES(100, 0)); @@ -376,11 +376,11 @@ static WRITE16_HANDLER( arm7_latch_68k_w ) COMBINE_DATA(&arm7_latch); #ifdef PGMARM7SPEEDHACK - cpu_trigger(Machine, 1000); + cpu_trigger(machine, 1000); timer_set(ATTOTIME_IN_USEC(50), NULL, 0, arm_irq); // i don't know how long.. cpu_spinuntil_trigger(1002); #else - cpunum_set_input_line(Machine, 2, ARM7_FIRQ_LINE, PULSE_LINE); + cpunum_set_input_line(machine, 2, ARM7_FIRQ_LINE, PULSE_LINE); cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(200)); cpu_spinuntil_time(ATTOTIME_IN_CYCLES(200, 2)); // give the arm time to respond (just boosting the interleave doesn't help #endif @@ -419,8 +419,8 @@ static WRITE16_HANDLER ( z80_reset_w ) if(data == 0x5050) { sndti_reset(SOUND_ICS2115, 0); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); if(0) { FILE *out; out = fopen("z80ram.bin", "wb"); @@ -432,7 +432,7 @@ static WRITE16_HANDLER ( z80_reset_w ) { /* this might not be 100% correct, but several of the games (ddp2, puzzli2 etc. expect the z80 to be turned off during data uploads, they write here before the upload */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); } } @@ -487,11 +487,11 @@ static WRITE16_HANDLER( pgm_calendar_w ) { static mame_system_time systime; - mame_get_base_datetime(Machine, &systime); + mame_get_base_datetime(machine, &systime); // initialize the time, otherwise it crashes if( !systime.time ) - mame_get_base_datetime(Machine, &systime); + mame_get_base_datetime(machine, &systime); CalCom <<= 1; CalCom |= data & 1; @@ -540,7 +540,7 @@ static WRITE16_HANDLER( pgm_calendar_w ) break; case 0xf: //Load Date - mame_get_base_datetime(Machine, &systime); + mame_get_base_datetime(machine, &systime); break; } } diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 989a6cad3d1..5c4eb295db4 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -201,7 +201,7 @@ static WRITE8_HANDLER( sound_command_nonmi_w ) static WRITE8_HANDLER( pending_command_clear_w ) { pending_command = 0; - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 10956236c82..32c27a57dc5 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -187,7 +187,7 @@ static WRITE8_HANDLER(vram2_w) if(offset<0x300) { offset&=0xff; - palette_set_color_rgb(Machine, offset, pal6bit(palram[offset]), pal6bit(palram[offset+0x100]), pal6bit(palram[offset+0x200])); + palette_set_color_rgb(machine, offset, pal6bit(palram[offset]), pal6bit(palram[offset+0x100]), pal6bit(palram[offset+0x200])); } } } diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index bd1fbf9d8f8..a950a5a2812 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -87,7 +87,7 @@ static WRITE16_HANDLER( pkscramble_output_w ) if (!(out & 0x2000) && interrupt_line_active) { - cpunum_set_input_line(Machine, 0, 1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 1, CLEAR_LINE); interrupt_line_active = 0; } diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index 5efeb785b9b..de80fd4ced4 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -54,7 +54,6 @@ bootleg todo: */ #include "driver.h" -#include "deprecat.h" #include "decocrpt.h" #include "decoprot.h" #include "deco16ic.h" @@ -125,7 +124,7 @@ static WRITE16_HANDLER( paletteram16_xRGB_w ) g = ((paldat & 0x0000ff00) >>8); b = ((paldat & 0x00ff0000) >>16); - palette_set_color(Machine,pen,MAKE_RGB(r,g,b)); + palette_set_color(machine,pen,MAKE_RGB(r,g,b)); } static READ16_HANDLER( pckgaldx_protection_r ) diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 3f8b66084a8..f2bf8705925 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -187,7 +187,7 @@ static WRITE32_HANDLER( sound_w ) static WRITE32_HANDLER( sound_irq_w ) { - cpunum_set_input_line(Machine, 2, 0, HOLD_LINE); + cpunum_set_input_line(machine, 2, 0, HOLD_LINE); } diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 60bdd372e5d..d1fed8eded3 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -263,7 +263,7 @@ static WRITE16_HANDLER( pntnpuzl_palette_w ) rgb[sub++] = data & 0xff; if (sub == 3) { - palette_set_color_rgb(Machine,indx++,pal6bit(rgb[0]),pal6bit(rgb[1]),pal6bit(rgb[2])); + palette_set_color_rgb(machine,indx++,pal6bit(rgb[0]),pal6bit(rgb[1]),pal6bit(rgb[2])); sub = 0; if (indx == 256) indx = 0; } diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 2baa598f01e..e3db722fa96 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -373,7 +373,7 @@ static WRITE16_HANDLER( polepos_z8002_nvi_enable_w ) cpu_interrupt_enable(which,data); if (!data) - cpunum_set_input_line(Machine, which, 0, CLEAR_LINE); + cpunum_set_input_line(machine, which, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index cbc6f8c104b..98a598f2099 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -5,7 +5,6 @@ Atari Poolshark Driver ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "poolshrk.h" #include "sound/discrete.h" @@ -91,7 +90,7 @@ static READ8_HANDLER( poolshrk_input_r ) static READ8_HANDLER( poolshrk_irq_reset_r ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c index b1a066113a2..df5d4f95395 100644 --- a/src/mame/drivers/pooyan.c +++ b/src/mame/drivers/pooyan.c @@ -9,7 +9,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "pooyan.h" #include "audio/timeplt.h" @@ -44,7 +43,7 @@ static WRITE8_HANDLER( irq_enable_w ) { irq_enable = data & 1; if (!irq_enable) - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); } diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index 0049e59d400..8e095af5c48 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -150,7 +150,7 @@ static READ8_HANDLER( popper_input_ports_r ) static READ8_HANDLER( popper_soundcpu_nmi_r ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); return 0; } diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index ad20d2aebd5..3be1f8253f5 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -381,7 +381,7 @@ static READ8_HANDLER( psikyo_soundlatch_r ) static WRITE8_HANDLER( psikyo_clear_nmi_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); z80_nmi = 0; } diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 9781dbe3c39..ccdd400ab0f 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -256,8 +256,8 @@ static WRITE32_HANDLER( ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_ g = ((paletteram32[offset] & 0x00ff0000) >>16); r = ((paletteram32[offset] & 0xff000000) >>24); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); - palette_set_color(Machine,offset+0x800,MAKE_RGB(r,g,b)); // For screen 2 + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset+0x800,MAKE_RGB(r,g,b)); // For screen 2 } static WRITE32_HANDLER( ps4_bgpen_1_dword_w ) @@ -269,7 +269,7 @@ static WRITE32_HANDLER( ps4_bgpen_1_dword_w ) g = ((bgpen_1[0] & 0x00ff0000) >>16); r = ((bgpen_1[0] & 0xff000000) >>24); - palette_set_color(Machine,0x1000,MAKE_RGB(r,g,b)); // Clear colour for screen 1 + palette_set_color(machine,0x1000,MAKE_RGB(r,g,b)); // Clear colour for screen 1 } static WRITE32_HANDLER( ps4_bgpen_2_dword_w ) @@ -281,7 +281,7 @@ static WRITE32_HANDLER( ps4_bgpen_2_dword_w ) g = ((bgpen_2[0] & 0x00ff0000) >>16); r = ((bgpen_2[0] & 0xff000000) >>24); - palette_set_color(Machine,0x1001,MAKE_RGB(r,g,b)); // Clear colour for screen 2 + palette_set_color(machine,0x1001,MAKE_RGB(r,g,b)); // Clear colour for screen 2 } static WRITE32_HANDLER( ps4_screen1_brt_w ) @@ -299,7 +299,7 @@ static WRITE32_HANDLER( ps4_screen1_brt_w ) int i; for (i = 0; i < 0x800; i++) - palette_set_brightness(Machine,i,brt1); + palette_set_brightness(machine,i,brt1); oldbrt1 = brt1; } @@ -326,7 +326,7 @@ static WRITE32_HANDLER( ps4_screen2_brt_w ) int i; for (i = 0x800; i < 0x1000; i++) - palette_set_brightness(Machine,i,brt2); + palette_set_brightness(machine,i,brt2); oldbrt2 = brt2; } diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 69ae8392c3e..23423b24727 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -431,7 +431,7 @@ static WRITE32_HANDLER( paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w ) g = ((paletteram32[offset] & 0x00ff0000) >>16); r = ((paletteram32[offset] & 0xff000000) >>24); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } static WRITE32_HANDLER( psikyosh_vidregs_w ) diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index d6f5eaafd51..f2d32c17c50 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -104,7 +104,6 @@ DIP locations verified for: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "sound/vlm5030.h" #include "sound/nes_apu.h" @@ -167,9 +166,9 @@ static WRITE8_HANDLER( punchout_speech_vcu_w ) static WRITE8_HANDLER( punchout_2a03_reset_w ) { if (data & 1) - 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); } static int prot_mode_sel = -1; /* Mode selector */ diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index c5209ecd9b6..51d634e92af 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -63,7 +63,7 @@ static WRITE16_HANDLER( pushman_68705_w ) if (offset==1) { - cpunum_set_input_line(Machine, 2,M68705_IRQ_LINE,HOLD_LINE); + cpunum_set_input_line(machine, 2,M68705_IRQ_LINE,HOLD_LINE); cpu_spin(); new_latch=0; } diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 093f2b1c1f2..2bc50993c2f 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -473,7 +473,7 @@ static WRITE32_HANDLER( rabbit_paletteram_dword_w ) r = ((paletteram32[offset] & 0x0000ff00) >>8); g = ((paletteram32[offset] & 0x00ff0000) >>16); - palette_set_color(Machine,offset^0xff,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset^0xff,MAKE_RGB(r,g,b)); } static READ32_HANDLER( rabbit_tilemap0_r ) @@ -792,7 +792,7 @@ static WRITE32_HANDLER( tmmjprd_paletteram_dword_w ) r = ((paletteram32[offset] & 0x0000ff00) >>8); g = ((paletteram32[offset] & 0x00ff0000) >>16); - palette_set_color(Machine,(offset^0xff)+0x2000,MAKE_RGB(r,g,b)); + palette_set_color(machine,(offset^0xff)+0x2000,MAKE_RGB(r,g,b)); } diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index f6e1675084f..757085d993a 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -268,7 +268,7 @@ static WRITE16_HANDLER( jumping_sound_w ) if (ACCESSING_BITS_0_7) { jumping_latch = data & 0xff; /*M68000 writes .b to $400007*/ - cpunum_set_input_line(Machine, 1,0,HOLD_LINE); + cpunum_set_input_line(machine, 1,0,HOLD_LINE); } } diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index a738cbd0e82..219e041f4d6 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -183,7 +183,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "audio/timeplt.h" #include "sound/namco.h" #include "sound/samples.h" @@ -208,7 +207,7 @@ VIDEO_UPDATE( locomotn ); static WRITE8_HANDLER( rallyx_interrupt_vector_w ) { cpunum_set_input_line_vector(0, 0, data); - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } @@ -237,7 +236,7 @@ static WRITE8_HANDLER( rallyx_latch_w ) case 0x01: /* INT ON */ cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); break; case 0x02: /* SOUND ON */ diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c index 905fee9c55b..8e5ff663963 100644 --- a/src/mame/drivers/redalert.c +++ b/src/mame/drivers/redalert.c @@ -68,7 +68,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "redalert.h" @@ -96,7 +95,7 @@ static INTERRUPT_GEN( redalert_vblank_interrupt ) static READ8_HANDLER( redalert_interrupt_clear_r ) { - cpunum_set_input_line(Machine, 0, M6502_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 0, M6502_IRQ_LINE, CLEAR_LINE); /* the result never seems to be actually used */ return video_screen_get_vpos(machine->primary_screen); diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index ff5aa044315..910eff19e15 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -21,7 +21,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" extern WRITE8_HANDLER( redclash_videoram_w ); @@ -53,7 +52,7 @@ static INTERRUPT_GEN( redclash_interrupt ) static WRITE8_HANDLER( irqack_w ) { - cpunum_set_input_line(Machine, 0,0,CLEAR_LINE); + cpunum_set_input_line(machine, 0,0,CLEAR_LINE); } diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index 254ce191e8a..cdb8918e0a7 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -66,19 +66,19 @@ static UINT8 cpu2_m6000=0; static WRITE8_HANDLER( cpu1_reset_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( cpu2_reset_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( mcu_reset_w ) { /* the bootlegs don't have a MCU, so make sure it's there before trying to reset it */ if (cpu_gettotalcpu() >= 4) - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( cpu2_m6000_w ) @@ -103,7 +103,7 @@ static WRITE8_HANDLER( irq0_ack_w ) cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( irq1_ack_w ) @@ -112,7 +112,7 @@ static WRITE8_HANDLER( irq1_ack_w ) cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static WRITE8_HANDLER( coincounter_w ) diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index b5dedb8147c..592eaa9364b 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -48,7 +48,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "cpu/hd6309/hd6309.h" #include "video/konamiic.h" diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index c3a2dea356e..181d7244ace 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -7,7 +7,6 @@ driver by Nicola Salmoria ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */ #include "machine/eeprom.h" @@ -57,7 +56,7 @@ static READ8_HANDLER( rollerg_sound_r ) static WRITE8_HANDLER( soundirq_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); } static TIMER_CALLBACK( nmi_callback ) @@ -67,7 +66,7 @@ static TIMER_CALLBACK( nmi_callback ) static WRITE8_HANDLER( sound_arm_nmi_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); timer_set(ATTOTIME_IN_USEC(50), NULL,0,nmi_callback); /* kludge until the K053260 is emulated correctly */ } diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index c05d77fe4b3..b37919220fa 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -194,7 +194,7 @@ static WRITE16_HANDLER( sound_command_w ) static READ8_HANDLER( sound_command_r ) { sound_busy = 0; - cpunum_set_input_line(Machine, 1, 0, (ym2151_irq | sound_busy) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, (ym2151_irq | sound_busy) ? ASSERT_LINE : CLEAR_LINE); return sound_data; } diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c index fe26ef6f884..d3eb0fea7ed 100644 --- a/src/mame/drivers/runaway.c +++ b/src/mame/drivers/runaway.c @@ -11,7 +11,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/atari_vg.h" #include "sound/pokey.h" @@ -81,7 +80,7 @@ static WRITE8_HANDLER( runaway_led_w ) static WRITE8_HANDLER( runaway_irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 7257f93a061..86576b3e684 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -36,7 +36,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "cpu/m68000/m68000.h" @@ -163,7 +162,7 @@ static WRITE16_HANDLER( rng_sysregs_w ) } if (!(data & 0x40)) - cpunum_set_input_line(Machine, 0, MC68000_IRQ_5, CLEAR_LINE); + cpunum_set_input_line(machine, 0, MC68000_IRQ_5, CLEAR_LINE); break; case 0x0c/2: @@ -193,7 +192,7 @@ static WRITE16_HANDLER( sound_cmd2_w ) static WRITE16_HANDLER( sound_irq_w ) { if (ACCESSING_BITS_8_15) - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE); } static READ16_HANDLER( sound_status_msb_r ) @@ -266,7 +265,7 @@ static WRITE8_HANDLER( z80ctrl_w ) memory_set_bankptr(2, memory_region(REGION_CPU2) + 0x10000 + (data & 0x07) * 0x4000); if (data & 0x10) - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } static INTERRUPT_GEN(audio_interrupt) diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index a9c27c6f2e6..cee4145f293 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -16,7 +16,6 @@ MAIN BOARD: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/vlm5030.h" #include "sound/dac.h" @@ -45,7 +44,7 @@ READ8_HANDLER( hyperspt_sh_timer_r ); static WRITE8_HANDLER( sbasketb_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); } static WRITE8_HANDLER( sbasketb_coin_counter_w ) diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index b071a3c144f..13b0a9f40e1 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -139,7 +139,7 @@ static TIMER_CALLBACK( scanline_callback ) static WRITE8_HANDLER( irq_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index f23de677553..a85534e4154 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/2203intf.h" extern UINT8 *scotrsht_scroll; diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index 2881e910089..1968b3d91f4 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -659,7 +659,7 @@ static WRITE32_HANDLER( interrupt_config_w ) /* VBLANK: clear anything pending on the old IRQ */ if (vblank_irq_num != 0) - cpunum_set_input_line(Machine, 0, vblank_irq_num, CLEAR_LINE); + cpunum_set_input_line(machine, 0, vblank_irq_num, CLEAR_LINE); /* VBLANK: compute the new IRQ vector */ irq = (*interrupt_config >> (2*VBLANK_IRQ_SHIFT)) & 3; @@ -670,7 +670,7 @@ static WRITE32_HANDLER( interrupt_config_w ) { /* Widget: clear anything pending on the old IRQ */ if (widget.irq_num != 0) - cpunum_set_input_line(Machine, 0, widget.irq_num, CLEAR_LINE); + cpunum_set_input_line(machine, 0, widget.irq_num, CLEAR_LINE); /* Widget: compute the new IRQ vector */ irq = (*interrupt_config >> (2*WIDGET_IRQ_SHIFT)) & 3; @@ -682,7 +682,7 @@ static WRITE32_HANDLER( interrupt_config_w ) { /* Ethernet: clear anything pending on the old IRQ */ if (ethernet_irq_num != 0) - cpunum_set_input_line(Machine, 0, ethernet_irq_num, CLEAR_LINE); + cpunum_set_input_line(machine, 0, ethernet_irq_num, CLEAR_LINE); /* Ethernet: compute the new IRQ vector */ irq = (*interrupt_config >> (2*ETHERNET_IRQ_SHIFT)) & 3; diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 49b159eea9b..3d658db2c21 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -81,7 +81,6 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "genesis.h" @@ -280,7 +279,7 @@ static WRITE16_HANDLER( palette_w ) b = ((newword >> 7) & 0x1e) | ((newword >> 14) & 0x01); /* set the color */ - palette_set_color_rgb(Machine, offset, pal5bit(r), pal5bit(g), pal5bit(b)); + palette_set_color_rgb(machine, offset, pal5bit(r), pal5bit(g), pal5bit(b)); } diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 9363846cef4..13e0fe1c482 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -278,7 +278,7 @@ static WRITE8_HANDLER( tilemap_sound_w ) /* D2 : SCONT1 - Tilemap origin bit 1 */ /* D1 : SCONT0 - Tilemap origin bit 0 */ /* D0 : MUTE (1= audio on, 0= audio off) */ - cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); segaic16_tilemap_set_colscroll(0, ~data & 0x04); segaic16_tilemap_set_rowscroll(0, ~data & 0x02); sound_global_enable(data & 0x01); @@ -291,8 +291,8 @@ static WRITE8_HANDLER( sub_control_adc_w ) /* D6 : INTR line on second CPU */ /* D5 : RESET line on second CPU */ /* D3-D2 : ADC_SELECT */ - cpunum_set_input_line(Machine, 1, 4, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, 4, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE); adc_select = (data >> 2) & 3; } diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 357ee5f245e..551ace4953d 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -196,7 +196,7 @@ static WRITE8_HANDLER( astron_COLOR_write ) g = (lowBits & 0xf0) >> 4; b = (highBits & 0x0f); - /* palette_set_color(Machine, palIndex, r, g, b); */ + /* palette_set_color(machine, palIndex, r, g, b); */ logerror("COLOR write : 0x%04x @ 0x%04x [0x%x]\n", data, offset, activecpu_get_pc()); } diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 1887921a4c2..a3fcc5575f6 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -144,7 +144,6 @@ Tetris - - - - EPR12169 EPR12170 - */ #include "driver.h" -#include "deprecat.h" #include "system16.h" #include "machine/8255ppi.h" #include "cpu/i8039/i8039.h" @@ -376,7 +375,7 @@ static WRITE8_HANDLER( tilemap_sound_w ) 0= Sound is disabled 1= sound is enabled */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); segaic16_tilemap_set_colscroll(0, ~data & 0x04); segaic16_tilemap_set_rowscroll(0, ~data & 0x02); } @@ -428,8 +427,8 @@ static WRITE8_HANDLER( n7751_control_w ) D1 = /RESET line on 7751 D0 = /IRQ line on 7751 */ - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); - cpunum_set_input_line(Machine, 2, 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(100)); } diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 1a850f252e3..bbdfc74abf8 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1334,7 +1334,7 @@ static void upd7759_generate_nmi(int state) static WRITE8_HANDLER( mcu_data_w ) { mcu_data = data; - cpunum_set_input_line(Machine, 2, 1, PULSE_LINE); + cpunum_set_input_line(machine, 2, 1, PULSE_LINE); } #endif diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index a9264ad3c3f..d3e97faf7b4 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -352,7 +352,7 @@ static WRITE16_HANDLER( iochip_0_w ) */ if (((oldval ^ data) & 0x40) && !(data & 0x40)) watchdog_reset_w(machine,0,0); segaic16_set_display_enable(data & 0x20); - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); return; case 3: diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index 62c2c780012..305bb3de7c3 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -315,9 +315,9 @@ static WRITE16_HANDLER( io_chip_w ) */ segaic16_set_display_enable(data & 0x80); if (((old ^ data) & 0x20) && !(data & 0x20)) watchdog_reset_w(machine,0,0); - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE); - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x04) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x04) ? ASSERT_LINE : CLEAR_LINE); break; /* mute */ diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 58f1d9b7fd7..518137a5bc6 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -841,7 +841,7 @@ static READ32_HANDLER( sound_fifo_status_r ) static READ32_HANDLER( spi_int_r ) { - cpunum_set_input_line(Machine, 0, 0,CLEAR_LINE ); + cpunum_set_input_line(machine, 0, 0,CLEAR_LINE ); return 0xffffffff; } @@ -913,9 +913,9 @@ logerror("z80 data = %08x mask = %08x\n",data,mem_mask); if( ACCESSING_BITS_0_7 ) { if( data & 0x1 ) { z80_prg_fifo_pos = 0; - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE ); } else { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE ); } } } diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index 653462150df..91c7dd6e14e 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -43,7 +43,6 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -107,8 +106,8 @@ static WRITE8_HANDLER( friskyt_portB_w ) if (((portb & 4) == 0) && (data & 4)) { /* reset and start the protection mcu */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); } /* other bits unknown */ diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index 3c4c95948c8..9e0bb9eb93c 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -69,7 +69,6 @@ I/O read/write ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "sound/sn76496.h" @@ -155,7 +154,7 @@ static WRITE8_HANDLER( paletteram_IIBBGGRR_w ) b = (data >> 2) & 0x0c; if (b) b |= i; - palette_set_color_rgb(Machine,offset,pal4bit(r),pal4bit(g),pal4bit(b)); + palette_set_color_rgb(machine,offset,pal4bit(r),pal4bit(g),pal4bit(b)); } diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 63ccb009019..47903117692 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1497,7 +1497,7 @@ static WRITE16_HANDLER( sub_ctrl_w ) if (ACCESSING_BITS_0_7) { if ( !(old_data&1) && (data&1) ) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); old_data = data; } break; @@ -2704,7 +2704,7 @@ static READ8_HANDLER( wiggie_soundlatch_r ) static WRITE16_HANDLER( wiggie_soundlatch_w ) { wiggie_soundlatch = data >> 8; - cpunum_set_input_line(Machine, 1,0, HOLD_LINE); + cpunum_set_input_line(machine, 1,0, HOLD_LINE); } diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c index 8fe06e9826f..1c9bbf7cf88 100644 --- a/src/mame/drivers/sgladiat.c +++ b/src/mame/drivers/sgladiat.c @@ -20,7 +20,6 @@ AT08XX03: */ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "snk.h" #include "sound/ay8910.h" @@ -75,7 +74,7 @@ static READ8_HANDLER( sgladiat_soundlatch_r ) static READ8_HANDLER( sgladiat_sound_nmi_ack_r ) { -// cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, CLEAR_LINE); +// cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index e4601d229f0..7f6c7cedf52 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -49,7 +49,6 @@ Games by Nihon Game/Culture Brain: */ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -80,18 +79,18 @@ static WRITE8_HANDLER( shangkid_maincpu_bank_w ) static WRITE8_HANDLER( shangkid_bbx_enable_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, data?0:1 ); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, data?0:1 ); } static WRITE8_HANDLER( shangkid_cpu_reset_w ) { if( data == 0 ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); } else if( data == 1 ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, PULSE_LINE); } } @@ -115,7 +114,7 @@ static WRITE8_HANDLER( chinhero_bbx_AY8910_write_w ) { if( data == 0x01 ) /* 0->1 transition triggers interrupt on Sound CPU */ - cpunum_set_input_line(Machine, 2, 0, HOLD_LINE ); + cpunum_set_input_line(machine, 2, 0, HOLD_LINE ); } break; @@ -138,7 +137,7 @@ static WRITE8_HANDLER( shangkid_bbx_AY8910_write_w ) { if( data == 0x01 ) /* 0->1 transition triggers interrupt on Sound CPU */ - cpunum_set_input_line(Machine, 2, 0, HOLD_LINE ); + cpunum_set_input_line(machine, 2, 0, HOLD_LINE ); } else memory_set_bank(2, data ? 0 : 1); diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index a5e12c9ae23..6e1dde3f6ee 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -82,7 +82,6 @@ PROM : Type MB7051 #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "video/resnet.h" @@ -221,13 +220,13 @@ static WRITE8_HANDLER( shougi_watchdog_reset_w ) static WRITE8_HANDLER( shougi_mcu_halt_off_w ) { /* logerror("mcu HALT OFF"); */ - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, CLEAR_LINE); } static WRITE8_HANDLER( shougi_mcu_halt_on_w ) { /* logerror("mcu HALT ON"); */ - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT,ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT,ASSERT_LINE); } @@ -238,8 +237,8 @@ static WRITE8_HANDLER( nmi_disable_and_clear_line_w ) nmi_enabled = 0; /* disable NMIs */ /* NMI lines are tied together on both CPUs and connected to the LS74 /Q output */ - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } static WRITE8_HANDLER( nmi_enable_w ) diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index a60c0b946d2..76a2a4f7a79 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -49,7 +49,7 @@ static WRITE8_HANDLER( sidepckt_i8751_w ) static const int table_3[]={0xbd,0x73,0x80,0xbd,0x73,0xa7,0xbd,0x73,0xe0,0x7e,0x72,0x56,0xff,0xff,0xff,0xff}; static int current_ptr=0,current_table=0,in_math=0,math_param; - cpunum_set_input_line(Machine, 0,M6809_FIRQ_LINE,HOLD_LINE); /* i8751 triggers FIRQ on main cpu */ + cpunum_set_input_line(machine, 0,M6809_FIRQ_LINE,HOLD_LINE); /* i8751 triggers FIRQ on main cpu */ /* This function takes multiple parameters */ if (in_math==1) { @@ -90,7 +90,7 @@ static WRITE8_HANDLER( sidepctj_i8751_w ) static const int table_3[]={0xbd,0x71,0xc8,0xbd,0x71,0xef,0xbd,0x72,0x28,0x7e,0x70,0x9e,0xff,0xff,0xff,0xff}; static int current_ptr=0,current_table=0,in_math,math_param; - cpunum_set_input_line(Machine, 0,M6809_FIRQ_LINE,HOLD_LINE); /* i8751 triggers FIRQ on main cpu */ + cpunum_set_input_line(machine, 0,M6809_FIRQ_LINE,HOLD_LINE); /* i8751 triggers FIRQ on main cpu */ /* This function takes multiple parameters */ if (in_math==1) { diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 447bce2fc23..080976f1a99 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "sound/2151intf.h" #include "sound/okim6295.h" @@ -142,7 +141,7 @@ VIDEO_UPDATE(silkroad); static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) { COMBINE_DATA(&paletteram32[offset]); - palette_set_color_rgb(Machine,offset,pal5bit(paletteram32[offset] >> (10+16)),pal5bit(paletteram32[offset] >> (5+16)),pal5bit(paletteram32[offset] >> (0+16))); + palette_set_color_rgb(machine,offset,pal5bit(paletteram32[offset] >> (10+16)),pal5bit(paletteram32[offset] >> (5+16)),pal5bit(paletteram32[offset] >> (0+16))); } /* player inputs */ diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index ff77d8f4b15..518f4d19089 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -91,7 +91,6 @@ Are the OKI M6295 clocks from Heavy Smash are correct at least for the Mitchell extern void decrypt156(void); #include "driver.h" -#include "deprecat.h" #include "decocrpt.h" #include "deco32.h" #include "cpu/arm/arm.h" @@ -164,7 +163,7 @@ static WRITE32_HANDLER( simpl156_palette_w ) color = offset; dat = paletteram16[offset]&0xffff; - palette_set_color_rgb(Machine,color,pal5bit(dat >> 0),pal5bit(dat >> 5),pal5bit(dat >> 10)); + palette_set_color_rgb(machine,color,pal5bit(dat >> 0),pal5bit(dat >> 5),pal5bit(dat >> 10)); } diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 02fdca1c0c2..214c60ef6b1 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -85,7 +85,7 @@ static TIMER_CALLBACK( nmi_callback ) static WRITE8_HANDLER( z80_arm_nmi_w ) { // sound_nmi_enabled = 1; - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); timer_set(ATTOTIME_IN_USEC(25), NULL,0,nmi_callback); /* kludge until the K053260 is emulated correctly */ } diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index a5f11717971..848e595fe0d 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -14,7 +14,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6800/m6800.h" #include "sound/namco.h" @@ -80,7 +79,7 @@ static WRITE8_HANDLER( skykid_led_w ) static WRITE8_HANDLER( skykid_subreset_w ) { int bit = !BIT(offset,11); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( skykid_bankswitch_w ) @@ -93,7 +92,7 @@ static WRITE8_HANDLER( skykid_irq_1_ctrl_w ) int bit = !BIT(offset,11); cpu_interrupt_enable(0,bit); if (!bit) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( skykid_irq_2_ctrl_w ) @@ -101,7 +100,7 @@ static WRITE8_HANDLER( skykid_irq_2_ctrl_w ) int bit = !BIT(offset,13); cpu_interrupt_enable(1,bit); if (!bit) - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static MACHINE_START( skykid ) diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 5542bf7bb28..e2b7ae7e3b3 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -9,7 +9,6 @@ *************************************************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" static tilemap *tmap, *tmap2; @@ -123,7 +122,7 @@ static WRITE8_HANDLER( skylncr_paletteram_w ) paletteram[color] = data; r = paletteram[(color/3*3)+0]; g = paletteram[(color/3*3)+1]; b = paletteram[(color/3*3)+2]; r = (r << 2) | (r >> 4); g = (g << 2) | (g >> 4); b = (b << 2) | (b >> 4); - palette_set_color(Machine,color/3,MAKE_RGB(r,g,b)); + palette_set_color(machine,color/3,MAKE_RGB(r,g,b)); color = (color + 1) % (0x100*3); } } @@ -142,7 +141,7 @@ static WRITE8_HANDLER( skylncr_paletteram2_w ) paletteram_2[color] = data; r = paletteram_2[(color/3*3)+0]; g = paletteram_2[(color/3*3)+1]; b = paletteram_2[(color/3*3)+2]; r = (r << 2) | (r >> 4); g = (g << 2) | (g >> 4); b = (b << 2) | (b >> 4); - palette_set_color(Machine,0x100 + color/3,MAKE_RGB(r,g,b)); + palette_set_color(machine,0x100 + color/3,MAKE_RGB(r,g,b)); color = (color + 1) % (0x100*3); } } diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 6c24a652dc2..cdd810df399 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -171,7 +171,7 @@ static WRITE16_HANDLER( color_ram_word_w ) g = (color_ram[offset] &0xff00) >> 8; b = (color_ram[offset] &0xff); - palette_set_color(Machine,offset/2,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset/2,MAKE_RGB(r,g,b)); } } @@ -218,7 +218,7 @@ static READ16_HANDLER( opwolf3_adc_r ) static WRITE16_HANDLER( opwolf3_adc_req_w ) { /* 4 writes a frame - one for each analogue port */ - cpunum_set_input_line(Machine, 0,3,HOLD_LINE); + cpunum_set_input_line(machine, 0,3,HOLD_LINE); } /***************************************************** diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index fedbf3bd2ac..938ff2dda99 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -71,7 +71,7 @@ static WRITE8_HANDLER( sonson_sh_irqtrigger_w ) if (last == 0 && data == 1) { /* setting bit 0 low then high triggers IRQ on the sound CPU */ - cpunum_set_input_line(Machine, 1,M6809_FIRQ_LINE,HOLD_LINE); + cpunum_set_input_line(machine, 1,M6809_FIRQ_LINE,HOLD_LINE); } last = data; diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 442db280cb1..e13b64f3dd1 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/sn76496.h" @@ -256,14 +255,14 @@ int rgbcolor; { /* palette 1 */ int col_ind = offset & 0x1f; - palette_set_color_rgb(Machine, 0x10 + 0x00 + col_ind, pal3bit(rgbcolor >> 0), pal3bit(rgbcolor >> 6), pal3bit(rgbcolor >> 3)); + palette_set_color_rgb(machine, 0x10 + 0x00 + col_ind, pal3bit(rgbcolor >> 0), pal3bit(rgbcolor >> 6), pal3bit(rgbcolor >> 3)); } else if ((offset>=0x300) && (offset<0x320)) /* 0xa300- 0xa31f */ { /* palette 2 */ int col_ind = offset & 0x1f; - palette_set_color_rgb(Machine, 0x10 + 0x00 + col_ind, pal3bit(rgbcolor >> 0), pal3bit(rgbcolor >> 6), pal3bit(rgbcolor >> 3)); + palette_set_color_rgb(machine, 0x10 + 0x00 + col_ind, pal3bit(rgbcolor >> 0), pal3bit(rgbcolor >> 6), pal3bit(rgbcolor >> 3)); } else logerror("palette? read from unkram offset = %04x\n",offset); diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index 0dfd4edf6ff..2c17f96298e 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -75,7 +75,7 @@ static READ8_HANDLER( spcforce_t0_r ) static WRITE8_HANDLER( spcforce_soundtrigger_w ) { - cpunum_set_input_line(Machine, 1, 0, (~data & 0x08) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, (~data & 0x08) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index 89bab06212c..4813d7c722a 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -21,7 +21,6 @@ TODO: ******************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" /*** README INFO ************************************************************** diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index 63d6d65d98a..5d6972f3c4b 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -97,7 +97,7 @@ static WRITE8_HANDLER( sprint8_int_reset_w ) collision_reset = !(data & 1); if (collision_reset) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 1fcc43bcc5d..c973b733478 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -333,7 +333,7 @@ for (i = 0;i < 0xfe;i++) static WRITE8_HANDLER( spy_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); } static WRITE8_HANDLER( sound_bank_w ) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 56fd1e2b695..4f60bc5a6f9 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -569,7 +569,7 @@ static WRITE16_HANDLER(paletteram_w) if(b > 0x1F) b = 0x1F; } - palette_set_color(Machine, offset, MAKE_RGB(r << 3, g << 3, b << 3)); + palette_set_color(machine, offset, MAKE_RGB(r << 3, g << 3, b << 3)); } } diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index 9c1cf25b8a5..7184cee8f73 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -250,7 +250,7 @@ static WRITE32_HANDLER(FIFO_w) if(!(data>>28)) { - palette_set_color_rgb(Machine, PS7500_FIFO[1]&0xff, data&0xff,(data>>8)&0xff,(data>>16)&0xff); + palette_set_color_rgb(machine, PS7500_FIFO[1]&0xff, data&0xff,(data>>8)&0xff,(data>>16)&0xff); PS7500_FIFO[1]++; //autoinc } } diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index b65db357969..27239109cc8 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -83,7 +83,7 @@ static WRITE16_HANDLER( sshangha_protection16_w ) if (offset == (0x260 >> 1)) { //soundlatch_w(0,data&0xff); - //cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + //cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } } diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index e042fc3ae67..c2c98c16d9a 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -81,7 +81,6 @@ Notes: #include "driver.h" -#include "deprecat.h" #include "cpu/i8051/i8051.h" #include "sound/okim6295.h" diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c index c47f334ea38..39255f6c5e7 100644 --- a/src/mame/drivers/sspeedr.c +++ b/src/mame/drivers/sspeedr.c @@ -5,7 +5,6 @@ Taito Super Speed Race driver ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sspeedr.lh" @@ -56,7 +55,7 @@ static PALETTE_INIT( sspeedr ) static WRITE8_HANDLER( sspeedr_int_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c index 93d431c1397..d0f2ada67e6 100644 --- a/src/mame/drivers/stvinit.c +++ b/src/mame/drivers/stvinit.c @@ -6,7 +6,6 @@ to be honest i think some of these cause more problems than they're worth ... */ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "cpu/sh2/sh2.h" #include "machine/stvprot.h" @@ -273,7 +272,7 @@ static READ32_HANDLER( hanagumi_speedup_r ) static READ32_HANDLER( hanagumi_slave_off ) { /* just turn the slave off, i don't think the game needs it */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); return stv_workram_h[0x015438/4]; } @@ -464,7 +463,7 @@ static WRITE32_HANDLER(dnmtdeka_cmd_write) if ( data != 0 ) dnmtdeka_pending_commands++; //logerror( "CMD: Written by cpu=%d, at = %08X, offset = %08X, data = %08X, commands = %d\n", cpu_getactivecpu(), activecpu_get_pc(), offset, data, dnmtdeka_pending_commands ); - cpu_trigger(Machine, 1000); + cpu_trigger(machine, 1000); } static READ32_HANDLER(dnmtdeka_cmd_read) @@ -513,7 +512,7 @@ static WRITE32_HANDLER(diehard_cmd_write) if ( data != 0 ) diehard_pending_commands++; //logerror( "CMD: Written by cpu=%d, at = %08X, offset = %08X, data = %08X, commands = %d\n", cpu_getactivecpu(), activecpu_get_pc(), offset, data, diehard_pending_commands ); - cpu_trigger(Machine, 1000); + cpu_trigger(machine, 1000); } static READ32_HANDLER(diehard_cmd_read) @@ -537,7 +536,7 @@ static READ32_HANDLER(diehard_cmd_ack_read) if ( (stv_workram_h[0x000e0dd8/4] & 0xff000000) == 0 && diehard_pending_commands == 0 ) { - cpu_trigger(Machine, 1000); + cpu_trigger(machine, 1000); } return stv_workram_h[0x000e0dd8/4]; } @@ -556,7 +555,7 @@ static WRITE32_HANDLER(diehard_cmd_ack_write_cpu0) { //logerror( "CMDACK: Write by cpu=%d, at = %08X, offset = %08X, data = %08X, commands = %d\n", cpu_getactivecpu(), activecpu_get_pc(), offset, data, diehard_pending_commands ); COMBINE_DATA(&stv_workram_h[0x000e0dd8/4]); - cpu_trigger(Machine, 1000); + cpu_trigger(machine, 1000); } DRIVER_INIT(diehard) @@ -617,7 +616,7 @@ static READ32_HANDLER( bakubaku_speedup_r ) static READ32_HANDLER( bakubaku_speedup2_r ) { - if (activecpu_get_pc()==0x06033762) cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + if (activecpu_get_pc()==0x06033762) cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); return stv_workram_h[0x0033762/4]; } @@ -669,7 +668,7 @@ static READ32_HANDLER( groovef_speedup_r ) /* static READ32_HANDLER( groovef_second_cpu_off_r ) { - if (activecpu_get_pc()==0x060060c2) cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + if (activecpu_get_pc()==0x060060c2) cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); return 0; } */ diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index 9c41759e9a7..48aff482488 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -34,7 +34,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "video/taitoic.h" #include "audio/taitosnd.h" @@ -88,8 +87,8 @@ static WRITE32_HANDLER( cpua_ctrl_w ) if (ACCESSING_BITS_8_15) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data &0x200) ? CLEAR_LINE : ASSERT_LINE); - if (data&0x8000) cpunum_set_input_line(Machine, 0,3,HOLD_LINE); /* Guess */ + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data &0x200) ? CLEAR_LINE : ASSERT_LINE); + if (data&0x8000) cpunum_set_input_line(machine, 0,3,HOLD_LINE); /* Guess */ } if (ACCESSING_BITS_0_7) @@ -108,7 +107,7 @@ static WRITE32_HANDLER( superchs_palette_w ) g = (a &0xff00) >> 8; b = (a &0xff); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } static READ32_HANDLER( superchs_input_r ) @@ -222,7 +221,7 @@ static WRITE32_HANDLER( superchs_stick_w ) different byte in this long word before the RTE. I assume all but the last (top) byte cause an IRQ with the final one being an ACK. (Total guess but it works). */ if (mem_mask!=0xff000000) - cpunum_set_input_line(Machine, 0,3,HOLD_LINE); + cpunum_set_input_line(machine, 0,3,HOLD_LINE); } /*********************************************************** diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 74052f85286..900853b62a6 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -22,7 +22,6 @@ #include "driver.h" #include "render.h" -#include "deprecat.h" #include "sound/sn76496.h" #include "sound/custom.h" #include "machine/laserdsc.h" @@ -179,7 +178,7 @@ static WRITE8_HANDLER( superdq_io_w ) static const UINT8 black_color_entries[] = {7,15,16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; if ( data & 0x40 ) /* bit 6 = irqack */ - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); coin_counter_w( 0, data & 0x08 ); coin_counter_w( 1, data & 0x04 ); diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index ab6a73946e9..3fdfa63bf46 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -291,7 +291,7 @@ static WRITE8_HANDLER( mcu_p3_w ) static READ8_HANDLER( nmi_ack_r ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index 5b61066217c..663aa6535c1 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -96,7 +96,6 @@ CRU lines: #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" @@ -159,7 +158,7 @@ static INTERRUPT_GEN( supertnk_interrupt ) static WRITE8_HANDLER( supertnk_interrupt_ack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c index aaede84ff47..5d2e6a7d87a 100644 --- a/src/mame/drivers/suprridr.c +++ b/src/mame/drivers/suprridr.c @@ -80,7 +80,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "suprridr.h" #include "sound/ay8910.h" @@ -136,7 +135,7 @@ static READ8_HANDLER( sound_data_r ) 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); } diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index a83ff94ef05..64837a133f7 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -1231,7 +1231,7 @@ static WRITE16_HANDLER( ga_sound_command_w ) if( ACCESSING_BITS_8_15 ) { soundlatch_w( machine,0,data>>8 ); - cpunum_set_input_line(Machine, 1, 0, HOLD_LINE ); + cpunum_set_input_line(machine, 1, 0, HOLD_LINE ); } } diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index a6aa60ea996..d2dbdc5350f 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -846,7 +846,7 @@ static INT32 driveout_sound_latch = 0; static READ8_HANDLER( driveout_sound_command_r) { - cpunum_set_input_line(Machine, 1,0,CLEAR_LINE); + cpunum_set_input_line(machine, 1,0,CLEAR_LINE); // logerror("sound IRQ OFF (sound command=%02x)\n",driveout_sound_latch); return driveout_sound_latch; } @@ -887,7 +887,7 @@ static WRITE16_HANDLER ( driveout_sound_command_w ) else { driveout_sound_latch = ((data<<4) & 0xf0) | (driveout_sound_latch & 0x0f); - cpunum_set_input_line (Machine, 1, 0, ASSERT_LINE); + cpunum_set_input_line (machine, 1, 0, ASSERT_LINE); } } } diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index d5c72c641fa..e66c92a3e86 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -36,7 +36,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "taito_f3.h" #include "sound/es5506.h" @@ -119,12 +118,12 @@ static WRITE32_HANDLER( f3_control_w ) static WRITE32_HANDLER( f3_sound_reset_0_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); } static WRITE32_HANDLER( f3_sound_reset_1_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } static WRITE32_HANDLER( f3_sound_bankswitch_w ) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index bec758823d7..336d32d5dbf 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -312,7 +312,7 @@ static WRITE8_HANDLER( irq_enable_w ) // fix Plotting test mode if ((irq_enable & (1 << last_irq_level)) == 0) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static READ8_HANDLER( irq_enable_r ) @@ -1050,7 +1050,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER (evilston_snd_w) { shared_ram[0x7fe]=data&0x7f; - cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE); + cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE); } diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index a62744218db..dc12afc0cc1 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -247,7 +247,7 @@ static WRITE16_HANDLER( system_control_w ) dsp_HOLD_signal = (data & 4) ? CLEAR_LINE : ASSERT_LINE; - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); logerror("68K:%06x writing %04x to TMS32025. %s HOLD , %s RESET\n",activecpu_get_previouspc(),data,((data & 4) ? "Clear" : "Assert"),((data & 1) ? "Clear" : "Assert")); } @@ -295,7 +295,7 @@ static WRITE16_HANDLER( airsys_paletteram16_w ) /* xxBBBBxRRRRxGGGG */ COMBINE_DATA(&paletteram16[offset]); a = paletteram16[offset]; - palette_set_color_rgb(Machine,offset,pal4bit(a >> 0),pal4bit(a >> 5),pal4bit(a >> 10)); + palette_set_color_rgb(machine,offset,pal4bit(a >> 0),pal4bit(a >> 5),pal4bit(a >> 10)); } diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 0b8cb053afd..8c4aa39124e 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -408,7 +408,7 @@ static WRITE32_HANDLER( taitojc_palette_w ) g = (color >> 16) & 0xff; b = (color >> 0) & 0xff; - palette_set_color(Machine,offset, MAKE_RGB(r, g, b)); + palette_set_color(machine,offset, MAKE_RGB(r, g, b)); } static READ32_HANDLER ( jc_control_r ) @@ -776,13 +776,13 @@ static WRITE32_HANDLER(dsp_shared_w) { if (!first_dsp_reset) { - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, CLEAR_LINE); } first_dsp_reset = 0; } else { - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, ASSERT_LINE); } } } diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index ce409b4c561..dfb4349696b 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -164,7 +164,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index 7a67f855ece..2ec1d9266a5 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -56,7 +56,6 @@ Known issues: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "sound/samples.h" @@ -107,8 +106,8 @@ static WRITE8_HANDLER( tankbatt_interrupt_enable_w ) tankbatt_sound_enable = !data; if (data != 0) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); } /* hack - turn off the engine noise if the normal game nmi's are disabled */ if (data) sample_stop (2); @@ -120,8 +119,8 @@ static WRITE8_HANDLER( tankbatt_demo_interrupt_enable_w ) tankbatt_nmi_enable = data; if (data != 0) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE); } // interrupt_enable_w (offset, data); } diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index e16b4345f67..99d1d5438b7 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -152,7 +152,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER ( tbowl_trigger_nmi ) { /* trigger NMI on 6206B's Cpu? (guess but seems to work..) */ - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE); } static ADDRESS_MAP_START( readmem_6206C, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index 8a193289c3b..72ac7ca6ded 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -95,7 +95,6 @@ TO DO : ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/msm5205.h" @@ -120,9 +119,9 @@ extern VIDEO_UPDATE( tehkanwc ); static WRITE8_HANDLER( sub_cpu_halt_w ) { if (data) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index 5c2631d98ed..6ebdcb7004d 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -304,7 +304,7 @@ static UINT8 tempest_player_select; static WRITE8_HANDLER( wdclr_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); watchdog_reset(Machine); } diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index bb75f0b1421..50ffb3a03c0 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -15,7 +15,6 @@ Todo: #include "driver.h" #include "render.h" -#include "deprecat.h" #include "machine/laserdsc.h" #include "cpu/cop400/cop400.h" @@ -156,7 +155,7 @@ static WRITE8_HANDLER(data_write_cop) static WRITE8_HANDLER(intrq_w) { - cpunum_set_input_line(Machine, 0, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 0, 0, ASSERT_LINE); } static WRITE8_HANDLER(sc01_register_w) @@ -181,7 +180,7 @@ static WRITE8_HANDLER(sc01_register_w) SET_Z80_SSI_REQUEST(); if (!(Z80_SSI_REQUEST())) logerror("SETTING IRQ LINE sc01\n"); - cpunum_set_input_line(Machine, 0, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 0, 0, ASSERT_LINE); break; default: @@ -290,7 +289,7 @@ static WRITE8_HANDLER(cop_d_write) /* Assert the Z80's interrupt line if necessary */ if (irq_flag) { - cpunum_set_input_line(Machine, 0, 0, ASSERT_LINE); + cpunum_set_input_line(machine, 0, 0, ASSERT_LINE); } } diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index f0b399d1c5f..d6fc70c3698 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -9,7 +9,6 @@ K052591 emulation by Eddie Edwards ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */ #include "video/konamiic.h" #include "sound/2151intf.h" @@ -355,7 +354,7 @@ static WRITE8_HANDLER( thunderx_videobank_w ) static WRITE8_HANDLER( thunderx_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); } static WRITE8_HANDLER( scontra_snd_bankswitch_w ) diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c index febf9a93e4c..5814fe05046 100644 --- a/src/mame/drivers/timelimt.c +++ b/src/mame/drivers/timelimt.c @@ -11,7 +11,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" /* from video */ @@ -50,7 +49,7 @@ static WRITE8_HANDLER( nmi_enable_w ) static WRITE8_HANDLER( sound_reset_w ) { if ( data & 1 ) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE ); } diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 1a3ad7556a8..e1bb91a8f69 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -362,7 +362,7 @@ static WRITE16_HANDLER( tmaster_blitter_w ) { case 0x0e: tmaster_draw(); - cpunum_set_input_line(Machine, 0, 2, HOLD_LINE); + cpunum_set_input_line(machine, 0, 2, HOLD_LINE); break; } } @@ -484,7 +484,7 @@ static WRITE16_HANDLER( galgames_palette_data_w ) palette_data[palette_index] = data & 0xff; if (++palette_index == 3) { - palette_set_color(Machine, palette_offset, MAKE_RGB(palette_data[0], palette_data[1], palette_data[2])); + palette_set_color(machine, palette_offset, MAKE_RGB(palette_data[0], palette_data[1], palette_data[2])); palette_index = 0; palette_offset++; } diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 2201c0fbe1d..8e95c0e30e2 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -358,7 +358,7 @@ static TIMER_CALLBACK( nmi_callback ) static WRITE8_HANDLER( sound_arm_nmi_w ) { // sound_nmi_enabled = 1; - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); timer_set(ATTOTIME_IN_USEC(50), NULL,0,nmi_callback); /* kludge until the K053260 is emulated correctly */ } @@ -636,7 +636,7 @@ static WRITE16_HANDLER( thndrx2_eeprom_w ) /* bit 5 triggers IRQ on sound cpu */ if (last == 0 && (data & 0x20) != 0) - 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 & 0x20; /* bit 6 = enable char ROM reading through the video RAM */ @@ -824,7 +824,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( ssriders_soundkludge_w ) { /* I think this is more than just a trigger */ - cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff); + cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff); } static ADDRESS_MAP_START( blswhstl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index cbf49bbfd35..bb70a193fba 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -684,8 +684,8 @@ WRITE16_HANDLER( toaplan2_v25_coin_word_w ) #if USE_V25 /* only the ram-based V25 based games access the following bits */ - //cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x0020) ? CLEAR_LINE : ASSERT_LINE ); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, (data & 0x0010) ? CLEAR_LINE : ASSERT_LINE); + //cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x0020) ? CLEAR_LINE : ASSERT_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, (data & 0x0010) ? CLEAR_LINE : ASSERT_LINE); #endif } @@ -1238,20 +1238,20 @@ static WRITE16_HANDLER( raizing_clear_sndirq_w ) { // not sure whether this is correct // the 68K writes here during the sound IRQ handler, and nowhere else... - cpunum_set_input_line(Machine, 0, raizing_sndirq_line, CLEAR_LINE); + cpunum_set_input_line(machine, 0, raizing_sndirq_line, CLEAR_LINE); } static WRITE8_HANDLER( raizing_sndirq_w ) { // if raizing_clear_sndirq_w() is correct, should this be ASSERT_LINE? - cpunum_set_input_line(Machine, 0, raizing_sndirq_line, HOLD_LINE); + cpunum_set_input_line(machine, 0, raizing_sndirq_line, HOLD_LINE); } static WRITE8_HANDLER( raizing_clear_nmi_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE); } @@ -1577,7 +1577,7 @@ ADDRESS_MAP_END WRITE16_HANDLER( fixeight_subcpu_ctrl ) { /* 0x18 used */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, (data & 0x0010) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, (data & 0x0010) ? CLEAR_LINE : ASSERT_LINE); } #endif diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index 3a8bf619208..b0cd9e688c8 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -30,7 +30,6 @@ TODO: ****************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/namcoio.h" #include "sound/namco.h" @@ -162,7 +161,7 @@ static READ8_HANDLER( toypop_main_interrupt_enable_r ) static WRITE8_HANDLER( toypop_main_interrupt_enable_w ) { cpu_interrupt_enable(0,1); - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } static WRITE8_HANDLER( toypop_main_interrupt_disable_w ) @@ -173,7 +172,7 @@ static WRITE8_HANDLER( toypop_main_interrupt_disable_w ) static WRITE8_HANDLER( toypop_sound_interrupt_enable_acknowledge_w ) { cpu_interrupt_enable(1,1); - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); } static WRITE8_HANDLER( toypop_sound_interrupt_disable_w ) @@ -193,22 +192,22 @@ static INTERRUPT_GEN( toypop_main_interrupt ) static WRITE8_HANDLER( toypop_sound_clear_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); } static WRITE8_HANDLER( toypop_sound_assert_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } static WRITE8_HANDLER( toypop_m68000_clear_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, CLEAR_LINE); } static WRITE8_HANDLER( toypop_m68000_assert_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, ASSERT_LINE); } static TIMER_CALLBACK( disable_interrupts ) diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index 5f8131eaf5a..b8fc4ae0421 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -65,7 +65,6 @@ C004 76489 #4 trigger ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/sn76496.h" #include "sound/flt_rc.h" @@ -129,7 +128,7 @@ static WRITE8_HANDLER( tp84_filter_w ) static WRITE8_HANDLER( tp84_sh_irqtrigger_w ) { - cpunum_set_input_line_and_vector(Machine, 2,0,HOLD_LINE,0xff); + cpunum_set_input_line_and_vector(machine, 2,0,HOLD_LINE,0xff); } diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index 741de7bb721..7425b153041 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -30,7 +30,7 @@ extern VIDEO_UPDATE( tryout ); static WRITE8_HANDLER( tryout_nmi_ack_w ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE ); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE ); } static WRITE8_HANDLER( tryout_sound_w ) diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 84023eabb47..85f7e3710ee 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -105,7 +105,7 @@ static WRITE16_HANDLER( pcup_prgbank_w ) static WRITE16_HANDLER( paldat_w ) { - palette_set_color_rgb(Machine,paloff & 0x7fff,pal5bit(data>>0),pal5bit(data>>5),pal5bit(data>>10)); + palette_set_color_rgb(machine,paloff & 0x7fff,pal5bit(data>>0),pal5bit(data>>5),pal5bit(data>>10)); } static READ16_HANDLER( peno_rand ) diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c index d16da765c30..5bad67f28f3 100644 --- a/src/mame/drivers/tubep.c +++ b/src/mame/drivers/tubep.c @@ -168,7 +168,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( main_cpu_irq_line_clear_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); logerror("CPU#0 VBLANK int clear at scanline=%3i\n", curr_scanline); return; } @@ -204,7 +204,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( second_cpu_irq_line_clear_w ) { - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); logerror("CPU#1 VBLANK int clear at scanline=%3i\n", curr_scanline); return; } @@ -239,7 +239,7 @@ static READ8_HANDLER( tubep_soundlatch_r ) static READ8_HANDLER( tubep_sound_irq_ack ) { - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE); return 0; } @@ -409,7 +409,7 @@ static WRITE8_HANDLER( rjammer_LS259_w ) static WRITE8_HANDLER( rjammer_soundlatch_w ) { sound_latch = data; - cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE); } @@ -594,7 +594,7 @@ static WRITE8_HANDLER( rjammer_voice_input_w ) I do it here because this port (0x80) is first one accessed in the interrupt routine. */ - cpunum_set_input_line(Machine, 2, 0, CLEAR_LINE ); + cpunum_set_input_line(machine, 2, 0, CLEAR_LINE ); return; } diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c index 361ceb384d9..5ab6778495b 100644 --- a/src/mame/drivers/turbosub.c +++ b/src/mame/drivers/turbosub.c @@ -45,7 +45,6 @@ and hardware. ***********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" /* Set to 1 to display test results and skip on errors */ @@ -126,8 +125,8 @@ static WRITE8_HANDLER( G_STATUS_W ) bankaddress = 0x10000 + (data & 0x03) * 0x10000; memory_set_bankptr(1,&ROM[bankaddress]); - cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, (data&0x80) ? ASSERT_LINE : CLEAR_LINE); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, (data&0x80) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, (data&0x80) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, (data&0x80) ? ASSERT_LINE : CLEAR_LINE); } /* diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index e177ee35d0f..7c9eb102d00 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -13,7 +13,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "tutankhm.h" #include "cpu/m6809/m6809.h" #include "audio/timeplt.h" @@ -44,7 +43,7 @@ static WRITE8_HANDLER( irq_enable_w ) { irq_enable = data & 1; if (!irq_enable) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 6777b66a9f1..26bc48db2ca 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -53,7 +53,6 @@ Known Issues: */ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "sound/2151intf.h" @@ -171,13 +170,13 @@ static WRITE16_HANDLER( twin16_CPUA_register_w ) if( twin16_CPUA_register!=old ) { if( (old&0x08)==0 && (twin16_CPUA_register&0x08) ) - cpunum_set_input_line_and_vector(Machine, CPU_SOUND, 0, HOLD_LINE, 0xff ); + cpunum_set_input_line_and_vector(machine, CPU_SOUND, 0, HOLD_LINE, 0xff ); if( (old&0x40) && (twin16_CPUA_register&0x40)==0 ) twin16_spriteram_process(); if( (old&0x10)==0 && (twin16_CPUA_register&0x10) ) - cpunum_set_input_line(Machine, CPU_B, MC68000_IRQ_6, HOLD_LINE ); + cpunum_set_input_line(machine, CPU_B, MC68000_IRQ_6, HOLD_LINE ); coin_counter_w( 0, twin16_CPUA_register&0x01 ); coin_counter_w( 1, twin16_CPUA_register&0x02 ); @@ -199,7 +198,7 @@ static WRITE16_HANDLER( twin16_CPUB_register_w ) { if( (old&0x01)==0 && (twin16_CPUB_register&0x1) ) { - cpunum_set_input_line(Machine, CPU_A, MC68000_IRQ_6, HOLD_LINE ); + cpunum_set_input_line(machine, CPU_A, MC68000_IRQ_6, HOLD_LINE ); } } } @@ -211,7 +210,7 @@ static WRITE16_HANDLER( fround_CPU_register_w ) if( twin16_CPUA_register!=old ) { if( (old&0x08)==0 && (twin16_CPUA_register&0x08) ) - cpunum_set_input_line_and_vector(Machine, CPU_SOUND, 0, HOLD_LINE, 0xff ); // trigger IRQ on sound CPU + cpunum_set_input_line_and_vector(machine, CPU_SOUND, 0, HOLD_LINE, 0xff ); // trigger IRQ on sound CPU } } diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index 77ca5b43da8..e3db7899db0 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -41,7 +41,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/custom.h" #include "cpu/i86/i86.h" @@ -63,23 +62,23 @@ static UINT32 ts; /* Main CPU and Z80 synchronisation */ static WRITE16_HANDLER( z80_busreq_w ) { - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, (data & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, (data & 1) ? CLEAR_LINE : ASSERT_LINE); } static WRITE16_HANDLER( resume_math_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_TEST, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_TEST, ASSERT_LINE); } static WRITE16_HANDLER( halt_math_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_TEST, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_TEST, CLEAR_LINE); } /* Z80 can trigger an interrupt itself */ static WRITE8_HANDLER( z80_intreq_w ) { - cpunum_set_input_line(Machine, 2, 0, HOLD_LINE); + cpunum_set_input_line(machine, 2, 0, HOLD_LINE); } /* Periodic Z80 interrupt */ diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index 792f477f52c..eba00ed2cce 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -41,7 +41,7 @@ static WRITE8_HANDLER( jamma_if_control_latch_w ) if ( diff & 0x40 ) { - cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, (data & 0x40) ? CLEAR_LINE : ASSERT_LINE); } // bit 3 - enable 752 Hz (D-3) square wave output diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 8bb5efe7d98..68250f1de37 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -7,7 +7,6 @@ Driver by Manuel Abadia ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "video/konamiic.h" @@ -105,7 +104,7 @@ static WRITE16_HANDLER( sound_cmd_w ) static WRITE16_HANDLER( sound_irq_trigger_w ) { if (ACCESSING_BITS_0_7) - cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE); + cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE); } diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index 3c9b04b797b..1eb7ae48fce 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -187,7 +187,6 @@ Board contains only 29 ROMs and not much else. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "video/taitoic.h" #include "audio/taitosnd.h" @@ -226,7 +225,7 @@ static WRITE32_HANDLER( color_ram_w ) g = (a &0xff00) >> 8; b = (a &0xff); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } } diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 10d11d9fff7..05cad31db25 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -28,7 +28,6 @@ *********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "sound/2151intf.h" #include "sound/okim6295.h" @@ -161,10 +160,10 @@ static WRITE32_HANDLER( paletteram32_w ) COMBINE_DATA(&paletteram32[offset]); paldata = paletteram32[offset] & 0xffff; - palette_set_color_rgb(Machine, offset*2 + 1, pal5bit(paldata >> 10), pal5bit(paldata >> 5), pal5bit(paldata >> 0)); + palette_set_color_rgb(machine, offset*2 + 1, pal5bit(paldata >> 10), pal5bit(paldata >> 5), pal5bit(paldata >> 0)); paldata = (paletteram32[offset] >> 16) & 0xffff; - palette_set_color_rgb(Machine, offset*2 + 0, pal5bit(paldata >> 10), pal5bit(paldata >> 5), pal5bit(paldata >> 0)); + palette_set_color_rgb(machine, offset*2 + 0, pal5bit(paldata >> 10), pal5bit(paldata >> 5), pal5bit(paldata >> 0)); } static READ32_HANDLER( wyvernwg_prot_r ) diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index 07b65853321..6ea2ee4a5e4 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -92,9 +92,9 @@ static WRITE8_HANDLER( vastar_hold_cpu2_w ) { /* I'm not sure that this works exactly like this */ if (data & 1) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } static READ8_HANDLER( vastar_sharedram_r ) diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index 0ea2c6c6910..9dd232b85d5 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -63,7 +63,7 @@ static WRITE32_HANDLER( vega_palette_w ) COMBINE_DATA(&paletteram32[offset]); paldata = paletteram32[offset] & 0x7fff; - palette_set_color_rgb(Machine, offset, pal5bit(paldata >> 10), pal5bit(paldata >> 5), pal5bit(paldata >> 0)); + palette_set_color_rgb(machine, offset, pal5bit(paldata >> 10), pal5bit(paldata >> 5), pal5bit(paldata >> 0)); } static WRITE32_HANDLER( vega_misc_w ) diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index 4e315b31237..92c401ed591 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -660,7 +660,7 @@ static READ32_HANDLER( timekeeper_r ) { /* get the time */ mame_system_time systime; - mame_get_base_datetime(Machine, &systime); + mame_get_base_datetime(machine, &systime); /* return portions thereof */ switch (offset*4) diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 8a187a59eba..7bbd7253db4 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -87,7 +87,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */ #include "machine/eeprom.h" diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index 2a2698fc228..d90229e69bf 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -52,7 +52,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "vicdual.h" diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index 66899e76f03..7110a1bb77d 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -35,7 +35,6 @@ Tomasz Slanina 20050225 */ #include "driver.h" -#include "deprecat.h" #include "machine/8255ppi.h" #include "sound/ay8910.h" @@ -59,7 +58,7 @@ static WRITE8_HANDLER(vroulet_paletteram_w) { a=paletteram[((i*8+j)*2)&0xff ]; b=paletteram[((i*8+j)*2+1)&0xff ]; - palette_set_color_rgb(Machine,i*16+j,pal4bit(b),pal4bit(b>>4),pal4bit(a)); + palette_set_color_rgb(machine,i*16+j,pal4bit(b),pal4bit(b>>4),pal4bit(a)); } } } diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index ec977820047..fb6fd3d793c 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -174,8 +174,8 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) STATE_POSTLOAD( wardner_restore_bank ) { - wardner_ramrom_bank_sw(Machine,0,1); /* Dummy value to ensure restoration */ - wardner_ramrom_bank_sw(Machine,0,wardner_membank); + wardner_ramrom_bank_sw(machine,0,1); /* Dummy value to ensure restoration */ + wardner_ramrom_bank_sw(machine,0,wardner_membank); } diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 74c161eb990..ba5d9409185 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -127,7 +127,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/custom.h" #include "warpwarp.h" #include "geebee.lh" @@ -289,7 +288,7 @@ static WRITE8_HANDLER( warpwarp_out3_w ) warpwarp_ball_on = data & 1; cpu_interrupt_enable(0,data & 1); if (~data & 1) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); break; case 7: flip_screen_set(data & 1); diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index b55d53eea35..a563f6fbccb 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -372,11 +372,11 @@ static WRITE16_HANDLER( irqctrl_w ) // Bit 0 : SUBINT if ( (wecleman_irqctrl & 1) && (!(data & 1)) ) // 1->0 transition - cpunum_set_input_line(Machine, 1,4,HOLD_LINE); + cpunum_set_input_line(machine, 1,4,HOLD_LINE); // Bit 1 : NSUBRST - if (data & 2) cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE ); - else cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE ); + if (data & 2) cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE ); + else cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE ); // Bit 2 : SOUND-ON // Bit 3 : SOUNDRST diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c index 9804c2b3eb2..79f741735ac 100644 --- a/src/mame/drivers/wilytowr.c +++ b/src/mame/drivers/wilytowr.c @@ -25,7 +25,6 @@ Dip locations verified for: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/i8039/i8039.h" #include "sound/ay8910.h" #include "sound/samples.h" @@ -221,7 +220,7 @@ static WRITE8_HANDLER( coin_w ) static WRITE8_HANDLER( snd_irq_w ) { - cpunum_set_input_line(Machine, 1, 0, PULSE_LINE); + cpunum_set_input_line(machine, 1, 0, PULSE_LINE); } diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index c0b53635fe5..fe1f4b6ee18 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -12,7 +12,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "sound/ay8910.h" static tilemap *bg_tilemap; @@ -56,7 +55,7 @@ static READ8_HANDLER( player_inputs_r ) static WRITE8_HANDLER( sound_irq_w ) { - cpunum_set_input_line(Machine, 1,0,HOLD_LINE); + cpunum_set_input_line(machine, 1,0,HOLD_LINE); //sync with sound cpu (but it still loses some soundlatches...) //timer_call_after_resynch(NULL, 0, NULL); } diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c index 495a9224fcf..393371b420d 100644 --- a/src/mame/drivers/wiping.c +++ b/src/mame/drivers/wiping.c @@ -34,7 +34,6 @@ dip: 6.7 7.7 ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/custom.h" @@ -87,9 +86,9 @@ static READ8_HANDLER( ports_r ) static WRITE8_HANDLER( subcpu_reset_w ) { if (data & 1) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 23714f55adc..e1393f5eb80 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -190,7 +190,6 @@ TODO : */ #include "driver.h" -#include "deprecat.h" #include "sound/es8712.h" #include "sound/2203intf.h" @@ -366,7 +365,7 @@ static WRITE8_HANDLER(write_a00x) break; case 0x08: //A008 - cpunum_set_input_line(Machine, cpu_getactivecpu(),0,CLEAR_LINE); + cpunum_set_input_line(machine, cpu_getactivecpu(),0,CLEAR_LINE); break; } } diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index ef09a3dfc32..070dcd01313 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -141,10 +141,10 @@ static WRITE16_HANDLER( wwfsstar_flipscreen_w ) static WRITE16_HANDLER( wwfsstar_irqack_w ) { if(offset == 0) - cpunum_set_input_line(Machine, 0, 6, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 6, CLEAR_LINE); else - cpunum_set_input_line(Machine, 0, 5, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 5, CLEAR_LINE); } /* diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index b55d9bcd317..135d2839817 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -208,28 +208,28 @@ static WRITE8_HANDLER( xain_main_irq_w ) switch (offset) { case 0: /* 0x3a09 - NMI clear */ - cpunum_set_input_line(Machine, 0,INPUT_LINE_NMI,CLEAR_LINE); + cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,CLEAR_LINE); break; case 1: /* 0x3a0a - FIRQ clear */ - cpunum_set_input_line(Machine, 0,M6809_FIRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 0,M6809_FIRQ_LINE,CLEAR_LINE); break; case 2: /* 0x3a0b - IRQ clear */ - cpunum_set_input_line(Machine, 0,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,CLEAR_LINE); break; case 3: /* 0x3a0c - IRQB assert */ - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,ASSERT_LINE); break; } } static WRITE8_HANDLER( xain_irqA_assert_w ) { - cpunum_set_input_line(Machine, 0,M6809_IRQ_LINE,ASSERT_LINE); + cpunum_set_input_line(machine, 0,M6809_IRQ_LINE,ASSERT_LINE); } static WRITE8_HANDLER( xain_irqB_clear_w ) { - cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,CLEAR_LINE); + cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,CLEAR_LINE); } static READ8_HANDLER( xain_68705_r ) diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index c9c93f1b9d3..6ce655e567c 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -52,7 +52,7 @@ static WRITE8_HANDLER ( xxmissio_status_m_w ) case 0x40: xxmissio_status &= ~0x08; - cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0x10); + cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0x10); break; case 0x80: @@ -75,7 +75,7 @@ static WRITE8_HANDLER ( xxmissio_status_s_w ) case 0x80: xxmissio_status &= ~0x04; - cpunum_set_input_line_and_vector(Machine, 0,0,HOLD_LINE,0x10); + cpunum_set_input_line_and_vector(machine, 0,0,HOLD_LINE,0x10); break; } } diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index e9e8fcf862e..a42ef46b9fd 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -20,7 +20,6 @@ TODO: ******************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/sn76496.h" @@ -35,7 +34,7 @@ VIDEO_UPDATE(xyonix); static WRITE8_HANDLER( xyonix_irqack_w ) { - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index ba08622d101..8d650a09667 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -305,7 +305,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/segacrpt.h" #include "machine/8255ppi.h" #include "audio/segasnd.h" @@ -374,7 +373,7 @@ static WRITE8_HANDLER( int_enable_w ) { int_enabled = data & 1; if (!int_enabled) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 825d19a1f87..5c21e31e9ca 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -27,7 +27,6 @@ TODO: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/okim6295.h" VIDEO_START( zerozone ); diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 1c0e518b57a..c014570674e 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -114,8 +114,8 @@ static WRITE32_HANDLER( paletteram32_w ) { COMBINE_DATA(&paletteram32[offset]); data = paletteram32[offset]; - palette_set_color_rgb(Machine, (offset * 2) + 0, pal5bit(data >> 26), pal5bit(data >> 21), pal5bit(data >> 16)); - palette_set_color_rgb(Machine, (offset * 2) + 1, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); + palette_set_color_rgb(machine, (offset * 2) + 0, pal5bit(data >> 26), pal5bit(data >> 21), pal5bit(data >> 16)); + palette_set_color_rgb(machine, (offset * 2) + 1, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } #define NUM_LAYERS 2 @@ -217,9 +217,9 @@ static WRITE32_HANDLER( sysreg_w ) EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE); if (data & 0x10) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } return; } @@ -228,10 +228,10 @@ static WRITE32_HANDLER( sysreg_w ) if (ACCESSING_BITS_24_31) { if (data & 0x80000000) /* CG Board 1 IRQ Ack */ - cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE); if (data & 0x40000000) /* CG Board 0 IRQ Ack */ - cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_IRQ0, CLEAR_LINE); set_cgboard_id((data >> 28) & 0x3); @@ -325,7 +325,7 @@ static WRITE32_HANDLER( jetwave_palette_w ) { COMBINE_DATA(&paletteram32[offset]); data = paletteram32[offset]; - palette_set_color_rgb(Machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); + palette_set_color_rgb(machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } static ADDRESS_MAP_START( jetwave_map, ADDRESS_SPACE_PROGRAM, 32 ) diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c index 591ffa17938..525480efec7 100644 --- a/src/mame/machine/asic65.c +++ b/src/mame/machine/asic65.c @@ -480,7 +480,7 @@ static WRITE16_HANDLER( asic65_68k_w ) static READ16_HANDLER( asic65_68k_r ) { asic65_tfull = 0; - cpunum_set_input_line(Machine, asic65_cpunum, 0, CLEAR_LINE); + cpunum_set_input_line(machine, asic65_cpunum, 0, CLEAR_LINE); return asic65_tdata; } diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index d20a29c9112..2d9fdb287c6 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -1014,8 +1014,8 @@ WRITE8_HANDLER( balsente_counter_control_w ) counter_set_gate(0, (data >> 1) & 1); /* bits D2 and D4 control the clear/reset flags on the flip-flop that feeds counter 0 */ - if (!(data & 0x04)) set_counter_0_ff(Machine, 1); - if (!(data & 0x10)) set_counter_0_ff(Machine, 0); + if (!(data & 0x04)) set_counter_0_ff(machine, 1); + if (!(data & 0x10)) set_counter_0_ff(machine, 0); /* bit 5 clears the NMI interrupt; recompute the I/O state now */ m6850_update_io(); diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index 00e36ed1562..f58f4d7a4bc 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -61,9 +61,9 @@ static READ8_HANDLER( b_via_0_pb_r ) static WRITE8_HANDLER( b_via_0_pa_w ) { if ((data & 0x08) == 0) - 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); if ((data & 0x04) == 0) { diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c index f650ba15e08..fee5a57a576 100644 --- a/src/mame/machine/bigevglf.c +++ b/src/mame/machine/bigevglf.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" static UINT8 from_mcu; @@ -45,7 +44,7 @@ WRITE8_HANDLER( bigevglf_68705_portB_w ) if ((ddrB & 0x02) && (~portB_out & 0x02) && (data & 0x02)) /* positive going transition of the clock */ { - cpunum_set_input_line(Machine, 3,0,CLEAR_LINE); + cpunum_set_input_line(machine, 3,0,CLEAR_LINE); main_sent = 0; } @@ -86,7 +85,7 @@ WRITE8_HANDLER( bigevglf_mcu_w ) { portA_in = data; main_sent = 1; - cpunum_set_input_line(Machine, 3,0,ASSERT_LINE); + cpunum_set_input_line(machine, 3,0,ASSERT_LINE); } diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c index 4e84b52006e..11523b9ed9e 100644 --- a/src/mame/machine/buggychl.c +++ b/src/mame/machine/buggychl.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" @@ -75,7 +74,7 @@ logerror("%04x: 68705 port B write %02x\n",activecpu_get_pc(),data); if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 2,0,CLEAR_LINE); main_sent = 0; logerror("read command %02x from main cpu\n",portA_in); } @@ -132,7 +131,7 @@ WRITE8_HANDLER( buggychl_mcu_w ) logerror("%04x: mcu_w %02x\n",activecpu_get_pc(),data); from_main = data; main_sent = 1; - cpunum_set_input_line(Machine, 2,0,ASSERT_LINE); + cpunum_set_input_line(machine, 2,0,ASSERT_LINE); } READ8_HANDLER( buggychl_mcu_r ) diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index 1ac6bacd0d4..0d0c5ad25e9 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -5,7 +5,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "debugger.h" #include "dc.h" #include "cpu/sh4/sh4.h" @@ -867,12 +866,12 @@ WRITE64_HANDLER( dc_aica_reg_w ) if (dat & 1) { /* halt the ARM7 */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } else { /* it's alive ! */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); } } diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c index df0edfade03..abd4b33ca83 100644 --- a/src/mame/machine/dec0.c +++ b/src/mame/machine/dec0.c @@ -527,7 +527,7 @@ static WRITE16_HANDLER( robocop_68000_share_w ) robocop_shared_ram[offset]=data&0xff; if (offset==0x7ff) /* A control address - not standard ram */ - cpunum_set_input_line(Machine, 2,0,HOLD_LINE); + cpunum_set_input_line(machine, 2,0,HOLD_LINE); } /******************************************************************************/ diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index fd8503a5926..dd274b07efa 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -5,7 +5,6 @@ ***********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "cpu/i8x41/i8x41.h" #include "machine/decocass.h" @@ -136,7 +135,7 @@ READ8_HANDLER( decocass_sound_command_r ) { UINT8 data = soundlatch_r(machine, 0); LOG(4,("CPU #%d sound command <- $%02x\n", cpu_getactivecpu(), data)); - cpunum_set_input_line(Machine, 1, M6502_IRQ_LINE, CLEAR_LINE); + cpunum_set_input_line(machine, 1, M6502_IRQ_LINE, CLEAR_LINE); decocass_sound_ack &= ~0x80; return data; } @@ -282,14 +281,14 @@ WRITE8_HANDLER( decocass_reset_w ) decocass_reset = data; /* CPU #1 active hight reset */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, data & 0x01 ); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, data & 0x01 ); /* on reset also remove the sound timer */ if (data & 1) timer_adjust_oneshot(decocass_sound_timer, attotime_never, 0); /* 8041 active low reset */ - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x08) ^ 0x08 ); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x08) ^ 0x08 ); } static const char *dirnm(int speed) diff --git a/src/mame/machine/decoprot.c b/src/mame/machine/decoprot.c index bd2390c430e..84aa83c9837 100644 --- a/src/mame/machine/decoprot.c +++ b/src/mame/machine/decoprot.c @@ -71,7 +71,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "decoprot.h" diff --git a/src/mame/machine/docastle.c b/src/mame/machine/docastle.c index 4793d1cd498..a77b2821ca6 100644 --- a/src/mame/machine/docastle.c +++ b/src/mame/machine/docastle.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "includes/docastle.h" @@ -57,7 +56,7 @@ WRITE8_HANDLER( docastle_shared0_w ) if (offset == 8) /* awake the master CPU */ - cpu_trigger(Machine, 500); + cpu_trigger(machine, 500); } @@ -79,5 +78,5 @@ WRITE8_HANDLER( docastle_shared1_w ) WRITE8_HANDLER( docastle_nmitrigger_w ) { - cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE); + cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE); } diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c index 0c17198e5d8..c52a833c118 100644 --- a/src/mame/machine/flstory.c +++ b/src/mame/machine/flstory.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" extern UINT8 *onna34ro_workram; extern UINT8 *victnine_workram; @@ -71,7 +70,7 @@ WRITE8_HANDLER( flstory_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 2,0,CLEAR_LINE); main_sent = 0; logerror("read command %02x from main cpu\n",portA_in); } @@ -118,7 +117,7 @@ WRITE8_HANDLER( flstory_mcu_w ) logerror("%04x: mcu_w %02x\n",activecpu_get_pc(),data); from_main = data; main_sent = 1; - cpunum_set_input_line(Machine, 2,0,ASSERT_LINE); + cpunum_set_input_line(machine, 2,0,ASSERT_LINE); } READ8_HANDLER( flstory_mcu_r ) diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c index ddd4921c57f..70790372020 100644 --- a/src/mame/machine/konppc.c +++ b/src/mame/machine/konppc.c @@ -147,15 +147,15 @@ WRITE32_HANDLER( cgboard_dsp_comm_w_ppc ) pci_bridge_enable[cgboard_id] = (data & 0x20000000) ? 1 : 0; if (data & 0x10000000) - cpunum_set_input_line(Machine, dsp, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, dsp, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, dsp, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, dsp, INPUT_LINE_RESET, ASSERT_LINE); if (data & 0x02000000) - cpunum_set_input_line(Machine, dsp, INPUT_LINE_IRQ0, ASSERT_LINE); + cpunum_set_input_line(machine, dsp, INPUT_LINE_IRQ0, ASSERT_LINE); if (data & 0x04000000) - cpunum_set_input_line(Machine, dsp, INPUT_LINE_IRQ1, ASSERT_LINE); + cpunum_set_input_line(machine, dsp, INPUT_LINE_IRQ1, ASSERT_LINE); } if (ACCESSING_BITS_0_7) @@ -184,7 +184,7 @@ WRITE32_HANDLER( cgboard_dsp_shared_w_ppc ) { if (cgboard_id < MAX_CG_BOARDS) { - cpu_trigger(Machine, 10000); // Remove the timeout (a part of the GTI Club FIFO test workaround) + cpu_trigger(machine, 10000); // Remove the timeout (a part of the GTI Club FIFO test workaround) COMBINE_DATA(dsp_shared_ram[cgboard_id] + (offset + (dsp_shared_ram_bank[cgboard_id] * DSP_BANK_SIZE_WORD))); } } diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 8b3b7cad810..89650d21443 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "cpu/z80/z80.h" #include "leland.h" diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c index a5f237742c0..db3f14a1794 100644 --- a/src/mame/machine/lkage.c +++ b/src/mame/machine/lkage.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" static UINT8 from_main,from_mcu; @@ -68,7 +67,7 @@ WRITE8_HANDLER( lkage_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 2,0,CLEAR_LINE); main_sent = 0; logerror("read command %02x from main cpu\n",portA_in); } @@ -116,7 +115,7 @@ WRITE8_HANDLER( lkage_mcu_w ) logerror("%04x: mcu_w %02x\n",activecpu_get_pc(),data); from_main = data; main_sent = 1; - cpunum_set_input_line(Machine, 2,0,ASSERT_LINE); + cpunum_set_input_line(machine, 2,0,ASSERT_LINE); } READ8_HANDLER( lkage_mcu_r ) diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c index e0dd0dce8ac..a1101f1dfc1 100644 --- a/src/mame/machine/lsasquad.c +++ b/src/mame/machine/lsasquad.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" @@ -32,7 +31,7 @@ WRITE8_HANDLER( lsasquad_sh_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; } } @@ -145,7 +144,7 @@ WRITE8_HANDLER( lsasquad_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 2,0,CLEAR_LINE); main_sent = 0; //logerror("read command %02x from main cpu\n",portA_in); } @@ -169,7 +168,7 @@ WRITE8_HANDLER( lsasquad_mcu_w ) //logerror("%04x: mcu_w %02x\n",activecpu_get_pc(),data); from_main = data; main_sent = 1; - cpunum_set_input_line(Machine, 2,0,ASSERT_LINE); + cpunum_set_input_line(machine, 2,0,ASSERT_LINE); } READ8_HANDLER( lsasquad_mcu_r ) diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c index 8317775ecc8..2fb9c903afe 100644 --- a/src/mame/machine/mhavoc.c +++ b/src/mame/machine/mhavoc.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/avgdvg.h" #include "sound/5220intf.h" #include "cpu/m6502/m6502.h" @@ -62,7 +61,7 @@ static TIMER_CALLBACK( cpu_irq_clock ) WRITE8_HANDLER( mhavoc_alpha_irq_ack_w ) { /* clear the line and reset the clock */ - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); alpha_irq_clock = 0; alpha_irq_clock_enable = 1; } @@ -71,7 +70,7 @@ WRITE8_HANDLER( mhavoc_alpha_irq_ack_w ) WRITE8_HANDLER( mhavoc_gamma_irq_ack_w ) { /* clear the line and reset the clock */ - cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 1, 0, CLEAR_LINE); gamma_irq_clock = 0; } @@ -320,7 +319,7 @@ WRITE8_HANDLER( mhavoc_out_0_w ) player_1 = (data >> 5) & 1; /* Bit 3 = Gamma reset */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); if (!(data & 0x08)) { logerror("\t\t\t\t*** resetting gamma processor. ***\n"); diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c index 8b3c461c730..923f5476d83 100644 --- a/src/mame/machine/midyunit.c +++ b/src/mame/machine/midyunit.c @@ -5,7 +5,6 @@ **************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms34010/tms34010.h" #include "cpu/m6809/m6809.h" #include "machine/6821pia.h" @@ -580,7 +579,7 @@ WRITE16_HANDLER( midyunit_sound_w ) case SOUND_YAWDIM: soundlatch_w(machine, 0, data); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); break; } } diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index 93b650efe15..9d1a5e6182d 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -314,7 +314,7 @@ WRITE32_HANDLER( n64_sp_reg_w ) // cpu_spinuntil_trigger(6789); // printf( "Clearing RSP_STATUS_HALT\n" ); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); cpunum_set_info_int(1, CPUINFO_INT_REGISTER + RSP_SR, cpunum_get_info_int(1, CPUINFO_INT_REGISTER + RSP_SR) & ~RSP_STATUS_HALT ); // RSP_STATUS &= ~RSP_STATUS_HALT; //} @@ -326,7 +326,7 @@ WRITE32_HANDLER( n64_sp_reg_w ) if (data & 0x00000002) // set halt { // printf( "Setting RSP_STATUS_HALT\n" ); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); cpunum_set_info_int(1, CPUINFO_INT_REGISTER + RSP_SR, cpunum_get_info_int(1, CPUINFO_INT_REGISTER + RSP_SR) | RSP_STATUS_HALT ); // RSP_STATUS |= RSP_STATUS_HALT; } diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c index 3c7a94be10a..2544ff3f187 100644 --- a/src/mame/machine/namcond1.c +++ b/src/mame/machine/namcond1.c @@ -10,7 +10,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "namcond1.h" @@ -98,7 +97,7 @@ WRITE16_HANDLER( namcond1_cuskey_w ) // this is a kludge until we emulate the h8 if ((namcond1_h8_irq5_enabled == 0) && (data != 0x0000)) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); } namcond1_h8_irq5_enabled = ( data != 0x0000 ); break; diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index 05a150bd825..1b9d49a320d 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -586,9 +586,9 @@ WRITE8_HANDLER( namcos1_cpu_control_w ) namcos1_reset = data & 1; } - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index 475c6c7e707..ce58148c1dd 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -779,7 +779,7 @@ WRITE8_HANDLER( namcos2_mcu_analog_ctrl_w ) /* If the interrupt enable bit is set trigger an A/D IRQ */ if(data&0x20) { - cpunum_set_input_line(Machine, CPU_MCU, HD63705_INT_ADCONV , PULSE_LINE); + cpunum_set_input_line(machine, CPU_MCU, HD63705_INT_ADCONV , PULSE_LINE); } } } diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c index ed8fa98f521..ad7fb84632c 100644 --- a/src/mame/machine/nitedrvr.c +++ b/src/mame/machine/nitedrvr.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "nitedrvr.h" #include "sound/discrete.h" diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c index 989e59b46d9..2e6fd76e2ec 100644 --- a/src/mame/machine/nycaptor.c +++ b/src/mame/machine/nycaptor.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" static UINT8 from_main,from_mcu; static int mcu_sent = 0,main_sent = 0; @@ -56,7 +55,7 @@ WRITE8_HANDLER( nycaptor_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 3,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 3,0,CLEAR_LINE); main_sent = 0; } @@ -103,7 +102,7 @@ WRITE8_HANDLER( nycaptor_mcu_w ) from_main = data; main_sent = 1; - cpunum_set_input_line(Machine, 3,0,ASSERT_LINE); + cpunum_set_input_line(machine, 3,0,ASSERT_LINE); } READ8_HANDLER( nycaptor_mcu_r ) diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c index 30143edcaf2..eee2db6381c 100644 --- a/src/mame/machine/pitnrun.c +++ b/src/mame/machine/pitnrun.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6805/m6805.h" @@ -110,7 +109,7 @@ WRITE8_HANDLER( pitnrun_68705_portB_w ) { /* 68705 is going to read data from the Z80 */ timer_call_after_resynch(NULL, 0,pitnrun_mcu_data_real_r); - cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + cpunum_set_input_line(machine, 2,0,CLEAR_LINE); portA_in = fromz80; } if (~data & 0x04) diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c index a19c07cf583..e5e99c7002f 100644 --- a/src/mame/machine/playch10.c +++ b/src/mame/machine/playch10.c @@ -102,12 +102,12 @@ WRITE8_HANDLER( pc10_DOGDI_w ) WRITE8_HANDLER( pc10_GAMERES_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 ); } WRITE8_HANDLER( pc10_GAMESTOP_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ( data & 1 ) ? CLEAR_LINE : ASSERT_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ( data & 1 ) ? CLEAR_LINE : ASSERT_LINE ); } WRITE8_HANDLER( pc10_PPURES_w ) diff --git a/src/mame/machine/retofinv.c b/src/mame/machine/retofinv.c index e0107e6d7e6..3f12e91d9ec 100644 --- a/src/mame/machine/retofinv.c +++ b/src/mame/machine/retofinv.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" @@ -57,7 +56,7 @@ WRITE8_HANDLER( retofinv_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 3,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 3,0,CLEAR_LINE); main_sent = 0; //logerror("read command %02x from main cpu\n",portA_in); } @@ -114,7 +113,7 @@ WRITE8_HANDLER( retofinv_mcu_w ) logerror("%04x: mcu_w %02x\n",activecpu_get_pc(),data); from_main = data; main_sent = 1; - cpunum_set_input_line(Machine, 3,0,ASSERT_LINE); + cpunum_set_input_line(machine, 3,0,ASSERT_LINE); } READ8_HANDLER( retofinv_mcu_r ) diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index 803190385b1..b1a9d2d0947 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -892,7 +892,7 @@ WRITE16_HANDLER( copdxbl_0_w ) /*case (0x740/2): { soundlatch_w(1,data&0x00ff); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE ); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE ); break; }*/ } diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 7a1af2768ea..c2991ba7aa6 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "cpu/konami/konami.h" #include "machine/eeprom.h" diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c index 4865bf57eb0..1f8156e1983 100644 --- a/src/mame/machine/slapfght.c +++ b/src/mame/machine/slapfght.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *slapfight_dpram; @@ -64,14 +63,14 @@ READ8_HANDLER( slapfight_dpram_r ) /* Reset and hold sound CPU */ WRITE8_HANDLER( slapfight_port_00_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); getstar_sh_intenabled = 0; } /* Release reset on sound CPU */ WRITE8_HANDLER( slapfight_port_01_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); } /* Disable and clear hardware interrupt */ @@ -192,7 +191,7 @@ WRITE8_HANDLER( tigerh_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + if (main_sent) cpunum_set_input_line(machine, 2,0,CLEAR_LINE); main_sent = 0; } if ((ddrB & 0x04) && (data & 0x04) && (~portB_out & 0x04)) @@ -233,7 +232,7 @@ WRITE8_HANDLER( tigerh_mcu_w ) from_main = data; main_sent = 1; mcu_sent=0; - cpunum_set_input_line(Machine, 2,0,ASSERT_LINE); + cpunum_set_input_line(machine, 2,0,ASSERT_LINE); } READ8_HANDLER( tigerh_mcu_r ) diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 01115a3f0be..4cc7dfcaefc 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -1431,7 +1431,7 @@ WRITE8_HANDLER( snes_w_io ) case MEMSEL: /* Access cycle designation in memory (2) area */ /* FIXME: Need to adjust the speed only during access of banks 0x80+ * Currently we are just increasing it no matter what */ -// cpunum_set_clockscale(Machine, 0, (data & 0x1) ? 1.335820896 : 1.0 ); +// cpunum_set_clockscale(machine, 0, (data & 0x1) ? 1.335820896 : 1.0 ); #ifdef SNES_DBG_REG_W if( (data & 0x1) != (snes_ram[MEMSEL] & 0x1) ) mame_printf_debug( "CPU speed: %f Mhz\n", (data & 0x1) ? 3.58 : 2.68 ); diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c index f07ed6daf38..694f854adbf 100644 --- a/src/mame/machine/tait8741.c +++ b/src/mame/machine/tait8741.c @@ -8,7 +8,6 @@ Taito 8741 emulation */ #include "driver.h" -#include "deprecat.h" #include "tait8741.h" #define VERBOSE 0 diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c index 88ab4414450..2fc9cab7b00 100644 --- a/src/mame/machine/taitosj.c +++ b/src/mame/machine/taitosj.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6805/m6805.h" @@ -203,7 +202,7 @@ WRITE8_HANDLER( taitosj_68705_portB_w ) { /* 68705 is going to read data from the Z80 */ timer_call_after_resynch(NULL, 0,taitosj_mcu_data_real_r); - cpunum_set_input_line(Machine, 2,0,CLEAR_LINE); + cpunum_set_input_line(machine, 2,0,CLEAR_LINE); portA_in = fromz80; LOG(("%04x: 68705 <- Z80 %02x\n",activecpu_get_pc(),portA_in)); } diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c index f950fcf4558..9a5ed97239b 100644 --- a/src/mame/machine/tatsumi.c +++ b/src/mame/machine/tatsumi.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "tatsumi.h" #include "sound/2151intf.h" #include "sound/okim6295.h" @@ -49,37 +48,37 @@ WRITE16_HANDLER( apache3_bank_w ) if (tatsumi_control_word&0x7f00) { logerror("Unknown control Word: %04x\n",tatsumi_control_word); - cpunum_set_input_line(Machine, 3, INPUT_LINE_HALT, CLEAR_LINE); // ? + cpunum_set_input_line(machine, 3, INPUT_LINE_HALT, CLEAR_LINE); // ? } if ((tatsumi_control_word&0x8)==0 && !(tatsumi_last_control&0x8)) - cpunum_set_input_line(Machine, 1, INPUT_LINE_IRQ4, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ4, ASSERT_LINE); if (tatsumi_control_word&0x10) - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); if (tatsumi_control_word&0x80) - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, ASSERT_LINE); else - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, CLEAR_LINE); tatsumi_last_control=tatsumi_control_word; } WRITE16_HANDLER( apache3_irq_ack_w ) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_IRQ4, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ4, CLEAR_LINE); if ((data&2) && (tatsumi_last_irq&2)==0) { - cpunum_set_input_line(Machine, 3, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 3, INPUT_LINE_HALT, ASSERT_LINE); } if ((tatsumi_last_irq&2) && (data&2)==0) { - cpunum_set_input_line(Machine, 3, INPUT_LINE_HALT, CLEAR_LINE); - cpunum_set_input_line_and_vector(Machine, 3, 0, HOLD_LINE, 0xc7 | 0x10); + cpunum_set_input_line(machine, 3, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line_and_vector(machine, 3, 0, HOLD_LINE, 0xc7 | 0x10); } tatsumi_last_irq=data; @@ -187,14 +186,14 @@ WRITE16_HANDLER( roundup5_control_w ) COMBINE_DATA(&tatsumi_control_word); if (tatsumi_control_word&0x10) - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); if (tatsumi_control_word&0x4) - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, ASSERT_LINE); else - cpunum_set_input_line(Machine, 2, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 2, INPUT_LINE_HALT, CLEAR_LINE); // if (offset==1 && (tatsumi_control_w&0xfeff)!=(last_bank&0xfeff)) // logerror("%08x: Changed bank to %04x (%d)\n",activecpu_get_pc(),tatsumi_control_w,offset); @@ -220,7 +219,7 @@ WRITE16_HANDLER( roundup5_control_w ) */ if ((tatsumi_control_word&0x8)==0 && !(tatsumi_last_control&0x8)) - cpunum_set_input_line(Machine, 1, INPUT_LINE_IRQ4, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ4, ASSERT_LINE); // if (tatsumi_control_w&0x200) // cpu_set_reset_line(1, CLEAR_LINE); // else @@ -253,7 +252,7 @@ WRITE16_HANDLER( roundup5_e0000_w ) */ COMBINE_DATA(&roundup5_e0000_ram[offset]); - cpunum_set_input_line(Machine, 1, INPUT_LINE_IRQ4, CLEAR_LINE); // guess, probably wrong + cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ4, CLEAR_LINE); // guess, probably wrong // logerror("d_68k_e0000_w %06x %04x\n",activecpu_get_pc(),data); } @@ -284,12 +283,12 @@ WRITE16_HANDLER(cyclwarr_control_w) if ((tatsumi_control_word&4)==4 && (tatsumi_last_control&4)==0) { // logerror("68k 2 halt\n"); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE); } if ((tatsumi_control_word&4)==0 && (tatsumi_last_control&4)==4) { // logerror("68k 2 irq go\n"); - cpunum_set_input_line(Machine, 1, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, CLEAR_LINE); } diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c index 7b9418cb1f4..c407749a298 100644 --- a/src/mame/machine/twincobr.c +++ b/src/mame/machine/twincobr.c @@ -159,7 +159,7 @@ WRITE16_HANDLER( twincobr_dsp_bio_w ) if (data == 0) { if (dsp_execute) { LOG(("Turning the main CPU on\n")); - cpunum_set_input_line(Machine, 0, INPUT_LINE_HALT, CLEAR_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_HALT, CLEAR_LINE); dsp_execute = 0; } twincobr_dsp_BIO = ASSERT_LINE; diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c index 7fb54b34fe6..1a9e49261ae 100644 --- a/src/mame/machine/tx1.c +++ b/src/mame/machine/tx1.c @@ -4,7 +4,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "debugger.h" #include "machine/8255ppi.h" #include "tx1.h" diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c index 7056dd6e927..b509f23c4bb 100644 --- a/src/mame/machine/vertigo.c +++ b/src/mame/machine/vertigo.c @@ -166,9 +166,9 @@ WRITE16_HANDLER( vertigo_wsot_w ) { /* Reset sound cpu */ if ((data & 2) == 0) - 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); } diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 2b1f37dbe9c..b5178ac4e4a 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -1171,7 +1171,7 @@ static int ret; static WRITE8_HANDLER ( set_bnglngby_irq_w ) { ret = data; - cpunum_set_input_line(Machine, 0, 0, ( data & 2 ) ? ASSERT_LINE : CLEAR_LINE ); + cpunum_set_input_line(machine, 0, 0, ( data & 2 ) ? ASSERT_LINE : CLEAR_LINE ); /* other values ??? */ /* 0, 4, 84 */ } @@ -1257,7 +1257,7 @@ static WRITE8_HANDLER( vstennis_vrom_banking ) ppu2c0x_set_videorom_bank( cpu_getactivecpu(), 0, 8, ( data & 4 ) ? 1 : 0, 512 ); /* bit 1 ( data & 2 ) triggers irq on the other cpu */ - cpunum_set_input_line(Machine, other_cpu, 0, ( data & 2 ) ? CLEAR_LINE : ASSERT_LINE ); + cpunum_set_input_line(machine, other_cpu, 0, ( data & 2 ) ? CLEAR_LINE : ASSERT_LINE ); /* move along */ if ( cpu_getactivecpu() == 0 ) diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 2dd7dfecd08..d62ee9d093a 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *c1942_fgvideoram; @@ -186,7 +185,7 @@ WRITE8_HANDLER( c1942_c804_w ) coin_counter_w(0,data & 0x01); - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); flip_screen_set(data & 0x80); } diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 42e9885cdad..08023b8b1a0 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" static tilemap *fix_tilemap; static int bank_base,flipscreen; @@ -38,7 +37,7 @@ WRITE16_HANDLER( alpha68k_paletteram_w ) g = ((newword >> 3) & 0x1e) | ((newword >> 13) & 0x01); b = ((newword << 1) & 0x1e) | ((newword >> 12) & 0x01); - palette_set_color_rgb(Machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); } /******************************************************************************/ diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c index 9a164c404ab..540cc5f5736 100644 --- a/src/mame/video/amiga.c +++ b/src/mame/video/amiga.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "includes/amiga.h" diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 584dda252e3..f23d358b3bb 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -7,7 +7,6 @@ enable / disable tilemap bits might be wrong */ #include "driver.h" -#include "deprecat.h" static tilemap *tx_tilemap,*bgbot_tilemap ,*bgtop_tilemap; @@ -254,7 +253,7 @@ WRITE8_HANDLER( angelkds_paletteram_w ) paletteram[offset] = data; no=offset & 0xff; - palette_set_color_rgb(Machine,no,pal4bit(paletteram[no]),pal4bit(paletteram[no]>>4),pal4bit(paletteram[no+0x100])); + palette_set_color_rgb(machine,no,pal4bit(paletteram[no]),pal4bit(paletteram[no]>>4),pal4bit(paletteram[no+0x100])); } /*** Video Start & Update diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index ad5e05b5703..809aea0c4a3 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "includes/arkanoid.h" static UINT8 gfxbank, palettebank; @@ -68,7 +67,7 @@ WRITE8_HANDLER( arkanoid_d008_w ) which resets itself). This bit is the likely candidate as it is flipped early in bootup just prior to accessing the MCU for the first time. */ if (cpu_gettotalcpu()>1) // Bootlegs don't have the MCU but still set this bit - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); } static TILE_GET_INFO( get_bg_tile_info ) diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index 669aae43564..6937903c934 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/atarigen.h" #include "atarisy1.h" @@ -249,7 +248,7 @@ WRITE16_HANDLER( atarisy1_bankselect_w ) /* sound CPU reset */ if (diff & 0x0080) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (newselect & 0x0080) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (newselect & 0x0080) ? CLEAR_LINE : ASSERT_LINE); if (!(newselect & 0x0080)) atarigen_sound_reset(); } diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index a3516fc68a0..841c4ad168f 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/atarigen.h" #include "slapstic.h" #include "atarisy2.h" @@ -241,7 +240,7 @@ WRITE16_HANDLER( atarisy2_paletteram_w ) red = (color_table[(newword >> 12) & 15] * inten) >> 4; green = (color_table[(newword >> 8) & 15] * inten) >> 4; blue = (color_table[(newword >> 4) & 15] * inten) >> 4; - palette_set_color(Machine, offset, MAKE_RGB(red, green, blue)); + palette_set_color(machine, offset, MAKE_RGB(red, green, blue)); } diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c index aa968ddb530..d5d88c59f81 100644 --- a/src/mame/video/balsente.c +++ b/src/mame/video/balsente.c @@ -7,7 +7,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "balsente.h" @@ -107,7 +106,7 @@ WRITE8_HANDLER( balsente_paletteram_w ) g = paletteram[(offset & ~3) + 1]; b = paletteram[(offset & ~3) + 2]; - palette_set_color_rgb(Machine, offset / 4, pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, offset / 4, pal4bit(r), pal4bit(g), pal4bit(b)); } diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index c94ce7a4b3a..6fcbbc2325c 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *battlane_spriteram; UINT8 *battlane_tileram; @@ -51,7 +50,7 @@ WRITE8_HANDLER( battlane_palette_w ) bit2 = (~data >> 7) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); } WRITE8_HANDLER( battlane_scrollx_w ) diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c index a95dbf09a9e..54bcaa3ba77 100644 --- a/src/mame/video/battlera.c +++ b/src/mame/video/battlera.c @@ -54,7 +54,7 @@ WRITE8_HANDLER( battlera_palette_w ) if (offset%2) offset-=1; pal_word=paletteram[offset] | (paletteram[offset+1]<<8); - palette_set_color_rgb(Machine, offset/2, pal3bit(pal_word >> 3), pal3bit(pal_word >> 6), pal3bit(pal_word >> 0)); + palette_set_color_rgb(machine, offset/2, pal3bit(pal_word >> 3), pal3bit(pal_word >> 6), pal3bit(pal_word >> 0)); } /******************************************************************************/ diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index c4a5491a7ed..59539783c8d 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" static int battlex_scroll_lsb; static int battlex_scroll_msb; @@ -36,7 +35,7 @@ PALETTE_INIT( battlex ) WRITE8_HANDLER( battlex_palette_w ) { - palette_set_color_rgb(Machine,16*8 + offset,pal1bit(data >> 2),pal1bit(data >> 0),pal1bit(data >> 1)); + palette_set_color_rgb(machine,16*8 + offset,pal1bit(data >> 2),pal1bit(data >> 0),pal1bit(data >> 1)); } WRITE8_HANDLER( battlex_scroll_x_lsb_w ) diff --git a/src/mame/video/beathead.c b/src/mame/video/beathead.c index fdfdd6cc33e..a437ebe4627 100644 --- a/src/mame/video/beathead.c +++ b/src/mame/video/beathead.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "beathead.h" @@ -115,7 +114,7 @@ WRITE32_HANDLER( beathead_finescroll_w ) if ((oldword & 8) && !(newword & 8) && video_screen_get_vpos(machine->primary_screen) != 261) { logerror("Suspending time! (scanline = %d)\n", video_screen_get_vpos(machine->primary_screen)); - cpunum_set_input_line(Machine, 0, INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(machine, 0, INPUT_LINE_HALT, ASSERT_LINE); } } @@ -133,7 +132,7 @@ WRITE32_HANDLER( beathead_palette_w ) int r = ((newword >> 9) & 0x3e) | ((newword >> 15) & 0x01); int g = ((newword >> 4) & 0x3e) | ((newword >> 15) & 0x01); int b = ((newword << 1) & 0x3e) | ((newword >> 15) & 0x01); - palette_set_color_rgb(Machine, offset, pal6bit(r), pal6bit(g), pal6bit(b)); + palette_set_color_rgb(machine, offset, pal6bit(r), pal6bit(g), pal6bit(b)); } diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c index 6bb9f4c52d3..f79f7d97d2d 100644 --- a/src/mame/video/beezer.c +++ b/src/mame/video/beezer.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "machine/6522via.h" @@ -59,7 +58,7 @@ WRITE8_HANDLER( beezer_map_w ) bit1 = (data >> 7) & 0x01; b = 0x5f * bit0 + 0xa0 * bit1; - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); } READ8_HANDLER( beezer_line_r ) diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index 945262b1534..be80f4c2ac0 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -91,7 +91,6 @@ E000-FFFF | R | D D D D D D D D | 8K ROM ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "machine/bfm_bd1.h" // vfd #include "video/bfm_adr2.h" @@ -290,7 +289,7 @@ static WRITE8_HANDLER( screen_ram_w ) r = ((data & 0x18)>>3) * 85; // 00011000b = 0x18 g = ((data & 0x06)>>1) * 85; // 00000110b = 0x06 b = ((data & 0x01) ) * 255; - palette_set_color(Machine, pal, MAKE_RGB(r,g,b)); + palette_set_color(machine, pal, MAKE_RGB(r,g,b)); } if ( adder2_screen_page_reg & SL_ACCESS ) diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index d0e86340788..9cc6356a39a 100644 --- a/src/mame/video/bigevglf.c +++ b/src/mame/video/bigevglf.c @@ -6,7 +6,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *bigevglf_spriteram1; @@ -27,7 +26,7 @@ WRITE8_HANDLER(bigevglf_palette_w) paletteram[offset] = data; color = paletteram[offset&0x3ff] | (paletteram[0x400+(offset&0x3ff)] << 8); - palette_set_color_rgb(Machine, offset&0x3ff, pal4bit(color >> 4), pal4bit(color >> 0), pal4bit(color >> 8)); + palette_set_color_rgb(machine, offset&0x3ff, pal4bit(color >> 4), pal4bit(color >> 0), pal4bit(color >> 8)); } WRITE8_HANDLER( bigevglf_gfxcontrol_w ) diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 6ba15e07668..8e2d8a92a25 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" UINT8 *blktiger_txvideoram; @@ -161,7 +160,7 @@ WRITE8_HANDLER( blktiger_video_control_w ) coin_counter_w(1,data & 2); /* bit 5 resets the sound CPU */ - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE); /* bit 6 flips screen */ flip_screen_set(data & 0x40); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index ee14a07990e..a3b3e393ba6 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -29,7 +29,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" /* Variables needed by driver: */ @@ -50,7 +49,7 @@ UINT16 *blmbycar_vram_1, *blmbycar_scroll_1; WRITE16_HANDLER( blmbycar_palette_w ) { data = COMBINE_DATA(&paletteram16[offset]); - palette_set_color_rgb( Machine, offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8)); + palette_set_color_rgb( machine, offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8)); } diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 0a8a5278b3e..3f9e266f3a5 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -9,7 +9,6 @@ drivers by Acho A. Tang // Directives #include "driver.h" -#include "deprecat.h" #define BW_DEBUG 0 @@ -154,7 +153,7 @@ WRITE8_HANDLER( bwing_paletteram_w ) if (b > 0xff) b = 0xff; } - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); #if BW_DEBUG paletteram[offset+0x40] = palatch; diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index c99d961ca47..b12a0f598c0 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -4,7 +4,6 @@ Omori Electric CAD (OEC) 1981 */ #include "driver.h" -#include "deprecat.h" static tilemap *carjmbre_tilemap; @@ -56,7 +55,7 @@ WRITE8_HANDLER( carjmbre_bgcolor_w ) if(oldbg!=carjmbre_bgcolor) { for (i=0;i<64;i+=4) - palette_set_color_rgb(Machine, i, (carjmbre_bgcolor&0xff)*0x50, (carjmbre_bgcolor&0xff)*0x50, (carjmbre_bgcolor&0xff)!=0?0x50:0); + palette_set_color_rgb(machine, i, (carjmbre_bgcolor&0xff)*0x50, (carjmbre_bgcolor&0xff)*0x50, (carjmbre_bgcolor&0xff)!=0?0x50:0); } } diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index 128627926a2..5ded3888be6 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "ccastles.h" #include "video/resnet.h" @@ -125,7 +124,7 @@ WRITE8_HANDLER( ccastles_paletteram_w ) bit2 = (~b >> 2) & 0x01; b = combine_3_weights(bweights, bit0, bit1, bit2); - palette_set_color(Machine, offset & 0x1f, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset & 0x1f, MAKE_RGB(r, g, b)); } diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c index 617cdc8306a..8d3b7df60f7 100644 --- a/src/mame/video/cchasm.c +++ b/src/mame/video/cchasm.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/vector.h" #include "cchasm.h" @@ -115,7 +114,7 @@ WRITE16_HANDLER( cchasm_refresh_control_w ) cchasm_refresh(); break; case 0xf7: - cpunum_set_input_line (Machine, 0, 2, CLEAR_LINE); + cpunum_set_input_line (machine, 0, 2, CLEAR_LINE); break; } } diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index f01ba9ad2b0..6066388628d 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -5,7 +5,6 @@ *************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "centiped.h" @@ -235,7 +234,7 @@ WRITE8_HANDLER( centiped_paletteram_w ) /* character colors, set directly */ if ((offset & 0x08) == 0) - palette_set_color(Machine, offset & 0x03, color); + palette_set_color(machine, offset & 0x03, color); /* sprite colors - set all the applicable ones */ else @@ -247,13 +246,13 @@ WRITE8_HANDLER( centiped_paletteram_w ) for (i = 0; i < 0x100; i += 4) { if (offset == ((i >> 2) & 0x03)) - palette_set_color(Machine, i + 4 + 1, color); + palette_set_color(machine, i + 4 + 1, color); if (offset == ((i >> 4) & 0x03)) - palette_set_color(Machine, i + 4 + 2, color); + palette_set_color(machine, i + 4 + 2, color); if (offset == ((i >> 6) & 0x03)) - palette_set_color(Machine, i + 4 + 3, color); + palette_set_color(machine, i + 4 + 3, color); } } } @@ -390,7 +389,7 @@ WRITE8_HANDLER( milliped_paletteram_w ) { paletteram[offset] = data; - melliped_mazeinv_set_color(Machine, offset, data); + melliped_mazeinv_set_color(machine, offset, data); } @@ -399,7 +398,7 @@ WRITE8_HANDLER( mazeinv_paletteram_w ) paletteram[offset] = data; /* the value passed in is a look-up index into the color PROM */ - melliped_mazeinv_set_color(Machine, offset, ~memory_region(REGION_PROMS)[~data & 0x0f]); + melliped_mazeinv_set_color(machine, offset, ~memory_region(REGION_PROMS)[~data & 0x0f]); } diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c index d7edba1fe61..c1997c42aa6 100644 --- a/src/mame/video/changela.c +++ b/src/mame/video/changela.c @@ -12,7 +12,6 @@ Todo: Priority between tree0 and tree1. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" extern UINT8 changela_tree0_col; @@ -785,7 +784,7 @@ WRITE8_HANDLER( changela_colors_w ) g = color_table[(c >> 3) & 0x07]; b = color_table[(c >> 6) & 0x07]; - palette_set_color_rgb(Machine,color_index,r,g,b); + palette_set_color_rgb(machine,color_index,r,g,b); } diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index 9ec55093d8d..4fd117e6e22 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -54,7 +54,6 @@ Note: if MAME_DEBUG is defined, pressing Z or X with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "megasys1.h" /* Variables only used here: */ @@ -298,9 +297,9 @@ WRITE16_HANDLER( bigrun_vregs_w ) case 0x2208/2 : break; // watchdog reset /* Not sure about this one.. */ - case 0x2308/2 : cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE ); - cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE ); - cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE ); + case 0x2308/2 : cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE ); + cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE ); + cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE ); break; default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data); diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index 30b57f7ce53..d3ea5ed363d 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cloud9.h" #include "video/resnet.h" @@ -112,7 +111,7 @@ WRITE8_HANDLER( cloud9_paletteram_w ) bit2 = (~b >> 2) & 0x01; b = combine_3_weights(bweights, bit0, bit1, bit2); - palette_set_color(Machine, offset & 0x3f, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset & 0x3f, MAKE_RGB(r, g, b)); } diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index ad6335e1bd4..22e8db133e2 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" static tilemap *bg_tilemap[2]; diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index 902bcf2d8ae..b81a494c421 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *commando_videoram2, *commando_colorram2; @@ -60,7 +59,7 @@ WRITE8_HANDLER( commando_c804_w ) coin_counter_w(1, data & 0x02); // bit 4 resets the sound CPU - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); // bit 7 flips screen flip_screen_set(data & 0x80); diff --git a/src/mame/video/csk.c b/src/mame/video/csk.c index 09f3fdb6161..7ec0015c8bc 100644 --- a/src/mame/video/csk.c +++ b/src/mame/video/csk.c @@ -41,7 +41,7 @@ WRITE8_HANDLER( cpk_palette2_w ) cpk_palette2[offset] = data; newword = cpk_palette[offset] + 256 * cpk_palette2[offset]; - palette_set_color_rgb(Machine,offset,pal5bit(newword >> 0),pal5bit(newword >> 5),pal5bit(newword >> 10)); + palette_set_color_rgb(machine,offset,pal5bit(newword >> 0),pal5bit(newword >> 5),pal5bit(newword >> 10)); } /* Video handling */ diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 584138fe8c1..46d2885701d 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -41,7 +41,6 @@ sprites. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" //static int scroll1[4]; static int scroll2[4]; @@ -196,9 +195,9 @@ WRITE8_HANDLER( lastmiss_control_w ) scroll2[2]=(data>>6)&1; if (data&0x80) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); } WRITE8_HANDLER( shackled_control_w ) diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index 77b0a816c5e..c2aa14f4f1f 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -195,7 +195,7 @@ WRITE16_HANDLER( deco16_nonbuffered_palette_w ) g = (paletteram16[offset+1] >> 8) & 0xff; r = (paletteram16[offset+1] >> 0) & 0xff; - palette_set_color(Machine,offset/2,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset/2,MAKE_RGB(r,g,b)); } WRITE16_HANDLER( deco16_buffered_palette_w ) @@ -206,7 +206,7 @@ WRITE16_HANDLER( deco16_buffered_palette_w ) WRITE16_HANDLER( deco16_palette_dma_w ) { - const int m=Machine->config->total_colors; + const int m=machine->config->total_colors; int r,g,b,i; for (i=0; i> 8) & 0xff; r = (paletteram16[i*2+1] >> 0) & 0xff; - palette_set_color(Machine,i,MAKE_RGB(r,g,b)); + palette_set_color(machine,i,MAKE_RGB(r,g,b)); } } } diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 3c8d30b791d..8deb99a092b 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -157,7 +157,7 @@ WRITE32_HANDLER( deco32_nonbuffered_palette_w ) g = (paletteram32[offset] >> 8) & 0xff; r = (paletteram32[offset] >> 0) & 0xff; - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } WRITE32_HANDLER( deco32_buffered_palette_w ) @@ -168,7 +168,7 @@ WRITE32_HANDLER( deco32_buffered_palette_w ) WRITE32_HANDLER( deco32_palette_dma_w ) { - const int m=Machine->config->total_colors; + const int m=machine->config->total_colors; int r,g,b,i; for (i=0; i> 8) & 0xff; r = (paletteram32[i] >> 0) & 0xff; - palette_set_color(Machine,i,MAKE_RGB(r,g,b)); + palette_set_color(machine,i,MAKE_RGB(r,g,b)); } } } diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 1f79ed46c2d..d48d58c4eb5 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -5,7 +5,6 @@ ***********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/decocass.h" static INT32 watchdog_count; @@ -209,7 +208,7 @@ WRITE8_HANDLER( decocass_paletteram_w ) * (ME/ input on 1st paletteram, inverter -> ME/ on 2nd) */ offset = (offset & 31) ^ 16; - colortable_palette_set_color(Machine->colortable, offset, MAKE_RGB(pal3bit(~data >> 0), pal3bit(~data >> 3), pal2bit(~data >> 6))); + colortable_palette_set_color(machine->colortable, offset, MAKE_RGB(pal3bit(~data >> 0), pal3bit(~data >> 3), pal2bit(~data >> 6))); } WRITE8_HANDLER( decocass_charram_w ) diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index 0d5f2843ae9..e0cd65560b7 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" UINT16 *deniam_videoram,*deniam_textram; @@ -146,7 +145,7 @@ WRITE16_HANDLER( deniam_palette_w ) r = ((data << 1) & 0x1e) | ((data >> 12) & 0x01); g = ((data >> 3) & 0x1e) | ((data >> 13) & 0x01); b = ((data >> 7) & 0x1e) | ((data >> 14) & 0x01); - palette_set_color_rgb(Machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); } diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index bf3189a02ae..5fe7267da8b 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -4,7 +4,6 @@ * video hardware for DJ Boy */ #include "driver.h" -#include "deprecat.h" #include "kan_pand.h" static UINT8 djboy_videoreg, djboy_scrollx, djboy_scrolly; @@ -57,7 +56,7 @@ WRITE8_HANDLER( djboy_paletteram_w ) offset &= ~1; val = (paletteram[offset]<<8) | paletteram[offset+1]; - palette_set_color_rgb(Machine,offset/2,pal4bit(val >> 8),pal4bit(val >> 4),pal4bit(val >> 0)); + palette_set_color_rgb(machine,offset/2,pal4bit(val >> 8),pal4bit(val >> 4),pal4bit(val >> 0)); } VIDEO_UPDATE( djboy ) diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index cf86049d4f1..2e52e12341c 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -1,6 +1,5 @@ #include "driver.h" -#include "deprecat.h" static tilemap *bg_layer,*fg_layer,*tx_layer; UINT16 *dynduke_back_data,*dynduke_fore_data,*dynduke_scroll_ram; @@ -16,7 +15,7 @@ WRITE16_HANDLER( dynduke_paletteram_w ) COMBINE_DATA(&paletteram16[offset]); color=paletteram16[offset]; - palette_set_color_rgb(Machine,offset,pal4bit(color >> 0),pal4bit(color >> 4),pal4bit(color >> 8)); + palette_set_color_rgb(machine,offset,pal4bit(color >> 0),pal4bit(color >> 4),pal4bit(color >> 8)); } WRITE16_HANDLER( dynduke_background_w ) diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c index 1d13d09ce70..230f247994d 100644 --- a/src/mame/video/exidy.c +++ b/src/mame/video/exidy.c @@ -102,7 +102,7 @@ INTERRUPT_GEN( teetert_vblank_interrupt ) READ8_HANDLER( exidy_interrupt_r ) { /* clear any interrupts */ - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); /* return the latched condition */ return int_condition; diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c index 30b5e1b3044..3f089547c3b 100644 --- a/src/mame/video/exidy440.c +++ b/src/mame/video/exidy440.c @@ -138,7 +138,7 @@ WRITE8_HANDLER( exidy440_paletteram_w ) word = (local_paletteram[offset] << 8) + local_paletteram[offset + 1]; /* extract the 5-5-5 RGB colors */ - palette_set_color_rgb(Machine, offset / 2, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0)); + palette_set_color_rgb(machine, offset / 2, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0)); } } @@ -221,7 +221,7 @@ WRITE8_HANDLER( exidy440_control_w ) { /* extract a word and the 5-5-5 RGB components */ int word = (local_paletteram[offset] << 8) + local_paletteram[offset + 1]; - palette_set_color_rgb(Machine, i, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0)); + palette_set_color_rgb(machine, i, pal5bit(word >> 10), pal5bit(word >> 5), pal5bit(word >> 0)); } } } diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c index 3fb73d6dc87..2fa48d4c729 100644 --- a/src/mame/video/fastfred.c +++ b/src/mame/video/fastfred.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/resnet.h" #include "fastfred.h" diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index 23b7f93c31f..2a1d02eef08 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "machine/atarigen.h" #include "foodf.h" #include "video/resnet.h" @@ -108,7 +107,7 @@ WRITE16_HANDLER( foodf_paletteram_w ) bit1 = (newword >> 7) & 0x01; b = combine_2_weights(bweights, bit0, bit1); - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); } diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 1aa0c6b41bd..103596638a3 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -7,7 +7,6 @@ ******************************************************************************/ #include "driver.h" -#include "deprecat.h" static int fromanc2_scrollx[2][4], fromanc2_scrolly[2][4]; static int fromanc2_gfxbank[2][4]; @@ -83,7 +82,7 @@ WRITE16_HANDLER( fromanc2_paletteram_0_w ) // GGGG_GRRR_RRBB_BBBx color = ((offset & 0x0700) << 1) + (offset & 0x00ff); - palette_set_color_rgb(Machine, 0x000 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1)); + palette_set_color_rgb(machine, 0x000 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1)); } WRITE16_HANDLER( fromanc2_paletteram_1_w ) @@ -94,7 +93,7 @@ WRITE16_HANDLER( fromanc2_paletteram_1_w ) // GGGG_GRRR_RRBB_BBBx color = ((offset & 0x0700) << 1) + (offset & 0x00ff); - palette_set_color_rgb(Machine, 0x100 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1)); + palette_set_color_rgb(machine, 0x100 + color, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1)); } @@ -116,7 +115,7 @@ WRITE16_HANDLER( fromancr_paletteram_0_w ) // xGGG_GGRR_RRRB_BBBB color = ((offset & 0x0700) << 1) + (offset & 0x00ff); - palette_set_color_rgb(Machine, 0x000 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0)); + palette_set_color_rgb(machine, 0x000 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0)); } WRITE16_HANDLER( fromancr_paletteram_1_w ) @@ -127,7 +126,7 @@ WRITE16_HANDLER( fromancr_paletteram_1_w ) // xGGG_GGRR_RRRB_BBBB color = ((offset & 0x0700) << 1) + (offset & 0x00ff); - palette_set_color_rgb(Machine, 0x100 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0)); + palette_set_color_rgb(machine, 0x100 + color, pal5bit(data >> 5), pal5bit(data >> 10), pal5bit(data >> 0)); } @@ -149,7 +148,7 @@ WRITE16_HANDLER( fromanc4_paletteram_0_w ) // xRRR_RRGG_GGGB_BBBB color = ((offset & 0x0700) << 1) + (offset & 0x00ff); - palette_set_color_rgb(Machine, 0x000 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); + palette_set_color_rgb(machine, 0x000 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } WRITE16_HANDLER( fromanc4_paletteram_1_w ) @@ -160,7 +159,7 @@ WRITE16_HANDLER( fromanc4_paletteram_1_w ) // xRRR_RRGG_GGGB_BBBB color = ((offset & 0x0700) << 1) + (offset & 0x00ff); - palette_set_color_rgb(Machine, 0x100 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); + palette_set_color_rgb(machine, 0x100 + color, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index bf198e602c9..51751715ef5 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -8,7 +8,6 @@ ******************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "fromance.h" @@ -212,7 +211,7 @@ WRITE8_HANDLER( fromance_paletteram_w ) /* compute R,G,B */ palword = (local_paletteram[offset | 1] << 8) | local_paletteram[offset & ~1]; - palette_set_color_rgb(Machine, offset / 2, pal5bit(palword >> 10), pal5bit(palword >> 5), pal5bit(palword >> 0)); + palette_set_color_rgb(machine, offset / 2, pal5bit(palword >> 10), pal5bit(palword >> 5), pal5bit(palword >> 0)); } diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c index 99b27afc680..f05b9f6295f 100644 --- a/src/mame/video/funybubl.c +++ b/src/mame/video/funybubl.c @@ -6,7 +6,6 @@ todo - convert to tilemap #include "driver.h" -#include "deprecat.h" UINT8* funybubl_banked_videoram; UINT8 *funybubl_paletteram; @@ -24,7 +23,7 @@ WRITE8_HANDLER ( funybubl_paldatawrite ) coldat = funybubl_paletteram[colchanged*4] | (funybubl_paletteram[colchanged*4+1] << 8) | (funybubl_paletteram[colchanged*4+2] << 16) | (funybubl_paletteram[colchanged*4+3] << 24); - palette_set_color_rgb(Machine,colchanged,pal6bit(coldat >> 12),pal6bit(coldat >> 0),pal6bit(coldat >> 6)); + palette_set_color_rgb(machine,colchanged,pal6bit(coldat >> 12),pal6bit(coldat >> 0),pal6bit(coldat >> 6)); } diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index e05c2612ad4..5fa9b724a24 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -77,7 +77,6 @@ Multi monitor notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT16 *gaelco2_vregs; static UINT16 *gaelco2_videoram; @@ -241,7 +240,7 @@ WRITE16_HANDLER( gaelco2_palette_w ) b = pal5bit(b); /* update game palette */ - palette_set_color(Machine, 4096*0 + offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, 4096*0 + offset, MAKE_RGB(r, g, b)); /* update shadow/highligh palettes */ for (i = 1; i < 16; i++){ @@ -253,7 +252,7 @@ WRITE16_HANDLER( gaelco2_palette_w ) auxg = ADJUST_COLOR(g + pen_color_adjust[i]); auxb = ADJUST_COLOR(b + pen_color_adjust[i]); - palette_set_color(Machine, 4096*i + offset, MAKE_RGB(auxr, auxg, auxb)); + palette_set_color(machine, 4096*i + offset, MAKE_RGB(auxr, auxg, auxb)); } } diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c index ef676eea0cf..15d9d991e1d 100644 --- a/src/mame/video/galpani2.c +++ b/src/mame/video/galpani2.c @@ -72,7 +72,7 @@ WRITE16_HANDLER( galpani2_bg8_##_n_##_w ) \ WRITE16_HANDLER( galpani2_palette_##_n_##_w ) \ { \ UINT16 newword = COMBINE_DATA(&galpani2_palette_##_n_[offset]); \ - palette_set_color_rgb( Machine, offset + 0x4000 + _n_ * 0x100, pal5bit(newword >> 5), pal5bit(newword >> 10), pal5bit(newword >> 0) ); \ + palette_set_color_rgb( machine, offset + 0x4000 + _n_ * 0x100, pal5bit(newword >> 5), pal5bit(newword >> 10), pal5bit(newword >> 0) ); \ } galpani2_BG8_REGS_R( 0 ) diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c index a23fb915fab..364f81e0f99 100644 --- a/src/mame/video/galpanic.c +++ b/src/mame/video/galpanic.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "kan_pand.h" UINT16 *galpanic_bgvideoram,*galpanic_fgvideoram; @@ -45,7 +44,7 @@ WRITE16_HANDLER( galpanic_paletteram_w ) { data = COMBINE_DATA(&paletteram16[offset]); /* bit 0 seems to be a transparency flag for the front bitmap */ - palette_set_color_rgb(Machine,offset,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); + palette_set_color_rgb(machine,offset,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); } diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index f30fd51b86d..ed5faa6c182 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -119,7 +119,7 @@ static VIDEO_UPDATE( leprechn ) static WRITE8_HANDLER( video_data_w ) { - gameplan_state *state = Machine->driver_data; + gameplan_state *state = machine->driver_data; state->video_data = data; } @@ -127,7 +127,7 @@ static WRITE8_HANDLER( video_data_w ) static WRITE8_HANDLER( gameplan_video_command_w ) { - gameplan_state *state = Machine->driver_data; + gameplan_state *state = machine->driver_data; state->video_command = data & 0x07; } @@ -135,7 +135,7 @@ static WRITE8_HANDLER( gameplan_video_command_w ) static WRITE8_HANDLER( leprechn_video_command_w ) { - gameplan_state *state = Machine->driver_data; + gameplan_state *state = machine->driver_data; state->video_command = (data >> 3) & 0x07; } diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index c3b66b40aed..77f366cd6f7 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -58,7 +58,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: **************************************************************************/ #include "driver.h" -#include "deprecat.h" /* Variables only used here */ static tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap; @@ -182,7 +181,7 @@ WRITE16_HANDLER( ginganin_vregs16_w ) break; case 7: soundlatch_w(machine,0,data); - cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); break; default: logerror("CPU #0 PC %06X : Warning, videoreg %04X <- %04X\n",activecpu_get_pc(),offset,data); diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c index ba0f2289ba1..83e19c86feb 100644 --- a/src/mame/video/gladiatr.c +++ b/src/mame/video/gladiatr.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *gladiatr_videoram, *gladiatr_colorram, *gladiatr_textram; @@ -118,7 +117,7 @@ WRITE8_HANDLER( gladiatr_paletteram_w ) g = (g << 1) + ((paletteram[offset + 0x400] >> 5) & 0x01); b = (b << 1) + ((paletteram[offset + 0x400] >> 6) & 0x01); - palette_set_color_rgb(Machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); } diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c index c2494d22d8c..9f5e008234c 100644 --- a/src/mame/video/gottlieb.c +++ b/src/mame/video/gottlieb.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *gottlieb_charram; @@ -86,7 +85,7 @@ WRITE8_HANDLER( gottlieb_paletteram_w ) b = 0x10 * bit0 + 0x21 * bit1 + 0x46 * bit2 + 0x88 * bit3; - palette_set_color(Machine, offset / 2, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset / 2, MAKE_RGB(r, g, b)); } WRITE8_HANDLER( gottlieb_video_outputs_w ) @@ -142,7 +141,7 @@ WRITE8_HANDLER( gottlieb_charram_w ) { gottlieb_charram[offset] = data; - decodechar(Machine->gfx[0], offset / 32, gottlieb_charram); + decodechar(machine->gfx[0], offset / 32, gottlieb_charram); tilemap_mark_all_tiles_dirty(bg_tilemap); } diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 32c21a9416c..0e70a52628f 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -2,7 +2,6 @@ /* updated by Hans Andersson, dec 2005 */ #include "driver.h" -#include "deprecat.h" #include "video/resnet.h" #include "includes/grchamp.h" @@ -55,21 +54,21 @@ PALETTE_INIT( grchamp ) WRITE8_HANDLER( grchamp_left_w ) { - grchamp_state *state = Machine->driver_data; + grchamp_state *state = machine->driver_data; state->leftram[offset] = data; tilemap_mark_tile_dirty(state->left_tilemap, offset); } WRITE8_HANDLER( grchamp_center_w ) { - grchamp_state *state = Machine->driver_data; + grchamp_state *state = machine->driver_data; state->centerram[offset] = data; tilemap_mark_tile_dirty(state->center_tilemap, offset); } WRITE8_HANDLER( grchamp_right_w ) { - grchamp_state *state = Machine->driver_data; + grchamp_state *state = machine->driver_data; state->rightram[offset] = data; tilemap_mark_tile_dirty(state->right_tilemap, offset); } diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index cab3459bbc1..9953d68dc57 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -287,14 +287,14 @@ READ32_HANDLER( K001005_r ) { if (K001005_fifo_read_ptr < 0x3ff) { - //cpunum_set_input_line(Machine, 2, SHARC_INPUT_FLAG1, CLEAR_LINE); + //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, CLEAR_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, CLEAR_LINE); cpuintrf_pop_context(); } else { - //cpunum_set_input_line(Machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); + //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, ASSERT_LINE); cpuintrf_pop_context(); @@ -302,7 +302,7 @@ READ32_HANDLER( K001005_r ) } else { - //cpunum_set_input_line(Machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); + //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, ASSERT_LINE); cpuintrf_pop_context(); @@ -346,14 +346,14 @@ WRITE32_HANDLER( K001005_w ) { if (K001005_fifo_write_ptr < 0x400) { - //cpunum_set_input_line(Machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); + //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, ASSERT_LINE); cpuintrf_pop_context(); } else { - //cpunum_set_input_line(Machine, 2, SHARC_INPUT_FLAG1, CLEAR_LINE); + //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, CLEAR_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, CLEAR_LINE); cpuintrf_pop_context(); @@ -361,7 +361,7 @@ WRITE32_HANDLER( K001005_w ) } else { - //cpunum_set_input_line(Machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); + //cpunum_set_input_line(machine, 2, SHARC_INPUT_FLAG1, ASSERT_LINE); cpuintrf_push_context(2); sharc_set_flag_input(1, ASSERT_LINE); cpuintrf_pop_context(); diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c index f434d185290..ccb791392ae 100644 --- a/src/mame/video/gundealr.c +++ b/src/mame/video/gundealr.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" @@ -101,7 +100,7 @@ WRITE8_HANDLER( gundealr_paletteram_w ) b = (val >> 4) & 0x0f; /* TODO: the bottom 4 bits are used as well, but I'm not sure about the meaning */ - palette_set_color_rgb(Machine,offset / 2,pal4bit(r),pal4bit(g),pal4bit(b)); + palette_set_color_rgb(machine,offset / 2,pal4bit(r),pal4bit(g),pal4bit(b)); } WRITE8_HANDLER( gundealr_fg_scroll_w ) diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c index aded862a76f..b481b558368 100644 --- a/src/mame/video/harddriv.c +++ b/src/mame/video/harddriv.c @@ -286,7 +286,7 @@ WRITE16_HANDLER( hdgsp_control_hi_w ) break; case 0x04: - if (Machine->config->total_colors >= 256 * 8) + if (machine->config->total_colors >= 256 * 8) update_palette_bank((gfx_palettebank & ~4) | (val << 2)); break; diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 6e218b3e3f8..7818984ab9a 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" static int homerun_gfx_ctrl; static int homerun_gc_up,homerun_gc_down; @@ -48,7 +47,7 @@ WRITE8_HANDLER(homerun_color_w) bit1 = (data >> 6) & 0x01; bit2 = (data >> 7) & 0x01; b = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } static TILE_GET_INFO( get_homerun_tile_info ) diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 0922bc49c6b..36a10676000 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -55,7 +55,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #define RASTER_LINES 262 #define FIRST_VISIBLE_LINE 0 @@ -85,7 +84,7 @@ WRITE16_HANDLER( hyprduel_paletteram_w ) { data = COMBINE_DATA(&paletteram16[offset]); /* We need the ^0xff because we had to invert the pens in the gfx */ - palette_set_color_rgb(Machine,offset^0xff,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); + palette_set_color_rgb(machine,offset^0xff,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); } diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c index 89e4b66a0fe..99c27621725 100644 --- a/src/mame/video/irobot.c +++ b/src/mame/video/irobot.c @@ -76,7 +76,7 @@ WRITE8_HANDLER( irobot_paletteram_w ) g = 12 * bits * intensity; bits = (color >> 7) & 0x03; r = 12 * bits * intensity; - palette_set_color(Machine,(offset >> 1) & 0x3F,MAKE_RGB(r,g,b)); + palette_set_color(machine,(offset >> 1) & 0x3F,MAKE_RGB(r,g,b)); } diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c index 82dffecec29..8300d2b655e 100644 --- a/src/mame/video/itech32.c +++ b/src/mame/video/itech32.c @@ -6,7 +6,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "profiler.h" #include "cpu/m68000/m68000.h" #include "itech32.h" @@ -272,7 +271,7 @@ WRITE16_HANDLER( timekill_intensity_w ) double intensity = (double)(data & 0xff) / (double)0x60; int i; for (i = 0; i < 8192; i++) - palette_set_brightness(Machine, i, intensity); + palette_set_brightness(machine, i, intensity); } } @@ -350,7 +349,7 @@ WRITE16_HANDLER( timekill_paletteram_w ) g = paletteram16[offset & ~1] >> 8; b = paletteram16[offset | 1] >> 8; - palette_set_color(Machine, offset / 2, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset / 2, MAKE_RGB(r, g, b)); } @@ -367,7 +366,7 @@ WRITE16_HANDLER( bloodstm_paletteram_w ) g = paletteram16[offset & ~1] >> 8; b = paletteram16[offset | 1] & 0xff; - palette_set_color(Machine, offset / 2, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset / 2, MAKE_RGB(r, g, b)); } @@ -381,7 +380,7 @@ WRITE32_HANDLER( drivedge_paletteram_w ) g = (paletteram32[offset] >> 8) & 0xff; b = (paletteram32[offset] >> 16) & 0xff; - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); } @@ -395,7 +394,7 @@ WRITE32_HANDLER( itech020_paletteram_w ) g = (paletteram32[offset] >> 8) & 0xff; b = paletteram32[offset] & 0xff; - palette_set_color(Machine, offset, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset, MAKE_RGB(r, g, b)); } diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c index 1ee779141d1..c936e0dd7e1 100644 --- a/src/mame/video/itech8.c +++ b/src/mame/video/itech8.c @@ -88,7 +88,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/tms34061.h" #include "video/tlc34076.h" #include "cpu/m6809/m6809.h" @@ -470,7 +469,7 @@ READ8_HANDLER( itech8_blitter_r ) /* a read from offset 3 clears the interrupt and returns the status */ if (offset == 3) { - itech8_update_interrupts(Machine, -1, -1, 0); + itech8_update_interrupts(machine, -1, -1, 0); if (blit_in_progress) result |= 0x80; else diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c index 7ab9166d1ee..b861dbcf1d7 100644 --- a/src/mame/video/jaguar.c +++ b/src/mame/video/jaguar.c @@ -733,11 +733,11 @@ READ32_HANDLER( cojag_gun_input_r ) switch (offset) { case 0: - get_crosshair_xy(Machine, 1, &beamx, &beamy); + get_crosshair_xy(machine, 1, &beamx, &beamy); return (beamy << 16) | (beamx ^ 0x1ff); case 1: - get_crosshair_xy(Machine, 0, &beamx, &beamy); + get_crosshair_xy(machine, 0, &beamx, &beamy); return (beamy << 16) | (beamx ^ 0x1ff); case 2: diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c index 617f6dfffd1..8675142dc45 100644 --- a/src/mame/video/jedi.c +++ b/src/mame/video/jedi.c @@ -15,7 +15,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "jedi.h" diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c index 4b6fdd09a6b..dc8207f8486 100644 --- a/src/mame/video/jpmimpct.c +++ b/src/mame/video/jpmimpct.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms34010/tms34010.h" #include "jpmimpct.h" @@ -61,7 +60,7 @@ WRITE16_HANDLER( bt477_w ) if (++*addr_cnt == 3) { - palette_set_color(Machine, bt477.address, MAKE_RGB(color[0], color[1], color[2])); + palette_set_color(machine, bt477.address, MAKE_RGB(color[0], color[1], color[2])); *addr_cnt = 0; /* Address register increments */ diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c index c9b62501cf0..205fb5bb934 100644 --- a/src/mame/video/kangaroo.c +++ b/src/mame/video/kangaroo.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "kangaroo.h" diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 94c7031903b..842377e5756 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -4,7 +4,6 @@ */ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #include "machine/konamigx.h" diff --git a/src/mame/video/lethalj.c b/src/mame/video/lethalj.c index 982bf8ee685..b23fdd325e7 100644 --- a/src/mame/video/lethalj.c +++ b/src/mame/video/lethalj.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/tms34010/tms34010.h" #include "lethalj.h" @@ -62,7 +61,7 @@ READ16_HANDLER( lethalj_gun_r ) case 4: case 5: /* latch the crosshair position */ - get_crosshair_xy(Machine, offset - 4, &beamx, &beamy); + get_crosshair_xy(machine, offset - 4, &beamx, &beamy); gunx = beamx; guny = beamy; blank_palette = 1; @@ -170,7 +169,7 @@ WRITE16_HANDLER( lethalj_blitter_w ) /* clear the IRQ on offset 0 */ else if (offset == 0) - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); } diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 277be39fc6a..705cb118c73 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -10,7 +10,6 @@ *******************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" static int background_color,background_disable; diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 671d5cd5d30..5316b83c1ac 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "lockon.h" #include "video/resnet.h" #include "cpu/nec/nec.h" @@ -170,7 +169,7 @@ PALETTE_INIT( lockon ) b = compute_res_net( (p1 & 0x1f), 2, &lockon_pd_net_info ); } - palette_set_color(Machine, i, MAKE_RGB(r, g, b)); + palette_set_color(machine, i, MAKE_RGB(r, g, b)); } } @@ -330,8 +329,8 @@ WRITE16_HANDLER( lockon_ground_ctrl_w ) static TIMER_CALLBACK( bufend_callback ) { - cpunum_set_input_line_and_vector(Machine, GROUND_CPU, 0, HOLD_LINE, 0xff); - cpunum_set_input_line(Machine, OBJECT_CPU, NEC_INPUT_LINE_POLL, ASSERT_LINE); + cpunum_set_input_line_and_vector(machine, GROUND_CPU, 0, HOLD_LINE, 0xff); + cpunum_set_input_line(machine, OBJECT_CPU, NEC_INPUT_LINE_POLL, ASSERT_LINE); } /* Get data for a each 8x8x3 ground tile */ @@ -659,7 +658,7 @@ WRITE16_HANDLER( lockon_tza112_w ) READ16_HANDLER( lockon_obj_4000_r ) { - cpunum_set_input_line(Machine, OBJECT_CPU, NEC_INPUT_LINE_POLL, CLEAR_LINE); + cpunum_set_input_line(machine, OBJECT_CPU, NEC_INPUT_LINE_POLL, CLEAR_LINE); return 0xffff; } @@ -695,8 +694,8 @@ WRITE16_HANDLER( lockon_fb_clut_w ) { rgb_t color; - color = palette_get_color(Machine, 0x300 + (data & 0xff)); - palette_set_color(Machine, 0x400 + offset, color); + color = palette_get_color(machine, 0x300 + (data & 0xff)); + palette_set_color(machine, 0x400 + offset, color); } /* Rotation control register */ diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c index e4824cb04e1..3d428061286 100644 --- a/src/mame/video/lordgun.c +++ b/src/mame/video/lordgun.c @@ -36,7 +36,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" // Variables needed by driver: diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 9836373c6d6..0e0557ee15c 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -67,13 +67,13 @@ WRITE8_HANDLER( m10_colorram_w ) WRITE8_HANDLER( m15_chargen_w ) { - m10_state *state = Machine->driver_data; + m10_state *state = machine->driver_data; if (state->chargen[offset] != data) { state->chargen[offset] = data; /* not very effective ... dirty would be better */ - decodechar(Machine->gfx[0],offset >> 3,state->chargen); + decodechar(machine->gfx[0],offset >> 3,state->chargen); } } diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index b7a3c6d6a87..b1bf305d2fe 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "m58.h" #include "video/resnet.h" diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c index a47212cd6e1..e782774ea8d 100644 --- a/src/mame/video/m72.c +++ b/src/mame/video/m72.c @@ -353,9 +353,9 @@ WRITE16_HANDLER( m72_port02_w ) /* bit 4 resets sound CPU (active low) */ if (data & 0x10) - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE); else - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE); /* bit 5 = "bank"? */ } diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c index 8a37ce6a54d..f3855839654 100644 --- a/src/mame/video/matmania.c +++ b/src/mame/video/matmania.c @@ -13,7 +13,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" @@ -114,7 +113,7 @@ WRITE8_HANDLER( matmania_paletteram_w ) bit3 = (val >> 3) & 0x01; b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - palette_set_color(Machine,offs2 + 64,MAKE_RGB(r,g,b)); + palette_set_color(machine,offs2 + 64,MAKE_RGB(r,g,b)); } diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c index df94b2214c8..b5ec3676419 100644 --- a/src/mame/video/mcr3.c +++ b/src/mame/video/mcr3.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "mcr.h" @@ -150,7 +149,7 @@ WRITE8_HANDLER( mcr3_paletteram_w ) offset &= 0x7f; /* high bit of red comes from low bit of address */ - palette_set_color_rgb(Machine, offset / 2, pal3bit(((offset & 1) << 2) + (data >> 6)), pal3bit(data >> 0), pal3bit(data >> 3)); + palette_set_color_rgb(machine, offset / 2, pal3bit(((offset & 1) << 2) + (data >> 6)), pal3bit(data >> 0), pal3bit(data >> 3)); } diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index bd580f44db2..9c3107c35a7 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "mcr.h" @@ -134,7 +133,7 @@ WRITE16_HANDLER( mcr68_paletteram_w ) COMBINE_DATA(&paletteram16[offset]); newword = paletteram16[offset]; - palette_set_color_rgb(Machine, offset, pal3bit(newword >> 6), pal3bit(newword >> 0), pal3bit(newword >> 3)); + palette_set_color_rgb(machine, offset, pal3bit(newword >> 6), pal3bit(newword >> 0), pal3bit(newword >> 3)); } @@ -144,7 +143,7 @@ WRITE16_HANDLER( zwackery_paletteram_w ) COMBINE_DATA(&paletteram16[offset]); newword = paletteram16[offset]; - palette_set_color_rgb(Machine, offset, pal5bit(~newword >> 10), pal5bit(~newword >> 0), pal5bit(~newword >> 5)); + palette_set_color_rgb(machine, offset, pal5bit(~newword >> 10), pal5bit(~newword >> 0), pal5bit(~newword >> 5)); } diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c index d194a09a902..a166a9148c6 100644 --- a/src/mame/video/megasys1.c +++ b/src/mame/video/megasys1.c @@ -192,7 +192,6 @@ actual code sent to the hardware. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "megasys1.h" /* Variables defined here, that have to be shared: */ diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 8658fcf679e..fe56a882e82 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -52,7 +52,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" /* Variables that driver has access to: */ @@ -130,7 +129,7 @@ WRITE16_HANDLER( metro_paletteram_w ) { data = COMBINE_DATA(&paletteram16[offset]); /* We need the ^0xff because we had to invert the pens in the gfx */ - palette_set_color_rgb(Machine,offset^0xff,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); + palette_set_color_rgb(machine,offset^0xff,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); } diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c index 585fdd9d8ec..00d7765563c 100644 --- a/src/mame/video/midtunit.c +++ b/src/mame/video/midtunit.c @@ -5,7 +5,6 @@ **************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "profiler.h" #include "cpu/tms34010/tms34010.h" #include "cpu/tms34010/34010ops.h" @@ -299,7 +298,7 @@ WRITE16_HANDLER( midtunit_paletteram_w ) COMBINE_DATA(&paletteram16[offset]); newword = paletteram16[offset]; - palette_set_color_rgb(Machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); + palette_set_color_rgb(machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } @@ -685,7 +684,7 @@ WRITE16_HANDLER( midtunit_dma_w ) /* high bit triggers action */ command = dma_register[DMA_COMMAND]; - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); if (!(command & 0x8000)) return; diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c index 5bdbafc24b6..dc72ade6e48 100644 --- a/src/mame/video/midvunit.c +++ b/src/mame/video/midvunit.c @@ -512,7 +512,7 @@ WRITE32_HANDLER( midvunit_paletteram_w ) COMBINE_DATA(&paletteram32[offset]); newword = paletteram32[offset]; - palette_set_color_rgb(Machine, offset, pal5bit(newword >> 10), pal5bit(newword >> 5), pal5bit(newword >> 0)); + palette_set_color_rgb(machine, offset, pal5bit(newword >> 10), pal5bit(newword >> 5), pal5bit(newword >> 0)); } diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index a30a95f08ae..12d299493e4 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -5,7 +5,6 @@ Namco System 1 Video Hardware *******************************************************************/ #include "driver.h" -#include "deprecat.h" /* @@ -197,7 +196,7 @@ WRITE8_HANDLER( namcos1_paletteram_w ) r = namcos1_paletteram[offset]; g = namcos1_paletteram[offset + 0x0800]; b = namcos1_paletteram[offset + 0x1000]; - palette_set_color(Machine,color,MAKE_RGB(r,g,b)); + palette_set_color(machine,color,MAKE_RGB(r,g,b)); } else { diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c index f92d2022de9..e569983ca71 100644 --- a/src/mame/video/nbmj8891.c +++ b/src/mame/video/nbmj8891.c @@ -57,7 +57,7 @@ WRITE8_HANDLER( nbmj8891_palette_type1_w ) g = ((nbmj8891_palette[offset + 1] & 0xf0) >> 4); b = ((nbmj8891_palette[offset + 1] & 0x0f) >> 0); - palette_set_color_rgb(Machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); } READ8_HANDLER( nbmj8891_palette_type2_r ) @@ -79,7 +79,7 @@ WRITE8_HANDLER( nbmj8891_palette_type2_w ) g = ((nbmj8891_palette[offset + 0x000] & 0xf0) >> 4); b = ((nbmj8891_palette[offset + 0x100] & 0x0f) >> 0); - palette_set_color_rgb(Machine, (offset & 0x0ff), pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, (offset & 0x0ff), pal4bit(r), pal4bit(g), pal4bit(b)); } READ8_HANDLER( nbmj8891_palette_type3_r ) @@ -101,7 +101,7 @@ WRITE8_HANDLER( nbmj8891_palette_type3_w ) g = ((nbmj8891_palette[offset + 0] & 0xf0) >> 4); b = ((nbmj8891_palette[offset + 0] & 0x0f) >> 0); - palette_set_color_rgb(Machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); } WRITE8_HANDLER( nbmj8891_clutsel_w ) diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c index e7972525b49..91f799e2c00 100644 --- a/src/mame/video/nbmj8991.c +++ b/src/mame/video/nbmj8991.c @@ -51,7 +51,7 @@ WRITE8_HANDLER( nbmj8991_palette_type1_w ) g = ((paletteram[offset + 1] & 0xf0) >> 4); b = ((paletteram[offset + 1] & 0x0f) >> 0); - palette_set_color_rgb(Machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); } WRITE8_HANDLER( nbmj8991_palette_type2_w ) @@ -68,7 +68,7 @@ WRITE8_HANDLER( nbmj8991_palette_type2_w ) g = (((paletteram[offset + 0] & 0x03) << 3) | ((paletteram[offset + 1] & 0xe0) >> 5)); b = ((paletteram[offset + 1] & 0x1f) >> 0); - palette_set_color_rgb(Machine, (offset / 2), pal5bit(r), pal5bit(g), pal5bit(b)); + palette_set_color_rgb(machine, (offset / 2), pal5bit(r), pal5bit(g), pal5bit(b)); } WRITE8_HANDLER( nbmj8991_palette_type3_w ) @@ -85,7 +85,7 @@ WRITE8_HANDLER( nbmj8991_palette_type3_w ) g = ((paletteram[offset + 0] & 0xf0) >> 4); b = ((paletteram[offset + 0] & 0x0f) >> 0); - palette_set_color_rgb(Machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); } /****************************************************************************** diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c index 73129fb8646..32f40850556 100644 --- a/src/mame/video/nbmj9195.c +++ b/src/mame/video/nbmj9195.c @@ -69,7 +69,7 @@ WRITE8_HANDLER( nbmj9195_palette_w ) g = ((nbmj9195_palette[offset + 0] & 0xf0) >> 4); b = ((nbmj9195_palette[offset + 1] & 0x0f) >> 0); - palette_set_color_rgb(Machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); + palette_set_color_rgb(machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b)); } } @@ -92,7 +92,7 @@ WRITE8_HANDLER( nbmj9195_nb22090_palette_w ) g = nbmj9195_nb22090_palette[(0x100 + (offs_h * 0x300) + offs_l)]; b = nbmj9195_nb22090_palette[(0x200 + (offs_h * 0x300) + offs_l)]; - palette_set_color(Machine, ((offs_h * 0x100) + offs_l), MAKE_RGB(r, g, b)); + palette_set_color(machine, ((offs_h * 0x100) + offs_l), MAKE_RGB(r, g, b)); } /****************************************************************************** diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index 043f86c5881..7dceaf8c75b 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT16 *nemesis_videoram1b; UINT16 *nemesis_videoram2b; @@ -94,7 +93,7 @@ WRITE16_HANDLER( nemesis_gfx_flipx_w ) else { if (data & 0x100) - cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff); + cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff); } } @@ -149,7 +148,7 @@ WRITE16_HANDLER( nemesis_palette_word_w ) bit5=(data >> 14)&1; b = MULTIPLIER; - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } WRITE16_HANDLER( salamander_palette_word_w ) @@ -158,7 +157,7 @@ WRITE16_HANDLER( salamander_palette_word_w ) offset &= ~1; data = ((paletteram16[offset] << 8) & 0xff00) | (paletteram16[offset+1] & 0xff); - palette_set_color_rgb(Machine,offset / 2,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb(machine,offset / 2,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); } WRITE16_HANDLER( nemesis_videoram1b_word_w ) diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c index 232c6309bf9..1b373185c07 100644 --- a/src/mame/video/niyanpai.c +++ b/src/mame/video/niyanpai.c @@ -68,7 +68,7 @@ WRITE16_HANDLER( niyanpai_palette_w ) g = ((niyanpai_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8); b = ((niyanpai_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8); - palette_set_color(Machine, ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b)); + palette_set_color(machine, ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b)); } if (ACCESSING_BITS_0_7) @@ -77,7 +77,7 @@ WRITE16_HANDLER( niyanpai_palette_w ) g = ((niyanpai_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0); b = ((niyanpai_palette[(0x100 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0); - palette_set_color(Machine, ((offs_h << 8) + (offs_l << 1) + 1), MAKE_RGB(r, g, b)); + palette_set_color(machine, ((offs_h << 8) + (offs_l << 1) + 1), MAKE_RGB(r, g, b)); } } } diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 6c28b70b24e..108d757f3b6 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -8,7 +8,6 @@ ******************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/z80/z80.h" @@ -79,7 +78,7 @@ WRITE8_HANDLER( ojankohs_palette_w ) ((ojankohs_paletteram[offset + 1] & 0xe0) >> 5); b = (ojankohs_paletteram[offset + 1] & 0x1f) >> 0; - palette_set_color_rgb(Machine,offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b)); + palette_set_color_rgb(machine,offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b)); } WRITE8_HANDLER( ccasino_palette_w ) @@ -98,7 +97,7 @@ WRITE8_HANDLER( ccasino_palette_w ) ((ojankohs_paletteram[offset + 1] & 0xe0) >> 5); b = (ojankohs_paletteram[offset + 1] & 0x1f) >> 0; - palette_set_color_rgb(Machine,offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b)); + palette_set_color_rgb(machine,offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b)); } WRITE8_HANDLER( ojankoc_palette_w ) @@ -116,7 +115,7 @@ WRITE8_HANDLER( ojankoc_palette_w ) g = (color >> 5) & 0x1f; b = (color >> 0) & 0x1f; - palette_set_color_rgb(Machine,offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b)); + palette_set_color_rgb(machine,offset >> 1, pal5bit(r), pal5bit(g), pal5bit(b)); } diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index a4db67fad1a..f187b39e986 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -17,7 +17,6 @@ **************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "includes/pacman.h" #include "video/resnet.h" @@ -354,7 +353,7 @@ Van Van WRITE8_HANDLER( vanvan_bgcolor_w ) { int c = 0xaa * (data & 1); - palette_set_color(Machine,0,MAKE_RGB(c,c,c)); + palette_set_color(machine,0,MAKE_RGB(c,c,c)); } diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 9643d4ef666..d602205d1fa 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -26,7 +26,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "paradise.h" /* Variables that driver has access to: */ @@ -54,7 +53,7 @@ WRITE8_HANDLER( paradise_palette_w ) { paletteram[offset] = data; offset %= 0x800; - palette_set_color_rgb(Machine,offset, paletteram[offset + 0x800 * 0], + palette_set_color_rgb(machine,offset, paletteram[offset + 0x800 * 0], paletteram[offset + 0x800 * 1], paletteram[offset + 0x800 * 2] ); } @@ -87,7 +86,7 @@ WRITE8_HANDLER( paradise_palbank_w ) int bank2 = (data & 0xf0); for (i = 0; i < 15; i++) - palette_set_color_rgb(Machine,0x800+i, paletteram[0x200 + bank2 + i + 0x800 * 0], + palette_set_color_rgb(machine,0x800+i, paletteram[0x200 + bank2 + i + 0x800 * 0], paletteram[0x200 + bank2 + i + 0x800 * 1], paletteram[0x200 + bank2 + i + 0x800 * 2] ); if (paradise_palbank != bank1) diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index 7a2ded1f76f..d89bf6c8235 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" UINT16 *bigtwin_bgvideoram; UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3; @@ -251,7 +250,7 @@ WRITE16_HANDLER( bigtwin_paletteram_w ) g |= ((val & 0x04) >> 2); b |= ((val & 0x02) >> 1); - palette_set_color_rgb(Machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); } WRITE16_HANDLER( bigtwin_scroll_w ) diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c index 5eef9939532..6cc0693cab3 100644 --- a/src/mame/video/policetr.c +++ b/src/mame/video/policetr.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "cpu/mips/r3000.h" #include "policetr.h" @@ -246,12 +245,12 @@ WRITE32_HANDLER( policetr_video_w ) /* latch 0x50 clears IRQ4 */ case 0x50: - cpunum_set_input_line(Machine, 0, R3000_IRQ4, CLEAR_LINE); + cpunum_set_input_line(machine, 0, R3000_IRQ4, CLEAR_LINE); break; /* latch 0x60 clears IRQ5 */ case 0x60: - cpunum_set_input_line(Machine, 0, R3000_IRQ5, CLEAR_LINE); + cpunum_set_input_line(machine, 0, R3000_IRQ5, CLEAR_LINE); break; /* log anything else */ @@ -346,7 +345,7 @@ WRITE32_HANDLER( policetr_palette_data_w ) palette_data[palette_index] = (data >> 16) & 0xff; if (++palette_index == 3) { - palette_set_color(Machine, palette_offset, MAKE_RGB(palette_data[0], palette_data[1], palette_data[2])); + palette_set_color(machine, palette_offset, MAKE_RGB(palette_data[0], palette_data[1], palette_data[2])); palette_index = 0; } } diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index c4a385bf217..a7caff31312 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *popeye_background_pos; UINT8 *popeye_palettebank; diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 4a0b06ac157..7512820865d 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -6,8 +6,6 @@ Omori Electric CAD (OEC) 1983 #include "driver.h" #include "video/resnet.h" -#include "deprecat.h" - static tilemap *popper_p123_tilemap, *popper_p0_tilemap, *popper_ol_p123_tilemap, *popper_ol_p0_tilemap; UINT8 *popper_videoram, *popper_attribram, *popper_ol_videoram, *popper_ol_attribram, *popper_spriteram; size_t popper_spriteram_size; diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index 1320c81631c..4478893a5b5 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -38,7 +38,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: **************************************************************************/ #include "driver.h" -#include "deprecat.h" /* Variables that driver has access to: */ UINT16 *powerins_vram_0, *powerins_vctrl_0; @@ -96,7 +95,7 @@ WRITE16_HANDLER( powerins_paletteram16_w ) int g = ((newword >> 7) & 0x1E ) | ((newword >> 2) & 0x01); int b = ((newword >> 3) & 0x1E ) | ((newword >> 1) & 0x01); - palette_set_color_rgb( Machine,offset, pal5bit(r),pal5bit(g),pal5bit(b) ); + palette_set_color_rgb( machine,offset, pal5bit(r),pal5bit(g),pal5bit(b) ); } diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c index 1f2d7d0e721..29ff082f65c 100644 --- a/src/mame/video/psx.c +++ b/src/mame/video/psx.c @@ -614,7 +614,7 @@ static STATE_POSTLOAD( updatevisiblearea ) visarea.min_x = visarea.min_y = 0; visarea.max_x = m_n_screenwidth - 1; visarea.max_y = m_n_screenheight - 1; - video_screen_configure(Machine->primary_screen, m_n_screenwidth, m_n_screenheight, &visarea, HZ_TO_ATTOSECONDS(refresh)); + video_screen_configure(machine->primary_screen, m_n_screenwidth, m_n_screenheight, &visarea, HZ_TO_ATTOSECONDS(refresh)); } static void psx_gpu_init( running_machine *machine ) diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index 69eccc8bb6b..f300cdd750c 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -10,7 +10,6 @@ Video hardware ******************************************************************************/ #include "driver.h" -#include "deprecat.h" static UINT8 *quizdna_bg_ram; static UINT8 *quizdna_fg_ram; @@ -133,7 +132,7 @@ WRITE8_HANDLER( paletteram_xBGR_RRRR_GGGG_BBBB_w ) g = ((d0 >> 3) & 0x1e) | ((d1 >> 5) & 1); b = ((d0 << 1) & 0x1e) | ((d1 >> 6) & 1); - palette_set_color_rgb(Machine,offs/2,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offs/2,pal5bit(r),pal5bit(g),pal5bit(b)); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/rockola.c b/src/mame/video/rockola.c index d6eb6391816..fbf03265b17 100644 --- a/src/mame/video/rockola.c +++ b/src/mame/video/rockola.c @@ -126,7 +126,7 @@ WRITE8_HANDLER( rockola_flipscreen_w ) backcolor = data & 7; for (i = 0;i < 32;i += 4) - palette_set_color(Machine, COLOR(1, i), palette[4 * backcolor + 0x20]); + palette_set_color(machine, COLOR(1, i), palette[4 * backcolor + 0x20]); } /* bit 3 selects char bank */ @@ -275,7 +275,7 @@ WRITE8_HANDLER( satansat_backcolor_w ) backcolor = data & 0x03; for (i = 0; i < 16; i += 4) - palette_set_color(Machine, COLOR(1, i), palette[backcolor + 0x10]); + palette_set_color(machine, COLOR(1, i), palette[backcolor + 0x10]); } } diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c index b68fc1f3a16..91c90806102 100644 --- a/src/mame/video/rpunch.c +++ b/src/mame/video/rpunch.c @@ -7,7 +7,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #define BITMAP_WIDTH 304 diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c index 7f5dc12b455..c2fbc730e65 100644 --- a/src/mame/video/runaway.c +++ b/src/mame/video/runaway.c @@ -5,7 +5,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" static tilemap *bg_tilemap; @@ -34,7 +33,7 @@ WRITE8_HANDLER( runaway_paletteram_w ) 0x47 * ((~data >> 0) & 1) + 0x97 * ((~data >> 1) & 1); - palette_set_color(Machine, offset, MAKE_RGB(R, G, B)); + palette_set_color(machine, offset, MAKE_RGB(R, G, B)); } diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index b871e15ea71..64d2737af5a 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -612,7 +612,7 @@ WRITE8_HANDLER( sindbadm_back_port_w ) { /* port 0: irq ack */ case 0: - cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE); + cpunum_set_input_line(machine, 0, 0, CLEAR_LINE); break; /* port 1: background control diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index b8a4e2e5b7d..b59f5c4ab8d 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -591,9 +591,9 @@ WRITE16_HANDLER( segaic16_paletteram_w ) b = ((newval >> 14) & 0x01) | ((newval >> 7) & 0x1e); /* normal colors */ - palette_set_color_rgb(Machine, offset + 0 * palette.entries, palette.normal[r], palette.normal[g], palette.normal[b]); - palette_set_color_rgb(Machine, offset + 1 * palette.entries, palette.shadow[r], palette.shadow[g], palette.shadow[b]); - palette_set_color_rgb(Machine, offset + 2 * palette.entries, palette.hilight[r], palette.hilight[g], palette.hilight[b]); + palette_set_color_rgb(machine, offset + 0 * palette.entries, palette.normal[r], palette.normal[g], palette.normal[b]); + palette_set_color_rgb(machine, offset + 1 * palette.entries, palette.shadow[r], palette.shadow[g], palette.shadow[b]); + palette_set_color_rgb(machine, offset + 2 * palette.entries, palette.hilight[r], palette.hilight[g], palette.hilight[b]); } diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index 79a1d4e68f0..91412fc7e2e 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -23,7 +23,6 @@ System 24 68000x2 315-5292 315-5293 315-5294 315-5242 ym2151 da */ #include "driver.h" -#include "deprecat.h" #include "segaic24.h" @@ -65,7 +64,7 @@ WRITE16_HANDLER (system24temp_sys16_paletteram1_w) r |= r >> 5; g |= g >> 5; b |= b >> 5; - set_color(Machine, offset, r, g, b, data & 0x8000); + set_color(machine, offset, r, g, b, data & 0x8000); } // - System 24 diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c index d4b0aee9b87..b5b177bc356 100644 --- a/src/mame/video/shangha3.c +++ b/src/mame/video/shangha3.c @@ -59,7 +59,6 @@ Word | Bit(s) | Use ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "profiler.h" @@ -212,7 +211,7 @@ WRITE16_HANDLER( shangha3_blitter_go_w ) if (flipy) dy = sy + sizey-15 - dy; else dy = sy + dy; - drawgfx(rawbitmap,Machine->gfx[0], + drawgfx(rawbitmap,machine->gfx[0], (tile & 0x0fff) | (code & 0xf000), (tile >> 12) | (color & 0x70), flipx,flipy, @@ -226,7 +225,7 @@ WRITE16_HANDLER( shangha3_blitter_go_w ) int w; if (zoomx <= 1 && zoomy <= 1) - drawgfxzoom(rawbitmap,Machine->gfx[0], + drawgfxzoom(rawbitmap,machine->gfx[0], code, color, flipx,flipy, @@ -239,7 +238,7 @@ else for (x = 0;x < w;x++) { - drawgfxzoom(rawbitmap,Machine->gfx[0], + drawgfxzoom(rawbitmap,machine->gfx[0], code, color, flipx,flipy, diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 48904e63ebb..aa2d13b0132 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" static int gfxbank; @@ -41,7 +40,7 @@ WRITE8_HANDLER( sichuan2_paletteram_w ) offset &= 0xff; - palette_set_color_rgb(Machine, offset, pal5bit(paletteram[offset + 0x000]), pal5bit(paletteram[offset + 0x100]), pal5bit(paletteram[offset + 0x200])); + palette_set_color_rgb(machine, offset, pal5bit(paletteram[offset + 0x000]), pal5bit(paletteram[offset + 0x100]), pal5bit(paletteram[offset + 0x200])); } static TILE_GET_INFO( get_bg_tile_info ) diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index e5402244e47..61283170deb 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" extern int sidearms_gameid; @@ -53,7 +52,7 @@ WRITE8_HANDLER( sidearms_c804_w ) /* bit 4 resets the sound CPU */ if (data & 0x10) { - cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, PULSE_LINE); } /* bit 5 enables starfield */ diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 0a811de93b3..f156283f11b 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -13,7 +13,6 @@ Notes: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" static int sprite_flip, pow_charbase=0; //* static tilemap *fix_tilemap; @@ -127,7 +126,7 @@ WRITE16_HANDLER( pow_paletteram16_word_w ) g = ((newword >> 3) & 0x1e) | ((newword >> 13) & 0x01) ; b = ((newword << 1) & 0x1e) | ((newword >> 12) & 0x01) ; - palette_set_color_rgb(Machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset,pal5bit(r),pal5bit(g),pal5bit(b)); } WRITE16_HANDLER( pow_video16_w ) diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index f6d9453d833..8a102f758ef 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -6,7 +6,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT16 *sshangha_pf2_data,*sshangha_pf1_data; UINT16 *sshangha_pf1_rowscroll,*sshangha_pf2_rowscroll; @@ -27,7 +26,7 @@ WRITE16_HANDLER( sshangha_palette_24bit_w ) g = (paletteram16[offset+1] >> 8) & 0xff; r = (paletteram16[offset+1] >> 0) & 0xff; - palette_set_color(Machine,offset/2,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset/2,MAKE_RGB(r,g,b)); } static void sshangha_tilemap_draw(bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index adfbfff4b20..bbb7888a5a1 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -8,7 +8,6 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04 ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *ssozumo_videoram2; UINT8 *ssozumo_colorram2; @@ -99,7 +98,7 @@ WRITE8_HANDLER( ssozumo_paletteram_w ) bit3 = (val >> 3) & 0x01; b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - palette_set_color(Machine, offs2 + 64, MAKE_RGB(r, g, b)); + palette_set_color(machine, offs2 + 64, MAKE_RGB(r, g, b)); } WRITE8_HANDLER( ssozumo_scroll_w ) diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 9e16b65f556..ad3661ef923 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -136,7 +136,6 @@ Note: press Z to show some info on each sprite (debug builds only) ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "seta.h" #ifdef MAME_DEBUG #include "ui.h" @@ -400,7 +399,7 @@ WRITE16_HANDLER( paletteram16_xrgb_swap_word_w ) g = data1 >> 8; b = data1 & 0xff; - palette_set_color(Machine, offset>>1, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset>>1, MAKE_RGB(r, g, b)); } /*************************************************************************** diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index 50c57e2a6f2..5b08a1856ca 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -105,8 +105,8 @@ WRITE8_HANDLER (st0016_palette_ram_w) st0016_paletteram[ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset]=data; val=st0016_paletteram[color*2]+(st0016_paletteram[color*2+1]<<8); if(!color) - palette_set_color_rgb(Machine,UNUSED_PEN,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); /* same as color 0 - bg ? */ - palette_set_color_rgb(Machine,color,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); + palette_set_color_rgb(machine,UNUSED_PEN,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); /* same as color 0 - bg ? */ + palette_set_color_rgb(machine,color,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); } READ8_HANDLER(st0016_character_ram_r) @@ -117,7 +117,7 @@ READ8_HANDLER(st0016_character_ram_r) WRITE8_HANDLER(st0016_character_ram_w) { st0016_charram[ST0016_CHAR_BANK_SIZE*st0016_char_bank+offset]=data; - decodechar(Machine->gfx[st0016_ramgfx], st0016_char_bank,(UINT8 *) st0016_charram); + decodechar(machine->gfx[st0016_ramgfx], st0016_char_bank,(UINT8 *) st0016_charram); } READ8_HANDLER(st0016_vregs_r) @@ -421,9 +421,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static STATE_POSTLOAD( st0016_postload ) { int i; - st0016_rom_bank_w(Machine,0,st0016_rom_bank); + st0016_rom_bank_w(machine,0,st0016_rom_bank); for(i=0;igfx[st0016_ramgfx], i,(UINT8 *) st0016_charram); + decodechar(machine->gfx[st0016_ramgfx], i,(UINT8 *) st0016_charram); } diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c index 0056d307614..c27e2e1eb93 100644 --- a/src/mame/video/stactics.c +++ b/src/mame/video/stactics.c @@ -47,7 +47,6 @@ tilt the mirror up and down, and the monitor left and right. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "stactics.h" @@ -92,7 +91,7 @@ static PALETTE_INIT( stactics ) WRITE8_HANDLER( stactics_scroll_ram_w ) { - stactics_state *state = Machine->driver_data; + stactics_state *state = machine->driver_data; if (data & 0x01) { @@ -130,7 +129,7 @@ CUSTOM_INPUT( stactics_get_frame_count_d3 ) WRITE8_HANDLER( stactics_speed_latch_w ) { - stactics_state *state = Machine->driver_data; + stactics_state *state = machine->driver_data; /* This writes to a shift register which is clocked by */ /* a 555 oscillator. This value determines the speed of */ @@ -157,7 +156,7 @@ WRITE8_HANDLER( stactics_speed_latch_w ) WRITE8_HANDLER( stactics_shot_trigger_w ) { - stactics_state *state = Machine->driver_data; + stactics_state *state = machine->driver_data; state->shot_standby = 0; } @@ -165,7 +164,7 @@ WRITE8_HANDLER( stactics_shot_trigger_w ) WRITE8_HANDLER( stactics_shot_flag_clear_w ) { - stactics_state *state = Machine->driver_data; + stactics_state *state = machine->driver_data; state->shot_arrive = 0; } diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c index c0e833c70e5..b2d78cb7acb 100644 --- a/src/mame/video/starshp1.c +++ b/src/mame/video/starshp1.c @@ -5,7 +5,6 @@ Atari Starship 1 video emulation ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "includes/starshp1.h" UINT8 *starshp1_playfield_ram; diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c index de72d30a371..d5757429f34 100644 --- a/src/mame/video/stvvdp1.c +++ b/src/mame/video/stvvdp1.c @@ -301,7 +301,7 @@ WRITE32_HANDLER( stv_vdp1_regs_w ) } /* needed by pblbeach, it doesn't clear local coordinates in its sprite list...*/ - if ( !strcmp(Machine->gamedrv->name, "pblbeach") ) + if ( !strcmp(machine->gamedrv->name, "pblbeach") ) { stvvdp1_local_x = stvvdp1_local_y = 0; } @@ -319,7 +319,7 @@ WRITE32_HANDLER( stv_vdp1_regs_w ) if(!(stv_scu[40] & 0x2000)) /*Sprite draw end irq*/ { logerror( "Interrupt: Sprite draw end, Vector 0x4d, Level 0x02\n" ); - cpunum_set_input_line_and_vector(Machine, 0, 2, HOLD_LINE , 0x4d); + cpunum_set_input_line_and_vector(machine, 0, 2, HOLD_LINE , 0x4d); } } } diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index f4f9b1cbe5e..9aa00e29d19 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -5109,7 +5109,7 @@ WRITE32_HANDLER ( stv_vdp2_cram_w ) b = ((stv_vdp2_cram[offset] & 0x00ff0000) >> 16); g = ((stv_vdp2_cram[offset] & 0x0000ff00) >> 8); r = ((stv_vdp2_cram[offset] & 0x000000ff) >> 0); - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } break; /*Mode 0*/ @@ -5120,11 +5120,11 @@ WRITE32_HANDLER ( stv_vdp2_cram_w ) b = ((stv_vdp2_cram[offset] & 0x00007c00) >> 10); g = ((stv_vdp2_cram[offset] & 0x000003e0) >> 5); r = ((stv_vdp2_cram[offset] & 0x0000001f) >> 0); - palette_set_color_rgb(Machine,(offset*2)+1,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,(offset*2)+1,pal5bit(r),pal5bit(g),pal5bit(b)); b = ((stv_vdp2_cram[offset] & 0x7c000000) >> 26); g = ((stv_vdp2_cram[offset] & 0x03e00000) >> 21); r = ((stv_vdp2_cram[offset] & 0x001f0000) >> 16); - palette_set_color_rgb(Machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b)); } break; /*Mode 1*/ @@ -5135,11 +5135,11 @@ WRITE32_HANDLER ( stv_vdp2_cram_w ) b = ((stv_vdp2_cram[offset] & 0x00007c00) >> 10); g = ((stv_vdp2_cram[offset] & 0x000003e0) >> 5); r = ((stv_vdp2_cram[offset] & 0x0000001f) >> 0); - palette_set_color_rgb(Machine,(offset*2)+1,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,(offset*2)+1,pal5bit(r),pal5bit(g),pal5bit(b)); b = ((stv_vdp2_cram[offset] & 0x7c000000) >> 26); g = ((stv_vdp2_cram[offset] & 0x03e00000) >> 21); r = ((stv_vdp2_cram[offset] & 0x001f0000) >> 16); - palette_set_color_rgb(Machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b)); + palette_set_color_rgb(machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b)); } break; } diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index a8c215ff16a..683b3b65a49 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "subs.h" #include "sound/discrete.h" @@ -13,13 +12,13 @@ WRITE8_HANDLER( subs_invert1_w ) { if ((offset & 0x01) == 1) { - palette_set_color(Machine, 0, MAKE_RGB(0x00, 0x00, 0x00)); - palette_set_color(Machine, 1, MAKE_RGB(0xFF, 0xFF, 0xFF)); + palette_set_color(machine, 0, MAKE_RGB(0x00, 0x00, 0x00)); + palette_set_color(machine, 1, MAKE_RGB(0xFF, 0xFF, 0xFF)); } else { - palette_set_color(Machine, 1, MAKE_RGB(0x00, 0x00, 0x00)); - palette_set_color(Machine, 0, MAKE_RGB(0xFF, 0xFF, 0xFF)); + palette_set_color(machine, 1, MAKE_RGB(0x00, 0x00, 0x00)); + palette_set_color(machine, 0, MAKE_RGB(0xFF, 0xFF, 0xFF)); } } @@ -27,13 +26,13 @@ WRITE8_HANDLER( subs_invert2_w ) { if ((offset & 0x01) == 1) { - palette_set_color(Machine, 2, MAKE_RGB(0x00, 0x00, 0x00)); - palette_set_color(Machine, 3, MAKE_RGB(0xFF, 0xFF, 0xFF)); + palette_set_color(machine, 2, MAKE_RGB(0x00, 0x00, 0x00)); + palette_set_color(machine, 3, MAKE_RGB(0xFF, 0xFF, 0xFF)); } else { - palette_set_color(Machine, 3, MAKE_RGB(0x00, 0x00, 0x00)); - palette_set_color(Machine, 2, MAKE_RGB(0xFF, 0xFF, 0xFF)); + palette_set_color(machine, 3, MAKE_RGB(0x00, 0x00, 0x00)); + palette_set_color(machine, 2, MAKE_RGB(0xFF, 0xFF, 0xFF)); } } diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c index 3e29109417a..8ccf22e5fc0 100644 --- a/src/mame/video/suna16.c +++ b/src/mame/video/suna16.c @@ -58,7 +58,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" static int color_bank; @@ -105,7 +104,7 @@ WRITE16_HANDLER( suna16_paletteram16_w ) { offset += color_bank * 256; data = COMBINE_DATA(&paletteram16[offset]); - palette_set_color_rgb( Machine, offset, pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb( machine, offset, pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); } diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index c3a9fd8599b..ca921da2362 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -70,7 +70,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #define TILEMAPS 0 @@ -166,7 +165,7 @@ WRITE8_HANDLER( brickzn_banked_paletteram_w ) (((rgb & (1<<0x6))?1:0)<<2) | (((rgb & (1<<0x7))?1:0)<<3); - palette_set_color_rgb(Machine,offset/2,pal4bit(r),pal4bit(g),pal4bit(b)); + palette_set_color_rgb(machine,offset/2,pal4bit(r),pal4bit(g),pal4bit(b)); } diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index 91453ce4844..9725804b2db 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -15,7 +15,6 @@ Tilemap flip flags were reversed */ #include "driver.h" -#include "deprecat.h" #define SUPRNOVA_DECODE_BUFFER_SIZE 0x2000 @@ -138,7 +137,7 @@ WRITE32_HANDLER ( skns_palette_ram_w ) r <<= 3; } - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 932af66f409..18b10427ba1 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -8,7 +8,6 @@ *************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "system1.h" UINT8 *system1_scroll_y; @@ -105,7 +104,7 @@ WRITE8_HANDLER( system1_paletteram_w ) b = pal2bit(data >> 6); } - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } static STATE_POSTLOAD( system1_postload ) diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index d41ed861f4a..ae7ad52ad77 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -89,7 +89,6 @@ type1 type0 function ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "system16.h" #include "video/resnet.h" @@ -524,9 +523,9 @@ WRITE16_HANDLER( sys16_paletteram_w ) gh = combine_6_weights(weights[1][1], g0, g1, g2, g3, g4, 1); bh = combine_6_weights(weights[1][2], b0, b1, b2, b3, b4, 1); - palette_set_color( Machine, offset, MAKE_RGB(r, g, b) ); + palette_set_color( machine, offset, MAKE_RGB(r, g, b) ); - palette_set_color( Machine, offset+Machine->config->total_colors/2,MAKE_RGB(rs,gs,bs)); + palette_set_color( machine, offset+machine->config->total_colors/2,MAKE_RGB(rs,gs,bs)); } } diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index 9834813bfd8..f10ba11f1f7 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -813,7 +813,7 @@ WRITE32_HANDLER( f3_palette_24bit_w ) b = (paletteram32[offset] >> 0) & 0xff; } - palette_set_color(Machine,offset,MAKE_RGB(r,g,b)); + palette_set_color(machine,offset,MAKE_RGB(r,g,b)); } /******************************************************************************/ diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c index bec0fa8de8c..668b792ca68 100644 --- a/src/mame/video/taito_z.c +++ b/src/mame/video/taito_z.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "video/taitoic.h" #define TC0100SCN_GFX_NUM 1 @@ -831,7 +830,7 @@ WRITE16_HANDLER( contcirc_out_w ) if (ACCESSING_BITS_0_7) { /* bit 0 = reset sub CPU */ - 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); /* bits 1-3 n.c. */ diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index 7ced0ad9c6d..85169933fdd 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -533,7 +533,6 @@ Newer version of the I/O chip ? ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "taitoic.h" #define TOPSPEED_ROAD_COLORS @@ -4732,7 +4731,7 @@ static STATE_POSTLOAD( TC0110PCR_restore_colors ) } } - palette_set_color(Machine, i + (chip << 12),MAKE_RGB(r,g,b)); + palette_set_color(machine, i + (chip << 12),MAKE_RGB(r,g,b)); } } @@ -4815,7 +4814,7 @@ WRITE16_HANDLER( TC0110PCR_word_w ) case 1: { TC0110PCR_ram[0][(TC0110PCR_addr[0])] = data & 0xffff; - palette_set_color_rgb(Machine,TC0110PCR_addr[0],pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb(machine,TC0110PCR_addr[0],pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); break; } @@ -4837,7 +4836,7 @@ WRITE16_HANDLER( TC0110PCR_step1_word_w ) case 1: { TC0110PCR_ram[0][(TC0110PCR_addr[0])] = data & 0xffff; - palette_set_color_rgb(Machine,TC0110PCR_addr[0],pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb(machine,TC0110PCR_addr[0],pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); break; } @@ -4860,7 +4859,7 @@ WRITE16_HANDLER( TC0110PCR_step1_word_1_w ) { TC0110PCR_ram[1][(TC0110PCR_addr[1])] = data & 0xffff; /* change a color in the second color area (4096-8191) */ - palette_set_color_rgb(Machine,TC0110PCR_addr[1] + 4096,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb(machine,TC0110PCR_addr[1] + 4096,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); break; } @@ -4883,7 +4882,7 @@ WRITE16_HANDLER( TC0110PCR_step1_word_2_w ) { TC0110PCR_ram[2][(TC0110PCR_addr[2])] = data & 0xffff; /* change a color in the second color area (8192-12288) */ - palette_set_color_rgb(Machine,TC0110PCR_addr[2] + 8192,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb(machine,TC0110PCR_addr[2] + 8192,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); break; } @@ -4907,7 +4906,7 @@ WRITE16_HANDLER( TC0110PCR_step1_rbswap_word_w ) case 1: { TC0110PCR_ram[0][(TC0110PCR_addr[0])] = data & 0xffff; - palette_set_color_rgb(Machine,TC0110PCR_addr[0],pal5bit(data >> 10),pal5bit(data >> 5),pal5bit(data >> 0)); + palette_set_color_rgb(machine,TC0110PCR_addr[0],pal5bit(data >> 10),pal5bit(data >> 5),pal5bit(data >> 0)); break; } @@ -4931,7 +4930,7 @@ WRITE16_HANDLER( TC0110PCR_step1_4bpg_word_w ) case 1: { TC0110PCR_ram[0][(TC0110PCR_addr[0])] = data & 0xffff; - palette_set_color_rgb(Machine,TC0110PCR_addr[0],pal4bit(data >> 0),pal4bit(data >> 4),pal4bit(data >> 8)); + palette_set_color_rgb(machine,TC0110PCR_addr[0],pal4bit(data >> 0),pal4bit(data >> 4),pal4bit(data >> 8)); break; } diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index caff49bd763..ed338e9ca86 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -51,7 +51,7 @@ WRITE16_HANDLER(roundup5_vram_w) offset=offset%0xc000; - decodechar(Machine->gfx[1],offset/0x10,(UINT8 *)roundup5_vram); + decodechar(machine->gfx[1],offset/0x10,(UINT8 *)roundup5_vram); } @@ -83,7 +83,7 @@ bit 0: 3.9kOhm resistor offset&=~1; word = ((paletteram16[offset] & 0xff)<<8) | (paletteram16[offset+1] & 0xff); - palette_set_color_rgb(Machine,offset/2,pal5bit(word >> 10),pal5bit(word >> 5),pal5bit(word >> 0)); + palette_set_color_rgb(machine,offset/2,pal5bit(word >> 10),pal5bit(word >> 5),pal5bit(word >> 0)); } @@ -113,7 +113,7 @@ bit 0: 3.9kOhm resistor // logerror("PAL: %04x %02x\n",offset,data); data = paletteram16[offset]; - palette_set_color_rgb(Machine,offset,pal5bit(data >> 10),pal5bit(data >> 5),pal5bit(data >> 0)); + palette_set_color_rgb(machine,offset,pal5bit(data >> 10),pal5bit(data >> 5),pal5bit(data >> 0)); } diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 6db6f415780..2e647d45372 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -39,7 +39,6 @@ To Do: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" extern UINT16 tetrisp2_systemregs[0x10]; @@ -72,14 +71,14 @@ WRITE16_HANDLER( tetrisp2_palette_w ) { data = COMBINE_DATA(&paletteram16[offset]); if ((offset & 1) == 0) - palette_set_color_rgb(Machine,offset/2,pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11)); + palette_set_color_rgb(machine,offset/2,pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11)); } WRITE16_HANDLER( rocknms_sub_palette_w ) { data = COMBINE_DATA(&paletteram16_2[offset]); if ((offset & 1) == 0) - palette_set_color_rgb(Machine,(0x8000 + (offset/2)),pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11)); + palette_set_color_rgb(machine,(0x8000 + (offset/2)),pal5bit(data >> 1),pal5bit(data >> 6),pal5bit(data >> 11)); } diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c index 1368069bf84..03736e7e89a 100644 --- a/src/mame/video/thief.c +++ b/src/mame/video/thief.c @@ -3,7 +3,6 @@ */ #include "driver.h" -#include "deprecat.h" static UINT8 thief_read_mask, thief_write_mask; static UINT8 thief_video_control; @@ -68,7 +67,7 @@ WRITE8_HANDLER( thief_color_map_w ){ int r = intensity[(data & 0x03) >> 0]; int g = intensity[(data & 0x0C) >> 2]; int b = intensity[(data & 0x30) >> 4]; - palette_set_color( Machine,offset,MAKE_RGB(r,g,b) ); + palette_set_color( machine,offset,MAKE_RGB(r,g,b) ); } /***************************************************************************/ diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c index 67e816ea6cd..e886c682f99 100644 --- a/src/mame/video/tiamc1.c +++ b/src/mame/video/tiamc1.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" UINT8 *tiamc1_tileram; @@ -84,7 +83,7 @@ WRITE8_HANDLER( tiamc1_bg_hshift_w ) { WRITE8_HANDLER( tiamc1_palette_w ) { - palette_set_color(Machine, offset, palette[data]); + palette_set_color(machine, offset, palette[data]); } PALETTE_INIT( tiamc1 ) diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 892ae79daa5..ab99daa75bf 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "video/konamiic.h" @@ -323,7 +322,7 @@ WRITE16_HANDLER( tmnt_paletteram_word_w ) offset &= ~1; data = (paletteram16[offset] << 8) | paletteram16[offset+1]; - palette_set_color_rgb(Machine,offset / 2,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); + palette_set_color_rgb(machine,offset / 2,pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); } @@ -340,7 +339,7 @@ WRITE16_HANDLER( tmnt_0a0000_w ) /* bit 3 high then low triggers irq on sound CPU */ if (last == 0x08 && (data & 0x08) == 0) - 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 & 0x08; @@ -366,7 +365,7 @@ WRITE16_HANDLER( punkshot_0a0020_w ) /* bit 2 = trigger irq on sound CPU */ if (last == 0x04 && (data & 0x04) == 0) - 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 & 0x04; @@ -388,7 +387,7 @@ WRITE16_HANDLER( lgtnfght_0a0018_w ) /* bit 2 = trigger irq on sound CPU */ if (last == 0x00 && (data & 0x04) == 0x04) - 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 & 0x04; diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index 275c32a3163..d1a61e686da 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -119,7 +119,6 @@ Abnormalities: #include "driver.h" -#include "deprecat.h" #include "toaplan1.h" #include "cpu/m68000/m68000.h" diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 4a63b81e050..372035d467a 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -656,7 +656,7 @@ WRITE16_HANDLER( toaplan2_tx_gfxram16_w ) { int code = offset/32; COMBINE_DATA(&toaplan2_tx_gfxram16[offset]); - decodechar(Machine->gfx[2], code, toaplan2_tx_gfxram); + decodechar(machine->gfx[2], code, toaplan2_tx_gfxram); tilemap_mark_all_tiles_dirty(tx_tilemap); } @@ -699,7 +699,7 @@ WRITE16_HANDLER( batrider_textdata_decode ) /* Decode text characters */ for (code = 0; code < 1024; code++) - decodechar (Machine->gfx[2], code, raizing_tx_gfxram); + decodechar (machine->gfx[2], code, raizing_tx_gfxram); tilemap_mark_all_tiles_dirty(tx_tilemap); } diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c index 9510b029803..68d50972722 100644 --- a/src/mame/video/tryout.c +++ b/src/mame/video/tryout.c @@ -6,7 +6,6 @@ ****************************************************************/ #include "driver.h" -#include "deprecat.h" static tilemap *fg_tilemap, *bg_tilemap; static UINT8 vram_bank; @@ -141,7 +140,7 @@ WRITE8_HANDLER( tryout_vram_w ) break; } - decodechar(Machine->gfx[2],(offset-0x400/64)&0x7f,tryout_vram_gfx); + decodechar(machine->gfx[2],(offset-0x400/64)&0x7f,tryout_vram_gfx); tilemap_mark_all_tiles_dirty(bg_tilemap); } diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c index fc1f2484457..0afc481a211 100644 --- a/src/mame/video/tubep.c +++ b/src/mame/video/tubep.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "includes/tubep.h" #include "video/resnet.h" @@ -557,7 +556,7 @@ WRITE8_HANDLER( tubep_sprite_control_w ) /SINT line will be reasserted in XSize * YSize cycles (RH0 signal cycles) */ /* 1.clear the /SINT interrupt line */ - cpunum_set_input_line(Machine, 3,0,CLEAR_LINE); + cpunum_set_input_line(machine, 3,0,CLEAR_LINE); /* 2.assert /SINT again after this time */ timer_set( attotime_mul(ATTOTIME_IN_HZ(19968000/8), (XSize+1)*(YSize+1)), NULL, 0, sprite_timer_callback); diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index fa1b9d25ba8..df6c85e6720 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -5,7 +5,6 @@ *************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "turbo.h" #include "video/resnet.h" @@ -205,7 +204,7 @@ VIDEO_START( buckrog ) WRITE8_HANDLER( turbo_videoram_w ) { - turbo_state *state = Machine->driver_data; + turbo_state *state = machine->driver_data; state->videoram[offset] = data; if (offset < 0x400) { @@ -217,7 +216,7 @@ WRITE8_HANDLER( turbo_videoram_w ) WRITE8_HANDLER( buckrog_bitmap_w ) { - turbo_state *state = Machine->driver_data; + turbo_state *state = machine->driver_data; state->buckrog_bitmap_ram[offset] = data & 1; } diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c index ce8ae702173..1b91ceecb31 100644 --- a/src/mame/video/twin16.c +++ b/src/mame/video/twin16.c @@ -14,7 +14,6 @@ */ #include "driver.h" -#include "deprecat.h" extern UINT16 twin16_custom_video; extern UINT16 *twin16_gfx_rom; @@ -50,7 +49,7 @@ WRITE16_HANDLER( twin16_paletteram_word_w ) offset &= ~1; data = ((paletteram16[offset] & 0xff) << 8) | (paletteram16[offset + 1] & 0xff); - palette_set_color_rgb(Machine, offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10)); + palette_set_color_rgb(machine, offset / 2, pal5bit(data >> 0), pal5bit(data >> 5), pal5bit(data >> 10)); } WRITE16_HANDLER( fround_gfx_bank_w ) diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index a22fad4fd1c..3392d4783a9 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -4,7 +4,6 @@ ****************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "profiler.h" #include "render.h" #include "cpu/i86/i86.h" @@ -1577,7 +1576,7 @@ WRITE16_HANDLER( buggyboy_gas_w ) } case 0xe0: { - cpunum_set_input_line(Machine, 1, INPUT_LINE_TEST, CLEAR_LINE); + cpunum_set_input_line(machine, 1, INPUT_LINE_TEST, CLEAR_LINE); vregs.flags = data; break; } diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c index 825f3b987b0..c943e0ed619 100644 --- a/src/mame/video/unico.c +++ b/src/mame/video/unico.c @@ -37,7 +37,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "unico.h" /* Variables needed by drivers: */ @@ -65,7 +64,7 @@ WRITE16_HANDLER( unico_palette_w ) COMBINE_DATA(&paletteram16[offset]); data1 = paletteram16[offset & ~1]; data2 = paletteram16[offset | 1]; - palette_set_color_rgb( Machine,offset/2, + palette_set_color_rgb( machine,offset/2, (data1 >> 8) & 0xFC, (data1 >> 0) & 0xFC, (data2 >> 8) & 0xFC ); @@ -74,7 +73,7 @@ WRITE16_HANDLER( unico_palette_w ) WRITE32_HANDLER( unico_palette32_w ) { UINT32 rgb0 = COMBINE_DATA(&paletteram32[offset]); - palette_set_color_rgb( Machine,offset, + palette_set_color_rgb( machine,offset, (rgb0 >> 24) & 0xFC, (rgb0 >> 16) & 0xFC, (rgb0 >> 8) & 0xFC ); diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c index 55ec2561eef..309acdd3900 100644 --- a/src/mame/video/usgames.c +++ b/src/mame/video/usgames.c @@ -1,5 +1,4 @@ #include "driver.h" -#include "deprecat.h" UINT8 *usgames_videoram,*usgames_charram; @@ -63,7 +62,7 @@ WRITE8_HANDLER( usgames_charram_w ) { usgames_charram[offset] = data; - decodechar(Machine->gfx[0], offset/8, usgames_charram); + decodechar(machine->gfx[0], offset/8, usgames_charram); tilemap_mark_all_tiles_dirty(usgames_tilemap); } diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c index ec8ec472adc..ebc222d6257 100644 --- a/src/mame/video/vigilant.c +++ b/src/mame/video/vigilant.c @@ -15,7 +15,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" static const rectangle bottomvisiblearea = @@ -110,7 +109,7 @@ WRITE8_HANDLER( vigilant_paletteram_w ) g = (paletteram[bank + offset + 0x100] << 3) & 0xFF; b = (paletteram[bank + offset + 0x200] << 3) & 0xFF; - palette_set_color(Machine, (bank >> 2) + offset,MAKE_RGB(r,g,b)); + palette_set_color(machine, (bank >> 2) + offset,MAKE_RGB(r,g,b)); } diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 7b5eb7caf7d..a38a0bdfb9b 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -8,7 +8,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/konamiic.h" #define BMP_PAD 8 @@ -880,9 +879,9 @@ WRITE16_HANDLER( hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w ) g = ((newword >> 3) & 0x1E ) | ((newword >> 13) & 0x01); b = ((newword >> 7) & 0x1E ) | ((newword >> 14) & 0x01); - palette_set_color_rgb(Machine, offset, pal5bit(r), pal5bit(g), pal5bit(b)); + palette_set_color_rgb(machine, offset, pal5bit(r), pal5bit(g), pal5bit(b)); r>>=1; g>>=1; b>>=1; - palette_set_color_rgb(Machine, offset+0x800, pal5bit(r)/2, pal5bit(g)/2, pal5bit(b)/2); + palette_set_color_rgb(machine, offset+0x800, pal5bit(r)/2, pal5bit(g)/2, pal5bit(b)/2); } WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w ) @@ -891,7 +890,7 @@ WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w ) // the highest nibble has some unknown functions // if (newword & 0xf000) logerror("MSN set on color %03x: %1x\n", offset, newword>>12); - palette_set_color_rgb(Machine, offset, pal4bit(newword >> 0), pal4bit(newword >> 4), pal4bit(newword >> 8)); + palette_set_color_rgb(machine, offset, pal4bit(newword >> 0), pal4bit(newword >> 4), pal4bit(newword >> 8)); } diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index b0ade745c98..95c932d21a8 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -92,7 +92,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/resnet.h" #include "williams.h" @@ -379,7 +378,7 @@ WRITE8_HANDLER( williams2_paletteram_w ) b = ((entry_hi >> 0) & 15) * i; g = ((entry_lo >> 4) & 15) * i; r = ((entry_lo >> 0) & 15) * i; - palette_set_color(Machine, offset / 2, MAKE_RGB(r, g, b)); + palette_set_color(machine, offset / 2, MAKE_RGB(r, g, b)); } diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index e7fcfdd7a58..d04ec285883 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -1221,7 +1221,7 @@ WRITE16_HANDLER( ygv608_w ) if (++p3_state == 3) { p3_state = 0; - palette_set_color_rgb(Machine,ygv608.regs.s.cc, + palette_set_color_rgb(machine,ygv608.regs.s.cc, pal6bit(ygv608.colour_palette[ygv608.regs.s.cc][0]), pal6bit(ygv608.colour_palette[ygv608.regs.s.cc][1]), pal6bit(ygv608.colour_palette[ygv608.regs.s.cc][2]) ); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index 9ed74e72ddd..8a3a2dfc8a5 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -28,7 +28,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: ***************************************************************************/ #include "driver.h" -#include "deprecat.h" /* Variables that driver has access to: */ @@ -83,7 +82,7 @@ WRITE8_HANDLER( yunsung8_videoram_w ) color = RAM[offset & ~1] | (RAM[offset | 1] << 8); /* BBBBBGGGGGRRRRRx */ - palette_set_color_rgb(Machine, offset/2 + (bank ? 0x400:0), pal5bit(color >> 0), pal5bit(color >> 5), pal5bit(color >> 10)); + palette_set_color_rgb(machine, offset/2 + (bank ? 0x400:0), pal5bit(color >> 0), pal5bit(color >> 5), pal5bit(color >> 10)); } else {