Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Sent: Saturday, December 06, 2008 4:52 PM
To: submit@mamedev.org
Cc: atariace@hotmail.com
Subject: [patch] Deprecat.h cleanup

Hi mamedev,

This patch changes some global Machine references to use machine,
device->machine, ... instead, and removes any unneeded #include
"deprecat.h" lines as well (about 10% of them in fact).  It was
generated using the attached script, and then reverting some cases
where it was overzealous.

~aa
This commit is contained in:
Aaron Giles 2008-12-07 14:51:36 +00:00
parent 96321d328f
commit 872ec20658
67 changed files with 65 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,6 @@
*****************************************************************************/ *****************************************************************************/
#include <stdarg.h> #include <stdarg.h>
#include "deprecat.h"
#define ARM7_DEBUG_CORE 0 #define ARM7_DEBUG_CORE 0

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

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

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

@ -14,7 +14,6 @@
#include "drcbeut.h" #include "drcbeut.h"
#include "eminline.h" #include "eminline.h"
#include "debugger.h" #include "debugger.h"
#include "deprecat.h"
#include <math.h> #include <math.h>
#ifdef _MSC_VER #ifdef _MSC_VER

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

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

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

@ -30,7 +30,6 @@
***************************************************************************/ ***************************************************************************/
#include "debugger.h" #include "debugger.h"
#include "deprecat.h"
#include "dsp56k.h" #include "dsp56k.h"
#include "dsp56def.h" #include "dsp56def.h"

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

@ -1,4 +1,3 @@
#include "deprecat.h"
/* ======================================================================== */ /* ======================================================================== */
/* ============================= CONFIGURATION ============================ */ /* ============================= CONFIGURATION ============================ */

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

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

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

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

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

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

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

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

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

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

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

@ -74,7 +74,6 @@ TODO:
*/ */
#include "debugger.h" #include "debugger.h"
#include "deprecat.h"
#include "m6800.h" #include "m6800.h"
#define VERBOSE 0 #define VERBOSE 0

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

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

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

@ -7,7 +7,6 @@
***************************************************************************/ ***************************************************************************/
#include "mips3com.h" #include "mips3com.h"
#include "deprecat.h"
#include "cpuexec.h" #include "cpuexec.h"
#include "mame.h" #include "mame.h"

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

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

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

@ -100,7 +100,6 @@
*****************************************************************************/ *****************************************************************************/
#include "debugger.h" #include "debugger.h"
#include "deprecat.h"
#include "sh2.h" #include "sh2.h"
#include "sh2comn.h" #include "sh2comn.h"

1
src/emu/cpu/sh2/sh2comn.c
View File

@ -7,7 +7,6 @@
*****************************************************************************/ *****************************************************************************/
#include "debugger.h" #include "debugger.h"
#include "deprecat.h"
#include "cpuexec.h" #include "cpuexec.h"
#include "sh2.h" #include "sh2.h"
#include "sh2comn.h" #include "sh2comn.h"

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

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

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

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

1
src/emu/cpu/tms34010/34010gfx.c
View File

@ -9,7 +9,6 @@
#ifndef RECURSIVE_INCLUDE #ifndef RECURSIVE_INCLUDE
#include "deprecat.h"
#define LOG_GFX_OPS 0 #define LOG_GFX_OPS 0
#define LOGGFX(x) do { if (LOG_GFX_OPS && input_code_pressed(KEYCODE_L)) logerror x; } while (0) #define LOGGFX(x) do { if (LOG_GFX_OPS && input_code_pressed(KEYCODE_L)) logerror x; } while (0)

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

@ -32,7 +32,6 @@
#include "cpuexec.h" #include "cpuexec.h"
#include "debugger.h" #include "debugger.h"
#include "tms7000.h" #include "tms7000.h"
#include "deprecat.h"
#define VERBOSE 0 #define VERBOSE 0

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

@ -41,7 +41,6 @@
****************************************************************************/ ****************************************************************************/
#include "debugger.h" #include "debugger.h"
#include "deprecat.h"
#define PC(n) (((n)->sregs[CS]<<4)+(n)->ip) #define PC(n) (((n)->sregs[CS]<<4)+(n)->ip)

1
src/emu/debug/debugcmd.c
View File

@ -18,7 +18,6 @@
#include "debughlp.h" #include "debughlp.h"
#include "debugvw.h" #include "debugvw.h"
#include "render.h" #include "render.h"
#include "deprecat.h"
#include <ctype.h> #include <ctype.h>

