summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ddragon.c
diff options
context:
space:
mode:
author Fabio Priuli <etabeta78@users.noreply.github.com>2009-11-27 00:30:00 +0000
committer Fabio Priuli <etabeta78@users.noreply.github.com>2009-11-27 00:30:00 +0000
commit330341d5e3a1dae698437d3ff71850099b0d3101 (patch)
treefdb1817bada65eca035bf4e4b911dbba9f1aa844 /src/mame/drivers/ddragon.c
parentcdd9d7c75755992b00a51392b456b6cfcc2bdb60 (diff)
Added driver data struct and save states to the following drivers: chinagat.c, esd16.c, f-32.c, fcombat.c, finalizr.c.
Also, added driver data struct to ddragon.c, ddragon3.c and fgoal.c fgoal.c suffers of pending timers and hence no save state flag
Diffstat (limited to 'src/mame/drivers/ddragon.c')
-rw-r--r--src/mame/drivers/ddragon.c256
1 files changed, 139 insertions, 117 deletions
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 420c5a467b0..e55b5959a4d 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -77,6 +77,7 @@ Dip locations verified with manual for ddragon & ddragon2
#include "sound/2151intf.h"
#include "sound/okim6295.h"
#include "sound/msm5205.h"
+#include "ddragon.h"
#define MAIN_CLOCK XTAL_12MHz
@@ -85,31 +86,6 @@ Dip locations verified with manual for ddragon & ddragon2
#define PIXEL_CLOCK MAIN_CLOCK / 2
-/* from video */
-extern UINT8 *ddragon_bgvideoram,*ddragon_fgvideoram;
-extern UINT16 ddragon_scrollx_hi, ddragon_scrolly_hi;
-extern UINT8 *ddragon_scrollx_lo;
-extern UINT8 *ddragon_scrolly_lo;
-VIDEO_START( ddragon );
-VIDEO_UPDATE( ddragon );
-WRITE8_HANDLER( ddragon_bgvideoram_w );
-WRITE8_HANDLER( ddragon_fgvideoram_w );
-extern UINT8 *ddragon_spriteram;
-extern UINT8 technos_video_hw;
-/* end of extern code & data */
-
-/* private globals */
-static UINT8 dd_sub_cpu_busy;
-static UINT8 sprite_irq, sound_irq, ym_irq;
-static const device_config *snd_cpu;
-static UINT32 adpcm_pos[2], adpcm_end[2];
-static UINT8 adpcm_idle[2];
-static int adpcm_data[2];
-static UINT8 *darktowr_mcu_ports;
-static UINT8 *rambase;
-/* end of private globals */
-
-
/*************************************
*
* Video timing
@@ -131,7 +107,7 @@ static UINT8 *rambase;
Since MAME's video timing is 0-based, we need to convert this.
*/
-INLINE int scanline_to_vcount(int scanline)
+INLINE int scanline_to_vcount( int scanline )
{
int vcount = scanline + 8;
if (vcount < 0x100)
@@ -170,27 +146,38 @@ static TIMER_DEVICE_CALLBACK( ddragon_scanline )
static MACHINE_START( ddragon )
{
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
+
/* configure banks */
memory_configure_bank(machine, 1, 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000);
- /* determine the sound CPU index */
- snd_cpu = cputag_get_cpu(machine, "soundcpu");
+ state->sub_cpu = devtag_get_device(machine, "sub");
+ state->snd_cpu = devtag_get_device(machine, "soundcpu");
+ state->adpcm_1 = devtag_get_device(machine, "adpcm1");
+ state->adpcm_2 = devtag_get_device(machine, "adpcm2");
/* register for save states */
- state_save_register_global(machine, dd_sub_cpu_busy);
- state_save_register_global_array(machine, adpcm_pos);
- state_save_register_global_array(machine, adpcm_end);
- state_save_register_global_array(machine, adpcm_idle);
+ state_save_register_global(machine, state->dd_sub_cpu_busy);
+ state_save_register_global(machine, state->scrollx_hi);
+ state_save_register_global(machine, state->scrolly_hi);
+ state_save_register_global_array(machine, state->adpcm_pos);
+ state_save_register_global_array(machine, state->adpcm_end);
+ state_save_register_global_array(machine, state->adpcm_idle);
+ state_save_register_global_array(machine, state->adpcm_data);
}
static MACHINE_RESET( ddragon )
{
- dd_sub_cpu_busy = 1;
- adpcm_pos[0] = adpcm_pos[1] = 0;
- adpcm_end[0] = adpcm_end[1] = 0;
- adpcm_idle[0] = adpcm_idle[1] = 1;
- adpcm_data[0] = adpcm_data[1] = -1;
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
+
+ state->dd_sub_cpu_busy = 1;
+ state->adpcm_pos[0] = state->adpcm_pos[1] = 0;
+ state->adpcm_end[0] = state->adpcm_end[1] = 0;
+ state->adpcm_idle[0] = state->adpcm_idle[1] = 1;
+ state->adpcm_data[0] = state->adpcm_data[1] = -1;
+ state->scrollx_hi = 0;
+ state->scrolly_hi = 0;
}
@@ -203,16 +190,17 @@ static MACHINE_RESET( ddragon )
static WRITE8_HANDLER( ddragon_bankswitch_w )
{
- ddragon_scrollx_hi = ((data & 0x01) << 8);
- ddragon_scrolly_hi = ((data & 0x02) << 7);
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+ state->scrollx_hi = (data & 0x01);
+ state->scrolly_hi = ((data & 0x02) >> 1);
flip_screen_set(space->machine, ~data & 0x04);
/* bit 3 unknown */
if (data & 0x10)
- dd_sub_cpu_busy = 0;
- else if (dd_sub_cpu_busy == 0)
- cputag_set_input_line(space->machine, "sub", sprite_irq, (sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
+ state->dd_sub_cpu_busy = 0;
+ else if (state->dd_sub_cpu_busy == 0)
+ cputag_set_input_line(space->machine, "sub", state->sprite_irq, (state->sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
memory_set_bank(space->machine, 1, (data & 0xe0) >> 5);
}
@@ -220,8 +208,9 @@ static WRITE8_HANDLER( ddragon_bankswitch_w )
static WRITE8_HANDLER( toffy_bankswitch_w )
{
- ddragon_scrollx_hi = ((data & 0x01) << 8);
- ddragon_scrolly_hi = ((data & 0x02) << 7);
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+ state->scrollx_hi = (data & 0x01);
+ state->scrolly_hi = ((data & 0x02) >> 1);
// flip_screen_set(space->machine, ~data & 0x04);
@@ -234,6 +223,7 @@ static WRITE8_HANDLER( toffy_bankswitch_w )
static READ8_HANDLER( darktowr_mcu_bank_r )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
// logerror("BankRead %05x %08x\n",cpu_get_pc(space->cpu),offset);
/* Horrible hack - the alternate TStrike set is mismatched against the MCU,
@@ -249,11 +239,11 @@ static READ8_HANDLER( darktowr_mcu_bank_r )
return 0x63;
/* Just return whatever the code is expecting */
- return rambase[0xbe1];
+ return state->rambase[0xbe1];
}
if (offset == 0x1401 || offset == 1)
- return darktowr_mcu_ports[0];
+ return state->darktowr_mcu_ports[0];
logerror("Unmapped mcu bank read %04x\n",offset);
return 0xff;
@@ -262,11 +252,12 @@ static READ8_HANDLER( darktowr_mcu_bank_r )
static WRITE8_HANDLER( darktowr_mcu_bank_w )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
logerror("BankWrite %05x %08x %08x\n", cpu_get_pc(space->cpu), offset, data);
if (offset == 0x1400 || offset == 0)
{
- darktowr_mcu_ports[1] = BITSWAP8(data,0,1,2,3,4,5,6,7);
+ state->darktowr_mcu_ports[1] = BITSWAP8(data,0,1,2,3,4,5,6,7);
logerror("MCU PORT 1 -> %04x (from %04x)\n", BITSWAP8(data,0,1,2,3,4,5,6,7), data);
}
}
@@ -274,20 +265,21 @@ static WRITE8_HANDLER( darktowr_mcu_bank_w )
static WRITE8_HANDLER( darktowr_bankswitch_w )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
int oldbank = memory_get_bank(space->machine, 1);
int newbank = (data & 0xe0) >> 5;
- ddragon_scrollx_hi = ((data & 0x01) << 8);
- ddragon_scrolly_hi = ((data & 0x02) << 7);
+ state->scrollx_hi = (data & 0x01);
+ state->scrolly_hi = ((data & 0x02) >> 1);
// flip_screen_set(space->machine, ~data & 0x04);
/* bit 3 unknown */
if (data & 0x10)
- dd_sub_cpu_busy = 0;
- else if (dd_sub_cpu_busy == 0)
- cputag_set_input_line(space->machine, "sub", sprite_irq, (sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
+ state->dd_sub_cpu_busy = 0;
+ else if (state->dd_sub_cpu_busy == 0)
+ cputag_set_input_line(space->machine, "sub", state->sprite_irq, (state->sprite_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
memory_set_bank(space->machine, 1, newbank);
if (newbank == 4 && oldbank != 4)
@@ -306,6 +298,7 @@ static WRITE8_HANDLER( darktowr_bankswitch_w )
static WRITE8_HANDLER( ddragon_interrupt_w )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
switch (offset)
{
case 0: /* 380b - NMI ack */
@@ -322,7 +315,7 @@ static WRITE8_HANDLER( ddragon_interrupt_w )
case 3: /* 380e - SND irq */
soundlatch_w(space, 0, data);
- cpu_set_input_line(snd_cpu, sound_irq, (sound_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
+ cpu_set_input_line(state->snd_cpu, state->sound_irq, (state->sound_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
break;
case 4: /* 380f - ? */
@@ -334,7 +327,8 @@ static WRITE8_HANDLER( ddragon_interrupt_w )
static WRITE8_HANDLER( ddragon2_sub_irq_ack_w )
{
- cputag_set_input_line(space->machine, "sub", sprite_irq, CLEAR_LINE );
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+ cputag_set_input_line(space->machine, "sub", state->sprite_irq, CLEAR_LINE );
}
@@ -344,9 +338,10 @@ static WRITE8_HANDLER( ddragon2_sub_irq_w )
}
-static void irq_handler(const device_config *device, int irq)
+static void irq_handler( const device_config *device, int irq )
{
- cpu_set_input_line(snd_cpu, ym_irq , irq ? ASSERT_LINE : CLEAR_LINE );
+ ddragon_state *state = (ddragon_state *)device->machine->driver_data;
+ cpu_set_input_line(state->snd_cpu, state->ym_irq , irq ? ASSERT_LINE : CLEAR_LINE );
}
@@ -359,14 +354,16 @@ static void irq_handler(const device_config *device, int irq)
static CUSTOM_INPUT( sub_cpu_busy )
{
- return dd_sub_cpu_busy;
+ ddragon_state *state = (ddragon_state *)field->port->machine->driver_data;
+ return state->dd_sub_cpu_busy;
}
static WRITE8_HANDLER( darktowr_mcu_w )
{
- logerror("McuWrite %05x %08x %08x\n",cpu_get_pc(space->cpu),offset,data);
- darktowr_mcu_ports[offset]=data;
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+ logerror("McuWrite %05x %08x %08x\n",cpu_get_pc(space->cpu), offset, data);
+ state->darktowr_mcu_ports[offset] = data;
}
@@ -379,6 +376,8 @@ static READ8_HANDLER( ddragon_hd63701_internal_registers_r )
static WRITE8_HANDLER( ddragon_hd63701_internal_registers_w )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+
/* I don't know why port 0x17 is used.. Doesn't seem to be a standard MCU port */
if (offset == 0x17)
{
@@ -388,7 +387,7 @@ static WRITE8_HANDLER( ddragon_hd63701_internal_registers_w )
if (data & 3)
{
cputag_set_input_line(space->machine, "maincpu", M6809_IRQ_LINE, ASSERT_LINE);
- cputag_set_input_line(space->machine, "sub", sprite_irq, CLEAR_LINE);
+ cputag_set_input_line(space->machine, "sub", state->sprite_irq, CLEAR_LINE);
}
}
}
@@ -403,20 +402,24 @@ static WRITE8_HANDLER( ddragon_hd63701_internal_registers_w )
static READ8_HANDLER( ddragon_spriteram_r )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+
/* Double Dragon crash fix - see notes above */
- if (offset == 0x49 && cpu_get_pc(space->cpu) == 0x6261 && ddragon_spriteram[offset] == 0x1f)
+ if (offset == 0x49 && cpu_get_pc(space->cpu) == 0x6261 && state->spriteram[offset] == 0x1f)
return 0x1;
- return ddragon_spriteram[offset];
+ return state->spriteram[offset];
}
static WRITE8_HANDLER( ddragon_spriteram_w )
{
- if (space->cpu == cputag_get_cpu(space->machine, "sub") && offset == 0)
- dd_sub_cpu_busy = 1;
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
- ddragon_spriteram[offset] = data;
+ if (space->cpu == state->sub_cpu && offset == 0)
+ state->dd_sub_cpu_busy = 1;
+
+ state->spriteram[offset] = data;
}
@@ -429,58 +432,62 @@ static WRITE8_HANDLER( ddragon_spriteram_w )
static WRITE8_HANDLER( dd_adpcm_w )
{
- const device_config *adpcm = devtag_get_device(space->machine, (offset & 1) ? "adpcm2" : "adpcm1");
- int chip = (strcmp(adpcm->tag, "adpcm1") == 0) ? 0 : 1;
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+ const device_config *adpcm = (offset & 1) ? state->adpcm_2 : state->adpcm_1;
+ int chip = (adpcm == state->adpcm_1) ? 0 : 1;
- switch (offset/2)
+ switch (offset / 2)
{
case 3:
- adpcm_idle[chip] = 1;
- msm5205_reset_w(adpcm,1);
+ state->adpcm_idle[chip] = 1;
+ msm5205_reset_w(adpcm, 1);
break;
case 2:
- adpcm_pos[chip] = (data & 0x7f) * 0x200;
+ state->adpcm_pos[chip] = (data & 0x7f) * 0x200;
break;
case 1:
- adpcm_end[chip] = (data & 0x7f) * 0x200;
+ state->adpcm_end[chip] = (data & 0x7f) * 0x200;
break;
case 0:
- adpcm_idle[chip] = 0;
- msm5205_reset_w(adpcm,0);
+ state->adpcm_idle[chip] = 0;
+ msm5205_reset_w(adpcm, 0);
break;
}
}
-static void dd_adpcm_int(const device_config *device)
+static void dd_adpcm_int( const device_config *device )
{
- int chip = (strcmp(device->tag, "adpcm1") == 0) ? 0 : 1;
- if (adpcm_pos[chip] >= adpcm_end[chip] || adpcm_pos[chip] >= 0x10000)
+ ddragon_state *state = (ddragon_state *)device->machine->driver_data;
+ int chip = (device == state->adpcm_1) ? 0 : 1;
+
+ if (state->adpcm_pos[chip] >= state->adpcm_end[chip] || state->adpcm_pos[chip] >= 0x10000)
{
- adpcm_idle[chip] = 1;
- msm5205_reset_w(device,1);
+ state->adpcm_idle[chip] = 1;
+ msm5205_reset_w(device, 1);
}
- else if (adpcm_data[chip] != -1)
+ else if (state->adpcm_data[chip] != -1)
{
- msm5205_data_w(device, adpcm_data[chip] & 0x0f);
- adpcm_data[chip] = -1;
+ msm5205_data_w(device, state->adpcm_data[chip] & 0x0f);
+ state->adpcm_data[chip] = -1;
}
else
{
UINT8 *ROM = memory_region(device->machine, "adpcm") + 0x10000 * chip;
- adpcm_data[chip] = ROM[adpcm_pos[chip]++];
- msm5205_data_w(device,adpcm_data[chip] >> 4);
+ state->adpcm_data[chip] = ROM[state->adpcm_pos[chip]++];
+ msm5205_data_w(device, state->adpcm_data[chip] >> 4);
}
}
static READ8_HANDLER( dd_adpcm_status_r )
{
- return adpcm_idle[0] + (adpcm_idle[1] << 1);
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
+ return state->adpcm_idle[0] + (state->adpcm_idle[1] << 1);
}
@@ -492,21 +499,21 @@ static READ8_HANDLER( dd_adpcm_status_r )
*************************************/
static ADDRESS_MAP_START( ddragon_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&rambase)
+ AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_MEMBER(ddragon_state, rambase)
AM_RANGE(0x1000, 0x11ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram)
AM_RANGE(0x1200, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2)
AM_RANGE(0x1400, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram)
- AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(&ddragon_spriteram)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE_MEMBER(ddragon_state, fgvideoram)
+ AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE_MEMBER(ddragon_state, spriteram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE_MEMBER(ddragon_state, bgvideoram)
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1")
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2")
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("EXTRA")
AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW0")
AM_RANGE(0x3804, 0x3804) AM_READ_PORT("DSW1")
AM_RANGE(0x3808, 0x3808) AM_WRITE(ddragon_bankswitch_w)
- AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo)
- AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo)
+ AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(ddragon_state, scrollx_lo)
+ AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(ddragon_state, scrolly_lo)
AM_RANGE(0x380b, 0x380f) AM_WRITE(ddragon_interrupt_w)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
AM_RANGE(0x8000, 0xffff) AM_ROM
@@ -515,17 +522,17 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dd2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
- AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram)
- AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(&ddragon_spriteram)
- AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram)
+ AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE_MEMBER(ddragon_state, fgvideoram)
+ AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE_MEMBER(ddragon_state, spriteram)
+ AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE_MEMBER(ddragon_state, bgvideoram)
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1")
AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2")
AM_RANGE(0x3802, 0x3802) AM_READ_PORT("EXTRA")
AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW0")
AM_RANGE(0x3804, 0x3804) AM_READ_PORT("DSW1")
AM_RANGE(0x3808, 0x3808) AM_WRITE(ddragon_bankswitch_w)
- AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo)
- AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo)
+ AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(ddragon_state, scrollx_lo)
+ AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(ddragon_state, scrolly_lo)
AM_RANGE(0x380b, 0x380f) AM_WRITE(ddragon_interrupt_w)
AM_RANGE(0x3c00, 0x3dff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram)
AM_RANGE(0x3e00, 0x3fff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2)
@@ -566,8 +573,9 @@ ADDRESS_MAP_END
/* might not be 100% accurate, check bits written */
static WRITE8_HANDLER( ddragnba_port_w )
{
+ ddragon_state *state = (ddragon_state *)space->machine->driver_data;
cputag_set_input_line(space->machine, "maincpu", M6809_IRQ_LINE, ASSERT_LINE);
- cputag_set_input_line(space->machine, "sub", sprite_irq, CLEAR_LINE );
+ cputag_set_input_line(space->machine, "sub", state->sprite_irq, CLEAR_LINE );
}
static ADDRESS_MAP_START( ddragnba_sub_portmap, ADDRESS_SPACE_IO, 8 )
@@ -610,7 +618,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
- AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE(darktowr_mcu_w) AM_BASE(&darktowr_mcu_ports)
+ AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE(darktowr_mcu_w) AM_BASE_MEMBER(ddragon_state, darktowr_mcu_ports)
AM_RANGE(0x0008, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
@@ -965,6 +973,9 @@ static const msm5205_interface msm5205_config =
static MACHINE_DRIVER_START( ddragon )
+ /* driver data */
+ MDRV_DRIVER_DATA(ddragon_state)
+
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
MDRV_CPU_PROGRAM_MAP(ddragon_map)
@@ -1031,6 +1042,9 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ddgn6809 )
+ /* driver data */
+ MDRV_DRIVER_DATA(ddragon_state)
+
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
MDRV_CPU_PROGRAM_MAP(ddragon_map)
@@ -1078,6 +1092,9 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ddragon2 )
+ /* driver data */
+ MDRV_DRIVER_DATA(ddragon_state)
+
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
MDRV_CPU_PROGRAM_MAP(dd2_map)
@@ -1943,40 +1960,44 @@ ROM_END
static DRIVER_INIT( ddragon )
{
- sprite_irq = INPUT_LINE_NMI;
- sound_irq = M6809_IRQ_LINE;
- ym_irq = M6809_FIRQ_LINE;
- technos_video_hw = 0;
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
+ state->sprite_irq = INPUT_LINE_NMI;
+ state->sound_irq = M6809_IRQ_LINE;
+ state->ym_irq = M6809_FIRQ_LINE;
+ state->technos_video_hw = 0;
}
static DRIVER_INIT( ddragon2 )
{
- sprite_irq = INPUT_LINE_NMI;
- sound_irq = INPUT_LINE_NMI;
- ym_irq = 0;
- technos_video_hw = 2;
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
+ state->sprite_irq = INPUT_LINE_NMI;
+ state->sound_irq = INPUT_LINE_NMI;
+ state->ym_irq = 0;
+ state->technos_video_hw = 2;
}
static DRIVER_INIT( darktowr )
{
- sprite_irq = INPUT_LINE_NMI;
- sound_irq = M6809_IRQ_LINE;
- ym_irq = M6809_FIRQ_LINE;
- technos_video_hw = 0;
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
+ state->sprite_irq = INPUT_LINE_NMI;
+ state->sound_irq = M6809_IRQ_LINE;
+ state->ym_irq = M6809_FIRQ_LINE;
+ state->technos_video_hw = 0;
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x3808, 0x3808, 0, 0, darktowr_bankswitch_w);
}
static DRIVER_INIT( toffy )
{
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
int i, length;
UINT8 *rom;
- sound_irq = M6809_IRQ_LINE;
- ym_irq = M6809_FIRQ_LINE;
- technos_video_hw = 0;
+ state->sound_irq = M6809_IRQ_LINE;
+ state->ym_irq = M6809_FIRQ_LINE;
+ state->technos_video_hw = 0;
memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x3808, 0x3808, 0, 0, toffy_bankswitch_w);
/* the program rom has a simple bitswap encryption */
@@ -2011,12 +2032,13 @@ static DRIVER_INIT( toffy )
static DRIVER_INIT( ddgn6809 )
{
+ ddragon_state *state = (ddragon_state *)machine->driver_data;
/* Descramble GFX here */
- sprite_irq = INPUT_LINE_NMI;
- sound_irq = M6809_IRQ_LINE;
- ym_irq = M6809_FIRQ_LINE;
- technos_video_hw = 0;
+ state->sprite_irq = INPUT_LINE_NMI;
+ state->sound_irq = M6809_IRQ_LINE;
+ state->ym_irq = M6809_FIRQ_LINE;
+ state->technos_video_hw = 0;
}
/*************************************