diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c index bc55872b583..84519f65b4e 100644 --- a/src/emu/cpu/arm7/arm7core.c +++ b/src/emu/cpu/arm7/arm7core.c @@ -78,7 +78,6 @@ *****************************************************************************/ #include -#include "deprecat.h" #define ARM7_DEBUG_CORE 0 diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index 3e49027c84b..aa55e9df33b 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -11,7 +11,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "cubeqcpu.h" diff --git a/src/emu/cpu/drcbec.c b/src/emu/cpu/drcbec.c index 8b3712389fa..24e3c79e633 100644 --- a/src/emu/cpu/drcbec.c +++ b/src/emu/cpu/drcbec.c @@ -14,7 +14,6 @@ #include "drcbeut.h" #include "eminline.h" #include "debugger.h" -#include "deprecat.h" #include #ifdef _MSC_VER diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index b5a7bc37582..1e544f02f7a 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 7a294cd2da3..0f600c4ca03 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -30,7 +30,6 @@ ***************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "dsp56k.h" #include "dsp56def.h" diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h index e952f334f88..5ec4d01df6b 100644 --- a/src/emu/cpu/g65816/g65816op.h +++ b/src/emu/cpu/g65816/g65816op.h @@ -1,4 +1,3 @@ -#include "deprecat.h" /* ======================================================================== */ /* ============================= CONFIGURATION ============================ */ diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c index ea613715d9e..2a4d5ce5604 100644 --- a/src/emu/cpu/h6280/h6280.c +++ b/src/emu/cpu/h6280/h6280.c @@ -109,7 +109,6 @@ ******************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "h6280.h" static int h6280_ICount = 0; diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index ab50b1f417b..8a68b045a4b 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 aabf99bf587..6b2b5f1712f 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 8e033942618..eec6f1fc114 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 7b9dbfb6666..436f2af8b69 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 070eec910e4..19b0b6f2de1 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 diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c index a8cd585735c..5bea3e2588e 100644 --- a/src/emu/cpu/minx/minx.c +++ b/src/emu/cpu/minx/minx.c @@ -44,7 +44,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/mips3com.c b/src/emu/cpu/mips/mips3com.c index ee6844ca2ea..eb2a7f31cc7 100644 --- a/src/emu/cpu/mips/mips3com.c +++ b/src/emu/cpu/mips/mips3com.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "mips3com.h" -#include "deprecat.h" #include "cpuexec.h" #include "mame.h" diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index 96d1020f589..afa0309b7d8 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/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c index 91d353dcc5d..9d9067bde77 100644 --- a/src/emu/cpu/sh2/sh2.c +++ b/src/emu/cpu/sh2/sh2.c @@ -100,7 +100,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "sh2.h" #include "sh2comn.h" diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c index cbc58d351af..ea2b1588d1b 100644 --- a/src/emu/cpu/sh2/sh2comn.c +++ b/src/emu/cpu/sh2/sh2comn.c @@ -7,7 +7,6 @@ *****************************************************************************/ #include "debugger.h" -#include "deprecat.h" #include "cpuexec.h" #include "sh2.h" #include "sh2comn.h" diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c index 27971816a06..c5091a90b57 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 "cpuexec.h" #include "tlcs90.h" diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 2b35b8cf80d..3dcf487d1f3 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/tms34010/34010gfx.c b/src/emu/cpu/tms34010/34010gfx.c index 0d7ade5ae39..f3fe8cb476a 100644 --- a/src/emu/cpu/tms34010/34010gfx.c +++ b/src/emu/cpu/tms34010/34010gfx.c @@ -9,7 +9,6 @@ #ifndef RECURSIVE_INCLUDE -#include "deprecat.h" #define LOG_GFX_OPS 0 #define LOGGFX(x) do { if (LOG_GFX_OPS && input_code_pressed(KEYCODE_L)) logerror x; } while (0) diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index ba538249c44..039e452ab9f 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -32,7 +32,6 @@ #include "cpuexec.h" #include "debugger.h" #include "tms7000.h" -#include "deprecat.h" #define VERBOSE 0 diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index d9a466a5150..fbc6b0f3162 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" #define PC(n) (((n)->sregs[CS]<<4)+(n)->ip) diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index 3f69ef5a850..2e76b1240e1 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -18,7 +18,6 @@ #include "debughlp.h" #include "debugvw.h" #include "render.h" -#include "deprecat.h" #include diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c index 9f5135c7dd9..2a1b1ba0d30 100644 --- a/src/emu/debug/debugvw.c +++ b/src/emu/debug/debugvw.c @@ -10,7 +10,6 @@ *********************************************************************/ #include "driver.h" -#include "deprecat.h" #include "debugvw.h" #include "debugcmd.h" #include "debugcmt.h" diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c index 030cda689b7..9a198fd86b2 100644 --- a/src/emu/sound/2203intf.c +++ b/src/emu/sound/2203intf.c @@ -128,8 +128,8 @@ static SND_START( ym2203 ) if (!info->psg) return NULL; /* Timer Handler set */ - info->timer[0] = timer_alloc(Machine, timer_callback_2203_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_2203_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_2203_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_2203_1, info); /* stream system initialize */ info->stream = stream_create(0,1,rate,info,ym2203_stream_update); diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c index 44f98c5b2d7..33a4b7c2902 100644 --- a/src/emu/sound/2608intf.c +++ b/src/emu/sound/2608intf.c @@ -145,8 +145,8 @@ static SND_START( ym2608 ) if (!info->psg) return NULL; /* Timer Handler set */ - info->timer[0] = timer_alloc(Machine, timer_callback_2608_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_2608_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_2608_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_2608_1, info); /* stream system initialize */ info->stream = stream_create(0,2,rate,info,ym2608_stream_update); diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c index 41147c1f5a7..55548389f1a 100644 --- a/src/emu/sound/2610intf.c +++ b/src/emu/sound/2610intf.c @@ -146,8 +146,8 @@ static SND_START( ym2610 ) if (!info->psg) return NULL; /* Timer Handler set */ - info->timer[0] = timer_alloc(Machine, timer_callback_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_1, info); /* stream system initialize */ info->stream = stream_create(0,2,rate,info,ym2610_stream_update); @@ -212,8 +212,8 @@ static SND_START( ym2610b ) if (!info->psg) return NULL; /* Timer Handler set */ - info->timer[0] =timer_alloc(Machine, timer_callback_0, info); - info->timer[1] =timer_alloc(Machine, timer_callback_1, info); + info->timer[0] =timer_alloc(device->machine, timer_callback_0, info); + info->timer[1] =timer_alloc(device->machine, timer_callback_1, info); /* stream system initialize */ info->stream = stream_create(0,2,rate,info,ym2610b_stream_update); diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c index 8de7efadec7..3f8632d2efb 100644 --- a/src/emu/sound/2612intf.c +++ b/src/emu/sound/2612intf.c @@ -100,8 +100,8 @@ static SND_START( ym2612 ) /* FM init */ /* Timer Handler set */ - info->timer[0] = timer_alloc(Machine, timer_callback_2612_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_2612_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_2612_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_2612_1, info); /* stream system initialize */ info->stream = stream_create(0,2,rate,info,ym2612_stream_update); diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c index ccfd7c5158e..21aa65bc3c7 100644 --- a/src/emu/sound/262intf.c +++ b/src/emu/sound/262intf.c @@ -90,8 +90,8 @@ static SND_START( ymf262 ) ymf262_set_irq_handler (info->chip, IRQHandler_262, info); ymf262_set_update_handler(info->chip, _stream_update, info); - info->timer[0] = timer_alloc(Machine, timer_callback_262_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_262_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_262_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_262_1, info); return info; } diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c index 8ca77038ecd..18dbf4f286f 100644 --- a/src/emu/sound/3812intf.c +++ b/src/emu/sound/3812intf.c @@ -102,8 +102,8 @@ static SND_START( ym3812 ) ym3812_set_irq_handler (info->chip, IRQHandler_3812, info); ym3812_set_update_handler(info->chip, _stream_update_3812, info); - info->timer[0] = timer_alloc(Machine, timer_callback_3812_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_3812_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_3812_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_3812_1, info); return info; } @@ -270,8 +270,8 @@ static SND_START( ym3526 ) ym3526_set_irq_handler (info->chip, IRQHandler_3526, info); ym3526_set_update_handler(info->chip, _stream_update_3526, info); - info->timer[0] = timer_alloc(Machine, timer_callback_3526_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_3526_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_3526_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_3526_1, info); return info; } @@ -482,8 +482,8 @@ static SND_START( y8950 ) y8950_set_irq_handler (info->chip, IRQHandler_8950, info); y8950_set_update_handler(info->chip, _stream_update_8950, info); - info->timer[0] = timer_alloc(Machine, timer_callback_8950_0, info); - info->timer[1] = timer_alloc(Machine, timer_callback_8950_1, info); + info->timer[0] = timer_alloc(device->machine, timer_callback_8950_0, info); + info->timer[1] = timer_alloc(device->machine, timer_callback_8950_1, info); return info; } diff --git a/src/emu/sound/5110intf.c b/src/emu/sound/5110intf.c index 782c8dd6cd0..a18975995e8 100644 --- a/src/emu/sound/5110intf.c +++ b/src/emu/sound/5110intf.c @@ -13,7 +13,6 @@ #include #include "sndintrf.h" -#include "deprecat.h" #include "streams.h" #include "tms5110.h" #include "5110intf.h" diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index d423db1f961..dc19ace8ab4 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -546,9 +546,9 @@ static void AICA_Init(const device_config *device, struct _AICA *AICA, const aic } } - AICA->timerA = timer_alloc(Machine, timerA_cb, AICA); - AICA->timerB = timer_alloc(Machine, timerB_cb, AICA); - AICA->timerC = timer_alloc(Machine, timerC_cb, AICA); + AICA->timerA = timer_alloc(device->machine, timerA_cb, AICA); + AICA->timerB = timer_alloc(device->machine, timerB_cb, AICA); + AICA->timerC = timer_alloc(device->machine, timerC_cb, AICA); for(i=0;i<0x400;++i) { diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c index 0384f34514d..ef30af723ef 100644 --- a/src/emu/sound/es5503.c +++ b/src/emu/sound/es5503.c @@ -260,7 +260,7 @@ static SND_START( es5503 ) chip->oscillators[osc].irqpend = 0; chip->oscillators[osc].accumulator = 0; - chip->oscillators[osc].timer = timer_alloc(Machine, es5503_timer_cb, &chip->oscillators[osc]); + chip->oscillators[osc].timer = timer_alloc(device->machine, es5503_timer_cb, &chip->oscillators[osc]); chip->oscillators[osc].chip = (void *)chip; } diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c index b6882efe361..ac4788294d9 100644 --- a/src/emu/sound/gaelco.c +++ b/src/emu/sound/gaelco.c @@ -35,7 +35,6 @@ Registers per channel: #include "sndintrf.h" #include "cpuintrf.h" -#include "deprecat.h" #include "streams.h" #include "gaelco.h" #include "wavwrite.h" diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index 9f3021b41a3..1f634f33d39 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -233,7 +233,7 @@ static SND_START( k053260 ) /* setup SH1 timer if necessary */ if ( ic->intf->irq ) - timer_pulse( Machine, attotime_mul(ATTOTIME_IN_HZ(clock), 32), NULL, 0, ic->intf->irq ); + timer_pulse( device->machine, attotime_mul(ATTOTIME_IN_HZ(clock), 32), NULL, 0, ic->intf->irq ); return ic; } diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c index e7dc8536cac..a962d9efe86 100644 --- a/src/emu/sound/k054539.c +++ b/src/emu/sound/k054539.c @@ -18,7 +18,6 @@ CHANNEL_DEBUG enables the following keys: *********************************************************/ #include "sndintrf.h" -#include "deprecat.h" #include "streams.h" #include "k054539.h" #include @@ -465,7 +464,7 @@ static void k054539_init_chip(const device_config *device, struct k054539_info * // One or more of the registers must be the timer period // And anyway, this particular frequency is probably wrong // 480 hz is TRUSTED by gokuparo disco stage - the looping sample doesn't line up otherwise - timer_pulse(Machine, ATTOTIME_IN_HZ(480), info, 0, k054539_irq); + timer_pulse(device->machine, ATTOTIME_IN_HZ(480), info, 0, k054539_irq); info->stream = stream_create(0, 2, clock, info, k054539_update); diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index 3afc491be3a..c1dbcd13854 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -189,7 +189,7 @@ static SND_START( msm5205 ) /* stream system initialize */ voice->stream = stream_create(0,1,clock,voice,MSM5205_update); - voice->timer = timer_alloc(Machine, MSM5205_vclk_callback, voice); + voice->timer = timer_alloc(device->machine, MSM5205_vclk_callback, voice); /* initialize */ msm5205_reset(voice); diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c index 8da5a31dbd2..8916597bbd0 100644 --- a/src/emu/sound/namco.c +++ b/src/emu/sound/namco.c @@ -12,7 +12,6 @@ ***************************************************************************/ #include "sndintrf.h" -#include "deprecat.h" #include "streams.h" #include "namco.h" diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index 395f5f8a75c..49efad7a1c6 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -648,15 +648,15 @@ static SND_START( pokey ) chip->clockmult = DIV_64; chip->KBCODE = 0x09; /* Atari 800 'no key' */ chip->SKCTL = SK_RESET; /* let the RNG run after reset */ - chip->rtimer = timer_alloc(Machine, NULL, NULL); + chip->rtimer = timer_alloc(device->machine, NULL, NULL); - chip->timer[0] = timer_alloc(Machine, pokey_timer_expire, chip); - chip->timer[1] = timer_alloc(Machine, pokey_timer_expire, chip); - chip->timer[2] = timer_alloc(Machine, pokey_timer_expire, chip); + chip->timer[0] = timer_alloc(device->machine, pokey_timer_expire, chip); + chip->timer[1] = timer_alloc(device->machine, pokey_timer_expire, chip); + chip->timer[2] = timer_alloc(device->machine, pokey_timer_expire, chip); for (i=0; i<8; i++) { - chip->ptimer[i] = timer_alloc(Machine, pokey_pot_trigger, chip); + chip->ptimer[i] = timer_alloc(device->machine, pokey_pot_trigger, chip); chip->pot_r[i] = chip->intf.pot_r[i]; } chip->allpot_r = chip->intf.allpot_r; diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c index 99d4a6d30db..4f3a6e6a5a9 100644 --- a/src/emu/sound/rf5c400.c +++ b/src/emu/sound/rf5c400.c @@ -17,7 +17,6 @@ #include "sndintrf.h" #include "streams.h" -#include "deprecat.h" #include "rf5c400.h" struct rf5c400_info @@ -254,7 +253,7 @@ static void rf5c400_init_chip(const device_config *device, struct rf5c400_info * double r; // attack - r = 1.0 / (ENV_AR_SPEED * Machine->sample_rate); + r = 1.0 / (ENV_AR_SPEED * device->machine->sample_rate); for (i = 0; i < ENV_MIN_AR; i++) { info->env_ar_table[i] = 1.0; @@ -270,7 +269,7 @@ static void rf5c400_init_chip(const device_config *device, struct rf5c400_info * } // decay - r = -1.0 / (ENV_DR_SPEED * Machine->sample_rate); + r = -1.0 / (ENV_DR_SPEED * device->machine->sample_rate); for (i = 0; i < ENV_MIN_DR; i++) { info->env_dr_table[i] = r; @@ -286,7 +285,7 @@ static void rf5c400_init_chip(const device_config *device, struct rf5c400_info * } // release - r = -1.0 / (ENV_RR_SPEED * Machine->sample_rate); + r = -1.0 / (ENV_RR_SPEED * device->machine->sample_rate); for (i = 0; i < ENV_MIN_RR; i++) { info->env_rr_table[i] = r; diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 55cf9b55406..4cc39629372 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -539,9 +539,9 @@ static void SCSP_Init(const device_config *device, struct _SCSP *SCSP, const scs } } - SCSP->timerA = timer_alloc(Machine, timerA_cb, SCSP); - SCSP->timerB = timer_alloc(Machine, timerB_cb, SCSP); - SCSP->timerC = timer_alloc(Machine, timerC_cb, SCSP); + SCSP->timerA = timer_alloc(device->machine, timerA_cb, SCSP); + SCSP->timerB = timer_alloc(device->machine, timerB_cb, SCSP); + SCSP->timerC = timer_alloc(device->machine, timerC_cb, SCSP); for(i=0;i<0x400;++i) { diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c index b72c41b7920..3dd173a3776 100644 --- a/src/emu/sound/sid6581.c +++ b/src/emu/sound/sid6581.c @@ -7,7 +7,6 @@ ***************************************************************************/ #include "sndintrf.h" -#include "deprecat.h" #include "sid6581.h" #include "sid.h" @@ -38,8 +37,8 @@ static void *sid_start(const device_config *device, int clock, SIDTYPE sidtype) sid = (SID6581 *) auto_malloc(sizeof(*sid)); memset(sid, 0, sizeof(*sid)); - sid->mixer_channel = stream_create (0, 1, Machine->sample_rate, (void *) sid, sid_update); - sid->PCMfreq = Machine->sample_rate; + sid->mixer_channel = stream_create (0, 1, device->machine->sample_rate, (void *) sid, sid_update); + sid->PCMfreq = device->machine->sample_rate; sid->clock = clock; sid->ad_read = iface ? iface->ad_read : NULL; sid->type = sidtype; diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c index 980fcd5f387..825667a778b 100644 --- a/src/emu/sound/sp0250.c +++ b/src/emu/sound/sp0250.c @@ -17,7 +17,6 @@ */ #include -#include "deprecat.h" #include "sndintrf.h" #include "streams.h" #include "cpuintrf.h" @@ -201,7 +200,7 @@ static SND_START( sp0250 ) sp->RNG = 1; sp->drq = intf->drq_callback; sp->drq(ASSERT_LINE); - timer_pulse(Machine, attotime_mul(ATTOTIME_IN_HZ(clock), CLOCK_DIVIDER), sp, 0, sp0250_timer_tick); + timer_pulse(device->machine, attotime_mul(ATTOTIME_IN_HZ(clock), CLOCK_DIVIDER), sp, 0, sp0250_timer_tick); sp->stream = stream_create(0, 1, clock / CLOCK_DIVIDER, sp, sp0250_update); diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c index 70de9f3142a..681b6513e75 100644 --- a/src/emu/sound/upd7759.c +++ b/src/emu/sound/upd7759.c @@ -100,7 +100,6 @@ #include #include "sndintrf.h" -#include "deprecat.h" #include "streams.h" #include "upd7759.h" diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c index 616235d0cf6..3cb79b44e9c 100644 --- a/src/emu/sound/x1_010.c +++ b/src/emu/sound/x1_010.c @@ -49,7 +49,6 @@ Registers: ***************************************************************************/ #include "sndintrf.h" -#include "deprecat.h" #include "cpuintrf.h" #include "streams.h" #include "x1_010.h" diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c index 8a34bae3259..7c61b1954f8 100644 --- a/src/emu/sound/ym2151.c +++ b/src/emu/sound/ym2151.c @@ -1534,8 +1534,8 @@ void * ym2151_init(const device_config *device, int clock, int rate) #ifdef USE_MAME_TIMERS /* this must be done _before_ a call to ym2151_reset_chip() */ - PSG->timer_A = timer_alloc(Machine, timer_callback_a, PSG); - PSG->timer_B = timer_alloc(Machine, timer_callback_b, PSG); + PSG->timer_A = timer_alloc(device->machine, timer_callback_a, PSG); + PSG->timer_B = timer_alloc(device->machine, timer_callback_b, PSG); #else PSG->tim_A = 0; PSG->tim_B = 0; @@ -1547,7 +1547,7 @@ void * ym2151_init(const device_config *device, int clock, int rate) { cymfile = fopen("2151_.cym","wb"); if (cymfile) - timer_pulse ( Machine, ATTOTIME_IN_HZ(110), NULL, 0, cymfile_callback); /*110 Hz pulse timer*/ + timer_pulse ( device->machine, ATTOTIME_IN_HZ(110), NULL, 0, cymfile_callback); /*110 Hz pulse timer*/ else logerror("Could not create file 2151_.cym\n"); } diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index 3ff9c0221da..01ae88e6363 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -1729,8 +1729,8 @@ static void init_state(YMF271Chip *chip, const device_config *device) static void ymf271_init(const device_config *device, YMF271Chip *chip, UINT8 *rom, void (*cb)(running_machine *,int), read8_space_func ext_read, write8_space_func ext_write) { - chip->timA = timer_alloc(Machine, ymf271_timer_a_tick, chip); - chip->timB = timer_alloc(Machine, ymf271_timer_b_tick, chip); + chip->timA = timer_alloc(device->machine, ymf271_timer_a_tick, chip); + chip->timB = timer_alloc(device->machine, ymf271_timer_b_tick, chip); chip->rom = rom; chip->irq_callback = cb; diff --git a/src/emu/state.c b/src/emu/state.c index 874c7a8d954..f6134b83111 100644 --- a/src/emu/state.c +++ b/src/emu/state.c @@ -22,7 +22,6 @@ #include "driver.h" #include "astring.h" -#include "deprecat.h" #include @@ -246,7 +245,7 @@ void state_save_register_memory(running_machine *machine, const char *module, co if (!global->reg_allowed) { logerror("Attempt to register save state entry after state registration is closed! module %s tag %s name %s\n",module, tag, name); - if (Machine->gamedrv->flags & GAME_SUPPORTS_SAVE) + if (machine->gamedrv->flags & GAME_SUPPORTS_SAVE) fatalerror("Attempt to register save state entry after state registration is closed! module %s tag %s name %s\n", module, tag, name); global->illegal_regs++; return; diff --git a/src/emu/timer.c b/src/emu/timer.c index 31632e7fd8e..2b7547b99e2 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -11,7 +11,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "profiler.h" #include "pool.h" diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 457291a2f5c..6dbdda5f025 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -902,7 +902,7 @@ static void dcs_register_state(running_machine *machine) state_save_register_global_pointer(machine, dcs_sram, 0x8000*4 / sizeof(dcs_sram[0])); if (dcs.rev == 2) - state_save_register_postload(Machine, sdrc_postload, NULL); + state_save_register_postload(machine, sdrc_postload, NULL); } @@ -923,8 +923,8 @@ void dcs_init(running_machine *machine) cpu_set_info_fct(dcs.cpu, CPUINFO_PTR_ADSP2100_TIMER_HANDLER, (genf *)timer_enable_callback); /* configure boot and sound ROMs */ - dcs.bootrom = (UINT16 *)memory_region(Machine, "dcs"); - dcs.bootrom_words = memory_region_length(Machine, "dcs") / 2; + dcs.bootrom = (UINT16 *)memory_region(machine, "dcs"); + dcs.bootrom_words = memory_region_length(machine, "dcs") / 2; dcs.sounddata = dcs.bootrom; dcs.sounddata_words = dcs.bootrom_words; dcs.sounddata_banks = dcs.sounddata_words / 0x1000; @@ -938,10 +938,10 @@ void dcs_init(running_machine *machine) dcs.auto_ack = TRUE; /* register for save states */ - dcs_register_state(Machine); + dcs_register_state(machine); /* reset the system */ - dcs_reset(Machine, NULL, 0); + dcs_reset(machine, NULL, 0); } diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c index 070e98927d8..ea8fa44de26 100644 --- a/src/mame/audio/taito_en.c +++ b/src/mame/audio/taito_en.c @@ -259,7 +259,7 @@ void taito_f3_soundsystem_reset(running_machine *machine) /* reset CPU to catch any banking of startup vectors */ cpu_reset(cputag_get_cpu(machine, "audio")); - //cpu_set_input_line(Machine->cpu[1], INPUT_LINE_RESET, ASSERT_LINE); + //cpu_set_input_line(machine->cpu[1], INPUT_LINE_RESET, ASSERT_LINE); } const es5505_interface es5505_taito_f3_config = diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index df6eec1ec5e..d9c60bf8e5a 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -198,7 +198,6 @@ the entire size of the screen. ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "sound/2608intf.h" #include "sound/2610intf.h" diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index 5bdadd09074..3461f70560e 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -30,7 +30,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/vector.h" #include "cpu/ccpu/ccpu.h" #include "cinemat.h" diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index c77422c41d7..0e5d7f70f1f 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -110,7 +110,6 @@ Few words about protection: #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index c303cd7e5ae..0d90e72b616 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -14,7 +14,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "system16.h" #include "machine/fd1089.h" #include "machine/segaic16.h" diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index 3712b4895df..e979b2fad3a 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -20,7 +20,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "system16.h" #include "cpu/m68000/m68000.h" #include "machine/segaic16.h" diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c index 0b562957510..45c455c6cc8 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" diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 11159640dd4..fccae17ec27 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -243,7 +243,6 @@ To Do / Unknowns: #include "driver.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eeprom.h" diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c index 7a321421ad3..ca4443a005b 100644 --- a/src/mame/machine/amiga.c +++ b/src/mame/machine/amiga.c @@ -299,7 +299,7 @@ static void amiga_m68k_reset(const device_config *device) MACHINE_RESET( amiga ) { -// const address_space *space = cpu_get_address_space(Machine->cpu[0], ADDRESS_SPACE_PROGRAM); +// const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); /* set m68k reset function */ cpu_set_info_fct(machine->cpu[0], CPUINFO_PTR_M68K_RESET_CALLBACK, (genf *)amiga_m68k_reset); @@ -1374,7 +1374,7 @@ WRITE16_HANDLER( amiga_custom_w ) /* if 'blitter-nasty' has been turned on and we have a blit pending, reschedule it */ if ( ( data & 0x400 ) && ( CUSTOM_REG(REG_DMACON) & 0x4000 ) ) - timer_adjust_oneshot( amiga_blitter_timer, cpu_clocks_to_attotime( Machine->activecpu, BLITTER_NASTY_DELAY ), 0); + timer_adjust_oneshot( amiga_blitter_timer, cpu_clocks_to_attotime( space->machine->activecpu, BLITTER_NASTY_DELAY ), 0); break; @@ -1385,7 +1385,7 @@ WRITE16_HANDLER( amiga_custom_w ) CUSTOM_REG(offset) = data; if ( temp & 0x8000 ) /* if we're enabling irq's, delay a bit */ - timer_adjust_oneshot( amiga_irq_timer, cpu_clocks_to_attotime( Machine->activecpu, AMIGA_IRQ_DELAY_CYCLES ), 0); + timer_adjust_oneshot( amiga_irq_timer, cpu_clocks_to_attotime( space->machine->activecpu, AMIGA_IRQ_DELAY_CYCLES ), 0); else /* if we're disabling irq's, process right away */ update_irqs(space->machine); break; diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c index 6df49196555..7de972f05c0 100644 --- a/src/mame/machine/cubocd32.c +++ b/src/mame/machine/cubocd32.c @@ -642,7 +642,7 @@ static void akiko_update_cdrom(const address_space *space) if ( cmdbuf[7] == 0x80 ) { - if (LOG_AKIKO_CD) logerror( "AKIKO CD: PC:%06x Data read - start lba: %08x - end lba: %08x\n", safe_cpu_get_pc(Machine->activecpu), startpos, endpos ); + if (LOG_AKIKO_CD) logerror( "AKIKO CD: PC:%06x Data read - start lba: %08x - end lba: %08x\n", safe_cpu_get_pc(space->machine->activecpu), startpos, endpos ); akiko.cdrom_speed = (cmdbuf[8] & 0x40) ? 2 : 1; akiko.cdrom_lba_start = startpos; akiko.cdrom_lba_end = endpos; diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index e9a20d149c7..81eeff8da66 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -147,7 +147,7 @@ INLINE int decode_reg32_64(running_machine *machine, UINT32 offset, UINT64 mem_m if ((mem_mask != U64(0xffffffff00000000)) && (mem_mask != U64(0x00000000ffffffff))) { mame_printf_verbose("Wrong mask! (PC=%x)\n", cpu_get_pc(machine->activecpu)); -// debugger_break(Machine); +// debugger_break(machine); } if (mem_mask == U64(0xffffffff00000000)) @@ -171,7 +171,7 @@ INLINE int decode_reg3216_64(running_machine *machine, UINT32 offset, UINT64 mem (mem_mask != U64(0xffffffff00000000)) && (mem_mask != U64(0x00000000ffffffff))) { mame_printf_verbose("Wrong mask! (PC=%x)\n", cpu_get_pc(machine->activecpu)); -// debugger_break(Machine); +// debugger_break(machine); } if (mem_mask & U64(0x0000ffff00000000)) diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c index 1ba599fc467..f934316ed92 100644 --- a/src/mame/machine/fddebug.c +++ b/src/mame/machine/fddebug.c @@ -438,7 +438,7 @@ INLINE int pc_is_valid(running_machine *machine, UINT32 pc, UINT32 flags) return 0; if (pc & 0xff000000) return 0; - if (memory_decrypted_read_ptr(cpu_get_address_space(Machine->activecpu, ADDRESS_SPACE_PROGRAM), pc) == NULL) + if (memory_decrypted_read_ptr(cpu_get_address_space(machine->activecpu, ADDRESS_SPACE_PROGRAM), pc) == NULL) return 0; return 1; } diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c index daa3e74ac20..31d646a1504 100644 --- a/src/mame/machine/midwayic.c +++ b/src/mame/machine/midwayic.c @@ -734,7 +734,7 @@ static UINT16 ioasic_fifo_r(const device_config *device) /* fetch the data from the buffer and update the IOASIC state */ result = ioasic.fifo[ioasic.fifo_out++ % FIFO_SIZE]; ioasic.fifo_bytes--; - update_ioasic_irq(Machine); + update_ioasic_irq(device->machine); if (LOG_FIFO && (ioasic.fifo_bytes < 4 || ioasic.fifo_bytes >= FIFO_SIZE - 4)) logerror("fifo_r(%04X): FIFO bytes = %d!\n", result, ioasic.fifo_bytes); @@ -745,7 +745,7 @@ static UINT16 ioasic_fifo_r(const device_config *device) /* main CPU is handling the I/O ASIC interrupt */ if (ioasic.fifo_bytes == 0 && ioasic.has_dcs) { - ioasic.fifo_force_buffer_empty_pc = safe_cpu_get_pc(Machine->activecpu); + ioasic.fifo_force_buffer_empty_pc = safe_cpu_get_pc(device->machine->activecpu); if (LOG_FIFO) logerror("fifo_r(%04X): FIFO empty, PC = %04X\n", result, ioasic.fifo_force_buffer_empty_pc); } diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c index 33efbeb7603..662c5d9bdc3 100644 --- a/src/mame/machine/midwunit.c +++ b/src/mame/machine/midwunit.c @@ -382,8 +382,8 @@ static void init_wunit_generic(running_machine *machine) register_state_saving(machine); /* load the graphics ROMs -- quadruples */ - midyunit_gfx_rom = base = memory_region(Machine, "gfx1"); - len = memory_region_length(Machine, "gfx1"); + midyunit_gfx_rom = base = memory_region(machine, "gfx1"); + len = memory_region_length(machine, "gfx1"); for (i = 0; i < len / 0x400000; i++) { memcpy(midwunit_decode_memory, base, 0x400000); diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c index 4a8802d073b..63eb68a932e 100644 --- a/src/mame/video/cinemat.c +++ b/src/mame/video/cinemat.c @@ -5,7 +5,6 @@ ***************************************************************************/ #include "driver.h" -#include "deprecat.h" #include "video/vector.h" #include "cpu/ccpu/ccpu.h" #include "cinemat.h" diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 7dc22b126ea..c07eb33574c 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -7537,14 +7537,14 @@ void K053250_vh_start(running_machine *machine, int chips, const char **region) for(chip=0; chipgamedrv->description, Machine->gamedrv->name); + _snprintf(title, ARRAY_LENGTH(title), "Debug: %s [%s]", machine->gamedrv->description, machine->gamedrv->name); info = debugwin_window_create(machine, title, NULL); if (info == NULL || !debugwin_view_create(info, 0, type)) return;