1
src/emu/debug/debugvw.c
View File

@ -10,7 +10,6 @@
*********************************************************************/ *********************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "debugvw.h" #include "debugvw.h"
#include "debugcmd.h" #include "debugcmd.h"
#include "debugcmt.h" #include "debugcmt.h"

4
src/emu/sound/2203intf.c
View File

@ -128,8 +128,8 @@ static SND_START( ym2203 )
if (!info->psg) return NULL; if (!info->psg) return NULL;
/* Timer Handler set */ /* Timer Handler set */
info->timer[0] = timer_alloc(Machine, timer_callback_2203_0, info); info->timer[0] = timer_alloc(device->machine, timer_callback_2203_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_2203_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_2203_1, info);
/* stream system initialize */ /* stream system initialize */
info->stream = stream_create(0,1,rate,info,ym2203_stream_update); info->stream = stream_create(0,1,rate,info,ym2203_stream_update);

4
src/emu/sound/2608intf.c
View File

@ -145,8 +145,8 @@ static SND_START( ym2608 )
if (!info->psg) return NULL; if (!info->psg) return NULL;
/* Timer Handler set */ /* Timer Handler set */
info->timer[0] = timer_alloc(Machine, timer_callback_2608_0, info); info->timer[0] = timer_alloc(device->machine, timer_callback_2608_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_2608_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_2608_1, info);
/* stream system initialize */ /* stream system initialize */
info->stream = stream_create(0,2,rate,info,ym2608_stream_update); info->stream = stream_create(0,2,rate,info,ym2608_stream_update);

8
src/emu/sound/2610intf.c
View File

@ -146,8 +146,8 @@ static SND_START( ym2610 )
if (!info->psg) return NULL; if (!info->psg) return NULL;
/* Timer Handler set */ /* Timer Handler set */
info->timer[0] = timer_alloc(Machine, timer_callback_0, info); info->timer[0] = timer_alloc(device->machine, timer_callback_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_1, info);
/* stream system initialize */ /* stream system initialize */
info->stream = stream_create(0,2,rate,info,ym2610_stream_update); info->stream = stream_create(0,2,rate,info,ym2610_stream_update);
@ -212,8 +212,8 @@ static SND_START( ym2610b )
if (!info->psg) return NULL; if (!info->psg) return NULL;
/* Timer Handler set */ /* Timer Handler set */
info->timer[0] =timer_alloc(Machine, timer_callback_0, info); info->timer[0] =timer_alloc(device->machine, timer_callback_0, info);
info->timer[1] =timer_alloc(Machine, timer_callback_1, info); info->timer[1] =timer_alloc(device->machine, timer_callback_1, info);
/* stream system initialize */ /* stream system initialize */
info->stream = stream_create(0,2,rate,info,ym2610b_stream_update); info->stream = stream_create(0,2,rate,info,ym2610b_stream_update);

4
src/emu/sound/2612intf.c
View File

@ -100,8 +100,8 @@ static SND_START( ym2612 )
/* FM init */ /* FM init */
/* Timer Handler set */ /* Timer Handler set */
info->timer[0] = timer_alloc(Machine, timer_callback_2612_0, info); info->timer[0] = timer_alloc(device->machine, timer_callback_2612_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_2612_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_2612_1, info);
/* stream system initialize */ /* stream system initialize */
info->stream = stream_create(0,2,rate,info,ym2612_stream_update); info->stream = stream_create(0,2,rate,info,ym2612_stream_update);

4
src/emu/sound/262intf.c
View File

@ -90,8 +90,8 @@ static SND_START( ymf262 )
ymf262_set_irq_handler (info->chip, IRQHandler_262, info); ymf262_set_irq_handler (info->chip, IRQHandler_262, info);
ymf262_set_update_handler(info->chip, _stream_update, info); ymf262_set_update_handler(info->chip, _stream_update, info);
info->timer[0] = timer_alloc(Machine, timer_callback_262_0, info); info->timer[0] = timer_alloc(device->machine, timer_callback_262_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_262_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_262_1, info);
return info; return info;
} }

12
src/emu/sound/3812intf.c
View File

