summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2008-03-05 22:02:25 +0000
committer Couriersud <couriersud@users.noreply.github.com>2008-03-05 22:02:25 +0000
commit3292183f4f721d599a1ba1a3d325a2066987cdee (patch)
tree40edaeb5e193364b0686a44449942899e893f0f2
parentdbd1965d0e1005b9a11c8b7989e8f32338fe9a88 (diff)
* remove deprecat.h and Machine where it was possible
-rw-r--r--src/mame/audio/dkong.c1
-rw-r--r--src/mame/drivers/dkong.c19
-rw-r--r--src/mame/video/dkong.c23
3 files changed, 21 insertions, 22 deletions
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 2e6b35d95d9..454fdae5162 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1,5 +1,4 @@
#include "driver.h"
-#include "deprecat.h"
#include "cpu/i8039/i8039.h"
#include "cpu/m6502/m6502.h"
#include "sound/nes_apu.h"
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 25207db6410..ffb43af062f 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -299,13 +299,14 @@ Donkey Kong Junior Notes
***************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "cpu/s2650/s2650.h"
#include "cpu/m6502/m6502.h"
#include "includes/dkong.h"
#include "machine/8257dma.h"
#include "machine/z80dma.h"
+#include "deprecat.h"
+
/*************************************
*
* Defines
@@ -632,7 +633,7 @@ static WRITE8_HANDLER( hunchbkd_mirror_w )
static READ8_HANDLER( epos_decrypt_rom )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
if (offset & 0x01)
{
@@ -661,14 +662,14 @@ static READ8_HANDLER( epos_decrypt_rom )
static WRITE8_HANDLER( hunchbkd_data_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->hunchloopback = data;
}
static READ8_HANDLER( hunchbkd_port0_r )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
#if DEBUG_PROTECTION
logerror("port 0 : pc = %4x\n",activecpu_get_pc());
#endif
@@ -685,7 +686,7 @@ static READ8_HANDLER( hunchbkd_port0_r )
static READ8_HANDLER( hunchbkd_port1_r )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
return state->hunchloopback;
}
@@ -739,13 +740,13 @@ static WRITE8_HANDLER( dkong3_2a03_reset_w )
{
if (data & 1)
{
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, CLEAR_LINE);
}
else
{
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, ASSERT_LINE);
}
}
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index e1bbe8f2d8e..5f52deb31bd 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -8,7 +8,6 @@
***************************************************************************/
#include "driver.h"
-#include "deprecat.h"
#include "video/resnet.h"
#include "includes/dkong.h"
@@ -472,7 +471,7 @@ static TILE_GET_INFO( radarsc1_bg_tile_info )
WRITE8_HANDLER( dkong_videoram_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
if (state->video_ram[offset] != data)
{
@@ -483,21 +482,21 @@ WRITE8_HANDLER( dkong_videoram_w )
WRITE8_HANDLER( radarscp_snd02_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->snd02_enable = data & 0x01;
}
WRITE8_HANDLER( radarsc1_ansn_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->sig_ansn = data & 0x01;
}
WRITE8_HANDLER( dkongjr_gfxbank_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
if (state->gfx_bank != (data & 0x01))
{
@@ -508,7 +507,7 @@ WRITE8_HANDLER( dkongjr_gfxbank_w )
WRITE8_HANDLER( dkong3_gfxbank_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
if (state->gfx_bank != (~data & 0x01))
{
@@ -519,7 +518,7 @@ WRITE8_HANDLER( dkong3_gfxbank_w )
WRITE8_HANDLER( dkong_palettebank_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
int newbank;
newbank = state->palette_bank;
@@ -538,14 +537,14 @@ WRITE8_HANDLER( dkong_palettebank_w )
WRITE8_HANDLER( radarscp_grid_enable_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->grid_on = data & 0x01;
}
WRITE8_HANDLER( radarscp_grid_color_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->grid_col = (data & 0x07) ^ 0x07;
//popmessage("Gridcol: %d", state->grid_col);
@@ -553,14 +552,14 @@ WRITE8_HANDLER( radarscp_grid_color_w )
WRITE8_HANDLER( dkong_flipscreen_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->flip = ~data & 0x01;
}
WRITE8_HANDLER( dkong_spritebank_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
state->sprite_bank = data & 0x01;
}
@@ -699,7 +698,7 @@ static void radarscp_step(running_machine *machine, int line_cnt)
if (line_cnt>=512)
line_cnt=512-VTOTAL;
- if ( ( !(line_cnt & 0x40) && ((line_cnt+1) & 0x40) ) && (mame_rand(Machine) > RAND_MAX/2))
+ if ( ( !(line_cnt & 0x40) && ((line_cnt+1) & 0x40) ) && (mame_rand(machine) > RAND_MAX/2))
state->sig30Hz = (1-state->sig30Hz);
state->rflip_sig = state->snd02_enable & state->sig30Hz;