@ -102,8 +102,8 @@ static SND_START( ym3812 )
ym3812_set_irq_handler (info->chip, IRQHandler_3812, info); ym3812_set_irq_handler (info->chip, IRQHandler_3812, info);
ym3812_set_update_handler(info->chip, _stream_update_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[0] = timer_alloc(device->machine, timer_callback_3812_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_3812_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_3812_1, info);
return info; return info;
} }
@ -270,8 +270,8 @@ static SND_START( ym3526 )
ym3526_set_irq_handler (info->chip, IRQHandler_3526, info); ym3526_set_irq_handler (info->chip, IRQHandler_3526, info);
ym3526_set_update_handler(info->chip, _stream_update_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[0] = timer_alloc(device->machine, timer_callback_3526_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_3526_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_3526_1, info);
return info; return info;
} }
@ -482,8 +482,8 @@ static SND_START( y8950 )
y8950_set_irq_handler (info->chip, IRQHandler_8950, info); y8950_set_irq_handler (info->chip, IRQHandler_8950, info);
y8950_set_update_handler(info->chip, _stream_update_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[0] = timer_alloc(device->machine, timer_callback_8950_0, info);
info->timer[1] = timer_alloc(Machine, timer_callback_8950_1, info); info->timer[1] = timer_alloc(device->machine, timer_callback_8950_1, info);
return info; return info;
} }

1
src/emu/sound/5110intf.c
View File

@ -13,7 +13,6 @@
#include <math.h> #include <math.h>
#include "sndintrf.h" #include "sndintrf.h"
#include "deprecat.h"
#include "streams.h" #include "streams.h"
#include "tms5110.h" #include "tms5110.h"
#include "5110intf.h" #include "5110intf.h"

6
src/emu/sound/aica.c
View File

@ -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->timerA = timer_alloc(device->machine, timerA_cb, AICA);
AICA->timerB = timer_alloc(Machine, timerB_cb, AICA); AICA->timerB = timer_alloc(device->machine, timerB_cb, AICA);
AICA->timerC = timer_alloc(Machine, timerC_cb, AICA); AICA->timerC = timer_alloc(device->machine, timerC_cb, AICA);
for(i=0;i<0x400;++i) for(i=0;i<0x400;++i)
{ {

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

@ -260,7 +260,7 @@ static SND_START( es5503 )
chip->oscillators[osc].irqpend = 0; chip->oscillators[osc].irqpend = 0;
chip->oscillators[osc].accumulator = 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; chip->oscillators[osc].chip = (void *)chip;
} }

1
src/emu/sound/gaelco.c
View File

@ -35,7 +35,6 @@ Registers per channel:
#include "sndintrf.h" #include "sndintrf.h"
#include "cpuintrf.h" #include "cpuintrf.h"
#include "deprecat.h"
#include "streams.h" #include "streams.h"
#include "gaelco.h" #include "gaelco.h"
#include "wavwrite.h" #include "wavwrite.h"

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

@ -233,7 +233,7 @@ static SND_START( k053260 )
/* setup SH1 timer if necessary */ /* setup SH1 timer if necessary */
if ( ic->intf->irq ) 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; return ic;
} }

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

@ -18,7 +18,6 @@ CHANNEL_DEBUG enables the following keys:
*********************************************************/ *********************************************************/
#include "sndintrf.h" #include "sndintrf.h"
#include "deprecat.h"
#include "streams.h" #include "streams.h"
#include "k054539.h" #include "k054539.h"
#include <math.h> #include <math.h>
@ -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 // One or more of the registers must be the timer period
// And anyway, this particular frequency is probably wrong // And anyway, this particular frequency is probably wrong
// 480 hz is TRUSTED by gokuparo disco stage - the looping sample doesn't line up otherwise // 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); info->stream = stream_create(0, 2, clock, info, k054539_update);

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

@ -189,7 +189,7 @@ static SND_START( msm5205 )
/* stream system initialize */ /* stream system initialize */
voice->stream = stream_create(0,1,clock,voice,MSM5205_update); 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 */ /* initialize */
msm5205_reset(voice); msm5205_reset(voice);

1
src/emu/sound/namco.c
View File

@ -12,7 +12,6 @@
***************************************************************************/ ***************************************************************************/
#include "sndintrf.h" #include "sndintrf.h"
#include "deprecat.h"
#include "streams.h" #include "streams.h"
#include "namco.h" #include "namco.h"

10
src/emu/sound/pokey.c
View File

@ -648,15 +648,15 @@ static SND_START( pokey )
chip->clockmult = DIV_64; chip->clockmult = DIV_64;
chip->KBCODE = 0x09; /* Atari 800 'no key' */ chip->KBCODE = 0x09; /* Atari 800 'no key' */
chip->SKCTL = SK_RESET; /* let the RNG run after reset */ 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[0] = timer_alloc(device->machine, pokey_timer_expire, chip);
chip->timer[1] = timer_alloc(Machine, pokey_timer_expire, chip); chip->timer[1] = timer_alloc(device->machine, pokey_timer_expire, chip);
chip->timer[2] = timer_alloc(Machine, pokey_timer_expire, chip); chip->timer[2] = timer_alloc(device->machine, pokey_timer_expire, chip);
for (i=0; i<8; i++) 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->pot_r[i] = chip->intf.pot_r[i];
} }
chip->allpot_r = chip->intf.allpot_r; chip->allpot_r = chip->intf.allpot_r;

7
src/emu/sound/rf5c400.c
View File

@ -17,7 +17,6 @@
#include "sndintrf.h" #include "sndintrf.h"
#include "streams.h" #include "streams.h"
#include "deprecat.h"
#include "rf5c400.h" #include "rf5c400.h"
struct rf5c400_info struct rf5c400_info
@ -254,7 +253,7 @@ static void rf5c400_init_chip(const device_config *device, struct rf5c400_info *
double r; double r;
// attack // 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++) for (i = 0; i < ENV_MIN_AR; i++)
{ {
info->env_ar_table[i] = 1.0; info->env_ar_table[i] = 1.0;
@ -270,7 +269,7 @@ static void rf5c400_init_chip(const device_config *device, struct rf5c400_info *
} }
// decay // 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++) for (i = 0; i < ENV_MIN_DR; i++)
{ {
info->env_dr_table[i] = r; info->env_dr_table[i] = r;
@ -286,7 +285,7 @@ static void rf5c400_init_chip(const device_config *device, struct rf5c400_info *
} }
// release // 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++) for (i = 0; i < ENV_MIN_RR; i++)
{ {
info->env_rr_table[i] = r; info->env_rr_table[i] = r;

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

@ -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->timerA = timer_alloc(device->machine, timerA_cb, SCSP);
SCSP->timerB = timer_alloc(Machine, timerB_cb, SCSP); SCSP->timerB = timer_alloc(device->machine, timerB_cb, SCSP);
SCSP->timerC = timer_alloc(Machine, timerC_cb, SCSP); SCSP->timerC = timer_alloc(device->machine, timerC_cb, SCSP);
for(i=0;i<0x400;++i) for(i=0;i<0x400;++i)
{ {

5
src/emu/sound/sid6581.c
View File

@ -7,7 +7,6 @@
***************************************************************************/ ***************************************************************************/
#include "sndintrf.h" #include "sndintrf.h"
#include "deprecat.h"
#include "sid6581.h" #include "sid6581.h"
#include "sid.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)); sid = (SID6581 *) auto_malloc(sizeof(*sid));
memset(sid, 0, sizeof(*sid)); memset(sid, 0, sizeof(*sid));
sid->mixer_channel = stream_create (0, 1, Machine->sample_rate, (void *) sid, sid_update); sid->mixer_channel = stream_create (0, 1, device->machine->sample_rate, (void *) sid, sid_update);
sid->PCMfreq = Machine->sample_rate; sid->PCMfreq = device->machine->sample_rate;
sid->clock = clock; sid->clock = clock;
sid->ad_read = iface ? iface->ad_read : NULL; sid->ad_read = iface ? iface->ad_read : NULL;
sid->type = sidtype; sid->type = sidtype;

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

@ -17,7 +17,6 @@
*/ */
#include <math.h> #include <math.h>
#include "deprecat.h"
#include "sndintrf.h" #include "sndintrf.h"
#include "streams.h" #include "streams.h"
#include "cpuintrf.h" #include "cpuintrf.h"
@ -201,7 +200,7 @@ static SND_START( sp0250 )
sp->RNG = 1; sp->RNG = 1;
sp->drq = intf->drq_callback; sp->drq = intf->drq_callback;
sp->drq(ASSERT_LINE); 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); sp->stream = stream_create(0, 1, clock / CLOCK_DIVIDER, sp, sp0250_update);

1
src/emu/sound/upd7759.c
View File

@ -100,7 +100,6 @@
#include <math.h> #include <math.h>
#include "sndintrf.h" #include "sndintrf.h"
#include "deprecat.h"
#include "streams.h" #include "streams.h"
#include "upd7759.h" #include "upd7759.h"

1
src/emu/sound/x1_010.c
View File

@ -49,7 +49,6 @@ Registers:
***************************************************************************/ ***************************************************************************/
#include "sndintrf.h" #include "sndintrf.h"
#include "deprecat.h"
#include "cpuintrf.h" #include "cpuintrf.h"
#include "streams.h" #include "streams.h"
#include "x1_010.h" #include "x1_010.h"

6
src/emu/sound/ym2151.c
View File

@ -1534,8 +1534,8 @@ void * ym2151_init(const device_config *device, int clock, int rate)
#ifdef USE_MAME_TIMERS #ifdef USE_MAME_TIMERS
/* this must be done _before_ a call to ym2151_reset_chip() */ /* this must be done _before_ a call to ym2151_reset_chip() */
PSG->timer_A = timer_alloc(Machine, timer_callback_a, PSG); PSG->timer_A = timer_alloc(device->machine, timer_callback_a, PSG);
PSG->timer_B = timer_alloc(Machine, timer_callback_b, PSG); PSG->timer_B = timer_alloc(device->machine, timer_callback_b, PSG);
#else #else
PSG->tim_A = 0; PSG->tim_A = 0;
PSG->tim_B = 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"); cymfile = fopen("2151_.cym","wb");
if (cymfile) 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 else
logerror("Could not create file 2151_.cym\n"); logerror("Could not create file 2151_.cym\n");
} }

4
src/emu/sound/ymf271.c
View File

@ -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) 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->timA = timer_alloc(device->machine, ymf271_timer_a_tick, chip);
chip->timB = timer_alloc(Machine, ymf271_timer_b_tick, chip); chip->timB = timer_alloc(device->machine, ymf271_timer_b_tick, chip);
chip->rom = rom; chip->rom = rom;
chip->irq_callback = cb; chip->irq_callback = cb;

3
src/emu/state.c
View File

@ -22,7 +22,6 @@
#include "driver.h" #include "driver.h"
#include "astring.h" #include "astring.h"
#include "deprecat.h"
#include <zlib.h> #include <zlib.h>
@ -246,7 +245,7 @@ void state_save_register_memory(running_machine *machine, const char *module, co
if (!global->reg_allowed) 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); 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); 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++; global->illegal_regs++;
return; return;

1
src/emu/timer.c
View File

@ -11,7 +11,6 @@
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "profiler.h" #include "profiler.h"
#include "pool.h" #include "pool.h"

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

@ -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])); state_save_register_global_pointer(machine, dcs_sram, 0x8000*4 / sizeof(dcs_sram[0]));
if (dcs.rev == 2) 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); cpu_set_info_fct(dcs.cpu, CPUINFO_PTR_ADSP2100_TIMER_HANDLER, (genf *)timer_enable_callback);
/* configure boot and sound ROMs */ /* configure boot and sound ROMs */
dcs.bootrom = (UINT16 *)memory_region(Machine, "dcs"); dcs.bootrom = (UINT16 *)memory_region(machine, "dcs");
dcs.bootrom_words = memory_region_length(Machine, "dcs") / 2; dcs.bootrom_words = memory_region_length(machine, "dcs") / 2;
dcs.sounddata = dcs.bootrom; dcs.sounddata = dcs.bootrom;
dcs.sounddata_words = dcs.bootrom_words; dcs.sounddata_words = dcs.bootrom_words;
dcs.sounddata_banks = dcs.sounddata_words / 0x1000; dcs.sounddata_banks = dcs.sounddata_words / 0x1000;
@ -938,10 +938,10 @@ void dcs_init(running_machine *machine)
dcs.auto_ack = TRUE; dcs.auto_ack = TRUE;
/* register for save states */ /* register for save states */
dcs_register_state(Machine); dcs_register_state(machine);
/* reset the system */ /* reset the system */
dcs_reset(Machine, NULL, 0); dcs_reset(machine, NULL, 0);
} }

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

@ -259,7 +259,7 @@ void taito_f3_soundsystem_reset(running_machine *machine)
/* reset CPU to catch any banking of startup vectors */ /* reset CPU to catch any banking of startup vectors */
cpu_reset(cputag_get_cpu(machine, "audio")); 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 = const es5505_interface es5505_taito_f3_config =

1
src/mame/drivers/bbusters.c
View File

@ -198,7 +198,6 @@ the entire size of the screen.
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "sound/2608intf.h" #include "sound/2608intf.h"
#include "sound/2610intf.h" #include "sound/2610intf.h"

1
src/mame/drivers/cinemat.c
View File

@ -30,7 +30,6 @@
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "video/vector.h" #include "video/vector.h"
#include "cpu/ccpu/ccpu.h" #include "cpu/ccpu/ccpu.h"
#include "cinemat.h" #include "cinemat.h"

1
src/mame/drivers/ddealer.c
View File

@ -110,7 +110,6 @@ Few words about protection:
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "sound/2203intf.h" #include "sound/2203intf.h"

1
src/mame/drivers/segaorun.c
View File

@ -14,7 +14,6 @@
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "system16.h" #include "system16.h"
#include "machine/fd1089.h" #include "machine/fd1089.h"
#include "machine/segaic16.h" #include "machine/segaic16.h"

1
src/mame/drivers/segaxbd.c
View File

@ -20,7 +20,6 @@
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "system16.h" #include "system16.h"
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "machine/segaic16.h" #include "machine/segaic16.h"

1
src/mame/drivers/stvinit.c
View File

@ -6,7 +6,6 @@ to be honest i think some of these cause more problems than they're worth ...
*/ */
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "machine/eeprom.h" #include "machine/eeprom.h"
#include "cpu/sh2/sh2.h" #include "cpu/sh2/sh2.h"
#include "machine/stvprot.h" #include "machine/stvprot.h"

1
src/mame/drivers/toaplan2.c
View File

@ -243,7 +243,6 @@ To Do / Unknowns:
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h" #include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h" #include "cpu/z80/z80.h"
#include "machine/eeprom.h" #include "machine/eeprom.h"

6
src/mame/machine/amiga.c
View File

@ -299,7 +299,7 @@ static void amiga_m68k_reset(const device_config *device)
MACHINE_RESET( amiga ) 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 */ /* set m68k reset function */
cpu_set_info_fct(machine->cpu[0], CPUINFO_PTR_M68K_RESET_CALLBACK, (genf *)amiga_m68k_reset); 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 'blitter-nasty' has been turned on and we have a blit pending, reschedule it */
if ( ( data & 0x400 ) && ( CUSTOM_REG(REG_DMACON) & 0x4000 ) ) 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; break;
@ -1385,7 +1385,7 @@ WRITE16_HANDLER( amiga_custom_w )
CUSTOM_REG(offset) = data; CUSTOM_REG(offset) = data;
if ( temp & 0x8000 ) /* if we're enabling irq's, delay a bit */ 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 */ else /* if we're disabling irq's, process right away */
update_irqs(space->machine); update_irqs(space->machine);
break; break;

2
src/mame/machine/cubocd32.c
View File

@ -642,7 +642,7 @@ static void akiko_update_cdrom(const address_space *space)
if ( cmdbuf[7] == 0x80 ) 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_speed = (cmdbuf[8] & 0x40) ? 2 : 1;
akiko.cdrom_lba_start = startpos; akiko.cdrom_lba_start = startpos;
akiko.cdrom_lba_end = endpos; akiko.cdrom_lba_end = endpos;

4
src/mame/machine/dc.c
View File

@ -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))) if ((mem_mask != U64(0xffffffff00000000)) && (mem_mask != U64(0x00000000ffffffff)))
{ {
mame_printf_verbose("Wrong mask! (PC=%x)\n", cpu_get_pc(machine->activecpu)); mame_printf_verbose("Wrong mask! (PC=%x)\n", cpu_get_pc(machine->activecpu));
// debugger_break(Machine); // debugger_break(machine);
} }
if (mem_mask == U64(0xffffffff00000000)) 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))) (mem_mask != U64(0xffffffff00000000)) && (mem_mask != U64(0x00000000ffffffff)))
{ {
mame_printf_verbose("Wrong mask! (PC=%x)\n", cpu_get_pc(machine->activecpu)); mame_printf_verbose("Wrong mask! (PC=%x)\n", cpu_get_pc(machine->activecpu));
// debugger_break(Machine); // debugger_break(machine);
} }
if (mem_mask & U64(0x0000ffff00000000)) if (mem_mask & U64(0x0000ffff00000000))

2
src/mame/machine/fddebug.c
View File

@ -438,7 +438,7 @@ INLINE int pc_is_valid(running_machine *machine, UINT32 pc, UINT32 flags)
return 0; return 0;
if (pc & 0xff000000) if (pc & 0xff000000)
return 0; 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 0;
return 1; return 1;
} }

4
src/mame/machine/midwayic.c
View File

@ -734,7 +734,7 @@ static UINT16 ioasic_fifo_r(const device_config *device)
/* fetch the data from the buffer and update the IOASIC state */ /* fetch the data from the buffer and update the IOASIC state */
result = ioasic.fifo[ioasic.fifo_out++ % FIFO_SIZE]; result = ioasic.fifo[ioasic.fifo_out++ % FIFO_SIZE];
ioasic.fifo_bytes--; 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)) 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); 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 */ /* main CPU is handling the I/O ASIC interrupt */
if (ioasic.fifo_bytes == 0 && ioasic.has_dcs) 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) if (LOG_FIFO)
logerror("fifo_r(%04X): FIFO empty, PC = %04X\n", result, ioasic.fifo_force_buffer_empty_pc); logerror("fifo_r(%04X): FIFO empty, PC = %04X\n", result, ioasic.fifo_force_buffer_empty_pc);
} }

4
src/mame/machine/midwunit.c
View File

@ -382,8 +382,8 @@ static void init_wunit_generic(running_machine *machine)
register_state_saving(machine); register_state_saving(machine);
/* load the graphics ROMs -- quadruples */ /* load the graphics ROMs -- quadruples */
midyunit_gfx_rom = base = memory_region(Machine, "gfx1"); midyunit_gfx_rom = base = memory_region(machine, "gfx1");
len = memory_region_length(Machine, "gfx1"); len = memory_region_length(machine, "gfx1");
for (i = 0; i < len / 0x400000; i++) for (i = 0; i < len / 0x400000; i++)
{ {
memcpy(midwunit_decode_memory, base, 0x400000); memcpy(midwunit_decode_memory, base, 0x400000);

1
src/mame/video/cinemat.c
View File

@ -5,7 +5,6 @@
***************************************************************************/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "deprecat.h"
#include "video/vector.h" #include "video/vector.h"
#include "cpu/ccpu/ccpu.h" #include "cpu/ccpu/ccpu.h"
#include "cinemat.h" #include "cinemat.h"

4
src/mame/video/konamiic.c
View File

@ -7537,14 +7537,14 @@ void K053250_vh_start(running_machine *machine, int chips, const char **region)
for(chip=0; chip<chips; chip++) for(chip=0; chip<chips; chip++)
{ {
K053250_info.chip[chip].base = memory_region(Machine, region[chip]); K053250_info.chip[chip].base = memory_region(machine, region[chip]);
ram = auto_malloc(0x6000); ram = auto_malloc(0x6000);
K053250_info.chip[chip].ram = ram; K053250_info.chip[chip].ram = ram;
K053250_info.chip[chip].rammax = ram + 0x800; K053250_info.chip[chip].rammax = ram + 0x800;
K053250_info.chip[chip].buffer[0] = ram + 0x2000; K053250_info.chip[chip].buffer[0] = ram + 0x2000;
K053250_info.chip[chip].buffer[1] = ram + 0x2800; K053250_info.chip[chip].buffer[1] = ram + 0x2800;
memset(ram+0x2000, 0, 0x2000); memset(ram+0x2000, 0, 0x2000);
K053250_info.chip[chip].rommask = memory_region_length(Machine, region[chip]); K053250_info.chip[chip].rommask = memory_region_length(machine, region[chip]);
K053250_info.chip[chip].page[1] = K053250_info.chip[chip].page[0] = 0; K053250_info.chip[chip].page[1] = K053250_info.chip[chip].page[0] = 0;
K053250_info.chip[chip].offsy = K053250_info.chip[chip].offsx = 0; K053250_info.chip[chip].offsy = K053250_info.chip[chip].offsx = 0;
K053250_info.chip[chip].frame = -1; K053250_info.chip[chip].frame = -1;

2
src/osd/windows/debugwin.c
View File

@ -1581,7 +1581,7 @@ static void generic_create_window(running_machine *machine, int type)
char title[256]; char title[256];
// create the window // create the window
_snprintf(title, ARRAY_LENGTH(title), "Debug: %s [%s]", Machine->gamedrv->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); info = debugwin_window_create(machine, title, NULL);
if (info == NULL || !debugwin_view_create(info, 0, type)) if (info == NULL || !debugwin_view_create(info, 0, type))
return; return;