diff --git a/src/emu/machine.c b/src/emu/machine.c index 6f8c9778214..93a75a40145 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -174,7 +174,6 @@ running_machine::running_machine(const game_driver &driver, const machine_config generic_video_data(NULL), generic_audio_data(NULL), m_debug_view(NULL), - driver_data(NULL), m_logerror_list(NULL), m_scheduler(*this), m_options(options), @@ -190,7 +189,8 @@ running_machine::running_machine(const game_driver &driver, const machine_config m_saveload_schedule(SLS_NONE), m_saveload_schedule_time(attotime_zero), m_saveload_searchpath(NULL), - m_rand_seed(0x9d14abd7) + m_rand_seed(0x9d14abd7), + m_driver_data(NULL) { memset(gfx, 0, sizeof(gfx)); memset(&generic, 0, sizeof(generic)); @@ -202,7 +202,7 @@ running_machine::running_machine(const game_driver &driver, const machine_config // allocate the driver data (after devices) if (m_config.m_driver_data_alloc != NULL) - driver_data = (*m_config.m_driver_data_alloc)(*this); + m_driver_data = (*m_config.m_driver_data_alloc)(*this); // find devices primary_screen = screen_first(*this); @@ -965,6 +965,30 @@ running_machine::logerror_callback_item::logerror_callback_item(logerror_callbac +//************************************************************************** +// DRIVER DATA +//************************************************************************** + +//------------------------------------------------- +// driver_data_t - constructor +//------------------------------------------------- + +driver_data_t::driver_data_t(running_machine &machine) + : m_machine(machine) +{ +} + + +//------------------------------------------------- +// driver_data_t - destructor +//------------------------------------------------- + +driver_data_t::~driver_data_t() +{ +} + + + //************************************************************************** // SYSTEM TIME //************************************************************************** diff --git a/src/emu/machine.h b/src/emu/machine.h index 158ce49257e..9cb5dd91fbd 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -157,6 +157,17 @@ typedef struct _generic_audio_private generic_audio_private; typedef tagged_list region_list; +// base class for all driver data structures +class driver_data_t +{ +public: + driver_data_t(running_machine &machine); + virtual ~driver_data_t(); + + running_machine & m_machine; +}; + + // memory region class region_info { @@ -231,6 +242,7 @@ struct generic_pointers }; +// system time description, both local and UTC class system_time { public: @@ -385,7 +397,8 @@ public: debug_view_manager * m_debug_view; // internal data from debugvw.c // driver-specific information - void * driver_data; // drivers can hang data off of here instead of using globals + template + T *driver_data() const { return downcast(m_driver_data); } private: void start(); @@ -448,6 +461,8 @@ private: // base time time_t m_base_time; + + driver_data_t * m_driver_data; // drivers can hang data off of here instead of using globals }; diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 069a8fb2622..4180746515f 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -106,6 +106,8 @@ #define video_update_0 NULL +class driver_data_t; + typedef void (*nvram_handler_func)(running_machine *machine, mame_file *file, int read_or_write); typedef void (*memcard_handler_func)(running_machine *machine, mame_file *file, int action); typedef void (*machine_start_func)(running_machine *machine); @@ -117,7 +119,7 @@ typedef void (*video_reset_func)(running_machine *machine); typedef void (*palette_init_func)(running_machine *machine, const UINT8 *color_prom); typedef void (*video_eof_func)(running_machine *machine); typedef UINT32 (*video_update_func)(device_t *screen, bitmap_t *bitmap, const rectangle *cliprect); -typedef void * (*driver_data_alloc_func)(running_machine &machine); +typedef driver_data_t *(*driver_data_alloc_func)(running_machine &machine); diff --git a/src/emu/memory.c b/src/emu/memory.c index df17b79e796..be350dd7a34 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -2072,13 +2072,13 @@ static void memory_init_locate(running_machine *machine) if (entry->m_baseptr != NULL) *entry->m_baseptr = entry->m_memory; if (entry->m_baseptroffs_plus1 != 0) - *(void **)((UINT8 *)machine->driver_data + entry->m_baseptroffs_plus1 - 1) = entry->m_memory; + *(void **)(reinterpret_cast(machine->driver_data()) + entry->m_baseptroffs_plus1 - 1) = entry->m_memory; if (entry->m_genbaseptroffs_plus1 != 0) *(void **)((UINT8 *)&machine->generic + entry->m_genbaseptroffs_plus1 - 1) = entry->m_memory; if (entry->m_sizeptr != NULL) *entry->m_sizeptr = entry->m_byteend - entry->m_bytestart + 1; if (entry->m_sizeptroffs_plus1 != 0) - *(size_t *)((UINT8 *)machine->driver_data + entry->m_sizeptroffs_plus1 - 1) = entry->m_byteend - entry->m_bytestart + 1; + *(size_t *)(reinterpret_cast(machine->driver_data()) + entry->m_sizeptroffs_plus1 - 1) = entry->m_byteend - entry->m_bytestart + 1; if (entry->m_gensizeptroffs_plus1 != 0) *(size_t *)((UINT8 *)&machine->generic + entry->m_gensizeptroffs_plus1 - 1) = entry->m_byteend - entry->m_bytestart + 1; } diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c index 49ed177905f..1c69251d2c1 100644 --- a/src/mame/audio/8080bw.c +++ b/src/mame/audio/8080bw.c @@ -16,7 +16,7 @@ MACHINE_START( extra_8080bw_sh ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state_save_register_global(machine, state->port_1_last_extra); state_save_register_global(machine, state->port_2_last_extra); @@ -31,7 +31,7 @@ MACHINE_START( extra_8080bw_sh ) WRITE8_HANDLER( invadpt2_sh_port_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; sn76477_enable_w(state->sn, !(data & 0x01)); /* SAUCER SOUND */ @@ -58,7 +58,7 @@ WRITE8_HANDLER( invadpt2_sh_port_2_w ) D2 = 82K D3 = 100K */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 4, 3, 0); /* FLEET */ @@ -81,7 +81,7 @@ WRITE8_HANDLER( invadpt2_sh_port_2_w ) WRITE8_HANDLER( spcewars_sh_port_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; sn76477_enable_w(state->sn, !(data & 0x01)); /* Saucer Sound */ @@ -125,7 +125,7 @@ const samples_interface lrescue_samples_interface = WRITE8_HANDLER( lrescue_sh_port_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 0, 3, 0); /* Thrust */ @@ -143,7 +143,7 @@ WRITE8_HANDLER( lrescue_sh_port_1_w ) WRITE8_HANDLER( lrescue_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 1, 8, 0); /* Footstep high tone */ @@ -183,7 +183,7 @@ WRITE8_HANDLER( cosmo_sh_port_2_w ) WRITE8_HANDLER( ballbomb_sh_port_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 1, 2, 0); /* Hit a balloon */ @@ -201,7 +201,7 @@ WRITE8_HANDLER( ballbomb_sh_port_1_w ) WRITE8_HANDLER( ballbomb_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last_extra; if (data & 0x01) sample_start(state->samples, 0, 7, 0); /* Indicates plane will drop bombs */ @@ -260,7 +260,7 @@ DISCRETE_SOUND_END WRITE8_HANDLER( indianbt_sh_port_1_w ) { /* bit 4 occurs every 5.25 seconds during gameplay */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 1, 7, 0); /* Death */ @@ -277,7 +277,7 @@ WRITE8_HANDLER( indianbt_sh_port_1_w ) WRITE8_HANDLER( indianbt_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 4, 0, 0); /* Bird dropped an egg, Lasso used */ @@ -633,7 +633,7 @@ WRITE8_DEVICE_HANDLER( polaris_sh_port_2_w ) WRITE8_DEVICE_HANDLER( polaris_sh_port_3_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); coin_lockout_global_w(device->machine, data & 0x04); /* SX8 */ @@ -787,7 +787,7 @@ static const double schaser_effect_rc[8] = WRITE8_HANDLER( schaser_sh_port_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); int effect; /* bit 0 - Dot Sound Enable (SX0) @@ -860,7 +860,7 @@ WRITE8_HANDLER( schaser_sh_port_2_w ) bit 4 - Field Control B (SX10) bit 5 - Flip Screen */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); //printf( "schaser_sh_port_2_w: %02x\n", data ); @@ -882,7 +882,7 @@ WRITE8_HANDLER( schaser_sh_port_2_w ) static TIMER_CALLBACK( schaser_effect_555_cb ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); int effect = param; attotime new_time; /* Toggle 555 output */ @@ -907,7 +907,7 @@ static TIMER_CALLBACK( schaser_effect_555_cb ) static STATE_POSTLOAD( schaser_reinit_555_time_remain ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); state->schaser_effect_555_time_remain = double_to_attotime(state->schaser_effect_555_time_remain_savable); schaser_sh_port_2_w(space, 0, state->port_2_last_extra); @@ -916,7 +916,7 @@ static STATE_POSTLOAD( schaser_reinit_555_time_remain ) MACHINE_START( schaser_sh ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state->schaser_effect_555_timer = timer_alloc(machine, schaser_effect_555_cb, NULL); @@ -930,7 +930,7 @@ MACHINE_START( schaser_sh ) MACHINE_RESET( schaser_sh ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); state->schaser_effect_555_is_low = 0; @@ -950,7 +950,7 @@ MACHINE_RESET( schaser_sh ) WRITE8_HANDLER( rollingc_sh_port_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_3_last_extra; if (rising_bits & 0x02) sample_start(state->samples, 4, 0, 0); /* Steering */ @@ -974,7 +974,7 @@ WRITE8_HANDLER( rollingc_sh_port_w ) WRITE8_HANDLER( invrvnge_sh_port_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); switch (data) { @@ -1019,7 +1019,7 @@ WRITE8_HANDLER( invrvnge_sh_port_w ) WRITE8_HANDLER( lupin3_sh_port_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 0, 6, 0); /* Walking, get money */ @@ -1035,7 +1035,7 @@ WRITE8_HANDLER( lupin3_sh_port_1_w ) WRITE8_HANDLER( lupin3_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 0, 3, 0); /* Lands on top of building, wife kicks man */ @@ -1064,7 +1064,7 @@ WRITE8_HANDLER( schasercv_sh_port_1_w ) bit 3 = 1st speedup Death is a stream of ff's with some fe's thrown in */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x02) sample_start(state->samples, 1, 6, 0); /* Ran over a dot */ @@ -1075,7 +1075,7 @@ WRITE8_HANDLER( schasercv_sh_port_1_w ) WRITE8_HANDLER( schasercv_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); speaker_level_w(state->speaker, (data & 0x01) ? 1 : 0); /* End-of-Level */ @@ -1092,7 +1092,7 @@ WRITE8_HANDLER( schasercv_sh_port_2_w ) WRITE8_HANDLER( yosakdon_sh_port_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 0, 3, 0); /* Game Over */ @@ -1108,7 +1108,7 @@ WRITE8_HANDLER( yosakdon_sh_port_1_w ) WRITE8_HANDLER( yosakdon_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 1, 6, 0); /* Ready? , Game Over */ @@ -1132,7 +1132,7 @@ WRITE8_HANDLER( yosakdon_sh_port_2_w ) WRITE8_HANDLER( shuttlei_sh_port_1_w ) { /* bit 3 is high while you are alive and playing */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last_extra; if (rising_bits & 0x01) sample_start(state->samples, 4, 4, 0); /* Fleet move */ @@ -1145,7 +1145,7 @@ WRITE8_HANDLER( shuttlei_sh_port_1_w ) WRITE8_HANDLER( shuttlei_sh_port_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); switch (data) { diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c index 94b774bf963..ec8503a634f 100644 --- a/src/mame/audio/astrof.c +++ b/src/mame/audio/astrof.c @@ -34,7 +34,7 @@ WRITE8_HANDLER( astrof_audio_1_w ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last; if (state->astrof_death_playing) @@ -80,7 +80,7 @@ WRITE8_HANDLER( astrof_audio_1_w ) WRITE8_HANDLER( astrof_audio_2_w ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last; /* D0-D2 - explosion select (triggered by D2 of the other port */ @@ -184,7 +184,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( tomahawk_audio_w ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); /* D0 - sonar */ diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 159fddda10f..a7d1084ae8a 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -203,7 +203,7 @@ void atarijsa_reset(void) static READ8_HANDLER( jsa1_io_r ) { - atarigen_state *atarigen = (atarigen_state *)space->machine->driver_data; + atarigen_state *atarigen = space->machine->driver_data(); int result = 0xff; switch (offset & 0x206) @@ -333,7 +333,7 @@ static WRITE8_HANDLER( jsa1_io_w ) static READ8_HANDLER( jsa2_io_r ) { - atarigen_state *atarigen = (atarigen_state *)space->machine->driver_data; + atarigen_state *atarigen = space->machine->driver_data(); int result = 0xff; switch (offset & 0x206) @@ -458,7 +458,7 @@ static WRITE8_HANDLER( jsa2_io_w ) static READ8_HANDLER( jsa3_io_r ) { - atarigen_state *atarigen = (atarigen_state *)space->machine->driver_data; + atarigen_state *atarigen = space->machine->driver_data(); int result = 0xff; switch (offset & 0x206) @@ -592,7 +592,7 @@ static WRITE8_HANDLER( jsa3_io_w ) static READ8_HANDLER( jsa3s_io_r ) { - atarigen_state *atarigen = (atarigen_state *)space->machine->driver_data; + atarigen_state *atarigen = space->machine->driver_data(); int result = 0xff; switch (offset & 0x206) diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c index 02bc9966b78..6326ff99eb6 100644 --- a/src/mame/audio/circus.c +++ b/src/mame/audio/circus.c @@ -172,7 +172,7 @@ DISCRETE_SOUND_END WRITE8_HANDLER( circus_clown_z_w ) { - circus_state *state = (circus_state *)space->machine->driver_data; + circus_state *state = space->machine->driver_data(); state->clown_z = (data & 0x0f); *(memory_region(space->machine, "maincpu") + 0x8000) = data; logerror("Z:%02x\n",data); //DEBUG diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index 526d2138abf..159799bb8c4 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -17,7 +17,7 @@ static void update_sound_68k_interrupts(running_machine *machine); void cyberbal_sound_reset(running_machine *machine) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; + cyberbal_state *state = machine->driver_data(); /* reset the sound system */ state->bank_base = &memory_region(machine, "audiocpu")[0x10000]; @@ -37,18 +37,18 @@ void cyberbal_sound_reset(running_machine *machine) READ8_HANDLER( cyberbal_special_port3_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "JSAII"); if (!(input_port_read(space->machine, "IN0") & 0x8000)) temp ^= 0x80; - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x40; - if (state->atarigen.sound_to_cpu_ready) temp ^= 0x20; + if (state->cpu_to_sound_ready) temp ^= 0x40; + if (state->sound_to_cpu_ready) temp ^= 0x20; return temp; } READ8_HANDLER( cyberbal_sound_6502_stat_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); int temp = 0xff; if (state->sound_data_from_6502_ready) temp ^= 0x80; if (state->sound_data_from_68k_ready) temp ^= 0x40; @@ -58,7 +58,7 @@ READ8_HANDLER( cyberbal_sound_6502_stat_r ) WRITE8_HANDLER( cyberbal_sound_bank_select_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); memory_set_bankptr(space->machine, "soundbank", &state->bank_base[0x1000 * ((data >> 6) & 3)]); coin_counter_w(space->machine, 1, (data >> 5) & 1); coin_counter_w(space->machine, 0, (data >> 4) & 1); @@ -69,7 +69,7 @@ WRITE8_HANDLER( cyberbal_sound_bank_select_w ) READ8_HANDLER( cyberbal_sound_68k_6502_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); state->sound_data_from_68k_ready = 0; return state->sound_data_from_68k; } @@ -77,7 +77,7 @@ READ8_HANDLER( cyberbal_sound_68k_6502_r ) WRITE8_HANDLER( cyberbal_sound_68k_6502_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); state->sound_data_from_6502 = data; state->sound_data_from_6502_ready = 1; @@ -99,7 +99,7 @@ WRITE8_HANDLER( cyberbal_sound_68k_6502_w ) static void update_sound_68k_interrupts(running_machine *machine) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; + cyberbal_state *state = machine->driver_data(); cputag_set_input_line(machine, "dac", 6, state->fast_68k_int ? ASSERT_LINE : CLEAR_LINE); cputag_set_input_line(machine, "dac", 2, state->io_68k_int ? ASSERT_LINE : CLEAR_LINE); } @@ -107,7 +107,7 @@ static void update_sound_68k_interrupts(running_machine *machine) INTERRUPT_GEN( cyberbal_sound_68k_irq_gen ) { - cyberbal_state *state = (cyberbal_state *)device->machine->driver_data; + cyberbal_state *state = device->machine->driver_data(); if (!state->fast_68k_int) { state->fast_68k_int = 1; @@ -118,7 +118,7 @@ INTERRUPT_GEN( cyberbal_sound_68k_irq_gen ) WRITE16_HANDLER( cyberbal_io_68k_irq_ack_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); if (state->io_68k_int) { state->io_68k_int = 0; @@ -129,7 +129,7 @@ WRITE16_HANDLER( cyberbal_io_68k_irq_ack_w ) READ16_HANDLER( cyberbal_sound_68k_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); int temp = (state->sound_data_from_6502 << 8) | 0xff; state->sound_data_from_6502_ready = 0; @@ -142,7 +142,7 @@ READ16_HANDLER( cyberbal_sound_68k_r ) WRITE16_HANDLER( cyberbal_sound_68k_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { state->sound_data_from_68k = (data >> 8) & 0xff; @@ -153,7 +153,7 @@ WRITE16_HANDLER( cyberbal_sound_68k_w ) WRITE16_HANDLER( cyberbal_sound_68k_dac_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); running_device *dac = space->machine->device((offset & 8) ? "dac2" : "dac1"); dac_data_16_w(dac, (((data >> 3) & 0x800) | ((data >> 2) & 0x7ff)) << 4); diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index 9dd88520780..a791a412f37 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -1066,7 +1066,7 @@ DISCRETE_SOUND_END static SOUND_START( dkong) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); state->snd_rom = memory_region(machine, "soundcpu"); } @@ -1196,7 +1196,7 @@ static READ8_DEVICE_HANDLER( dkong_voice_status_r ) static READ8_DEVICE_HANDLER( dkong_tune_r ) { - dkong_state *state = (dkong_state *)device->machine->driver_data; + dkong_state *state = device->machine->driver_data(); UINT8 page = latch8_r(state->dev_vp2,0) & 0x47; if ( page & 0x40 ) diff --git a/src/mame/audio/gotya.c b/src/mame/audio/gotya.c index 77afd0681ad..0504d69fc73 100644 --- a/src/mame/audio/gotya.c +++ b/src/mame/audio/gotya.c @@ -41,7 +41,7 @@ static const struct gotya_sample gotya_samples[] = WRITE8_HANDLER( gotya_soundlatch_w ) { - gotya_state *state = (gotya_state *)space->machine->driver_data; + gotya_state *state = space->machine->driver_data(); int sample_number; if (data == 0) diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c index f892fa24aaa..1001e082917 100644 --- a/src/mame/audio/harddriv.c +++ b/src/mame/audio/harddriv.c @@ -23,7 +23,7 @@ void hdsnd_init(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); state->rombase = (UINT8 *)memory_region(machine, "serialroms"); state->romsize = memory_region_length(machine, "serialroms"); } @@ -38,7 +38,7 @@ void hdsnd_init(running_machine *machine) static void update_68k_interrupts(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); cpu_set_input_line(state->soundcpu, 1, state->mainflag ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->soundcpu, 3, state->irq68k ? ASSERT_LINE : CLEAR_LINE); } @@ -53,7 +53,7 @@ static void update_68k_interrupts(running_machine *machine) READ16_HANDLER( hd68k_snd_data_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->soundflag = 0; logerror("%06X:main read from sound=%04X\n", cpu_get_previouspc(space->cpu), state->sounddata); return state->sounddata; @@ -62,14 +62,14 @@ READ16_HANDLER( hd68k_snd_data_r ) READ16_HANDLER( hd68k_snd_status_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return (state->mainflag << 15) | (state->soundflag << 14) | 0x1fff; } static TIMER_CALLBACK( delayed_68k_w ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); state->maindata = param; state->mainflag = 1; update_68k_interrupts(machine); @@ -85,7 +85,7 @@ WRITE16_HANDLER( hd68k_snd_data_w ) WRITE16_HANDLER( hd68k_snd_reset_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); cpu_set_input_line(state->soundcpu, INPUT_LINE_RESET, ASSERT_LINE); cpu_set_input_line(state->soundcpu, INPUT_LINE_RESET, CLEAR_LINE); state->mainflag = state->soundflag = 0; @@ -103,7 +103,7 @@ WRITE16_HANDLER( hd68k_snd_reset_w ) READ16_HANDLER( hdsnd68k_data_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->mainflag = 0; update_68k_interrupts(space->machine); logerror("%06X:sound read from main=%04X\n", cpu_get_previouspc(space->cpu), state->maindata); @@ -113,7 +113,7 @@ READ16_HANDLER( hdsnd68k_data_r ) WRITE16_HANDLER( hdsnd68k_data_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sounddata); state->soundflag = 1; logerror("%06X:sound write to main=%04X\n", cpu_get_previouspc(space->cpu), data); @@ -148,7 +148,7 @@ READ16_HANDLER( hdsnd68k_status_r ) // D14 = 'Sound Flag' // D13 = Test Switch // D12 = 5220 Ready Flag (0=Ready) - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); logerror("%06X:hdsnd68k_status_r(%04X)\n", cpu_get_previouspc(space->cpu), offset); return (state->mainflag << 15) | (state->soundflag << 14) | 0x2000 | 0;//((input_port_read(space->machine, "IN0") & 0x0020) << 8) | 0; } @@ -163,7 +163,7 @@ READ16_HANDLER( hdsnd68k_status_r ) WRITE16_HANDLER( hdsnd68k_latches_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* bit 3 selects the value; data is ignored */ data = (offset >> 3) & 1; @@ -212,7 +212,7 @@ WRITE16_HANDLER( hdsnd68k_speech_w ) WRITE16_HANDLER( hdsnd68k_irqclr_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->irq68k = 0; update_68k_interrupts(space->machine); } @@ -227,21 +227,21 @@ WRITE16_HANDLER( hdsnd68k_irqclr_w ) READ16_HANDLER( hdsnd68k_320ram_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->sounddsp_ram[offset & 0xfff]; } WRITE16_HANDLER( hdsnd68k_320ram_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sounddsp_ram[offset & 0xfff]); } READ16_HANDLER( hdsnd68k_320ports_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); const address_space *iospace = cpu_get_address_space(state->sounddsp, ADDRESS_SPACE_IO); return memory_read_word(iospace, (offset & 7) << 1); } @@ -249,7 +249,7 @@ READ16_HANDLER( hdsnd68k_320ports_r ) WRITE16_HANDLER( hdsnd68k_320ports_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); const address_space *iospace = cpu_get_address_space(state->sounddsp, ADDRESS_SPACE_IO); memory_write_word(iospace, (offset & 7) << 1, data); } @@ -257,7 +257,7 @@ WRITE16_HANDLER( hdsnd68k_320ports_w ) READ16_HANDLER( hdsnd68k_320com_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->cramen) return state->comram[offset & 0x1ff]; @@ -269,7 +269,7 @@ READ16_HANDLER( hdsnd68k_320com_r ) WRITE16_HANDLER( hdsnd68k_320com_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->cramen) COMBINE_DATA(&state->comram[offset & 0x1ff]); @@ -287,7 +287,7 @@ WRITE16_HANDLER( hdsnd68k_320com_w ) READ16_HANDLER( hdsnddsp_get_bio ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT64 cycles_since_last_bio = state->sounddsp->total_cycles() - state->last_bio_cycles; INT32 cycles_until_bio = CYCLES_PER_BIO - cycles_since_last_bio; @@ -312,7 +312,7 @@ READ16_HANDLER( hdsnddsp_get_bio ) WRITE16_DEVICE_HANDLER( hdsnddsp_dac_w ) { - harddriv_state *state = (harddriv_state *)device->machine->driver_data; + harddriv_state *state = device->machine->driver_data(); /* DAC L */ if (!state->dacmute) @@ -338,7 +338,7 @@ WRITE16_HANDLER( hdsnddsp_mute_w ) WRITE16_HANDLER( hdsnddsp_gen68kirq_w ) { /* generate 68k IRQ */ - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->irq68k = 1; update_68k_interrupts(space->machine); } @@ -346,7 +346,7 @@ WRITE16_HANDLER( hdsnddsp_gen68kirq_w ) WRITE16_HANDLER( hdsnddsp_soundaddr_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (offset == 0) { /* select sound ROM block */ @@ -362,7 +362,7 @@ WRITE16_HANDLER( hdsnddsp_soundaddr_w ) READ16_HANDLER( hdsnddsp_rom_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->sound_rom_offs < state->romsize) return state->rombase[state->sound_rom_offs++] << 7; state->sound_rom_offs++; @@ -372,7 +372,7 @@ READ16_HANDLER( hdsnddsp_rom_r ) READ16_HANDLER( hdsnddsp_comram_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->comram[state->sound_rom_offs++ & 0x1ff]; } diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 61ff3366126..d4e3732a29b 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -20,7 +20,7 @@ static SOUND_START( irem_audio ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->adpcm1 = machine->device("msm1"); state->adpcm2 = machine->device("msm2"); @@ -58,7 +58,7 @@ WRITE8_HANDLER( irem_sound_cmd_w ) static WRITE8_HANDLER( m6803_port1_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->port1 = data; } @@ -66,7 +66,7 @@ static WRITE8_HANDLER( m6803_port1_w ) static WRITE8_HANDLER( m6803_port2_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); /* write latch */ if ((state->port2 & 0x01) && !(data & 0x01)) @@ -102,7 +102,7 @@ static WRITE8_HANDLER( m6803_port2_w ) static READ8_HANDLER( m6803_port1_r ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); /* PSG 0 or 1? */ if (state->port2 & 0x08) @@ -128,7 +128,7 @@ static READ8_HANDLER( m6803_port2_r ) static WRITE8_DEVICE_HANDLER( ay8910_0_portb_w ) { - irem_z80_state *state = (irem_z80_state *)device->machine->driver_data; + irem_z80_state *state = device->machine->driver_data(); /* bits 2-4 select MSM5205 clock & 3b/4b playback mode */ msm5205_playmode_w(state->adpcm1, (data >> 2) & 7); @@ -165,7 +165,7 @@ static WRITE8_HANDLER( sound_irq_ack_w ) static WRITE8_HANDLER( m52_adpcm_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); if (offset & 1) { @@ -181,7 +181,7 @@ static WRITE8_HANDLER( m52_adpcm_w ) static WRITE8_HANDLER( m62_adpcm_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); running_device *adpcm = (offset & 1) ? state->adpcm2 : state->adpcm1; if (adpcm != NULL) @@ -198,7 +198,7 @@ static WRITE8_HANDLER( m62_adpcm_w ) static void adpcm_int(running_device *device) { - irem_z80_state *state = (irem_z80_state *)device->machine->driver_data; + irem_z80_state *state = device->machine->driver_data(); cputag_set_input_line(device->machine, "iremsound", INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index 43f37a881f8..a0a5a4003ed 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -22,7 +22,7 @@ static SOUND_START( jedi ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); /* set up save state */ state_save_register_global(machine, state->audio_latch); @@ -40,7 +40,7 @@ static SOUND_START( jedi ) static SOUND_RESET( jedi ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); /* init globals */ state->audio_latch = 0; @@ -79,7 +79,7 @@ WRITE8_HANDLER( jedi_audio_reset_w ) static TIMER_CALLBACK( delayed_audio_latch_w ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); state->audio_latch = param; *state->audio_comm_stat |= 0x80; @@ -94,7 +94,7 @@ WRITE8_HANDLER( jedi_audio_latch_w ) static READ8_HANDLER( audio_latch_r ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); *state->audio_comm_stat &= ~0x80; return state->audio_latch; @@ -103,7 +103,7 @@ static READ8_HANDLER( audio_latch_r ) CUSTOM_INPUT( jedi_audio_comm_stat_r ) { - jedi_state *state = (jedi_state *)field->port->machine->driver_data; + jedi_state *state = field->port->machine->driver_data(); return *state->audio_comm_stat >> 6; } @@ -117,7 +117,7 @@ CUSTOM_INPUT( jedi_audio_comm_stat_r ) READ8_HANDLER( jedi_audio_ack_latch_r ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); *state->audio_comm_stat &= ~0x40; return state->audio_ack_latch; @@ -126,7 +126,7 @@ READ8_HANDLER( jedi_audio_ack_latch_r ) static WRITE8_HANDLER( audio_ack_latch_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); state->audio_ack_latch = data; *state->audio_comm_stat |= 0x40; @@ -142,7 +142,7 @@ static WRITE8_HANDLER( audio_ack_latch_w ) static WRITE8_HANDLER( speech_strobe_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); int new_speech_strobe_state = (~offset >> 8) & 1; if ((new_speech_strobe_state != state->speech_strobe_state) && new_speech_strobe_state) diff --git a/src/mame/audio/laserbat.c b/src/mame/audio/laserbat.c index 84880f3cca8..b6761b9824f 100644 --- a/src/mame/audio/laserbat.c +++ b/src/mame/audio/laserbat.c @@ -5,13 +5,13 @@ WRITE8_HANDLER( laserbat_csound1_w ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); state->csound1 = data; } WRITE8_HANDLER( laserbat_csound2_w ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); int ksound = 0; if (data & 0x01) diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index c04647fe446..c9cf9ff1c8b 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -450,7 +450,7 @@ DISCRETE_SOUND_END static void set_ea(const address_space *space, int ea) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); //printf("ea: %d\n", ea); //cputag_set_input_line(machine, "audiocpu", MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE); if (state->eabank != NULL) @@ -465,7 +465,7 @@ static void set_ea(const address_space *space, int ea) static SOUND_START( mario ) { - mario_state *state = (mario_state *)machine->driver_data; + mario_state *state = machine->driver_data(); running_device *audiocpu = machine->device("audiocpu"); #if USE_8039 UINT8 *SND = memory_region(machine, "audiocpu"); @@ -488,7 +488,7 @@ static SOUND_START( mario ) static SOUND_RESET( mario ) { - mario_state *state = (mario_state *)machine->driver_data; + mario_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM); #if USE_8039 @@ -567,7 +567,7 @@ static WRITE8_HANDLER( mario_sh_p2_w ) WRITE8_HANDLER( masao_sh_irqtrigger_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); if (state->last == 1 && data == 0) { @@ -600,7 +600,7 @@ WRITE8_DEVICE_HANDLER( mario_sh2_w ) /* Misc samples */ WRITE8_HANDLER( mario_sh3_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); switch (offset) { diff --git a/src/mame/audio/micro3d.c b/src/mame/audio/micro3d.c index f788ac9500d..9d72dcce281 100644 --- a/src/mame/audio/micro3d.c +++ b/src/mame/audio/micro3d.c @@ -181,7 +181,7 @@ static void recompute_filter(lp_filter *iir, double k, double q, double fc) void micro3d_noise_sh_w(running_machine *machine, UINT8 data) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); if (~data & 8) { @@ -373,7 +373,7 @@ DEVICE_GET_INFO( micro3d_sound ) WRITE8_HANDLER( micro3d_snd_dac_a ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->dac_data = data; } @@ -384,7 +384,7 @@ WRITE8_HANDLER( micro3d_snd_dac_b ) WRITE8_HANDLER( micro3d_sound_io_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->sound_port_latch[offset] = data; @@ -407,7 +407,7 @@ WRITE8_HANDLER( micro3d_sound_io_w ) READ8_HANDLER( micro3d_sound_io_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); switch (offset) { diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index 190074dda26..90d9373c05f 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -19,7 +19,7 @@ static SOUND_START( samples ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->port_1_last); @@ -165,7 +165,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( seawolf_audio_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last; /* if (data & 0x01) enable SHIP HIT sound */ @@ -231,7 +231,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( gunfight_audio_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); /* D0 and D1 are just tied to 1k resistors */ @@ -1284,7 +1284,7 @@ WRITE8_DEVICE_HANDLER( desertgu_audio_1_w ) WRITE8_DEVICE_HANDLER( desertgu_audio_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); discrete_sound_w(device, DESERTGU_ROADRUNNER_BEEP_BEEP_EN, (data >> 0) & 0x01); @@ -1593,7 +1593,7 @@ WRITE8_HANDLER( gmissile_audio_1_w ) reversed (D5=R, D7=L), but the software confirms that ours is right */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last; /* D0 and D1 are not connected */ @@ -1688,7 +1688,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( m4_audio_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last; /* D0 and D1 are not connected */ @@ -1715,7 +1715,7 @@ WRITE8_HANDLER( m4_audio_1_w ) WRITE8_HANDLER( m4_audio_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last; /* if (data & 0x01) enable LEFT PLAYER EXPLOSION sound via 510K res (goes to left speaker) */ @@ -1950,7 +1950,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( clowns_audio_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); coin_counter_w(space->machine, 0, (data >> 0) & 0x01); state->clowns_controller_select = (data >> 1) & 0x01; @@ -1961,7 +1961,7 @@ WRITE8_HANDLER( clowns_audio_1_w ) WRITE8_DEVICE_HANDLER( clowns_audio_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last; discrete_sound_w(device, CLOWNS_POP_BOTTOM_EN, (data >> 0) & 0x01); @@ -2317,7 +2317,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( spacwalk_audio_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); coin_counter_w(device->machine, 0, (data >> 0) & 0x01); @@ -3165,7 +3165,7 @@ WRITE8_DEVICE_HANDLER( spcenctr_audio_1_w ) WRITE8_DEVICE_HANDLER( spcenctr_audio_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); /* set WIND SOUND FREQ(data & 0x0f) 0, if no wind */ @@ -3181,7 +3181,7 @@ WRITE8_DEVICE_HANDLER( spcenctr_audio_2_w ) WRITE8_DEVICE_HANDLER( spcenctr_audio_3_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); /* if (data & 0x01) enable SCREECH (hit the sides) sound */ @@ -3234,7 +3234,7 @@ MACHINE_DRIVER_END WRITE8_HANDLER( phantom2_audio_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_1_last; /* if (data & 0x01) enable PLAYER SHOT sound */ @@ -3256,7 +3256,7 @@ WRITE8_HANDLER( phantom2_audio_1_w ) WRITE8_HANDLER( phantom2_audio_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 rising_bits = data & ~state->port_2_last; /* D0-D2 are not connected */ @@ -4087,7 +4087,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( invaders_audio_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); sn76477_enable_w(state->sn, (~data >> 0) & 0x01); /* saucer sound */ @@ -4104,7 +4104,7 @@ WRITE8_DEVICE_HANDLER( invaders_audio_1_w ) WRITE8_DEVICE_HANDLER( invaders_audio_2_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); discrete_sound_w(device, INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f); discrete_sound_w(device, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10); @@ -4720,7 +4720,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( invad2ct_audio_1_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); sn76477_enable_w(state->sn1, (~data >> 0) & 0x01); /* saucer sound */ @@ -4746,7 +4746,7 @@ WRITE8_DEVICE_HANDLER( invad2ct_audio_2_w ) WRITE8_DEVICE_HANDLER( invad2ct_audio_3_w ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); sn76477_enable_w(state->sn2, (~data >> 0) & 0x01); /* saucer sound */ diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c index 903c0d2f002..af34c8a52de 100644 --- a/src/mame/audio/n8080.c +++ b/src/mame/audio/n8080.c @@ -71,7 +71,7 @@ static const sn76477_interface spacefev_sn76477_interface = static void spacefev_update_SN76477_status( running_device *sn ) { - n8080_state *state = (n8080_state *)sn->machine->driver_data; + n8080_state *state = sn->machine->driver_data(); double dblR0 = RES_M(1.0); double dblR1 = RES_M(1.5); @@ -101,7 +101,7 @@ static void spacefev_update_SN76477_status( running_device *sn ) static void sheriff_update_SN76477_status( running_device *sn ) { - n8080_state *state = (n8080_state *)sn->machine->driver_data; + n8080_state *state = sn->machine->driver_data(); if (state->mono_flop[1]) { sn76477_vco_voltage_w(sn, 5); @@ -123,7 +123,7 @@ static void sheriff_update_SN76477_status( running_device *sn ) static void update_SN76477_status( running_device *device ) { - n8080_state *state = (n8080_state *)device->machine->driver_data; + n8080_state *state = device->machine->driver_data(); if (state->n8080_hardware == 1) { spacefev_update_SN76477_status(device); @@ -137,7 +137,7 @@ static void update_SN76477_status( running_device *device ) static void start_mono_flop( running_device *sn, int n, attotime expire ) { - n8080_state *state = (n8080_state *)sn->machine->driver_data; + n8080_state *state = sn->machine->driver_data(); state->mono_flop[n] = 1; update_SN76477_status(sn); @@ -148,7 +148,7 @@ static void start_mono_flop( running_device *sn, int n, attotime expire ) static void stop_mono_flop( running_device *sn, int n ) { - n8080_state *state = (n8080_state *)sn->machine->driver_data; + n8080_state *state = sn->machine->driver_data(); state->mono_flop[n] = 0; update_SN76477_status(sn); @@ -166,7 +166,7 @@ static TIMER_CALLBACK( stop_mono_flop_callback ) static void spacefev_sound_pins_changed( running_machine *machine ) { running_device *sn = machine->device("snsnd"); - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); UINT16 changes = ~state->curr_sound_pins & state->prev_sound_pins; if (changes & (1 << 0x3)) @@ -199,7 +199,7 @@ static void spacefev_sound_pins_changed( running_machine *machine ) static void sheriff_sound_pins_changed( running_machine *machine ) { running_device *sn = machine->device("snsnd"); - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); UINT16 changes = ~state->curr_sound_pins & state->prev_sound_pins; if (changes & (1 << 0x6)) @@ -223,7 +223,7 @@ static void sheriff_sound_pins_changed( running_machine *machine ) static void helifire_sound_pins_changed( running_machine *machine ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); UINT16 changes = ~state->curr_sound_pins & state->prev_sound_pins; /* ((state->curr_sound_pins >> 0xa) & 1) not emulated */ @@ -239,7 +239,7 @@ static void helifire_sound_pins_changed( running_machine *machine ) static void sound_pins_changed( running_machine *machine ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); if (state->n8080_hardware == 1) spacefev_sound_pins_changed(machine); @@ -254,7 +254,7 @@ static void sound_pins_changed( running_machine *machine ) static void delayed_sound_1( running_machine *machine, int data ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->curr_sound_pins &= ~( (1 << 0x7) | @@ -295,7 +295,7 @@ static TIMER_CALLBACK( delayed_sound_1_callback ) static void delayed_sound_2( running_machine *machine, int data ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->curr_sound_pins &= ~( (1 << 0x8) | @@ -340,7 +340,7 @@ WRITE8_HANDLER( n8080_sound_2_w ) static READ8_HANDLER( n8080_8035_p1_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); UINT8 val = 0; if ((state->curr_sound_pins >> 0xb) & 1) val |= 0x01; @@ -358,31 +358,31 @@ static READ8_HANDLER( n8080_8035_p1_r ) static READ8_HANDLER( n8080_8035_t0_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); return (state->curr_sound_pins >> 0x7) & 1; } static READ8_HANDLER( n8080_8035_t1_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); return (state->curr_sound_pins >> 0xc) & 1; } static READ8_HANDLER( helifire_8035_t0_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); return (state->curr_sound_pins >> 0x3) & 1; } static READ8_HANDLER( helifire_8035_t1_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); return (state->curr_sound_pins >> 0x4) & 1; } static READ8_HANDLER( helifire_8035_external_ram_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); UINT8 val = 0; if ((state->curr_sound_pins >> 0x7) & 1) val |= 0x01; @@ -396,7 +396,7 @@ static READ8_HANDLER( helifire_8035_external_ram_r ) static READ8_HANDLER( helifire_8035_p2_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); return ((state->curr_sound_pins >> 0xc) & 1) ? 0x10 : 0x00; /* not used */ } @@ -409,14 +409,14 @@ static WRITE8_HANDLER( n8080_dac_w ) static WRITE8_HANDLER( helifire_dac_w ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); dac_data_w(space->machine->device("dac"), data * state->helifire_dac_volume); } static WRITE8_HANDLER( helifire_sound_ctrl_w ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); state->helifire_dac_phase = data & 0x80; /* data & 0x40 not emulated */ @@ -438,7 +438,7 @@ static WRITE8_HANDLER( helifire_sound_ctrl_w ) static TIMER_DEVICE_CALLBACK( spacefev_vco_voltage_timer ) { running_device *sn = timer.machine->device("snsnd"); - n8080_state *state = (n8080_state *)timer.machine->driver_data; + n8080_state *state = timer.machine->driver_data(); double voltage = 0; if (state->mono_flop[2]) @@ -452,7 +452,7 @@ static TIMER_DEVICE_CALLBACK( spacefev_vco_voltage_timer ) static TIMER_DEVICE_CALLBACK( helifire_dac_volume_timer ) { - n8080_state *state = (n8080_state *)timer.machine->driver_data; + n8080_state *state = timer.machine->driver_data(); double t = state->helifire_dac_timing - attotime_to_double(timer_get_time(timer.machine)); if (state->helifire_dac_phase) @@ -468,7 +468,7 @@ static TIMER_DEVICE_CALLBACK( helifire_dac_volume_timer ) MACHINE_START( spacefev_sound ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->sound_timer[0] = timer_alloc(machine, stop_mono_flop_callback, NULL); state->sound_timer[1] = timer_alloc(machine, stop_mono_flop_callback, NULL); @@ -483,7 +483,7 @@ MACHINE_START( spacefev_sound ) MACHINE_RESET( spacefev_sound ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->n8080_hardware = 1; state->mono_flop[0] = 0; @@ -500,7 +500,7 @@ MACHINE_RESET( spacefev_sound ) MACHINE_START( sheriff_sound ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->sound_timer[0] = timer_alloc(machine, stop_mono_flop_callback, NULL); state->sound_timer[1] = timer_alloc(machine, stop_mono_flop_callback, NULL); @@ -514,7 +514,7 @@ MACHINE_START( sheriff_sound ) MACHINE_RESET( sheriff_sound ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->n8080_hardware = 2; state->mono_flop[0] = 0; @@ -530,7 +530,7 @@ MACHINE_RESET( sheriff_sound ) MACHINE_START( helifire_sound ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state_save_register_global(machine, state->prev_snd_data); state_save_register_global(machine, state->prev_sound_pins); @@ -543,7 +543,7 @@ MACHINE_START( helifire_sound ) MACHINE_RESET( helifire_sound ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->n8080_hardware = 3; state->helifire_dac_volume = 1; diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index 917f623a423..4fdfcb80d58 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -28,7 +28,7 @@ static SOUND_START( timeplt ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->soundcpu = machine->device("tpsound"); state->filter_0_0 = machine->device("filter.0.0"); @@ -69,7 +69,7 @@ static SOUND_START( timeplt ) static READ8_DEVICE_HANDLER( timeplt_portB_r ) { - timeplt_state *state = (timeplt_state *)device->machine->driver_data; + timeplt_state *state = device->machine->driver_data(); static const int timeplt_timer[10] = { @@ -102,7 +102,7 @@ static void filter_w( running_device *device, int data ) static WRITE8_HANDLER( timeplt_filter_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); filter_w(state->filter_1_0, (offset >> 0) & 3); filter_w(state->filter_1_1, (offset >> 2) & 3); filter_w(state->filter_1_2, (offset >> 4) & 3); @@ -121,7 +121,7 @@ static WRITE8_HANDLER( timeplt_filter_w ) WRITE8_HANDLER( timeplt_sh_irqtrigger_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); if (state->last_irq_state == 0 && data) { diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c index d6a406162cb..eb2c691029e 100644 --- a/src/mame/audio/trackfld.c +++ b/src/mame/audio/trackfld.c @@ -20,7 +20,7 @@ READ8_HANDLER( trackfld_sh_timer_r ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); UINT32 clock = state->audiocpu->total_cycles() / TIMER_RATE; return clock & 0xF; @@ -33,7 +33,7 @@ READ8_DEVICE_HANDLER( trackfld_speech_r ) WRITE8_DEVICE_HANDLER( trackfld_sound_w ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); int changes = offset ^ state->last_addr; /* A7 = data enable for VLM5030 (don't care ) */ @@ -53,7 +53,7 @@ WRITE8_DEVICE_HANDLER( trackfld_sound_w ) READ8_HANDLER( hyperspt_sh_timer_r ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); UINT32 clock = state->audiocpu->total_cycles() / TIMER_RATE; if (state->vlm != NULL) @@ -64,7 +64,7 @@ READ8_HANDLER( hyperspt_sh_timer_r ) WRITE8_DEVICE_HANDLER( hyperspt_sound_w ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); int changes = offset ^ state->last_addr; /* A3 = data enable for VLM5030 (don't care ) */ @@ -89,7 +89,7 @@ WRITE8_DEVICE_HANDLER( hyperspt_sound_w ) WRITE8_HANDLER( konami_sh_irqtrigger_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); if (state->last_irq == 0 && data) { /* setting bit 0 low then high triggers IRQ on the sound CPU */ @@ -102,13 +102,13 @@ WRITE8_HANDLER( konami_sh_irqtrigger_w ) WRITE8_HANDLER( konami_SN76496_latch_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->SN76496_latch = data; } WRITE8_DEVICE_HANDLER( konami_SN76496_w ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); sn76496_w(device, offset, state->SN76496_latch); } diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c index 7fe9e42bb81..5df10c8b259 100644 --- a/src/mame/audio/turbo.c +++ b/src/mame/audio/turbo.c @@ -75,7 +75,7 @@ WRITE8_DEVICE_HANDLER( turbo_sound_a_w ) #if (!DISCRETE_TEST) running_device *samples = device->machine->device("samples"); #endif - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); UINT8 diff = data ^ state->sound_state[0]; state->sound_state[0] = data; @@ -124,7 +124,7 @@ WRITE8_DEVICE_HANDLER( turbo_sound_a_w ) WRITE8_DEVICE_HANDLER( turbo_sound_b_w ) { running_device *samples = device->machine->device("samples"); - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; @@ -147,7 +147,7 @@ WRITE8_DEVICE_HANDLER( turbo_sound_b_w ) WRITE8_DEVICE_HANDLER( turbo_sound_c_w ) { running_device *samples = device->machine->device("samples"); - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); /* OSEL1-2 */ state->turbo_osel = (state->turbo_osel & 1) | ((data & 3) << 1); @@ -297,7 +297,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( subroc3d_sound_a_w ) { - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->sound_state[0] = data; /* DIS0-3 contained in bits 0-3 */ @@ -328,7 +328,7 @@ INLINE void subroc3d_update_volume(running_device *samples, int leftchan, UINT8 WRITE8_DEVICE_HANDLER( subroc3d_sound_b_w ) { running_device *samples = device->machine->device("samples"); - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; @@ -384,7 +384,7 @@ WRITE8_DEVICE_HANDLER( subroc3d_sound_b_w ) WRITE8_DEVICE_HANDLER( subroc3d_sound_c_w ) { running_device *samples = device->machine->device("samples"); - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); UINT8 diff = data ^ state->sound_state[2]; state->sound_state[2] = data; @@ -509,7 +509,7 @@ static void buckrog_update_samples(turbo_state *state, running_device *samples) WRITE8_DEVICE_HANDLER( buckrog_sound_a_w ) { running_device *samples = device->machine->device("samples"); - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); UINT8 diff = data ^ state->sound_state[0]; state->sound_state[0] = data; @@ -535,7 +535,7 @@ WRITE8_DEVICE_HANDLER( buckrog_sound_a_w ) WRITE8_DEVICE_HANDLER( buckrog_sound_b_w ) { running_device *samples = device->machine->device("samples"); - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c index 5064aeed964..05eec27cbf6 100644 --- a/src/mame/audio/zaxxon.c +++ b/src/mame/audio/zaxxon.c @@ -113,7 +113,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( zaxxon_sound_a_w ) { - zaxxon_state *state = (zaxxon_state *)device->machine->driver_data; + zaxxon_state *state = device->machine->driver_data(); running_device *samples = device->machine->device("samples"); UINT8 diff = data ^ state->sound_state[0]; state->sound_state[0] = data; @@ -149,7 +149,7 @@ WRITE8_DEVICE_HANDLER( zaxxon_sound_a_w ) WRITE8_DEVICE_HANDLER( zaxxon_sound_b_w ) { - zaxxon_state *state = (zaxxon_state *)device->machine->driver_data; + zaxxon_state *state = device->machine->driver_data(); running_device *samples = device->machine->device("samples"); UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; @@ -167,7 +167,7 @@ WRITE8_DEVICE_HANDLER( zaxxon_sound_b_w ) WRITE8_DEVICE_HANDLER( zaxxon_sound_c_w ) { - zaxxon_state *state = (zaxxon_state *)device->machine->driver_data; + zaxxon_state *state = device->machine->driver_data(); running_device *samples = device->machine->device("samples"); UINT8 diff = data ^ state->sound_state[2]; state->sound_state[2] = data; @@ -225,7 +225,7 @@ MACHINE_DRIVER_END WRITE8_DEVICE_HANDLER( congo_sound_b_w ) { - zaxxon_state *state = (zaxxon_state *)device->machine->driver_data; + zaxxon_state *state = device->machine->driver_data(); running_device *samples = device->machine->device("samples"); UINT8 diff = data ^ state->sound_state[1]; state->sound_state[1] = data; @@ -239,7 +239,7 @@ WRITE8_DEVICE_HANDLER( congo_sound_b_w ) WRITE8_DEVICE_HANDLER( congo_sound_c_w ) { - zaxxon_state *state = (zaxxon_state *)device->machine->driver_data; + zaxxon_state *state = device->machine->driver_data(); running_device *samples = device->machine->device("samples"); UINT8 diff = data ^ state->sound_state[2]; state->sound_state[2] = data; diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 751d3557144..6044e73c9b4 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -236,7 +236,7 @@ GFXDECODE_END static MACHINE_START( 1942 ) { - _1942_state *state = (_1942_state *)machine->driver_data; + _1942_state *state = machine->driver_data<_1942_state>(); state->audiocpu = machine->device("audiocpu"); @@ -246,7 +246,7 @@ static MACHINE_START( 1942 ) static MACHINE_RESET( 1942 ) { - _1942_state *state = (_1942_state *)machine->driver_data; + _1942_state *state = machine->driver_data<_1942_state>(); state->palette_bank = 0; state->scroll[0] = 0; diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 1e1b6f0eb1a..f92e00d1b47 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -249,7 +249,7 @@ GFXDECODE_END static MACHINE_RESET( 1943 ) { - _1943_state *state = (_1943_state *)machine->driver_data; + _1943_state *state = machine->driver_data<_1943_state>(); state->char_on = 0; state->obj_on = 0; diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 79b796e9b74..150ab3fe6d6 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -47,13 +47,14 @@ Notes: #define MASTER_CLOCK XTAL_16MHz -class k3_state +class k3_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, k3_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, k3_state(machine)); } k3_state(running_machine &machine) - : oki1(machine.device("oki1")), + : driver_data_t(machine), + oki1(machine.device("oki1")), oki2(machine.device("oki2")) { } /* memory pointers */ @@ -73,27 +74,27 @@ public: static WRITE16_HANDLER( k3_bgram_w ) { - k3_state *state = (k3_state *)space->machine->driver_data; + k3_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bgram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static TILE_GET_INFO( get_k3_bg_tile_info ) { - k3_state *state = (k3_state *)machine->driver_data; + k3_state *state = machine->driver_data(); int tileno = state->bgram[tile_index]; SET_TILE_INFO(1, tileno, 0, 0); } static VIDEO_START(k3) { - k3_state *state = (k3_state *)machine->driver_data; + k3_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_k3_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 64); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - k3_state *state = (k3_state *)machine->driver_data; + k3_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; UINT16 *source = state->spriteram_1; UINT16 *source2 = state->spriteram_2; @@ -119,7 +120,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE(k3) { - k3_state *state = (k3_state *)screen->machine->driver_data; + k3_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -128,19 +129,19 @@ static VIDEO_UPDATE(k3) static WRITE16_HANDLER( k3_scrollx_w ) { - k3_state *state = (k3_state *)space->machine->driver_data; + k3_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, data); } static WRITE16_HANDLER( k3_scrolly_w ) { - k3_state *state = (k3_state *)space->machine->driver_data; + k3_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, data); } static WRITE16_HANDLER( k3_soundbanks_w ) { - k3_state *state = (k3_state *)space->machine->driver_data; + k3_state *state = space->machine->driver_data(); state->oki1->set_bank_base((data & 4) ? 0x40000 : 0); state->oki2->set_bank_base((data & 2) ? 0x40000 : 0); } diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index c587664b1db..fa451c529c8 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -70,7 +70,7 @@ static WRITE8_HANDLER( irqack_w ) { - _20pacgal_state *state = (_20pacgal_state *)space->machine->driver_data; + _20pacgal_state *state = space->machine->driver_data<_20pacgal_state>(); int bit = data & 1; cpu_interrupt_enable(state->maincpu, bit); @@ -81,7 +81,7 @@ static WRITE8_HANDLER( irqack_w ) static WRITE8_HANDLER( timer_pulse_w ) { - //_20pacgal_state *state = (_20pacgal_state *)space->machine->driver_data; + //_20pacgal_state *state = space->machine->driver_data<_20pacgal_state>(); //printf("timer pulse %02x\n", data); } @@ -138,7 +138,7 @@ static WRITE8_HANDLER( _20pacgal_coin_counter_w ) static void set_bankptr(running_machine *machine) { - _20pacgal_state *state = (_20pacgal_state *) machine->driver_data; + _20pacgal_state *state = machine->driver_data<_20pacgal_state>(); if (state->game_selected == 0) { UINT8 *rom = memory_region(machine, "maincpu"); @@ -150,7 +150,7 @@ static void set_bankptr(running_machine *machine) static WRITE8_HANDLER( ram_bank_select_w ) { - _20pacgal_state *state = (_20pacgal_state *)space->machine->driver_data; + _20pacgal_state *state = space->machine->driver_data<_20pacgal_state>(); state->game_selected = data & 1; set_bankptr(space->machine); @@ -158,7 +158,7 @@ static WRITE8_HANDLER( ram_bank_select_w ) static WRITE8_HANDLER( ram_48000_w ) { - _20pacgal_state *state = (_20pacgal_state *)space->machine->driver_data; + _20pacgal_state *state = space->machine->driver_data<_20pacgal_state>(); if (state->game_selected) { @@ -283,7 +283,7 @@ INPUT_PORTS_END static MACHINE_START( 20pacgal ) { - _20pacgal_state *state = (_20pacgal_state *)machine->driver_data; + _20pacgal_state *state = machine->driver_data<_20pacgal_state>(); state->maincpu = machine->device("maincpu"); state->eeprom = machine->device("eeprom"); @@ -295,7 +295,7 @@ static MACHINE_START( 20pacgal ) static MACHINE_RESET( 20pacgal ) { - _20pacgal_state *state = (_20pacgal_state *)machine->driver_data; + _20pacgal_state *state = machine->driver_data<_20pacgal_state>(); state->game_selected = 0; } @@ -372,7 +372,7 @@ ROM_END static DRIVER_INIT(20pacgal) { - _20pacgal_state *state = (_20pacgal_state *)machine->driver_data; + _20pacgal_state *state = machine->driver_data<_20pacgal_state>(); state->ram_48000 = auto_alloc_array(machine, UINT8, 0x2000); } diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 5a7daeca0df..ea2cab5a03b 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -49,12 +49,13 @@ DAC -26.6860Mhz #include "sound/2610intf.h" -class _2mindril_state +class _2mindril_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _2mindril_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _2mindril_state(machine)); } - _2mindril_state(running_machine &machine) { } + _2mindril_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * map1ram; @@ -94,7 +95,7 @@ public: static VIDEO_UPDATE( drill ) { - _2mindril_state *state = (_2mindril_state *)screen->machine->driver_data; + _2mindril_state *state = screen->machine->driver_data<_2mindril_state>(); bitmap_fill(bitmap, NULL, 0); DRAW_MAP(state->map1ram, 0) @@ -123,7 +124,7 @@ static VIDEO_UPDATE( drill ) static VIDEO_START( drill ) { - _2mindril_state *state = (_2mindril_state *)machine->driver_data; + _2mindril_state *state = machine->driver_data<_2mindril_state>(); machine->gfx[0]->color_granularity = 16; gfx_element_set_source(machine->gfx[1], (UINT8 *)state->charram); @@ -131,7 +132,7 @@ static VIDEO_START( drill ) static READ16_HANDLER( drill_io_r ) { - _2mindril_state *state = (_2mindril_state *)space->machine->driver_data; + _2mindril_state *state = space->machine->driver_data<_2mindril_state>(); // if (offset * 2 == 0x4) /*popmessage("PC=%08x %04x %04x %04x %04x %04x %04x %04x %04x", cpu_get_pc(space->cpu), state->iodata[0/2], state->iodata[2/2], state->iodata[4/2], state->iodata[6/2], @@ -161,7 +162,7 @@ static READ16_HANDLER( drill_io_r ) static WRITE16_HANDLER( drill_io_w ) { - _2mindril_state *state = (_2mindril_state *)space->machine->driver_data; + _2mindril_state *state = space->machine->driver_data<_2mindril_state>(); COMBINE_DATA(&state->iodata[offset]); switch(offset) @@ -195,20 +196,20 @@ static WRITE16_HANDLER( drill_io_w ) #ifdef UNUSED_FUNCTION static TIMER_CALLBACK( shutter_req ) { - _2mindril_state *state = (_2mindril_state *)machine->driver_data; + _2mindril_state *state = machine->driver_data<_2mindril_state>(); state->shutter_sensor = param; } static TIMER_CALLBACK( defender_req ) { - _2mindril_state *state = (_2mindril_state *)machine->driver_data; + _2mindril_state *state = machine->driver_data<_2mindril_state>(); state->defender_sensor = param; } #endif static WRITE16_HANDLER( sensors_w ) { - _2mindril_state *state = (_2mindril_state *)space->machine->driver_data; + _2mindril_state *state = space->machine->driver_data<_2mindril_state>(); /*---- xxxx ---- ---- select "lamps" (guess)*/ /*---- ---- ---- -x-- lamp*/ @@ -237,7 +238,7 @@ static WRITE16_HANDLER( sensors_w ) static WRITE16_HANDLER( charram_w ) { - _2mindril_state *state = (_2mindril_state *)space->machine->driver_data; + _2mindril_state *state = space->machine->driver_data<_2mindril_state>(); COMBINE_DATA(&state->charram[offset]); gfx_element_mark_dirty(space->machine->gfx[1], offset / 16); @@ -415,7 +416,7 @@ static INTERRUPT_GEN( drill_interrupt ) /* WRONG,it does something with 60000c & 700002,likely to be called when the player throws the ball.*/ static void irqhandler(running_device *device, int irq) { -// _2mindril_state *state = (_2mindril_state *)machine->driver_data; +// _2mindril_state *state = machine->driver_data<_2mindril_state>(); // cpu_set_input_line(state->maincpu, 5, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -427,7 +428,7 @@ static const ym2610_interface ym2610_config = static MACHINE_START( drill ) { - _2mindril_state *state = (_2mindril_state *)machine->driver_data; + _2mindril_state *state = machine->driver_data<_2mindril_state>(); state->maincpu = machine->device("maincpu"); @@ -437,7 +438,7 @@ static MACHINE_START( drill ) static MACHINE_RESET( drill ) { - _2mindril_state *state = (_2mindril_state *)machine->driver_data; + _2mindril_state *state = machine->driver_data<_2mindril_state>(); state->defender_sensor = 0; state->shutter_sensor = 0; diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index a5273295258..583bbd0731d 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -27,12 +27,13 @@ #include "machine/pxa255.h" #include "sound/dmadac.h" -class _39in1_state +class _39in1_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _39in1_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _39in1_state(machine)); } - _39in1_state(running_machine &machine) { } + _39in1_state(running_machine &machine) + : driver_data_t(machine) { } UINT32 seed; UINT32 magic; @@ -111,7 +112,7 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine* machine, int n_level, static READ32_HANDLER( pxa255_i2s_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_I2S_Regs *i2s_regs = &state->i2s_regs; switch(PXA255_I2S_BASE_ADDR | (offset << 2)) @@ -146,7 +147,7 @@ static READ32_HANDLER( pxa255_i2s_r ) static WRITE32_HANDLER( pxa255_i2s_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_I2S_Regs *i2s_regs = &state->i2s_regs; #if 0 @@ -225,7 +226,7 @@ static WRITE32_HANDLER( pxa255_i2s_w ) static void pxa255_dma_irq_check(running_machine* machine) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_DMA_Regs *dma_regs = &state->dma_regs; int channel = 0; int set_intr = 0; @@ -248,7 +249,7 @@ static void pxa255_dma_irq_check(running_machine* machine) static void pxa255_dma_load_descriptor_and_start(running_machine* machine, int channel) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_DMA_Regs *dma_regs = &state->dma_regs; attotime period; @@ -290,7 +291,7 @@ static void pxa255_dma_load_descriptor_and_start(running_machine* machine, int c static TIMER_CALLBACK( pxa255_dma_dma_end ) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_DMA_Regs *dma_regs = &state->dma_regs; UINT32 sadr = dma_regs->dsadr[param]; UINT32 tadr = dma_regs->dtadr[param]; @@ -400,7 +401,7 @@ static TIMER_CALLBACK( pxa255_dma_dma_end ) static READ32_HANDLER( pxa255_dma_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_DMA_Regs *dma_regs = &state->dma_regs; switch(PXA255_DMA_BASE_ADDR | (offset << 2)) @@ -459,7 +460,7 @@ static READ32_HANDLER( pxa255_dma_r ) static WRITE32_HANDLER( pxa255_dma_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_DMA_Regs *dma_regs = &state->dma_regs; switch(PXA255_DMA_BASE_ADDR | (offset << 2)) @@ -551,7 +552,7 @@ static WRITE32_HANDLER( pxa255_dma_w ) static void pxa255_ostimer_irq_check(running_machine* machine) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_OSTMR_Regs *ostimer_regs = &state->ostimer_regs; pxa255_set_irq_line(machine, PXA255_INT_OSTIMER0, (ostimer_regs->oier & PXA255_OIER_E0) ? ((ostimer_regs->ossr & PXA255_OSSR_M0) ? 1 : 0) : 0); @@ -562,7 +563,7 @@ static void pxa255_ostimer_irq_check(running_machine* machine) static TIMER_CALLBACK( pxa255_ostimer_match ) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_OSTMR_Regs *ostimer_regs = &state->ostimer_regs; if (0) verboselog(machine, 3, "pxa255_ostimer_match channel %d\n", param); @@ -573,7 +574,7 @@ static TIMER_CALLBACK( pxa255_ostimer_match ) static READ32_HANDLER( pxa255_ostimer_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_OSTMR_Regs *ostimer_regs = &state->ostimer_regs; switch(PXA255_OSTMR_BASE_ADDR | (offset << 2)) @@ -613,7 +614,7 @@ static READ32_HANDLER( pxa255_ostimer_r ) static WRITE32_HANDLER( pxa255_ostimer_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_OSTMR_Regs *ostimer_regs = &state->ostimer_regs; switch(PXA255_OSTMR_BASE_ADDR | (offset << 2)) @@ -705,7 +706,7 @@ static WRITE32_HANDLER( pxa255_ostimer_w ) static void pxa255_update_interrupts(running_machine* machine) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_INTC_Regs *intc_regs = &state->intc_regs; intc_regs->icfp = (intc_regs->icpr & intc_regs->icmr) & intc_regs->iclr; @@ -716,7 +717,7 @@ static void pxa255_update_interrupts(running_machine* machine) static void pxa255_set_irq_line(running_machine* machine, UINT32 line, int irq_state) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_INTC_Regs *intc_regs = &state->intc_regs; intc_regs->icpr &= ~line; @@ -727,7 +728,7 @@ static void pxa255_set_irq_line(running_machine* machine, UINT32 line, int irq_s static READ32_HANDLER( pxa255_intc_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_INTC_Regs *intc_regs = &state->intc_regs; switch(PXA255_INTC_BASE_ADDR | (offset << 2)) @@ -759,7 +760,7 @@ static READ32_HANDLER( pxa255_intc_r ) static WRITE32_HANDLER( pxa255_intc_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_INTC_Regs *intc_regs = &state->intc_regs; switch(PXA255_INTC_BASE_ADDR | (offset << 2)) @@ -801,7 +802,7 @@ static WRITE32_HANDLER( pxa255_intc_w ) static READ32_HANDLER( pxa255_gpio_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_GPIO_Regs *gpio_regs = &state->gpio_regs; switch(PXA255_GPIO_BASE_ADDR | (offset << 2)) @@ -899,7 +900,7 @@ static READ32_HANDLER( pxa255_gpio_r ) static WRITE32_HANDLER( pxa255_gpio_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_GPIO_Regs *gpio_regs = &state->gpio_regs; switch(PXA255_GPIO_BASE_ADDR | (offset << 2)) @@ -1049,7 +1050,7 @@ static WRITE32_HANDLER( pxa255_gpio_w ) static void pxa255_lcd_load_dma_descriptor(const address_space* space, UINT32 address, int channel) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; lcd_regs->dma[channel].fdadr = memory_read_dword_32le(space, address); @@ -1065,7 +1066,7 @@ static void pxa255_lcd_load_dma_descriptor(const address_space* space, UINT32 ad static void pxa255_lcd_irq_check(running_machine* machine) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; if(((lcd_regs->lcsr & PXA255_LCSR_BS) != 0 && (lcd_regs->lccr0 & PXA255_LCCR0_BM) == 0) || @@ -1082,7 +1083,7 @@ static void pxa255_lcd_irq_check(running_machine* machine) static void pxa255_lcd_dma_kickoff(running_machine* machine, int channel) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; if(lcd_regs->dma[channel].fdadr != 0) @@ -1123,7 +1124,7 @@ static void pxa255_lcd_dma_kickoff(running_machine* machine, int channel) static void pxa255_lcd_check_load_next_branch(running_machine* machine, int channel) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; if(lcd_regs->fbr[channel] & 1) @@ -1152,7 +1153,7 @@ static void pxa255_lcd_check_load_next_branch(running_machine* machine, int chan static TIMER_CALLBACK( pxa255_lcd_dma_eof ) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; if (0) verboselog( machine, 3, "End of frame callback\n" ); @@ -1167,7 +1168,7 @@ static TIMER_CALLBACK( pxa255_lcd_dma_eof ) static READ32_HANDLER( pxa255_lcd_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; switch(PXA255_LCD_BASE_ADDR | (offset << 2)) @@ -1235,7 +1236,7 @@ static READ32_HANDLER( pxa255_lcd_r ) static WRITE32_HANDLER( pxa255_lcd_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); PXA255_LCD_Regs *lcd_regs = &state->lcd_regs; switch(PXA255_LCD_BASE_ADDR | (offset << 2)) @@ -1358,7 +1359,7 @@ static READ32_HANDLER( unknown_r ) static READ32_HANDLER( cpld_r ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); //if (cpu_get_pc(space->cpu) != 0xe3af4) printf("CPLD read @ %x (PC %x state %d)\n", offset, cpu_get_pc(space->cpu), state); @@ -1415,7 +1416,7 @@ static READ32_HANDLER( cpld_r ) static WRITE32_HANDLER( cpld_w ) { - _39in1_state *state = (_39in1_state *)space->machine->driver_data; + _39in1_state *state = space->machine->driver_data<_39in1_state>(); if (mem_mask == 0xffff) { @@ -1449,7 +1450,7 @@ static READ32_HANDLER( prot_cheater_r ) static DRIVER_INIT( 39in1 ) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); state->dmadac[0] = machine->device("dac1"); state->dmadac[1] = machine->device("dac2"); @@ -1509,7 +1510,7 @@ INPUT_PORTS_END static VIDEO_UPDATE( 39in1 ) { - _39in1_state *state = (_39in1_state *)screen->machine->driver_data; + _39in1_state *state = screen->machine->driver_data<_39in1_state>(); int x = 0; int y = 0; @@ -1527,7 +1528,7 @@ static VIDEO_UPDATE( 39in1 ) /* To be moved to DEVICE_START( pxa255 ) upon completion */ static void pxa255_start(running_machine* machine) { - _39in1_state *state = (_39in1_state *)machine->driver_data; + _39in1_state *state = machine->driver_data<_39in1_state>(); int index = 0; //pxa255_t* pxa255 = pxa255_get_safe_token( device ); diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 2914fb8f98f..47e0ca58e7a 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -227,7 +227,7 @@ Notes - Has jumper setting for 122HZ or 61HZ) static TIMER_CALLBACK( nmi_callback ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); else @@ -242,13 +242,13 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( nmi_disable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) { @@ -296,7 +296,7 @@ static WRITE8_HANDLER( bank_select_w ) static WRITE8_HANDLER( pix1_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); // if (data > 7) // logerror("pix1 = %2x\n", data); @@ -304,7 +304,7 @@ static WRITE8_HANDLER( pix1_w ) } static WRITE8_HANDLER( pix2_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); // if ((data!=0x00) && (data != 0xff)) // logerror("pix2 = %2x\n", data); @@ -315,14 +315,14 @@ static WRITE8_HANDLER( pix2_w ) #if 0 static READ8_HANDLER( pix1_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return state->pix1; } #endif static READ8_HANDLER( pix2_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); int res; int d1 = state->pix1 & 7; @@ -400,7 +400,7 @@ static const UINT8 mcu_data2[0x80] = static WRITE8_HANDLER( undoukai_mcu_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); int ram_adr = state->mcu_ram[0x1b5] * 0x100 + state->mcu_ram[0x1b4]; int d, i; @@ -560,7 +560,7 @@ static WRITE8_HANDLER( undoukai_mcu_w ) static READ8_HANDLER( undoukai_mcu_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); // logerror("mcu_r %02x\n", state->from_mcu); @@ -578,7 +578,7 @@ static READ8_HANDLER( undoukai_mcu_status_r ) static DRIVER_INIT( undoukai ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x2000); @@ -590,7 +590,7 @@ static DRIVER_INIT( undoukai ) static DRIVER_INIT( 40love ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x2000); @@ -616,20 +616,20 @@ static DRIVER_INIT( 40love ) static READ8_HANDLER( from_snd_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->snd_flag = 0; return state->snd_data; } static READ8_HANDLER( snd_flag_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return state->snd_flag | 0xfd; } static WRITE8_HANDLER( to_main_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->snd_data = data; state->snd_flag = 2; } @@ -688,7 +688,7 @@ ADDRESS_MAP_END static MACHINE_RESET( ta7630 ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int i; double db = 0.0; @@ -713,7 +713,7 @@ static MACHINE_RESET( ta7630 ) static WRITE8_DEVICE_HANDLER( sound_control_0_w ) { - buggychl_state *state = (buggychl_state *)device->machine->driver_data; + buggychl_state *state = device->machine->driver_data(); state->snd_ctrl0 = data & 0xff; // popmessage("SND0 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); @@ -726,7 +726,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_0_w ) } static WRITE8_DEVICE_HANDLER( sound_control_1_w ) { - buggychl_state *state = (buggychl_state *)device->machine->driver_data; + buggychl_state *state = device->machine->driver_data(); state->snd_ctrl1 = data & 0xff; // popmessage("SND1 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); sound_set_output_gain(device, 4, state->vol_ctrl[(state->snd_ctrl1 >> 4) & 15] / 100.0); /* group2 from msm5232 */ @@ -737,7 +737,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_1_w ) static WRITE8_DEVICE_HANDLER( sound_control_2_w ) { - buggychl_state *state = (buggychl_state *)device->machine->driver_data; + buggychl_state *state = device->machine->driver_data(); int i; state->snd_ctrl2 = data & 0xff; // popmessage("SND2 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); @@ -748,7 +748,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_2_w ) static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */ { - buggychl_state *state = (buggychl_state *)device->machine->driver_data; + buggychl_state *state = device->machine->driver_data(); state->snd_ctrl3 = data & 0xff; // popmessage("SND3 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); } @@ -997,7 +997,7 @@ static const msm5232_interface msm5232_config = static MACHINE_START( common ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->mcu = machine->device("mcu"); @@ -1019,7 +1019,7 @@ static MACHINE_START( common ) static MACHINE_START( 40love ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -1041,7 +1041,7 @@ static MACHINE_START( 40love ) static MACHINE_START( undoukai ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -1056,7 +1056,7 @@ static MACHINE_START( undoukai ) static MACHINE_RESET( common ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); MACHINE_RESET_CALL(ta7630); @@ -1077,7 +1077,7 @@ static MACHINE_RESET( common ) static MACHINE_RESET( 40love ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); cputag_set_input_line(machine, "mcu", 0, CLEAR_LINE); @@ -1101,7 +1101,7 @@ static MACHINE_RESET( 40love ) static MACHINE_RESET( undoukai ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int i; MACHINE_RESET_CALL(common); diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index d1eee1d8695..160b4d46e27 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -56,13 +56,13 @@ Sound : static WRITE8_HANDLER( sound_data_w ) { - _4enraya_state *state = (_4enraya_state *)space->machine->driver_data; + _4enraya_state *state = space->machine->driver_data<_4enraya_state>(); state->soundlatch = data; } static WRITE8_DEVICE_HANDLER( sound_control_w ) { - _4enraya_state *state = (_4enraya_state *)device->machine->driver_data; + _4enraya_state *state = device->machine->driver_data<_4enraya_state>(); if ((state->last_snd_ctrl & 0x04) == 0x04 && (data & 0x4) == 0x00) ay8910_data_address_w(device, state->last_snd_ctrl, state->soundlatch); @@ -149,7 +149,7 @@ GFXDECODE_END static MACHINE_START( 4enraya ) { - _4enraya_state *state = (_4enraya_state *)machine->driver_data; + _4enraya_state *state = machine->driver_data<_4enraya_state>(); state_save_register_global(machine, state->soundlatch); state_save_register_global(machine, state->last_snd_ctrl); @@ -157,7 +157,7 @@ static MACHINE_START( 4enraya ) static MACHINE_RESET( 4enraya ) { - _4enraya_state *state = (_4enraya_state *)machine->driver_data; + _4enraya_state *state = machine->driver_data<_4enraya_state>(); state->soundlatch = 0; state->last_snd_ctrl = 0; diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 9cae120accd..ff5f7680fb7 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -1158,7 +1158,7 @@ MACHINE_DRIVER_END static CUSTOM_INPUT( sflush_80_r ) { - mw8080bw_state *state = (mw8080bw_state *)field->port->machine->driver_data; + mw8080bw_state *state = field->port->machine->driver_data(); state->sfl_int ^= 1; /* vblank flag ? */ return state->sfl_int; @@ -1166,7 +1166,7 @@ static CUSTOM_INPUT( sflush_80_r ) static MACHINE_START( sflush ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state_save_register_global(machine, state->sfl_int); MACHINE_START_CALL(mw8080bw); @@ -1374,7 +1374,7 @@ MACHINE_DRIVER_END static INTERRUPT_GEN( polaris_interrupt ) { - mw8080bw_state *state = (mw8080bw_state *)device->machine->driver_data; + mw8080bw_state *state = device->machine->driver_data(); state->polaris_cloud_speed++; if (state->polaris_cloud_speed >= 4) /* every 4 frames - this was verified against real machine */ @@ -1386,7 +1386,7 @@ static INTERRUPT_GEN( polaris_interrupt ) static MACHINE_START( polaris ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state_save_register_global(machine, state->polaris_cloud_speed); state_save_register_global(machine, state->polaris_cloud_pos); diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 941eb0d6fcd..31b7bdc59e5 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -24,7 +24,7 @@ static UINT8 *paletteram_1000; static INTERRUPT_GEN( k88games_interrupt ) { - _88games_state *state = (_88games_state *)device->machine->driver_data; + _88games_state *state = device->machine->driver_data<_88games_state>(); if (k052109_is_irq_enabled(state->k052109)) irq0_line_hold(device); @@ -32,7 +32,7 @@ static INTERRUPT_GEN( k88games_interrupt ) static READ8_HANDLER( bankedram_r ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); if (state->videobank) return state->ram[offset]; @@ -47,7 +47,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); if (state->videobank) state->ram[offset] = data; @@ -57,7 +57,7 @@ static WRITE8_HANDLER( bankedram_w ) static WRITE8_HANDLER( k88games_5f84_w ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); /* bits 0/1 coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -73,14 +73,14 @@ static WRITE8_HANDLER( k88games_5f84_w ) static WRITE8_HANDLER( k88games_sh_irqtrigger_w ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static WRITE8_HANDLER( speech_control_w ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); running_device *upd; state->speech_chip = (data & 4) ? 1 : 0; @@ -92,7 +92,7 @@ static WRITE8_HANDLER( speech_control_w ) static WRITE8_HANDLER( speech_msg_w ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); running_device *upd = state->speech_chip ? state->upd_2 : state->upd_1; upd7759_port_w(upd, 0, data); @@ -101,7 +101,7 @@ static WRITE8_HANDLER( speech_msg_w ) /* special handlers to combine 052109 & 051960 */ static READ8_HANDLER( k052109_051960_r ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -118,7 +118,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - _88games_state *state = (_88games_state *)space->machine->driver_data; + _88games_state *state = space->machine->driver_data<_88games_state>(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -273,7 +273,7 @@ INPUT_PORTS_END static KONAMI_SETLINES_CALLBACK( k88games_banking ) { - _88games_state *state = (_88games_state *)device->machine->driver_data; + _88games_state *state = device->machine->driver_data<_88games_state>(); UINT8 *RAM = memory_region(device->machine, "maincpu"); int offs; @@ -315,7 +315,7 @@ static KONAMI_SETLINES_CALLBACK( k88games_banking ) static MACHINE_START( 88games ) { - _88games_state *state = (_88games_state *)machine->driver_data; + _88games_state *state = machine->driver_data<_88games_state>(); state->audiocpu = machine->device("audiocpu"); state->k052109 = machine->device("k052109"); @@ -335,7 +335,7 @@ static MACHINE_START( 88games ) static MACHINE_RESET( 88games ) { - _88games_state *state = (_88games_state *)machine->driver_data; + _88games_state *state = machine->driver_data<_88games_state>(); konami_configure_set_lines(machine->device("maincpu"), k88games_banking); machine->generic.paletteram.u8 = &memory_region(machine, "maincpu")[0x20000]; diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index 27c14db6f15..8e4658f8f68 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -43,12 +43,13 @@ A1 2101 2101 #define MASTER_CLOCK XTAL_18MHz -class ace_state +class ace_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ace_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ace_state(machine)); } - ace_state(running_machine &machine) { } + ace_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 * ram2; @@ -62,21 +63,21 @@ public: static WRITE8_HANDLER( ace_objpos_w ) { - ace_state *state = (ace_state *)space->machine->driver_data; + ace_state *state = space->machine->driver_data(); state->objpos[offset] = data; } #if 0 static READ8_HANDLER( ace_objpos_r ) { - ace_state *state = (ace_state *)space->machine->driver_data; + ace_state *state = space->machine->driver_data(); return state->objpos[offset]; } #endif static VIDEO_START( ace ) { - ace_state *state = (ace_state *)machine->driver_data; + ace_state *state = machine->driver_data(); gfx_element_set_source(machine->gfx[1], state->characterram); gfx_element_set_source(machine->gfx[2], state->characterram); gfx_element_set_source(machine->gfx[3], state->characterram); @@ -85,7 +86,7 @@ static VIDEO_START( ace ) static VIDEO_UPDATE( ace ) { - ace_state *state = (ace_state *)screen->machine->driver_data; + ace_state *state = screen->machine->driver_data(); int offs; /* first of all, fill the screen with the background color */ @@ -131,7 +132,7 @@ static PALETTE_INIT( ace ) static WRITE8_HANDLER( ace_characterram_w ) { - ace_state *state = (ace_state *)space->machine->driver_data; + ace_state *state = space->machine->driver_data(); if (state->characterram[offset] != data) { if (data & ~0x07) @@ -148,7 +149,7 @@ static WRITE8_HANDLER( ace_characterram_w ) static WRITE8_HANDLER( ace_scoreram_w ) { - ace_state *state = (ace_state *)space->machine->driver_data; + ace_state *state = space->machine->driver_data(); state->scoreram[offset] = data; gfx_element_mark_dirty(space->machine->gfx[4], offset / 32); } @@ -320,13 +321,13 @@ GFXDECODE_END static MACHINE_START( ace ) { - ace_state *state = (ace_state *)machine->driver_data; + ace_state *state = machine->driver_data(); state_save_register_global_array(machine, state->objpos); } static MACHINE_RESET( ace ) { - ace_state *state = (ace_state *)machine->driver_data; + ace_state *state = machine->driver_data(); int i; for (i = 0; i < 8; i++) diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 44f93e567c5..4c2f74dbc90 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -35,13 +35,13 @@ static WRITE8_HANDLER( triothep_control_select_w ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); state->trio_control_select = data; } static READ8_HANDLER( triothep_control_r ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); switch (state->trio_control_select) { case 0: return input_port_read(space->machine, "P1"); @@ -56,7 +56,7 @@ static READ8_HANDLER( triothep_control_r ) static WRITE8_HANDLER( actfancr_sound_w ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -265,7 +265,7 @@ GFXDECODE_END static void sound_irq(running_device *device, int linestate) { - actfancr_state *state = (actfancr_state *)device->machine->driver_data; + actfancr_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); /* IRQ */ } @@ -278,7 +278,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( actfancr ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -286,7 +286,7 @@ static MACHINE_START( actfancr ) static MACHINE_START( triothep ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); MACHINE_START_CALL(actfancr); @@ -295,7 +295,7 @@ static MACHINE_START( triothep ) static MACHINE_RESET( actfancr ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); int i; state->flipscreen = 0; @@ -308,7 +308,7 @@ static MACHINE_RESET( actfancr ) static MACHINE_RESET( triothep ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); MACHINE_RESET_CALL(actfancr); state->trio_control_select = 0; @@ -584,7 +584,7 @@ ROM_END static READ8_HANDLER( cycle_r ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); int pc = cpu_get_pc(space->cpu); int ret = state->main_ram[0x26]; @@ -602,7 +602,7 @@ static READ8_HANDLER( cycle_r ) static READ8_HANDLER( cyclej_r ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); int pc = cpu_get_pc(space->cpu); int ret = state->main_ram[0x26]; diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index 8185cd87b5c..a74beabde9a 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -152,12 +152,13 @@ Video board has additional chips: #include "machine/microtch.h" #include "machine/68681.h" -class adp_state +class adp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, adp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, adp_state(machine)); } - adp_state(running_machine &machine) { } + adp_state(running_machine &machine) + : driver_data_t(machine) { } /* misc */ UINT8 mux_data; @@ -178,7 +179,7 @@ public: static void duart_irq_handler( running_device *device, UINT8 vector ) { - adp_state *state = (adp_state *)device->machine->driver_data; + adp_state *state = device->machine->driver_data(); cpu_set_input_line_and_vector(state->maincpu, 4, HOLD_LINE, vector); }; @@ -192,7 +193,7 @@ static void duart_tx( running_device *device, int channel, UINT8 data ) static void microtouch_tx( running_machine *machine, UINT8 data ) { - adp_state *state = (adp_state *)machine->driver_data; + adp_state *state = machine->driver_data(); duart68681_rx_data(state->duart, 0, data); } @@ -203,7 +204,7 @@ static UINT8 duart_input( running_device *device ) static MACHINE_START( skattv ) { - adp_state *state = (adp_state *)machine->driver_data; + adp_state *state = machine->driver_data(); microtouch_init(machine, microtouch_tx, 0); state->maincpu = machine->device("maincpu"); @@ -241,7 +242,7 @@ static MACHINE_START( skattv ) static MACHINE_RESET( skattv ) { - adp_state *state = (adp_state *)machine->driver_data; + adp_state *state = machine->driver_data(); state->mux_data = 0; state->register_active = 0; @@ -291,7 +292,7 @@ static VIDEO_START(adp) static VIDEO_UPDATE( adp ) { - adp_state *state = (adp_state *)screen->machine->driver_data; + adp_state *state = screen->machine->driver_data(); int x, y, b, src; b = ((hd63484_regs_r(state->hd63484, 0xcc/2, 0xffff) & 0x000f) << 16) + hd63484_regs_r(state->hd63484, 0xce/2, 0xffff); @@ -368,7 +369,7 @@ if (!input_code_pressed(screen->machine, KEYCODE_O)) // debug: toggle window static READ16_HANDLER( test_r ) { - adp_state *state = (adp_state *)space->machine->driver_data; + adp_state *state = space->machine->driver_data(); int value = 0xffff; switch (state->mux_data) @@ -410,7 +411,7 @@ static READ16_HANDLER( test_r ) /*???*/ static WRITE16_HANDLER(wh2_w) { - adp_state *state = (adp_state *)space->machine->driver_data; + adp_state *state = space->machine->driver_data(); state->register_active = data; } diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index a1a15b217b7..71dd36fc857 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -30,7 +30,7 @@ Revisions: static READ8_HANDLER( aeroboto_201_r ) { - aeroboto_state *state = (aeroboto_state *)space->machine->driver_data; + aeroboto_state *state = space->machine->driver_data(); /* if you keep a button pressed during boot, the game will expect this */ /* serie of values to be returned from 3004, and display "PASS 201" if it is */ static const UINT8 res[4] = { 0xff, 0x9f, 0x1b, 0x03 }; @@ -42,7 +42,7 @@ static READ8_HANDLER( aeroboto_201_r ) static INTERRUPT_GEN( aeroboto_interrupt ) { - aeroboto_state *state = (aeroboto_state *)device->machine->driver_data; + aeroboto_state *state = device->machine->driver_data(); if (!state->disable_irq) cpu_set_input_line(device, 0, ASSERT_LINE); @@ -58,7 +58,7 @@ static READ8_HANDLER( aeroboto_irq_ack_r ) static READ8_HANDLER( aeroboto_2973_r ) { - aeroboto_state *state = (aeroboto_state *)space->machine->driver_data; + aeroboto_state *state = space->machine->driver_data(); state->mainram[0x02be] = 0; return 0xff; @@ -66,7 +66,7 @@ static READ8_HANDLER( aeroboto_2973_r ) static WRITE8_HANDLER ( aeroboto_1a2_w ) { - aeroboto_state *state = (aeroboto_state *)space->machine->driver_data; + aeroboto_state *state = space->machine->driver_data(); state->mainram[0x01a2] = data; if (data) @@ -228,7 +228,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( formatz ) { - aeroboto_state *state = (aeroboto_state *)machine->driver_data; + aeroboto_state *state = machine->driver_data(); state->stars_rom = memory_region(machine, "gfx2"); state->stars_length = memory_region_length(machine, "gfx2"); @@ -239,7 +239,7 @@ static MACHINE_START( formatz ) static MACHINE_RESET( formatz ) { - aeroboto_state *state = (aeroboto_state *)machine->driver_data; + aeroboto_state *state = machine->driver_data(); state->disable_irq = 0; state->count = 0; diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 0d52e89129e..de661cbdbda 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -68,7 +68,7 @@ Verification still needed for the other PCBs. static WRITE16_HANDLER( sound_command_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->pending_command = 1; @@ -79,7 +79,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( turbofrc_sound_command_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { state->pending_command = 1; @@ -90,7 +90,7 @@ static WRITE16_HANDLER( turbofrc_sound_command_w ) static WRITE16_HANDLER( aerfboot_soundlatch_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if(ACCESSING_BITS_8_15) { soundlatch_w(space, 0, (data >> 8) & 0xff); @@ -100,13 +100,13 @@ static WRITE16_HANDLER( aerfboot_soundlatch_w ) static READ16_HANDLER( pending_command_r ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); return state->pending_command; } static WRITE8_HANDLER( pending_command_clear_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); state->pending_command = 0; } @@ -1282,7 +1282,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - aerofgt_state *state = (aerofgt_state *)device->machine->driver_data; + aerofgt_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -1299,7 +1299,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( common ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state_save_register_global(machine, state->pending_command); @@ -1316,7 +1316,7 @@ static MACHINE_START( aerofgt ) static MACHINE_RESET( common ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state->pending_command = 0; } diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index f514be6a289..4d70fa5aefe 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -228,7 +228,7 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit /* Read/Write Handlers */ static READ8_HANDLER( devram_r ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); // There's an MCU here, possibly switch (offset) @@ -263,7 +263,7 @@ static READ8_HANDLER( devram_r ) static WRITE8_HANDLER( master_nmi_trigger_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); cpu_set_input_line(state->slave, INPUT_LINE_NMI, PULSE_LINE); } @@ -274,7 +274,7 @@ static WRITE8_HANDLER( master_bankswitch_w ) static WRITE8_HANDLER( slave_bankswitch_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank2", data & 0x07); @@ -291,7 +291,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static READ8_HANDLER( soundcommand_status_r ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); // bits: 2 <-> ? 1 <-> soundlatch full 0 <-> soundlatch2 empty return 4 + state->soundlatch_status * 2 + (1 - state->soundlatch2_status); @@ -299,21 +299,21 @@ static READ8_HANDLER( soundcommand_status_r ) static READ8_HANDLER( soundcommand_r ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); state->soundlatch_status = 0; // soundlatch has been read return soundlatch_r(space, 0); } static READ8_HANDLER( soundcommand2_r ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); state->soundlatch2_status = 0; // soundlatch2 has been read return soundlatch2_r(space, 0); } static WRITE8_HANDLER( soundcommand_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); state->soundlatch_status = 1; // soundlatch has been written cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); // cause a nmi to sub cpu @@ -321,14 +321,14 @@ static WRITE8_HANDLER( soundcommand_w ) static WRITE8_HANDLER( soundcommand2_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); soundlatch2_w(space, 0, data); state->soundlatch2_status = 1; // soundlatch2 has been written } static WRITE8_HANDLER( airbustr_paletteram_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); int val; /* ! byte 1 ! ! byte 0 ! */ @@ -559,14 +559,14 @@ static const ym2203_interface ym2203_config = static INTERRUPT_GEN( master_interrupt ) { - airbustr_state *state = (airbustr_state *)device->machine->driver_data; + airbustr_state *state = device->machine->driver_data(); state->master_addr ^= 0x02; cpu_set_input_line_and_vector(device, 0, HOLD_LINE, state->master_addr); } static INTERRUPT_GEN( slave_interrupt ) { - airbustr_state *state = (airbustr_state *)device->machine->driver_data; + airbustr_state *state = device->machine->driver_data(); state->slave_addr ^= 0x02; cpu_set_input_line_and_vector(device, 0, HOLD_LINE, state->slave_addr); } @@ -575,7 +575,7 @@ static INTERRUPT_GEN( slave_interrupt ) static MACHINE_START( airbustr ) { - airbustr_state *state = (airbustr_state *)machine->driver_data; + airbustr_state *state = machine->driver_data(); UINT8 *MASTER = memory_region(machine, "master"); UINT8 *SLAVE = memory_region(machine, "slave"); UINT8 *AUDIO = memory_region(machine, "audiocpu"); @@ -605,7 +605,7 @@ static MACHINE_START( airbustr ) static MACHINE_RESET( airbustr ) { - airbustr_state *state = (airbustr_state *)machine->driver_data; + airbustr_state *state = machine->driver_data(); state->soundlatch_status = state->soundlatch2_status = 0; state->master_addr = 0xff; diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 63cc7187583..4fb2ac10b4d 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -137,7 +137,7 @@ INPUT_PORTS_END static WRITE8_HANDLER( sound_bank_w ) { - ajax_state *state = (ajax_state *)space->machine->driver_data; + ajax_state *state = space->machine->driver_data(); int bank_A, bank_B; /* banks # for the 007232 (chip 1) */ diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index b65a79ed531..35c3e0fe808 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -14,12 +14,13 @@ TODO: #include "cpu/z80/z80.h" #include "sound/ay8910.h" -class albazc_state +class albazc_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazc_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazc_state(machine)); } - albazc_state(running_machine &machine) { } + albazc_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 * spriteram1; @@ -54,7 +55,7 @@ static VIDEO_START( hanaroku ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - albazc_state *state = (albazc_state *)machine->driver_data; + albazc_state *state = machine->driver_data(); int i; for (i = 511; i >= 0; i--) @@ -130,7 +131,7 @@ static WRITE8_HANDLER( hanaroku_out_2_w ) static WRITE8_HANDLER( albazc_vregs_w ) { - albazc_state *state = (albazc_state *)space->machine->driver_data; + albazc_state *state = space->machine->driver_data(); #ifdef UNUSED_FUNCTION { diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 54d4c865926..ae860e9d17c 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -61,12 +61,13 @@ Code disassembling #include "machine/8255ppi.h" -class albazg_state +class albazg_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazg_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazg_state(machine)); } - albazg_state(running_machine &machine) { } + albazg_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * cus_ram; @@ -89,7 +90,7 @@ public: static TILE_GET_INFO( y_get_bg_tile_info ) { - albazg_state *state = (albazg_state *)machine->driver_data; + albazg_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = state->colorram[tile_index]; @@ -103,13 +104,13 @@ static TILE_GET_INFO( y_get_bg_tile_info ) static VIDEO_START( yumefuda ) { - albazg_state *state = (albazg_state *)machine->driver_data; + albazg_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, y_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( yumefuda ) { - albazg_state *state = (albazg_state *)screen->machine->driver_data; + albazg_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); return 0; } @@ -134,14 +135,14 @@ GFXDECODE_END static WRITE8_HANDLER( yumefuda_vram_w ) { - albazg_state *state = (albazg_state *)space->machine->driver_data; + albazg_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static WRITE8_HANDLER( yumefuda_cram_w ) { - albazg_state *state = (albazg_state *)space->machine->driver_data; + albazg_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -149,14 +150,14 @@ static WRITE8_HANDLER( yumefuda_cram_w ) /*Custom RAM (Thrash Protection)*/ static READ8_HANDLER( custom_ram_r ) { - albazg_state *state = (albazg_state *)space->machine->driver_data; + albazg_state *state = space->machine->driver_data(); // logerror("Custom RAM read at %02x PC = %x\n", offset + 0xaf80, cpu_get_pc(space->cpu)); return state->cus_ram[offset];// ^ 0x55; } static WRITE8_HANDLER( custom_ram_w ) { - albazg_state *state = (albazg_state *)space->machine->driver_data; + albazg_state *state = space->machine->driver_data(); // logerror("Custom RAM write at %02x : %02x PC = %x\n", offset + 0xaf80, data, cpu_get_pc(space->cpu)); if(state->prot_lock) state->cus_ram[offset] = data; @@ -165,14 +166,14 @@ static WRITE8_HANDLER( custom_ram_w ) /*this might be used as NVRAM commands btw*/ static WRITE8_HANDLER( prot_lock_w ) { - albazg_state *state = (albazg_state *)space->machine->driver_data; + albazg_state *state = space->machine->driver_data(); // logerror("PC %04x Prot lock value written %02x\n", cpu_get_pc(space->cpu), data); state->prot_lock = data; } static READ8_DEVICE_HANDLER( mux_r ) { - albazg_state *state = (albazg_state *)device->machine->driver_data; + albazg_state *state = device->machine->driver_data(); switch(state->mux_data) { case 0x00: return input_port_read(device->machine, "IN0"); @@ -189,7 +190,7 @@ static READ8_DEVICE_HANDLER( mux_r ) static WRITE8_DEVICE_HANDLER( mux_w ) { - albazg_state *state = (albazg_state *)device->machine->driver_data; + albazg_state *state = device->machine->driver_data(); int new_bank = (data & 0xc0) >> 6; //0x10000 "Learn Mode" @@ -376,7 +377,7 @@ INPUT_PORTS_END static MACHINE_START( yumefuda ) { - albazg_state *state = (albazg_state *)machine->driver_data; + albazg_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); @@ -388,7 +389,7 @@ static MACHINE_START( yumefuda ) static MACHINE_RESET( yumefuda ) { - albazg_state *state = (albazg_state *)machine->driver_data; + albazg_state *state = machine->driver_data(); state->mux_data = 0; state->bank = -1; state->prot_lock = 0; diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index a49d7a79018..8825b7afd4a 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -21,7 +21,7 @@ static KONAMI_SETLINES_CALLBACK( aliens_banking ); static INTERRUPT_GEN( aliens_interrupt ) { - aliens_state *state = (aliens_state *)device->machine->driver_data; + aliens_state *state = device->machine->driver_data(); if (k051960_is_irq_enabled(state->k051960)) cpu_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); @@ -29,7 +29,7 @@ static INTERRUPT_GEN( aliens_interrupt ) static READ8_HANDLER( bankedram_r ) { - aliens_state *state = (aliens_state *)space->machine->driver_data; + aliens_state *state = space->machine->driver_data(); if (state->palette_selected) return space->machine->generic.paletteram.u8[offset]; @@ -39,7 +39,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - aliens_state *state = (aliens_state *)space->machine->driver_data; + aliens_state *state = space->machine->driver_data(); if (state->palette_selected) paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data); @@ -49,7 +49,7 @@ static WRITE8_HANDLER( bankedram_w ) static WRITE8_HANDLER( aliens_coin_counter_w ) { - aliens_state *state = (aliens_state *)space->machine->driver_data; + aliens_state *state = space->machine->driver_data(); /* bits 0-1 = coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -73,7 +73,7 @@ static WRITE8_HANDLER( aliens_coin_counter_w ) static WRITE8_HANDLER( aliens_sh_irqtrigger_w ) { - aliens_state *state = (aliens_state *)space->machine->driver_data; + aliens_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); @@ -81,7 +81,7 @@ static WRITE8_HANDLER( aliens_sh_irqtrigger_w ) static WRITE8_DEVICE_HANDLER( aliens_snd_bankswitch_w ) { - aliens_state *state = (aliens_state *)device->machine->driver_data; + aliens_state *state = device->machine->driver_data(); /* b1: bank for chanel A */ /* b0: bank for chanel B */ @@ -95,7 +95,7 @@ static WRITE8_DEVICE_HANDLER( aliens_snd_bankswitch_w ) static READ8_HANDLER( k052109_051960_r ) { - aliens_state *state = (aliens_state *)space->machine->driver_data; + aliens_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -112,7 +112,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - aliens_state *state = (aliens_state *)space->machine->driver_data; + aliens_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -237,7 +237,7 @@ static const k051960_interface aliens_k051960_intf = static MACHINE_START( aliens ) { - aliens_state *state = (aliens_state *)machine->driver_data; + aliens_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 20, &ROM[0x10000], 0x2000); @@ -254,7 +254,7 @@ static MACHINE_START( aliens ) static MACHINE_RESET( aliens ) { - aliens_state *state = (aliens_state *)machine->driver_data; + aliens_state *state = machine->driver_data(); konami_configure_set_lines(machine->device("maincpu"), aliens_banking); diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index d935b032d6d..a099cad1631 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -232,7 +232,7 @@ static READ16_HANDLER( kyros_dip_r ) static READ16_HANDLER( control_1_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); if (state->invert_controls) return ~(input_port_read(space->machine, "IN0") + (input_port_read(space->machine, "IN1") << 8)); @@ -242,7 +242,7 @@ static READ16_HANDLER( control_1_r ) static READ16_HANDLER( control_2_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); if (state->invert_controls) return ~(input_port_read(space->machine, "IN3") + ((~(1 << input_port_read(space->machine, "IN5"))) << 8)); @@ -258,7 +258,7 @@ static READ16_HANDLER( control_2_V_r ) static READ16_HANDLER( control_3_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); if (state->invert_controls) return ~(((~(1 << input_port_read(space->machine, "IN6"))) << 8) & 0xff00); @@ -269,7 +269,7 @@ static READ16_HANDLER( control_3_r ) /* High 4 bits of CN1 & CN2 */ static READ16_HANDLER( control_4_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); if (state->invert_controls) return ~((((~(1 << input_port_read(space->machine, "IN6"))) << 4) & 0xf000) @@ -313,7 +313,7 @@ static WRITE16_HANDLER( alpha68k_V_sound_w ) //AT static WRITE16_HANDLER( paddlema_soundlatch_w ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -324,7 +324,7 @@ static WRITE16_HANDLER( paddlema_soundlatch_w ) static WRITE16_HANDLER( tnextspc_soundlatch_w ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -343,7 +343,7 @@ static READ16_HANDLER( kyros_alpha_trigger_r ) */ static const UINT8 coinage1[8][2]={{1,1}, {1,5}, {1,3}, {2,3}, {1,2}, {1,6}, {1,4}, {3,2}}; static const UINT8 coinage2[8][2]={{1,1}, {5,1}, {3,1}, {7,1}, {2,1}, {6,1}, {4,1}, {8,1}}; - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int source = state->shared_ram[offset]; switch (offset) @@ -425,7 +425,7 @@ static READ16_HANDLER( alpha_II_trigger_r ) */ static const UINT8 coinage1[8][2] = {{1,1}, {1,2}, {1,3}, {1,4}, {1,5}, {1,6}, {2,3}, {3,2}}; static const UINT8 coinage2[8][2] = {{1,1}, {2,1}, {3,1}, {4,1}, {5,1}, {6,1}, {7,1}, {8,1}}; - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int source = state->shared_ram[offset]; switch (offset) @@ -520,7 +520,7 @@ static READ16_HANDLER( alpha_V_trigger_r ) */ static const UINT8 coinage1[8][2] = {{1,1}, {1,5}, {1,3}, {2,3}, {1,2}, {1,6}, {1,4}, {3,2}}; static const UINT8 coinage2[8][2] = {{1,1}, {5,1}, {3,1}, {7,1}, {2,1}, {6,1}, {4,1}, {8,1}}; - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int source = state->shared_ram[offset]; switch (offset) @@ -1829,7 +1829,7 @@ static const ym2203_interface ym2203_config = static void YM3812_irq( running_device *device, int param ) { - alpha68k_state *state = (alpha68k_state *)device->machine->driver_data; + alpha68k_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, (param) ? HOLD_LINE : CLEAR_LINE); } @@ -1852,7 +1852,7 @@ static INTERRUPT_GEN( alpha68k_interrupt ) static MACHINE_START( common ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -1868,7 +1868,7 @@ static MACHINE_START( common ) static MACHINE_RESET( common ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->trigstate = 0; state->deposits1 = 0; @@ -1882,7 +1882,7 @@ static MACHINE_RESET( common ) static MACHINE_START( alpha68k_V ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank7", 0, 32, &ROM[0x10000], 0x4000); @@ -1895,7 +1895,7 @@ static MACHINE_START( alpha68k_V ) static MACHINE_RESET( alpha68k_V ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -1905,7 +1905,7 @@ static MACHINE_RESET( alpha68k_V ) static MACHINE_RESET( alpha68k_II ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -1918,7 +1918,7 @@ static MACHINE_RESET( alpha68k_II ) static MACHINE_START( alpha68k_II ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank7", 0, 28, &ROM[0x10000], 0x4000); @@ -3130,7 +3130,7 @@ ROM_END static READ16_HANDLER( timesold_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x4]; if (cpu_get_pc(space->cpu) == 0x9ea2 && (ret & 0xff00) == 0) @@ -3144,7 +3144,7 @@ static READ16_HANDLER( timesold_cycle_r ) static READ16_HANDLER( timesold1_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x4]; if (cpu_get_pc(space->cpu) == 0x9e20 && (ret & 0xff00) == 0) @@ -3158,7 +3158,7 @@ static READ16_HANDLER( timesold1_cycle_r ) static READ16_HANDLER( btlfield_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x4]; if (cpu_get_pc(space->cpu) == 0x9e1c && (ret & 0xff00) == 0) @@ -3172,7 +3172,7 @@ static READ16_HANDLER( btlfield_cycle_r ) static READ16_HANDLER( skysoldr_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x4]; if (cpu_get_pc(space->cpu) == 0x1f4e && (ret & 0xff00) == 0) @@ -3186,7 +3186,7 @@ static READ16_HANDLER( skysoldr_cycle_r ) static READ16_HANDLER( skyadvnt_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x4]; if (cpu_get_pc(space->cpu) == 0x1f78 && (ret & 0xff00) == 0) @@ -3200,7 +3200,7 @@ static READ16_HANDLER( skyadvnt_cycle_r ) static READ16_HANDLER( gangwars_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x103]; if (cpu_get_pc(space->cpu) == 0xbbb6) @@ -3214,7 +3214,7 @@ static READ16_HANDLER( gangwars_cycle_r ) static READ16_HANDLER( gangwarsb_cycle_r ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int ret = state->shared_ram[0x103]; if (cpu_get_pc(space->cpu) == 0xbbca) @@ -3230,7 +3230,7 @@ static READ16_HANDLER( gangwarsb_cycle_r ) static DRIVER_INIT( sstingry ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->invert_controls = 0; state->microcontroller_id = 0x00ff; state->coin_id = 0x22 | (0x22 << 8); @@ -3238,7 +3238,7 @@ static DRIVER_INIT( sstingry ) static DRIVER_INIT( kyros ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->invert_controls = 0; state->microcontroller_id = 0x0012; state->coin_id = 0x22 | (0x22 << 8); @@ -3247,7 +3247,7 @@ static DRIVER_INIT( kyros ) static DRIVER_INIT( jongbou ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0c0001, 0, 0, jongbou_inputs_r); state->invert_controls = 0; state->microcontroller_id = 0x00ff; @@ -3257,14 +3257,14 @@ static DRIVER_INIT( jongbou ) static DRIVER_INIT( paddlema ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->microcontroller_id = 0; state->coin_id = 0; // Not needed ! } static DRIVER_INIT( timesold ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, timesold_cycle_r); state->invert_controls = 0; state->microcontroller_id = 0; @@ -3273,7 +3273,7 @@ static DRIVER_INIT( timesold ) static DRIVER_INIT( timesold1 ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, timesold1_cycle_r); state->invert_controls = 1; state->microcontroller_id = 0; @@ -3282,7 +3282,7 @@ static DRIVER_INIT( timesold1 ) static DRIVER_INIT( btlfield ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, btlfield_cycle_r); state->invert_controls = 1; state->microcontroller_id = 0; @@ -3291,7 +3291,7 @@ static DRIVER_INIT( btlfield ) static DRIVER_INIT( btlfieldb ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->invert_controls = 1; state->microcontroller_id = 0; state->coin_id = 0x22 | (0x22 << 8); //not checked @@ -3300,7 +3300,7 @@ static DRIVER_INIT( btlfieldb ) static DRIVER_INIT( skysoldr ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, skysoldr_cycle_r); memory_set_bankptr(machine, "bank8", (memory_region(machine, "user1")) + 0x40000); state->invert_controls = 0; @@ -3310,7 +3310,7 @@ static DRIVER_INIT( skysoldr ) static DRIVER_INIT( goldmedl ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->invert_controls = 0; state->microcontroller_id = 0x8803; //AT state->coin_id = 0x23 | (0x24 << 8); @@ -3318,7 +3318,7 @@ static DRIVER_INIT( goldmedl ) static DRIVER_INIT( goldmedla ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_set_bankptr(machine, "bank8", memory_region(machine, "maincpu") + 0x20000); state->invert_controls = 0; state->microcontroller_id = 0x8803; //Guess - routine to handle coinage is the same as in 'goldmedl' @@ -3327,7 +3327,7 @@ static DRIVER_INIT( goldmedla ) static DRIVER_INIT( skyadvnt ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, skyadvnt_cycle_r); state->invert_controls = 0; state->microcontroller_id = 0x8814; @@ -3336,7 +3336,7 @@ static DRIVER_INIT( skyadvnt ) static DRIVER_INIT( skyadvntu ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40008, 0x40009, 0, 0, skyadvnt_cycle_r); state->invert_controls = 0; state->microcontroller_id = 0x8814; @@ -3345,7 +3345,7 @@ static DRIVER_INIT( skyadvntu ) static DRIVER_INIT( gangwars ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40206, 0x40207, 0, 0, gangwars_cycle_r); memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); state->invert_controls = 0; @@ -3355,7 +3355,7 @@ static DRIVER_INIT( gangwars ) static DRIVER_INIT( gangwarsb ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x40206, 0x40207, 0, 0, gangwarsb_cycle_r); memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); state->invert_controls = 0; @@ -3365,7 +3365,7 @@ static DRIVER_INIT( gangwarsb ) static DRIVER_INIT( sbasebal ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); /* Game hangs on divide by zero?! Patch it */ @@ -3389,7 +3389,7 @@ static DRIVER_INIT( sbasebal ) static DRIVER_INIT( tnextspc ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->invert_controls = 0; state->microcontroller_id = 0x890a; state->coin_id = 0; // Not needed ! diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index 968e4a941fb..dcb9f969d7f 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -36,7 +36,7 @@ Sound: YM2151 static UINT8 amspdwy_wheel_r( running_machine *machine, int index ) { - amspdwy_state *state = (amspdwy_state *)machine->driver_data; + amspdwy_state *state = machine->driver_data(); static const char *const portnames[] = { "WHEEL1", "WHEEL2", "AN1", "AN2" }; UINT8 wheel = input_port_read(machine, portnames[2 + index]); if (wheel != state->wheel_old[index]) @@ -69,7 +69,7 @@ static READ8_DEVICE_HANDLER( amspdwy_sound_r ) static WRITE8_HANDLER( amspdwy_sound_w ) { - amspdwy_state *state = (amspdwy_state *)space->machine->driver_data; + amspdwy_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -241,7 +241,7 @@ GFXDECODE_END static void irq_handler( running_device *device, int irq ) { - amspdwy_state *state = (amspdwy_state *)device->machine->driver_data; + amspdwy_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -252,7 +252,7 @@ static const ym2151_interface amspdwy_ym2151_interface = static MACHINE_START( amspdwy ) { - amspdwy_state *state = (amspdwy_state *)machine->driver_data; + amspdwy_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -263,7 +263,7 @@ static MACHINE_START( amspdwy ) static MACHINE_RESET( amspdwy ) { - amspdwy_state *state = (amspdwy_state *)machine->driver_data; + amspdwy_state *state = machine->driver_data(); state->flipscreen = 0; state->wheel_old[0] = 0; state->wheel_old[1] = 0; diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index 2b4933e51e9..8015e304cdb 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -489,32 +489,32 @@ sound related ? static WRITE8_HANDLER( angelkds_main_sound_w ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); state->sound[offset] = data; } static READ8_HANDLER( angelkds_main_sound_r ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); return state->sound2[offset]; } static WRITE8_HANDLER( angelkds_sub_sound_w ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); state->sound2[offset] = data; } static READ8_HANDLER( angelkds_sub_sound_r ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); return state->sound[offset]; } static void irqhandler( running_device *device, int irq ) { - angelkds_state *state = (angelkds_state *)device->machine->driver_data; + angelkds_state *state = device->machine->driver_data(); cpu_set_input_line(state->subcpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -575,7 +575,7 @@ GFXDECODE_END static MACHINE_START( angelkds ) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); state->subcpu = machine->device("sub"); @@ -589,7 +589,7 @@ static MACHINE_START( angelkds ) static MACHINE_RESET( angelkds ) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); int i; for (i = 0; i < 4; i++) diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 14679ae449f..90888de95cf 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -171,7 +171,7 @@ Language static void appoooh_adpcm_int(running_device *device) { - appoooh_state *state = (appoooh_state *)device->machine->driver_data; + appoooh_state *state = device->machine->driver_data(); if (state->adpcm_address != 0xffffffff) { @@ -199,7 +199,7 @@ static void appoooh_adpcm_int(running_device *device) /* adpcm address write */ static WRITE8_HANDLER( appoooh_adpcm_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); state->adpcm_address = data << 8; msm5205_reset_w(state->adpcm, 0); @@ -402,7 +402,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( appoooh ) { - appoooh_state *state = (appoooh_state *)machine->driver_data; + appoooh_state *state = machine->driver_data(); state->adpcm = machine->device("msm"); @@ -413,7 +413,7 @@ static MACHINE_START( appoooh ) static MACHINE_RESET( appoooh ) { - appoooh_state *state = (appoooh_state *)machine->driver_data; + appoooh_state *state = machine->driver_data(); state->adpcm_address = 0xffffffff; state->adpcm_data = 0; diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 69913cbd788..ae87dfd5486 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -74,7 +74,7 @@ static MACHINE_RESET( aquarium_hack ) static READ16_HANDLER( aquarium_coins_r ) { - aquarium_state *state = (aquarium_state *)space->machine->driver_data; + aquarium_state *state = space->machine->driver_data(); int data; data = (input_port_read(space->machine, "SYSTEM") & 0x7fff); @@ -86,14 +86,14 @@ static READ16_HANDLER( aquarium_coins_r ) static WRITE8_HANDLER( aquarium_snd_ack_w ) { - aquarium_state *state = (aquarium_state *)space->machine->driver_data; + aquarium_state *state = space->machine->driver_data(); state->aquarium_snd_ack = 0x8000; } static WRITE16_HANDLER( aquarium_sound_w ) { // popmessage("sound write %04x",data); - aquarium_state *state = (aquarium_state *)space->machine->driver_data; + aquarium_state *state = space->machine->driver_data(); soundlatch_w(space, 1, data & 0xff); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE ); @@ -328,7 +328,7 @@ GFXDECODE_END static void irq_handler( running_device *device, int irq ) { - aquarium_state *state = (aquarium_state *)device->machine->driver_data; + aquarium_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0 , irq ? ASSERT_LINE : CLEAR_LINE); } @@ -340,7 +340,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( aquarium ) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -349,7 +349,7 @@ static MACHINE_START( aquarium ) static MACHINE_RESET( aquarium ) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); state->aquarium_snd_ack = 0; #if AQUARIUS_HACK diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index 773c61e3d40..148baf7bc52 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -83,7 +83,7 @@ static WRITE8_DEVICE_HANDLER( ay8910_porta_w ) { - arabian_state *state = (arabian_state *)device->machine->driver_data; + arabian_state *state = device->machine->driver_data(); /* bit 7 = ENA @@ -98,7 +98,7 @@ static WRITE8_DEVICE_HANDLER( ay8910_porta_w ) static WRITE8_DEVICE_HANDLER( ay8910_portb_w ) { - arabian_state *state = (arabian_state *)device->machine->driver_data; + arabian_state *state = device->machine->driver_data(); /* bit 5 = /IREQ to custom CPU @@ -125,7 +125,7 @@ static WRITE8_DEVICE_HANDLER( ay8910_portb_w ) static READ8_HANDLER( custom_cpu_r ) { - arabian_state *state = (arabian_state *)space->machine->driver_data; + arabian_state *state = space->machine->driver_data(); /* since we don't have a simulator for the Fujitsu 8841 4-bit microprocessor */ /* we have to simulate its behavior; it looks like Arabian reads out of the */ @@ -171,7 +171,7 @@ static READ8_HANDLER( custom_cpu_r ) static WRITE8_HANDLER( custom_cpu_w ) { - arabian_state *state = (arabian_state *)space->machine->driver_data; + arabian_state *state = space->machine->driver_data(); state->custom_cpu_ram[0x7f0 + offset] = data; } @@ -179,7 +179,7 @@ static WRITE8_HANDLER( custom_cpu_w ) static void update_flip_state( running_machine *machine ) { - arabian_state *state = (arabian_state *)machine->driver_data; + arabian_state *state = machine->driver_data(); /* the custom CPU also controls the video flip control line; unfortunately, */ /* it appears that the custom is smart enough to flip the screen itself, based */ @@ -199,7 +199,7 @@ static void update_flip_state( running_machine *machine ) static WRITE8_HANDLER( custom_flip_w ) { - arabian_state *state = (arabian_state *)space->machine->driver_data; + arabian_state *state = space->machine->driver_data(); state->custom_cpu_ram[0x34b + offset] = data; update_flip_state(space->machine); @@ -208,7 +208,7 @@ static WRITE8_HANDLER( custom_flip_w ) static WRITE8_HANDLER( custom_cocktail_w ) { - arabian_state *state = (arabian_state *)space->machine->driver_data; + arabian_state *state = space->machine->driver_data(); state->custom_cpu_ram[0x400 + offset] = data; update_flip_state(space->machine); @@ -374,7 +374,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( arabian ) { - arabian_state *state = (arabian_state *)machine->driver_data; + arabian_state *state = machine->driver_data(); state_save_register_global(machine, state->custom_cpu_reset); state_save_register_global(machine, state->custom_cpu_busy); @@ -382,7 +382,7 @@ static MACHINE_START( arabian ) static MACHINE_RESET( arabian ) { - arabian_state *state = (arabian_state *)machine->driver_data; + arabian_state *state = machine->driver_data(); state->custom_cpu_reset = 0; state->custom_cpu_busy = 0; diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index c479748e89c..b205e52465f 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -83,8 +83,8 @@ static void update_interrupts(running_machine *machine) { - rampart_state *state = (rampart_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + rampart_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -111,10 +111,10 @@ static MACHINE_START( arcadecl ) static MACHINE_RESET( arcadecl ) { - rampart_state *state = (rampart_state *)machine->driver_data; + rampart_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update, 32); } @@ -168,7 +168,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x640026, 0x640027) AM_READ_PORT("TRACKY1") AM_RANGE(0x640040, 0x64004f) AM_WRITE(latch_w) AM_RANGE(0x640060, 0x64006f) AM_WRITE(atarigen_eeprom_enable_w) - AM_RANGE(0x641000, 0x641fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(rampart_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x641000, 0x641fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(rampart_state, eeprom, eeprom_size) AM_RANGE(0x642000, 0x642001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) AM_RANGE(0x646000, 0x646fff) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0x647000, 0x647fff) AM_WRITE(watchdog_reset16_w) diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index b2ce9feaa96..ec2e0c02716 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -914,7 +914,7 @@ static const ay8910_interface hexa_ay8910_config = static MACHINE_START( arkanoid ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->mcu = machine->device("mcu"); @@ -939,7 +939,7 @@ static MACHINE_START( arkanoid ) static MACHINE_RESET( arkanoid ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->port_a_in = 0; state->port_a_out = 0; @@ -1459,21 +1459,21 @@ static void arkanoid_bootleg_init( running_machine *machine ) static DRIVER_INIT( arkangc ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bootleg_id = ARKANGC; arkanoid_bootleg_init(machine); } static DRIVER_INIT( arkangc2 ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bootleg_id = ARKANGC2; arkanoid_bootleg_init(machine); } static DRIVER_INIT( block2 ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); // the graphics on this bootleg have the data scrambled int tile; UINT8* srcgfx = memory_region(machine,"gfx1"); @@ -1509,28 +1509,28 @@ static DRIVER_INIT( block2 ) static DRIVER_INIT( arkblock ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bootleg_id = ARKBLOCK; arkanoid_bootleg_init(machine); } static DRIVER_INIT( arkbloc2 ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bootleg_id = ARKBLOC2; arkanoid_bootleg_init(machine); } static DRIVER_INIT( arkgcbl ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bootleg_id = ARKGCBL; arkanoid_bootleg_init(machine); } static DRIVER_INIT( paddle2 ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bootleg_id = PADDLE2; arkanoid_bootleg_init(machine); } diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 3fa6c17fe8e..ebf19d33ac4 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -176,7 +176,7 @@ Stephh's notes (based on the games M68000 code and some tests) : static WRITE16_HANDLER( io_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vreg); /* bits 0 and 1 of armedf_vreg are coin counters */ @@ -186,7 +186,7 @@ static WRITE16_HANDLER( io_w ) static WRITE16_HANDLER( terraf_io_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vreg); /* bits 0 and 1 of armedf_vreg are coin counters */ @@ -209,7 +209,7 @@ static WRITE16_HANDLER( terraf_io_w ) static WRITE16_HANDLER( kodure_io_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vreg); /* bits 0 and 1 of armedf_vreg are coin counters */ @@ -236,7 +236,7 @@ static WRITE16_HANDLER( sound_command_w ) #ifdef UNUSED_FUNCTION static WRITE16_HANDLER( legion_command_c ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->legion_cmd[offset]); //logerror("Legion CMD %04x=%04x", offset, data); @@ -762,7 +762,7 @@ GFXDECODE_END static MACHINE_START( armedf ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state_save_register_global(machine, state->mcu_mode); state_save_register_global(machine, state->old_mcu_mode); @@ -777,7 +777,7 @@ static MACHINE_START( armedf ) static MACHINE_RESET( armedf ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state->mcu_mode = 0; state->old_mcu_mode = 0; @@ -1527,32 +1527,32 @@ ROM_END static DRIVER_INIT( terraf ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state->scroll_type = 0; } static DRIVER_INIT( terrafu ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state->scroll_type = 5; } static DRIVER_INIT( armedf ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state->scroll_type = 1; } static DRIVER_INIT( kodure ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state->scroll_type = 2; } static DRIVER_INIT( legion ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); #if LEGION_HACK /* This is a hack to allow you to use the extra features of 3 of the "Unused" Dip Switches (see notes above). */ @@ -1567,7 +1567,7 @@ static DRIVER_INIT( legion ) static DRIVER_INIT( legiono ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); #if LEGION_HACK /* This is a hack to allow you to use the extra features of 3 of the "Unused" Dip Switches (see notes above). */ @@ -1581,7 +1581,7 @@ static DRIVER_INIT( legiono ) static DRIVER_INIT( cclimbr2 ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); state->scroll_type = 4; } diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 5839a7f53c9..28ca7882371 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -88,7 +88,7 @@ static READ16_HANDLER(fake_4a00a_r) static WRITE16_HANDLER( ashnojoe_soundlatch_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->soundlatch_status = 1; @@ -121,20 +121,20 @@ ADDRESS_MAP_END static WRITE8_HANDLER( adpcm_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->adpcm_byte = data; } static READ8_HANDLER( sound_latch_r ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->soundlatch_status = 0; return soundlatch_r(space, 0); } static READ8_HANDLER( sound_latch_status_r ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); return state->soundlatch_status; } @@ -276,7 +276,7 @@ GFXDECODE_END static void ym2203_irq_handler( running_device *device, int irq ) { - ashnojoe_state *state = (ashnojoe_state *)device->machine->driver_data; + ashnojoe_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -309,7 +309,7 @@ static const ym2203_interface ym2203_config = static void ashnojoe_vclk_cb( running_device *device ) { - ashnojoe_state *state = (ashnojoe_state *)device->machine->driver_data; + ashnojoe_state *state = device->machine->driver_data(); if (state->msm5205_vclk_toggle == 0) { msm5205_data_w(device, state->adpcm_byte >> 4); @@ -332,7 +332,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( ashnojoe ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -343,7 +343,7 @@ static MACHINE_START( ashnojoe ) static MACHINE_RESET( ashnojoe ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); state->adpcm_byte = 0; state->soundlatch_status = 0; diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index d77ff3b20e8..7d14a9be646 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -33,14 +33,14 @@ static const eeprom_interface eeprom_intf = #if 0 static READ16_HANDLER( control2_r ) { - asterix_state *state = (asterix_state *)space->machine->driver_data; + asterix_state *state = space->machine->driver_data(); return state->cur_control2; } #endif static WRITE16_HANDLER( control2_w ) { - asterix_state *state = (asterix_state *)space->machine->driver_data; + asterix_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -57,7 +57,7 @@ static WRITE16_HANDLER( control2_w ) static INTERRUPT_GEN( asterix_interrupt ) { - asterix_state *state = (asterix_state *)device->machine->driver_data; + asterix_state *state = device->machine->driver_data(); // global interrupt masking if (!k056832_is_irq_enabled(state->k056832, 0)) @@ -73,13 +73,13 @@ static READ8_DEVICE_HANDLER( asterix_sound_r ) static TIMER_CALLBACK( nmi_callback ) { - asterix_state *state = (asterix_state *)machine->driver_data; + asterix_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( sound_arm_nmi_w ) { - asterix_state *state = (asterix_state *)space->machine->driver_data; + asterix_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); timer_set(space->machine, ATTOTIME_IN_USEC(5), NULL, 0, nmi_callback); @@ -87,7 +87,7 @@ static WRITE8_HANDLER( sound_arm_nmi_w ) static WRITE16_HANDLER( sound_irq_w ) { - asterix_state *state = (asterix_state *)space->machine->driver_data; + asterix_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -97,7 +97,7 @@ static WRITE16_HANDLER( sound_irq_w ) #if 0 static WRITE16_HANDLER( protection_w ) { - asterix_state *state = (asterix_state *)space->machine->driver_data; + asterix_state *state = space->machine->driver_data(); COMBINE_DATA(state->prot + offset); if (offset == 1) @@ -251,7 +251,7 @@ static const k05324x_interface asterix_k05324x_intf = static MACHINE_START( asterix ) { - asterix_state *state = (asterix_state *)machine->driver_data; + asterix_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -273,7 +273,7 @@ static MACHINE_START( asterix ) static MACHINE_RESET( asterix ) { - asterix_state *state = (asterix_state *)machine->driver_data; + asterix_state *state = machine->driver_data(); int i; state->cur_control2 = 0; diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 31acabe2fd6..e112be419b4 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -41,12 +41,13 @@ enum }; -class astinvad_state +class astinvad_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astinvad_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astinvad_state(machine)); } - astinvad_state(running_machine &machine) { } + astinvad_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 * colorram; UINT8 * videoram; @@ -105,7 +106,7 @@ static const ppi8255_interface ppi8255_intf[2] = static VIDEO_START( spaceint ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); state->colorram = auto_alloc_array(machine, UINT8, state->videoram_size); state_save_register_global(machine, state->color_latch); @@ -115,14 +116,14 @@ static VIDEO_START( spaceint ) static WRITE8_HANDLER( color_latch_w ) { - astinvad_state *state = (astinvad_state *)space->machine->driver_data; + astinvad_state *state = space->machine->driver_data(); state->color_latch = data & 0x0f; } static WRITE8_HANDLER( spaceint_videoram_w ) { - astinvad_state *state = (astinvad_state *)space->machine->driver_data; + astinvad_state *state = space->machine->driver_data(); state->videoram[offset] = data; state->colorram[offset] = state->color_latch; } @@ -137,7 +138,7 @@ static WRITE8_HANDLER( spaceint_videoram_w ) static void plot_byte( running_machine *machine, bitmap_t *bitmap, UINT8 y, UINT8 x, UINT8 data, UINT8 color ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); pen_t fore_pen = MAKE_RGB(pal1bit(color >> 0), pal1bit(color >> 2), pal1bit(color >> 1)); UINT8 flip_xor = state->screen_flip & 7; @@ -154,7 +155,7 @@ static void plot_byte( running_machine *machine, bitmap_t *bitmap, UINT8 y, UINT static VIDEO_UPDATE( astinvad ) { - astinvad_state *state = (astinvad_state *)screen->machine->driver_data; + astinvad_state *state = screen->machine->driver_data(); const UINT8 *color_prom = memory_region(screen->machine, "proms"); UINT8 yoffs = state->flip_yoffs & state->screen_flip; int x, y; @@ -174,7 +175,7 @@ static VIDEO_UPDATE( astinvad ) static VIDEO_UPDATE( spaceint ) { - astinvad_state *state = (astinvad_state *)screen->machine->driver_data; + astinvad_state *state = screen->machine->driver_data(); const UINT8 *color_prom = memory_region(screen->machine, "proms"); int offs; @@ -206,14 +207,14 @@ static VIDEO_UPDATE( spaceint ) static TIMER_CALLBACK( kamikaze_int_off ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); } static TIMER_CALLBACK( kamizake_int_gen ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); /* interrupts are asserted on every state change of the 128V line */ cpu_set_input_line(state->maincpu, 0, ASSERT_LINE); param ^= 128; @@ -226,7 +227,7 @@ static TIMER_CALLBACK( kamizake_int_gen ) static MACHINE_START( kamikaze ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->ppi8255_0 = machine->device("ppi8255_0"); @@ -243,7 +244,7 @@ static MACHINE_START( kamikaze ) static MACHINE_RESET( kamikaze ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); state->screen_flip = 0; state->screen_red = 0; @@ -254,7 +255,7 @@ static MACHINE_RESET( kamikaze ) static MACHINE_START( spaceint ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->samples = machine->device("samples"); @@ -265,7 +266,7 @@ static MACHINE_START( spaceint ) static MACHINE_RESET( spaceint ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); state->screen_flip = 0; state->sound_state[0] = 0; @@ -276,7 +277,7 @@ static MACHINE_RESET( spaceint ) static INPUT_CHANGED( spaceint_coin_inserted ) { - astinvad_state *state = (astinvad_state *)field->port->machine->driver_data; + astinvad_state *state = field->port->machine->driver_data(); /* coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); } @@ -291,7 +292,7 @@ static INPUT_CHANGED( spaceint_coin_inserted ) static READ8_HANDLER( kamikaze_ppi_r ) { - astinvad_state *state = (astinvad_state *)space->machine->driver_data; + astinvad_state *state = space->machine->driver_data(); UINT8 result = 0xff; /* the address lines are used for /CS; yes, they can overlap! */ @@ -305,7 +306,7 @@ static READ8_HANDLER( kamikaze_ppi_r ) static WRITE8_HANDLER( kamikaze_ppi_w ) { - astinvad_state *state = (astinvad_state *)space->machine->driver_data; + astinvad_state *state = space->machine->driver_data(); /* the address lines are used for /CS; yes, they can overlap! */ if (!(offset & 4)) @@ -324,7 +325,7 @@ static WRITE8_HANDLER( kamikaze_ppi_w ) static WRITE8_DEVICE_HANDLER( astinvad_sound1_w ) { - astinvad_state *state = (astinvad_state *)device->machine->driver_data; + astinvad_state *state = device->machine->driver_data(); int bits_gone_hi = data & ~state->sound_state[0]; state->sound_state[0] = data; @@ -341,7 +342,7 @@ static WRITE8_DEVICE_HANDLER( astinvad_sound1_w ) static WRITE8_DEVICE_HANDLER( astinvad_sound2_w ) { - astinvad_state *state = (astinvad_state *)device->machine->driver_data; + astinvad_state *state = device->machine->driver_data(); int bits_gone_hi = data & ~state->sound_state[1]; state->sound_state[1] = data; @@ -357,7 +358,7 @@ static WRITE8_DEVICE_HANDLER( astinvad_sound2_w ) static WRITE8_HANDLER( spaceint_sound1_w ) { - astinvad_state *state = (astinvad_state *)space->machine->driver_data; + astinvad_state *state = space->machine->driver_data(); int bits_gone_hi = data & ~state->sound_state[0]; state->sound_state[0] = data; @@ -376,7 +377,7 @@ static WRITE8_HANDLER( spaceint_sound1_w ) static WRITE8_HANDLER( spaceint_sound2_w ) { - astinvad_state *state = (astinvad_state *)space->machine->driver_data; + astinvad_state *state = space->machine->driver_data(); int bits_gone_hi = data & ~state->sound_state[1]; state->sound_state[1] = data; @@ -752,7 +753,7 @@ ROM_END static DRIVER_INIT( kamikaze ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); /* the flip screen logic adds 32 to the Y after flipping */ state->flip_yoffs = 32; @@ -761,7 +762,7 @@ static DRIVER_INIT( kamikaze ) static DRIVER_INIT( spcking2 ) { - astinvad_state *state = (astinvad_state *)machine->driver_data; + astinvad_state *state = machine->driver_data(); /* don't have the schematics, but the blanking must center the screen here */ state->flip_yoffs = 0; diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index a427822983f..dfbb97e189b 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -35,12 +35,13 @@ To do: #include "machine/ticket.h" #include "sound/okim6295.h" -class astrocorp_state +class astrocorp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrocorp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrocorp_state(machine)); } - astrocorp_state(running_machine &machine) { } + astrocorp_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; @@ -59,7 +60,7 @@ public: static VIDEO_START( astrocorp ) { - astrocorp_state *state = (astrocorp_state *)machine->driver_data; + astrocorp_state *state = machine->driver_data(); state->bitmap = machine->primary_screen->alloc_compatible_bitmap(); @@ -92,7 +93,7 @@ static VIDEO_START( astrocorp ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - astrocorp_state *state = (astrocorp_state *)machine->driver_data; + astrocorp_state *state = machine->driver_data(); UINT16 *source = state->spriteram; UINT16 *finish = state->spriteram + state->spriteram_size / 2; @@ -140,7 +141,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE(astrocorp) { - astrocorp_state *state = (astrocorp_state *)screen->machine->driver_data; + astrocorp_state *state = screen->machine->driver_data(); if (state->screen_enable & 1) copybitmap(bitmap, state->bitmap, 0,0,0,0, cliprect); @@ -157,7 +158,7 @@ static VIDEO_UPDATE(astrocorp) static WRITE16_HANDLER( astrocorp_draw_sprites_w ) { - astrocorp_state *state = (astrocorp_state *)space->machine->driver_data; + astrocorp_state *state = space->machine->driver_data(); UINT16 old = state->draw_sprites; UINT16 now = COMBINE_DATA(&state->draw_sprites); @@ -258,7 +259,7 @@ static WRITE16_HANDLER( skilldrp_outputs_w ) static WRITE16_HANDLER( astrocorp_screen_enable_w ) { - astrocorp_state *state = (astrocorp_state *)space->machine->driver_data; + astrocorp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->screen_enable); // popmessage("%04X",data); if (state->screen_enable & (~1)) @@ -273,7 +274,7 @@ static READ16_HANDLER( astrocorp_unk_r ) // 5-6-5 Palette: BBBBB-GGGGGG-RRRRR static WRITE16_HANDLER( astrocorp_palette_w ) { - astrocorp_state *state = (astrocorp_state *)space->machine->driver_data; + astrocorp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->paletteram[offset]); palette_set_color_rgb(space->machine, offset, pal5bit((state->paletteram[offset] >> 0) & 0x1f), diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 2c145e9ba13..6c3a5c344e9 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -81,7 +81,7 @@ static READ8_HANDLER( irq_clear_r ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); return 0; @@ -90,7 +90,7 @@ static READ8_HANDLER( irq_clear_r ) static TIMER_DEVICE_CALLBACK( irq_callback ) { - astrof_state *state = (astrof_state *)timer.machine->driver_data; + astrof_state *state = timer.machine->driver_data(); cpu_set_input_line(state->maincpu, 0, ASSERT_LINE); } @@ -104,7 +104,7 @@ static TIMER_DEVICE_CALLBACK( irq_callback ) static INPUT_CHANGED( coin_inserted ) { - astrof_state *state = (astrof_state *)field->port->machine->driver_data; + astrof_state *state = field->port->machine->driver_data(); /* coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); @@ -114,7 +114,7 @@ static INPUT_CHANGED( coin_inserted ) static INPUT_CHANGED( service_coin_inserted ) { - astrof_state *state = (astrof_state *)field->port->machine->driver_data; + astrof_state *state = field->port->machine->driver_data(); /* service coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); @@ -146,7 +146,7 @@ static CUSTOM_INPUT( astrof_p2_controls_r ) static CUSTOM_INPUT( tomahawk_controls_r ) { UINT32 ret; - astrof_state *state = (astrof_state *)field->port->machine->driver_data; + astrof_state *state = field->port->machine->driver_data(); /* on a cocktail cabinet, two sets of controls are multiplexed on a single set of inputs @@ -174,7 +174,7 @@ static CUSTOM_INPUT( tomahawk_controls_r ) static VIDEO_START( astrof ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* allocate the color RAM -- half the size of the video RAM as A0 is not connected */ state->colorram = auto_alloc_array(machine, UINT8, state->videoram_size / 2); @@ -184,7 +184,7 @@ static VIDEO_START( astrof ) static rgb_t make_pen( running_machine *machine, UINT8 data ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); UINT8 r1_bit = state->red_on ? 0x01 : (data >> 0) & 0x01; UINT8 r2_bit = state->red_on ? 0x01 : (data >> 1) & 0x01; @@ -205,7 +205,7 @@ static rgb_t make_pen( running_machine *machine, UINT8 data ) static void astrof_get_pens( running_machine *machine, pen_t *pens ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); offs_t i; UINT8 bank = (state->astrof_palette_bank ? 0x10 : 0x00); UINT8 config = input_port_read_safe(machine, "FAKE", 0x00); @@ -282,7 +282,7 @@ static void tomahawk_get_pens( running_machine *machine, pen_t *pens ) static WRITE8_HANDLER( astrof_videoram_w ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); state->videoram[offset] = data; state->colorram[offset >> 1] = *state->astrof_color & 0x0e; @@ -291,7 +291,7 @@ static WRITE8_HANDLER( astrof_videoram_w ) static WRITE8_HANDLER( tomahawk_videoram_w ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); state->videoram[offset] = data; state->colorram[offset >> 1] = (*state->astrof_color & 0x0e) | ((*state->astrof_color & 0x01) << 4); @@ -300,7 +300,7 @@ static WRITE8_HANDLER( tomahawk_videoram_w ) static WRITE8_HANDLER( video_control_1_w ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); state->flipscreen = ((data >> 0) & 0x01) & input_port_read(space->machine, "CAB"); @@ -316,7 +316,7 @@ static WRITE8_HANDLER( video_control_1_w ) static void astrof_set_video_control_2( running_machine *machine, UINT8 data ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* D0 - OUT0 - goes to edge conn. pin A10 - was perhaps meant to be a start lamp */ /* D1 - OUT1 - goes to edge conn. pin A11 - was perhaps meant to be a start lamp */ @@ -339,7 +339,7 @@ static WRITE8_HANDLER( astrof_video_control_2_w ) static void spfghmk2_set_video_control_2( running_machine *machine, UINT8 data ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* D0 - OUT0 - goes to edge conn. pin A10 - was perhaps meant to be a start lamp */ /* D1 - OUT1 - goes to edge conn. pin A11 - was perhaps meant to be a start lamp */ @@ -359,7 +359,7 @@ static WRITE8_HANDLER( spfghmk2_video_control_2_w ) static void tomahawk_set_video_control_2( running_machine *machine, UINT8 data ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* D0 - OUT0 - goes to edge conn. pin A10 - was perhaps meant to be a start lamp */ /* D1 - OUT1 - goes to edge conn. pin A11 - was perhaps meant to be a start lamp */ @@ -378,7 +378,7 @@ static WRITE8_HANDLER( tomahawk_video_control_2_w ) static void video_update_common( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, pen_t *pens ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -461,7 +461,7 @@ static READ8_HANDLER( shoot_r ) static READ8_HANDLER( abattle_coin_prot_r ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); state->abattle_count = (state->abattle_count + 1) % 0x0101; return state->abattle_count ? 0x07 : 0x00; @@ -470,7 +470,7 @@ static READ8_HANDLER( abattle_coin_prot_r ) static READ8_HANDLER( afire_coin_prot_r ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); state->abattle_count = state->abattle_count ^ 0x01; return state->abattle_count ? 0x07 : 0x00; @@ -479,7 +479,7 @@ static READ8_HANDLER( afire_coin_prot_r ) static READ8_HANDLER( tomahawk_protection_r ) { - astrof_state *state = (astrof_state *)space->machine->driver_data; + astrof_state *state = space->machine->driver_data(); /* flip the byte */ return BITSWAP8(*state->tomahawk_protection, 0, 1, 2, 3, 4, 5, 6, 7); @@ -495,7 +495,7 @@ static READ8_HANDLER( tomahawk_protection_r ) static MACHINE_START( astrof ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* the 74175 outputs all HI's if not otherwise set */ astrof_set_video_control_2(machine, 0xff); @@ -518,7 +518,7 @@ static MACHINE_START( astrof ) static MACHINE_START( abattle ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* register for state saving */ state_save_register_global(machine, state->abattle_count); @@ -529,7 +529,7 @@ static MACHINE_START( abattle ) static MACHINE_START( spfghmk2 ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* the 74175 outputs all HI's if not otherwise set */ spfghmk2_set_video_control_2(machine, 0xff); @@ -548,7 +548,7 @@ static MACHINE_START( spfghmk2 ) static MACHINE_START( tomahawk ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); /* the 74175 outputs all HI's if not otherwise set */ tomahawk_set_video_control_2(machine, 0xff); @@ -572,7 +572,7 @@ static MACHINE_START( tomahawk ) static MACHINE_RESET( abattle ) { - astrof_state *state = (astrof_state *)machine->driver_data; + astrof_state *state = machine->driver_data(); state->abattle_count = 0; } diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 8c8df50dc12..cf3146a6ee0 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -232,7 +232,7 @@ DIP locations verified for: static TIMER_CALLBACK( cadash_interrupt5 ) { - asuka_state *state = (asuka_state *)machine->driver_data; + asuka_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 5, HOLD_LINE); } @@ -261,7 +261,7 @@ static WRITE8_DEVICE_HANDLER( sound_bankswitch_2151_w ) static void asuka_msm5205_vck( running_device *device ) { - asuka_state *state = (asuka_state *)device->machine->driver_data; + asuka_state *state = device->machine->driver_data(); if (state->adpcm_data != -1) { @@ -278,7 +278,7 @@ static void asuka_msm5205_vck( running_device *device ) static WRITE8_HANDLER( asuka_msm5205_address_w ) { - asuka_state *state = (asuka_state *)space->machine->driver_data; + asuka_state *state = space->machine->driver_data(); state->adpcm_pos = (state->adpcm_pos & 0x00ff) | (data << 8); } @@ -289,7 +289,7 @@ static WRITE8_DEVICE_HANDLER( asuka_msm5205_start_w ) static WRITE8_DEVICE_HANDLER( asuka_msm5205_stop_w ) { - asuka_state *state = (asuka_state *)device->machine->driver_data; + asuka_state *state = device->machine->driver_data(); msm5205_reset_w(device, 1); state->adpcm_pos &= 0xff00; } @@ -835,7 +835,7 @@ static const tc0110pcr_interface asuka_tc0110pcr_intf = static MACHINE_START( asuka ) { - asuka_state *state = (asuka_state *)machine->driver_data; + asuka_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -860,7 +860,7 @@ static MACHINE_START( asuka ) static MACHINE_RESET( asuka ) { - asuka_state *state = (asuka_state *)machine->driver_data; + asuka_state *state = machine->driver_data(); state->adpcm_pos = 0; state->adpcm_data = -1; @@ -876,7 +876,7 @@ static MACHINE_RESET( asuka ) static VIDEO_EOF( asuka ) { - asuka_state *state = (asuka_state *)machine->driver_data; + asuka_state *state = machine->driver_data(); pc090oj_eof_callback(state->pc090oj); } diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index 3e80779c3f9..bc4886d508e 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -507,7 +507,7 @@ GFXDECODE_END static MACHINE_START( atarifb ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -532,7 +532,7 @@ static MACHINE_START( atarifb ) static MACHINE_RESET( atarifb ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); state->CTRLD = 0; state->sign_x_1 = 0; diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index a7680683c6c..6ca01780e2b 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -34,15 +34,15 @@ static void update_interrupts(running_machine *machine) { - atarig1_state *state = (atarig1_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + atarig1_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_START( atarig1 ) { - atarig1_state *state = (atarig1_state *)machine->driver_data; + atarig1_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->which_input); } @@ -50,11 +50,11 @@ static MACHINE_START( atarig1 ) static MACHINE_RESET( atarig1 ) { - atarig1_state *state = (atarig1_state *)machine->driver_data; + atarig1_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_slapstic_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_slapstic_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, atarig1_scanline_update, 8); atarijsa_reset(); } @@ -76,7 +76,7 @@ static WRITE16_HANDLER( mo_control_w ) static WRITE16_HANDLER( mo_command_w ) { - atarig1_state *state = (atarig1_state *)space->machine->driver_data; + atarig1_state *state = space->machine->driver_data(); COMBINE_DATA(state->mo_command); atarirle_command_w(0, (data == 0 && state->is_pitfight) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW); } @@ -91,9 +91,9 @@ static WRITE16_HANDLER( mo_command_w ) static READ16_HANDLER( special_port0_r ) { - atarig1_state *state = (atarig1_state *)space->machine->driver_data; + atarig1_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "IN0"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x1000; + if (state->cpu_to_sound_ready) temp ^= 0x1000; temp ^= 0x2000; /* A2DOK always high for now */ return temp; } @@ -101,7 +101,7 @@ static READ16_HANDLER( special_port0_r ) static WRITE16_HANDLER( a2d_select_w ) { - atarig1_state *state = (atarig1_state *)space->machine->driver_data; + atarig1_state *state = space->machine->driver_data(); state->which_input = offset; } @@ -109,7 +109,7 @@ static WRITE16_HANDLER( a2d_select_w ) static READ16_HANDLER( a2d_data_r ) { static const char *const adcnames[] = { "ADC0", "ADC1", "ADC2" }; - atarig1_state *state = (atarig1_state *)space->machine->driver_data; + atarig1_state *state = space->machine->driver_data(); /* Pit Fighter has no A2D, just another input port */ if (state->is_pitfight) @@ -149,7 +149,7 @@ INLINE void update_bank(atarig1_state *state, int bank) static STATE_POSTLOAD( pitfightb_state_postload ) { - atarig1_state *state = (atarig1_state *)machine->driver_data; + atarig1_state *state = machine->driver_data(); int bank = state->bslapstic_bank; state->bslapstic_bank = -1; update_bank(state, bank); @@ -158,7 +158,7 @@ static STATE_POSTLOAD( pitfightb_state_postload ) static READ16_HANDLER( pitfightb_cheap_slapstic_r ) { - atarig1_state *state = (atarig1_state *)space->machine->driver_data; + atarig1_state *state = space->machine->driver_data(); int result = state->bslapstic_base[offset & 0xfff]; /* the cheap replacement slapstic just triggers on the simple banking */ @@ -186,7 +186,7 @@ static READ16_HANDLER( pitfightb_cheap_slapstic_r ) static void pitfightb_cheap_slapstic_init(running_machine *machine) { - atarig1_state *state = (atarig1_state *)machine->driver_data; + atarig1_state *state = machine->driver_data(); /* install a read handler */ state->bslapstic_base = memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x038000, 0x03ffff, 0, 0, pitfightb_cheap_slapstic_r); @@ -221,13 +221,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfc0000, 0xfc0001) AM_READ(special_port0_r) AM_RANGE(0xfc8000, 0xfc8007) AM_READWRITE(a2d_data_r, a2d_select_w) AM_RANGE(0xfd0000, 0xfd0001) AM_READ(atarigen_sound_upper_r) - AM_RANGE(0xfd8000, 0xfdffff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(atarig1_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfd8000, 0xfdffff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(atarig1_state, eeprom, eeprom_size) /* AM_RANGE(0xfe0000, 0xfe7fff) AM_READ(from_r)*/ AM_RANGE(0xfe8000, 0xfe89ff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xff0000, 0xff0fff) AM_WRITE(atarirle_0_spriteram_w) AM_BASE(&atarirle_0_spriteram) AM_RANGE(0xff2000, 0xff2001) AM_WRITE(mo_command_w) AM_BASE_MEMBER(atarig1_state, mo_command) - AM_RANGE(0xff4000, 0xff5fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(atarig1_state, atarigen.playfield) - AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(atarig1_state, atarigen.alpha) + AM_RANGE(0xff4000, 0xff5fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(atarig1_state, playfield) + AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(atarig1_state, alpha) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -1169,9 +1169,9 @@ ROM_END static void init_g1_common(running_machine *machine, offs_t slapstic_base, int slapstic, int is_pitfight) { - atarig1_state *state = (atarig1_state *)machine->driver_data; + atarig1_state *state = machine->driver_data(); - state->atarigen.eeprom_default = NULL; + state->eeprom_default = NULL; if (slapstic == -1) { pitfightb_cheap_slapstic_init(machine); diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index e14a79096cc..8636a3dca66 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -33,15 +33,15 @@ static void update_interrupts(running_machine *machine) { - atarig42_state *state = (atarig42_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 5, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + atarig42_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 5, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_START( atarig42 ) { - atarig42_state *state = (atarig42_state *)machine->driver_data; + atarig42_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->analog_data); @@ -54,10 +54,10 @@ static MACHINE_START( atarig42 ) static MACHINE_RESET( atarig42 ) { - atarig42_state *state = (atarig42_state *)machine->driver_data; + atarig42_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, atarig42_scanline_update, 8); atarijsa_reset(); } @@ -72,10 +72,10 @@ static MACHINE_RESET( atarig42 ) static READ16_HANDLER( special_port2_r ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "IN2"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0020; - if (state->atarigen.sound_to_cpu_ready) temp ^= 0x0010; + if (state->cpu_to_sound_ready) temp ^= 0x0020; + if (state->sound_to_cpu_ready) temp ^= 0x0010; temp ^= 0x0008; /* A2D.EOC always high for now */ return temp; } @@ -84,7 +84,7 @@ static READ16_HANDLER( special_port2_r ) static WRITE16_HANDLER( a2d_select_w ) { static const char *const portnames[] = { "A2D0", "A2D1" }; - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); state->analog_data = input_port_read(space->machine, portnames[offset != 0]); } @@ -92,7 +92,7 @@ static WRITE16_HANDLER( a2d_select_w ) static READ16_HANDLER( a2d_data_r ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); return state->analog_data << 8; } @@ -125,7 +125,7 @@ static WRITE16_HANDLER( io_latch_w ) static WRITE16_HANDLER( mo_command_w ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); COMBINE_DATA(state->mo_command); atarirle_command_w(0, (data == 0) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW); } @@ -140,7 +140,7 @@ static WRITE16_HANDLER( mo_command_w ) static DIRECT_UPDATE_HANDLER( sloop_direct_handler ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); if (address < 0x80000) { direct->raw = direct->decrypted = (UINT8 *)state->sloop_base; @@ -264,7 +264,7 @@ static void roadriot_sloop_tweak(atarig42_state *state, int offset) static READ16_HANDLER( roadriot_sloop_data_r ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); roadriot_sloop_tweak(state, offset); if (offset < 0x78000/2) return state->sloop_base[offset]; @@ -275,7 +275,7 @@ static READ16_HANDLER( roadriot_sloop_data_r ) static WRITE16_HANDLER( roadriot_sloop_data_w ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); roadriot_sloop_tweak(state, offset); } @@ -323,7 +323,7 @@ static void guardians_sloop_tweak(atarig42_state *state, int offset) static READ16_HANDLER( guardians_sloop_data_r ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); guardians_sloop_tweak(state, offset); if (offset < 0x78000/2) return state->sloop_base[offset]; @@ -334,7 +334,7 @@ static READ16_HANDLER( guardians_sloop_data_r ) static WRITE16_HANDLER( guardians_sloop_data_w ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); guardians_sloop_tweak(state, offset); } @@ -363,11 +363,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf40000, 0xf40001) AM_READ(asic65_io_r) AM_RANGE(0xf60000, 0xf60001) AM_READ(asic65_r) AM_RANGE(0xf80000, 0xf80003) AM_WRITE(asic65_data_w) - AM_RANGE(0xfa0000, 0xfa0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(atarig42_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfa0000, 0xfa0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(atarig42_state, eeprom, eeprom_size) AM_RANGE(0xfc0000, 0xfc0fff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xff0000, 0xff0fff) AM_WRITE(atarirle_0_spriteram_w) AM_BASE(&atarirle_0_spriteram) - AM_RANGE(0xff2000, 0xff5fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(atarig42_state, atarigen.playfield) - AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(atarig42_state, atarigen.alpha) + AM_RANGE(0xff2000, 0xff5fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(atarig42_state, playfield) + AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(atarig42_state, alpha) AM_RANGE(0xff7000, 0xff7001) AM_WRITE(mo_command_w) AM_BASE_MEMBER(atarig42_state, mo_command) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -688,8 +688,8 @@ static DRIVER_INIT( roadriot ) 0x01B0,0x0146,0x012E,0x1A00,0x01C8,0x01D0,0x0118,0x0D00, 0x0118,0x0100,0x01C8,0x01D0,0x0000 }; - atarig42_state *state = (atarig42_state *)machine->driver_data; - state->atarigen.eeprom_default = default_eeprom; + atarig42_state *state = machine->driver_data(); + state->eeprom_default = default_eeprom; atarijsa_init(machine, "IN2", 0x0040); state->playfield_base = 0x400; @@ -738,8 +738,8 @@ static DRIVER_INIT( guardian ) 0x01BE,0x016D,0x0142,0x0100,0x0120,0x0109,0x0110,0x0141, 0x0109,0x0100,0x0108,0x0134,0x0105,0x0148,0x1400,0x0000 }; - atarig42_state *state = (atarig42_state *)machine->driver_data; - state->atarigen.eeprom_default = default_eeprom; + atarig42_state *state = machine->driver_data(); + state->eeprom_default = default_eeprom; atarijsa_init(machine, "IN2", 0x0040); state->playfield_base = 0x000; diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index cd37ce948fd..32f4c32d6eb 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -49,10 +49,10 @@ static void cage_irq_callback(running_machine *machine, int reason); static void update_interrupts(running_machine *machine) { - atarigt_state *state = (atarigt_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 3, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + atarigt_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 3, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -64,10 +64,10 @@ static MACHINE_START( atarigt ) static MACHINE_RESET( atarigt ) { - atarigt_state *state = (atarigt_state *)machine->driver_data; + atarigt_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, atarigt_scanline_update, 8); } @@ -108,10 +108,10 @@ static READ32_HANDLER( special_port2_r ) static READ32_HANDLER( special_port3_r ) { - atarigt_state *state = (atarigt_state *)space->machine->driver_data; + atarigt_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "COIN"); - if (state->atarigen.video_int_state) temp ^= 0x0001; - if (state->atarigen.scanline_int_state) temp ^= 0x0002; + if (state->video_int_state) temp ^= 0x0001; + if (state->scanline_int_state) temp ^= 0x0002; return (temp << 16) | temp; } @@ -211,7 +211,7 @@ static WRITE32_HANDLER( latch_w ) static WRITE32_HANDLER( mo_command_w ) { - atarigt_state *state = (atarigt_state *)space->machine->driver_data; + atarigt_state *state = space->machine->driver_data(); COMBINE_DATA(state->mo_command); if (ACCESSING_BITS_0_15) atarirle_command_w(0, ((data & 0xffff) == 2) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW); @@ -555,7 +555,7 @@ if (LOG_PROTECTION) static READ32_HANDLER( colorram_protection_r ) { - atarigt_state *state = (atarigt_state *)space->machine->driver_data; + atarigt_state *state = space->machine->driver_data(); offs_t address = 0xd80000 + offset * 4; UINT32 result32 = 0; UINT16 result; @@ -579,7 +579,7 @@ static READ32_HANDLER( colorram_protection_r ) static WRITE32_HANDLER( colorram_protection_w ) { - atarigt_state *state = (atarigt_state *)space->machine->driver_data; + atarigt_state *state = space->machine->driver_data(); offs_t address = 0xd80000 + offset * 4; if (ACCESSING_BITS_16_31) @@ -609,10 +609,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xc00000, 0xc00003) AM_READWRITE(sound_data_r, sound_data_w) AM_RANGE(0xd00014, 0xd00017) AM_READ(analog_port0_r) AM_RANGE(0xd0001c, 0xd0001f) AM_READ(analog_port1_r) - AM_RANGE(0xd20000, 0xd20fff) AM_READWRITE(atarigen_eeprom_upper32_r, atarigen_eeprom32_w) AM_BASE_SIZE_MEMBER(atarigt_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xd20000, 0xd20fff) AM_READWRITE(atarigen_eeprom_upper32_r, atarigen_eeprom32_w) AM_BASE_SIZE_MEMBER(atarigt_state, eeprom, eeprom_size) AM_RANGE(0xd40000, 0xd4ffff) AM_WRITE(atarigen_eeprom_enable32_w) - AM_RANGE(0xd72000, 0xd75fff) AM_WRITE(atarigen_playfield32_w) AM_BASE_MEMBER(atarigt_state, atarigen.playfield32) - AM_RANGE(0xd76000, 0xd76fff) AM_WRITE(atarigen_alpha32_w) AM_BASE_MEMBER(atarigt_state, atarigen.alpha32) + AM_RANGE(0xd72000, 0xd75fff) AM_WRITE(atarigen_playfield32_w) AM_BASE_MEMBER(atarigt_state, playfield32) + AM_RANGE(0xd76000, 0xd76fff) AM_WRITE(atarigen_alpha32_w) AM_BASE_MEMBER(atarigt_state, alpha32) AM_RANGE(0xd78000, 0xd78fff) AM_WRITE(atarirle_0_spriteram32_w) AM_BASE(&atarirle_0_spriteram32) AM_RANGE(0xd7a200, 0xd7a203) AM_WRITE(mo_command_w) AM_BASE_MEMBER(atarigt_state, mo_command) AM_RANGE(0xd70000, 0xd7ffff) AM_RAM @@ -1247,9 +1247,9 @@ static WRITE32_HANDLER( tmek_pf_w ) static DRIVER_INIT( tmek ) { - atarigt_state *state = (atarigt_state *)machine->driver_data; + atarigt_state *state = machine->driver_data(); - state->atarigen.eeprom_default = NULL; + state->eeprom_default = NULL; state->is_primrage = 0; cage_init(machine, 0x4fad); @@ -1266,9 +1266,9 @@ static DRIVER_INIT( tmek ) static void primrage_init_common(running_machine *machine, offs_t cage_speedup) { - atarigt_state *state = (atarigt_state *)machine->driver_data; + atarigt_state *state = machine->driver_data(); - state->atarigen.eeprom_default = NULL; + state->eeprom_default = NULL; state->is_primrage = 1; cage_init(machine, cage_speedup); diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 0467d3c0035..2a359d2da69 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -35,9 +35,9 @@ static void update_interrupts(running_machine *machine) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 5, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + atarigx2_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 5, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -49,10 +49,10 @@ static MACHINE_START( atarigx2 ) static MACHINE_RESET( atarigx2 ) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; + atarigx2_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, atarigx2_scanline_update, 8); atarijsa_reset(); } @@ -67,10 +67,10 @@ static MACHINE_RESET( atarigx2 ) static READ32_HANDLER( special_port2_r ) { - atarigx2_state *state = (atarigx2_state *)space->machine->driver_data; + atarigx2_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "SERVICE"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0020; - if (state->atarigen.sound_to_cpu_ready) temp ^= 0x0010; + if (state->cpu_to_sound_ready) temp ^= 0x0020; + if (state->sound_to_cpu_ready) temp ^= 0x0010; temp ^= 0x0008; /* A2D.EOC always high for now */ return (temp << 16) | temp; } @@ -129,7 +129,7 @@ static WRITE32_HANDLER( latch_w ) static WRITE32_HANDLER( mo_command_w ) { - atarigx2_state *state = (atarigx2_state *)space->machine->driver_data; + atarigx2_state *state = space->machine->driver_data(); COMBINE_DATA(state->mo_command); if (ACCESSING_BITS_0_15) atarirle_command_w(0, ((data & 0xffff) == 2) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW); @@ -146,7 +146,7 @@ static WRITE32_HANDLER( mo_command_w ) static WRITE32_HANDLER( atarigx2_protection_w ) { - atarigx2_state *state = (atarigx2_state *)space->machine->driver_data; + atarigx2_state *state = space->machine->driver_data(); { int pc = cpu_get_previouspc(space->cpu); // if (pc == 0x11cbe || pc == 0x11c30) @@ -1103,7 +1103,7 @@ static READ32_HANDLER( atarigx2_protection_r ) { 0xffffffff, 0xffff } }; - atarigx2_state *state = (atarigx2_state *)space->machine->driver_data; + atarigx2_state *state = space->machine->driver_data(); UINT32 result = state->protection_base[offset]; if (offset == 0x300) @@ -1153,10 +1153,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xc80000, 0xc80fff) AM_RAM AM_RANGE(0xca0000, 0xca0fff) AM_READWRITE(atarigx2_protection_r, atarigx2_protection_w) AM_BASE_MEMBER(atarigx2_state, protection_base) AM_RANGE(0xd00000, 0xd1ffff) AM_READ(a2d_data_r) - AM_RANGE(0xd20000, 0xd20fff) AM_READWRITE(atarigen_eeprom_upper32_r, atarigen_eeprom32_w) AM_BASE_SIZE_MEMBER(atarigx2_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xd20000, 0xd20fff) AM_READWRITE(atarigen_eeprom_upper32_r, atarigen_eeprom32_w) AM_BASE_SIZE_MEMBER(atarigx2_state, eeprom, eeprom_size) AM_RANGE(0xd40000, 0xd40fff) AM_RAM_WRITE(atarigen_666_paletteram32_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xd72000, 0xd75fff) AM_WRITE(atarigen_playfield32_w) AM_BASE_MEMBER(atarigx2_state, atarigen.playfield32) - AM_RANGE(0xd76000, 0xd76fff) AM_WRITE(atarigen_alpha32_w) AM_BASE_MEMBER(atarigx2_state, atarigen.alpha32) + AM_RANGE(0xd72000, 0xd75fff) AM_WRITE(atarigen_playfield32_w) AM_BASE_MEMBER(atarigx2_state, playfield32) + AM_RANGE(0xd76000, 0xd76fff) AM_WRITE(atarigen_alpha32_w) AM_BASE_MEMBER(atarigx2_state, alpha32) AM_RANGE(0xd78000, 0xd78fff) AM_WRITE(atarirle_0_spriteram32_w) AM_BASE(&atarirle_0_spriteram32) AM_RANGE(0xd7a200, 0xd7a203) AM_WRITE(mo_command_w) AM_BASE_MEMBER(atarigx2_state, mo_command) AM_RANGE(0xd70000, 0xd7ffff) AM_RAM @@ -2144,7 +2144,7 @@ ROM_END static DRIVER_INIT( spclords ) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; + atarigx2_state *state = machine->driver_data(); atarijsa_init(machine, "SERVICE", 0x0040); @@ -2156,7 +2156,7 @@ static DRIVER_INIT( spclords ) static DRIVER_INIT( motofren ) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; + atarigx2_state *state = machine->driver_data(); atarijsa_init(machine, "SERVICE", 0x0040); @@ -2194,7 +2194,7 @@ static READ32_HANDLER( rrreveng_prot_r ) static DRIVER_INIT( rrreveng ) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; + atarigx2_state *state = machine->driver_data(); atarijsa_init(machine, "SERVICE", 0x0040); diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index a88c3b59a22..5f2497c6055 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -188,17 +188,17 @@ static void update_interrupts(running_machine *machine) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); cputag_set_input_line(machine, "maincpu", 2, state->joystick_int && state->joystick_int_enable ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 3, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 3, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_START( atarisy1 ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->joystick_int); @@ -209,12 +209,12 @@ static MACHINE_START( atarisy1 ) static MACHINE_RESET( atarisy1 ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); /* initialize the system */ - atarigen_eeprom_reset(&state->atarigen); - atarigen_slapstic_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_slapstic_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_sound_io_reset(machine->device("audiocpu")); /* reset the joystick parameters */ @@ -233,7 +233,7 @@ static MACHINE_RESET( atarisy1 ) static TIMER_DEVICE_CALLBACK( delayed_joystick_int ) { - atarisy1_state *state = (atarisy1_state *)timer.machine->driver_data; + atarisy1_state *state = timer.machine->driver_data(); state->joystick_value = param; state->joystick_int = 1; atarigen_update_interrupts(timer.machine); @@ -242,7 +242,7 @@ static TIMER_DEVICE_CALLBACK( delayed_joystick_int ) static READ16_HANDLER( joystick_r ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); int newval = 0xff; static const char *const portnames[] = { "IN0", "IN1" }; @@ -273,7 +273,7 @@ static READ16_HANDLER( joystick_r ) static WRITE16_HANDLER( joystick_w ) { /* the A4 bit enables/disables joystick IRQs */ - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); state->joystick_int_enable = ((offset >> 3) & 1) ^ 1; } @@ -287,7 +287,7 @@ static WRITE16_HANDLER( joystick_w ) static READ16_HANDLER( trakball_r ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); int result = 0xff; /* Marble Madness trackball type -- rotated 45 degrees! */ @@ -337,9 +337,9 @@ static READ16_HANDLER( trakball_r ) static READ16_HANDLER( port4_r ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "F60000"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0080; + if (state->cpu_to_sound_ready) temp ^= 0x0080; return temp; } @@ -353,11 +353,11 @@ static READ16_HANDLER( port4_r ) static READ8_HANDLER( switch_6502_r ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "1820"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x08; - if (state->atarigen.sound_to_cpu_ready) temp ^= 0x10; + if (state->cpu_to_sound_ready) temp ^= 0x08; + if (state->sound_to_cpu_ready) temp ^= 0x10; if (!(input_port_read(space->machine, "F60000") & 0x0040)) temp ^= 0x80; return temp; @@ -453,19 +453,19 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x087fff) AM_ROM /* slapstic maps here */ AM_RANGE(0x2e0000, 0x2e0001) AM_READ(atarisy1_int3state_r) AM_RANGE(0x400000, 0x401fff) AM_RAM - AM_RANGE(0x800000, 0x800001) AM_WRITE(atarisy1_xscroll_w) AM_BASE_MEMBER(atarisy1_state, atarigen.xscroll) - AM_RANGE(0x820000, 0x820001) AM_WRITE(atarisy1_yscroll_w) AM_BASE_MEMBER(atarisy1_state, atarigen.yscroll) + AM_RANGE(0x800000, 0x800001) AM_WRITE(atarisy1_xscroll_w) AM_BASE_MEMBER(atarisy1_state, xscroll) + AM_RANGE(0x820000, 0x820001) AM_WRITE(atarisy1_yscroll_w) AM_BASE_MEMBER(atarisy1_state, yscroll) AM_RANGE(0x840000, 0x840001) AM_WRITE(atarisy1_priority_w) AM_RANGE(0x860000, 0x860001) AM_WRITE(atarisy1_bankselect_w) AM_BASE_MEMBER(atarisy1_state, bankselect) AM_RANGE(0x880000, 0x880001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x8a0000, 0x8a0001) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x900000, 0x9fffff) AM_RAM - AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(atarisy1_state, atarigen.playfield) + AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(atarisy1_state, playfield) AM_RANGE(0xa02000, 0xa02fff) AM_RAM_WRITE(atarisy1_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0xa03000, 0xa03fff) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(atarisy1_state, atarigen.alpha) + AM_RANGE(0xa03000, 0xa03fff) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(atarisy1_state, alpha) AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xf00000, 0xf00fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(atarisy1_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xf00000, 0xf00fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(atarisy1_state, eeprom, eeprom_size) AM_RANGE(0xf20000, 0xf20007) AM_READ(trakball_r) AM_RANGE(0xf40000, 0xf4001f) AM_READWRITE(joystick_r, joystick_w) AM_RANGE(0xf60000, 0xf60003) AM_READ(port4_r) @@ -2325,7 +2325,7 @@ ROM_END static DRIVER_INIT( marble ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_slapstic_init(machine->device("maincpu"), 0x080000, 0, 103); @@ -2336,7 +2336,7 @@ static DRIVER_INIT( marble ) static DRIVER_INIT( peterpak ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_slapstic_init(machine->device("maincpu"), 0x080000, 0, 107); @@ -2347,7 +2347,7 @@ static DRIVER_INIT( peterpak ) static DRIVER_INIT( indytemp ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_slapstic_init(machine->device("maincpu"), 0x080000, 0, 105); @@ -2358,7 +2358,7 @@ static DRIVER_INIT( indytemp ) static DRIVER_INIT( roadrunn ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_slapstic_init(machine->device("maincpu"), 0x080000, 0, 108); @@ -2369,7 +2369,7 @@ static DRIVER_INIT( roadrunn ) static DRIVER_INIT( roadb109 ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_slapstic_init(machine->device("maincpu"), 0x080000, 0, 109); @@ -2380,7 +2380,7 @@ static DRIVER_INIT( roadb109 ) static DRIVER_INIT( roadb110 ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); atarigen_slapstic_init(machine->device("maincpu"), 0x080000, 0, 110); diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 26af184172d..d78ad64e214 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -157,14 +157,14 @@ static STATE_POSTLOAD( bankselect_postload ); static void update_interrupts(running_machine *machine) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); - if (state->atarigen.video_int_state) + if (state->video_int_state) cputag_set_input_line(machine, "maincpu", 3, ASSERT_LINE); else cputag_set_input_line(machine, "maincpu", 3, CLEAR_LINE); - if (state->atarigen.scanline_int_state) + if (state->scanline_int_state) cputag_set_input_line(machine, "maincpu", 2, ASSERT_LINE); else cputag_set_input_line(machine, "maincpu", 2, CLEAR_LINE); @@ -190,7 +190,7 @@ static void update_interrupts(running_machine *machine) static void scanline_update(screen_device &screen, int scanline) { - atarisy2_state *state = (atarisy2_state *)screen.machine->driver_data; + atarisy2_state *state = screen.machine->driver_data(); if (scanline <= screen.height()) { /* generate the 32V interrupt (IRQ 2) */ @@ -210,7 +210,7 @@ static void scanline_update(screen_device &screen, int scanline) static DIRECT_UPDATE_HANDLER( atarisy2_direct_handler ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); /* make sure slapstic area looks like ROM */ if (address >= 0x8000 && address < 0x8200) @@ -224,7 +224,7 @@ static DIRECT_UPDATE_HANDLER( atarisy2_direct_handler ) static MACHINE_START( atarisy2 ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->interrupt_enable); @@ -238,11 +238,11 @@ static MACHINE_START( atarisy2 ) static MACHINE_RESET( atarisy2 ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); + atarigen_eeprom_reset(state); slapstic_reset(); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_interrupt_reset(state, update_interrupts); atarigen_sound_io_reset(machine->device("soundcpu")); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update, 64); memory_set_direct_update_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), atarisy2_direct_handler); @@ -263,7 +263,7 @@ static MACHINE_RESET( atarisy2 ) static INTERRUPT_GEN( vblank_int ) { - atarisy2_state *state = (atarisy2_state *)device->machine->driver_data; + atarisy2_state *state = device->machine->driver_data(); /* clock the VBLANK through */ if (state->interrupt_enable & 8) @@ -274,7 +274,7 @@ static INTERRUPT_GEN( vblank_int ) static WRITE16_HANDLER( int0_ack_w ) { /* reset sound IRQ */ - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); state->p2portrd_state = 0; atarigen_update_interrupts(space->machine); } @@ -290,7 +290,7 @@ static WRITE16_HANDLER( int1_ack_w ) static TIMER_CALLBACK( delayed_int_enable_w ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); state->interrupt_enable = param; } @@ -331,7 +331,7 @@ static WRITE16_HANDLER( bankselect_w ) 0x8e000, 0x86000, 0x7e000, 0x76000 }; - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); int newword = state->bankselect[offset]; UINT8 *base; @@ -346,7 +346,7 @@ static WRITE16_HANDLER( bankselect_w ) static STATE_POSTLOAD( bankselect_postload ) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); bankselect_w(space, 0, state->bankselect[0], 0xffff); bankselect_w(space, 1, state->bankselect[1], 0xffff); @@ -362,11 +362,11 @@ static STATE_POSTLOAD( bankselect_postload ) static READ16_HANDLER( switch_r ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "1800") | (input_port_read(space->machine, "1801") << 8); - if (state->atarigen.cpu_to_sound_ready) result ^= 0x20; - if (state->atarigen.sound_to_cpu_ready) result ^= 0x10; + if (state->cpu_to_sound_ready) result ^= 0x20; + if (state->sound_to_cpu_ready) result ^= 0x10; return result; } @@ -374,11 +374,11 @@ static READ16_HANDLER( switch_r ) static READ8_HANDLER( switch_6502_r ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "1840"); - if (state->atarigen.cpu_to_sound_ready) result |= 0x01; - if (state->atarigen.sound_to_cpu_ready) result |= 0x02; + if (state->cpu_to_sound_ready) result |= 0x01; + if (state->sound_to_cpu_ready) result |= 0x02; if ((state->has_tms5220) && (tms5220_readyq_r(space->machine->device("tms")) == 0)) result &= ~0x04; if (!(input_port_read(space->machine, "1801") & 0x80)) result |= 0x10; @@ -389,7 +389,7 @@ static READ8_HANDLER( switch_6502_r ) static WRITE8_HANDLER( switch_6502_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); if (state->has_tms5220) { @@ -408,7 +408,7 @@ static WRITE8_HANDLER( switch_6502_w ) static WRITE16_HANDLER( adc_strobe_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); state->which_adc = offset & 3; } @@ -416,7 +416,7 @@ static WRITE16_HANDLER( adc_strobe_w ) static READ16_HANDLER( adc_r ) { static const char *const adcnames[] = { "ADC0", "ADC1", "ADC2", "ADC3" }; - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); if (state->which_adc < state->pedal_count) return ~input_port_read(space->machine, adcnames[state->which_adc]); @@ -428,7 +428,7 @@ static READ16_HANDLER( adc_r ) static READ8_HANDLER( leta_r ) { static const char *const letanames[] = { "LETA0", "LETA1", "LETA2", "LETA3" }; - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); if (state->pedal_count == -1) /* 720 */ { @@ -611,7 +611,7 @@ static WRITE8_HANDLER( mixer_w ) static WRITE8_HANDLER( sound_reset_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); /* if no change, do nothing */ if ((data & 1) == state->sound_reset_state) @@ -635,7 +635,7 @@ static WRITE8_HANDLER( sound_reset_w ) static READ16_HANDLER( sound_r ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); /* clear the p2portwr state on a p1portrd */ state->p2portwr_state = 0; @@ -648,7 +648,7 @@ static READ16_HANDLER( sound_r ) static WRITE8_HANDLER( sound_6502_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); /* clock the state through */ state->p2portwr_state = (state->interrupt_enable & 2) != 0; @@ -661,7 +661,7 @@ static WRITE8_HANDLER( sound_6502_w ) static READ8_HANDLER( sound_6502_r ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); /* clock the state through */ state->p2portrd_state = (state->interrupt_enable & 1) != 0; @@ -681,7 +681,7 @@ static READ8_HANDLER( sound_6502_r ) static WRITE8_HANDLER( tms5220_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); if (state->has_tms5220) { tms5220_data_w(space->machine->device("tms"), 0, data); @@ -690,7 +690,7 @@ static WRITE8_HANDLER( tms5220_w ) static WRITE8_HANDLER( tms5220_strobe_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); if (state->has_tms5220) { tms5220_wsq_w(space->machine->device("tms"), 1-(offset & 1)); @@ -729,8 +729,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x15e0, 0x15e1) AM_MIRROR(0x001e) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0x1600, 0x1601) AM_MIRROR(0x007e) AM_WRITE(int_enable_w) AM_RANGE(0x1680, 0x1681) AM_MIRROR(0x007e) AM_WRITE(atarigen_sound_w) - AM_RANGE(0x1700, 0x1701) AM_MIRROR(0x007e) AM_WRITE(atarisy2_xscroll_w) AM_BASE_MEMBER(atarisy2_state, atarigen.xscroll) - AM_RANGE(0x1780, 0x1781) AM_MIRROR(0x007e) AM_WRITE(atarisy2_yscroll_w) AM_BASE_MEMBER(atarisy2_state, atarigen.yscroll) + AM_RANGE(0x1700, 0x1701) AM_MIRROR(0x007e) AM_WRITE(atarisy2_xscroll_w) AM_BASE_MEMBER(atarisy2_state, xscroll) + AM_RANGE(0x1780, 0x1781) AM_MIRROR(0x007e) AM_WRITE(atarisy2_yscroll_w) AM_BASE_MEMBER(atarisy2_state, yscroll) AM_RANGE(0x1800, 0x1801) AM_MIRROR(0x03fe) AM_READWRITE(switch_r, watchdog_reset16_w) AM_RANGE(0x1c00, 0x1c01) AM_MIRROR(0x03fe) AM_READ(sound_r) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(atarisy2_videoram_r, atarisy2_videoram_w) @@ -751,7 +751,7 @@ ADDRESS_MAP_END /* full memory map derived from schematics */ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x2000) AM_RAM - AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0x2000) AM_RAM AM_BASE_SIZE_MEMBER(atarisy2_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0x2000) AM_RAM AM_BASE_SIZE_MEMBER(atarisy2_state, eeprom, eeprom_size) AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x2780) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w) AM_RANGE(0x1810, 0x1813) AM_MIRROR(0x278c) AM_READ(leta_r) AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x2780) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w) @@ -3037,10 +3037,10 @@ static DRIVER_INIT( paperboy ) 0x0000 }; int i; - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); UINT8 *cpu1 = memory_region(machine, "maincpu"); - state->atarigen.eeprom_default = compressed_default_eeprom; + state->eeprom_default = compressed_default_eeprom; slapstic_init(machine, 105); /* expand the 16k program ROMs into full 64k chunks */ @@ -3088,8 +3088,8 @@ static DRIVER_INIT( 720 ) 0x0152,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0x06ff, 0x0000 }; - atarisy2_state *state = (atarisy2_state *)machine->driver_data; - state->atarigen.eeprom_default = compressed_default_eeprom; + atarisy2_state *state = machine->driver_data(); + state->eeprom_default = compressed_default_eeprom; slapstic_init(machine, 107); state->pedal_count = -1; @@ -3100,11 +3100,11 @@ static DRIVER_INIT( 720 ) static void ssprint_init_common(running_machine *machine, const UINT16 *default_eeprom) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); int i; UINT8 *cpu1 = memory_region(machine, "maincpu"); - state->atarigen.eeprom_default = default_eeprom; + state->eeprom_default = default_eeprom; slapstic_init(machine, 108); /* expand the 32k program ROMs into full 64k chunks */ @@ -3226,10 +3226,10 @@ static DRIVER_INIT( csprint ) 0x0186,0x0100,0x011B,0x01BC,0x011D,0x011F,0x0000 }; int i; - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); UINT8 *cpu1 = memory_region(machine, "maincpu"); - state->atarigen.eeprom_default = compressed_default_eeprom; + state->eeprom_default = compressed_default_eeprom; slapstic_init(machine, 109); /* expand the 32k program ROMs into full 64k chunks */ @@ -3243,9 +3243,9 @@ static DRIVER_INIT( csprint ) static DRIVER_INIT( apb ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); - state->atarigen.eeprom_default = NULL; + state->eeprom_default = NULL; slapstic_init(machine, 110); state->pedal_count = 2; diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c index 159fce6a325..9a3111a21e0 100644 --- a/src/mame/drivers/attckufo.c +++ b/src/mame/drivers/attckufo.c @@ -46,13 +46,14 @@ LOIPOIO-B #include "sound/mos6560.h" -class attckufo_state +class attckufo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, attckufo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, attckufo_state(machine)); } attckufo_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), mos6560(machine.device("mos6560")) { } /* memory pointers */ @@ -157,26 +158,26 @@ INPUT_PORTS_END static INTERRUPT_GEN( attckufo_raster_interrupt ) { - attckufo_state *state = (attckufo_state *)device->machine->driver_data; + attckufo_state *state = device->machine->driver_data(); mos6560_raster_interrupt_gen(state->mos6560); } static VIDEO_UPDATE( attckufo ) { - attckufo_state *state = (attckufo_state *)screen->machine->driver_data; + attckufo_state *state = screen->machine->driver_data(); mos6560_video_update(state->mos6560, bitmap, cliprect); return 0; } static int attckufo_dma_read( running_machine *machine, int offset ) { - attckufo_state *state = (attckufo_state *)machine->driver_data; + attckufo_state *state = machine->driver_data(); return memory_read_byte(state->maincpu->space(AS_PROGRAM), offset); } static int attckufo_dma_read_color( running_machine *machine, int offset ) { - attckufo_state *state = (attckufo_state *)machine->driver_data; + attckufo_state *state = machine->driver_data(); return memory_read_byte(state->maincpu->space(AS_PROGRAM), offset + 0x400); } diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index 196b4c66a65..f145e546e75 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -60,7 +60,7 @@ static INTERRUPT_GEN( avalnche_interrupt ) static VIDEO_UPDATE( avalnche ) { - avalnche_state *state = (avalnche_state *)screen->machine->driver_data; + avalnche_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -93,7 +93,7 @@ static VIDEO_UPDATE( avalnche ) static WRITE8_HANDLER( avalance_video_invert_w ) { - avalnche_state *state = (avalnche_state *)space->machine->driver_data; + avalnche_state *state = space->machine->driver_data(); state->avalance_video_inverted = data & 0x01; } @@ -218,14 +218,14 @@ INPUT_PORTS_END static MACHINE_START( avalnche ) { - avalnche_state *state = (avalnche_state *)machine->driver_data; + avalnche_state *state = machine->driver_data(); state_save_register_global(machine, state->avalance_video_inverted); } static MACHINE_RESET( avalnche ) { - avalnche_state *state = (avalnche_state *)machine->driver_data; + avalnche_state *state = machine->driver_data(); state->avalance_video_inverted = 0; } diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index ac5b5c1fee4..cad77af7830 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -20,12 +20,13 @@ #include "video/deco16ic.h" #include "rendlay.h" -class backfire_state +class backfire_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, backfire_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, backfire_state(machine)); } - backfire_state(running_machine &machine) { } + backfire_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; @@ -55,7 +56,7 @@ public: /* I'm using the functions in deco16ic.c ... same chips, why duplicate code? */ static VIDEO_START( backfire ) { - backfire_state *state = (backfire_state *)machine->driver_data; + backfire_state *state = machine->driver_data(); /* allocate the ram as 16-bit (we do it here because the CPU is 32-bit) */ state->pf1_rowscroll = auto_alloc_array(machine, UINT16, 0x0800/2); @@ -160,7 +161,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( backfire ) { - backfire_state *state = (backfire_state *)screen->machine->driver_data; + backfire_state *state = screen->machine->driver_data(); /* screen 1 uses pf1 as the forground and pf3 as the background */ /* screen 2 uses pf2 as the foreground and pf4 as the background */ @@ -224,7 +225,7 @@ static READ32_DEVICE_HANDLER( backfire_eeprom_r ) static READ32_HANDLER( backfire_control2_r ) { - backfire_state *state = (backfire_state *)space->machine->driver_data; + backfire_state *state = space->machine->driver_data(); // logerror("%08x:Read eprom %08x (%08x)\n", cpu_get_pc(space->cpu), offset << 1, mem_mask); return (eeprom_read_bit(state->eeprom) << 24) | input_port_read(space->machine, "IN1") | (input_port_read(space->machine, "IN1") << 16); @@ -233,7 +234,7 @@ static READ32_HANDLER( backfire_control2_r ) #ifdef UNUSED_FUNCTION static READ32_HANDLER(backfire_control3_r) { - backfire_state *state = (backfire_state *)space->machine->driver_data; + backfire_state *state = space->machine->driver_data(); // logerror("%08x:Read eprom %08x (%08x)\n", cpu_get_pc(space->cpu), offset << 1, mem_mask); return (eeprom_read_bit(state->eeprom) << 24) | input_port_read(space->machine, "IN2") | (input_port_read(space->machine, "IN2") << 16); @@ -261,14 +262,14 @@ static WRITE32_HANDLER(backfire_nonbuffered_palette_w) /* map 32-bit writes to 16-bit */ -static READ32_HANDLER( backfire_pf1_rowscroll_r ) { backfire_state *state = (backfire_state *)space->machine->driver_data; return state->pf1_rowscroll[offset] ^ 0xffff0000; } -static READ32_HANDLER( backfire_pf2_rowscroll_r ) { backfire_state *state = (backfire_state *)space->machine->driver_data; return state->pf2_rowscroll[offset] ^ 0xffff0000; } -static READ32_HANDLER( backfire_pf3_rowscroll_r ) { backfire_state *state = (backfire_state *)space->machine->driver_data; return state->pf3_rowscroll[offset] ^ 0xffff0000; } -static READ32_HANDLER( backfire_pf4_rowscroll_r ) { backfire_state *state = (backfire_state *)space->machine->driver_data; return state->pf4_rowscroll[offset] ^ 0xffff0000; } -static WRITE32_HANDLER( backfire_pf1_rowscroll_w ) { backfire_state *state = (backfire_state *)space->machine->driver_data; data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf1_rowscroll[offset]); } -static WRITE32_HANDLER( backfire_pf2_rowscroll_w ) { backfire_state *state = (backfire_state *)space->machine->driver_data; data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf2_rowscroll[offset]); } -static WRITE32_HANDLER( backfire_pf3_rowscroll_w ) { backfire_state *state = (backfire_state *)space->machine->driver_data; data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf3_rowscroll[offset]); } -static WRITE32_HANDLER( backfire_pf4_rowscroll_w ) { backfire_state *state = (backfire_state *)space->machine->driver_data; data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf4_rowscroll[offset]); } +static READ32_HANDLER( backfire_pf1_rowscroll_r ) { backfire_state *state = space->machine->driver_data(); return state->pf1_rowscroll[offset] ^ 0xffff0000; } +static READ32_HANDLER( backfire_pf2_rowscroll_r ) { backfire_state *state = space->machine->driver_data(); return state->pf2_rowscroll[offset] ^ 0xffff0000; } +static READ32_HANDLER( backfire_pf3_rowscroll_r ) { backfire_state *state = space->machine->driver_data(); return state->pf3_rowscroll[offset] ^ 0xffff0000; } +static READ32_HANDLER( backfire_pf4_rowscroll_r ) { backfire_state *state = space->machine->driver_data(); return state->pf4_rowscroll[offset] ^ 0xffff0000; } +static WRITE32_HANDLER( backfire_pf1_rowscroll_w ) { backfire_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf1_rowscroll[offset]); } +static WRITE32_HANDLER( backfire_pf2_rowscroll_w ) { backfire_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf2_rowscroll[offset]); } +static WRITE32_HANDLER( backfire_pf3_rowscroll_w ) { backfire_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf3_rowscroll[offset]); } +static WRITE32_HANDLER( backfire_pf4_rowscroll_w ) { backfire_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf4_rowscroll[offset]); } #ifdef UNUSED_FUNCTION @@ -469,7 +470,7 @@ static const deco16ic_interface backfire_deco16ic_intf = static MACHINE_START( backfire ) { - backfire_state *state = (backfire_state *)machine->driver_data; + backfire_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->deco16ic = machine->device("deco_custom"); @@ -675,7 +676,7 @@ static void descramble_sound( running_machine *machine ) static READ32_HANDLER( backfire_speedup_r ) { - backfire_state *state = (backfire_state *)space->machine->driver_data; + backfire_state *state = space->machine->driver_data(); //mame_printf_debug( "%08x\n",cpu_get_pc(space->cpu)); diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 210463e7cd7..2764e4ae401 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -178,9 +178,9 @@ Measurements - static void update_interrupts(running_machine *machine) { - badlands_state *state = (badlands_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + badlands_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -198,7 +198,7 @@ static void scanline_update(screen_device &screen, int scanline) static MACHINE_START( badlands ) { - badlands_state *state = (badlands_state *)machine->driver_data; + badlands_state *state = machine->driver_data(); atarigen_init(machine); @@ -208,12 +208,12 @@ static MACHINE_START( badlands ) static MACHINE_RESET( badlands ) { - badlands_state *state = (badlands_state *)machine->driver_data; + badlands_state *state = machine->driver_data(); state->pedal_value[0] = state->pedal_value[1] = 0x80; - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update, 32); atarigen_sound_io_reset(machine->device("audiocpu")); @@ -230,7 +230,7 @@ static MACHINE_RESET( badlands ) static INTERRUPT_GEN( vblank_int ) { - badlands_state *state = (badlands_state *)device->machine->driver_data; + badlands_state *state = device->machine->driver_data(); int pedal_state = input_port_read(device->machine, "PEDALS"); int i; @@ -255,23 +255,23 @@ static INTERRUPT_GEN( vblank_int ) static READ16_HANDLER( sound_busy_r ) { - badlands_state *state = (badlands_state *)space->machine->driver_data; + badlands_state *state = space->machine->driver_data(); int temp = 0xfeff; - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0100; + if (state->cpu_to_sound_ready) temp ^= 0x0100; return temp; } static READ16_HANDLER( pedal_0_r ) { - badlands_state *state = (badlands_state *)space->machine->driver_data; + badlands_state *state = space->machine->driver_data(); return state->pedal_value[0]; } static READ16_HANDLER( pedal_1_r ) { - badlands_state *state = (badlands_state *)space->machine->driver_data; + badlands_state *state = space->machine->driver_data(); return state->pedal_value[1]; } @@ -285,7 +285,7 @@ static READ16_HANDLER( pedal_1_r ) static READ8_HANDLER( audio_io_r ) { - badlands_state *state = (badlands_state *)space->machine->driver_data; + badlands_state *state = space->machine->driver_data(); int result = 0xff; switch (offset & 0x206) @@ -311,8 +311,8 @@ static READ8_HANDLER( audio_io_r ) */ result = input_port_read(space->machine, "AUDIO"); if (!(input_port_read(space->machine, "FE4000") & 0x0080)) result ^= 0x90; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x40; - if (state->atarigen.sound_to_cpu_ready) result ^= 0x20; + if (state->cpu_to_sound_ready) result ^= 0x40; + if (state->sound_to_cpu_ready) result ^= 0x20; result ^= 0x10; break; @@ -334,7 +334,7 @@ static READ8_HANDLER( audio_io_r ) static WRITE8_HANDLER( audio_io_w ) { - badlands_state *state = (badlands_state *)space->machine->driver_data; + badlands_state *state = space->machine->driver_data(); switch (offset & 0x206) { @@ -384,7 +384,7 @@ static WRITE8_HANDLER( audio_io_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0xfc0000, 0xfc1fff) AM_READWRITE(sound_busy_r, atarigen_sound_reset_w) - AM_RANGE(0xfd0000, 0xfd1fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(badlands_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfd0000, 0xfd1fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(badlands_state, eeprom, eeprom_size) AM_RANGE(0xfe0000, 0xfe1fff) AM_WRITE(watchdog_reset16_w) AM_RANGE(0xfe2000, 0xfe3fff) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xfe4000, 0xfe5fff) AM_READ_PORT("FE4000") @@ -397,7 +397,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfec000, 0xfedfff) AM_WRITE(badlands_pf_bank_w) AM_RANGE(0xfee000, 0xfeffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0xffc000, 0xffc3ff) AM_RAM_WRITE(atarigen_expanded_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(badlands_state, atarigen.playfield) + AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(badlands_state, playfield) AM_RANGE(0xfff000, 0xfff1ff) AM_RAM_WRITE(atarimo_0_spriteram_expanded_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xfff200, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -589,7 +589,7 @@ ROM_END static DRIVER_INIT( badlands ) { - badlands_state *state = (badlands_state *)machine->driver_data; + badlands_state *state = machine->driver_data(); /* initialize the audio system */ state->bank_base = &memory_region(machine, "audiocpu")[0x03000]; @@ -653,14 +653,14 @@ static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfe4006, 0xfe4007) AM_READ(badlandsb_unk_r ) - AM_RANGE(0xfd0000, 0xfd1fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(badlands_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfd0000, 0xfd1fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(badlands_state, eeprom, eeprom_size) //AM_RANGE(0xfe0000, 0xfe1fff) AM_WRITE(watchdog_reset16_w) AM_RANGE(0xfe2000, 0xfe3fff) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xfec000, 0xfedfff) AM_WRITE(badlands_pf_bank_w) AM_RANGE(0xfee000, 0xfeffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0xffc000, 0xffc3ff) AM_RAM_WRITE(atarigen_expanded_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(badlands_state, atarigen.playfield) + AM_RANGE(0xffe000, 0xffefff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(badlands_state, playfield) AM_RANGE(0xfff000, 0xfff1ff) AM_RAM_WRITE(atarimo_0_spriteram_expanded_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xfff200, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -684,8 +684,8 @@ GFXDECODE_END static void update_interrupts_bootleg(running_machine *machine) { - badlands_state *state = (badlands_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); + badlands_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -702,11 +702,11 @@ static void scanline_update_bootleg(screen_device &screen, int scanline) static MACHINE_RESET( badlandsb ) { - badlands_state *state = (badlands_state *)machine->driver_data; + badlands_state *state = machine->driver_data(); // state->pedal_value[0] = state->pedal_value[1] = 0x80; - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts_bootleg); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts_bootleg); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update_bootleg, 32); // atarigen_sound_io_reset(machine->device("audiocpu")); diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 9027d6a82c6..d8f249b6482 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -2107,7 +2107,7 @@ static void expand_roms(running_machine *machine, UINT8 cd_rom_mask) INLINE void config_shooter_adc(running_machine *machine, UINT8 shooter, UINT8 adc_shift) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); state->shooter = shooter; state->adc_shift = adc_shift; } diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index a23dd97c58c..df4e65f4472 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -261,7 +261,7 @@ GFXDECODE_END static MACHINE_RESET( bankp ) { - bankp_state *state = (bankp_state *)machine->driver_data; + bankp_state *state = machine->driver_data(); state->scroll_x = 0; state->priority = 0; diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c index 55e44261f1e..f9024359af1 100644 --- a/src/mame/drivers/batman.c +++ b/src/mame/drivers/batman.c @@ -32,15 +32,15 @@ static void update_interrupts(running_machine *machine) { - batman_state *state = (batman_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + batman_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_START( batman ) { - batman_state *state = (batman_state *)machine->driver_data; + batman_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->latch_data); @@ -50,11 +50,11 @@ static MACHINE_START( batman ) static MACHINE_RESET( batman ) { - batman_state *state = (batman_state *)machine->driver_data; + batman_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); - atarivc_reset(*machine->primary_screen, state->atarigen.atarivc_eof_data, 2); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); + atarivc_reset(*machine->primary_screen, state->atarivc_eof_data, 2); atarigen_scanline_timer_reset(*machine->primary_screen, batman_scanline_update, 8); atarijsa_reset(); } @@ -88,17 +88,17 @@ static WRITE16_HANDLER( batman_atarivc_w ) static READ16_HANDLER( special_port2_r ) { - batman_state *state = (batman_state *)space->machine->driver_data; + batman_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "260010"); - if (state->atarigen.sound_to_cpu_ready) result ^= 0x0010; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0020; + if (state->sound_to_cpu_ready) result ^= 0x0010; + if (state->cpu_to_sound_ready) result ^= 0x0020; return result; } static WRITE16_HANDLER( latch_w ) { - batman_state *state = (batman_state *)space->machine->driver_data; + batman_state *state = space->machine->driver_data(); int oldword = state->latch_data; COMBINE_DATA(&state->latch_data); @@ -112,7 +112,7 @@ static WRITE16_HANDLER( latch_w ) if ((oldword ^ state->latch_data) & 0x7000) { space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); - tilemap_mark_all_tiles_dirty(state->atarigen.alpha_tilemap); + tilemap_mark_all_tiles_dirty(state->alpha_tilemap); state->alpha_tile_bank = (state->latch_data >> 12) & 7; } } @@ -133,7 +133,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0x3fffff) AM_RANGE(0x000000, 0x0bffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM - AM_RANGE(0x120000, 0x120fff) AM_MIRROR(0x01f000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(batman_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x120000, 0x120fff) AM_MIRROR(0x01f000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(batman_state, eeprom, eeprom_size) AM_RANGE(0x260000, 0x260001) AM_MIRROR(0x11ff8c) AM_READ_PORT("260000") AM_RANGE(0x260002, 0x260003) AM_MIRROR(0x11ff8c) AM_READ_PORT("260002") AM_RANGE(0x260010, 0x260011) AM_MIRROR(0x11ff8e) AM_READ(special_port2_r) @@ -143,13 +143,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260060, 0x260061) AM_MIRROR(0x11ff8e) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x2a0000, 0x2a0001) AM_MIRROR(0x11fffe) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_MIRROR(0x100000) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3effc0, 0x3effff) AM_MIRROR(0x100000) AM_READWRITE(batman_atarivc_r, batman_atarivc_w) AM_BASE_MEMBER(batman_state, atarigen.atarivc_data) - AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE_MEMBER(batman_state, atarigen.playfield2) - AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(batman_state, atarigen.playfield) - AM_RANGE(0x3f4000, 0x3f5fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield_dual_upper_w) AM_BASE_MEMBER(batman_state, atarigen.playfield_upper) + AM_RANGE(0x3effc0, 0x3effff) AM_MIRROR(0x100000) AM_READWRITE(batman_atarivc_r, batman_atarivc_w) AM_BASE_MEMBER(batman_state, atarivc_data) + AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE_MEMBER(batman_state, playfield2) + AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(batman_state, playfield) + AM_RANGE(0x3f4000, 0x3f5fff) AM_MIRROR(0x100000) AM_WRITE(atarigen_playfield_dual_upper_w) AM_BASE_MEMBER(batman_state, playfield_upper) AM_RANGE(0x3f6000, 0x3f7fff) AM_MIRROR(0x100000) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f8000, 0x3f8fef) AM_MIRROR(0x100000) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(batman_state, atarigen.alpha) - AM_RANGE(0x3f8f00, 0x3f8f7f) AM_MIRROR(0x100000) AM_BASE_MEMBER(batman_state, atarigen.atarivc_eof_data) + AM_RANGE(0x3f8000, 0x3f8fef) AM_MIRROR(0x100000) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(batman_state, alpha) + AM_RANGE(0x3f8f00, 0x3f8f7f) AM_MIRROR(0x100000) AM_BASE_MEMBER(batman_state, atarivc_eof_data) AM_RANGE(0x3f8f80, 0x3f8fff) AM_MIRROR(0x100000) AM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f0000, 0x3fffff) AM_MIRROR(0x100000) AM_RAM ADDRESS_MAP_END @@ -347,8 +347,8 @@ static DRIVER_INIT( batman ) 0x0150,0x0218,0x01D0,0x0100,0x01D0,0x0300,0x01D0,0x0600, 0x01D0,0x02C8,0x0000 }; - batman_state *state = (batman_state *)machine->driver_data; - state->atarigen.eeprom_default = default_eeprom; + batman_state *state = machine->driver_data(); + state->eeprom_default = default_eeprom; atarijsa_init(machine, "260010", 0x0040); } diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 285d567afa3..6823d21d41a 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -22,7 +22,7 @@ static WRITE8_HANDLER( battlane_cpu_command_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); state->cpu_control = data; @@ -81,7 +81,7 @@ static WRITE8_HANDLER( battlane_cpu_command_w ) static INTERRUPT_GEN( battlane_cpu1_interrupt ) { - battlane_state *state = (battlane_state *)device->machine->driver_data; + battlane_state *state = device->machine->driver_data(); /* See note in battlane_cpu_command_w */ if (~state->cpu_control & 0x08) @@ -258,7 +258,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - battlane_state *state = (battlane_state *)device->machine->driver_data; + battlane_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, M6809_FIRQ_LINE, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -276,7 +276,7 @@ static const ym3526_interface ym3526_config = static MACHINE_START( battlane ) { - battlane_state *state = (battlane_state *)machine->driver_data; + battlane_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -287,7 +287,7 @@ static MACHINE_START( battlane ) static MACHINE_RESET( battlane ) { - battlane_state *state = (battlane_state *)machine->driver_data; + battlane_state *state = machine->driver_data(); state->video_ctrl = 0; state->cpu_control = 0; diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index 4957e515c4a..a76f6c9d49f 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -204,7 +204,7 @@ GFXDECODE_END static MACHINE_RESET( battlex ) { - battlex_state *state = (battlex_state *)machine->driver_data; + battlex_state *state = machine->driver_data(); state->scroll_lsb = 0; state->scroll_msb = 0; diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 0ebb0f26732..1b70d75a7a2 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -27,14 +27,14 @@ static INTERRUPT_GEN( battlnts_interrupt ) { - battlnts_state *state = (battlnts_state *)device->machine->driver_data; + battlnts_state *state = device->machine->driver_data(); if (k007342_is_int_enabled(state->k007342)) cpu_set_input_line(device, HD6309_IRQ_LINE, HOLD_LINE); } static WRITE8_HANDLER( battlnts_sh_irqtrigger_w ) { - battlnts_state *state = (battlnts_state *)space->machine->driver_data; + battlnts_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -220,7 +220,7 @@ static const k007420_interface bladestl_k007420_intf = static MACHINE_START( battlnts ) { - battlnts_state *state = (battlnts_state *)machine->driver_data; + battlnts_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -235,7 +235,7 @@ static MACHINE_START( battlnts ) static MACHINE_RESET( battlnts ) { - battlnts_state *state = (battlnts_state *)machine->driver_data; + battlnts_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; state->layer_colorbase[1] = 0; diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c index a66abfbd41c..327d9b8e0f8 100644 --- a/src/mame/drivers/beaminv.c +++ b/src/mame/drivers/beaminv.c @@ -55,12 +55,13 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "cpu/z80/z80.h" -class beaminv_state +class beaminv_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beaminv_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beaminv_state(machine)); } - beaminv_state(running_machine &machine) { } + beaminv_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -93,7 +94,7 @@ static const int interrupt_lines[INTERRUPTS_PER_FRAME] = { 0x00, 0x80 }; static TIMER_CALLBACK( interrupt_callback ) { - beaminv_state *state = (beaminv_state *)machine->driver_data; + beaminv_state *state = machine->driver_data(); int interrupt_number = param; int next_interrupt_number; int next_vpos; @@ -110,14 +111,14 @@ static TIMER_CALLBACK( interrupt_callback ) static void create_interrupt_timer( running_machine *machine ) { - beaminv_state *state = (beaminv_state *)machine->driver_data; + beaminv_state *state = machine->driver_data(); state->interrupt_timer = timer_alloc(machine, interrupt_callback, NULL); } static void start_interrupt_timer( running_machine *machine ) { - beaminv_state *state = (beaminv_state *)machine->driver_data; + beaminv_state *state = machine->driver_data(); int vpos = interrupt_lines[0]; timer_adjust_oneshot(state->interrupt_timer, machine->primary_screen->time_until_pos(vpos), 0); } @@ -132,7 +133,7 @@ static void start_interrupt_timer( running_machine *machine ) static MACHINE_START( beaminv ) { - beaminv_state *state = (beaminv_state *)machine->driver_data; + beaminv_state *state = machine->driver_data(); create_interrupt_timer(machine); state->maincpu = machine->device("maincpu"); @@ -151,7 +152,7 @@ static MACHINE_START( beaminv ) static MACHINE_RESET( beaminv ) { - beaminv_state *state = (beaminv_state *)machine->driver_data; + beaminv_state *state = machine->driver_data(); start_interrupt_timer(machine); state->controller_select = 0; @@ -167,7 +168,7 @@ static MACHINE_RESET( beaminv ) static VIDEO_UPDATE( beaminv ) { - beaminv_state *state = (beaminv_state *)screen->machine->driver_data; + beaminv_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -211,7 +212,7 @@ static READ8_HANDLER( v128_r ) static WRITE8_HANDLER( controller_select_w ) { - beaminv_state *state = (beaminv_state *)space->machine->driver_data; + beaminv_state *state = space->machine->driver_data(); /* 0x01 (player 1) or 0x02 (player 2) */ state->controller_select = data; } @@ -219,7 +220,7 @@ static WRITE8_HANDLER( controller_select_w ) static READ8_HANDLER( controller_r ) { - beaminv_state *state = (beaminv_state *)space->machine->driver_data; + beaminv_state *state = space->machine->driver_data(); return input_port_read(space->machine, (state->controller_select == 1) ? P1_CONTROL_PORT_TAG : P2_CONTROL_PORT_TAG); } diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index 392036fd58d..3133c3bef00 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -119,7 +119,7 @@ static void update_interrupts(running_machine *machine); static TIMER_DEVICE_CALLBACK( scanline_callback ) { - beathead_state *state = (beathead_state *)timer.machine->driver_data; + beathead_state *state = timer.machine->driver_data(); int scanline = param; /* update the video */ @@ -151,11 +151,11 @@ static MACHINE_START( beathead ) static MACHINE_RESET( beathead ) { - beathead_state *state = (beathead_state *)machine->driver_data; + beathead_state *state = machine->driver_data(); /* reset the common subsystems */ - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarijsa_reset(); /* the code is temporarily mapped at 0 at startup */ @@ -183,7 +183,7 @@ static MACHINE_RESET( beathead ) static void update_interrupts(running_machine *machine) { - beathead_state *state = (beathead_state *)machine->driver_data; + beathead_state *state = machine->driver_data(); int gen_int; /* compute the combined interrupt signal */ @@ -206,7 +206,7 @@ static void update_interrupts(running_machine *machine) static WRITE32_HANDLER( interrupt_control_w ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); int irq = offset & 3; int control = (offset >> 2) & 1; @@ -225,7 +225,7 @@ static WRITE32_HANDLER( interrupt_control_w ) static READ32_HANDLER( interrupt_control_r ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); /* return the enables as a bitfield */ return (state->irq_enable[0]) | (state->irq_enable[1] << 1) | (state->irq_enable[2] << 2); @@ -241,7 +241,7 @@ static READ32_HANDLER( interrupt_control_r ) static WRITE32_HANDLER( eeprom_data_w ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); if (state->eeprom_enabled) { @@ -254,7 +254,7 @@ static WRITE32_HANDLER( eeprom_data_w ) static WRITE32_HANDLER( eeprom_enable_w ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); state->eeprom_enabled = 1; } @@ -269,10 +269,10 @@ static WRITE32_HANDLER( eeprom_enable_w ) static READ32_HANDLER( input_2_r ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "IN2"); - if (state->atarigen.sound_to_cpu_ready) result ^= 0x10; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x20; + if (state->sound_to_cpu_ready) result ^= 0x10; + if (state->cpu_to_sound_ready) result ^= 0x20; return result; } diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index a1504096b0f..2fedba653d7 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -66,7 +66,7 @@ J1100072A static WRITE8_HANDLER( beg_banking_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->beg_bank = data; /* d0-d3 connect to A11-A14 of the ROMs (via ls273 latch) @@ -77,7 +77,7 @@ static WRITE8_HANDLER( beg_banking_w ) static TIMER_CALLBACK( from_sound_latch_callback ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); state->from_sound = param & 0xff; state->sound_state |= 2; } @@ -88,7 +88,7 @@ static WRITE8_HANDLER( beg_fromsound_w ) /* write to D800 sets bit 1 in status * static READ8_HANDLER( beg_fromsound_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); return state->from_sound; @@ -96,7 +96,7 @@ static READ8_HANDLER( beg_fromsound_r ) static READ8_HANDLER( beg_soundstate_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); UINT8 ret = state->sound_state; /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); @@ -106,7 +106,7 @@ static READ8_HANDLER( beg_soundstate_r ) static READ8_HANDLER( soundstate_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); return state->sound_state; @@ -114,7 +114,7 @@ static READ8_HANDLER( soundstate_r ) static TIMER_CALLBACK( nmi_callback ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -125,27 +125,27 @@ static TIMER_CALLBACK( nmi_callback ) static WRITE8_HANDLER( sound_command_w ) /* write to port 20 clears bit 0 in status */ { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->for_sound = data; timer_call_after_resynch(space->machine, NULL, data, nmi_callback); } static READ8_HANDLER( sound_command_r ) /* read from D800 sets bit 0 in status */ { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->sound_state |= 1; return state->for_sound; } static WRITE8_HANDLER( nmi_disable_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) { @@ -156,7 +156,7 @@ static WRITE8_HANDLER( nmi_enable_w ) static TIMER_CALLBACK( deferred_ls74_w ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); int offs = (param >> 8) & 255; int data = param & 255; state->beg13_ls74[offs] = data; @@ -185,7 +185,7 @@ static WRITE8_HANDLER( beg13_b_set_w ) static READ8_HANDLER( beg_status_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); /* d0 = Q of 74ls74 IC13(partA) d1 = Q of 74ls74 IC13(partB) @@ -204,7 +204,7 @@ static READ8_HANDLER( beg_status_r ) static READ8_HANDLER( beg_trackball_x_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); static const char *const portx_name[2] = { "P1X", "P2X" }; return input_port_read(space->machine, portx_name[state->port_select]); @@ -212,7 +212,7 @@ static READ8_HANDLER( beg_trackball_x_r ) static READ8_HANDLER( beg_trackball_y_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); static const char *const porty_name[2] = { "P1Y", "P2Y" }; return input_port_read(space->machine, porty_name[state->port_select]); @@ -220,7 +220,7 @@ static READ8_HANDLER( beg_trackball_y_r ) static WRITE8_HANDLER( beg_port08_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->port_select = (data & 0x04) >> 2; } @@ -342,7 +342,7 @@ ADDRESS_MAP_END static READ8_HANDLER( sub_cpu_mcu_coin_port_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); /* bit 0 and bit 1 = coin inputs bit 3 and bit 4 = MCU status @@ -432,7 +432,7 @@ static const msm5232_interface msm5232_config = static MACHINE_START( bigevglf ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->mcu = machine->device("mcu"); @@ -469,7 +469,7 @@ static MACHINE_START( bigevglf ) static MACHINE_RESET( bigevglf ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); state->vidram_bank = 0; state->plane_selected = 0; diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 93c48efbda0..9310e9a8aee 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -117,12 +117,13 @@ Notes: #include "sound/3812intf.h" -class bigfghtr_state +class bigfghtr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigfghtr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigfghtr_state(machine)); } - bigfghtr_state(running_machine &machine) { } + bigfghtr_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT16 * text_videoram; @@ -145,7 +146,7 @@ public: static TILE_GET_INFO( get_fg_tile_info ) { - bigfghtr_state *state = (bigfghtr_state *)machine->driver_data; + bigfghtr_state *state = machine->driver_data(); int data = state->fg_videoram[tile_index]; SET_TILE_INFO( 1, @@ -157,7 +158,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - bigfghtr_state *state = (bigfghtr_state *)machine->driver_data; + bigfghtr_state *state = machine->driver_data(); int data = state->bg_videoram[tile_index]; SET_TILE_INFO( 2, @@ -168,7 +169,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - bigfghtr_state *state = (bigfghtr_state *)machine->driver_data; + bigfghtr_state *state = machine->driver_data(); int tile_number = state->text_videoram[tile_index] & 0xff; int attributes; @@ -183,7 +184,7 @@ static TILE_GET_INFO( get_tx_tile_info ) static VIDEO_START( bigfghtr ) { - bigfghtr_state *state = (bigfghtr_state *)machine->driver_data; + bigfghtr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 16, 16, 64, 32); @@ -195,7 +196,7 @@ static VIDEO_START( bigfghtr ) static WRITE16_HANDLER(text_videoram_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->text_videoram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset & 0x7ff); @@ -203,7 +204,7 @@ static WRITE16_HANDLER(text_videoram_w ) static WRITE16_HANDLER( fg_videoram_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -211,7 +212,7 @@ static WRITE16_HANDLER( fg_videoram_w ) static WRITE16_HANDLER( bg_videoram_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -219,19 +220,19 @@ static WRITE16_HANDLER( bg_videoram_w ) static WRITE16_HANDLER( fg_scrollx_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_scrollx); } static WRITE16_HANDLER( fg_scrolly_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_scrolly); } static WRITE16_HANDLER( bg_scrollx_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll_x); tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll_x); @@ -239,7 +240,7 @@ static WRITE16_HANDLER( bg_scrollx_w ) static WRITE16_HANDLER( bg_scrolly_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll_y); tilemap_set_scrolly(state->bg_tilemap, 0, state->scroll_y); @@ -272,7 +273,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( bigfghtr ) { - bigfghtr_state *state = (bigfghtr_state *)screen->machine->driver_data; + bigfghtr_state *state = screen->machine->driver_data(); int sprite_enable = state->vreg & 0x200; tilemap_set_enable(state->bg_tilemap, state->vreg & 0x800); @@ -320,7 +321,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( io_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vreg); flip_screen_set(space->machine, state->vreg & 0x1000); @@ -328,7 +329,7 @@ static WRITE16_HANDLER( io_w ) static READ16_HANDLER( latch_r ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); state->read_latch = 1; return 0; @@ -337,13 +338,13 @@ static READ16_HANDLER( latch_r ) static WRITE16_HANDLER( sharedram_w ) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sharedram[offset]); } static READ16_HANDLER(sharedram_r) { - bigfghtr_state *state = (bigfghtr_state *)space->machine->driver_data; + bigfghtr_state *state = space->machine->driver_data(); switch(offset) { case 0x40/2: @@ -535,7 +536,7 @@ GFXDECODE_END static MACHINE_START( bigfghtr ) { - bigfghtr_state *state = (bigfghtr_state *)machine->driver_data; + bigfghtr_state *state = machine->driver_data(); state_save_register_global(machine, state->fg_scrollx); state_save_register_global(machine, state->fg_scrolly); @@ -547,7 +548,7 @@ static MACHINE_START( bigfghtr ) static MACHINE_RESET( bigfghtr ) { - bigfghtr_state *state = (bigfghtr_state *)machine->driver_data; + bigfghtr_state *state = machine->driver_data(); state->fg_scrollx = 0; state->fg_scrolly = 0; diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index aef5d9d725a..dd7bf7782f1 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -73,7 +73,7 @@ static WRITE16_HANDLER( hacked_controls_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); logerror("%06x: hacked_controls_w %04x %02x\n", cpu_get_pc(space->cpu), offset, data); COMBINE_DATA(&state->inp[offset]); @@ -81,7 +81,7 @@ static WRITE16_HANDLER( hacked_controls_w ) static READ16_HANDLER( hacked_controls_r ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); logerror("%06x: hacked_controls_r %04x %04x\n", cpu_get_pc(space->cpu), offset, state->inp[offset]); return state->inp[offset]; @@ -89,7 +89,7 @@ static READ16_HANDLER( hacked_controls_r ) static WRITE16_HANDLER( bionicc_mpu_trigger_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); data = input_port_read(space->machine, "SYSTEM") >> 12; state->inp[0] = data ^ 0x0f; @@ -104,7 +104,7 @@ static WRITE16_HANDLER( bionicc_mpu_trigger_w ) static WRITE16_HANDLER( hacked_soundcommand_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); COMBINE_DATA(&state->soundcommand); soundlatch_w(space, 0, state->soundcommand & 0xff); @@ -112,7 +112,7 @@ static WRITE16_HANDLER( hacked_soundcommand_w ) static READ16_HANDLER( hacked_soundcommand_r ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); return state->soundcommand; } @@ -335,7 +335,7 @@ GFXDECODE_END static MACHINE_START( bionicc ) { - bionicc_state *state = (bionicc_state *)machine->driver_data; + bionicc_state *state = machine->driver_data(); state_save_register_global(machine, state->soundcommand); state_save_register_global_array(machine, state->inp); @@ -344,7 +344,7 @@ static MACHINE_START( bionicc ) static MACHINE_RESET( bionicc ) { - bionicc_state *state = (bionicc_state *)machine->driver_data; + bionicc_state *state = machine->driver_data(); state->inp[0] = 0; state->inp[1] = 0; diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index 7167e3fcfe0..803a5fa6d89 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -92,27 +92,27 @@ Notes: static READ16_HANDLER( control_r ) { - bishi_state *state = (bishi_state *)space->machine->driver_data; + bishi_state *state = space->machine->driver_data(); return state->cur_control; } static WRITE16_HANDLER( control_w ) { // bit 8 = interrupt gate - bishi_state *state = (bishi_state *)space->machine->driver_data; + bishi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->cur_control); } static WRITE16_HANDLER( control2_w ) { // bit 12 = part of the banking calculation for the K056832 ROM readback - bishi_state *state = (bishi_state *)space->machine->driver_data; + bishi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->cur_control2); } static INTERRUPT_GEN(bishi_interrupt) { - bishi_state *state = (bishi_state *)device->machine->driver_data; + bishi_state *state = device->machine->driver_data(); if (state->cur_control & 0x800) { switch (cpu_getiloops(device)) @@ -136,7 +136,7 @@ static READ16_HANDLER( bishi_mirror_r ) static READ16_HANDLER( bishi_K056832_rom_r ) { - bishi_state *state = (bishi_state *)space->machine->driver_data; + bishi_state *state = space->machine->driver_data(); UINT16 ouroffs; ouroffs = (offset >> 1) * 8; @@ -369,7 +369,7 @@ INPUT_PORTS_END static void sound_irq_gen(running_device *device, int state) { - bishi_state *bishi = (bishi_state *)device->machine->driver_data; + bishi_state *bishi = device->machine->driver_data(); if (state) cpu_set_input_line(bishi->maincpu, M68K_IRQ_1, ASSERT_LINE); else @@ -400,7 +400,7 @@ static const k054338_interface bishi_k054338_intf = static MACHINE_START( bishi ) { - bishi_state *state = (bishi_state *)machine->driver_data; + bishi_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->k056832 = machine->device("k056832"); @@ -413,7 +413,7 @@ static MACHINE_START( bishi ) static MACHINE_RESET( bishi ) { - bishi_state *state = (bishi_state *)machine->driver_data; + bishi_state *state = machine->driver_data(); state->cur_control = 0; state->cur_control2 = 0; } diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index e9f9f11e7c1..b651678c628 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -24,20 +24,20 @@ DIP Locations verified for: static READ8_HANDLER( bking_sndnmi_disable_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; return 0; } static WRITE8_HANDLER( bking_sndnmi_enable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; } static WRITE8_HANDLER( bking_soundlatch_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); int i, code = 0; for (i = 0;i < 8;i++) @@ -51,19 +51,19 @@ static WRITE8_HANDLER( bking_soundlatch_w ) static WRITE8_HANDLER( bking3_addr_l_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->addr_l = data; } static WRITE8_HANDLER( bking3_addr_h_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->addr_h = data; } static READ8_HANDLER( bking3_extrarom_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "user2"); return rom[state->addr_h * 256 + state->addr_l]; } @@ -411,7 +411,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( bking ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -437,7 +437,7 @@ static MACHINE_START( bking ) static MACHINE_START( bking3 ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->mcu = machine->device("mcu"); @@ -465,7 +465,7 @@ static MACHINE_START( bking3 ) static MACHINE_RESET( bking ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); /* video */ state->pc3259_output[0] = 0; @@ -492,7 +492,7 @@ static MACHINE_RESET( bking ) static MACHINE_RESET( bking3 ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); cputag_set_input_line(machine, "mcu", 0, CLEAR_LINE); diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index d879eaaa7b8..5a72fab7df4 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -38,7 +38,7 @@ static INTERRUPT_GEN( bladestl_interrupt ) { - bladestl_state *state = (bladestl_state *)device->machine->driver_data; + bladestl_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -59,7 +59,7 @@ static INTERRUPT_GEN( bladestl_interrupt ) static READ8_HANDLER( trackball_r ) { - bladestl_state *state = (bladestl_state *)space->machine->driver_data; + bladestl_state *state = space->machine->driver_data(); static const char *const port[] = { "TRACKBALL_P1_1", "TRACKBALL_P1_2", "TRACKBALL_P2_1", "TRACKBALL_P1_2" }; int curr, delta; @@ -72,7 +72,7 @@ static READ8_HANDLER( trackball_r ) static WRITE8_HANDLER( bladestl_bankswitch_w ) { - bladestl_state *state = (bladestl_state *)space->machine->driver_data; + bladestl_state *state = space->machine->driver_data(); /* bits 0 & 1 = coin counters */ coin_counter_w(space->machine, 0,data & 0x01); @@ -94,7 +94,7 @@ static WRITE8_HANDLER( bladestl_bankswitch_w ) static WRITE8_HANDLER( bladestl_sh_irqtrigger_w ) { - bladestl_state *state = (bladestl_state *)space->machine->driver_data; + bladestl_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, HOLD_LINE); @@ -306,7 +306,7 @@ static const k007420_interface bladestl_k007420_intf = static MACHINE_START( bladestl ) { - bladestl_state *state = (bladestl_state *)machine->driver_data; + bladestl_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); @@ -322,7 +322,7 @@ static MACHINE_START( bladestl ) static MACHINE_RESET( bladestl ) { - bladestl_state *state = (bladestl_state *)machine->driver_data; + bladestl_state *state = machine->driver_data(); int i; state->layer_colorbase[0] = 0; diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index bdb5bf0e9c1..4f5bbc30970 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -28,20 +28,20 @@ Protection comms between main cpu and i8751 static READ8_HANDLER( blktiger_from_mcu_r ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); return state->i8751_latch; } static WRITE8_HANDLER( blktiger_to_mcu_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); cpu_set_input_line(state->mcu, MCS51_INT1_LINE, ASSERT_LINE); state->z80_latch = data; } static READ8_HANDLER( blktiger_from_main_r ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); cpu_set_input_line(state->mcu, MCS51_INT1_LINE, CLEAR_LINE); //printf("%02x read\n",latch); return state->z80_latch; @@ -49,7 +49,7 @@ static READ8_HANDLER( blktiger_from_main_r ) static WRITE8_HANDLER( blktiger_to_main_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); //printf("%02x write\n",data); state->i8751_latch = data; } @@ -265,7 +265,7 @@ GFXDECODE_END /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - blktiger_state *state = (blktiger_state *)device->machine->driver_data; + blktiger_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -281,7 +281,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( blktiger ) { - blktiger_state *state = (blktiger_state *)machine->driver_data; + blktiger_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->mcu = machine->device("mcu"); @@ -302,7 +302,7 @@ static MACHINE_START( blktiger ) static MACHINE_RESET( blktiger ) { - blktiger_state *state = (blktiger_state *)machine->driver_data; + blktiger_state *state = machine->driver_data(); /* configure bankswitching */ memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index edc945ade21..25cda9700f7 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -60,7 +60,7 @@ static WRITE16_HANDLER( blmbycar_okibank_w ) static WRITE16_HANDLER( blmbycar_pot_wheel_reset_w ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->pot_wheel = ~input_port_read(space->machine, "WHEEL") & 0xff; @@ -68,7 +68,7 @@ static WRITE16_HANDLER( blmbycar_pot_wheel_reset_w ) static WRITE16_HANDLER( blmbycar_pot_wheel_shift_w ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -80,7 +80,7 @@ static WRITE16_HANDLER( blmbycar_pot_wheel_shift_w ) static READ16_HANDLER( blmbycar_pot_wheel_r ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); return ((state->pot_wheel & 0x80) ? 0x04 : 0) | (mame_rand(space->machine) & 0x08); } @@ -130,7 +130,7 @@ ADDRESS_MAP_END static READ16_HANDLER( waterball_unk_r ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); state->retvalue ^= 0x0008; // must toggle.. but not vblank? return state->retvalue; @@ -341,7 +341,7 @@ GFXDECODE_END static MACHINE_START( blmbycar ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); state_save_register_global(machine, state->pot_wheel); state_save_register_global(machine, state->old_val); @@ -349,7 +349,7 @@ static MACHINE_START( blmbycar ) static MACHINE_RESET( blmbycar ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); state->pot_wheel = 0; state->old_val = 0; @@ -394,14 +394,14 @@ MACHINE_DRIVER_END static MACHINE_START( watrball ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); state_save_register_global(machine, state->retvalue); } static MACHINE_RESET( watrball ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); state->retvalue = 0; } diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 14804a209a3..807499dc919 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -58,7 +58,7 @@ static INTERRUPT_GEN( blockade_interrupt ) { - blockade_state *state = (blockade_state *)device->machine->driver_data; + blockade_state *state = device->machine->driver_data(); cpu_resume(device, SUSPEND_ANY_REASON); if ((input_port_read(device->machine, "IN0") & 0x80) == 0) @@ -76,7 +76,7 @@ static INTERRUPT_GEN( blockade_interrupt ) static READ8_HANDLER( blockade_input_port_0_r ) { - blockade_state *state = (blockade_state *)space->machine->driver_data; + blockade_state *state = space->machine->driver_data(); /* coin latch is bit 7 */ UINT8 temp = (input_port_read(space->machine, "IN0") & 0x7f); @@ -85,7 +85,7 @@ static READ8_HANDLER( blockade_input_port_0_r ) static WRITE8_HANDLER( blockade_coin_latch_w ) { - blockade_state *state = (blockade_state *)space->machine->driver_data; + blockade_state *state = space->machine->driver_data(); if (data & 0x80) { @@ -466,7 +466,7 @@ static PALETTE_INIT( bw ) static MACHINE_START( blockade ) { - blockade_state *state = (blockade_state *)machine->driver_data; + blockade_state *state = machine->driver_data(); state_save_register_global(machine, state->coin_latch); state_save_register_global(machine, state->just_been_reset); @@ -474,7 +474,7 @@ static MACHINE_START( blockade ) static MACHINE_RESET( blockade ) { - blockade_state *state = (blockade_state *)machine->driver_data; + blockade_state *state = machine->driver_data(); state->coin_latch = 1; state->just_been_reset = 0; diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 5f1ea70362e..639b58e20db 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -32,7 +32,7 @@ static KONAMI_SETLINES_CALLBACK( blockhl_banking ); static INTERRUPT_GEN( blockhl_interrupt ) { - blockhl_state *state = (blockhl_state *)device->machine->driver_data; + blockhl_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109) && state->rombank == 0) /* kludge to prevent crashes */ cpu_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); @@ -40,7 +40,7 @@ static INTERRUPT_GEN( blockhl_interrupt ) static READ8_HANDLER( bankedram_r ) { - blockhl_state *state = (blockhl_state *)space->machine->driver_data; + blockhl_state *state = space->machine->driver_data(); if (state->palette_selected) return space->machine->generic.paletteram.u8[offset]; @@ -50,7 +50,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - blockhl_state *state = (blockhl_state *)space->machine->driver_data; + blockhl_state *state = space->machine->driver_data(); if (state->palette_selected) paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data); @@ -60,7 +60,7 @@ static WRITE8_HANDLER( bankedram_w ) static WRITE8_HANDLER( blockhl_sh_irqtrigger_w ) { - blockhl_state *state = (blockhl_state *)space->machine->driver_data; + blockhl_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -68,7 +68,7 @@ static WRITE8_HANDLER( blockhl_sh_irqtrigger_w ) /* special handlers to combine 052109 & 051960 */ static READ8_HANDLER( k052109_051960_r ) { - blockhl_state *state = (blockhl_state *)space->machine->driver_data; + blockhl_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -85,7 +85,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - blockhl_state *state = (blockhl_state *)space->machine->driver_data; + blockhl_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -193,7 +193,7 @@ static const k051960_interface blockhl_k051960_intf = static MACHINE_START( blockhl ) { - blockhl_state *state = (blockhl_state *)machine->driver_data; + blockhl_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); @@ -209,7 +209,7 @@ static MACHINE_START( blockhl ) static MACHINE_RESET( blockhl ) { - blockhl_state *state = (blockhl_state *)machine->driver_data; + blockhl_state *state = machine->driver_data(); konami_configure_set_lines(machine->device("maincpu"), blockhl_banking); @@ -323,7 +323,7 @@ ROM_END static KONAMI_SETLINES_CALLBACK( blockhl_banking ) { - blockhl_state *state = (blockhl_state *)device->machine->driver_data; + blockhl_state *state = device->machine->driver_data(); /* bits 0-1 = ROM bank */ state->rombank = lines & 0x03; diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index 98f39b7c211..01b0b69b246 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -83,7 +83,7 @@ static INTERRUPT_GEN( blockout_interrupt ) static WRITE16_HANDLER( blockout_sound_command_w ) { - blockout_state *state = (blockout_state *)space->machine->driver_data; + blockout_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -237,7 +237,7 @@ INPUT_PORTS_END /* handler called by the 2151 emulator when the internal timers cause an IRQ */ static void blockout_irq_handler(running_device *device, int irq) { - blockout_state *state = (blockout_state *)device->machine->driver_data; + blockout_state *state = device->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE, 0xff); } @@ -255,7 +255,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( blockout ) { - blockout_state *state = (blockout_state *)machine->driver_data; + blockout_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -264,7 +264,7 @@ static MACHINE_START( blockout ) static MACHINE_RESET( blockout ) { - blockout_state *state = (blockout_state *)machine->driver_data; + blockout_state *state = machine->driver_data(); state->color = 0; } diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index 31bcf49d469..2338a7346c3 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -33,10 +33,10 @@ static void update_interrupts(running_machine *machine) { - blstroid_state *state = (blstroid_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + blstroid_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 4, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -54,10 +54,10 @@ static MACHINE_START( blstroid ) static MACHINE_RESET( blstroid ) { - blstroid_state *state = (blstroid_state *)machine->driver_data; + blstroid_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, blstroid_scanline_update, 8); atarijsa_reset(); } @@ -73,10 +73,10 @@ static MACHINE_RESET( blstroid ) static READ16_HANDLER( inputs_r ) { static const char *const iptnames[] = { "IN0", "IN1" }; - blstroid_state *state = (blstroid_state *)space->machine->driver_data; + blstroid_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, iptnames[offset & 1]); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0040; + if (state->cpu_to_sound_ready) temp ^= 0x0040; if (atarigen_get_hblank(*space->machine->primary_screen)) temp ^= 0x0010; return temp; } @@ -106,8 +106,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff9804, 0xff9805) AM_MIRROR(0x7f83f8) AM_READ_PORT("DIAL1") AM_RANGE(0xff9c00, 0xff9c03) AM_MIRROR(0x7f83fc) AM_READ(inputs_r) AM_RANGE(0xffa000, 0xffa3ff) AM_MIRROR(0x7f8c00) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xffb000, 0xffb3ff) AM_MIRROR(0x7f8c00) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(blstroid_state, atarigen.eeprom, atarigen.eeprom_size) - AM_RANGE(0xffc000, 0xffcfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(blstroid_state, atarigen.playfield) + AM_RANGE(0xffb000, 0xffb3ff) AM_MIRROR(0x7f8c00) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(blstroid_state, eeprom, eeprom_size) + AM_RANGE(0xffc000, 0xffcfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(blstroid_state, playfield) AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xffe000, 0xffffff) AM_MIRROR(0x7f8000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index dce3c4c10ca..62c9df112a3 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -60,19 +60,19 @@ static WRITE8_DEVICE_HANDLER( dipsw_w ) { - blueprnt_state *state = (blueprnt_state *)device->machine->driver_data; + blueprnt_state *state = device->machine->driver_data(); state->dipsw = data; } static READ8_HANDLER( blueprnt_sh_dipsw_r ) { - blueprnt_state *state = (blueprnt_state *)space->machine->driver_data; + blueprnt_state *state = space->machine->driver_data(); return state->dipsw; } static WRITE8_HANDLER( blueprnt_sound_command_w ) { - blueprnt_state *state = (blueprnt_state *)space->machine->driver_data; + blueprnt_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -281,7 +281,7 @@ static const ay8910_interface ay8910_interface_2 = static MACHINE_START( blueprnt ) { - blueprnt_state *state = (blueprnt_state *)machine->driver_data; + blueprnt_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -290,7 +290,7 @@ static MACHINE_START( blueprnt ) static MACHINE_RESET( blueprnt ) { - blueprnt_state *state = (blueprnt_state *)machine->driver_data; + blueprnt_state *state = machine->driver_data(); state->gfx_bank = 0; state->dipsw = 0; diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index a6073c56fcd..af1c641cd28 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -24,13 +24,13 @@ static WRITE8_HANDLER( bogeyman_8910_latch_w ) { - bogeyman_state *state = (bogeyman_state *)space->machine->driver_data; + bogeyman_state *state = space->machine->driver_data(); state->psg_latch = data; } static WRITE8_HANDLER( bogeyman_8910_control_w ) { - bogeyman_state *state = (bogeyman_state *)space->machine->driver_data; + bogeyman_state *state = space->machine->driver_data(); // bit 0 is flipscreen flip_screen_set(space->machine, data & 0x01); @@ -207,7 +207,7 @@ GFXDECODE_END static MACHINE_START( bogeyman ) { - bogeyman_state *state = (bogeyman_state *)machine->driver_data; + bogeyman_state *state = machine->driver_data(); state_save_register_global(machine, state->psg_latch); state_save_register_global(machine, state->last_write); @@ -215,7 +215,7 @@ static MACHINE_START( bogeyman ) static MACHINE_RESET( bogeyman ) { - bogeyman_state *state = (bogeyman_state *)machine->driver_data; + bogeyman_state *state = machine->driver_data(); state->psg_latch = 0; state->last_write = 0; @@ -223,7 +223,7 @@ static MACHINE_RESET( bogeyman ) static WRITE8_DEVICE_HANDLER( bogeyman_colbank_w ) { - bogeyman_state *state = (bogeyman_state *)device->machine->driver_data; + bogeyman_state *state = device->machine->driver_data(); if((data & 1) != (state->colbank & 1)) { diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index bf848f014c8..8ffdab68c7e 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -103,7 +103,7 @@ Dip Locations and factory settings verified with manual static TIMER_CALLBACK( soundlatch_callback ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); state->latch = param; } @@ -115,7 +115,7 @@ static WRITE8_HANDLER( bombjack_soundlatch_w ) static READ8_HANDLER( bombjack_soundlatch_r ) { - bombjack_state *state = (bombjack_state *)space->machine->driver_data; + bombjack_state *state = space->machine->driver_data(); int res; res = state->latch; @@ -328,7 +328,7 @@ GFXDECODE_END static MACHINE_START( bombjack ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); state_save_register_global(machine, state->latch); state_save_register_global(machine, state->background_image); @@ -337,7 +337,7 @@ static MACHINE_START( bombjack ) static MACHINE_RESET( bombjack ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); state->latch = 0; state->background_image = 0; diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 6970e80d598..f57d3b2524f 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -276,13 +276,13 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - boogwing_state *driver_state = (boogwing_state *)device->machine->driver_data; + boogwing_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - boogwing_state *state = (boogwing_state *)device->machine->driver_data; + boogwing_state *state = device->machine->driver_data(); state->oki2->set_bank_base(((data & 2) >> 1) * 0x40000); state->oki1->set_bank_base((data & 1) * 0x40000); } diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 8efc52b987e..3c7f6e08e8d 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -23,7 +23,7 @@ static INTERRUPT_GEN( bottom9_interrupt ) { - bottom9_state *state = (bottom9_state *)device->machine->driver_data; + bottom9_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) cpu_set_input_line(device, 0, HOLD_LINE); @@ -31,7 +31,7 @@ static INTERRUPT_GEN( bottom9_interrupt ) static READ8_HANDLER( k052109_051960_r ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -48,7 +48,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -60,7 +60,7 @@ static WRITE8_HANDLER( k052109_051960_w ) static READ8_HANDLER( bottom9_bankedram1_r ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); if (state->k052109_selected) return k052109_051960_r(space, offset); @@ -75,7 +75,7 @@ static READ8_HANDLER( bottom9_bankedram1_r ) static WRITE8_HANDLER( bottom9_bankedram1_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); if (state->k052109_selected) k052109_051960_w(space, offset, data); @@ -85,7 +85,7 @@ static WRITE8_HANDLER( bottom9_bankedram1_w ) static READ8_HANDLER( bottom9_bankedram2_r ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); if (state->k052109_selected) return k052109_051960_r(space, offset + 0x2000); @@ -95,7 +95,7 @@ static READ8_HANDLER( bottom9_bankedram2_r ) static WRITE8_HANDLER( bottom9_bankedram2_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); if (state->k052109_selected) k052109_051960_w(space, offset + 0x2000, data); @@ -122,7 +122,7 @@ static WRITE8_HANDLER( bankswitch_w ) static WRITE8_HANDLER( bottom9_1f90_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); /* bits 0/1 = coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -143,26 +143,26 @@ static WRITE8_HANDLER( bottom9_1f90_w ) static WRITE8_HANDLER( bottom9_sh_irqtrigger_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static INTERRUPT_GEN( bottom9_sound_interrupt ) { - bottom9_state *state = (bottom9_state *)device->machine->driver_data; + bottom9_state *state = device->machine->driver_data(); if (state->nmienable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } static WRITE8_HANDLER( nmi_enable_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); state->nmienable = data; } static WRITE8_HANDLER( sound_bank_w ) { - bottom9_state *state = (bottom9_state *)space->machine->driver_data; + bottom9_state *state = space->machine->driver_data(); int bank_A, bank_B; bank_A = ((data >> 0) & 0x03); @@ -332,7 +332,7 @@ static const k051316_interface bottom9_k051316_intf = static MACHINE_START( bottom9 ) { - bottom9_state *state = (bottom9_state *)machine->driver_data; + bottom9_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); @@ -353,7 +353,7 @@ static MACHINE_START( bottom9 ) static MACHINE_RESET( bottom9 ) { - bottom9_state *state = (bottom9_state *)machine->driver_data; + bottom9_state *state = machine->driver_data(); state->video_enable = 0; state->zoomreadroms = 0; diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index c4a42bc0d21..5d016198e11 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -20,12 +20,13 @@ * *************************************/ -class boxer_state +class boxer_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, boxer_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, boxer_state(machine)); } - boxer_state(running_machine &machine) { } + boxer_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * tile_ram; @@ -47,7 +48,7 @@ public: static TIMER_CALLBACK( pot_interrupt ) { - boxer_state *state = (boxer_state *)machine->driver_data; + boxer_state *state = machine->driver_data(); int mask = param; if (state->pot_latch & mask) @@ -59,7 +60,7 @@ static TIMER_CALLBACK( pot_interrupt ) static TIMER_CALLBACK( periodic_callback ) { - boxer_state *state = (boxer_state *)machine->driver_data; + boxer_state *state = machine->driver_data(); int scanline = param; cpu_set_input_line(state->maincpu, 0, ASSERT_LINE); @@ -112,7 +113,7 @@ static PALETTE_INIT( boxer ) static void draw_boxer( running_machine *machine, bitmap_t* bitmap, const rectangle* cliprect ) { - boxer_state *state = (boxer_state *)machine->driver_data; + boxer_state *state = machine->driver_data(); int n; for (n = 0; n < 2; n++) @@ -160,7 +161,7 @@ static void draw_boxer( running_machine *machine, bitmap_t* bitmap, const rectan static VIDEO_UPDATE( boxer ) { - boxer_state *state = (boxer_state *)screen->machine->driver_data; + boxer_state *state = screen->machine->driver_data(); int i, j; bitmap_fill(bitmap, cliprect, 1); @@ -205,7 +206,7 @@ static READ8_HANDLER( boxer_input_r ) static READ8_HANDLER( boxer_misc_r ) { - boxer_state *state = (boxer_state *)space->machine->driver_data; + boxer_state *state = space->machine->driver_data(); UINT8 val = 0; switch (offset & 3) @@ -245,7 +246,7 @@ static WRITE8_HANDLER( boxer_sound_w ) static WRITE8_HANDLER( boxer_pot_w ) { - boxer_state *state = (boxer_state *)space->machine->driver_data; + boxer_state *state = space->machine->driver_data(); /* BIT0 => HPOT1 */ /* BIT1 => VPOT1 */ /* BIT2 => RPOT1 */ @@ -261,7 +262,7 @@ static WRITE8_HANDLER( boxer_pot_w ) static WRITE8_HANDLER( boxer_irq_reset_w ) { - boxer_state *state = (boxer_state *)space->machine->driver_data; + boxer_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); } @@ -418,7 +419,7 @@ GFXDECODE_END static MACHINE_START( boxer ) { - boxer_state *state = (boxer_state *)machine->driver_data; + boxer_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -428,7 +429,7 @@ static MACHINE_START( boxer ) static MACHINE_RESET( boxer ) { - boxer_state *state = (boxer_state *)machine->driver_data; + boxer_state *state = machine->driver_data(); timer_set(machine, machine->primary_screen->time_until_pos(0), NULL, 0, periodic_callback); state->pot_state = 0; diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index c8cf1f46d3f..c82b6389842 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -67,7 +67,7 @@ static WRITE8_HANDLER( brkthru_1803_w ) { - brkthru_state *state = (brkthru_state *)space->machine->driver_data; + brkthru_state *state = space->machine->driver_data(); /* bit 0 = NMI enable */ cpu_interrupt_enable(state->maincpu, ~data & 1); @@ -75,7 +75,7 @@ static WRITE8_HANDLER( brkthru_1803_w ) } static WRITE8_HANDLER( darwin_0803_w ) { - brkthru_state *state = (brkthru_state *)space->machine->driver_data; + brkthru_state *state = space->machine->driver_data(); /* bit 0 = NMI enable */ /*cpu_interrupt_enable(state->audiocpu, ~data & 1);*/ logerror("0803 %02X\n",data); @@ -85,14 +85,14 @@ static WRITE8_HANDLER( darwin_0803_w ) static WRITE8_HANDLER( brkthru_soundlatch_w ) { - brkthru_state *state = (brkthru_state *)space->machine->driver_data; + brkthru_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } static INPUT_CHANGED( coin_inserted ) { - brkthru_state *state = (brkthru_state *)field->port->machine->driver_data; + brkthru_state *state = field->port->machine->driver_data(); /* coin insertion causes an IRQ */ cpu_set_input_line(state->maincpu, 0, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -346,7 +346,7 @@ GFXDECODE_END /* handler called by the 3812 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int linestate ) { - brkthru_state *state = (brkthru_state *)device->machine->driver_data; + brkthru_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, linestate); } @@ -365,7 +365,7 @@ static const ym3526_interface ym3526_config = static MACHINE_START( brkthru ) { - brkthru_state *state = (brkthru_state *)machine->driver_data; + brkthru_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -377,7 +377,7 @@ static MACHINE_START( brkthru ) static MACHINE_RESET( brkthru ) { - brkthru_state *state = (brkthru_state *)machine->driver_data; + brkthru_state *state = machine->driver_data(); state->bgscroll = 0; state->bgbasecolor = 0; diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index 3d84323579e..8e401c859ed 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -212,7 +212,7 @@ GFXDECODE_END static MACHINE_START( bsktball ) { - bsktball_state *state = (bsktball_state *)machine->driver_data; + bsktball_state *state = machine->driver_data(); state_save_register_global(machine, state->nmi_on); state_save_register_global(machine, state->i256v); @@ -230,7 +230,7 @@ static MACHINE_START( bsktball ) static MACHINE_RESET( bsktball ) { - bsktball_state *state = (bsktball_state *)machine->driver_data; + bsktball_state *state = machine->driver_data(); state->nmi_on = 0; state->i256v = 0; diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 7a7785cca1f..95046fe934b 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -166,7 +166,7 @@ static UINT8 *decrypted; static WRITE8_HANDLER( audio_nmi_enable_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); /* for most games, this serves as the NMI enable for the audio CPU; however, lnc and disco use bit 0 of the first AY-8910's port A instead; many other @@ -180,7 +180,7 @@ static WRITE8_HANDLER( audio_nmi_enable_w ) static WRITE8_DEVICE_HANDLER( ay_audio_nmi_enable_w ) { - btime_state *state = (btime_state *)device->machine->driver_data; + btime_state *state = device->machine->driver_data(); /* port A bit 0, when 1, inhibits the NMI */ if (state->audio_nmi_enable_type == AUDIO_ENABLE_AY8910) @@ -192,7 +192,7 @@ static WRITE8_DEVICE_HANDLER( ay_audio_nmi_enable_w ) static TIMER_DEVICE_CALLBACK( audio_nmi_gen ) { - btime_state *state = (btime_state *)timer.machine->driver_data; + btime_state *state = timer.machine->driver_data(); int scanline = param; state->audio_nmi_state = scanline & 8; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, (state->audio_nmi_enabled && state->audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE); @@ -208,7 +208,7 @@ INLINE UINT8 swap_bits_5_6(UINT8 data) static void btime_decrypt( const address_space *space ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); UINT8 *src, *src1; int addr, addr1; @@ -239,7 +239,7 @@ static void btime_decrypt( const address_space *space ) static WRITE8_HANDLER( lnc_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (offset <= 0x3bff) ; else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(space, offset - 0x3c00, data); return; } @@ -260,7 +260,7 @@ static WRITE8_HANDLER( lnc_w ) static WRITE8_HANDLER( mmonkey_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (offset <= 0x3bff) ; else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(space, offset - 0x3c00, data); return; } @@ -280,7 +280,7 @@ static WRITE8_HANDLER( mmonkey_w ) static WRITE8_HANDLER( btime_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (offset <= 0x07ff) ; else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(space, offset - 0x0c00, data); @@ -299,7 +299,7 @@ static WRITE8_HANDLER( btime_w ) static WRITE8_HANDLER( tisland_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (offset <= 0x07ff) ; else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(space, offset - 0x0c00, data); @@ -320,7 +320,7 @@ static WRITE8_HANDLER( tisland_w ) static WRITE8_HANDLER( zoar_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (offset <= 0x07ff) ; else if (offset >= 0x8000 && offset <= 0x87ff) ; @@ -340,7 +340,7 @@ static WRITE8_HANDLER( zoar_w ) static WRITE8_HANDLER( disco_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (offset <= 0x04ff) ; else if (offset >= 0x2000 && offset <= 0x7fff) deco_charram_w(space, offset - 0x2000, data); @@ -525,7 +525,7 @@ ADDRESS_MAP_END static INPUT_CHANGED( coin_inserted_irq_hi ) { - btime_state *state = (btime_state *)field->port->machine->driver_data; + btime_state *state = field->port->machine->driver_data(); if (newval) cpu_set_input_line(state->maincpu, 0, HOLD_LINE); @@ -533,7 +533,7 @@ static INPUT_CHANGED( coin_inserted_irq_hi ) static INPUT_CHANGED( coin_inserted_irq_lo ) { - btime_state *state = (btime_state *)field->port->machine->driver_data; + btime_state *state = field->port->machine->driver_data(); if (!newval) cpu_set_input_line(state->maincpu, 0, HOLD_LINE); @@ -541,21 +541,21 @@ static INPUT_CHANGED( coin_inserted_irq_lo ) static INPUT_CHANGED( coin_inserted_nmi_lo ) { - btime_state *state = (btime_state *)field->port->machine->driver_data; + btime_state *state = field->port->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_HANDLER( audio_command_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, 0, ASSERT_LINE); } static READ8_HANDLER( audio_command_r ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, CLEAR_LINE); return soundlatch_r(space, offset); } @@ -1425,7 +1425,7 @@ DISCRETE_SOUND_END static MACHINE_START( btime ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1440,7 +1440,7 @@ static MACHINE_START( btime ) static MACHINE_START( mmonkey ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); MACHINE_START_CALL(btime); @@ -1452,7 +1452,7 @@ static MACHINE_START( mmonkey ) static MACHINE_RESET( btime ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); /* by default, the audio NMI is disabled, except for bootlegs which don't use the enable */ state->audio_nmi_enabled = (state->audio_nmi_enable_type == AUDIO_ENABLE_NONE); @@ -1469,7 +1469,7 @@ static MACHINE_RESET( btime ) static MACHINE_RESET( lnc ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); *state->lnc_charbank = 1; MACHINE_RESET_CALL(btime); @@ -1477,7 +1477,7 @@ static MACHINE_RESET( lnc ) static MACHINE_RESET( mmonkey ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); MACHINE_RESET_CALL(lnc); @@ -2121,14 +2121,14 @@ static void init_rom1(running_machine *machine) static DRIVER_INIT( btime ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); init_rom1(machine); state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT; } static DRIVER_INIT( zoar ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "maincpu"); /* At location 0xD50A is what looks like an undocumented opcode. I tried @@ -2143,7 +2143,7 @@ static DRIVER_INIT( zoar ) static DRIVER_INIT( tisland ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "maincpu"); /* At location 0xa2b6 there's a strange RLA followed by a BPL that reads from an @@ -2158,28 +2158,28 @@ static DRIVER_INIT( tisland ) static DRIVER_INIT( lnc ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); decrypt_C10707_cpu(machine, "maincpu"); state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910; } static DRIVER_INIT( bnj ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); decrypt_C10707_cpu(machine, "maincpu"); state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT; } static DRIVER_INIT( disco ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); DRIVER_INIT_CALL(btime); state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910; } static DRIVER_INIT( cookrace ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); decrypt_C10707_cpu(machine, "maincpu"); memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10"); @@ -2189,14 +2189,14 @@ static DRIVER_INIT( cookrace ) static DRIVER_INIT( protennb ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); DRIVER_INIT_CALL(btime); state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910; } static DRIVER_INIT( wtennis ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); decrypt_C10707_cpu(machine, "maincpu"); memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc15f, 0xc15f, 0, 0, wtennis_reset_hack_r); @@ -2208,7 +2208,7 @@ static DRIVER_INIT( wtennis ) static DRIVER_INIT( sdtennis ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); decrypt_C10707_cpu(machine, "maincpu"); decrypt_C10707_cpu(machine, "audiocpu"); state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT; diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index 4bffc0cc61a..54cd44d1b56 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -699,7 +699,7 @@ GFXDECODE_END // handler called by the 2203 emulator when the internal timers cause an IRQ static void irqhandler(running_device *device, int irq) { - bublbobl_state *state = (bublbobl_state *)device->machine->driver_data; + bublbobl_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -723,7 +723,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( common ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->mcu = machine->device("mcu"); @@ -738,7 +738,7 @@ static MACHINE_START( common ) static MACHINE_RESET( common ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); state->sound_nmi_enable = 0; state->pending_nmi = 0; @@ -748,7 +748,7 @@ static MACHINE_RESET( common ) static MACHINE_START( tokio ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -757,7 +757,7 @@ static MACHINE_START( tokio ) static MACHINE_RESET( tokio ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -810,7 +810,7 @@ MACHINE_DRIVER_END static MACHINE_START( bublbobl ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -830,7 +830,7 @@ static MACHINE_START( bublbobl ) static MACHINE_RESET( bublbobl ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -898,7 +898,7 @@ MACHINE_DRIVER_END static MACHINE_START( boblbobl ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -908,7 +908,7 @@ static MACHINE_START( boblbobl ) static MACHINE_RESET( boblbobl ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -932,7 +932,7 @@ MACHINE_DRIVER_END static MACHINE_START( bub68705 ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -948,7 +948,7 @@ static MACHINE_START( bub68705 ) static MACHINE_RESET( bub68705 ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -1543,7 +1543,7 @@ static void configure_banks( running_machine* machine ) static DRIVER_INIT( bublbobl ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); configure_banks(machine); @@ -1553,7 +1553,7 @@ static DRIVER_INIT( bublbobl ) static DRIVER_INIT( tokio ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); configure_banks(machine); /* preemptively enable video, the bit is not mapped for this game and */ diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index e0844916c49..f41668ee37e 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -93,7 +93,7 @@ static WRITE8_HANDLER( bankswitch_w ) static TIMER_CALLBACK( nmi_callback ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -109,13 +109,13 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( nmi_disable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) { @@ -372,7 +372,7 @@ static const msm5232_interface msm5232_config = static MACHINE_START( buggychl ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x2000); @@ -406,7 +406,7 @@ static MACHINE_START( buggychl ) static MACHINE_RESET( buggychl ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); cputag_set_input_line(machine, "mcu", 0, CLEAR_LINE); diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 34397ab78e5..b0eab22d849 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -36,7 +36,7 @@ Known issues: static INTERRUPT_GEN ( bwp1_interrupt ) { - bwing_state *state = (bwing_state *)device->machine->driver_data; + bwing_state *state = device->machine->driver_data(); UINT8 latch_data; switch (cpu_getiloops(device)) @@ -75,7 +75,7 @@ static INTERRUPT_GEN ( bwp1_interrupt ) static INTERRUPT_GEN ( bwp3_interrupt ) { - bwing_state *state = (bwing_state *)device->machine->driver_data; + bwing_state *state = device->machine->driver_data(); if (!state->bwp3_nmimask) cpu_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE); @@ -86,32 +86,32 @@ static INTERRUPT_GEN ( bwp3_interrupt ) static WRITE8_HANDLER( bwp12_sharedram1_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); state->bwp1_sharedram1[offset] = state->bwp2_sharedram1[offset] = data; } static WRITE8_HANDLER( bwp3_u8F_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); state->bwp3_u8F_d = data; // prepares custom chip for various operations } static WRITE8_HANDLER( bwp3_nmimask_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); state->bwp3_nmimask = data & 0x80; } static WRITE8_HANDLER( bwp3_nmiack_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); } static READ8_HANDLER( bwp1_io_r ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); if (offset == 0) return(input_port_read(space->machine, "DSW0")); if (offset == 1) return(input_port_read(space->machine, "DSW1")); @@ -125,7 +125,7 @@ static READ8_HANDLER( bwp1_io_r ) static WRITE8_HANDLER( bwp1_ctrl_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); switch (offset) { @@ -171,7 +171,7 @@ static WRITE8_HANDLER( bwp1_ctrl_w ) static WRITE8_HANDLER( bwp2_ctrl_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); switch (offset) { case 0: cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, ASSERT_LINE); break; // SMSTB @@ -374,7 +374,7 @@ GFXDECODE_END static MACHINE_START( bwing ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -397,7 +397,7 @@ static MACHINE_START( bwing ) static MACHINE_RESET( bwing ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); int i; state->coin = 0; @@ -629,7 +629,7 @@ ROM_END static void fix_bwp3( running_machine *machine ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); UINT8 *rom = state->bwp3_rombase; int i, j = state->bwp3_romsize; UINT8 ah, al; @@ -645,7 +645,7 @@ static void fix_bwp3( running_machine *machine ) static DRIVER_INIT( bwing ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); state->bwp123_membase[0] = memory_region(machine, "maincpu"); state->bwp123_membase[1] = memory_region(machine, "sub"); diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index d7dbcd56466..c35aefc21f5 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -54,7 +54,7 @@ Dip locations verified with Fabtek manual for the trackball version static MACHINE_RESET( cabalbl ) { - cabal_state *state = (cabal_state *)machine->driver_data; + cabal_state *state = machine->driver_data(); state->sound_command1 = state->sound_command2 = 0xff; } @@ -63,7 +63,7 @@ static MACHINE_RESET( cabalbl ) static WRITE16_HANDLER( cabalbl_sndcmd_w ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); switch (offset) { @@ -81,7 +81,7 @@ static WRITE16_HANDLER( cabalbl_sndcmd_w ) static WRITE16_HANDLER( track_reset_w ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); int i; static const char *const track_names[] = { "IN0", "IN1", "IN2", "IN3" }; @@ -91,7 +91,7 @@ static WRITE16_HANDLER( track_reset_w ) static READ16_HANDLER( track_r ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); switch (offset) { @@ -162,14 +162,14 @@ ADDRESS_MAP_END static READ8_HANDLER( cabalbl_snd2_r ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); return BITSWAP8(state->sound_command2, 7,2,4,5,3,6,1,0); } static READ8_HANDLER( cabalbl_snd1_r ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); return BITSWAP8(state->sound_command1, 7,2,4,5,3,6,1,0); } diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 3ea2673520f..7f06787e04d 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -83,12 +83,13 @@ Notes: #include "sound/ay8910.h" -class calorie_state +class calorie_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, calorie_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, calorie_state(machine)); } - calorie_state(running_machine &machine) { } + calorie_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * fg_ram; @@ -109,7 +110,7 @@ public: static TILE_GET_INFO( get_bg_tile_info ) { - calorie_state *state = (calorie_state *)machine->driver_data; + calorie_state *state = machine->driver_data(); UINT8 *src = memory_region(machine, "user1"); int bg_base = (state->bg_bank & 0x0f) * 0x200; int code = src[bg_base + tile_index] | (((src[bg_base + tile_index + 0x100]) & 0x10) << 4); @@ -121,7 +122,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - calorie_state *state = (calorie_state *)machine->driver_data; + calorie_state *state = machine->driver_data(); int code = ((state->fg_ram[tile_index + 0x400] & 0x30) << 4) | state->fg_ram[tile_index]; int color = state->fg_ram[tile_index + 0x400] & 0x0f; @@ -131,7 +132,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( calorie ) { - calorie_state *state = (calorie_state *)machine->driver_data; + calorie_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -141,7 +142,7 @@ static VIDEO_START( calorie ) static VIDEO_UPDATE( calorie ) { - calorie_state *state = (calorie_state *)screen->machine->driver_data; + calorie_state *state = screen->machine->driver_data(); int x; if (state->bg_bank & 0x10) @@ -200,14 +201,14 @@ static VIDEO_UPDATE( calorie ) static WRITE8_HANDLER( fg_ram_w ) { - calorie_state *state = (calorie_state *)space->machine->driver_data; + calorie_state *state = space->machine->driver_data(); state->fg_ram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); } static WRITE8_HANDLER( bg_bank_w ) { - calorie_state *state = (calorie_state *)space->machine->driver_data; + calorie_state *state = space->machine->driver_data(); if((state->bg_bank & ~0x10) != (data & ~0x10)) tilemap_mark_all_tiles_dirty(state->bg_tilemap); @@ -417,14 +418,14 @@ GFXDECODE_END static MACHINE_START( calorie ) { - calorie_state *state = (calorie_state *)machine->driver_data; + calorie_state *state = machine->driver_data(); state_save_register_global(machine, state->bg_bank); } static MACHINE_RESET( calorie ) { - calorie_state *state = (calorie_state *)machine->driver_data; + calorie_state *state = machine->driver_data(); state->bg_bank = 0; } diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 01400f59d45..6b6c99a2d6f 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -152,21 +152,21 @@ static WRITE8_HANDLER( capbowl_rom_select_w ) static READ8_HANDLER( track_0_r ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "IN0") & 0xf0) | ((input_port_read(space->machine, "TRACKY") - state->last_trackball_val[0]) & 0x0f); } static READ8_HANDLER( track_1_r ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "IN1") & 0xf0) | ((input_port_read(space->machine, "TRACKX") - state->last_trackball_val[1]) & 0x0f); } static WRITE8_HANDLER( track_reset_w ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); /* reset the trackball counters */ state->last_trackball_val[0] = input_port_read(space->machine, "TRACKY"); @@ -185,7 +185,7 @@ static WRITE8_HANDLER( track_reset_w ) static WRITE8_HANDLER( capbowl_sndcmd_w ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, HOLD_LINE); soundlatch_w(space, offset, data); } @@ -201,7 +201,7 @@ static WRITE8_HANDLER( capbowl_sndcmd_w ) static void firqhandler( running_device *device, int irq ) { - capbowl_state *state = (capbowl_state *)device->machine->driver_data; + capbowl_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 1, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -347,7 +347,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( capbowl ) { - capbowl_state *state = (capbowl_state *)machine->driver_data; + capbowl_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -359,7 +359,7 @@ static MACHINE_START( capbowl ) static MACHINE_RESET( capbowl ) { - capbowl_state *state = (capbowl_state *)machine->driver_data; + capbowl_state *state = machine->driver_data(); timer_set(machine, machine->primary_screen->time_until_pos(32), NULL, 32, capbowl_update); diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index 41331f1d4c9..ce3d47bd685 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -183,7 +183,7 @@ GFXDECODE_END static MACHINE_RESET( carjmbre ) { - carjmbre_state *state = (carjmbre_state *)machine->driver_data; + carjmbre_state *state = machine->driver_data(); state->flipscreen = 0; state->bgcolor = 0; diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index d919bfd3a70..8600aca27ad 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -93,7 +93,7 @@ Versions known to exist but not dumped: /* Update the IRQ state based on all possible causes */ static void update_irq_state( running_machine *machine ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); if (state->vblank_irq || state->sound_irq || state->unknown_irq) cpu_set_input_line(state->maincpu, state->irq_level, ASSERT_LINE); else @@ -102,7 +102,7 @@ static void update_irq_state( running_machine *machine ) static TIMER_CALLBACK( cave_vblank_start ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); state->vblank_irq = 1; update_irq_state(machine); cave_get_sprite_info(machine); @@ -111,7 +111,7 @@ static TIMER_CALLBACK( cave_vblank_start ) static TIMER_CALLBACK( cave_vblank_end ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); if (state->kludge == 3) /* mazinger metmqstr */ { state->unknown_irq = 1; @@ -123,7 +123,7 @@ static TIMER_CALLBACK( cave_vblank_end ) /* Called once/frame to generate the VBLANK interrupt */ static INTERRUPT_GEN( cave_interrupt ) { - cave_state *state = (cave_state *)device->machine->driver_data; + cave_state *state = device->machine->driver_data(); timer_set(device->machine, ATTOTIME_IN_USEC(17376 - state->time_vblank_irq), NULL, 0, cave_vblank_start); timer_set(device->machine, ATTOTIME_IN_USEC(17376 - state->time_vblank_irq + 2000), NULL, 0, cave_vblank_end); } @@ -131,7 +131,7 @@ static INTERRUPT_GEN( cave_interrupt ) /* Called by the YMZ280B to set the IRQ state */ static void sound_irq_gen( running_device *device, int state ) { - cave_state *cave = (cave_state *)device->machine->driver_data; + cave_state *cave = device->machine->driver_data(); cave->sound_irq = (state != 0); update_irq_state(device->machine); } @@ -155,7 +155,7 @@ static void sound_irq_gen( running_device *device, int state ) static READ16_HANDLER( cave_irq_cause_r ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); int result = 0x0003; if (state->vblank_irq) @@ -200,7 +200,7 @@ static READ8_HANDLER( soundflags_r ) { // bit 2 is low: can read command (lo) // bit 3 is low: can read command (hi) -// cave_state *state = (cave_state *)space->machine->driver_data; +// cave_state *state = space->machine->driver_data(); // return (state->sound_flag1 ? 0 : 4) | // (state->sound_flag2 ? 0 : 8) ; return 0; @@ -210,7 +210,7 @@ static READ16_HANDLER( soundflags_ack_r ) { // bit 0 is low: can write command // bit 1 is low: can read answer - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); // return ((state->sound_flag1 | state->sound_flag2) ? 1 : 0) | // ((state->soundbuf_len > 0) ? 0 : 2) ; @@ -220,7 +220,7 @@ static READ16_HANDLER( soundflags_ack_r ) /* Main CPU: write a 16 bit sound latch and generate a NMI on the sound CPU */ static WRITE16_HANDLER( sound_cmd_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); // state->sound_flag1 = 1; // state->sound_flag2 = 1; soundlatch_word_w(space, offset, data, mem_mask); @@ -231,7 +231,7 @@ static WRITE16_HANDLER( sound_cmd_w ) /* Sound CPU: read the low 8 bits of the 16 bit sound latch */ static READ8_HANDLER( soundlatch_lo_r ) { -// cave_state *state = (cave_state *)space->machine->driver_data; +// cave_state *state = space->machine->driver_data(); // state->sound_flag1 = 0; return soundlatch_word_r(space, offset, 0x00ff) & 0xff; } @@ -239,7 +239,7 @@ static READ8_HANDLER( soundlatch_lo_r ) /* Sound CPU: read the high 8 bits of the 16 bit sound latch */ static READ8_HANDLER( soundlatch_hi_r ) { -// cave_state *state = (cave_state *)space->machine->driver_data; +// cave_state *state = space->machine->driver_data(); // state->sound_flag2 = 0; return soundlatch_word_r(space, offset, 0xff00) >> 8; } @@ -247,7 +247,7 @@ static READ8_HANDLER( soundlatch_hi_r ) /* Main CPU: read the latch written by the sound CPU (acknowledge) */ static READ16_HANDLER( soundlatch_ack_r ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); if (state->soundbuf_len > 0) { UINT8 data = state->soundbuf_data[0]; @@ -266,7 +266,7 @@ static READ16_HANDLER( soundlatch_ack_r ) /* Sound CPU: write latch for the main CPU (acknowledge) */ static WRITE8_HANDLER( soundlatch_ack_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); state->soundbuf_data[state->soundbuf_len] = data; if (state->soundbuf_len < 32) state->soundbuf_len++; @@ -485,7 +485,7 @@ static READ16_HANDLER( donpachi_videoregs_r ) #if 0 WRITE16_HANDLER( donpachi_videoregs_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoregs[offset]); switch (offset) @@ -633,14 +633,14 @@ ADDRESS_MAP_END static void show_leds(running_machine *machine) { #ifdef MAME_DEBUG -// cave_state *state = (cave_state *)machine->driver_data; +// cave_state *state = machine->driver_data(); // popmessage("led %04X eep %02X", state->leds[0], (state->leds[1] >> 8) & ~0x70); #endif } static WRITE16_HANDLER( korokoro_leds_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); COMBINE_DATA(&state->leds[0]); set_led_status(space->machine, 0, data & 0x8000); @@ -665,7 +665,7 @@ static WRITE16_HANDLER( korokoro_leds_w ) static WRITE16_DEVICE_HANDLER( korokoro_eeprom_msb_w ) { - cave_state *state = (cave_state *)device->machine->driver_data; + cave_state *state = device->machine->driver_data(); if (data & ~0x7000) { logerror("%s: Unknown EEPROM bit written %04X\n",cpuexec_describe_context(device->machine),data); @@ -690,7 +690,7 @@ static WRITE16_DEVICE_HANDLER( korokoro_eeprom_msb_w ) static CUSTOM_INPUT( korokoro_hopper_r ) { - cave_state *state = (cave_state *)field->port->machine->driver_data; + cave_state *state = field->port->machine->driver_data(); return state->hopper ? 1 : 0; } @@ -811,10 +811,10 @@ INLINE void vctrl_w(UINT16 *VCTRL, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 } COMBINE_DATA(&VCTRL[offset]); } -static WRITE16_HANDLER( pwrinst2_vctrl_0_w ) { cave_state *state = (cave_state *)space->machine->driver_data; vctrl_w(state->vctrl_0, offset, data, mem_mask); } -static WRITE16_HANDLER( pwrinst2_vctrl_1_w ) { cave_state *state = (cave_state *)space->machine->driver_data; vctrl_w(state->vctrl_1, offset, data, mem_mask); } -static WRITE16_HANDLER( pwrinst2_vctrl_2_w ) { cave_state *state = (cave_state *)space->machine->driver_data; vctrl_w(state->vctrl_2, offset, data, mem_mask); } -static WRITE16_HANDLER( pwrinst2_vctrl_3_w ) { cave_state *state = (cave_state *)space->machine->driver_data; vctrl_w(state->vctrl_3, offset, data, mem_mask); } +static WRITE16_HANDLER( pwrinst2_vctrl_0_w ) { cave_state *state = space->machine->driver_data(); vctrl_w(state->vctrl_0, offset, data, mem_mask); } +static WRITE16_HANDLER( pwrinst2_vctrl_1_w ) { cave_state *state = space->machine->driver_data(); vctrl_w(state->vctrl_1, offset, data, mem_mask); } +static WRITE16_HANDLER( pwrinst2_vctrl_2_w ) { cave_state *state = space->machine->driver_data(); vctrl_w(state->vctrl_2, offset, data, mem_mask); } +static WRITE16_HANDLER( pwrinst2_vctrl_3_w ) { cave_state *state = space->machine->driver_data(); vctrl_w(state->vctrl_3, offset, data, mem_mask); } static ADDRESS_MAP_START( pwrinst2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM @@ -906,7 +906,7 @@ static WRITE16_DEVICE_HANDLER( tjumpman_eeprom_lsb_w ) static WRITE16_HANDLER( tjumpman_leds_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { set_led_status(space->machine, 0, data & 0x0001); // suru @@ -924,7 +924,7 @@ static WRITE16_HANDLER( tjumpman_leds_w ) static CUSTOM_INPUT( tjumpman_hopper_r ) { - cave_state *state = (cave_state *)field->port->machine->driver_data; + cave_state *state = field->port->machine->driver_data(); return (state->hopper && !(field->port->machine->primary_screen->frame_number() % 10)) ? 0 : 1; } @@ -1135,13 +1135,13 @@ ADDRESS_MAP_END static READ8_HANDLER( mirror_ram_r ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); return state->mirror_ram[offset]; } static WRITE8_HANDLER( mirror_ram_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); state->mirror_ram[offset] = data; } @@ -1710,7 +1710,7 @@ GFXDECODE_END static MACHINE_START( cave ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1726,7 +1726,7 @@ static MACHINE_START( cave ) static MACHINE_RESET( cave ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); memset(state->soundbuf_data, 0, 32); state->soundbuf_len = 0; @@ -4216,7 +4216,7 @@ static void sailormn_unpack_tiles( running_machine *machine, const char *region static void init_cave(running_machine *machine) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); state->spritetype[0] = 0; // Normal sprites state->kludge = 0; @@ -4241,7 +4241,7 @@ static DRIVER_INIT( agallet ) static DRIVER_INIT( dfeveron ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); unpack_sprites(machine); @@ -4250,7 +4250,7 @@ static DRIVER_INIT( dfeveron ) static DRIVER_INIT( feversos ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); unpack_sprites(machine); @@ -4259,7 +4259,7 @@ static DRIVER_INIT( feversos ) static DRIVER_INIT( ddonpach ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); ddonpach_unpack_sprites(machine); @@ -4269,7 +4269,7 @@ static DRIVER_INIT( ddonpach ) static DRIVER_INIT( donpachi ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); ddonpach_unpack_sprites(machine); @@ -4280,7 +4280,7 @@ static DRIVER_INIT( donpachi ) static DRIVER_INIT( esprade ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); esprade_unpack_sprites(machine); @@ -4296,7 +4296,7 @@ static DRIVER_INIT( esprade ) static DRIVER_INIT( gaia ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); /* No EEPROM */ @@ -4308,7 +4308,7 @@ static DRIVER_INIT( gaia ) static DRIVER_INIT( guwange ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); esprade_unpack_sprites(machine); @@ -4317,7 +4317,7 @@ static DRIVER_INIT( guwange ) static DRIVER_INIT( hotdogst ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); init_cave(machine); @@ -4332,7 +4332,7 @@ static DRIVER_INIT( hotdogst ) static DRIVER_INIT( mazinger ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); UINT8 *buffer; UINT8 *src = memory_region(machine, "sprites"); @@ -4365,7 +4365,7 @@ static DRIVER_INIT( mazinger ) static DRIVER_INIT( metmqstr ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); init_cave(machine); @@ -4382,7 +4382,7 @@ static DRIVER_INIT( metmqstr ) static DRIVER_INIT( pwrinst2j ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); UINT8 *buffer; UINT8 *src = memory_region(machine, "sprites"); @@ -4431,7 +4431,7 @@ static DRIVER_INIT( pwrinst2 ) static DRIVER_INIT( sailormn ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); UINT8 *buffer; UINT8 *src = memory_region(machine, "sprites"); @@ -4465,7 +4465,7 @@ static DRIVER_INIT( sailormn ) static DRIVER_INIT( tjumpman ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); unpack_sprites(machine); @@ -4479,7 +4479,7 @@ static DRIVER_INIT( tjumpman ) static DRIVER_INIT( uopoko ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); unpack_sprites(machine); @@ -4489,7 +4489,7 @@ static DRIVER_INIT( uopoko ) static DRIVER_INIT( korokoro ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); init_cave(machine); state->irq_level = 2; diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 9f9e1fe4de0..72c502aded8 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -8,12 +8,13 @@ #include "cpu/m6800/m6800.h" -class cball_state +class cball_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cball_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cball_state(machine)); } - cball_state(running_machine &machine) { } + cball_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * video_ram; @@ -28,7 +29,7 @@ public: static TILE_GET_INFO( get_tile_info ) { - cball_state *state = (cball_state *)machine->driver_data; + cball_state *state = machine->driver_data(); UINT8 code = state->video_ram[tile_index]; SET_TILE_INFO(0, code, code >> 7, 0); @@ -37,7 +38,7 @@ static TILE_GET_INFO( get_tile_info ) static WRITE8_HANDLER( cball_vram_w ) { - cball_state *state = (cball_state *)space->machine->driver_data; + cball_state *state = space->machine->driver_data(); state->video_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -46,14 +47,14 @@ static WRITE8_HANDLER( cball_vram_w ) static VIDEO_START( cball ) { - cball_state *state = (cball_state *)machine->driver_data; + cball_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( cball ) { - cball_state *state = (cball_state *)screen->machine->driver_data; + cball_state *state = screen->machine->driver_data(); /* draw playfield */ tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -71,7 +72,7 @@ static VIDEO_UPDATE( cball ) static TIMER_CALLBACK( interrupt_callback ) { - cball_state *state = (cball_state *)machine->driver_data; + cball_state *state = machine->driver_data(); int scanline = param; generic_pulse_irq_line(state->maincpu, 0); @@ -87,7 +88,7 @@ static TIMER_CALLBACK( interrupt_callback ) static MACHINE_START( cball ) { - cball_state *state = (cball_state *)machine->driver_data; + cball_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); } @@ -110,7 +111,7 @@ static PALETTE_INIT( cball ) static READ8_HANDLER( cball_wram_r ) { - cball_state *state = (cball_state *)space->machine->driver_data; + cball_state *state = space->machine->driver_data(); return state->video_ram[0x380 + offset]; } @@ -118,7 +119,7 @@ static READ8_HANDLER( cball_wram_r ) static WRITE8_HANDLER( cball_wram_w ) { - cball_state *state = (cball_state *)space->machine->driver_data; + cball_state *state = space->machine->driver_data(); state->video_ram[0x380 + offset] = data; } diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index ec9fcfdc6f8..4530b335e71 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -29,7 +29,7 @@ static WRITE8_HANDLER( cbasebal_bankswitch_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); /* bits 0-4 select ROM bank */ //logerror("%04x: bankswitch %02x\n", cpu_get_pc(space->cpu), data); @@ -44,7 +44,7 @@ static WRITE8_HANDLER( cbasebal_bankswitch_w ) static READ8_HANDLER( bankedram_r ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); switch (state->rambank) { @@ -63,7 +63,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); switch (state->rambank) { @@ -244,7 +244,7 @@ GFXDECODE_END static MACHINE_START( cbasebal ) { - cbasebal_state *state = (cbasebal_state *)machine->driver_data; + cbasebal_state *state = machine->driver_data(); memory_configure_bank(machine, "bank1", 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x4000); @@ -261,7 +261,7 @@ static MACHINE_START( cbasebal ) static MACHINE_RESET( cbasebal ) { - cbasebal_state *state = (cbasebal_state *)machine->driver_data; + cbasebal_state *state = machine->driver_data(); state->rambank = 0; state->tilebank = 0; diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 607623e7bd3..93ef9204516 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -28,7 +28,7 @@ static WRITE16_HANDLER( twocrude_control_w ) { - cbuster_state *state = (cbuster_state *)space->machine->driver_data; + cbuster_state *state = space->machine->driver_data(); switch (offset << 1) { @@ -81,7 +81,7 @@ static WRITE16_HANDLER( twocrude_control_w ) static READ16_HANDLER( twocrude_control_r ) { - cbuster_state *state = (cbuster_state *)space->machine->driver_data; + cbuster_state *state = space->machine->driver_data(); switch (offset << 1) { @@ -266,7 +266,7 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - cbuster_state *driver_state = (cbuster_state *)device->machine->driver_data; + cbuster_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -295,7 +295,7 @@ static const deco16ic_interface twocrude_deco16ic_intf = static MACHINE_START( cbuster ) { - cbuster_state *state = (cbuster_state *)machine->driver_data; + cbuster_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -307,7 +307,7 @@ static MACHINE_START( cbuster ) static MACHINE_RESET( cbuster ) { - cbuster_state *state = (cbuster_state *)machine->driver_data; + cbuster_state *state = machine->driver_data(); state->prot = 0; state->pri = 0; diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 1b1264b1b35..d1d24bbc906 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -149,7 +149,7 @@ static UINT8 *nvram_stage; INLINE void schedule_next_irq( running_machine *machine, int curscanline ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); /* scan for a rising edge on the IRQCK signal */ for (curscanline++; ; curscanline = (curscanline + 1) & 0xff) @@ -163,7 +163,7 @@ INLINE void schedule_next_irq( running_machine *machine, int curscanline ) static TIMER_CALLBACK( clock_irq ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); /* assert the IRQ if not already asserted */ if (!state->irq_state) @@ -182,7 +182,7 @@ static TIMER_CALLBACK( clock_irq ) static CUSTOM_INPUT( get_vblank ) { - ccastles_state *state = (ccastles_state *)field->port->machine->driver_data; + ccastles_state *state = field->port->machine->driver_data(); int scanline = field->port->machine->primary_screen->vpos(); return state->syncprom[scanline & 0xff] & 1; } @@ -197,7 +197,7 @@ static CUSTOM_INPUT( get_vblank ) static MACHINE_START( ccastles ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); rectangle visarea; /* initialize globals */ @@ -246,7 +246,7 @@ static MACHINE_START( ccastles ) static MACHINE_RESET( ccastles ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE); state->irq_state = 0; } @@ -261,7 +261,7 @@ static MACHINE_RESET( ccastles ) static WRITE8_HANDLER( irq_ack_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); if (state->irq_state) { cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); @@ -326,7 +326,7 @@ static WRITE8_HANDLER( nvram_recall_w ) static WRITE8_HANDLER( nvram_store_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); state->nvram_store[offset] = data & 1; if (!state->nvram_store[0] && state->nvram_store[1]) diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c index ef1666bb976..146ebc48b18 100644 --- a/src/mame/drivers/cchance.c +++ b/src/mame/drivers/cchance.c @@ -49,13 +49,13 @@ static WRITE8_HANDLER( output_0_w ) static READ8_HANDLER( input_1_r ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); return (state->hop_io) | (state->bell_io) | (input_port_read(space->machine, "SP") & 0xff); } static WRITE8_HANDLER( output_1_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); state->hop_io = (data & 0x40)>>4; state->bell_io = (data & 0x80)>>4; @@ -183,7 +183,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( cchance ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu = NULL; state_save_register_global(machine, state->screenflip); @@ -193,7 +193,7 @@ static MACHINE_START( cchance ) static MACHINE_RESET( cchance ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->screenflip = 0; state->mcu_type = -1; diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c index 011860f5084..5b95b611245 100644 --- a/src/mame/drivers/cdi.c +++ b/src/mame/drivers/cdi.c @@ -558,12 +558,13 @@ struct _mcd212_ab_t BYTE68K deltaUV[BYTE68K_MAX + 1]; }; -class cdi_state +class cdi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cdi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cdi_state(machine)); } - cdi_state(running_machine &machine) { } + cdi_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *planea; UINT16 *planeb; @@ -598,7 +599,7 @@ static void scc68070_set_timer_callback(scc68070_regs_t *scc68070, int channel) static TIMER_CALLBACK( scc68070_timer0_callback ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); scc68070_regs_t *scc68070 = &state->scc68070_regs; scc68070->timers.timer0 = scc68070->timers.reload_register; @@ -615,7 +616,7 @@ static TIMER_CALLBACK( scc68070_timer0_callback ) static READ16_HANDLER( scc68070_periphs_r ) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); scc68070_regs_t *scc68070 = &state->scc68070_regs; switch(offset) @@ -858,7 +859,7 @@ static READ16_HANDLER( scc68070_periphs_r ) static WRITE16_HANDLER( scc68070_periphs_w ) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); scc68070_regs_t *scc68070 = &state->scc68070_regs; switch(offset) @@ -1559,7 +1560,7 @@ static void cdic_decode_audio_sector(running_machine *machine, const unsigned ch { // Get XA format from sector header - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; const unsigned char *hdr = xa + 4; int channels; @@ -1686,7 +1687,7 @@ static void cdic_decode_audio_sector(running_machine *machine, const unsigned ch // After an appropriate delay for decoding to take place... static TIMER_CALLBACK( audio_sample_trigger ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; if(cdic->decode_addr == 0xffff) @@ -1813,7 +1814,7 @@ static UINT32 increment_cdda_sector_bcd(UINT32 bcd) static TIMER_CALLBACK( cdic_trigger_readback_int ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; switch(cdic->command) @@ -2123,7 +2124,7 @@ static TIMER_CALLBACK( cdic_trigger_readback_int ) static READ16_HANDLER( cdic_r ) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; offset += 0x3c00/2; @@ -2208,7 +2209,7 @@ static READ16_HANDLER( cdic_r ) static WRITE16_HANDLER( cdic_w ) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; offset += 0x3c00/2; @@ -2416,7 +2417,7 @@ static void cdic_register_globals(running_machine *machine, cdic_regs_t *cdic) static TIMER_CALLBACK( slave_trigger_readback_int ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); slave_regs_t *slave = &state->slave_regs; verboselog(machine, 0, "Asserting IRQ2\n" ); @@ -2427,7 +2428,7 @@ static TIMER_CALLBACK( slave_trigger_readback_int ) static void slave_prepare_readback(running_machine *machine, attotime delay, UINT8 channel, UINT8 count, UINT8 data0, UINT8 data1, UINT8 data2, UINT8 data3, UINT8 cmd) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); slave_regs_t *slave = &state->slave_regs; slave->channel[channel].out_index = 0; @@ -2443,7 +2444,7 @@ static void slave_prepare_readback(running_machine *machine, attotime delay, UIN static void perform_mouse_update(running_machine *machine) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); slave_regs_t *slave = &state->slave_regs; UINT16 x = input_port_read(machine, "MOUSEX"); UINT16 y = input_port_read(machine, "MOUSEY"); @@ -2490,7 +2491,7 @@ static INPUT_CHANGED( mouse_update ) static READ16_HANDLER( slave_r ) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); slave_regs_t *slave = &state->slave_regs; if(slave->channel[offset].out_count) @@ -2527,7 +2528,7 @@ static READ16_HANDLER( slave_r ) static void set_mouse_position(running_machine* machine) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); slave_regs_t *slave = &state->slave_regs; UINT16 x, y; @@ -2547,7 +2548,7 @@ static void set_mouse_position(running_machine* machine) static WRITE16_HANDLER( slave_w ) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); slave_regs_t *slave = &state->slave_regs; switch(offset) @@ -2885,7 +2886,7 @@ static const UINT16 cdi220_lcd_char[20*22] = static void cdi220_draw_lcd(running_machine *machine, int y) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); bitmap_t *bitmap = state->lcdbitmap; UINT32 *scanline = BITMAP_ADDR32(bitmap, y, 0); int x = 0; @@ -2910,7 +2911,7 @@ static void cdi220_draw_lcd(running_machine *machine, int y) static READ16_HANDLER(mcd212_r) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; UINT8 channel = 1 - (offset / 8); @@ -2973,7 +2974,7 @@ static READ16_HANDLER(mcd212_r) static void mcd212_update_visible_area(running_machine *machine) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; rectangle visarea = machine->primary_screen->visible_area(); attoseconds_t period = machine->primary_screen->frame_period().attoseconds; @@ -2995,7 +2996,7 @@ static void mcd212_update_visible_area(running_machine *machine) static WRITE16_HANDLER(mcd212_w) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; switch(offset) @@ -3035,7 +3036,7 @@ static WRITE16_HANDLER(mcd212_w) static void mcd212_set_register(running_machine *machine, int channel, UINT8 reg, UINT32 value) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; switch(reg) @@ -3227,7 +3228,7 @@ static void mcd212_set_display_parameters(mcd212_regs_t *mcd212, int channel, UI static void mcd212_process_ica(running_machine *machine, int channel) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; UINT16 *ica = channel ? state->planeb : state->planea; UINT32 addr = 0x000400/2; @@ -3312,7 +3313,7 @@ static void mcd212_process_ica(running_machine *machine, int channel) static void mcd212_process_dca(running_machine *machine, int channel) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; UINT16 *dca = channel ? state->planeb : state->planea; UINT32 addr = (mcd212->channel[channel].dca & 0x0007ffff) / 2; //(mcd212_get_dcp(mcd212, channel) & 0x0007ffff) / 2; // mcd212->channel[channel].dca / 2; @@ -3460,7 +3461,7 @@ INLINE UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte) static void mcd212_update_region_arrays(running_machine *machine) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; int x = 0; int latched_rf0 = 0; @@ -3693,7 +3694,7 @@ static void mcd212_update_region_arrays(running_machine *machine) static int mcd212_get_screen_width(running_machine *machine) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; if((mcd212->channel[0].dcr & (MCD212_DCR_CF | MCD212_DCR_FD)) && (mcd212->channel[0].csrw & MCD212_CSR1W_ST)) @@ -3705,7 +3706,7 @@ static int mcd212_get_screen_width(running_machine *machine) static void mcd212_process_vsr(running_machine *machine, int channel, UINT8 *pixels_r, UINT8 *pixels_g, UINT8 *pixels_b) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; UINT8 *data = channel ? (UINT8*)state->planeb : (UINT8*)state->planea; UINT32 vsr = mcd212_get_vsr(mcd212, channel) & 0x0007ffff; @@ -4014,7 +4015,7 @@ static const UINT32 mcd212_4bpp_color[16] = static void mcd212_draw_cursor(running_machine *machine, UINT32 *scanline, int y) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; if(mcd212->channel[0].cursor_control & MCD212_CURCNT_EN) @@ -4062,7 +4063,7 @@ static void mcd212_draw_cursor(running_machine *machine, UINT32 *scanline, int y static void mcd212_mix_lines(running_machine *machine, UINT8 *plane_a_r, UINT8 *plane_a_g, UINT8 *plane_a_b, UINT8 *plane_b_r, UINT8 *plane_b_g, UINT8 *plane_b_b, UINT32 *out) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; int x = 0; UINT8 debug_mode = input_port_read(machine, "DEBUG"); @@ -4258,7 +4259,7 @@ static void mcd212_draw_scanline(running_machine *machine, int y) static TIMER_CALLBACK( mcd212_perform_scan ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); mcd212_regs_t *mcd212 = &state->mcd212_regs; int scanline = machine->primary_screen->vpos(); @@ -4451,7 +4452,7 @@ static void mcd212_ab_init(mcd212_ab_t *mcd212_ab) static VIDEO_START(cdi) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); VIDEO_START_CALL(generic_bitmapped); mcd212_ab_init(&state->mcd212_ab); @@ -4464,7 +4465,7 @@ static VIDEO_START(cdi) static VIDEO_UPDATE(cdi) { - cdi_state *state = (cdi_state *)screen->machine->driver_data; + cdi_state *state = screen->machine->driver_data(); running_device *main_screen = screen->machine->device("screen"); running_device *lcd_screen = screen->machine->device("lcd"); @@ -4482,7 +4483,7 @@ static VIDEO_UPDATE(cdi) static TIMER_CALLBACK( test_timer_callback ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); // This function manually triggers interrupt requests as a test. if(state->timer_set == 0) @@ -4506,7 +4507,7 @@ static TIMER_CALLBACK( test_timer_callback ) static WRITE16_HANDLER(cdic_ram_w) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; verboselog(space->machine, 0, "cdic_ram_w: %08x = %04x & %04x\n", 0x00300000 + offset*2, data, mem_mask); @@ -4515,7 +4516,7 @@ static WRITE16_HANDLER(cdic_ram_w) static READ16_HANDLER(cdic_ram_r) { - cdi_state *state = (cdi_state *)space->machine->driver_data; + cdi_state *state = space->machine->driver_data(); cdic_regs_t *cdic = &state->cdic_regs; verboselog(space->machine, 0, "cdic_ram_r: %08x = %04x & %04x\n", 0x00300000 + offset*2, cdic->ram[offset], mem_mask); @@ -4589,7 +4590,7 @@ INPUT_PORTS_END static MACHINE_START( cdi ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); scc68070_register_globals(machine, &state->scc68070_regs); cdic_register_globals(machine, &state->cdic_regs); @@ -4613,7 +4614,7 @@ static MACHINE_START( cdi ) static MACHINE_RESET( cdi ) { - cdi_state *state = (cdi_state *)machine->driver_data; + cdi_state *state = machine->driver_data(); UINT16 *src = (UINT16*)memory_region(machine, "maincpu"); UINT16 *dst = state->planea; //running_device *cdrom_dev = machine->device("cdrom"); diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index a2f35308c04..aadbfa164bc 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -244,7 +244,7 @@ GFXDECODE_END static MACHINE_START( chaknpop ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); @@ -260,7 +260,7 @@ static MACHINE_START( chaknpop ) static MACHINE_RESET( chaknpop ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); state->gfxmode = 0; state->flip_x = 0; diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 2f623413be5..9bf6c0d34b3 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -97,7 +97,7 @@ TODO: static VIDEO_EOF( champbas ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); state->watchdog_count++; if (state->watchdog_count == 0x10) @@ -113,20 +113,20 @@ static VIDEO_EOF( champbas ) static WRITE8_HANDLER( champbas_watchdog_reset_w ) { - champbas_state *state = (champbas_state *)space->machine->driver_data; + champbas_state *state = space->machine->driver_data(); state->watchdog_count = 0; } static CUSTOM_INPUT( champbas_watchdog_bit2 ) { - champbas_state *state = (champbas_state *)field->port->machine->driver_data; + champbas_state *state = field->port->machine->driver_data(); return BIT(state->watchdog_count, 2); } static WRITE8_HANDLER( irq_enable_w ) { - champbas_state *state = (champbas_state *)space->machine->driver_data; + champbas_state *state = space->machine->driver_data(); int bit = data & 1; cpu_interrupt_enable(state->maincpu, bit); @@ -136,7 +136,7 @@ static WRITE8_HANDLER( irq_enable_w ) static TIMER_CALLBACK( exctsccr_fm_callback ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -161,7 +161,7 @@ static WRITE8_HANDLER( champbas_mcu_switch_w ) static WRITE8_HANDLER( champbas_mcu_halt_w ) { - champbas_state *state = (champbas_state *)space->machine->driver_data; + champbas_state *state = space->machine->driver_data(); // MCU not present/not used in champbas if (state->mcu == NULL) @@ -566,7 +566,7 @@ GFXDECODE_END static MACHINE_START( champbas ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->mcu = machine->device(CPUTAG_MCU); @@ -578,7 +578,7 @@ static MACHINE_START( champbas ) static MACHINE_START( exctsccr ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); // FIXME @@ -590,7 +590,7 @@ static MACHINE_START( exctsccr ) static MACHINE_RESET( champbas ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); state->palette_bank = 0; state->gfx_bank = 0; // talbot has only 1 bank diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 1ba66cf11d8..486e275def7 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -158,7 +158,7 @@ Notes: static READ8_HANDLER( trackball_r ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); UINT8 ret; UINT8 port4 = input_port_read(space->machine, "FAKEX"); UINT8 port5 = input_port_read(space->machine, "FAKEY"); @@ -184,7 +184,7 @@ static WRITE8_HANDLER( champbwl_misc_w ) static WRITE8_HANDLER( champbwl_objctrl_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); if(offset != 0) data ^= 0xff; @@ -332,7 +332,7 @@ static const x1_010_interface champbwl_sound_intf = static MACHINE_START( champbwl ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); state->mcu = NULL; @@ -345,7 +345,7 @@ static MACHINE_START( champbwl ) static MACHINE_RESET( champbwl ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->screenflip = 0; state->mcu_type = -1; diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 72db57d9188..d76c7c7e6be 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -51,12 +51,13 @@ ToDo: #include "sound/2203intf.h" -class chanbara_state +class chanbara_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chanbara_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chanbara_state(machine)); } - chanbara_state(running_machine &machine) { } + chanbara_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -90,7 +91,7 @@ static PALETTE_INIT( chanbara ) static WRITE8_HANDLER( chanbara_videoram_w ) { - chanbara_state *state = (chanbara_state *)space->machine->driver_data; + chanbara_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -98,7 +99,7 @@ static WRITE8_HANDLER( chanbara_videoram_w ) static WRITE8_HANDLER( chanbara_colorram_w ) { - chanbara_state *state = (chanbara_state *)space->machine->driver_data; + chanbara_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -106,7 +107,7 @@ static WRITE8_HANDLER( chanbara_colorram_w ) static WRITE8_HANDLER( chanbara_videoram2_w ) { - chanbara_state *state = (chanbara_state *)space->machine->driver_data; + chanbara_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->bg2_tilemap, offset); @@ -114,7 +115,7 @@ static WRITE8_HANDLER( chanbara_videoram2_w ) static WRITE8_HANDLER( chanbara_colorram2_w ) { - chanbara_state *state = (chanbara_state *)space->machine->driver_data; + chanbara_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->bg2_tilemap, offset); @@ -123,7 +124,7 @@ static WRITE8_HANDLER( chanbara_colorram2_w ) static TILE_GET_INFO( get_bg_tile_info ) { - chanbara_state *state = (chanbara_state *)machine->driver_data; + chanbara_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 1) << 8); int color = (state->colorram[tile_index] >> 1) & 0x1f; @@ -132,7 +133,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - chanbara_state *state = (chanbara_state *)machine->driver_data; + chanbara_state *state = machine->driver_data(); int code = state->videoram2[tile_index]; int color = (state->colorram2[tile_index] >> 1) & 0x1f; @@ -141,7 +142,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) static VIDEO_START(chanbara ) { - chanbara_state *state = (chanbara_state *)machine->driver_data; + chanbara_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,8, 8, 32, 32); state->bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows,16, 16, 16, 32); tilemap_set_transparent_pen(state->bg_tilemap, 0); @@ -149,7 +150,7 @@ static VIDEO_START(chanbara ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - chanbara_state *state = (chanbara_state *)machine->driver_data; + chanbara_state *state = machine->driver_data(); int offs; for (offs = 0; offs < 0x80; offs += 4) @@ -193,7 +194,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( chanbara ) { - chanbara_state *state = (chanbara_state *)screen->machine->driver_data; + chanbara_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->bg2_tilemap, 0, state->scroll | (state->scrollhi << 8)); tilemap_draw(bitmap, cliprect, state->bg2_tilemap, 0, 0); @@ -326,7 +327,7 @@ GFXDECODE_END static WRITE8_DEVICE_HANDLER( chanbara_ay_out_0_w ) { - chanbara_state *state = (chanbara_state *)device->machine->driver_data; + chanbara_state *state = device->machine->driver_data(); //printf("chanbara_ay_out_0_w %02x\n",data); state->scroll = data; @@ -334,7 +335,7 @@ static WRITE8_DEVICE_HANDLER( chanbara_ay_out_0_w ) static WRITE8_DEVICE_HANDLER( chanbara_ay_out_1_w ) { - chanbara_state *state = (chanbara_state *)device->machine->driver_data; + chanbara_state *state = device->machine->driver_data(); //printf("chanbara_ay_out_1_w %02x\n",data); state->scrollhi = data & 0x03; @@ -346,7 +347,7 @@ static WRITE8_DEVICE_HANDLER( chanbara_ay_out_1_w ) static void sound_irq( running_device *device, int linestate ) { - chanbara_state *state = (chanbara_state *)device->machine->driver_data; + chanbara_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, linestate); } @@ -367,7 +368,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( chanbara ) { - chanbara_state *state = (chanbara_state *)machine->driver_data; + chanbara_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -377,7 +378,7 @@ static MACHINE_START( chanbara ) static MACHINE_RESET( chanbara ) { - chanbara_state *state = (chanbara_state *)machine->driver_data; + chanbara_state *state = machine->driver_data(); state->scroll = 0; state->scrollhi = 0; diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 79aa35a0ce4..4bcacf5eb61 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -20,7 +20,7 @@ Tomasz Slanina static READ8_HANDLER( mcu_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); //mame_printf_debug("Z80 MCU R = %x\n", state->mcu_out); return state->mcu_out; @@ -29,7 +29,7 @@ static READ8_HANDLER( mcu_r ) /* latch LS374 at U39 */ static WRITE8_HANDLER( mcu_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->mcu_in = data; } @@ -40,49 +40,49 @@ static WRITE8_HANDLER( mcu_w ) static READ8_HANDLER( changela_68705_port_a_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); } static WRITE8_HANDLER( changela_68705_port_a_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->port_a_out = data; } static WRITE8_HANDLER( changela_68705_ddr_a_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->ddr_a = data; } static READ8_HANDLER( changela_68705_port_b_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (input_port_read(space->machine, "MCU") & ~state->ddr_b); } static WRITE8_HANDLER( changela_68705_port_b_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->port_b_out = data; } static WRITE8_HANDLER( changela_68705_ddr_b_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->ddr_b = data; } static READ8_HANDLER( changela_68705_port_c_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); return (state->port_c_out & state->ddr_c) | (state->port_c_in & ~state->ddr_c); } static WRITE8_HANDLER( changela_68705_port_c_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); /* PC3 is connected to the CLOCK input of the LS374, so we latch the data on positive going edge of the clock */ @@ -99,7 +99,7 @@ static WRITE8_HANDLER( changela_68705_port_c_w ) static WRITE8_HANDLER( changela_68705_ddr_c_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->ddr_c = data; } @@ -123,13 +123,13 @@ ADDRESS_MAP_END /* U30 */ static READ8_HANDLER( changela_24_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); return ((state->port_c_out & 2) << 2) | 7; /* bits 2,1,0-N/C inputs */ } static READ8_HANDLER( changela_25_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); //collisions on bits 3,2, bits 1,0-N/C inputs return (state->tree1_col << 3) | (state->tree0_col << 2) | 0x03; } @@ -141,7 +141,7 @@ static READ8_HANDLER( changela_30_r ) static READ8_HANDLER( changela_31_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); /* If the new value is less than the old value, and it did not wrap around, or if the new value is greater than the old value, and it did wrap around, then we are moving LEFT. */ @@ -197,19 +197,19 @@ static READ8_HANDLER( changela_2d_r ) static WRITE8_HANDLER( mcu_pc_0_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->port_c_in = (state->port_c_in & 0xfe) | (data & 1); } static WRITE8_HANDLER( changela_collision_reset_0 ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->collision_reset = data & 0x01; } static WRITE8_HANDLER( changela_collision_reset_1 ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->tree_collision_reset = data & 0x01; } @@ -422,7 +422,7 @@ static const ay8910_interface ay8910_interface_2 = static INTERRUPT_GEN( chl_interrupt ) { - changela_state *state = (changela_state *)device->machine->driver_data; + changela_state *state = device->machine->driver_data(); int vector = device->machine->primary_screen->vblank() ? 0xdf : 0xcf; /* 4 irqs per frame: 3 times 0xcf, 1 time 0xdf */ // device->machine->primary_screen->update_partial(device->machine->primary_screen->vpos()); @@ -439,7 +439,7 @@ static INTERRUPT_GEN( chl_interrupt ) static MACHINE_START(changela) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); state->mcu = machine->device("mcu"); @@ -481,7 +481,7 @@ static MACHINE_START(changela) static MACHINE_RESET (changela) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); /* video */ state->slopeROM_bank = 0; diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c index 961901c025b..40908e1044b 100644 --- a/src/mame/drivers/cheekyms.c +++ b/src/mame/drivers/cheekyms.c @@ -14,7 +14,7 @@ static INPUT_CHANGED( coin_inserted ) { - cheekyms_state *state = (cheekyms_state *)field->port->machine->driver_data; + cheekyms_state *state = field->port->machine->driver_data(); /* this starts a 556 one-shot timer (and triggers a sound effect) */ if (newval) @@ -111,7 +111,7 @@ GFXDECODE_END static MACHINE_START( cheekyms ) { - cheekyms_state *state = (cheekyms_state *)machine->driver_data; + cheekyms_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->dac = machine->device("dac"); diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 15393c71c89..976d0a0b8b2 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -110,7 +110,7 @@ INLINE int scanline_to_vcount( int scanline ) static TIMER_DEVICE_CALLBACK( chinagat_scanline ) { - ddragon_state *state = (ddragon_state *)timer.machine->driver_data; + ddragon_state *state = timer.machine->driver_data(); int scanline = param; int screen_height = timer.machine->primary_screen->height(); int vcount_old = scanline_to_vcount((scanline == 0) ? screen_height - 1 : scanline - 1); @@ -135,7 +135,7 @@ static TIMER_DEVICE_CALLBACK( chinagat_scanline ) static WRITE8_HANDLER( chinagat_interrupt_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); switch (offset) { @@ -170,7 +170,7 @@ static WRITE8_HANDLER( chinagat_video_ctrl_w ) ---- -x-- Flip screen --x- ---- Enable video ??? ****************************/ - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); state->scrolly_hi = ((data & 0x02) >> 1); state->scrollx_hi = data & 0x01; @@ -190,7 +190,7 @@ static WRITE8_HANDLER( chinagat_sub_bankswitch_w ) static READ8_HANDLER( saiyugoub1_mcu_command_r ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); #if 0 if (state->mcu_command == 0x78) { @@ -202,7 +202,7 @@ static READ8_HANDLER( saiyugoub1_mcu_command_r ) static WRITE8_HANDLER( saiyugoub1_mcu_command_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); state->mcu_command = data; #if 0 if (data != 0x78) @@ -214,14 +214,14 @@ static WRITE8_HANDLER( saiyugoub1_mcu_command_w ) static WRITE8_HANDLER( saiyugoub1_adpcm_rom_addr_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); /* i8748 Port 1 write */ state->i8748_P1 = data; } static WRITE8_DEVICE_HANDLER( saiyugoub1_adpcm_control_w ) { - ddragon_state *state = (ddragon_state *)device->machine->driver_data; + ddragon_state *state = device->machine->driver_data(); /* i8748 Port 2 write */ UINT8 *saiyugoub1_adpcm_rom = memory_region(device->machine, "adpcm"); @@ -275,7 +275,7 @@ static WRITE8_DEVICE_HANDLER( saiyugoub1_m5205_clk_w ) /* Actually, T0 output clk mode is not supported by the i8048 core */ #if 0 - ddragon_state *state = (ddragon_state *)device->machine->driver_data; + ddragon_state *state = device->machine->driver_data(); state->m5205_clk++; if (state->m5205_clk == 8) @@ -290,7 +290,7 @@ static WRITE8_DEVICE_HANDLER( saiyugoub1_m5205_clk_w ) static READ8_HANDLER( saiyugoub1_m5205_irq_r ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); if (state->adpcm_sound_irq) { state->adpcm_sound_irq = 0; @@ -301,7 +301,7 @@ static READ8_HANDLER( saiyugoub1_m5205_irq_r ) static void saiyugoub1_m5205_irq_w( running_device *device ) { - ddragon_state *state = (ddragon_state *)device->machine->driver_data; + ddragon_state *state = device->machine->driver_data(); state->adpcm_sound_irq = 1; } @@ -494,7 +494,7 @@ GFXDECODE_END static void chinagat_irq_handler( running_device *device, int irq ) { - ddragon_state *state = (ddragon_state *)device->machine->driver_data; + ddragon_state *state = device->machine->driver_data(); cpu_set_input_line(state->snd_cpu, 0, irq ? ASSERT_LINE : CLEAR_LINE ); } @@ -524,7 +524,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( chinagat ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->sub_cpu = machine->device("sub"); @@ -551,7 +551,7 @@ static MACHINE_START( chinagat ) static MACHINE_RESET( chinagat ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->scrollx_hi = 0; state->scrolly_hi = 0; @@ -923,7 +923,7 @@ ROM_END static DRIVER_INIT( chinagat ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); UINT8 *MAIN = memory_region(machine, "maincpu"); UINT8 *SUB = memory_region(machine, "sub"); diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 7e46bf5149b..d1644ab5860 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -47,12 +47,13 @@ MM63.10N #include "sound/2203intf.h" #include "sound/msm5205.h" -class chinsan_state +class chinsan_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chinsan_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chinsan_state(machine)); } - chinsan_state(running_machine &machine) { } + chinsan_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * video; @@ -86,7 +87,7 @@ static VIDEO_START( chinsan ) static VIDEO_UPDATE( chinsan ) { - chinsan_state *state = (chinsan_state *)screen->machine->driver_data; + chinsan_state *state = screen->machine->driver_data(); int y, x, count; count = 0; for (y = 0; y < 32; y++) @@ -143,7 +144,7 @@ static const ym2203_interface ym2203_config = static WRITE8_HANDLER( chinsan_port00_w ) { - chinsan_state *state = (chinsan_state *)space->machine->driver_data; + chinsan_state *state = space->machine->driver_data(); state->port_select = data; @@ -161,7 +162,7 @@ static WRITE8_HANDLER( chinsan_port00_w ) static READ8_HANDLER( chinsan_input_port_0_r ) { - chinsan_state *state = (chinsan_state *)space->machine->driver_data; + chinsan_state *state = space->machine->driver_data(); //return 0xff; // the inputs don't seem to work, so just return ff for now @@ -194,7 +195,7 @@ static READ8_HANDLER( chinsan_input_port_0_r ) static READ8_HANDLER( chinsan_input_port_1_r ) { - chinsan_state *state = (chinsan_state *)space->machine->driver_data; + chinsan_state *state = space->machine->driver_data(); switch (state->port_select) { @@ -225,7 +226,7 @@ static READ8_HANDLER( chinsan_input_port_1_r ) static WRITE8_DEVICE_HANDLER( chin_adpcm_w ) { - chinsan_state *state = (chinsan_state *)device->machine->driver_data; + chinsan_state *state = device->machine->driver_data(); state->adpcm_pos = (data & 0xff) * 0x100; state->adpcm_idle = 0; msm5205_reset_w(device, 0); @@ -529,7 +530,7 @@ GFXDECODE_END static void chin_adpcm_int( running_device *device ) { - chinsan_state *state = (chinsan_state *)device->machine->driver_data; + chinsan_state *state = device->machine->driver_data(); if (state->adpcm_pos >= 0x10000 || state->adpcm_idle) { @@ -567,7 +568,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( chinsan ) { - chinsan_state *state = (chinsan_state *)machine->driver_data; + chinsan_state *state = machine->driver_data(); memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); @@ -580,7 +581,7 @@ static MACHINE_START( chinsan ) static MACHINE_RESET( chinsan ) { - chinsan_state *state = (chinsan_state *)machine->driver_data; + chinsan_state *state = machine->driver_data(); state->adpcm_idle = 1; state->port_select = 0; diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index ffa0a138f45..2822da9ce18 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -28,7 +28,7 @@ static WRITE8_DEVICE_HANDLER( k007232_extvolume_w ); static INTERRUPT_GEN( chqflag_interrupt ) { - chqflag_state *state = (chqflag_state *)device->machine->driver_data; + chqflag_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -44,7 +44,7 @@ static INTERRUPT_GEN( chqflag_interrupt ) static WRITE8_HANDLER( chqflag_bankswitch_w ) { - chqflag_state *state = (chqflag_state *)space->machine->driver_data; + chqflag_state *state = space->machine->driver_data(); int bankaddress; UINT8 *RAM = memory_region(space->machine, "maincpu"); @@ -75,7 +75,7 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) static WRITE8_HANDLER( chqflag_vreg_w ) { - chqflag_state *state = (chqflag_state *)space->machine->driver_data; + chqflag_state *state = space->machine->driver_data(); /* bits 0 & 1 = coin counters */ coin_counter_w(space->machine, 1, data & 0x01); @@ -120,13 +120,13 @@ static WRITE8_HANDLER( chqflag_vreg_w ) static WRITE8_HANDLER( select_analog_ctrl_w ) { - chqflag_state *state = (chqflag_state *)space->machine->driver_data; + chqflag_state *state = space->machine->driver_data(); state->analog_ctrl = data; } static READ8_HANDLER( analog_read_r ) { - chqflag_state *state = (chqflag_state *)space->machine->driver_data; + chqflag_state *state = space->machine->driver_data(); switch (state->analog_ctrl & 0x03) { case 0x00: return (state->accel = input_port_read(space->machine, "IN3")); /* accelerator */ @@ -140,7 +140,7 @@ static READ8_HANDLER( analog_read_r ) static WRITE8_HANDLER( chqflag_sh_irqtrigger_w ) { - chqflag_state *state = (chqflag_state *)space->machine->driver_data; + chqflag_state *state = space->machine->driver_data(); soundlatch2_w(space, 0, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -176,7 +176,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( k007232_bankswitch_w ) { - chqflag_state *state = (chqflag_state *)space->machine->driver_data; + chqflag_state *state = space->machine->driver_data(); int bank_A, bank_B; /* banks # for the 007232 (chip 1) */ @@ -292,7 +292,7 @@ INPUT_PORTS_END static void chqflag_ym2151_irq_w( running_device *device, int data ) { - chqflag_state *state = (chqflag_state *)device->machine->driver_data; + chqflag_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, data ? ASSERT_LINE : CLEAR_LINE); } @@ -354,7 +354,7 @@ static const k051316_interface chqflag_k051316_intf_2 = static MACHINE_START( chqflag ) { - chqflag_state *state = (chqflag_state *)machine->driver_data; + chqflag_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); @@ -376,7 +376,7 @@ static MACHINE_START( chqflag ) static MACHINE_RESET( chqflag ) { - chqflag_state *state = (chqflag_state *)machine->driver_data; + chqflag_state *state = machine->driver_data(); state->k051316_readroms = 0; state->last_vreg = 0; diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 8a3f9b00f60..4673446e4bc 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -10,7 +10,7 @@ static CDP1802_MODE_READ( cidelsa_mode_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); return state->cdp1802_mode; } @@ -29,7 +29,7 @@ static CDP1802_EF_READ( cidelsa_ef_r ) static WRITE_LINE_DEVICE_HANDLER( cidelsa_q_w ) { - cidelsa_state *driver_state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *driver_state = device->machine->driver_data(); driver_state->cdp1802_q = state; } @@ -66,7 +66,7 @@ static WRITE8_HANDLER( draco_sound_bankswitch_w ) static WRITE8_DEVICE_HANDLER( draco_sound_g_w ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); /* @@ -97,21 +97,21 @@ static WRITE8_DEVICE_HANDLER( draco_sound_g_w ) static READ8_HANDLER( draco_sound_in_r ) { - cidelsa_state *state = (cidelsa_state *)space->machine->driver_data; + cidelsa_state *state = space->machine->driver_data(); return ~(state->draco_sound) & 0x07; } static READ8_HANDLER( draco_sound_ay8910_r ) { - cidelsa_state *state = (cidelsa_state *)space->machine->driver_data; + cidelsa_state *state = space->machine->driver_data(); return state->draco_ay_latch; } static WRITE8_HANDLER( draco_sound_ay8910_w ) { - cidelsa_state *state = (cidelsa_state *)space->machine->driver_data; + cidelsa_state *state = space->machine->driver_data(); state->draco_ay_latch = data; } @@ -171,7 +171,7 @@ static WRITE8_HANDLER( draco_out1_w ) 7 SONIDO C -> COP402 IN2 */ - cidelsa_state *state = (cidelsa_state *)space->machine->driver_data; + cidelsa_state *state = space->machine->driver_data(); state->draco_sound = (data & 0xe0) >> 5; } @@ -308,14 +308,14 @@ ADDRESS_MAP_END static CUSTOM_INPUT( cdp1869_pcb_r ) { - cidelsa_state *state = (cidelsa_state *)field->port->machine->driver_data; + cidelsa_state *state = field->port->machine->driver_data(); return state->cdp1869_pcb; } static CUSTOM_INPUT( cidelsa_prd_r ) { - cidelsa_state *state = (cidelsa_state *)field->port->machine->driver_data; + cidelsa_state *state = field->port->machine->driver_data(); return state->cdp1869_prd; } @@ -466,14 +466,14 @@ INPUT_PORTS_END static TIMER_CALLBACK( set_cpu_mode ) { - cidelsa_state *state = (cidelsa_state *)machine->driver_data; + cidelsa_state *state = machine->driver_data(); state->cdp1802_mode = CDP1802_MODE_RUN; } static MACHINE_START( cidelsa ) { - cidelsa_state *state = (cidelsa_state *)machine->driver_data; + cidelsa_state *state = machine->driver_data(); state->cdp1802 = machine->device(CDP1802_TAG); @@ -487,7 +487,7 @@ static MACHINE_START( cidelsa ) static MACHINE_START( draco ) { - cidelsa_state *state = (cidelsa_state *)machine->driver_data; + cidelsa_state *state = machine->driver_data(); MACHINE_START_CALL( cidelsa ); diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 8ccecfd8bda..db6bf5f589a 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -45,7 +45,7 @@ D000 Paddle Position and Interrupt Reset #if 0 static READ8_HANDLER( ripcord_IN2_r ) { - circus_state *state = (circus_state *)space->machine->driver_data; + circus_state *state = space->machine->driver_data(); state->interrupt++; logerror("circus_int: %02x\n", state->interrupt); return readinputport (2); @@ -266,7 +266,7 @@ static INTERRUPT_GEN( ripcord_interrupt ) static MACHINE_START( circus ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->samples = machine->device("samples"); @@ -279,7 +279,7 @@ static MACHINE_START( circus ) static MACHINE_RESET( circus ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->clown_x = 0; state->clown_y = 0; @@ -584,23 +584,23 @@ ROM_END static DRIVER_INIT( circus ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->game_id = 1; } static DRIVER_INIT( robotbwl ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->game_id = 2; } static DRIVER_INIT( crash ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->game_id = 3; } static DRIVER_INIT( ripcord ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->game_id = 4; } diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index b46a8f12219..d5ed4b42777 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -59,7 +59,7 @@ To enter service mode, keep 1&2 pressed on reset static MACHINE_START( circusc ) { - circusc_state *state = (circusc_state *)machine->driver_data; + circusc_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->sn1 = machine->device("sn1"); @@ -72,7 +72,7 @@ static MACHINE_START( circusc ) static MACHINE_RESET( circusc ) { - circusc_state *state = (circusc_state *)machine->driver_data; + circusc_state *state = machine->driver_data(); state->sn_latch = 0; } @@ -89,7 +89,7 @@ static READ8_HANDLER( circusc_sh_timer_r ) * Can be shortened to: */ - circusc_state *state = (circusc_state *)space->machine->driver_data; + circusc_state *state = space->machine->driver_data(); int clock; clock = state->audiocpu->total_cycles() >> 9; @@ -99,7 +99,7 @@ static READ8_HANDLER( circusc_sh_timer_r ) static WRITE8_HANDLER( circusc_sh_irqtrigger_w ) { - circusc_state *state = (circusc_state *)space->machine->driver_data; + circusc_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -110,7 +110,7 @@ static WRITE8_HANDLER( circusc_coin_counter_w ) static WRITE8_HANDLER(circusc_sound_w) { - circusc_state *state = (circusc_state *)space->machine->driver_data; + circusc_state *state = space->machine->driver_data(); switch (offset & 7) { diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index b6674f302ff..e5b1cbe34c7 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -21,7 +21,7 @@ static READ8_HANDLER( citycon_in_r ) static READ8_HANDLER( citycon_irq_ack_r ) { - citycon_state *state = (citycon_state *)space->machine->driver_data; + citycon_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); return 0; @@ -189,7 +189,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( citycon ) { - citycon_state *state = (citycon_state *)machine->driver_data; + citycon_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -198,7 +198,7 @@ static MACHINE_START( citycon ) static MACHINE_RESET( citycon ) { - citycon_state *state = (citycon_state *)machine->driver_data; + citycon_state *state = machine->driver_data(); state->bg_image = 0; } diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index 5628d7a5f4a..16d3cf61b0b 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -17,12 +17,13 @@ #include "machine/8255ppi.h" -class clayshoo_state +class clayshoo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, clayshoo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, clayshoo_state(machine)); } - clayshoo_state(running_machine &machine) { } + clayshoo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -43,7 +44,7 @@ public: static WRITE8_DEVICE_HANDLER( input_port_select_w ) { - clayshoo_state *state = (clayshoo_state *)device->machine->driver_data; + clayshoo_state *state = device->machine->driver_data(); state->input_port_select = data; } @@ -68,7 +69,7 @@ static UINT8 difficulty_input_port_r( running_machine *machine, int bit ) static READ8_DEVICE_HANDLER( input_port_r ) { - clayshoo_state *state = (clayshoo_state *)device->machine->driver_data; + clayshoo_state *state = device->machine->driver_data(); UINT8 ret = 0; switch (state->input_port_select) @@ -95,7 +96,7 @@ static READ8_DEVICE_HANDLER( input_port_r ) static TIMER_CALLBACK( reset_analog_bit ) { - clayshoo_state *state = (clayshoo_state *)machine->driver_data; + clayshoo_state *state = machine->driver_data(); state->analog_port_val &= ~param; } @@ -110,7 +111,7 @@ static attotime compute_duration( running_device *device, int analog_pos ) static WRITE8_HANDLER( analog_reset_w ) { - clayshoo_state *state = (clayshoo_state *)space->machine->driver_data; + clayshoo_state *state = space->machine->driver_data(); /* reset the analog value, and start the two times that will fire off in a short period proportional to the position of the @@ -125,14 +126,14 @@ static WRITE8_HANDLER( analog_reset_w ) static READ8_HANDLER( analog_r ) { - clayshoo_state *state = (clayshoo_state *)space->machine->driver_data; + clayshoo_state *state = space->machine->driver_data(); return state->analog_port_val; } static void create_analog_timers( running_machine *machine ) { - clayshoo_state *state = (clayshoo_state *)machine->driver_data; + clayshoo_state *state = machine->driver_data(); state->analog_timer_1 = timer_alloc(machine, reset_analog_bit, NULL); state->analog_timer_2 = timer_alloc(machine, reset_analog_bit, NULL); } @@ -168,7 +169,7 @@ static const ppi8255_interface ppi8255_intf[2] = static MACHINE_START( clayshoo ) { - clayshoo_state *state = (clayshoo_state *)machine->driver_data; + clayshoo_state *state = machine->driver_data(); create_analog_timers(machine); /* register for state saving */ @@ -186,7 +187,7 @@ static MACHINE_START( clayshoo ) static VIDEO_UPDATE( clayshoo ) { - clayshoo_state *state = (clayshoo_state *)screen->machine->driver_data; + clayshoo_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -316,7 +317,7 @@ INPUT_PORTS_END static MACHINE_RESET( clayshoo ) { - clayshoo_state *state = (clayshoo_state *)machine->driver_data; + clayshoo_state *state = machine->driver_data(); state->input_port_select = 0; state->analog_port_val = 0; diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index d6d2459529f..9fcdd2347a8 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -121,7 +121,7 @@ static UINT8 *nvram_stage; INLINE void schedule_next_irq(running_machine *machine, int curscanline) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); /* IRQ is clocked by /32V, so every 64 scanlines */ curscanline = (curscanline + 64) & 255; @@ -133,7 +133,7 @@ INLINE void schedule_next_irq(running_machine *machine, int curscanline) static TIMER_CALLBACK( clock_irq ) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); /* assert the IRQ if not already asserted */ if (!state->irq_state) { @@ -151,7 +151,7 @@ static TIMER_CALLBACK( clock_irq ) static CUSTOM_INPUT( get_vblank ) { - cloud9_state *state = (cloud9_state *)field->port->machine->driver_data; + cloud9_state *state = field->port->machine->driver_data(); int scanline = field->port->machine->primary_screen->vpos(); return (~state->syncprom[scanline & 0xff] >> 1) & 1; } @@ -166,7 +166,7 @@ static CUSTOM_INPUT( get_vblank ) static MACHINE_START( cloud9 ) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); rectangle visarea; /* initialize globals */ @@ -211,7 +211,7 @@ static MACHINE_START( cloud9 ) static MACHINE_RESET( cloud9 ) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE); state->irq_state = 0; } @@ -226,7 +226,7 @@ static MACHINE_RESET( cloud9 ) static WRITE8_HANDLER( irq_ack_w ) { - cloud9_state *state = (cloud9_state *)space->machine->driver_data; + cloud9_state *state = space->machine->driver_data(); if (state->irq_state) { cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 531c2bf333d..4e7b5cbafd9 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -55,7 +55,7 @@ Note about version levels using Mutant Fighter as the example: static WRITE16_HANDLER( cninja_sound_w ) { - cninja_state *state = (cninja_state *)space->machine->driver_data; + cninja_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); @@ -63,7 +63,7 @@ static WRITE16_HANDLER( cninja_sound_w ) static WRITE16_HANDLER( stoneage_sound_w ) { - cninja_state *state = (cninja_state *)space->machine->driver_data; + cninja_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -71,7 +71,7 @@ static WRITE16_HANDLER( stoneage_sound_w ) static TIMER_DEVICE_CALLBACK( interrupt_gen ) { - cninja_state *state = (cninja_state *)timer.machine->driver_data; + cninja_state *state = timer.machine->driver_data(); cpu_set_input_line(state->maincpu, (state->irq_mask & 0x10) ? 3 : 4, ASSERT_LINE); state->raster_irq_timer->reset(); @@ -79,7 +79,7 @@ static TIMER_DEVICE_CALLBACK( interrupt_gen ) static READ16_HANDLER( cninja_irq_r ) { - cninja_state *state = (cninja_state *)space->machine->driver_data; + cninja_state *state = space->machine->driver_data(); switch (offset) { @@ -99,7 +99,7 @@ static READ16_HANDLER( cninja_irq_r ) static WRITE16_HANDLER( cninja_irq_w ) { - cninja_state *state = (cninja_state *)space->machine->driver_data; + cninja_state *state = space->machine->driver_data(); switch (offset) { @@ -151,7 +151,7 @@ static READ16_HANDLER( robocop2_prot_r ) static WRITE16_HANDLER( cninja_pf12_control_w ) { - cninja_state *state = (cninja_state *)space->machine->driver_data; + cninja_state *state = space->machine->driver_data(); deco16ic_pf12_control_w(state->deco16ic, offset, data, mem_mask); space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); } @@ -159,7 +159,7 @@ static WRITE16_HANDLER( cninja_pf12_control_w ) static WRITE16_HANDLER( cninja_pf34_control_w ) { - cninja_state *state = (cninja_state *)space->machine->driver_data; + cninja_state *state = space->machine->driver_data(); deco16ic_pf34_control_w(state->deco16ic, offset, data, mem_mask); space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); } @@ -721,19 +721,19 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - cninja_state *driver_state = (cninja_state *)device->machine->driver_data; + cninja_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } static void sound_irq2(running_device *device, int state) { - cninja_state *driver_state = (cninja_state *)device->machine->driver_data; + cninja_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 0, state); } static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - cninja_state *state = (cninja_state *)device->machine->driver_data; + cninja_state *state = device->machine->driver_data(); /* the second OKIM6295 ROM is bank switched */ state->oki2->set_bank_base((data & 1) * 0x40000); @@ -828,7 +828,7 @@ static const deco16ic_interface mutantf_deco16ic_intf = static MACHINE_START( cninja ) { - cninja_state *state = (cninja_state *)machine->driver_data; + cninja_state *state = machine->driver_data(); state_save_register_global(machine, state->scanline); state_save_register_global(machine, state->irq_mask); @@ -836,7 +836,7 @@ static MACHINE_START( cninja ) static MACHINE_RESET( cninja ) { - cninja_state *state = (cninja_state *)machine->driver_data; + cninja_state *state = machine->driver_data(); state->scanline = 0; state->irq_mask = 0; diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 3890c6c6814..fc983078602 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -29,12 +29,13 @@ #include "sound/dac.h" -class cntsteer_state +class cntsteer_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cntsteer_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cntsteer_state(machine)); } - cntsteer_state(running_machine &machine) { } + cntsteer_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -90,7 +91,7 @@ static PALETTE_INIT( zerotrgt ) static TILE_GET_INFO( get_bg_tile_info ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); int code = state->videoram2[tile_index]; SET_TILE_INFO(2, code + state->bg_bank, state->bg_color_bank, 0); @@ -98,7 +99,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int attr = state->colorram[tile_index]; @@ -109,7 +110,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( cntsteer ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 32, 32); @@ -120,7 +121,7 @@ static VIDEO_START( cntsteer ) static VIDEO_START( zerotrgt ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows_flip_x, 8, 8, 32, 32); @@ -144,7 +145,7 @@ Sprite list: */ static void zerotrgt_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); int offs; for (offs = 0; offs < 0x200; offs += 4) @@ -202,7 +203,7 @@ static void zerotrgt_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void cntsteer_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); int offs; for (offs = 0; offs < 0x80; offs += 4) @@ -251,7 +252,7 @@ static void cntsteer_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static VIDEO_UPDATE( zerotrgt ) { - cntsteer_state *state = (cntsteer_state *)screen->machine->driver_data; + cntsteer_state *state = screen->machine->driver_data(); if (state->disable_roz) bitmap_fill(bitmap, cliprect, screen->machine->pens[8 * state->bg_color_bank]); @@ -302,7 +303,7 @@ static VIDEO_UPDATE( zerotrgt ) static VIDEO_UPDATE( cntsteer ) { - cntsteer_state *state = (cntsteer_state *)screen->machine->driver_data; + cntsteer_state *state = screen->machine->driver_data(); if (state->disable_roz) bitmap_fill(bitmap, cliprect, screen->machine->pens[8 * state->bg_color_bank]); @@ -363,7 +364,7 @@ static VIDEO_UPDATE( cntsteer ) */ static WRITE8_HANDLER(zerotrgt_vregs_w) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); // static UINT8 test[5]; // test[offset] = data; @@ -389,7 +390,7 @@ static WRITE8_HANDLER(zerotrgt_vregs_w) static WRITE8_HANDLER(cntsteer_vregs_w) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); // static UINT8 test[5]; // test[offset] = data; @@ -414,21 +415,21 @@ static WRITE8_HANDLER(cntsteer_vregs_w) static WRITE8_HANDLER( cntsteer_foreground_vram_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } static WRITE8_HANDLER( cntsteer_foreground_attr_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } static WRITE8_HANDLER( cntsteer_background_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -441,20 +442,20 @@ static WRITE8_HANDLER( cntsteer_background_w ) static WRITE8_HANDLER( gekitsui_sub_irq_ack ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, M6809_IRQ_LINE, CLEAR_LINE); } static WRITE8_HANDLER( cntsteer_sound_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } static WRITE8_HANDLER( zerotrgt_ctrl_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); /*TODO: check this.*/ logerror("CTRL: %04x: %04x: %04x\n", cpu_get_pc(space->cpu), offset, data); // if (offset == 0) cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, ASSERT_LINE); @@ -466,7 +467,7 @@ static WRITE8_HANDLER( zerotrgt_ctrl_w ) static WRITE8_HANDLER( cntsteer_sub_irq_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, M6809_IRQ_LINE, ASSERT_LINE); // printf("%02x IRQ\n", data); } @@ -480,7 +481,7 @@ static WRITE8_HANDLER( cntsteer_sub_nmi_w ) static WRITE8_HANDLER( cntsteer_main_irq_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, HOLD_LINE); } @@ -573,13 +574,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( nmimask_w ) { - cntsteer_state *state = (cntsteer_state *)space->machine->driver_data; + cntsteer_state *state = space->machine->driver_data(); state->nmimask = data & 0x80; } static INTERRUPT_GEN ( sound_interrupt ) { - cntsteer_state *state = (cntsteer_state *)device->machine->driver_data; + cntsteer_state *state = device->machine->driver_data(); if (!state->nmimask) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } @@ -652,7 +653,7 @@ INPUT_PORTS_END static INPUT_CHANGED( coin_inserted ) { - cntsteer_state *state = (cntsteer_state *)field->port->machine->driver_data; + cntsteer_state *state = field->port->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -785,7 +786,7 @@ GFXDECODE_END static MACHINE_START( cntsteer ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -806,7 +807,7 @@ static MACHINE_START( cntsteer ) static MACHINE_START( zerotrgt ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); state_save_register_global(machine, state->nmimask); MACHINE_START_CALL(cntsteer); @@ -815,7 +816,7 @@ static MACHINE_START( zerotrgt ) static MACHINE_RESET( cntsteer ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); state->flipscreen = 0; state->bg_bank = 0; @@ -833,7 +834,7 @@ static MACHINE_RESET( cntsteer ) static MACHINE_RESET( zerotrgt ) { - cntsteer_state *state = (cntsteer_state *)machine->driver_data; + cntsteer_state *state = machine->driver_data(); state->nmimask = 0; MACHINE_RESET_CALL(cntsteer); diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index e22e0cfcf3f..f96db5b5ddf 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -138,7 +138,7 @@ Dip location and recommended settings verified with the US manual static WRITE8_HANDLER( combatsc_vreg_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); if (data != state->vreg) { tilemap_mark_all_tiles_dirty(state->textlayer); @@ -152,7 +152,7 @@ static WRITE8_HANDLER( combatsc_vreg_w ) static WRITE8_HANDLER( combatscb_sh_irqtrigger_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -166,13 +166,13 @@ static READ8_HANDLER( combatscb_io_r ) static WRITE8_HANDLER( combatscb_priority_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); state->priority = data & 0x20; } static WRITE8_HANDLER( combatsc_bankselect_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); if (data & 0x40) { @@ -197,7 +197,7 @@ static WRITE8_HANDLER( combatsc_bankselect_w ) static WRITE8_HANDLER( combatscb_io_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); switch (offset) { @@ -210,7 +210,7 @@ static WRITE8_HANDLER( combatscb_io_w ) static WRITE8_HANDLER( combatscb_bankselect_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); if (data & 0x40) { @@ -262,7 +262,7 @@ static WRITE8_HANDLER( combatsc_coin_counter_w ) static READ8_HANDLER( trackball_r ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); if (offset == 0) { @@ -300,12 +300,12 @@ static READ8_HANDLER( trackball_r ) /* the protection is a simple multiply */ static WRITE8_HANDLER( protection_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); state->prot[offset] = data; } static READ8_HANDLER( protection_r ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); return ((state->prot[0] * state->prot[1]) >> (offset * 8)) & 0xff; } static WRITE8_HANDLER( protection_clock_w ) @@ -318,7 +318,7 @@ static WRITE8_HANDLER( protection_clock_w ) static WRITE8_HANDLER( combatsc_sh_irqtrigger_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -344,7 +344,7 @@ static WRITE8_DEVICE_HANDLER( combatsc_portA_w ) static READ8_DEVICE_HANDLER ( combatsc_ym2203_r ) { - combatsc_state *state = (combatsc_state *)device->machine->driver_data; + combatsc_state *state = device->machine->driver_data(); int status = ym2203_r(device,offset); if (cpu_get_pc(state->audiocpu) == 0x334) @@ -668,7 +668,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( combatsc ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); UINT8 *MEM = memory_region(machine, "maincpu") + 0x38000; state->io_ram = MEM + 0x0000; @@ -696,7 +696,7 @@ static MACHINE_START( combatsc ) static MACHINE_RESET( combatsc ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int i; diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 2a9483582dc..c8c11c4ba9a 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -226,7 +226,7 @@ static INTERRUPT_GEN( commando_interrupt ) static MACHINE_START( commando ) { - commando_state *state = (commando_state *)machine->driver_data; + commando_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -236,7 +236,7 @@ static MACHINE_START( commando ) static MACHINE_RESET( commando ) { - commando_state *state = (commando_state *)machine->driver_data; + commando_state *state = machine->driver_data(); state->scroll_x[0] = 0; state->scroll_x[1] = 0; diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 3a4230a5dd4..ed7a00239a5 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -24,19 +24,19 @@ static WRITE8_DEVICE_HANDLER( compgolf_scrollx_lo_w ) { - compgolf_state *state = (compgolf_state *)device->machine->driver_data; + compgolf_state *state = device->machine->driver_data(); state->scrollx_lo = data; } static WRITE8_DEVICE_HANDLER( compgolf_scrolly_lo_w ) { - compgolf_state *state = (compgolf_state *)device->machine->driver_data; + compgolf_state *state = device->machine->driver_data(); state->scrolly_lo = data; } static WRITE8_HANDLER( compgolf_ctrl_w ) { - compgolf_state *state = (compgolf_state *)space->machine->driver_data; + compgolf_state *state = space->machine->driver_data(); /* bit 4 and 6 are always set */ @@ -228,7 +228,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( compgolf ) { - compgolf_state *state = (compgolf_state *)machine->driver_data; + compgolf_state *state = machine->driver_data(); state_save_register_global(machine, state->bank); state_save_register_global(machine, state->scrollx_lo); @@ -239,7 +239,7 @@ static MACHINE_START( compgolf ) static MACHINE_RESET( compgolf ) { - compgolf_state *state = (compgolf_state *)machine->driver_data; + compgolf_state *state = machine->driver_data(); state->bank = -1; state->scrollx_lo = 0; diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index da18e0bb665..d218a714500 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -32,7 +32,7 @@ static WRITE8_HANDLER( contra_bankswitch_w ) static WRITE8_HANDLER( contra_sh_irqtrigger_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, HOLD_LINE); } @@ -171,7 +171,7 @@ GFXDECODE_END static MACHINE_START( contra ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index 42823be24dd..a7584ca354c 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -59,7 +59,7 @@ static UINT8 nvram_write_enable; static void amerdart_scanline(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params) { - coolpool_state *state = (coolpool_state *)screen.machine->driver_data; + coolpool_state *state = screen.machine->driver_data(); UINT16 *vram = &state->vram_base[(params->rowaddr << 8) & 0xff00]; UINT32 *dest = BITMAP_ADDR32(bitmap, scanline, 0); @@ -88,7 +88,7 @@ static void amerdart_scanline(screen_device &screen, bitmap_t *bitmap, int scanl static void coolpool_scanline(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params) { - coolpool_state *state = (coolpool_state *)screen.machine->driver_data; + coolpool_state *state = screen.machine->driver_data(); UINT16 *vram = &state->vram_base[(params->rowaddr << 8) & 0x1ff00]; UINT32 *dest = BITMAP_ADDR32(bitmap, scanline, 0); @@ -114,7 +114,7 @@ static void coolpool_scanline(screen_device &screen, bitmap_t *bitmap, int scanl static void coolpool_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); memcpy(shiftreg, &state->vram_base[TOWORD(address) & ~TOWORD(0xfff)], TOBYTE(0x1000)); } @@ -122,7 +122,7 @@ static void coolpool_to_shiftreg(const address_space *space, UINT32 address, UIN static void coolpool_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); memcpy(&state->vram_base[TOWORD(address) & ~TOWORD(0xfff)], shiftreg, TOBYTE(0x1000)); } @@ -137,7 +137,7 @@ static void coolpool_from_shiftreg(const address_space *space, UINT32 address, U static MACHINE_RESET( amerdart ) { - coolpool_state *state = (coolpool_state *)machine->driver_data; + coolpool_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->dsp = machine->device("dsp"); @@ -209,7 +209,7 @@ static WRITE16_HANDLER( nvram_thrash_data_w ) static TIMER_DEVICE_CALLBACK( amerdart_audio_int_gen ) { - coolpool_state *state = (coolpool_state *)timer.machine->driver_data; + coolpool_state *state = timer.machine->driver_data(); cpu_set_input_line(state->dsp, 0, ASSERT_LINE); cpu_set_input_line(state->dsp, 0, CLEAR_LINE); @@ -230,7 +230,7 @@ static WRITE16_HANDLER( amerdart_misc_w ) static READ16_HANDLER( amerdart_dsp_bio_line_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); static UINT8 old_cmd; static UINT8 same_cmd_count; @@ -253,7 +253,7 @@ static READ16_HANDLER( amerdart_dsp_bio_line_r ) static READ16_HANDLER( amerdart_iop_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); // logerror("%08x:IOP read %04x\n",cpu_get_pc(space->cpu),state->iop_answer); cputag_set_input_line(space->machine, "maincpu", 1, CLEAR_LINE); @@ -263,7 +263,7 @@ static READ16_HANDLER( amerdart_iop_r ) static WRITE16_HANDLER( amerdart_iop_w ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); // logerror("%08x:IOP write %04x\n", cpu_get_pc(space->cpu), data); COMBINE_DATA(&state->iop_cmd); @@ -272,7 +272,7 @@ static WRITE16_HANDLER( amerdart_iop_w ) static READ16_HANDLER( amerdart_dsp_cmd_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); // logerror("%08x:DSP cmd_r %04x\n", cpu_get_pc(space->cpu), state->iop_cmd); state->cmd_pending = 0; @@ -281,7 +281,7 @@ static READ16_HANDLER( amerdart_dsp_cmd_r ) static WRITE16_HANDLER( amerdart_dsp_answer_w ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); // logerror("%08x:DSP answer %04x\n", cpu_get_pc(space->cpu), data); state->iop_answer = data; @@ -320,7 +320,7 @@ static int amerdart_trackball_dec(int data) static int amerdart_trackball_direction(const address_space *space, int num, int data) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); UINT16 result_x = (data & 0x0c) >> 2; UINT16 result_y = (data & 0x03) >> 0; @@ -410,7 +410,7 @@ static READ16_HANDLER( amerdart_trackball_r ) */ - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); state->result = (state->lastresult | 0x00ff); @@ -467,7 +467,7 @@ static WRITE16_HANDLER( coolpool_misc_w ) static TIMER_CALLBACK( deferred_iop_w ) { - coolpool_state *state = (coolpool_state *)machine->driver_data; + coolpool_state *state = machine->driver_data(); state->iop_cmd = param; state->cmd_pending = 1; @@ -487,7 +487,7 @@ static WRITE16_HANDLER( coolpool_iop_w ) static READ16_HANDLER( coolpool_iop_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); logerror("%08x:IOP read %04x\n",cpu_get_pc(space->cpu),state->iop_answer); cputag_set_input_line(space->machine, "maincpu", 1, CLEAR_LINE); @@ -506,7 +506,7 @@ static READ16_HANDLER( coolpool_iop_r ) static READ16_HANDLER( dsp_cmd_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); state->cmd_pending = 0; logerror("%08x:IOP cmd_r %04x\n", cpu_get_pc(space->cpu), state->iop_cmd); @@ -516,7 +516,7 @@ static READ16_HANDLER( dsp_cmd_r ) static WRITE16_HANDLER( dsp_answer_w ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); logerror("%08x:IOP answer %04x\n", cpu_get_pc(space->cpu), data); state->iop_answer = data; @@ -526,7 +526,7 @@ static WRITE16_HANDLER( dsp_answer_w ) static READ16_HANDLER( dsp_bio_line_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); return state->cmd_pending ? CLEAR_LINE : ASSERT_LINE; } @@ -547,7 +547,7 @@ static READ16_HANDLER( dsp_hold_line_r ) static READ16_HANDLER( dsp_rom_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "user2"); return rom[state->iop_romaddr & (memory_region_length(space->machine, "user2") - 1)]; @@ -556,7 +556,7 @@ static READ16_HANDLER( dsp_rom_r ) static WRITE16_HANDLER( dsp_romaddr_w ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); switch (offset) { @@ -586,7 +586,7 @@ static WRITE16_DEVICE_HANDLER( dsp_dac_w ) static READ16_HANDLER( coolpool_input_r ) { - coolpool_state *state = (coolpool_state *)space->machine->driver_data; + coolpool_state *state = space->machine->driver_data(); state->result = (input_port_read(space->machine, "IN1") & 0x00ff) | (state->lastresult & 0xff00); state->newx[1] = input_port_read(space->machine, "XAXIS"); @@ -1180,7 +1180,7 @@ ROM_END static void register_state_save(running_machine *machine) { - coolpool_state *state = (coolpool_state *)machine->driver_data; + coolpool_state *state = machine->driver_data(); state_save_register_global_array(machine, state->oldx); state_save_register_global_array(machine, state->oldy); @@ -1197,7 +1197,7 @@ static void register_state_save(running_machine *machine) static DRIVER_INIT( amerdart ) { - coolpool_state *state = (coolpool_state *)machine->driver_data; + coolpool_state *state = machine->driver_data(); state->lastresult = 0xffff; diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index 3bfb47c56cf..9bad2323e1e 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -68,14 +68,14 @@ Mighty Guy board layout: static WRITE8_HANDLER( cop01_sound_command_w ) { - cop01_state *state = (cop01_state *)space->machine->driver_data; + cop01_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static READ8_HANDLER( cop01_sound_command_r ) { - cop01_state *state = (cop01_state *)space->machine->driver_data; + cop01_state *state = space->machine->driver_data(); int res = (soundlatch_r(space, offset) & 0x7f) << 1; /* bit 0 seems to be a timer */ @@ -156,7 +156,7 @@ ADDRESS_MAP_END /* this just gets some garbage out of the YM3526 */ static READ8_HANDLER( kludge ) { - cop01_state *state = (cop01_state *)space->machine->driver_data; + cop01_state *state = space->machine->driver_data(); return state->timer++; } @@ -414,7 +414,7 @@ GFXDECODE_END static MACHINE_START( cop01 ) { - cop01_state *state = (cop01_state *)machine->driver_data; + cop01_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -425,7 +425,7 @@ static MACHINE_START( cop01 ) static MACHINE_RESET( cop01 ) { - cop01_state *state = (cop01_state *)machine->driver_data; + cop01_state *state = machine->driver_data(); state->pulse = 0; state->timer = 0; diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c index 4430b799cbc..2553602b7e0 100644 --- a/src/mame/drivers/copsnrob.c +++ b/src/mame/drivers/copsnrob.c @@ -82,13 +82,13 @@ static PALETTE_INIT( copsnrob ) static READ8_HANDLER( copsnrob_misc_r ) { - copsnrob_state *state = (copsnrob_state *)space->machine->driver_data; + copsnrob_state *state = space->machine->driver_data(); return state->misc | (input_port_read(space->machine, "IN0") & 0x80); } static WRITE8_HANDLER( copsnrob_misc_w ) { - copsnrob_state *state = (copsnrob_state *)space->machine->driver_data; + copsnrob_state *state = space->machine->driver_data(); state->misc = data & 0x7f; set_led_status(space->machine, 1, ~data & 0x40); } @@ -258,14 +258,14 @@ GFXDECODE_END static MACHINE_START( copsnrob ) { - copsnrob_state *state = (copsnrob_state *)machine->driver_data; + copsnrob_state *state = machine->driver_data(); state_save_register_global(machine, state->misc); } static MACHINE_RESET( copsnrob ) { - copsnrob_state *state = (copsnrob_state *)machine->driver_data; + copsnrob_state *state = machine->driver_data(); state->misc = 0; } diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index e8c507c58df..91540c14549 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -49,7 +49,7 @@ forcing all sprites on a row to have an added blue component. static WRITE8_HANDLER( panic_sound_output_w ) { - cosmic_state *state = (cosmic_state *)space->machine->driver_data; + cosmic_state *state = space->machine->driver_data(); /* Sound Enable / Disable */ if (offset == 11) @@ -125,7 +125,7 @@ static WRITE8_HANDLER( panic_sound_output2_w ) static WRITE8_HANDLER( cosmicg_output_w ) { - cosmic_state *state = (cosmic_state *)space->machine->driver_data; + cosmic_state *state = space->machine->driver_data(); /* Sound Enable / Disable */ if (offset == 12) @@ -189,7 +189,7 @@ static WRITE8_HANDLER( cosmicg_output_w ) static WRITE8_HANDLER( cosmica_sound_output_w ) { - cosmic_state *state = (cosmic_state *)space->machine->driver_data; + cosmic_state *state = space->machine->driver_data(); /* Sound Enable / Disable */ if (offset == 11) @@ -339,7 +339,7 @@ static INTERRUPT_GEN( panic_interrupt ) static INTERRUPT_GEN( cosmica_interrupt ) { - cosmic_state *state = (cosmic_state *)device->machine->driver_data; + cosmic_state *state = device->machine->driver_data(); state->pixel_clock = (state->pixel_clock + 2) & 0x3f; if (state->pixel_clock == 0) @@ -384,7 +384,7 @@ static INTERRUPT_GEN( nomnlnd_interrupt ) static READ8_HANDLER( cosmica_pixel_clock_r ) { - cosmic_state *state = (cosmic_state *)space->machine->driver_data; + cosmic_state *state = space->machine->driver_data(); return state->pixel_clock; } @@ -1022,7 +1022,7 @@ static const samples_interface cosmicg_samples_interface = static MACHINE_START( cosmic ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); state->samples = machine->device("samples"); state->dac = machine->device("dac"); @@ -1039,7 +1039,7 @@ static MACHINE_START( cosmic ) static MACHINE_RESET( cosmic ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); state->pixel_clock = 0; state->background_enable = 0; @@ -1579,7 +1579,7 @@ ROM_END static DRIVER_INIT( cosmicg ) { /* Program ROMs have data pins connected different from normal */ - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); offs_t offs, len; UINT8 *rom; len = memory_region_length(machine, "maincpu"); @@ -1604,7 +1604,7 @@ static DRIVER_INIT( cosmicg ) static DRIVER_INIT( cosmica ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); state->sound_enabled = 1; state->dive_bomb_b_select = 0; } @@ -1627,7 +1627,7 @@ static DRIVER_INIT( nomnlnd ) static DRIVER_INIT( panic ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); state->sound_enabled = 1; } diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 1e94a566d06..aeed68d9a6b 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -260,25 +260,25 @@ static READ16_HANDLER( cps1_hack_dsw_r ) static READ16_HANDLER( forgottn_dial_0_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); return ((input_port_read(space->machine, "DIAL0") - state->dial[0]) >> (8 * offset)) & 0xff; } static READ16_HANDLER( forgottn_dial_1_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); return ((input_port_read(space->machine, "DIAL1") - state->dial[1]) >> (8 * offset)) & 0xff; } static WRITE16_HANDLER( forgottn_dial_0_reset_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); state->dial[0] = input_port_read(space->machine, "DIAL0"); } static WRITE16_HANDLER( forgottn_dial_1_reset_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); state->dial[1] = input_port_read(space->machine, "DIAL1"); } @@ -365,13 +365,13 @@ static READ16_HANDLER( qsound_rom_r ) READ16_HANDLER( qsound_sharedram1_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); return state->qsound_sharedram1[offset] | 0xff00; } WRITE16_HANDLER( qsound_sharedram1_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->qsound_sharedram1[offset] = data; @@ -379,13 +379,13 @@ WRITE16_HANDLER( qsound_sharedram1_w ) static READ16_HANDLER( qsound_sharedram2_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); return state->qsound_sharedram2[offset] | 0xff00; } static WRITE16_HANDLER( qsound_sharedram2_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->qsound_sharedram2[offset] = data; @@ -2922,7 +2922,7 @@ GFXDECODE_END static void cps1_irq_handler_mus(running_device *device, int irq) { - cps_state *state = (cps_state *)device->machine->driver_data; + cps_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -2944,7 +2944,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( common ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -9455,7 +9455,7 @@ ROM_END static DRIVER_INIT( forgottn ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); /* Forgotten Worlds has a NEC uPD4701AC on the B-board handling dial inputs from the CN-MOWS connector. */ /* The memory mapping is handled by PAL LWIO */ diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index d31e6694246..391f4a824ea 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -624,7 +624,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) : static INTERRUPT_GEN( cps2_interrupt ) { - cps_state *state = (cps_state *)device->machine->driver_data; + cps_state *state = device->machine->driver_data(); /* 2 is vblank, 4 is some sort of scanline interrupt, 6 is both at the same time. */ if (state->scancount >= 258) @@ -697,7 +697,7 @@ static const eeprom_interface cps2_eeprom_interface = static WRITE16_HANDLER( cps2_eeprom_port_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -773,7 +773,7 @@ static WRITE16_HANDLER( cps2_eeprom_port_w ) static READ16_HANDLER( cps2_qsound_volume_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); /* Extra adapter memory (0x660000-0x663fff) available when bit 14 = 0 */ /* Network adapter (ssf2tb) present when bit 15 = 0 */ @@ -799,7 +799,7 @@ static READ16_HANDLER( kludge_r ) static READ16_HANDLER( joy_or_paddle_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (state->readpaddle != 0) return (input_port_read(space->machine, "IN0")); @@ -1193,7 +1193,7 @@ GFXDECODE_END static MACHINE_START( cps2 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -7844,7 +7844,7 @@ ROM_END static DRIVER_INIT( cps2 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); /* Decrypt the game - see machine/cps2crpt.c */ DRIVER_INIT_CALL(cps2crpt); @@ -7860,7 +7860,7 @@ static DRIVER_INIT( cps2 ) static DRIVER_INIT( ssf2tb ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); DRIVER_INIT_CALL(cps2); @@ -7874,7 +7874,7 @@ static DRIVER_INIT( ssf2tb ) static DRIVER_INIT ( pzloop2 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); DRIVER_INIT_CALL(cps2); @@ -7887,19 +7887,19 @@ static DRIVER_INIT ( pzloop2 ) static READ16_HANDLER( gigamn2_dummyqsound_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); return state->gigamn2_dummyqsound_ram[offset]; }; static WRITE16_HANDLER( gigamn2_dummyqsound_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); state->gigamn2_dummyqsound_ram[offset] = data; }; static DRIVER_INIT( gigamn2 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); int length = memory_region_length(machine, "maincpu"); diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 7328bfa7252..dc2b4ece3f7 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -50,7 +50,7 @@ static WRITE8_HANDLER( rom_bank_select_w ) static MACHINE_START( crgolf ) { - crgolf_state *state = (crgolf_state *)machine->driver_data; + crgolf_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -70,7 +70,7 @@ static MACHINE_START( crgolf ) static MACHINE_RESET( crgolf ) { - crgolf_state *state = (crgolf_state *)machine->driver_data; + crgolf_state *state = machine->driver_data(); state->port_select = 0; state->main_to_sound_data = 0; @@ -89,7 +89,7 @@ static MACHINE_RESET( crgolf ) static READ8_HANDLER( switch_input_r ) { static const char *const portnames[] = { "IN0", "IN1", "P1", "P2", "DSW", "UNUSED0", "UNUSED1" }; - crgolf_state *state = (crgolf_state *)space->machine->driver_data; + crgolf_state *state = space->machine->driver_data(); return input_port_read(space->machine, portnames[state->port_select]); } @@ -103,7 +103,7 @@ static READ8_HANDLER( analog_input_r ) static WRITE8_HANDLER( switch_input_select_w ) { - crgolf_state *state = (crgolf_state *)space->machine->driver_data; + crgolf_state *state = space->machine->driver_data(); if (!(data & 0x40)) state->port_select = 6; if (!(data & 0x20)) state->port_select = 5; @@ -130,7 +130,7 @@ static WRITE8_HANDLER( unknown_w ) static TIMER_CALLBACK( main_to_sound_callback ) { - crgolf_state *state = (crgolf_state *)machine->driver_data; + crgolf_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); state->main_to_sound_data = param; @@ -145,7 +145,7 @@ static WRITE8_HANDLER( main_to_sound_w ) static READ8_HANDLER( main_to_sound_r ) { - crgolf_state *state = (crgolf_state *)space->machine->driver_data; + crgolf_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); return state->main_to_sound_data; @@ -161,7 +161,7 @@ static READ8_HANDLER( main_to_sound_r ) static TIMER_CALLBACK( sound_to_main_callback ) { - crgolf_state *state = (crgolf_state *)machine->driver_data; + crgolf_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, ASSERT_LINE); state->sound_to_main_data = param; @@ -176,7 +176,7 @@ static WRITE8_HANDLER( sound_to_main_w ) static READ8_HANDLER( sound_to_main_r ) { - crgolf_state *state = (crgolf_state *)space->machine->driver_data; + crgolf_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, CLEAR_LINE); return state->sound_to_main_data; @@ -192,7 +192,7 @@ static READ8_HANDLER( sound_to_main_r ) static void vck_callback( running_device *device ) { - crgolf_state *state = (crgolf_state *)device->machine->driver_data; + crgolf_state *state = device->machine->driver_data(); /* only play back if we have data remaining */ if (state->sample_count != 0xff) @@ -218,7 +218,7 @@ static void vck_callback( running_device *device ) static WRITE8_DEVICE_HANDLER( crgolfhi_sample_w ) { - crgolf_state *state = (crgolf_state *)device->machine->driver_data; + crgolf_state *state = device->machine->driver_data(); switch (offset) { diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 02debd0d2ee..80c609abebb 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -32,7 +32,7 @@ static WRITE8_HANDLER( crimfght_coin_w ) static WRITE8_HANDLER( crimfght_sh_irqtrigger_w ) { - crimfght_state *state = (crimfght_state *)space->machine->driver_data; + crimfght_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -42,7 +42,7 @@ static WRITE8_DEVICE_HANDLER( crimfght_snd_bankswitch_w ) /* b1: bank for channel A */ /* b0: bank for channel B */ - crimfght_state *state = (crimfght_state *)device->machine->driver_data; + crimfght_state *state = device->machine->driver_data(); int bank_A = BIT(data, 1); int bank_B = BIT(data, 0); @@ -51,7 +51,7 @@ static WRITE8_DEVICE_HANDLER( crimfght_snd_bankswitch_w ) static READ8_HANDLER( k052109_051960_r ) { - crimfght_state *state = (crimfght_state *)space->machine->driver_data; + crimfght_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -68,7 +68,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - crimfght_state *state = (crimfght_state *)space->machine->driver_data; + crimfght_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -257,7 +257,7 @@ static const k051960_interface crimfght_k051960_intf = static MACHINE_START( crimfght ) { - crimfght_state *state = (crimfght_state *)machine->driver_data; + crimfght_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank2", 0, 12, &ROM[0x10000], 0x2000); @@ -408,7 +408,7 @@ ROM_END static KONAMI_SETLINES_CALLBACK( crimfght_banking ) { - crimfght_state *state = (crimfght_state *)device->machine->driver_data; + crimfght_state *state = device->machine->driver_data(); /* bit 5 = select work RAM or palette */ if (lines & 0x20) diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 7b67b0d8acf..3c7602204fb 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -273,7 +273,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int linestate ) { - crospang_state *state = (crospang_state *)device->machine->driver_data; + crospang_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); } @@ -285,7 +285,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( crospang ) { - crospang_state *state = (crospang_state *)machine->driver_data; + crospang_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -296,7 +296,7 @@ static MACHINE_START( crospang ) static MACHINE_RESET( crospang ) { - crospang_state *state = (crospang_state *)machine->driver_data; + crospang_state *state = machine->driver_data(); state->bestri_tilebank = 0; // state->xsproff = 4; diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index cf253f3c508..f3308bdd34c 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -165,7 +165,7 @@ static WRITE8_HANDLER( crshrace_sh_bankswitch_w ) static WRITE16_HANDLER( sound_command_w ) { - crshrace_state *state = (crshrace_state *)space->machine->driver_data; + crshrace_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -177,13 +177,13 @@ static WRITE16_HANDLER( sound_command_w ) static CUSTOM_INPUT( country_sndpending_r ) { - crshrace_state *state = (crshrace_state *)field->port->machine->driver_data; + crshrace_state *state = field->port->machine->driver_data(); return state->pending_command; } static WRITE8_HANDLER( pending_command_clear_w ) { - crshrace_state *state = (crshrace_state *)space->machine->driver_data; + crshrace_state *state = space->machine->driver_data(); state->pending_command = 0; } @@ -430,7 +430,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - crshrace_state *state = (crshrace_state *)device->machine->driver_data; + crshrace_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -447,7 +447,7 @@ static const k053936_interface crshrace_k053936_intf = static MACHINE_START( crshrace ) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->k053936 = machine->device("k053936"); @@ -460,7 +460,7 @@ static MACHINE_START( crshrace ) static MACHINE_RESET( crshrace ) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); state->roz_bank = 0; state->gfxctrl = 0; diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 98a6aa5ab3e..c3ded17adfe 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -124,12 +124,13 @@ Notes: #define IDLE_LOOP_SPEEDUP -class crystal_state +class crystal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crystal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crystal_state(machine)); } - crystal_state(running_machine &machine) { } + crystal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * workram; @@ -159,7 +160,7 @@ public: static void IntReq( running_machine *machine, int num ) { - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); UINT32 IntEn = memory_read_dword(space, 0x01800c08); UINT32 IntPend = memory_read_dword(space, 0x01800c0c); @@ -177,7 +178,7 @@ static void IntReq( running_machine *machine, int num ) static READ32_HANDLER( FlipCount_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); #ifdef IDLE_LOOP_SPEEDUP UINT32 IntPend = memory_read_dword(space, 0x01800c0c); @@ -190,7 +191,7 @@ static READ32_HANDLER( FlipCount_r ) static WRITE32_HANDLER( FlipCount_w ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); if (mem_mask & 0x00ff0000) { @@ -204,7 +205,7 @@ static WRITE32_HANDLER( FlipCount_w ) static READ32_HANDLER( Input_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); if (offset == 0) return input_port_read(space->machine, "P1_P2"); @@ -225,7 +226,7 @@ static READ32_HANDLER( Input_r ) static WRITE32_HANDLER( IntAck_w ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); UINT32 IntPend = memory_read_dword(space, 0x01800c0c); if (mem_mask & 0xff) @@ -241,7 +242,7 @@ static WRITE32_HANDLER( IntAck_w ) static IRQ_CALLBACK( icallback ) { - crystal_state *state = (crystal_state *)device->machine->driver_data; + crystal_state *state = device->machine->driver_data(); const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); UINT32 IntPend = memory_read_dword(space, 0x01800c0c); int i; @@ -258,7 +259,7 @@ static IRQ_CALLBACK( icallback ) static WRITE32_HANDLER( Banksw_w ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); state->Bank = (data >> 1) & 7; if (state->Bank <= 2) @@ -269,7 +270,7 @@ static WRITE32_HANDLER( Banksw_w ) static TIMER_CALLBACK( Timercb ) { - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); int which = (int)(FPTR)ptr; static const int num[] = { 0, 1, 9, 10 }; @@ -281,7 +282,7 @@ static TIMER_CALLBACK( Timercb ) INLINE void Timer_w( const address_space *space, int which, UINT32 data, UINT32 mem_mask ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); if (((data ^ state->Timerctrl[which]) & 1) && (data & 1)) //Timer activate { @@ -304,7 +305,7 @@ static WRITE32_HANDLER( Timer0_w ) static READ32_HANDLER( Timer0_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->Timerctrl[0]; } @@ -315,7 +316,7 @@ static WRITE32_HANDLER( Timer1_w ) static READ32_HANDLER( Timer1_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->Timerctrl[1]; } @@ -326,7 +327,7 @@ static WRITE32_HANDLER( Timer2_w ) static READ32_HANDLER( Timer2_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->Timerctrl[2]; } @@ -337,13 +338,13 @@ static WRITE32_HANDLER( Timer3_w ) static READ32_HANDLER( Timer3_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->Timerctrl[3]; } static READ32_HANDLER( FlashCmd_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); if ((state->FlashCmd & 0xff) == 0xff) { @@ -367,19 +368,19 @@ static READ32_HANDLER( FlashCmd_r ) static WRITE32_HANDLER( FlashCmd_w ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); state->FlashCmd = data; } static READ32_HANDLER( PIO_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->PIO; } static WRITE32_HANDLER( PIO_w ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); UINT32 RST = data & 0x01000000; UINT32 CLK = data & 0x02000000; UINT32 DAT = data & 0x10000000; @@ -400,7 +401,7 @@ static WRITE32_HANDLER( PIO_w ) INLINE void DMA_w( const address_space *space, int which, UINT32 data, UINT32 mem_mask ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); if (((data ^ state->DMActrl[which]) & (1 << 10)) && (data & (1 << 10))) //DMAOn { @@ -443,7 +444,7 @@ INLINE void DMA_w( const address_space *space, int which, UINT32 data, UINT32 me static READ32_HANDLER( DMA0_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->DMActrl[0]; } @@ -454,7 +455,7 @@ static WRITE32_HANDLER( DMA0_w ) static READ32_HANDLER( DMA1_r ) { - crystal_state *state = (crystal_state *)space->machine->driver_data; + crystal_state *state = space->machine->driver_data(); return state->DMActrl[1]; } @@ -522,7 +523,7 @@ loop: JMP Loop1 */ - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); #if 1 static const UINT32 Patch[] = @@ -550,7 +551,7 @@ loop: static STATE_POSTLOAD( crystal_banksw_postload ) { - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); if (state->Bank <= 2) memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + state->Bank * 0x1000000); @@ -560,7 +561,7 @@ static STATE_POSTLOAD( crystal_banksw_postload ) static MACHINE_START( crystal ) { - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); int i; state->maincpu = machine->device("maincpu"); @@ -590,7 +591,7 @@ static MACHINE_START( crystal ) static MACHINE_RESET( crystal ) { - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); int i; memset(state->sysregs, 0, 0x10000); @@ -633,7 +634,7 @@ static void SetVidReg( const address_space *space, UINT16 reg, UINT16 val ) static VIDEO_UPDATE( crystal ) { - crystal_state *state = (crystal_state *)screen->machine->driver_data; + crystal_state *state = screen->machine->driver_data(); const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM); int DoFlip; @@ -694,7 +695,7 @@ static VIDEO_UPDATE( crystal ) static VIDEO_EOF(crystal) { - crystal_state *state = (crystal_state *)machine->driver_data; + crystal_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT16 head, tail; int DoFlip = 0; diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index b6b9bcf28c8..f1b6c4fbbcf 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -14,12 +14,13 @@ #define MCLK 16000000 -class cultures_state +class cultures_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cultures_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cultures_state(machine)); } - cultures_state(running_machine &machine) { } + cultures_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg0_videoram; @@ -43,7 +44,7 @@ public: static TILE_GET_INFO( get_bg1_tile_info ) { - cultures_state *state = (cultures_state *)machine->driver_data; + cultures_state *state = machine->driver_data(); UINT8 *region = memory_region(machine, "gfx3") + 0x200000 + 0x80000 * state->bg1_bank; int code = region[tile_index * 2] + (region[tile_index * 2 + 1] << 8); SET_TILE_INFO(2, code, code >> 12, 0); @@ -51,7 +52,7 @@ static TILE_GET_INFO( get_bg1_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - cultures_state *state = (cultures_state *)machine->driver_data; + cultures_state *state = machine->driver_data(); UINT8 *region = memory_region(machine, "gfx2") + 0x200000 + 0x80000 * state->bg2_bank; int code = region[tile_index * 2] + (region[tile_index * 2 + 1] << 8); SET_TILE_INFO(1, code, code >> 12, 0); @@ -59,14 +60,14 @@ static TILE_GET_INFO( get_bg2_tile_info ) static TILE_GET_INFO( get_bg0_tile_info ) { - cultures_state *state = (cultures_state *)machine->driver_data; + cultures_state *state = machine->driver_data(); int code = state->bg0_videoram[tile_index * 2] + (state->bg0_videoram[tile_index * 2 + 1] << 8); SET_TILE_INFO(0, code, code >> 12, 0); } static VIDEO_START( cultures ) { - cultures_state *state = (cultures_state *)machine->driver_data; + cultures_state *state = machine->driver_data(); state->bg0_tilemap = tilemap_create(machine, get_bg0_tile_info,tilemap_scan_rows, 8, 8, 64, 128); state->bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows, 8, 8, 512, 512); state->bg2_tilemap = tilemap_create(machine, get_bg2_tile_info,tilemap_scan_rows, 8, 8, 512, 512); @@ -85,7 +86,7 @@ static VIDEO_START( cultures ) static VIDEO_UPDATE( cultures ) { - cultures_state *state = (cultures_state *)screen->machine->driver_data; + cultures_state *state = screen->machine->driver_data(); int attr; // tilemaps attributes @@ -115,14 +116,14 @@ static VIDEO_UPDATE( cultures ) static WRITE8_HANDLER( cpu_bankswitch_w ) { - cultures_state *state = (cultures_state *)space->machine->driver_data; + cultures_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data & 0x0f); state->video_bank = ~data & 0x20; } static WRITE8_HANDLER( bg0_videoram_w ) { - cultures_state *state = (cultures_state *)space->machine->driver_data; + cultures_state *state = space->machine->driver_data(); if (state->video_bank == 0) { int r, g, b, datax; @@ -145,7 +146,7 @@ static WRITE8_HANDLER( bg0_videoram_w ) static WRITE8_HANDLER( misc_w ) { - cultures_state *state = (cultures_state *)space->machine->driver_data; + cultures_state *state = space->machine->driver_data(); int new_bank = data & 0xf; if (state->old_bank != new_bank) @@ -163,7 +164,7 @@ static WRITE8_HANDLER( misc_w ) static WRITE8_HANDLER( bg_bank_w ) { - cultures_state *state = (cultures_state *)space->machine->driver_data; + cultures_state *state = space->machine->driver_data(); if (state->bg1_bank != (data & 3)) { state->bg1_bank = data & 3; @@ -353,14 +354,14 @@ GFXDECODE_END static INTERRUPT_GEN( cultures_interrupt ) { - cultures_state *state = (cultures_state *)device->machine->driver_data; + cultures_state *state = device->machine->driver_data(); if (state->irq_enable) cpu_set_input_line(device, 0, HOLD_LINE); } static MACHINE_START( cultures ) { - cultures_state *state = (cultures_state *)machine->driver_data; + cultures_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x0000], 0x4000); @@ -377,7 +378,7 @@ static MACHINE_START( cultures ) static MACHINE_RESET( cultures ) { - cultures_state *state = (cultures_state *)machine->driver_data; + cultures_state *state = machine->driver_data(); state->old_bank = -1; state->video_bank = 0; state->irq_enable = 0; diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 51644c8af9f..1f54083f891 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -114,7 +114,7 @@ Todo & FIXME: READ8_HANDLER( cvs_video_or_color_ram_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) return state->video_ram[offset]; @@ -124,7 +124,7 @@ READ8_HANDLER( cvs_video_or_color_ram_r ) WRITE8_HANDLER( cvs_video_or_color_ram_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) state->video_ram[offset] = data; @@ -135,7 +135,7 @@ WRITE8_HANDLER( cvs_video_or_color_ram_w ) READ8_HANDLER( cvs_bullet_ram_or_palette_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) return state->palette_ram[offset & 0x0f]; @@ -145,7 +145,7 @@ READ8_HANDLER( cvs_bullet_ram_or_palette_r ) WRITE8_HANDLER( cvs_bullet_ram_or_palette_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) state->palette_ram[offset & 0x0f] = data; @@ -156,7 +156,7 @@ WRITE8_HANDLER( cvs_bullet_ram_or_palette_w ) READ8_HANDLER( cvs_s2636_0_or_character_ram_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) return state->character_ram[(0 * 0x800) | 0x400 | state->character_ram_page_start | offset]; @@ -166,7 +166,7 @@ READ8_HANDLER( cvs_s2636_0_or_character_ram_r ) WRITE8_HANDLER( cvs_s2636_0_or_character_ram_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) { @@ -181,7 +181,7 @@ WRITE8_HANDLER( cvs_s2636_0_or_character_ram_w ) READ8_HANDLER( cvs_s2636_1_or_character_ram_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) return state->character_ram[(1 * 0x800) | 0x400 | state->character_ram_page_start | offset]; @@ -191,7 +191,7 @@ READ8_HANDLER( cvs_s2636_1_or_character_ram_r ) WRITE8_HANDLER( cvs_s2636_1_or_character_ram_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) { @@ -206,7 +206,7 @@ WRITE8_HANDLER( cvs_s2636_1_or_character_ram_w ) READ8_HANDLER( cvs_s2636_2_or_character_ram_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) return state->character_ram[(2 * 0x800) | 0x400 | state->character_ram_page_start | offset]; @@ -216,7 +216,7 @@ READ8_HANDLER( cvs_s2636_2_or_character_ram_r ) WRITE8_HANDLER( cvs_s2636_2_or_character_ram_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (*state->fo_state) { @@ -262,7 +262,7 @@ static void cvs_slave_cpu_interrupt( running_device *cpu, int state ) static READ8_HANDLER( cvs_input_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); UINT8 ret = 0; /* the upper 4 bits of the address is used to select the character banking attributes */ @@ -294,7 +294,7 @@ static READ8_HANDLER( cvs_input_r ) #if 0 static READ8_HANDLER( cvs_393hz_clock_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); return state->cvs_393hz_clock ? 0x80 : 0; } #endif @@ -306,7 +306,7 @@ static READ8_DEVICE_HANDLER( tms_clock_r ) static TIMER_CALLBACK( cvs_393hz_timer_cb ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); state->cvs_393hz_clock = !state->cvs_393hz_clock; /* quasar.c games use this timer but have no dac3! */ @@ -320,7 +320,7 @@ static TIMER_CALLBACK( cvs_393hz_timer_cb ) static void start_393hz_timer(running_machine *machine) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); state->cvs_393hz_timer = timer_alloc(machine, cvs_393hz_timer_cb, NULL); timer_adjust_periodic(state->cvs_393hz_timer, ATTOTIME_IN_HZ(30*393), 0, ATTOTIME_IN_HZ(30*393)); } @@ -335,7 +335,7 @@ static void start_393hz_timer(running_machine *machine) static WRITE8_DEVICE_HANDLER( cvs_4_bit_dac_data_w ) { - cvs_state *state = (cvs_state *)device->machine->driver_data; + cvs_state *state = device->machine->driver_data(); UINT8 dac_value; static int old_data[4] = {0,0,0,0}; @@ -358,7 +358,7 @@ static WRITE8_DEVICE_HANDLER( cvs_4_bit_dac_data_w ) static WRITE8_DEVICE_HANDLER( cvs_unknown_w ) { - cvs_state *state = (cvs_state *)device->machine->driver_data; + cvs_state *state = device->machine->driver_data(); /* offset 2 is used in 8ball * offset 0 is used in spacefrt @@ -385,7 +385,7 @@ static WRITE8_DEVICE_HANDLER( cvs_unknown_w ) static WRITE8_HANDLER( cvs_speech_rom_address_lo_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); /* assuming that d0-d2 are cleared here */ state->speech_rom_bit_address = (state->speech_rom_bit_address & 0xf800) | (data << 3); @@ -394,7 +394,7 @@ static WRITE8_HANDLER( cvs_speech_rom_address_lo_w ) static WRITE8_HANDLER( cvs_speech_rom_address_hi_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); state->speech_rom_bit_address = (state->speech_rom_bit_address & 0x07ff) | (data << 11); LOG(("%04x : CVS: Speech Hi %02x Address = %04x\n", cpu_get_pc(space->cpu), data, state->speech_rom_bit_address >> 3)); } @@ -402,7 +402,7 @@ static WRITE8_HANDLER( cvs_speech_rom_address_hi_w ) static READ8_HANDLER( cvs_speech_command_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); /* FIXME: this was by observation on board ??? * -bit 7 is TMS status (active LO) */ @@ -412,7 +412,7 @@ static READ8_HANDLER( cvs_speech_command_r ) static WRITE8_DEVICE_HANDLER( cvs_tms5110_ctl_w ) { - cvs_state *state = (cvs_state *)device->machine->driver_data; + cvs_state *state = device->machine->driver_data(); UINT8 ctl; /* * offset 0: CS ? @@ -439,7 +439,7 @@ static WRITE8_DEVICE_HANDLER( cvs_tms5110_pdc_w ) static int speech_rom_read_bit( running_device *device ) { - cvs_state *state = (cvs_state *)device->machine->driver_data; + cvs_state *state = device->machine->driver_data(); running_machine *machine = device->machine; UINT8 *ROM = memory_region(machine, "speechdata"); int bit; @@ -471,7 +471,7 @@ static const tms5110_interface tms5100_interface = static WRITE8_HANDLER( audio_command_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); LOG(("data %02x\n", data)); /* cause interrupt on audio CPU if bit 7 set */ @@ -1004,7 +1004,7 @@ static const s2636_interface s2636_2_config = MACHINE_START( cvs ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); /* allocate memory */ state->color_ram = auto_alloc_array(machine, UINT8, 0x400); @@ -1045,7 +1045,7 @@ MACHINE_START( cvs ) MACHINE_RESET( cvs ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); state->character_banking_mode = 0; state->character_ram_page_start = 0; diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index ed917db9ee9..4e243452d3a 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -37,15 +37,15 @@ static void update_interrupts(running_machine *machine) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "extra", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); + cyberbal_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "extra", 1, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_START( cyberbal ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; + cyberbal_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->fast_68k_int); @@ -59,11 +59,11 @@ static MACHINE_START( cyberbal ) static MACHINE_RESET( cyberbal ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; + cyberbal_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_slapstic_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_slapstic_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, cyberbal_scanline_update, 8); atarigen_sound_io_reset(machine->device("audiocpu")); @@ -76,18 +76,18 @@ static MACHINE_RESET( cyberbal ) static void cyberbal2p_update_interrupts(running_machine *machine) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 3, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cyberbal_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 3, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_RESET( cyberbal2p ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; + cyberbal_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, cyberbal2p_update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, cyberbal2p_update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, cyberbal_scanline_update, 8); atarijsa_reset(); } @@ -102,27 +102,27 @@ static MACHINE_RESET( cyberbal2p ) static READ16_HANDLER( special_port0_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "IN0"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0080; + if (state->cpu_to_sound_ready) temp ^= 0x0080; return temp; } static READ16_HANDLER( special_port2_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "IN2"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x2000; + if (state->cpu_to_sound_ready) temp ^= 0x2000; return temp; } static READ16_HANDLER( sound_state_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); int temp = 0xffff; - if (state->atarigen.cpu_to_sound_ready) temp ^= 0xffff; + if (state->cpu_to_sound_ready) temp ^= 0xffff; return temp; } @@ -149,7 +149,7 @@ static WRITE16_HANDLER( p2_reset_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0xfc0000, 0xfc0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(cyberbal_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfc0000, 0xfc0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(cyberbal_state, eeprom, eeprom_size) AM_RANGE(0xfc8000, 0xfcffff) AM_READ(atarigen_sound_upper_r) AM_RANGE(0xfd0000, 0xfd1fff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0xfd2000, 0xfd3fff) AM_WRITE(atarigen_sound_reset_w) @@ -160,12 +160,12 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfe1000, 0xfe1fff) AM_READ_PORT("IN1") AM_RANGE(0xfe8000, 0xfe8fff) AM_RAM_WRITE(cyberbal_paletteram_1_w) AM_SHARE("share1") AM_BASE_MEMBER(cyberbal_state, paletteram_1) AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE(cyberbal_paletteram_0_w) AM_SHARE("share2") AM_BASE_MEMBER(cyberbal_state, paletteram_0) - AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(atarigen_playfield2_w) AM_SHARE("share3") AM_BASE_MEMBER(cyberbal_state, atarigen.playfield2) - AM_RANGE(0xff2000, 0xff2fff) AM_RAM_WRITE(atarigen_alpha2_w) AM_SHARE("share4") AM_BASE_MEMBER(cyberbal_state, atarigen.alpha2) + AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(atarigen_playfield2_w) AM_SHARE("share3") AM_BASE_MEMBER(cyberbal_state, playfield2) + AM_RANGE(0xff2000, 0xff2fff) AM_RAM_WRITE(atarigen_alpha2_w) AM_SHARE("share4") AM_BASE_MEMBER(cyberbal_state, alpha2) AM_RANGE(0xff3000, 0xff37ff) AM_RAM_WRITE(atarimo_1_spriteram_w) AM_SHARE("share5") AM_BASE(&atarimo_1_spriteram) AM_RANGE(0xff3800, 0xff3fff) AM_RAM AM_SHARE("share6") - AM_RANGE(0xff4000, 0xff5fff) AM_RAM_WRITE(atarigen_playfield_w) AM_SHARE("share7") AM_BASE_MEMBER(cyberbal_state, atarigen.playfield) - AM_RANGE(0xff6000, 0xff6fff) AM_RAM_WRITE(atarigen_alpha_w) AM_SHARE("share8") AM_BASE_MEMBER(cyberbal_state, atarigen.alpha) + AM_RANGE(0xff4000, 0xff5fff) AM_RAM_WRITE(atarigen_playfield_w) AM_SHARE("share7") AM_BASE_MEMBER(cyberbal_state, playfield) + AM_RANGE(0xff6000, 0xff6fff) AM_RAM_WRITE(atarigen_alpha_w) AM_SHARE("share8") AM_BASE_MEMBER(cyberbal_state, alpha) AM_RANGE(0xff7000, 0xff77ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_SHARE("share9") AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xff7800, 0xff9fff) AM_RAM AM_SHARE("share10") AM_RANGE(0xffa000, 0xffbfff) AM_READONLY AM_WRITENOP AM_SHARE("share11") @@ -253,7 +253,7 @@ static ADDRESS_MAP_START( cyberbal2p_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfc2000, 0xfc2003) AM_READ_PORT("IN1") AM_RANGE(0xfc4000, 0xfc4003) AM_READ(special_port2_r) AM_RANGE(0xfc6000, 0xfc6003) AM_READ(atarigen_sound_upper_r) - AM_RANGE(0xfc8000, 0xfc8fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(cyberbal_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfc8000, 0xfc8fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(cyberbal_state, eeprom, eeprom_size) AM_RANGE(0xfca000, 0xfcafff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xfd0000, 0xfd0003) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0xfd2000, 0xfd2003) AM_WRITE(atarigen_sound_reset_w) @@ -261,8 +261,8 @@ static ADDRESS_MAP_START( cyberbal2p_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfd6000, 0xfd6003) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xfd8000, 0xfd8003) AM_WRITE(atarigen_sound_upper_w) AM_RANGE(0xfe0000, 0xfe0003) AM_READ(sound_state_r) - AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(cyberbal_state, atarigen.playfield) - AM_RANGE(0xff2000, 0xff2fff) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(cyberbal_state, atarigen.alpha) + AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(cyberbal_state, playfield) + AM_RANGE(0xff2000, 0xff2fff) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(cyberbal_state, alpha) AM_RANGE(0xff3000, 0xff37ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xff3800, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -997,24 +997,24 @@ static const UINT16 default_eeprom[] = static DRIVER_INIT( cyberbal ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - state->atarigen.eeprom_default = default_eeprom; + cyberbal_state *state = machine->driver_data(); + state->eeprom_default = default_eeprom; atarigen_slapstic_init(machine->device("maincpu"), 0x018000, 0, 0); } static DRIVER_INIT( cyberbalt ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - state->atarigen.eeprom_default = default_eeprom; + cyberbal_state *state = machine->driver_data(); + state->eeprom_default = default_eeprom; atarigen_slapstic_init(machine->device("maincpu"), 0x018000, 0, 116); } static DRIVER_INIT( cyberbal2p ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - state->atarigen.eeprom_default = default_eeprom; + cyberbal_state *state = machine->driver_data(); + state->eeprom_default = default_eeprom; atarijsa_init(machine, "IN2", 0x8000); } diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 6e02345fcaf..56ea8b5a50e 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -25,12 +25,13 @@ #include "sound/ay8910.h" #include "video/resnet.h" -class dacholer_state +class dacholer_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dacholer_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dacholer_state(machine)); } - dacholer_state(running_machine &machine) { } + dacholer_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgvideoram; @@ -57,21 +58,21 @@ public: static WRITE8_HANDLER( background_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static WRITE8_HANDLER( foreground_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } static WRITE8_HANDLER( bg_bank_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); if ((data & 3) != state->bg_bank) { state->bg_bank = data & 3; @@ -93,7 +94,7 @@ static WRITE8_HANDLER( coins_w ) static WRITE8_HANDLER(snd_w) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -129,32 +130,32 @@ ADDRESS_MAP_END static WRITE8_HANDLER( adpcm_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); state->msm_data = data; state->msm_toggle = 0; } static WRITE8_HANDLER( snd_ack_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); state->snd_ack = data; } static CUSTOM_INPUT( snd_ack_r ) { - dacholer_state *state = (dacholer_state *)field->port->machine->driver_data; + dacholer_state *state = field->port->machine->driver_data(); return state->snd_ack; //guess ... } static WRITE8_HANDLER( snd_irq_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); state->snd_interrupt_enable = data; } static WRITE8_HANDLER( music_irq_w ) { - dacholer_state *state = (dacholer_state *)space->machine->driver_data; + dacholer_state *state = space->machine->driver_data(); state->music_interrupt_enable = data; } @@ -312,19 +313,19 @@ INPUT_PORTS_END static TILE_GET_INFO( get_bg_tile_info ) { - dacholer_state *state = (dacholer_state *)machine->driver_data; + dacholer_state *state = machine->driver_data(); SET_TILE_INFO(1, state->bgvideoram[tile_index] + state->bg_bank * 0x100, 0, 0); } static TILE_GET_INFO( get_fg_tile_info ) { - dacholer_state *state = (dacholer_state *)machine->driver_data; + dacholer_state *state = machine->driver_data(); SET_TILE_INFO(0, state->fgvideoram[tile_index], 0, 0); } static VIDEO_START( dacholer ) { - dacholer_state *state = (dacholer_state *)machine->driver_data; + dacholer_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -333,7 +334,7 @@ static VIDEO_START( dacholer ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - dacholer_state *state = (dacholer_state *)machine->driver_data; + dacholer_state *state = machine->driver_data(); int offs, code, attr, sx, sy, flipx, flipy; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -365,7 +366,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE(dacholer) { - dacholer_state *state = (dacholer_state *)screen->machine->driver_data; + dacholer_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); @@ -404,7 +405,7 @@ GFXDECODE_END static INTERRUPT_GEN( sound_irq ) { - dacholer_state *state = (dacholer_state *)device->machine->driver_data; + dacholer_state *state = device->machine->driver_data(); if (state->music_interrupt_enable == 1) { cpu_set_input_line_and_vector(device, 0, HOLD_LINE, 0x30); @@ -413,7 +414,7 @@ static INTERRUPT_GEN( sound_irq ) static void adpcm_int( running_device *device ) { - dacholer_state *state = (dacholer_state *)device->machine->driver_data; + dacholer_state *state = device->machine->driver_data(); if (state->snd_interrupt_enable == 1 || (state->snd_interrupt_enable == 0 && state->msm_toggle == 1)) { msm5205_data_w(device, state->msm_data >> 4); @@ -436,7 +437,7 @@ static const msm5205_interface msm_interface = static MACHINE_START( dacholer ) { - dacholer_state *state = (dacholer_state *)machine->driver_data; + dacholer_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -450,7 +451,7 @@ static MACHINE_START( dacholer ) static MACHINE_RESET( dacholer ) { - dacholer_state *state = (dacholer_state *)machine->driver_data; + dacholer_state *state = machine->driver_data(); state->msm_data = 0; state->msm_toggle = 0; diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index 3beb50eac30..000ba1cc3a2 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -144,13 +144,13 @@ static void parse_control( running_machine *machine ) /* assumes Z80 sandwiched /* bit 0 enables cpu B */ /* however this fails when recovering from a save state if cpu B is disabled !! */ - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); cpu_set_input_line(state->cpub, INPUT_LINE_RESET, (state->cpua_ctrl & 0x01) ? CLEAR_LINE : ASSERT_LINE); } static WRITE16_HANDLER( cpua_ctrl_w ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); if ((data & 0xff00) && ((data & 0xff) == 0)) data = data >> 8; @@ -174,7 +174,7 @@ static WRITE16_HANDLER( darius_watchdog_w ) static READ16_HANDLER( darius_ioc_r ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); switch (offset) { @@ -204,7 +204,7 @@ logerror("CPU #0 PC %06x: warning - read unmapped ioc offset %06x\n",cpu_get_pc( static WRITE16_HANDLER( darius_ioc_w ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); switch (offset) { @@ -276,13 +276,13 @@ ADDRESS_MAP_END static void reset_sound_region( running_machine *machine ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); memory_set_bank(machine, "bank1", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->banknum = data & 0x03; reset_sound_region(space->machine); @@ -292,7 +292,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static WRITE8_HANDLER( adpcm_command_w ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->adpcm_command = data; /* logerror("#ADPCM command write =%2x\n",data); */ } @@ -311,7 +311,7 @@ static WRITE8_HANDLER( display_value ) static void update_fm0( running_machine *machine ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); int left = ( state->pan[0] * state->vol[6]) >> 8; int right = ((0xff - state->pan[0]) * state->vol[6]) >> 8; @@ -323,7 +323,7 @@ static void update_fm0( running_machine *machine ) static void update_fm1( running_machine *machine ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); int left = ( state->pan[1] * state->vol[7]) >> 8; int right = ((0xff - state->pan[1]) * state->vol[7]) >> 8; @@ -335,7 +335,7 @@ static void update_fm1( running_machine *machine ) static void update_psg0( running_machine *machine, int port ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); running_device *lvol = NULL, *rvol = NULL; int left, right; @@ -358,7 +358,7 @@ static void update_psg0( running_machine *machine, int port ) static void update_psg1( running_machine *machine, int port ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); running_device *lvol = NULL, *rvol = NULL; int left, right; @@ -381,7 +381,7 @@ static void update_psg1( running_machine *machine, int port ) static void update_da( running_machine *machine ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); int left = state->def_vol[(state->pan[4] >> 4) & 0x0f]; int right = state->def_vol[(state->pan[4] >> 0) & 0x0f]; @@ -393,21 +393,21 @@ static void update_da( running_machine *machine ) static WRITE8_HANDLER( darius_fm0_pan ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->pan[0] = data & 0xff; /* data 0x00:right 0xff:left */ update_fm0(space->machine); } static WRITE8_HANDLER( darius_fm1_pan ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->pan[1] = data & 0xff; update_fm1(space->machine); } static WRITE8_HANDLER( darius_psg0_pan ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->pan[2] = data & 0xff; update_psg0(space->machine, 0); update_psg0(space->machine, 1); @@ -416,7 +416,7 @@ static WRITE8_HANDLER( darius_psg0_pan ) static WRITE8_HANDLER( darius_psg1_pan ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->pan[3] = data & 0xff; update_psg1(space->machine, 0); update_psg1(space->machine, 1); @@ -425,7 +425,7 @@ static WRITE8_HANDLER( darius_psg1_pan ) static WRITE8_HANDLER( darius_da_pan ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->pan[4] = data & 0xff; update_da(space->machine); } @@ -434,7 +434,7 @@ static WRITE8_HANDLER( darius_da_pan ) static WRITE8_DEVICE_HANDLER( darius_write_portA0 ) { - darius_state *state = (darius_state *)device->machine->driver_data; + darius_state *state = device->machine->driver_data(); // volume control FM #0 PSG #0 A //popmessage(" pan %02x %02x %02x %02x %02x", state->pan[0], state->pan[1], state->pan[2], state->pan[3], state->pan[4] ); @@ -448,7 +448,7 @@ static WRITE8_DEVICE_HANDLER( darius_write_portA0 ) static WRITE8_DEVICE_HANDLER( darius_write_portA1 ) { - darius_state *state = (darius_state *)device->machine->driver_data; + darius_state *state = device->machine->driver_data(); // volume control FM #1 PSG #1 A //popmessage(" pan %02x %02x %02x %02x %02x", state->pan[0], state->pan[1], state->pan[2], state->pan[3], state->pan[4] ); @@ -461,7 +461,7 @@ static WRITE8_DEVICE_HANDLER( darius_write_portA1 ) static WRITE8_DEVICE_HANDLER( darius_write_portB0 ) { - darius_state *state = (darius_state *)device->machine->driver_data; + darius_state *state = device->machine->driver_data(); // volume control PSG #0 B/C //popmessage(" pan %02x %02x %02x %02x %02x", state->pan[0], state->pan[1], state->pan[2], state->pan[3], state->pan[4] ); @@ -474,7 +474,7 @@ static WRITE8_DEVICE_HANDLER( darius_write_portB0 ) static WRITE8_DEVICE_HANDLER( darius_write_portB1 ) { - darius_state *state = (darius_state *)device->machine->driver_data; + darius_state *state = device->machine->driver_data(); // volume control PSG #1 B/C //popmessage(" pan %02x %02x %02x %02x %02x", state->pan[0], state->pan[1], state->pan[2], state->pan[3], state->pan[4] ); @@ -515,7 +515,7 @@ ADDRESS_MAP_END static void darius_adpcm_int( running_device *device ) { - darius_state *state = (darius_state *)device->machine->driver_data; + darius_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(state->adpcm, INPUT_LINE_NMI, PULSE_LINE); @@ -529,7 +529,7 @@ static const msm5205_interface msm5205_config = static READ8_HANDLER( adpcm_command_read ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); /* logerror("read port 0: %02x PC=%4x\n",adpcm_command, cpu_get_pc(space->cpu) ); */ return state->adpcm_command; @@ -547,7 +547,7 @@ static READ8_HANDLER( readport3 ) static WRITE8_HANDLER( adpcm_nmi_disable ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->nmi_enable = 0; /* logerror("write port 0: NMI DISABLE PC=%4x\n", data, cpu_get_pc(space->cpu) ); */ @@ -555,7 +555,7 @@ static WRITE8_HANDLER( adpcm_nmi_disable ) static WRITE8_HANDLER( adpcm_nmi_enable ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); state->nmi_enable = 1; /* logerror("write port 1: NMI ENABLE PC=%4x\n", cpu_get_pc(space->cpu) ); */ } @@ -800,7 +800,7 @@ GFXDECODE_END /* handler called by the YM2203 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) /* assumes Z80 sandwiched between 68Ks */ { - darius_state *state = (darius_state *)device->machine->driver_data; + darius_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -853,7 +853,7 @@ static STATE_POSTLOAD( darius_postload ) static MACHINE_START( darius ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x8000); memory_configure_bank(machine, "bank1", 4, 1, memory_region(machine, "audiocpu"), 0x8000); @@ -905,7 +905,7 @@ static MACHINE_START( darius ) static MACHINE_RESET( darius ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); int i; state->cpua_ctrl = 0xff; diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 561c0b025d0..0d1572ffc21 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -170,7 +170,7 @@ static READ16_HANDLER( dassault_sub_control_r ) static WRITE16_HANDLER( dassault_sound_w ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); /* IRQ1 */ } @@ -178,7 +178,7 @@ static WRITE16_HANDLER( dassault_sound_w ) /* The CPU-CPU irq controller is overlaid onto the end of the shared memory */ static READ16_HANDLER( dassault_irq_r ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); switch (offset) { case 0: cpu_set_input_line(state->maincpu, 5, CLEAR_LINE); break; @@ -189,7 +189,7 @@ static READ16_HANDLER( dassault_irq_r ) static WRITE16_HANDLER( dassault_irq_w ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); switch (offset) { case 0: cpu_set_input_line(state->maincpu, 5, ASSERT_LINE); break; @@ -201,13 +201,13 @@ static WRITE16_HANDLER( dassault_irq_w ) static WRITE16_HANDLER( shared_ram_w ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); COMBINE_DATA(&state->shared_ram[offset]); } static READ16_HANDLER( shared_ram_r ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); return state->shared_ram[offset]; } @@ -513,13 +513,13 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - dassault_state *driver_state = (dassault_state *)device->machine->driver_data; + dassault_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); } static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - dassault_state *state = (dassault_state *)device->machine->driver_data; + dassault_state *state = device->machine->driver_data(); /* the second OKIM6295 ROM is bank switched */ state->oki2->set_bank_base((data & 1) * 0x40000); @@ -812,7 +812,7 @@ ROM_END static READ16_HANDLER( dassault_main_skip ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); int ret = state->ram[0]; if (cpu_get_previouspc(space->cpu) == 0x1170 && ret & 0x8000) @@ -823,7 +823,7 @@ static READ16_HANDLER( dassault_main_skip ) static READ16_HANDLER( thndzone_main_skip ) { - dassault_state *state = (dassault_state *)space->machine->driver_data; + dassault_state *state = space->machine->driver_data(); int ret = state->ram[0]; if (cpu_get_pc(space->cpu) == 0x114c && ret & 0x8000) diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 3a0ec2b2429..29ad1f3c012 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -25,12 +25,13 @@ Protection TODO: #include "sound/okim6295.h" #include "video/deco16ic.h" -class dblewing_state +class dblewing_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dblewing_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dblewing_state(machine)); } - dblewing_state(running_machine &machine) { } + dblewing_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; @@ -103,7 +104,7 @@ x = xpos static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - dblewing_state *state = (dblewing_state *)machine->driver_data; + dblewing_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -193,7 +194,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE(dblewing) { - dblewing_state *state = (dblewing_state *)screen->machine->driver_data; + dblewing_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); @@ -220,7 +221,7 @@ static VIDEO_UPDATE(dblewing) */ static READ16_HANDLER ( dblewing_prot_r ) { - dblewing_state *state = (dblewing_state *)space->machine->driver_data; + dblewing_state *state = space->machine->driver_data(); switch (offset * 2) { @@ -284,7 +285,7 @@ static READ16_HANDLER ( dblewing_prot_r ) static WRITE16_HANDLER( dblewing_prot_w ) { - dblewing_state *state = (dblewing_state *)space->machine->driver_data; + dblewing_state *state = space->machine->driver_data(); // if (offset * 2 != 0x380) // printf("dblewing prot w %08x, %04x, %04x %04x\n", cpu_get_pc(space->cpu), offset * 2, mem_mask, data); @@ -432,7 +433,7 @@ ADDRESS_MAP_END static READ8_HANDLER(irq_latch_r) { - dblewing_state *state = (dblewing_state *)space->machine->driver_data; + dblewing_state *state = space->machine->driver_data(); /* bit 1 of dblewing_sound_irq specifies IRQ command writes */ state->sound_irq &= ~0x02; @@ -624,7 +625,7 @@ INPUT_PORTS_END static void sound_irq( running_device *device, int state ) { - dblewing_state *driver_state = (dblewing_state *)device->machine->driver_data; + dblewing_state *driver_state = device->machine->driver_data(); /* bit 0 of dblewing_sound_irq specifies IRQ from sound chip */ if (state) @@ -659,7 +660,7 @@ static const deco16ic_interface dblewing_deco16ic_intf = static MACHINE_START( dblewing ) { - dblewing_state *state = (dblewing_state *)machine->driver_data; + dblewing_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -698,7 +699,7 @@ static MACHINE_START( dblewing ) static MACHINE_RESET( dblewing ) { - dblewing_state *state = (dblewing_state *)machine->driver_data; + dblewing_state *state = machine->driver_data(); state->_008_data = 0; state->_104_data = 0; diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index f3bd39630d8..3cba7c13360 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -63,7 +63,7 @@ Notes: static INTERRUPT_GEN( dbz_interrupt ) { - dbz_state *state = (dbz_state *)device->machine->driver_data; + dbz_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -81,14 +81,14 @@ static INTERRUPT_GEN( dbz_interrupt ) #if 0 static READ16_HANDLER( dbzcontrol_r ) { - dbz_state *state = (dbz_state *)space->machine->driver_data; + dbz_state *state = space->machine->driver_data(); return state->control; } #endif static WRITE16_HANDLER( dbzcontrol_w ) { - dbz_state *state = (dbz_state *)space->machine->driver_data; + dbz_state *state = space->machine->driver_data(); /* bit 10 = enable '246 readback */ COMBINE_DATA(&state->control); @@ -109,13 +109,13 @@ static WRITE16_HANDLER( dbz_sound_command_w ) static WRITE16_HANDLER( dbz_sound_cause_nmi ) { - dbz_state *state = (dbz_state *)space->machine->driver_data; + dbz_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } static void dbz_sound_irq( running_device *device, int irq ) { - dbz_state *state = (dbz_state *)device->machine->driver_data; + dbz_state *state = device->machine->driver_data(); if (irq) cpu_set_input_line(state->audiocpu, 0, ASSERT_LINE); @@ -338,7 +338,7 @@ static const k053936_interface dbz_k053936_intf = static MACHINE_START( dbz ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -356,7 +356,7 @@ static MACHINE_START( dbz ) static MACHINE_RESET( dbz ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); int i; for (i = 0; i < 5; i++) diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 597130e6da5..3c48d4fe978 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -49,7 +49,7 @@ static void update_irq_state( running_device *cpu ) { - dcheese_state *state = (dcheese_state *)cpu->machine->driver_data; + dcheese_state *state = cpu->machine->driver_data(); int i; for (i = 1; i < 5; i++) @@ -59,7 +59,7 @@ static void update_irq_state( running_device *cpu ) static IRQ_CALLBACK( irq_callback ) { - dcheese_state *state = (dcheese_state *)device->machine->driver_data; + dcheese_state *state = device->machine->driver_data(); /* auto-ack the IRQ */ state->irq_state[irqline] = 0; @@ -72,7 +72,7 @@ static IRQ_CALLBACK( irq_callback ) void dcheese_signal_irq( running_machine *machine, int which ) { - dcheese_state *state = (dcheese_state *)machine->driver_data; + dcheese_state *state = machine->driver_data(); state->irq_state[which] = 1; update_irq_state(state->maincpu); @@ -95,7 +95,7 @@ static INTERRUPT_GEN( dcheese_vblank ) static MACHINE_START( dcheese ) { - dcheese_state *state = (dcheese_state *)machine->driver_data; + dcheese_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -119,7 +119,7 @@ static MACHINE_START( dcheese ) static CUSTOM_INPUT( sound_latch_state_r ) { - dcheese_state *state = (dcheese_state *)field->port->machine->driver_data; + dcheese_state *state = field->port->machine->driver_data(); return state->soundlatch_full; } @@ -138,7 +138,7 @@ static WRITE16_HANDLER( eeprom_control_w ) static WRITE16_HANDLER( sound_command_w ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -159,7 +159,7 @@ static WRITE16_HANDLER( sound_command_w ) static READ8_HANDLER( sound_command_r ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); /* read the latch and clear the IRQ */ state->soundlatch_full = 0; @@ -177,7 +177,7 @@ static READ8_HANDLER( sound_status_r ) static WRITE8_HANDLER( sound_control_w ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); UINT8 diff = data ^ state->sound_control; state->sound_control = data; @@ -192,7 +192,7 @@ static WRITE8_HANDLER( sound_control_w ) static WRITE8_DEVICE_HANDLER( bsmt_data_w ) { - dcheese_state *state = (dcheese_state *)device->machine->driver_data; + dcheese_state *state = device->machine->driver_data(); /* writes come in pairs; even bytes latch, odd bytes write */ if (offset % 2 == 0) diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c index a9f7ebe7bb9..13ba38d0e8b 100644 --- a/src/mame/drivers/dday.c +++ b/src/mame/drivers/dday.c @@ -222,7 +222,7 @@ GFXDECODE_END static MACHINE_START( dday ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); state->ay1 = machine->device("ay1"); @@ -234,7 +234,7 @@ static MACHINE_START( dday ) static MACHINE_RESET( dday ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); state->control = 0; state->sl_enable = 0; diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 044a7ff4319..d3ab1d82622 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -56,12 +56,13 @@ $842f = lives #include "sound/ay8910.h" -class ddayjlc_state +class ddayjlc_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddayjlc_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddayjlc_state(machine)); } - ddayjlc_state(running_machine &machine) { } + ddayjlc_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgram; @@ -131,25 +132,25 @@ static const UINT8 prot_data[0x10] = static CUSTOM_INPUT( prot_r ) { - ddayjlc_state *state = (ddayjlc_state *)field->port->machine->driver_data; + ddayjlc_state *state = field->port->machine->driver_data(); return prot_data[state->prot_addr]; } static WRITE8_HANDLER( prot_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->prot_addr = (state->prot_addr & (~(1 << offset))) | ((data & 1) << offset); } static WRITE8_HANDLER( char_bank_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->char_bank = data; } static WRITE8_HANDLER( ddayjlc_bgram_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); if (!offset) tilemap_set_scrollx(state->bg_tilemap, 0, data + 8); @@ -160,38 +161,38 @@ static WRITE8_HANDLER( ddayjlc_bgram_w ) static WRITE8_HANDLER( ddayjlc_videoram_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->videoram[offset] = data; } static WRITE8_HANDLER(sound_nmi_w) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->sound_nmi_enable = data; } static WRITE8_HANDLER(main_nmi_w) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->main_nmi_enable = data; } static WRITE8_HANDLER( bg0_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->bgadr = (state->bgadr & 0xfe) | (data & 1); } static WRITE8_HANDLER( bg1_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->bgadr = (state->bgadr & 0xfd) | ((data & 1) << 1); } static WRITE8_HANDLER( bg2_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->bgadr = (state->bgadr & 0xfb) | ((data & 1) << 2); if (state->bgadr > 2) @@ -202,7 +203,7 @@ static WRITE8_HANDLER( bg2_w ) static WRITE8_HANDLER( sound_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); @@ -210,7 +211,7 @@ static WRITE8_HANDLER( sound_w ) static WRITE8_HANDLER( i8257_CH0_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); state->e00x_d[offset][state->e00x_l[offset]] = data; state->e00x_l[offset] ^= 1; @@ -218,7 +219,7 @@ static WRITE8_HANDLER( i8257_CH0_w ) static WRITE8_HANDLER( i8257_LMSR_w ) { - ddayjlc_state *state = (ddayjlc_state *)space->machine->driver_data; + ddayjlc_state *state = space->machine->driver_data(); if (!data) { @@ -367,7 +368,7 @@ GFXDECODE_END static TILE_GET_INFO( get_tile_info_bg ) { - ddayjlc_state *state = (ddayjlc_state *)machine->driver_data; + ddayjlc_state *state = machine->driver_data(); int code = state->bgram[tile_index] + ((state->bgram[tile_index + 0x400] & 0x08) << 5); int color = (state->bgram[tile_index + 0x400] & 0x7); color |= (state->bgram[tile_index + 0x400] & 0x40) >> 3; @@ -377,13 +378,13 @@ static TILE_GET_INFO( get_tile_info_bg ) static VIDEO_START( ddayjlc ) { - ddayjlc_state *state = (ddayjlc_state *)machine->driver_data; + ddayjlc_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info_bg, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( ddayjlc ) { - ddayjlc_state *state = (ddayjlc_state *)screen->machine->driver_data; + ddayjlc_state *state = screen->machine->driver_data(); UINT32 i; tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -430,14 +431,14 @@ static const ay8910_interface ay8910_config = static INTERRUPT_GEN( ddayjlc_interrupt ) { - ddayjlc_state *state = (ddayjlc_state *)device->machine->driver_data; + ddayjlc_state *state = device->machine->driver_data(); if(state->main_nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } static INTERRUPT_GEN( ddayjlc_snd_interrupt ) { - ddayjlc_state *state = (ddayjlc_state *)device->machine->driver_data; + ddayjlc_state *state = device->machine->driver_data(); if(state->sound_nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } @@ -445,7 +446,7 @@ static INTERRUPT_GEN( ddayjlc_snd_interrupt ) static MACHINE_START( ddayjlc ) { - ddayjlc_state *state = (ddayjlc_state *)machine->driver_data; + ddayjlc_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -464,7 +465,7 @@ static MACHINE_START( ddayjlc ) static MACHINE_RESET( ddayjlc ) { - ddayjlc_state *state = (ddayjlc_state *)machine->driver_data; + ddayjlc_state *state = machine->driver_data(); int i; state->char_bank = 0; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 725a0fc3d96..1181b0cf893 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -113,12 +113,13 @@ Few words about protection: #include "cpu/m68000/m68000.h" #include "sound/2203intf.h" -class ddealer_state +class ddealer_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddealer_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddealer_state(machine)); } - ddealer_state(running_machine &machine) { } + ddealer_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * mcu_shared_ram; @@ -145,13 +146,13 @@ public: static WRITE16_HANDLER( ddealer_flipscreen_w ) { - ddealer_state *state = (ddealer_state *)space->machine->driver_data; + ddealer_state *state = space->machine->driver_data(); state->flipscreen = data & 0x01; } static TILE_GET_INFO( get_back_tile_info ) { - ddealer_state *state = (ddealer_state *)machine->driver_data; + ddealer_state *state = machine->driver_data(); int code = state->back_vram[tile_index]; SET_TILE_INFO( 0, @@ -162,7 +163,7 @@ static TILE_GET_INFO( get_back_tile_info ) static VIDEO_START( ddealer ) { - ddealer_state *state = (ddealer_state *)machine->driver_data; + ddealer_state *state = machine->driver_data(); state->flipscreen = 0; state->back_tilemap = tilemap_create(machine, get_back_tile_info, tilemap_scan_cols, 8, 8, 64, 32); } @@ -252,7 +253,7 @@ static void ddealer_draw_video_layer( running_machine *machine, UINT16* vreg_bas static VIDEO_UPDATE( ddealer ) { - ddealer_state *state = (ddealer_state *)screen->machine->driver_data; + ddealer_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->back_tilemap, 0, state->flipscreen ? -192 : -64); tilemap_set_flip(state->back_tilemap, state->flipscreen ? TILEMAP_FLIPY | TILEMAP_FLIPX : 0); tilemap_draw(bitmap, cliprect, state->back_tilemap, 0, 0); @@ -294,7 +295,7 @@ static VIDEO_UPDATE( ddealer ) static TIMER_DEVICE_CALLBACK( ddealer_mcu_sim ) { - ddealer_state *state = (ddealer_state *)timer.machine->driver_data; + ddealer_state *state = timer.machine->driver_data(); /*coin/credit simulation*/ /*$fe002 is used,might be for multiple coins for one credit settings.*/ @@ -361,7 +362,7 @@ static TIMER_DEVICE_CALLBACK( ddealer_mcu_sim ) static WRITE16_HANDLER( back_vram_w ) { - ddealer_state *state = (ddealer_state *)space->machine->driver_data; + ddealer_state *state = space->machine->driver_data(); COMBINE_DATA(&state->back_vram[offset]); tilemap_mark_tile_dirty(state->back_tilemap, offset); } @@ -369,7 +370,7 @@ static WRITE16_HANDLER( back_vram_w ) static WRITE16_HANDLER( ddealer_vregs_w ) { - ddealer_state *state = (ddealer_state *)space->machine->driver_data; + ddealer_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vregs[offset]); } @@ -397,7 +398,7 @@ Protection handling,identical to Hacha Mecha Fighter / Thunder Dragon with diffe static WRITE16_HANDLER( ddealer_mcu_shared_w ) { - ddealer_state *state = (ddealer_state *)space->machine->driver_data; + ddealer_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mcu_shared_ram[offset]); switch(offset) @@ -591,7 +592,7 @@ GFXDECODE_END static MACHINE_START( ddealer ) { - ddealer_state *state = (ddealer_state *)machine->driver_data; + ddealer_state *state = machine->driver_data(); state_save_register_global(machine, state->respcount); state_save_register_global(machine, state->flipscreen); @@ -601,7 +602,7 @@ static MACHINE_START( ddealer ) static MACHINE_RESET (ddealer) { - ddealer_state *state = (ddealer_state *)machine->driver_data; + ddealer_state *state = machine->driver_data(); state->respcount = 0; state->flipscreen = 0; @@ -652,7 +653,7 @@ MACHINE_DRIVER_END static READ16_HANDLER( ddealer_mcu_r ) { - ddealer_state *state = (ddealer_state *)space->machine->driver_data; + ddealer_state *state = space->machine->driver_data(); static const int resp[] = { 0x93, 0xc7, 0x00, 0x8000, diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index de045fea58d..849d3aec1fe 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -139,7 +139,7 @@ static const int mjflove_commands[8] = { BLIT_STOP, BLIT_CHANGE_PEN, BLIT_CHANGE VIDEO_START( ddenlovr ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int i; for (i = 0; i < 8; i++) @@ -237,7 +237,7 @@ VIDEO_START( ddenlovr ) static VIDEO_START( mmpanic ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); VIDEO_START_CALL(ddenlovr); @@ -246,7 +246,7 @@ static VIDEO_START( mmpanic ) static VIDEO_START( hanakanz ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); VIDEO_START_CALL(ddenlovr); @@ -256,7 +256,7 @@ static VIDEO_START( hanakanz ) static VIDEO_START( mjflove ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); VIDEO_START_CALL(ddenlovr); @@ -270,7 +270,7 @@ static void ddenlovr_flipscreen_w( UINT8 data ) static void ddenlovr_blit_flip_w( running_machine *machine, UINT8 data ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); if ((data ^ state->ddenlovr_blit_flip) & 0xec) { @@ -285,13 +285,13 @@ static void ddenlovr_blit_flip_w( running_machine *machine, UINT8 data ) WRITE8_HANDLER( ddenlovr_bgcolor_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_bgcolor = data; } static WRITE8_HANDLER( ddenlovr_bgcolor2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_bgcolor2 = data; } @@ -304,13 +304,13 @@ static WRITE16_HANDLER( ddenlovr16_bgcolor_w ) WRITE8_HANDLER( ddenlovr_priority_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_priority = data; } static WRITE8_HANDLER( ddenlovr_priority2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_priority2 = data; } @@ -323,13 +323,13 @@ static WRITE16_HANDLER( ddenlovr16_priority_w ) WRITE8_HANDLER( ddenlovr_layer_enable_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_layer_enable = data; } static WRITE8_HANDLER( ddenlovr_layer_enable2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_layer_enable2 = data; } @@ -344,7 +344,7 @@ static WRITE16_HANDLER( ddenlovr16_layer_enable_w ) static void do_plot( running_machine *machine, int x, int y, int pen ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int addr, temp; int xclip, yclip; @@ -435,7 +435,7 @@ INLINE void log_draw_error( int src, int cmd ) static int blit_draw( running_machine *machine, int src, int sx ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); UINT8 *src_data = memory_region(machine, "blitter"); int src_len = memory_region_length(machine, "blitter"); int bit_addr = (src & 0xffffff) * state->ddenlovr_blit_rom_bits; /* convert to bit address */ @@ -530,7 +530,7 @@ static int blit_draw( running_machine *machine, int src, int sx ) */ static void blit_rect_xywh( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int x, y; #ifdef MAME_DEBUG @@ -557,7 +557,7 @@ static void blit_rect_xywh( running_machine *machine ) */ static void blit_rect_yh( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int start = 512 * state->ddenlovr_blit_y; int length = 512 * (state->ddenlovr_rect_height + 1); @@ -597,7 +597,7 @@ static void blit_rect_yh( running_machine *machine ) */ static void blit_fill_xy( running_machine *machine, int x, int y ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int start = 512 * y + x; #ifdef MAME_DEBUG @@ -632,7 +632,7 @@ static void blit_fill_xy( running_machine *machine, int x, int y ) */ static void blit_horiz_line( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int i; #ifdef MAME_DEBUG @@ -663,7 +663,7 @@ static void blit_horiz_line( running_machine *machine ) */ static void blit_vert_line( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int i; #ifdef MAME_DEBUG @@ -682,7 +682,7 @@ static void blit_vert_line( running_machine *machine ) INLINE void log_blit( running_machine *machine, int data ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); #if 1 logerror("%s: blit src %06x x %03x y %03x flags %02x layer %02x pen %02x penmode %02x w %03x h %03x linelen %03x flip %02x clip: ctrl %x xy %03x %03x wh %03x %03x\n", @@ -695,7 +695,7 @@ INLINE void log_blit( running_machine *machine, int data ) static void blitter_w( const address_space *space, int blitter, offs_t offset, UINT8 data, int irq_vector ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int hi_bits; profiler_mark_start(PROFILER_VIDEO); @@ -858,7 +858,7 @@ profiler_mark_end(); // differences wrt blitter_data_w: slightly different blitter commands static void blitter_w_funkyfig( running_machine *machine, int blitter, offs_t offset, UINT8 data, int irq_vector ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int hi_bits; profiler_mark_start(PROFILER_VIDEO); @@ -1015,14 +1015,14 @@ profiler_mark_end(); static WRITE8_HANDLER( hanakanz_blitter_reg_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_blit_latch = data; } // differences wrt blitter_data_w: registers are shuffled around, hi_bits in the low bits, clip_w/h, includes layers registers static WRITE8_HANDLER( hanakanz_blitter_data_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int hi_bits; profiler_mark_start(PROFILER_VIDEO); @@ -1225,7 +1225,7 @@ static WRITE16_HANDLER( ddenlovr_blitter_w ) static WRITE16_HANDLER( ddenlovr_blitter_irq_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1244,7 +1244,7 @@ static WRITE16_HANDLER( ddenlovr_blitter_irq_ack_w ) static READ8_HANDLER( rongrong_gfxrom_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "blitter"); size_t size = memory_region_length(space->machine, "blitter"); int address = state->ddenlovr_blit_address; @@ -1268,7 +1268,7 @@ static READ16_HANDLER( ddenlovr_gfxrom_r ) static void copylayer(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int x,y; int scrollx = state->ddenlovr_scroll[layer / 4 * 8 + (layer % 4) + 0]; int scrolly = state->ddenlovr_scroll[layer / 4 * 8 + (layer % 4) + 4]; @@ -1302,7 +1302,7 @@ static void copylayer(running_machine *machine, bitmap_t *bitmap, const rectangl VIDEO_UPDATE(ddenlovr) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); static const int order[24][4] = { @@ -1409,7 +1409,7 @@ VIDEO_UPDATE(ddenlovr) static CUSTOM_INPUT( ddenlovr_special_r ) { - dynax_state *state = (dynax_state *)field->port->machine->driver_data; + dynax_state *state = field->port->machine->driver_data(); return state->ddenlovr_blitter_irq_flag; } @@ -1427,7 +1427,7 @@ static WRITE16_HANDLER( ddenlovr_coincounter_1_w ) static WRITE8_HANDLER( rongrong_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int r, g, b, d1, d2, indx; state->palram[offset] = data; @@ -1453,58 +1453,58 @@ static WRITE16_HANDLER( ddenlovr_palette_w ) WRITE8_HANDLER( ddenlovr_palette_base_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_palette_base[offset] = data; } static WRITE8_HANDLER( ddenlovr_palette_base2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_palette_base[offset + 4] = data; } WRITE8_HANDLER( ddenlovr_palette_mask_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_palette_mask[offset] = data; } static WRITE8_HANDLER( ddenlovr_palette_mask2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_palette_mask[offset + 4] = data; } WRITE8_HANDLER( ddenlovr_transparency_pen_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_transparency_pen[offset] = data; } static WRITE8_HANDLER( ddenlovr_transparency_pen2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_transparency_pen[offset + 4] = data; } WRITE8_HANDLER( ddenlovr_transparency_mask_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_transparency_mask[offset] = data; } static WRITE8_HANDLER( ddenlovr_transparency_mask2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->ddenlovr_transparency_mask[offset + 4] = data; } static WRITE16_HANDLER( ddenlovr16_palette_base_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->ddenlovr_palette_base[offset] = data & 0xff; @@ -1512,7 +1512,7 @@ static WRITE16_HANDLER( ddenlovr16_palette_base_w ) static WRITE16_HANDLER( ddenlovr16_palette_mask_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->ddenlovr_palette_mask[offset] = data & 0xff; @@ -1520,7 +1520,7 @@ static WRITE16_HANDLER( ddenlovr16_palette_mask_w ) static WRITE16_HANDLER( ddenlovr16_transparency_pen_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->ddenlovr_transparency_pen[offset] = data & 0xff; @@ -1528,7 +1528,7 @@ static WRITE16_HANDLER( ddenlovr16_transparency_pen_w ) static WRITE16_HANDLER( ddenlovr16_transparency_mask_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->ddenlovr_transparency_mask[offset] = data & 0xff; @@ -1554,7 +1554,7 @@ static WRITE16_DEVICE_HANDLER( ddenlovr_oki_bank_w ) static WRITE16_DEVICE_HANDLER( quiz365_oki_bank1_w ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1566,7 +1566,7 @@ static WRITE16_DEVICE_HANDLER( quiz365_oki_bank1_w ) static WRITE16_DEVICE_HANDLER( quiz365_oki_bank2_w ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1591,13 +1591,13 @@ static READ16_HANDLER( unk16_r ) static WRITE8_DEVICE_HANDLER( ddenlovr_select_w ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->dsw_sel = data; } static WRITE16_HANDLER( ddenlovr_select_16_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->dsw_sel = data; @@ -1605,13 +1605,13 @@ static WRITE16_HANDLER( ddenlovr_select_16_w ) static WRITE8_HANDLER( ddenlovr_select2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->input_sel = data; } static WRITE16_HANDLER( ddenlovr_select2_16_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->input_sel = data; @@ -1619,7 +1619,7 @@ static WRITE16_HANDLER( ddenlovr_select2_16_w ) static READ8_HANDLER( rongrong_input2_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); // logerror("%04x: input2_r offset %d select %x\n", cpu_get_pc(space->cpu), offset, state->input_sel); /* 0 and 1 are read from offset 1, 2 from offset 0... */ @@ -1635,7 +1635,7 @@ static READ8_HANDLER( rongrong_input2_r ) static READ8_DEVICE_HANDLER( quiz365_input_r ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(device->machine, "DSW1"); if (!BIT(state->dsw_sel, 1)) return input_port_read(device->machine, "DSW2"); @@ -1647,7 +1647,7 @@ static READ8_DEVICE_HANDLER( quiz365_input_r ) static READ16_HANDLER( quiz365_input2_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); // logerror("%04x: input2_r offset %d select %x\n",cpu_get_pc(space->cpu), offset, state->input_sel); /* 0 and 1 are read from offset 1, 2 from offset 0... */ @@ -1663,7 +1663,7 @@ static READ16_HANDLER( quiz365_input2_r ) static WRITE8_HANDLER( rongrong_blitter_busy_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->rongrong_blitter_busy_select = data; if (data != 0x18) @@ -1672,7 +1672,7 @@ static WRITE8_HANDLER( rongrong_blitter_busy_w ) static READ8_HANDLER( rongrong_blitter_busy_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->rongrong_blitter_busy_select) { @@ -1687,7 +1687,7 @@ static READ8_HANDLER( rongrong_blitter_busy_r ) static WRITE16_HANDLER( quiz365_coincounter_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1705,7 +1705,7 @@ static WRITE16_HANDLER( quiz365_coincounter_w ) */ static READ16_HANDLER( quiz365_protection_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->quiz365_protection[0]) { @@ -1718,7 +1718,7 @@ static READ16_HANDLER( quiz365_protection_r ) static WRITE16_HANDLER( quiz365_protection_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); COMBINE_DATA(state->quiz365_protection + offset); } @@ -1761,7 +1761,7 @@ ADDRESS_MAP_END static READ16_HANDLER( ddenlovj_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT16 dsw = 0; if ((~*state->dsw_sel16) & 0x01) dsw |= input_port_read(space->machine, "DSW1"); if ((~*state->dsw_sel16) & 0x02) dsw |= input_port_read(space->machine, "DSW2"); @@ -1781,7 +1781,7 @@ static WRITE16_HANDLER( ddenlovj_coincounter_w ) static CUSTOM_INPUT( ddenlovj_blitter_r ) { - dynax_state *state = (dynax_state *)field->port->machine->driver_data; + dynax_state *state = field->port->machine->driver_data(); return state->ddenlovr_blitter_irq_flag ? 0x03 : 0x00; // bit 4 = 1 -> blitter busy } @@ -1819,7 +1819,7 @@ ADDRESS_MAP_END static READ16_HANDLER( ddenlovrk_protection1_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (*state->protection1) { case 0x007e: return 0x00aa; @@ -1829,7 +1829,7 @@ static READ16_HANDLER( ddenlovrk_protection1_r ) static READ16_HANDLER( ddenlovrk_protection2_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (*state->protection1) { case 0x0000: return *state->protection2; @@ -1838,7 +1838,7 @@ static READ16_HANDLER( ddenlovrk_protection2_r ) } static WRITE16_HANDLER( ddenlovrk_protection2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); COMBINE_DATA(state->protection2); state->oki->set_bank_base(((*state->protection2) & 0x7) * 0x40000); @@ -1921,13 +1921,13 @@ ADDRESS_MAP_END static CUSTOM_INPUT( nettoqc_special_r ) { - dynax_state *state = (dynax_state *)field->port->machine->driver_data; + dynax_state *state = field->port->machine->driver_data(); return state->ddenlovr_blitter_irq_flag ? 0x03 : 0x00; } static READ16_HANDLER( nettoqc_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(space->machine, "DSW1"); if (!BIT(state->dsw_sel, 1)) return input_port_read(space->machine, "DSW2"); @@ -1944,7 +1944,7 @@ static READ16_HANDLER( nettoqc_input_r ) static READ16_HANDLER( nettoqc_protection_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->protection1[0] & 0xff) { @@ -2012,7 +2012,7 @@ ADDRESS_MAP_END static READ8_HANDLER( rongrong_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(space->machine, "DSW1"); if (!BIT(state->dsw_sel, 1)) return input_port_read(space->machine, "DSW2"); @@ -2024,7 +2024,7 @@ static READ8_HANDLER( rongrong_input_r ) static WRITE8_HANDLER( rongrong_select_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); //logerror("%04x: rongrong_select_w %02x\n",cpu_get_pc(space->cpu),data); @@ -2133,7 +2133,7 @@ static WRITE8_HANDLER( mmpanic_rombank_w ) static WRITE8_HANDLER( mmpanic_soundlatch_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, PULSE_LINE); @@ -2150,21 +2150,21 @@ static WRITE8_HANDLER( mmpanic_blitter2_w ) static void mmpanic_update_leds(running_machine *machine) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); set_led_status(machine, 0, state->mmpanic_leds); } /* leds 1-8 */ static WRITE8_HANDLER( mmpanic_leds_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->mmpanic_leds = (state->mmpanic_leds & 0xff00) | data; mmpanic_update_leds(space->machine); } /* led 9 */ static WRITE8_HANDLER( mmpanic_leds2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->mmpanic_leds = (state->mmpanic_leds & 0xfeff) | (data ? 0x0100 : 0); mmpanic_update_leds(space->machine); } @@ -2172,7 +2172,7 @@ static WRITE8_HANDLER( mmpanic_leds2_w ) static WRITE8_HANDLER( mmpanic_lockout_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->dsw_sel == 0x0c) { @@ -2289,7 +2289,7 @@ static WRITE8_HANDLER( funkyfig_blitter_w ) static WRITE8_HANDLER( funkyfig_rombank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->dsw_sel = data; @@ -2300,7 +2300,7 @@ static WRITE8_HANDLER( funkyfig_rombank_w ) static READ8_HANDLER( funkyfig_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(space->machine, "DSW1"); if (!BIT(state->dsw_sel, 1)) return input_port_read(space->machine, "DSW2"); @@ -2311,7 +2311,7 @@ static READ8_HANDLER( funkyfig_dsw_r ) static READ8_HANDLER( funkyfig_coin_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2324,7 +2324,7 @@ static READ8_HANDLER( funkyfig_coin_r ) static READ8_HANDLER( funkyfig_key_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2337,7 +2337,7 @@ static READ8_HANDLER( funkyfig_key_r ) static WRITE8_HANDLER( funkyfig_lockout_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2419,19 +2419,19 @@ ADDRESS_MAP_END static WRITE8_HANDLER( hanakanz_keyb_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->keyb = data; } static WRITE8_HANDLER( hanakanz_dsw_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->dsw_sel = data; } static READ8_HANDLER( hanakanz_keyb_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 val = 0xff; @@ -2447,7 +2447,7 @@ static READ8_HANDLER( hanakanz_keyb_r ) static READ8_HANDLER( hanakanz_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(space->machine, "DSW1"); if (!BIT(state->dsw_sel, 1)) return input_port_read(space->machine, "DSW2"); @@ -2464,7 +2464,7 @@ static READ8_HANDLER( hanakanz_busy_r ) static READ8_HANDLER( hanakanz_gfxrom_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "blitter"); size_t size = memory_region_length(space->machine, "blitter"); int address = (state->ddenlovr_blit_address & 0xffffff) * 2; @@ -2510,7 +2510,7 @@ static WRITE8_HANDLER( hanakanz_coincounter_w ) static WRITE8_HANDLER( hanakanz_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->ddenlovr_blit_latch & 0x80) { @@ -2583,13 +2583,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( mjreach1_protection_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->prot_val = data; } static READ8_HANDLER( mjreach1_protection_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return state->prot_val; } @@ -2621,7 +2621,7 @@ ADDRESS_MAP_END static READ8_HANDLER( mjchuuka_keyb_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 val = 0xff; if (!BIT(state->keyb, 0)) val = input_port_read(space->machine, offset ? "KEY5" : "KEY0"); @@ -2646,7 +2646,7 @@ static WRITE8_HANDLER( mjchuuka_blitter_w ) static void mjchuuka_get_romdata(running_machine *machine) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "blitter"); size_t size = memory_region_length(machine, "blitter"); int address = (state->ddenlovr_blit_address & 0xffffff) * 2; @@ -2663,7 +2663,7 @@ static void mjchuuka_get_romdata(running_machine *machine) static READ8_HANDLER( mjchuuka_gfxrom_0_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); mjchuuka_get_romdata(space->machine); state->ddenlovr_blit_address++; return state->romdata[0]; @@ -2671,13 +2671,13 @@ static READ8_HANDLER( mjchuuka_gfxrom_0_r ) static READ8_HANDLER( mjchuuka_gfxrom_1_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return state->romdata[1]; } static WRITE8_HANDLER( mjchuuka_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT16 rgb = (offset & 0xff00) | data; if (rgb & 0x8000) @@ -2770,7 +2770,7 @@ static WRITE8_HANDLER( mjmyster_rambank_w ) static WRITE8_HANDLER( mjmyster_select2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->input_sel = data; if (data & 0x80) @@ -2779,7 +2779,7 @@ static WRITE8_HANDLER( mjmyster_select2_w ) static READ8_HANDLER( mjmyster_coins_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2796,7 +2796,7 @@ static READ8_HANDLER( mjmyster_coins_r ) static READ8_HANDLER( mjmyster_keyb_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 ret = 0xff; if (BIT(state->keyb, 0)) ret = input_port_read(space->machine, "KEY0"); @@ -2813,7 +2813,7 @@ static READ8_HANDLER( mjmyster_keyb_r ) static READ8_HANDLER( mjmyster_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(space->machine, "DSW4"); if (!BIT(state->dsw_sel, 1)) return input_port_read(space->machine, "DSW3"); @@ -2826,7 +2826,7 @@ static READ8_HANDLER( mjmyster_dsw_r ) static WRITE8_HANDLER( mjmyster_coincounter_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2883,7 +2883,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( hginga_rombank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data & 0x7); state->hginga_rombank = data; } @@ -2891,7 +2891,7 @@ static WRITE8_HANDLER( hginga_rombank_w ) // similar to rongrong static READ8_HANDLER( hginga_protection_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "maincpu"); if (state->hginga_rombank & 0x10) @@ -2911,7 +2911,7 @@ ADDRESS_MAP_END static READ8_DEVICE_HANDLER( hginga_dsw_r ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(device->machine, "DSW4"); if (!BIT(state->dsw_sel, 1)) return input_port_read(device->machine, "DSW3"); @@ -2925,14 +2925,14 @@ static READ8_DEVICE_HANDLER( hginga_dsw_r ) static WRITE8_HANDLER( hginga_input_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->input_sel = data; state->keyb = 0; } static READ8_HANDLER( hginga_coins_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2952,7 +2952,7 @@ static WRITE8_HANDLER( hginga_80_w ) static WRITE8_HANDLER( hginga_coins_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -2977,7 +2977,7 @@ static WRITE8_HANDLER( hginga_coins_w ) static READ8_HANDLER( hginga_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; @@ -3000,7 +3000,7 @@ static READ8_HANDLER( hginga_input_r ) static WRITE8_HANDLER( hginga_blitter_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (offset == 0) { state->ddenlovr_blit_latch = data; @@ -3062,7 +3062,7 @@ ADDRESS_MAP_END static UINT8 hgokou_player_r( const address_space *space, int player ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 hopper_bit = ((state->hopper && !(space->machine->primary_screen->frame_number() % 10)) ? 0 : (1 << 6)); if (!BIT(state->input_sel, 0)) return input_port_read(space->machine, player ? "KEY5" : "KEY0") | hopper_bit; @@ -3076,13 +3076,13 @@ static UINT8 hgokou_player_r( const address_space *space, int player ) static WRITE8_HANDLER( hgokou_dsw_sel_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->dsw_sel = data; } static READ8_HANDLER( hgokou_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->dsw_sel) { @@ -3097,7 +3097,7 @@ static READ8_HANDLER( hgokou_input_r ) static WRITE8_HANDLER( hgokou_input_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->dsw_sel) { @@ -3125,7 +3125,7 @@ static WRITE8_HANDLER( hgokou_input_w ) // similar to rongrong static READ8_HANDLER( hgokou_protection_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "maincpu"); if (state->hginga_rombank == 0) @@ -3177,7 +3177,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( hparadis_select_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->dsw_sel = data; state->keyb = 0; @@ -3189,7 +3189,7 @@ static WRITE8_HANDLER( hparadis_select_w ) static READ8_HANDLER( hparadis_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; @@ -3208,7 +3208,7 @@ static READ8_HANDLER( hparadis_input_r ) static READ8_HANDLER( hparadis_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(space->machine, "DSW1"); if (!BIT(state->dsw_sel, 1)) return input_port_read(space->machine, "DSW2"); @@ -3220,7 +3220,7 @@ static READ8_HANDLER( hparadis_dsw_r ) static WRITE8_HANDLER( hparadis_coin_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -3270,7 +3270,7 @@ ADDRESS_MAP_END static READ8_HANDLER( mjmywrld_coins_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -3320,13 +3320,13 @@ ADDRESS_MAP_END static READ16_HANDLER( akamaru_protection1_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return (state->prot_16 & 0x0008) ? 0x0001 : 0x0000; } static WRITE16_HANDLER( akamaru_protection1_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int bank; COMBINE_DATA(&state->prot_16); @@ -3344,7 +3344,7 @@ static READ16_HANDLER( akamaru_protection2_r ) static READ16_HANDLER( akamaru_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT16 dsw = 0; if (state->dsw_sel16[1] == 0xff) dsw |= input_port_read(space->machine, "DSW1"); @@ -3354,7 +3354,7 @@ static READ16_HANDLER( akamaru_dsw_r ) static READ16_HANDLER( akamaru_blitter_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return state->ddenlovr_blitter_irq_flag << 6; // bit 7 = 1 -> blitter busy } @@ -3432,7 +3432,7 @@ static READ8_HANDLER( mjflove_protection_r ) static READ8_HANDLER( mjflove_keyb_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 val = 0xff; if (!BIT(state->keyb, 0)) val = input_port_read(space->machine, offset ? "KEY5" : "KEY0"); @@ -3446,7 +3446,7 @@ static READ8_HANDLER( mjflove_keyb_r ) static CUSTOM_INPUT( mjflove_blitter_r ) { - dynax_state *state = (dynax_state *)field->port->machine->driver_data; + dynax_state *state = field->port->machine->driver_data(); // bit 7 = 1 -> blitter busy // bit 6 = 0 -> VBLANK? @@ -3513,7 +3513,7 @@ static WRITE8_DEVICE_HANDLER( jongtei_okibank_w ) static WRITE8_HANDLER( jongtei_dsw_keyb_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->dsw_sel = data; state->keyb = data; } @@ -3557,7 +3557,7 @@ ADDRESS_MAP_END static READ8_HANDLER( sryudens_keyb_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 val = 0x3f; if (!BIT(state->keyb, 0)) val = input_port_read(space->machine, offset ? "KEY5" : "KEY0"); @@ -3634,7 +3634,7 @@ ADDRESS_MAP_END static READ8_HANDLER( daimyojn_keyb1_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 val = 0x3f; if (!BIT(state->keyb, 0)) val = input_port_read(space->machine, "KEY0"); @@ -3649,7 +3649,7 @@ static READ8_HANDLER( daimyojn_keyb1_r ) static READ8_HANDLER( daimyojn_keyb2_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); UINT8 val = 0x3f; if (!BIT(state->keyb, 0)) val = input_port_read(space->machine, "KEY5"); @@ -3667,13 +3667,13 @@ static READ8_HANDLER( daimyojn_keyb2_r ) static WRITE8_HANDLER( daimyojn_protection_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->prot_val = data; } static READ8_HANDLER( daimyojn_protection_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->prot_val) { case 0xd4: return 0x96; @@ -3693,13 +3693,13 @@ static WRITE8_DEVICE_HANDLER( daimyojn_okibank_w ) static WRITE8_HANDLER( daimyojn_palette_sel_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->daimyojn_palette_sel = data; } static WRITE8_HANDLER( daimyojn_blitter_data_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->daimyojn_palette_sel & 0x01) hanakanz_palette_w(space, offset, data); @@ -7574,7 +7574,7 @@ INPUT_PORTS_END static MACHINE_START( ddenlovr ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->soundcpu = machine->device("soundcpu"); @@ -7607,7 +7607,7 @@ static MACHINE_START( ddenlovr ) static MACHINE_RESET( ddenlovr ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->input_sel = 0; state->dsw_sel = 0; @@ -7819,7 +7819,7 @@ MACHINE_DRIVER_END */ static INTERRUPT_GEN( quizchq_irq ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); /* I haven't found a irq ack register, so I need this kludge to make sure I don't lose any interrupt generated by the blitter, @@ -7904,7 +7904,7 @@ MACHINE_DRIVER_END */ static INTERRUPT_GEN( mmpanic_irq ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); /* I haven't found a irq ack register, so I need this kludge to make sure I don't lose any interrupt generated by the blitter, @@ -7981,7 +7981,7 @@ MACHINE_DRIVER_END */ static INTERRUPT_GEN( hanakanz_irq ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); /* I haven't found a irq ack register, so I need this kludge to make sure I don't lose any interrupt generated by the blitter, @@ -8062,7 +8062,7 @@ MACHINE_DRIVER_END */ static INTERRUPT_GEN( mjchuuka_irq ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); /* I haven't found a irq ack register, so I need this kludge to make sure I don't lose any interrupt generated by the blitter, @@ -8180,7 +8180,7 @@ MACHINE_DRIVER_END */ static INTERRUPT_GEN( hginga_irq ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); /* I haven't found a irq ack register, so I need this kludge to make sure I don't lose any interrupt generated by the blitter, @@ -8274,7 +8274,7 @@ MACHINE_DRIVER_END static INTERRUPT_GEN( mjflove_irq ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->mjflove_irq_cause = 1 | (1 << 1); diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index a024fa94bb4..ea0fee1931a 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -118,7 +118,7 @@ INLINE int scanline_to_vcount( int scanline ) static TIMER_DEVICE_CALLBACK( ddragon_scanline ) { - ddragon_state *state = (ddragon_state *)timer.machine->driver_data; + ddragon_state *state = timer.machine->driver_data(); int scanline = param; int screen_height = timer.machine->primary_screen->height(); int vcount_old = scanline_to_vcount((scanline == 0) ? screen_height - 1 : scanline - 1); @@ -147,7 +147,7 @@ static TIMER_DEVICE_CALLBACK( ddragon_scanline ) static MACHINE_START( ddragon ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); /* configure banks */ memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); @@ -171,7 +171,7 @@ static MACHINE_START( ddragon ) static MACHINE_RESET( ddragon ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->dd_sub_cpu_busy = 1; state->adpcm_pos[0] = state->adpcm_pos[1] = 0; @@ -192,7 +192,7 @@ static MACHINE_RESET( ddragon ) static WRITE8_HANDLER( ddragon_bankswitch_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); state->scrollx_hi = (data & 0x01); state->scrolly_hi = ((data & 0x02) >> 1); flip_screen_set(space->machine, ~data & 0x04); @@ -210,7 +210,7 @@ static WRITE8_HANDLER( ddragon_bankswitch_w ) static WRITE8_HANDLER( toffy_bankswitch_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); state->scrollx_hi = (data & 0x01); state->scrolly_hi = ((data & 0x02) >> 1); @@ -225,7 +225,7 @@ static WRITE8_HANDLER( toffy_bankswitch_w ) static READ8_HANDLER( darktowr_mcu_bank_r ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *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, @@ -254,7 +254,7 @@ static READ8_HANDLER( darktowr_mcu_bank_r ) static WRITE8_HANDLER( darktowr_mcu_bank_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); logerror("BankWrite %05x %08x %08x\n", cpu_get_pc(space->cpu), offset, data); if (offset == 0x1400 || offset == 0) @@ -267,7 +267,7 @@ static WRITE8_HANDLER( darktowr_mcu_bank_w ) static WRITE8_HANDLER( darktowr_bankswitch_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); int oldbank = memory_get_bank(space->machine, "bank1"); int newbank = (data & 0xe0) >> 5; @@ -300,7 +300,7 @@ static WRITE8_HANDLER( darktowr_bankswitch_w ) static WRITE8_HANDLER( ddragon_interrupt_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); switch (offset) { case 0: /* 380b - NMI ack */ @@ -329,21 +329,21 @@ static WRITE8_HANDLER( ddragon_interrupt_w ) static WRITE8_HANDLER( ddragon2_sub_irq_ack_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); cpu_set_input_line(state->sub_cpu, state->sprite_irq, CLEAR_LINE ); } static WRITE8_HANDLER( ddragon2_sub_irq_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, ASSERT_LINE); } static void irq_handler( running_device *device, int irq ) { - ddragon_state *state = (ddragon_state *)device->machine->driver_data; + ddragon_state *state = device->machine->driver_data(); cpu_set_input_line(state->snd_cpu, state->ym_irq , irq ? ASSERT_LINE : CLEAR_LINE ); } @@ -357,14 +357,14 @@ static void irq_handler( running_device *device, int irq ) static CUSTOM_INPUT( sub_cpu_busy ) { - ddragon_state *state = (ddragon_state *)field->port->machine->driver_data; + ddragon_state *state = field->port->machine->driver_data(); return state->dd_sub_cpu_busy; } static WRITE8_HANDLER( darktowr_mcu_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *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,7 +379,7 @@ 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; + ddragon_state *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) @@ -405,7 +405,7 @@ static WRITE8_HANDLER( ddragon_hd63701_internal_registers_w ) static READ8_HANDLER( ddragon_spriteram_r ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); /* Double Dragon crash fix - see notes above */ if (offset == 0x49 && cpu_get_pc(space->cpu) == 0x6261 && state->spriteram[offset] == 0x1f) @@ -417,7 +417,7 @@ static READ8_HANDLER( ddragon_spriteram_r ) static WRITE8_HANDLER( ddragon_spriteram_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); if (space->cpu == state->sub_cpu && offset == 0) state->dd_sub_cpu_busy = 1; @@ -435,7 +435,7 @@ static WRITE8_HANDLER( ddragon_spriteram_w ) static WRITE8_HANDLER( dd_adpcm_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); running_device *adpcm = (offset & 1) ? state->adpcm_2 : state->adpcm_1; int chip = (adpcm == state->adpcm_1) ? 0 : 1; @@ -464,7 +464,7 @@ static WRITE8_HANDLER( dd_adpcm_w ) static void dd_adpcm_int( running_device *device ) { - ddragon_state *state = (ddragon_state *)device->machine->driver_data; + ddragon_state *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) @@ -489,7 +489,7 @@ static void dd_adpcm_int( running_device *device ) static READ8_HANDLER( dd_adpcm_status_r ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); return state->adpcm_idle[0] + (state->adpcm_idle[1] << 1); } @@ -576,7 +576,7 @@ ADDRESS_MAP_END /* might not be 100% accurate, check bits written */ static WRITE8_HANDLER( ddragonba_port_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, ASSERT_LINE); cpu_set_input_line(state->sub_cpu, state->sprite_irq, CLEAR_LINE ); } @@ -2009,7 +2009,7 @@ ROM_END static DRIVER_INIT( ddragon ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->sprite_irq = INPUT_LINE_NMI; state->sound_irq = M6809_IRQ_LINE; state->ym_irq = M6809_FIRQ_LINE; @@ -2019,7 +2019,7 @@ static DRIVER_INIT( ddragon ) static DRIVER_INIT( ddragon2 ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->sprite_irq = INPUT_LINE_NMI; state->sound_irq = INPUT_LINE_NMI; state->ym_irq = 0; @@ -2029,7 +2029,7 @@ static DRIVER_INIT( ddragon2 ) static DRIVER_INIT( darktowr ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->sprite_irq = INPUT_LINE_NMI; state->sound_irq = M6809_IRQ_LINE; state->ym_irq = M6809_FIRQ_LINE; @@ -2040,7 +2040,7 @@ static DRIVER_INIT( darktowr ) static DRIVER_INIT( toffy ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); int i, length; UINT8 *rom; @@ -2081,7 +2081,7 @@ static DRIVER_INIT( toffy ) static DRIVER_INIT( ddragon6809 ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); int i; UINT8 *dst,*src; diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index b0ee0c3338b..7afea6c6659 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -162,7 +162,7 @@ static WRITE8_DEVICE_HANDLER( oki_bankswitch_w ) static WRITE16_HANDLER( ddragon3_io_w ) { - ddragon3_state *state = (ddragon3_state *)space->machine->driver_data; + ddragon3_state *state = space->machine->driver_data(); COMBINE_DATA(&state->io_reg[offset]); @@ -516,7 +516,7 @@ GFXDECODE_END static void dd3_ymirq_handler(running_device *device, int irq) { - ddragon3_state *state = (ddragon3_state *)device->machine->driver_data; + ddragon3_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0 , irq ? ASSERT_LINE : CLEAR_LINE ); } @@ -533,7 +533,7 @@ static const ym2151_interface ym2151_config = static TIMER_DEVICE_CALLBACK( ddragon3_scanline ) { - ddragon3_state *state = (ddragon3_state *)timer.machine->driver_data; + ddragon3_state *state = timer.machine->driver_data(); int scanline = param; /* An interrupt is generated every 16 scanlines */ @@ -560,7 +560,7 @@ static TIMER_DEVICE_CALLBACK( ddragon3_scanline ) static MACHINE_START( ddragon3 ) { - ddragon3_state *state = (ddragon3_state *)machine->driver_data; + ddragon3_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -576,7 +576,7 @@ static MACHINE_START( ddragon3 ) static MACHINE_RESET( ddragon3 ) { - ddragon3_state *state = (ddragon3_state *)machine->driver_data; + ddragon3_state *state = machine->driver_data(); int i; state->vreg = 0; diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c index bb732ae7bba..cf12887be13 100644 --- a/src/mame/drivers/ddribble.c +++ b/src/mame/drivers/ddribble.c @@ -20,14 +20,14 @@ static INTERRUPT_GEN( ddribble_interrupt_0 ) { - ddribble_state *state = (ddribble_state *)device->machine->driver_data; + ddribble_state *state = device->machine->driver_data(); if (state->int_enable_0) cpu_set_input_line(device, M6809_FIRQ_LINE, HOLD_LINE); } static INTERRUPT_GEN( ddribble_interrupt_1 ) { - ddribble_state *state = (ddribble_state *)device->machine->driver_data; + ddribble_state *state = device->machine->driver_data(); if (state->int_enable_1) cpu_set_input_line(device, M6809_FIRQ_LINE, HOLD_LINE); } @@ -41,25 +41,25 @@ static WRITE8_HANDLER( ddribble_bankswitch_w ) static READ8_HANDLER( ddribble_sharedram_r ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE8_HANDLER( ddribble_sharedram_w ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); state->sharedram[offset] = data; } static READ8_HANDLER( ddribble_snd_sharedram_r ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); return state->snd_sharedram[offset]; } static WRITE8_HANDLER( ddribble_snd_sharedram_w ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); state->snd_sharedram[offset] = data; } @@ -85,7 +85,7 @@ static READ8_DEVICE_HANDLER( ddribble_vlm5030_busy_r ) static WRITE8_DEVICE_HANDLER( ddribble_vlm5030_ctrl_w ) { - ddribble_state *state = (ddribble_state *)device->machine->driver_data; + ddribble_state *state = device->machine->driver_data(); UINT8 *SPEECH_ROM = memory_region(device->machine, "vlm"); /* b7 : vlm data bus OE */ @@ -250,7 +250,7 @@ static const vlm5030_interface vlm5030_config = static MACHINE_START( ddribble ) { - ddribble_state *state = (ddribble_state *)machine->driver_data; + ddribble_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 5, &ROM[0x10000], 0x2000); @@ -267,7 +267,7 @@ static MACHINE_START( ddribble ) static MACHINE_RESET( ddribble ) { - ddribble_state *state = (ddribble_state *)machine->driver_data; + ddribble_state *state = machine->driver_data(); int i; for (i = 0; i < 5; i++) diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 68d3a31be8b..838d24d879a 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -60,19 +60,19 @@ static VIDEO_EOF( dec8 ) static READ8_HANDLER( i8751_h_r ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); return state->i8751_return >> 8; /* MSB */ } static READ8_HANDLER( i8751_l_r ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); return state->i8751_return & 0xff; /* LSB */ } static WRITE8_HANDLER( i8751_reset_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->i8751_return = 0; } @@ -118,13 +118,13 @@ static TIMER_CALLBACK( dec8_i8751_timer_callback ) { // The schematics show a clocked LS194 shift register (3A) is used to automatically // clear the IRQ request. The MCU does not clear it itself. - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); cpu_set_input_line(state->mcu, MCS51_INT1_LINE, CLEAR_LINE); } static WRITE8_HANDLER( dec8_i8751_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); switch (offset) { @@ -147,7 +147,7 @@ static WRITE8_HANDLER( dec8_i8751_w ) static WRITE8_HANDLER( srdarwin_i8751_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->i8751_return = 0; switch (offset) @@ -222,7 +222,7 @@ bb63 = Square things again static WRITE8_HANDLER( shackled_i8751_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->i8751_return = 0; switch (offset) @@ -251,7 +251,7 @@ static WRITE8_HANDLER( shackled_i8751_w ) static WRITE8_HANDLER( lastmisn_i8751_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->i8751_return = 0; switch (offset) @@ -283,7 +283,7 @@ static WRITE8_HANDLER( lastmisn_i8751_w ) static WRITE8_HANDLER( csilver_i8751_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->i8751_return = 0; switch (offset) @@ -313,7 +313,7 @@ static WRITE8_HANDLER( csilver_i8751_w ) static WRITE8_HANDLER( garyoret_i8751_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->i8751_return = 0; switch (offset) @@ -349,7 +349,7 @@ static WRITE8_HANDLER( dec8_bank_w ) /* Used by Ghostbusters, Meikyuu Hunter G & Gondomania */ static WRITE8_HANDLER( ghostb_bank_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); /* Bit 0: SECCLR - acknowledge interrupt from I8751 Bit 1: NMI enable/disable @@ -379,14 +379,14 @@ static WRITE8_HANDLER( csilver_control_w ) static WRITE8_HANDLER( dec8_sound_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } static void csilver_adpcm_int( running_device *device ) { - dec8_state *state = (dec8_state *)device->machine->driver_data; + dec8_state *state = device->machine->driver_data(); state->toggle ^= 1; if (state->toggle) cpu_set_input_line(state->audiocpu, M6502_IRQ_LINE, HOLD_LINE); @@ -403,7 +403,7 @@ static READ8_DEVICE_HANDLER( csilver_adpcm_reset_r ) static WRITE8_HANDLER( csilver_adpcm_data_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->msm5205next = data; } @@ -416,7 +416,7 @@ static WRITE8_HANDLER( csilver_sound_bank_w ) static WRITE8_HANDLER( oscar_int_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); /* Deal with interrupts, coins also generate NMI to CPU 0 */ switch (offset) { @@ -438,7 +438,7 @@ static WRITE8_HANDLER( oscar_int_w ) /* Used by Shackled, Last Mission, Captain Silver */ static WRITE8_HANDLER( shackled_int_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); #if 0 /* This is correct, but the cpus in Shackled need an interleave of about 5000! With lower interleave CPU 0 misses an interrupt at the start of the game @@ -827,7 +827,7 @@ ADDRESS_MAP_END static READ8_HANDLER( dec8_mcu_from_main_r ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); switch (offset) { @@ -846,7 +846,7 @@ static READ8_HANDLER( dec8_mcu_from_main_r ) static WRITE8_HANDLER( dec8_mcu_to_main_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); // Outputs P0 and P1 are latched if (offset==0) state->i8751_port0=data; @@ -1883,7 +1883,7 @@ GFXDECODE_END /* handler called by the 3812 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int linestate ) { - dec8_state *state = (dec8_state *)device->machine->driver_data; + dec8_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); /* M6502_IRQ_LINE */ } @@ -1907,7 +1907,7 @@ static const msm5205_interface msm5205_config = static INTERRUPT_GEN( gondo_interrupt ) { - dec8_state *state = (dec8_state *)device->machine->driver_data; + dec8_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); /* VBL */ } @@ -1915,7 +1915,7 @@ static INTERRUPT_GEN( gondo_interrupt ) /* Coins generate NMI's */ static INTERRUPT_GEN( oscar_interrupt ) { - dec8_state *state = (dec8_state *)device->machine->driver_data; + dec8_state *state = device->machine->driver_data(); if ((input_port_read(device->machine, "IN2") & 0x7) == 0x7) state->latch = 1; if (state->latch && (input_port_read(device->machine, "IN2") & 0x7) != 0x7) { @@ -1929,7 +1929,7 @@ static INTERRUPT_GEN( oscar_interrupt ) static MACHINE_START( dec8 ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -1955,7 +1955,7 @@ static MACHINE_START( dec8 ) static MACHINE_RESET( dec8 ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int i; state->nmi_enable = state->i8751_port0 = state->i8751_port1 = 0; @@ -3436,14 +3436,14 @@ ROM_END static DRIVER_INIT( dec8 ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->latch = 0; } /* Ghostbusters, Darwin, Oscar use a "Deco 222" custom 6502 for sound. */ static DRIVER_INIT( deco222 ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM); int A; UINT8 *decrypt; diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 4eaf8696ab9..e37918e4aa8 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -22,13 +22,14 @@ #include "sound/ymz280b.h" #include "video/deco16ic.h" -class deco156_state +class deco156_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, deco156_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, deco156_state(machine)); } deco156_state(running_machine &machine) - : oki2(machine.device("oki2")) { } + : driver_data_t(machine), + oki2(machine.device("oki2")) { } /* memory pointers */ UINT16 * pf1_rowscroll; @@ -43,7 +44,7 @@ public: static VIDEO_START( wcvol95 ) { - deco156_state *state = (deco156_state *)machine->driver_data; + deco156_state *state = machine->driver_data(); /* allocate the ram as 16-bit (we do it here because the CPU is 32-bit) */ state->pf1_rowscroll = auto_alloc_array(machine, UINT16, 0x800/2); @@ -138,7 +139,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan static VIDEO_UPDATE( wcvol95 ) { - deco156_state *state = (deco156_state *)screen->machine->driver_data; + deco156_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, NULL, 0); bitmap_fill(bitmap, NULL, 0); @@ -155,7 +156,7 @@ static VIDEO_UPDATE( wcvol95 ) static WRITE32_HANDLER(hvysmsh_eeprom_w) { - deco156_state *state = (deco156_state *)space->machine->driver_data; + deco156_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->oki2->set_bank_base(0x40000 * (data & 0x7)); @@ -189,10 +190,10 @@ static WRITE32_HANDLER( deco156_nonbuffered_palette_w ) palette_set_color(space->machine,offset,MAKE_RGB(r,g,b)); } -static READ32_HANDLER( wcvol95_pf1_rowscroll_r ) { deco156_state *state = (deco156_state *)space->machine->driver_data; return state->pf1_rowscroll[offset] ^ 0xffff0000; } -static READ32_HANDLER( wcvol95_pf2_rowscroll_r ) { deco156_state *state = (deco156_state *)space->machine->driver_data; return state->pf2_rowscroll[offset] ^ 0xffff0000; } -static WRITE32_HANDLER( wcvol95_pf1_rowscroll_w ) { deco156_state *state = (deco156_state *)space->machine->driver_data; data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf1_rowscroll[offset]); } -static WRITE32_HANDLER( wcvol95_pf2_rowscroll_w ) { deco156_state *state = (deco156_state *)space->machine->driver_data; data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf2_rowscroll[offset]); } +static READ32_HANDLER( wcvol95_pf1_rowscroll_r ) { deco156_state *state = space->machine->driver_data(); return state->pf1_rowscroll[offset] ^ 0xffff0000; } +static READ32_HANDLER( wcvol95_pf2_rowscroll_r ) { deco156_state *state = space->machine->driver_data(); return state->pf2_rowscroll[offset] ^ 0xffff0000; } +static WRITE32_HANDLER( wcvol95_pf1_rowscroll_w ) { deco156_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf1_rowscroll[offset]); } +static WRITE32_HANDLER( wcvol95_pf2_rowscroll_w ) { deco156_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf2_rowscroll[offset]); } static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 ) @@ -402,7 +403,7 @@ static const deco16ic_interface deco156_deco16ic_intf = static MACHINE_START( deco156 ) { - deco156_state *state = (deco156_state *)machine->driver_data; + deco156_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->deco16ic = machine->device("deco_custom"); diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index 1b4901fc665..44cd7fba0d4 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -57,42 +57,42 @@ INLINE int swap_bits_5_6(int data) static WRITE8_HANDLER( ram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->decrypted[0x0000 + offset] = swap_bits_5_6(data); state->rambase[0x0000 + offset] = data; } static WRITE8_HANDLER( charram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->decrypted[0x6000 + offset] = swap_bits_5_6(data); decocass_charram_w(space, offset, data); } static WRITE8_HANDLER( fgvideoram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->decrypted[0xc000 + offset] = swap_bits_5_6(data); decocass_fgvideoram_w(space, offset, data); } static WRITE8_HANDLER( fgcolorram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->decrypted[0xc400 + offset] = swap_bits_5_6(data); decocass_colorram_w(space, offset, data); } static WRITE8_HANDLER( tileram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->decrypted[0xd000 + offset] = swap_bits_5_6(data); decocass_tileram_w(space, offset, data); } static WRITE8_HANDLER( objectram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->decrypted[0xd800 + offset] = swap_bits_5_6(data); decocass_objectram_w(space, offset, data); } @@ -102,14 +102,14 @@ static WRITE8_HANDLER( mirrorcolorram_w ) { offset = ((offset >> 5) & 0x1f) | (( static READ8_HANDLER( mirrorvideoram_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); return state->fgvideoram[offset]; } static READ8_HANDLER( mirrorcolorram_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); return state->colorram[offset]; } @@ -1355,7 +1355,7 @@ ROM_END static DRIVER_INIT( decocass ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *rom = memory_region(machine, "maincpu"); int A; @@ -1380,7 +1380,7 @@ static DRIVER_INIT( decocass ) static DRIVER_INIT( decocrom ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); int romlength = memory_region_length(machine, "user3"); UINT8 *rom = memory_region(machine, "user3"); int i; diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index 13b102dc1cc..6282ad4c7eb 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -50,7 +50,7 @@ Notes: static WRITE16_HANDLER( sound_command_w ) { - deniam_state *state = (deniam_state *)space->machine->driver_data; + deniam_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { soundlatch_w(space,offset, (data >> 8) & 0xff); @@ -223,7 +223,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int linestate ) { - deniam_state *state = (deniam_state *)device->machine->driver_data; + deniam_state *state = device->machine->driver_data(); /* system 16c doesn't have the sound CPU */ if (state->audio_cpu != NULL) @@ -239,7 +239,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( deniam ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); state->audio_cpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index c3f567118fa..1d6fd9b832d 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -9,12 +9,13 @@ Atari Destroyer Driver #include "deprecat.h" -class destroyr_state +class destroyr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, destroyr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, destroyr_state(machine)); } - destroyr_state(running_machine &machine) { } + destroyr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * major_obj_ram; @@ -39,7 +40,7 @@ public: static VIDEO_UPDATE( destroyr ) { - destroyr_state *state = (destroyr_state *)screen->machine->driver_data; + destroyr_state *state = screen->machine->driver_data(); int i, j; bitmap_fill(bitmap, cliprect, 0); @@ -105,7 +106,7 @@ static VIDEO_UPDATE( destroyr ) static TIMER_CALLBACK( destroyr_dial_callback ) { - destroyr_state *state = (destroyr_state *)machine->driver_data; + destroyr_state *state = machine->driver_data(); int dial = param; /* Analog inputs come from the player's depth control potentiometer. @@ -126,7 +127,7 @@ static TIMER_CALLBACK( destroyr_dial_callback ) static TIMER_CALLBACK( destroyr_frame_callback ) { - destroyr_state *state = (destroyr_state *)machine->driver_data; + destroyr_state *state = machine->driver_data(); state->potsense[0] = 0; state->potsense[1] = 0; @@ -138,7 +139,7 @@ static TIMER_CALLBACK( destroyr_frame_callback ) static MACHINE_RESET( destroyr ) { - destroyr_state *state = (destroyr_state *)machine->driver_data; + destroyr_state *state = machine->driver_data(); timer_set(machine, machine->primary_screen->time_until_pos(0), NULL, 0, destroyr_frame_callback); @@ -156,7 +157,7 @@ static MACHINE_RESET( destroyr ) static WRITE8_HANDLER( destroyr_misc_w ) { - destroyr_state *state = (destroyr_state *)space->machine->driver_data; + destroyr_state *state = space->machine->driver_data(); /* bits 0 to 2 connect to the sound circuits */ state->attract = data & 0x01; @@ -173,7 +174,7 @@ static WRITE8_HANDLER( destroyr_misc_w ) static WRITE8_HANDLER( destroyr_cursor_load_w ) { - destroyr_state *state = (destroyr_state *)space->machine->driver_data; + destroyr_state *state = space->machine->driver_data(); state->cursor = data; watchdog_reset_w(space, offset, data); } @@ -181,7 +182,7 @@ static WRITE8_HANDLER( destroyr_cursor_load_w ) static WRITE8_HANDLER( destroyr_interrupt_ack_w ) { - destroyr_state *state = (destroyr_state *)space->machine->driver_data; + destroyr_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); } @@ -228,7 +229,7 @@ static WRITE8_HANDLER( destroyr_output_w ) static READ8_HANDLER( destroyr_input_r ) { - destroyr_state *state = (destroyr_state *)space->machine->driver_data; + destroyr_state *state = space->machine->driver_data(); offset &= 0x0f; if (offset == 0) @@ -434,7 +435,7 @@ static PALETTE_INIT( destroyr ) static MACHINE_START( destroyr ) { - destroyr_state *state = (destroyr_state *)machine->driver_data; + destroyr_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 0da20ad6b00..8367f19c0d2 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -161,7 +161,7 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - dietgo_state *driver_state = (dietgo_state *)device->machine->driver_data; + dietgo_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -192,7 +192,7 @@ static const deco16ic_interface dietgo_deco16ic_intf = static MACHINE_START( dietgo ) { - dietgo_state *state = (dietgo_state *)machine->driver_data; + dietgo_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index f7377206294..2f1ce2e6800 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -43,12 +43,13 @@ Notes: -class discoboy_state +class discoboy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, discoboy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, discoboy_state(machine)); } - discoboy_state(running_machine &machine) { } + discoboy_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram_1; @@ -75,7 +76,7 @@ static VIDEO_START( discoboy ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - discoboy_state *state = (discoboy_state *)machine->driver_data; + discoboy_state *state = machine->driver_data(); int flipscreen = 0; int offs, sx, sy; @@ -123,7 +124,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( discoboy ) { - discoboy_state *state = (discoboy_state *)screen->machine->driver_data; + discoboy_state *state = screen->machine->driver_data(); UINT16 x, y; int i; int count = 0; @@ -191,21 +192,21 @@ void discoboy_setrombank( running_machine *machine, UINT8 data ) static WRITE8_HANDLER( rambank_select_w ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); state->ram_bank = data; if (data &= 0x83) logerror("rambank_select_w !!!!!"); } static WRITE8_HANDLER( discoboy_port_00_w ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); if (data & 0xfe) logerror("unk discoboy_port_00_w %02x\n",data); state->port_00 = data; } static WRITE8_HANDLER( discoboy_port_01_w ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); // 00 10 20 30 during gameplay 1,2,3 other times?? title screen bit 0x40 toggle //printf("unk discoboy_port_01_w %02x\n",data); @@ -217,7 +218,7 @@ static WRITE8_HANDLER( discoboy_port_01_w ) static WRITE8_HANDLER( discoboy_port_03_w ) // sfx? (to sound cpu) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); // printf("unk discoboy_port_03_w %02x\n", data); // cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, HOLD_LINE); soundlatch_w(space, 0, data); @@ -233,7 +234,7 @@ static WRITE8_HANDLER( discoboy_port_06_w ) static WRITE8_HANDLER( rambank_w ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); if (state->ram_bank & 0x20) state->ram_2[offset] = data; @@ -243,7 +244,7 @@ static WRITE8_HANDLER( rambank_w ) static READ8_HANDLER( rambank_r ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); if (state->ram_bank & 0x20) return state->ram_2[offset]; @@ -253,7 +254,7 @@ static READ8_HANDLER( rambank_r ) static READ8_HANDLER( rambank2_r ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); if (state->port_00 == 0x00) return state->ram_3[offset]; @@ -267,7 +268,7 @@ static READ8_HANDLER( rambank2_r ) static WRITE8_HANDLER( rambank2_w ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); if (state->port_00 == 0x00) state->ram_3[offset] = data; @@ -279,13 +280,13 @@ static WRITE8_HANDLER( rambank2_w ) static READ8_HANDLER( discoboy_ram_att_r ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); return state->ram_att[offset]; } static WRITE8_HANDLER( discoboy_ram_att_w ) { - discoboy_state *state = (discoboy_state *)space->machine->driver_data; + discoboy_state *state = space->machine->driver_data(); state->ram_att[offset] = data; } @@ -324,7 +325,7 @@ ADDRESS_MAP_END static void splash_msm5205_int( running_device *device ) { - discoboy_state *state = (discoboy_state *)device->machine->driver_data; + discoboy_state *state = device->machine->driver_data(); msm5205_data_w(device, state->adpcm_data >> 4); // state->adpcm_data = (state->adpcm_data << 4) & 0xf0; } @@ -443,7 +444,7 @@ static const msm5205_interface discoboy_msm5205_interface = static MACHINE_START( discoboy ) { - discoboy_state *state = (discoboy_state *)machine->driver_data; + discoboy_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -455,7 +456,7 @@ static MACHINE_START( discoboy ) static MACHINE_RESET( discoboy ) { - discoboy_state *state = (discoboy_state *)machine->driver_data; + discoboy_state *state = machine->driver_data(); state->ram_bank = 0; state->port_00 = 0; @@ -539,7 +540,7 @@ ROM_END static DRIVER_INIT( discoboy ) { - discoboy_state *state = (discoboy_state *)machine->driver_data; + discoboy_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); state->ram_1 = auto_alloc_array(machine, UINT8, 0x800); diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 33228bb0671..2588fc19b5b 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -53,12 +53,13 @@ -class diverboy_state +class diverboy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, diverboy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, diverboy_state(machine)); } - diverboy_state(running_machine &machine) { } + diverboy_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; @@ -76,7 +77,7 @@ static VIDEO_START(diverboy) static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect ) { - diverboy_state *state = (diverboy_state *)machine->driver_data; + diverboy_state *state = machine->driver_data(); UINT16 *source = state->spriteram; UINT16 *finish = source + (state->spriteram_size / 2); @@ -120,7 +121,7 @@ static VIDEO_UPDATE(diverboy) static WRITE16_HANDLER( soundcmd_w ) { - diverboy_state *state = (diverboy_state *)space->machine->driver_data; + diverboy_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -245,7 +246,7 @@ GFXDECODE_END static MACHINE_START( diverboy ) { - diverboy_state *state = (diverboy_state *)machine->driver_data; + diverboy_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); } diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index e7d358f7d0f..86ae9b6e8e5 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -150,7 +150,7 @@ Notes: static WRITE8_HANDLER( beast_data_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->data_to_beast = data; state->z80_to_beast_full = 1; @@ -160,7 +160,7 @@ static WRITE8_HANDLER( beast_data_w ) static READ8_HANDLER( beast_data_r ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->beast_to_z80_full = 0; return state->data_to_z80; @@ -168,7 +168,7 @@ static READ8_HANDLER( beast_data_r ) static READ8_HANDLER( beast_status_r ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); return (!state->beast_to_z80_full << 2) | (state->z80_to_beast_full << 3); } @@ -176,13 +176,13 @@ static READ8_HANDLER( beast_status_r ) static WRITE8_HANDLER( trigger_nmi_on_cpu0 ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, PULSE_LINE); } static WRITE8_HANDLER( cpu0_bankswitch_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); data ^= state->bankxor; memory_set_bank(space->machine, "bank1", data); @@ -199,7 +199,7 @@ static WRITE8_HANDLER( cpu0_bankswitch_w ) */ static WRITE8_HANDLER( cpu1_bankswitch_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->videoreg = data; switch (data & 0xf) @@ -239,7 +239,7 @@ static WRITE8_HANDLER( coin_count_w ) static WRITE8_HANDLER( trigger_nmi_on_sound_cpu2 ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->cpu2, INPUT_LINE_NMI, PULSE_LINE); } /* trigger_nmi_on_sound_cpu2 */ @@ -316,7 +316,7 @@ static READ8_HANDLER( beast_p0_r ) static WRITE8_HANDLER( beast_p0_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); if (!BIT(state->beast_p0, 1) && BIT(data, 1)) { @@ -332,7 +332,7 @@ static WRITE8_HANDLER( beast_p0_w ) static READ8_HANDLER( beast_p1_r ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); if (BIT(state->beast_p0, 0) == 0) return state->data_to_beast; @@ -342,7 +342,7 @@ static READ8_HANDLER( beast_p1_r ) static WRITE8_HANDLER( beast_p1_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); if (data == 0xff) { @@ -355,7 +355,7 @@ static WRITE8_HANDLER( beast_p1_w ) static READ8_HANDLER( beast_p2_r ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); switch ((state->beast_p0 >> 2) & 3) { @@ -368,13 +368,13 @@ static READ8_HANDLER( beast_p2_r ) static WRITE8_HANDLER( beast_p2_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->beast_p2 = data; } static READ8_HANDLER( beast_p3_r ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); UINT8 dsw = 0; UINT8 dsw1 = ~input_port_read(space->machine, "DSW1"); @@ -392,7 +392,7 @@ static READ8_HANDLER( beast_p3_r ) static WRITE8_HANDLER( beast_p3_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->beast_p3 = data; cpu_set_input_line(state->cpu1, INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE); @@ -515,7 +515,7 @@ GFXDECODE_END static INTERRUPT_GEN( djboy_interrupt ) { /* CPU1 uses interrupt mode 2. For now, just alternate the two interrupts. */ - djboy_state *state = (djboy_state *)device->machine->driver_data; + djboy_state *state = device->machine->driver_data(); state->addr ^= 0x02; cpu_set_input_line_and_vector(device, 0, HOLD_LINE, state->addr); } @@ -530,7 +530,7 @@ static const kaneko_pandora_interface djboy_pandora_config = static MACHINE_START( djboy ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); UINT8 *MAIN = memory_region(machine, "maincpu"); UINT8 *CPU1 = memory_region(machine, "cpu1"); UINT8 *CPU2 = memory_region(machine, "cpu2"); @@ -569,7 +569,7 @@ static MACHINE_START( djboy ) static MACHINE_RESET( djboy ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); state->videoreg = 0; state->scrollx = 0; @@ -748,13 +748,13 @@ ROM_END static DRIVER_INIT( djboy ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); state->bankxor = 0x00; } static DRIVER_INIT( djboyj ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); state->bankxor = 0x1f; } diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index b5e8dd40cc9..a825b83eea2 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -387,7 +387,7 @@ static INTERRUPT_GEN( s2650_interrupt ) static void dkong_init_device_driver_data( running_machine *machine ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); state->dev_n2a03a = machine->device("n2a03a"); state->dev_n2a03b = machine->device("n2a03b"); @@ -397,7 +397,7 @@ static void dkong_init_device_driver_data( running_machine *machine ) static MACHINE_START( dkong2b ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); dkong_init_device_driver_data(machine); state->hardware_type = HARDWARE_TKG04; @@ -408,7 +408,7 @@ static MACHINE_START( dkong2b ) static MACHINE_START( s2650 ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); UINT8 *p = memory_region(machine, "user1"); const char *game_name = machine->gamedrv->name; int i; @@ -442,7 +442,7 @@ static MACHINE_START( s2650 ) static MACHINE_START( radarscp ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); MACHINE_START_CALL(dkong2b); state->hardware_type = HARDWARE_TRS02; @@ -450,7 +450,7 @@ static MACHINE_START( radarscp ) static MACHINE_START( radarscp1 ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); MACHINE_START_CALL(dkong2b); state->hardware_type = HARDWARE_TRS01; @@ -458,7 +458,7 @@ static MACHINE_START( radarscp1 ) static MACHINE_START( dkong3 ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); dkong_init_device_driver_data(machine); state->hardware_type = HARDWARE_TKG04; @@ -471,7 +471,7 @@ static MACHINE_RESET( dkong ) static MACHINE_RESET( strtheat ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); MACHINE_RESET_CALL(dkong); @@ -484,7 +484,7 @@ static MACHINE_RESET( strtheat ) static MACHINE_RESET( drakton ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); MACHINE_RESET_CALL(dkong); @@ -504,7 +504,7 @@ static MACHINE_RESET( drakton ) static READ8_HANDLER( hb_dma_read_byte ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); int bucket = state->rev_map[(offset>>10) & 0x1ff]; int addr; @@ -518,7 +518,7 @@ static READ8_HANDLER( hb_dma_read_byte ) static WRITE8_HANDLER( hb_dma_write_byte ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); int bucket = state->rev_map[(offset>>10) & 0x1ff]; int addr; @@ -532,13 +532,13 @@ static WRITE8_HANDLER( hb_dma_write_byte ) static READ8_DEVICE_HANDLER( p8257_ctl_r ) { - dkong_state *state = (dkong_state *)device->machine->driver_data; + dkong_state *state = device->machine->driver_data(); return state->dma_latch; } static WRITE8_DEVICE_HANDLER( p8257_ctl_w ) { - dkong_state *state = (dkong_state *)device->machine->driver_data; + dkong_state *state = device->machine->driver_data(); state->dma_latch = data; } @@ -562,7 +562,7 @@ static WRITE8_DEVICE_HANDLER( p8257_drq_w ) static READ8_HANDLER( dkong_in2_r ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); /* mcu status (sound feedback) is inverted bit4 from port B (8039) */ UINT8 mcustatus = latch8_bit4_q_r(state->dev_vp2, 0); UINT8 r; @@ -601,7 +601,7 @@ static WRITE8_HANDLER( s2650_mirror_w ) static READ8_HANDLER( epos_decrypt_rom ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); if (offset & 0x01) { @@ -631,7 +631,7 @@ static READ8_HANDLER( epos_decrypt_rom ) static WRITE8_HANDLER( s2650_data_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); #if DEBUG_PROTECTION logerror("write : pc = %04x, loopback = %02x\n",cpu_get_pc(space->cpu), data); #endif @@ -641,7 +641,7 @@ static WRITE8_HANDLER( s2650_data_w ) static WRITE8_HANDLER( s2650_fo_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); #if DEBUG_PROTECTION logerror("write : pc = %04x, FO = %02x\n",cpu_get_pc(space->cpu), data); #endif @@ -654,7 +654,7 @@ static WRITE8_HANDLER( s2650_fo_w ) static READ8_HANDLER( s2650_port0_r ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); #if DEBUG_PROTECTION logerror("port 0 : pc = %04x, loopback = %02x fo=%d\n",cpu_get_pc(space->cpu), state->hunchloopback, state->main_fo); #endif @@ -679,7 +679,7 @@ static READ8_HANDLER( s2650_port0_r ) static READ8_HANDLER( s2650_port1_r ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); #if DEBUG_PROTECTION logerror("port 1 : pc = %04x, loopback = %02x fo=%d\n",cpu_get_pc(space->cpu), state->hunchloopback, state->main_fo); @@ -702,7 +702,7 @@ static READ8_HANDLER( s2650_port1_r ) static WRITE8_HANDLER( dkong3_2a03_reset_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); if (data & 1) { diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index f37a54c4676..d31bf81f8e1 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -163,7 +163,7 @@ Dip locations verified with manual for docastle, dorunrun and dowild. /* Read/Write Handlers */ static void idsoccer_adpcm_int( running_device *device ) { - docastle_state *state = (docastle_state *)device->machine->driver_data; + docastle_state *state = device->machine->driver_data(); if (state->adpcm_pos >= memory_region_length(device->machine, "adpcm")) { @@ -184,7 +184,7 @@ static void idsoccer_adpcm_int( running_device *device ) static READ8_DEVICE_HANDLER( idsoccer_adpcm_status_r ) { - docastle_state *state = (docastle_state *)device->machine->driver_data; + docastle_state *state = device->machine->driver_data(); // this is wrong, but the samples work anyway!! state->adpcm_status ^= 0x80; @@ -193,7 +193,7 @@ static READ8_DEVICE_HANDLER( idsoccer_adpcm_status_r ) static WRITE8_DEVICE_HANDLER( idsoccer_adpcm_w ) { - docastle_state *state = (docastle_state *)device->machine->driver_data; + docastle_state *state = device->machine->driver_data(); if (data & 0x80) { @@ -563,7 +563,7 @@ static const msm5205_interface msm5205_config = static MACHINE_RESET( docastle ) { - docastle_state *state = (docastle_state *)machine->driver_data; + docastle_state *state = machine->driver_data(); int i; for (i = 0; i < 9; i++) @@ -579,7 +579,7 @@ static MACHINE_RESET( docastle ) static MACHINE_START( docastle ) { - docastle_state *state = (docastle_state *)machine->driver_data; + docastle_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->slave = machine->device("slave"); diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index d2be35e04d9..6ef7d5dbe5d 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -16,20 +16,20 @@ driver by Nicola Salmoria static READ8_HANDLER( sharedram_r ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE8_HANDLER( sharedram_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); state->sharedram[offset] = data; } static WRITE8_HANDLER( subirqtrigger_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); /* bit 0 used but unknown */ if (data & 0x04) cpu_set_input_line(state->subcpu, 0, ASSERT_LINE); @@ -37,19 +37,19 @@ static WRITE8_HANDLER( subirqtrigger_w ) static WRITE8_HANDLER( sub_irqack_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, 0, CLEAR_LINE); } static WRITE8_HANDLER( dogfgt_soundlatch_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); state->soundlatch = data; } static WRITE8_HANDLER( dogfgt_soundcontrol_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); /* bit 5 goes to 8910 #0 BDIR pin */ if ((state->last_snd_ctrl & 0x20) == 0x20 && (data & 0x20) == 0x00) @@ -215,7 +215,7 @@ GFXDECODE_END static MACHINE_START( dogfgt ) { - dogfgt_state *state = (dogfgt_state *)machine->driver_data; + dogfgt_state *state = machine->driver_data(); state->subcpu = machine->device("sub"); @@ -231,7 +231,7 @@ static MACHINE_START( dogfgt ) static MACHINE_RESET( dogfgt ) { - dogfgt_state *state = (dogfgt_state *)machine->driver_data; + dogfgt_state *state = machine->driver_data(); int i; state->bm_plane = 0; diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index c9dca06dfc1..2b7c16906c4 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -64,12 +64,13 @@ Notes: #include "cpu/z80/z80.h" #include "sound/ay8910.h" -class dominob_state +class dominob_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dominob_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dominob_state(machine)); } - dominob_state(running_machine &machine) { } + dominob_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * spriteram; @@ -90,7 +91,7 @@ static VIDEO_START( dominob ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - dominob_state *state = (dominob_state *)machine->driver_data; + dominob_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -120,7 +121,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( dominob ) { - dominob_state *state = (dominob_state *)screen->machine->driver_data; + dominob_state *state = screen->machine->driver_data(); int x,y; int index = 0; diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 85d31d9fc34..4acb628209d 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -16,12 +16,13 @@ Todo: #define NUM_PENS (8) -class dorachan_state +class dorachan_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dorachan_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dorachan_state(machine)); } - dorachan_state(running_machine &machine) { } + dorachan_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -43,7 +44,7 @@ public: static CUSTOM_INPUT( dorachan_protection_r ) { - dorachan_state *state = (dorachan_state *)field->port->machine->driver_data; + dorachan_state *state = field->port->machine->driver_data(); UINT8 ret = 0; switch (cpu_get_previouspc(state->main_cpu)) @@ -81,7 +82,7 @@ static void get_pens(pen_t *pens) static VIDEO_UPDATE( dorachan ) { - dorachan_state *state = (dorachan_state *)screen->machine->driver_data; + dorachan_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; const UINT8 *color_map_base; @@ -124,14 +125,14 @@ static VIDEO_UPDATE( dorachan ) static WRITE8_HANDLER(dorachan_ctrl_w) { - dorachan_state *state = (dorachan_state *)space->machine->driver_data; + dorachan_state *state = space->machine->driver_data(); state->flip_screen = (data >> 6) & 0x01; } static CUSTOM_INPUT( dorachan_v128_r ) { - dorachan_state *state = (dorachan_state *)field->port->machine->driver_data; + dorachan_state *state = field->port->machine->driver_data(); /* to avoid resetting (when player 2 starts) bit 0 need to be inverted when screen is flipped */ return ((field->port->machine->primary_screen->vpos() >> 7) & 0x01) ^ state->flip_screen; @@ -225,7 +226,7 @@ INPUT_PORTS_END static MACHINE_START( dorachan ) { - dorachan_state *state = (dorachan_state *)machine->driver_data; + dorachan_state *state = machine->driver_data(); state->main_cpu = machine->device("maincpu"); @@ -234,7 +235,7 @@ static MACHINE_START( dorachan ) static MACHINE_RESET( dorachan ) { - dorachan_state *state = (dorachan_state *)machine->driver_data; + dorachan_state *state = machine->driver_data(); state->flip_screen = 0; } diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index e9d2f7b020e..539843a3e58 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -24,12 +24,13 @@ SOUND : (none) #include "cpu/z80/z80.h" -class dotrikun_state +class dotrikun_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dotrikun_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dotrikun_state(machine)); } - dotrikun_state(running_machine &machine) { } + dotrikun_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -48,7 +49,7 @@ public: static WRITE8_HANDLER( dotrikun_color_w ) { - dotrikun_state *state = (dotrikun_state *)space->machine->driver_data; + dotrikun_state *state = space->machine->driver_data(); space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); state->color = data; } @@ -56,7 +57,7 @@ static WRITE8_HANDLER( dotrikun_color_w ) static VIDEO_UPDATE( dotrikun ) { - dotrikun_state *state = (dotrikun_state *)screen->machine->driver_data; + dotrikun_state *state = screen->machine->driver_data(); int offs; pen_t back_pen = MAKE_RGB(pal1bit(state->color >> 3), pal1bit(state->color >> 4), pal1bit(state->color >> 5)); @@ -133,13 +134,13 @@ INPUT_PORTS_END static MACHINE_START( dotrikun ) { - dotrikun_state *state = (dotrikun_state *)machine->driver_data; + dotrikun_state *state = machine->driver_data(); state_save_register_global(machine, state->color); } static MACHINE_RESET( dotrikun ) { - dotrikun_state *state = (dotrikun_state *)machine->driver_data; + dotrikun_state *state = machine->driver_data(); state->color = 0; } diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index 13ee2172e94..232ceebe6dc 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -13,7 +13,7 @@ Atari Drag Race Driver static TIMER_DEVICE_CALLBACK( dragrace_frame_callback ) { - dragrace_state *state = (dragrace_state *)timer.machine->driver_data; + dragrace_state *state = timer.machine->driver_data(); int i; static const char *const portnames[] = { "P1", "P2" }; @@ -36,7 +36,7 @@ static TIMER_DEVICE_CALLBACK( dragrace_frame_callback ) static void dragrace_update_misc_flags( running_machine *machine ) { - dragrace_state *state = (dragrace_state *)machine->driver_data; + dragrace_state *state = machine->driver_data(); /* 0x0900 = set 3SPEED1 0x00000001 * 0x0901 = set 4SPEED1 0x00000002 * 0x0902 = set 5SPEED1 0x00000004 @@ -90,7 +90,7 @@ static void dragrace_update_misc_flags( running_machine *machine ) static WRITE8_HANDLER( dragrace_misc_w ) { - dragrace_state *state = (dragrace_state *)space->machine->driver_data; + dragrace_state *state = space->machine->driver_data(); /* Set/clear individual bit */ UINT32 mask = 1 << offset; @@ -104,7 +104,7 @@ static WRITE8_HANDLER( dragrace_misc_w ) static WRITE8_HANDLER( dragrace_misc_clear_w ) { - dragrace_state *state = (dragrace_state *)space->machine->driver_data; + dragrace_state *state = space->machine->driver_data(); /* Clear 8 bits */ UINT32 mask = 0xff << (((offset >> 3) & 0x03) * 8); @@ -115,7 +115,7 @@ static WRITE8_HANDLER( dragrace_misc_clear_w ) static READ8_HANDLER( dragrace_input_r ) { - dragrace_state *state = (dragrace_state *)space->machine->driver_data; + dragrace_state *state = space->machine->driver_data(); int val = input_port_read(space->machine, "IN2"); static const char *const portnames[] = { "IN0", "IN1" }; @@ -316,7 +316,7 @@ static PALETTE_INIT( dragrace ) static MACHINE_START( dragrace ) { - dragrace_state *state = (dragrace_state *)machine->driver_data; + dragrace_state *state = machine->driver_data(); state->discrete = machine->device("discrete"); @@ -326,7 +326,7 @@ static MACHINE_START( dragrace ) static MACHINE_RESET( dragrace ) { - dragrace_state *state = (dragrace_state *)machine->driver_data; + dragrace_state *state = machine->driver_data(); state->misc_flags = 0; state->gear[0] = 0; diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 6079e1bc639..d2c5f150807 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -90,12 +90,13 @@ Stephh's notes (based on the game M68EC020 code and some tests) : #define MASTER_CLOCK 32000000 -class dreamwld_state +class dreamwld_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dreamwld_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dreamwld_state(machine)); } - dreamwld_state(running_machine &machine) { } + dreamwld_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * bg_videoram; @@ -116,7 +117,7 @@ public: static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - dreamwld_state *state = (dreamwld_state *)machine->driver_data; + dreamwld_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; UINT32 *source = state->spriteram; UINT32 *finish = state->spriteram + 0x1000 / 4; @@ -172,7 +173,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static WRITE32_HANDLER( dreamwld_bg_videoram_w ) { - dreamwld_state *state = (dreamwld_state *)space->machine->driver_data; + dreamwld_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset * 2); tilemap_mark_tile_dirty(state->bg_tilemap, offset * 2 + 1); @@ -180,7 +181,7 @@ static WRITE32_HANDLER( dreamwld_bg_videoram_w ) static TILE_GET_INFO( get_dreamwld_bg_tile_info ) { - dreamwld_state *state = (dreamwld_state *)machine->driver_data; + dreamwld_state *state = machine->driver_data(); int tileno, colour; tileno = (tile_index & 1) ? (state->bg_videoram[tile_index >> 1] & 0xffff) : ((state->bg_videoram[tile_index >> 1] >> 16) & 0xffff); colour = tileno >> 13; @@ -191,7 +192,7 @@ static TILE_GET_INFO( get_dreamwld_bg_tile_info ) static WRITE32_HANDLER( dreamwld_bg2_videoram_w ) { - dreamwld_state *state = (dreamwld_state *)space->machine->driver_data; + dreamwld_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg2_videoram[offset]); tilemap_mark_tile_dirty(state->bg2_tilemap, offset * 2); tilemap_mark_tile_dirty(state->bg2_tilemap, offset * 2 + 1); @@ -199,7 +200,7 @@ static WRITE32_HANDLER( dreamwld_bg2_videoram_w ) static TILE_GET_INFO( get_dreamwld_bg2_tile_info ) { - dreamwld_state *state = (dreamwld_state *)machine->driver_data; + dreamwld_state *state = machine->driver_data(); UINT16 tileno, colour; tileno = (tile_index & 1) ? (state->bg2_videoram[tile_index >> 1] & 0xffff) : ((state->bg2_videoram[tile_index >> 1] >> 16) & 0xffff); colour = tileno >> 13; @@ -209,7 +210,7 @@ static TILE_GET_INFO( get_dreamwld_bg2_tile_info ) static VIDEO_START( dreamwld ) { - dreamwld_state *state = (dreamwld_state *)machine->driver_data; + dreamwld_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_dreamwld_bg_tile_info,tilemap_scan_rows, 16, 16, 64,32); state->bg2_tilemap = tilemap_create(machine, get_dreamwld_bg2_tile_info,tilemap_scan_rows, 16, 16, 64,32); @@ -218,7 +219,7 @@ static VIDEO_START( dreamwld ) static VIDEO_UPDATE( dreamwld ) { - dreamwld_state *state = (dreamwld_state *)screen->machine->driver_data; + dreamwld_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, state->bg_scroll[(0x400 / 4)] + 32); tilemap_set_scrolly(state->bg2_tilemap, 0, state->bg_scroll[(0x400 / 4) + 2] + 32); @@ -251,7 +252,7 @@ static VIDEO_UPDATE( dreamwld ) static READ32_HANDLER( dreamwld_protdata_r ) { - dreamwld_state *state = (dreamwld_state *)space->machine->driver_data; + dreamwld_state *state = space->machine->driver_data(); UINT8 *protdata = memory_region(space->machine, "user1"); size_t protsize = memory_region_length(space->machine, "user1"); @@ -262,7 +263,7 @@ static READ32_HANDLER( dreamwld_protdata_r ) static WRITE32_HANDLER( dreamwld_palette_w ) { - dreamwld_state *state = (dreamwld_state *)space->machine->driver_data; + dreamwld_state *state = space->machine->driver_data(); UINT16 dat; int color; @@ -403,7 +404,7 @@ GFXDECODE_END static MACHINE_START( dreamwld ) { - dreamwld_state *state = (dreamwld_state *)machine->driver_data; + dreamwld_state *state = machine->driver_data(); state_save_register_global(machine, state->protindex); state_save_register_global_array(machine, state->tilebank); @@ -412,7 +413,7 @@ static MACHINE_START( dreamwld ) static MACHINE_RESET( dreamwld ) { - dreamwld_state *state = (dreamwld_state *)machine->driver_data; + dreamwld_state *state = machine->driver_data(); state->tilebankold[0] = state->tilebankold[1] = -1; state->tilebank[0] = state->tilebank[1] = 0; diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index a151bbc2ac1..d895563a931 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -50,7 +50,7 @@ static WRITE16_HANDLER( drgnmst_coin_w ) static WRITE16_HANDLER( drgnmst_snd_command_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -61,7 +61,7 @@ static WRITE16_HANDLER( drgnmst_snd_command_w ) static WRITE16_HANDLER( drgnmst_snd_flag_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); /* Enables the following 68K write operation to latch through to the PIC */ if (ACCESSING_BITS_0_7) @@ -71,13 +71,13 @@ static WRITE16_HANDLER( drgnmst_snd_flag_w ) static READ8_HANDLER( pic16c5x_port0_r ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); return state->pic16c5x_port0; } static READ8_HANDLER( drgnmst_snd_command_r ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); int data = 0; switch (state->oki_control & 0x1f) @@ -94,7 +94,7 @@ static READ8_HANDLER( drgnmst_snd_command_r ) static READ8_HANDLER( drgnmst_snd_flag_r ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); if (state->snd_flag) { state->snd_flag = 0; @@ -106,7 +106,7 @@ static READ8_HANDLER( drgnmst_snd_flag_r ) static WRITE8_HANDLER( drgnmst_pcm_banksel_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); /* This is a 4 bit port. Each pair of bits is used in part of the OKI PCM ROM bank selectors. See the Port 2 write handler below (drgnmst_snd_control_w) for details. @@ -117,7 +117,7 @@ static WRITE8_HANDLER( drgnmst_pcm_banksel_w ) static WRITE8_HANDLER( drgnmst_oki_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); state->oki_command = data; } @@ -146,7 +146,7 @@ static WRITE8_HANDLER( drgnmst_snd_control_w ) The OKI0 banks are pre-configured below in the driver init. */ - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); int oki_new_bank; state->oki_control = data; @@ -379,7 +379,7 @@ GFXDECODE_END static MACHINE_START( drgnmst ) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); state_save_register_global(machine, state->snd_flag); state_save_register_global(machine, state->snd_command); @@ -392,7 +392,7 @@ static MACHINE_START( drgnmst ) static MACHINE_RESET( drgnmst ) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); state->snd_flag = 0; state->snd_command = 0; diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 1d25d294020..bf933353bf7 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -40,7 +40,7 @@ static INTERRUPT_GEN( dribling_irq_gen ) { - dribling_state *state = (dribling_state *)device->machine->driver_data; + dribling_state *state = device->machine->driver_data(); if (state->di) cpu_set_input_line(device, 0, ASSERT_LINE); } @@ -55,7 +55,7 @@ static INTERRUPT_GEN( dribling_irq_gen ) static READ8_DEVICE_HANDLER( dsr_r ) { - dribling_state *state = (dribling_state *)device->machine->driver_data; + dribling_state *state = device->machine->driver_data(); /* return DSR0-7 */ return (state->ds << state->sh) | (state->dr >> (8 - state->sh)); @@ -64,7 +64,7 @@ static READ8_DEVICE_HANDLER( dsr_r ) static READ8_DEVICE_HANDLER( input_mux0_r ) { - dribling_state *state = (dribling_state *)device->machine->driver_data; + dribling_state *state = device->machine->driver_data(); /* low value in the given bit selects */ if (!(state->input_mux & 0x01)) @@ -86,7 +86,7 @@ static READ8_DEVICE_HANDLER( input_mux0_r ) static WRITE8_DEVICE_HANDLER( misc_w ) { - dribling_state *state = (dribling_state *)device->machine->driver_data; + dribling_state *state = device->machine->driver_data(); /* bit 7 = di */ state->di = (data >> 7) & 1; @@ -132,7 +132,7 @@ static WRITE8_DEVICE_HANDLER( pb_w ) static WRITE8_DEVICE_HANDLER( shr_w ) { - dribling_state *state = (dribling_state *)device->machine->driver_data; + dribling_state *state = device->machine->driver_data(); /* bit 3 = watchdog */ if (data & 0x08) @@ -152,7 +152,7 @@ static WRITE8_DEVICE_HANDLER( shr_w ) static READ8_HANDLER( ioread ) { - dribling_state *state = (dribling_state *)space->machine->driver_data; + dribling_state *state = space->machine->driver_data(); if (offset & 0x08) return ppi8255_r(state->ppi_0, offset & 3); @@ -164,7 +164,7 @@ static READ8_HANDLER( ioread ) static WRITE8_HANDLER( iowrite ) { - dribling_state *state = (dribling_state *)space->machine->driver_data; + dribling_state *state = space->machine->driver_data(); if (offset & 0x08) ppi8255_w(state->ppi_0, offset & 3, data); @@ -285,7 +285,7 @@ INPUT_PORTS_END static MACHINE_START( dribling ) { - dribling_state *state = (dribling_state *)machine->driver_data; + dribling_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->ppi_0 = machine->device("ppi8255_0"); @@ -301,7 +301,7 @@ static MACHINE_START( dribling ) static MACHINE_RESET( dribling ) { - dribling_state *state = (dribling_state *)machine->driver_data; + dribling_state *state = machine->driver_data(); state->abca = 0; state->di = 0; diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index e39b34e9639..a19732cc1a7 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -25,7 +25,7 @@ Quite similar to Appoooh static INTERRUPT_GEN( drmicro_interrupt ) { - drmicro_state *state = (drmicro_state *)device->machine->driver_data; + drmicro_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); @@ -33,7 +33,7 @@ static INTERRUPT_GEN( drmicro_interrupt ) static WRITE8_HANDLER( nmi_enable_w ) { - drmicro_state *state = (drmicro_state *)space->machine->driver_data; + drmicro_state *state = space->machine->driver_data(); state->nmi_enable = data & 1; state->flipscreen = (data & 2) ? 1 : 0; @@ -45,7 +45,7 @@ static WRITE8_HANDLER( nmi_enable_w ) static void pcm_w(running_device *device) { - drmicro_state *state = (drmicro_state *)device->machine->driver_data; + drmicro_state *state = device->machine->driver_data(); UINT8 *PCM = memory_region(device->machine, "adpcm"); int data = PCM[state->pcm_adr / 2]; @@ -66,7 +66,7 @@ static void pcm_w(running_device *device) static WRITE8_HANDLER( pcm_set_w ) { - drmicro_state *state = (drmicro_state *)space->machine->driver_data; + drmicro_state *state = space->machine->driver_data(); state->pcm_adr = ((data & 0x3f) << 9); pcm_w(state->msm); } @@ -228,7 +228,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( drmicro ) { - drmicro_state *state = (drmicro_state *)machine->driver_data; + drmicro_state *state = machine->driver_data(); state->msm = machine->device("msm"); @@ -239,7 +239,7 @@ static MACHINE_START( drmicro ) static MACHINE_RESET( drmicro ) { - drmicro_state *state = (drmicro_state *)machine->driver_data; + drmicro_state *state = machine->driver_data(); state->nmi_enable = 0; state->pcm_adr = 0; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 88701ac0a5e..1c6057ee664 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -11,12 +11,13 @@ similar hardware. #include "cpu/m68000/m68000.h" #include "sound/okim6295.h" -class drtomy_state +class drtomy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drtomy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drtomy_state(machine)); } - drtomy_state(running_machine &machine) { } + drtomy_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; @@ -35,7 +36,7 @@ public: static TILE_GET_INFO( get_tile_info_fg ) { - drtomy_state *state = (drtomy_state *)machine->driver_data; + drtomy_state *state = machine->driver_data(); int code = state->videoram_fg[tile_index] & 0xfff; int color = (state->videoram_fg[tile_index] & 0xf000) >> 12; SET_TILE_INFO(2, code, color, 0); @@ -44,7 +45,7 @@ static TILE_GET_INFO( get_tile_info_fg ) static TILE_GET_INFO( get_tile_info_bg ) { - drtomy_state *state = (drtomy_state *)machine->driver_data; + drtomy_state *state = machine->driver_data(); int code = state->videoram_bg[tile_index] & 0xfff; int color = (state->videoram_bg[tile_index] & 0xf000) >> 12; SET_TILE_INFO(1, code, color, 0); @@ -70,7 +71,7 @@ static TILE_GET_INFO( get_tile_info_bg ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - drtomy_state *state = (drtomy_state *)machine->driver_data; + drtomy_state *state = machine->driver_data(); int i, x, y, ex, ey; const gfx_element *gfx = machine->gfx[0]; @@ -115,7 +116,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_START( drtomy ) { - drtomy_state *state = (drtomy_state *)machine->driver_data; + drtomy_state *state = machine->driver_data(); state->tilemap_bg = tilemap_create(machine, get_tile_info_bg, tilemap_scan_rows, 16, 16, 32, 32); state->tilemap_fg = tilemap_create(machine, get_tile_info_fg, tilemap_scan_rows, 16, 16, 32, 32); @@ -125,7 +126,7 @@ static VIDEO_START( drtomy ) static VIDEO_UPDATE( drtomy ) { - drtomy_state *state = (drtomy_state *)screen->machine->driver_data; + drtomy_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap_bg, 0, 0); tilemap_draw(bitmap, cliprect, state->tilemap_fg, 0, 0); @@ -135,21 +136,21 @@ static VIDEO_UPDATE( drtomy ) static WRITE16_HANDLER( drtomy_vram_fg_w ) { - drtomy_state *state = (drtomy_state *)space->machine->driver_data; + drtomy_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram_fg[offset]); tilemap_mark_tile_dirty(state->tilemap_fg, offset); } static WRITE16_HANDLER( drtomy_vram_bg_w ) { - drtomy_state *state = (drtomy_state *)space->machine->driver_data; + drtomy_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram_bg[offset]); tilemap_mark_tile_dirty(state->tilemap_bg, offset); } static WRITE16_DEVICE_HANDLER( drtomy_okibank_w ) { - drtomy_state *state = (drtomy_state *)device->machine->driver_data; + drtomy_state *state = device->machine->driver_data(); if (state->oki_bank != (data & 3)) { state->oki_bank = data & 3; @@ -279,14 +280,14 @@ INPUT_PORTS_END static MACHINE_START( drtomy ) { - drtomy_state *state = (drtomy_state *)machine->driver_data; + drtomy_state *state = machine->driver_data(); state_save_register_global(machine, state->oki_bank); } static MACHINE_RESET( drtomy ) { - drtomy_state *state = (drtomy_state *)machine->driver_data; + drtomy_state *state = machine->driver_data(); state->oki_bank = 0; } diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 50b9c8b28f6..75ed5626be8 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -58,12 +58,13 @@ Notes: #define DUNHUANG_DEBUG 0 -class dunhuang_state +class dunhuang_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dunhuang_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dunhuang_state(machine)); } - dunhuang_state(running_machine &machine) { } + dunhuang_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; @@ -96,14 +97,14 @@ public: static TILE_GET_INFO( get_tile_info ) { - dunhuang_state *state = (dunhuang_state *)machine->driver_data; + dunhuang_state *state = machine->driver_data(); UINT16 code = state->videoram[tile_index]; UINT8 color = state->colorram[tile_index] & 0x0f; SET_TILE_INFO(0, code, color, 0); } static TILE_GET_INFO( get_tile_info2 ) { - dunhuang_state *state = (dunhuang_state *)machine->driver_data; + dunhuang_state *state = machine->driver_data(); UINT16 code = state->videoram2[tile_index]; UINT8 color = state->colorram2[tile_index] & 0x0f; SET_TILE_INFO(1, code, color, 0); @@ -111,7 +112,7 @@ static TILE_GET_INFO( get_tile_info2 ) static VIDEO_START(dunhuang) { - dunhuang_state *state = (dunhuang_state *)machine->driver_data; + dunhuang_state *state = machine->driver_data(); state->tmap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 0x40,0x20); state->tmap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 8,32, 0x40,0x8); @@ -135,7 +136,7 @@ static VIDEO_START(dunhuang) static VIDEO_UPDATE( dunhuang ) { - dunhuang_state *state = (dunhuang_state *)screen->machine->driver_data; + dunhuang_state *state = screen->machine->driver_data(); int layers_ctrl = -1; #if DUNHUANG_DEBUG @@ -173,7 +174,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) static WRITE8_HANDLER( dunhuang_pos_x_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->pos_x = data & 0x3f; state->written = 0; state->written2 = 0; @@ -181,7 +182,7 @@ static WRITE8_HANDLER( dunhuang_pos_x_w ) static WRITE8_HANDLER( dunhuang_pos_y_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->pos_y = data; state->written = 0; state->written2 = 0; @@ -189,7 +190,7 @@ static WRITE8_HANDLER( dunhuang_pos_y_w ) static WRITE8_HANDLER( dunhuang_tile_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); int addr; if (state->written & (1 << offset)) @@ -216,7 +217,7 @@ static WRITE8_HANDLER( dunhuang_tile_w ) static WRITE8_HANDLER( dunhuang_tile2_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); int addr; if (state->written2 & (1 << offset)) @@ -245,12 +246,12 @@ static WRITE8_HANDLER( dunhuang_tile2_w ) static WRITE8_HANDLER( dunhuang_clear_y_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->clear_y = data; } static WRITE8_HANDLER( dunhuang_horiz_clear_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); int i; // logerror("%06x: horiz clear, y = %02x, data = %02d\n", cpu_get_pc(space->cpu), state->clear_y,data); for (i = 0; i < 0x40; i++) @@ -267,7 +268,7 @@ static WRITE8_HANDLER( dunhuang_horiz_clear_w ) static WRITE8_HANDLER( dunhuang_vert_clear_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); int i; // logerror("%06x: vert clear, x = %02x, y = %02x, data = %02x\n", cpu_get_pc(space->cpu), state->pos_x,state->pos_y,data); for (i = 0; i < 0x08; i++) @@ -288,50 +289,50 @@ static WRITE8_HANDLER( dunhuang_vert_clear_w ) static WRITE8_HANDLER( dunhuang_block_dest_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_dest = data; } static WRITE8_HANDLER( dunhuang_block_x_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_x = data; } static WRITE8_HANDLER( dunhuang_block_y_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_y = data; } static WRITE8_HANDLER( dunhuang_block_w_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_w = data; } static WRITE8_HANDLER( dunhuang_block_c_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_c = data; } static WRITE8_HANDLER( dunhuang_block_addr_lo_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_addr_lo = data; } static WRITE8_HANDLER( dunhuang_block_addr_hi_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->block_addr_hi = data; } static WRITE8_HANDLER( dunhuang_block_h_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); int i,j, addr; UINT8 *tile_addr; @@ -382,13 +383,13 @@ static WRITE8_HANDLER( dunhuang_block_h_w ) static WRITE8_HANDLER( dunhuang_paloffs_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->paloffs = data * 3; } static WRITE8_HANDLER( dunhuang_paldata_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->paldata[state->paloffs] = data; palette_set_color_rgb( space->machine, state->paloffs/3, @@ -404,7 +405,7 @@ static WRITE8_HANDLER( dunhuang_paldata_w ) static WRITE8_HANDLER( dunhuang_layers_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); // popmessage("layers %02x",data); state->layers = data; } @@ -423,13 +424,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( dunhuang_input_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); state->input = data; } static READ8_HANDLER( dunhuang_service_r ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); return input_port_read(space->machine, "SERVICE") | ((state->hopper && !(space->machine->primary_screen->frame_number() % 10)) ? 0x00 : 0x08) // bit 3: hopper sensor | 0x80 // bit 7 low -> tiles block transferrer busy @@ -438,7 +439,7 @@ static READ8_HANDLER( dunhuang_service_r ) static READ8_DEVICE_HANDLER( dunhuang_dsw_r ) { - dunhuang_state *state = (dunhuang_state *)device->machine->driver_data; + dunhuang_state *state = device->machine->driver_data(); if (!(state->input & 0x01)) return input_port_read(device->machine, "DSW1"); if (!(state->input & 0x02)) return input_port_read(device->machine, "DSW2"); if (!(state->input & 0x04)) return input_port_read(device->machine, "DSW3"); @@ -449,7 +450,7 @@ static READ8_DEVICE_HANDLER( dunhuang_dsw_r ) } static READ8_HANDLER( dunhuang_input_r ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); if (!(state->input & 0x01)) return input_port_read(space->machine, "IN0"); if (!(state->input & 0x02)) return input_port_read(space->machine, "IN1"); if (!(state->input & 0x04)) return input_port_read(space->machine, "IN2"); @@ -461,7 +462,7 @@ static READ8_HANDLER( dunhuang_input_r ) static WRITE8_HANDLER( dunhuang_rombank_w ) { - dunhuang_state *state = (dunhuang_state *)space->machine->driver_data; + dunhuang_state *state = space->machine->driver_data(); // ? data & 0x01 // ? data & 0x02 @@ -765,7 +766,7 @@ static const ay8910_interface dunhuang_ay8910_interface = static MACHINE_START( dunhuang ) { - dunhuang_state *state = (dunhuang_state *)machine->driver_data; + dunhuang_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); @@ -791,7 +792,7 @@ static MACHINE_START( dunhuang ) static MACHINE_RESET( dunhuang ) { - dunhuang_state *state = (dunhuang_state *)machine->driver_data; + dunhuang_state *state = machine->driver_data(); state->written = 0; state->written2 = 0; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 6b6b9055cd4..1ec6df77adc 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -278,12 +278,13 @@ uPC1352C @ N3 #include "cpu/i8085/i8085.h" #include "sound/ay8910.h" -class dwarfd_state +class dwarfd_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dwarfd_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dwarfd_state(machine)); } - dwarfd_state(running_machine &machine) { } + dwarfd_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * dw_ram; @@ -350,7 +351,7 @@ enum static WRITE8_HANDLER (i8275_preg_w) //param reg { - dwarfd_state *state = (dwarfd_state *)space->machine->driver_data; + dwarfd_state *state = space->machine->driver_data(); switch (state->i8275Command) { @@ -471,7 +472,7 @@ static READ8_HANDLER (i8275_preg_r) //param reg static WRITE8_HANDLER (i8275_creg_w) //comand reg { - dwarfd_state *state = (dwarfd_state *)space->machine->driver_data; + dwarfd_state *state = space->machine->driver_data(); switch (data>>5) { @@ -516,7 +517,7 @@ static READ8_HANDLER (i8275_sreg_r) //status static READ8_HANDLER(dwarfd_ram_r) { - dwarfd_state *state = (dwarfd_state *)space->machine->driver_data; + dwarfd_state *state = space->machine->driver_data(); if (state->crt_access == 0) { @@ -532,7 +533,7 @@ static READ8_HANDLER(dwarfd_ram_r) static WRITE8_HANDLER(dwarfd_ram_w) { - dwarfd_state *state = (dwarfd_state *)space->machine->driver_data; + dwarfd_state *state = space->machine->driver_data(); state->dw_ram[offset] = data; } @@ -683,7 +684,7 @@ static VIDEO_START(dwarfd) static void drawCrt( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - dwarfd_state *state = (dwarfd_state *)machine->driver_data; + dwarfd_state *state = machine->driver_data(); int x, y; for (y = 0; y < maxy; y++) { @@ -751,7 +752,7 @@ static VIDEO_UPDATE( dwarfd ) static WRITE_LINE_DEVICE_HANDLER( dwarfd_sod_callback ) { - dwarfd_state *driver_state = (dwarfd_state *)device->machine->driver_data; + dwarfd_state *driver_state = device->machine->driver_data(); driver_state->crt_access = state; } @@ -768,7 +769,7 @@ static I8085_CONFIG( dwarfd_i8085_config ) #define NUM_LINES 25 static INTERRUPT_GEN( dwarfd_interrupt ) { - dwarfd_state *state = (dwarfd_state *)device->machine->driver_data; + dwarfd_state *state = device->machine->driver_data(); if (cpu_getiloops(device) < NUM_LINES) { @@ -914,7 +915,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( dwarfd ) { - dwarfd_state *state = (dwarfd_state *)machine->driver_data; + dwarfd_state *state = machine->driver_data(); state_save_register_global(machine, state->bank); state_save_register_global(machine, state->line); @@ -938,7 +939,7 @@ static MACHINE_START( dwarfd ) static MACHINE_RESET( dwarfd ) { - dwarfd_state *state = (dwarfd_state *)machine->driver_data; + dwarfd_state *state = machine->driver_data(); state->bank = 0; state->line = 0; @@ -1141,7 +1142,7 @@ ROM_END static DRIVER_INIT(dwarfd) { - dwarfd_state *state = (dwarfd_state *)machine->driver_data; + dwarfd_state *state = machine->driver_data(); int i; UINT8 *src, *dst; diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index b200bffc5ce..a79747a38ed 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -37,12 +37,13 @@ dy_6.bin (near Z80) #include "sound/ay8910.h" -class dynadice_state +class dynadice_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dynadice_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dynadice_state(machine)); } - dynadice_state(running_machine &machine) { } + dynadice_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -59,7 +60,7 @@ public: static WRITE8_HANDLER( dynadice_videoram_w ) { - dynadice_state *state = (dynadice_state *)space->machine->driver_data; + dynadice_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); tilemap_mark_all_tiles_dirty(state->top_tilemap); @@ -67,13 +68,13 @@ static WRITE8_HANDLER( dynadice_videoram_w ) static WRITE8_HANDLER( sound_data_w ) { - dynadice_state *state = (dynadice_state *)space->machine->driver_data; + dynadice_state *state = space->machine->driver_data(); state->ay_data = data; } static WRITE8_DEVICE_HANDLER( sound_control_w ) { - dynadice_state *state = (dynadice_state *)device->machine->driver_data; + dynadice_state *state = device->machine->driver_data(); /* AY 3-8910 : @@ -190,14 +191,14 @@ GFXDECODE_END static TILE_GET_INFO( get_tile_info ) { - dynadice_state *state = (dynadice_state *)machine->driver_data; + dynadice_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO(1, code, 0, 0); } static VIDEO_START( dynadice ) { - dynadice_state *state = (dynadice_state *)machine->driver_data; + dynadice_state *state = machine->driver_data(); /* pacman - style videoram layout */ state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -207,7 +208,7 @@ static VIDEO_START( dynadice ) static VIDEO_UPDATE( dynadice ) { - dynadice_state *state = (dynadice_state *)screen->machine->driver_data; + dynadice_state *state = screen->machine->driver_data(); rectangle myclip = *cliprect; myclip.max_x = 15; tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -224,13 +225,13 @@ static PALETTE_INIT( dynadice ) static MACHINE_START( dynadice ) { - dynadice_state *state = (dynadice_state *)machine->driver_data; + dynadice_state *state = machine->driver_data(); state_save_register_global(machine, state->ay_data); } static MACHINE_RESET( dynadice ) { - dynadice_state *state = (dynadice_state *)machine->driver_data; + dynadice_state *state = machine->driver_data(); state->ay_data = 0; } diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index c30f8547c16..21bb6e54689 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -100,35 +100,35 @@ TODO: /* It runs in IM 0, thus needs an opcode on the data bus */ void sprtmtch_update_irq( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int irq = (state->sound_irq ? 0x08 : 0) | ((state->vblank_irq) ? 0x10 : 0) | ((state->blitter_irq) ? 0x20 : 0) ; cpu_set_input_line_and_vector(state->maincpu, 0, irq ? ASSERT_LINE : CLEAR_LINE, 0xc7 | irq); /* rst $xx */ } static WRITE8_HANDLER( dynax_vblank_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->vblank_irq = 0; sprtmtch_update_irq(space->machine); } static WRITE8_HANDLER( dynax_blitter_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blitter_irq = 0; sprtmtch_update_irq(space->machine); } static INTERRUPT_GEN( sprtmtch_vblank_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->vblank_irq = 1; sprtmtch_update_irq(device->machine); } static void sprtmtch_sound_callback( running_device *device, int state ) { - dynax_state *driver_state = (dynax_state *)device->machine->driver_data; + dynax_state *driver_state = device->machine->driver_data(); driver_state->sound_irq = state; sprtmtch_update_irq(device->machine); } @@ -141,35 +141,35 @@ static void sprtmtch_sound_callback( running_device *device, int state ) /* It runs in IM 0, thus needs an opcode on the data bus */ void jantouki_update_irq(running_machine *machine) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int irq = ((state->blitter_irq) ? 0x08 : 0) | ((state->blitter2_irq) ? 0x10 : 0) | ((state->vblank_irq) ? 0x20 : 0) ; cpu_set_input_line_and_vector(state->maincpu, 0, irq ? ASSERT_LINE : CLEAR_LINE, 0xc7 | irq); /* rst $xx */ } static WRITE8_HANDLER( jantouki_vblank_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->vblank_irq = 0; jantouki_update_irq(space->machine); } static WRITE8_HANDLER( jantouki_blitter_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blitter_irq = data; jantouki_update_irq(space->machine); } static WRITE8_HANDLER( jantouki_blitter2_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blitter2_irq = data; jantouki_update_irq(space->machine); } static INTERRUPT_GEN( jantouki_vblank_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->vblank_irq = 1; jantouki_update_irq(device->machine); } @@ -181,28 +181,28 @@ static INTERRUPT_GEN( jantouki_vblank_interrupt ) static void jantouki_sound_update_irq(running_machine *machine) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int irq = ((state->sound_irq) ? 0x08 : 0) | ((state->soundlatch_irq) ? 0x10 : 0) | ((state->sound_vblank_irq) ? 0x20 : 0) ; cpu_set_input_line_and_vector(state->soundcpu, 0, irq ? ASSERT_LINE : CLEAR_LINE, 0xc7 | irq); /* rst $xx */ } static INTERRUPT_GEN( jantouki_sound_vblank_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->sound_vblank_irq = 1; jantouki_sound_update_irq(device->machine); } static WRITE8_HANDLER( jantouki_sound_vblank_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->sound_vblank_irq = 0; jantouki_sound_update_irq(space->machine); } static void jantouki_sound_callback(running_device *device, int state) { - dynax_state *driver_state = (dynax_state *)device->machine->driver_data; + dynax_state *driver_state = device->machine->driver_data(); driver_state->sound_irq = state; jantouki_sound_update_irq(device->machine); } @@ -238,7 +238,7 @@ static READ8_HANDLER( ret_ff ) static READ8_HANDLER( hanamai_keyboard_0_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int res = 0x3f; /* the game reads all rows at once (keyb = 0) to check if a key is pressed */ @@ -253,7 +253,7 @@ static READ8_HANDLER( hanamai_keyboard_0_r ) static READ8_HANDLER( hanamai_keyboard_1_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int res = 0x3f; /* the game reads all rows at once (keyb = 0) to check if a key is pressed */ @@ -268,7 +268,7 @@ static READ8_HANDLER( hanamai_keyboard_1_r ) static WRITE8_HANDLER( hanamai_keyboard_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->keyb = data; } @@ -286,7 +286,7 @@ static WRITE8_HANDLER( jantouki_sound_rombank_w ) static WRITE8_HANDLER( hnoridur_rombank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int bank_n = (memory_region_length(space->machine, "maincpu") - 0x10000) / 0x8000; //logerror("%04x: rom bank = %02x\n", cpu_get_pc(space->cpu), data); @@ -300,14 +300,14 @@ static WRITE8_HANDLER( hnoridur_rombank_w ) static WRITE8_HANDLER( hnoridur_palbank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->palbank = data & 0x0f; dynax_blit_palbank_w(space, 0, data); } static WRITE8_HANDLER( hnoridur_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->hnoridur_bank) { @@ -348,7 +348,7 @@ static WRITE8_HANDLER( hnoridur_palette_w ) static WRITE8_HANDLER( yarunara_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int addr = 512 * state->palbank + offset; switch (state->hnoridur_bank) @@ -380,7 +380,7 @@ static WRITE8_HANDLER( yarunara_palette_w ) static WRITE8_HANDLER( nanajign_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->hnoridur_bank) { @@ -410,7 +410,7 @@ static WRITE8_HANDLER( nanajign_palette_w ) static void adpcm_int( running_device *device ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); msm5205_data_w(device, state->msm5205next >> 4); state->msm5205next <<= 4; @@ -425,7 +425,7 @@ static void adpcm_int( running_device *device ) static void adpcm_int_cpu1( running_device *device ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); msm5205_data_w(device, state->msm5205next >> 4); state->msm5205next <<= 4; @@ -440,20 +440,20 @@ static void adpcm_int_cpu1( running_device *device ) static WRITE8_HANDLER( adpcm_data_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->msm5205next = data; } static WRITE8_DEVICE_HANDLER( adpcm_reset_w ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->resetkludge = data & 1; msm5205_reset_w(device, ~data & 1); } static MACHINE_RESET( adpcm ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); /* start with the MSM5205 reset */ state->resetkludge = 0; msm5205_reset_w(machine->device("msm"), 1); @@ -608,7 +608,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( hjingi_bank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->hnoridur_bank = data; } @@ -619,13 +619,13 @@ static WRITE8_HANDLER( hjingi_lockout_w ) static WRITE8_HANDLER( hjingi_hopper_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->hopper = data & 0x01; } static UINT8 hjingi_hopper_bit( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); return (state->hopper && !(machine->primary_screen->frame_number() % 10)) ? 0 : (1 << 6); } @@ -705,7 +705,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( yarunara_input_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (offset) { @@ -720,7 +720,7 @@ static WRITE8_HANDLER( yarunara_input_w ) static READ8_HANDLER( yarunara_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; @@ -765,7 +765,7 @@ static READ8_HANDLER( yarunara_input_r ) static WRITE8_HANDLER( yarunara_rombank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data); state->hnoridur_bank = data; @@ -961,13 +961,13 @@ ADDRESS_MAP_END static READ8_HANDLER( jantouki_soundlatch_ack_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return (state->soundlatch_ack) ? 0x80 : 0; } static WRITE8_HANDLER( jantouki_soundlatch_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->soundlatch_ack = 1; state->soundlatch_full = 1; @@ -1026,7 +1026,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( jantouki_soundlatch_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->soundlatch_ack = data; state->soundlatch_irq = 0; jantouki_sound_update_irq(space->machine); @@ -1034,14 +1034,14 @@ static WRITE8_HANDLER( jantouki_soundlatch_ack_w ) static READ8_HANDLER( jantouki_soundlatch_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->soundlatch_full = 0; return state->latch; } static READ8_HANDLER( jantouki_soundlatch_status_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return (state->soundlatch_full) ? 0 : 0x80; } @@ -1072,7 +1072,7 @@ static READ8_HANDLER( mjelctrn_keyboard_1_r ) static READ8_HANDLER( mjelctrn_dsw_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int dsw = (state->keyb & 0xc0) >> 6; static const char *const dswnames[] = { "DSW0", "DSW1", "DSW3", "DSW4" }; @@ -1081,7 +1081,7 @@ static READ8_HANDLER( mjelctrn_dsw_r ) static WRITE8_HANDLER( mjelctrn_blitter_ack_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blitter_irq = 0; } @@ -1130,20 +1130,20 @@ ADDRESS_MAP_END static WRITE8_HANDLER( htengoku_select_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->input_sel = data; state->keyb = 0; } static WRITE8_DEVICE_HANDLER( htengoku_dsw_w ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->dsw_sel = data; } static READ8_DEVICE_HANDLER( htengoku_dsw_r ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(device->machine, "DSW0"); if (!BIT(state->dsw_sel, 1)) return input_port_read(device->machine, "DSW1"); if (!BIT(state->dsw_sel, 2)) return input_port_read(device->machine, "DSW2"); @@ -1156,7 +1156,7 @@ static READ8_DEVICE_HANDLER( htengoku_dsw_r ) static WRITE8_HANDLER( htengoku_coin_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -1181,7 +1181,7 @@ static WRITE8_HANDLER( htengoku_coin_w ) static READ8_HANDLER( htengoku_input_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; @@ -1197,7 +1197,7 @@ static READ8_HANDLER( htengoku_input_r ) static READ8_HANDLER( htengoku_coin_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -1212,7 +1212,7 @@ static READ8_HANDLER( htengoku_coin_r ) static WRITE8_HANDLER( htengoku_rombank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data & 0x07); state->hnoridur_bank = data; @@ -1275,7 +1275,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( tenkai_ipsel_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (offset) { case 0: state->input_sel = data; @@ -1289,7 +1289,7 @@ static WRITE8_HANDLER( tenkai_ipsel_w ) static WRITE8_HANDLER( tenkai_ip_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->input_sel) { @@ -1311,7 +1311,7 @@ static WRITE8_HANDLER( tenkai_ip_w ) static READ8_HANDLER( tenkai_ip_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); static const char *const keynames0[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; //static const char *const keynames1[] = { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }; @@ -1361,13 +1361,13 @@ static READ8_HANDLER( tenkai_ip_r ) static WRITE8_DEVICE_HANDLER( tenkai_dswsel_w ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->dsw_sel = data; } static READ8_DEVICE_HANDLER( tenkai_dsw_r ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); if (!BIT(state->dsw_sel, 0)) return input_port_read(device->machine, "DSW0"); if (!BIT(state->dsw_sel, 1)) return input_port_read(device->machine, "DSW1"); @@ -1381,13 +1381,13 @@ static READ8_DEVICE_HANDLER( tenkai_dsw_r ) static READ8_HANDLER( tenkai_palette_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return state->palette_ram[512 * state->palbank + offset]; } static WRITE8_HANDLER( tenkai_palette_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int addr = 512 * state->palbank + offset; state->palette_ram[addr] = data; @@ -1403,7 +1403,7 @@ static WRITE8_HANDLER( tenkai_palette_w ) static void tenkai_update_rombank( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->romptr = memory_region(machine, "maincpu") + 0x10000 + 0x8000 * state->rombank; // logerror("rombank = %02x\n", state->rombank); } @@ -1415,26 +1415,26 @@ static READ8_HANDLER( tenkai_p3_r ) static WRITE8_HANDLER( tenkai_p3_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->rombank = ((data & 0x04) << 1) | (state->rombank & 0x07); tenkai_update_rombank(space->machine); } static WRITE8_HANDLER( tenkai_p4_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->rombank = (state->rombank & 0x08) | ((data & 0x0e) >> 1); tenkai_update_rombank(space->machine); } static READ8_HANDLER( tenkai_p5_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); return state->tenkai_p5_val; } static WRITE8_HANDLER( tenkai_p6_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->tenkai_p5_val &= 0x0f; if (data & 0x0f) @@ -1443,7 +1443,7 @@ static WRITE8_HANDLER( tenkai_p6_w ) static WRITE8_HANDLER( tenkai_p7_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->tenkai_p5_val &= 0xf0; if (data & 0x03) @@ -1452,7 +1452,7 @@ static WRITE8_HANDLER( tenkai_p7_w ) static WRITE8_HANDLER( tenkai_p8_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->rombank = ((data & 0x08) << 1) | (state->rombank & 0x0f); tenkai_update_rombank(space->machine); } @@ -1464,7 +1464,7 @@ static READ8_HANDLER( tenkai_p8_r ) static READ8_HANDLER( tenkai_8000_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->rombank < 0x10) return state->romptr[offset]; @@ -1479,7 +1479,7 @@ static READ8_HANDLER( tenkai_8000_r ) static WRITE8_HANDLER( tenkai_8000_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if ((state->rombank == 0x10) && (offset < 0x10)) { @@ -1497,20 +1497,20 @@ static WRITE8_HANDLER( tenkai_8000_w ) static void tenkai_show_6c( running_machine *machine ) { -// dynax_state *state = (dynax_state *)machine->driver_data; +// dynax_state *state = machine->driver_data(); // popmessage("%02x %02x", state->tenkai_6c, state->tenkai_70); } static WRITE8_HANDLER( tenkai_6c_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->tenkai_6c = data; tenkai_show_6c(space->machine); } static WRITE8_HANDLER( tenkai_70_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->tenkai_70 = data; tenkai_show_6c(space->machine); } @@ -1569,7 +1569,7 @@ ADDRESS_MAP_END static READ8_HANDLER( gekisha_keyboard_0_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int res = 0x3f; if (!BIT(state->keyb, 0)) res &= input_port_read(space->machine, "KEY0"); @@ -1582,7 +1582,7 @@ static READ8_HANDLER( gekisha_keyboard_0_r ) } static READ8_HANDLER( gekisha_keyboard_1_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int res = 0x3f; if (!BIT(state->keyb, 0)) res &= input_port_read(space->machine, "KEY5"); @@ -1601,28 +1601,28 @@ static READ8_HANDLER( gekisha_keyboard_1_r ) static WRITE8_HANDLER( gekisha_hopper_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->gekisha_val[offset] = data; // popmessage("%02x %02x", gekisha_val[0], gekisha_val[1]); } static void gekisha_set_rombank( running_machine *machine, UINT8 data ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->rombank = data; state->romptr = memory_region(machine, "maincpu") + 0x8000 + state->rombank * 0x8000; } static WRITE8_HANDLER( gekisha_p4_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->gekisha_rom_enable = !BIT(data, 3); gekisha_set_rombank(space->machine, BIT(data, 2)); } static READ8_HANDLER( gekisha_8000_r ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->gekisha_rom_enable) return state->romptr[offset]; @@ -1644,7 +1644,7 @@ static READ8_HANDLER( gekisha_8000_r ) static WRITE8_HANDLER( gekisha_8000_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (!state->gekisha_rom_enable) { @@ -4202,7 +4202,7 @@ INPUT_PORTS_END static MACHINE_START( dynax ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->soundcpu = machine->device("soundcpu"); @@ -4242,7 +4242,7 @@ static MACHINE_START( dynax ) static MACHINE_RESET( dynax ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); if (machine->device("msm") != NULL) MACHINE_RESET_CALL(adpcm); @@ -4611,7 +4611,7 @@ MACHINE_DRIVER_END static INTERRUPT_GEN( yarunara_clock_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); state->yarunara_clk_toggle ^= 1; if (state->yarunara_clk_toggle == 1) @@ -4694,7 +4694,7 @@ static const msm5205_interface jantouki_msm5205_interface = static MACHINE_START( jantouki ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); UINT8 *MAIN = memory_region(machine, "maincpu"); UINT8 *SOUND = memory_region(machine, "soundcpu"); @@ -4781,14 +4781,14 @@ MACHINE_DRIVER_END 0xf8 is vblank */ void mjelctrn_update_irq( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->blitter_irq = 1; cpu_set_input_line_and_vector(state->maincpu, 0, HOLD_LINE, 0xfa); } static INTERRUPT_GEN( mjelctrn_vblank_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); // This is a kludge to avoid losing blitter interrupts // there should be a vblank ack mechanism @@ -4818,14 +4818,14 @@ MACHINE_DRIVER_END 0x46 is a periodic irq? */ void neruton_update_irq( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->blitter_irq = 1; cpu_set_input_line_and_vector(state->maincpu, 0, HOLD_LINE, 0x42); } static INTERRUPT_GEN( neruton_vblank_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); // This is a kludge to avoid losing blitter interrupts // there should be a vblank ack mechanism @@ -4856,7 +4856,7 @@ MACHINE_DRIVER_END 0x40 is vblank */ static INTERRUPT_GEN( majxtal7_vblank_interrupt ) { - dynax_state *state = (dynax_state *)device->machine->driver_data; + dynax_state *state = device->machine->driver_data(); // This is a kludge to avoid losing blitter interrupts // there should be a vblank ack mechanism @@ -5023,7 +5023,7 @@ MACHINE_DRIVER_END static STATE_POSTLOAD( gekisha_bank_postload ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); gekisha_set_rombank(machine, state->rombank); } diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index f34ba20009a..a1176a17df8 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -45,12 +45,13 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f #include "cpu/z80/z80.h" #include "sound/okim6295.h" -class egghunt_state +class egghunt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, egghunt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, egghunt_state(machine)); } - egghunt_state(running_machine &machine) { } + egghunt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgram; @@ -73,7 +74,7 @@ public: static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - egghunt_state *state = (egghunt_state *)machine->driver_data; + egghunt_state *state = machine->driver_data(); int flipscreen = 0; int offs, sx, sy; @@ -112,7 +113,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta static TILE_GET_INFO( get_bg_tile_info ) { - egghunt_state *state = (egghunt_state *)machine->driver_data; + egghunt_state *state = machine->driver_data(); int code = ((state->bgram[tile_index * 2 + 1] << 8) | state->bgram[tile_index * 2]) & 0x3fff; int colour = state->atram[tile_index] & 0x3f; @@ -131,7 +132,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static READ8_HANDLER( egghunt_bgram_r ) { - egghunt_state *state = (egghunt_state *)space->machine->driver_data; + egghunt_state *state = space->machine->driver_data(); if (state->vidram_bank) { return state->spram[offset]; @@ -144,7 +145,7 @@ static READ8_HANDLER( egghunt_bgram_r ) static WRITE8_HANDLER( egghunt_bgram_w ) { - egghunt_state *state = (egghunt_state *)space->machine->driver_data; + egghunt_state *state = space->machine->driver_data(); if (state->vidram_bank) { state->spram[offset] = data; @@ -158,7 +159,7 @@ static WRITE8_HANDLER( egghunt_bgram_w ) static WRITE8_HANDLER( egghunt_atram_w ) { - egghunt_state *state = (egghunt_state *)space->machine->driver_data; + egghunt_state *state = space->machine->driver_data(); state->atram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -166,7 +167,7 @@ static WRITE8_HANDLER( egghunt_atram_w ) static VIDEO_START(egghunt) { - egghunt_state *state = (egghunt_state *)machine->driver_data; + egghunt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->bgram = auto_alloc_array(machine, UINT8, 0x1000); @@ -178,7 +179,7 @@ static VIDEO_START(egghunt) static VIDEO_UPDATE(egghunt) { - egghunt_state *state = (egghunt_state *)screen->machine->driver_data; + egghunt_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -186,7 +187,7 @@ static VIDEO_UPDATE(egghunt) static WRITE8_HANDLER( egghunt_gfx_banking_w ) { - egghunt_state *state = (egghunt_state *)space->machine->driver_data; + egghunt_state *state = space->machine->driver_data(); // data & 0x03 is used for tile banking // data & 0x30 is used for sprites banking state->gfx_banking = data & 0x33; @@ -196,26 +197,26 @@ static WRITE8_HANDLER( egghunt_gfx_banking_w ) static WRITE8_HANDLER( egghunt_vidram_bank_w ) { - egghunt_state *state = (egghunt_state *)space->machine->driver_data; + egghunt_state *state = space->machine->driver_data(); state->vidram_bank = data & 1; } static WRITE8_HANDLER( egghunt_soundlatch_w ) { - egghunt_state *state = (egghunt_state *)space->machine->driver_data; + egghunt_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } static READ8_DEVICE_HANDLER( egghunt_okibanking_r ) { - egghunt_state *state = (egghunt_state *)device->machine->driver_data; + egghunt_state *state = device->machine->driver_data(); return state->okibanking; } static WRITE8_DEVICE_HANDLER( egghunt_okibanking_w ) { - egghunt_state *state = (egghunt_state *)device->machine->driver_data; + egghunt_state *state = device->machine->driver_data(); state->okibanking = data; okim6295_device *oki = downcast(device); oki->set_bank_base((data & 0x10) ? 0x40000 : 0); @@ -392,7 +393,7 @@ GFXDECODE_END static MACHINE_START( egghunt ) { - egghunt_state *state = (egghunt_state *)machine->driver_data; + egghunt_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -403,7 +404,7 @@ static MACHINE_START( egghunt ) static MACHINE_RESET( egghunt ) { - egghunt_state *state = (egghunt_state *)machine->driver_data; + egghunt_state *state = machine->driver_data(); state->gfx_banking = 0; state->okibanking = 0; state->vidram_bank = 0; diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index 2f1455b8c55..f027b7334dc 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -8,12 +8,13 @@ #include "cpu/s2650/s2650.h" -class embargo_state +class embargo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, embargo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, embargo_state(machine)); } - embargo_state(running_machine &machine) { } + embargo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -34,7 +35,7 @@ public: static VIDEO_UPDATE( embargo ) { - embargo_state *state = (embargo_state *)screen->machine->driver_data; + embargo_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -68,14 +69,14 @@ static VIDEO_UPDATE( embargo ) static READ8_HANDLER( input_port_bit_r ) { - embargo_state *state = (embargo_state *)space->machine->driver_data; + embargo_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "IN1") << (7 - state->input_select)) & 0x80; } static READ8_HANDLER( dial_r ) { - embargo_state *state = (embargo_state *)space->machine->driver_data; + embargo_state *state = space->machine->driver_data(); UINT8 lo = 0; UINT8 hi = 0; @@ -127,21 +128,21 @@ static READ8_HANDLER( dial_r ) static WRITE8_HANDLER( port_1_w ) { - embargo_state *state = (embargo_state *)space->machine->driver_data; + embargo_state *state = space->machine->driver_data(); state->dial_enable_1 = data & 0x01; /* other bits unknown */ } static WRITE8_HANDLER( port_2_w ) { - embargo_state *state = (embargo_state *)space->machine->driver_data; + embargo_state *state = space->machine->driver_data(); state->dial_enable_2 = data & 0x01; /* other bits unknown */ } static WRITE8_HANDLER( input_select_w ) { - embargo_state *state = (embargo_state *)space->machine->driver_data; + embargo_state *state = space->machine->driver_data(); state->input_select = data & 0x07; } @@ -229,7 +230,7 @@ INPUT_PORTS_END static MACHINE_START( embargo ) { - embargo_state *state = (embargo_state *)machine->driver_data; + embargo_state *state = machine->driver_data(); /* register for state saving */ state_save_register_global(machine, state->dial_enable_1); @@ -240,7 +241,7 @@ static MACHINE_START( embargo ) static MACHINE_RESET( embargo ) { - embargo_state *state = (embargo_state *)machine->driver_data; + embargo_state *state = machine->driver_data(); state->dial_enable_1 = 0; state->dial_enable_2 = 0; diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index b87030959bc..78077caf076 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -57,12 +57,13 @@ TODO: #define NUM_PENS (8) -class enigma2_state +class enigma2_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, enigma2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, enigma2_state(machine)); } - enigma2_state(running_machine &machine) { } + enigma2_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -104,14 +105,14 @@ INLINE int vysnc_chain_counter_to_vpos( UINT16 counter ) static TIMER_CALLBACK( interrupt_clear_callback ) { - enigma2_state *state = (enigma2_state *)machine->driver_data; + enigma2_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); } static TIMER_CALLBACK( interrupt_assert_callback ) { - enigma2_state *state = (enigma2_state *)machine->driver_data; + enigma2_state *state = machine->driver_data(); UINT16 next_counter; int next_vpos; @@ -135,7 +136,7 @@ static TIMER_CALLBACK( interrupt_assert_callback ) static void create_interrupt_timers( running_machine *machine ) { - enigma2_state *state = (enigma2_state *)machine->driver_data; + enigma2_state *state = machine->driver_data(); state->interrupt_clear_timer = timer_alloc(machine, interrupt_clear_callback, NULL); state->interrupt_assert_timer = timer_alloc(machine, interrupt_assert_callback, NULL); } @@ -143,7 +144,7 @@ static void create_interrupt_timers( running_machine *machine ) static void start_interrupt_timers( running_machine *machine ) { - enigma2_state *state = (enigma2_state *)machine->driver_data; + enigma2_state *state = machine->driver_data(); int vpos = vysnc_chain_counter_to_vpos(INT_TRIGGER_COUNT_1); timer_adjust_oneshot(state->interrupt_assert_timer, machine->primary_screen->time_until_pos(vpos), 0); } @@ -152,7 +153,7 @@ static void start_interrupt_timers( running_machine *machine ) static MACHINE_START( enigma2 ) { - enigma2_state *state = (enigma2_state *)machine->driver_data; + enigma2_state *state = machine->driver_data(); create_interrupt_timers(machine); state->maincpu = machine->device("maincpu"); @@ -168,7 +169,7 @@ static MACHINE_START( enigma2 ) static MACHINE_RESET( enigma2 ) { - enigma2_state *state = (enigma2_state *)machine->driver_data; + enigma2_state *state = machine->driver_data(); cputag_set_input_line(machine, "audiocpu", INPUT_LINE_NMI, CLEAR_LINE); state->last_sound_data = 0; @@ -201,7 +202,7 @@ static void get_pens(pen_t *pens) static VIDEO_UPDATE( enigma2 ) { - enigma2_state *state = (enigma2_state *)screen->machine->driver_data; + enigma2_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; const rectangle &visarea = screen->visible_area(); @@ -289,7 +290,7 @@ static VIDEO_UPDATE( enigma2 ) static VIDEO_UPDATE( enigma2a ) { - enigma2_state *state = (enigma2_state *)screen->machine->driver_data; + enigma2_state *state = screen->machine->driver_data(); UINT8 x = 0; const rectangle &visarea = screen->visible_area(); UINT16 bitmap_y = visarea.min_y; @@ -351,7 +352,7 @@ static VIDEO_UPDATE( enigma2a ) static READ8_HANDLER( dip_switch_r ) { - enigma2_state *state = (enigma2_state *)space->machine->driver_data; + enigma2_state *state = space->machine->driver_data(); UINT8 ret = 0x00; if (LOG_PROT) logerror("DIP SW Read: %x at %x (prot data %x)\n", offset, cpu_get_pc(space->cpu), state->protection_data); @@ -382,7 +383,7 @@ static READ8_HANDLER( dip_switch_r ) static WRITE8_HANDLER( sound_data_w ) { - enigma2_state *state = (enigma2_state *)space->machine->driver_data; + enigma2_state *state = space->machine->driver_data(); /* clock sound latch shift register on rising edge of D2 */ if (!(data & 0x04) && (state->last_sound_data & 0x04)) state->sound_latch = (state->sound_latch << 1) | (~data & 0x01); @@ -395,14 +396,14 @@ static WRITE8_HANDLER( sound_data_w ) static READ8_DEVICE_HANDLER( sound_latch_r ) { - enigma2_state *state = (enigma2_state *)device->machine->driver_data; + enigma2_state *state = device->machine->driver_data(); return BITSWAP8(state->sound_latch,0,1,2,3,4,5,6,7); } static WRITE8_DEVICE_HANDLER( protection_data_w ) { - enigma2_state *state = (enigma2_state *)device->machine->driver_data; + enigma2_state *state = device->machine->driver_data(); if (LOG_PROT) logerror("%s: Protection Data Write: %x\n", cpuexec_describe_context(device->machine), data); state->protection_data = data; } @@ -410,7 +411,7 @@ static WRITE8_DEVICE_HANDLER( protection_data_w ) static WRITE8_HANDLER( enigma2_flip_screen_w ) { - enigma2_state *state = (enigma2_state *)space->machine->driver_data; + enigma2_state *state = space->machine->driver_data(); state->flip_screen = ((data >> 5) & 0x01) && ((input_port_read(space->machine, "DSW") & 0x20) == 0x20); } @@ -423,7 +424,7 @@ static CUSTOM_INPUT( p1_controls_r ) static CUSTOM_INPUT( p2_controls_r ) { - enigma2_state *state = (enigma2_state *)field->port->machine->driver_data; + enigma2_state *state = field->port->machine->driver_data(); if (state->flip_screen) return input_port_read(field->port->machine, "P2CONTROLS"); else diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index f3adebe064e..e2a07547e3e 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -36,7 +36,7 @@ static WRITE8_HANDLER( dealer_decrypt_rom ) { - epos_state *state = (epos_state *)space->machine->driver_data; + epos_state *state = space->machine->driver_data(); if (offset & 0x04) state->counter = (state->counter + 1) & 0x03; @@ -365,7 +365,7 @@ INPUT_PORTS_END static MACHINE_START( epos ) { - epos_state *state = (epos_state *)machine->driver_data; + epos_state *state = machine->driver_data(); state_save_register_global(machine, state->palette); state_save_register_global(machine, state->counter); @@ -373,7 +373,7 @@ static MACHINE_START( epos ) static MACHINE_RESET( epos ) { - epos_state *state = (epos_state *)machine->driver_data; + epos_state *state = machine->driver_data(); state->palette = 0; state->counter = 0; diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index c4b8e36b0b8..55d330146ca 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -38,14 +38,14 @@ static void update_interrupts(running_machine *machine) { - eprom_state *state = (eprom_state *)machine->driver_data; + eprom_state *state = machine->driver_data(); - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); if (machine->device("extra") != NULL) - cputag_set_input_line(machine, "extra", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "extra", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -57,10 +57,10 @@ static MACHINE_START( eprom ) static MACHINE_RESET( eprom ) { - eprom_state *state = (eprom_state *)machine->driver_data; + eprom_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, eprom_scanline_update, 8); atarijsa_reset(); } @@ -75,11 +75,11 @@ static MACHINE_RESET( eprom ) static READ16_HANDLER( special_port1_r ) { - eprom_state *state = (eprom_state *)space->machine->driver_data; + eprom_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "260010"); - if (state->atarigen.sound_to_cpu_ready) result ^= 0x0004; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0008; + if (state->sound_to_cpu_ready) result ^= 0x0004; + if (state->cpu_to_sound_ready) result ^= 0x0008; result ^= 0x0010; return result; @@ -106,7 +106,7 @@ static READ16_HANDLER( adc_r ) static WRITE16_HANDLER( eprom_latch_w ) { - eprom_state *state = (eprom_state *)space->machine->driver_data; + eprom_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7 && (space->machine->device("extra") != NULL)) { @@ -134,14 +134,14 @@ static WRITE16_HANDLER( eprom_latch_w ) static READ16_HANDLER( sync_r ) { - eprom_state *state = (eprom_state *)space->machine->driver_data; + eprom_state *state = space->machine->driver_data(); return state->sync_data[offset]; } static WRITE16_HANDLER( sync_w ) { - eprom_state *state = (eprom_state *)space->machine->driver_data; + eprom_state *state = space->machine->driver_data(); int oldword = state->sync_data[offset]; int newword = oldword; COMBINE_DATA(&newword); @@ -161,7 +161,7 @@ static WRITE16_HANDLER( sync_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_ROM - AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(eprom_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(eprom_state, eeprom, eeprom_size) AM_RANGE(0x16cc00, 0x16cc01) AM_RAM AM_SHARE("share2") AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE("share1") AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) @@ -175,18 +175,18 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3f0000, 0x3f1fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(eprom_state, atarigen.playfield) + AM_RANGE(0x3f0000, 0x3f1fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(eprom_state, playfield) AM_RANGE(0x3f2000, 0x3f3fff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f4000, 0x3f4f7f) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(eprom_state, atarigen.alpha) + AM_RANGE(0x3f4000, 0x3f4f7f) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(eprom_state, alpha) AM_RANGE(0x3f4f80, 0x3f4fff) AM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x3f8000, 0x3f9fff) AM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(eprom_state, atarigen.playfield_upper) + AM_RANGE(0x3f8000, 0x3f9fff) AM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(eprom_state, playfield_upper) AM_RANGE(0x3f0000, 0x3f9fff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( guts_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_ROM - AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(eprom_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(eprom_state, eeprom, eeprom_size) AM_RANGE(0x16cc00, 0x16cc01) AM_RAM AM_SHARE("share2") AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE("share1") AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) @@ -200,10 +200,10 @@ static ADDRESS_MAP_START( guts_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM AM_BASE_GENERIC(paletteram) - AM_RANGE(0xff0000, 0xff1fff) AM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(eprom_state, atarigen.playfield_upper) - AM_RANGE(0xff8000, 0xff9fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(eprom_state, atarigen.playfield) + AM_RANGE(0xff0000, 0xff1fff) AM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(eprom_state, playfield_upper) + AM_RANGE(0xff8000, 0xff9fff) AM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(eprom_state, playfield) AM_RANGE(0xffa000, 0xffbfff) AM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0xffc000, 0xffcf7f) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(eprom_state, atarigen.alpha) + AM_RANGE(0xffc000, 0xffcf7f) AM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(eprom_state, alpha) AM_RANGE(0xffcf80, 0xffcfff) AM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0xff0000, 0xff1fff) AM_RAM AM_RANGE(0xff8000, 0xffffff) AM_RAM @@ -728,7 +728,7 @@ ROM_END static DRIVER_INIT( eprom ) { - eprom_state *state = (eprom_state *)machine->driver_data; + eprom_state *state = machine->driver_data(); atarijsa_init(machine, "260010", 0x0002); diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index e07bf07f48b..ba484105d22 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -392,13 +392,13 @@ D static TIMER_CALLBACK( equites_nmi_callback ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); cpu_set_input_line(state->audio_cpu, INPUT_LINE_NMI, ASSERT_LINE); } static TIMER_CALLBACK( equites_frq_adjuster_callback ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); UINT8 frq = input_port_read(machine, FRQ_ADJUSTER_TAG); msm5232_set_clock(state->msm, MSM5232_MIN_CLOCK + frq * (MSM5232_MAX_CLOCK - MSM5232_MIN_CLOCK) / 100); @@ -412,7 +412,7 @@ static TIMER_CALLBACK( equites_frq_adjuster_callback ) static SOUND_START(equites) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); state->nmi_timer = timer_alloc(machine, equites_nmi_callback, NULL); state->adjuster_timer = timer_alloc(machine, equites_frq_adjuster_callback, NULL); @@ -421,7 +421,7 @@ static SOUND_START(equites) static WRITE8_HANDLER(equites_c0f8_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); switch (offset) { @@ -470,7 +470,7 @@ static WRITE8_HANDLER(equites_c0f8_w) static WRITE8_DEVICE_HANDLER( equites_8910porta_w ) { - equites_state *state = (equites_state *)device->machine->driver_data; + equites_state *state = device->machine->driver_data(); // bongo 1 sample_set_volume(device, 0, ((data & 0x30) >> 4) * 0.33); @@ -491,7 +491,7 @@ popmessage("HH %d(%d) CYM %d(%d)", state->hihat, BIT(state->ay_port_b, 6), state static WRITE8_DEVICE_HANDLER( equites_8910portb_w ) { - equites_state *state = (equites_state *)device->machine->driver_data; + equites_state *state = device->machine->driver_data(); #if POPDRUMKIT if (data & ~state->ay_port_b & 0x08) state->cymbal++; if (data & ~state->ay_port_b & 0x04) state->hihat++; @@ -527,14 +527,14 @@ popmessage("HH %d(%d) CYM %d(%d)",state->hihat,BIT(state->ay_port_b,6),state->cy static WRITE8_HANDLER(equites_cymbal_ctrl_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); state->eq_cymbal_ctrl++; } static void equites_update_dac( running_machine *machine ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); // there is only one latch, which is used to drive two DAC channels. // When the channel is enabled in the 4066, it goes to a series of @@ -551,14 +551,14 @@ static void equites_update_dac( running_machine *machine ) static WRITE8_HANDLER( equites_dac_latch_w ) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); state->dac_latch = data << 2; equites_update_dac(space->machine); } static WRITE8_HANDLER( equites_8155_portb_w ) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); state->eq8155_port_b = data; equites_update_dac(space->machine); } @@ -584,7 +584,7 @@ static INTERRUPT_GEN( equites_interrupt ) static WRITE8_HANDLER(equites_8155_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); // FIXME proper 8155 emulation must be implemented switch( offset ) @@ -638,19 +638,19 @@ static READ16_HANDLER(hvoltage_debug_r) static CUSTOM_INPUT( gekisou_unknown_status ) { - equites_state *state = (equites_state *)field->port->machine->driver_data; + equites_state *state = field->port->machine->driver_data(); return state->unknown_bit; } static WRITE16_HANDLER( gekisou_unknown_0_w ) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); state->unknown_bit = 0; } static WRITE16_HANDLER( gekisou_unknown_1_w ) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); state->unknown_bit = 1; } @@ -660,7 +660,7 @@ static WRITE16_HANDLER( gekisou_unknown_1_w ) static READ16_HANDLER(equites_spriteram_kludge_r) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (state->spriteram[0] == 0x5555) return 0; else @@ -669,26 +669,26 @@ static READ16_HANDLER(equites_spriteram_kludge_r) static READ16_HANDLER(mcu_r) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); return 0xff00 | state->mcu_ram[offset]; } static WRITE16_HANDLER(mcu_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->mcu_ram[offset] = data & 0xff; } static WRITE16_HANDLER( mcu_halt_assert_w ) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); cpu_set_input_line(state->mcu, INPUT_LINE_HALT, ASSERT_LINE); } static WRITE16_HANDLER( mcu_halt_clear_w ) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); cpu_set_input_line(state->mcu, INPUT_LINE_HALT, CLEAR_LINE); } @@ -1183,7 +1183,7 @@ MACHINE_DRIVER_END static MACHINE_START( equites ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); state->mcu = machine->device("mcu"); state->audio_cpu = machine->device("audiocpu"); @@ -1215,7 +1215,7 @@ static MACHINE_START( equites ) static MACHINE_RESET( equites ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); flip_screen_set(machine, 0); diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 58e8d2a6507..ef9c7e02156 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -60,13 +60,13 @@ Head Panic static WRITE16_HANDLER( esd16_spriteram_w ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); COMBINE_DATA(&state->spriteram[offset]); } static WRITE16_HANDLER( esd16_sound_command_w ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { soundlatch_w(space, 0, data & 0xff); @@ -105,7 +105,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER(hedpanic_platform_w) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); int offsets = state->headpanic_platform_x[0] + 0x40 * state->headpanic_platform_y[0]; state->vram_1[offsets] = data; @@ -115,7 +115,7 @@ static WRITE16_HANDLER(hedpanic_platform_w) static READ16_HANDLER( esd_eeprom_r ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { return ((eeprom_read_bit(state->eeprom) & 0x01) << 15); @@ -240,7 +240,7 @@ ADDRESS_MAP_END static READ8_HANDLER( esd16_sound_command_r ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); /* Clear IRQ only after reading the command, or some get lost */ cpu_set_input_line(state->audio_cpu, 0, CLEAR_LINE); @@ -518,7 +518,7 @@ GFXDECODE_END static MACHINE_START( esd16 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); UINT8 *AUDIO = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 17, &AUDIO[0x0000], 0x4000); @@ -531,7 +531,7 @@ static MACHINE_START( esd16 ) static MACHINE_RESET( esd16 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); state->tilemap0_color = 0; } diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index 3990cb09731..5f6c754d79c 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -43,14 +43,14 @@ Stephh's notes (based on the games Z80 code and some tests) : static TIMER_CALLBACK( interrupt_disable ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); //interrupt_enable = 0; cpu_interrupt_enable(state->maincpu, 0); } MACHINE_RESET( espial ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->flipscreen = 0; @@ -61,7 +61,7 @@ MACHINE_RESET( espial ) MACHINE_START( espial ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -79,14 +79,14 @@ WRITE8_HANDLER( zodiac_master_interrupt_enable_w ) WRITE8_HANDLER( espial_sound_nmi_enable_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->sound_nmi_enabled = data & 1; } INTERRUPT_GEN( espial_sound_nmi_gen ) { - espial_state *state = (espial_state *)device->machine->driver_data; + espial_state *state = device->machine->driver_data(); if (state->sound_nmi_enabled) nmi_line_pulse(device); @@ -104,7 +104,7 @@ INTERRUPT_GEN( zodiac_master_interrupt ) WRITE8_HANDLER( zodiac_master_soundlatch_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index 033f23fe61a..72729f0286d 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -194,7 +194,7 @@ GFXDECODE_END static MACHINE_START( exedexes ) { - exedexes_state *state = (exedexes_state *)machine->driver_data; + exedexes_state *state = machine->driver_data(); state_save_register_global(machine, state->chon); state_save_register_global(machine, state->objon); @@ -204,7 +204,7 @@ static MACHINE_START( exedexes ) static MACHINE_RESET( exedexes ) { - exedexes_state *state = (exedexes_state *)machine->driver_data; + exedexes_state *state = machine->driver_data(); state->chon = 0; state->objon = 0; diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index fe1dc45e155..a152fa844af 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -133,14 +133,14 @@ Stephh's notes (based on the games Z80 code and some tests) : static CUSTOM_INPUT( exerion_controls_r ) { static const char *const inname[2] = { "P1", "P2" }; - exerion_state *state = (exerion_state *)field->port->machine->driver_data; + exerion_state *state = field->port->machine->driver_data(); return input_port_read(field->port->machine, inname[state->cocktail_flip]) & 0x3f; } static INPUT_CHANGED( coin_inserted ) { - exerion_state *state = (exerion_state *)field->port->machine->driver_data; + exerion_state *state = field->port->machine->driver_data(); /* coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -157,7 +157,7 @@ static INPUT_CHANGED( coin_inserted ) /* protection or some sort of timer. */ static READ8_DEVICE_HANDLER( exerion_porta_r ) { - exerion_state *state = (exerion_state *)device->machine->driver_data; + exerion_state *state = device->machine->driver_data(); state->porta ^= 0x40; return state->porta; } @@ -165,7 +165,7 @@ static READ8_DEVICE_HANDLER( exerion_porta_r ) static WRITE8_DEVICE_HANDLER( exerion_portb_w ) { - exerion_state *state = (exerion_state *)device->machine->driver_data; + exerion_state *state = device->machine->driver_data(); /* pull the expected value from the ROM */ state->porta = memory_region(device->machine, "maincpu")[0x5f76]; state->portb = data; @@ -176,7 +176,7 @@ static WRITE8_DEVICE_HANDLER( exerion_portb_w ) static READ8_HANDLER( exerion_protection_r ) { - exerion_state *state = (exerion_state *)space->machine->driver_data; + exerion_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x4143) return memory_region(space->machine, "maincpu")[0x33c0 + (state->main_ram[0xd] << 2) + offset]; else @@ -384,7 +384,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( exerion ) { - exerion_state *state = (exerion_state *)machine->driver_data; + exerion_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -399,7 +399,7 @@ static MACHINE_START( exerion ) static MACHINE_RESET( exerion ) { - exerion_state *state = (exerion_state *)machine->driver_data; + exerion_state *state = machine->driver_data(); int i; state->porta = 0; diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index 37be5df6e32..2cef71b9076 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -219,7 +219,7 @@ Stephh's notes (based on the games M6502 code and some tests) : static READ8_HANDLER( exprraid_protection_r ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); switch (offset) { case 0: @@ -233,7 +233,7 @@ static READ8_HANDLER( exprraid_protection_r ) static WRITE8_HANDLER( sound_cpu_command_w ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->slave, INPUT_LINE_NMI, PULSE_LINE); } @@ -280,13 +280,13 @@ ADDRESS_MAP_END static INPUT_CHANGED( coin_inserted_deco16 ) { - exprraid_state *state = (exprraid_state *)field->port->machine->driver_data; + exprraid_state *state = field->port->machine->driver_data(); cpu_set_input_line(state->maincpu, DECO16_IRQ_LINE, newval ? CLEAR_LINE : ASSERT_LINE); } static INPUT_CHANGED( coin_inserted_nmi ) { - exprraid_state *state = (exprraid_state *)field->port->machine->driver_data; + exprraid_state *state = field->port->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -441,7 +441,7 @@ GFXDECODE_END /* handler called by the 3812 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int linestate ) { - exprraid_state *state = (exprraid_state *)device->machine->driver_data; + exprraid_state *state = device->machine->driver_data(); cpu_set_input_line_and_vector(state->slave, 0, linestate, 0xff); } @@ -453,7 +453,7 @@ static const ym3526_interface ym3526_config = #if 0 static INTERRUPT_GEN( exprraid_interrupt ) { - exprraid_state *state = (exprraid_state *)device->machine->driver_data; + exprraid_state *state = device->machine->driver_data(); if ((~input_port_read(device->machine, "IN2")) & 0xc0) { @@ -475,7 +475,7 @@ static INTERRUPT_GEN( exprraid_interrupt ) static MACHINE_START( exprraid ) { - exprraid_state *state = (exprraid_state *)machine->driver_data; + exprraid_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->slave = machine->device("slave"); @@ -485,7 +485,7 @@ static MACHINE_START( exprraid ) static MACHINE_RESET( exprraid ) { - exprraid_state *state = (exprraid_state *)machine->driver_data; + exprraid_state *state = machine->driver_data(); state->bg_index[0] = 0; state->bg_index[1] = 0; diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index 99d7dc8e121..b44b2a048ca 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -17,13 +17,14 @@ #include "sound/2151intf.h" #include "sound/okim6295.h" -class mosaicf2_state +class mosaicf2_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaicf2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaicf2_state(machine)); } mosaicf2_state(running_machine &machine) - : maincpu(machine.device("maincpu")) { } + : driver_data_t(machine), + maincpu(machine.device("maincpu")) { } /* memory pointers */ cpu_device * maincpu; @@ -33,7 +34,7 @@ public: static VIDEO_UPDATE( mosaicf2 ) { - mosaicf2_state *state = (mosaicf2_state *)screen->machine->driver_data; + mosaicf2_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < 0x10000; offs++) @@ -63,7 +64,7 @@ ADDRESS_MAP_END static READ32_HANDLER( f32_input_port_1_r ) { /* burn a bunch of cycles because this is polled frequently during busy loops */ - mosaicf2_state *state = (mosaicf2_state *)space->machine->driver_data; + mosaicf2_state *state = space->machine->driver_data(); offs_t pc = state->maincpu->pc(); if ((pc == 0x000379de) || (pc == 0x000379cc) ) state->maincpu->eat_cycles(100); diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 53d3bc8501a..c6dfe0144b3 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -30,13 +30,13 @@ static READ16_HANDLER( sharedram_r ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE16_HANDLER( sharedram_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sharedram[offset]); } @@ -66,7 +66,7 @@ static WRITE8_HANDLER( f1gp_sh_bankswitch_w ) static WRITE16_HANDLER( sound_command_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -78,13 +78,13 @@ static WRITE16_HANDLER( sound_command_w ) static READ16_HANDLER( command_pending_r ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); return (state->pending_command ? 0xff : 0); } static WRITE8_HANDLER( pending_command_clear_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); state->pending_command = 0; } @@ -411,7 +411,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - f1gp_state *state = (f1gp_state *)device->machine->driver_data; + f1gp_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -433,7 +433,7 @@ static const k053936_interface f1gp2_k053936_intf = static MACHINE_START( f1gpb ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); state_save_register_global(machine, state->pending_command); state_save_register_global(machine, state->roz_bank); @@ -444,7 +444,7 @@ static MACHINE_START( f1gpb ) static MACHINE_START( f1gp ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x8000); @@ -457,7 +457,7 @@ static MACHINE_START( f1gp ) static MACHINE_RESET( f1gp ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); state->pending_command = 0; state->roz_bank = 0; diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index 0ac9e1c358c..ebd109aa69d 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -61,7 +61,7 @@ Year + Game Main CPU Sound CPU Sound Video static WRITE8_HANDLER( fantland_nmi_enable_w ) { - fantland_state *state = (fantland_state *)space->machine->driver_data; + fantland_state *state = space->machine->driver_data(); state->nmi_enable = data; if ((state->nmi_enable != 0) && (state->nmi_enable != 8)) @@ -76,7 +76,7 @@ static WRITE16_HANDLER( fantland_nmi_enable_16_w ) static WRITE8_HANDLER( fantland_soundlatch_w ) { - fantland_state *state = (fantland_state *)space->machine->driver_data; + fantland_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audio_cpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -166,7 +166,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( borntofi_nmi_enable_w ) { - fantland_state *state = (fantland_state *)space->machine->driver_data; + fantland_state *state = space->machine->driver_data(); state->nmi_enable = data; // data & 0x31 changes when lightgun fires @@ -180,7 +180,7 @@ static WRITE8_HANDLER( borntofi_nmi_enable_w ) // Trackball doesn't work correctly static READ8_HANDLER( borntofi_inputs_r ) { - fantland_state *state = (fantland_state *)space->machine->driver_data; + fantland_state *state = space->machine->driver_data(); int x, y, f; switch (input_port_read(space->machine, "Controls") & 0x03) @@ -313,7 +313,7 @@ ADDRESS_MAP_END static void borntofi_adpcm_start( running_device *device, int voice ) { - fantland_state *state = (fantland_state *)device->machine->driver_data; + fantland_state *state = device->machine->driver_data(); msm5205_reset_w(device, 0); state->adpcm_playing[voice] = 1; state->adpcm_nibble[voice] = 0; @@ -322,14 +322,14 @@ static void borntofi_adpcm_start( running_device *device, int voice ) static void borntofi_adpcm_stop( running_device *device, int voice ) { - fantland_state *state = (fantland_state *)device->machine->driver_data; + fantland_state *state = device->machine->driver_data(); msm5205_reset_w(device, 1); state->adpcm_playing[voice] = 0; } static WRITE8_HANDLER( borntofi_msm5205_w ) { - fantland_state *state = (fantland_state *)space->machine->driver_data; + fantland_state *state = space->machine->driver_data(); int voice = offset / 8; int reg = offset % 8; running_device *msm; @@ -365,7 +365,7 @@ static WRITE8_HANDLER( borntofi_msm5205_w ) static void borntofi_adpcm_int( running_device *device, int voice ) { - fantland_state *state = (fantland_state *)device->machine->driver_data; + fantland_state *state = device->machine->driver_data(); UINT8 *rom; size_t len; int start, stop; @@ -827,7 +827,7 @@ GFXDECODE_END static MACHINE_START( fantland ) { - fantland_state *state = (fantland_state *)machine->driver_data; + fantland_state *state = machine->driver_data(); state->audio_cpu = machine->device("audiocpu"); @@ -836,13 +836,13 @@ static MACHINE_START( fantland ) static MACHINE_RESET( fantland ) { - fantland_state *state = (fantland_state *)machine->driver_data; + fantland_state *state = machine->driver_data(); state->nmi_enable = 0; } static INTERRUPT_GEN( fantland_irq ) { - fantland_state *state = (fantland_state *)device->machine->driver_data; + fantland_state *state = device->machine->driver_data(); if (state->nmi_enable & 8) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } @@ -900,7 +900,7 @@ MACHINE_DRIVER_END static void galaxygn_sound_irq( running_device *device, int line ) { - fantland_state *state = (fantland_state *)device->machine->driver_data; + fantland_state *state = device->machine->driver_data(); cpu_set_input_line_and_vector(state->audio_cpu, 0, line ? ASSERT_LINE : CLEAR_LINE, 0x80/4); } @@ -974,7 +974,7 @@ static const msm5205_interface msm5205_config_3 = static MACHINE_START( borntofi ) { - fantland_state *state = (fantland_state *)machine->driver_data; + fantland_state *state = machine->driver_data(); MACHINE_START_CALL(fantland); @@ -995,7 +995,7 @@ static MACHINE_START( borntofi ) static MACHINE_RESET( borntofi ) { - fantland_state *state = (fantland_state *)machine->driver_data; + fantland_state *state = machine->driver_data(); int i; MACHINE_RESET_CALL(fantland); @@ -1064,7 +1064,7 @@ MACHINE_DRIVER_END static void wheelrun_ym3526_irqhandler( running_device *device, int state ) { - fantland_state *driver = (fantland_state *)device->machine->driver_data; + fantland_state *driver = device->machine->driver_data(); cpu_set_input_line(driver->audio_cpu, INPUT_LINE_IRQ0, state); } diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index f22bf030f09..199a3970095 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -20,7 +20,7 @@ static INTERRUPT_GEN( fastlane_interrupt ) { - fastlane_state *state = (fastlane_state *)device->machine->driver_data; + fastlane_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -36,7 +36,7 @@ static INTERRUPT_GEN( fastlane_interrupt ) static WRITE8_HANDLER( k007121_registers_w ) { - fastlane_state *state = (fastlane_state *)space->machine->driver_data; + fastlane_state *state = space->machine->driver_data(); if (offset < 8) k007121_ctrl_w(state->k007121, offset, data); @@ -46,7 +46,7 @@ static WRITE8_HANDLER( k007121_registers_w ) static WRITE8_HANDLER( fastlane_bankswitch_w ) { - fastlane_state *state = (fastlane_state *)space->machine->driver_data; + fastlane_state *state = space->machine->driver_data(); /* bits 0 & 1 coin counters */ coin_counter_w(space->machine, 0,data & 0x01); @@ -200,7 +200,7 @@ static const k007232_interface k007232_interface_2 = static MACHINE_START( fastlane ) { - fastlane_state *state = (fastlane_state *)machine->driver_data; + fastlane_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 70feb0ab7e8..5616ed69d71 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -36,7 +36,7 @@ inputs + notes by stephh static INPUT_CHANGED( coin_inserted ) { - fcombat_state *state = (fcombat_state *)field->port->machine->driver_data; + fcombat_state *state = field->port->machine->driver_data(); /* coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); @@ -61,7 +61,7 @@ static READ8_HANDLER( fcombat_protection_r ) static READ8_HANDLER( fcombat_port01_r ) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); /* the cocktail flip bit muxes between ports 0 and 1 */ return state->cocktail_flip ? input_port_read(space->machine, "IN1") : input_port_read(space->machine, "IN0"); } @@ -71,19 +71,19 @@ static READ8_HANDLER( fcombat_port01_r ) static WRITE8_HANDLER(e900_w) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); state->fcombat_sh = data; } static WRITE8_HANDLER(ea00_w) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); state->fcombat_sv = (state->fcombat_sv & 0xff00) | data; } static WRITE8_HANDLER(eb00_w) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); state->fcombat_sv = (state->fcombat_sv & 0xff) | (data << 8); } @@ -92,19 +92,19 @@ static WRITE8_HANDLER(eb00_w) static WRITE8_HANDLER(ec00_w) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); state->tx = data; } static WRITE8_HANDLER(ed00_w) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); state->ty = data; } static READ8_HANDLER(e300_r) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); int wx = (state->tx + state->fcombat_sh) / 16; int wy = (state->ty * 2 + state->fcombat_sv) / 16; @@ -267,7 +267,7 @@ GFXDECODE_END static MACHINE_START( fcombat ) { - fcombat_state *state = (fcombat_state *)machine->driver_data; + fcombat_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -283,7 +283,7 @@ static MACHINE_START( fcombat ) static MACHINE_RESET( fcombat ) { - fcombat_state *state = (fcombat_state *)machine->driver_data; + fcombat_state *state = machine->driver_data(); state->cocktail_flip = 0; state->char_palette = 0; diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index 5f51c5472c0..78832dd2e86 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -42,7 +42,7 @@ from 2.bin to 9.bin program eproms static WRITE16_HANDLER( fcrash_soundlatch_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -53,7 +53,7 @@ static WRITE16_HANDLER( fcrash_soundlatch_w ) static WRITE8_HANDLER( fcrash_snd_bankswitch_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); sound_set_output_gain(state->msm_1, 0, (data & 0x08) ? 0.0 : 1.0); sound_set_output_gain(state->msm_2, 0, (data & 0x10) ? 0.0 : 1.0); @@ -63,7 +63,7 @@ static WRITE8_HANDLER( fcrash_snd_bankswitch_w ) static void m5205_int1( running_device *device ) { - cps_state *state = (cps_state *)device->machine->driver_data; + cps_state *state = device->machine->driver_data(); msm5205_data_w(device, state->sample_buffer1 & 0x0f); state->sample_buffer1 >>= 4; @@ -74,7 +74,7 @@ static void m5205_int1( running_device *device ) static void m5205_int2( running_device *device ) { - cps_state *state = (cps_state *)device->machine->driver_data; + cps_state *state = device->machine->driver_data(); msm5205_data_w(device, state->sample_buffer2 & 0x0f); state->sample_buffer2 >>= 4; @@ -84,13 +84,13 @@ static void m5205_int2( running_device *device ) static WRITE8_HANDLER( fcrash_msm5205_0_data_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); state->sample_buffer1 = data; } static WRITE8_HANDLER( fcrash_msm5205_1_data_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); state->sample_buffer2 = data; } @@ -101,7 +101,7 @@ static WRITE8_HANDLER( fcrash_msm5205_1_data_w ) static void fcrash_update_transmasks( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int i; int priority[4]; @@ -128,7 +128,7 @@ static void fcrash_update_transmasks( running_machine *machine ) static void fcrash_render_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int pos; int base = 0x50c8 / 2; @@ -161,7 +161,7 @@ static void fcrash_render_sprites( running_machine *machine, bitmap_t *bitmap, c static void fcrash_render_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer, int primask ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); switch (layer) { @@ -178,7 +178,7 @@ static void fcrash_render_layer( running_machine *machine, bitmap_t *bitmap, con static void fcrash_render_high_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); switch (layer) { @@ -195,7 +195,7 @@ static void fcrash_render_high_layer( running_machine *machine, bitmap_t *bitmap static void fcrash_build_palette( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int offset; for (offset = 0; offset < 32 * 6 * 16; offset++) @@ -218,7 +218,7 @@ static void fcrash_build_palette( running_machine *machine ) static VIDEO_UPDATE( fcrash ) { - cps_state *state = (cps_state *)screen->machine->driver_data; + cps_state *state = screen->machine->driver_data(); int layercontrol, l0, l1, l2, l3; int videocontrol = state->cps_a_regs[0x22 / 2]; @@ -299,7 +299,7 @@ static VIDEO_UPDATE( fcrash ) // doesn't have the scroll offsets like fcrash static VIDEO_UPDATE( kodb ) { - cps_state *state = (cps_state *)screen->machine->driver_data; + cps_state *state = screen->machine->driver_data(); int layercontrol, l0, l1, l2, l3; int videocontrol = state->cps_a_regs[0x22 / 2]; @@ -691,7 +691,7 @@ static const msm5205_interface msm5205_interface2 = static MACHINE_START( fcrash ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "soundcpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); @@ -709,7 +709,7 @@ static MACHINE_START( fcrash ) static MACHINE_START( kodb ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("soundcpu"); @@ -717,7 +717,7 @@ static MACHINE_START( kodb ) static MACHINE_RESET( fcrash ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->sample_buffer1 = 0; state->sample_buffer2 = 0; diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c index 7cc9697ac10..e8cfedd9ef6 100644 --- a/src/mame/drivers/fgoal.c +++ b/src/mame/drivers/fgoal.c @@ -70,7 +70,7 @@ static PALETTE_INIT( fgoal ) static TIMER_CALLBACK( interrupt_callback ) { - fgoal_state *state = (fgoal_state *)machine->driver_data; + fgoal_state *state = machine->driver_data(); int scanline; int coin = (input_port_read(machine, "IN1") & 2); @@ -92,14 +92,14 @@ static TIMER_CALLBACK( interrupt_callback ) static unsigned video_ram_address( running_machine *machine ) { - fgoal_state *state = (fgoal_state *)machine->driver_data; + fgoal_state *state = machine->driver_data(); return 0x4000 | (state->row << 5) | (state->col >> 3); } static READ8_HANDLER( fgoal_analog_r ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); return input_port_read(space->machine, state->fgoal_player ? "PADDLE1" : "PADDLE0"); /* PCB can be jumpered to use a single dial */ } @@ -113,7 +113,7 @@ static CUSTOM_INPUT( fgoal_80_r ) static READ8_HANDLER( fgoal_nmi_reset_r ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, CLEAR_LINE); return 0; @@ -122,7 +122,7 @@ static READ8_HANDLER( fgoal_nmi_reset_r ) static READ8_HANDLER( fgoal_irq_reset_r ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); return 0; @@ -131,14 +131,14 @@ static READ8_HANDLER( fgoal_irq_reset_r ) static READ8_HANDLER( fgoal_row_r ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); return state->row; } static WRITE8_HANDLER( fgoal_row_w ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); state->row = data; mb14241_shift_data_w(state->mb14241, 0, 0); @@ -146,7 +146,7 @@ static WRITE8_HANDLER( fgoal_row_w ) static WRITE8_HANDLER( fgoal_col_w ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); state->col = data; mb14241_shift_count_w(state->mb14241, 0, data); @@ -164,7 +164,7 @@ static READ8_HANDLER( fgoal_address_lo_r ) static READ8_HANDLER( fgoal_shifter_r ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); UINT8 v = mb14241_shift_result_r(state->mb14241, 0); return BITSWAP8(v, 7, 6, 5, 4, 3, 2, 1, 0); @@ -172,7 +172,7 @@ static READ8_HANDLER( fgoal_shifter_r ) static READ8_HANDLER( fgoal_shifter_reverse_r ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); UINT8 v = mb14241_shift_result_r(state->mb14241, 0); return BITSWAP8(v, 0, 1, 2, 3, 4, 5, 6, 7); @@ -200,7 +200,7 @@ static WRITE8_HANDLER( fgoal_sound2_w ) /* BIT3 => SX5 */ /* BIT4 => SX4 */ /* BIT5 => SX3 */ - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); state->fgoal_player = data & 1; } @@ -338,7 +338,7 @@ GFXDECODE_END static MACHINE_START( fgoal ) { - fgoal_state *state = (fgoal_state *)machine->driver_data; + fgoal_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->mb14241 = machine->device("mb14241"); @@ -354,7 +354,7 @@ static MACHINE_START( fgoal ) static MACHINE_RESET( fgoal ) { - fgoal_state *state = (fgoal_state *)machine->driver_data; + fgoal_state *state = machine->driver_data(); timer_set(machine, machine->primary_screen->time_until_pos(0), NULL, 0, interrupt_callback); diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index 27e85d87686..44d5090f7ae 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -23,7 +23,7 @@ static INTERRUPT_GEN( finalizr_interrupt ) { - finalizr_state *state = (finalizr_state *)device->machine->driver_data; + finalizr_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -45,7 +45,7 @@ static WRITE8_HANDLER( finalizr_coin_w ) static WRITE8_HANDLER( finalizr_flipscreen_w ) { - finalizr_state *state = (finalizr_state *)space->machine->driver_data; + finalizr_state *state = space->machine->driver_data(); state->nmi_enable = data & 0x01; state->irq_enable = data & 0x02; @@ -54,13 +54,13 @@ static WRITE8_HANDLER( finalizr_flipscreen_w ) static WRITE8_HANDLER( finalizr_i8039_irq_w ) { - finalizr_state *state = (finalizr_state *)space->machine->driver_data; + finalizr_state *state = space->machine->driver_data(); cpu_set_input_line(state->audio_cpu, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_w ) { - finalizr_state *state = (finalizr_state *)space->machine->driver_data; + finalizr_state *state = space->machine->driver_data(); /* bit 0x80 goes active low, indicating that the external IRQ being serviced is complete @@ -73,7 +73,7 @@ static WRITE8_HANDLER( i8039_irqen_w ) static READ8_HANDLER( i8039_T1_r ) { - finalizr_state *state = (finalizr_state *)space->machine->driver_data; + finalizr_state *state = space->machine->driver_data(); /* I suspect the clock-out from the I8039 T0 line should be connected here (See the i8039_T0_w handler below). @@ -245,7 +245,7 @@ GFXDECODE_END static MACHINE_START( finalizr ) { - finalizr_state *state = (finalizr_state *)machine->driver_data; + finalizr_state *state = machine->driver_data(); state->audio_cpu = machine->device("audiocpu"); @@ -258,7 +258,7 @@ static MACHINE_START( finalizr ) static MACHINE_RESET( finalizr ) { - finalizr_state *state = (finalizr_state *)machine->driver_data; + finalizr_state *state = machine->driver_data(); state->spriterambank = 0; state->charbank = 0; diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index d3e129afd80..35f7cc8c75d 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -144,7 +144,7 @@ Notes: static WRITE8_HANDLER( firetrap_nmi_disable_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->nmi_enable = ~data & 1; } @@ -166,7 +166,7 @@ static READ8_HANDLER( firetrap_8751_bootleg_r ) static READ8_HANDLER( firetrap_8751_r ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); //logerror("PC:%04x read from 8751\n",cpu_get_pc(space->cpu)); return state->i8751_return; } @@ -193,7 +193,7 @@ static WRITE8_HANDLER( firetrap_8751_w ) }; static const int i8751_coin_data[]={ 0x00, 0xb7 }; static const int i8751_36_data[]={ 0x00, 0xbc }; - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); /* End of command - important to note, as coin input is supressed while commands are pending */ if (data == 0x26) @@ -257,14 +257,14 @@ static WRITE8_HANDLER( firetrap_8751_w ) static WRITE8_HANDLER( firetrap_sound_command_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } static WRITE8_HANDLER( firetrap_sound_2400_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); msm5205_reset_w(state->msm, ~data & 0x01); state->irq_enable = data & 0x02; } @@ -276,7 +276,7 @@ static WRITE8_HANDLER( firetrap_sound_bankselect_w ) static void firetrap_adpcm_int( running_device *device ) { - firetrap_state *state = (firetrap_state *)device->machine->driver_data; + firetrap_state *state = device->machine->driver_data(); msm5205_data_w(device, state->msm5205next >> 4); state->msm5205next <<= 4; @@ -288,7 +288,7 @@ static void firetrap_adpcm_int( running_device *device ) static WRITE8_HANDLER( firetrap_adpcm_data_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->msm5205next = data; } @@ -578,7 +578,7 @@ static const msm5205_interface msm5205_config = static INTERRUPT_GEN( firetrap ) { - firetrap_state *state = (firetrap_state *)device->machine->driver_data; + firetrap_state *state = device->machine->driver_data(); /* Check for coin IRQ */ if (cpu_getiloops(device)) @@ -607,7 +607,7 @@ static INTERRUPT_GEN( firetrap ) static INTERRUPT_GEN( bootleg ) { - firetrap_state *state = (firetrap_state *)device->machine->driver_data; + firetrap_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line (device, INPUT_LINE_NMI, PULSE_LINE); @@ -616,7 +616,7 @@ static INTERRUPT_GEN( bootleg ) static MACHINE_START( firetrap ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); UINT8 *MAIN = memory_region(machine, "maincpu"); UINT8 *SOUND = memory_region(machine, "audiocpu"); @@ -644,7 +644,7 @@ static MACHINE_START( firetrap ) static MACHINE_RESET( firetrap ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); int i; for (i = 0; i < 2; i++) diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index 470124eb57f..143607356f8 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -90,14 +90,14 @@ Stephh's notes : static READ16_HANDLER(fitfight_700000_r) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); UINT16 data = state->fof_700000_data; return (data << 2); } static READ16_HANDLER(histryma_700000_r) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); UINT16 data = (state->fof_700000_data & 0x00AA); data |= ((state->fof_700000_data & 0x0055) >> 2); return (data); @@ -105,7 +105,7 @@ static READ16_HANDLER(histryma_700000_r) static READ16_HANDLER(bbprot_700000_r) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); UINT16 data = 0; data = (state->fof_700000_data & 0x000b); data |= ((state->fof_700000_data & 0x01d0) >> 2); @@ -116,7 +116,7 @@ static READ16_HANDLER(bbprot_700000_r) static WRITE16_HANDLER(fitfight_700000_w) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fof_700000[offset]); // needed for scrolling if (data < 0x0200) // to avoid considering writes of 0x0200 @@ -719,14 +719,14 @@ GFXDECODE_END static MACHINE_START( fitfight ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); state_save_register_global(machine, state->fof_700000_data); } static MACHINE_RESET( fitfight ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); state->fof_700000_data = 0; } @@ -979,7 +979,7 @@ static DRIVER_INIT( fitfight ) { // UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); // mem16[0x0165B2/2] = 0x4e71; // for now so it boots - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x700000, 0x700001, 0, 0, fitfight_700000_r); state->bbprot_kludge = 0; } @@ -988,14 +988,14 @@ static DRIVER_INIT( histryma ) { // UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); // mem16[0x017FDC/2] = 0x4e71; // for now so it boots - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x700000, 0x700001, 0, 0, histryma_700000_r); state->bbprot_kludge = 0; } static DRIVER_INIT( bbprot ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); state->bbprot_kludge = 1; } diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 19ef016c24a..8fa2c675e0a 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -22,7 +22,7 @@ static INTERRUPT_GEN( flkatck_interrupt ) { - flkatck_state *state = (flkatck_state *)device->machine->driver_data; + flkatck_state *state = device->machine->driver_data(); if (state->irq_enabled) cpu_set_input_line(device, HD6309_IRQ_LINE, HOLD_LINE); @@ -62,7 +62,7 @@ static READ8_HANDLER( flkatck_ls138_r ) static WRITE8_HANDLER( flkatck_ls138_w ) { - flkatck_state *state = (flkatck_state *)space->machine->driver_data; + flkatck_state *state = space->machine->driver_data(); switch ((offset & 0x1c) >> 2) { @@ -84,13 +84,13 @@ static WRITE8_HANDLER( flkatck_ls138_w ) /* Protection - an external multiplyer connected to the sound CPU */ static READ8_HANDLER( multiply_r ) { - flkatck_state *state = (flkatck_state *)space->machine->driver_data; + flkatck_state *state = space->machine->driver_data(); return (state->multiply_reg[0] * state->multiply_reg[1]) & 0xff; } static WRITE8_HANDLER( multiply_w ) { - flkatck_state *state = (flkatck_state *)space->machine->driver_data; + flkatck_state *state = space->machine->driver_data(); state->multiply_reg[offset] = data; } @@ -197,7 +197,7 @@ static const k007232_interface k007232_config = static MACHINE_START( flkatck ) { - flkatck_state *state = (flkatck_state *)machine->driver_data; + flkatck_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x2000); @@ -212,7 +212,7 @@ static MACHINE_START( flkatck ) static MACHINE_RESET( flkatck ) { - flkatck_state *state = (flkatck_state *)machine->driver_data; + flkatck_state *state = machine->driver_data(); k007232_set_bank(machine->device("konami"), 0, 1); diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index d6731b59007..6989f903c0f 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -20,27 +20,27 @@ static READ8_HANDLER( from_snd_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->snd_flag = 0; return state->snd_data; } static READ8_HANDLER( snd_flag_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); return state->snd_flag | 0xfd; } static WRITE8_HANDLER( to_main_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->snd_data = data; state->snd_flag = 2; } static TIMER_CALLBACK( nmi_callback ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); else @@ -56,13 +56,13 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( nmi_disable_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) { @@ -125,7 +125,7 @@ ADDRESS_MAP_END static CUSTOM_INPUT( victnine_mcu_status_bit01_r ) { - flstory_state *state = (flstory_state *)field->port->machine->driver_data; + flstory_state *state = field->port->machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); return (victnine_mcu_status_r(space, 0) & 3); @@ -161,7 +161,7 @@ ADDRESS_MAP_END static MACHINE_RESET( ta7630 ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); int i; double db = 0.0; @@ -186,7 +186,7 @@ static MACHINE_RESET( ta7630 ) static WRITE8_DEVICE_HANDLER( sound_control_0_w ) { - flstory_state *state = (flstory_state *)device->machine->driver_data; + flstory_state *state = device->machine->driver_data(); state->snd_ctrl0 = data & 0xff; // popmessage("SND0 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); @@ -200,7 +200,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_0_w ) } static WRITE8_DEVICE_HANDLER( sound_control_1_w ) { - flstory_state *state = (flstory_state *)device->machine->driver_data; + flstory_state *state = device->machine->driver_data(); state->snd_ctrl1 = data & 0xff; // popmessage("SND1 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); @@ -212,7 +212,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_1_w ) static WRITE8_DEVICE_HANDLER( sound_control_2_w ) { - flstory_state *state = (flstory_state *)device->machine->driver_data; + flstory_state *state = device->machine->driver_data(); int i; state->snd_ctrl2 = data & 0xff; @@ -224,7 +224,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_2_w ) static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */ { - flstory_state *state = (flstory_state *)device->machine->driver_data; + flstory_state *state = device->machine->driver_data(); state->snd_ctrl3 = data & 0xff; // popmessage("SND3 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3); @@ -656,7 +656,7 @@ static const msm5232_interface msm5232_config = static MACHINE_START( flstory ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -696,7 +696,7 @@ static MACHINE_START( flstory ) static MACHINE_RESET( flstory ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); MACHINE_RESET_CALL(ta7630); diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 5527d2fb4bf..706df5fb35e 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -11,12 +11,13 @@ Atari Flyball Driver -class flyball_state +class flyball_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flyball_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flyball_state(machine)); } - flyball_state(running_machine &machine) { } + flyball_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * rombase; @@ -56,7 +57,7 @@ static TILEMAP_MAPPER( flyball_get_memory_offset ) static TILE_GET_INFO( flyball_get_tile_info ) { - flyball_state *state = (flyball_state *)machine->driver_data; + flyball_state *state = machine->driver_data(); UINT8 data = state->playfield_ram[tile_index]; int flags = ((data & 0x40) ? TILE_FLIPX : 0) | ((data & 0x80) ? TILE_FLIPY : 0); int code = data & 63; @@ -72,14 +73,14 @@ static TILE_GET_INFO( flyball_get_tile_info ) static VIDEO_START( flyball ) { - flyball_state *state = (flyball_state *)machine->driver_data; + flyball_state *state = machine->driver_data(); state->tmap = tilemap_create(machine, flyball_get_tile_info, flyball_get_memory_offset, 8, 16, 32, 16); } static VIDEO_UPDATE( flyball ) { - flyball_state *state = (flyball_state *)screen->machine->driver_data; + flyball_state *state = screen->machine->driver_data(); int pitcherx = state->pitcher_horz; int pitchery = state->pitcher_vert - 31; @@ -112,7 +113,7 @@ static VIDEO_UPDATE( flyball ) static TIMER_CALLBACK( flyball_joystick_callback ) { - flyball_state *state = (flyball_state *)machine->driver_data; + flyball_state *state = machine->driver_data(); int potsense = param; if (potsense & ~state->potmask) @@ -124,7 +125,7 @@ static TIMER_CALLBACK( flyball_joystick_callback ) static TIMER_CALLBACK( flyball_quarter_callback ) { - flyball_state *state = (flyball_state *)machine->driver_data; + flyball_state *state = machine->driver_data(); int scanline = param; int potsense[64], i; @@ -168,43 +169,43 @@ static READ8_HANDLER( flyball_scanline_r ) static READ8_HANDLER( flyball_potsense_r ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); return state->potsense & ~state->potmask; } static WRITE8_HANDLER( flyball_potmask_w ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); state->potmask |= data & 0xf; } static WRITE8_HANDLER( flyball_pitcher_pic_w ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); state->pitcher_pic = data & 0xf; } static WRITE8_HANDLER( flyball_ball_vert_w ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); state->ball_vert = data; } static WRITE8_HANDLER( flyball_ball_horz_w ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); state->ball_horz = data; } static WRITE8_HANDLER( flyball_pitcher_vert_w ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); state->pitcher_vert = data; } static WRITE8_HANDLER( flyball_pitcher_horz_w ) { - flyball_state *state = (flyball_state *)space->machine->driver_data; + flyball_state *state = space->machine->driver_data(); state->pitcher_horz = data; } @@ -362,7 +363,7 @@ static PALETTE_INIT( flyball ) static MACHINE_START( flyball ) { - flyball_state *state = (flyball_state *)machine->driver_data; + flyball_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -377,7 +378,7 @@ static MACHINE_START( flyball ) static MACHINE_RESET( flyball ) { - flyball_state *state = (flyball_state *)machine->driver_data; + flyball_state *state = machine->driver_data(); int i; /* address bits 0 through 8 are inverted */ diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index 601a3bfed6a..7d7b5769cdd 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -104,10 +104,10 @@ static READ16_HANDLER( nvram_r ) static void update_interrupts(running_machine *machine) { - foodf_state *state = (foodf_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 3, state->atarigen.scanline_int_state && state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); + foodf_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 3, state->scanline_int_state && state->video_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -135,7 +135,7 @@ static TIMER_DEVICE_CALLBACK( scanline_update ) static MACHINE_START( foodf ) { - foodf_state *state = (foodf_state *)machine->driver_data; + foodf_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->whichport); } @@ -143,8 +143,8 @@ static MACHINE_START( foodf ) static MACHINE_RESET( foodf ) { - foodf_state *state = (foodf_state *)machine->driver_data; - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + foodf_state *state = machine->driver_data(); + atarigen_interrupt_reset(state, update_interrupts); timer_device *scan_timer = machine->device("scan_timer"); scan_timer->adjust(machine->primary_screen->time_until_pos(0)); } @@ -159,7 +159,7 @@ static MACHINE_RESET( foodf ) static WRITE16_HANDLER( digital_w ) { - foodf_state *state = (foodf_state *)space->machine->driver_data; + foodf_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { foodf_set_flip(state, data & 0x01); @@ -190,7 +190,7 @@ static WRITE16_HANDLER( digital_w ) static READ16_HANDLER( analog_r ) { static const char *const portnames[] = { "STICK0_X", "STICK1_X", "STICK0_Y", "STICK1_Y" }; - foodf_state *state = (foodf_state *)space->machine->driver_data; + foodf_state *state = space->machine->driver_data(); return input_port_read(space->machine, portnames[state->whichport]); } @@ -198,7 +198,7 @@ static READ16_HANDLER( analog_r ) static WRITE16_HANDLER( analog_w ) { - foodf_state *state = (foodf_state *)space->machine->driver_data; + foodf_state *state = space->machine->driver_data(); state->whichport = offset ^ 3; } @@ -215,7 +215,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x014000, 0x014fff) AM_MIRROR(0x3e3000) AM_RAM AM_RANGE(0x018000, 0x018fff) AM_MIRROR(0x3e3000) AM_RAM AM_RANGE(0x01c000, 0x01c0ff) AM_MIRROR(0x3e3f00) AM_RAM AM_BASE_GENERIC(spriteram) - AM_RANGE(0x800000, 0x8007ff) AM_MIRROR(0x03f800) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(foodf_state, atarigen.playfield) + AM_RANGE(0x800000, 0x8007ff) AM_MIRROR(0x03f800) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(foodf_state, playfield) AM_RANGE(0x900000, 0x9001ff) AM_MIRROR(0x03fe00) AM_RAM_READ(nvram_r) AM_BASE_SIZE_GENERIC(nvram) AM_RANGE(0x940000, 0x940007) AM_MIRROR(0x023ff8) AM_READ(analog_r) AM_RANGE(0x944000, 0x944007) AM_MIRROR(0x023ff8) AM_WRITE(analog_w) diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 29ad858ccc3..c99cf7b87f3 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -58,13 +58,13 @@ static WRITE8_HANDLER( coin_w ) static WRITE8_HANDLER( spinner_select_w ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); state->spinner = data & 1; } static READ8_HANDLER( spinner_r ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); return input_port_read(space->machine, state->spinner ? "IN3" : "IN2"); } @@ -75,20 +75,20 @@ static WRITE8_HANDLER( pbillrd_bankswitch_w ) static WRITE8_HANDLER( nmi_enable_w ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); state->nmi_en = data & 1; } static INTERRUPT_GEN( freekick_irqgen ) { - freekick_state *state = (freekick_state *)device->machine->driver_data; + freekick_state *state = device->machine->driver_data(); if (state->nmi_en) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } static WRITE8_HANDLER( oigas_5_w ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); if (data > 0xc0 && data < 0xe0) state->cnt = 1; @@ -101,7 +101,7 @@ static WRITE8_HANDLER( oigas_5_w ) static READ8_HANDLER( oigas_3_r ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); switch (++state->cnt) { case 2: return ~(state->inval >> 8); @@ -144,13 +144,13 @@ static READ8_HANDLER( oigas_2_r ) static READ8_HANDLER( freekick_ff_r ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); return state->ff_data; } static WRITE8_HANDLER( freekick_ff_w ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); state->ff_data = data; } @@ -513,19 +513,19 @@ INPUT_PORTS_END static WRITE8_DEVICE_HANDLER( snd_rom_addr_l_w ) { - freekick_state *state = (freekick_state *)device->machine->driver_data; + freekick_state *state = device->machine->driver_data(); state->romaddr = (state->romaddr & 0xff00) | data; } static WRITE8_DEVICE_HANDLER( snd_rom_addr_h_w ) { - freekick_state *state = (freekick_state *)device->machine->driver_data; + freekick_state *state = device->machine->driver_data(); state->romaddr = (state->romaddr & 0x00ff) | (data << 8); } static READ8_DEVICE_HANDLER( snd_rom_r ) { - freekick_state *state = (freekick_state *)device->machine->driver_data; + freekick_state *state = device->machine->driver_data(); return memory_region(device->machine, "user1")[state->romaddr & 0x7fff]; } @@ -596,7 +596,7 @@ GFXDECODE_END static MACHINE_START( freekick ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); state_save_register_global(machine, state->romaddr); state_save_register_global(machine, state->spinner); @@ -606,7 +606,7 @@ static MACHINE_START( freekick ) static MACHINE_RESET( freekick ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); state->romaddr = 0; state->spinner = 0; @@ -623,7 +623,7 @@ static MACHINE_START( pbillrd ) static MACHINE_START( oigas ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); state_save_register_global(machine, state->inval); state_save_register_global(machine, state->outval); @@ -634,7 +634,7 @@ static MACHINE_START( oigas ) static MACHINE_RESET( oigas ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); MACHINE_RESET_CALL(freekick); diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index eeb4fa4d3cd..93a31197e2b 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -39,7 +39,7 @@ static INTERRUPT_GEN( fromanc2_interrupt ) static WRITE16_HANDLER( fromanc2_sndcmd_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); soundlatch_w(space, offset, (data >> 8) & 0xff); // 1P (LEFT) soundlatch2_w(space, offset, data & 0xff); // 2P (RIGHT) @@ -50,13 +50,13 @@ static WRITE16_HANDLER( fromanc2_sndcmd_w ) static WRITE16_HANDLER( fromanc2_portselect_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->portselect = data; } static READ16_HANDLER( fromanc2_keymatrix_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 ret; switch (state->portselect) @@ -75,19 +75,19 @@ static READ16_HANDLER( fromanc2_keymatrix_r ) static CUSTOM_INPUT( subcpu_int_r ) { - fromanc2_state *state = (fromanc2_state *)field->port->machine->driver_data; + fromanc2_state *state = field->port->machine->driver_data(); return state->subcpu_int_flag & 0x01; } static CUSTOM_INPUT( sndcpu_nmi_r ) { - fromanc2_state *state = (fromanc2_state *)field->port->machine->driver_data; + fromanc2_state *state = field->port->machine->driver_data(); return state->sndcpu_nmi_flag & 0x01; } static CUSTOM_INPUT( subcpu_nmi_r ) { - fromanc2_state *state = (fromanc2_state *)field->port->machine->driver_data; + fromanc2_state *state = field->port->machine->driver_data(); return state->subcpu_nmi_flag & 0x01; } @@ -114,7 +114,7 @@ static WRITE16_HANDLER( fromanc4_eeprom_w ) static WRITE16_HANDLER( fromanc2_subcpu_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->datalatch1 = data; cpu_set_input_line(state->subcpu, 0, HOLD_LINE); @@ -123,7 +123,7 @@ static WRITE16_HANDLER( fromanc2_subcpu_w ) static READ16_HANDLER( fromanc2_subcpu_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_NMI, PULSE_LINE); state->subcpu_nmi_flag = 0; @@ -132,13 +132,13 @@ static READ16_HANDLER( fromanc2_subcpu_r ) static READ8_HANDLER( fromanc2_maincpu_r_l ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->datalatch1 & 0x00ff; } static READ8_HANDLER( fromanc2_maincpu_r_h ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->subcpu_int_flag = 1; return (state->datalatch1 & 0xff00) >> 8; @@ -146,25 +146,25 @@ static READ8_HANDLER( fromanc2_maincpu_r_h ) static WRITE8_HANDLER( fromanc2_maincpu_w_l ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->datalatch_2l = data; } static WRITE8_HANDLER( fromanc2_maincpu_w_h ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->datalatch_2h = data; } static WRITE8_HANDLER( fromanc2_subcpu_nmi_clr ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->subcpu_nmi_flag = 1; } static READ8_HANDLER( fromanc2_sndcpu_nmi_clr ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->sndcpu_nmi_flag = 1; return 0xff; @@ -497,7 +497,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int irq) { - fromanc2_state *state = (fromanc2_state *)device->machine->driver_data; + fromanc2_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -515,7 +515,7 @@ static const ym2610_interface ym2610_config = static MACHINE_START( fromanc4 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->subcpu = machine->device("sub"); @@ -534,7 +534,7 @@ static MACHINE_START( fromanc4 ) static MACHINE_START( fromanc2 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "sub"), 0x4000); memory_configure_bank(machine, "bank2", 0, 1, memory_region(machine, "sub") + 0x08000, 0x4000); @@ -548,7 +548,7 @@ static MACHINE_START( fromanc2 ) static MACHINE_RESET( fromanc2 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->portselect = 0; state->datalatch1 = 0; @@ -834,7 +834,7 @@ ROM_END static DRIVER_INIT( fromanc2 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->subcpu_nmi_flag = 1; state->subcpu_int_flag = 1; state->sndcpu_nmi_flag = 1; @@ -842,7 +842,7 @@ static DRIVER_INIT( fromanc2 ) static DRIVER_INIT( fromanc4 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->sndcpu_nmi_flag = 1; } diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index d4338f64be0..e1f3f942dd6 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -55,14 +55,14 @@ Memo: static READ8_HANDLER( fromance_commanddata_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); return state->commanddata; } static TIMER_CALLBACK( deferred_commanddata_w ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); state->commanddata = param; state->directionflag = 1; } @@ -77,7 +77,7 @@ static WRITE8_HANDLER( fromance_commanddata_w ) static READ8_HANDLER( fromance_busycheck_main_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); @@ -91,7 +91,7 @@ static READ8_HANDLER( fromance_busycheck_main_r ) static READ8_HANDLER( fromance_busycheck_sub_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); if (state->directionflag) return 0xff; // standby @@ -102,7 +102,7 @@ static READ8_HANDLER( fromance_busycheck_sub_r ) static WRITE8_HANDLER( fromance_busycheck_sub_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->directionflag = 0; } @@ -129,7 +129,7 @@ static WRITE8_HANDLER( fromance_rombank_w ) static WRITE8_DEVICE_HANDLER( fromance_adpcm_reset_w ) { - fromance_state *state = (fromance_state *)device->machine->driver_data; + fromance_state *state = device->machine->driver_data(); state->adpcm_reset = (data & 0x01); state->vclk_left = 0; @@ -139,7 +139,7 @@ static WRITE8_DEVICE_HANDLER( fromance_adpcm_reset_w ) static WRITE8_HANDLER( fromance_adpcm_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->adpcm_data = data; state->vclk_left = 2; } @@ -147,7 +147,7 @@ static WRITE8_HANDLER( fromance_adpcm_w ) static void fromance_adpcm_int( running_device *device ) { - fromance_state *state = (fromance_state *)device->machine->driver_data; + fromance_state *state = device->machine->driver_data(); /* skip if we're reset */ if (!state->adpcm_reset) @@ -176,14 +176,14 @@ static void fromance_adpcm_int( running_device *device ) static WRITE8_HANDLER( fromance_portselect_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->portselect = data; } static READ8_HANDLER( fromance_keymatrix_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); int ret = 0xff; if (state->portselect & 0x01) @@ -960,7 +960,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( fromance ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "sub"); memory_configure_bank(machine, "bank1", 0, 0x100, &ROM[0x10000], 0x4000); @@ -980,7 +980,7 @@ static MACHINE_START( fromance ) static MACHINE_RESET( fromance ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); int i; state->directionflag = 0; diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index cc4f4df5012..c55f95c148c 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -280,14 +280,14 @@ static const ay8910_interface ay8910_config = static MACHINE_START( funkybee ) { - funkybee_state *state = (funkybee_state *)machine->driver_data; + funkybee_state *state = machine->driver_data(); state_save_register_global(machine, state->gfx_bank); } static MACHINE_RESET( funkybee ) { - funkybee_state *state = (funkybee_state *)machine->driver_data; + funkybee_state *state = machine->driver_data(); state->gfx_bank = 0; } diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 7536f9e8b35..25aba62c3b0 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -277,7 +277,7 @@ GFXDECODE_END static void sound_irq( running_device *device, int state ) { - funkyjet_state *driver_state = (funkyjet_state *)device->machine->driver_data; + funkyjet_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -298,7 +298,7 @@ static const deco16ic_interface funkyjet_deco16ic_intf = static MACHINE_START( funkyjet ) { - funkyjet_state *state = (funkyjet_state *)machine->driver_data; + funkyjet_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index e842ab301d3..eb862ae3e12 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -67,7 +67,7 @@ static WRITE8_HANDLER ( funybubl_cpurombank_w ) static WRITE8_HANDLER( funybubl_soundcommand_w ) { - funybubl_state *state = (funybubl_state *)space->machine->driver_data; + funybubl_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -202,7 +202,7 @@ GFXDECODE_END static MACHINE_START( funybubl ) { - funybubl_state *state = (funybubl_state *)machine->driver_data; + funybubl_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index f1f34db1fec..c905df53de6 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -53,7 +53,7 @@ To Do: static WRITE16_HANDLER( fuuki16_vregs_w ) { - fuuki16_state *state = (fuuki16_state *)space->machine->driver_data; + fuuki16_state *state = space->machine->driver_data(); UINT16 old_data = state->vregs[offset]; UINT16 new_data = COMBINE_DATA(&state->vregs[offset]); if ((offset == 0x1c/2) && old_data != new_data) @@ -66,7 +66,7 @@ static WRITE16_HANDLER( fuuki16_vregs_w ) static WRITE16_HANDLER( fuuki16_sound_command_w ) { - fuuki16_state *state = (fuuki16_state *)space->machine->driver_data; + fuuki16_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { soundlatch_w(space,0,data & 0xff); @@ -376,7 +376,7 @@ GFXDECODE_END static void soundirq( running_device *device, int state ) { - fuuki16_state *fuuki16 = (fuuki16_state *)device->machine->driver_data; + fuuki16_state *fuuki16 = device->machine->driver_data(); cpu_set_input_line(fuuki16->audiocpu, 0, state); } @@ -399,7 +399,7 @@ static const ym3812_interface fuuki16_ym3812_intf = static TIMER_CALLBACK( level_1_interrupt_callback ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 1, HOLD_LINE); timer_set(machine, machine->primary_screen->time_until_pos(248), NULL, 0, level_1_interrupt_callback); } @@ -407,7 +407,7 @@ static TIMER_CALLBACK( level_1_interrupt_callback ) static TIMER_CALLBACK( vblank_interrupt_callback ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 3, HOLD_LINE); // VBlank IRQ timer_set(machine, machine->primary_screen->time_until_vblank_start(), NULL, 0, vblank_interrupt_callback); } @@ -415,7 +415,7 @@ static TIMER_CALLBACK( vblank_interrupt_callback ) static TIMER_CALLBACK( raster_interrupt_callback ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 5, HOLD_LINE); // Raster Line IRQ machine->primary_screen->update_partial(machine->primary_screen->vpos()); timer_adjust_oneshot(state->raster_interrupt_timer, machine->primary_screen->frame_period(), 0); @@ -424,7 +424,7 @@ static TIMER_CALLBACK( raster_interrupt_callback ) static MACHINE_START( fuuki16 ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x8000); @@ -438,7 +438,7 @@ static MACHINE_START( fuuki16 ) static MACHINE_RESET( fuuki16 ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); const rectangle &visarea = machine->primary_screen->visible_area(); timer_set(machine, machine->primary_screen->time_until_pos(248), NULL, 0, level_1_interrupt_callback); diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 50767c66007..81d5bd88ed0 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -157,7 +157,7 @@ FG-3J ROM-J 507KA0301P04 Rev:1.3 static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) { - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; + fuuki32_state *state = space->machine->driver_data(); if(ACCESSING_BITS_16_31) { int r,g,b; @@ -194,14 +194,14 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) /* Sound comms */ static READ32_HANDLER( snd_020_r ) { - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; + fuuki32_state *state = space->machine->driver_data(); UINT32 retdata = state->shared_ram[offset * 2] << 16 | state->shared_ram[(offset * 2) + 1]; return retdata; } static WRITE32_HANDLER( snd_020_w ) { - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; + fuuki32_state *state = space->machine->driver_data(); if (ACCESSING_BITS_16_23) state->shared_ram[offset * 2] = data >> 16; @@ -212,7 +212,7 @@ static WRITE32_HANDLER( snd_020_w ) static WRITE32_HANDLER( fuuki32_vregs_w ) { - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; + fuuki32_state *state = space->machine->driver_data(); if (state->vregs[offset] != data) { @@ -274,14 +274,14 @@ static WRITE8_HANDLER ( fuuki32_sound_bw_w ) static READ8_HANDLER( snd_z80_r ) { - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; + fuuki32_state *state = space->machine->driver_data(); UINT8 retdata = state->shared_ram[offset]; return retdata; } static WRITE8_HANDLER( snd_z80_w ) { - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; + fuuki32_state *state = space->machine->driver_data(); state->shared_ram[offset] = data; } @@ -485,7 +485,7 @@ GFXDECODE_END static TIMER_CALLBACK( level_1_interrupt_callback ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 1, HOLD_LINE); timer_set(machine, machine->primary_screen->time_until_pos(248), NULL, 0, level_1_interrupt_callback); } @@ -493,7 +493,7 @@ static TIMER_CALLBACK( level_1_interrupt_callback ) static TIMER_CALLBACK( vblank_interrupt_callback ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 3, HOLD_LINE); // VBlank IRQ timer_set(machine, machine->primary_screen->time_until_vblank_start(), NULL, 0, vblank_interrupt_callback); } @@ -501,7 +501,7 @@ static TIMER_CALLBACK( vblank_interrupt_callback ) static TIMER_CALLBACK( raster_interrupt_callback ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 5, HOLD_LINE); // Raster Line IRQ machine->primary_screen->update_partial(machine->primary_screen->vpos()); timer_adjust_oneshot(state->raster_interrupt_timer, machine->primary_screen->frame_period(), 0); @@ -510,7 +510,7 @@ static TIMER_CALLBACK( raster_interrupt_callback ) static MACHINE_START( fuuki32 ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "soundcpu"); memory_configure_bank(machine, "bank1", 0, 0x3e, &ROM[0x10000], 0x8000); @@ -527,7 +527,7 @@ static MACHINE_START( fuuki32 ) static MACHINE_RESET( fuuki32 ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); const rectangle &visarea = machine->primary_screen->visible_area(); timer_set(machine, machine->primary_screen->time_until_pos(248), NULL, 0, level_1_interrupt_callback); @@ -538,7 +538,7 @@ static MACHINE_RESET( fuuki32 ) static void irqhandler( running_device *device, int irq ) { - fuuki32_state *state = (fuuki32_state *)device->machine->driver_data; + fuuki32_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 241a2e26027..85209dccf0e 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -23,7 +23,7 @@ static WRITE16_HANDLER( bigkarnk_sound_command_w ) { - gaelco_state *state = (gaelco_state *)space->machine->driver_data; + gaelco_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -64,7 +64,7 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w ) static WRITE16_HANDLER( gaelco_vram_encrypted_w ) { - gaelco_state *state = (gaelco_state *)space->machine->driver_data; + gaelco_state *state = space->machine->driver_data(); // mame_printf_debug("gaelco_vram_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0f, 0x4228); @@ -76,7 +76,7 @@ static WRITE16_HANDLER( gaelco_vram_encrypted_w ) static WRITE16_HANDLER(gaelco_encrypted_w) { - gaelco_state *state = (gaelco_state *)space->machine->driver_data; + gaelco_state *state = space->machine->driver_data(); // mame_printf_debug("gaelco_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0f, 0x4228); @@ -87,7 +87,7 @@ static WRITE16_HANDLER(gaelco_encrypted_w) static WRITE16_HANDLER( thoop_vram_encrypted_w ) { - gaelco_state *state = (gaelco_state *)space->machine->driver_data; + gaelco_state *state = space->machine->driver_data(); // mame_printf_debug("gaelco_vram_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0e, 0x4228); @@ -98,7 +98,7 @@ static WRITE16_HANDLER( thoop_vram_encrypted_w ) static WRITE16_HANDLER(thoop_encrypted_w) { - gaelco_state *state = (gaelco_state *)space->machine->driver_data; + gaelco_state *state = space->machine->driver_data(); // mame_printf_debug("gaelco_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0e, 0x4228); @@ -492,7 +492,7 @@ GFXDECODEINFO(0x100000,64) static MACHINE_START( gaelco ) { - gaelco_state *state = (gaelco_state *)machine->driver_data; + gaelco_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); } diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index aba8828bda5..2a7b07ce0c3 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -138,7 +138,7 @@ Notes: static WRITE16_HANDLER( gaiden_sound_command_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) soundlatch_w(space, 0, data & 0xff); /* Ninja Gaiden */ @@ -149,7 +149,7 @@ static WRITE16_HANDLER( gaiden_sound_command_w ) static WRITE16_HANDLER( drgnbowl_sound_command_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -166,7 +166,7 @@ static WRITE16_HANDLER( drgnbowl_sound_command_w ) static WRITE16_HANDLER( wildfang_protection_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -217,7 +217,7 @@ static WRITE16_HANDLER( wildfang_protection_w ) static READ16_HANDLER( wildfang_protection_r ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); // logerror("PC %06x: read prot %02x\n", cpu_get_pc(space->cpu), state->prot); return state->prot; } @@ -295,7 +295,7 @@ static const int jumppoints_other[0x100] = static MACHINE_RESET( raiga ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); state->prot = 0; state->jumpcode = 0; @@ -315,7 +315,7 @@ static MACHINE_RESET( raiga ) static MACHINE_START( raiga ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state_save_register_global(machine, state->prot); @@ -336,7 +336,7 @@ static MACHINE_START( raiga ) static WRITE16_HANDLER( raiga_protection_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -388,7 +388,7 @@ static WRITE16_HANDLER( raiga_protection_w ) static READ16_HANDLER( raiga_protection_r ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); // logerror("PC %06x: read prot %02x\n", cpu_get_pc(space->cpu), state->prot); return state->prot; } @@ -750,7 +750,7 @@ GFXDECODE_END /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - gaiden_state *state = (gaiden_state *)device->machine->driver_data; + gaiden_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -1501,7 +1501,7 @@ ROM_END static DRIVER_INIT( shadoww ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); /* sprite size Y = sprite size X */ state->sprite_sizey = 0; state->raiga_jumppoints = jumppoints_00; @@ -1509,7 +1509,7 @@ static DRIVER_INIT( shadoww ) static DRIVER_INIT( wildfang ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); /* sprite size Y = sprite size X */ state->sprite_sizey = 0; state->raiga_jumppoints = jumppoints_00; @@ -1522,7 +1522,7 @@ static DRIVER_INIT( wildfang ) static DRIVER_INIT( raiga ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); /* sprite size Y independent from sprite size X */ state->sprite_sizey = 2; state->raiga_jumppoints = jumppoints_00; @@ -1574,7 +1574,7 @@ static void descramble_drgnbowl_gfx(running_machine *machine) static DRIVER_INIT( drgnbowl ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); state->raiga_jumppoints = jumppoints_00; descramble_drgnbowl_gfx(machine); diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index e6942cce086..700c4a7e94d 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -44,12 +44,13 @@ Notes: #include "sound/okim6295.h" #include "galaxi.lh" -class galaxi_state +class galaxi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galaxi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galaxi_state(machine)); } - galaxi_state(running_machine &machine) { } + galaxi_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg1_ram; @@ -75,77 +76,77 @@ public: static TILE_GET_INFO( get_bg1_tile_info ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); UINT16 code = state->bg1_ram[tile_index]; SET_TILE_INFO(0, code, 0x10 + (code >> 12), 0); } static TILE_GET_INFO( get_bg2_tile_info ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); UINT16 code = state->bg2_ram[tile_index]; SET_TILE_INFO(0, code, 0x10 + (code >> 12), 0); } static TILE_GET_INFO( get_bg3_tile_info ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); UINT16 code = state->bg3_ram[tile_index]; SET_TILE_INFO(0, code, (code >> 12), 0); } static TILE_GET_INFO( get_bg4_tile_info ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); UINT16 code = state->bg4_ram[tile_index]; SET_TILE_INFO(0, code, (code >> 12), 0); } static TILE_GET_INFO( get_fg_tile_info ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); UINT16 code = state->fg_ram[tile_index]; SET_TILE_INFO(1, code, 0x20 + (code >> 12), 0); } static WRITE16_HANDLER( galaxi_bg1_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg1_ram[offset]); tilemap_mark_tile_dirty(state->bg1_tmap, offset); } static WRITE16_HANDLER( galaxi_bg2_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg2_ram[offset]); tilemap_mark_tile_dirty(state->bg2_tmap, offset); } static WRITE16_HANDLER( galaxi_bg3_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg3_ram[offset]); tilemap_mark_tile_dirty(state->bg3_tmap, offset); } static WRITE16_HANDLER( galaxi_bg4_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg4_ram[offset]); tilemap_mark_tile_dirty(state->bg4_tmap, offset); } static WRITE16_HANDLER( galaxi_fg_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_ram[offset]); tilemap_mark_tile_dirty(state->fg_tmap, offset); } static VIDEO_START(galaxi) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); state->bg1_tmap = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 16, 16, 0x20, 0x10); state->bg2_tmap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 16, 16, 0x20, 0x10); @@ -166,7 +167,7 @@ static VIDEO_START(galaxi) static VIDEO_UPDATE(galaxi) { - galaxi_state *state = (galaxi_state *)screen->machine->driver_data; + galaxi_state *state = screen->machine->driver_data(); int layers_ctrl = -1; #ifdef MAME_DEBUG @@ -199,27 +200,27 @@ static VIDEO_UPDATE(galaxi) static void show_out( running_machine *machine ) { -// galaxi_state *state = (galaxi_state *)machine->driver_data; +// galaxi_state *state = machine->driver_data(); // popmessage("%04x %04x %04x", state->out[0], state->out[1], state->out[2]); } static WRITE16_HANDLER( galaxi_500000_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->out[0]); show_out(space->machine); } static WRITE16_HANDLER( galaxi_500002_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); COMBINE_DATA(&state->out[1]); show_out(space->machine); } static WRITE16_HANDLER( galaxi_500004_w ) { - galaxi_state *state = (galaxi_state *)space->machine->driver_data; + galaxi_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -256,13 +257,13 @@ static WRITE16_HANDLER( galaxi_500004_w ) static CUSTOM_INPUT( ticket_r ) { - galaxi_state *state = (galaxi_state *)field->port->machine->driver_data; + galaxi_state *state = field->port->machine->driver_data(); return state->ticket && !(field->port->machine->primary_screen->frame_number() % 10); } static CUSTOM_INPUT( hopper_r ) { - galaxi_state *state = (galaxi_state *)field->port->machine->driver_data; + galaxi_state *state = field->port->machine->driver_data(); return state->hopper && !(field->port->machine->primary_screen->frame_number() % 10); } @@ -373,7 +374,7 @@ GFXDECODE_END static MACHINE_START( galaxi ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); state_save_register_global(machine, state->hopper); state_save_register_global(machine, state->ticket); @@ -382,7 +383,7 @@ static MACHINE_START( galaxi ) static MACHINE_RESET( galaxi ) { - galaxi_state *state = (galaxi_state *)machine->driver_data; + galaxi_state *state = machine->driver_data(); state->hopper = 0; state->ticket = 0; diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index ea093fd8f66..10f3ab6257a 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -396,7 +396,7 @@ GFXDECODE_END static MACHINE_START( galivan ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); /* configure ROM banking */ UINT8 *rombase = memory_region(machine, "maincpu"); @@ -413,7 +413,7 @@ static MACHINE_START( galivan ) static MACHINE_START( ninjemak ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); /* configure ROM banking */ UINT8 *rombase = memory_region(machine, "maincpu"); @@ -429,7 +429,7 @@ static MACHINE_START( ninjemak ) static MACHINE_RESET( galivan ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); machine->device("maincpu")->reset(); @@ -443,7 +443,7 @@ static MACHINE_RESET( galivan ) static MACHINE_RESET( ninjemak ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); machine->device("maincpu")->reset(); diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 2fcd21e5ec3..b0bf8c5ced7 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -28,7 +28,7 @@ TODO: static WRITE16_HANDLER( soundcommand_w ) { - galspnbl_state *state = (galspnbl_state *)space->machine->driver_data; + galspnbl_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -190,7 +190,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int linestate ) { - galspnbl_state *state = (galspnbl_state *)device->machine->driver_data; + galspnbl_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); } @@ -202,7 +202,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( galspnbl ) { - galspnbl_state *state = (galspnbl_state *)machine->driver_data; + galspnbl_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); } diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index 389d59ca9e8..d19c02639c5 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -91,7 +91,7 @@ TODO: static WRITE8_DEVICE_HANDLER( io_select_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); switch (data) { @@ -108,7 +108,7 @@ static WRITE8_DEVICE_HANDLER( io_select_w ) static READ8_DEVICE_HANDLER( io_port_r ) { static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3", "DSW0", "DSW1" }; - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); return input_port_read(device->machine, portnames[state->current_port]); } @@ -139,7 +139,7 @@ static const via6522_interface via_1_interface = static WRITE8_DEVICE_HANDLER( audio_reset_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); @@ -153,14 +153,14 @@ static WRITE8_DEVICE_HANDLER( audio_reset_w ) static WRITE8_DEVICE_HANDLER( audio_cmd_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); riot6532_porta_in_set(state->riot, data, 0x7f); } static WRITE8_DEVICE_HANDLER( audio_trigger_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); riot6532_porta_in_set(state->riot, data << 7, 0x80); } @@ -184,7 +184,7 @@ static const via6522_interface via_2_interface = static WRITE_LINE_DEVICE_HANDLER( r6532_irq ) { - gameplan_state *gameplan = (gameplan_state *)device->machine->driver_data; + gameplan_state *gameplan = device->machine->driver_data(); cpu_set_input_line(gameplan->audiocpu, 0, state); if (state == ASSERT_LINE) @@ -982,7 +982,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( gameplan ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1002,7 +1002,7 @@ static MACHINE_START( gameplan ) static MACHINE_RESET( gameplan ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); state->current_port = 0; state->video_x = 0; state->video_y = 0; diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 9a477de39f9..89154ac40c9 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -136,9 +136,9 @@ static void update_interrupts(running_machine *machine) { - gauntlet_state *state = (gauntlet_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + gauntlet_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -156,7 +156,7 @@ static void scanline_update(screen_device &screen, int scanline) static MACHINE_START( gauntlet ) { - gauntlet_state *state = (gauntlet_state *)machine->driver_data; + gauntlet_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->sound_reset_val); @@ -165,13 +165,13 @@ static MACHINE_START( gauntlet ) static MACHINE_RESET( gauntlet ) { - gauntlet_state *state = (gauntlet_state *)machine->driver_data; + gauntlet_state *state = machine->driver_data(); state->sound_reset_val = 1; - atarigen_eeprom_reset(&state->atarigen); - atarigen_slapstic_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_slapstic_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update, 32); atarigen_sound_io_reset(machine->device("audiocpu")); } @@ -186,10 +186,10 @@ static MACHINE_RESET( gauntlet ) static READ16_HANDLER( port4_r ) { - gauntlet_state *state = (gauntlet_state *)space->machine->driver_data; + gauntlet_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "803008"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0020; - if (state->atarigen.sound_to_cpu_ready) temp ^= 0x0010; + if (state->cpu_to_sound_ready) temp ^= 0x0020; + if (state->sound_to_cpu_ready) temp ^= 0x0010; return temp; } @@ -203,7 +203,7 @@ static READ16_HANDLER( port4_r ) static WRITE16_HANDLER( sound_reset_w ) { - gauntlet_state *state = (gauntlet_state *)space->machine->driver_data; + gauntlet_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { int oldword = state->sound_reset_val; @@ -236,11 +236,11 @@ static WRITE16_HANDLER( sound_reset_w ) static READ8_HANDLER( switch_6502_r ) { - gauntlet_state *state = (gauntlet_state *)space->machine->driver_data; + gauntlet_state *state = space->machine->driver_data(); int temp = 0x30; - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x80; - if (state->atarigen.sound_to_cpu_ready) temp ^= 0x40; + if (state->cpu_to_sound_ready) temp ^= 0x80; + if (state->sound_to_cpu_ready) temp ^= 0x40; if (!tms5220_readyq_r(space->machine->device("tms"))) temp ^= 0x20; if (!(input_port_read(space->machine, "803008") & 0x0008)) temp ^= 0x10; @@ -310,7 +310,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) /* MBUS */ AM_RANGE(0x800000, 0x801fff) AM_MIRROR(0x2fc000) AM_RAM - AM_RANGE(0x802000, 0x802fff) AM_MIRROR(0x2fc000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(gauntlet_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x802000, 0x802fff) AM_MIRROR(0x2fc000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(gauntlet_state, eeprom, eeprom_size) AM_RANGE(0x803000, 0x803001) AM_MIRROR(0x2fcef0) AM_READ_PORT("803000") AM_RANGE(0x803002, 0x803003) AM_MIRROR(0x2fcef0) AM_READ_PORT("803002") AM_RANGE(0x803004, 0x803005) AM_MIRROR(0x2fcef0) AM_READ_PORT("803004") @@ -324,14 +324,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x803170, 0x803171) AM_MIRROR(0x2fce8e) AM_WRITE(atarigen_sound_w) /* VBUS */ - AM_RANGE(0x900000, 0x901fff) AM_MIRROR(0x2c8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(gauntlet_state, atarigen.playfield) + AM_RANGE(0x900000, 0x901fff) AM_MIRROR(0x2c8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(gauntlet_state, playfield) AM_RANGE(0x902000, 0x903fff) AM_MIRROR(0x2c8000) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x904000, 0x904fff) AM_MIRROR(0x2c8000) AM_RAM - AM_RANGE(0x905f6e, 0x905f6f) AM_MIRROR(0x2c8000) AM_RAM_WRITE(gauntlet_yscroll_w) AM_BASE_MEMBER(gauntlet_state, atarigen.yscroll) - AM_RANGE(0x905000, 0x905f7f) AM_MIRROR(0x2c8000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(gauntlet_state, atarigen.alpha) + AM_RANGE(0x905f6e, 0x905f6f) AM_MIRROR(0x2c8000) AM_RAM_WRITE(gauntlet_yscroll_w) AM_BASE_MEMBER(gauntlet_state, yscroll) + AM_RANGE(0x905000, 0x905f7f) AM_MIRROR(0x2c8000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(gauntlet_state, alpha) AM_RANGE(0x905f80, 0x905fff) AM_MIRROR(0x2c8000) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x910000, 0x9107ff) AM_MIRROR(0x2cf800) AM_RAM_WRITE(paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x930000, 0x930001) AM_MIRROR(0x2cfffe) AM_WRITE(gauntlet_xscroll_w) AM_BASE_MEMBER(gauntlet_state, atarigen.xscroll) + AM_RANGE(0x930000, 0x930001) AM_MIRROR(0x2cfffe) AM_WRITE(gauntlet_xscroll_w) AM_BASE_MEMBER(gauntlet_state, xscroll) ADDRESS_MAP_END @@ -1624,9 +1624,9 @@ ROM_END static void gauntlet_common_init(running_machine *machine, int slapstic, int vindctr2) { - gauntlet_state *state = (gauntlet_state *)machine->driver_data; + gauntlet_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "maincpu"); - state->atarigen.eeprom_default = NULL; + state->eeprom_default = NULL; atarigen_slapstic_init(machine->device("maincpu"), 0x038000, 0, slapstic); /* swap the top and bottom halves of the main CPU ROM images */ diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 792bf8691a6..18e3c26202e 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -88,7 +88,7 @@ static INTERRUPT_GEN( gberet_interrupt ) { - gberet_state *state = (gberet_state *)device->machine->driver_data; + gberet_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { if (state->irq_enable) @@ -118,7 +118,7 @@ static WRITE8_HANDLER( gberet_coin_counter_w ) static WRITE8_HANDLER( gberet_flipscreen_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); state->nmi_enable = data & 0x01; state->irq_enable = data & 0x04; @@ -137,7 +137,7 @@ static WRITE8_HANDLER( mrgoemon_coin_counter_w ) static WRITE8_HANDLER( mrgoemon_flipscreen_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); state->nmi_enable = data & 0x01; state->irq_enable = data & 0x02; @@ -371,7 +371,7 @@ GFXDECODE_END static MACHINE_START( gberet ) { - gberet_state *state = (gberet_state *)machine->driver_data; + gberet_state *state = machine->driver_data(); state_save_register_global(machine, state->irq_enable); state_save_register_global(machine, state->nmi_enable); @@ -380,7 +380,7 @@ static MACHINE_START( gberet ) static MACHINE_RESET( gberet ) { - gberet_state *state = (gberet_state *)machine->driver_data; + gberet_state *state = machine->driver_data(); state->irq_enable = 0; state->nmi_enable = 0; diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 4c9faa9f93a..c07474d4702 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -21,7 +21,7 @@ static KONAMI_SETLINES_CALLBACK( gbusters_banking ); static INTERRUPT_GEN( gbusters_interrupt ) { - gbusters_state *state = (gbusters_state *)device->machine->driver_data; + gbusters_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) cpu_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); @@ -29,7 +29,7 @@ static INTERRUPT_GEN( gbusters_interrupt ) static READ8_HANDLER( bankedram_r ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); if (state->palette_selected) return space->machine->generic.paletteram.u8[offset]; @@ -39,7 +39,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); if (state->palette_selected) paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data); @@ -49,7 +49,7 @@ static WRITE8_HANDLER( bankedram_w ) static WRITE8_HANDLER( gbusters_1f98_w ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); /* bit 0 = enable char ROM reading through the video RAM */ k052109_set_rmrd_line(state->k052109, (data & 0x01) ? ASSERT_LINE : CLEAR_LINE); @@ -66,7 +66,7 @@ static WRITE8_HANDLER( gbusters_1f98_w ) static WRITE8_HANDLER( gbusters_coin_counter_w ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); /* bit 0 select palette RAM or work RAM at 5800-5fff */ state->palette_selected = ~data & 0x01; @@ -105,7 +105,7 @@ char baf[40]; static WRITE8_HANDLER( gbusters_sh_irqtrigger_w ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -127,7 +127,7 @@ static WRITE8_DEVICE_HANDLER( gbusters_snd_bankswitch_w ) /* special handlers to combine 052109 & 051960 */ static READ8_HANDLER( k052109_051960_r ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -144,7 +144,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - gbusters_state *state = (gbusters_state *)space->machine->driver_data; + gbusters_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -274,7 +274,7 @@ static const k051960_interface gbusters_k051960_intf = static MACHINE_START( gbusters ) { - gbusters_state *state = (gbusters_state *)machine->driver_data; + gbusters_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x2000); @@ -295,7 +295,7 @@ static MACHINE_START( gbusters ) static MACHINE_RESET( gbusters ) { - gbusters_state *state = (gbusters_state *)machine->driver_data; + gbusters_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "maincpu"); konami_configure_set_lines(machine->device("maincpu"), gbusters_banking); diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 30bf88cab30..06bbd12054a 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -44,14 +44,14 @@ Stephh's notes (based on the game M68000 code and some tests) : static TIMER_CALLBACK( gcpinbal_interrupt1 ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 1, HOLD_LINE); } #ifdef UNUSED_FUNCTION static TIMER_CALLBACK( gcpinbal_interrupt3 ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); // IRQ3 is from the M6585 // if (!ADPCM_playing(0)) { @@ -76,7 +76,7 @@ static INTERRUPT_GEN( gcpinbal_interrupt ) static READ16_HANDLER( ioc_r ) { - gcpinbal_state *state = (gcpinbal_state *)space->machine->driver_data; + gcpinbal_state *state = space->machine->driver_data(); /* 20 (only once), 76, a0 are read in log */ @@ -105,7 +105,7 @@ static READ16_HANDLER( ioc_r ) static WRITE16_HANDLER( ioc_w ) { - gcpinbal_state *state = (gcpinbal_state *)space->machine->driver_data; + gcpinbal_state *state = space->machine->driver_data(); COMBINE_DATA(&state->ioc_ram[offset]); // switch (offset) @@ -204,7 +204,7 @@ static WRITE16_HANDLER( ioc_w ) /* Controlled through ioc? */ static void gcp_adpcm_int( running_device *device ) { - gcpinbal_state *state = (gcpinbal_state *)device->machine->driver_data; + gcpinbal_state *state = device->machine->driver_data(); if (state->adpcm_idle) msm5205_reset_w(device, 1); @@ -394,7 +394,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( gcpinbal ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); state_save_register_global_array(machine, state->scrollx); state_save_register_global_array(machine, state->scrolly); @@ -412,7 +412,7 @@ static MACHINE_START( gcpinbal ) static MACHINE_RESET( gcpinbal ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); int i; for (i = 0; i < 3; i++) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index f68a1440cc1..9fd3b426340 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -60,13 +60,13 @@ static const eeprom_interface eeprom_intf = static READ16_HANDLER( control2_r ) { - gijoe_state *state = (gijoe_state *)space->machine->driver_data; + gijoe_state *state = space->machine->driver_data(); return state->cur_control2; } static WRITE16_HANDLER( control2_w ) { - gijoe_state *state = (gijoe_state *)space->machine->driver_data; + gijoe_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -87,7 +87,7 @@ static WRITE16_HANDLER( control2_w ) static void gijoe_objdma( running_machine *machine ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); UINT16 *src_head, *src_tail, *dst_head, *dst_tail; src_head = state->spriteram; @@ -112,7 +112,7 @@ static void gijoe_objdma( running_machine *machine ) static TIMER_CALLBACK( dmaend_callback ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); if (state->cur_control2 & 0x0020) cpu_set_input_line(state->maincpu, 6, HOLD_LINE); @@ -120,7 +120,7 @@ static TIMER_CALLBACK( dmaend_callback ) static INTERRUPT_GEN( gijoe_interrupt ) { - gijoe_state *state = (gijoe_state *)device->machine->driver_data; + gijoe_state *state = device->machine->driver_data(); // global interrupt masking (*this game only) if (!k056832_is_irq_enabled(state->k056832, 0)) @@ -150,7 +150,7 @@ static WRITE16_HANDLER( sound_cmd_w ) static WRITE16_HANDLER( sound_irq_w ) { - gijoe_state *state = (gijoe_state *)space->machine->driver_data; + gijoe_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -161,7 +161,7 @@ static READ16_HANDLER( sound_status_r ) static void sound_nmi( running_device *device ) { - gijoe_state *state = (gijoe_state *)device->machine->driver_data; + gijoe_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -276,7 +276,7 @@ static const k053247_interface gijoe_k053247_intf = static MACHINE_START( gijoe ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -292,7 +292,7 @@ static MACHINE_START( gijoe ) static MACHINE_RESET( gijoe ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); state->cur_control2 = 0; } diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index 098d8cf5b10..5049e6e72d4 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -89,7 +89,7 @@ static WRITE8_HANDLER( MC6840_control_port_0_w ) /* MC6840 Emulation by Takahiro Nogi. 1999/09/27 (This routine hasn't been completed yet.) */ - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); state->MC6840_index0 = data; if (state->MC6840_index0 & 0x80) /* enable timer output */ @@ -116,7 +116,7 @@ static WRITE8_HANDLER( MC6840_control_port_1_w ) /* MC6840 Emulation by Takahiro Nogi. 1999/09/27 (This routine hasn't been completed yet.) */ - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); state->MC6840_index1 = data; } @@ -125,7 +125,7 @@ static WRITE8_HANDLER( MC6840_write_port_0_w ) /* MC6840 Emulation by Takahiro Nogi. 1999/09/27 (This routine hasn't been completed yet.) */ - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); state->MC6840_register0 = data; } @@ -134,7 +134,7 @@ static WRITE8_HANDLER( MC6840_write_port_1_w ) /* MC6840 Emulation by Takahiro Nogi. 1999/09/27 (This routine hasn't been completed yet.) */ - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); state->MC6840_register1 = data; } @@ -278,7 +278,7 @@ static INTERRUPT_GEN( ginganin_sound_interrupt ) /* MC6840 Emulation by Takahiro Nogi. 1999/09/27 (This routine hasn't been completed yet.) */ - ginganin_state *state = (ginganin_state *)device->machine->driver_data; + ginganin_state *state = device->machine->driver_data(); if (state->S_TEMPO_OLD != state->S_TEMPO) { @@ -304,7 +304,7 @@ static INTERRUPT_GEN( ginganin_sound_interrupt ) static MACHINE_START( ginganin ) { - ginganin_state *state = (ginganin_state *)machine->driver_data; + ginganin_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -322,7 +322,7 @@ static MACHINE_START( ginganin ) static MACHINE_RESET( ginganin ) { - ginganin_state *state = (ginganin_state *)machine->driver_data; + ginganin_state *state = machine->driver_data(); state->layers_ctrl = 0; state->flipscreen = 0; diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index 851ae62430f..27a0508167e 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -15,13 +15,13 @@ The DS5002FP has up to 128KB undumped gameplay code making the game unplayable : static WRITE16_HANDLER( clr_int_w ) { - glass_state *state = (glass_state *)space->machine->driver_data; + glass_state *state = space->machine->driver_data(); state->cause_interrupt = 1; } static INTERRUPT_GEN( glass_interrupt ) { - glass_state *state = (glass_state *)device->machine->driver_data; + glass_state *state = device->machine->driver_data(); if (state->cause_interrupt) { @@ -173,7 +173,7 @@ INPUT_PORTS_END static MACHINE_START( glass ) { - glass_state *state = (glass_state *)machine->driver_data; + glass_state *state = machine->driver_data(); state_save_register_global(machine, state->cause_interrupt); state_save_register_global(machine, state->current_bit); @@ -183,7 +183,7 @@ static MACHINE_START( glass ) static MACHINE_RESET( glass ) { - glass_state *state = (glass_state *)machine->driver_data; + glass_state *state = machine->driver_data(); int i; state->cause_interrupt = 1; diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index db82563a815..d63461669e4 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -303,7 +303,7 @@ GFXDECODE_END static MACHINE_START( gng ) { - gng_state *state = (gng_state *)machine->driver_data; + gng_state *state = machine->driver_data(); UINT8 *rombase = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x2000); @@ -315,7 +315,7 @@ static MACHINE_START( gng ) static MACHINE_RESET( gng ) { - gng_state *state = (gng_state *)machine->driver_data; + gng_state *state = machine->driver_data(); state->scrollx[0] = 0; state->scrollx[1] = 0; diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 3572a0de0c5..7453f4e571a 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -34,12 +34,13 @@ Notes: #include "cpu/z80/z80.h" #include "sound/dac.h" -class go2000_state +class go2000_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, go2000_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, go2000_state(machine)); } - go2000_state(running_machine &machine) { } + go2000_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; @@ -53,7 +54,7 @@ public: static WRITE16_HANDLER( sound_cmd_w ) { - go2000_state *state = (go2000_state *)space->machine->driver_data; + go2000_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data & 0xff); cpu_set_input_line(state->soundcpu, 0, HOLD_LINE); } @@ -172,7 +173,7 @@ static VIDEO_START(go2000) static VIDEO_UPDATE(go2000) { - go2000_state *state = (go2000_state *)screen->machine->driver_data; + go2000_state *state = screen->machine->driver_data(); int x,y; int count = 0; @@ -307,7 +308,7 @@ static VIDEO_UPDATE(go2000) static MACHINE_START( go2000 ) { - go2000_state *state = (go2000_state *)machine->driver_data; + go2000_state *state = machine->driver_data(); UINT8 *SOUND = memory_region(machine, "soundcpu"); int i; diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 69d42f08604..1213f0eb798 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -17,7 +17,7 @@ static WRITE16_HANDLER( goal92_sound_command_w ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { soundlatch_w(space, 0, (data >> 8) & 0xff); @@ -77,7 +77,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_control_w ) static WRITE8_HANDLER( adpcm_data_w ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); state->msm5205next = data; } @@ -213,7 +213,7 @@ INPUT_PORTS_END static void irqhandler( running_device *device, int irq ) { /* NMI writes to MSM ports *only*! -AS */ - //goal92_state *state = (goal92_state *)device->machine->driver_data; + //goal92_state *state = device->machine->driver_data(); //cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -229,7 +229,7 @@ static const ym2203_interface ym2203_config = static void goal92_adpcm_int( running_device *device ) { - goal92_state *state = (goal92_state *)device->machine->driver_data; + goal92_state *state = device->machine->driver_data(); msm5205_data_w(device, state->msm5205next); state->msm5205next >>= 4; state->adpcm_toggle^= 1; @@ -292,7 +292,7 @@ GFXDECODE_END static MACHINE_START( goal92 ) { - goal92_state *state = (goal92_state *)machine->driver_data; + goal92_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); @@ -306,7 +306,7 @@ static MACHINE_START( goal92 ) static MACHINE_RESET( goal92 ) { - goal92_state *state = (goal92_state *)machine->driver_data; + goal92_state *state = machine->driver_data(); state->fg_bank = 0; state->msm5205next = 0; diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index c332e9cf7ef..6bd68170dc5 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -26,7 +26,7 @@ Notes: static WRITE8_HANDLER( goindol_bankswitch_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data & 0x03); @@ -43,7 +43,7 @@ static WRITE8_HANDLER( goindol_bankswitch_w ) static READ8_HANDLER( prot_f422_r ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); /* bit 7 = vblank? */ state->prot_toggle ^= 0x80; @@ -54,7 +54,7 @@ static READ8_HANDLER( prot_f422_r ) static WRITE8_HANDLER( prot_fc44_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); logerror("%04x: prot_fc44_w(%02x)\n", cpu_get_pc(space->cpu), data); state->ram[0x0419] = 0x5b; @@ -64,7 +64,7 @@ static WRITE8_HANDLER( prot_fc44_w ) static WRITE8_HANDLER( prot_fd99_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); logerror("%04x: prot_fd99_w(%02x)\n", cpu_get_pc(space->cpu), data); state->ram[0x0421] = 0x3f; @@ -72,7 +72,7 @@ static WRITE8_HANDLER( prot_fd99_w ) static WRITE8_HANDLER( prot_fc66_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); logerror("%04x: prot_fc66_w(%02x)\n", cpu_get_pc(space->cpu), data); state->ram[0x0423] = 0x06; @@ -80,7 +80,7 @@ static WRITE8_HANDLER( prot_fc66_w ) static WRITE8_HANDLER( prot_fcb0_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); logerror("%04x: prot_fcb0_w(%02x)\n", cpu_get_pc(space->cpu), data); state->ram[0x0425] = 0x06; @@ -226,7 +226,7 @@ GFXDECODE_END static MACHINE_START( goindol ) { - goindol_state *state = (goindol_state *)machine->driver_data; + goindol_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -237,7 +237,7 @@ static MACHINE_START( goindol ) static MACHINE_RESET( goindol ) { - goindol_state *state = (goindol_state *)machine->driver_data; + goindol_state *state = machine->driver_data(); state->char_bank = 0; state->prot_toggle = 0; diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 4be491cbe4d..20aedf3f425 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -121,7 +121,7 @@ static NVRAM_HANDLER( goldstar ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); if (read_or_write) mame_fwrite(file,state->nvram,state->nvram_size); @@ -137,7 +137,7 @@ static NVRAM_HANDLER( goldstar ) static WRITE8_HANDLER( protection_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); if (data == 0x2a) state->dataoffset = 0; @@ -145,7 +145,7 @@ static WRITE8_HANDLER( protection_w ) static READ8_HANDLER( protection_r ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); static const int data[4] = { 0x47, 0x4f, 0x4c, 0x44 }; state->dataoffset %= 4; @@ -400,7 +400,7 @@ static WRITE8_HANDLER( magical_outb850_w ) { // guess, could be wrong, this might just be lights - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); if (data&0x20) state->tile_bank = 1; @@ -569,7 +569,7 @@ static WRITE8_HANDLER( unkcm_0x02_w ) static WRITE8_HANDLER( unkcm_0x03_w ) { //popmessage("unkcm_0x03_w %02x", data); - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->unkch_vidreg = data; @@ -5360,21 +5360,21 @@ static const ppi8255_interface cm_ppi8255_intf[2] = static WRITE8_DEVICE_HANDLER( system_outputa_w ) { - //goldstar_state *state = (goldstar_state *)device->machine->driver_data; + //goldstar_state *state = device->machine->driver_data(); //popmessage("system_outputa_w %02x",data); } static WRITE8_DEVICE_HANDLER( system_outputb_w ) { - //goldstar_state *state = (goldstar_state *)device->machine->driver_data; + //goldstar_state *state = device->machine->driver_data(); //popmessage("system_outputb_w %02x",data); } static WRITE8_DEVICE_HANDLER( system_outputc_w ) { - goldstar_state *state = (goldstar_state *)device->machine->driver_data; + goldstar_state *state = device->machine->driver_data(); state->lucky8_nmi_enable = data & 8; state->unkch_vidreg = data & 2; @@ -5480,13 +5480,13 @@ static const ay8910_interface cm_ay8910_config = static WRITE8_DEVICE_HANDLER( ay8910_outputa_w ) { - //goldstar_state *state = (goldstar_state *)device->machine->driver_data; + //goldstar_state *state = device->machine->driver_data(); //popmessage("ay8910_outputa_w %02x",data); } static WRITE8_DEVICE_HANDLER( ay8910_outputb_w ) { - //goldstar_state *state = (goldstar_state *)device->machine->driver_data; + //goldstar_state *state = device->machine->driver_data(); //popmessage("ay8910_outputb_w %02x",data); } @@ -5931,7 +5931,7 @@ MACHINE_DRIVER_END static INTERRUPT_GEN( lucky8_irq ) { - goldstar_state *state = (goldstar_state *)device->machine->driver_data; + goldstar_state *state = device->machine->driver_data(); if(state->lucky8_nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 1a42687e190..ccbb5a0af9e 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -35,12 +35,13 @@ voice.rom - VOICE ROM #include "sound/okim6295.h" -class good_state +class good_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, good_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, good_state(machine)); } - good_state(running_machine &machine) { } + good_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_tilemapram; @@ -55,14 +56,14 @@ public: static WRITE16_HANDLER( fg_tilemapram_w ) { - good_state *state = (good_state *)space->machine->driver_data; + good_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_tilemapram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } static TILE_GET_INFO( get_fg_tile_info ) { - good_state *state = (good_state *)machine->driver_data; + good_state *state = machine->driver_data(); int tileno = state->fg_tilemapram[tile_index * 2]; int attr = state->fg_tilemapram[tile_index * 2 + 1] & 0xf; SET_TILE_INFO(0, tileno, attr, 0); @@ -70,14 +71,14 @@ static TILE_GET_INFO( get_fg_tile_info ) static WRITE16_HANDLER( bg_tilemapram_w ) { - good_state *state = (good_state *)space->machine->driver_data; + good_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_tilemapram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } static TILE_GET_INFO( get_bg_tile_info ) { - good_state *state = (good_state *)machine->driver_data; + good_state *state = machine->driver_data(); int tileno = state->bg_tilemapram[tile_index * 2]; int attr = state->bg_tilemapram[tile_index * 2 + 1] & 0xf; SET_TILE_INFO(1, tileno, attr, 0); @@ -87,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( good ) { - good_state *state = (good_state *)machine->driver_data; + good_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transparent_pen(state->fg_tilemap, 0xf); @@ -95,7 +96,7 @@ static VIDEO_START( good ) static VIDEO_UPDATE( good ) { - good_state *state = (good_state *)screen->machine->driver_data; + good_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index 6f13e0ad79c..88cd1d23837 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -238,7 +238,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int linestate ) { - gotcha_state *state = (gotcha_state *)device->machine->driver_data; + gotcha_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); } @@ -250,7 +250,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( gotcha ) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -261,7 +261,7 @@ static MACHINE_START( gotcha ) static MACHINE_RESET( gotcha ) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); int i; for (i = 0; i < 4; i++) diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index bb01c5f7a27..a64307b257c 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -176,7 +176,7 @@ static const samples_interface gotya_samples_interface = static MACHINE_START( gotya ) { - gotya_state *state = (gotya_state *)machine->driver_data; + gotya_state *state = machine->driver_data(); state->samples = machine->device("samples"); @@ -186,7 +186,7 @@ static MACHINE_START( gotya ) static MACHINE_RESET( gotya ) { - gotya_state *state = (gotya_state *)machine->driver_data; + gotya_state *state = machine->driver_data(); state->scroll_bit_8 = 0; state->theme_playing = 0; diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index ae344c226f1..c566d537196 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -30,13 +30,13 @@ static READ16_HANDLER( k052109_halfword_r ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); return k052109_r(state->k052109, offset); } static WRITE16_HANDLER( k052109_halfword_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) k052109_w(state->k052109, offset, data & 0xff); @@ -49,13 +49,13 @@ static WRITE16_HANDLER( k052109_halfword_w ) static READ16_HANDLER( k051937_halfword_r ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); return k051937_r(state->k051960, offset); } static WRITE16_HANDLER( k051937_halfword_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) k051937_w(state->k051960, offset, data & 0xff); @@ -63,20 +63,20 @@ static WRITE16_HANDLER( k051937_halfword_w ) static READ16_HANDLER( k051960_halfword_r ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); return k051960_r(state->k051960, offset); } static WRITE16_HANDLER( k051960_halfword_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) k051960_w(state->k051960, offset, data & 0xff); } static WRITE16_HANDLER( cpuA_ctrl_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -102,7 +102,7 @@ static WRITE16_HANDLER( cpuA_ctrl_w ) static WRITE16_HANDLER( cpuB_irqenable_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->irqBmask = (data >> 8) & 0x07; @@ -110,14 +110,14 @@ static WRITE16_HANDLER( cpuB_irqenable_w ) static INTERRUPT_GEN( cpuA_interrupt ) { - gradius3_state *state = (gradius3_state *)device->machine->driver_data; + gradius3_state *state = device->machine->driver_data(); if (state->irqAen) cpu_set_input_line(device, 2, HOLD_LINE); } static INTERRUPT_GEN( cpuB_interrupt ) { - gradius3_state *state = (gradius3_state *)device->machine->driver_data; + gradius3_state *state = device->machine->driver_data(); if (cpu_getiloops(device) & 1) /* ??? */ { @@ -133,7 +133,7 @@ static INTERRUPT_GEN( cpuB_interrupt ) static WRITE16_HANDLER( cpuB_irqtrigger_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); if (state->irqBmask & 4) { @@ -152,7 +152,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( sound_irq_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -301,7 +301,7 @@ static const k051960_interface gradius3_k051960_intf = static MACHINE_START( gradius3 ) { - gradius3_state *state = (gradius3_state *)machine->driver_data; + gradius3_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -317,7 +317,7 @@ static MACHINE_START( gradius3 ) static MACHINE_RESET( gradius3 ) { - gradius3_state *state = (gradius3_state *)machine->driver_data; + gradius3_state *state = machine->driver_data(); /* start with cpu B halted */ cputag_set_input_line(machine, "sub", INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index bff644e2208..2eeb9aba851 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -92,7 +92,7 @@ static MACHINE_RESET( grchamp ) static INTERRUPT_GEN( grchamp_cpu0_interrupt ) { - grchamp_state *state = (grchamp_state *)device->machine->driver_data; + grchamp_state *state = device->machine->driver_data(); if (state->cpu0_out[0] & 0x01) cpu_set_input_line(device, 0, ASSERT_LINE); @@ -101,7 +101,7 @@ static INTERRUPT_GEN( grchamp_cpu0_interrupt ) static INTERRUPT_GEN( grchamp_cpu1_interrupt ) { - grchamp_state *state = (grchamp_state *)device->machine->driver_data; + grchamp_state *state = device->machine->driver_data(); if (state->cpu1_out[4] & 0x01) cpu_set_input_line(device, 0, ASSERT_LINE); @@ -117,7 +117,7 @@ static INTERRUPT_GEN( grchamp_cpu1_interrupt ) static WRITE8_HANDLER( cpu0_outputs_w ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); UINT8 diff = data ^ state->cpu0_out[offset]; state->cpu0_out[offset] = data; @@ -201,7 +201,7 @@ static WRITE8_HANDLER( led_board_w ) { static const UINT8 ls247_map[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0x58,0x4c,0x62,0x69,0x78,0x00 }; - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); switch (offset) { @@ -245,7 +245,7 @@ static WRITE8_HANDLER( led_board_w ) static WRITE8_HANDLER( cpu1_outputs_w ) { running_device *discrete = space->machine->device("discrete"); - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); UINT8 diff = data ^ state->cpu1_out[offset]; state->cpu1_out[offset] = data; @@ -354,28 +354,28 @@ INLINE UINT8 get_pc3259_bits(running_machine *machine, grchamp_state *state, int static READ8_HANDLER( pc3259_0_r ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); return get_pc3259_bits(space->machine, state, 0); } static READ8_HANDLER( pc3259_1_r ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); return get_pc3259_bits(space->machine, state, 1); } static READ8_HANDLER( pc3259_2_r ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); return get_pc3259_bits(space->machine, state, 2); } static READ8_HANDLER( pc3259_3_r ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); return get_pc3259_bits(space->machine, state, 3); } @@ -389,14 +389,14 @@ static READ8_HANDLER( pc3259_3_r ) static READ8_HANDLER( sub_to_main_comm_r ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); return state->comm_latch; } static TIMER_CALLBACK( main_to_sub_comm_sync_w ) { - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); int offset = param >> 8; state->comm_latch2[offset & 3] = param; } @@ -410,7 +410,7 @@ static WRITE8_HANDLER( main_to_sub_comm_w ) static READ8_HANDLER( main_to_sub_comm_r ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); return state->comm_latch2[offset]; } diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index dba16dc6cdc..ca5e8df9d12 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -124,13 +124,14 @@ RAM4 is HMC HM6264LP-70 #include "cpu/e132xs/e132xs.h" #include "sound/okim6295.h" -class gstream_state +class gstream_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gstream_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gstream_state(machine)); } gstream_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), oki_1(machine.device("oki1")), oki_2(machine.device("oki2")) { } @@ -187,7 +188,7 @@ static CUSTOM_INPUT( gstream_mirror_r ) static WRITE32_HANDLER( gstream_palette_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); COMBINE_DATA(&state->paletteram[offset]); palette_set_color_rgb(space->machine, offset * 2, pal5bit(state->paletteram[offset] >> (0 + 16)), @@ -202,7 +203,7 @@ static WRITE32_HANDLER( gstream_palette_w ) static WRITE32_HANDLER( gstream_vram_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram[offset]); if (ACCESSING_BITS_24_31) @@ -224,37 +225,37 @@ static WRITE32_HANDLER( gstream_vram_w ) static WRITE32_HANDLER( gstream_tilemap1_scrollx_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); state->tmap1_scrollx = data; } static WRITE32_HANDLER( gstream_tilemap1_scrolly_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); state->tmap1_scrolly = data; } static WRITE32_HANDLER( gstream_tilemap2_scrollx_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); state->tmap2_scrollx = data; } static WRITE32_HANDLER( gstream_tilemap2_scrolly_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); state->tmap2_scrolly = data; } static WRITE32_HANDLER( gstream_tilemap3_scrollx_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); state->tmap3_scrollx = data; } static WRITE32_HANDLER( gstream_tilemap3_scrolly_w ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); state->tmap3_scrolly = data; } @@ -307,7 +308,7 @@ static WRITE32_HANDLER( gstream_oki_banking_w ) Musics order is completely guessed but close to what the original PCB game should be */ - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); static const int bank_table_0[16] = { -1, -1, -1, -1, -1, -1, 0, 0, -1, 6, 0, 5, -1, 0, 0, 0 }; static const int bank_table_1[16] = { -1, -1, -1, -1, -1, -1, 2, 2, -1, 0, 0, 4, -1, 1, 1, 1 }; @@ -431,7 +432,7 @@ GFXDECODE_END static TILE_GET_INFO( get_gs1_tile_info ) { - gstream_state *state = (gstream_state *)machine->driver_data; + gstream_state *state = machine->driver_data(); int tileno = (state->vram[tile_index + 0x000 / 4] & 0x0fff0000) >> 16; int palette = (state->vram[tile_index + 0x000 / 4] & 0xc0000000) >> 30; SET_TILE_INFO(0, tileno, palette + 0x10, 0); @@ -439,7 +440,7 @@ static TILE_GET_INFO( get_gs1_tile_info ) static TILE_GET_INFO( get_gs2_tile_info ) { - gstream_state *state = (gstream_state *)machine->driver_data; + gstream_state *state = machine->driver_data(); int tileno = (state->vram[tile_index + 0x400 / 4] & 0x0fff0000) >> 16; int palette = (state->vram[tile_index + 0x400 / 4] & 0xc0000000) >> 30; SET_TILE_INFO(0, tileno + 0x1000, palette + 0x14, 0); @@ -448,7 +449,7 @@ static TILE_GET_INFO( get_gs2_tile_info ) static TILE_GET_INFO( get_gs3_tile_info ) { - gstream_state *state = (gstream_state *)machine->driver_data; + gstream_state *state = machine->driver_data(); int tileno = (state->vram[tile_index + 0x800 / 4] & 0x0fff0000) >> 16; int palette = (state->vram[tile_index + 0x800 / 4] & 0xc0000000) >> 30; SET_TILE_INFO(0, tileno + 0x2000, palette + 0x18, 0); @@ -457,7 +458,7 @@ static TILE_GET_INFO( get_gs3_tile_info ) static VIDEO_START(gstream) { - gstream_state *state = (gstream_state *)machine->driver_data; + gstream_state *state = machine->driver_data(); state->tilemap1 = tilemap_create(machine, get_gs1_tile_info, tilemap_scan_rows, 32, 32, 16, 16); state->tilemap2 = tilemap_create(machine, get_gs2_tile_info, tilemap_scan_rows, 32, 32, 16, 16); state->tilemap3 = tilemap_create(machine, get_gs3_tile_info, tilemap_scan_rows, 32, 32, 16, 16); @@ -482,7 +483,7 @@ static VIDEO_UPDATE(gstream) are being set ?! */ - gstream_state *state = (gstream_state *)screen->machine->driver_data; + gstream_state *state = screen->machine->driver_data(); int i; //popmessage("(1) %08x %08x (2) %08x %08x (3) %08x %08x", state->tmap1_scrollx, state->tmap1_scrolly, state->tmap2_scrollx, state->tmap2_scrolly, state->tmap3_scrollx, state->tmap3_scrolly ); @@ -521,7 +522,7 @@ static VIDEO_UPDATE(gstream) static MACHINE_START( gstream ) { - gstream_state *state = (gstream_state *)machine->driver_data; + gstream_state *state = machine->driver_data(); state_save_register_global(machine, state->tmap1_scrollx); state_save_register_global(machine, state->tmap2_scrollx); @@ -535,7 +536,7 @@ static MACHINE_START( gstream ) static MACHINE_RESET( gstream ) { - gstream_state *state = (gstream_state *)machine->driver_data; + gstream_state *state = machine->driver_data(); state->tmap1_scrollx = 0; state->tmap2_scrollx = 0; @@ -626,7 +627,7 @@ ROM_END static READ32_HANDLER( gstream_speedup_r ) { - gstream_state *state = (gstream_state *)space->machine->driver_data; + gstream_state *state = space->machine->driver_data(); if (state->maincpu->state(STATE_GENPC) == 0xc0001592) { state->maincpu->eat_cycles(50); diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 27b4b5faf32..52eb184a662 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -55,7 +55,7 @@ Runs in interrupt mode 0, the interrupt vectors are 0xcf (RST 08h) and static INTERRUPT_GEN( yamyam_interrupt ) { - gundealr_state *state = (gundealr_state *)device->machine->driver_data; + gundealr_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -78,7 +78,7 @@ static WRITE8_HANDLER( yamyam_bankswitch_w ) static WRITE8_HANDLER( yamyam_protection_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); logerror("e000 = %02x\n", state->rambase[0x000]); state->rambase[0x000] = data; if (data == 0x03) state->rambase[0x001] = 0x03; @@ -446,7 +446,7 @@ GFXDECODE_END static MACHINE_START( gundealr ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); @@ -457,7 +457,7 @@ static MACHINE_START( gundealr ) static MACHINE_RESET( gundealr ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); state->flipscreen = 0; state->scroll[0] = 0; @@ -574,13 +574,13 @@ ROM_END static DRIVER_INIT( gundealr ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); state->input_ports_hack = 0; } static DRIVER_INIT( yamyam ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); state->input_ports_hack = 1; memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, yamyam_protection_w); } diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index 79b1c48d72e..0ead2b1e74f 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -274,7 +274,7 @@ GFXDECODE_END static MACHINE_START( gunsmoke ) { - gunsmoke_state *state = (gunsmoke_state *)machine->driver_data; + gunsmoke_state *state = machine->driver_data(); UINT8 *rombase = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x4000); @@ -287,7 +287,7 @@ static MACHINE_START( gunsmoke ) static MACHINE_RESET( gunsmoke ) { - gunsmoke_state *state = (gunsmoke_state *)machine->driver_data; + gunsmoke_state *state = machine->driver_data(); state->chon = 0; state->objon = 0; diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index 1fc320bcd3a..df324d1ff04 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -89,7 +89,7 @@ static const int gyruss_timer[10] = static READ8_DEVICE_HANDLER( gyruss_portA_r ) { - gyruss_state *state = (gyruss_state *)device->machine->driver_data; + gyruss_state *state = device->machine->driver_data(); return gyruss_timer[(state->audiocpu->total_cycles() / 1024) % 10]; } @@ -101,7 +101,7 @@ static WRITE8_DEVICE_HANDLER( gyruss_dac_w ) static WRITE8_HANDLER( gyruss_irq_clear_w ) { - gyruss_state *state = (gyruss_state *)space->machine->driver_data; + gyruss_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu_2, 0, CLEAR_LINE); } @@ -132,14 +132,14 @@ static WRITE8_DEVICE_HANDLER( gyruss_filter1_w ) static WRITE8_HANDLER( gyruss_sh_irqtrigger_w ) { - gyruss_state *state = (gyruss_state *)space->machine->driver_data; + gyruss_state *state = space->machine->driver_data(); /* writing to this register triggers IRQ on the sound CPU */ cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static WRITE8_HANDLER( gyruss_i8039_irq_w ) { - gyruss_state *state = (gyruss_state *)space->machine->driver_data; + gyruss_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu_2, 0, ASSERT_LINE); } @@ -499,7 +499,7 @@ DISCRETE_SOUND_END static MACHINE_START( gyruss ) { - gyruss_state *state = (gyruss_state *)machine->driver_data; + gyruss_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->audiocpu_2 = machine->device("audio2"); diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index 3197df802ee..f71522b441c 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -32,7 +32,7 @@ static READ8_HANDLER( hanaawas_input_port_0_r ) { - hanaawas_state *state = (hanaawas_state *)space->machine->driver_data; + hanaawas_state *state = space->machine->driver_data(); int i, ordinal = 0; UINT16 buttons = 0; @@ -66,7 +66,7 @@ static READ8_HANDLER( hanaawas_input_port_0_r ) static WRITE8_HANDLER( hanaawas_inputs_mux_w ) { - hanaawas_state *state = (hanaawas_state *)space->machine->driver_data; + hanaawas_state *state = space->machine->driver_data(); state->mux = data; } @@ -186,14 +186,14 @@ static const ay8910_interface ay8910_config = static MACHINE_START( hanaawas ) { - hanaawas_state *state = (hanaawas_state *)machine->driver_data; + hanaawas_state *state = machine->driver_data(); state_save_register_global(machine, state->mux); } static MACHINE_RESET( hanaawas ) { - hanaawas_state *state = (hanaawas_state *)machine->driver_data; + hanaawas_state *state = machine->driver_data(); state->mux = 0; } diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index 908e56a6b3b..f273ce101ce 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -422,7 +422,7 @@ static ADDRESS_MAP_START( driver_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(hd68k_gsp_io_r, hd68k_gsp_io_w) AM_RANGE(0xc04000, 0xc07fff) AM_READWRITE(hd68k_msp_io_r, hd68k_msp_io_w) AM_RANGE(0xff0000, 0xff001f) AM_READWRITE(hd68k_duart_r, hd68k_duart_w) - AM_RANGE(0xff4000, 0xff4fff) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_BASE_SIZE_MEMBER(harddriv_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xff4000, 0xff4fff) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_BASE_SIZE_MEMBER(harddriv_state, eeprom, eeprom_size) AM_RANGE(0xff8000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -470,7 +470,7 @@ static ADDRESS_MAP_START( multisync_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(hd68k_gsp_io_r, hd68k_gsp_io_w) AM_RANGE(0xc04000, 0xc07fff) AM_READWRITE(hd68k_msp_io_r, hd68k_msp_io_w) AM_RANGE(0xff0000, 0xff001f) AM_READWRITE(hd68k_duart_r, hd68k_duart_w) - AM_RANGE(0xff4000, 0xff4fff) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_BASE_SIZE_MEMBER(harddriv_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xff4000, 0xff4fff) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_BASE_SIZE_MEMBER(harddriv_state, eeprom, eeprom_size) AM_RANGE(0xff8000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -508,7 +508,7 @@ static ADDRESS_MAP_START( multisync2_68k_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(hd68k_gsp_io_r, hd68k_gsp_io_w) AM_RANGE(0xc04000, 0xc07fff) AM_READWRITE(hd68k_msp_io_r, hd68k_msp_io_w) AM_RANGE(0xfc0000, 0xfc001f) AM_READWRITE(hd68k_duart_r, hd68k_duart_w) - AM_RANGE(0xfd0000, 0xfd0fff) AM_MIRROR(0x004000) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_BASE_SIZE_MEMBER(harddriv_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xfd0000, 0xfd0fff) AM_MIRROR(0x004000) AM_READWRITE(hd68k_zram_r, hd68k_zram_w) AM_BASE_SIZE_MEMBER(harddriv_state, eeprom, eeprom_size) AM_RANGE(0xff0000, 0xffffff) AM_RAM ADDRESS_MAP_END @@ -3643,22 +3643,22 @@ static const UINT16 default_eeprom[] = /* COMMON INIT: initialize the original "driver" main board */ static void init_driver(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* note that we're not multisync and set the default EEPROM data */ state->gsp_multisync = FALSE; - state->atarigen.eeprom_default = default_eeprom; + state->eeprom_default = default_eeprom; } /* COMMON INIT: initialize the later "multisync" main board */ static void init_multisync(running_machine *machine, int compact_inputs) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* note that we're multisync and set the default EEPROM data */ state->gsp_multisync = TRUE; - state->atarigen.eeprom_default = default_eeprom; + state->eeprom_default = default_eeprom; /* install handlers for the compact driving games' inputs */ if (compact_inputs) @@ -3673,7 +3673,7 @@ static void init_multisync(running_machine *machine, int compact_inputs) /* COMMON INIT: initialize the ADSP/ADSP2 board */ static void init_adsp(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* install ADSP program RAM */ memory_install_readwrite16_handler(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), 0x800000, 0x807fff, 0, 0, hd68k_adsp_program_r, hd68k_adsp_program_w); @@ -3694,7 +3694,7 @@ static void init_adsp(running_machine *machine) /* COMMON INIT: initialize the DS3 board */ static void init_ds3(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* install ADSP program RAM */ memory_install_readwrite16_handler(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), 0x800000, 0x807fff, 0, 0, hd68k_ds3_program_r, hd68k_ds3_program_w); @@ -3792,7 +3792,7 @@ static void init_ds3(running_machine *machine) /* COMMON INIT: initialize the DSK add-on board */ static void init_dsk(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); UINT8 *usr3 = memory_region(machine, "user3"); /* install ASIC61 */ @@ -3826,7 +3826,7 @@ static void init_dsk(running_machine *machine) /* COMMON INIT: initialize the DSK II add-on board */ static void init_dsk2(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); UINT8 *usr3 = memory_region(machine, "user3"); /* install ASIC65 */ @@ -3856,7 +3856,7 @@ static void init_dsk2(running_machine *machine) /* COMMON INIT: initialize the DSPCOM add-on board */ static void init_dspcom(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* install ASIC65 */ memory_install_write16_handler(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), 0x900000, 0x900003, 0, 0, asic65_data_w); @@ -3874,7 +3874,7 @@ static void init_dspcom(running_machine *machine) /* COMMON INIT: initialize the original "driver" sound board */ static void init_driver_sound(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); hdsnd_init(machine); @@ -3895,7 +3895,7 @@ static void init_driver_sound(running_machine *machine) static DRIVER_INIT( harddriv ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_driver(machine); @@ -3920,7 +3920,7 @@ static DRIVER_INIT( harddriv ) static DRIVER_INIT( harddrivc ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 1); @@ -3945,7 +3945,7 @@ static DRIVER_INIT( harddrivc ) static DRIVER_INIT( stunrun ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 0); @@ -3965,7 +3965,7 @@ static DRIVER_INIT( stunrun ) static READ32_HANDLER( rddsp32_speedup_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == state->rddsp32_speedup_pc && (*state->rddsp32_speedup >> 16) == 0) { UINT32 r14 = cpu_get_reg(space->cpu, DSP32_R14); @@ -3984,7 +3984,7 @@ static READ32_HANDLER( rddsp32_speedup_r ) static DRIVER_INIT( racedriv ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_driver(machine); @@ -4011,7 +4011,7 @@ static DRIVER_INIT( racedriv ) static void racedrivc_init_common(running_machine *machine, offs_t gsp_protection) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 1); @@ -4057,7 +4057,7 @@ static READ16_HANDLER( steeltal_dummy_r ) static void steeltal_init_common(running_machine *machine, offs_t ds3_transfer_pc, int proto_sloop) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 0); @@ -4106,7 +4106,7 @@ static DRIVER_INIT( steeltalp ) { steeltal_init_common(machine, 0x52290, 1); } static DRIVER_INIT( strtdriv ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 1); @@ -4137,7 +4137,7 @@ static DRIVER_INIT( strtdriv ) static DRIVER_INIT( hdrivair ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 1); @@ -4164,7 +4164,7 @@ static DRIVER_INIT( hdrivair ) static DRIVER_INIT( hdrivairp ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* initialize the boards */ init_multisync(machine, 1); diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 36123f49509..455388bf37b 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -24,7 +24,7 @@ static WRITE8_HANDLER( hcastle_bankswitch_w ) static WRITE8_HANDLER( hcastle_soundirq_w ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -156,7 +156,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int linestate) { -// hcastle_state *state = (hcastle_state *)device->machine->driver_data; +// hcastle_state *state = device->machine->driver_data(); // cputag_set_input_line(state->audiocpu, 0, linestate); } @@ -178,7 +178,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( hcastle ) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x2000); @@ -196,7 +196,7 @@ static MACHINE_START( hcastle ) static MACHINE_RESET( hcastle ) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); state->pf2_bankbase = 0; state->pf1_bankbase = 0; diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index 920fc9f6158..178e345622a 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -99,7 +99,7 @@ static WRITE8_HANDLER( himesiki_rombank_w ) static WRITE8_HANDLER( himesiki_sound_w ) { - himesiki_state *state = (himesiki_state *)space->machine->driver_data; + himesiki_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->subcpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -269,7 +269,7 @@ GFXDECODE_END static MACHINE_START( himesiki ) { - himesiki_state *state = (himesiki_state *)machine->driver_data; + himesiki_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); @@ -282,7 +282,7 @@ static MACHINE_START( himesiki ) static MACHINE_RESET( himesiki ) { - himesiki_state *state = (himesiki_state *)machine->driver_data; + himesiki_state *state = machine->driver_data(); state->scrollx[0] = 0; state->scrollx[1] = 0; diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 49a38cf7521..3f1c021a8bb 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -30,7 +30,7 @@ static TILE_GET_INFO( get_hitme_tile_info ) { - hitme_state *state = (hitme_state *)machine->driver_data; + hitme_state *state = machine->driver_data(); /* the code is the low 6 bits */ UINT8 code = state->videoram[tile_index] & 0x3f; @@ -40,7 +40,7 @@ static TILE_GET_INFO( get_hitme_tile_info ) static WRITE8_HANDLER( hitme_vidram_w ) { - hitme_state *state = (hitme_state *)space->machine->driver_data; + hitme_state *state = space->machine->driver_data(); /* mark this tile dirty */ state->videoram[offset] = data; @@ -57,21 +57,21 @@ static WRITE8_HANDLER( hitme_vidram_w ) static VIDEO_START( hitme ) { - hitme_state *state = (hitme_state *)machine->driver_data; + hitme_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_hitme_tile_info, tilemap_scan_rows, 8, 10, 40, 19); } static VIDEO_START( barricad ) { - hitme_state *state = (hitme_state *)machine->driver_data; + hitme_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_hitme_tile_info, tilemap_scan_rows, 8, 8, 32, 24); } static VIDEO_UPDATE( hitme ) { - hitme_state *state = (hitme_state *)screen->machine->driver_data; + hitme_state *state = screen->machine->driver_data(); /* the card width resistor comes from an input port, scaled to the range 0-25 kOhms */ double width_resist = input_port_read(screen->machine, "WIDTH") * 25000 / 100; /* this triggers a oneshot for the following length of time */ @@ -119,7 +119,7 @@ static VIDEO_UPDATE( hitme ) static VIDEO_UPDATE( barricad ) { - hitme_state *state = (hitme_state *)screen->machine->driver_data; + hitme_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap, 0, 0); return 0; } @@ -134,7 +134,7 @@ static VIDEO_UPDATE( barricad ) static UINT8 read_port_and_t0( running_machine *machine, int port ) { - hitme_state *state = (hitme_state *)machine->driver_data; + hitme_state *state = machine->driver_data(); static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3" }; UINT8 val = input_port_read(machine, portnames[port]); @@ -192,7 +192,7 @@ static WRITE8_DEVICE_HANDLER( output_port_0_w ) In fact, it is very important that our timing calculation timeout AFTER the sound system's equivalent computation, or else we will hang notes. */ - hitme_state *state = (hitme_state *)device->machine->driver_data; + hitme_state *state = device->machine->driver_data(); UINT8 raw_game_speed = input_port_read(device->machine, "R3"); double resistance = raw_game_speed * 25000 / 100; attotime duration = attotime_make(0, ATTOSECONDS_PER_SECOND * 0.45 * 6.8e-6 * resistance * (data + 1)); @@ -311,7 +311,7 @@ static MACHINE_START( hitme ) static MACHINE_RESET( hitme ) { - hitme_state *state = (hitme_state *)machine->driver_data; + hitme_state *state = machine->driver_data(); state->timeout_time = attotime_zero; } diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 7a11b998894..b934a631a41 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -41,7 +41,7 @@ TODO: static READ8_HANDLER( keyboard_0_r ) { - hnayayoi_state *state = (hnayayoi_state *)space->machine->driver_data; + hnayayoi_state *state = space->machine->driver_data(); int res = 0x3f; int i; static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; @@ -63,7 +63,7 @@ static READ8_HANDLER( keyboard_1_r ) static WRITE8_HANDLER( keyboard_w ) { - hnayayoi_state *state = (hnayayoi_state *)space->machine->driver_data; + hnayayoi_state *state = space->machine->driver_data(); state->keyb = data; } @@ -529,7 +529,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( hnayayoi ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); state_save_register_global(machine, state->palbank); state_save_register_global(machine, state->blit_layer); @@ -540,7 +540,7 @@ static MACHINE_START( hnayayoi ) static MACHINE_RESET( hnayayoi ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); /* start with the MSM5205 reset */ msm5205_reset_w(machine->device("msm"), 1); diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index f9aa907537a..ebeef7d2edd 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -226,7 +226,7 @@ Custom: GX61A01 static INTERRUPT_GEN( homedata_irq ) { - homedata_state *state = (homedata_state *)device->machine->driver_data; + homedata_state *state = device->machine->driver_data(); state->vblank = 1; cpu_set_input_line(device, M6809_FIRQ_LINE, HOLD_LINE); } @@ -247,7 +247,7 @@ static INTERRUPT_GEN( upd7807_irq ) static READ8_HANDLER( mrokumei_keyboard_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); int res = 0x3f,i; static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; @@ -283,14 +283,14 @@ static READ8_HANDLER( mrokumei_keyboard_r ) static WRITE8_HANDLER( mrokumei_keyboard_select_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->keyb = data; } static READ8_HANDLER( mrokumei_sound_io_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); if (state->sndbank & 4) return(soundlatch_r(space, 0)); else @@ -299,7 +299,7 @@ static READ8_HANDLER( mrokumei_sound_io_r ) static WRITE8_HANDLER( mrokumei_sound_bank_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* bit 0 = ROM bank bit 2 = ROM or soundlatch */ @@ -308,7 +308,7 @@ static WRITE8_HANDLER( mrokumei_sound_bank_w ) static WRITE8_HANDLER( mrokumei_sound_io_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); switch (offset & 0xff) { case 0x40: @@ -322,7 +322,7 @@ static WRITE8_HANDLER( mrokumei_sound_io_w ) static WRITE8_HANDLER( mrokumei_sound_cmd_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -338,19 +338,19 @@ static WRITE8_HANDLER( mrokumei_sound_cmd_w ) static READ8_HANDLER( reikaids_upd7807_porta_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); return state->upd7807_porta; } static WRITE8_HANDLER( reikaids_upd7807_porta_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->upd7807_porta = data; } static WRITE8_HANDLER( reikaids_upd7807_portc_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* port C layout: 7 coin counter @@ -379,7 +379,7 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w ) static READ8_HANDLER( reikaids_io_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); int res = input_port_read(space->machine, "IN2"); // bit 4 = coin, bit 5 = service res |= BIT(state->upd7807_portc, 2) * 0x01; // bit 0 = upd7807 status @@ -397,14 +397,14 @@ static READ8_HANDLER( reikaids_io_r ) static READ8_HANDLER( reikaids_snd_command_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); //logerror("%04x: sndmcd_r (%02x)\n", cpu_get_pc(space->cpu), state->snd_command); return state->snd_command; } static WRITE8_HANDLER( reikaids_snd_command_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->snd_command = data; //logerror("%04x: coprocessor_command_w %02x\n", cpu_get_pc(space->cpu), data); } @@ -420,21 +420,21 @@ static WRITE8_HANDLER( reikaids_snd_command_w ) static WRITE8_HANDLER( pteacher_snd_command_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); //logerror("%04x: snd_command_w %02x\n", cpu_get_pc(space->cpu), data); state->from_cpu = data; } static READ8_HANDLER( pteacher_snd_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); //logerror("%04x: pteacher_snd_r %02x\n",cpu_get_pc(space->cpu),to_cpu); return state->to_cpu; } static READ8_HANDLER( pteacher_io_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* bit 6: !vblank * bit 7: visible page * other bits seem unused @@ -452,7 +452,7 @@ static READ8_HANDLER( pteacher_io_r ) static READ8_HANDLER( pteacher_keyboard_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5" }; int dips = input_port_read(space->machine, "DSW"); @@ -476,7 +476,7 @@ static READ8_HANDLER( pteacher_keyboard_r ) static READ8_HANDLER( pteacher_upd7807_porta_r ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); if (!BIT(state->upd7807_portc, 6)) state->upd7807_porta = state->from_cpu; else @@ -487,20 +487,20 @@ static READ8_HANDLER( pteacher_upd7807_porta_r ) static WRITE8_HANDLER( pteacher_snd_answer_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->to_cpu = data; //logerror("%04x: to_cpu = %02x\n", cpu_get_pc(space->cpu), state->to_cpu); } static WRITE8_HANDLER( pteacher_upd7807_porta_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->upd7807_porta = data; } static WRITE8_HANDLER( pteacher_upd7807_portc_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* port C layout: 7 coin counter 6 enable message from main CPU on port A @@ -1147,7 +1147,7 @@ GFXDECODE_END static MACHINE_START( homedata ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1168,7 +1168,7 @@ static MACHINE_START( homedata ) static MACHINE_START( reikaids ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0xc000], 0x4000); @@ -1185,7 +1185,7 @@ static MACHINE_START( reikaids ) static MACHINE_START( pteacher ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); @@ -1203,7 +1203,7 @@ static MACHINE_START( pteacher ) static MACHINE_RESET( homedata ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->visible_page = 0; state->flipscreen = 0; @@ -1221,7 +1221,7 @@ static MACHINE_RESET( homedata ) static MACHINE_RESET( pteacher ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* on reset, ports are set as input (high impedance), therefore 0xff output */ @@ -1238,7 +1238,7 @@ static MACHINE_RESET( pteacher ) static MACHINE_RESET( reikaids ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* on reset, ports are set as input (high impedance), therefore 0xff output */ @@ -2060,13 +2060,13 @@ static DRIVER_INIT( mjikaga ) static DRIVER_INIT( reikaids ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->priority = 0; } static DRIVER_INIT( battlcry ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->priority = 1; /* priority and initial value for bank write */ } diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 82263de3503..6e3d6ae541c 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -24,19 +24,19 @@ Todo : static WRITE8_DEVICE_HANDLER(pa_w) { - homerun_state *state = (homerun_state *)device->machine->driver_data; + homerun_state *state = device->machine->driver_data(); state->xpa = data; } static WRITE8_DEVICE_HANDLER(pb_w) { - homerun_state *state = (homerun_state *)device->machine->driver_data; + homerun_state *state = device->machine->driver_data(); state->xpb = data; } static WRITE8_DEVICE_HANDLER(pc_w) { - homerun_state *state = (homerun_state *)device->machine->driver_data; + homerun_state *state = device->machine->driver_data(); state->xpc = data; } @@ -192,7 +192,7 @@ GFXDECODE_END static MACHINE_START( homerun ) { - homerun_state *state = (homerun_state *)machine->driver_data; + homerun_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x00000], 0x4000); @@ -208,7 +208,7 @@ static MACHINE_START( homerun ) static MACHINE_RESET( homerun ) { - homerun_state *state = (homerun_state *)machine->driver_data; + homerun_state *state = machine->driver_data(); state->gfx_ctrl = 0; state->gc_up = 0; diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 5194726b7eb..799b0b6fb14 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -45,12 +45,13 @@ so it could be by them instead #include "cpu/i86/i86.h" #include "sound/ay8910.h" -class hotblock_state +class hotblock_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hotblock_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hotblock_state(machine)); } - hotblock_state(running_machine &machine) { } + hotblock_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * vram; @@ -65,7 +66,7 @@ public: static READ8_HANDLER( hotblock_video_read ) { - hotblock_state *state = (hotblock_state *)space->machine->driver_data; + hotblock_state *state = space->machine->driver_data(); /* right?, anything else?? */ if (state->port0 & 0x20) // port 0 = a8 e8 -- palette { @@ -89,7 +90,7 @@ static WRITE8_HANDLER( hotblock_port4_w ) { // mame_printf_debug("port4_w: pc = %06x : data %04x\n", cpu_get_pc(space->cpu), data); // popmessage("port4_w: pc = %06x : data %04x", cpu_get_pc(space->cpu), data); - hotblock_state *state = (hotblock_state *)space->machine->driver_data; + hotblock_state *state = space->machine->driver_data(); state->port4 = data; } @@ -98,13 +99,13 @@ static WRITE8_HANDLER( hotblock_port4_w ) static WRITE8_HANDLER( hotblock_port0_w ) { // popmessage("port4_w: pc = %06x : data %04x", cpu_get_pc(space->cpu), data); - hotblock_state *state = (hotblock_state *)space->machine->driver_data; + hotblock_state *state = space->machine->driver_data(); state->port0 = data; } static WRITE8_HANDLER( hotblock_video_write ) { - hotblock_state *state = (hotblock_state *)space->machine->driver_data; + hotblock_state *state = space->machine->driver_data(); /* right?, anything else?? */ if (state->port0 & 0x20) // port 0 = a8 e8 -- palette { @@ -133,14 +134,14 @@ ADDRESS_MAP_END static VIDEO_START(hotblock) { - hotblock_state *state = (hotblock_state *)machine->driver_data; + hotblock_state *state = machine->driver_data(); state->pal = auto_alloc_array(machine, UINT8, 0x10000); state_save_register_global_pointer(machine, state->pal, 0x10000); } static VIDEO_UPDATE(hotblock) { - hotblock_state *state = (hotblock_state *)screen->machine->driver_data; + hotblock_state *state = screen->machine->driver_data(); int y, x, count; int i; static const int xxx = 320, yyy = 204; diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index bd8358d0b41..2db3d9a2669 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -268,7 +268,7 @@ GFXDECODE_END static MACHINE_START( hyperspt ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->vlm = machine->device("vlm"); @@ -281,7 +281,7 @@ static MACHINE_START( hyperspt ) static MACHINE_START( hypersptb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); MACHINE_START_CALL(hyperspt); @@ -292,7 +292,7 @@ static MACHINE_START( hypersptb ) static MACHINE_RESET( hyperspt ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->SN76496_latch = 0; state->last_addr = 0; @@ -301,7 +301,7 @@ static MACHINE_RESET( hyperspt ) static MACHINE_RESET( hypersptb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); MACHINE_RESET_CALL(hyperspt); diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index c65534cf5ec..39244afe693 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -48,7 +48,7 @@ fix comms so it boots, it's a bit of a hack for hyperduel at the moment ;-) static void update_irq_state( running_machine *machine ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); int irq = state->requested_int & ~*state->irq_enable; cpu_set_input_line(state->maincpu, 3, (irq & state->int_num) ? ASSERT_LINE : CLEAR_LINE); @@ -56,13 +56,13 @@ static void update_irq_state( running_machine *machine ) static TIMER_CALLBACK( vblank_end_callback ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->requested_int &= ~param; } static INTERRUPT_GEN( hyprduel_interrupt ) { - hyprduel_state *state = (hyprduel_state *)device->machine->driver_data; + hyprduel_state *state = device->machine->driver_data(); int line = RASTER_LINES - cpu_getiloops(device); if (line == RASTER_LINES) @@ -81,13 +81,13 @@ static INTERRUPT_GEN( hyprduel_interrupt ) static READ16_HANDLER( hyprduel_irq_cause_r ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); return state->requested_int; } static WRITE16_HANDLER( hyprduel_irq_cause_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { if (data == state->int_num) @@ -102,7 +102,7 @@ static WRITE16_HANDLER( hyprduel_irq_cause_w ) static WRITE16_HANDLER( hyprduel_subcpu_control_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); switch (data) { @@ -135,7 +135,7 @@ static WRITE16_HANDLER( hyprduel_subcpu_control_w ) static READ16_HANDLER( hyprduel_cpusync_trigger1_r ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); if (state->cpu_trigger == 1001) { cpuexec_trigger(space->machine, 1001); @@ -147,7 +147,7 @@ static READ16_HANDLER( hyprduel_cpusync_trigger1_r ) static WRITE16_HANDLER( hyprduel_cpusync_trigger1_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sharedram1[0x00040e / 2 + offset]); if (((state->sharedram1[0x00040e / 2] << 16) + state->sharedram1[0x000410 / 2]) != 0x00) @@ -163,7 +163,7 @@ static WRITE16_HANDLER( hyprduel_cpusync_trigger1_w ) static READ16_HANDLER( hyprduel_cpusync_trigger2_r ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); if (state->cpu_trigger == 1002) { cpuexec_trigger(space->machine, 1002); @@ -175,7 +175,7 @@ static READ16_HANDLER( hyprduel_cpusync_trigger2_r ) static WRITE16_HANDLER( hyprduel_cpusync_trigger2_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sharedram1[0x000408 / 2 + offset]); if (ACCESSING_BITS_8_15) @@ -191,7 +191,7 @@ static WRITE16_HANDLER( hyprduel_cpusync_trigger2_w ) static TIMER_CALLBACK( magerror_irq_callback ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, 1, HOLD_LINE); } @@ -209,7 +209,7 @@ static TIMER_CALLBACK( magerror_irq_callback ) static READ16_HANDLER( hyprduel_bankedrom_r ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); UINT8 *ROM = memory_region(space->machine, "gfx1"); size_t len = memory_region_length(space->machine, "gfx1"); @@ -267,7 +267,7 @@ static READ16_HANDLER( hyprduel_bankedrom_r ) static TIMER_CALLBACK( hyprduel_blit_done ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->requested_int |= 1 << state->blitter_bit; update_irq_state(machine); } @@ -291,7 +291,7 @@ INLINE void blt_write( const address_space *space, const int tmap, const offs_t static WRITE16_HANDLER( hyprduel_blitter_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_regs[offset]); if (offset == 0xc / 2) @@ -623,7 +623,7 @@ GFXDECODE_END static void sound_irq( running_device *device, int state ) { - hyprduel_state *hyprduel = (hyprduel_state *)device->machine->driver_data; + hyprduel_state *hyprduel = device->machine->driver_data(); cpu_set_input_line(hyprduel->subcpu, 1, HOLD_LINE); } @@ -638,7 +638,7 @@ static const ym2151_interface ym2151_config = static MACHINE_RESET( hyprduel ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); /* start with cpu2 halted */ cputag_set_input_line(machine, "sub", INPUT_LINE_RESET, ASSERT_LINE); @@ -652,7 +652,7 @@ static MACHINE_RESET( hyprduel ) static MACHINE_START( hyprduel ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -665,7 +665,7 @@ static MACHINE_START( hyprduel ) static MACHINE_START( magerror ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); MACHINE_START_CALL(hyprduel); timer_adjust_periodic(state->magerror_irq_timer, attotime_zero, 0, ATTOTIME_IN_HZ(968)); /* tempo? */ @@ -813,7 +813,7 @@ ROM_END static DRIVER_INIT( hyprduel ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->int_num = 0x02; @@ -826,7 +826,7 @@ static DRIVER_INIT( hyprduel ) static DRIVER_INIT( magerror ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->int_num = 0x01; state->magerror_irq_timer = timer_alloc(machine, magerror_irq_callback, NULL); diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index 63afd351c09..8aebe15c4e4 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -208,7 +208,7 @@ GFXDECODE_END static MACHINE_START( ikki ) { - ikki_state *state = (ikki_state *)machine->driver_data; + ikki_state *state = machine->driver_data(); state_save_register_global(machine, state->flipscreen); state_save_register_global(machine, state->punch_through_pen); @@ -216,7 +216,7 @@ static MACHINE_START( ikki ) static MACHINE_RESET( ikki ) { - ikki_state *state = (ikki_state *)machine->driver_data; + ikki_state *state = machine->driver_data(); state->flipscreen = 0; } diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index ff54728cb60..e368c80018f 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -83,12 +83,13 @@ Known issues: #define HLE_COM -class imolagp_state +class imolagp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, imolagp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, imolagp_state(machine)); } - imolagp_state(running_machine &machine) { } + imolagp_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *slave_workram; // used only ifdef HLE_COM @@ -116,7 +117,7 @@ public: static WRITE8_HANDLER( transmit_data_w ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); state->mComData[state->mComCount++] = data; } @@ -136,19 +137,19 @@ static READ8_HANDLER( receive_data_r ) */ static WRITE8_HANDLER( transmit_data_w ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); state->mLatchedData[offset] = data; } static READ8_HANDLER( trigger_slave_nmi_r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); cpu_set_input_line(state->slave, INPUT_LINE_NMI, PULSE_LINE); return 0; } static READ8_HANDLER( receive_data_r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); return state->mLatchedData[offset]; } #endif @@ -185,7 +186,7 @@ static void initialize_colors( running_machine *machine ) static VIDEO_START( imolagp ) { - imolagp_state *state = (imolagp_state *)machine->driver_data; + imolagp_state *state = machine->driver_data(); int i; for (i = 0; i < 3; i++) { @@ -203,7 +204,7 @@ static VIDEO_START( imolagp ) static VIDEO_UPDATE( imolagp ) { - imolagp_state *state = (imolagp_state *)screen->machine->driver_data; + imolagp_state *state = screen->machine->driver_data(); int scroll2 = state->scroll ^ 0x03; int pass; for (pass = 0; pass < 2; pass++) @@ -281,13 +282,13 @@ static WRITE8_HANDLER( imola_ledram_w ) static READ8_HANDLER( steerlatch_r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); return state->steerlatch; } static WRITE8_HANDLER( screenram_w ) { /* ?! */ - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); switch (state->draw_mode) { case 0x82: @@ -305,7 +306,7 @@ static WRITE8_HANDLER( screenram_w ) static READ8_HANDLER( imola_slave_port05r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); memcpy(state->videoram[2], state->videoram[1], 0x4000); /* hack! capture before sprite plane is erased */ state->draw_mode = 0x05; return 0; @@ -313,14 +314,14 @@ static READ8_HANDLER( imola_slave_port05r ) static READ8_HANDLER( imola_slave_port06r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); state->draw_mode = 0x06; return 0; } static READ8_HANDLER( imola_slave_port81r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); state->draw_mode = 0x81; memcpy(state->videoram[2], state->videoram[1], 0x4000); /* hack! capture before sprite plane is erased */ return 0; @@ -328,20 +329,20 @@ static READ8_HANDLER( imola_slave_port81r ) static READ8_HANDLER( imola_slave_port82r ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); state->draw_mode = 0x82; return 0; } static WRITE8_HANDLER( vreg_control_w ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); state->control = data; } static WRITE8_HANDLER( vreg_data_w ) { - imolagp_state *state = (imolagp_state *)space->machine->driver_data; + imolagp_state *state = space->machine->driver_data(); switch (state->control) { case 0x0e: @@ -471,7 +472,7 @@ INPUT_PORTS_END static INTERRUPT_GEN( master_interrupt ) { - imolagp_state *state = (imolagp_state *)device->machine->driver_data; + imolagp_state *state = device->machine->driver_data(); int which = cpu_getiloops(device); if (which == 0) { @@ -516,7 +517,7 @@ static const ppi8255_interface ppi8255_intf = static MACHINE_START( imolagp ) { - imolagp_state *state = (imolagp_state *)machine->driver_data; + imolagp_state *state = machine->driver_data(); state->slavecpu = machine->device("slave"); @@ -535,7 +536,7 @@ static MACHINE_START( imolagp ) static MACHINE_RESET( imolagp ) { - imolagp_state *state = (imolagp_state *)machine->driver_data; + imolagp_state *state = machine->driver_data(); state->control = 0; state->scroll = 0; diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 2c13ebfa6fc..3722b4c2484 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -83,7 +83,7 @@ TODO: static WRITE16_HANDLER( inufuku_soundcommand_w ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { /* hack... sound doesn't work otherwise */ @@ -98,7 +98,7 @@ static WRITE16_HANDLER( inufuku_soundcommand_w ) static WRITE8_HANDLER( pending_command_clear_w ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); state->pending_command = 0; } @@ -115,7 +115,7 @@ static WRITE8_HANDLER( inufuku_soundrombank_w ) static CUSTOM_INPUT( soundflag_r ) { - inufuku_state *state = (inufuku_state *)field->port->machine->driver_data; + inufuku_state *state = field->port->machine->driver_data(); UINT16 soundflag = state->pending_command ? 0 : 1; return soundflag; @@ -298,7 +298,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - inufuku_state *state = (inufuku_state *)device->machine->driver_data; + inufuku_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -316,7 +316,7 @@ static const ym2610_interface ym2610_config = static MACHINE_START( inufuku ) { - inufuku_state *state = (inufuku_state *)machine->driver_data; + inufuku_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x8000); @@ -336,7 +336,7 @@ static MACHINE_START( inufuku ) static MACHINE_RESET( inufuku ) { - inufuku_state *state = (inufuku_state *)machine->driver_data; + inufuku_state *state = machine->driver_data(); state->pending_command = 1; state->bg_scrollx = 0; diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index b96d32affdc..853572cae7b 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -23,7 +23,7 @@ static INTERRUPT_GEN( ironhors_interrupt ) { - ironhors_state *state = (ironhors_state *)device->machine->driver_data; + ironhors_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -39,7 +39,7 @@ static INTERRUPT_GEN( ironhors_interrupt ) static WRITE8_HANDLER( ironhors_sh_irqtrigger_w ) { - ironhors_state *state = (ironhors_state *)space->machine->driver_data; + ironhors_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->soundcpu, 0, HOLD_LINE, 0xff); } @@ -358,7 +358,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( ironhors ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); state->soundcpu = machine->device("soundcpu"); @@ -369,7 +369,7 @@ static MACHINE_START( ironhors ) static MACHINE_RESET( ironhors ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); state->palettebank = 0; state->charbank = 0; @@ -427,7 +427,7 @@ MACHINE_DRIVER_END static INTERRUPT_GEN( farwest_interrupt ) { - ironhors_state *state = (ironhors_state *)device->machine->driver_data; + ironhors_state *state = device->machine->driver_data(); if (cpu_getiloops(device) &1) { @@ -443,7 +443,7 @@ static INTERRUPT_GEN( farwest_interrupt ) static READ8_DEVICE_HANDLER( farwest_soundlatch_r ) { - ironhors_state *state = (ironhors_state *)device->machine->driver_data; + ironhors_state *state = device->machine->driver_data(); return soundlatch_r(cpu_get_address_space(state->soundcpu, ADDRESS_SPACE_PROGRAM), 0); } diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 711f49fbf5d..a020d8d6e11 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -56,7 +56,7 @@ The 2 ay-8910 read ports are responsible for reading the sound commands. static READ8_DEVICE_HANDLER( timer_r ) { - jack_state *state = (jack_state *)device->machine->driver_data; + jack_state *state = device->machine->driver_data(); /* wrong! there should be no need for timer_rate, the same function */ /* should work for both games */ @@ -66,7 +66,7 @@ static READ8_DEVICE_HANDLER( timer_r ) static WRITE8_HANDLER( jack_sh_command_w ) { - jack_state *state = (jack_state *)space->machine->driver_data; + jack_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -76,14 +76,14 @@ static WRITE8_HANDLER( jack_sh_command_w ) static WRITE8_HANDLER( joinem_misc_w ) { - jack_state *state = (jack_state *)space->machine->driver_data; + jack_state *state = space->machine->driver_data(); flip_screen_set(space->machine, data & 0x80); state->joinem_snd_bit = data & 1; } static CUSTOM_INPUT( sound_check_r ) { - jack_state *state = (jack_state *)field->port->machine->driver_data; + jack_state *state = field->port->machine->driver_data(); UINT8 ret = 0; if ((input_port_read(field->port->machine, "IN2") & 0x80) && !state->joinem_snd_bit) @@ -98,7 +98,7 @@ static CUSTOM_INPUT( sound_check_r ) static READ8_HANDLER( striv_question_r ) { - jack_state *state = (jack_state *)space->machine->driver_data; + jack_state *state = space->machine->driver_data(); // Set-up the remap table for every 16 bytes if ((offset & 0xc00) == 0x800) @@ -794,7 +794,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( jack ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -806,7 +806,7 @@ static MACHINE_START( jack ) static MACHINE_RESET( jack ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); int i; state->joinem_snd_bit = 0; @@ -1356,26 +1356,26 @@ static void treahunt_decode( running_machine *machine ) static DRIVER_INIT( jack ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); state->timer_rate = 128; } static DRIVER_INIT( treahunt ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); state->timer_rate = 128; treahunt_decode(machine); } static DRIVER_INIT( zzyzzyxx ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); state->timer_rate = 16; } static DRIVER_INIT( loverboy ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); /* this doesn't make sense.. the startup code, and irq0 have jumps to 0.. I replace the startup jump with another jump to what appears to be @@ -1392,7 +1392,7 @@ static DRIVER_INIT( loverboy ) static DRIVER_INIT( striv ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 data; int A; diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 33458e06017..7a16b3a6198 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -90,35 +90,35 @@ static READ8_HANDLER( topgunbl_rotary_r ) static WRITE8_HANDLER( jackal_flipscreen_w ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); state->irq_enable = data & 0x02; flip_screen_set(space->machine, data & 0x08); } static READ8_HANDLER( jackal_zram_r ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); return state->rambank[0x0020 + offset]; } static READ8_HANDLER( jackal_voram_r ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); return state->rambank[0x2000 + offset]; } static READ8_HANDLER( jackal_spriteram_r ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); return state->spritebank[0x3000 + offset]; } static WRITE8_HANDLER( jackal_rambank_w ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); UINT8 *rgn = memory_region(space->machine, "master"); if (data & 0x04) @@ -135,14 +135,14 @@ static WRITE8_HANDLER( jackal_rambank_w ) static WRITE8_HANDLER( jackal_zram_w ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); state->rambank[0x0020 + offset] = data; } static WRITE8_HANDLER( jackal_voram_w ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); if ((offset & 0xf800) == 0) jackal_mark_tile_dirty(space->machine, offset & 0x3ff); @@ -153,7 +153,7 @@ static WRITE8_HANDLER( jackal_voram_w ) static WRITE8_HANDLER( jackal_spriteram_w ) { - jackal_state *state = (jackal_state *)space->machine->driver_data; + jackal_state *state = space->machine->driver_data(); state->spritebank[0x3000 + offset] = data; } @@ -317,7 +317,7 @@ GFXDECODE_END static INTERRUPT_GEN( jackal_interrupt ) { - jackal_state *state = (jackal_state *)device->machine->driver_data; + jackal_state *state = device->machine->driver_data(); if (state->irq_enable) { @@ -335,7 +335,7 @@ static INTERRUPT_GEN( jackal_interrupt ) static MACHINE_START( jackal ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "master"); memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x04000], 0x8000); @@ -350,7 +350,7 @@ static MACHINE_START( jackal ) static MACHINE_RESET( jackal ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); UINT8 *rgn = memory_region(machine, "master"); // HACK: running at the nominal clock rate, music stops working diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 2e52295fb3d..859369462cc 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -94,7 +94,7 @@ Notes: static WRITE8_HANDLER( ctrl_w ) { - jailbrek_state *state = (jailbrek_state *)space->machine->driver_data; + jailbrek_state *state = space->machine->driver_data(); state->nmi_enable = data & 0x01; state->irq_enable = data & 0x02; @@ -103,7 +103,7 @@ static WRITE8_HANDLER( ctrl_w ) static INTERRUPT_GEN( jb_interrupt ) { - jailbrek_state *state = (jailbrek_state *)device->machine->driver_data; + jailbrek_state *state = device->machine->driver_data(); if (state->irq_enable) cpu_set_input_line(device, 0, HOLD_LINE); @@ -111,7 +111,7 @@ static INTERRUPT_GEN( jb_interrupt ) static INTERRUPT_GEN( jb_interrupt_nmi ) { - jailbrek_state *state = (jailbrek_state *)device->machine->driver_data; + jailbrek_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); @@ -239,14 +239,14 @@ GFXDECODE_END static MACHINE_START( jailbrek ) { - jailbrek_state *state = (jailbrek_state *)machine->driver_data; + jailbrek_state *state = machine->driver_data(); state_save_register_global(machine, state->irq_enable); state_save_register_global(machine, state->nmi_enable); } static MACHINE_RESET( jailbrek ) { - jailbrek_state *state = (jailbrek_state *)machine->driver_data; + jailbrek_state *state = machine->driver_data(); state->irq_enable = 0; state->nmi_enable = 0; } diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 846a8e4cc3a..d54590220a7 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -33,12 +33,13 @@ $c088-$c095 player tiles #define MASTER_CLOCK XTAL_19_968MHz -class jangou_state +class jangou_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jangou_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jangou_state(machine)); } - jangou_state(running_machine &machine) { } + jangou_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 *blit_buffer; @@ -114,7 +115,7 @@ static PALETTE_INIT( jangou ) static VIDEO_START( jangou ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); state->blit_buffer = auto_alloc_array(machine, UINT8, 256 * 256); state_save_register_global_pointer(machine, state->blit_buffer, 256 * 256); @@ -122,7 +123,7 @@ static VIDEO_START( jangou ) static VIDEO_UPDATE( jangou ) { - jangou_state *state = (jangou_state *)screen->machine->driver_data; + jangou_state *state = screen->machine->driver_data(); int x, y; for (y = cliprect->min_y; y <= cliprect->max_y; ++y) @@ -164,7 +165,7 @@ static UINT8 jangou_gfx_nibble( running_machine *machine, UINT16 niboffset ) static void plot_jangou_gfx_pixel( running_machine *machine, UINT8 pix, int x, int y ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); if (y < 0 || y >= 512) return; if (x < 0 || x >= 512) @@ -178,7 +179,7 @@ static void plot_jangou_gfx_pixel( running_machine *machine, UINT8 pix, int x, i static WRITE8_HANDLER( blitter_process_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); int src, x, y, h, w, flipx; state->blit_data[offset] = data; @@ -230,7 +231,7 @@ static WRITE8_HANDLER( blitter_process_w ) /* What is the bit 5 (0x20) for?*/ static WRITE8_HANDLER( blit_vregs_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); // printf("%02x %02x\n", offset, data); state->pen_data[offset] = data & 0xf; @@ -244,7 +245,7 @@ static WRITE8_HANDLER( blit_vregs_w ) static WRITE8_HANDLER( mux_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); state->mux_data = ~data; } @@ -263,7 +264,7 @@ static WRITE8_HANDLER( output_w ) static READ8_DEVICE_HANDLER( input_mux_r ) { - jangou_state *state = (jangou_state *)device->machine->driver_data; + jangou_state *state = device->machine->driver_data(); switch(state->mux_data) { case 0x01: return input_port_read(device->machine, "PL1_1"); @@ -291,14 +292,14 @@ static READ8_DEVICE_HANDLER( input_system_r ) static WRITE8_HANDLER( sound_latch_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->cpu_1, INPUT_LINE_NMI, ASSERT_LINE); } static READ8_HANDLER( sound_latch_r ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); cpu_set_input_line(state->cpu_1, INPUT_LINE_NMI, CLEAR_LINE); return soundlatch_r(space, 0); } @@ -306,13 +307,13 @@ static READ8_HANDLER( sound_latch_r ) /* Jangou HC-55516 CVSD */ static WRITE8_HANDLER( cvsd_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); state->cvsd_shiftreg = data; } static TIMER_CALLBACK( cvsd_bit_timer_callback ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); /* Data is shifted out at the MSB */ hc55516_digit_w(state->cvsd, (state->cvsd_shiftreg >> 7) & 1); @@ -327,13 +328,13 @@ static TIMER_CALLBACK( cvsd_bit_timer_callback ) /* Jangou Lady MSM5218 (MSM5205-compatible) ADPCM */ static WRITE8_HANDLER( adpcm_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); state->adpcm_byte = data; } static void jngolady_vclk_cb( running_device *device ) { - jangou_state *state = (jangou_state *)device->machine->driver_data; + jangou_state *state = device->machine->driver_data(); if (state->msm5205_vclk_toggle == 0) msm5205_data_w(device, state->adpcm_byte >> 4); @@ -355,13 +356,13 @@ static void jngolady_vclk_cb( running_device *device ) static READ8_HANDLER( master_com_r ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); return state->z80_latch; } static WRITE8_HANDLER( master_com_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); cpu_set_input_line(state->nsc, 0, HOLD_LINE); state->nsc_latch = data; @@ -369,13 +370,13 @@ static WRITE8_HANDLER( master_com_w ) static READ8_HANDLER( slave_com_r ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); return state->nsc_latch; } static WRITE8_HANDLER( slave_com_w ) { - jangou_state *state = (jangou_state *)space->machine->driver_data; + jangou_state *state = space->machine->driver_data(); state->z80_latch = data; } @@ -782,7 +783,7 @@ static const msm5205_interface msm5205_config = static SOUND_START( jangou ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); /* Create a timer to feed the CVSD DAC with sample bits */ state->cvsd_bit_timer = timer_alloc(machine, cvsd_bit_timer_callback, NULL); @@ -798,7 +799,7 @@ static SOUND_START( jangou ) static MACHINE_START( common ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); state->cpu_0 = machine->device("cpu0"); state->cpu_1 = machine->device("cpu1"); @@ -812,7 +813,7 @@ static MACHINE_START( common ) static MACHINE_START( jangou ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -822,7 +823,7 @@ static MACHINE_START( jangou ) static MACHINE_START( jngolady ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -834,7 +835,7 @@ static MACHINE_START( jngolady ) static MACHINE_RESET( common ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); int i; state->mux_data = 0; @@ -848,7 +849,7 @@ static MACHINE_RESET( common ) static MACHINE_RESET( jangou ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); @@ -858,7 +859,7 @@ static MACHINE_RESET( jangou ) static MACHINE_RESET( jngolady ) { - jangou_state *state = (jangou_state *)machine->driver_data; + jangou_state *state = machine->driver_data(); MACHINE_RESET_CALL(common); diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index f0a3c33c5eb..3e7834a6aa8 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -99,12 +99,13 @@ dumped by sayu #include "sound/sn76496.h" #include "sound/msm5205.h" -class jantotsu_state +class jantotsu_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jantotsu_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jantotsu_state(machine)); } - jantotsu_state(running_machine &machine) { } + jantotsu_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 *bitmap; @@ -129,7 +130,7 @@ public: static VIDEO_START(jantotsu) { - jantotsu_state *state = (jantotsu_state *)machine->driver_data; + jantotsu_state *state = machine->driver_data(); state->bitmap = auto_alloc_array(machine, UINT8, 0x8000); state_save_register_global_pointer(machine, state->bitmap, 0x8000); @@ -137,7 +138,7 @@ static VIDEO_START(jantotsu) static VIDEO_UPDATE(jantotsu) { - jantotsu_state *state = (jantotsu_state *)screen->machine->driver_data; + jantotsu_state *state = screen->machine->driver_data(); int x, y, i; int count = 0; @@ -174,19 +175,19 @@ static VIDEO_UPDATE(jantotsu) /* banked vram */ static READ8_HANDLER( jantotsu_bitmap_r ) { - jantotsu_state *state = (jantotsu_state *)space->machine->driver_data; + jantotsu_state *state = space->machine->driver_data(); return state->bitmap[offset + ((state->vram_bank & 3) * 0x2000)]; } static WRITE8_HANDLER( jantotsu_bitmap_w ) { - jantotsu_state *state = (jantotsu_state *)space->machine->driver_data; + jantotsu_state *state = space->machine->driver_data(); state->bitmap[offset + ((state->vram_bank & 3) * 0x2000)] = data; } static WRITE8_HANDLER( bankaddr_w ) { - jantotsu_state *state = (jantotsu_state *)space->machine->driver_data; + jantotsu_state *state = space->machine->driver_data(); state->vram_bank = ((data & 0xc0) >> 6); // top 2 bits? @@ -230,7 +231,7 @@ static PALETTE_INIT( jantotsu ) /*Multiplexer is mapped as 6-bits reads,bits 6 & 7 are always connected to the coin mechs.*/ static READ8_HANDLER( jantotsu_mux_r ) { - jantotsu_state *state = (jantotsu_state *)space->machine->driver_data; + jantotsu_state *state = space->machine->driver_data(); UINT8 coin_port = input_port_read(space->machine, "COINS"); // printf("%02x\n", state->mux_data); @@ -252,7 +253,7 @@ static READ8_HANDLER( jantotsu_mux_r ) static WRITE8_HANDLER( jantotsu_mux_w ) { - jantotsu_state *state = (jantotsu_state *)space->machine->driver_data; + jantotsu_state *state = space->machine->driver_data(); state->mux_data = ~data; } @@ -267,7 +268,7 @@ static READ8_HANDLER( jantotsu_dsw2_r ) static WRITE8_DEVICE_HANDLER( jan_adpcm_w ) { - jantotsu_state *state = (jantotsu_state *)device->machine->driver_data; + jantotsu_state *state = device->machine->driver_data(); switch (offset) { @@ -292,7 +293,7 @@ static WRITE8_DEVICE_HANDLER( jan_adpcm_w ) static void jan_adpcm_int( running_device *device ) { - jantotsu_state *state = (jantotsu_state *)device->machine->driver_data; + jantotsu_state *state = device->machine->driver_data(); if (state->adpcm_pos >= 0x10000 || state->adpcm_idle) { @@ -477,7 +478,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( jantotsu ) { - jantotsu_state *state = (jantotsu_state *)machine->driver_data; + jantotsu_state *state = machine->driver_data(); state_save_register_global(machine, state->vram_bank); state_save_register_global(machine, state->mux_data); @@ -489,7 +490,7 @@ static MACHINE_START( jantotsu ) static MACHINE_RESET( jantotsu ) { - jantotsu_state *state = (jantotsu_state *)machine->driver_data; + jantotsu_state *state = machine->driver_data(); /*Load hard-wired background color.*/ state->col_bank = (input_port_read(machine, "DSW2") & 0xc0) >> 3; diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index 442f5dfc30f..0878ee72c5f 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -124,7 +124,7 @@ static TIMER_CALLBACK( generate_interrupt ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); int scanline = param; /* IRQ is set by /32V */ @@ -154,7 +154,7 @@ static WRITE8_HANDLER( main_irq_ack_w ) static MACHINE_START( jedi ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); /* set a timer to run the interrupts */ state->interrupt_timer = timer_alloc(machine, generate_interrupt, NULL); @@ -177,7 +177,7 @@ static MACHINE_START( jedi ) static MACHINE_RESET( jedi ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); /* init globals */ state->a2d_select = 0; @@ -209,7 +209,7 @@ static WRITE8_HANDLER( rom_banksel_w ) static READ8_HANDLER( a2d_data_r ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); UINT8 ret = 0; switch (state->a2d_select) @@ -224,7 +224,7 @@ static READ8_HANDLER( a2d_data_r ) static WRITE8_HANDLER( a2d_select_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); state->a2d_select = offset; } @@ -245,7 +245,7 @@ static WRITE8_HANDLER( jedi_coin_counter_w ) static WRITE8_HANDLER( nvram_data_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); if (state->nvram_enabled) space->machine->generic.nvram.u8[offset] = data; @@ -254,7 +254,7 @@ static WRITE8_HANDLER( nvram_data_w ) static WRITE8_HANDLER( nvram_enable_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); state->nvram_enabled = ~offset & 1; } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 9e9a177af14..cd1f03ca3ef 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -102,12 +102,13 @@ Notes: #include "sound/ay8910.h" -class jollyjgr_state +class jollyjgr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jollyjgr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jollyjgr_state(machine)); } - jollyjgr_state(running_machine &machine) { } + jollyjgr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -132,14 +133,14 @@ public: static WRITE8_HANDLER( jollyjgr_videoram_w ) { - jollyjgr_state *state = (jollyjgr_state *)space->machine->driver_data; + jollyjgr_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static WRITE8_HANDLER( jollyjgr_attrram_w ) { - jollyjgr_state *state = (jollyjgr_state *)space->machine->driver_data; + jollyjgr_state *state = space->machine->driver_data(); if (offset & 1) { @@ -159,7 +160,7 @@ static WRITE8_HANDLER( jollyjgr_attrram_w ) static WRITE8_HANDLER( jollyjgr_misc_w ) { - jollyjgr_state *state = (jollyjgr_state *)space->machine->driver_data; + jollyjgr_state *state = space->machine->driver_data(); // they could be swapped, because it always set "data & 3" state->flip_x = data & 1; @@ -426,7 +427,7 @@ static PALETTE_INIT( jollyjgr ) /* Tilemap is the same as in Galaxian */ static TILE_GET_INFO( get_bg_tile_info ) { - jollyjgr_state *state = (jollyjgr_state *)machine->driver_data; + jollyjgr_state *state = machine->driver_data(); int color = state->colorram[((tile_index & 0x1f) << 1) | 1] & 7; int region = (state->tilemap_bank & 0x20) ? 2 : 0; SET_TILE_INFO(region, state->videoram[tile_index], color, 0); @@ -434,7 +435,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( jollyjgr ) { - jollyjgr_state *state = (jollyjgr_state *)machine->driver_data; + jollyjgr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->bg_tilemap, 0); @@ -443,7 +444,7 @@ static VIDEO_START( jollyjgr ) static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) { - jollyjgr_state *state = (jollyjgr_state *)machine->driver_data; + jollyjgr_state *state = machine->driver_data(); int x, y, count; int i, bit0, bit1, bit2; int color; @@ -480,7 +481,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) static VIDEO_UPDATE( jollyjgr ) { - jollyjgr_state *state = (jollyjgr_state *)screen->machine->driver_data; + jollyjgr_state *state = screen->machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -536,7 +537,7 @@ static VIDEO_UPDATE( jollyjgr ) static VIDEO_UPDATE( fspider ) { - jollyjgr_state *state = (jollyjgr_state *)screen->machine->driver_data; + jollyjgr_state *state = screen->machine->driver_data(); // Draw bg and sprites VIDEO_UPDATE_CALL(jollyjgr); @@ -609,7 +610,7 @@ GFXDECODE_END static INTERRUPT_GEN( jollyjgr_interrupt ) { - jollyjgr_state *state = (jollyjgr_state *)device->machine->driver_data; + jollyjgr_state *state = device->machine->driver_data(); if(state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } @@ -617,7 +618,7 @@ static INTERRUPT_GEN( jollyjgr_interrupt ) static MACHINE_START( jollyjgr ) { - jollyjgr_state *state = (jollyjgr_state *)machine->driver_data; + jollyjgr_state *state = machine->driver_data(); state_save_register_global(machine, state->nmi_enable); state_save_register_global(machine, state->flip_x); @@ -628,7 +629,7 @@ static MACHINE_START( jollyjgr ) static MACHINE_RESET( jollyjgr ) { - jollyjgr_state *state = (jollyjgr_state *)machine->driver_data; + jollyjgr_state *state = machine->driver_data(); state->nmi_enable = 0; state->flip_x = 0; diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 27fea5c0b53..8027ca7b6be 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -32,12 +32,13 @@ #define JONGKYO_CLOCK 18432000 -class jongkyo_state +class jongkyo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jongkyo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jongkyo_state(machine)); } - jongkyo_state(running_machine &machine) { } + jongkyo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -62,7 +63,7 @@ static VIDEO_START( jongkyo ) static VIDEO_UPDATE( jongkyo ) { - jongkyo_state *state = (jongkyo_state *)screen->machine->driver_data; + jongkyo_state *state = screen->machine->driver_data(); int y; for (y = 0; y < 256; ++y) @@ -112,7 +113,7 @@ static VIDEO_UPDATE( jongkyo ) static WRITE8_HANDLER( bank_select_w ) { - jongkyo_state *state = (jongkyo_state *)space->machine->driver_data; + jongkyo_state *state = space->machine->driver_data(); int mask = 1 << (offset >> 1); state->rom_bank &= ~mask; @@ -125,7 +126,7 @@ static WRITE8_HANDLER( bank_select_w ) static WRITE8_HANDLER( mux_w ) { - jongkyo_state *state = (jongkyo_state *)space->machine->driver_data; + jongkyo_state *state = space->machine->driver_data(); state->mux_data = ~data; // printf("%02x\n", state->mux_data); } @@ -140,7 +141,7 @@ static WRITE8_HANDLER( jongkyo_coin_counter_w ) static READ8_DEVICE_HANDLER( input_1p_r ) { - jongkyo_state *state = (jongkyo_state *)device->machine->driver_data; + jongkyo_state *state = device->machine->driver_data(); UINT8 cr_clear = input_port_read(device->machine, "CR_CLEAR"); switch (state->mux_data) @@ -160,7 +161,7 @@ static READ8_DEVICE_HANDLER( input_1p_r ) static READ8_DEVICE_HANDLER( input_2p_r ) { - jongkyo_state *state = (jongkyo_state *)device->machine->driver_data; + jongkyo_state *state = device->machine->driver_data(); UINT8 coin_port = input_port_read(device->machine, "COINS"); switch (state->mux_data) @@ -180,7 +181,7 @@ static READ8_DEVICE_HANDLER( input_2p_r ) static WRITE8_HANDLER( videoram2_w ) { - jongkyo_state *state = (jongkyo_state *)space->machine->driver_data; + jongkyo_state *state = space->machine->driver_data(); state->videoram2[offset] = data; } @@ -467,7 +468,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( jongkyo ) { - jongkyo_state *state = (jongkyo_state *)machine->driver_data; + jongkyo_state *state = machine->driver_data(); state->videoram2 = auto_alloc_array(machine, UINT8, 0x4000); state_save_register_global_pointer(machine, state->videoram2, 0x4000); @@ -478,7 +479,7 @@ static MACHINE_START( jongkyo ) static MACHINE_RESET( jongkyo ) { - jongkyo_state *state = (jongkyo_state *)machine->driver_data; + jongkyo_state *state = machine->driver_data(); state->rom_bank = 0; state->mux_data = 0; diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index e20cb43058f..2969cb7d9b8 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -97,7 +97,7 @@ static WRITE8_HANDLER( junofrst_bankselect_w ) static READ8_DEVICE_HANDLER( junofrst_portA_r ) { - timeplt_state *state = (timeplt_state *)device->machine->driver_data; + timeplt_state *state = device->machine->driver_data(); int timer; /* main xtal 14.318MHz, divided by 8 to get the CPU clock, further */ @@ -114,7 +114,7 @@ static READ8_DEVICE_HANDLER( junofrst_portA_r ) static WRITE8_DEVICE_HANDLER( junofrst_portB_w ) { - timeplt_state *state = (timeplt_state *)device->machine->driver_data; + timeplt_state *state = device->machine->driver_data(); running_device *filter[3] = { state->filter_0_0, state->filter_0_1, state->filter_0_2 }; int i; @@ -135,7 +135,7 @@ static WRITE8_DEVICE_HANDLER( junofrst_portB_w ) static WRITE8_HANDLER( junofrst_sh_irqtrigger_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); if (state->last_irq == 0 && data == 1) { @@ -149,14 +149,14 @@ static WRITE8_HANDLER( junofrst_sh_irqtrigger_w ) static WRITE8_HANDLER( junofrst_i8039_irq_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); cpu_set_input_line(state->i8039, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_and_status_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); if ((data & 0x80) == 0) cpu_set_input_line(state->i8039, 0, CLEAR_LINE); @@ -280,7 +280,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( junofrst ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->i8039 = machine->device("mcu"); @@ -298,7 +298,7 @@ static MACHINE_START( junofrst ) static MACHINE_RESET( junofrst ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->i8039_status = 0; state->last_irq = 0; diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index 4359d03952a..50664a7d1ea 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -180,7 +180,7 @@ static MACHINE_START( kangaroo ) static MACHINE_START( kangaroo_mcu ) { - kangaroo_state *state = (kangaroo_state *)machine->driver_data; + kangaroo_state *state = machine->driver_data(); MACHINE_START_CALL(kangaroo); memory_install_readwrite8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xef00, 0xefff, 0, 0, mcu_sim_r, mcu_sim_w); @@ -190,7 +190,7 @@ static MACHINE_START( kangaroo_mcu ) static MACHINE_RESET( kangaroo ) { - kangaroo_state *state = (kangaroo_state *)machine->driver_data; + kangaroo_state *state = machine->driver_data(); /* I think there is a bug in the startup checks of the game. At the very */ /* beginning, during the RAM check, it goes one byte too far, and ends up */ @@ -222,7 +222,7 @@ static MACHINE_RESET( kangaroo ) static READ8_HANDLER( mcu_sim_r ) { - kangaroo_state *state = (kangaroo_state *)space->machine->driver_data; + kangaroo_state *state = space->machine->driver_data(); return ++state->clock & 0x0f; } diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 899bc80b965..01e5bfe4481 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -54,7 +54,7 @@ /* Emulation of the protected microcontroller - for coins & general protection */ static void karnov_i8751_w( running_machine *machine, int data ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); /* Pending coin operations may cause protection commands to be queued */ if (state->i8751_needs_ack) @@ -93,7 +93,7 @@ static void karnov_i8751_w( running_machine *machine, int data ) static void wndrplnt_i8751_w( running_machine *machine, int data ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); /* The last command hasn't been ACK'd (probably a conflict with coin command) */ if (state->i8751_needs_ack) @@ -153,7 +153,7 @@ static void wndrplnt_i8751_w( running_machine *machine, int data ) static void chelnov_i8751_w( running_machine *machine, int data ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); /* Pending coin operations may cause protection commands to be queued */ if (state->i8751_needs_ack) @@ -291,7 +291,7 @@ static void chelnov_i8751_w( running_machine *machine, int data ) static WRITE16_HANDLER( karnov_control_w ) { - karnov_state *state = (karnov_state *)space->machine->driver_data; + karnov_state *state = space->machine->driver_data(); /* Mnemonics filled in from the schematics, brackets are my comments */ switch (offset << 1) @@ -365,7 +365,7 @@ static WRITE16_HANDLER( karnov_control_w ) static READ16_HANDLER( karnov_control_r ) { - karnov_state *state = (karnov_state *)space->machine->driver_data; + karnov_state *state = space->machine->driver_data(); switch (offset << 1) { @@ -717,7 +717,7 @@ GFXDECODE_END static INTERRUPT_GEN( karnov_interrupt ) { - karnov_state *state = (karnov_state *)device->machine->driver_data; + karnov_state *state = device->machine->driver_data(); /* Coin input to the i8751 generates an interrupt to the main cpu */ if (input_port_read(device->machine, "FAKE") == state->coin_mask) @@ -745,7 +745,7 @@ static INTERRUPT_GEN( karnov_interrupt ) static void sound_irq( running_device *device, int linestate ) { - karnov_state *state = (karnov_state *)device->machine->driver_data; + karnov_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); /* IRQ */ } @@ -762,7 +762,7 @@ static const ym3526_interface ym3526_config = static MACHINE_START( karnov ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -781,7 +781,7 @@ static MACHINE_START( karnov ) static MACHINE_RESET( karnov ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); memset(state->ram, 0, 0x4000 / 2); /* Chelnov likes ram clear on reset.. */ @@ -1110,28 +1110,28 @@ ROM_END static DRIVER_INIT( karnov ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); state->microcontroller_id = KARNOV; state->coin_mask = 0; } static DRIVER_INIT( karnovj ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); state->microcontroller_id = KARNOVJ; state->coin_mask = 0; } static DRIVER_INIT( wndrplnt ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); state->microcontroller_id = WNDRPLNT; state->coin_mask = 0; } static DRIVER_INIT( chelnov ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); state->microcontroller_id = CHELNOV; @@ -1142,7 +1142,7 @@ static DRIVER_INIT( chelnov ) static DRIVER_INIT( chelnovw ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); state->microcontroller_id = CHELNOVW; @@ -1153,7 +1153,7 @@ static DRIVER_INIT( chelnovw ) static DRIVER_INIT( chelnovj ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); state->microcontroller_id = CHELNOVJ; diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index e2ff7e11bba..c9aa0a87828 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -76,34 +76,34 @@ IO ports and memory map changes. Dip switches differ too. static WRITE8_HANDLER( control_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); state->nmi_enable = data & 1; } static WRITE8_HANDLER( sound_reset_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); if (!(data & 1)) cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, PULSE_LINE); } static WRITE8_DEVICE_HANDLER( sound_control_w ) { - kchamp_state *state = (kchamp_state *)device->machine->driver_data; + kchamp_state *state = device->machine->driver_data(); msm5205_reset_w(device, !(data & 1)); state->sound_nmi_enable = ((data >> 1) & 1); } static WRITE8_HANDLER( sound_command_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static WRITE8_HANDLER( sound_msm_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); state->msm_data = data; state->msm_play_lo_nibble = 1; } @@ -148,14 +148,14 @@ ADDRESS_MAP_END ********************/ static READ8_HANDLER( sound_reset_r ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, PULSE_LINE); return 0; } static WRITE8_HANDLER( kc_sound_control_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); if (offset == 0) state->sound_nmi_enable = ((data >> 7) & 1); @@ -348,14 +348,14 @@ GFXDECODE_END static INTERRUPT_GEN( kc_interrupt ) { - kchamp_state *state = (kchamp_state *)device->machine->driver_data; + kchamp_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } static void msmint( running_device *device ) { - kchamp_state *state = (kchamp_state *)device->machine->driver_data; + kchamp_state *state = device->machine->driver_data(); if (state->msm_play_lo_nibble) msm5205_data_w(device, state->msm_data & 0x0f); @@ -383,7 +383,7 @@ static const msm5205_interface msm_interface = static INTERRUPT_GEN( sound_int ) { - kchamp_state *state = (kchamp_state *)device->machine->driver_data; + kchamp_state *state = device->machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } @@ -391,7 +391,7 @@ static INTERRUPT_GEN( sound_int ) static MACHINE_START( kchamp ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -401,7 +401,7 @@ static MACHINE_START( kchamp ) static MACHINE_START( kchampvs ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); MACHINE_START_CALL(kchamp); @@ -412,7 +412,7 @@ static MACHINE_START( kchampvs ) static MACHINE_RESET( kchamp ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); state->nmi_enable = 0; state->sound_nmi_enable = 0; @@ -752,7 +752,7 @@ static UINT8 *decrypt_code(running_machine *machine) static DRIVER_INIT( kchampvs ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "maincpu"); UINT8 *decrypted = decrypt_code(machine); int A; @@ -784,7 +784,7 @@ static DRIVER_INIT( kchampvs ) static DRIVER_INIT( kchampvs2 ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); decrypt_code(machine); state->counter = 0; diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index ca30b56fb55..e3b9699a34e 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -216,7 +216,7 @@ WRITE16_DEVICE_HANDLER( kickgoal_snd_w ) static WRITE16_DEVICE_HANDLER( actionhw_snd_w ) { - kickgoal_state *state = (kickgoal_state *)device->machine->driver_data; + kickgoal_state *state = device->machine->driver_data(); logerror("%s: Writing %04x to Sound CPU - mask %04x\n",cpuexec_describe_context(device->machine),data,mem_mask); if (!ACCESSING_BITS_0_7) @@ -305,7 +305,7 @@ static WRITE16_DEVICE_HANDLER( actionhw_snd_w ) static INTERRUPT_GEN( kickgoal_interrupt ) { - kickgoal_state *state = (kickgoal_state *)device->machine->driver_data; + kickgoal_state *state = device->machine->driver_data(); if ((okim6295_r(state->adpcm, 0) & 0x08) == 0) { @@ -459,7 +459,7 @@ static const UINT8 kickgoal_default_eeprom_type1[128] = { static READ16_HANDLER( kickgoal_eeprom_r ) { - kickgoal_state *state = (kickgoal_state *)space->machine->driver_data; + kickgoal_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { return eeprom_read_bit(state->eeprom); @@ -470,7 +470,7 @@ static READ16_HANDLER( kickgoal_eeprom_r ) static WRITE16_HANDLER( kickgoal_eeprom_w ) { - kickgoal_state *state = (kickgoal_state *)space->machine->driver_data; + kickgoal_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { switch (offset) @@ -658,7 +658,7 @@ GFXDECODE_END static MACHINE_START( kickgoal ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); state_save_register_global_array(machine, state->snd_sam); state_save_register_global(machine, state->melody_loop); @@ -670,7 +670,7 @@ static MACHINE_START( kickgoal ) static MACHINE_RESET( kickgoal ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); state->melody_loop = 0; state->snd_new = 0; diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 4f2fbe3a714..18e9c2447a8 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -23,26 +23,26 @@ Main CPU: static WRITE8_HANDLER( video_interrupt_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->video_cpu, 0, HOLD_LINE, 0xff); } static WRITE8_HANDLER( sprite_interrupt_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->sprite_cpu, 0, HOLD_LINE, 0xff); } static WRITE8_HANDLER( scroll_interrupt_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); sprite_interrupt_w(space, offset, data); *state->scroll_y = data; } static WRITE8_HANDLER( sound_command_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line_and_vector(state->audio_cpu, 0, HOLD_LINE, 0xff); } @@ -448,7 +448,7 @@ static const ay8910_interface ay8910_config = static INTERRUPT_GEN( kingofb_interrupt ) { - kingofb_state *state = (kingofb_state *)device->machine->driver_data; + kingofb_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); @@ -456,7 +456,7 @@ static INTERRUPT_GEN( kingofb_interrupt ) static MACHINE_START( kingofb ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); state->video_cpu = machine->device("video"); state->sprite_cpu = machine->device("sprite"); @@ -468,7 +468,7 @@ static MACHINE_START( kingofb ) static MACHINE_RESET( kingofb ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); state->nmi_enable = 0; state->palette_bank = 0; diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index 3b6a99d66cc..7fc5ef1b9ca 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -32,8 +32,8 @@ static void update_interrupts(running_machine *machine) { - klax_state *state = (klax_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.video_int_state || state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + klax_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->video_int_state || state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -67,10 +67,10 @@ static MACHINE_START( klax ) static MACHINE_RESET( klax ) { - klax_state *state = (klax_state *)machine->driver_data; + klax_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update, 32); } @@ -84,7 +84,7 @@ static MACHINE_RESET( klax ) static ADDRESS_MAP_START( klax_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r,atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(klax_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r,atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(klax_state, eeprom, eeprom_size) AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x260000, 0x260001) AM_READ_PORT("P1") AM_WRITE(klax_latch_w) AM_RANGE(0x260002, 0x260003) AM_READ_PORT("P2") @@ -92,9 +92,9 @@ static ADDRESS_MAP_START( klax_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x2e0000, 0x2e0001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x360000, 0x360001) AM_WRITE(interrupt_ack_w) AM_RANGE(0x3e0000, 0x3e07ff) AM_RAM_WRITE(atarigen_expanded_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3f0000, 0x3f0f7f) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(klax_state, atarigen.playfield) + AM_RANGE(0x3f0000, 0x3f0f7f) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(klax_state, playfield) AM_RANGE(0x3f0f80, 0x3f0fff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x3f1000, 0x3f1fff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(klax_state, atarigen.playfield_upper) + AM_RANGE(0x3f1000, 0x3f1fff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(klax_state, playfield_upper) AM_RANGE(0x3f2000, 0x3f27ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3f2800, 0x3f3fff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index c6a71b67cef..1561cf9aa2b 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -35,7 +35,7 @@ Updates: static WRITE8_HANDLER( sound_cmd_w ) { - kncljoe_state *state = (kncljoe_state *)space->machine->driver_data; + kncljoe_state *state = space->machine->driver_data(); if ((data & 0x80) == 0) soundlatch_w(space, 0, data & 0x7f); @@ -65,13 +65,13 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( m6803_port1_w ) { - kncljoe_state *state = (kncljoe_state *)device->machine->driver_data; + kncljoe_state *state = device->machine->driver_data(); state->port1 = data; } static WRITE8_DEVICE_HANDLER( m6803_port2_w ) { - kncljoe_state *state = (kncljoe_state *)device->machine->driver_data; + kncljoe_state *state = device->machine->driver_data(); /* write latch */ if ((state->port2 & 0x01) && !(data & 0x01)) @@ -85,7 +85,7 @@ static WRITE8_DEVICE_HANDLER( m6803_port2_w ) static READ8_DEVICE_HANDLER( m6803_port1_r ) { - kncljoe_state *state = (kncljoe_state *)device->machine->driver_data; + kncljoe_state *state = device->machine->driver_data(); if (state->port2 & 0x08) return ay8910_r(device, 0); @@ -99,7 +99,7 @@ static READ8_DEVICE_HANDLER( m6803_port2_r ) static WRITE8_HANDLER( sound_irq_ack_w ) { - kncljoe_state *state = (kncljoe_state *)space->machine->driver_data; + kncljoe_state *state = space->machine->driver_data(); cpu_set_input_line(state->soundcpu, 0, CLEAR_LINE); } @@ -250,7 +250,7 @@ static INTERRUPT_GEN (sound_nmi) static MACHINE_START( kncljoe ) { - kncljoe_state *state = (kncljoe_state *)machine->driver_data; + kncljoe_state *state = machine->driver_data(); state->soundcpu = machine->device("soundcpu"); @@ -263,7 +263,7 @@ static MACHINE_START( kncljoe ) static MACHINE_RESET( kncljoe ) { - kncljoe_state *state = (kncljoe_state *)machine->driver_data; + kncljoe_state *state = machine->driver_data(); state->port1 = 0; state->port2 = 0; diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 371975001c6..414d8175ef0 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -45,12 +45,13 @@ to prevent disabling inputs. static const int input_tab[]= { 0x22, 0x64, 0x44, 0x68, 0x30, 0x50, 0x70, 0x48, 0x28, 0x21, 0x41, 0x82, 0x81, 0x42 }; -class koikoi_state +class koikoi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, koikoi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, koikoi_state(machine)); } - koikoi_state(running_machine &machine) { } + koikoi_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -74,7 +75,7 @@ public: static TILE_GET_INFO( get_tile_info ) { - koikoi_state *state = (koikoi_state *)machine->driver_data; + koikoi_state *state = machine->driver_data(); int code = state->videoram[tile_index] | ((state->videoram[tile_index + 0x400] & 0x40) << 2); int color = (state->videoram[tile_index + 0x400] & 0x1f); int flip = (state->videoram[tile_index + 0x400] & 0x80) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; @@ -129,13 +130,13 @@ static PALETTE_INIT( koikoi ) static VIDEO_START(koikoi) { - koikoi_state *state = (koikoi_state *)machine->driver_data; + koikoi_state *state = machine->driver_data(); state->tmap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE(koikoi) { - koikoi_state *state = (koikoi_state *)screen->machine->driver_data; + koikoi_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tmap, 0, 0); return 0; } @@ -148,14 +149,14 @@ static VIDEO_UPDATE(koikoi) static WRITE8_HANDLER( vram_w ) { - koikoi_state *state = (koikoi_state *)space->machine->driver_data; + koikoi_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tmap, offset & 0x3ff); } static READ8_DEVICE_HANDLER( input_r ) { - koikoi_state *state = (koikoi_state *)device->machine->driver_data; + koikoi_state *state = device->machine->driver_data(); if (state->inputcnt < 0) return 0; @@ -198,7 +199,7 @@ static WRITE8_DEVICE_HANDLER( unknown_w ) static READ8_HANDLER( io_r ) { - koikoi_state *state = (koikoi_state *)space->machine->driver_data; + koikoi_state *state = space->machine->driver_data(); if (!offset) return input_port_read(space->machine, "IN0") ^ state->ioram[4]; //coin @@ -207,7 +208,7 @@ static READ8_HANDLER( io_r ) static WRITE8_HANDLER( io_w ) { - koikoi_state *state = (koikoi_state *)space->machine->driver_data; + koikoi_state *state = space->machine->driver_data(); if (offset == 7 && data == 0) state->inputcnt = 0; //reset read cycle counter @@ -335,7 +336,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( koikoi ) { - koikoi_state *state = (koikoi_state *)machine->driver_data; + koikoi_state *state = machine->driver_data(); state_save_register_global(machine, state->inputcnt); state_save_register_global(machine, state->inputval); @@ -345,7 +346,7 @@ static MACHINE_START( koikoi ) static MACHINE_RESET( koikoi ) { - koikoi_state *state = (koikoi_state *)machine->driver_data; + koikoi_state *state = machine->driver_data(); int i; state->inputcnt = -1; diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c index ed2240ba863..cfa92017baf 100644 --- a/src/mame/drivers/kopunch.c +++ b/src/mame/drivers/kopunch.c @@ -70,7 +70,7 @@ ADDRESS_MAP_END static INPUT_CHANGED( left_coin_inserted ) { - kopunch_state *state = (kopunch_state *)field->port->machine->driver_data; + kopunch_state *state = field->port->machine->driver_data(); /* left coin insertion causes a rst6.5 (vector 0x34) */ if (newval) @@ -79,7 +79,7 @@ static INPUT_CHANGED( left_coin_inserted ) static INPUT_CHANGED( right_coin_inserted ) { - kopunch_state *state = (kopunch_state *)field->port->machine->driver_data; + kopunch_state *state = field->port->machine->driver_data(); /* right coin insertion causes a rst5.5 (vector 0x2c) */ if (newval) @@ -173,7 +173,7 @@ GFXDECODE_END static MACHINE_START( kopunch ) { - kopunch_state *state = (kopunch_state *)machine->driver_data; + kopunch_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -182,7 +182,7 @@ static MACHINE_START( kopunch ) static MACHINE_RESET( kopunch ) { - kopunch_state *state = (kopunch_state *)machine->driver_data; + kopunch_state *state = machine->driver_data(); state->gfxbank = 0; } diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index bd091320ef2..f42d05b262d 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -86,20 +86,20 @@ static WRITE8_HANDLER( bank_select_w ) static WRITE8_HANDLER( latch_w ) { - ksayakyu_state *state = (ksayakyu_state *)space->machine->driver_data; + ksayakyu_state *state = space->machine->driver_data(); state->sound_status &= ~0x80; soundlatch_w(space, 0, data | 0x80); } static READ8_HANDLER (sound_status_r) { - ksayakyu_state *state = (ksayakyu_state *)space->machine->driver_data; + ksayakyu_state *state = space->machine->driver_data(); return state->sound_status | 4; } static WRITE8_HANDLER(tomaincpu_w) { - ksayakyu_state *state = (ksayakyu_state *)space->machine->driver_data; + ksayakyu_state *state = space->machine->driver_data(); state->sound_status |= 0x80; soundlatch_w(space, 0, data); } @@ -252,7 +252,7 @@ GFXDECODE_END static MACHINE_START( ksayakyu ) { - ksayakyu_state *state = (ksayakyu_state *)machine->driver_data; + ksayakyu_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); @@ -264,7 +264,7 @@ static MACHINE_START( ksayakyu ) static MACHINE_RESET( ksayakyu ) { - ksayakyu_state *state = (ksayakyu_state *)machine->driver_data; + ksayakyu_state *state = machine->driver_data(); state->sound_status = 0xff; state->video_ctrl = 0; diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 93a52b0898f..9738ee3ed2a 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -36,7 +36,7 @@ static WRITE8_HANDLER( kyugo_sub_cpu_control_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_HALT, data ? CLEAR_LINE : ASSERT_LINE); } @@ -449,7 +449,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( kyugo ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -464,7 +464,7 @@ static MACHINE_START( kyugo ) static MACHINE_RESET( kyugo ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); // must start with interrupts and sub CPU disabled cpu_interrupt_enable(machine->device("maincpu"), 0); @@ -1302,7 +1302,7 @@ static DRIVER_INIT( gyrodine ) static DRIVER_INIT( srdmissn ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); /* shared RAM is mapped at 0xe000 as well */ memory_install_ram(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe7ff, 0, 0, state->shared_ram); diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index 95eaf4fa6a5..2fcad2a9600 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -19,7 +19,7 @@ static INTERRUPT_GEN( labyrunr_interrupt ) { - labyrunr_state *state = (labyrunr_state *)device->machine->driver_data; + labyrunr_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -185,7 +185,7 @@ static const ym2203_interface ym2203_interface_2 = static MACHINE_START( labyrunr ) { - labyrunr_state *state = (labyrunr_state *)machine->driver_data; + labyrunr_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index dcc281e4c05..e2d758489ad 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -67,25 +67,25 @@ TODO: /* Sound comm between CPU's */ static READ8_HANDLER( sraider_sound_low_r ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); return state->sound_low; } static READ8_HANDLER( sraider_sound_high_r ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); return state->sound_high; } static WRITE8_HANDLER( sraider_sound_low_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->sound_low = data; } static WRITE8_HANDLER( sraider_sound_high_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->sound_high = data; } @@ -100,7 +100,7 @@ static READ8_HANDLER( sraider_8005_r ) /* Unknown IO */ static WRITE8_HANDLER( sraider_misc_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); switch(offset) { @@ -189,7 +189,7 @@ ADDRESS_MAP_END static INPUT_CHANGED( coin1_inserted ) { - ladybug_state *state = (ladybug_state *)field->port->machine->driver_data; + ladybug_state *state = field->port->machine->driver_data(); /* left coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); @@ -197,7 +197,7 @@ static INPUT_CHANGED( coin1_inserted ) static INPUT_CHANGED( coin2_inserted ) { - ladybug_state *state = (ladybug_state *)field->port->machine->driver_data; + ladybug_state *state = field->port->machine->driver_data(); /* right coin insertion causes an IRQ */ if (newval) @@ -724,13 +724,13 @@ GFXDECODE_END static MACHINE_START( ladybug ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); } static MACHINE_START( sraider ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -752,7 +752,7 @@ static MACHINE_START( sraider ) static MACHINE_RESET( sraider ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); int i; state->grid_color = 0; diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index f2ea944cecd..9c615166291 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -56,27 +56,27 @@ Notes: static READ8_HANDLER( from_snd_r ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->snd_flag = 0; return state->snd_data; } static WRITE8_HANDLER( to_main_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->snd_data = data; state->snd_flag = 2; } static WRITE8_HANDLER( sound_cpu_reset_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, (data & 1 ) ? ASSERT_LINE : CLEAR_LINE); } static TIMER_CALLBACK( nmi_callback ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -92,13 +92,13 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( nmi_disable_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) @@ -130,7 +130,7 @@ static const msm5232_interface msm5232_config = static READ8_HANDLER( snd_flag_r ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); return state->snd_flag | 0xfd; } @@ -285,7 +285,7 @@ GFXDECODE_END static MACHINE_START( ladyfrog ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -299,7 +299,7 @@ static MACHINE_START( ladyfrog ) static MACHINE_RESET( ladyfrog ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); state->tilebank = 0; state->palette_bank = 0; diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index 6983615c10d..190f11d9175 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -20,12 +20,13 @@ #include "cpu/z80/z80.h" #include "deprecat.h" -class laserbas_state +class laserbas_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbas_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbas_state(machine)); } - laserbas_state(running_machine &machine) { } + laserbas_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 *vram1; @@ -39,7 +40,7 @@ public: static VIDEO_START(laserbas) { - laserbas_state *state = (laserbas_state *)machine->driver_data; + laserbas_state *state = machine->driver_data(); state->vram1 = auto_alloc_array(machine, UINT8, 0x8000); state->vram2 = auto_alloc_array(machine, UINT8, 0x8000); @@ -50,7 +51,7 @@ static VIDEO_START(laserbas) static VIDEO_UPDATE(laserbas) { - laserbas_state *state = (laserbas_state *)screen->machine->driver_data; + laserbas_state *state = screen->machine->driver_data(); int x, y; for (y = 0; y < 256; y++) @@ -71,7 +72,7 @@ static VIDEO_UPDATE(laserbas) static READ8_HANDLER(vram_r) { - laserbas_state *state = (laserbas_state *)space->machine->driver_data; + laserbas_state *state = space->machine->driver_data(); if(!state->vrambank) return state->vram1[offset]; @@ -81,7 +82,7 @@ static READ8_HANDLER(vram_r) static WRITE8_HANDLER(vram_w) { - laserbas_state *state = (laserbas_state *)space->machine->driver_data; + laserbas_state *state = space->machine->driver_data(); if(!state->vrambank) state->vram1[offset] = data; @@ -91,7 +92,7 @@ static WRITE8_HANDLER(vram_w) static READ8_HANDLER( read_unk ) { - laserbas_state *state = (laserbas_state *)space->machine->driver_data; + laserbas_state *state = space->machine->driver_data(); state->count ^= 0x80; return state->count | 0x7f; @@ -104,7 +105,7 @@ static WRITE8_HANDLER(palette_w) static WRITE8_HANDLER(vrambank_w) { - laserbas_state *state = (laserbas_state *)space->machine->driver_data; + laserbas_state *state = space->machine->driver_data(); if ((offset & 0xf1) == 0x10) state->vrambank = data & 0x40; @@ -158,7 +159,7 @@ static INTERRUPT_GEN( laserbas_interrupt ) static MACHINE_START( laserbas ) { - laserbas_state *state = (laserbas_state *)machine->driver_data; + laserbas_state *state = machine->driver_data(); state_save_register_global(machine, state->vrambank); state_save_register_global(machine, state->count); @@ -166,7 +167,7 @@ static MACHINE_START( laserbas ) static MACHINE_RESET( laserbas ) { - laserbas_state *state = (laserbas_state *)machine->driver_data; + laserbas_state *state = machine->driver_data(); state->vrambank = 0; state->count = 0; diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 39cd1d4166f..920f8d2a528 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -29,7 +29,7 @@ TODO: static WRITE8_HANDLER( laserbat_videoram_w ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); if (state->video_page == 0) { @@ -45,7 +45,7 @@ static WRITE8_HANDLER( laserbat_videoram_w ) static WRITE8_HANDLER( video_extra_w ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); state->video_page = (data & 0x10) >> 4; state->sprite_enable = (data & 1) ^ 1; @@ -55,7 +55,7 @@ static WRITE8_HANDLER( video_extra_w ) static WRITE8_HANDLER( sprite_x_y_w ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); if (offset == 0) state->sprite_x = 256 - data; @@ -65,7 +65,7 @@ static WRITE8_HANDLER( sprite_x_y_w ) static WRITE8_HANDLER( laserbat_input_mux_w ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); state->input_mux = (data & 0x30) >> 4; @@ -79,7 +79,7 @@ static WRITE8_HANDLER( laserbat_input_mux_w ) static READ8_HANDLER( laserbat_input_r ) { - laserbat_state *state = (laserbat_state *)space->machine->driver_data; + laserbat_state *state = space->machine->driver_data(); static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3" }; return input_port_read(space->machine, portnames[state->input_mux]); @@ -487,7 +487,7 @@ GFXDECODE_END static TILE_GET_INFO( get_tile_info ) { - laserbat_state *state = (laserbat_state *)machine->driver_data; + laserbat_state *state = machine->driver_data(); // wrong color index! SET_TILE_INFO(0, state->videoram[tile_index], state->colorram[tile_index] & 0x7f, 0); @@ -495,7 +495,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( laserbat ) { - laserbat_state *state = (laserbat_state *)machine->driver_data; + laserbat_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -508,7 +508,7 @@ static VIDEO_START( laserbat ) static VIDEO_UPDATE( laserbat ) { - laserbat_state *state = (laserbat_state *)screen->machine->driver_data; + laserbat_state *state = screen->machine->driver_data(); int y; bitmap_t *s2636_1_bitmap; bitmap_t *s2636_2_bitmap; @@ -586,32 +586,32 @@ static const sn76477_interface laserbat_sn76477_interface = static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0a ) { - laserbat_state *laserbat = (laserbat_state *)device->machine->driver_data; + laserbat_state *laserbat = device->machine->driver_data(); cpu_set_input_line(laserbat->audiocpu, INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0b ) { - laserbat_state *laserbat = (laserbat_state *)device->machine->driver_data; + laserbat_state *laserbat = device->machine->driver_data(); cpu_set_input_line(laserbat->audiocpu, 0, state ? ASSERT_LINE : CLEAR_LINE); } static READ8_DEVICE_HANDLER( zaccaria_port0a_r ) { - laserbat_state *state = (laserbat_state *)device->machine->driver_data; + laserbat_state *state = device->machine->driver_data(); running_device *ay = (state->active_8910 == 0) ? state->ay1 : state->ay2; return ay8910_r(ay, 0); } static WRITE8_DEVICE_HANDLER( zaccaria_port0a_w ) { - laserbat_state *state = (laserbat_state *)device->machine->driver_data; + laserbat_state *state = device->machine->driver_data(); state->port0a = data; } static WRITE8_DEVICE_HANDLER( zaccaria_port0b_w ) { - laserbat_state *state = (laserbat_state *)device->machine->driver_data; + laserbat_state *state = device->machine->driver_data(); /* bit 1 goes to 8910 #0 BDIR pin */ if ((state->last_port0b & 0x02) == 0x02 && (data & 0x02) == 0x00) { @@ -674,7 +674,7 @@ static INTERRUPT_GEN( laserbat_interrupt ) static INTERRUPT_GEN( zaccaria_cb1_toggle ) { - laserbat_state *state = (laserbat_state *)device->machine->driver_data; + laserbat_state *state = device->machine->driver_data(); pia6821_cb1_w(state->pia, state->cb1_toggle & 1); state->cb1_toggle ^= 1; @@ -704,7 +704,7 @@ static const s2636_interface s2636_3_config = static MACHINE_START( laserbat ) { - laserbat_state *state = (laserbat_state *)machine->driver_data; + laserbat_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->s2636_1 = machine->device("s2636_1"); @@ -741,7 +741,7 @@ static MACHINE_START( laserbat ) static MACHINE_RESET( laserbat ) { - laserbat_state *state = (laserbat_state *)machine->driver_data; + laserbat_state *state = machine->driver_data(); state->video_page = 0; state->input_mux = 0; diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index 9d8f1b55de3..fcec989ea3f 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -38,7 +38,7 @@ DIP locations verified for: static INPUT_CHANGED( coin_inserted ) { - lasso_state *state = (lasso_state *)field->port->machine->driver_data; + lasso_state *state = field->port->machine->driver_data(); /* coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); @@ -48,14 +48,14 @@ static INPUT_CHANGED( coin_inserted ) /* Write to the sound latch and generate an IRQ on the sound CPU */ static WRITE8_HANDLER( sound_command_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); generic_pulse_irq_line(state->audiocpu, 0); } static WRITE8_HANDLER( pinbo_sound_command_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -68,7 +68,7 @@ static READ8_HANDLER( sound_status_r ) static WRITE8_HANDLER( sound_select_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); UINT8 to_write = BITSWAP8(*state->chip_data, 0, 1, 2, 3, 4, 5, 6, 7); if (~data & 0x01) /* chip #0 */ @@ -464,7 +464,7 @@ GFXDECODE_END static MACHINE_START( lasso ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -476,7 +476,7 @@ static MACHINE_START( lasso ) static MACHINE_START( wwjgtin ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); MACHINE_START_CALL(lasso); @@ -485,14 +485,14 @@ static MACHINE_START( wwjgtin ) static MACHINE_RESET( lasso ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); state->gfxbank = 0; } static MACHINE_RESET( wwjgtin ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); MACHINE_RESET_CALL(lasso); diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index 3d8f27bc392..1013c484288 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -442,7 +442,7 @@ GFXDECODE_END /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - lastduel_state *state = (lastduel_state *)device->machine->driver_data; + lastduel_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -474,7 +474,7 @@ static INTERRUPT_GEN( madgear_interrupt ) static MACHINE_START( lastduel ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -493,7 +493,7 @@ static MACHINE_START( madgear ) static MACHINE_RESET( lastduel ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); int i; state->tilemap_priority = 0; diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index f5c97224cf0..543b014fb33 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -66,12 +66,13 @@ Notes: #include "deprecat.h" #include "cpu/h83002/h8.h" -class lastfght_state +class lastfght_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastfght_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastfght_state(machine)); } - lastfght_state(running_machine &machine) { } + lastfght_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * colorram; @@ -98,7 +99,7 @@ public: static VIDEO_START( lastfght ) { - lastfght_state *state = (lastfght_state *)machine->driver_data; + lastfght_state *state = machine->driver_data(); int i; for (i = 0; i < 2; i++) state->bitmap[i] = machine->primary_screen->alloc_compatible_bitmap(); @@ -113,7 +114,7 @@ static VIDEO_START( lastfght ) static VIDEO_UPDATE( lastfght ) { - lastfght_state *state = (lastfght_state *)screen->machine->driver_data; + lastfght_state *state = screen->machine->driver_data(); #ifdef MAME_DEBUG #if 1 @@ -158,7 +159,7 @@ static VIDEO_UPDATE( lastfght ) static WRITE16_HANDLER( colordac_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -181,7 +182,7 @@ static WRITE16_HANDLER( colordac_w ) // high byte of a 16 bit register static WRITE16_HANDLER( lastfght_hi_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) logerror("%06x: 600000.b = %02x\n", cpu_get_pc(space->cpu), data >> 8); @@ -195,7 +196,7 @@ static WRITE16_HANDLER( lastfght_hi_w ) // screen x static WRITE16_HANDLER( lastfght_x_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) logerror("%06x: 800008.b = %02x\n", cpu_get_pc(space->cpu), data >> 8); @@ -209,7 +210,7 @@ static WRITE16_HANDLER( lastfght_x_w ) // screen y, screen width - 1 static WRITE16_HANDLER( lastfght_yw_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -226,7 +227,7 @@ static WRITE16_HANDLER( lastfght_yw_w ) // screen height - 1 static WRITE16_HANDLER( lastfght_h_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -240,7 +241,7 @@ static WRITE16_HANDLER( lastfght_h_w ) // source delta x << 6, source x << 6 static WRITE16_HANDLER( lastfght_sx_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -257,7 +258,7 @@ static WRITE16_HANDLER( lastfght_sx_w ) // source y << 6, source y1 << 6 static WRITE16_HANDLER( lastfght_sy_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -274,7 +275,7 @@ static WRITE16_HANDLER( lastfght_sy_w ) // source rom (0x200000 bytes), source page (512x256 bytes) static WRITE16_HANDLER( lastfght_sr_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -291,7 +292,7 @@ static WRITE16_HANDLER( lastfght_sr_w ) // source x1 << 6, source delta y << 6 static WRITE16_HANDLER( lastfght_sd_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -308,7 +309,7 @@ static WRITE16_HANDLER( lastfght_sd_w ) // start blit static WRITE16_HANDLER( lastfght_blit_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -347,7 +348,7 @@ static WRITE16_HANDLER( lastfght_blit_w ) // toggle framebuffer static WRITE16_HANDLER( lastfght_dest_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->dest ^= 1; @@ -384,7 +385,7 @@ static READ16_HANDLER( lastfght_c00006_r ) static WRITE16_HANDLER( lastfght_c00006_w ) { - lastfght_state *state = (lastfght_state *)space->machine->driver_data; + lastfght_state *state = space->machine->driver_data(); COMBINE_DATA(&state->c00006); // popmessage("%04x", state->c00006); } @@ -511,7 +512,7 @@ INPUT_PORTS_END static INTERRUPT_GEN( unknown_interrupt ) { - lastfght_state *state = (lastfght_state *)device->machine->driver_data; + lastfght_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { case 0: @@ -525,7 +526,7 @@ static INTERRUPT_GEN( unknown_interrupt ) static MACHINE_START( lastfght ) { - lastfght_state *state = (lastfght_state *)machine->driver_data; + lastfght_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -549,7 +550,7 @@ static MACHINE_START( lastfght ) static MACHINE_RESET( lastfght ) { - lastfght_state *state = (lastfght_state *)machine->driver_data; + lastfght_state *state = machine->driver_data(); state->clr_offset = 0; state->dest = 0; diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index c8280e90db5..2302bf69a9c 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -239,7 +239,7 @@ static INTERRUPT_GEN( lazercmd_timer ) { - lazercmd_state *state = (lazercmd_state *)device->machine->driver_data; + lazercmd_state *state = device->machine->driver_data(); if (++state->timer_count >= 64 * 128) { @@ -251,7 +251,7 @@ static INTERRUPT_GEN( lazercmd_timer ) static INTERRUPT_GEN( bbonk_timer ) { - lazercmd_state *state = (lazercmd_state *)device->machine->driver_data; + lazercmd_state *state = device->machine->driver_data(); if (++state->timer_count >= 64 * 128) state->timer_count = 0; @@ -289,7 +289,7 @@ static READ8_HANDLER( lazercmd_data_port_r ) static WRITE8_HANDLER( lazercmd_hardware_w ) { - lazercmd_state *state = (lazercmd_state *)space->machine->driver_data; + lazercmd_state *state = space->machine->driver_data(); switch (offset) { @@ -313,7 +313,7 @@ static WRITE8_HANDLER( lazercmd_hardware_w ) static WRITE8_HANDLER( medlanes_hardware_w ) { - lazercmd_state *state = (lazercmd_state *)space->machine->driver_data; + lazercmd_state *state = space->machine->driver_data(); switch (offset) { @@ -340,7 +340,7 @@ static WRITE8_HANDLER( medlanes_hardware_w ) static WRITE8_HANDLER( bbonk_hardware_w ) { - lazercmd_state *state = (lazercmd_state *)space->machine->driver_data; + lazercmd_state *state = space->machine->driver_data(); switch (offset) { @@ -361,7 +361,7 @@ static WRITE8_HANDLER( bbonk_hardware_w ) static READ8_HANDLER( lazercmd_hardware_r ) { - lazercmd_state *state = (lazercmd_state *)space->machine->driver_data; + lazercmd_state *state = space->machine->driver_data(); UINT8 data = 0; switch (offset) @@ -601,7 +601,7 @@ static PALETTE_INIT( lazercmd ) static MACHINE_START( lazercmd ) { - lazercmd_state *state = (lazercmd_state *)machine->driver_data; + lazercmd_state *state = machine->driver_data(); state->dac = machine->device("dac"); @@ -614,7 +614,7 @@ static MACHINE_START( lazercmd ) static MACHINE_RESET( lazercmd ) { - lazercmd_state *state = (lazercmd_state *)machine->driver_data; + lazercmd_state *state = machine->driver_data(); state->marker_x = 0; state->marker_y = 0; diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index b84d79978f1..5c68987a37a 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -24,7 +24,7 @@ static WRITE16_HANDLER( lemmings_control_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); /* Offset==0 Pixel layer X scroll */ if (offset == 4) @@ -64,7 +64,7 @@ static READ16_HANDLER( lemmings_prot_r ) static WRITE16_HANDLER( lemmings_palette_24bit_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); int r, g, b; COMBINE_DATA(&state->paletteram[offset]); @@ -80,14 +80,14 @@ static WRITE16_HANDLER( lemmings_palette_24bit_w ) static WRITE16_HANDLER( lemmings_sound_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 1, HOLD_LINE); } static WRITE8_HANDLER( lemmings_sound_ack_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 1, CLEAR_LINE); } @@ -246,7 +246,7 @@ GFXDECODE_END static void sound_irq( running_device *device, int state ) { - lemmings_state *lemmings = (lemmings_state *)device->machine->driver_data; + lemmings_state *lemmings = device->machine->driver_data(); cpu_set_input_line(lemmings->audiocpu, 0, state); } @@ -257,7 +257,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( lemmings ) { - lemmings_state *state = (lemmings_state *)machine->driver_data; + lemmings_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); } diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 6a4f4a85bc4..78733c733bb 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -212,7 +212,7 @@ static WRITE8_HANDLER( control2_w ) /* bit 4 bankswitches the 4800-4fff region: 0 = registers, 1 = RAM ("CBNK" on schematics) */ /* bit 6 is "SHD0" (some kind of shadow control) */ /* bit 7 is "SHD1" (ditto) */ - lethal_state *state = (lethal_state *)space->machine->driver_data; + lethal_state *state = space->machine->driver_data(); state->cur_control2 = data; @@ -221,7 +221,7 @@ static WRITE8_HANDLER( control2_w ) static INTERRUPT_GEN(lethalen_interrupt) { - lethal_state *state = (lethal_state *)device->machine->driver_data; + lethal_state *state = device->machine->driver_data(); if (k056832_is_irq_enabled(state->k056832, 0)) cpu_set_input_line(device, HD6309_IRQ_LINE, HOLD_LINE); @@ -234,7 +234,7 @@ static WRITE8_HANDLER( sound_cmd_w ) static WRITE8_HANDLER( sound_irq_w ) { - lethal_state *state = (lethal_state *)space->machine->driver_data; + lethal_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -245,7 +245,7 @@ static READ8_HANDLER( sound_status_r ) static void sound_nmi( running_device *device ) { - lethal_state *state = (lethal_state *)device->machine->driver_data; + lethal_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -256,7 +256,7 @@ static WRITE8_HANDLER( le_bankswitch_w ) static READ8_HANDLER( le_4800_r ) { - lethal_state *state = (lethal_state *)space->machine->driver_data; + lethal_state *state = space->machine->driver_data(); if (state->cur_control2 & 0x10) // RAM enable { @@ -332,7 +332,7 @@ static READ8_HANDLER( le_4800_r ) static WRITE8_HANDLER( le_4800_w ) { - lethal_state *state = (lethal_state *)space->machine->driver_data; + lethal_state *state = space->machine->driver_data(); if (state->cur_control2 & 0x10) // RAM enable { @@ -579,7 +579,7 @@ static const k054539_interface k054539_config = static MACHINE_START( lethalen ) { - lethal_state *state = (lethal_state *)machine->driver_data; + lethal_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 0x20, &ROM[0x10000], 0x2000); @@ -603,7 +603,7 @@ static MACHINE_START( lethalen ) static MACHINE_RESET( lethalen ) { - lethal_state *state = (lethal_state *)machine->driver_data; + lethal_state *state = machine->driver_data(); UINT8 *prgrom = (UINT8 *)memory_region(machine, "maincpu"); int i; diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index d6dead3c57b..93cb59f360f 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -27,7 +27,7 @@ static READ8_HANDLER( deco16_bank_r ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); const UINT8 *ROM = memory_region(space->machine, "user1"); /* The tilemap bank can be swapped into main memory */ @@ -67,7 +67,7 @@ static READ8_HANDLER( deco16_io_r ) static WRITE8_HANDLER( deco16_bank_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->bank = data; if (state->bank) @@ -78,7 +78,7 @@ static WRITE8_HANDLER( deco16_bank_w ) static READ8_HANDLER( prosoccr_bank_r ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); const UINT8 *ROM = memory_region(space->machine, "user1"); /* The tilemap bank can be swapped into main memory */ @@ -108,7 +108,7 @@ static READ8_HANDLER( prosoccr_bank_r ) static READ8_HANDLER( prosoccr_charram_r ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); UINT8 *SRC_GFX = memory_region(space->machine, "shared_gfx"); if (state->gfx_rom_readback) @@ -130,7 +130,7 @@ static READ8_HANDLER( prosoccr_charram_r ) static WRITE8_HANDLER( prosoccr_charram_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); UINT8 *FG_GFX = memory_region(space->machine, "fg_gfx"); if (state->bank) @@ -168,7 +168,7 @@ static WRITE8_HANDLER( prosoccr_charram_w ) static WRITE8_HANDLER( prosoccr_char_bank_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->gfx_rom_readback = data & 1; //enable GFX rom read-back if (data & 0xfe) @@ -177,7 +177,7 @@ static WRITE8_HANDLER( prosoccr_char_bank_w ) static WRITE8_HANDLER( prosoccr_io_bank_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->bank = data & 1; if (state->bank) @@ -769,7 +769,7 @@ GFXDECODE_END static INTERRUPT_GEN( deco16_interrupt ) { - liberate_state *state = (liberate_state *)device->machine->driver_data; + liberate_state *state = device->machine->driver_data(); int p = ~input_port_read(device->machine, "IN3"); if ((p & 0x43) && !state->latch) { @@ -799,7 +799,7 @@ static INTERRUPT_GEN( prosport_interrupt ) static MACHINE_START( liberate ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -815,7 +815,7 @@ static MACHINE_START( liberate ) static MACHINE_RESET( liberate ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); memset(state->io_ram, 0, ARRAY_LENGTH(state->io_ram)); diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index d56cfc6ed9b..16be99055d0 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -87,7 +87,7 @@ TODO: static TIMER_CALLBACK( nmi_callback ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); else @@ -102,13 +102,13 @@ static WRITE8_HANDLER( lkage_sound_command_w ) static WRITE8_HANDLER( lkage_sh_nmi_disable_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( lkage_sh_nmi_enable_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) @@ -342,7 +342,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int irq) { - lkage_state *state = (lkage_state *)device->machine->driver_data; + lkage_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -358,7 +358,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( lkage ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -389,7 +389,7 @@ static MACHINE_START( lkage ) static MACHINE_RESET( lkage ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); state->bg_tile_bank = state->fg_tile_bank = 0; @@ -674,7 +674,7 @@ ROM_END static READ8_HANDLER( fake_mcu_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); int result = 0; switch (state->mcu_val) @@ -710,13 +710,13 @@ static READ8_HANDLER( fake_mcu_r ) static WRITE8_HANDLER( fake_mcu_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->mcu_val = data; } static READ8_HANDLER( fake_status_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); return state->mcu_ready; } diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index 89139718eb5..74f185da7f6 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -53,7 +53,7 @@ static READ8_HANDLER( adc_r ); static WRITE16_HANDLER( adrst_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->ctrl_reg = data & 0xff; /* Bus mastering for shared access */ @@ -64,14 +64,14 @@ static WRITE16_HANDLER( adrst_w ) static READ16_HANDLER( main_gnd_r ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); const address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM); return memory_read_word(gndspace, V30_GND_ADDR | offset * 2); } static WRITE16_HANDLER( main_gnd_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); const address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM); if (ACCESSING_BITS_0_7) @@ -82,14 +82,14 @@ static WRITE16_HANDLER( main_gnd_w ) static READ16_HANDLER( main_obj_r ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); const address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM); return memory_read_word(objspace, V30_OBJ_ADDR | offset * 2); } static WRITE16_HANDLER( main_obj_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); const address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM); if (ACCESSING_BITS_0_7) @@ -100,7 +100,7 @@ static WRITE16_HANDLER( main_obj_w ) static WRITE16_HANDLER( tst_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); if (offset < 0x800) { @@ -121,27 +121,27 @@ static WRITE16_HANDLER( tst_w ) static READ16_HANDLER( main_z80_r ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); const address_space *sndspace = cpu_get_address_space(state->audiocpu, ADDRESS_SPACE_PROGRAM); return 0xff00 | memory_read_byte(sndspace, offset); } static WRITE16_HANDLER( main_z80_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); const address_space *sndspace = cpu_get_address_space(state->audiocpu, ADDRESS_SPACE_PROGRAM); memory_write_byte(sndspace, offset, data); } static WRITE16_HANDLER( inten_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->main_inten = 1; } static WRITE16_HANDLER( emres_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); watchdog_reset(space->machine); state->main_inten = 0; } @@ -392,7 +392,7 @@ static WRITE8_HANDLER( sound_vol ) #define LO_RI 100000.0 #define LO_RP 100000.0 - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); static const double gains[16] = { @@ -428,7 +428,7 @@ static WRITE8_HANDLER( sound_vol ) static void ym2203_irq(running_device *device, int irq) { - lockon_state *state = (lockon_state *)device->machine->driver_data; + lockon_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE ); } @@ -464,7 +464,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( lockon ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -497,7 +497,7 @@ static MACHINE_START( lockon ) static MACHINE_RESET( lockon ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); state->ground_ctrl = 0; state->scroll_h = 0; diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index efa2927d65f..584b0cb2a4b 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -95,12 +95,13 @@ static UINT8 *cop_io; * *************************************/ -class looping_state +class looping_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, looping_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, looping_state(machine)); } - looping_state(running_machine &machine) { } + looping_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -170,7 +171,7 @@ static PALETTE_INIT( looping ) static TILE_GET_INFO( get_tile_info ) { - looping_state *state = (looping_state *)machine->driver_data; + looping_state *state = machine->driver_data(); int tile_number = state->videoram[tile_index]; int color = state->colorram[(tile_index & 0x1f) * 2 + 1] & 0x07; SET_TILE_INFO(0, tile_number, color, 0); @@ -179,7 +180,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( looping ) { - looping_state *state = (looping_state *)machine->driver_data; + looping_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8,8, 32,32); @@ -196,7 +197,7 @@ static VIDEO_START( looping ) static WRITE8_HANDLER( flip_screen_x_w ) { - looping_state *state = (looping_state *)space->machine->driver_data; + looping_state *state = space->machine->driver_data(); flip_screen_x_set(space->machine, ~data & 0x01); tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen_get(space->machine) ? 128 : 0); } @@ -204,7 +205,7 @@ static WRITE8_HANDLER( flip_screen_x_w ) static WRITE8_HANDLER( flip_screen_y_w ) { - looping_state *state = (looping_state *)space->machine->driver_data; + looping_state *state = space->machine->driver_data(); flip_screen_y_set(space->machine, ~data & 0x01); tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen_get(space->machine) ? 128 : 0); } @@ -212,7 +213,7 @@ static WRITE8_HANDLER( flip_screen_y_w ) static WRITE8_HANDLER( looping_videoram_w ) { - looping_state *state = (looping_state *)space->machine->driver_data; + looping_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -220,7 +221,7 @@ static WRITE8_HANDLER( looping_videoram_w ) static WRITE8_HANDLER( looping_colorram_w ) { - looping_state *state = (looping_state *)space->machine->driver_data; + looping_state *state = space->machine->driver_data(); int i; state->colorram[offset] = data; @@ -250,7 +251,7 @@ static WRITE8_HANDLER( looping_colorram_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { const UINT8 *source; - looping_state *state = (looping_state *)machine->driver_data; + looping_state *state = machine->driver_data(); for (source = state->spriteram; source < state->spriteram + 0x40; source += 4) { @@ -280,7 +281,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static VIDEO_UPDATE( looping ) { - looping_state *state = (looping_state *)screen->machine->driver_data; + looping_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); @@ -297,7 +298,7 @@ static VIDEO_UPDATE( looping ) static MACHINE_START( looping ) { - looping_state *state = (looping_state *)machine->driver_data; + looping_state *state = machine->driver_data(); state_save_register_global_array(machine, state->sound); } @@ -369,7 +370,7 @@ static WRITE8_DEVICE_HANDLER( looping_sound_sw ) 0007 = AFA */ - looping_state *state = (looping_state *)device->machine->driver_data; + looping_state *state = device->machine->driver_data(); state->sound[offset + 1] = data ^ 1; dac_data_w(device, ((state->sound[2] << 7) + (state->sound[3] << 6)) * state->sound[7]); } diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index bd240cdafd6..e69bf954d67 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -540,7 +540,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int irq) { - lsasquad_state *state = (lsasquad_state *)device->machine->driver_data; + lsasquad_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -566,7 +566,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( lsasquad ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x2000); @@ -595,7 +595,7 @@ static MACHINE_START( lsasquad ) static MACHINE_RESET( lsasquad ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); state->sound_pending = 0; state->sound_nmi_enable = 0; diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index ca3712cf375..54e43248f58 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -62,13 +62,13 @@ Notes: static WRITE8_HANDLER( avengers_adpcm_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); state->adpcm = data; } static READ8_HANDLER( avengers_adpcm_r ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); return state->adpcm; } @@ -97,7 +97,7 @@ static INTERRUPT_GEN( lwings_interrupt ) static WRITE8_HANDLER( avengers_protection_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); int pc = cpu_get_pc(space->cpu); if (pc == 0x2eeb) @@ -125,13 +125,13 @@ static WRITE8_HANDLER( avengers_protection_w ) static WRITE8_HANDLER( avengers_prot_bank_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); state->palette_pen = data * 64; } static int avengers_fetch_paldata( running_machine *machine ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); static const char pal_data[] = /* page 1: 0x03,0x02,0x01,0x00 */ @@ -224,7 +224,7 @@ static int avengers_fetch_paldata( running_machine *machine ) static READ8_HANDLER( avengers_protection_r ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); static const int xpos[8] = { 10, 7, 0, -7, -10, -7, 0, 7 }; static const int ypos[8] = { 0, 7, 10, 7, 0, -7, -10, -7 }; int best_dist = 0; @@ -261,7 +261,7 @@ static READ8_HANDLER( avengers_protection_r ) static READ8_HANDLER( avengers_soundlatch2_r ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); UINT8 data = *state->soundlatch2 | state->soundstate; state->soundstate = 0; return(data); @@ -742,7 +742,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( lwings ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -758,7 +758,7 @@ static MACHINE_START( lwings ) static MACHINE_RESET( lwings ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); state->bg2_image = 0; state->scroll_x[0] = 0; diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 59b793d8e33..69ecfe35b99 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -130,14 +130,14 @@ Notes (couriersud) static WRITE8_DEVICE_HANDLER( ic8j1_output_changed ) { - m10_state *state = (m10_state *)device->machine->driver_data; + m10_state *state = device->machine->driver_data(); LOG(("ic8j1: %d %d\n", data, device->machine->primary_screen->vpos())); cpu_set_input_line(state->maincpu, 0, !data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_DEVICE_HANDLER( ic8j2_output_changed ) { - m10_state *state = (m10_state *)device->machine->driver_data; + m10_state *state = device->machine->driver_data(); /* written from /Q to A with slight delight */ LOG(("ic8j2: %d\n", data)); @@ -194,7 +194,7 @@ static PALETTE_INIT( m10 ) static MACHINE_START( m10 ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->ic8j1 = machine->device("ic8j1"); @@ -208,7 +208,7 @@ static MACHINE_START( m10 ) static MACHINE_RESET( m10 ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); state->bottomline = 0; state->flip = 0; @@ -242,7 +242,7 @@ static MACHINE_RESET( m10 ) static WRITE8_HANDLER( m10_ctrl_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); #if DEBUG if (data & 0x40) @@ -319,7 +319,7 @@ static WRITE8_HANDLER( m10_ctrl_w ) static WRITE8_HANDLER( m11_ctrl_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); #if DEBUG if (data & 0x4c) @@ -352,7 +352,7 @@ static WRITE8_HANDLER( m11_ctrl_w ) static WRITE8_HANDLER( m15_ctrl_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); #if DEBUG if (data & 0xf0) @@ -388,7 +388,7 @@ static WRITE8_HANDLER( m10_a500_w ) static WRITE8_HANDLER( m11_a100_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); int raising_bits = data & ~state->last; //int falling_bits = ~data & state->last; @@ -423,7 +423,7 @@ static WRITE8_HANDLER( m11_a100_w ) static WRITE8_HANDLER( m15_a100_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); //int raising_bits = data & ~state->last; int falling_bits = ~data & state->last; @@ -481,7 +481,7 @@ static WRITE8_HANDLER( m15_a100_w ) static READ8_HANDLER( m10_a700_r ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); //LOG(("rd:%d\n",space->machine->primary_screen->vpos())); LOG(("clear\n")); ttl74123_clear_w(state->ic8j1, 0, 0); @@ -491,7 +491,7 @@ static READ8_HANDLER( m10_a700_r ) static READ8_HANDLER( m11_a700_r ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); //LOG(("rd:%d\n",space->machine->primary_screen->vpos())); //cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); LOG(("clear\n")); @@ -508,7 +508,7 @@ static READ8_HANDLER( m11_a700_r ) static INPUT_CHANGED( coin_inserted ) { - m10_state *state = (m10_state *)field->port->machine->driver_data; + m10_state *state = field->port->machine->driver_data(); /* coin insertion causes an NMI */ cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); } @@ -516,7 +516,7 @@ static INPUT_CHANGED( coin_inserted ) static TIMER_CALLBACK( interrupt_callback ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); if (param == 0) { cpu_set_input_line(state->maincpu, 0, ASSERT_LINE); @@ -938,7 +938,7 @@ MACHINE_DRIVER_END static DRIVER_INIT( andromed ) { int i; - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); for (i = 0x1c00; i < 0x2000; i++) state->rom[i] = 0x60; @@ -947,7 +947,7 @@ static DRIVER_INIT( andromed ) static DRIVER_INIT( ipminva1 ) { int i; - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); for (i = 0x1400; i < 0x17ff; i++) state->rom[i] = 0x60; diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index d31163084b6..c62e05e458e 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -53,12 +53,13 @@ Dumped by Chackn #include "cpu/i8085/i8085.h" -class m14_state +class m14_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m14_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m14_state(machine)); } - m14_state(running_machine &machine) { } + m14_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ tilemap_t *m14_tilemap; @@ -99,7 +100,7 @@ static PALETTE_INIT( m14 ) static TILE_GET_INFO( m14_get_tile_info ) { - m14_state *state = (m14_state *)machine->driver_data; + m14_state *state = machine->driver_data(); int code = state->video_ram[tile_index]; int color = state->color_ram[tile_index] & 0x0f; @@ -115,14 +116,14 @@ static TILE_GET_INFO( m14_get_tile_info ) static VIDEO_START( m14 ) { - m14_state *state = (m14_state *)machine->driver_data; + m14_state *state = machine->driver_data(); state->m14_tilemap = tilemap_create(machine, m14_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( m14 ) { - m14_state *state = (m14_state *)screen->machine->driver_data; + m14_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->m14_tilemap, 0, 0); return 0; @@ -131,7 +132,7 @@ static VIDEO_UPDATE( m14 ) static WRITE8_HANDLER( m14_vram_w ) { - m14_state *state = (m14_state *)space->machine->driver_data; + m14_state *state = space->machine->driver_data(); state->video_ram[offset] = data; tilemap_mark_tile_dirty(state->m14_tilemap, offset); @@ -139,7 +140,7 @@ static WRITE8_HANDLER( m14_vram_w ) static WRITE8_HANDLER( m14_cram_w ) { - m14_state *state = (m14_state *)space->machine->driver_data; + m14_state *state = space->machine->driver_data(); state->color_ram[offset] = data; tilemap_mark_tile_dirty(state->m14_tilemap, offset); @@ -160,7 +161,7 @@ static READ8_HANDLER( m14_rng_r ) /* Here routes the hopper & the inputs */ static READ8_HANDLER( input_buttons_r ) { - m14_state *state = (m14_state *)space->machine->driver_data; + m14_state *state = space->machine->driver_data(); if (state->hop_mux) { @@ -184,7 +185,7 @@ static WRITE8_HANDLER( test_w ) static WRITE8_HANDLER( hopper_w ) { - m14_state *state = (m14_state *)space->machine->driver_data; + m14_state *state = space->machine->driver_data(); /* ---- x--- coin out */ /* ---- --x- hopper/input mux? */ @@ -222,7 +223,7 @@ ADDRESS_MAP_END static INPUT_CHANGED( left_coin_inserted ) { - m14_state *state = (m14_state *)field->port->machine->driver_data; + m14_state *state = field->port->machine->driver_data(); /* left coin insertion causes a rst6.5 (vector 0x34) */ if (newval) cpu_set_input_line(state->maincpu, I8085_RST65_LINE, HOLD_LINE); @@ -230,7 +231,7 @@ static INPUT_CHANGED( left_coin_inserted ) static INPUT_CHANGED( right_coin_inserted ) { - m14_state *state = (m14_state *)field->port->machine->driver_data; + m14_state *state = field->port->machine->driver_data(); /* right coin insertion causes a rst5.5 (vector 0x2c) */ if (newval) cpu_set_input_line(state->maincpu, I8085_RST55_LINE, HOLD_LINE); @@ -314,7 +315,7 @@ static INTERRUPT_GEN( m14_irq ) static MACHINE_START( m14 ) { - m14_state *state = (m14_state *)machine->driver_data; + m14_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -323,7 +324,7 @@ static MACHINE_START( m14 ) static MACHINE_RESET( m14 ) { - m14_state *state = (m14_state *)machine->driver_data; + m14_state *state = machine->driver_data(); state->hop_mux = 0; } diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c index 51d1f796129..30ed80817ca 100644 --- a/src/mame/drivers/m52.c +++ b/src/mame/drivers/m52.c @@ -381,7 +381,7 @@ GFXDECODE_END static MACHINE_RESET( m52 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->bg1xpos = 0; state->bg1ypos = 0; diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index 5ae480610e1..7b5d36646ea 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -83,7 +83,7 @@ other supported games as well. static READ8_HANDLER( ldrun2_bankswitch_r ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); if (state->ldrun2_bankswap) { state->ldrun2_bankswap--; @@ -97,7 +97,7 @@ static READ8_HANDLER( ldrun2_bankswitch_r ) static WRITE8_HANDLER( ldrun2_bankswitch_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); static const int banks[30] = { 0,0,0,0,0,1,0,1,0,0, @@ -931,7 +931,7 @@ GFXDECODE_END static MACHINE_START( m62 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state_save_register_global(machine, state->ldrun2_bankswap); state_save_register_global_array(machine, state->bankcontrol); @@ -939,7 +939,7 @@ static MACHINE_START( m62 ) static MACHINE_RESET( m62 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->flipscreen = 0; state->m62_background_hscroll = 0; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 3f7ad588845..7918620611f 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -121,12 +121,13 @@ Dip locations verified for: #include "sound/ay8910.h" #include "sound/samples.h" -class m63_state +class m63_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m63_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m63_state(machine)); } - m63_state(running_machine &machine) { } + m63_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 * videoram; UINT8 * colorram; @@ -210,7 +211,7 @@ static PALETTE_INIT( m63 ) static WRITE8_HANDLER( m63_videoram_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -218,7 +219,7 @@ static WRITE8_HANDLER( m63_videoram_w ) static WRITE8_HANDLER( m63_colorram_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -226,7 +227,7 @@ static WRITE8_HANDLER( m63_colorram_w ) static WRITE8_HANDLER( m63_videoram2_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -234,7 +235,7 @@ static WRITE8_HANDLER( m63_videoram2_w ) static WRITE8_HANDLER( m63_palbank_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); if (state->pal_bank != (data & 0x01)) { @@ -254,7 +255,7 @@ static WRITE8_HANDLER( m63_flipscreen_w ) static WRITE8_HANDLER( fghtbskt_flipscreen_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); flip_screen_set(space->machine, data); state->fg_flag = flip_screen_get(space->machine) ? TILE_FLIPX : 0; @@ -263,7 +264,7 @@ static WRITE8_HANDLER( fghtbskt_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] | ((attr & 0x30) << 4); @@ -274,7 +275,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); int code = state->videoram2[tile_index]; @@ -283,7 +284,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( m63 ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -294,7 +295,7 @@ static VIDEO_START( m63 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -335,7 +336,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( m63 ) { - m63_state *state = (m63_state *)screen->machine->driver_data; + m63_state *state = screen->machine->driver_data(); int col; @@ -356,14 +357,14 @@ static WRITE8_HANDLER( coin_w ) static WRITE8_HANDLER( snd_irq_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); cpu_set_input_line(state->soundcpu, 0, ASSERT_LINE); timer_call_after_resynch(space->machine, NULL, 0, NULL); } static WRITE8_HANDLER( snddata_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); if ((state->p2 & 0xf0) == 0xe0) ay8910_address_w(state->ay1, 0, offset); @@ -379,13 +380,13 @@ static WRITE8_HANDLER( snddata_w ) static WRITE8_HANDLER( p1_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); state->p1 = data; } static WRITE8_HANDLER( p2_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); state->p2 = data; if((state->p2 & 0xf0) == 0x50) @@ -396,13 +397,13 @@ static WRITE8_HANDLER( p2_w ) static READ8_HANDLER( snd_status_r ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); return state->sound_status; } static READ8_HANDLER( irq_r ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); if (state->sound_irq) { @@ -414,7 +415,7 @@ static READ8_HANDLER( irq_r ) static READ8_HANDLER( snddata_r ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); switch (state->p2 & 0xf0) { case 0x60: return soundlatch_r(space, 0); ; @@ -425,7 +426,7 @@ static READ8_HANDLER( snddata_r ) static WRITE8_HANDLER( fghtbskt_samples_w ) { - m63_state *state = (m63_state *)space->machine->driver_data; + m63_state *state = space->machine->driver_data(); if (data & 1) sample_start_raw(state->samples, 0, state->samplebuf + ((data & 0xf0) << 8), 0x2000, 8000, 0); @@ -675,7 +676,7 @@ GFXDECODE_END static SAMPLES_START( fghtbskt_sh_start ) { running_machine *machine = device->machine; - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); int i, len = memory_region_length(machine, "samples"); UINT8 *ROM = memory_region(machine, "samples"); @@ -695,13 +696,13 @@ static const samples_interface fghtbskt_samples_interface = static INTERRUPT_GEN( snd_irq ) { - m63_state *state = (m63_state *)device->machine->driver_data; + m63_state *state = device->machine->driver_data(); state->sound_irq = 1; } static MACHINE_START( m63 ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); state->soundcpu = machine->device("soundcpu"); state->ay1 = machine->device("ay1"); @@ -721,7 +722,7 @@ static MACHINE_START( m63 ) static MACHINE_RESET( m63 ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); state->pal_bank = 0; state->fg_flag = 0; @@ -1000,13 +1001,13 @@ ROM_END static DRIVER_INIT( wilytowr ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); state->sy_offset = 238; } static DRIVER_INIT( fghtbskt ) { - m63_state *state = (m63_state *)machine->driver_data; + m63_state *state = machine->driver_data(); state->sy_offset = 240; } diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index 7b8e3e5ae36..042ab35e774 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -58,12 +58,13 @@ and two large (paddles pretending to be) guns. #include "includes/m79amb.h" #include "cpu/i8085/i8085.h" -class m79amb_state +class m79amb_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m79amb_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m79amb_state(machine)); } - m79amb_state(running_machine &machine) { } + m79amb_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -77,13 +78,13 @@ public: static WRITE8_HANDLER( ramtek_videoram_w ) { - m79amb_state *state = (m79amb_state *)space->machine->driver_data; + m79amb_state *state = space->machine->driver_data(); state->videoram[offset] = data & ~*state->mask; } static VIDEO_UPDATE( ramtek ) { - m79amb_state *state = (m79amb_state *)screen->machine->driver_data; + m79amb_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < 0x2000; offs++) @@ -110,7 +111,7 @@ static VIDEO_UPDATE( ramtek ) static READ8_HANDLER( gray5bit_controller0_r ) { - m79amb_state *state = (m79amb_state *)space->machine->driver_data; + m79amb_state *state = space->machine->driver_data(); UINT8 port_data = input_port_read(space->machine, "8004"); UINT8 gun_pos = input_port_read(space->machine, "GUN1"); @@ -119,7 +120,7 @@ static READ8_HANDLER( gray5bit_controller0_r ) static READ8_HANDLER( gray5bit_controller1_r ) { - m79amb_state *state = (m79amb_state *)space->machine->driver_data; + m79amb_state *state = space->machine->driver_data(); UINT8 port_data = input_port_read(space->machine, "8005"); UINT8 gun_pos = input_port_read(space->machine, "GUN2"); @@ -292,7 +293,7 @@ static const UINT8 lut_pos[0x20] = { static DRIVER_INIT( m79amb ) { - m79amb_state *state = (m79amb_state *)machine->driver_data; + m79amb_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "maincpu"); int i, j; diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 18fc0fd193b..d75243d208d 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -306,7 +306,7 @@ Notes: static WRITE32_HANDLER( paletteram32_macrossp_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); int r,g,b; COMBINE_DATA(&state->paletteram[offset]); @@ -320,7 +320,7 @@ static WRITE32_HANDLER( paletteram32_macrossp_w ) static READ32_HANDLER ( macrossp_soundstatus_r ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); // logerror("%08x read soundstatus\n", cpu_get_pc(space->cpu)); @@ -334,7 +334,7 @@ static READ32_HANDLER ( macrossp_soundstatus_r ) static WRITE32_HANDLER( macrossp_soundcmd_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); if (ACCESSING_BITS_16_31) { @@ -349,7 +349,7 @@ static WRITE32_HANDLER( macrossp_soundcmd_w ) static READ16_HANDLER( macrossp_soundcmd_r ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); // logerror("%06x read soundcmd\n",cpu_get_pc(space->cpu)); state->sndpending = 0; @@ -358,7 +358,7 @@ static READ16_HANDLER( macrossp_soundcmd_r ) static void update_colors( running_machine *machine ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); int i, r, g, b; for (i = 0; i < 0x1000; i++) @@ -388,7 +388,7 @@ static void update_colors( running_machine *machine ) static WRITE32_HANDLER( macrossp_palette_fade_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); state->fade_effect = ((data & 0xff00) >> 8) - 0x28; //it writes two times, first with a -0x28 then with the proper data // popmessage("%02x",fade_effect); @@ -584,7 +584,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int irq) { - // macrossp_state *state = (macrossp_state *)space->machine->driver_data; + // macrossp_state *state = space->machine->driver_data(); logerror("ES5506 irq %d\n", irq); /* IRQ lines 1 & 4 on the sound 68000 are definitely triggered by the ES5506, @@ -604,7 +604,7 @@ static const es5506_interface es5506_config = static MACHINE_START( macrossp ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -617,7 +617,7 @@ static MACHINE_START( macrossp ) static MACHINE_RESET( macrossp ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); state->sndpending = 0; state->snd_toggle = 0; @@ -778,7 +778,7 @@ PC :00018104 018104: addq.w #1, $f1015a.l PC :0001810A 01810A: cmp.w $f10140.l, D0 PC :00018110 018110: beq 18104 */ - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mainram[0x10158 / 4]); if (cpu_get_pc(space->cpu) == 0x001810A) cpu_spinuntil_int(space->cpu); @@ -787,7 +787,7 @@ PC :00018110 018110: beq 18104 #ifdef UNUSED_FUNCTION static WRITE32_HANDLER( quizmoon_speedup_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mainram[0x00020 / 4]); if (cpu_get_pc(space->cpu) == 0x1cc) cpu_spinuntil_int(space->cpu); diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index bcad0addc05..69912df0974 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -24,7 +24,7 @@ static WRITE16_HANDLER( madmotor_sound_w ) { - madmotor_state *state = (madmotor_state *)space->machine->driver_data; + madmotor_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -214,7 +214,7 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - madmotor_state *driver_state = (madmotor_state *)device->machine->driver_data; + madmotor_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -225,7 +225,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( madmotor ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -235,7 +235,7 @@ static MACHINE_START( madmotor ) static MACHINE_RESET( madmotor ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); state->flipscreen = 0; } diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 62a8ee23863..6b36c6477ec 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -33,7 +33,7 @@ Notes: static INTERRUPT_GEN( mainevt_interrupt ) { - mainevt_state *state = (mainevt_state *)device->machine->driver_data; + mainevt_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) irq0_line_hold(device); @@ -41,13 +41,13 @@ static INTERRUPT_GEN( mainevt_interrupt ) static WRITE8_HANDLER( dv_nmienable_w ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); state->nmi_enable = data; } static INTERRUPT_GEN( dv_interrupt ) { - mainevt_state *state = (mainevt_state *)device->machine->driver_data; + mainevt_state *state = device->machine->driver_data(); if (state->nmi_enable) nmi_line_pulse(device); @@ -56,7 +56,7 @@ static INTERRUPT_GEN( dv_interrupt ) static WRITE8_HANDLER( mainevt_bankswitch_w ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); /* bit 0-1 ROM bank select */ memory_set_bank(space->machine, "bank1", data & 0x03); @@ -84,7 +84,7 @@ static WRITE8_HANDLER( mainevt_coin_w ) static WRITE8_HANDLER( mainevt_sh_irqtrigger_w ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -95,7 +95,7 @@ static READ8_DEVICE_HANDLER( mainevt_sh_busy_r ) static WRITE8_HANDLER( mainevt_sh_irqcontrol_w ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); upd7759_reset_w(state->upd, data & 2); upd7759_start_w(state->upd, data & 1); @@ -110,7 +110,7 @@ static WRITE8_HANDLER( devstor_sh_irqcontrol_w ) static WRITE8_HANDLER( mainevt_sh_bankswitch_w ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); int bank_A, bank_B; //logerror("CPU #1 PC: %04x bank switch = %02x\n",cpu_get_pc(space->cpu),data); @@ -138,7 +138,7 @@ static WRITE8_DEVICE_HANDLER( dv_sh_bankswitch_w ) static READ8_HANDLER( k052109_051960_r ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -155,7 +155,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - mainevt_state *state = (mainevt_state *)space->machine->driver_data; + mainevt_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -417,7 +417,7 @@ static const k051960_interface mainevt_k051960_intf = static MACHINE_START( mainevt ) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); @@ -434,7 +434,7 @@ static MACHINE_START( mainevt ) static MACHINE_RESET( mainevt ) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); state->nmi_enable = 0; } diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index eded005c28d..639d708da51 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -72,7 +72,7 @@ static READ8_HANDLER( fake_VRLE_r ) { - malzak_state *state = (malzak_state *)space->machine->driver_data; + malzak_state *state = space->machine->driver_data(); return (s2636_work_ram_r(state->s2636_0, 0xcb) & 0x3f) + (space->machine->primary_screen->vblank() * 0x40); } @@ -157,21 +157,21 @@ static WRITE8_HANDLER( port40_w ) static WRITE8_HANDLER( port60_w ) { - malzak_state *state = (malzak_state *)space->machine->driver_data; + malzak_state *state = space->machine->driver_data(); state->malzak_x = data; // logerror("I/O: port 0x60 write 0x%02x\n", data); } static WRITE8_HANDLER( portc0_w ) { - malzak_state *state = (malzak_state *)space->machine->driver_data; + malzak_state *state = space->machine->driver_data(); state->malzak_y = data; // logerror("I/O: port 0xc0 write 0x%02x\n", data); } static READ8_HANDLER( collision_r ) { - malzak_state *state = (malzak_state *)space->machine->driver_data; + malzak_state *state = space->machine->driver_data(); // High 4 bits seem to refer to the row affected. if(++state->collision_counter > 15) @@ -368,7 +368,7 @@ static const saa5050_interface malzac_saa5050_intf = static MACHINE_START( malzak ) { - malzak_state *state = (malzak_state *)machine->driver_data; + malzak_state *state = machine->driver_data(); memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "user2"), 0x400); @@ -383,7 +383,7 @@ static MACHINE_START( malzak ) static MACHINE_RESET( malzak ) { - malzak_state *state = (malzak_state *)machine->driver_data; + malzak_state *state = machine->driver_data(); memset(state->playfield_code, 0, 256); diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index c5ce1ffb034..ad85a981e04 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -1551,14 +1551,14 @@ static READ8_DEVICE_HANDLER( dipA_h ) { return input_port_read(device->machine, static READ8_DEVICE_HANDLER( dipB_mux ) // dips B { - mappy_state *state = (mappy_state *)device->machine->driver_data; + mappy_state *state = device->machine->driver_data(); return input_port_read(device->machine, "DSW2") >> (4 * state->mux); } static READ8_DEVICE_HANDLER( dipB_muxi ) // dips B { - mappy_state *state = (mappy_state *)device->machine->driver_data; + mappy_state *state = device->machine->driver_data(); // bits are interleaved in Phozon return BITSWAP8(input_port_read(device->machine, "DSW2"),6,4,2,0,7,5,3,1) >> (4 * state->mux); @@ -1566,7 +1566,7 @@ static READ8_DEVICE_HANDLER( dipB_muxi ) // dips B static WRITE8_DEVICE_HANDLER( out_mux ) { - mappy_state *state = (mappy_state *)device->machine->driver_data; + mappy_state *state = device->machine->driver_data(); state->mux = data & 1; } diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index ebc27c53ab3..6a452d9f84a 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -43,7 +43,7 @@ write static MACHINE_RESET( marineb ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->palette_bank = 0; state->column_scroll = 0; @@ -55,7 +55,7 @@ static MACHINE_RESET( marineb ) static MACHINE_RESET( springer ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->palette_bank = 0; state->column_scroll = 0; @@ -67,7 +67,7 @@ static MACHINE_RESET( springer ) static MACHINE_START( marineb ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = NULL; diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 3f6f1a18684..c3b41419d94 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -97,12 +97,13 @@ p2 ink doesn't always light up in test mode #include "emu.h" #include "cpu/z80/z80.h" -class marinedt_state +class marinedt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, marinedt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, marinedt_state(machine)); } - marinedt_state(running_machine &machine) { } + marinedt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * tx_tileram; @@ -122,7 +123,7 @@ public: static WRITE8_HANDLER( tx_tileram_w ) { - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); state->tx_tileram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -130,7 +131,7 @@ static WRITE8_HANDLER( tx_tileram_w ) static READ8_HANDLER( marinedt_port1_r ) { - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); //might need to be reversed for cocktail stuff @@ -146,7 +147,7 @@ static READ8_HANDLER( marinedt_coll_r ) //----x--- obj1 to playfield collision //-----xxx unused - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); return state->coll | state->collh; } @@ -160,7 +161,7 @@ static READ8_HANDLER( marinedt_obj1_x_r ) //xxxx---- unknown //----xxxx x pos in tile ram - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); UINT8 *RAM = memory_region(space->machine, "maincpu"); if (RAM[0x430e]) @@ -178,7 +179,7 @@ static READ8_HANDLER( marinedt_obj1_yr_r ) //xxxx---- unknown //----xxxx row in current screen quarter - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); //has to be +1 if cx went over? if (state->cx == 0x10) @@ -195,18 +196,18 @@ static READ8_HANDLER( marinedt_obj1_yq_r ) //----xx-- unknown //------xx screen quarter - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); return state->cyq | (state->cyqh << 4); } -static WRITE8_HANDLER( marinedt_obj1_a_w ) { marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->obj1_a = data; } -static WRITE8_HANDLER( marinedt_obj1_x_w ) { marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->obj1_x = data; } -static WRITE8_HANDLER( marinedt_obj1_y_w ) { marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->obj1_y = data; } -static WRITE8_HANDLER( marinedt_obj2_a_w ) { marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->obj2_a = data; } -static WRITE8_HANDLER( marinedt_obj2_x_w ) { marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->obj2_x = data; } -static WRITE8_HANDLER( marinedt_obj2_y_w ) { marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->obj2_y = data; } +static WRITE8_HANDLER( marinedt_obj1_a_w ) { marinedt_state *state = space->machine->driver_data(); state->obj1_a = data; } +static WRITE8_HANDLER( marinedt_obj1_x_w ) { marinedt_state *state = space->machine->driver_data(); state->obj1_x = data; } +static WRITE8_HANDLER( marinedt_obj1_y_w ) { marinedt_state *state = space->machine->driver_data(); state->obj1_y = data; } +static WRITE8_HANDLER( marinedt_obj2_a_w ) { marinedt_state *state = space->machine->driver_data(); state->obj2_a = data; } +static WRITE8_HANDLER( marinedt_obj2_x_w ) { marinedt_state *state = space->machine->driver_data(); state->obj2_x = data; } +static WRITE8_HANDLER( marinedt_obj2_y_w ) { marinedt_state *state = space->machine->driver_data(); state->obj2_y = data; } -static WRITE8_HANDLER( marinedt_music_w ){ marinedt_state *state = (marinedt_state *)space->machine->driver_data; state->music = data; } +static WRITE8_HANDLER( marinedt_music_w ){ marinedt_state *state = space->machine->driver_data(); state->music = data; } static WRITE8_HANDLER( marinedt_sound_w ) { @@ -219,7 +220,7 @@ static WRITE8_HANDLER( marinedt_sound_w ) //------x- dots hit //-------x ?? - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); state->sound = data; } @@ -233,7 +234,7 @@ static WRITE8_HANDLER( marinedt_pd_w ) //------x- obj2 enable //-------x obj1 enable - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); state->pd = data; } @@ -261,7 +262,7 @@ static WRITE8_HANDLER( marinedt_pf_w ) //------x- ?? upright/cocktail //-------x ?? service mode (coin lockout??) - marinedt_state *state = (marinedt_state *)space->machine->driver_data; + marinedt_state *state = space->machine->driver_data(); //if ((state->pf & 0x07) != (data & 0x07)) // mame_printf_debug("marinedt_pf_w: %02x\n", data & 0x07); @@ -457,7 +458,7 @@ bit0 = 0; static TILE_GET_INFO( get_tile_info ) { - marinedt_state *state = (marinedt_state *)machine->driver_data; + marinedt_state *state = machine->driver_data(); int code = state->tx_tileram[tile_index]; int color = 0; int flags = TILE_FLIPX; @@ -467,7 +468,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( marinedt ) { - marinedt_state *state = (marinedt_state *)machine->driver_data; + marinedt_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->tx_tilemap, 0); @@ -495,7 +496,7 @@ static VIDEO_START( marinedt ) static VIDEO_UPDATE( marinedt ) { - marinedt_state *state = (marinedt_state *)screen->machine->driver_data; + marinedt_state *state = screen->machine->driver_data(); int sx, sy; bitmap_fill(state->tile, NULL, 0); @@ -598,7 +599,7 @@ static VIDEO_UPDATE( marinedt ) static MACHINE_START( marinedt ) { - marinedt_state *state = (marinedt_state *)machine->driver_data; + marinedt_state *state = machine->driver_data(); state_save_register_global(machine, state->obj1_a); state_save_register_global(machine, state->obj1_x); @@ -622,7 +623,7 @@ static MACHINE_START( marinedt ) static MACHINE_RESET( marinedt ) { - marinedt_state *state = (marinedt_state *)machine->driver_data; + marinedt_state *state = machine->driver_data(); state->obj1_a = 0; state->obj1_x = 0; diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index 69e3b300100..87b712fa6fc 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -47,14 +47,14 @@ The driver has been updated accordingly. static WRITE8_HANDLER( matmania_sh_command_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, M6502_IRQ_LINE, HOLD_LINE); } static WRITE8_HANDLER( maniach_sh_command_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, HOLD_LINE); } @@ -301,7 +301,7 @@ GFXDECODE_END static MACHINE_START( matmania ) { - matmania_state *state = (matmania_state *)machine->driver_data; + matmania_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -359,7 +359,7 @@ MACHINE_DRIVER_END /* handler called by the 3526 emulator when the internal timers cause an IRQ */ static void irqhandler(running_device *device, int linestate) { - matmania_state *state = (matmania_state *)device->machine->driver_data; + matmania_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 1, linestate); } @@ -371,7 +371,7 @@ static const ym3526_interface ym3526_config = static MACHINE_START( maniach ) { - matmania_state *state = (matmania_state *)machine->driver_data; + matmania_state *state = machine->driver_data(); MACHINE_START_CALL(matmania); @@ -392,7 +392,7 @@ static MACHINE_START( maniach ) static MACHINE_RESET( maniach ) { - matmania_state *state = (matmania_state *)machine->driver_data; + matmania_state *state = machine->driver_data(); state->port_a_in = 0; state->port_a_out = 0; diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 0982d2ece71..f97fea3ba2c 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -13,12 +13,13 @@ #define MCLK 10000000 -class mayumi_state +class mayumi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mayumi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mayumi_state(machine)); } - mayumi_state(running_machine &machine) { } + mayumi_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -41,7 +42,7 @@ public: static TILE_GET_INFO( get_tile_info ) { - mayumi_state *state = (mayumi_state *)machine->driver_data; + mayumi_state *state = machine->driver_data(); int code = state->videoram[tile_index] + (state->videoram[tile_index + 0x800] & 0x1f) * 0x100; int col = (state->videoram[tile_index + 0x1000] >> 3) & 0x1f; @@ -50,20 +51,20 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( mayumi ) { - mayumi_state *state = (mayumi_state *)machine->driver_data; + mayumi_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } static WRITE8_HANDLER( mayumi_videoram_w ) { - mayumi_state *state = (mayumi_state *)space->machine->driver_data; + mayumi_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap, offset & 0x7ff); } static VIDEO_UPDATE( mayumi ) { - mayumi_state *state = (mayumi_state *)screen->machine->driver_data; + mayumi_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap, 0, 0); return 0; } @@ -76,7 +77,7 @@ static VIDEO_UPDATE( mayumi ) static INTERRUPT_GEN( mayumi_interrupt ) { - mayumi_state *state = (mayumi_state *)device->machine->driver_data; + mayumi_state *state = device->machine->driver_data(); if (state->int_enable) cpu_set_input_line(device, 0, HOLD_LINE); @@ -90,7 +91,7 @@ static INTERRUPT_GEN( mayumi_interrupt ) static WRITE8_HANDLER( bank_sel_w ) { - mayumi_state *state = (mayumi_state *)space->machine->driver_data; + mayumi_state *state = space->machine->driver_data(); int bank = BIT(data, 7) | (BIT(data, 6) << 1); memory_set_bank(space->machine, "bank1", bank); @@ -102,13 +103,13 @@ static WRITE8_HANDLER( bank_sel_w ) static WRITE8_HANDLER( input_sel_w ) { - mayumi_state *state = (mayumi_state *)space->machine->driver_data; + mayumi_state *state = space->machine->driver_data(); state->input_sel = data; } static READ8_HANDLER( key_matrix_r ) { - mayumi_state *state = (mayumi_state *)space->machine->driver_data; + mayumi_state *state = space->machine->driver_data(); int p, i, ret; static const char *const keynames[2][5] = { @@ -349,7 +350,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( mayumi ) { - mayumi_state *state = (mayumi_state *)machine->driver_data; + mayumi_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -361,7 +362,7 @@ static MACHINE_START( mayumi ) static MACHINE_RESET( mayumi ) { - mayumi_state *state = (mayumi_state *)machine->driver_data; + mayumi_state *state = machine->driver_data(); state->int_enable = 0; state->input_sel = 0; diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index a5098387817..92db87040c0 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -48,12 +48,13 @@ TO DO: #define SOUND_CLOCK XTAL_14_31818MHz -class mazerbla_state +class mazerbla_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mazerbla_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mazerbla_state(machine)); } - mazerbla_state(running_machine &machine) { } + mazerbla_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * cfb_ram; @@ -116,7 +117,7 @@ public: static PALETTE_INIT( mazerbla ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); static const int resistances_r[2] = { 4700, 2200 }; static const int resistances_gb[3] = { 10000, 4700, 2200 }; @@ -130,7 +131,7 @@ static PALETTE_INIT( mazerbla ) static VIDEO_START( mazerbla ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); state->tmpbitmaps[0] = machine->primary_screen->alloc_compatible_bitmap(); state->tmpbitmaps[1] = machine->primary_screen->alloc_compatible_bitmap(); state->tmpbitmaps[2] = machine->primary_screen->alloc_compatible_bitmap(); @@ -153,7 +154,7 @@ static int planes_enabled[4] = {1,1,1,1}; //all enabled VIDEO_UPDATE( test_vcu ) { - mazerbla_state *state = (mazerbla_state *)screen->machine->driver_data; + mazerbla_state *state = screen->machine->driver_data(); char buf[128]; UINT32 color_base = 0; @@ -251,7 +252,7 @@ VIDEO_UPDATE( test_vcu ) static VIDEO_UPDATE( mazerbla ) { - mazerbla_state *state = (mazerbla_state *)screen->machine->driver_data; + mazerbla_state *state = screen->machine->driver_data(); UINT32 color_base = 0; if (state->game_id == MAZERBLA) @@ -272,7 +273,7 @@ static VIDEO_UPDATE( mazerbla ) static WRITE8_HANDLER( cfb_backgnd_color_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); if (state->bknd_col != data) { @@ -305,7 +306,7 @@ static WRITE8_HANDLER( cfb_backgnd_color_w ) static WRITE8_HANDLER( cfb_vbank_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); /* only bit 6 connected */ state->vbank = BIT(data, 6); @@ -314,7 +315,7 @@ static WRITE8_HANDLER( cfb_vbank_w ) static WRITE8_HANDLER( cfb_rom_bank_sel_w ) /* mazer blazer */ { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->gfx_rom_bank = data; memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000); @@ -322,7 +323,7 @@ static WRITE8_HANDLER( cfb_rom_bank_sel_w ) /* mazer blazer */ static WRITE8_HANDLER( cfb_rom_bank_sel_w_gg ) /* great guns */ { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->gfx_rom_bank = data >> 1; memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000); @@ -332,7 +333,7 @@ static WRITE8_HANDLER( cfb_rom_bank_sel_w_gg ) /* great guns */ /* VCU status? */ static READ8_HANDLER( cfb_port_02_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->port02_status ^= 0xff; return state->port02_status; } @@ -340,7 +341,7 @@ static READ8_HANDLER( cfb_port_02_r ) static WRITE8_HANDLER( vcu_video_reg_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); if (state->vcu_video_reg[offset] != data) { state->vcu_video_reg[offset] = data; @@ -351,7 +352,7 @@ static WRITE8_HANDLER( vcu_video_reg_w ) static READ8_HANDLER( vcu_set_cmd_param_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->vcu_gfx_param_addr = offset; /* offset = 0 is not known */ @@ -371,7 +372,7 @@ static READ8_HANDLER( vcu_set_cmd_param_r ) static READ8_HANDLER( vcu_set_gfx_addr_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); UINT8 * rom = memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000; int offs; int x, y; @@ -518,7 +519,7 @@ static READ8_HANDLER( vcu_set_gfx_addr_r ) static READ8_HANDLER( vcu_set_clr_addr_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); UINT8 * rom = memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000; int offs; int x, y; @@ -718,7 +719,7 @@ static READ8_HANDLER( vcu_set_clr_addr_r ) static WRITE8_HANDLER( cfb_zpu_int_req_set_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->zpu_int_vector &= ~2; /* clear D1 on INTA (interrupt acknowledge) */ @@ -727,7 +728,7 @@ static WRITE8_HANDLER( cfb_zpu_int_req_set_w ) static READ8_HANDLER( cfb_zpu_int_req_clr ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->zpu_int_vector |= 2; @@ -740,7 +741,7 @@ static READ8_HANDLER( cfb_zpu_int_req_clr ) static READ8_HANDLER( ls670_0_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); @@ -750,7 +751,7 @@ static READ8_HANDLER( ls670_0_r ) static TIMER_CALLBACK( deferred_ls670_0_w ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); int offset = (param >> 8) & 255; int data = param & 255; @@ -765,7 +766,7 @@ static WRITE8_HANDLER( ls670_0_w ) static READ8_HANDLER( ls670_1_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); @@ -775,7 +776,7 @@ static READ8_HANDLER( ls670_1_r ) static TIMER_CALLBACK( deferred_ls670_1_w ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); int offset = (param >> 8) & 255; int data = param & 255; @@ -843,7 +844,7 @@ Vertical movement of gun is Strobe 9, Bits 0-7. static WRITE8_HANDLER( zpu_bcd_decoder_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); /* bcd decoder used a input select (a mux) for reads from port 0x62 */ state->bcd_7445 = data & 0xf; @@ -851,7 +852,7 @@ static WRITE8_HANDLER( zpu_bcd_decoder_w ) static READ8_HANDLER( zpu_inputs_r ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); static const char *const strobenames[] = { "ZPU", "DSW0", "DSW1", "DSW2", "DSW3", "BUTTONS", "STICK0_X", "STICK0_Y", "STICK1_X", "STICK1_Y", "UNUSED", "UNUSED", "UNUSED", "UNUSED", "UNUSED", "UNUSED" }; @@ -905,7 +906,7 @@ static WRITE8_DEVICE_HANDLER( gg_led_ctrl_w ) static WRITE8_HANDLER( vsb_ls273_audio_control_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); state->vsb_ls273 = data; /* bit 5 - led on */ @@ -914,13 +915,13 @@ static WRITE8_HANDLER( vsb_ls273_audio_control_w ) static READ8_DEVICE_HANDLER( soundcommand_r ) { - mazerbla_state *state = (mazerbla_state *)device->machine->driver_data; + mazerbla_state *state = device->machine->driver_data(); return state->soundlatch; } static TIMER_CALLBACK( delayed_sound_w ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); state->soundlatch = param; /* cause NMI on sound CPU */ @@ -934,13 +935,13 @@ static WRITE8_HANDLER( main_sound_w ) static WRITE8_HANDLER( sound_int_clear_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, 0, CLEAR_LINE); } static WRITE8_HANDLER( sound_nmi_clear_w ) { - mazerbla_state *state = (mazerbla_state *)space->machine->driver_data; + mazerbla_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_NMI, CLEAR_LINE); } @@ -1382,7 +1383,7 @@ static IRQ_CALLBACK(irq_callback) note: 1111 11110 (0xfe) - cannot happen and is not handled by game */ - mazerbla_state *state = (mazerbla_state *)device->machine->driver_data; + mazerbla_state *state = device->machine->driver_data(); return (state->zpu_int_vector & ~1); /* D0->GND is performed on CFB board */ } @@ -1401,7 +1402,7 @@ static INTERRUPT_GEN( sound_interrupt ) static MACHINE_START( mazerbla ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -1437,7 +1438,7 @@ static MACHINE_START( mazerbla ) static MACHINE_RESET( mazerbla ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); int i; state->zpu_int_vector = 0xff; @@ -1685,13 +1686,13 @@ ROM_END static DRIVER_INIT( mazerbla ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); state->game_id = MAZERBLA; } static DRIVER_INIT( greatgun ) { - mazerbla_state *state = (mazerbla_state *)machine->driver_data; + mazerbla_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "sub2"); state->game_id = GREATGUN; diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 412ab5ae1aa..b7404916382 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -146,7 +146,7 @@ Stephh's notes (based on the games M68000 code and some tests) : static WRITE16_HANDLER( mcat_soundlatch_w ) { - mcatadv_state *state = (mcatadv_state *)space->machine->driver_data; + mcatadv_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, PULSE_LINE); @@ -416,7 +416,7 @@ GFXDECODE_END /* Stolen from Psikyo.c */ static void sound_irq( running_device *device, int irq ) { - mcatadv_state *state = (mcatadv_state *)device->machine->driver_data; + mcatadv_state *state = device->machine->driver_data(); cpu_set_input_line(state->soundcpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -428,7 +428,7 @@ static const ym2610_interface mcatadv_ym2610_interface = static MACHINE_START( mcatadv ) { - mcatadv_state *state = (mcatadv_state *)machine->driver_data; + mcatadv_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "soundcpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 18f2fcc102f..8821d5638d5 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -86,12 +86,13 @@ struct _speedup_entry UINT32 pc; }; -class mediagx_state +class mediagx_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mediagx_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mediagx_state(machine)); } - mediagx_state(running_machine &machine) { } + mediagx_state(running_machine &machine) + : driver_data_t(machine) { } UINT32 *cga_ram; UINT32 *bios_ram; @@ -229,7 +230,7 @@ static void draw_char(bitmap_t *bitmap, const rectangle *cliprect, const gfx_ele static void draw_framebuffer(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); int i, j; int width, height; int line_delta = (state->disp_ctrl_reg[DC_LINE_DELTA] & 0x3ff) * 4; @@ -322,7 +323,7 @@ static void draw_framebuffer(running_machine *machine, bitmap_t *bitmap, const r static void draw_cga(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); int i, j; const gfx_element *gfx = machine->gfx[0]; UINT32 *cga = state->cga_ram; @@ -346,7 +347,7 @@ static void draw_cga(running_machine *machine, bitmap_t *bitmap, const rectangle static VIDEO_UPDATE(mediagx) { - mediagx_state *state = (mediagx_state *)screen->machine->driver_data; + mediagx_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0); draw_framebuffer(screen->machine, bitmap, cliprect); @@ -360,7 +361,7 @@ static VIDEO_UPDATE(mediagx) static READ32_HANDLER( disp_ctrl_r ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); UINT32 r = state->disp_ctrl_reg[offset]; switch (offset) @@ -383,7 +384,7 @@ static READ32_HANDLER( disp_ctrl_r ) static WRITE32_HANDLER( disp_ctrl_w ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); COMBINE_DATA(state->disp_ctrl_reg + offset); } @@ -424,14 +425,14 @@ static WRITE32_DEVICE_HANDLER( fdc_w ) static READ32_HANDLER( memory_ctrl_r ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); return state->memory_ctrl_reg[offset]; } static WRITE32_HANDLER( memory_ctrl_w ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); //mame_printf_debug("memory_ctrl_w %08X, %08X, %08X\n", data, offset, mem_mask); if (offset == 7) @@ -457,7 +458,7 @@ static WRITE32_HANDLER( memory_ctrl_w ) static READ32_HANDLER( biu_ctrl_r ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); if (offset == 0) { @@ -468,7 +469,7 @@ static READ32_HANDLER( biu_ctrl_r ) static WRITE32_HANDLER( biu_ctrl_w ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); //mame_printf_debug("biu_ctrl_w %08X, %08X, %08X\n", data, offset, mem_mask); COMBINE_DATA(state->biu_ctrl_reg + offset); @@ -488,7 +489,7 @@ static WRITE32_HANDLER(bios_ram_w) static UINT8 mediagx_config_reg_r(running_device *device) { - mediagx_state *state = (mediagx_state *)device->machine->driver_data; + mediagx_state *state = device->machine->driver_data(); //mame_printf_debug("mediagx_config_reg_r %02X\n", mediagx_config_reg_sel); return state->mediagx_config_regs[state->mediagx_config_reg_sel]; @@ -496,7 +497,7 @@ static UINT8 mediagx_config_reg_r(running_device *device) static void mediagx_config_reg_w(running_device *device, UINT8 data) { - mediagx_state *state = (mediagx_state *)device->machine->driver_data; + mediagx_state *state = device->machine->driver_data(); //mame_printf_debug("mediagx_config_reg_w %02X, %02X\n", mediagx_config_reg_sel, data); state->mediagx_config_regs[state->mediagx_config_reg_sel] = data; @@ -523,7 +524,7 @@ static READ8_DEVICE_HANDLER( io20_r ) static WRITE8_DEVICE_HANDLER( io20_w ) { - mediagx_state *state = (mediagx_state *)device->machine->driver_data; + mediagx_state *state = device->machine->driver_data(); // 0x22, 0x23, Cyrix configuration registers if (offset == 0x02) @@ -542,7 +543,7 @@ static WRITE8_DEVICE_HANDLER( io20_w ) static READ32_HANDLER( parallel_port_r ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); UINT32 r = 0; //static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3", "IN4", "IN5", "IN6", "IN7", "IN8" }; // but parallel_pointer takes values 0 -> 23 @@ -578,7 +579,7 @@ static READ32_HANDLER( parallel_port_r ) static WRITE32_HANDLER( parallel_port_w ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); static const char *const portnames[] = { "IN0", "IN1", "IN2", "IN3", "IN4", "IN5", "IN6", "IN7", "IN8" }; // but parallel_pointer takes values 0 -> 23 COMBINE_DATA( &state->parport ); @@ -662,7 +663,7 @@ static WRITE32_HANDLER( parallel_port_w ) static UINT32 cx5510_pci_r(running_device *busdevice, running_device *device, int function, int reg, UINT32 mem_mask) { - mediagx_state *state = (mediagx_state *)busdevice->machine->driver_data; + mediagx_state *state = busdevice->machine->driver_data(); //mame_printf_debug("CX5510: PCI read %d, %02X, %08X\n", function, reg, mem_mask); switch (reg) @@ -675,7 +676,7 @@ static UINT32 cx5510_pci_r(running_device *busdevice, running_device *device, in static void cx5510_pci_w(running_device *busdevice, running_device *device, int function, int reg, UINT32 data, UINT32 mem_mask) { - mediagx_state *state = (mediagx_state *)busdevice->machine->driver_data; + mediagx_state *state = busdevice->machine->driver_data(); //mame_printf_debug("CX5510: PCI write %d, %02X, %08X, %08X\n", function, reg, data, mem_mask); COMBINE_DATA(state->cx5510_regs + (reg/4)); @@ -685,7 +686,7 @@ static void cx5510_pci_w(running_device *busdevice, running_device *device, int static TIMER_DEVICE_CALLBACK( sound_timer_callback ) { - mediagx_state *state = (mediagx_state *)timer.machine->driver_data; + mediagx_state *state = timer.machine->driver_data(); state->ad1847_sample_counter = 0; timer.adjust(ATTOTIME_IN_MSEC(10)); @@ -699,7 +700,7 @@ static TIMER_DEVICE_CALLBACK( sound_timer_callback ) static void ad1847_reg_write(running_machine *machine, int reg, UINT8 data) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); static const int divide_factor[] = { 3072, 1536, 896, 768, 448, 384, 512, 2560 }; switch (reg) @@ -738,7 +739,7 @@ static void ad1847_reg_write(running_machine *machine, int reg, UINT8 data) static READ32_HANDLER( ad1847_r ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); switch (offset) { @@ -750,7 +751,7 @@ static READ32_HANDLER( ad1847_r ) static WRITE32_HANDLER( ad1847_w ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); if (offset == 0) { @@ -784,7 +785,7 @@ static WRITE32_HANDLER( ad1847_w ) static READ8_HANDLER(at_page8_r) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); UINT8 data = state->at_pages[offset % 0x10]; switch(offset % 8) @@ -808,7 +809,7 @@ static READ8_HANDLER(at_page8_r) static WRITE8_HANDLER(at_page8_w) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); state->at_pages[offset % 0x10] = data; @@ -841,7 +842,7 @@ static WRITE_LINE_DEVICE_HANDLER( pc_dma_hrq_changed ) static READ8_HANDLER( pc_dma_read_byte ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); offs_t page_offset = (((offs_t) state->dma_offset[0][state->dma_channel]) << 16) & 0xFF0000; @@ -851,7 +852,7 @@ static READ8_HANDLER( pc_dma_read_byte ) static WRITE8_HANDLER( pc_dma_write_byte ) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); offs_t page_offset = (((offs_t) state->dma_offset[0][state->dma_channel]) << 16) & 0xFF0000; @@ -860,7 +861,7 @@ static WRITE8_HANDLER( pc_dma_write_byte ) static void set_dma_channel(running_device *device, int channel, int _state) { - mediagx_state *state = (mediagx_state *)device->machine->driver_data; + mediagx_state *state = device->machine->driver_data(); if (!_state) state->dma_channel = channel; } @@ -1007,7 +1008,7 @@ INPUT_PORTS_END static IRQ_CALLBACK(irq_callback) { - mediagx_state *state = (mediagx_state *)device->machine->driver_data; + mediagx_state *state = device->machine->driver_data(); int r; r = pic8259_acknowledge( state->pic8259_2); @@ -1020,7 +1021,7 @@ static IRQ_CALLBACK(irq_callback) static MACHINE_START(mediagx) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); state->pit8254 = machine->device( "pit8254" ); state->pic8259_1 = machine->device( "pic8259_master" ); @@ -1034,7 +1035,7 @@ static MACHINE_START(mediagx) static MACHINE_RESET(mediagx) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "bios"); cpu_set_irq_callback(machine->device("maincpu"), irq_callback); @@ -1160,21 +1161,21 @@ static void set_gate_a20(running_machine *machine, int a20) static void keyboard_interrupt(running_machine *machine, int _state) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); pic8259_ir1_w(state->pic8259_1, _state); } static void ide_interrupt(running_device *device, int _state) { - mediagx_state *state = (mediagx_state *)device->machine->driver_data; + mediagx_state *state = device->machine->driver_data(); pic8259_ir6_w(state->pic8259_2, _state); } static int mediagx_get_out2(running_machine *machine) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); return pit8253_get_output( state->pit8254, 2 ); } @@ -1186,14 +1187,14 @@ static const struct kbdc8042_interface at8042 = static void mediagx_set_keyb_int(running_machine *machine, int _state) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); pic8259_ir1_w(state->pic8259_1, _state); } static void init_mediagx(running_machine *machine) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); state->frame_width = state->frame_height = 1; @@ -1207,7 +1208,7 @@ static void init_mediagx(running_machine *machine) INLINE UINT32 generic_speedup(const address_space *space, int idx) { - mediagx_state *state = (mediagx_state *)space->machine->driver_data; + mediagx_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == state->speedup_table[idx].pc) { @@ -1240,7 +1241,7 @@ static const read32_space_func speedup_handlers[] = #ifdef MAME_DEBUG static void report_speedups(running_machine &machine) { - mediagx_state *state = (mediagx_state *)machine.driver_data; + mediagx_state *state = machine.driver_data(); int i; for (i = 0; i < state->speedup_count; i++) @@ -1250,7 +1251,7 @@ static void report_speedups(running_machine &machine) static void install_speedups(running_machine *machine, const speedup_entry *entries, int count) { - mediagx_state *state = (mediagx_state *)machine->driver_data; + mediagx_state *state = machine->driver_data(); int i; assert(count < ARRAY_LENGTH(speedup_handlers)); diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 5be425ea2a8..af982d49ba9 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -20,7 +20,7 @@ To enter service mode, keep 1&2 pressed on reset static READ8_DEVICE_HANDLER( megazone_port_a_r ) { - megazone_state *state = (megazone_state *)device->machine->driver_data; + megazone_state *state = device->machine->driver_data(); int clock, timer; @@ -58,13 +58,13 @@ static WRITE8_DEVICE_HANDLER( megazone_port_b_w ) static WRITE8_HANDLER( megazone_i8039_irq_w ) { - megazone_state *state = (megazone_state *)space->machine->driver_data; + megazone_state *state = space->machine->driver_data(); cpu_set_input_line(state->daccpu, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_and_status_w ) { - megazone_state *state = (megazone_state *)space->machine->driver_data; + megazone_state *state = space->machine->driver_data(); if ((data & 0x80) == 0) cpu_set_input_line(state->daccpu, 0, CLEAR_LINE); @@ -226,7 +226,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( megazone ) { - megazone_state *state = (megazone_state *)machine->driver_data; + megazone_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -238,7 +238,7 @@ static MACHINE_START( megazone ) static MACHINE_RESET( megazone ) { - megazone_state *state = (megazone_state *)machine->driver_data; + megazone_state *state = machine->driver_data(); state->flipscreen = 0; state->i8039_status = 0; diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index a518c3243d7..5815ad382cb 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -65,12 +65,13 @@ SOFT PSG & VOICE BY M.C & S.H #include "video/resnet.h" #include "sound/ay8910.h" -class meijinsn_state +class meijinsn_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, meijinsn_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, meijinsn_state(machine)); } - meijinsn_state(running_machine &machine) { } + meijinsn_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * shared_ram; @@ -96,7 +97,7 @@ static WRITE16_HANDLER( sound_w ) static READ16_HANDLER( alpha_mcu_r ) { - meijinsn_state *state = (meijinsn_state *)space->machine->driver_data; + meijinsn_state *state = space->machine->driver_data(); static const UINT8 coinage1[2][2] = {{1,1}, {1,2}}; static const UINT8 coinage2[2][2] = {{1,5}, {2,1}}; @@ -280,7 +281,7 @@ static PALETTE_INIT( meijinsn ) static VIDEO_UPDATE(meijinsn) { - meijinsn_state *state = (meijinsn_state *)screen->machine->driver_data; + meijinsn_state *state = screen->machine->driver_data(); int offs; for (offs = 0; offs < 0x4000; offs++) @@ -321,7 +322,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( meijinsn ) { - meijinsn_state *state = (meijinsn_state *)machine->driver_data; + meijinsn_state *state = machine->driver_data(); state_save_register_global(machine, state->deposits1); state_save_register_global(machine, state->deposits2); @@ -330,7 +331,7 @@ static MACHINE_START( meijinsn ) static MACHINE_RESET( meijinsn ) { - meijinsn_state *state = (meijinsn_state *)machine->driver_data; + meijinsn_state *state = machine->driver_data(); state->deposits1 = 0; state->deposits2 = 0; diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index 5a56d3371d3..509f6af78b1 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -122,14 +122,14 @@ Stephh's notes (based on the games Z80 code and some tests) : static WRITE8_HANDLER( mermaid_ay8910_write_port_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); if (state->ay8910_enable[0]) ay8910_data_w(state->ay1, offset, data); if (state->ay8910_enable[1]) ay8910_data_w(state->ay2, offset, data); } static WRITE8_HANDLER( mermaid_ay8910_control_port_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); if (state->ay8910_enable[0]) ay8910_address_w(state->ay1, offset, data); if (state->ay8910_enable[1]) ay8910_address_w(state->ay2, offset, data); } @@ -328,7 +328,7 @@ GFXDECODE_END static MACHINE_START( mermaid ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->ay1 = machine->device("ay1"); @@ -345,7 +345,7 @@ static MACHINE_START( mermaid ) static MACHINE_RESET( mermaid ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); state->coll_bit0 = 0; state->coll_bit1 = 0; diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c index 5bc76089b86..b6dd68fa4c4 100644 --- a/src/mame/drivers/metalmx.c +++ b/src/mame/drivers/metalmx.c @@ -285,7 +285,7 @@ static VIDEO_START( metalmx ) static VIDEO_UPDATE( metalmx ) { /* TODO: TMS34020 should take care of this */ - metalmx_state *state = (metalmx_state *)screen->machine->driver_data; + metalmx_state *state = screen->machine->driver_data(); // UINT32 *src_base = &gsp_vram[(vreg_base[0x40/4] & 0x40) ? 0x20000 : 0]; UINT16 *src_base = state->gsp_vram; @@ -333,7 +333,7 @@ static WRITE32_HANDLER( motor_w ) static WRITE32_HANDLER( reset_w ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); if (ACCESSING_BITS_16_31) { @@ -382,7 +382,7 @@ static void cage_irq_callback(running_machine *machine, int reason) static WRITE32_HANDLER( dsp32c_1_w ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); offset <<= 1; @@ -396,7 +396,7 @@ static WRITE32_HANDLER( dsp32c_1_w ) static READ32_HANDLER( dsp32c_1_r ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); UINT32 data; offset <<= 1; @@ -414,7 +414,7 @@ static READ32_HANDLER( dsp32c_1_r ) static WRITE32_HANDLER( dsp32c_2_w ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); offset <<= 1; @@ -428,7 +428,7 @@ static WRITE32_HANDLER( dsp32c_2_w ) static READ32_HANDLER( dsp32c_2_r ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); UINT32 data; offset <<= 1; @@ -472,14 +472,14 @@ static READ32_HANDLER( host_gsp_r ) static READ32_HANDLER( host_dram_r ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); return (state->gsp_dram[offset * 2] << 16) | state->gsp_dram[offset * 2 + 1]; } static WRITE32_HANDLER( host_dram_w ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); COMBINE_DATA(state->gsp_dram + offset * 2 + 1); data >>= 16; @@ -489,14 +489,14 @@ static WRITE32_HANDLER( host_dram_w ) static READ32_HANDLER( host_vram_r ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); return (state->gsp_vram[offset * 2] << 16) | state->gsp_vram[offset * 2 + 1]; } static WRITE32_HANDLER( host_vram_w ) { - metalmx_state *state = (metalmx_state *)space->machine->driver_data; + metalmx_state *state = space->machine->driver_data(); COMBINE_DATA(state->gsp_vram + offset * 2 + 1); data >>= 16; @@ -785,7 +785,7 @@ MACHINE_DRIVER_END static DRIVER_INIT( metalmx ) { UINT8 *adsp_boot = (UINT8*)memory_region(machine, "adsp"); - metalmx_state *state = (metalmx_state *)machine->driver_data; + metalmx_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->adsp = machine->device("adsp"); @@ -801,7 +801,7 @@ static DRIVER_INIT( metalmx ) static MACHINE_RESET( metalmx ) { - metalmx_state *state = (metalmx_state *)machine->driver_data; + metalmx_state *state = machine->driver_data(); cpu_set_input_line(state->dsp32c_1, INPUT_LINE_RESET, ASSERT_LINE); cpu_set_input_line(state->dsp32c_2, INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 1c4c01fa0de..ab731528448 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -47,13 +47,13 @@ metlclsh: static WRITE8_HANDLER( metlclsh_cause_irq ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, M6809_IRQ_LINE, ASSERT_LINE); } static WRITE8_HANDLER( metlclsh_ack_nmi ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, CLEAR_LINE); } @@ -86,19 +86,19 @@ ADDRESS_MAP_END static WRITE8_HANDLER( metlclsh_cause_nmi2 ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( metlclsh_ack_irq2 ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, M6809_IRQ_LINE, CLEAR_LINE); } static WRITE8_HANDLER( metlclsh_ack_nmi2 ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_NMI, CLEAR_LINE); } @@ -255,7 +255,7 @@ GFXDECODE_END static void metlclsh_irqhandler(running_device *device, int linestate) { - metlclsh_state *state = (metlclsh_state *)device->machine->driver_data; + metlclsh_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, linestate); } @@ -275,7 +275,7 @@ static INTERRUPT_GEN( metlclsh_interrupt2 ) static MACHINE_START( metlclsh ) { - metlclsh_state *state = (metlclsh_state *)machine->driver_data; + metlclsh_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -286,7 +286,7 @@ static MACHINE_START( metlclsh ) static MACHINE_RESET( metlclsh ) { - metlclsh_state *state = (metlclsh_state *)machine->driver_data; + metlclsh_state *state = machine->driver_data(); flip_screen_set(machine, 0); diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 6378d97776a..1b795d2c310 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -112,7 +112,7 @@ driver modified by Eisuke Watanabe static READ16_HANDLER( metro_irq_cause_r ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); return state->requested_int[0] * 0x01 + // vblank state->requested_int[1] * 0x02 + @@ -128,7 +128,7 @@ static READ16_HANDLER( metro_irq_cause_r ) /* Update the IRQ state based on all possible causes */ static void update_irq_state( running_machine *machine ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); /* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */ @@ -161,7 +161,7 @@ static void update_irq_state( running_machine *machine ) /* For games that supply an *IRQ Vector* on the data bus */ static IRQ_CALLBACK( metro_irq_callback ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); // logerror("%s: irq callback returns %04X\n", cpuexec_describe_context(device->machine), state->irq_vectors[int_level]); return state->irq_vectors[irqline] & 0xff; @@ -170,7 +170,7 @@ static IRQ_CALLBACK( metro_irq_callback ) static WRITE16_HANDLER( metro_irq_cause_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); //if (data & ~0x15) logerror("CPU #0 PC %06X : unknown bits of irqcause written: %04X\n", cpu_get_pc(space->cpu), data); @@ -194,7 +194,7 @@ static WRITE16_HANDLER( metro_irq_cause_w ) static INTERRUPT_GEN( metro_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -213,7 +213,7 @@ static INTERRUPT_GEN( metro_interrupt ) /* Lev 1. Lev 2 seems sound related */ static INTERRUPT_GEN( bangball_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); state->requested_int[0] = 1; // set scroll regs if a flag is set state->requested_int[4] = 1; // clear that flag @@ -222,7 +222,7 @@ static INTERRUPT_GEN( bangball_interrupt ) static INTERRUPT_GEN( msgogo_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -241,14 +241,14 @@ static INTERRUPT_GEN( msgogo_interrupt ) static TIMER_CALLBACK( vblank_end_callback ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->requested_int[5] = param; } /* lev 2-7 (lev 1 seems sound related) */ static INTERRUPT_GEN( karatour_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -270,7 +270,7 @@ static INTERRUPT_GEN( karatour_interrupt ) static TIMER_CALLBACK( mouja_irq_callback ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->requested_int[0] = 1; update_irq_state(machine); @@ -278,7 +278,7 @@ static TIMER_CALLBACK( mouja_irq_callback ) static WRITE16_HANDLER( mouja_irq_timer_ctrl_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); double freq = 58.0 + (0xff - (data & 0xff)) / 2.2; /* 0xff=58Hz, 0x80=116Hz? */ timer_adjust_periodic(state->mouja_irq_timer, attotime_zero, 0, ATTOTIME_IN_HZ(freq)); @@ -286,7 +286,7 @@ static WRITE16_HANDLER( mouja_irq_timer_ctrl_w ) static INTERRUPT_GEN( mouja_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); state->requested_int[1] = 1; update_irq_state(device->machine); @@ -295,7 +295,7 @@ static INTERRUPT_GEN( mouja_interrupt ) static INTERRUPT_GEN( gakusai_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -308,7 +308,7 @@ static INTERRUPT_GEN( gakusai_interrupt ) static INTERRUPT_GEN( dokyusei_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -325,7 +325,7 @@ static INTERRUPT_GEN( dokyusei_interrupt ) static void ymf278b_interrupt( running_device *device, int active ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, 2, active); } @@ -339,7 +339,7 @@ static void ymf278b_interrupt( running_device *device, int active ) static int metro_io_callback( running_device *device, int ioline, int state ) { - metro_state *driver_state = (metro_state *)device->machine->driver_data; + metro_state *driver_state = device->machine->driver_data(); const address_space *space = cpu_get_address_space(driver_state->maincpu, ADDRESS_SPACE_PROGRAM); UINT8 data = 0; @@ -359,7 +359,7 @@ static int metro_io_callback( running_device *device, int ioline, int state ) static WRITE16_HANDLER( metro_soundlatch_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -373,19 +373,19 @@ static WRITE16_HANDLER( metro_soundlatch_w ) static READ16_HANDLER( metro_soundstatus_r ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); return (state->busy_sndcpu ? 0x00 : 0x01); } static CUSTOM_INPUT( custom_soundstatus_r ) { - metro_state *state = (metro_state *)field->port->machine->driver_data; + metro_state *state = field->port->machine->driver_data(); return (state->busy_sndcpu ? 0x01 : 0x00); } static WRITE16_HANDLER( metro_soundstatus_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->soundstatus = data & 0x01; @@ -417,13 +417,13 @@ static WRITE8_HANDLER( daitorid_sound_rombank_w ) static READ8_HANDLER( metro_porta_r ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); return state->porta; } static WRITE8_HANDLER( metro_porta_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); state->porta = data; } @@ -440,7 +440,7 @@ static WRITE8_HANDLER( metro_portb_w ) 0 */ - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); if (BIT(state->portb, 7) && !BIT(data, 7)) /* clock 1->0 */ { @@ -482,7 +482,7 @@ static WRITE8_HANDLER( daitorid_portb_w ) 1 select YM2151 register or data port 0 */ - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); if (BIT(state->portb, 7) && !BIT(data, 7)) /* clock 1->0 */ { @@ -528,7 +528,7 @@ static WRITE8_HANDLER( daitorid_portb_w ) static void metro_sound_irq_handler( running_device *device, int state ) { - metro_state *driver_state = (metro_state *)device->machine->driver_data; + metro_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, UPD7810_INTF2, state ? ASSERT_LINE : CLEAR_LINE); } @@ -592,7 +592,7 @@ static WRITE16_HANDLER( metro_coin_lockout_4words_w ) static READ16_HANDLER( metro_bankedrom_r ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); UINT8 *ROM = memory_region(space->machine, "gfx1"); size_t len = memory_region_length(space->machine, "gfx1"); @@ -655,7 +655,7 @@ static READ16_HANDLER( metro_bankedrom_r ) static TIMER_CALLBACK( metro_blit_done ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->requested_int[state->blitter_bit] = 1; update_irq_state(machine); } @@ -679,7 +679,7 @@ INLINE void blt_write( const address_space *space, const int tmap, const offs_t static WRITE16_HANDLER( metro_blitter_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_regs[offset]); if (offset == 0x0c / 2) @@ -1120,7 +1120,7 @@ ADDRESS_MAP_END #define KARATOUR_VRAM( _n_ ) \ static READ16_HANDLER( karatour_vram_##_n_##_r ) \ { \ - metro_state *state = (metro_state *)space->machine->driver_data; \ + metro_state *state = space->machine->driver_data(); \ return state->vram_##_n_[KARATOUR_OFFS(offset)]; \ } \ static WRITE16_HANDLER( karatour_vram_##_n_##_w ) \ @@ -1272,14 +1272,14 @@ ADDRESS_MAP_END static void gakusai_oki_bank_set(running_device *device) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); int bank = (state->gakusai_oki_bank_lo & 7) + (state->gakusai_oki_bank_hi & 1) * 8; downcast(device)->set_bank_base(bank * 0x40000); } static WRITE16_DEVICE_HANDLER( gakusai_oki_bank_hi_w ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1290,7 +1290,7 @@ static WRITE16_DEVICE_HANDLER( gakusai_oki_bank_hi_w ) static WRITE16_DEVICE_HANDLER( gakusai_oki_bank_lo_w ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1302,7 +1302,7 @@ static WRITE16_DEVICE_HANDLER( gakusai_oki_bank_lo_w ) static READ16_HANDLER( gakusai_input_r ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); UINT16 input_sel = (*state->input_sel) ^ 0x3e; // Bit 0 ?? if (input_sel & 0x0002) return input_port_read(space->machine, "KEY0"); @@ -1691,7 +1691,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( blzntrnd_sound_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data >> 8); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -1708,7 +1708,7 @@ static WRITE8_HANDLER( blzntrnd_sh_bankswitch_w ) static void blzntrnd_irqhandler(running_device *device, int irq) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -1769,7 +1769,7 @@ ADDRESS_MAP_END static WRITE16_DEVICE_HANDLER( mouja_sound_rombank_w ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); if (ACCESSING_BITS_0_7) state->oki->set_bank_base(((data >> 3) & 0x07) * 0x40000); @@ -1817,7 +1817,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( puzzlet_irq_enable_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) *state->irq_enable = data ^ 0xffff; @@ -1827,7 +1827,7 @@ static WRITE16_HANDLER( puzzlet_irq_enable_w ) static WRITE16_HANDLER( vram_0_clr_w ) { static int i; - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); // printf("0 %04x %04x\n",offset,data); for(i=0;i<0x20/2;i++) @@ -1837,7 +1837,7 @@ static WRITE16_HANDLER( vram_0_clr_w ) static WRITE16_HANDLER( vram_1_clr_w ) { static int i; - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); // printf("0 %04x %04x\n",offset,data); for(i=0;i<0x20/2;i++) @@ -1847,7 +1847,7 @@ static WRITE16_HANDLER( vram_1_clr_w ) static WRITE16_HANDLER( vram_2_clr_w ) { static int i; - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); // printf("0 %04x %04x\n",offset,data); for(i=0;i<0x20/2;i++) @@ -3577,7 +3577,7 @@ GFXDECODE_END static MACHINE_START( metro ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state_save_register_global(machine, state->blitter_bit); state_save_register_global(machine, state->irq_line); @@ -3596,7 +3596,7 @@ static MACHINE_START( metro ) static MACHINE_RESET( metro ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); if (state->irq_line == -1) cpu_set_irq_callback(machine->device("maincpu"), metro_irq_callback); @@ -4593,7 +4593,7 @@ MACHINE_DRIVER_END static INTERRUPT_GEN( puzzlet_interrupt ) { - metro_state *state = (metro_state *)device->machine->driver_data; + metro_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -6082,7 +6082,7 @@ ROM_END static void metro_common( running_machine *machine ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); memset(state->requested_int, 0, ARRAY_LENGTH(state->requested_int)); state->irq_line = 2; @@ -6094,7 +6094,7 @@ static void metro_common( running_machine *machine ) static DRIVER_INIT( metro ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); metro_common(machine); @@ -6107,7 +6107,7 @@ static DRIVER_INIT( metro ) static DRIVER_INIT( karatour ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); UINT16 *RAM = auto_alloc_array(machine, UINT16, 0x20000*3/2); int i; @@ -6127,7 +6127,7 @@ static DRIVER_INIT( karatour ) static DRIVER_INIT( daitorid ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); metro_common(machine); @@ -6142,7 +6142,7 @@ static DRIVER_INIT( daitorid ) /* Unscramble the GFX ROMs */ static DRIVER_INIT( balcube ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); const size_t len = memory_region_length(machine, "gfx1"); UINT8 *src = memory_region(machine, "gfx1"); @@ -6185,14 +6185,14 @@ static DRIVER_INIT( dharmak ) static DRIVER_INIT( blzntrnd ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); metro_common(machine); state->irq_line = 1; } static DRIVER_INIT( mouja ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); metro_common(machine); state->irq_line = -1; /* split interrupt handlers */ state->mouja_irq_timer = timer_alloc(machine, mouja_irq_callback, NULL); @@ -6200,7 +6200,7 @@ static DRIVER_INIT( mouja ) static DRIVER_INIT( gakusai ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); metro_common(machine); state->irq_line = -1; state->blitter_bit = 3; @@ -6208,7 +6208,7 @@ static DRIVER_INIT( gakusai ) static DRIVER_INIT( puzzlet ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); metro_common(machine); state->irq_line = 0; state->blitter_bit = 0; diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index 87b55b978e9..ec73db7ae29 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -421,7 +421,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( mexico86 ) { - mexico86_state *state = (mexico86_state *)machine->driver_data; + mexico86_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); @@ -449,7 +449,7 @@ static MACHINE_START( mexico86 ) static MACHINE_RESET( mexico86 ) { - mexico86_state *state = (mexico86_state *)machine->driver_data; + mexico86_state *state = machine->driver_data(); /*TODO: check the PCB and see how the halt / reset lines are connected. */ if (machine->device("sub") != NULL) diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index a14a728751f..c8f145ca74f 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -7,12 +7,13 @@ #include "emu.h" #include "cpu/m6502/m6502.h" -class mgolf_state +class mgolf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mgolf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mgolf_state(machine)); } - mgolf_state(running_machine &machine) { } + mgolf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8* video_ram; @@ -33,7 +34,7 @@ public: static TILE_GET_INFO( get_tile_info ) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); UINT8 code = state->video_ram[tile_index]; SET_TILE_INFO(0, code, code >> 7, 0); @@ -42,7 +43,7 @@ static TILE_GET_INFO( get_tile_info ) static WRITE8_HANDLER( mgolf_vram_w ) { - mgolf_state *state = (mgolf_state *)space->machine->driver_data; + mgolf_state *state = space->machine->driver_data(); state->video_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -50,14 +51,14 @@ static WRITE8_HANDLER( mgolf_vram_w ) static VIDEO_START( mgolf ) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( mgolf ) { - mgolf_state *state = (mgolf_state *)screen->machine->driver_data; + mgolf_state *state = screen->machine->driver_data(); int i; /* draw playfield */ @@ -86,7 +87,7 @@ static VIDEO_UPDATE( mgolf ) static void update_plunger( running_machine *machine ) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); UINT8 val = input_port_read(machine, "BUTTON"); if (state->prev != val) @@ -108,7 +109,7 @@ static void update_plunger( running_machine *machine ) static TIMER_CALLBACK( interrupt_callback ) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); int scanline = param; update_plunger(machine); @@ -126,14 +127,14 @@ static TIMER_CALLBACK( interrupt_callback ) static double calc_plunger_pos(running_machine *machine) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); return (attotime_to_double(timer_get_time(machine)) - attotime_to_double(state->time_released)) * (attotime_to_double(state->time_released) - attotime_to_double(state->time_pushed) + 0.2); } static READ8_HANDLER( mgolf_wram_r ) { - mgolf_state *state = (mgolf_state *)space->machine->driver_data; + mgolf_state *state = space->machine->driver_data(); return state->video_ram[0x380 + offset]; } @@ -176,7 +177,7 @@ static READ8_HANDLER( mgolf_misc_r ) static WRITE8_HANDLER( mgolf_wram_w ) { - mgolf_state *state = (mgolf_state *)space->machine->driver_data; + mgolf_state *state = space->machine->driver_data(); state->video_ram[0x380 + offset] = data; } @@ -302,7 +303,7 @@ GFXDECODE_END static MACHINE_START( mgolf ) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -312,7 +313,7 @@ static MACHINE_START( mgolf ) static MACHINE_RESET( mgolf ) { - mgolf_state *state = (mgolf_state *)machine->driver_data; + mgolf_state *state = machine->driver_data(); timer_set(machine, machine->primary_screen->time_until_pos(16), NULL, 16, interrupt_callback); state->mask = 0; diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index 58142af77e1..0e03b650614 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -39,7 +39,7 @@ static READ8_HANDLER( mikie_sh_timer_r ) { - mikie_state *state = (mikie_state *)space->machine->driver_data; + mikie_state *state = space->machine->driver_data(); int clock = state->audiocpu->total_cycles() / MIKIE_TIMER_RATE; return clock; @@ -47,7 +47,7 @@ static READ8_HANDLER( mikie_sh_timer_r ) static WRITE8_HANDLER( mikie_sh_irqtrigger_w ) { - mikie_state *state = (mikie_state *)space->machine->driver_data; + mikie_state *state = space->machine->driver_data(); if (state->last_irq == 0 && data == 1) { @@ -204,7 +204,7 @@ GFXDECODE_END static MACHINE_START( mikie ) { - mikie_state *state = (mikie_state *)machine->driver_data; + mikie_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -215,7 +215,7 @@ static MACHINE_START( mikie ) static MACHINE_RESET( mikie ) { - mikie_state *state = (mikie_state *)machine->driver_data; + mikie_state *state = machine->driver_data(); state->palettebank = 0; state->last_irq = 0; diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index d2c63d447e6..3f153900c24 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -14,12 +14,13 @@ Japan). It has no sound. #include "cpu/z80/z80.h" -class minivadr_state +class minivadr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, minivadr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, minivadr_state(machine)); } - minivadr_state(running_machine &machine) { } + minivadr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -34,7 +35,7 @@ public: static VIDEO_UPDATE( minivadr ) { - minivadr_state *state = (minivadr_state *)screen->machine->driver_data; + minivadr_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 0df967d67e1..14449c5bcee 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -39,13 +39,14 @@ MR_01-.3A [a0b758aa] #include "video/deco16ic.h" #include "sound/okim6295.h" -class mirage_state +class mirage_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mirage_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mirage_state(machine)); } mirage_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), deco16ic(machine.device("deco_custom")), oki_sfx(machine.device("oki_sfx")), oki_bgm(machine.device("oki_bgm")) { } @@ -70,7 +71,7 @@ public: static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - mirage_state *state = (mirage_state *)machine->driver_data; + mirage_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -143,7 +144,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( mirage ) { - mirage_state *state = (mirage_state *)screen->machine->driver_data; + mirage_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); @@ -162,13 +163,13 @@ static VIDEO_UPDATE( mirage ) static WRITE16_HANDLER( mirage_mux_w ) { - mirage_state *state = (mirage_state *)space->machine->driver_data; + mirage_state *state = space->machine->driver_data(); state->mux_data = data & 0x1f; } static READ16_HANDLER( mirage_input_r ) { - mirage_state *state = (mirage_state *)space->machine->driver_data; + mirage_state *state = space->machine->driver_data(); switch (state->mux_data & 0x1f) { case 0x01: return input_port_read(space->machine, "KEY0"); @@ -183,13 +184,13 @@ static READ16_HANDLER( mirage_input_r ) static WRITE16_HANDLER( okim1_rombank_w ) { - mirage_state *state = (mirage_state *)space->machine->driver_data; + mirage_state *state = space->machine->driver_data(); state->oki_sfx->set_bank_base(0x40000 * (data & 0x3)); } static WRITE16_HANDLER( okim0_rombank_w ) { - mirage_state *state = (mirage_state *)space->machine->driver_data; + mirage_state *state = space->machine->driver_data(); /*bits 4-6 used on POST? */ state->oki_bgm->set_bank_base(0x40000 * (data & 0x7)); @@ -363,14 +364,14 @@ static const deco16ic_interface mirage_deco16ic_intf = static MACHINE_START( mirage ) { - mirage_state *state = (mirage_state *)machine->driver_data; + mirage_state *state = machine->driver_data(); state_save_register_global(machine, state->mux_data); } static MACHINE_RESET( mirage ) { - mirage_state *state = (mirage_state *)machine->driver_data; + mirage_state *state = machine->driver_data(); state->mux_data = 0; } diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 00a03123ced..c813db53175 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -24,7 +24,7 @@ OKI M6295 sound ROM dump is bad. static VIDEO_UPDATE( missb2 ) { - bublbobl_state *state = (bublbobl_state *)screen->machine->driver_data; + bublbobl_state *state = screen->machine->driver_data(); int offs; int sx, sy, xc, yc; int gfx_num, gfx_attr, gfx_offs; @@ -125,7 +125,7 @@ INLINE void bg_changecolor_RRRRGGGGBBBBxxxx( running_machine *machine, pen_t col static WRITE8_HANDLER( bg_paletteram_RRRRGGGGBBBBxxxx_be_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->bg_paletteram[offset] = data; bg_changecolor_RRRRGGGGBBBBxxxx(space->machine, offset / 2, state->bg_paletteram[offset | 1] | (state->bg_paletteram[offset & ~1] << 8)); } @@ -357,7 +357,7 @@ static INTERRUPT_GEN( missb2_interrupt ) static MACHINE_START( missb2 ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -372,7 +372,7 @@ static MACHINE_START( missb2 ) static MACHINE_RESET( missb2 ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); state->sound_nmi_enable = 0; state->pending_nmi = 0; @@ -476,7 +476,7 @@ static void configure_banks( running_machine* machine ) static DRIVER_INIT( missb2 ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); configure_banks(machine); state->video_enable = 0; diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index cb1662f444e..c544b9793c9 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -164,7 +164,7 @@ static WRITE8_HANDLER( pang_bankswitch_w ) static READ8_HANDLER( block_input_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); static const char *const dialnames[] = { "DIAL1", "DIAL2" }; static const char *const portnames[] = { "IN1", "IN2" }; @@ -209,7 +209,7 @@ static READ8_HANDLER( block_input_r ) static WRITE8_HANDLER( block_dial_control_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); if (data == 0x08) { @@ -226,7 +226,7 @@ static WRITE8_HANDLER( block_dial_control_w ) static READ8_HANDLER( mahjong_input_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); int i; static const char *const keynames[2][5] = { @@ -245,14 +245,14 @@ static READ8_HANDLER( mahjong_input_r ) static WRITE8_HANDLER( mahjong_input_select_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); state->keymatrix = data; } static READ8_HANDLER( input_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); static const char *const portnames[] = { "IN0", "IN1", "IN2" }; switch (state->input_type) @@ -280,7 +280,7 @@ static READ8_HANDLER( input_r ) static WRITE8_HANDLER( input_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); switch (state->input_type) { @@ -368,7 +368,7 @@ ADDRESS_MAP_END #ifdef UNUSED_FUNCTION static WRITE8_HANDLER( spangbl_msm5205_data_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); state->sample_buffer = data; } #endif @@ -387,7 +387,7 @@ ADDRESS_MAP_END /**** Monsters World ****/ static WRITE8_DEVICE_HANDLER( oki_banking_w ) { - mitchell_state *state = (mitchell_state *)device->machine->driver_data; + mitchell_state *state = device->machine->driver_data(); state->oki->set_bank_base(0x40000 * (data & 3)); } @@ -401,7 +401,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER(mstworld_sound_w) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -1080,7 +1080,7 @@ GFXDECODE_END static MACHINE_START( mitchell ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state_save_register_global(machine, state->sample_buffer); state_save_register_global(machine, state->sample_select); @@ -1093,7 +1093,7 @@ static MACHINE_START( mitchell ) static MACHINE_RESET( mitchell ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->sample_buffer = 0; state->sample_select = 0; @@ -1208,7 +1208,7 @@ GFXDECODE_END static void spangbl_adpcm_int( running_device *device ) { - mitchell_state *state = (mitchell_state *)device->machine->driver_data; + mitchell_state *state = device->machine->driver_data(); msm5205_data_w(device, state->sample_buffer & 0x0f); state->sample_buffer >>= 4; state->sample_select ^= 1; @@ -2133,7 +2133,7 @@ static void configure_banks( running_machine *machine ) static DRIVER_INIT( dokaben ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; mgakuen2_decode(machine); @@ -2141,7 +2141,7 @@ static DRIVER_INIT( dokaben ) } static DRIVER_INIT( pang ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; pang_decode(machine); @@ -2149,7 +2149,7 @@ static DRIVER_INIT( pang ) } static DRIVER_INIT( pangb ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; bootleg_decode(machine); @@ -2157,7 +2157,7 @@ static DRIVER_INIT( pangb ) } static DRIVER_INIT( cworld ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; cworld_decode(machine); @@ -2165,7 +2165,7 @@ static DRIVER_INIT( cworld ) } static DRIVER_INIT( hatena ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; hatena_decode(machine); @@ -2173,7 +2173,7 @@ static DRIVER_INIT( hatena ) } static DRIVER_INIT( spang ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ @@ -2183,7 +2183,7 @@ static DRIVER_INIT( spang ) static DRIVER_INIT( spangbl ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ @@ -2193,7 +2193,7 @@ static DRIVER_INIT( spangbl ) static DRIVER_INIT( spangj ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ @@ -2202,7 +2202,7 @@ static DRIVER_INIT( spangj ) } static DRIVER_INIT( sbbros ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ @@ -2211,7 +2211,7 @@ static DRIVER_INIT( sbbros ) } static DRIVER_INIT( qtono1 ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; qtono1_decode(machine); @@ -2219,7 +2219,7 @@ static DRIVER_INIT( qtono1 ) } static DRIVER_INIT( qsangoku ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 0; nvram_size = 0; qsangoku_decode(machine); @@ -2227,7 +2227,7 @@ static DRIVER_INIT( qsangoku ) } static DRIVER_INIT( mgakuen ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 1; configure_banks(machine); memory_install_read_port(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "DSW0"); @@ -2235,7 +2235,7 @@ static DRIVER_INIT( mgakuen ) } static DRIVER_INIT( mgakuen2 ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 1; nvram_size = 0; mgakuen2_decode(machine); @@ -2243,7 +2243,7 @@ static DRIVER_INIT( mgakuen2 ) } static DRIVER_INIT( pkladies ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 1; nvram_size = 0; mgakuen2_decode(machine); @@ -2251,7 +2251,7 @@ static DRIVER_INIT( pkladies ) } static DRIVER_INIT( pkladiesbl ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 1; nvram_size = 0; bootleg_decode(machine); @@ -2259,7 +2259,7 @@ static DRIVER_INIT( pkladiesbl ) } static DRIVER_INIT( marukin ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 1; nvram_size = 0; marukin_decode(machine); @@ -2267,7 +2267,7 @@ static DRIVER_INIT( marukin ) } static DRIVER_INIT( block ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 2; nvram_size = 0x80; nvram = &memory_region(machine, "maincpu")[0xff80]; /* NVRAM */ @@ -2276,7 +2276,7 @@ static DRIVER_INIT( block ) } static DRIVER_INIT( blockbl ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->input_type = 2; nvram_size = 0x80; nvram = &memory_region(machine, "maincpu")[0xff80]; /* NVRAM */ diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index af057319bfb..25182a226d0 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -115,7 +115,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_w ) static READ8_HANDLER( keyboard_r ) { - mjkjidai_state *state = (mjkjidai_state *)space->machine->driver_data; + mjkjidai_state *state = space->machine->driver_data(); int res = 0x3f,i; static const char *const keynames[] = { "PL2_1", "PL2_2", "PL2_3", "PL2_4", "PL2_5", "PL2_6", "PL1_1", "PL1_2", "PL1_3", "PL1_4", "PL1_5", "PL1_6" }; @@ -143,7 +143,7 @@ static READ8_HANDLER( keyboard_r ) static WRITE8_HANDLER( keyboard_select_w ) { - mjkjidai_state *state = (mjkjidai_state *)space->machine->driver_data; + mjkjidai_state *state = space->machine->driver_data(); // logerror("%04x: keyboard_select %d = %02x\n",cpu_get_pc(space->cpu),offset,data); @@ -156,7 +156,7 @@ static WRITE8_HANDLER( keyboard_select_w ) static NVRAM_HANDLER( mjkjidai ) { - mjkjidai_state *state = (mjkjidai_state *)machine->driver_data; + mjkjidai_state *state = machine->driver_data(); if (read_or_write) mame_fwrite(file, state->nvram, state->nvram_size); diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 0c5a77388c8..f0e3810e6ba 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -15,12 +15,13 @@ #define MCLK 12000000 -class mjsister_state +class mjsister_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjsister_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjsister_state(machine)); } - mjsister_state(running_machine &machine) { } + mjsister_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram0, *videoram1; @@ -55,7 +56,7 @@ public: static VIDEO_START( mjsister ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); state->tmpbitmap0 = auto_bitmap_alloc(machine, 256, 256, machine->primary_screen->format()); state->tmpbitmap1 = auto_bitmap_alloc(machine, 256, 256, machine->primary_screen->format()); state->videoram0 = auto_alloc_array(machine, UINT8, 0x8000); @@ -67,7 +68,7 @@ static VIDEO_START( mjsister ) static void mjsister_plot0( running_machine *machine, int offset, UINT8 data ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); int x, y, c1, c2; x = offset & 0x7f; @@ -82,7 +83,7 @@ static void mjsister_plot0( running_machine *machine, int offset, UINT8 data ) static void mjsister_plot1( running_machine *machine, int offset, UINT8 data ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); int x, y, c1, c2; x = offset & 0x7f; @@ -102,7 +103,7 @@ static void mjsister_plot1( running_machine *machine, int offset, UINT8 data ) static WRITE8_HANDLER( mjsister_videoram_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); if (state->vrambank) { state->videoram1[offset] = data; @@ -117,7 +118,7 @@ static WRITE8_HANDLER( mjsister_videoram_w ) static VIDEO_UPDATE( mjsister ) { - mjsister_state *state = (mjsister_state *)screen->machine->driver_data; + mjsister_state *state = screen->machine->driver_data(); int flip = state->flip_screen; int i, j; @@ -155,7 +156,7 @@ static VIDEO_UPDATE( mjsister ) static TIMER_CALLBACK( dac_callback ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); UINT8 *DACROM = memory_region(machine, "samples"); dac_data_w(state->dac, DACROM[(state->dac_bank * 0x10000 + state->dac_adr++) & 0x1ffff]); @@ -168,13 +169,13 @@ static TIMER_CALLBACK( dac_callback ) static WRITE8_HANDLER( mjsister_dac_adr_s_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); state->dac_adr_s = data; } static WRITE8_HANDLER( mjsister_dac_adr_e_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); state->dac_adr_e = data; state->dac_adr = state->dac_adr_s << 8; @@ -186,7 +187,7 @@ static WRITE8_HANDLER( mjsister_dac_adr_e_w ) static WRITE8_HANDLER( mjsister_banksel1_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); int tmp = state->colorbank; switch (data) @@ -222,7 +223,7 @@ static WRITE8_HANDLER( mjsister_banksel1_w ) static WRITE8_HANDLER( mjsister_banksel2_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); switch (data) { @@ -241,19 +242,19 @@ static WRITE8_HANDLER( mjsister_banksel2_w ) static WRITE8_HANDLER( mjsister_input_sel1_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); state->input_sel1 = data; } static WRITE8_HANDLER( mjsister_input_sel2_w ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); state->input_sel2 = data; } static READ8_HANDLER( mjsister_keys_r ) { - mjsister_state *state = (mjsister_state *)space->machine->driver_data; + mjsister_state *state = space->machine->driver_data(); int p, i, ret = 0; static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5" }; @@ -439,7 +440,7 @@ static const ay8910_interface ay8910_config = static STATE_POSTLOAD( mjsister_redraw ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); /* we can skip saving tmpbitmaps because we can redraw them from vram */ state->screen_redraw = 1; @@ -447,7 +448,7 @@ static STATE_POSTLOAD( mjsister_redraw ) static MACHINE_START( mjsister ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x8000); @@ -473,7 +474,7 @@ static MACHINE_START( mjsister ) static MACHINE_RESET( mjsister ) { - mjsister_state *state = (mjsister_state *)machine->driver_data; + mjsister_state *state = machine->driver_data(); state->dac_busy = 0; state->flip_screen = 0; diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index b43c4504ca3..0fad0037631 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -5,12 +5,13 @@ #include "sound/dac.h" #include "includes/konamipt.h" -class mogura_state +class mogura_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mogura_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mogura_state(machine)); } - mogura_state(running_machine &machine) { } + mogura_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * tileram; @@ -60,7 +61,7 @@ static PALETTE_INIT( mogura ) static TILE_GET_INFO( get_mogura_tile_info ) { - mogura_state *state = (mogura_state *)machine->driver_data; + mogura_state *state = machine->driver_data(); int code = state->tileram[tile_index]; int attr = state->tileram[tile_index + 0x800]; @@ -74,14 +75,14 @@ static TILE_GET_INFO( get_mogura_tile_info ) static VIDEO_START( mogura ) { - mogura_state *state = (mogura_state *)machine->driver_data; + mogura_state *state = machine->driver_data(); gfx_element_set_source(machine->gfx[0], state->gfxram); state->tilemap = tilemap_create(machine, get_mogura_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } static VIDEO_UPDATE( mogura ) { - mogura_state *state = (mogura_state *)screen->machine->driver_data; + mogura_state *state = screen->machine->driver_data(); const rectangle &visarea = screen->visible_area(); /* tilemap layout is a bit strange ... */ @@ -105,14 +106,14 @@ static VIDEO_UPDATE( mogura ) static WRITE8_HANDLER( mogura_tileram_w ) { - mogura_state *state = (mogura_state *)space->machine->driver_data; + mogura_state *state = space->machine->driver_data(); state->tileram[offset] = data; tilemap_mark_tile_dirty(state->tilemap, offset & 0x7ff); } static WRITE8_HANDLER(mogura_dac_w) { - mogura_state *state = (mogura_state *)space->machine->driver_data; + mogura_state *state = space->machine->driver_data(); dac_data_w(state->dac1, data & 0xf0); /* left */ dac_data_w(state->dac2, (data & 0x0f) << 4); /* right */ } @@ -120,7 +121,7 @@ static WRITE8_HANDLER(mogura_dac_w) static WRITE8_HANDLER ( mogura_gfxram_w ) { - mogura_state *state = (mogura_state *)space->machine->driver_data; + mogura_state *state = space->machine->driver_data(); state->gfxram[offset] = data ; gfx_element_mark_dirty(space->machine->gfx[0], offset / 16); @@ -193,7 +194,7 @@ GFXDECODE_END static MACHINE_START( mogura ) { - mogura_state *state = (mogura_state *)machine->driver_data; + mogura_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->dac1 = machine->device("dac1"); diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index a584cc206d5..c5a4e3087ad 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -53,12 +53,13 @@ #include "sound/ay8910.h" -class mole_state +class mole_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mole_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mole_state(machine)); } - mole_state(running_machine &machine) { } + mole_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * tileram; @@ -85,7 +86,7 @@ static PALETTE_INIT( mole ) static TILE_GET_INFO( get_bg_tile_info ) { - mole_state *state = (mole_state *)machine->driver_data; + mole_state *state = machine->driver_data(); UINT16 code = state->tileram[tile_index]; SET_TILE_INFO((code & 0x200) ? 1 : 0, code & 0x1ff, 0, 0); @@ -93,7 +94,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( mole ) { - mole_state *state = (mole_state *)machine->driver_data; + mole_state *state = machine->driver_data(); state->tileram = auto_alloc_array_clear(machine, UINT16, 0x400); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 40, 25); @@ -102,7 +103,7 @@ static VIDEO_START( mole ) static WRITE8_HANDLER( mole_videoram_w ) { - mole_state *state = (mole_state *)space->machine->driver_data; + mole_state *state = space->machine->driver_data(); state->tileram[offset] = data | (state->tile_bank << 8); tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -110,7 +111,7 @@ static WRITE8_HANDLER( mole_videoram_w ) static WRITE8_HANDLER( mole_tilebank_w ) { - mole_state *state = (mole_state *)space->machine->driver_data; + mole_state *state = space->machine->driver_data(); state->tile_bank = data; tilemap_mark_all_tiles_dirty(state->bg_tilemap); @@ -123,7 +124,7 @@ static WRITE8_HANDLER( mole_flipscreen_w ) static VIDEO_UPDATE( mole ) { - mole_state *state = (mole_state *)screen->machine->driver_data; + mole_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); return 0; @@ -303,14 +304,14 @@ GFXDECODE_END static MACHINE_START( mole ) { - mole_state *state = (mole_state *)machine->driver_data; + mole_state *state = machine->driver_data(); state_save_register_global(machine, state->tile_bank); } static MACHINE_RESET( mole ) { - mole_state *state = (mole_state *)machine->driver_data; + mole_state *state = machine->driver_data(); state->tile_bank = 0; } diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index bc8e7e14ae0..bd579a6ddfb 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -227,7 +227,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( momoko ) { - momoko_state *state = (momoko_state *)machine->driver_data; + momoko_state *state = machine->driver_data(); UINT8 *BG_MAP = memory_region(machine, "user1"); memory_configure_bank(machine, "bank1", 0, 32, &BG_MAP[0x0000], 0x1000); @@ -246,7 +246,7 @@ static MACHINE_START( momoko ) static MACHINE_RESET( momoko ) { - momoko_state *state = (momoko_state *)machine->driver_data; + momoko_state *state = machine->driver_data(); state->fg_scrollx = 0; state->fg_scrolly = 0; diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index b41eedb25c6..9ec0db17414 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -66,7 +66,7 @@ static const eeprom_interface eeprom_intf = static READ16_HANDLER( control2_r ) { - moo_state *state = (moo_state *)space->machine->driver_data; + moo_state *state = space->machine->driver_data(); return state->cur_control2; } @@ -80,7 +80,7 @@ static WRITE16_HANDLER( control2_w ) /* bit 10 is watchdog */ /* bit 11 is enable irq 4 (unconfirmed) */ - moo_state *state = (moo_state *)space->machine->driver_data; + moo_state *state = space->machine->driver_data(); COMBINE_DATA(&state->cur_control2); input_port_write(space->machine, "EEPROMOUT", state->cur_control2, 0xff); @@ -94,7 +94,7 @@ static WRITE16_HANDLER( control2_w ) static void moo_objdma( running_machine *machine, int type ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); int num_inactive; UINT16 *src, *dst, zmask; int counter = k053247_get_dy(state->k053246); @@ -121,14 +121,14 @@ static void moo_objdma( running_machine *machine, int type ) static TIMER_CALLBACK( dmaend_callback ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); if (state->cur_control2 & 0x800) cpu_set_input_line(state->maincpu, 4, HOLD_LINE); } static INTERRUPT_GEN( moo_interrupt ) { - moo_state *state = (moo_state *)device->machine->driver_data; + moo_state *state = device->machine->driver_data(); if (k053246_is_irq_enabled(state->k053246)) { moo_objdma(device->machine, state->game_type); @@ -144,7 +144,7 @@ static INTERRUPT_GEN( moo_interrupt ) static INTERRUPT_GEN( moobl_interrupt ) { - moo_state *state = (moo_state *)device->machine->driver_data; + moo_state *state = device->machine->driver_data(); moo_objdma(device->machine, state->game_type); // schedule DMA end interrupt (delay shortened to catch up with V-blank) @@ -171,7 +171,7 @@ static WRITE16_HANDLER( sound_cmd2_w ) static WRITE16_HANDLER( sound_irq_w ) { - moo_state *state = (moo_state *)space->machine->driver_data; + moo_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -192,7 +192,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) /* of RAM, but they put 0x10000 there. The CPU can access them all. */ static READ16_HANDLER( K053247_scattered_word_r ) { - moo_state *state = (moo_state *)space->machine->driver_data; + moo_state *state = space->machine->driver_data(); if (offset & 0x0078) return state->spriteram[offset]; @@ -205,7 +205,7 @@ static READ16_HANDLER( K053247_scattered_word_r ) static WRITE16_HANDLER( K053247_scattered_word_w ) { - moo_state *state = (moo_state *)space->machine->driver_data; + moo_state *state = space->machine->driver_data(); if (offset & 0x0078) COMBINE_DATA(state->spriteram + offset); @@ -222,7 +222,7 @@ static WRITE16_HANDLER( K053247_scattered_word_w ) static WRITE16_HANDLER( moo_prot_w ) { - moo_state *state = (moo_state *)space->machine->driver_data; + moo_state *state = space->machine->driver_data(); UINT32 src1, src2, dst, length, a, b, res; COMBINE_DATA(&state->protram[offset]); @@ -431,7 +431,7 @@ INPUT_PORTS_END static MACHINE_START( moo ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("soundcpu"); @@ -451,7 +451,7 @@ static MACHINE_START( moo ) static MACHINE_RESET( moo ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); int i; for (i = 0; i < 16; i++) @@ -885,7 +885,7 @@ ROM_END static DRIVER_INIT( moo ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); state->game_type = (!strcmp(machine->gamedrv->name, "bucky") || !strcmp(machine->gamedrv->name, "buckyua")); } diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index f686ba86468..01136dbd052 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -14,7 +14,7 @@ static WRITE8_HANDLER( protection_w ) { - mosaic_state *state = (mosaic_state *)space->machine->driver_data; + mosaic_state *state = space->machine->driver_data(); if (!BIT(data, 7)) { @@ -40,7 +40,7 @@ static WRITE8_HANDLER( protection_w ) static READ8_HANDLER( protection_r ) { - mosaic_state *state = (mosaic_state *)space->machine->driver_data; + mosaic_state *state = space->machine->driver_data(); int res = (state->prot_val >> 8) & 0xff; logerror("%06x: protection_r %02x\n", cpu_get_pc(space->cpu), res); @@ -52,7 +52,7 @@ static READ8_HANDLER( protection_r ) static WRITE8_HANDLER( gfire2_protection_w ) { - mosaic_state *state = (mosaic_state *)space->machine->driver_data; + mosaic_state *state = space->machine->driver_data(); logerror("%06x: protection_w %02x\n", cpu_get_pc(space->cpu), data); @@ -81,7 +81,7 @@ static WRITE8_HANDLER( gfire2_protection_w ) static READ8_HANDLER( gfire2_protection_r ) { - mosaic_state *state = (mosaic_state *)space->machine->driver_data; + mosaic_state *state = space->machine->driver_data(); int res = state->prot_val & 0xff; state->prot_val >>= 8; @@ -255,14 +255,14 @@ static const ym2203_interface ym2203_config = static MACHINE_START( mosaic ) { - mosaic_state *state = (mosaic_state *)machine->driver_data; + mosaic_state *state = machine->driver_data(); state_save_register_global(machine, state->prot_val); } static MACHINE_RESET( mosaic ) { - mosaic_state *state = (mosaic_state *)machine->driver_data; + mosaic_state *state = machine->driver_data(); state->prot_val = 0; } diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index f940ff5a4a0..0c7e169856a 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -22,13 +22,13 @@ * the NMI input on the main CPU */ static WRITE8_HANDLER( mouser_nmi_enable_w ) { - mouser_state *state = (mouser_state *)space->machine->driver_data; + mouser_state *state = space->machine->driver_data(); state->nmi_enable = data; } static INTERRUPT_GEN( mouser_nmi_interrupt ) { - mouser_state *state = (mouser_state *)device->machine->driver_data; + mouser_state *state = device->machine->driver_data(); if (BIT(state->nmi_enable, 0)) nmi_line_pulse(device); @@ -38,14 +38,14 @@ static INTERRUPT_GEN( mouser_nmi_interrupt ) static WRITE8_HANDLER( mouser_sound_interrupt_w ) { - mouser_state *state = (mouser_state *)space->machine->driver_data; + mouser_state *state = space->machine->driver_data(); state->sound_byte = data; cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } static READ8_HANDLER( mouser_sound_byte_r ) { - mouser_state *state = (mouser_state *)space->machine->driver_data; + mouser_state *state = space->machine->driver_data(); return state->sound_byte; } @@ -173,7 +173,7 @@ GFXDECODE_END static MACHINE_START( mouser ) { - mouser_state *state = (mouser_state *)machine->driver_data; + mouser_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -184,7 +184,7 @@ static MACHINE_START( mouser ) static MACHINE_RESET( mouser ) { - mouser_state *state = (mouser_state *)machine->driver_data; + mouser_state *state = machine->driver_data(); state->sound_byte = 0; state->nmi_enable = 0; diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 659d9da54a4..231c5bd7296 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -54,14 +54,14 @@ Video Board static WRITE8_HANDLER( mrflea_main_w ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); state->status |= 0x01; // pending command to main CPU state->main = data; } static WRITE8_HANDLER( mrflea_io_w ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); state->status |= 0x08; // pending command to IO CPU state->io = data; cpu_set_input_line(state->subcpu, 0, HOLD_LINE ); @@ -69,21 +69,21 @@ static WRITE8_HANDLER( mrflea_io_w ) static READ8_HANDLER( mrflea_main_r ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); state->status &= ~0x01; // main CPU command read return state->main; } static READ8_HANDLER( mrflea_io_r ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); state->status &= ~0x08; // IO CPU command read return state->io; } static READ8_HANDLER( mrflea_main_status_r ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); /* 0x01: main CPU command pending 0x08: io cpu ready */ @@ -92,7 +92,7 @@ static READ8_HANDLER( mrflea_main_status_r ) static READ8_HANDLER( mrflea_io_status_r ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); /* 0x08: IO CPU command pending 0x01: main cpu ready */ @@ -101,7 +101,7 @@ static READ8_HANDLER( mrflea_io_status_r ) static INTERRUPT_GEN( mrflea_slave_interrupt ) { - mrflea_state *state = (mrflea_state *)device->machine->driver_data; + mrflea_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0 || (state->status & 0x08)) cpu_set_input_line(device, 0, HOLD_LINE); } @@ -112,7 +112,7 @@ static READ8_HANDLER( mrflea_interrupt_type_r ) 1. triggered (in response to sound command) 2. heartbeat (for music timing) */ - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); if (state->status & 0x08 ) return 0x00; /* process command */ @@ -122,7 +122,7 @@ static READ8_HANDLER( mrflea_interrupt_type_r ) static WRITE8_HANDLER( mrflea_select1_w ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); state->select1 = data; } @@ -327,7 +327,7 @@ static const ay8910_interface mrflea_ay8910_interface_1 = static MACHINE_START( mrflea ) { - mrflea_state *state = (mrflea_state *)machine->driver_data; + mrflea_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -341,7 +341,7 @@ static MACHINE_START( mrflea ) static MACHINE_RESET( mrflea ) { - mrflea_state *state = (mrflea_state *)machine->driver_data; + mrflea_state *state = machine->driver_data(); state->gfx_bank = 0; state->io = 0; diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index c10af8f32a1..50f1f044a6e 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -23,7 +23,7 @@ TO DO: static TIMER_CALLBACK( nmi_callback ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); else @@ -38,13 +38,13 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( nmi_disable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) { @@ -93,7 +93,7 @@ MCU simulation TODO: \-Fix some graphics imperfections(*not* confirmed if they are caused by unhandled commands or imperfect video emulation). */ - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); switch (state->mcu_val) { @@ -169,7 +169,7 @@ static WRITE8_HANDLER( msisaac_mcu_w ) #ifdef USE_MCU buggychl_mcu_w(offset,data); #else - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); //if(data != 0x0a && data != 0x42 && data != 0x02) // popmessage("PC = %04x %02x", cpu_get_pc(space->cpu), data); state->mcu_val = data; @@ -217,7 +217,7 @@ ADDRESS_MAP_END static MACHINE_RESET( ta7630 ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int i; double db = 0.0; @@ -243,7 +243,7 @@ static MACHINE_RESET( ta7630 ) static WRITE8_DEVICE_HANDLER( sound_control_0_w ) { - buggychl_state *state = (buggychl_state *)device->machine->driver_data; + buggychl_state *state = device->machine->driver_data(); state->snd_ctrl0 = data & 0xff; //popmessage("SND0 0=%2x 1=%2x", state->snd_ctrl0, state->snd_ctrl1); @@ -258,7 +258,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_0_w ) } static WRITE8_HANDLER( sound_control_1_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->snd_ctrl1 = data & 0xff; //popmessage("SND1 0=%2x 1=%2x", state->snd_ctrl0, state->snd_ctrl1); } @@ -453,7 +453,7 @@ static const msm5232_interface msm5232_config = static MACHINE_START( msisaac ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -491,7 +491,7 @@ static MACHINE_START( msisaac ) static MACHINE_RESET( msisaac ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); MACHINE_RESET_CALL(ta7630); diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 22f8cee4ec8..0b154e238eb 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -48,7 +48,7 @@ behavior we use . static WRITE16_HANDLER( mugsmash_reg2_w ) { - mugsmash_state *state = (mugsmash_state *)space->machine->driver_data; + mugsmash_state *state = space->machine->driver_data(); state->regs2[offset] = data; //popmessage ("Regs2 %04x, %04x, %04x, %04x", state->regs2[0], state->regs2[1], state->regs2[2], state->regs2[3]); @@ -391,7 +391,7 @@ GFXDECODE_END static void irq_handler(running_device *device, int irq) { - mugsmash_state *state = (mugsmash_state *)device->machine->driver_data; + mugsmash_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0 , irq ? ASSERT_LINE : CLEAR_LINE ); } @@ -402,7 +402,7 @@ static const ym2151_interface ym2151_config = static MACHINE_START( mugsmash ) { - mugsmash_state *state = (mugsmash_state *)machine->driver_data; + mugsmash_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 00aa93c5c02..63fb279f4e0 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -39,13 +39,13 @@ Stephh's notes (based on the game Z80 code and some tests) : static WRITE8_HANDLER( mnchmobl_nmi_enable_w ) { - munchmo_state *state = (munchmo_state *)space->machine->driver_data; + munchmo_state *state = space->machine->driver_data(); state->nmi_enable = data; } static INTERRUPT_GEN( mnchmobl_interrupt ) { - munchmo_state *state = (munchmo_state *)device->machine->driver_data; + munchmo_state *state = device->machine->driver_data(); state->which = !state->which; if (state->which) @@ -56,7 +56,7 @@ static INTERRUPT_GEN( mnchmobl_interrupt ) static INTERRUPT_GEN( mnchmobl_sound_irq ) { - munchmo_state *state = (munchmo_state *)device->machine->driver_data; + munchmo_state *state = device->machine->driver_data(); if (!(state->sound_nmi_enable)) cpu_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE); @@ -64,7 +64,7 @@ static INTERRUPT_GEN( mnchmobl_sound_irq ) static WRITE8_HANDLER( mnchmobl_soundlatch_w ) { - munchmo_state *state = (munchmo_state *)space->machine->driver_data; + munchmo_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE ); @@ -72,14 +72,14 @@ static WRITE8_HANDLER( mnchmobl_soundlatch_w ) static WRITE8_HANDLER( sound_nmi_enable_w ) { - munchmo_state *state = (munchmo_state *)space->machine->driver_data; + munchmo_state *state = space->machine->driver_data(); state->sound_nmi_enable = data & 1; } static WRITE8_HANDLER( sound_nmi_ack_w ) { - munchmo_state *state = (munchmo_state *)space->machine->driver_data; + munchmo_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); } @@ -307,7 +307,7 @@ GFXDECODE_END static MACHINE_START( munchmo ) { - munchmo_state *state = (munchmo_state *)machine->driver_data; + munchmo_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -320,7 +320,7 @@ static MACHINE_START( munchmo ) static MACHINE_RESET( munchmo ) { - munchmo_state *state = (munchmo_state *)machine->driver_data; + munchmo_state *state = machine->driver_data(); state->palette_bank = 0; state->flipscreen = 0; diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c index 1741d06e0fc..573d970b2e6 100644 --- a/src/mame/drivers/mw8080bw.c +++ b/src/mame/drivers/mw8080bw.c @@ -167,7 +167,7 @@ static READ8_HANDLER( mw8080bw_shift_result_rev_r ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 ret = mb14241_shift_result_r(state->mb14241, 0); return BITSWAP8(ret,0,1,2,3,4,5,6,7); @@ -176,7 +176,7 @@ static READ8_HANDLER( mw8080bw_shift_result_rev_r ) static READ8_HANDLER( mw8080bw_reversable_shift_result_r ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); UINT8 ret; if (state->rev_shift_res) @@ -193,7 +193,7 @@ static READ8_HANDLER( mw8080bw_reversable_shift_result_r ) static WRITE8_HANDLER( mw8080bw_reversable_shift_count_w) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); mb14241_shift_count_w(state->mb14241, offset, data); state->rev_shift_res = data & 0x08; @@ -430,7 +430,7 @@ MACHINE_DRIVER_END static WRITE8_HANDLER( gunfight_io_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); if (offset & 0x01) gunfight_audio_w(space, 0, data); @@ -627,7 +627,7 @@ static CUSTOM_INPUT( tornbase_score_input_r ) static WRITE8_HANDLER( tornbase_io_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); if (offset & 0x01) tornbase_audio_w(space->machine->device("discrete"), 0, data); @@ -882,14 +882,14 @@ MACHINE_DRIVER_END static STATE_POSTLOAD( maze_update_discrete ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); maze_write_discrete(machine->device("discrete"), state->maze_tone_timing_state); } static TIMER_CALLBACK( maze_tone_timing_timer_callback ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state->maze_tone_timing_state = !state->maze_tone_timing_state; maze_write_discrete(state->discrete, state->maze_tone_timing_state); } @@ -897,7 +897,7 @@ static TIMER_CALLBACK( maze_tone_timing_timer_callback ) static MACHINE_START( maze ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* create astable timer for IC B1 */ timer_pulse(machine, MAZE_555_B1_PERIOD, NULL, 0, maze_tone_timing_timer_callback); @@ -991,7 +991,7 @@ MACHINE_DRIVER_END static MACHINE_START( boothill ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->rev_shift_res); @@ -1087,7 +1087,7 @@ MACHINE_DRIVER_END static WRITE8_HANDLER( checkmat_io_w ) { - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); if (offset & 0x01) checkmat_audio_w(state->discrete, 0, data); @@ -1195,7 +1195,7 @@ MACHINE_DRIVER_END static MACHINE_START( desertgu ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->desertgun_controller_select); @@ -1206,7 +1206,7 @@ static MACHINE_START( desertgu ) static CUSTOM_INPUT( desertgu_gun_input_r ) { - mw8080bw_state *state = (mw8080bw_state *)field->port->machine->driver_data; + mw8080bw_state *state = field->port->machine->driver_data(); UINT32 ret; if (state->desertgun_controller_select) @@ -1220,7 +1220,7 @@ static CUSTOM_INPUT( desertgu_gun_input_r ) static CUSTOM_INPUT( desertgu_dip_sw_0_1_r ) { - mw8080bw_state *state = (mw8080bw_state *)field->port->machine->driver_data; + mw8080bw_state *state = field->port->machine->driver_data(); UINT32 ret; if (state->desertgun_controller_select) @@ -1525,7 +1525,7 @@ MACHINE_DRIVER_END static MACHINE_START( gmissile ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->rev_shift_res); @@ -1622,7 +1622,7 @@ MACHINE_DRIVER_END static MACHINE_START( m4 ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->rev_shift_res); @@ -1721,7 +1721,7 @@ MACHINE_DRIVER_END static MACHINE_START( clowns ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->clowns_controller_select); @@ -1732,7 +1732,7 @@ static MACHINE_START( clowns ) static CUSTOM_INPUT( clowns_controller_r ) { - mw8080bw_state *state = (mw8080bw_state *)field->port->machine->driver_data; + mw8080bw_state *state = field->port->machine->driver_data(); UINT32 ret; if (state->clowns_controller_select) @@ -2156,14 +2156,14 @@ MACHINE_DRIVER_END static TIMER_DEVICE_CALLBACK( spcenctr_strobe_timer_callback ) { - mw8080bw_state *state = (mw8080bw_state *)timer.machine->driver_data; + mw8080bw_state *state = timer.machine->driver_data(); output_set_value("STROBE", param && state->spcenctr_strobe_state); } static MACHINE_START( spcenctr ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->spcenctr_strobe_state); @@ -2177,28 +2177,28 @@ static MACHINE_START( spcenctr ) #if 0 UINT8 spcenctr_get_trench_width( *running_machine *machine ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); return state->spcenctr_trench_width; } UINT8 spcenctr_get_trench_center( *running_machine *machine ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); return state->spcenctr_trench_center; } UINT8 spcenctr_get_trench_slope( *running_machine *machine , UINT8 addr ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); return state->spcenctr_trench_slope[addr & 0x0f]; } #endif static WRITE8_HANDLER( spcenctr_io_w ) { /* A7 A6 A5 A4 A3 A2 A1 A0 */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); if ((offset & 0x07) == 0x02) watchdog_reset_w(space, 0, data); /* - - - - - 0 1 0 */ @@ -2326,7 +2326,7 @@ MACHINE_DRIVER_END static MACHINE_START( phantom2 ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->phantom2_cloud_counter); @@ -2420,7 +2420,7 @@ static READ8_HANDLER( bowler_shift_result_r ) /* ZV - not too sure why this is needed, I don't see anything unusual on the schematics that would cause the bits to flip */ - mw8080bw_state *state = (mw8080bw_state *)space->machine->driver_data; + mw8080bw_state *state = space->machine->driver_data(); return ~mb14241_shift_result_r(state->mb14241, 0); } @@ -2557,7 +2557,7 @@ MACHINE_DRIVER_END static MACHINE_START( invaders ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); /* setup for save states */ state_save_register_global(machine, state->invaders_flip_screen); diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 080ce7fa517..94333cf4373 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -46,12 +46,13 @@ Notes: #define SOUND_CLOCK XTAL_45MHz -class mwarr_state +class mwarr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mwarr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mwarr_state(machine)); } - mwarr_state(running_machine &machine) { } + mwarr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 *bg_videoram, *mlow_videoram, *mhigh_videoram, *tx_videoram, *sprites_buffer; @@ -76,7 +77,7 @@ public: static WRITE16_HANDLER( bg_videoram_w ) { - mwarr_state *state = (mwarr_state *)space->machine->driver_data; + mwarr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -84,7 +85,7 @@ static WRITE16_HANDLER( bg_videoram_w ) static WRITE16_HANDLER( mlow_videoram_w ) { - mwarr_state *state = (mwarr_state *)space->machine->driver_data; + mwarr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mlow_videoram[offset]); tilemap_mark_tile_dirty(state->mlow_tilemap,offset); @@ -92,7 +93,7 @@ static WRITE16_HANDLER( mlow_videoram_w ) static WRITE16_HANDLER( mhigh_videoram_w ) { - mwarr_state *state = (mwarr_state *)space->machine->driver_data; + mwarr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mhigh_videoram[offset]); tilemap_mark_tile_dirty(state->mhigh_tilemap,offset); @@ -100,7 +101,7 @@ static WRITE16_HANDLER( mhigh_videoram_w ) static WRITE16_HANDLER( tx_videoram_w ) { - mwarr_state *state = (mwarr_state *)space->machine->driver_data; + mwarr_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tx_videoram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap,offset); @@ -113,7 +114,7 @@ static WRITE16_DEVICE_HANDLER( oki1_bank_w ) static WRITE16_HANDLER( sprites_commands_w ) { - mwarr_state *state = (mwarr_state *)space->machine->driver_data; + mwarr_state *state = space->machine->driver_data(); if (state->which) { @@ -151,7 +152,7 @@ static WRITE16_HANDLER( sprites_commands_w ) static WRITE16_HANDLER( mwarr_brightness_w ) { - mwarr_state *state = (mwarr_state *)space->machine->driver_data; + mwarr_state *state = space->machine->driver_data(); int i; double brightness; @@ -331,7 +332,7 @@ GFXDECODE_END static TILE_GET_INFO( get_bg_tile_info ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); int tileno = state->bg_videoram[tile_index] & 0x1fff; int colour = (state->bg_videoram[tile_index] & 0xe000) >> 13; @@ -340,7 +341,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_mlow_tile_info ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); int tileno = state->mlow_videoram[tile_index] & 0x1fff; int colour = (state->mlow_videoram[tile_index] & 0xe000) >> 13; @@ -349,7 +350,7 @@ static TILE_GET_INFO( get_mlow_tile_info ) static TILE_GET_INFO( get_mhigh_tile_info ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); int tileno = state->mhigh_videoram[tile_index] & 0x1fff; int colour = (state->mhigh_videoram[tile_index] & 0xe000) >> 13; @@ -358,7 +359,7 @@ static TILE_GET_INFO( get_mhigh_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); int tileno = state->tx_videoram[tile_index] & 0x1fff; int colour = (state->tx_videoram[tile_index] & 0xe000) >> 13; @@ -367,7 +368,7 @@ static TILE_GET_INFO( get_tx_tile_info ) static VIDEO_START( mwarr ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 64, 16); state->mlow_tilemap = tilemap_create(machine, get_mlow_tile_info, tilemap_scan_cols, 16, 16, 64, 16); @@ -389,7 +390,7 @@ static VIDEO_START( mwarr ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); const UINT16 *source = state->sprites_buffer + 0x800 - 4; const UINT16 *finish = state->sprites_buffer; const gfx_element *gfx = machine->gfx[0]; @@ -460,7 +461,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( mwarr ) { - mwarr_state *state = (mwarr_state *)screen->machine->driver_data; + mwarr_state *state = screen->machine->driver_data(); int i; bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -521,14 +522,14 @@ static VIDEO_UPDATE( mwarr ) static MACHINE_START( mwarr ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); state_save_register_global(machine, state->which); } static MACHINE_RESET( mwarr ) { - mwarr_state *state = (mwarr_state *)machine->driver_data; + mwarr_state *state = machine->driver_data(); state->which = 0; } diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index d0b6879192b..c2f75cb483b 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -72,7 +72,7 @@ static INPUT_CHANGED( coin_inserted ) static WRITE8_HANDLER( mystston_ay8910_select_w ) { - mystston_state *state = (mystston_state *)space->machine->driver_data; + mystston_state *state = space->machine->driver_data(); /* bit 5 goes to 8910 #0 BDIR pin */ if (((*state->ay8910_select & 0x20) == 0x20) && ((data & 0x20) == 0x00)) diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c index 1305091f0c3..27b633db553 100644 --- a/src/mame/drivers/n8080.c +++ b/src/mame/drivers/n8080.c @@ -19,19 +19,19 @@ static WRITE8_HANDLER( n8080_shift_bits_w ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); state->shift_bits = data & 7; } static WRITE8_HANDLER( n8080_shift_data_w ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); state->shift_data = (state->shift_data >> 8) | (data << 8); } static READ8_HANDLER( n8080_shift_r ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); return state->shift_data >> (8 - state->shift_bits); } @@ -393,7 +393,7 @@ INPUT_PORTS_END static TIMER_DEVICE_CALLBACK( rst1_tick ) { - n8080_state *n8080 = (n8080_state *)timer.machine->driver_data; + n8080_state *n8080 = timer.machine->driver_data(); int state = n8080->inte ? ASSERT_LINE : CLEAR_LINE; /* V7 = 1, V6 = 0 */ @@ -402,7 +402,7 @@ static TIMER_DEVICE_CALLBACK( rst1_tick ) static TIMER_DEVICE_CALLBACK( rst2_tick ) { - n8080_state *n8080 = (n8080_state *)timer.machine->driver_data; + n8080_state *n8080 = timer.machine->driver_data(); int state = n8080->inte ? ASSERT_LINE : CLEAR_LINE; /* vblank */ @@ -411,7 +411,7 @@ static TIMER_DEVICE_CALLBACK( rst2_tick ) static WRITE_LINE_DEVICE_HANDLER( n8080_inte_callback ) { - n8080_state *n8080 = (n8080_state *)device->machine->driver_data; + n8080_state *n8080 = device->machine->driver_data(); n8080->inte = state; } @@ -434,7 +434,7 @@ static I8085_CONFIG( n8080_cpu_config ) static MACHINE_START( n8080 ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -464,7 +464,7 @@ static MACHINE_START( helifire ) static MACHINE_RESET( n8080 ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->shift_data = 0; state->shift_bits = 0; @@ -473,7 +473,7 @@ static MACHINE_RESET( n8080 ) static MACHINE_RESET( spacefev ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); MACHINE_RESET_CALL(n8080); MACHINE_RESET_CALL(spacefev_sound); @@ -484,7 +484,7 @@ static MACHINE_RESET( spacefev ) static MACHINE_RESET( sheriff ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); MACHINE_RESET_CALL(n8080); MACHINE_RESET_CALL(sheriff_sound); @@ -495,7 +495,7 @@ static MACHINE_RESET( sheriff ) static MACHINE_RESET( helifire ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); MACHINE_RESET_CALL(n8080); MACHINE_RESET_CALL(helifire_sound); diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 87a3d78472f..6edda7444a2 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -55,7 +55,7 @@ So this is the correct behavior of real hardware, not an emulation bug. static INTERRUPT_GEN( nemesis_interrupt ) { - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); if (state->irq_on) cpu_set_input_line(device, 1, HOLD_LINE); @@ -63,7 +63,7 @@ static INTERRUPT_GEN( nemesis_interrupt ) static INTERRUPT_GEN( konamigt_interrupt ) { - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); if (cpu_getiloops(device) == 0) { @@ -79,7 +79,7 @@ static INTERRUPT_GEN( konamigt_interrupt ) static INTERRUPT_GEN( gx400_interrupt ) { - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); switch (cpu_getiloops(device)) { @@ -102,7 +102,7 @@ static INTERRUPT_GEN( gx400_interrupt ) static INTERRUPT_GEN( salamand_interrupt ) { - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); if (state->irq_on) cpu_set_input_line(device, 1, HOLD_LINE); @@ -110,7 +110,7 @@ static INTERRUPT_GEN( salamand_interrupt ) static INTERRUPT_GEN( blkpnthr_interrupt ) { - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); if (state->irq_on) cpu_set_input_line(device, 2, HOLD_LINE); @@ -119,7 +119,7 @@ static INTERRUPT_GEN( blkpnthr_interrupt ) static WRITE16_HANDLER( gx400_irq1_enable_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->irq1_on = data & 0x0001; @@ -130,7 +130,7 @@ static WRITE16_HANDLER( gx400_irq1_enable_word_w ) static WRITE16_HANDLER( gx400_irq2_enable_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->irq2_on = data & 0x0001; @@ -141,7 +141,7 @@ static WRITE16_HANDLER( gx400_irq2_enable_word_w ) static WRITE16_HANDLER( gx400_irq4_enable_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->irq4_on = data & 0x0100; @@ -149,7 +149,7 @@ static WRITE16_HANDLER( gx400_irq4_enable_word_w ) static WRITE16_HANDLER( nemesis_irq_enable_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->irq_on = data & 0xff; @@ -160,7 +160,7 @@ static WRITE16_HANDLER( nemesis_irq_enable_word_w ) static WRITE16_HANDLER( konamigt_irq_enable_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->irq_on = data & 0xff; @@ -171,7 +171,7 @@ static WRITE16_HANDLER( konamigt_irq_enable_word_w ) static WRITE16_HANDLER( konamigt_irq2_enable_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->irq2_on = data & 0xff; @@ -183,13 +183,13 @@ static WRITE16_HANDLER( konamigt_irq2_enable_word_w ) static READ16_HANDLER( gx400_sharedram_word_r ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); return state->gx400_shared_ram[offset]; } static WRITE16_HANDLER( gx400_sharedram_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->gx400_shared_ram[offset] = data; @@ -225,7 +225,7 @@ static READ16_HANDLER( konamigt_input_word_r ) static WRITE16_HANDLER( selected_ip_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->selected_ip = data & 0xff; // latch the value @@ -233,7 +233,7 @@ static WRITE16_HANDLER( selected_ip_word_w ) static READ16_HANDLER( selected_ip_word_r ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); switch (state->selected_ip & 0xf) { // From WEC Le Mans Schems: @@ -255,7 +255,7 @@ static WRITE16_HANDLER( nemesis_soundlatch_word_w ) static WRITE8_DEVICE_HANDLER( gx400_speech_start_w ) { - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); /* the voice data is not in a rom but in sound RAM at $8000 */ vlm5030_set_rom(device, state->gx400_shared_ram + 0x4000); @@ -277,7 +277,7 @@ static READ8_DEVICE_HANDLER( nemesis_portA_r ) bit 5: vlm5030 busy bit 7: unused by this software version. Bubble Memory version uses this bit. */ - nemesis_state *state = (nemesis_state *)device->machine->driver_data; + nemesis_state *state = device->machine->driver_data(); int res = (state->audiocpu->total_cycles() / 1024) & 0x2f; // this should be 0x0f, but it doesn't work res |= 0xd0; @@ -571,7 +571,7 @@ ADDRESS_MAP_END static READ8_HANDLER( wd_r ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); state->frame_counter ^= 1; return state->frame_counter; } @@ -1617,7 +1617,7 @@ static const ay8910_interface ay8910_interface_2 = static void sound_irq(running_device *device, int state) { /* Interrupts _are_ generated, I wonder where they go.. */ -// nemesis_state *driver_state = (nemesis_state *)device->machine->driver_data; +// nemesis_state *driver_state = device->machine->driver_data(); // cpu_set_input_line(driver_state->audiocpu, 0, HOLD_LINE); } @@ -1646,7 +1646,7 @@ static const k007232_interface k007232_config = static MACHINE_START( nemesis ) { - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1667,7 +1667,7 @@ static MACHINE_START( nemesis ) static MACHINE_RESET( nemesis ) { - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); state->irq_on = 0; state->irq1_on = 0; diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index e4d6eb96709..fb948b8d0dd 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -7720,7 +7720,7 @@ static DRIVER_INIT( mslugx ) static DRIVER_INIT( kof99 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); kof99_decrypt_68k(machine); state->fixed_layer_bank_type = 1; @@ -7730,7 +7730,7 @@ static DRIVER_INIT( kof99 ) static DRIVER_INIT( kof99k ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0x00); @@ -7738,7 +7738,7 @@ static DRIVER_INIT( kof99k ) static DRIVER_INIT( garou ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); garou_decrypt_68k(machine); state->fixed_layer_bank_type = 1; @@ -7748,7 +7748,7 @@ static DRIVER_INIT( garou ) static DRIVER_INIT( garouo ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); garouo_decrypt_68k(machine); state->fixed_layer_bank_type = 1; @@ -7765,7 +7765,7 @@ static DRIVER_INIT( garoubl ) static DRIVER_INIT( mslug3 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); mslug3_decrypt_68k(machine); state->fixed_layer_bank_type = 1; @@ -7775,7 +7775,7 @@ static DRIVER_INIT( mslug3 ) static DRIVER_INIT( mslug3h ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0xad); @@ -7790,7 +7790,7 @@ static DRIVER_INIT( mslug3b6 ) static DRIVER_INIT( kof2000 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); kof2000_decrypt_68k(machine); state->fixed_layer_bank_type = 2; @@ -7801,7 +7801,7 @@ static DRIVER_INIT( kof2000 ) static DRIVER_INIT( kof2000n ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 2; neogeo_cmc50_m1_decrypt(machine); @@ -7810,7 +7810,7 @@ static DRIVER_INIT( kof2000n ) static DRIVER_INIT( kof2001 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof2000_neogeo_gfx_decrypt(machine, 0x1e); @@ -7840,7 +7840,7 @@ static DRIVER_INIT ( ct2k3sa ) static DRIVER_INIT( mslug4 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; /* USA violent content screen is wrong -- not a bug, confirmed on real hardware! */ neogeo_cmc50_m1_decrypt(machine); @@ -7858,7 +7858,7 @@ static DRIVER_INIT( ms4plus ) static DRIVER_INIT( ganryu ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0x07); @@ -7866,7 +7866,7 @@ static DRIVER_INIT( ganryu ) static DRIVER_INIT( s1945p ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0x05); @@ -7874,7 +7874,7 @@ static DRIVER_INIT( s1945p ) static DRIVER_INIT( preisle2 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0x9f); @@ -7882,7 +7882,7 @@ static DRIVER_INIT( preisle2 ) static DRIVER_INIT( bangbead ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0xf8); @@ -7890,7 +7890,7 @@ static DRIVER_INIT( bangbead ) static DRIVER_INIT( nitd ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0xff); @@ -7898,7 +7898,7 @@ static DRIVER_INIT( nitd ) static DRIVER_INIT( zupapa ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0xbd); @@ -7906,7 +7906,7 @@ static DRIVER_INIT( zupapa ) static DRIVER_INIT( sengoku3 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; kof99_neogeo_gfx_decrypt(machine, 0xfe); @@ -7914,7 +7914,7 @@ static DRIVER_INIT( sengoku3 ) static DRIVER_INIT( rotd ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); neo_pcm2_snk_1999(machine, 16); state->fixed_layer_bank_type = 1; @@ -7997,7 +7997,7 @@ static DRIVER_INIT( kof2k4se ) static DRIVER_INIT( matrim ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); matrim_decrypt_68k(machine); neo_pcm2_swap(machine, 1); @@ -8008,7 +8008,7 @@ static DRIVER_INIT( matrim ) static DRIVER_INIT( matrimbl ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); matrim_decrypt_68k(machine); state->fixed_layer_bank_type = 2; @@ -8018,7 +8018,7 @@ static DRIVER_INIT( matrimbl ) static DRIVER_INIT( pnyaa ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); neo_pcm2_snk_1999(machine, 4); state->fixed_layer_bank_type = 1; @@ -8028,7 +8028,7 @@ static DRIVER_INIT( pnyaa ) static DRIVER_INIT( mslug5 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); mslug5_decrypt_68k(machine); neo_pcm2_swap(machine, 2); @@ -8046,7 +8046,7 @@ static TIMER_CALLBACK( ms5pcb_bios_timer_callback ) static DRIVER_INIT( ms5pcb ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); /* start a timer that will check the BIOS select DIP every second */ @@ -8065,7 +8065,7 @@ static DRIVER_INIT( ms5pcb ) static DRIVER_INIT( ms5plus ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); cmc50_neogeo_gfx_decrypt(machine, 0x19); neo_pcm2_swap(machine, 2); @@ -8083,7 +8083,7 @@ static TIMER_CALLBACK( svcpcb_bios_timer_callback ) static DRIVER_INIT( svcpcb ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); /* start a timer that will check the BIOS select DIP every second */ @@ -8102,7 +8102,7 @@ static DRIVER_INIT( svcpcb ) static DRIVER_INIT( svc ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); svc_px_decrypt(machine); neo_pcm2_swap(machine, 3); @@ -8149,7 +8149,7 @@ static DRIVER_INIT( svcsplus ) static DRIVER_INIT( samsho5 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); samsho5_decrypt_68k(machine); neo_pcm2_swap(machine, 4); @@ -8169,7 +8169,7 @@ static DRIVER_INIT( samsho5b ) static DRIVER_INIT( kf2k3pcb ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); kf2k3pcb_decrypt_68k(machine); kf2k3pcb_gfx_decrypt(machine); @@ -8199,7 +8199,7 @@ static DRIVER_INIT( kf2k3pcb ) static DRIVER_INIT( kof2003 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); kof2003_decrypt_68k(machine); neo_pcm2_swap(machine, 5); @@ -8211,7 +8211,7 @@ static DRIVER_INIT( kof2003 ) static DRIVER_INIT( kof2003h ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); kof2003h_decrypt_68k(machine); neo_pcm2_swap(machine, 5); @@ -8252,7 +8252,7 @@ static DRIVER_INIT( kf2k3upl ) static DRIVER_INIT( samsh5sp ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); samsh5sp_decrypt_68k(machine); neo_pcm2_swap(machine, 6); @@ -8263,7 +8263,7 @@ static DRIVER_INIT( samsh5sp ) static DRIVER_INIT( jockeygp ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); DRIVER_INIT_CALL(neogeo); state->fixed_layer_bank_type = 1; neogeo_cmc50_m1_decrypt(machine); diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 399a2d356ee..49adeefd93f 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -241,7 +241,7 @@ static void set_output_data(running_machine *machine, UINT8 data); static void adjust_display_position_interrupt_timer( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if ((state->display_counter + 1) != 0) { @@ -255,14 +255,14 @@ static void adjust_display_position_interrupt_timer( running_machine *machine ) void neogeo_set_display_position_interrupt_control( running_machine *machine, UINT16 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->display_position_interrupt_control = data; } void neogeo_set_display_counter_msb( const address_space *space, UINT16 data ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); state->display_counter = (state->display_counter & 0x0000ffff) | ((UINT32)data << 16); @@ -272,7 +272,7 @@ void neogeo_set_display_counter_msb( const address_space *space, UINT16 data ) void neogeo_set_display_counter_lsb( const address_space *space, UINT16 data ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); state->display_counter = (state->display_counter & 0xffff0000) | data; @@ -288,7 +288,7 @@ void neogeo_set_display_counter_lsb( const address_space *space, UINT16 data ) static void update_interrupts( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); cputag_set_input_line(machine, "maincpu", 1, state->vblank_interrupt_pending ? ASSERT_LINE : CLEAR_LINE); cputag_set_input_line(machine, "maincpu", 2, state->display_position_interrupt_pending ? ASSERT_LINE : CLEAR_LINE); @@ -298,7 +298,7 @@ static void update_interrupts( running_machine *machine ) void neogeo_acknowledge_interrupt( running_machine *machine, UINT16 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (data & 0x01) state->irq3_pending = 0; @@ -313,7 +313,7 @@ void neogeo_acknowledge_interrupt( running_machine *machine, UINT16 data ) static TIMER_CALLBACK( display_position_interrupt_callback ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (LOG_VIDEO_SYSTEM) logerror("--- Scanline @ %d,%d\n", machine->primary_screen->vpos(), machine->primary_screen->hpos()); @@ -335,7 +335,7 @@ static TIMER_CALLBACK( display_position_interrupt_callback ) static TIMER_CALLBACK( display_position_vblank_callback ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (state->display_position_interrupt_control & IRQ2CTRL_AUTOLOAD_VBLANK) { @@ -350,7 +350,7 @@ static TIMER_CALLBACK( display_position_vblank_callback ) static TIMER_CALLBACK( vblank_interrupt_callback ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (LOG_VIDEO_SYSTEM) logerror("+++ VBLANK @ %d,%d\n", machine->primary_screen->vpos(), machine->primary_screen->hpos()); @@ -368,7 +368,7 @@ static TIMER_CALLBACK( vblank_interrupt_callback ) static void create_interrupt_timers( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->display_position_interrupt_timer = timer_alloc(machine, display_position_interrupt_callback, NULL); state->display_position_vblank_timer = timer_alloc(machine, display_position_vblank_callback, NULL); state->vblank_interrupt_timer = timer_alloc(machine, vblank_interrupt_callback, NULL); @@ -377,7 +377,7 @@ static void create_interrupt_timers( running_machine *machine ) static void start_interrupt_timers( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); timer_adjust_oneshot(state->vblank_interrupt_timer, machine->primary_screen->time_until_pos(NEOGEO_VBSTART), 0); timer_adjust_oneshot(state->display_position_vblank_timer, machine->primary_screen->time_until_pos(NEOGEO_VBSTART, NEOGEO_VBLANK_RELOAD_HPOS), 0); } @@ -392,21 +392,21 @@ static void start_interrupt_timers( running_machine *machine ) static void audio_cpu_irq(running_device *device, int assert) { - neogeo_state *state = (neogeo_state *)device->machine->driver_data; + neogeo_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, assert ? ASSERT_LINE : CLEAR_LINE); } static void audio_cpu_assert_nmi(running_machine *machine) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( audio_cpu_clear_nmi_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); } @@ -420,14 +420,14 @@ static WRITE8_HANDLER( audio_cpu_clear_nmi_w ) static void select_controller( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->controller_select = data; } static CUSTOM_INPUT( multiplexed_controller_r ) { - neogeo_state *state = (neogeo_state *)field->port->machine->driver_data; + neogeo_state *state = field->port->machine->driver_data(); int port = (FPTR)param; static const char *const cntrl[2][2] = @@ -441,7 +441,7 @@ static CUSTOM_INPUT( multiplexed_controller_r ) static CUSTOM_INPUT( mahjong_controller_r ) { - neogeo_state *state = (neogeo_state *)field->port->machine->driver_data; + neogeo_state *state = field->port->machine->driver_data(); UINT32 ret; /* @@ -467,7 +467,7 @@ cpu #0 (PC=00C18C40): unmapped memory word write to 00380000 = 0000 & 00FF static WRITE16_HANDLER( io_control_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); switch (offset) { case 0x00: select_controller(space->machine, data & 0x00ff); break; @@ -495,7 +495,7 @@ static WRITE16_HANDLER( io_control_w ) READ16_HANDLER( neogeo_unmapped_r ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); UINT16 ret; /* unmapped memory returns the last word on the data bus, which is almost always the opcode @@ -524,7 +524,7 @@ READ16_HANDLER( neogeo_unmapped_r ) static CUSTOM_INPUT( get_calendar_status ) { - neogeo_state *state = (neogeo_state *)field->port->machine->driver_data; + neogeo_state *state = field->port->machine->driver_data(); return (upd4990a_databit_r(state->upd4990a, 0) << 1) | upd4990a_testbit_r(state->upd4990a, 0); } @@ -554,14 +554,14 @@ static NVRAM_HANDLER( neogeo ) static void set_save_ram_unlock( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->save_ram_unlocked = data; } static WRITE16_HANDLER( save_ram_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); if (state->save_ram_unlocked) COMBINE_DATA(&save_ram[offset]); @@ -668,7 +668,7 @@ static READ8_HANDLER( audio_command_r ) static WRITE8_HANDLER( audio_result_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); if (LOG_CPU_COMM && (state->audio_result != data)) logerror(" AUD CPU PC %04x: audio_result_w %02x\n", cpu_get_pc(space->cpu), data); @@ -678,7 +678,7 @@ static WRITE8_HANDLER( audio_result_w ) static CUSTOM_INPUT( get_audio_result ) { - neogeo_state *state = (neogeo_state *)field->port->machine->driver_data; + neogeo_state *state = field->port->machine->driver_data(); UINT32 ret = state->audio_result; // if (LOG_CPU_COMM) logerror("MAIN CPU PC %06x: audio_result_r %02x\n", cpu_get_pc(field->port->machine->device("maincpu")), ret); @@ -696,14 +696,14 @@ static CUSTOM_INPUT( get_audio_result ) static void _set_main_cpu_vector_table_source( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); memory_set_bank(machine, NEOGEO_BANK_VECTORS, state->main_cpu_vector_table_source); } static void set_main_cpu_vector_table_source( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->main_cpu_vector_table_source = data; _set_main_cpu_vector_table_source(machine); @@ -712,14 +712,14 @@ static void set_main_cpu_vector_table_source( running_machine *machine, UINT8 da static void _set_main_cpu_bank_address( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); memory_set_bankptr(machine, NEOGEO_BANK_CARTRIDGE, &memory_region(machine, "maincpu")[state->main_cpu_bank_address]); } void neogeo_set_main_cpu_bank_address( const address_space *space, UINT32 bank_address ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); if (LOG_MAIN_CPU_BANKING) logerror("MAIN CPU PC %06x: neogeo_set_main_cpu_bank_address %06x\n", cpu_get_pc(space->cpu), bank_address); @@ -776,7 +776,7 @@ static void main_cpu_banking_init( running_machine *machine ) static void set_audio_cpu_banking( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); int region; for (region = 0; region < 4; region++) @@ -786,7 +786,7 @@ static void set_audio_cpu_banking( running_machine *machine ) static void audio_cpu_bank_select( const address_space *space, int region, UINT8 bank ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); if (LOG_AUDIO_CPU_BANKING) logerror("Audio CPU PC %03x: audio_cpu_bank_select: Region: %d Bank: %02x\n", cpu_get_pc(space->cpu), region, bank); @@ -830,7 +830,7 @@ static READ8_HANDLER( audio_cpu_bank_select_8000_bfff_r ) static void _set_audio_cpu_rom_source( const address_space *space ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); /* if (!memory_region(machine, "audiobios")) */ state->audio_cpu_rom_source = 1; @@ -851,7 +851,7 @@ static void _set_audio_cpu_rom_source( const address_space *space ) static void set_audio_cpu_rom_source( const address_space *space, UINT8 data ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); state->audio_cpu_rom_source = data; _set_audio_cpu_rom_source(space); @@ -860,7 +860,7 @@ static void set_audio_cpu_rom_source( const address_space *space, UINT8 data ) static void audio_cpu_banking_init( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); int region; int bank; UINT8 *rgn; @@ -988,7 +988,7 @@ static WRITE16_HANDLER( watchdog_w ) static void set_outputs( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); static const UINT8 led_map[0x10] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0x58,0x4c,0x62,0x69,0x78,0x00 }; @@ -1007,7 +1007,7 @@ static void set_outputs( running_machine *machine ) static void set_output_latch( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); /* looks like the LEDs are set on the falling edge */ @@ -1033,7 +1033,7 @@ static void set_output_latch( running_machine *machine, UINT8 data ) static void set_output_data( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->output_data = data; } @@ -1056,7 +1056,7 @@ static STATE_POSTLOAD( neogeo_postload ) static MACHINE_START( neogeo ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); /* set the BIOS bank */ memory_set_bankptr(machine, NEOGEO_BANK_BIOS, memory_region(machine, "mainbios")); @@ -1115,7 +1115,7 @@ static MACHINE_START( neogeo ) static MACHINE_RESET( neogeo ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); offs_t offs; const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); @@ -1389,7 +1389,7 @@ MACHINE_DRIVER_END static DRIVER_INIT( neogeo ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->fixed_layer_bank_type = 0; } diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index 6e44f558495..3a13915cc8a 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -115,14 +115,14 @@ GFXDECODE_END static MACHINE_START( news ) { - news_state *state = (news_state *)machine->driver_data; + news_state *state = machine->driver_data(); state_save_register_global(machine, state->bgpic); } static MACHINE_RESET( news ) { - news_state *state = (news_state *)machine->driver_data; + news_state *state = machine->driver_data(); state->bgpic = 0; } diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 3d5d26f15c0..05cae611857 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -27,12 +27,13 @@ TODO: #define MASTER_CLOCK XTAL_19_968MHz -class nightgal_state +class nightgal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nightgal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nightgal_state(machine)); } - nightgal_state(running_machine &machine) { } + nightgal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * blit_buffer; @@ -63,7 +64,7 @@ static READ8_HANDLER( blitter_status_r ) static VIDEO_START( nightgal ) { - nightgal_state *state = (nightgal_state *)machine->driver_data; + nightgal_state *state = machine->driver_data(); state->blit_buffer = auto_alloc_array(machine, UINT8, 256*256); state_save_register_global_pointer(machine, state->blit_buffer, 256*256); @@ -71,7 +72,7 @@ static VIDEO_START( nightgal ) static VIDEO_UPDATE( nightgal ) { - nightgal_state *state = (nightgal_state *)screen->machine->driver_data; + nightgal_state *state = screen->machine->driver_data(); int x, y; for (y = cliprect->min_y; y <= cliprect->max_y; ++y) @@ -107,7 +108,7 @@ static UINT8 nightgal_gfx_nibble( running_machine *machine, int niboffset ) static void plot_nightgal_gfx_pixel( running_machine *machine, UINT8 pix, int x, int y ) { - nightgal_state *state = (nightgal_state *)machine->driver_data; + nightgal_state *state = machine->driver_data(); if (y >= 512) return; if (x >= 512) return; if (y < 0) return; @@ -121,7 +122,7 @@ static void plot_nightgal_gfx_pixel( running_machine *machine, UINT8 pix, int x, static WRITE8_HANDLER( nsc_true_blitter_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); int src, x, y, h, w, flipx; state->true_blit[offset] = data; @@ -176,7 +177,7 @@ static WRITE8_HANDLER( nsc_true_blitter_w ) /* different register writes (probably a PAL line swapping).*/ static WRITE8_HANDLER( sexygal_nsc_true_blitter_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); int src, x, y, h, w, flipx; state->true_blit[offset] = data; @@ -300,40 +301,40 @@ master-slave algorythm #ifdef UNUSED_CODE static WRITE8_HANDLER( nsc_latch_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, 0, HOLD_LINE ); } static READ8_HANDLER( nsc_latch_r ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); return state->z80_latch; } static WRITE8_HANDLER( z80_latch_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->nsc_latch = data; } static READ8_HANDLER( z80_latch_r ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); return state->nsc_latch; } /*z80 -> MCU video params*/ static WRITE8_HANDLER( blitter_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->blit_raw_data[offset] = data; MAIN_Z80_HALT; } static READ8_HANDLER( nsc_blit_r ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); MAIN_Z80_RUN; return state->blit_raw_data[offset]; } @@ -342,26 +343,26 @@ static READ8_HANDLER( nsc_blit_r ) static WRITE8_HANDLER( royalqn_blitter_0_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->blit_raw_data[0] = data; } static WRITE8_HANDLER( royalqn_blitter_1_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->blit_raw_data[1] = data; } static WRITE8_HANDLER( royalqn_blitter_2_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->blit_raw_data[2] = data; cpu_set_input_line(state->subcpu, 0, ASSERT_LINE ); } static READ8_HANDLER( royalqn_nsc_blit_r ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); if(offset == 2) cpu_set_input_line(state->subcpu, 0, CLEAR_LINE ); @@ -371,14 +372,14 @@ static READ8_HANDLER( royalqn_nsc_blit_r ) static READ8_HANDLER( royalqn_comm_r ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); return (state->comms_ram[offset] & 0x80) | (0x7f); //bits 6-0 are undefined, presumably open bus } static WRITE8_HANDLER( royalqn_comm_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->comms_ram[offset] = data & 0x80; } @@ -386,19 +387,19 @@ static WRITE8_HANDLER( royalqn_comm_w ) #ifdef UNUSED_CODE static WRITE8_HANDLER( blit_vregs_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->pen_raw_data[offset] = data; } static READ8_HANDLER( blit_vregs_r ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); return state->pen_raw_data[offset]; } #endif static WRITE8_HANDLER( blit_true_vregs_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->pen_data[offset] = data; } @@ -410,14 +411,14 @@ static WRITE8_HANDLER( blit_true_vregs_w ) static WRITE8_HANDLER( mux_w ) { - nightgal_state *state = (nightgal_state *)space->machine->driver_data; + nightgal_state *state = space->machine->driver_data(); state->mux_data = ~data; //printf("%02x\n", state->mux_data); } static READ8_DEVICE_HANDLER( input_1p_r ) { - nightgal_state *state = (nightgal_state *)device->machine->driver_data; + nightgal_state *state = device->machine->driver_data(); UINT8 cr_clear = input_port_read(device->machine, "CR_CLEAR"); switch (state->mux_data) @@ -437,7 +438,7 @@ static READ8_DEVICE_HANDLER( input_1p_r ) static READ8_DEVICE_HANDLER( input_2p_r ) { - nightgal_state *state = (nightgal_state *)device->machine->driver_data; + nightgal_state *state = device->machine->driver_data(); UINT8 coin_port = input_port_read(device->machine, "COINS"); switch (state->mux_data) @@ -828,7 +829,7 @@ static const ay8910_interface ay8910_config = static MACHINE_START( nightgal ) { - nightgal_state *state = (nightgal_state *)machine->driver_data; + nightgal_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -845,7 +846,7 @@ static MACHINE_START( nightgal ) static MACHINE_RESET( nightgal ) { - nightgal_state *state = (nightgal_state *)machine->driver_data; + nightgal_state *state = machine->driver_data(); state->nsc_latch = 0; state->z80_latch = 0; diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index e208f745159..cbe169c483b 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -328,14 +328,14 @@ static void parse_control( running_machine *machine ) /* assumes Z80 sandwiched /* bit 0 enables cpu B */ /* however this fails when recovering from a save state if cpu B is disabled !! */ - ninjaw_state *state = (ninjaw_state *)machine->driver_data; + ninjaw_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, (state->cpua_ctrl & 0x1) ? CLEAR_LINE : ASSERT_LINE); } static WRITE16_HANDLER( cpua_ctrl_w ) { - ninjaw_state *state = (ninjaw_state *)space->machine->driver_data; + ninjaw_state *state = space->machine->driver_data(); if ((data &0xff00) && ((data &0xff) == 0)) data = data >> 8; @@ -353,13 +353,13 @@ static WRITE16_HANDLER( cpua_ctrl_w ) static void reset_sound_region( running_machine *machine ) { - ninjaw_state *state = (ninjaw_state *)machine->driver_data; + ninjaw_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - ninjaw_state *state = (ninjaw_state *)space->machine->driver_data; + ninjaw_state *state = space->machine->driver_data(); state->banknum = data & 7; reset_sound_region(space->machine); @@ -367,7 +367,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static WRITE16_HANDLER( ninjaw_sound_w ) { - ninjaw_state *state = (ninjaw_state *)space->machine->driver_data; + ninjaw_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, data & 0xff); @@ -382,7 +382,7 @@ static WRITE16_HANDLER( ninjaw_sound_w ) static READ16_HANDLER( ninjaw_sound_r ) { - ninjaw_state *state = (ninjaw_state *)space->machine->driver_data; + ninjaw_state *state = space->machine->driver_data(); if (offset == 1) return ((tc0140syt_comm_r(state->tc0140syt, 0) & 0xff)); @@ -395,7 +395,7 @@ static READ16_HANDLER( ninjaw_sound_r ) static WRITE8_HANDLER( ninjaw_pancontrol ) { - ninjaw_state *state = (ninjaw_state *)space->machine->driver_data; + ninjaw_state *state = space->machine->driver_data(); running_device *flt = NULL; offset &= 3; @@ -415,7 +415,7 @@ static WRITE8_HANDLER( ninjaw_pancontrol ) static WRITE16_HANDLER( tc0100scn_triple_screen_w ) { - ninjaw_state *state = (ninjaw_state *)space->machine->driver_data; + ninjaw_state *state = space->machine->driver_data(); tc0100scn_word_w(state->tc0100scn_1, offset, data, mem_mask); tc0100scn_word_w(state->tc0100scn_2, offset, data, mem_mask); @@ -648,7 +648,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - ninjaw_state *state = (ninjaw_state *)device->machine->driver_data; + ninjaw_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -759,7 +759,7 @@ static STATE_POSTLOAD( ninjaw_postload ) static MACHINE_START( ninjaw ) { - ninjaw_state *state = (ninjaw_state *)machine->driver_data; + ninjaw_state *state = machine->driver_data(); memory_configure_bank(machine, "bank10", 0, 8, memory_region(machine, "audiocpu") + 0xc000, 0x4000); @@ -788,7 +788,7 @@ static MACHINE_START( ninjaw ) static MACHINE_RESET( ninjaw ) { - ninjaw_state *state = (ninjaw_state *)machine->driver_data; + ninjaw_state *state = machine->driver_data(); state->cpua_ctrl = 0xff; state->banknum = 0; memset(state->pandata, 0, sizeof(state->pandata)); diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 7852425be1b..381fcd88021 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -226,12 +226,13 @@ Stephh's notes (based on the games M68000 code and some tests) : #include "sound/3812intf.h" -class nmg5_state +class nmg5_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nmg5_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nmg5_state(machine)); } - nmg5_state(running_machine &machine) { } + nmg5_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * fg_videoram; @@ -257,21 +258,21 @@ public: static WRITE16_HANDLER( fg_videoram_w ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); } static WRITE16_HANDLER( bg_videoram_w ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static WRITE16_HANDLER( nmg5_soundlatch_w ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -282,19 +283,19 @@ static WRITE16_HANDLER( nmg5_soundlatch_w ) static READ16_HANDLER( prot_r ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); return state->prot_val | state->input_data; } static WRITE16_HANDLER( prot_w ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); state->input_data = data & 0x0f; } static WRITE16_HANDLER( gfx_bank_w ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); if (state->gfx_bank != (data & 3)) { @@ -305,7 +306,7 @@ static WRITE16_HANDLER( gfx_bank_w ) static WRITE16_HANDLER( priority_reg_w ) { - nmg5_state *state = (nmg5_state *)space->machine->driver_data; + nmg5_state *state = space->machine->driver_data(); state->priority_reg = data & 7; @@ -826,16 +827,16 @@ INPUT_PORTS_END INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, UINT16 *vram, int color ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); SET_TILE_INFO(0, vram[tile_index] | (state->gfx_bank << 16), color, 0); } -static TILE_GET_INFO( fg_get_tile_info ) { nmg5_state *state = (nmg5_state *)machine->driver_data; get_tile_info(machine, tileinfo, tile_index, state->fg_videoram, 0); } -static TILE_GET_INFO( bg_get_tile_info ) { nmg5_state *state = (nmg5_state *)machine->driver_data; get_tile_info(machine, tileinfo, tile_index, state->bg_videoram, 1); } +static TILE_GET_INFO( fg_get_tile_info ) { nmg5_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, state->fg_videoram, 0); } +static TILE_GET_INFO( bg_get_tile_info ) { nmg5_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, state->bg_videoram, 1); } static VIDEO_START( nmg5 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->fg_tilemap = tilemap_create(machine, fg_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -844,7 +845,7 @@ static VIDEO_START( nmg5 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -880,7 +881,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); int yyy = 256; int xxx = 512 / 4; UINT16 x, y, count; @@ -910,7 +911,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) static VIDEO_UPDATE( nmg5 ) { - nmg5_state *state = (nmg5_state *)screen->machine->driver_data; + nmg5_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, state->scroll_ram[3] + 9); tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll_ram[2] + 3); @@ -999,7 +1000,7 @@ GFXDECODE_END static void soundirq( running_device *device, int state ) { - nmg5_state *driver_state = (nmg5_state *)device->machine->driver_data; + nmg5_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->soundcpu, 0, state); } @@ -1010,7 +1011,7 @@ static const ym3812_interface ym3812_intf = static MACHINE_START( nmg5 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->soundcpu = machine->device("soundcpu"); @@ -1022,7 +1023,7 @@ static MACHINE_START( nmg5 ) static MACHINE_RESET( nmg5 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); /* some games don't set the priority register so it should be hard-coded to a normal layout */ state->priority_reg = 7; @@ -1527,25 +1528,25 @@ ROM_END static DRIVER_INIT( prot_val_00 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); state->prot_val = 0x00; } static DRIVER_INIT( prot_val_10 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); state->prot_val = 0x10; } static DRIVER_INIT( prot_val_20 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); state->prot_val = 0x20; } static DRIVER_INIT( prot_val_40 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = machine->driver_data(); state->prot_val = 0x40; } diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index f4414d6416c..24f3630f31e 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -156,32 +156,32 @@ Stephh's additional notes (based on the game Z80 code and some tests) : static WRITE8_HANDLER( sub_cpu_halt_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_HALT, (data) ? ASSERT_LINE : CLEAR_LINE); } static READ8_HANDLER( from_snd_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->snd_data; } static WRITE8_HANDLER( to_main_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->snd_data = data; } static READ8_HANDLER(nycaptor_sharedram_r) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE8_HANDLER(nycaptor_sharedram_w) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->sharedram[offset] = data; } @@ -192,7 +192,7 @@ static READ8_HANDLER( nycaptor_b_r ) static READ8_HANDLER( nycaptor_by_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); int port = input_port_read(space->machine, "LIGHTY"); if (state->gametype == 1) @@ -209,14 +209,14 @@ static READ8_HANDLER( nycaptor_bx_r ) static WRITE8_HANDLER( sound_cpu_reset_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, (data&1 )? ASSERT_LINE : CLEAR_LINE); } static MACHINE_RESET( ta7630 ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); int i; double db = 0.0; double db_step = 0.50; /* 0.50 dB step (at least, maybe more) */ @@ -234,7 +234,7 @@ static MACHINE_RESET( ta7630 ) static TIMER_CALLBACK( nmi_callback ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); else @@ -249,13 +249,13 @@ static WRITE8_HANDLER( sound_command_w ) static WRITE8_HANDLER( nmi_disable_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } static WRITE8_HANDLER( nmi_enable_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) @@ -288,13 +288,13 @@ static const msm5232_interface msm5232_config = static READ8_HANDLER ( nycaptor_generic_control_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->generic_control_reg; } static WRITE8_HANDLER( nycaptor_generic_control_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->generic_control_reg = data; memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + ((data&0x08)>>3)*0x4000 ); } @@ -398,7 +398,7 @@ static READ8_HANDLER(cyclshtg_mcu_status_r1) static WRITE8_HANDLER( cyclshtg_generic_control_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); int bank = (data >> 2) & 3; state->generic_control_reg = data; @@ -697,7 +697,7 @@ GFXDECODE_END static MACHINE_START( nycaptor ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -731,7 +731,7 @@ static MACHINE_START( nycaptor ) static MACHINE_RESET( nycaptor ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); MACHINE_RESET_CALL(ta7630); @@ -1284,7 +1284,7 @@ ROM_END static DRIVER_INIT( bronx ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); int i; UINT8 *rom = memory_region(machine, "maincpu"); @@ -1296,7 +1296,7 @@ static DRIVER_INIT( bronx ) static DRIVER_INIT( colt ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); int i; UINT8 *rom = memory_region(machine, "maincpu"); @@ -1308,13 +1308,13 @@ static DRIVER_INIT( colt ) static DRIVER_INIT( nycaptor ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); state->gametype = 0; } static DRIVER_INIT( cyclshtg ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); state->gametype = 1; } diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index dda4dc3beb7..aebc7d16bfb 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -81,12 +81,13 @@ #define AUDIO_CPU_2_CLOCK AUDIO_2_MASTER_CLOCK -class nyny_state +class nyny_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nyny_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nyny_state(machine)); } - nyny_state(running_machine &machine) { } + nyny_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram1; @@ -129,7 +130,7 @@ static WRITE8_HANDLER( audio_2_command_w ); static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - nyny_state *driver_state = (nyny_state *)device->machine->driver_data; + nyny_state *driver_state = device->machine->driver_data(); int combined_state = pia6821_get_irq_a(driver_state->pia1) | pia6821_get_irq_b(driver_state->pia1) | pia6821_get_irq_b(driver_state->pia2); cpu_set_input_line(driver_state->maincpu, M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE); @@ -138,7 +139,7 @@ static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) static WRITE_LINE_DEVICE_HANDLER( main_cpu_firq ) { - nyny_state *driver_state = (nyny_state *)device->machine->driver_data; + nyny_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->maincpu, M6809_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); } @@ -152,7 +153,7 @@ static WRITE_LINE_DEVICE_HANDLER( main_cpu_firq ) static INTERRUPT_GEN( update_pia_1 ) { - nyny_state *state = (nyny_state *)device->machine->driver_data; + nyny_state *state = device->machine->driver_data(); /* update the different PIA pins from the input ports */ @@ -195,14 +196,14 @@ static const pia6821_interface pia_1_intf = static WRITE8_DEVICE_HANDLER( pia_2_port_a_w ) { - nyny_state *state = (nyny_state *)device->machine->driver_data; + nyny_state *state = device->machine->driver_data(); state->star_delay_counter = (state->star_delay_counter & 0x0f00) | data; } static WRITE8_DEVICE_HANDLER( pia_2_port_b_w ) { - nyny_state *state = (nyny_state *)device->machine->driver_data; + nyny_state *state = device->machine->driver_data(); /* bits 0-3 go to bits 8-11 of the star delay counter */ state->star_delay_counter = (state->star_delay_counter & 0x00ff) | ((data & 0x0f) << 8); @@ -247,7 +248,7 @@ static const pia6821_interface pia_2_intf = static WRITE8_DEVICE_HANDLER( ic48_1_74123_output_changed ) { - nyny_state *state = (nyny_state *)device->machine->driver_data; + nyny_state *state = device->machine->driver_data(); pia6821_ca1_w(state->pia2, data); } @@ -276,7 +277,7 @@ static const ttl74123_config ic48_1_config = static WRITE_LINE_DEVICE_HANDLER( flipscreen_w ) { - nyny_state *driver_state = (nyny_state *)device->machine->driver_data; + nyny_state *driver_state = device->machine->driver_data(); driver_state->flipscreen = state ? 0 : 1; } @@ -298,7 +299,7 @@ static MC6845_BEGIN_UPDATE( begin_update ) static MC6845_UPDATE_ROW( update_row ) { - nyny_state *state = (nyny_state *)device->machine->driver_data; + nyny_state *state = device->machine->driver_data(); UINT8 cx; pen_t *pens = (pen_t *)param; UINT8 x = 0; @@ -361,14 +362,14 @@ static MC6845_UPDATE_ROW( update_row ) INLINE void shift_star_generator( running_machine *machine ) { - nyny_state *state = (nyny_state *)machine->driver_data; + nyny_state *state = machine->driver_data(); state->star_shift_reg = (state->star_shift_reg << 1) | (((~state->star_shift_reg >> 15) & 0x01) ^ ((state->star_shift_reg >> 2) & 0x01)); } static MC6845_END_UPDATE( end_update ) { - nyny_state *state = (nyny_state *)device->machine->driver_data; + nyny_state *state = device->machine->driver_data(); /* draw the star field into the bitmap */ int y; @@ -406,7 +407,7 @@ static MC6845_END_UPDATE( end_update ) static WRITE_LINE_DEVICE_HANDLER( display_enable_changed ) { - nyny_state *driver_state = (nyny_state *)device->machine->driver_data; + nyny_state *driver_state = device->machine->driver_data(); ttl74123_a_w(driver_state->ic48_1, 0, state); } @@ -428,7 +429,7 @@ static const mc6845_interface mc6845_intf = static VIDEO_UPDATE( nyny ) { - nyny_state *state = (nyny_state *)screen->machine->driver_data; + nyny_state *state = screen->machine->driver_data(); mc6845_update(state->mc6845, bitmap, cliprect); @@ -445,7 +446,7 @@ static VIDEO_UPDATE( nyny ) static WRITE8_HANDLER( audio_1_command_w ) { - nyny_state *state = (nyny_state *)space->machine->driver_data; + nyny_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, M6800_IRQ_LINE, HOLD_LINE); @@ -454,7 +455,7 @@ static WRITE8_HANDLER( audio_1_command_w ) static WRITE8_HANDLER( audio_1_answer_w ) { - nyny_state *state = (nyny_state *)space->machine->driver_data; + nyny_state *state = space->machine->driver_data(); soundlatch3_w(space, 0, data); cpu_set_input_line(state->maincpu, M6809_IRQ_LINE, HOLD_LINE); @@ -500,7 +501,7 @@ static const ay8910_interface ay8910_64_interface = static WRITE8_HANDLER( audio_2_command_w ) { - nyny_state *state = (nyny_state *)space->machine->driver_data; + nyny_state *state = space->machine->driver_data(); soundlatch2_w(space, 0, (data & 0x60) >> 5); cpu_set_input_line(state->audiocpu2, M6800_IRQ_LINE, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE); @@ -516,7 +517,7 @@ static WRITE8_HANDLER( audio_2_command_w ) static READ8_HANDLER( nyny_pia_1_2_r ) { - nyny_state *state = (nyny_state *)space->machine->driver_data; + nyny_state *state = space->machine->driver_data(); UINT8 ret = 0; /* the address bits are directly connected to the chip selects */ @@ -529,7 +530,7 @@ static READ8_HANDLER( nyny_pia_1_2_r ) static WRITE8_HANDLER( nyny_pia_1_2_w ) { - nyny_state *state = (nyny_state *)space->machine->driver_data; + nyny_state *state = space->machine->driver_data(); /* the address bits are directly connected to the chip selects */ if (BIT(offset, 2)) pia6821_w(state->pia1, offset & 0x03, data); @@ -679,7 +680,7 @@ INPUT_PORTS_END static MACHINE_START( nyny ) { - nyny_state *state = (nyny_state *)machine->driver_data; + nyny_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -698,7 +699,7 @@ static MACHINE_START( nyny ) static MACHINE_RESET( nyny ) { - nyny_state *state = (nyny_state *)machine->driver_data; + nyny_state *state = machine->driver_data(); state->flipscreen = 0; state->star_enable = 0; diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index f9c50d96142..a5c54f3c688 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -32,9 +32,9 @@ static void update_interrupts(running_machine *machine) { - offtwall_state *state = (offtwall_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + offtwall_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -53,11 +53,11 @@ static MACHINE_START( offtwall ) static MACHINE_RESET( offtwall ) { - offtwall_state *state = (offtwall_state *)machine->driver_data; + offtwall_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); - atarivc_reset(*machine->primary_screen, state->atarigen.atarivc_eof_data, 1); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); + atarivc_reset(*machine->primary_screen, state->atarivc_eof_data, 1); atarijsa_reset(); } @@ -90,9 +90,9 @@ static WRITE16_HANDLER( offtwall_atarivc_w ) static READ16_HANDLER( special_port3_r ) { - offtwall_state *state = (offtwall_state *)space->machine->driver_data; + offtwall_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "260010"); - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0020; + if (state->cpu_to_sound_ready) result ^= 0x0020; return result; } @@ -150,7 +150,7 @@ static WRITE16_HANDLER( io_latch_w ) static READ16_HANDLER( bankswitch_r ) { - offtwall_state *state = (offtwall_state *)space->machine->driver_data; + offtwall_state *state = space->machine->driver_data(); /* this is the table lookup; the bank is determined by the address that was requested */ state->bank_offset = (offset & 3) * 0x1000; @@ -162,7 +162,7 @@ static READ16_HANDLER( bankswitch_r ) static READ16_HANDLER( bankrom_r ) { - offtwall_state *state = (offtwall_state *)space->machine->driver_data; + offtwall_state *state = space->machine->driver_data(); /* this is the banked ROM read */ logerror("%06X: %04X\n", cpu_get_previouspc(space->cpu), offset); @@ -204,7 +204,7 @@ static READ16_HANDLER( bankrom_r ) static READ16_HANDLER( spritecache_count_r ) { - offtwall_state *state = (offtwall_state *)space->machine->driver_data; + offtwall_state *state = space->machine->driver_data(); int prevpc = cpu_get_previouspc(space->cpu); /* if this read is coming from $99f8 or $9992, it's in the sprite copy loop */ @@ -259,7 +259,7 @@ static READ16_HANDLER( spritecache_count_r ) static READ16_HANDLER( unknown_verify_r ) { - offtwall_state *state = (offtwall_state *)space->machine->driver_data; + offtwall_state *state = space->machine->driver_data(); int prevpc = cpu_get_previouspc(space->cpu); if (prevpc < 0x5c5e || prevpc > 0xc432) return state->unknown_verify_base[offset]; @@ -278,7 +278,7 @@ static READ16_HANDLER( unknown_verify_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x037fff) AM_ROM AM_RANGE(0x038000, 0x03ffff) AM_READ(bankrom_r) AM_REGION("maincpu", 0x38000) AM_BASE_MEMBER(offtwall_state, bankrom_base) - AM_RANGE(0x120000, 0x120fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(offtwall_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x120000, 0x120fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(offtwall_state, eeprom, eeprom_size) AM_RANGE(0x260000, 0x260001) AM_READ_PORT("260000") AM_RANGE(0x260002, 0x260003) AM_READ_PORT("260002") AM_RANGE(0x260010, 0x260011) AM_READ(special_port3_r) @@ -292,11 +292,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260060, 0x260061) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(offtwall_atarivc_r, offtwall_atarivc_w) AM_BASE_MEMBER(offtwall_state, atarigen.atarivc_data) - AM_RANGE(0x3f4000, 0x3f5eff) AM_RAM_WRITE(atarigen_playfield_latched_msb_w) AM_BASE_MEMBER(offtwall_state, atarigen.playfield) - AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_BASE_MEMBER(offtwall_state, atarigen.atarivc_eof_data) + AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(offtwall_atarivc_r, offtwall_atarivc_w) AM_BASE_MEMBER(offtwall_state, atarivc_data) + AM_RANGE(0x3f4000, 0x3f5eff) AM_RAM_WRITE(atarigen_playfield_latched_msb_w) AM_BASE_MEMBER(offtwall_state, playfield) + AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_BASE_MEMBER(offtwall_state, atarivc_eof_data) AM_RANGE(0x3f5f80, 0x3f5fff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(offtwall_state, atarigen.playfield_upper) + AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(offtwall_state, playfield_upper) AM_RANGE(0x3f8000, 0x3fcfff) AM_RAM AM_RANGE(0x3fd000, 0x3fd7ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3fd800, 0x3fffff) AM_RAM @@ -502,9 +502,9 @@ static const UINT16 default_eeprom[] = static DRIVER_INIT( offtwall ) { - offtwall_state *state = (offtwall_state *)machine->driver_data; + offtwall_state *state = machine->driver_data(); - state->atarigen.eeprom_default = default_eeprom; + state->eeprom_default = default_eeprom; atarijsa_init(machine, "260010", 0x0040); /* install son-of-slapstic workarounds */ @@ -516,9 +516,9 @@ static DRIVER_INIT( offtwall ) static DRIVER_INIT( offtwalc ) { - offtwall_state *state = (offtwall_state *)machine->driver_data; + offtwall_state *state = machine->driver_data(); - state->atarigen.eeprom_default = default_eeprom; + state->eeprom_default = default_eeprom; atarijsa_init(machine, "260010", 0x0040); /* install son-of-slapstic workarounds */ diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index 4494fed9198..66744e097d3 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -19,7 +19,7 @@ Notes: static WRITE16_HANDLER( ohmygod_ctrl_w ) { - ohmygod_state *state = (ohmygod_state *)space->machine->driver_data; + ohmygod_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -296,7 +296,7 @@ GFXDECODE_END static MACHINE_START( ohmygod ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); state_save_register_global(machine, state->spritebank); state_save_register_global(machine, state->scrollx); @@ -306,7 +306,7 @@ static MACHINE_START( ohmygod ) static MACHINE_RESET( ohmygod ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "oki"); state->sndbank = 0; @@ -396,13 +396,13 @@ ROM_END static DRIVER_INIT( ohmygod ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); state->adpcm_bank_shift = 4; } static DRIVER_INIT( naname ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); state->adpcm_bank_shift = 0; } diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 4cabffeee28..2f37de4ef6e 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -45,7 +45,7 @@ static WRITE8_HANDLER( ojankohs_rombank_w ) static WRITE8_HANDLER( ojankoy_rombank_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data & 0x1f); @@ -58,7 +58,7 @@ static WRITE8_HANDLER( ojankoy_rombank_w ) static WRITE8_DEVICE_HANDLER( ojankohs_adpcm_reset_w ) { - ojankohs_state *state = (ojankohs_state *)device->machine->driver_data; + ojankohs_state *state = device->machine->driver_data(); state->adpcm_reset = BIT(data, 0); state->vclk_left = 0; @@ -67,14 +67,14 @@ static WRITE8_DEVICE_HANDLER( ojankohs_adpcm_reset_w ) static WRITE8_HANDLER( ojankohs_msm5205_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); state->adpcm_data = data; state->vclk_left = 2; } static void ojankohs_adpcm_int( running_device *device ) { - ojankohs_state *state = (ojankohs_state *)device->machine->driver_data; + ojankohs_state *state = device->machine->driver_data(); /* skip if we're reset */ if (!state->adpcm_reset) @@ -95,7 +95,7 @@ static void ojankohs_adpcm_int( running_device *device ) static WRITE8_HANDLER( ojankoc_ctrl_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); memory_set_bank(space->machine, "bank1", data & 0x0f); @@ -106,13 +106,13 @@ static WRITE8_HANDLER( ojankoc_ctrl_w ) static WRITE8_HANDLER( ojankohs_portselect_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); state->portselect = data; } static READ8_HANDLER( ojankohs_keymatrix_r ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int ret; switch (state->portselect) @@ -140,7 +140,7 @@ static READ8_HANDLER( ojankohs_keymatrix_r ) static READ8_HANDLER( ojankoc_keymatrix_r ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int i; int ret = 0; static const char *const keynames[2][5] = @@ -794,7 +794,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( common ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->msm = machine->device("msm"); @@ -840,7 +840,7 @@ static MACHINE_START( ojankoc ) static MACHINE_RESET( ojankohs ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); state->portselect = 0; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index 15e197cf132..dbaef4549e7 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -56,12 +56,13 @@ $7004 writes, related to $7000 reads #include "deprecat.h" #include "sound/ay8910.h" -class olibochu_state +class olibochu_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, olibochu_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, olibochu_state(machine)); } - olibochu_state(running_machine &machine) { } + olibochu_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -120,14 +121,14 @@ static PALETTE_INIT( olibochu ) static WRITE8_HANDLER( olibochu_videoram_w ) { - olibochu_state *state = (olibochu_state *)space->machine->driver_data; + olibochu_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static WRITE8_HANDLER( olibochu_colorram_w ) { - olibochu_state *state = (olibochu_state *)space->machine->driver_data; + olibochu_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -145,7 +146,7 @@ static WRITE8_HANDLER( olibochu_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - olibochu_state *state = (olibochu_state *)machine->driver_data; + olibochu_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0x20) << 3); int color = (attr & 0x1f) + 0x20; @@ -156,13 +157,13 @@ static TILE_GET_INFO( get_bg_tile_info ) static VIDEO_START( olibochu ) { - olibochu_state *state = (olibochu_state *)machine->driver_data; + olibochu_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - olibochu_state *state = (olibochu_state *)machine->driver_data; + olibochu_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -222,7 +223,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_UPDATE( olibochu ) { - olibochu_state *state = (olibochu_state *)screen->machine->driver_data; + olibochu_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -231,7 +232,7 @@ static VIDEO_UPDATE( olibochu ) static WRITE8_HANDLER( sound_command_w ) { - olibochu_state *state = (olibochu_state *)space->machine->driver_data; + olibochu_state *state = space->machine->driver_data(); int c; if (offset == 0) @@ -425,14 +426,14 @@ static INTERRUPT_GEN( olibochu_interrupt ) static MACHINE_START( olibochu ) { - olibochu_state *state = (olibochu_state *)machine->driver_data; + olibochu_state *state = machine->driver_data(); state_save_register_global(machine, state->cmd); } static MACHINE_RESET( olibochu ) { - olibochu_state *state = (olibochu_state *)machine->driver_data; + olibochu_state *state = machine->driver_data(); state->cmd = 0; } diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index f2ee08967de..59a5f010d4f 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -38,7 +38,7 @@ TO DO : static READ16_HANDLER( oneshot_in0_word_r ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); int data = input_port_read(space->machine, "DSW1"); switch (data & 0x0c) @@ -62,7 +62,7 @@ static READ16_HANDLER( oneshot_in0_word_r ) static READ16_HANDLER( oneshot_gun_x_p1_r ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); /* shots must be in a different location to register */ state->p1_wobble ^= 1; @@ -72,13 +72,13 @@ static READ16_HANDLER( oneshot_gun_x_p1_r ) static READ16_HANDLER( oneshot_gun_y_p1_r ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); return state->gun_y_p1; } static READ16_HANDLER( oneshot_gun_x_p2_r ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); /* shots must be in a different location to register */ state->p2_wobble ^= 1; @@ -88,7 +88,7 @@ static READ16_HANDLER( oneshot_gun_x_p2_r ) static READ16_HANDLER( oneshot_gun_y_p2_r ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); return state->gun_y_p2; } @@ -332,7 +332,7 @@ GFXDECODE_END static void irq_handler(running_device *device, int irq) { - oneshot_state *state = (oneshot_state *)device->machine->driver_data; + oneshot_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -343,7 +343,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( oneshot ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -359,7 +359,7 @@ static MACHINE_START( oneshot ) static MACHINE_RESET( oneshot ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); state->gun_x_p1 = 0; state->gun_y_p1 = 0; diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 2745e47b617..08b2288046e 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -46,12 +46,13 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat #define MASTER_CLOCK XTAL_4MHz -class onetwo_state +class onetwo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, onetwo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, onetwo_state(machine)); } - onetwo_state(running_machine &machine) { } + onetwo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * fgram; @@ -76,7 +77,7 @@ public: static TILE_GET_INFO( get_fg_tile_info ) { - onetwo_state *state = (onetwo_state *)machine->driver_data; + onetwo_state *state = machine->driver_data(); int code = (state->fgram[tile_index * 2 + 1] << 8) | state->fgram[tile_index * 2]; int color = (state->fgram[tile_index * 2 + 1] & 0x80) >> 7; @@ -87,13 +88,13 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( onetwo ) { - onetwo_state *state = (onetwo_state *)machine->driver_data; + onetwo_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } static VIDEO_UPDATE( onetwo ) { - onetwo_state *state = (onetwo_state *)screen->machine->driver_data; + onetwo_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; } @@ -106,7 +107,7 @@ static VIDEO_UPDATE( onetwo ) static WRITE8_HANDLER( onetwo_fgram_w ) { - onetwo_state *state = (onetwo_state *)space->machine->driver_data; + onetwo_state *state = space->machine->driver_data(); state->fgram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } @@ -125,14 +126,14 @@ static WRITE8_HANDLER( onetwo_coin_counters_w ) static WRITE8_HANDLER( onetwo_soundlatch_w ) { - onetwo_state *state = (onetwo_state *)space->machine->driver_data; + onetwo_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } static void set_color(running_machine *machine, int offset) { - onetwo_state *state = (onetwo_state *)machine->driver_data; + onetwo_state *state = machine->driver_data(); int r, g, b; r = state->paletteram[offset] & 0x1f; @@ -143,14 +144,14 @@ static void set_color(running_machine *machine, int offset) static WRITE8_HANDLER(palette1_w) { - onetwo_state *state = (onetwo_state *)space->machine->driver_data; + onetwo_state *state = space->machine->driver_data(); state->paletteram[offset] = data; set_color(space->machine, offset); } static WRITE8_HANDLER(palette2_w) { - onetwo_state *state = (onetwo_state *)space->machine->driver_data; + onetwo_state *state = space->machine->driver_data(); state->paletteram2[offset] = data; set_color(space->machine, offset); } @@ -326,7 +327,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int linestate) { - onetwo_state *state = (onetwo_state *)device->machine->driver_data; + onetwo_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate); } @@ -343,7 +344,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( onetwo ) { - onetwo_state *state = (onetwo_state *)machine->driver_data; + onetwo_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 82bec52e131..ce6ee139c86 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -286,13 +286,13 @@ register. So what is controlling priority. static READ16_HANDLER( cchip_r ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); return state->cchip_ram[offset]; } static WRITE16_HANDLER( cchip_w ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); state->cchip_ram[offset] = data &0xff; } @@ -317,7 +317,7 @@ static READ16_HANDLER( opwolf_dsw_r ) static READ16_HANDLER( opwolf_lightgun_r ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); int scaled; switch (offset) @@ -431,7 +431,7 @@ ADDRESS_MAP_END static MACHINE_START( opwolf ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -451,7 +451,7 @@ static MACHINE_START( opwolf ) static MACHINE_RESET( opwolf ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); state->adpcm_b[0] = state->adpcm_b[1] = 0; state->adpcm_c[0] = state->adpcm_c[1] = 0; @@ -468,7 +468,7 @@ static MACHINE_RESET( opwolf ) static void opwolf_msm5205_vck( running_device *device ) { - opwolf_state *state = (opwolf_state *)device->machine->driver_data; + opwolf_state *state = device->machine->driver_data(); int chip = (strcmp(device->tag(), "msm1") == 0) ? 0 : 1; if (state->adpcm_data[chip] != -1) { @@ -487,7 +487,7 @@ static void opwolf_msm5205_vck( running_device *device ) static WRITE8_DEVICE_HANDLER( opwolf_adpcm_b_w ) { - opwolf_state *state = (opwolf_state *)device->machine->driver_data; + opwolf_state *state = device->machine->driver_data(); int start; int end; @@ -510,7 +510,7 @@ static WRITE8_DEVICE_HANDLER( opwolf_adpcm_b_w ) static WRITE8_DEVICE_HANDLER( opwolf_adpcm_c_w ) { - opwolf_state *state = (opwolf_state *)device->machine->driver_data; + opwolf_state *state = device->machine->driver_data(); int start; int end; @@ -695,7 +695,7 @@ GFXDECODE_END static void irq_handler( running_device *device, int irq ) { - opwolf_state *state = (opwolf_state *)device->machine->driver_data; + opwolf_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -991,7 +991,7 @@ ROM_END static DRIVER_INIT( opwolf ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); UINT16* rom = (UINT16*)memory_region(machine, "maincpu"); state->opwolf_region = rom[0x03fffe / 2] & 0xff; @@ -1008,7 +1008,7 @@ static DRIVER_INIT( opwolf ) static DRIVER_INIT( opwolfb ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); UINT16* rom = (UINT16*)memory_region(machine, "maincpu"); state->opwolf_region = rom[0x03fffe / 2] & 0xff; diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 7e69e67fb89..1a77a2e5a91 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -33,7 +33,7 @@ Atari Orbit Driver static TIMER_DEVICE_CALLBACK( nmi_32v ) { - orbit_state *state = (orbit_state *)timer.machine->driver_data; + orbit_state *state = timer.machine->driver_data(); int scanline = param; int nmistate = (scanline & 32) && (state->misc_flags & 4); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, nmistate ? ASSERT_LINE : CLEAR_LINE); @@ -42,7 +42,7 @@ static TIMER_DEVICE_CALLBACK( nmi_32v ) static TIMER_CALLBACK( irq_off ) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); } @@ -63,7 +63,7 @@ static INTERRUPT_GEN( orbit_interrupt ) static void update_misc_flags(running_machine *machine, UINT8 val) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); state->misc_flags = val; @@ -88,7 +88,7 @@ static void update_misc_flags(running_machine *machine, UINT8 val) static WRITE8_HANDLER( orbit_misc_w ) { - orbit_state *state = (orbit_state *)space->machine->driver_data; + orbit_state *state = space->machine->driver_data(); UINT8 bit = offset >> 1; if (offset & 1) @@ -274,7 +274,7 @@ GFXDECODE_END static MACHINE_START( orbit ) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->discrete = machine->device("discrete"); @@ -285,7 +285,7 @@ static MACHINE_START( orbit ) static MACHINE_RESET( orbit ) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); update_misc_flags(machine, 0); state->flip_screen = 0; diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index 5e24a6713b6..d99465f56fc 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -47,12 +47,13 @@ Limit for help/undo (matta): #define TILE_WIDTH 6 -class othello_state +class othello_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othello_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othello_state(machine)); } - othello_state(running_machine &machine) { } + othello_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -79,7 +80,7 @@ public: static MC6845_UPDATE_ROW( update_row ) { - othello_state *state = (othello_state *)device->machine->driver_data; + othello_state *state = device->machine->driver_data(); int cx, x; UINT32 data_address; UINT32 tmp; @@ -119,7 +120,7 @@ static PALETTE_INIT( othello ) static VIDEO_UPDATE( othello ) { - othello_state *state = (othello_state *)screen->machine->driver_data; + othello_state *state = screen->machine->driver_data(); mc6845_update(state->mc6845, bitmap, cliprect); return 0; @@ -141,7 +142,7 @@ static READ8_HANDLER( unk_87_r ) static WRITE8_HANDLER( unk_8a_w ) { /* - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); state->n7751_command = (data & 0x07); cpu_set_input_line(state->n7751, 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE); @@ -164,7 +165,7 @@ static READ8_HANDLER( unk_8c_r ) static READ8_HANDLER( sound_ack_r ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); return state->ack_data; } @@ -175,7 +176,7 @@ static WRITE8_HANDLER( unk_8f_w ) static WRITE8_HANDLER( tilebank_w ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); state->tile_bank = (data == 0x0f) ? 0x100 : 0x00; logerror("tilebank -> %x\n", data); } @@ -204,19 +205,19 @@ static READ8_HANDLER( latch_r ) static WRITE8_HANDLER( ay_select_w ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); state->ay_select = data; } static WRITE8_HANDLER( ack_w ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); state->ack_data = data; } static WRITE8_HANDLER( ay_address_w ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); if (state->ay_select & 1) ay8910_address_w(state->ay1, 0, data); if (state->ay_select & 2) ay8910_address_w(state->ay2, 0, data); @@ -224,7 +225,7 @@ static WRITE8_HANDLER( ay_address_w ) static WRITE8_HANDLER( ay_data_w ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); if (state->ay_select & 1) ay8910_data_w(state->ay1, 0, data); if (state->ay_select & 2) ay8910_data_w(state->ay2, 0, data); @@ -246,7 +247,7 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( n7751_rom_control_w ) { - othello_state *state = (othello_state *)device->machine->driver_data; + othello_state *state = device->machine->driver_data(); /* P4 - address lines 0-3 */ /* P5 - address lines 4-7 */ @@ -281,19 +282,19 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_control_w ) static READ8_HANDLER( n7751_rom_r ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); return memory_region(space->machine, "n7751data")[state->sound_addr]; } static READ8_HANDLER( n7751_command_r ) { - othello_state *state = (othello_state *)space->machine->driver_data; + othello_state *state = space->machine->driver_data(); return 0x80 | ((state->n7751_command & 0x07) << 4); } static WRITE8_DEVICE_HANDLER( n7751_p2_w ) { - othello_state *state = (othello_state *)device->machine->driver_data; + othello_state *state = device->machine->driver_data(); /* write to P2; low 4 bits go to 8243 */ i8243_p2_w(device, offset, data & 0x0f); @@ -381,7 +382,7 @@ static const mc6845_interface h46505_intf = static MACHINE_START( othello ) { - othello_state *state = (othello_state *)machine->driver_data; + othello_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->mc6845 = machine->device("crtc"); @@ -399,7 +400,7 @@ static MACHINE_START( othello ) static MACHINE_RESET( othello ) { - othello_state *state = (othello_state *)machine->driver_data; + othello_state *state = machine->driver_data(); state->tile_bank = 0; state->ay_select = 0; diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index 4d4b29de3df..726bb1426ca 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -22,7 +22,7 @@ Notes: static READ16_HANDLER( pip ) { - othldrby_state *state = (othldrby_state *)space->machine->driver_data; + othldrby_state *state = space->machine->driver_data(); return state->toggle ^= 1; } @@ -218,7 +218,7 @@ GFXDECODE_END static MACHINE_START( othldrby ) { - othldrby_state *state = (othldrby_state *)machine->driver_data; + othldrby_state *state = machine->driver_data(); state_save_register_global(machine, state->toggle); state_save_register_global(machine, state->vram_addr); @@ -228,7 +228,7 @@ static MACHINE_START( othldrby ) static MACHINE_RESET( othldrby ) { - othldrby_state *state = (othldrby_state *)machine->driver_data; + othldrby_state *state = machine->driver_data(); state->toggle = 0xff; state->vram_addr = 0; diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index b2cc61d1f36..967f8d3d260 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -251,14 +251,14 @@ TODO: static void update_irq( running_machine *machine ) { - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, state->ad_irq ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->maincpu, 5, state->vblank_irq ? ASSERT_LINE : CLEAR_LINE); } static WRITE16_HANDLER( irq_ack_w ) { - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); switch (offset) { @@ -276,7 +276,7 @@ static WRITE16_HANDLER( irq_ack_w ) static INTERRUPT_GEN( vblank_interrupt ) { - othunder_state *state = (othunder_state *)device->machine->driver_data; + othunder_state *state = device->machine->driver_data(); state->vblank_irq = 1; update_irq(device->machine); @@ -284,7 +284,7 @@ static INTERRUPT_GEN( vblank_interrupt ) static TIMER_CALLBACK( ad_interrupt ) { - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); state->ad_irq = 1; update_irq(machine); @@ -312,7 +312,7 @@ static const eeprom_interface eeprom_intf = static WRITE16_HANDLER( othunder_tc0220ioc_w ) { - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -354,7 +354,7 @@ static WRITE16_HANDLER( othunder_tc0220ioc_w ) static READ16_HANDLER( othunder_tc0220ioc_r ) { - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); switch (offset) { @@ -395,21 +395,21 @@ static WRITE16_HANDLER( othunder_lightgun_w ) static void reset_sound_region( running_machine *machine ) { - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); state->banknum = data & 7; reset_sound_region(space->machine); } static WRITE16_HANDLER( othunder_sound_w ) { - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, data & 0xff); else if (offset == 1) @@ -418,7 +418,7 @@ static WRITE16_HANDLER( othunder_sound_w ) static READ16_HANDLER( othunder_sound_r ) { - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); if (offset == 1) return ((tc0140syt_comm_r(state->tc0140syt, 0) & 0xff)); else @@ -429,7 +429,7 @@ static WRITE8_HANDLER( othunder_TC0310FAM_w ) { /* there are two TC0310FAM, one for CH1 and one for CH2 from the YM2610. The PSG output is routed to both chips. */ - othunder_state *state = (othunder_state *)space->machine->driver_data; + othunder_state *state = space->machine->driver_data(); int voll, volr; state->pan[offset] = data & 0x1f; @@ -636,7 +636,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - othunder_state *state = (othunder_state *)device->machine->driver_data; + othunder_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -684,7 +684,7 @@ static STATE_POSTLOAD( othunder_postload ) static MACHINE_START( othunder ) { - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); @@ -711,7 +711,7 @@ static MACHINE_START( othunder ) static MACHINE_RESET( othunder ) { - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); state->vblank_irq = 0; state->ad_irq = 0; diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index ff14d3dbcfa..4f5e19b2d9f 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -83,7 +83,7 @@ static INTERRUPT_GEN( cpuA_interrupt ) static INTERRUPT_GEN( cpuB_interrupt ) { - overdriv_state *state = (overdriv_state *)device->machine->driver_data; + overdriv_state *state = device->machine->driver_data(); if (k053246_is_irq_enabled(state->k053246)) cpu_set_input_line(device, 4, HOLD_LINE); @@ -92,7 +92,7 @@ static INTERRUPT_GEN( cpuB_interrupt ) static WRITE16_HANDLER( cpuA_ctrl_w ) { - overdriv_state *state = (overdriv_state *)space->machine->driver_data; + overdriv_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -111,13 +111,13 @@ static WRITE16_HANDLER( cpuA_ctrl_w ) static READ16_HANDLER( cpuB_ctrl_r ) { - overdriv_state *state = (overdriv_state *)space->machine->driver_data; + overdriv_state *state = space->machine->driver_data(); return state->cpuB_ctrl; } static WRITE16_HANDLER( cpuB_ctrl_w ) { - overdriv_state *state = (overdriv_state *)space->machine->driver_data; + overdriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->cpuB_ctrl); if (ACCESSING_BITS_0_7) @@ -139,19 +139,19 @@ static READ8_DEVICE_HANDLER( overdriv_sound_r ) static WRITE16_HANDLER( overdriv_soundirq_w ) { - overdriv_state *state = (overdriv_state *)space->machine->driver_data; + overdriv_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, HOLD_LINE); } static WRITE16_HANDLER( overdriv_cpuB_irq5_w ) { - overdriv_state *state = (overdriv_state *)space->machine->driver_data; + overdriv_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, 5, HOLD_LINE); } static WRITE16_HANDLER( overdriv_cpuB_irq6_w ) { - overdriv_state *state = (overdriv_state *)space->machine->driver_data; + overdriv_state *state = space->machine->driver_data(); cpu_set_input_line(state->subcpu, 6, HOLD_LINE); } @@ -296,7 +296,7 @@ static const k051316_interface overdriv_k051316_intf_2 = static MACHINE_START( overdriv ) { - overdriv_state *state = (overdriv_state *)machine->driver_data; + overdriv_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -316,7 +316,7 @@ static MACHINE_START( overdriv ) static MACHINE_RESET( overdriv ) { - overdriv_state *state = (overdriv_state *)machine->driver_data; + overdriv_state *state = machine->driver_data(); state->cpuB_ctrl = 0; state->sprite_colorbase = 0; diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index 3997d2708b7..ac8e86a72e2 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -48,12 +48,13 @@ Driver by Tomasz Slanina #define USE_MSM 0 #define NUM_PLUNGER_REPEATS 50 -class pachifev_state +class pachifev_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pachifev_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pachifev_state(machine)); } - pachifev_state(running_machine &machine) { } + pachifev_state(running_machine &machine) + : driver_data_t(machine) { } /* controls related */ @@ -69,7 +70,7 @@ static WRITE8_HANDLER(controls_w) { if(!data) { - pachifev_state *state = (pachifev_state *)space->machine->driver_data; + pachifev_state *state = space->machine->driver_data(); /*end of input read*/ state->power=0; @@ -84,7 +85,7 @@ static WRITE8_HANDLER(controls_w) static READ8_HANDLER(controls_r) { - pachifev_state *state = (pachifev_state *)space->machine->driver_data; + pachifev_state *state = space->machine->driver_data(); int output_bit=(state->power < state->max_power)?0:1; ++state->power; return output_bit; @@ -220,7 +221,7 @@ static const msm5205_interface msm5205_config = static MACHINE_RESET( pachifev ) { - pachifev_state *state = (pachifev_state *)machine->driver_data; + pachifev_state *state = machine->driver_data(); state->power=0; state->max_power=0; @@ -239,7 +240,7 @@ static INTERRUPT_GEN( pachifev_vblank_irq ) TMS9928A_interrupt(device->machine); { - pachifev_state *state = (pachifev_state *)device->machine->driver_data; + pachifev_state *state = device->machine->driver_data(); int current_power=input_port_read(device->machine, "PLUNGER") & 0x3f; if(current_power != state->previous_power) { @@ -270,7 +271,7 @@ static MACHINE_START( pachifev) /* configure VDP */ TMS9928A_configure(&tms9928a_interface); { - pachifev_state *state = (pachifev_state *)machine->driver_data; + pachifev_state *state = machine->driver_data(); state_save_register_global(machine, state->power); state_save_register_global(machine, state->max_power); diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index be0a66e0c15..44830302edb 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -37,7 +37,7 @@ Boards: static INTERRUPT_GEN( pandoras_master_interrupt ) { - pandoras_state *state = (pandoras_state *)device->machine->driver_data; + pandoras_state *state = device->machine->driver_data(); if (state->irq_enable_a) cpu_set_input_line(device, M6809_IRQ_LINE, HOLD_LINE); @@ -45,7 +45,7 @@ static INTERRUPT_GEN( pandoras_master_interrupt ) static INTERRUPT_GEN( pandoras_slave_interrupt ) { - pandoras_state *state = (pandoras_state *)device->machine->driver_data; + pandoras_state *state = device->machine->driver_data(); if (state->irq_enable_b) cpu_set_input_line(device, M6809_IRQ_LINE, HOLD_LINE); @@ -62,7 +62,7 @@ static WRITE8_HANDLER( pandoras_int_control_w ) other bytes unknown */ - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); switch (offset) { @@ -90,7 +90,7 @@ static WRITE8_HANDLER( pandoras_int_control_w ) static WRITE8_HANDLER( pandoras_cpua_irqtrigger_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); if (!state->firq_old_data_a && data) cpu_set_input_line(state->maincpu, M6809_FIRQ_LINE, HOLD_LINE); @@ -100,7 +100,7 @@ static WRITE8_HANDLER( pandoras_cpua_irqtrigger_w ) static WRITE8_HANDLER( pandoras_cpub_irqtrigger_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); if (!state->firq_old_data_b && data) cpu_set_input_line(state->subcpu, M6809_FIRQ_LINE, HOLD_LINE); @@ -110,13 +110,13 @@ static WRITE8_HANDLER( pandoras_cpub_irqtrigger_w ) static WRITE8_HANDLER( pandoras_i8039_irqtrigger_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); cpu_set_input_line(state->mcu, 0, ASSERT_LINE); } static WRITE8_HANDLER( i8039_irqen_and_status_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); /* bit 7 enables IRQ */ if ((data & 0x80) == 0) @@ -128,7 +128,7 @@ static WRITE8_HANDLER( i8039_irqen_and_status_w ) static WRITE8_HANDLER( pandoras_z80_irqtrigger_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -300,7 +300,7 @@ GFXDECODE_END static MACHINE_START( pandoras ) { - pandoras_state *state = (pandoras_state *)machine->driver_data; + pandoras_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -316,7 +316,7 @@ static MACHINE_START( pandoras ) static MACHINE_RESET( pandoras ) { - pandoras_state *state = (pandoras_state *)machine->driver_data; + pandoras_state *state = machine->driver_data(); state->firq_old_data_a = 0; state->firq_old_data_b = 0; @@ -329,13 +329,13 @@ static MACHINE_RESET( pandoras ) static READ8_DEVICE_HANDLER( pandoras_portA_r ) { - pandoras_state *state = (pandoras_state *)device->machine->driver_data; + pandoras_state *state = device->machine->driver_data(); return state->i8039_status; } static READ8_DEVICE_HANDLER( pandoras_portB_r ) { - pandoras_state *state = (pandoras_state *)device->machine->driver_data; + pandoras_state *state = device->machine->driver_data(); return (state->audiocpu->total_cycles() / 512) & 0x0f; } diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 9734664c7f1..10d3a6fa952 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -543,7 +543,7 @@ GFXDECODE_END static MACHINE_START( paradise ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); int bank_n = memory_region_length(machine, "maincpu") / 0x4000 - 1; UINT8 *ROM = memory_region(machine, "maincpu"); @@ -556,7 +556,7 @@ static MACHINE_START( paradise ) static MACHINE_RESET( paradise ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); state->palbank = 0; state->priority = 0; @@ -1043,21 +1043,21 @@ ROM_END static DRIVER_INIT (paradise) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); state->sprite_inc = 0x20; } // Inverted flipscreen and sprites are packed in less memory (same number though) static DRIVER_INIT (tgtball) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); state->sprite_inc = 4; memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x2001, 0x2001, 0, 0, tgtball_flipscreen_w ); } static DRIVER_INIT (torus) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); state->sprite_inc = 4; memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x2070, 0x2070, 0, 0, torus_coin_counter_w); } diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index b84f4ff3b35..7439687cc57 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -21,14 +21,14 @@ static KONAMI_SETLINES_CALLBACK( parodius_banking ); static INTERRUPT_GEN( parodius_interrupt ) { - parodius_state *state = (parodius_state *)device->machine->driver_data; + parodius_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) cpu_set_input_line(device, 0, HOLD_LINE); } static READ8_HANDLER( bankedram_r ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); if (state->videobank & 0x01) { @@ -43,7 +43,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); if (state->videobank & 0x01) { @@ -58,7 +58,7 @@ static WRITE8_HANDLER( bankedram_w ) static READ8_HANDLER( parodius_052109_053245_r ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); if (state->videobank & 0x02) return k053245_r(state->k053245, offset); @@ -68,7 +68,7 @@ static READ8_HANDLER( parodius_052109_053245_r ) static WRITE8_HANDLER( parodius_052109_053245_w ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); if (state->videobank & 0x02) k053245_w(state->k053245, offset, data); @@ -78,7 +78,7 @@ static WRITE8_HANDLER( parodius_052109_053245_w ) static WRITE8_HANDLER( parodius_videobank_w ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); if (state->videobank & 0xf8) logerror("%04x: videobank = %02x\n",cpu_get_pc(space->cpu),data); @@ -91,7 +91,7 @@ static WRITE8_HANDLER( parodius_videobank_w ) static WRITE8_HANDLER( parodius_3fc0_w ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",cpu_get_pc(space->cpu),data); @@ -113,7 +113,7 @@ static READ8_DEVICE_HANDLER( parodius_sound_r ) static WRITE8_HANDLER( parodius_sh_irqtrigger_w ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -121,7 +121,7 @@ static WRITE8_HANDLER( parodius_sh_irqtrigger_w ) static void sound_nmi_callback( running_machine *machine, int param ) { - parodius_state *state = (parodius_state *)machine->driver_data; + parodius_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ( state->nmi_enabled ) ? CLEAR_LINE : ASSERT_LINE ); nmi_enabled = 0; @@ -130,13 +130,13 @@ static void sound_nmi_callback( running_machine *machine, int param ) static TIMER_CALLBACK( nmi_callback ) { - parodius_state *state = (parodius_state *)machine->driver_data; + parodius_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( sound_arm_nmi_w ) { - parodius_state *state = (parodius_state *)space->machine->driver_data; + parodius_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); timer_set(space->machine, ATTOTIME_IN_USEC(50), NULL, 0, nmi_callback); /* kludge until the K053260 is emulated correctly */ @@ -257,7 +257,7 @@ static const k05324x_interface parodius_k05324x_intf = static MACHINE_START( parodius ) { - parodius_state *state = (parodius_state *)machine->driver_data; + parodius_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 14, &ROM[0x10000], 0x4000); @@ -282,7 +282,7 @@ static MACHINE_START( parodius ) static MACHINE_RESET( parodius ) { - parodius_state *state = (parodius_state *)machine->driver_data; + parodius_state *state = machine->driver_data(); int i; konami_configure_set_lines(machine->device("maincpu"), parodius_banking); diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 28b87ab3f72..0505daf792c 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -76,12 +76,13 @@ Notes: #include "machine/eeprom.h" #include "sound/okim6295.h" -class pasha2_state +class pasha2_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pasha2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pasha2_state(machine)); } - pasha2_state(running_machine &machine) { } + pasha2_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bitmap0; @@ -97,7 +98,7 @@ public: static WRITE16_HANDLER( pasha2_misc_w ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); if (offset) { @@ -126,7 +127,7 @@ static WRITE16_HANDLER( pasha2_misc_w ) static WRITE16_HANDLER( pasha2_palette_w ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); int color; COMBINE_DATA(&state->paletteram[offset]); @@ -142,25 +143,25 @@ static WRITE16_HANDLER( pasha2_palette_w ) static WRITE16_HANDLER( vbuffer_set_w ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); state->vbuffer = 1; } static WRITE16_HANDLER( vbuffer_clear_w ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); state->vbuffer = 0; } static WRITE16_HANDLER( bitmap_0_w ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bitmap0[offset + state->vbuffer * 0x20000 / 2]); } static WRITE16_HANDLER( bitmap_1_w ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); // handle overlapping pixels without writing them switch (mem_mask) @@ -339,7 +340,7 @@ INPUT_PORTS_END static VIDEO_START( pasha2 ) { - pasha2_state *state = (pasha2_state *)machine->driver_data; + pasha2_state *state = machine->driver_data(); state->bitmap0 = auto_alloc_array(machine, UINT16, 0x40000/2); state->bitmap1 = auto_alloc_array(machine, UINT16, 0x40000/2); @@ -349,7 +350,7 @@ static VIDEO_START( pasha2 ) static VIDEO_UPDATE( pasha2 ) { - pasha2_state *state = (pasha2_state *)screen->machine->driver_data; + pasha2_state *state = screen->machine->driver_data(); int x, y, count; int color; @@ -398,7 +399,7 @@ static VIDEO_UPDATE( pasha2 ) static MACHINE_START( pasha2 ) { - pasha2_state *state = (pasha2_state *)machine->driver_data; + pasha2_state *state = machine->driver_data(); state_save_register_global(machine, state->old_bank); state_save_register_global(machine, state->vbuffer); @@ -406,7 +407,7 @@ static MACHINE_START( pasha2 ) static MACHINE_RESET( pasha2 ) { - pasha2_state *state = (pasha2_state *)machine->driver_data; + pasha2_state *state = machine->driver_data(); state->old_bank = -1; state->vbuffer = 0; @@ -479,7 +480,7 @@ ROM_END static READ16_HANDLER( pasha2_speedup_r ) { - pasha2_state *state = (pasha2_state *)space->machine->driver_data; + pasha2_state *state = space->machine->driver_data(); if(cpu_get_pc(space->cpu) == 0x8302) cpu_spinuntil_int(space->cpu); diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 195589085aa..1a4f2fe93f3 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -73,7 +73,7 @@ Stephh's notes (based on the game Z80 code and some tests) : static WRITE8_HANDLER( pbaction_sh_command_w ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0x00); } @@ -254,7 +254,7 @@ static INTERRUPT_GEN( pbaction_interrupt ) static MACHINE_START( pbaction ) { - pbaction_state *state = (pbaction_state *)machine->driver_data; + pbaction_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -264,7 +264,7 @@ static MACHINE_START( pbaction ) static MACHINE_RESET( pbaction ) { - pbaction_state *state = (pbaction_state *)machine->driver_data; + pbaction_state *state = machine->driver_data(); state->scroll = 0; } @@ -463,7 +463,7 @@ ROM_END static READ8_HANDLER( pbactio3_prot_kludge_r ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); /* on startup, the game expect this location to NOT act as RAM */ if (cpu_get_pc(space->cpu) == 0xab80) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index b7e69455036..8dbe566ec7c 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -305,7 +305,7 @@ static void IGS022_reset(running_machine* machine); static WRITE16_HANDLER( pgm_videoram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (offset < 0x4000 / 2) pgm_bg_videoram_w(space, offset, data, mem_mask); @@ -317,13 +317,13 @@ static WRITE16_HANDLER( pgm_videoram_w ) static READ16_HANDLER ( z80_ram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); return (state->z80_mainram[offset * 2] << 8) | state->z80_mainram[offset * 2 + 1]; } static READ32_HANDLER( arm7_latch_arm_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("ARM7: Latch read: %08x (%08x) (%06x)\n", state->kov2_latchdata_68k_w, mem_mask, cpu_get_pc(space->cpu)); @@ -332,7 +332,7 @@ static READ32_HANDLER( arm7_latch_arm_r ) static WRITE32_HANDLER( arm7_latch_arm_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("ARM7: Latch write: %08x (%08x) (%06x)\n", data, mem_mask, cpu_get_pc(space->cpu)); @@ -342,7 +342,7 @@ static WRITE32_HANDLER( arm7_latch_arm_w ) static READ32_HANDLER( arm7_shareram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("ARM7: ARM7 Shared RAM Read: %04x = %08x (%08x) (%06x)\n", offset << 2, state->arm7_shareram[offset], mem_mask, cpu_get_pc(space->cpu)); @@ -351,7 +351,7 @@ static READ32_HANDLER( arm7_shareram_r ) static WRITE32_HANDLER( arm7_shareram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("ARM7: ARM7 Shared RAM Write: %04x = %08x (%08x) (%06x)\n", offset << 2, data, mem_mask, cpu_get_pc(space->cpu)); @@ -360,7 +360,7 @@ static WRITE32_HANDLER( arm7_shareram_w ) static READ16_HANDLER( arm7_latch_68k_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("M68K: Latch read: %04x (%04x) (%06x)\n", state->kov2_latchdata_arm_w & 0x0000ffff, mem_mask, cpu_get_pc(space->cpu)); @@ -369,7 +369,7 @@ static READ16_HANDLER( arm7_latch_68k_r ) static WRITE16_HANDLER( arm7_latch_68k_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("M68K: Latch write: %04x (%04x) (%06x)\n", data & 0x0000ffff, mem_mask, cpu_get_pc(space->cpu)); @@ -382,7 +382,7 @@ static WRITE16_HANDLER( arm7_latch_68k_w ) static READ16_HANDLER( arm7_ram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 *share16 = (UINT16 *)state->arm7_shareram; if (PGMARM7LOGERROR) @@ -392,7 +392,7 @@ static READ16_HANDLER( arm7_ram_r ) static WRITE16_HANDLER( arm7_ram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 *share16 = (UINT16 *)state->arm7_shareram; if (PGMARM7LOGERROR) @@ -402,7 +402,7 @@ static WRITE16_HANDLER( arm7_ram_w ) static WRITE16_HANDLER ( z80_ram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); int pc = cpu_get_pc(space->cpu); if (ACCESSING_BITS_8_15) @@ -417,7 +417,7 @@ static WRITE16_HANDLER ( z80_ram_w ) static WRITE16_HANDLER ( z80_reset_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMLOGERROR) logerror("Z80: reset %04x @ %04x (%06x)\n", data, mem_mask, cpu_get_pc(space->cpu)); @@ -451,7 +451,7 @@ static WRITE16_HANDLER ( z80_ctrl_w ) static WRITE16_HANDLER ( m68k_l1_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if(ACCESSING_BITS_0_7) { @@ -471,7 +471,7 @@ static WRITE8_HANDLER( z80_l3_w ) static void sound_irq( running_device *device, int level ) { - pgm_state *state = (pgm_state *)device->machine->driver_data; + pgm_state *state = device->machine->driver_data(); cpu_set_input_line(state->soundcpu, 0, level); } @@ -490,7 +490,7 @@ static UINT8 bcd( UINT8 data ) static READ16_HANDLER( pgm_calendar_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT8 calr = (state->cal_val & state->cal_mask) ? 1 : 0; state->cal_mask <<= 1; @@ -499,7 +499,7 @@ static READ16_HANDLER( pgm_calendar_r ) static WRITE16_HANDLER( pgm_calendar_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); space->machine->base_datetime(state->systime); @@ -757,7 +757,7 @@ ADDRESS_MAP_END static READ32_HANDLER( kovsh_arm7_protlatch_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); timer_call_after_resynch(space->machine, NULL, 0, 0); // force resync @@ -766,7 +766,7 @@ static READ32_HANDLER( kovsh_arm7_protlatch_r ) static WRITE32_HANDLER( kovsh_arm7_protlatch_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); timer_call_after_resynch(space->machine, NULL, 0, 0); // force resync @@ -784,7 +784,7 @@ static WRITE32_HANDLER( kovsh_arm7_protlatch_w ) static READ16_HANDLER( kovsh_68k_protlatch_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); timer_call_after_resynch(space->machine, NULL, 0, 0); // force resync @@ -798,7 +798,7 @@ static READ16_HANDLER( kovsh_68k_protlatch_r ) static WRITE16_HANDLER( kovsh_68k_protlatch_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); timer_call_after_resynch(space->machine, NULL, 0, 0); // force resync @@ -816,7 +816,7 @@ static WRITE16_HANDLER( kovsh_68k_protlatch_w ) static READ16_HANDLER( kovsh_arm7_ram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 *share16 = (UINT16 *)state->arm7_shareram; if (PGMARM7LOGERROR) @@ -826,7 +826,7 @@ static READ16_HANDLER( kovsh_arm7_ram_r ) static WRITE16_HANDLER( kovsh_arm7_ram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 *share16 = (UINT16 *)state->arm7_shareram; if (PGMARM7LOGERROR) @@ -869,7 +869,7 @@ ADDRESS_MAP_END static READ32_HANDLER( kovsh_arm7_unk_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); return state->kovsh_counter++; } @@ -894,25 +894,25 @@ ADDRESS_MAP_END static WRITE32_HANDLER( svg_arm7_ram_sel_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); state->svg_ram_sel = data & 1; } static READ32_HANDLER( svg_arm7_shareram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); return state->svg_shareram[state->svg_ram_sel & 1][offset]; } static WRITE32_HANDLER( svg_arm7_shareram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); COMBINE_DATA(&state->svg_shareram[state->svg_ram_sel & 1][offset]); } static READ16_HANDLER( svg_m68k_ram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); int ram_sel = (state->svg_ram_sel & 1) ^ 1; UINT16 *share16 = (UINT16 *)(state->svg_shareram[ram_sel & 1]); @@ -921,7 +921,7 @@ static READ16_HANDLER( svg_m68k_ram_r ) static WRITE16_HANDLER( svg_m68k_ram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); int ram_sel = (state->svg_ram_sel & 1) ^ 1; UINT16 *share16 = (UINT16 *)(state->svg_shareram[ram_sel & 1]); @@ -935,7 +935,7 @@ static READ16_HANDLER( svg_68k_nmi_r ) static WRITE16_HANDLER( svg_68k_nmi_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); generic_pulse_irq_line(state->prot, ARM7_FIRQ_LINE); cpuexec_boost_interleave(space->machine, attotime_zero, ATTOTIME_IN_USEC(200)); cpu_spinuntil_time(space->cpu, state->prot->cycles_to_attotime(200)); // give the arm time to respond (just boosting the interleave doesn't help) @@ -943,7 +943,7 @@ static WRITE16_HANDLER( svg_68k_nmi_w ) static WRITE16_HANDLER( svg_latch_68k_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (PGMARM7LOGERROR) logerror("M68K: Latch write: %04x (%04x) (%06x)\n", data & 0x0000ffff, mem_mask, cpu_get_pc(space->cpu)); COMBINE_DATA(&state->kov2_latchdata_68k_w); @@ -1340,7 +1340,7 @@ static INTERRUPT_GEN( drgw_interrupt ) static MACHINE_START( pgm ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); machine->base_datetime(state->systime); @@ -1356,7 +1356,7 @@ static MACHINE_START( pgm ) static MACHINE_RESET( pgm ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); cputag_set_input_line(machine, "soundcpu", INPUT_LINE_HALT, ASSERT_LINE); @@ -3875,7 +3875,7 @@ static void expand_32x32x5bpp(running_machine *machine) static void expand_colourdata( running_machine *machine ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT8 *src = memory_region( machine, "sprcol" ); size_t srcsize = memory_region_length( machine, "sprcol" ); int cnt; @@ -3902,7 +3902,7 @@ static void expand_colourdata( running_machine *machine ) static void pgm_basic_init( running_machine *machine ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_set_bankptr(machine, "bank1", &ROM[0x100000]); @@ -3923,7 +3923,7 @@ static DRIVER_INIT( pgm ) static DRIVER_INIT( orlegend ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); pgm_basic_init(machine); memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xC0400e, 0xC0400f, 0, 0, pgm_asic3_r, pgm_asic3_w); @@ -4001,7 +4001,7 @@ static DRIVER_INIT( drgw2j ) static void kovsh_latch_init( running_machine *machine ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); state->kovsh_highlatch_arm_w = 0; state->kovsh_lowlatch_arm_w = 0; @@ -4025,7 +4025,7 @@ static DRIVER_INIT( kov ) static DRIVER_INIT( pstar ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); pgm_basic_init(machine); pgm_pstar_decrypt(machine); @@ -4091,7 +4091,7 @@ static DRIVER_INIT( oldsplus ) static void kov2_latch_init( running_machine *machine ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); state->kov2_latchdata_68k_w = 0; state->kov2_latchdata_arm_w = 0; @@ -4130,7 +4130,7 @@ static DRIVER_INIT( ddp2 ) static void svg_basic_init(running_machine *machine) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); pgm_basic_init(machine); state->svg_shareram[0] = auto_alloc_array(machine, UINT32, 0x10000 / 4); @@ -4183,7 +4183,7 @@ static DRIVER_INIT( dmnfrnt ) static void IGS022_do_dma(running_machine* machine, UINT16 src, UINT16 dst, UINT16 size, UINT16 mode) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT16 param; /* P_SRC =0x300290 (offset from prot rom base) @@ -4343,7 +4343,7 @@ static void IGS022_reset(running_machine* machine) { int i; UINT16 *PROTROM = (UINT16*)memory_region(machine, "igs022data"); - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT16 tmp; // fill ram with A5 patern @@ -4376,7 +4376,7 @@ static void IGS022_reset(running_machine* machine) static void IGS022_handle_command(running_machine* machine) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT16 cmd = state->sharedprotram[0x200/2]; //mame_printf_debug("command %04x\n", cmd); if (cmd == 0x6d) //Store values to asic ram @@ -4427,7 +4427,7 @@ static WRITE16_HANDLER( killbld_igs025_prot_w ) { // mame_printf_debug("killbrd prot r\n"); // return 0; - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); offset &= 0xf; if (offset == 0) @@ -4455,7 +4455,7 @@ static WRITE16_HANDLER( killbld_igs025_prot_w ) static READ16_HANDLER( killbld_igs025_prot_r ) { // mame_printf_debug("killbld prot w\n"); - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 res ; offset &= 0xf; @@ -4499,7 +4499,7 @@ static READ16_HANDLER( killbld_igs025_prot_r ) static MACHINE_RESET( killbld ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); MACHINE_RESET_CALL(pgm); /* fill the protection ram with a5 + auto dma */ @@ -4520,7 +4520,7 @@ static MACHINE_RESET( killbld ) /* ASIC025/ASIC022 don't provide rom patches like the DW2 protection does, the previous dump was bad :-) */ static DRIVER_INIT( killbld ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); pgm_basic_init(machine); pgm_killbld_decrypt(machine); @@ -4542,7 +4542,7 @@ static DRIVER_INIT( killbld ) static MACHINE_RESET( dw3 ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); MACHINE_RESET_CALL(pgm); @@ -4604,7 +4604,7 @@ static int ptr=0; static UINT8 dw3_swap; static WRITE16_HANDLER( drgw3_igs025_prot_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); offset&=0xf; @@ -4631,7 +4631,7 @@ static WRITE16_HANDLER( drgw3_igs025_prot_w ) static READ16_HANDLER( drgw3_igs025_prot_r ) { // mame_printf_debug("killbld prot w\n"); - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 res ; @@ -4679,7 +4679,7 @@ static DRIVER_INIT( drgw3 ) pgm_basic_init(machine); /* - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); { int x; @@ -4702,7 +4702,7 @@ static DRIVER_INIT( puzzli2 ) it uses an arm with no external rom an acts in a similar way to kov etc. */ - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); pgm_basic_init(machine); @@ -4748,7 +4748,7 @@ static DRIVER_INIT( puzzli2 ) static DRIVER_INIT( dw2001 ) { - //pgm_state *state = (pgm_state *)machine->driver_data; + //pgm_state *state = machine->driver_data(); UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); pgm_basic_init(machine); @@ -4818,21 +4818,21 @@ static UINT32 olds_prot_addr( UINT16 addr ) static UINT32 olds_read_reg( running_machine *machine, UINT16 addr ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT32 protaddr = (olds_prot_addr(addr) - 0x400000) / 2; return state->sharedprotram[protaddr] << 16 | state->sharedprotram[protaddr + 1]; } static void olds_write_reg( running_machine *machine, UINT16 addr, UINT32 val ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); state->sharedprotram[(olds_prot_addr(addr) - 0x400000) / 2] = val >> 16; state->sharedprotram[(olds_prot_addr(addr) - 0x400000) / 2 + 1] = val & 0xffff; } static MACHINE_RESET( olds ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT16 *mem16 = (UINT16 *)memory_region(machine, "user2"); int i; @@ -4854,7 +4854,7 @@ static MACHINE_RESET( olds ) static READ16_HANDLER( olds_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT16 res = 0; if (offset == 1) @@ -4878,7 +4878,7 @@ static READ16_HANDLER( olds_r ) static WRITE16_HANDLER( olds_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (offset == 0) state->kb_cmd = data; else //offset==2 @@ -4941,7 +4941,7 @@ static READ16_HANDLER( olds_prot_swap_r ) static DRIVER_INIT( olds ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); pgm_basic_init(machine); memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xdcb400, 0xdcb403, 0, 0, olds_r, olds_w); diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 60c4fa5d19d..3359d8be050 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -210,7 +210,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static TIMER_CALLBACK( delayed_command_w ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); state->sound_command = param & 0xff; state->pending_command = 1; @@ -236,7 +236,7 @@ static WRITE8_HANDLER( sound_command_nonmi_w ) static WRITE8_HANDLER( pending_command_clear_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->pending_command = 0; cpu_set_input_line(state->subcpu, INPUT_LINE_NMI, CLEAR_LINE); } @@ -244,14 +244,14 @@ static WRITE8_HANDLER( pending_command_clear_w ) static READ8_HANDLER( pending_command_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); return state->pending_command; } static READ8_HANDLER( sound_command_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); return state->sound_command; } @@ -558,7 +558,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - fromance_state *state = (fromance_state *)device->machine->driver_data; + fromance_state *state = device->machine->driver_data(); cpu_set_input_line(state->subcpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -589,7 +589,7 @@ static const ym2610_interface ym2610_config = static MACHINE_START( pipedrm ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); state->subcpu = machine->device("sub"); @@ -610,7 +610,7 @@ static MACHINE_START( pipedrm ) static MACHINE_RESET( pipedrm ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); int i; state->pending_command = 0; @@ -883,7 +883,7 @@ ROM_END static DRIVER_INIT( pipedrm ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); /* sprite RAM lives at the end of palette RAM */ state->spriteram = &machine->generic.paletteram.u8[0xc00]; diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index 46cb6fceb63..41b894c8097 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -312,7 +312,7 @@ static const deco16ic_interface pktgaldx_deco16ic_intf = static MACHINE_START( pktgaldx ) { - pktgaldx_state *state = (pktgaldx_state *)machine->driver_data; + pktgaldx_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->deco16ic = machine->device("deco_custom"); diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index c01cfa60e2a..88b1e631750 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -80,7 +80,7 @@ static const eeprom_interface eeprom_intf = static WRITE16_HANDLER( wbeachvl_coin_eeprom_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -99,7 +99,7 @@ static WRITE16_HANDLER( wbeachvl_coin_eeprom_w ) static WRITE16_HANDLER( hotmind_coin_eeprom_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -119,7 +119,7 @@ static WRITE16_HANDLER( hrdtimes_coin_w ) static WRITE16_HANDLER( playmark_snd_command_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -131,7 +131,7 @@ static WRITE16_HANDLER( playmark_snd_command_w ) static READ8_HANDLER( playmark_snd_command_r ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); int data = 0; if ((state->oki_control & 0x38) == 0x30) @@ -150,7 +150,7 @@ static READ8_HANDLER( playmark_snd_command_r ) static READ8_HANDLER( playmark_snd_flag_r ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); if (state->snd_flag) { @@ -164,7 +164,7 @@ static READ8_HANDLER( playmark_snd_flag_r ) static WRITE8_DEVICE_HANDLER( playmark_oki_banking_w ) { - playmark_state *state = (playmark_state *)device->machine->driver_data; + playmark_state *state = device->machine->driver_data(); if (state->old_oki_bank != (data & 7)) { @@ -179,13 +179,13 @@ static WRITE8_DEVICE_HANDLER( playmark_oki_banking_w ) static WRITE8_HANDLER( playmark_oki_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); state->oki_command = data; } static WRITE8_DEVICE_HANDLER( playmark_snd_control_w ) { - playmark_state *state = (playmark_state *)device->machine->driver_data; + playmark_state *state = device->machine->driver_data(); // const address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM); /* This port controls communications to and from the 68K, and the OKI @@ -907,7 +907,7 @@ GFXDECODE_END static MACHINE_START( playmark ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->oki = machine->device("oki"); state->eeprom = machine->device("eeprom"); @@ -929,7 +929,7 @@ static MACHINE_START( playmark ) static MACHINE_RESET( playmark ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->bgscrollx = 0; state->bgscrolly = 0; @@ -1462,7 +1462,7 @@ static UINT8 playmark_asciitohex(UINT8 data) static DRIVER_INIT( bigtwin ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT8 *playmark_PICROM_HEX = memory_region(machine, "user1"); UINT16 *playmark_PICROM = (UINT16 *)memory_region(machine, "audiocpu"); INT32 offs, data; diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c index e741b9a217e..739aed2dd0e 100644 --- a/src/mame/drivers/pooyan.c +++ b/src/mame/drivers/pooyan.c @@ -24,7 +24,7 @@ static INTERRUPT_GEN( pooyan_interrupt ) { - timeplt_state *state = (timeplt_state *)device->machine->driver_data; + timeplt_state *state = device->machine->driver_data(); if (state->irq_enable) cpu_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE); @@ -33,7 +33,7 @@ static INTERRUPT_GEN( pooyan_interrupt ) static WRITE8_HANDLER( irq_enable_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->irq_enable = data & 1; if (!state->irq_enable) @@ -207,7 +207,7 @@ GFXDECODE_END static MACHINE_START( pooyan ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -217,7 +217,7 @@ static MACHINE_START( pooyan ) static MACHINE_RESET( pooyan ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->irq_enable = 0; } diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index dc25ac84cd0..9eee385ab25 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -141,7 +141,7 @@ static READ8_HANDLER( popper_input_ports_r ) static READ8_HANDLER( popper_soundcpu_nmi_r ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); return 0; } @@ -307,7 +307,7 @@ GFXDECODE_END static MACHINE_START( popper ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -318,7 +318,7 @@ static MACHINE_START( popper ) static MACHINE_RESET( popper ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); state->flipscreen = 0; state->e002 = 0; diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 39f6cdbf590..6103df7c78f 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -46,7 +46,7 @@ static WRITE16_DEVICE_HANDLER( magicstk_coin_eeprom_w ) static WRITE16_HANDLER( magicstk_bgvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram1[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -54,7 +54,7 @@ static WRITE16_HANDLER( magicstk_bgvideoram_w ) static WRITE16_HANDLER( tile_banking_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); if (((data >> 12) & 0x0f) != state->tilebank) { @@ -377,7 +377,7 @@ INPUT_PORTS_END static TILE_GET_INFO( powerbal_get_bg_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); int code = (state->videoram1[tile_index] & 0x07ff) + state->tilebank * 0x800; int colr = state->videoram1[tile_index] & 0xf000; @@ -389,7 +389,7 @@ static TILE_GET_INFO( powerbal_get_bg_tile_info ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; int height = machine->gfx[0]->height; @@ -418,7 +418,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_START( powerbal ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, powerbal_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -429,7 +429,7 @@ static VIDEO_START( powerbal ) static VIDEO_UPDATE( powerbal ) { - playmark_state *state = (playmark_state *)screen->machine->driver_data; + playmark_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); @@ -471,14 +471,14 @@ GFXDECODE_END static MACHINE_START( powerbal ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state_save_register_global(machine, state->tilebank); } static MACHINE_RESET( powerbal ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->tilebank = 0; } @@ -688,7 +688,7 @@ ROM_END static DRIVER_INIT( powerbal ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->bg_yoffset = 16; state->yoffset = -8; @@ -696,7 +696,7 @@ static DRIVER_INIT( powerbal ) static DRIVER_INIT( magicstk ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->bg_yoffset = 0; state->yoffset = -5; diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 01acf4ccc0d..db1ba14a067 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -79,7 +79,7 @@ This was pointed out by Bart Puype static CUSTOM_INPUT( z80_nmi_r ) { - psikyo_state *state = (psikyo_state *)field->port->machine->driver_data; + psikyo_state *state = field->port->machine->driver_data(); int ret = 0x00; if (state->z80_nmi) @@ -97,7 +97,7 @@ static CUSTOM_INPUT( z80_nmi_r ) static CUSTOM_INPUT( mcu_status_r ) { - psikyo_state *state = (psikyo_state *)field->port->machine->driver_data; + psikyo_state *state = field->port->machine->driver_data(); int ret = 0x00; /* Don't know exactly what this bit is, but s1945 and tengai @@ -148,7 +148,7 @@ static READ32_HANDLER( gunbird_input_r ) static TIMER_CALLBACK( psikyo_soundlatch_callback ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); state->soundlatch = param; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); state->z80_nmi = 1; @@ -190,7 +190,7 @@ static const UINT8 s1945j_table[256] = { static WRITE32_HANDLER( s1945_mcu_w ) { - psikyo_state *state = (psikyo_state *)space->machine->driver_data; + psikyo_state *state = space->machine->driver_data(); // Accesses are always bytes, so resolve it int suboff; @@ -262,7 +262,7 @@ static WRITE32_HANDLER( s1945_mcu_w ) static READ32_HANDLER( s1945_mcu_r ) { - psikyo_state *state = (psikyo_state *)space->machine->driver_data; + psikyo_state *state = space->machine->driver_data(); switch (offset) { @@ -390,19 +390,19 @@ ADDRESS_MAP_END static void sound_irq( running_device *device, int irq ) { - psikyo_state *state = (psikyo_state *)device->machine->driver_data; + psikyo_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } static READ8_HANDLER( psikyo_soundlatch_r ) { - psikyo_state *state = (psikyo_state *)space->machine->driver_data; + psikyo_state *state = space->machine->driver_data(); return state->soundlatch; } static WRITE8_HANDLER( psikyo_clear_nmi_w ) { - psikyo_state *state = (psikyo_state *)space->machine->driver_data; + psikyo_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); state->z80_nmi = 0; } @@ -1026,7 +1026,7 @@ GFXDECODE_END static MACHINE_START( psikyo ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -1039,7 +1039,7 @@ static MACHINE_START( psikyo ) static MACHINE_RESET( psikyo ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); state->soundlatch = 0; state->z80_nmi = 0; @@ -1200,7 +1200,7 @@ MACHINE_DRIVER_END static void irqhandler( running_device *device, int linestate ) { - psikyo_state *state = (psikyo_state *)device->machine->driver_data; + psikyo_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, linestate ? ASSERT_LINE : CLEAR_LINE); } @@ -1832,7 +1832,7 @@ ROM_END static DRIVER_INIT( sngkace ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); { UINT8 *RAM = memory_region(machine, "ymsnd"); @@ -1874,7 +1874,7 @@ static DRIVER_INIT( sngkace ) static void s1945_mcu_init( running_machine *machine ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); state->s1945_mcu_direction = 0x00; state->s1945_mcu_inlatch = 0xff; state->s1945_mcu_latch1 = 0xff; @@ -1898,7 +1898,7 @@ static void s1945_mcu_init( running_machine *machine ) static DRIVER_INIT( tengai ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports */ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r); @@ -1921,7 +1921,7 @@ static DRIVER_INIT( tengai ) static DRIVER_INIT( gunbird ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports */ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r); @@ -1939,7 +1939,7 @@ static DRIVER_INIT( gunbird ) static DRIVER_INIT( s1945 ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports */ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r); @@ -1962,7 +1962,7 @@ static DRIVER_INIT( s1945 ) static DRIVER_INIT( s1945a ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports */ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r); @@ -1985,7 +1985,7 @@ static DRIVER_INIT( s1945a ) static DRIVER_INIT( s1945j ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports*/ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r); @@ -2008,7 +2008,7 @@ static DRIVER_INIT( s1945j ) static DRIVER_INIT( s1945jn ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports */ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r); @@ -2025,7 +2025,7 @@ static DRIVER_INIT( s1945jn ) static DRIVER_INIT( s1945bl ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* input ports */ memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r); diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 9ed2328c304..0e19ee45c6b 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -203,7 +203,7 @@ static CUSTOM_INPUT( system_port_r ) static CUSTOM_INPUT( mahjong_ctrl_r ) /* used by hotgmck/hgkairak */ { - psikyo4_state *state = (psikyo4_state *)field->port->machine->driver_data; + psikyo4_state *state = field->port->machine->driver_data(); int player = (FPTR)param; int sel = (state->io_select[0] & 0x0000ff00) >> 8; int ret = 0xff; @@ -218,7 +218,7 @@ static CUSTOM_INPUT( mahjong_ctrl_r ) /* used by hotgmck/hgkairak */ static WRITE32_HANDLER( ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); int r, g, b; COMBINE_DATA(&state->paletteram[offset]); @@ -232,7 +232,7 @@ static WRITE32_HANDLER( ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_ static WRITE32_HANDLER( ps4_bgpen_1_dword_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); int r, g, b; COMBINE_DATA(&state->bgpen_1[0]); @@ -245,7 +245,7 @@ static WRITE32_HANDLER( ps4_bgpen_1_dword_w ) static WRITE32_HANDLER( ps4_bgpen_2_dword_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); int r, g, b; COMBINE_DATA(&state->bgpen_2[0]); @@ -258,7 +258,7 @@ static WRITE32_HANDLER( ps4_bgpen_2_dword_w ) static WRITE32_HANDLER( ps4_screen1_brt_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -289,7 +289,7 @@ static WRITE32_HANDLER( ps4_screen1_brt_w ) static WRITE32_HANDLER( ps4_screen2_brt_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -321,7 +321,7 @@ static WRITE32_HANDLER( ps4_screen2_brt_w ) static WRITE32_HANDLER( ps4_vidregs_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vidregs[offset]); #if ROMTEST @@ -338,7 +338,7 @@ static WRITE32_HANDLER( ps4_vidregs_w ) #if ROMTEST static READ32_HANDLER( ps4_sample_r ) /* Send sample data for test */ { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); UINT8 *ROM = memory_region(space->machine, "ymf"); return ROM[state->sample_offs++] << 16; } @@ -348,7 +348,7 @@ static READ32_HANDLER( ps4_sample_r ) /* Send sample data for test */ static void set_hotgmck_pcm_bank( running_machine *machine, int n ) { - psikyo4_state *state = (psikyo4_state *)machine->driver_data; + psikyo4_state *state = machine->driver_data(); UINT8 *ymf_pcmbank = memory_region(machine, "ymf") + 0x200000; UINT8 *pcm_rom = memory_region(machine, "ymfsource"); @@ -357,7 +357,7 @@ static void set_hotgmck_pcm_bank( running_machine *machine, int n ) static WRITE32_HANDLER( hotgmck_pcm_bank_w ) { - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); int old_bank0 = PCM_BANK_NO(0); int old_bank1 = PCM_BANK_NO(1); int new_bank0, new_bank1; @@ -687,7 +687,7 @@ INPUT_PORTS_END static void irqhandler( running_device *device, int linestate ) { - psikyo4_state *state = (psikyo4_state *)device->machine->driver_data; + psikyo4_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, 12, linestate ? ASSERT_LINE : CLEAR_LINE); } @@ -699,7 +699,7 @@ static const ymf278b_interface ymf278b_config = static MACHINE_START( psikyo4 ) { - psikyo4_state *state = (psikyo4_state *)machine->driver_data; + psikyo4_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -717,7 +717,7 @@ static MACHINE_START( psikyo4 ) static MACHINE_RESET( psikyo4 ) { - psikyo4_state *state = (psikyo4_state *)machine->driver_data; + psikyo4_state *state = machine->driver_data(); state->oldbrt1 = -1; state->oldbrt2 = -1; @@ -1011,7 +1011,7 @@ PC :00001B44: MOV.L @R1,R2 PC :00001B46: TST R2,R2 PC :00001B48: BT $00001B3C */ - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x00001b3e) cpu_spinuntil_int(space->cpu); @@ -1030,7 +1030,7 @@ PC :00001B50: MOV.L @R1,R2 PC :00001B52: TST R2,R2 PC :00001B54: BT $00001B48 */ - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x00001b4a) cpu_spinuntil_int(space->cpu); @@ -1049,7 +1049,7 @@ PC :000029F4: MOV.L @R1,R3 PC :000029F6: TST R3,R3 PC :000029F8: BT $000029EC */ - psikyo4_state *state = (psikyo4_state *)space->machine->driver_data; + psikyo4_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x000029ee) cpu_spinuntil_int(space->cpu); @@ -1064,7 +1064,7 @@ static STATE_POSTLOAD( hotgmck_pcm_bank_postload ) static void install_hotgmck_pcm_bank(running_machine *machine) { - psikyo4_state *state = (psikyo4_state *)machine->driver_data; + psikyo4_state *state = machine->driver_data(); UINT8 *ymf_pcm = memory_region(machine, "ymf"); UINT8 *pcm_rom = memory_region(machine, "ymfsource"); diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 4ca253744e8..2c2e89c32a4 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -354,7 +354,7 @@ static INTERRUPT_GEN(psikyosh_interrupt) // bit 0 controls game speed on readback, mechanism is a little weird static WRITE32_HANDLER( psikyosh_irqctrl_w ) { - psikyosh_state *state = (psikyosh_state *)space->machine->driver_data; + psikyosh_state *state = space->machine->driver_data(); if (!(data & 0x00c00000)) { cpu_set_input_line(state->maincpu, 4, CLEAR_LINE); @@ -363,7 +363,7 @@ static WRITE32_HANDLER( psikyosh_irqctrl_w ) static WRITE32_HANDLER( paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w ) { - psikyosh_state *state = (psikyosh_state *)space->machine->driver_data; + psikyosh_state *state = space->machine->driver_data(); int r, g, b; COMBINE_DATA(&state->paletteram[offset]); @@ -376,7 +376,7 @@ static WRITE32_HANDLER( paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w ) static WRITE32_HANDLER( psikyosh_vidregs_w ) { - psikyosh_state *state = (psikyosh_state *)space->machine->driver_data; + psikyosh_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vidregs[offset]); if (offset == 4) /* Configure bank for gfx test */ @@ -388,7 +388,7 @@ static WRITE32_HANDLER( psikyosh_vidregs_w ) static READ32_HANDLER( psh_sample_r ) /* Send sample data for test */ { - psikyosh_state *state = (psikyosh_state *)space->machine->driver_data; + psikyosh_state *state = space->machine->driver_data(); UINT8 *ROM = memory_region(space->machine, "ymf"); return ROM[state->sample_offs++] << 16; @@ -788,7 +788,7 @@ INPUT_PORTS_END static void irqhandler(running_device *device, int linestate) { - psikyosh_state *state = (psikyosh_state *)device->machine->driver_data; + psikyosh_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, 12, linestate ? ASSERT_LINE : CLEAR_LINE); } @@ -800,7 +800,7 @@ static const ymf278b_interface ymf278b_config = static MACHINE_START( psikyosh ) { - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 71bea2d9213..1f220289b49 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -49,7 +49,7 @@ static WRITE16_HANDLER( pushman_control_w ) static READ16_HANDLER( pushman_68705_r ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); if (offset == 0) return state->latch; @@ -67,7 +67,7 @@ static READ16_HANDLER( pushman_68705_r ) static WRITE16_HANDLER( pushman_68705_w ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->shared_ram[2 * offset] = data >> 8; @@ -85,7 +85,7 @@ static WRITE16_HANDLER( pushman_68705_w ) /* ElSemi - Bouncing balls protection. */ static READ16_HANDLER( bballs_68705_r ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); if (offset == 0) return state->latch; @@ -102,7 +102,7 @@ static READ16_HANDLER( bballs_68705_r ) static WRITE16_HANDLER( bballs_68705_w ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->shared_ram[2 * offset] = data >> 8; @@ -131,13 +131,13 @@ static WRITE16_HANDLER( bballs_68705_w ) static READ8_HANDLER( pushman_68000_r ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); return state->shared_ram[offset]; } static WRITE8_HANDLER( pushman_68000_w ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); if (offset == 2 && (state->shared_ram[2] & 2) == 0 && data & 2) { @@ -403,7 +403,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int irq) { - pushman_state *state = (pushman_state *)device->machine->driver_data; + pushman_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -420,7 +420,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( pushman ) { - pushman_state *state = (pushman_state *)machine->driver_data; + pushman_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -434,7 +434,7 @@ static MACHINE_START( pushman ) static MACHINE_RESET( pushman ) { - pushman_state *state = (pushman_state *)machine->driver_data; + pushman_state *state = machine->driver_data(); state->latch = 0; state->new_latch = 0; @@ -494,7 +494,7 @@ MACHINE_DRIVER_END static MACHINE_RESET( bballs ) { - pushman_state *state = (pushman_state *)machine->driver_data; + pushman_state *state = machine->driver_data(); MACHINE_RESET_CALL(pushman); diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index ea65c6bf7b5..a43c953d174 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -19,12 +19,13 @@ #include "sound/okim6295.h" #include "machine/eeprom.h" -class pzletime_state +class pzletime_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pzletime_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pzletime_state(machine)); } - pzletime_state(running_machine &machine) { } + pzletime_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_videoram; @@ -45,7 +46,7 @@ public: static TILE_GET_INFO( get_mid_tile_info ) { - pzletime_state *state = (pzletime_state *)machine->driver_data; + pzletime_state *state = machine->driver_data(); int tileno = state->mid_videoram[tile_index] & 0x0fff; int colour = state->mid_videoram[tile_index] & 0xf000; colour = colour >> 12; @@ -54,7 +55,7 @@ static TILE_GET_INFO( get_mid_tile_info ) static TILE_GET_INFO( get_txt_tile_info ) { - pzletime_state *state = (pzletime_state *)machine->driver_data; + pzletime_state *state = machine->driver_data(); int tileno = state->txt_videoram[tile_index] & 0x0fff; int colour = state->txt_videoram[tile_index] & 0xf000; colour = colour >> 12; @@ -66,7 +67,7 @@ static TILE_GET_INFO( get_txt_tile_info ) static VIDEO_START( pzletime ) { - pzletime_state *state = (pzletime_state *)machine->driver_data; + pzletime_state *state = machine->driver_data(); state->mid_tilemap = tilemap_create(machine, get_mid_tile_info, tilemap_scan_cols, 16, 16, 64, 16); state->txt_tilemap = tilemap_create(machine, get_txt_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -77,7 +78,7 @@ static VIDEO_START( pzletime ) static VIDEO_UPDATE( pzletime ) { - pzletime_state *state = (pzletime_state *)screen->machine->driver_data; + pzletime_state *state = screen->machine->driver_data(); int count; int y, x; @@ -136,14 +137,14 @@ static VIDEO_UPDATE( pzletime ) static WRITE16_HANDLER( mid_videoram_w ) { - pzletime_state *state = (pzletime_state *)space->machine->driver_data; + pzletime_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mid_videoram[offset]); tilemap_mark_tile_dirty(state->mid_tilemap, offset); } static WRITE16_HANDLER( txt_videoram_w ) { - pzletime_state *state = (pzletime_state *)space->machine->driver_data; + pzletime_state *state = space->machine->driver_data(); COMBINE_DATA(&state->txt_videoram[offset]); tilemap_mark_tile_dirty(state->txt_tilemap, offset); } @@ -160,7 +161,7 @@ static WRITE16_DEVICE_HANDLER( eeprom_w ) static WRITE16_HANDLER( ticket_w ) { - pzletime_state *state = (pzletime_state *)space->machine->driver_data; + pzletime_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->ticket = data & 1; @@ -168,7 +169,7 @@ static WRITE16_HANDLER( ticket_w ) static WRITE16_HANDLER( video_regs_w ) { - pzletime_state *state = (pzletime_state *)space->machine->driver_data; + pzletime_state *state = space->machine->driver_data(); int i; COMBINE_DATA(&state->video_regs[offset]); @@ -202,7 +203,7 @@ static WRITE16_DEVICE_HANDLER( oki_bank_w ) static CUSTOM_INPUT( ticket_status_r ) { - pzletime_state *state = (pzletime_state *)field->port->machine->driver_data; + pzletime_state *state = field->port->machine->driver_data(); return (state->ticket && !(field->port->machine->primary_screen->frame_number() % 128)); } @@ -295,14 +296,14 @@ static PALETTE_INIT( pzletime ) static MACHINE_START( pzletime ) { - pzletime_state *state = (pzletime_state *)machine->driver_data; + pzletime_state *state = machine->driver_data(); state_save_register_global(machine, state->ticket); } static MACHINE_RESET( pzletime ) { - pzletime_state *state = (pzletime_state *)machine->driver_data; + pzletime_state *state = machine->driver_data(); state->ticket = 0; } diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index 3619ac15231..c590e8741c5 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -76,19 +76,19 @@ Sound Board 1b11107 static WRITE8_HANDLER( video_page_select_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); state->page = offset & 0x03; } static WRITE8_HANDLER( io_page_select_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); state->io_page = offset & 0x03; } static WRITE8_HANDLER( quasar_video_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); switch (state->page) { @@ -101,7 +101,7 @@ static WRITE8_HANDLER( quasar_video_w ) static READ8_HANDLER( quasar_IO_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); UINT8 ans = 0; switch (state->io_page) @@ -117,7 +117,7 @@ static READ8_HANDLER( quasar_IO_r ) static WRITE8_HANDLER( quasar_bullet_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); state->bullet_ram[offset] = (data ^ 0xff); } @@ -335,7 +335,7 @@ static const s2636_interface s2636_2_config = static MACHINE_START( quasar ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); MACHINE_START_CALL(cvs); @@ -347,7 +347,7 @@ static MACHINE_START( quasar ) static MACHINE_RESET( quasar ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); MACHINE_RESET_CALL(cvs); diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index cc19f377e2a..abdda4ef953 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -331,7 +331,7 @@ Stephh's notes (based on the game M68000 code and some tests) : static WRITE16_HANDLER( jumping_sound_w ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -403,7 +403,7 @@ static WRITE8_DEVICE_HANDLER( bankswitch_w ) static READ8_HANDLER( jumping_latch_r ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); return state->jumping_latch; } @@ -627,7 +627,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - rainbow_state *state = (rainbow_state *)device->machine->driver_data; + rainbow_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -666,7 +666,7 @@ static const tc0140syt_interface rainbow_tc0140syt_intf = static MACHINE_START( rainbow ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -895,7 +895,7 @@ static DRIVER_INIT( rainbowe ) static DRIVER_INIT( jumping ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); int i, len = memory_region_length(machine, "gfx2"); UINT8 *rom = memory_region(machine, "gfx2"); diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 630265c9c70..ee94b5a08b1 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -205,7 +205,7 @@ TODO: static WRITE8_HANDLER( rallyx_interrupt_vector_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); cpu_set_input_line_vector(state->maincpu, 0, data); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); @@ -214,7 +214,7 @@ static WRITE8_HANDLER( rallyx_interrupt_vector_w ) static WRITE8_HANDLER( rallyx_bang_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); if (data == 0 && state->last_bang != 0) sample_start(state->samples, 0, 0, 0); @@ -224,7 +224,7 @@ static WRITE8_HANDLER( rallyx_bang_w ) static WRITE8_HANDLER( rallyx_latch_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); int bit = data & 1; switch (offset) @@ -269,7 +269,7 @@ static WRITE8_HANDLER( rallyx_latch_w ) static WRITE8_HANDLER( locomotn_latch_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); int bit = data & 1; switch (offset) @@ -874,7 +874,7 @@ static const samples_interface rallyx_samples_interface = static MACHINE_START( rallyx ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->samples = machine->device("samples"); @@ -885,7 +885,7 @@ static MACHINE_START( rallyx ) static MACHINE_RESET( rallyx ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->last_bang = 0; state->stars_enable = 0; diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index 28cd33c7805..c9f639a28db 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -40,8 +40,8 @@ static void update_interrupts(running_machine *machine) { - rampart_state *state = (rampart_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + rampart_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -68,11 +68,11 @@ static MACHINE_START( rampart ) static MACHINE_RESET( rampart ) { - rampart_state *state = (rampart_state *)machine->driver_data; + rampart_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_slapstic_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_slapstic_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, scanline_update, 32); } @@ -145,7 +145,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x3e3f80, 0x3effff) AM_MIRROR(0x010000) AM_RAM AM_RANGE(0x460000, 0x460001) AM_MIRROR(0x019ffe) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0xff00) AM_RANGE(0x480000, 0x480003) AM_MIRROR(0x019ffc) AM_DEVWRITE8("ymsnd", ym2413_w, 0xff00) - AM_RANGE(0x500000, 0x500fff) AM_MIRROR(0x019000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(rampart_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x500000, 0x500fff) AM_MIRROR(0x019000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(rampart_state, eeprom, eeprom_size) AM_RANGE(0x5a6000, 0x5a6001) AM_MIRROR(0x019ffe) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x640000, 0x640001) AM_MIRROR(0x019ffe) AM_WRITE(latch_w) AM_RANGE(0x640000, 0x640001) AM_MIRROR(0x019ffc) AM_READ_PORT("IN0") @@ -495,10 +495,10 @@ static DRIVER_INIT( rampart ) 0x01FF,0x0E00,0x01FF,0x0E00,0x01FF,0x0E00,0x01FF,0x0E00, 0x0000 }; - rampart_state *state = (rampart_state *)machine->driver_data; + rampart_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "maincpu"); - state->atarigen.eeprom_default = compressed_default_eeprom; + state->eeprom_default = compressed_default_eeprom; memcpy(&rom[0x140000], &rom[0x40000], 0x8000); atarigen_slapstic_init(machine->device("maincpu"), 0x140000, 0x438000, 118); } diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 79bfa836d58..81b6d7901e8 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -174,7 +174,7 @@ static WRITE8_DEVICE_HANDLER( rastan_bankswitch_w ) static void rastan_msm5205_vck( running_device *device ) { - rastan_state *state = (rastan_state *)device->machine->driver_data; + rastan_state *state = device->machine->driver_data(); if (state->adpcm_data != -1) { msm5205_data_w(device, state->adpcm_data & 0x0f); @@ -190,7 +190,7 @@ static void rastan_msm5205_vck( running_device *device ) static WRITE8_HANDLER( rastan_msm5205_address_w ) { - rastan_state *state = (rastan_state *)space->machine->driver_data; + rastan_state *state = space->machine->driver_data(); state->adpcm_pos = (state->adpcm_pos & 0x00ff) | (data << 8); } @@ -201,7 +201,7 @@ static WRITE8_DEVICE_HANDLER( rastan_msm5205_start_w ) static WRITE8_DEVICE_HANDLER( rastan_msm5205_stop_w ) { - rastan_state *state = (rastan_state *)device->machine->driver_data; + rastan_state *state = device->machine->driver_data(); msm5205_reset_w(device, 1); state->adpcm_pos &= 0xff00; } @@ -346,7 +346,7 @@ GFXDECODE_END /* handler called by the YM2151 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - rastan_state *state = (rastan_state *)device->machine->driver_data; + rastan_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -364,7 +364,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( rastan ) { - rastan_state *state = (rastan_state *)machine->driver_data; + rastan_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x00000], 0x4000); @@ -384,7 +384,7 @@ static MACHINE_START( rastan ) static MACHINE_RESET( rastan ) { - rastan_state *state = (rastan_state *)machine->driver_data; + rastan_state *state = machine->driver_data(); state->sprite_ctrl = 0; state->sprites_flipscreen = 0; diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index 3e56ffb611e..1e6404ae35d 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -27,7 +27,7 @@ TODO: static WRITE8_HANDLER( irqack_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 0, CLEAR_LINE); } @@ -78,7 +78,7 @@ ADDRESS_MAP_END */ static INPUT_CHANGED( left_coin_inserted ) { - ladybug_state *state = (ladybug_state *)field->port->machine->driver_data; + ladybug_state *state = field->port->machine->driver_data(); if(newval) cpu_set_input_line(state->maincpu, 0, ASSERT_LINE); @@ -86,7 +86,7 @@ static INPUT_CHANGED( left_coin_inserted ) static INPUT_CHANGED( right_coin_inserted ) { - ladybug_state *state = (ladybug_state *)field->port->machine->driver_data; + ladybug_state *state = field->port->machine->driver_data(); if(newval) cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, PULSE_LINE); @@ -328,7 +328,7 @@ GFXDECODE_END static MACHINE_START( redclash ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -343,7 +343,7 @@ static MACHINE_START( redclash ) static MACHINE_RESET( redclash ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->star_speed = 0; state->gfxbank = 0; diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index aa1791bae46..e5fc11370e2 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -33,8 +33,8 @@ static void update_interrupts(running_machine *machine) { - relief_state *state = (relief_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + relief_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -72,11 +72,11 @@ static MACHINE_START( relief ) static MACHINE_RESET( relief ) { - relief_state *state = (relief_state *)machine->driver_data; + relief_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); - atarivc_reset(*machine->primary_screen, state->atarigen.atarivc_eof_data, 2); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); + atarivc_reset(*machine->primary_screen, state->atarivc_eof_data, 2); machine->device("oki")->set_bank_base(0); state->ym2413_volume = 15; @@ -94,9 +94,9 @@ static MACHINE_RESET( relief ) static READ16_HANDLER( special_port2_r ) { - relief_state *state = (relief_state *)space->machine->driver_data; + relief_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "260010"); - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0020; + if (state->cpu_to_sound_ready) result ^= 0x0020; if (!(result & 0x0080) || atarigen_get_hblank(*space->machine->primary_screen)) result ^= 0x0001; return result; } @@ -111,7 +111,7 @@ static READ16_HANDLER( special_port2_r ) static WRITE16_HANDLER( audio_control_w ) { - relief_state *state = (relief_state *)space->machine->driver_data; + relief_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->ym2413_volume = (data >> 1) & 15; @@ -128,7 +128,7 @@ static WRITE16_HANDLER( audio_control_w ) static WRITE16_HANDLER( audio_volume_w ) { - relief_state *state = (relief_state *)space->machine->driver_data; + relief_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->overall_volume = data & 127; @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140010, 0x140011) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x140020, 0x140021) AM_WRITE(audio_volume_w) AM_RANGE(0x140030, 0x140031) AM_WRITE(audio_control_w) - AM_RANGE(0x180000, 0x180fff) AM_READWRITE(atarigen_eeprom_upper_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(relief_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x180000, 0x180fff) AM_READWRITE(atarigen_eeprom_upper_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(relief_state, eeprom, eeprom_size) AM_RANGE(0x1c0030, 0x1c0031) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x260000, 0x260001) AM_READ_PORT("260000") AM_RANGE(0x260002, 0x260003) AM_READ_PORT("260002") @@ -161,13 +161,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x260012, 0x260013) AM_READ_PORT("260012") AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(relief_atarivc_r, relief_atarivc_w) AM_BASE_MEMBER(relief_state, atarigen.atarivc_data) - AM_RANGE(0x3f0000, 0x3f1fff) AM_RAM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE_MEMBER(relief_state, atarigen.playfield2) - AM_RANGE(0x3f2000, 0x3f3fff) AM_RAM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(relief_state, atarigen.playfield) - AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE(atarigen_playfield_dual_upper_w) AM_BASE_MEMBER(relief_state, atarigen.playfield_upper) + AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(relief_atarivc_r, relief_atarivc_w) AM_BASE_MEMBER(relief_state, atarivc_data) + AM_RANGE(0x3f0000, 0x3f1fff) AM_RAM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE_MEMBER(relief_state, playfield2) + AM_RANGE(0x3f2000, 0x3f3fff) AM_RAM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(relief_state, playfield) + AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE(atarigen_playfield_dual_upper_w) AM_BASE_MEMBER(relief_state, playfield_upper) AM_RANGE(0x3f6000, 0x3f67ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3f6800, 0x3f8eff) AM_RAM - AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_BASE_MEMBER(relief_state, atarigen.atarivc_eof_data) + AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_BASE_MEMBER(relief_state, atarivc_eof_data) AM_RANGE(0x3f8f80, 0x3f8fff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f9000, 0x3fffff) AM_RAM ADDRESS_MAP_END @@ -404,10 +404,10 @@ ROM_END static void init_common(running_machine *machine, const UINT16 *def_eeprom) { - relief_state *state = (relief_state *)machine->driver_data; + relief_state *state = machine->driver_data(); UINT8 *sound_base = memory_region(machine, "oki"); - state->atarigen.eeprom_default = def_eeprom; + state->eeprom_default = def_eeprom; /* expand the ADPCM data to avoid lots of memcpy's during gameplay */ /* the upper 128k is fixed, the lower 128k is bankswitched */ diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 211e3513517..82362b50811 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -58,7 +58,7 @@ Notes: static INTERRUPT_GEN( rockrage_interrupt ) { - rockrage_state *state = (rockrage_state *)device->machine->driver_data; + rockrage_state *state = device->machine->driver_data(); if (k007342_is_int_enabled(state->k007342)) cpu_set_input_line(device, HD6309_IRQ_LINE, HOLD_LINE); } @@ -77,7 +77,7 @@ static WRITE8_HANDLER( rockrage_bankswitch_w ) static WRITE8_HANDLER( rockrage_sh_irqtrigger_w ) { - rockrage_state *state = (rockrage_state *)space->machine->driver_data; + rockrage_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line(state->audiocpu, M6809_IRQ_LINE, HOLD_LINE); } @@ -273,7 +273,7 @@ static const k007420_interface rockrage_k007420_intf = static MACHINE_START( rockrage ) { - rockrage_state *state = (rockrage_state *)machine->driver_data; + rockrage_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x2000); @@ -288,7 +288,7 @@ static MACHINE_START( rockrage ) static MACHINE_RESET( rockrage ) { - rockrage_state *state = (rockrage_state *)machine->driver_data; + rockrage_state *state = machine->driver_data(); state->vreg = 0; state->layer_colorbase[0] = 0x00; diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index c5660140226..6ecfac27c93 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -116,7 +116,7 @@ static READ16_HANDLER( rohga_irq_ack_r ) { - rohga_state *state = (rohga_state *)space->machine->driver_data; + rohga_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 6, CLEAR_LINE); return 0; @@ -127,7 +127,7 @@ static WRITE16_HANDLER( wizdfire_irq_ack_w ) /* This might actually do more, nitrobal for example sets 0xca->0xffff->0x80 at startup then writes 7 all the time except when a credit is inserted (writes 6 twice). Wizard Fire / Dark Seal 2 just writes 1 all the time, so I just don't trust it much for now... -AS */ - rohga_state *state = (rohga_state *)space->machine->driver_data; + rohga_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, 6, CLEAR_LINE); } @@ -722,13 +722,13 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - rohga_state *driver_state = (rohga_state *)device->machine->driver_data; + rohga_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { - rohga_state *state = (rohga_state *)device->machine->driver_data; + rohga_state *state = device->machine->driver_data(); state->oki1->set_bank_base(BIT(data, 0) * 0x40000); state->oki2->set_bank_base(BIT(data, 1) * 0x40000); } diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index 23ef91843e9..c656f82ed6a 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -23,7 +23,7 @@ static KONAMI_SETLINES_CALLBACK( rollerg_banking ); static WRITE8_HANDLER( rollerg_0010_w ) { - rollerg_state *state = (rollerg_state *)space->machine->driver_data; + rollerg_state *state = space->machine->driver_data(); logerror("%04x: write %02x to 0010\n",cpu_get_pc(space->cpu), data); /* bits 0/1 are coin counters */ @@ -41,7 +41,7 @@ static WRITE8_HANDLER( rollerg_0010_w ) static READ8_HANDLER( rollerg_k051316_r ) { - rollerg_state *state = (rollerg_state *)space->machine->driver_data; + rollerg_state *state = space->machine->driver_data(); if (state->readzoomroms) return k051316_rom_r(state->k051316, offset); @@ -58,19 +58,19 @@ static READ8_DEVICE_HANDLER( rollerg_sound_r ) static WRITE8_HANDLER( soundirq_w ) { - rollerg_state *state = (rollerg_state *)space->machine->driver_data; + rollerg_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static TIMER_CALLBACK( nmi_callback ) { - rollerg_state *state = (rollerg_state *)machine->driver_data; + rollerg_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( sound_arm_nmi_w ) { - rollerg_state *state = (rollerg_state *)space->machine->driver_data; + rollerg_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); timer_set(space->machine, ATTOTIME_IN_USEC(50), NULL, 0, nmi_callback); /* kludge until the K053260 is emulated correctly */ } @@ -236,7 +236,7 @@ static const k051316_interface rollerg_k051316_intf = static MACHINE_START( rollerg ) { - rollerg_state *state = (rollerg_state *)machine->driver_data; + rollerg_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); @@ -254,7 +254,7 @@ static MACHINE_START( rollerg ) static MACHINE_RESET( rollerg ) { - rollerg_state *state = (rollerg_state *)machine->driver_data; + rollerg_state *state = machine->driver_data(); konami_configure_set_lines(machine->device("maincpu"), rollerg_banking); diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 2131a8b7906..de201fe2299 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -66,7 +66,7 @@ static const eeprom_interface eeprom_intf = static READ16_HANDLER( rng_sysregs_r ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); UINT16 data = 0; switch (offset) @@ -110,7 +110,7 @@ static READ16_HANDLER( rng_sysregs_r ) static WRITE16_HANDLER( rng_sysregs_w ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); COMBINE_DATA(state->sysreg + offset); @@ -158,7 +158,7 @@ static WRITE16_HANDLER( sound_cmd2_w ) static WRITE16_HANDLER( sound_irq_w ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); @@ -166,7 +166,7 @@ static WRITE16_HANDLER( sound_irq_w ) static READ16_HANDLER( sound_status_msb_r ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) return(state->sound_status << 8); @@ -176,7 +176,7 @@ static READ16_HANDLER( sound_status_msb_r ) static INTERRUPT_GEN(rng_interrupt) { - rungun_state *state = (rungun_state *)device->machine->driver_data; + rungun_state *state = device->machine->driver_data(); if (state->sysreg[0x0c / 2] & 0x09) cpu_set_input_line(device, M68K_IRQ_5, ASSERT_LINE); @@ -215,13 +215,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sound_status_w ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); state->sound_status = data; } static WRITE8_HANDLER( z80ctrl_w ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); state->z80_control = data; @@ -233,7 +233,7 @@ static WRITE8_HANDLER( z80ctrl_w ) static INTERRUPT_GEN(audio_interrupt) { - rungun_state *state = (rungun_state *)device->machine->driver_data; + rungun_state *state = device->machine->driver_data(); if (state->z80_control & 0x80) return; @@ -361,7 +361,7 @@ static const k053247_interface rng_k055673_intf = static MACHINE_START( rng ) { - rungun_state *state = (rungun_state *)machine->driver_data; + rungun_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "soundcpu"); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x10000], 0x4000); @@ -382,7 +382,7 @@ static MACHINE_START( rng ) static MACHINE_RESET( rng ) { - rungun_state *state = (rungun_state *)machine->driver_data; + rungun_state *state = machine->driver_data(); k054539_init_flags(machine->device("k054539_1"), K054539_REVERSE_STEREO); diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index 9ab93cb431a..04750cb78d6 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -50,12 +50,13 @@ modified by Hau #include "cpu/i8085/i8085.h" #include "sound/samples.h" -class safarir_state +class safarir_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, safarir_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, safarir_state(machine)); } - safarir_state(running_machine &machine) { } + safarir_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *ram_1, *ram_2; size_t ram_size; @@ -77,7 +78,7 @@ public: static WRITE8_HANDLER( ram_w ) { - safarir_state *state = (safarir_state *)space->machine->driver_data; + safarir_state *state = space->machine->driver_data(); if (state->ram_bank) state->ram_2[offset] = data; @@ -90,7 +91,7 @@ static WRITE8_HANDLER( ram_w ) static READ8_HANDLER( ram_r ) { - safarir_state *state = (safarir_state *)space->machine->driver_data; + safarir_state *state = space->machine->driver_data(); return state->ram_bank ? state->ram_2[offset] : state->ram_1[offset]; } @@ -98,7 +99,7 @@ static READ8_HANDLER( ram_r ) static WRITE8_HANDLER( ram_bank_w ) { - safarir_state *state = (safarir_state *)space->machine->driver_data; + safarir_state *state = space->machine->driver_data(); state->ram_bank = data & 0x01; @@ -184,7 +185,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static VIDEO_START( safarir ) { - safarir_state *state = (safarir_state *)machine->driver_data; + safarir_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -195,7 +196,7 @@ static VIDEO_START( safarir ) static VIDEO_UPDATE( safarir ) { - safarir_state *state = (safarir_state *)screen->machine->driver_data; + safarir_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, *state->bg_scroll); @@ -233,7 +234,7 @@ static VIDEO_UPDATE( safarir ) static WRITE8_HANDLER( safarir_audio_w ) { - safarir_state *state = (safarir_state *)space->machine->driver_data; + safarir_state *state = space->machine->driver_data(); running_device *samples = state->samples; UINT8 rising_bits = data & ~state->port_last; @@ -312,7 +313,7 @@ MACHINE_DRIVER_END static MACHINE_START( safarir ) { - safarir_state *state = (safarir_state *)machine->driver_data; + safarir_state *state = machine->driver_data(); state->ram_1 = auto_alloc_array(machine, UINT8, state->ram_size); state->ram_2 = auto_alloc_array(machine, UINT8, state->ram_size); diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index 12503501629..9b9fd19f77c 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -51,7 +51,7 @@ CPU/Video Board Parts: static WRITE8_HANDLER( sbasketb_sh_irqtrigger_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -174,7 +174,7 @@ GFXDECODE_END static MACHINE_START( sbasketb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->vlm = machine->device("vlm"); @@ -187,7 +187,7 @@ static MACHINE_START( sbasketb ) static MACHINE_RESET( sbasketb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->SN76496_latch = 0; state->last_addr = 0; diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index d5a4542f665..b22b3f419c6 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -45,12 +45,13 @@ PROMs : NEC B406 (1kx4) x2 #include "sound/ay8910.h" -class sbowling_state +class sbowling_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbowling_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbowling_state(machine)); } - sbowling_state(running_machine &machine) { } + sbowling_state(running_machine &machine) + : driver_data_t(machine) { } int bgmap; UINT8 *videoram; @@ -65,7 +66,7 @@ public: static TILE_GET_INFO( get_sb_tile_info ) { - sbowling_state *state = (sbowling_state *)machine->driver_data; + sbowling_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "user1"); int tileno = rom[tile_index + state->bgmap * 1024]; @@ -84,7 +85,7 @@ static void plot_pixel_sbw(bitmap_t *tmpbitmap, int x, int y, int col, int flip) static WRITE8_HANDLER( sbw_videoram_w ) { - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); int flip = flip_screen_get(space->machine); int x,y,i,v1,v2; @@ -108,7 +109,7 @@ static WRITE8_HANDLER( sbw_videoram_w ) static VIDEO_UPDATE(sbowling) { - sbowling_state *state = (sbowling_state *)screen->machine->driver_data; + sbowling_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0x18); tilemap_draw(bitmap, cliprect,state->sb_tilemap, 0, 0); @@ -118,7 +119,7 @@ static VIDEO_UPDATE(sbowling) static VIDEO_START(sbowling) { - sbowling_state *state = (sbowling_state *)machine->driver_data; + sbowling_state *state = machine->driver_data(); state->tmpbitmap = auto_bitmap_alloc(machine,32*8,32*8,machine->primary_screen->format()); state->sb_tilemap = tilemap_create(machine, get_sb_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -126,20 +127,20 @@ static VIDEO_START(sbowling) static WRITE8_HANDLER( pix_shift_w ) { - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); state->pix_sh = data; } static WRITE8_HANDLER( pix_data_w ) { - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); state->pix[0] = state->pix[1]; state->pix[1] = data; } static READ8_HANDLER( pix_data_r ) { - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); UINT32 p1, p0; int res; int sh = state->pix_sh & 7; @@ -170,7 +171,7 @@ static WRITE8_HANDLER (system_w) -----x-- 1 ? ----x--- flip screen/controls */ - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); flip_screen_set(space->machine, data&1); @@ -193,7 +194,7 @@ static WRITE8_HANDLER(graph_control_w) xx------ color PROM address lines A4,A3 */ - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); state->color_prom_address = ((data&0x07)<<7) | ((data&0xc0)>>3); @@ -203,7 +204,7 @@ static WRITE8_HANDLER(graph_control_w) static READ8_HANDLER (controls_r) { - sbowling_state *state = (sbowling_state *)space->machine->driver_data; + sbowling_state *state = space->machine->driver_data(); if (state->sbw_system & 2) return input_port_read(space->machine, "TRACKY"); diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index 0fd6bc5f34b..816800c2793 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -202,7 +202,7 @@ GFXDECODE_END static MACHINE_START( scregg ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = NULL; @@ -215,7 +215,7 @@ static MACHINE_START( scregg ) static MACHINE_RESET( scregg ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); state->btime_palette = 0; state->bnj_scroll1 = 0; diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index e538524d50f..d9818f99873 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -92,7 +92,7 @@ static const ppi8255_interface hangon_ppi_intf[2] = static void hangon_generic_init( running_machine *machine ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* reset the custom handlers and other pointers */ state->i8751_vblank_hook = NULL; @@ -110,7 +110,7 @@ static void hangon_generic_init( running_machine *machine ) static TIMER_CALLBACK( suspend_i8751 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); cpu_suspend(state->mcu, SUSPEND_REASON_DISABLE, 1); } @@ -124,7 +124,7 @@ static TIMER_CALLBACK( suspend_i8751 ) static MACHINE_RESET( hangon ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); fd1094_machine_init(machine->device("sub")); @@ -159,14 +159,14 @@ static INTERRUPT_GEN( hangon_irq ) static TIMER_CALLBACK( delayed_ppi8255_w ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); ppi8255_w(state->ppi8255_1, param >> 8, param & 0xff); } static READ16_HANDLER( hangon_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & 0x3020/2) { @@ -196,7 +196,7 @@ static READ16_HANDLER( hangon_io_r ) static WRITE16_HANDLER( hangon_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) switch (offset & 0x3020/2) @@ -221,7 +221,7 @@ static WRITE16_HANDLER( hangon_io_w ) static READ16_HANDLER( sharrier_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & 0x0030/2) { @@ -252,7 +252,7 @@ static READ16_HANDLER( sharrier_io_r ) static WRITE16_HANDLER( sharrier_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) switch (offset & 0x0030/2) @@ -284,7 +284,7 @@ static WRITE16_HANDLER( sharrier_io_w ) static WRITE8_DEVICE_HANDLER( sound_latch_w ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); soundlatch_w(space, offset, data); } @@ -313,7 +313,7 @@ static WRITE8_DEVICE_HANDLER( video_lamps_w ) static WRITE8_DEVICE_HANDLER( tilemap_sound_w ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); /* Port C : Tilemap origin and audio mute */ /* D7 : Port A handshaking signal /OBF */ @@ -333,7 +333,7 @@ static WRITE8_DEVICE_HANDLER( tilemap_sound_w ) static WRITE8_DEVICE_HANDLER( sub_control_adc_w ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); /* Port A : S.CPU control and ADC channel select */ /* D6 : INTR line on second CPU */ @@ -371,7 +371,7 @@ static READ8_DEVICE_HANDLER( adc_status_r ) static INTERRUPT_GEN( i8751_main_cpu_vblank ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); /* if we have a fake 8751 handler, call it on VBLANK */ if (state->i8751_vblank_hook != NULL) @@ -402,14 +402,14 @@ static void sharrier_i8751_sim(running_machine *machine) static void sound_irq(running_device *device, int irq) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); cpu_set_input_line(state->soundcpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } static READ8_HANDLER( sound_data_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); /* assert ACK */ ppi8255_set_port_c(state->ppi8255_1, 0x00); @@ -1850,7 +1850,7 @@ static DRIVER_INIT( hangon ) static DRIVER_INIT( sharrier ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); hangon_generic_init(machine); state->i8751_vblank_hook = sharrier_i8751_sim; diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 2f2fadbbb4b..1e598bd75e6 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -365,7 +365,7 @@ static const segaic16_memory_map_entry outrun_info[] = static TIMER_CALLBACK( delayed_sound_data_w ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); soundlatch_w(space, 0, param); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE); @@ -380,7 +380,7 @@ static void sound_data_w(running_machine *machine, UINT8 data) static READ8_HANDLER( sound_data_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, CLEAR_LINE); return soundlatch_r(space, offset); @@ -390,7 +390,7 @@ static READ8_HANDLER( sound_data_r ) static void outrun_generic_init(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* allocate memory for regions not automatically assigned */ segaic16_spriteram_0 = auto_alloc_array(machine, UINT16, 0x01000/2); @@ -435,7 +435,7 @@ static void outrun_generic_init(running_machine *machine) static void update_main_irqs(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 2, state->irq2_state ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->maincpu, 4, state->vblank_irq_state ? ASSERT_LINE : CLEAR_LINE); @@ -448,7 +448,7 @@ static void update_main_irqs(running_machine *machine) static TIMER_CALLBACK( irq2_gen ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* set the IRQ2 line */ state->irq2_state = 1; @@ -458,7 +458,7 @@ static TIMER_CALLBACK( irq2_gen ) static TIMER_CALLBACK( scanline_callback ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); int scanline = param; int next_scanline = scanline; @@ -513,14 +513,14 @@ static TIMER_CALLBACK( scanline_callback ) static void outrun_reset(running_device *device) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, PULSE_LINE); } static MACHINE_RESET( outrun ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); fd1094_machine_init(machine->device("maincpu")); /* reset misc components */ @@ -546,7 +546,7 @@ static MACHINE_RESET( outrun ) static void log_unknown_ppi_read( running_machine *machine, unsigned port ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); static const char ports[] = "ABC"; logerror("%06X:read from 8255 port %c\n", cpu_get_pc(state->maincpu), ports[port]); @@ -555,7 +555,7 @@ static void log_unknown_ppi_read( running_machine *machine, unsigned port ) static void log_unknown_ppi_write( running_machine *machine, unsigned port, UINT8 data ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); static const char ports[] = "ABC"; logerror("%06X:write %02X to 8255 port %c\n", cpu_get_pc(state->maincpu), data, ports[port]); @@ -597,7 +597,7 @@ static WRITE8_DEVICE_HANDLER( unknown_portb_w ) static WRITE8_DEVICE_HANDLER( video_control_w ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); /* Output port: D7: SG1 -- connects to sprite chip @@ -622,7 +622,7 @@ static WRITE8_DEVICE_HANDLER( video_control_w ) static READ16_HANDLER( misc_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (state->custom_io_r) return state->custom_io_r(space, offset, mem_mask); @@ -633,7 +633,7 @@ static READ16_HANDLER( misc_io_r ) static WRITE16_HANDLER( misc_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (state->custom_io_w) { @@ -646,7 +646,7 @@ static WRITE16_HANDLER( misc_io_w ) static READ16_HANDLER( outrun_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x7f/2; switch (offset & 0x70/2) @@ -677,7 +677,7 @@ static READ16_HANDLER( outrun_custom_io_r ) static WRITE16_HANDLER( outrun_custom_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x7f/2; switch (offset & 0x70/2) @@ -716,7 +716,7 @@ static WRITE16_HANDLER( outrun_custom_io_w ) static READ16_HANDLER( shangon_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x303f/2; switch (offset) @@ -743,7 +743,7 @@ static READ16_HANDLER( shangon_custom_io_r ) static WRITE16_HANDLER( shangon_custom_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x303f/2; switch (offset) @@ -2151,7 +2151,7 @@ ROM_END static DRIVER_INIT( outrun ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); outrun_generic_init(machine); state->custom_io_r = outrun_custom_io_r; @@ -2161,7 +2161,7 @@ static DRIVER_INIT( outrun ) static DRIVER_INIT( outrunb ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); static const UINT8 memory_map[] = { 0x02,0x00,0x0d,0x10,0x00,0x12,0x0c,0x13,0x08,0x14,0x0f,0x20,0x00,0x00,0x00,0x00 }; UINT16 *word; UINT8 *byte; @@ -2205,7 +2205,7 @@ static DRIVER_INIT( outrunb ) static DRIVER_INIT( shangon ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); outrun_generic_init(machine); state->custom_io_r = shangon_custom_io_r; @@ -2215,7 +2215,7 @@ static DRIVER_INIT( shangon ) static DRIVER_INIT( shangon3 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); outrun_generic_init(machine); fd1089b_decrypt(machine); diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index c88a4c6c5fb..0fe970f7c57 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -207,7 +207,7 @@ static const ppi8255_interface single_ppi_intf = static void system16a_generic_init(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* init the FD1094 */ fd1094_driver_init(machine, "maincpu", NULL); @@ -229,7 +229,7 @@ static void system16a_generic_init(running_machine *machine) static TIMER_CALLBACK( suspend_i8751 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); cpu_suspend(state->mcu, SUSPEND_REASON_DISABLE, 1); } @@ -243,7 +243,7 @@ static TIMER_CALLBACK( suspend_i8751 ) static MACHINE_START( system16a ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); state_save_register_global(machine, state->video_control); state_save_register_global(machine, state->mcu_control); @@ -258,7 +258,7 @@ static MACHINE_START( system16a ) static MACHINE_RESET( system16a ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); fd1094_machine_init(machine->device("maincpu")); @@ -279,14 +279,14 @@ static MACHINE_RESET( system16a ) static TIMER_CALLBACK( delayed_ppi8255_w ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); ppi8255_w(state->ppi8255, param >> 8, param & 0xff); } static READ16_HANDLER( standard_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x3fff/2; switch (offset & (0x3000/2)) { @@ -325,7 +325,7 @@ static WRITE16_HANDLER( standard_io_w ) static READ16_HANDLER( misc_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (state->custom_io_r) return (*state->custom_io_r)(space, offset, mem_mask); @@ -336,7 +336,7 @@ static READ16_HANDLER( misc_io_r ) static WRITE16_HANDLER( misc_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (state->custom_io_w) (*state->custom_io_w)(space, offset, data, mem_mask); @@ -367,7 +367,7 @@ static WRITE8_DEVICE_HANDLER( video_control_w ) D0 : Coin meter #1 */ - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); if (((state->video_control ^ data) & 0x0c) && state->lamp_changed_w) (*state->lamp_changed_w)(device->machine, state->video_control ^ data, data); @@ -410,7 +410,7 @@ static WRITE8_DEVICE_HANDLER( tilemap_sound_w ) 0= Sound is disabled 1= sound is enabled */ - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); segaic16_tilemap_set_colscroll(device->machine, 0, ~data & 0x04); @@ -427,7 +427,7 @@ static WRITE8_DEVICE_HANDLER( tilemap_sound_w ) static READ8_HANDLER( sound_data_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); /* assert ACK */ ppi8255_set_port_c(state->ppi8255, 0x00); @@ -447,7 +447,7 @@ static WRITE8_HANDLER( n7751_command_w ) D1 = /CS for ROM 0 D0 = A14 line to ROMs */ - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); int numroms = memory_region_length(space->machine, "n7751data") / 0x8000; state->n7751_rom_address &= 0x3fff; @@ -468,7 +468,7 @@ static WRITE8_DEVICE_HANDLER( n7751_control_w ) D1 = /RESET line on 7751 D0 = /IRQ line on 7751 */ - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); cpu_set_input_line(state->n7751, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); cpu_set_input_line(state->n7751, 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); @@ -482,7 +482,7 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_offset_w ) /* P5 - address lines 4-7 */ /* P6 - address lines 8-11 */ /* P7 - address lines 12-13 */ - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); int mask = (0xf << (4 * offset)) & 0x3fff; int newdata = (data << (4 * offset)) & mask; @@ -493,7 +493,7 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_offset_w ) static READ8_HANDLER( n7751_rom_r ) { /* read from BUS */ - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); return memory_region(space->machine, "n7751data")[state->n7751_rom_address]; } @@ -502,7 +502,7 @@ static READ8_DEVICE_HANDLER( n7751_p2_r ) { /* read from P2 - 8255's PC0-2 connects to 7751's S0-2 (P24-P26 on an 8048) */ /* bit 0x80 is an alternate way to control the sample on/off; doesn't appear to be used */ - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); return 0x80 | ((state->n7751_command & 0x07) << 4) | (i8243_p2_r(device, offset) & 0x0f); } @@ -534,7 +534,7 @@ static READ8_HANDLER( n7751_t1_r ) static INTERRUPT_GEN( i8751_main_cpu_vblank ) { /* if we have a fake 8751 handler, call it on VBLANK */ - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); if (state->i8751_vblank_hook != NULL) (*state->i8751_vblank_hook)(device->machine); @@ -550,7 +550,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank ) static void dumpmtmt_i8751_sim(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); UINT8 flag = workram[0x200/2] >> 8; UINT8 tick = workram[0x200/2] & 0xff; UINT8 sec = workram[0x202/2] >> 8; @@ -596,7 +596,7 @@ static void dumpmtmt_i8751_sim(running_machine *machine) static void quartet_i8751_sim(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); /* signal a VBLANK to the main CPU */ @@ -621,7 +621,7 @@ static void quartet_i8751_sim(running_machine *machine) static READ16_HANDLER( aceattaa_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & (0x3000/2)) { @@ -671,7 +671,7 @@ static READ16_HANDLER( aceattaa_custom_io_r ) static READ16_HANDLER( mjleague_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & (0x3000/2)) { @@ -755,7 +755,7 @@ static READ16_HANDLER( mjleague_custom_io_r ) static READ16_HANDLER( passsht16a_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & (0x3000/2)) { @@ -792,7 +792,7 @@ static READ16_HANDLER( passsht16a_custom_io_r ) static READ16_HANDLER( sdi_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & (0x3000/2)) { @@ -817,7 +817,7 @@ static READ16_HANDLER( sdi_custom_io_r ) static READ16_HANDLER( sjryuko_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const portname[] = { "MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5" }; switch (offset & (0x3000/2)) @@ -841,7 +841,7 @@ static READ16_HANDLER( sjryuko_custom_io_r ) static void sjryuko_lamp_changed_w(running_machine *machine, UINT8 changed, UINT8 newval) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); if ((changed & 4) && (newval & 4)) state->mj_input_num = (state->mj_input_num + 1) % 6; @@ -857,21 +857,21 @@ static void sjryuko_lamp_changed_w(running_machine *machine, UINT8 changed, UINT INLINE UINT8 maincpu_byte_r(running_machine *machine, offs_t offset) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); return memory_read_byte(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), offset); } INLINE void maincpu_byte_w(running_machine *machine, offs_t offset, UINT8 data) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); memory_write_byte(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), offset, data); } static WRITE8_HANDLER( mcu_control_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); int irqline; /* if we have a fake i8751 handler, ignore writes by the actual 8751 */ @@ -902,7 +902,7 @@ static WRITE8_HANDLER( mcu_io_w ) 1.11 0... = checksum #1 1.11 1... = checksum #2 */ - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch ((state->mcu_control >> 3) & 7) { @@ -943,7 +943,7 @@ static WRITE8_HANDLER( mcu_io_w ) static READ8_HANDLER( mcu_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch ((state->mcu_control >> 3) & 7) { @@ -3437,7 +3437,7 @@ static DRIVER_INIT( generic_16a ) static DRIVER_INIT( aceattaa ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); state->custom_io_r = aceattaa_custom_io_r; @@ -3460,7 +3460,7 @@ static DRIVER_INIT( fd1089b_16a ) static DRIVER_INIT( dumpmtmt ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); state->i8751_vblank_hook = dumpmtmt_i8751_sim; @@ -3469,7 +3469,7 @@ static DRIVER_INIT( dumpmtmt ) static DRIVER_INIT( mjleague ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); state->custom_io_r = mjleague_custom_io_r; @@ -3477,7 +3477,7 @@ static DRIVER_INIT( mjleague ) static DRIVER_INIT( passsht16a ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); state->custom_io_r = passsht16a_custom_io_r; @@ -3485,7 +3485,7 @@ static DRIVER_INIT( passsht16a ) static DRIVER_INIT( quartet ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); state->i8751_vblank_hook = quartet_i8751_sim; @@ -3502,7 +3502,7 @@ static DRIVER_INIT( fantzonep ) static DRIVER_INIT( sdi ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); fd1089b_decrypt(machine); @@ -3512,7 +3512,7 @@ static DRIVER_INIT( sdi ) static DRIVER_INIT( sjryukoa ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16a_generic_init(machine); fd1089b_decrypt(machine); diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 8843c5a6ff3..7e894e3927e 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1022,7 +1022,7 @@ static const segaic16_memory_map_entry *const region_info_list[] = static void sound_w(running_machine *machine, UINT8 data) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); if (state->soundcpu != NULL) { @@ -1035,7 +1035,7 @@ static void sound_w(running_machine *machine, UINT8 data) static void system16b_generic_init(running_machine *machine, int _rom_board) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* set the ROM board */ state->rom_board = _rom_board; @@ -1083,7 +1083,7 @@ static void system16b_generic_init(running_machine *machine, int _rom_board) static TIMER_CALLBACK( suspend_i8751 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); cpu_suspend(state->mcu, SUSPEND_REASON_DISABLE, 1); } @@ -1103,7 +1103,7 @@ static TIMER_CALLBACK( boost_interleave ) static MACHINE_RESET( system16b ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); static const UINT8 default_banklist[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; static const UINT8 alternate_banklist[] = { 0,255,255,255, 255,255,255,3, 255,255,255,2, 255,1,0,255 }; int i; @@ -1129,7 +1129,7 @@ static MACHINE_RESET( system16b ) static TIMER_DEVICE_CALLBACK( atomicp_sound_irq ) { - segas1x_state *state = (segas1x_state *)timer.machine->driver_data; + segas1x_state *state = timer.machine->driver_data(); if (++state->atomicp_sound_count >= state->atomicp_sound_divisor) { @@ -1167,7 +1167,7 @@ static READ16_HANDLER( standard_io_r ) static WRITE16_HANDLER( standard_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1199,7 +1199,7 @@ static WRITE16_HANDLER( standard_io_w ) static READ16_HANDLER( misc_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (state->custom_io_r) return (*state->custom_io_r)(space, offset, mem_mask); @@ -1210,7 +1210,7 @@ static READ16_HANDLER( misc_io_r ) static WRITE16_HANDLER( misc_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); if (state->custom_io_w) (*state->custom_io_w)(space, offset, data, mem_mask); @@ -1235,7 +1235,7 @@ static WRITE16_HANDLER( rom_5704_bank_w ) static READ16_HANDLER( rom_5797_bank_math_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1254,7 +1254,7 @@ static READ16_HANDLER( rom_5797_bank_math_r ) static WRITE16_HANDLER( rom_5797_bank_math_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -1279,7 +1279,7 @@ static WRITE16_HANDLER( rom_5797_bank_math_w ) static READ16_HANDLER( unknown_rgn2_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); logerror("Region 2: read from %04X\n", offset * 2); return segaic16_compare_timer_r(state->_315_5250_2, offset & 7, mem_mask); @@ -1288,7 +1288,7 @@ static READ16_HANDLER( unknown_rgn2_r ) static WRITE16_HANDLER( unknown_rgn2_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); logerror("Region 2: write to %04X = %04X & %04X\n", offset * 2, data, mem_mask); segaic16_compare_timer_w(state->_315_5250_2, offset & 7, data, mem_mask); @@ -1304,7 +1304,7 @@ static WRITE16_HANDLER( unknown_rgn2_w ) static WRITE8_DEVICE_HANDLER( upd7759_control_w ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); int size = memory_region_length(device->machine, "soundcpu") - 0x10000; if (size > 0) { @@ -1375,7 +1375,7 @@ static READ8_DEVICE_HANDLER( upd7759_status_r ) static void upd7759_generate_nmi(running_device *device, int state) { - segas1x_state *driver = (segas1x_state *)device->machine->driver_data; + segas1x_state *driver = device->machine->driver_data(); if (state) cpu_set_input_line(driver->soundcpu, INPUT_LINE_NMI, PULSE_LINE); @@ -1385,7 +1385,7 @@ static void upd7759_generate_nmi(running_device *device, int state) #if 0 static WRITE8_HANDLER( mcu_data_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); state->mcu_data = data; generic_pulse_irq_line(state->mcu, 1); } @@ -1400,7 +1400,7 @@ static WRITE8_HANDLER( mcu_data_w ) static INTERRUPT_GEN( i8751_main_cpu_vblank ) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); /* if we have a fake 8751 handler, call it on VBLANK */ if (state->i8751_vblank_hook != NULL) @@ -1417,7 +1417,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank ) static void altbeast_common_i8751_sim(running_machine *machine, offs_t soundoffs, offs_t inputoffs) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); UINT16 temp; @@ -1457,7 +1457,7 @@ static void altbeast_i8751_sim(running_machine *machine) static void ddux_i8751_sim(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); UINT16 temp; @@ -1476,7 +1476,7 @@ static void ddux_i8751_sim(running_machine *machine) static void goldnaxe_i8751_init(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); static const UINT8 memory_control_5704[0x10] = { 0x02,0x00, 0x02,0x08, 0x00,0x1f, 0x00,0xff, 0x00,0x20, 0x01,0x10, 0x00,0x14, 0x00,0xc4 }; static const UINT8 memory_control_5797[0x10] = @@ -1495,7 +1495,7 @@ static void goldnaxe_i8751_init(running_machine *machine) static void goldnaxe_i8751_sim(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); UINT16 temp; @@ -1527,7 +1527,7 @@ static void goldnaxe_i8751_sim(running_machine *machine) static void tturf_i8751_sim(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); UINT16 temp; @@ -1551,7 +1551,7 @@ static void tturf_i8751_sim(running_machine *machine) static void wb3_i8751_sim(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); UINT16 temp; @@ -1577,14 +1577,14 @@ static void wb3_i8751_sim(running_machine *machine) static MACHINE_START( atomicp ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); state_save_register_global(machine, state->atomicp_sound_count); } static WRITE16_HANDLER( atomicp_sound_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); ym2413_w(state->ymsnd, offset, data >> 8); } @@ -1627,7 +1627,7 @@ static READ16_HANDLER( dunkshot_custom_io_r ) static READ16_HANDLER( hwchamp_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); UINT16 result; switch (offset & (0x3000/2)) @@ -1648,7 +1648,7 @@ static READ16_HANDLER( hwchamp_custom_io_r ) static WRITE16_HANDLER( hwchamp_custom_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const portname[4] = { "MONITOR", "LEFT", "RIGHT", "DUMMY" }; switch (offset & (0x3000/2)) { @@ -1733,7 +1733,7 @@ static READ16_HANDLER( sdi_custom_io_r ) static READ16_HANDLER( sjryuko_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const portname[] = { "MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5" }; switch (offset & (0x3000/2)) @@ -1757,7 +1757,7 @@ static READ16_HANDLER( sjryuko_custom_io_r ) static WRITE16_HANDLER( sjryuko_custom_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset & (0x3000/2)) { @@ -6375,7 +6375,7 @@ static DRIVER_INIT( aliensy3_5358 ) static DRIVER_INIT( altbeast_5521 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5521); state->i8751_vblank_hook = altbeast_i8751_sim; @@ -6384,7 +6384,7 @@ static DRIVER_INIT( altbeast_5521 ) static DRIVER_INIT( altbeasj_5521 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5521); state->i8751_vblank_hook = altbeasj_i8751_sim; @@ -6393,7 +6393,7 @@ static DRIVER_INIT( altbeasj_5521 ) static DRIVER_INIT( altbeas5_5521 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5521); state->i8751_vblank_hook = altbeas5_i8751_sim; @@ -6423,7 +6423,7 @@ static DRIVER_INIT( aurailj_5704 ) static DRIVER_INIT( ddux_5704 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5704); state->i8751_vblank_hook = ddux_i8751_sim; @@ -6432,7 +6432,7 @@ static DRIVER_INIT( ddux_5704 ) static DRIVER_INIT( dunkshot_5358 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5358); fd1089a_decrypt(machine); @@ -6442,7 +6442,7 @@ static DRIVER_INIT( dunkshot_5358 ) static DRIVER_INIT( exctleag_5358 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5358); state->custom_io_r = sdi_custom_io_r; @@ -6451,7 +6451,7 @@ static DRIVER_INIT( exctleag_5358 ) static DRIVER_INIT( goldnaxe_5704 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5704); goldnaxe_i8751_init(machine); @@ -6461,7 +6461,7 @@ static DRIVER_INIT( goldnaxe_5704 ) static DRIVER_INIT( goldnaxe_5797 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5797); goldnaxe_i8751_init(machine); @@ -6471,7 +6471,7 @@ static DRIVER_INIT( goldnaxe_5797 ) static DRIVER_INIT( hwchamp_5521 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5521); state->custom_io_r = hwchamp_custom_io_r; @@ -6481,7 +6481,7 @@ static DRIVER_INIT( hwchamp_5521 ) static DRIVER_INIT( sdi_5358 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5358); state->custom_io_r = sdi_custom_io_r; @@ -6489,7 +6489,7 @@ static DRIVER_INIT( sdi_5358 ) static DRIVER_INIT( defense_5358 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5358); fd1089a_decrypt(machine); @@ -6513,7 +6513,7 @@ static DRIVER_INIT( shinobi3_5358 ) static DRIVER_INIT( sjryuko_5358 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5358); fd1089b_decrypt(machine); @@ -6524,7 +6524,7 @@ static DRIVER_INIT( sjryuko_5358 ) static DRIVER_INIT( passshtj_5358 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5358); state->custom_io_r = passshtj_custom_io_r; @@ -6533,7 +6533,7 @@ static DRIVER_INIT( passshtj_5358 ) static DRIVER_INIT( tturf_5704 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5704); state->i8751_vblank_hook = tturf_i8751_sim; @@ -6542,7 +6542,7 @@ static DRIVER_INIT( tturf_5704 ) static DRIVER_INIT( wb3_5704 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5704); state->i8751_vblank_hook = wb3_i8751_sim; @@ -6551,7 +6551,7 @@ static DRIVER_INIT( wb3_5704 ) static DRIVER_INIT( atomicp ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16b_generic_init(machine, ROM_BOARD_ATOMICP); state->disable_screen_blanking = 1; @@ -6563,7 +6563,7 @@ static DRIVER_INIT( atomicp ) static DRIVER_INIT( snapper ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); system16b_generic_init(machine, ROM_BOARD_ATOMICP); state->disable_screen_blanking = 1; diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 31126e828a2..d4c7b1a8a79 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -138,7 +138,7 @@ static const segaic16_memory_map_entry *const region_info_list[] = static void sound_w(running_machine *machine, UINT8 data) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); soundlatch_w(space, 0, data & 0xff); @@ -147,13 +147,13 @@ static void sound_w(running_machine *machine, UINT8 data) static UINT8 sound_r(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); return state->mcu_data; } static void system18_generic_init(running_machine *machine, int _rom_board) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* set the ROM board */ state->rom_board = _rom_board; @@ -208,7 +208,7 @@ static TIMER_CALLBACK( boost_interleave ) static MACHINE_RESET( system18 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); segaic16_memory_mapper_reset(machine); segaic16_tilemap_reset(machine, 0); @@ -229,7 +229,7 @@ static MACHINE_RESET( system18 ) static READ16_HANDLER( io_chip_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const portnames[] = { "P1", "P2", "PORTC", "PORTD", "SERVICE", "COINAGE", "DSW", "PORTH" }; offset &= 0x1f/2; @@ -277,7 +277,7 @@ static READ16_HANDLER( io_chip_r ) static WRITE16_HANDLER( io_chip_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); UINT8 old; /* generic implementation */ @@ -342,7 +342,7 @@ static WRITE16_HANDLER( io_chip_w ) static READ16_HANDLER( misc_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const portnames[] = { "SERVICE", "COINAGE" }; offset &= 0x1fff; @@ -367,7 +367,7 @@ static READ16_HANDLER( misc_io_r ) static WRITE16_HANDLER( misc_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); offset &= 0x1fff; switch (offset & (0x3000/2)) @@ -468,7 +468,7 @@ static READ16_HANDLER( ddcrew_custom_io_r ) static READ16_HANDLER( lghost_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); UINT16 result; switch (offset) { @@ -486,7 +486,7 @@ static READ16_HANDLER( lghost_custom_io_r ) static WRITE16_HANDLER( lghost_custom_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset) { @@ -522,7 +522,7 @@ static WRITE16_HANDLER( lghost_custom_io_w ) static READ16_HANDLER( wwally_custom_io_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset) { @@ -550,7 +550,7 @@ static READ16_HANDLER( wwally_custom_io_r ) static WRITE16_HANDLER( wwally_custom_io_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); switch (offset) { @@ -590,7 +590,7 @@ static WRITE8_HANDLER( soundbank_w ) static WRITE8_HANDLER( mcu_data_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); state->mcu_data = data; cpu_set_input_line(state->mcu, MCS51_INT1_LINE, HOLD_LINE); } @@ -2291,7 +2291,7 @@ static DRIVER_INIT( generic_5987 ) static DRIVER_INIT( ddcrew ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5987); state->custom_io_r = ddcrew_custom_io_r; @@ -2300,7 +2300,7 @@ static DRIVER_INIT( ddcrew ) static DRIVER_INIT( lghost ) { has_guns=1; - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5987); state->custom_io_r = lghost_custom_io_r; @@ -2309,7 +2309,7 @@ static DRIVER_INIT( lghost ) static DRIVER_INIT( wwally ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); DRIVER_INIT_CALL(generic_5987); state->custom_io_r = wwally_custom_io_r; diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index 7b7b042819d..dad28f7125e 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -262,7 +262,7 @@ static UINT16 *backupram1, *backupram2; static void xboard_generic_init(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* init the FD1094 */ fd1094_driver_init(machine, "maincpu", NULL); @@ -301,7 +301,7 @@ static void xboard_generic_init(running_machine *machine) static void update_main_irqs(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); int irq = 0; if (state->timer_irq_state) @@ -330,7 +330,7 @@ static void update_main_irqs(running_machine *machine) static TIMER_CALLBACK( scanline_callback ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); int scanline = param; int next_scanline = (scanline + 2) % 262; @@ -368,7 +368,7 @@ static TIMER_CALLBACK( scanline_callback ) static void timer_ack_callback(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* clear the timer IRQ */ state->timer_irq_state = 0; @@ -385,7 +385,7 @@ static void timer_ack_callback(running_machine *machine) static TIMER_CALLBACK( delayed_sound_data_w ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); soundlatch_w(space, 0, param); @@ -401,7 +401,7 @@ static void sound_data_w(running_machine *machine, UINT8 data) static void sound_cpu_irq(running_device *device, int state) { - segas1x_state *driver = (segas1x_state *)device->machine->driver_data; + segas1x_state *driver = device->machine->driver_data(); cpu_set_input_line(driver->soundcpu, 0, state); } @@ -409,7 +409,7 @@ static void sound_cpu_irq(running_device *device, int state) static READ8_HANDLER( sound_data_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, CLEAR_LINE); return soundlatch_r(space, offset); @@ -425,7 +425,7 @@ static READ8_HANDLER( sound_data_r ) static void xboard_reset(running_device *device) { - segas1x_state *state = (segas1x_state *)device->machine->driver_data; + segas1x_state *state = device->machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, PULSE_LINE); cpuexec_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(100)); @@ -454,7 +454,7 @@ static MACHINE_RESET( xboard ) static READ16_HANDLER( adc_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const ports[] = { "ADC0", "ADC1", "ADC2", "ADC3", "ADC4", "ADC5", "ADC6", "ADC7" }; int which = (state->iochip_regs[0][2] >> 2) & 7; @@ -477,7 +477,7 @@ static WRITE16_HANDLER( adc_w ) INLINE UINT16 iochip_r(running_machine *machine, int which, int port, int inputval) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); UINT16 result = state->iochip_regs[which][port]; /* if there's custom I/O, do that to get the input value */ @@ -546,7 +546,7 @@ static READ16_HANDLER( iochip_0_r ) static WRITE16_HANDLER( iochip_0_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); UINT8 oldval; /* access is via the low 8 bits */ @@ -622,7 +622,7 @@ static READ16_HANDLER( iochip_1_r ) static WRITE16_HANDLER( iochip_1_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); /* access is via the low 8 bits */ if (!ACCESSING_BITS_0_7) @@ -658,7 +658,7 @@ static WRITE16_HANDLER( iocontrol_w ) static WRITE16_HANDLER( aburner2_iochip_0_D_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); /* access is via the low 8 bits */ if (!ACCESSING_BITS_0_7) @@ -684,7 +684,7 @@ static WRITE16_HANDLER( aburner2_iochip_0_D_w ) static WRITE16_HANDLER( loffire_sync0_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); COMBINE_DATA(&state->loffire_sync[offset]); cpuexec_boost_interleave(space->machine, attotime_zero, ATTOTIME_IN_USEC(10)); @@ -2848,7 +2848,7 @@ static DRIVER_INIT( generic_xboard ) static DRIVER_INIT( aburner2 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); xboard_generic_init(machine); @@ -2860,7 +2860,7 @@ static DRIVER_INIT( aburner2 ) static DRIVER_INIT( aburner ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); xboard_generic_init(machine); @@ -2870,7 +2870,7 @@ static DRIVER_INIT( aburner ) static DRIVER_INIT( loffire ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); xboard_generic_init(machine); state->adc_reverse[1] = state->adc_reverse[3] = 1; @@ -2889,7 +2889,7 @@ static DRIVER_INIT( smgp ) static DRIVER_INIT( gprider ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); xboard_generic_init(machine); state->gprider_hack = 1; diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index f7214798275..d0d7ee8cda8 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -64,7 +64,7 @@ static UINT16 pdrift_bank; static void yboard_generic_init( running_machine *machine ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* reset globals */ state->vblank_irq_state = 0; @@ -84,7 +84,7 @@ static void yboard_generic_init( running_machine *machine ) static void update_main_irqs(running_machine *machine) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 2, state->timer_irq_state ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->subx, 2, state->timer_irq_state ? ASSERT_LINE : CLEAR_LINE); @@ -137,7 +137,7 @@ static void update_main_irqs(running_machine *machine) static TIMER_DEVICE_CALLBACK( scanline_callback ) { - segas1x_state *state = (segas1x_state *)timer.machine->driver_data; + segas1x_state *state = timer.machine->driver_data(); int scanline = param; /* on scanline 'irq2_scanline' generate an IRQ2 */ @@ -193,7 +193,7 @@ static TIMER_DEVICE_CALLBACK( scanline_callback ) static MACHINE_START( yboard ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->soundcpu = machine->device("soundcpu"); @@ -210,7 +210,7 @@ static MACHINE_START( yboard ) static MACHINE_RESET( yboard ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); state->irq2_scanline = 170; @@ -227,7 +227,7 @@ static MACHINE_RESET( yboard ) static void sound_cpu_irq(running_device *device, int state) { - segas1x_state *driver = (segas1x_state *)device->machine->driver_data; + segas1x_state *driver = device->machine->driver_data(); cpu_set_input_line(driver->soundcpu, 0, state); } @@ -235,7 +235,7 @@ static void sound_cpu_irq(running_device *device, int state) static TIMER_CALLBACK( delayed_sound_data_w ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); soundlatch_w(space, 0, param); @@ -252,7 +252,7 @@ static WRITE16_HANDLER( sound_data_w ) static READ8_HANDLER( sound_data_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, CLEAR_LINE); return soundlatch_r(space, offset); } @@ -267,7 +267,7 @@ static READ8_HANDLER( sound_data_r ) static READ16_HANDLER( io_chip_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const portnames[] = { "P1", "GENERAL", "PORTC", "PORTD", "PORTE", "DSW", "COINAGE", "PORTH" }; offset &= 0x1f/2; @@ -315,7 +315,7 @@ static READ16_HANDLER( io_chip_r ) static WRITE16_HANDLER( io_chip_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); UINT8 old; /* generic implementation */ @@ -387,7 +387,7 @@ static WRITE16_HANDLER( io_chip_w ) static READ16_HANDLER( analog_r ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); int result = 0xff; if (ACCESSING_BITS_0_7) { @@ -400,7 +400,7 @@ static READ16_HANDLER( analog_r ) static WRITE16_HANDLER( analog_w ) { - segas1x_state *state = (segas1x_state *)space->machine->driver_data; + segas1x_state *state = space->machine->driver_data(); static const char *const ports[] = { "ADC0", "ADC1", "ADC2", "ADC3", "ADC4", "ADC5", "ADC6" }; int selected = ((offset & 3) == 3) ? (3 + (state->misc_io_data[0x08/2] & 3)) : (offset & 3); int value = input_port_read_safe(space->machine, ports[selected], 0xff); diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index d5702302ee5..69c76c51fde 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -41,7 +41,7 @@ static WRITE16_HANDLER( sf_coin_w ) static WRITE16_HANDLER( soundcmd_w ) { - sf_state *state = (sf_state *)space->machine->driver_data; + sf_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -789,7 +789,7 @@ GFXDECODE_END static void irq_handler( running_device *device, int irq ) { - sf_state *state = (sf_state *)device->machine->driver_data; + sf_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -806,7 +806,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( sf ) { - sf_state *state = (sf_state *)machine->driver_data; + sf_state *state = machine->driver_data(); /* devices */ state->maincpu = machine->device("maincpu"); @@ -819,7 +819,7 @@ static MACHINE_START( sf ) static MACHINE_RESET( sf ) { - sf_state *state = (sf_state *)machine->driver_data; + sf_state *state = machine->driver_data(); state->sf_active = 0; state->bgscroll = 0; diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index c165a2df415..4ee121e7fc4 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -236,7 +236,7 @@ static WRITE16_HANDLER( shadfrce_flip_screen ) static READ16_HANDLER( shadfrce_input_ports_r ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); UINT16 data = 0xffff; switch (offset) @@ -283,7 +283,7 @@ static WRITE16_HANDLER( shadfrce_irq_ack_w ) static WRITE16_HANDLER( shadfrce_irq_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); state->irqs_enable = data & 1; /* maybe, it's set/unset inside every trap instruction which is executed */ state->video_enable = data & 8; /* probably */ @@ -305,14 +305,14 @@ static WRITE16_HANDLER( shadfrce_irq_w ) static WRITE16_HANDLER( shadfrce_scanline_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); state->raster_scanline = data; /* guess, 0 is always written */ } static TIMER_DEVICE_CALLBACK( shadfrce_scanline ) { - shadfrce_state *state = (shadfrce_state *)timer.machine->driver_data; + shadfrce_state *state = timer.machine->driver_data(); int scanline = param; /* Vblank is lowered on scanline 0 */ diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index 9e4029999d9..410b467d4cc 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -87,12 +87,13 @@ PROM : Type MB7051 #include "sound/ay8910.h" #include "video/resnet.h" -class shougi_state +class shougi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shougi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shougi_state(machine)); } - shougi_state(running_machine &machine) { } + shougi_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; int nmi_enabled; @@ -163,7 +164,7 @@ static PALETTE_INIT( shougi ) static VIDEO_UPDATE( shougi ) { - shougi_state *state = (shougi_state *)screen->machine->driver_data; + shougi_state *state = screen->machine->driver_data(); int offs; for (offs = 0;offs <0x4000; offs++) @@ -246,7 +247,7 @@ static WRITE8_HANDLER( shougi_mcu_halt_on_w ) static WRITE8_HANDLER( nmi_disable_and_clear_line_w ) { - shougi_state *state = (shougi_state *)space->machine->driver_data; + shougi_state *state = space->machine->driver_data(); state->nmi_enabled = 0; /* disable NMIs */ @@ -257,14 +258,14 @@ static WRITE8_HANDLER( nmi_disable_and_clear_line_w ) static WRITE8_HANDLER( nmi_enable_w ) { - shougi_state *state = (shougi_state *)space->machine->driver_data; + shougi_state *state = space->machine->driver_data(); state->nmi_enabled = 1; /* enable NMIs */ } static INTERRUPT_GEN( shougi_vblank_nmi ) { - shougi_state *state = (shougi_state *)device->machine->driver_data; + shougi_state *state = device->machine->driver_data(); if ( state->nmi_enabled == 1 ) { @@ -306,7 +307,7 @@ ADDRESS_MAP_END /* sub */ static READ8_HANDLER ( dummy_r ) { - shougi_state *state = (shougi_state *)space->machine->driver_data; + shougi_state *state = space->machine->driver_data(); state->r ^= 1; if(state->r) diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 5fb1ed1d865..30822fadc60 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -32,8 +32,8 @@ static void update_interrupts(running_machine *machine) { - shuuz_state *state = (shuuz_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + shuuz_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -71,11 +71,11 @@ static MACHINE_START( shuuz ) static MACHINE_RESET( shuuz ) { - shuuz_state *state = (shuuz_state *)machine->driver_data; + shuuz_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); - atarivc_reset(*machine->primary_screen, state->atarigen.atarivc_eof_data, 1); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); + atarivc_reset(*machine->primary_screen, state->atarivc_eof_data, 1); } @@ -139,7 +139,7 @@ static READ16_HANDLER( special_port0_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x100000, 0x100fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(shuuz_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x100000, 0x100fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(shuuz_state, eeprom, eeprom_size) AM_RANGE(0x101000, 0x101fff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x102000, 0x102001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x103000, 0x103003) AM_READ(leta_r) @@ -148,11 +148,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x106000, 0x106001) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) AM_RANGE(0x107000, 0x107007) AM_NOP AM_RANGE(0x3e0000, 0x3e087f) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(shuuz_atarivc_r, shuuz_atarivc_w) AM_BASE_MEMBER(shuuz_state, atarigen.atarivc_data) - AM_RANGE(0x3f4000, 0x3f5eff) AM_RAM_WRITE(atarigen_playfield_latched_msb_w) AM_BASE_MEMBER(shuuz_state, atarigen.playfield) - AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_BASE_MEMBER(shuuz_state, atarigen.atarivc_eof_data) + AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(shuuz_atarivc_r, shuuz_atarivc_w) AM_BASE_MEMBER(shuuz_state, atarivc_data) + AM_RANGE(0x3f4000, 0x3f5eff) AM_RAM_WRITE(atarigen_playfield_latched_msb_w) AM_BASE_MEMBER(shuuz_state, playfield) + AM_RANGE(0x3f5f00, 0x3f5f7f) AM_RAM AM_BASE_MEMBER(shuuz_state, atarivc_eof_data) AM_RANGE(0x3f5f80, 0x3f5fff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) - AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(shuuz_state, atarigen.playfield_upper) + AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(shuuz_state, playfield_upper) AM_RANGE(0x3f8000, 0x3fcfff) AM_RAM AM_RANGE(0x3fd000, 0x3fd3ff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0x3fd400, 0x3fffff) AM_RAM diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index dbfe251feef..edf6739cbeb 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -1155,28 +1155,28 @@ ROM_END static DRIVER_INIT( sidearms ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); state->gameid = 0; } static DRIVER_INIT( turtship ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); state->gameid = 1; } static DRIVER_INIT( dyger ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); state->gameid = 2; } static DRIVER_INIT( whizz ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); state->gameid = 3; } diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index 35fe93e8475..21b2023ecd8 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -29,13 +29,13 @@ static WRITE8_HANDLER( sound_cpu_command_w ) static READ8_HANDLER( sidepckt_i8751_r ) { - sidepckt_state *state = (sidepckt_state *)space->machine->driver_data; + sidepckt_state *state = space->machine->driver_data(); return state->i8751_return; } static WRITE8_HANDLER( sidepckt_i8751_w ) { - sidepckt_state *state = (sidepckt_state *)space->machine->driver_data; + sidepckt_state *state = space->machine->driver_data(); static const int table_1[]={5,3,2}; static const int table_2[]={0x8e,0x42,0xad,0x58,0xec,0x85,0xdd,0x4c,0xad,0x9f,0x00,0x4c,0x7e,0x42,0xa2,0xff}; static const int table_3[]={0xbd,0x73,0x80,0xbd,0x73,0xa7,0xbd,0x73,0xe0,0x7e,0x72,0x56,0xff,0xff,0xff,0xff}; @@ -76,7 +76,7 @@ static WRITE8_HANDLER( sidepckt_i8751_w ) static WRITE8_HANDLER( sidepctj_i8751_w ) { - sidepckt_state *state = (sidepckt_state *)space->machine->driver_data; + sidepckt_state *state = space->machine->driver_data(); static const int table_1[]={5,3,0}; static const int table_2[]={0x8e,0x42,0xb2,0x58,0xec,0x85,0xdd,0x4c,0xad,0x9f,0x00,0x4c,0x7e,0x42,0xa7,0xff}; static const int table_3[]={0xbd,0x71,0xc8,0xbd,0x71,0xef,0xbd,0x72,0x28,0x7e,0x70,0x9e,0xff,0xff,0xff,0xff}; diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 217e5a15a63..356d501ed8d 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -129,7 +129,7 @@ INPUT_PORTS_END static READ32_HANDLER( simpl156_inputs_read ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); int eep = eeprom_read_bit(state->eeprom); UINT32 returndata = input_port_read(space->machine, "IN0") ^ 0xffff0000; @@ -169,7 +169,7 @@ static READ32_HANDLER( simpl156_system_r ) static WRITE32_HANDLER( simpl156_eeprom_w ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); //int okibank; //okibank = data & 0x07; @@ -200,13 +200,13 @@ static WRITE32_HANDLER( simpl156_spriteram_w ) static READ32_HANDLER( simpl156_mainram_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); return state->mainram[offset]^0xffff0000; } static WRITE32_HANDLER( simpl156_mainram_w ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; @@ -215,13 +215,13 @@ static WRITE32_HANDLER( simpl156_mainram_w ) static READ32_HANDLER( simpl156_pf1_rowscroll_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); return state->pf1_rowscroll[offset] ^ 0xffff0000; } static WRITE32_HANDLER( simpl156_pf1_rowscroll_w ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; @@ -230,13 +230,13 @@ static WRITE32_HANDLER( simpl156_pf1_rowscroll_w ) static READ32_HANDLER( simpl156_pf2_rowscroll_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); return state->pf2_rowscroll[offset] ^ 0xffff0000; } static WRITE32_HANDLER( simpl156_pf2_rowscroll_w ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; @@ -1050,7 +1050,7 @@ static DRIVER_INIT( simpl156 ) /* Everything seems more stable if we run the CPU speed x4 and use Idle skips.. maybe it has an internal multipler? */ static READ32_HANDLER( joemacr_speedup_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x284) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x18/4]; @@ -1065,7 +1065,7 @@ static DRIVER_INIT( joemacr ) static READ32_HANDLER( chainrec_speedup_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x2d4) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x18/4]; @@ -1079,7 +1079,7 @@ static DRIVER_INIT( chainrec ) static READ32_HANDLER( prtytime_speedup_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x4f0) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0xae0/4]; @@ -1094,7 +1094,7 @@ static DRIVER_INIT( prtytime ) static READ32_HANDLER( charlien_speedup_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0xc8c8) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x10/4]; @@ -1108,7 +1108,7 @@ static DRIVER_INIT( charlien ) static READ32_HANDLER( osman_speedup_r ) { - simpl156_state *state = (simpl156_state *)space->machine->driver_data; + simpl156_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x5974) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x10/4]; diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index c85219bb1db..9fbcf1b7ff0 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -114,7 +114,7 @@ static WRITE8_HANDLER( z80_bankswitch_w ) #if 0 static void sound_nmi_callback( running_machine *machine, int param ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, (state->nmi_enabled) ? CLEAR_LINE : ASSERT_LINE ); state->nmi_enabled = 0; } @@ -122,13 +122,13 @@ static void sound_nmi_callback( running_machine *machine, int param ) static TIMER_CALLBACK( nmi_callback ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( z80_arm_nmi_w ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); timer_set(space->machine, ATTOTIME_IN_USEC(25), NULL, 0, nmi_callback); /* kludge until the K053260 is emulated correctly */ } @@ -229,7 +229,7 @@ INPUT_PORTS_END static void simpsons_objdma( running_machine *machine ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); int counter, num_inactive; UINT16 *src, *dst; @@ -255,7 +255,7 @@ static void simpsons_objdma( running_machine *machine ) static TIMER_CALLBACK( dmaend_callback ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); if (state->firq_enabled) cpu_set_input_line(state->maincpu, KONAMI_FIRQ_LINE, HOLD_LINE); } @@ -263,7 +263,7 @@ static TIMER_CALLBACK( dmaend_callback ) static INTERRUPT_GEN( simpsons_irq ) { - simpsons_state *state = (simpsons_state *)device->machine->driver_data; + simpsons_state *state = device->machine->driver_data(); if (k053246_is_irq_enabled(state->k053246)) { diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c index 2b3c2f2cac9..82558d50462 100644 --- a/src/mame/drivers/skeetsht.c +++ b/src/mame/drivers/skeetsht.c @@ -17,12 +17,13 @@ * *************************************/ -class skeetsht_state +class skeetsht_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skeetsht_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skeetsht_state(machine)); } - skeetsht_state(running_machine &machine) { } + skeetsht_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *tms_vram; UINT8 porta_latch; @@ -42,7 +43,7 @@ public: static MACHINE_RESET( skeetsht ) { - skeetsht_state *state = (skeetsht_state *)machine->driver_data; + skeetsht_state *state = machine->driver_data(); state->ay = machine->device("aysnd"); state->tms = machine->device("tms"); @@ -64,7 +65,7 @@ static VIDEO_START ( skeetsht ) static void skeetsht_scanline_update(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params) { - skeetsht_state *state = (skeetsht_state *)screen.machine->driver_data; + skeetsht_state *state = screen.machine->driver_data(); const rgb_t *const pens = tlc34076_get_pens(); UINT16 *vram = &state->tms_vram[(params->rowaddr << 8) & 0x3ff00]; UINT32 *dest = BITMAP_ADDR32(bitmap, scanline, 0); @@ -114,7 +115,7 @@ static void skeetsht_tms_irq(running_device *device, int state) static WRITE8_HANDLER( tms_w ) { - skeetsht_state *state = (skeetsht_state *)space->machine->driver_data; + skeetsht_state *state = space->machine->driver_data(); if ((offset & 1) == 0) state->lastdataw = data; @@ -124,7 +125,7 @@ static WRITE8_HANDLER( tms_w ) static READ8_HANDLER( tms_r ) { - skeetsht_state *state = (skeetsht_state *)space->machine->driver_data; + skeetsht_state *state = space->machine->driver_data(); if ((offset & 1) == 0) state->lastdatar = tms34010_host_r(state->tms, offset >> 1); @@ -141,14 +142,14 @@ static READ8_HANDLER( tms_r ) static READ8_HANDLER( hc11_porta_r ) { - skeetsht_state *state = (skeetsht_state *)space->machine->driver_data; + skeetsht_state *state = space->machine->driver_data(); return state->porta_latch; } static WRITE8_HANDLER( hc11_porta_w ) { - skeetsht_state *state = (skeetsht_state *)space->machine->driver_data; + skeetsht_state *state = space->machine->driver_data(); if (!(data & 0x8) && (state->porta_latch & 8)) state->ay_sel = state->porta_latch & 0x10; @@ -158,7 +159,7 @@ static WRITE8_HANDLER( hc11_porta_w ) static WRITE8_HANDLER( ay8910_w ) { - skeetsht_state *state = (skeetsht_state *)space->machine->driver_data; + skeetsht_state *state = space->machine->driver_data(); if (state->ay_sel) ay8910_data_w(state->ay, 0, data); diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index ec4930e2148..8460d95cfd6 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -32,10 +32,10 @@ static void update_interrupts(running_machine *machine) { - skullxbo_state *state = (skullxbo_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + skullxbo_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 4, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -47,12 +47,12 @@ static TIMER_CALLBACK( irq_gen ) static void alpha_row_update(screen_device &screen, int scanline) { - skullxbo_state *state = (skullxbo_state *)screen.machine->driver_data; - UINT16 *check = &state->atarigen.alpha[(scanline / 8) * 64 + 42]; + skullxbo_state *state = screen.machine->driver_data(); + UINT16 *check = &state->alpha[(scanline / 8) * 64 + 42]; /* check for interrupts in the alpha ram */ /* the interrupt occurs on the HBLANK of the 6th scanline following */ - if (check < &state->atarigen.alpha[0x7c0] && (*check & 0x8000)) + if (check < &state->alpha[0x7c0] && (*check & 0x8000)) { int width = screen.width(); attotime period = screen.time_until_pos(screen.vpos() + 6, width * 0.9); @@ -78,10 +78,10 @@ static MACHINE_START( skullxbo ) static MACHINE_RESET( skullxbo ) { - skullxbo_state *state = (skullxbo_state *)machine->driver_data; + skullxbo_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, alpha_row_update, 8); atarijsa_reset(); } @@ -96,9 +96,9 @@ static MACHINE_RESET( skullxbo ) static READ16_HANDLER( special_port1_r ) { - skullxbo_state *state = (skullxbo_state *)space->machine->driver_data; + skullxbo_state *state = space->machine->driver_data(); int temp = input_port_read(space->machine, "FF5802"); - if (state->atarigen.cpu_to_sound_ready) temp ^= 0x0040; + if (state->cpu_to_sound_ready) temp ^= 0x0040; if (atarigen_get_hblank(*space->machine->primary_screen)) temp ^= 0x0010; return temp; } @@ -133,7 +133,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff1400, 0xff17ff) AM_WRITE(atarigen_sound_w) AM_RANGE(0xff1800, 0xff1bff) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0xff1c00, 0xff1c7f) AM_WRITE(skullxbo_playfieldlatch_w) - AM_RANGE(0xff1c80, 0xff1cff) AM_WRITE(skullxbo_xscroll_w) AM_BASE_MEMBER(skullxbo_state, atarigen.xscroll) + AM_RANGE(0xff1c80, 0xff1cff) AM_WRITE(skullxbo_xscroll_w) AM_BASE_MEMBER(skullxbo_state, xscroll) AM_RANGE(0xff1d00, 0xff1d7f) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0xff1d80, 0xff1dff) AM_WRITE(watchdog_reset16_w) AM_RANGE(0xff1e00, 0xff1e7f) AM_WRITE(skullxbo_playfieldlatch_w) @@ -141,16 +141,16 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff1f00, 0xff1f7f) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0xff1f80, 0xff1fff) AM_WRITE(watchdog_reset16_w) AM_RANGE(0xff2000, 0xff2fff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xff4000, 0xff47ff) AM_WRITE(skullxbo_yscroll_w) AM_BASE_MEMBER(skullxbo_state, atarigen.yscroll) + AM_RANGE(0xff4000, 0xff47ff) AM_WRITE(skullxbo_yscroll_w) AM_BASE_MEMBER(skullxbo_state, yscroll) AM_RANGE(0xff4800, 0xff4fff) AM_WRITE(skullxbo_mobwr_w) - AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(skullxbo_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xff6000, 0xff6fff) AM_WRITE(atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(skullxbo_state, eeprom, eeprom_size) AM_RANGE(0xff5000, 0xff5001) AM_READ(atarigen_sound_r) AM_RANGE(0xff5800, 0xff5801) AM_READ_PORT("FF5800") AM_RANGE(0xff5802, 0xff5803) AM_READ(special_port1_r) AM_RANGE(0xff6000, 0xff6fff) AM_READ(atarigen_eeprom_r) - AM_RANGE(0xff8000, 0xff9fff) AM_RAM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(skullxbo_state, atarigen.playfield) - AM_RANGE(0xffa000, 0xffbfff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(skullxbo_state, atarigen.playfield_upper) - AM_RANGE(0xffc000, 0xffcf7f) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(skullxbo_state, atarigen.alpha) + AM_RANGE(0xff8000, 0xff9fff) AM_RAM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(skullxbo_state, playfield) + AM_RANGE(0xffa000, 0xffbfff) AM_RAM_WRITE(atarigen_playfield_upper_w) AM_BASE_MEMBER(skullxbo_state, playfield_upper) + AM_RANGE(0xffc000, 0xffcf7f) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(skullxbo_state, alpha) AM_RANGE(0xffcf80, 0xffcfff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0xffd000, 0xffdfff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xffe000, 0xffffff) AM_RAM diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 4d29fd15cac..c9607c86d3c 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -29,12 +29,13 @@ #include "cpu/z80/z80.h" #include "sound/ay8910.h" -class skyarmy_state +class skyarmy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyarmy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyarmy_state(machine)); } - skyarmy_state(running_machine &machine) { } + skyarmy_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *spriteram; UINT8 *videoram; @@ -56,7 +57,7 @@ static WRITE8_HANDLER( skyarmy_flip_screen_y_w ) static TILE_GET_INFO( get_skyarmy_tile_info ) { - skyarmy_state *state = (skyarmy_state *)machine->driver_data; + skyarmy_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int attr = BITSWAP8(state->colorram[tile_index], 7, 6, 5, 4, 3, 0, 1, 2) & 7; @@ -65,7 +66,7 @@ static TILE_GET_INFO( get_skyarmy_tile_info ) static WRITE8_HANDLER( skyarmy_videoram_w ) { - skyarmy_state *state = (skyarmy_state *)space->machine->driver_data; + skyarmy_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap,offset); @@ -73,7 +74,7 @@ static WRITE8_HANDLER( skyarmy_videoram_w ) static WRITE8_HANDLER( skyarmy_colorram_w ) { - skyarmy_state *state = (skyarmy_state *)space->machine->driver_data; + skyarmy_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->tilemap,offset); @@ -109,7 +110,7 @@ static PALETTE_INIT( skyarmy ) static VIDEO_START( skyarmy ) { - skyarmy_state *state = (skyarmy_state *)machine->driver_data; + skyarmy_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_skyarmy_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->tilemap,32); @@ -118,7 +119,7 @@ static VIDEO_START( skyarmy ) static VIDEO_UPDATE( skyarmy ) { - skyarmy_state *state = (skyarmy_state *)screen->machine->driver_data; + skyarmy_state *state = screen->machine->driver_data(); UINT8 *spriteram = state->spriteram; int sx, sy, flipx, flipy, offs,pal; int i; @@ -149,7 +150,7 @@ static VIDEO_UPDATE( skyarmy ) static INTERRUPT_GEN( skyarmy_nmi_source ) { - skyarmy_state *state = (skyarmy_state *)device->machine->driver_data; + skyarmy_state *state = device->machine->driver_data(); if(state->nmi) cpu_set_input_line(device,INPUT_LINE_NMI, PULSE_LINE); } @@ -157,7 +158,7 @@ static INTERRUPT_GEN( skyarmy_nmi_source ) static WRITE8_HANDLER( nmi_enable_w ) { - skyarmy_state *state = (skyarmy_state *)space->machine->driver_data; + skyarmy_state *state = space->machine->driver_data(); state->nmi=data & 1; } diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 9ee8cc58648..fa113ba85f8 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -84,7 +84,7 @@ ADDRESS_MAP_END static INPUT_CHANGED( coin_inserted ) { - skyfox_state *state = (skyfox_state *)field->port->machine->driver_data; + skyfox_state *state = field->port->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -214,7 +214,7 @@ GFXDECODE_END static INTERRUPT_GEN( skyfox_interrupt ) { - skyfox_state *state = (skyfox_state *)device->machine->driver_data; + skyfox_state *state = device->machine->driver_data(); /* Scroll the bg */ state->bg_pos += (state->bg_ctrl >> 1) & 0x7; // maybe.. @@ -222,7 +222,7 @@ static INTERRUPT_GEN( skyfox_interrupt ) static MACHINE_START( skyfox ) { - skyfox_state *state = (skyfox_state *)machine->driver_data; + skyfox_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); @@ -232,7 +232,7 @@ static MACHINE_START( skyfox ) static MACHINE_RESET( skyfox ) { - skyfox_state *state = (skyfox_state *)machine->driver_data; + skyfox_state *state = machine->driver_data(); state->bg_pos = 0; state->bg_ctrl = 0; diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 6e51a54de8d..0f17fe38f66 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -148,13 +148,13 @@ Region byte at offset 0x031: static READ16_HANDLER( color_ram_word_r ) { - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); return state->color_ram[offset]; } static WRITE16_HANDLER( color_ram_word_w ) { - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); int r,g,b; COMBINE_DATA(&state->color_ram[offset]); @@ -175,7 +175,7 @@ static WRITE16_HANDLER( color_ram_word_w ) static TIMER_CALLBACK( slapshot_interrupt6 ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, HOLD_LINE); } @@ -193,7 +193,7 @@ static INTERRUPT_GEN( slapshot_interrupt ) static READ16_HANDLER( slapshot_service_input_r ) { - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); switch (offset) { case 0x03: @@ -233,7 +233,7 @@ static WRITE16_HANDLER( opwolf3_adc_req_w ) output_set_value("Player2_Gun_Recoil",0); break; } - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); /* 4 writes a frame - one for each analogue port */ cpu_set_input_line(state->maincpu, 3, HOLD_LINE); @@ -245,13 +245,13 @@ static WRITE16_HANDLER( opwolf3_adc_req_w ) static void reset_sound_region( running_machine *machine ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); state->banknum = data & 7; reset_sound_region(space->machine); } @@ -263,7 +263,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static WRITE16_HANDLER( slapshot_msb_sound_w ) { - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, (data >> 8) & 0xff); else if (offset == 1) @@ -277,7 +277,7 @@ static WRITE16_HANDLER( slapshot_msb_sound_w ) static READ16_HANDLER( slapshot_msb_sound_r ) { - slapshot_state *state = (slapshot_state *)space->machine->driver_data; + slapshot_state *state = space->machine->driver_data(); if (offset == 1) return ((tc0140syt_comm_r(state->tc0140syt, 0) & 0xff) << 8); else @@ -492,7 +492,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - slapshot_state *state = (slapshot_state *)device->machine->driver_data; + slapshot_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -534,7 +534,7 @@ static STATE_POSTLOAD( slapshot_postload ) static MACHINE_START( slapshot ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index c5ba4ee0a26..c17180a9680 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -76,12 +76,13 @@ Notes: #define x_offset 0x45 #define y_offset 0x0d -class sliver_state +class sliver_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sliver_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sliver_state(machine)); } - sliver_state(running_machine &machine) { } + sliver_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 io_offset; UINT16 io_reg[IO_SIZE]; @@ -188,14 +189,14 @@ static const int gfxlookup[][4]= static WRITE16_HANDLER( sliver_RAMDAC_offset_w ) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); state->clr_offset=data*3; } static WRITE16_HANDLER( sliver_RAMDAC_color_w ) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); state->colorram[state->clr_offset]=data; state->clr_offset=(state->clr_offset+1)%768; @@ -224,7 +225,7 @@ static void plot_pixel_rgb(sliver_state *state, int x, int y, UINT32 r, UINT32 g static void plot_pixel_pal(running_machine *machine, int x, int y, int addr) { - sliver_state *state = (sliver_state *)machine->driver_data; + sliver_state *state = machine->driver_data(); UINT32 r,g,b; UINT16 color; @@ -254,7 +255,7 @@ static void plot_pixel_pal(running_machine *machine, int x, int y, int addr) static WRITE16_HANDLER( fifo_data_w ) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); if (state->tmp_counter < 8) { @@ -277,7 +278,7 @@ static WRITE16_HANDLER( fifo_data_w ) static void blit_gfx(running_machine *machine) { - sliver_state *state = (sliver_state *)machine->driver_data; + sliver_state *state = machine->driver_data(); int tmpptr=0; const UINT8 *rom = memory_region(machine, "user1"); @@ -311,7 +312,7 @@ static void blit_gfx(running_machine *machine) static WRITE16_HANDLER( fifo_clear_w ) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); bitmap_fill(state->bitmap_fg, 0,0); state->fptr=0; @@ -326,14 +327,14 @@ static WRITE16_HANDLER( fifo_flush_w ) static WRITE16_HANDLER( jpeg1_w ) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); COMBINE_DATA(&state->jpeg1); } static void render_jpeg(running_machine *machine) { - sliver_state *state = (sliver_state *)machine->driver_data; + sliver_state *state = machine->driver_data(); int x, y; int addr = state->jpeg_addr; UINT8 *rom; @@ -371,7 +372,7 @@ static int find_data(int offset) static WRITE16_HANDLER( jpeg2_w ) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); int idx; COMBINE_DATA(&state->jpeg2); @@ -392,14 +393,14 @@ static WRITE16_HANDLER( jpeg2_w ) static WRITE16_HANDLER(io_offset_w) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); COMBINE_DATA(&state->io_offset); } static WRITE16_HANDLER(io_data_w) { - sliver_state *state = (sliver_state *)space->machine->driver_data; + sliver_state *state = space->machine->driver_data(); if (state->io_offset < IO_SIZE) { @@ -478,7 +479,7 @@ ADDRESS_MAP_END static VIDEO_START(sliver) { - sliver_state *state = (sliver_state *)machine->driver_data; + sliver_state *state = machine->driver_data(); state->bitmap_bg = machine->primary_screen->alloc_compatible_bitmap(); state->bitmap_fg = machine->primary_screen->alloc_compatible_bitmap(); @@ -486,7 +487,7 @@ static VIDEO_START(sliver) static VIDEO_UPDATE(sliver) { - sliver_state *state = (sliver_state *)screen->machine->driver_data; + sliver_state *state = screen->machine->driver_data(); copybitmap (bitmap, state->bitmap_bg, 0, 0, 0, 0, cliprect); copybitmap_trans(bitmap, state->bitmap_fg, 0, 0, 0, 0, cliprect, 0); @@ -628,7 +629,7 @@ ROM_END static DRIVER_INIT(sliver) { - sliver_state *state = (sliver_state *)machine->driver_data; + sliver_state *state = machine->driver_data(); state->jpeg_addr = -1; state->colorram=auto_alloc_array(machine, UINT8, 256*3); diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index b911327d7a6..ca18ab67554 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -57,7 +57,7 @@ TODO: static WRITE8_HANDLER( sonson_sh_irqtrigger_w ) { - sonson_state *state = (sonson_state *)space->machine->driver_data; + sonson_state *state = space->machine->driver_data(); data &= 1; if (state->last_irq == 0 && data == 1) @@ -229,7 +229,7 @@ GFXDECODE_END static MACHINE_START( sonson ) { - sonson_state *state = (sonson_state *)machine->driver_data; + sonson_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -238,7 +238,7 @@ static MACHINE_START( sonson ) static MACHINE_RESET( sonson ) { - sonson_state *state = (sonson_state *)machine->driver_data; + sonson_state *state = machine->driver_data(); state->last_irq = 0; } diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 4343f4985ab..c5bb7564e7b 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -173,12 +173,13 @@ Notes: * *************************************/ -class spaceg_state +class spaceg_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spaceg_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spaceg_state(machine)); } - spaceg_state(running_machine &machine) { } + spaceg_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 * videoram; UINT8 * unkram; @@ -222,7 +223,7 @@ static PALETTE_INIT( spaceg ) static WRITE8_HANDLER( zvideoram_w ) { - spaceg_state *state = (spaceg_state *)space->machine->driver_data; + spaceg_state *state = space->machine->driver_data(); int col; col = state->unkram[0x400]; @@ -257,7 +258,7 @@ static WRITE8_HANDLER( zvideoram_w ) static READ8_HANDLER(spaceg_colorram_r) { - spaceg_state *state = (spaceg_state *)space->machine->driver_data; + spaceg_state *state = space->machine->driver_data(); int rgbcolor; if (offset < 0x400) @@ -289,7 +290,7 @@ static READ8_HANDLER(spaceg_colorram_r) static VIDEO_UPDATE( spaceg ) { - spaceg_state *state = (spaceg_state *)screen->machine->driver_data; + spaceg_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < 0x2000; offs++) diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index a3ea3eec86a..f1ab5877979 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -18,12 +18,13 @@ TODO: Video Hardware ***************************************************************************/ -class spoker_state +class spoker_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spoker_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spoker_state(machine)); } - spoker_state(running_machine &machine) { } + spoker_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *bg_tile_ram; tilemap_t *bg_tilemap; @@ -40,7 +41,7 @@ public: static WRITE8_HANDLER( bg_tile_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); state->bg_tile_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -48,21 +49,21 @@ static WRITE8_HANDLER( bg_tile_w ) static TILE_GET_INFO( get_bg_tile_info ) { - spoker_state *state = (spoker_state *)machine->driver_data; + spoker_state *state = machine->driver_data(); int code = state->bg_tile_ram[tile_index]; SET_TILE_INFO(1 + (tile_index & 3), code & 0xff, 0, 0); } static TILE_GET_INFO( get_fg_tile_info ) { - spoker_state *state = (spoker_state *)machine->driver_data; + spoker_state *state = machine->driver_data(); int code = state->fg_tile_ram[tile_index] | (state->fg_color_ram[tile_index] << 8); SET_TILE_INFO(0, code, (4*(code >> 14)+3), 0); } static WRITE8_HANDLER( fg_tile_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); state->fg_tile_ram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -70,7 +71,7 @@ static WRITE8_HANDLER( fg_tile_w ) static WRITE8_HANDLER( fg_color_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); state->fg_color_ram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -78,7 +79,7 @@ static WRITE8_HANDLER( fg_color_w ) static VIDEO_START(spoker) { - spoker_state *state = (spoker_state *)machine->driver_data; + spoker_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 32, 128, 8); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 128, 32); @@ -87,7 +88,7 @@ static VIDEO_START(spoker) static VIDEO_UPDATE(spoker) { - spoker_state *state = (spoker_state *)screen->machine->driver_data; + spoker_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -102,7 +103,7 @@ static VIDEO_UPDATE(spoker) static CUSTOM_INPUT( hopper_r ) { running_machine *machine = field->port->machine; - spoker_state *state = (spoker_state *)machine->driver_data; + spoker_state *state = machine->driver_data(); if (state->hopper) return !(machine->primary_screen->frame_number()%10); return input_code_pressed(machine, KEYCODE_H); @@ -117,7 +118,7 @@ static void show_out(UINT8 *out) static WRITE8_HANDLER( spoker_nmi_and_coins_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); if ((state->nmi_enable ^ data) & (~0xdd)) { @@ -140,7 +141,7 @@ static WRITE8_HANDLER( spoker_nmi_and_coins_w ) static WRITE8_HANDLER( spoker_video_and_leds_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); set_led_status(space->machine, 4, data & 0x01); // start? set_led_status(space->machine, 5, data & 0x04); // l_bet? @@ -154,7 +155,7 @@ static WRITE8_HANDLER( spoker_video_and_leds_w ) static WRITE8_HANDLER( spoker_leds_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); set_led_status(space->machine, 0, data & 0x01); // stop_1 set_led_status(space->machine, 1, data & 0x02); // stop_2 @@ -168,7 +169,7 @@ static WRITE8_HANDLER( spoker_leds_w ) static WRITE8_HANDLER( spoker_magic_w ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); state->igs_magic[offset] = data; @@ -188,7 +189,7 @@ static WRITE8_HANDLER( spoker_magic_w ) static READ8_HANDLER( spoker_magic_r ) { - spoker_state *state = (spoker_state *)space->machine->driver_data; + spoker_state *state = space->machine->driver_data(); switch(state->igs_magic[0]) { @@ -370,7 +371,7 @@ GFXDECODE_END static MACHINE_RESET( spoker ) { - spoker_state *state = (spoker_state *)machine->driver_data; + spoker_state *state = machine->driver_data(); state->nmi_enable = 0; state->hopper = 0; @@ -379,7 +380,7 @@ static MACHINE_RESET( spoker ) static INTERRUPT_GEN( spoker_interrupt ) { - spoker_state *state = (spoker_state *)device->machine->driver_data; + spoker_state *state = device->machine->driver_data(); if (state->nmi_enable & 0x80) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 318dd70abb8..57ae055dde3 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -94,12 +94,13 @@ Note #include "sound/okim6295.h" #include "machine/eeprom.h" -class spool99_state +class spool99_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spool99_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spool99_state(machine)); } - spool99_state(running_machine &machine) { } + spool99_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *main; tilemap_t *sc0_tilemap; @@ -109,7 +110,7 @@ public: static TILE_GET_INFO( get_spool99_tile_info ) { - spool99_state *state = (spool99_state *)machine->driver_data; + spool99_state *state = machine->driver_data(); int code = ((state->vram[tile_index*2+1]<<8) | (state->vram[tile_index*2+0])); int color = state->cram[tile_index*2+0]; @@ -122,14 +123,14 @@ static TILE_GET_INFO( get_spool99_tile_info ) static VIDEO_START(spool99) { - spool99_state *state = (spool99_state *)machine->driver_data; + spool99_state *state = machine->driver_data(); state->sc0_tilemap = tilemap_create(machine, get_spool99_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } static VIDEO_UPDATE(spool99) { - spool99_state *state = (spool99_state *)screen->machine->driver_data; + spool99_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->sc0_tilemap,0,0); return 0; @@ -137,7 +138,7 @@ static VIDEO_UPDATE(spool99) static WRITE8_HANDLER( spool99_vram_w ) { - spool99_state *state = (spool99_state *)space->machine->driver_data; + spool99_state *state = space->machine->driver_data(); state->vram[offset] = data; tilemap_mark_tile_dirty(state->sc0_tilemap,offset/2); @@ -145,7 +146,7 @@ static WRITE8_HANDLER( spool99_vram_w ) static WRITE8_HANDLER( spool99_cram_w ) { - spool99_state *state = (spool99_state *)space->machine->driver_data; + spool99_state *state = space->machine->driver_data(); state->cram[offset] = data; tilemap_mark_tile_dirty(state->sc0_tilemap,offset/2); @@ -415,7 +416,7 @@ ROM_END static DRIVER_INIT( spool99 ) { - spool99_state *state = (spool99_state *)machine->driver_data; + spool99_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); // vram = auto_alloc_array(machine, UINT8, 0x2000); diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 2141692e8ab..5cbe6f3d2d5 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -28,7 +28,7 @@ static INTERRUPT_GEN( spy_interrupt ) { - spy_state *state = (spy_state *)device->machine->driver_data; + spy_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) cpu_set_input_line(device, 0, HOLD_LINE); @@ -36,7 +36,7 @@ static INTERRUPT_GEN( spy_interrupt ) static READ8_HANDLER( spy_bankedram1_r ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); if (state->rambank & 1) { @@ -61,7 +61,7 @@ static READ8_HANDLER( spy_bankedram1_r ) static WRITE8_HANDLER( spy_bankedram1_w ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); if (state->rambank & 1) { @@ -173,7 +173,7 @@ static void spy_collision( running_machine *machine ) #define NEAR_PLANE_ZOOM 0x0100 #define FAR_PLANE_ZOOM 0x0000 - spy_state *state = (spy_state *)machine->driver_data; + spy_state *state = machine->driver_data(); int op1, x1, w1, z1, d1, y1, h1; int op2, x2, w2, z2, d2, y2, h2; int mode, i, loopend, nearplane; @@ -251,7 +251,7 @@ static void spy_collision( running_machine *machine ) static WRITE8_HANDLER( spy_3f90_w ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); /********************************************************************* * @@ -336,13 +336,13 @@ static WRITE8_HANDLER( spy_3f90_w ) static WRITE8_HANDLER( spy_sh_irqtrigger_w ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static WRITE8_HANDLER( sound_bank_w ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); int bank_A, bank_B; bank_A = (data >> 0) & 0x03; @@ -357,7 +357,7 @@ static WRITE8_HANDLER( sound_bank_w ) static READ8_HANDLER( k052109_051960_r ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -374,7 +374,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - spy_state *state = (spy_state *)space->machine->driver_data; + spy_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -480,7 +480,7 @@ static const k007232_interface spy_k007232_interface = static void irqhandler( running_device *device, int linestate ) { - spy_state *state = (spy_state *)device->machine->driver_data; + spy_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, linestate); } @@ -508,7 +508,7 @@ static const k051960_interface spy_k051960_intf = static MACHINE_START( spy ) { - spy_state *state = (spy_state *)machine->driver_data; + spy_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); @@ -533,7 +533,7 @@ static MACHINE_START( spy ) static MACHINE_RESET( spy ) { - spy_state *state = (spy_state *)machine->driver_data; + spy_state *state = machine->driver_data(); state->rambank = 0; state->pmcbank = 0; diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 50ca8821933..bb1ae5b23de 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -109,14 +109,14 @@ static DRIVER_INIT( srmp3 ) static MACHINE_RESET( srmp2 ) { - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); state->port_select = 0; } static MACHINE_RESET( srmp3 ) { - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); state->port_select = 0; } @@ -137,7 +137,7 @@ static WRITE16_HANDLER( srmp2_flags_w ) x--- ---- : Palette Bank */ - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); coin_counter_w( space->machine, 0, ((data & 0x01) >> 0) ); coin_lockout_w( space->machine, 0, (((~data) & 0x10) >> 4) ); @@ -165,7 +165,7 @@ static WRITE16_HANDLER( mjyuugi_adpcm_bank_w ) --xx ---- : GFX Bank */ - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); state->adpcm_bank = (data & 0x0f); state->gfx_bank = ((data >> 4) & 0x03); @@ -181,7 +181,7 @@ static WRITE16_DEVICE_HANDLER( srmp2_adpcm_code_w ) table and plays the ADPCM for itself. */ - srmp2_state *state = (srmp2_state *)device->machine->driver_data; + srmp2_state *state = device->machine->driver_data(); UINT8 *ROM = memory_region(device->machine, "adpcm"); state->adpcm_sptr = (ROM[((state->adpcm_bank * 0x10000) + (data << 2) + 0)] << 8); @@ -205,7 +205,7 @@ static WRITE8_DEVICE_HANDLER( srmp3_adpcm_code_w ) table and plays the ADPCM for itself. */ - srmp2_state *state = (srmp2_state *)device->machine->driver_data; + srmp2_state *state = device->machine->driver_data(); UINT8 *ROM = memory_region(device->machine, "adpcm"); state->adpcm_sptr = (ROM[((state->adpcm_bank * 0x10000) + (data << 2) + 0)] << 8); @@ -222,7 +222,7 @@ static WRITE8_DEVICE_HANDLER( srmp3_adpcm_code_w ) static void srmp2_adpcm_int(running_device *device) { - srmp2_state *state = (srmp2_state *)device->machine->driver_data; + srmp2_state *state = device->machine->driver_data(); UINT8 *ROM = memory_region(device->machine, "adpcm"); if (state->adpcm_sptr) @@ -275,7 +275,7 @@ static READ16_HANDLER( srmp2_input_1_r ) --x- ---- : Player 1 and 2 side flag */ - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3" }; if (!ACCESSING_BITS_0_7) @@ -323,7 +323,7 @@ static READ16_HANDLER( srmp2_input_2_r ) static WRITE16_HANDLER( srmp2_input_1_w ) { - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); state->port_select = (data != 0x0000) ? 1 : 0; } @@ -331,7 +331,7 @@ static WRITE16_HANDLER( srmp2_input_1_w ) static WRITE16_HANDLER( srmp2_input_2_w ) { - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); state->port_select = (data == 0x0000) ? 2 : 0; } @@ -344,7 +344,7 @@ static WRITE8_HANDLER( srmp3_rombank_w ) xxx- ---- : ADPCM ROM bank */ - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); UINT8 *ROM = memory_region(space->machine, "maincpu"); int addr; @@ -429,7 +429,7 @@ static WRITE8_HANDLER( srmp3_input_1_w ) ---- -x-- : Player 2 side flag ? */ - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); logerror("PC:%04X DATA:%02X srmp3_input_1_w\n", cpu_get_pc(space->cpu), data); state->port_select = 0; @@ -451,7 +451,7 @@ static WRITE8_HANDLER( srmp3_input_1_w ) static WRITE8_HANDLER( srmp3_input_2_w ) { - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); /* Key matrix reading related ? */ @@ -515,7 +515,7 @@ static WRITE8_HANDLER( srmp3_flags_w ) xx-- ---- : GFX Bank */ - srmp2_state *state = (srmp2_state *)space->machine->driver_data; + srmp2_state *state = space->machine->driver_data(); coin_counter_w( space->machine, 0, ((data & 0x01) >> 0) ); coin_lockout_w( space->machine, 0, (((~data) & 0x10) >> 4) ); diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 06f8f8d497f..8638eb71781 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -62,12 +62,13 @@ This is not a bug (real machine behaves the same). #define SPRITE_DATA_GRANULARITY 0x80 -class srmp5_state +class srmp5_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp5_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp5_state(machine)); } - srmp5_state(running_machine &machine) { } + srmp5_state(running_machine &machine) + : driver_data_t(machine) { } UINT32 databank; UINT16 *tileram; @@ -89,7 +90,7 @@ public: static VIDEO_UPDATE( srmp5 ) { - srmp5_state *state = (srmp5_state *)screen->machine->driver_data; + srmp5_state *state = screen->machine->driver_data(); int x,y,address,xs,xs2,ys,ys2,height,width,xw,yw,xb,yb,sizex,sizey; UINT16 *sprite_list=state->sprram; UINT16 *sprite_list_end=&state->sprram[0x4000]; //guess @@ -206,35 +207,35 @@ static VIDEO_UPDATE( srmp5 ) static READ32_HANDLER(srmp5_palette_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); return state->palram[offset]; } static WRITE32_HANDLER(srmp5_palette_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); COMBINE_DATA(&state->palram[offset]); palette_set_color(space->machine, offset, MAKE_RGB(data << 3 & 0xFF, data >> 2 & 0xFF, data >> 7 & 0xFF)); } static WRITE32_HANDLER(bank_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); COMBINE_DATA(&state->databank); } static READ32_HANDLER(tileram_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); return state->tileram[offset]; } static WRITE32_HANDLER(tileram_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); state->tileram[offset] = data & 0xFFFF; //lower 16bit only #ifdef DEBUG_CHAR @@ -244,21 +245,21 @@ static WRITE32_HANDLER(tileram_w) static READ32_HANDLER(spr_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); return state->sprram[offset]; } static WRITE32_HANDLER(spr_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); state->sprram[offset] = data & 0xFFFF; //lower 16bit only } static READ32_HANDLER(data_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); UINT32 data; const UINT8 *usr = memory_region(space->machine, "user2"); @@ -269,14 +270,14 @@ static READ32_HANDLER(data_r) static WRITE32_HANDLER(input_select_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); state->input_select = data & 0x0F; } static READ32_HANDLER(srmp5_inputs_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); UINT32 ret = 0; switch (state->input_select) @@ -301,7 +302,7 @@ static READ32_HANDLER(srmp5_inputs_r) //almost all cmds are sound related static WRITE32_HANDLER(cmd1_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); state->cmd1 = data & 0xFF; logerror("cmd1_w %08X\n", data); @@ -309,7 +310,7 @@ static WRITE32_HANDLER(cmd1_w) static WRITE32_HANDLER(cmd2_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); state->cmd2 = data & 0xFF; state->cmd_stat = 5; @@ -318,14 +319,14 @@ static WRITE32_HANDLER(cmd2_w) static READ32_HANDLER(cmd_stat32_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); return state->cmd_stat; } static READ32_HANDLER(srmp5_vidregs_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); logerror("vidregs read %08X %08X\n", offset << 2, state->vidregs[offset]); return state->vidregs[offset]; @@ -333,7 +334,7 @@ static READ32_HANDLER(srmp5_vidregs_r) static WRITE32_HANDLER(srmp5_vidregs_w) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vidregs[offset]); if(offset != 0x10C / 4) @@ -389,7 +390,7 @@ READ8_HANDLER(st0016_dma_r); static READ8_HANDLER(cmd1_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); state->cmd_stat = 0; return state->cmd1; @@ -397,14 +398,14 @@ static READ8_HANDLER(cmd1_r) static READ8_HANDLER(cmd2_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); return state->cmd2; } static READ8_HANDLER(cmd_stat8_r) { - srmp5_state *state = (srmp5_state *)space->machine->driver_data; + srmp5_state *state = space->machine->driver_data(); return state->cmd_stat; } @@ -623,7 +624,7 @@ ROM_END static DRIVER_INIT(srmp5) { - srmp5_state *state = (srmp5_state *)machine->driver_data; + srmp5_state *state = machine->driver_data(); st0016_game = 9; state->tileram = auto_alloc_array(machine, UINT16, 0x100000/2); diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index b0dd6ab9482..944e0514a44 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -71,12 +71,13 @@ Dumped 06/15/2000 #include "deprecat.h" #include "sound/nile.h" -class srmp6_state +class srmp6_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp6_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp6_state(machine)); } - srmp6_state(running_machine &machine) { } + srmp6_state(running_machine &machine) + : driver_data_t(machine) { } UINT16* tileram; UINT16* dmaram; @@ -109,7 +110,7 @@ static const gfx_layout tiles8x8_layout = static void update_palette(running_machine *machine) { - srmp6_state *state = (srmp6_state *)machine->driver_data; + srmp6_state *state = machine->driver_data(); INT8 r, g ,b; int brg = state->brightness - 0x60; int i; @@ -142,7 +143,7 @@ static void update_palette(running_machine *machine) static VIDEO_START(srmp6) { - srmp6_state *state = (srmp6_state *)machine->driver_data; + srmp6_state *state = machine->driver_data(); state->tileram = auto_alloc_array_clear(machine, UINT16, 0x100000*16/2); state->dmaram = auto_alloc_array(machine, UINT16, 0x100/2); @@ -161,7 +162,7 @@ static int xixi=0; static VIDEO_UPDATE(srmp6) { - srmp6_state *state = (srmp6_state *)screen->machine->driver_data; + srmp6_state *state = screen->machine->driver_data(); int alpha; int x,y,tileno,height,width,xw,yw,sprite,xb,yb; UINT16 *sprite_list = state->sprram_old; @@ -291,14 +292,14 @@ static VIDEO_UPDATE(srmp6) static WRITE16_HANDLER( srmp6_input_select_w ) { - srmp6_state *state = (srmp6_state *)space->machine->driver_data; + srmp6_state *state = space->machine->driver_data(); state->input_select = data & 0x0f; } static READ16_HANDLER( srmp6_inputs_r ) { - srmp6_state *state = (srmp6_state *)space->machine->driver_data; + srmp6_state *state = space->machine->driver_data(); if (offset == 0) // DSW return input_port_read(space->machine, "DSW"); @@ -317,7 +318,7 @@ static READ16_HANDLER( srmp6_inputs_r ) static WRITE16_HANDLER( video_regs_w ) { - srmp6_state *state = (srmp6_state *)space->machine->driver_data; + srmp6_state *state = space->machine->driver_data(); switch(offset) { @@ -357,7 +358,7 @@ static WRITE16_HANDLER( video_regs_w ) static READ16_HANDLER( video_regs_r ) { - srmp6_state *state = (srmp6_state *)space->machine->driver_data; + srmp6_state *state = space->machine->driver_data(); logerror("video_regs_r (PC=%06X): %04x\n", cpu_get_previouspc(space->cpu), offset*2); return state->video_regs[offset]; @@ -367,7 +368,7 @@ static READ16_HANDLER( video_regs_r ) /* DMA RLE stuff - the same as CPS3 */ static UINT32 process(running_machine *machine,UINT8 b,UINT32 dst_offset) { - srmp6_state *state = (srmp6_state *)machine->driver_data; + srmp6_state *state = machine->driver_data(); int l=0; UINT8 *tram=(UINT8*)state->tileram; @@ -403,7 +404,7 @@ static UINT32 process(running_machine *machine,UINT8 b,UINT32 dst_offset) static WRITE16_HANDLER(srmp6_dma_w) { - srmp6_state *state = (srmp6_state *)space->machine->driver_data; + srmp6_state *state = space->machine->driver_data(); UINT16* dmaram = state->dmaram; COMBINE_DATA(&dmaram[offset]); @@ -496,7 +497,7 @@ static WRITE16_HANDLER(tileram_w) static WRITE16_HANDLER(paletteram_w) { - srmp6_state *state = (srmp6_state *)space->machine->driver_data; + srmp6_state *state = space->machine->driver_data(); INT8 r, g, b; int brg = state->brightness - 0x60; diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 2a8ce5e3e1c..b0250e2ce89 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -150,12 +150,13 @@ Dumped by Chack'n #define NUM_PENS (4*8) #define VMEM_SIZE 0x100 -class ssingles_state +class ssingles_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ssingles_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ssingles_state(machine)); } - ssingles_state(running_machine &machine) { } + ssingles_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; UINT8 *colorram; @@ -178,7 +179,7 @@ static const UINT8 ssingles_colors[NUM_PENS*3]= static MC6845_UPDATE_ROW( update_row ) { - ssingles_state *state = (ssingles_state *)device->machine->driver_data; + ssingles_state *state = device->machine->driver_data(); int cx,x; UINT32 tile_address; UINT16 cell,palette; @@ -230,20 +231,20 @@ static const mc6845_interface mc6845_intf = static WRITE8_HANDLER(ssingles_videoram_w) { - ssingles_state *state = (ssingles_state *)space->machine->driver_data; + ssingles_state *state = space->machine->driver_data(); state->videoram[offset]=data; } static WRITE8_HANDLER(ssingles_colorram_w) { - ssingles_state *state = (ssingles_state *)space->machine->driver_data; + ssingles_state *state = space->machine->driver_data(); state->colorram[offset]=data; } static VIDEO_START(ssingles) { - ssingles_state *state = (ssingles_state *)machine->driver_data; + ssingles_state *state = machine->driver_data(); { int i; @@ -266,14 +267,14 @@ static VIDEO_UPDATE( ssingles ) static READ8_HANDLER(c000_r) { - ssingles_state *state = (ssingles_state *)space->machine->driver_data; + ssingles_state *state = space->machine->driver_data(); return state->prot_data; } static READ8_HANDLER(c001_r) { - ssingles_state *state = (ssingles_state *)space->machine->driver_data; + ssingles_state *state = space->machine->driver_data(); state->prot_data=0xc4; return 0; @@ -281,7 +282,7 @@ static READ8_HANDLER(c001_r) static WRITE8_HANDLER(c001_w) { - ssingles_state *state = (ssingles_state *)space->machine->driver_data; + ssingles_state *state = space->machine->driver_data(); state->prot_data^=data^0x11; } @@ -551,7 +552,7 @@ ROM_END static DRIVER_INIT(ssingles) { - ssingles_state *state = (ssingles_state *)machine->driver_data; + ssingles_state *state = machine->driver_data(); state->videoram=auto_alloc_array_clear(machine, UINT8, VMEM_SIZE); state->colorram=auto_alloc_array_clear(machine, UINT8, VMEM_SIZE); diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index f2debe63512..36492e46f54 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -217,7 +217,7 @@ static const UINT8 sslam_snd_loop[8][20] = static TIMER_CALLBACK( music_playback ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); int pattern = 0; okim6295_device *device = machine->device("oki"); @@ -257,7 +257,7 @@ static TIMER_CALLBACK( music_playback ) static void sslam_play(running_device *device, int track, int data) { - sslam_state *state = (sslam_state *)device->machine->driver_data; + sslam_state *state = device->machine->driver_data(); int status = okim6295_r(device,0); if (data < 0x80) { @@ -303,7 +303,7 @@ static WRITE16_DEVICE_HANDLER( sslam_snd_w ) { if (ACCESSING_BITS_0_7) { - sslam_state *state = (sslam_state *)device->machine->driver_data; + sslam_state *state = device->machine->driver_data(); logerror("%s Writing %04x to Sound CPU\n",cpuexec_describe_context(device->machine),data); if (data >= 0x40) { @@ -434,7 +434,7 @@ ADDRESS_MAP_END static READ8_HANDLER( playmark_snd_command_r ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); UINT8 data = 0; if ((state->oki_control & 0x38) == 0x30) { @@ -449,14 +449,14 @@ static READ8_HANDLER( playmark_snd_command_r ) static WRITE8_HANDLER( playmark_oki_w ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); state->oki_command = data; } static WRITE8_HANDLER( playmark_snd_control_w ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); state->oki_control = data; @@ -931,7 +931,7 @@ ROM_END static DRIVER_INIT( sslam ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); state->track = 0; state->melody = 0; state->bar = 0; @@ -946,7 +946,7 @@ static DRIVER_INIT( sslam ) static DRIVER_INIT( powerbls ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); state_save_register_global(machine, state->oki_control); state_save_register_global(machine, state->oki_command); diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 6466b066926..7f3047612db 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -14,12 +14,13 @@ #define NUM_PENS (8) -class sstrangr_state +class sstrangr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sstrangr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sstrangr_state(machine)); } - sstrangr_state(running_machine &machine) { } + sstrangr_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *ram; UINT8 flip_screen; @@ -36,7 +37,7 @@ public: static VIDEO_UPDATE( sstrangr ) { - sstrangr_state *state = (sstrangr_state *)screen->machine->driver_data; + sstrangr_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < 0x2000; offs++) @@ -85,7 +86,7 @@ static void get_pens(pen_t *pens) static VIDEO_UPDATE( sstrngr2 ) { - sstrangr_state *state = (sstrangr_state *)screen->machine->driver_data; + sstrangr_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; UINT8 *color_map_base; @@ -133,7 +134,7 @@ static VIDEO_UPDATE( sstrngr2 ) static WRITE8_HANDLER( port_w ) { - sstrangr_state *state = (sstrangr_state *)space->machine->driver_data; + sstrangr_state *state = space->machine->driver_data(); state->flip_screen = data & 0x20; } diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c index 432ee8060a8..68d435f3dec 100644 --- a/src/mame/drivers/stactics.c +++ b/src/mame/drivers/stactics.c @@ -55,7 +55,7 @@ Verify Color PROM resistor values (Last 8 colors) static CUSTOM_INPUT( get_motor_not_ready ) { - stactics_state *state = (stactics_state *)field->port->machine->driver_data; + stactics_state *state = field->port->machine->driver_data(); /* if the motor is self-centering, but not centered yet */ return ((*state->motor_on & 0x01) == 0) && @@ -65,7 +65,7 @@ static CUSTOM_INPUT( get_motor_not_ready ) static READ8_HANDLER( vert_pos_r ) { - stactics_state *state = (stactics_state *)space->machine->driver_data; + stactics_state *state = space->machine->driver_data(); return 0x70 - state->vert_pos; } @@ -73,7 +73,7 @@ static READ8_HANDLER( vert_pos_r ) static READ8_HANDLER( horiz_pos_r ) { - stactics_state *state = (stactics_state *)space->machine->driver_data; + stactics_state *state = space->machine->driver_data(); return state->horiz_pos + 0x88; } @@ -156,7 +156,7 @@ static WRITE8_HANDLER( stactics_coin_lockout_w ) static INTERRUPT_GEN( stactics_interrupt ) { - stactics_state *state = (stactics_state *)device->machine->driver_data; + stactics_state *state = device->machine->driver_data(); move_motor(device->machine, state); @@ -287,7 +287,7 @@ INPUT_PORTS_END static MACHINE_START( stactics ) { - stactics_state *state = (stactics_state *)machine->driver_data; + stactics_state *state = machine->driver_data(); state->vert_pos = 0; state->horiz_pos = 0; diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index 800a2d467fa..9db91f7e16b 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -364,14 +364,14 @@ ROM_END static DRIVER_INIT(stlforce) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); state->sprxoffs = 0; } static DRIVER_INIT(twinbrat) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); state->sprxoffs = 9; } diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index c247ae39c5a..e14cc76c45d 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -112,12 +112,13 @@ PCB2 (Top board, CPU board) #define MASTER_CLOCK XTAL_18_432MHz -class sub_state +class sub_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sub_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sub_state(machine)); } - sub_state(running_machine &machine) { } + sub_state(running_machine &machine) + : driver_data_t(machine) { } UINT8* vid; UINT8* attr; @@ -133,7 +134,7 @@ static VIDEO_START(sub) static VIDEO_UPDATE(sub) { - sub_state *state = (sub_state *)screen->machine->driver_data; + sub_state *state = screen->machine->driver_data(); const gfx_element *gfx = screen->machine->gfx[0]; const gfx_element *gfx_1 = screen->machine->gfx[1]; int y,x; @@ -244,7 +245,7 @@ static WRITE8_HANDLER( subm_to_sound_w ) static WRITE8_HANDLER( nmi_mask_w ) { - sub_state *state = (sub_state *)space->machine->driver_data; + sub_state *state = space->machine->driver_data(); state->nmi_en = data & 1; } @@ -412,7 +413,7 @@ static PALETTE_INIT( sub ) static INTERRUPT_GEN( subm_sound_irq ) { - sub_state *state = (sub_state *)device->machine->driver_data; + sub_state *state = device->machine->driver_data(); if(state->nmi_en) cputag_set_input_line(device->machine, "soundcpu", INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 05bfdaa5219..2d088e6f1a1 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -52,7 +52,7 @@ static READ16_HANDLER( supbtime_controls_r ) static WRITE16_HANDLER( sound_w ) { - supbtime_state *state = (supbtime_state *)space->machine->driver_data; + supbtime_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -311,7 +311,7 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - supbtime_state *driver_state = (supbtime_state *)device->machine->driver_data; + supbtime_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -332,7 +332,7 @@ static const deco16ic_interface supbtime_deco16ic_intf = static MACHINE_START( supbtime ) { - supbtime_state *state = (supbtime_state *)machine->driver_data; + supbtime_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 352c0d40650..93b794947ef 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -64,12 +64,13 @@ #include "cpu/z80/z80.h" #include "sound/ay8910.h" -class supdrapo_state +class supdrapo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supdrapo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supdrapo_state(machine)); } - supdrapo_state(running_machine &machine) { } + supdrapo_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *char_bank; UINT8 *col_line; @@ -89,7 +90,7 @@ static VIDEO_START( supdrapo ) static VIDEO_UPDATE( supdrapo ) { - supdrapo_state *state = (supdrapo_state *)screen->machine->driver_data; + supdrapo_state *state = screen->machine->driver_data(); int x, y; int count; int color; @@ -179,7 +180,7 @@ static WRITE8_HANDLER( wdog8000_w ) Watchdog: 00 */ - supdrapo_state *state = (supdrapo_state *)space->machine->driver_data; + supdrapo_state *state = space->machine->driver_data(); if (state->wdog == data) { @@ -232,7 +233,7 @@ static MACHINE_START( supdrapo ) static MACHINE_RESET( supdrapo ) { - supdrapo_state *state = (supdrapo_state *)machine->driver_data; + supdrapo_state *state = machine->driver_data(); state->wdog = 1; } diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index c7a4667a55b..f18e5dac5cb 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -27,12 +27,13 @@ #include "machine/laserdsc.h" #include "video/resnet.h" -class superdq_state +class superdq_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, superdq_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, superdq_state(machine)); } - superdq_state(running_machine &machine) { } + superdq_state(running_machine &machine) + : driver_data_t(machine) { } running_device *laserdisc; UINT8 ld_in_latch; @@ -45,7 +46,7 @@ public: static TILE_GET_INFO( get_tile_info ) { - superdq_state *state = (superdq_state *)machine->driver_data; + superdq_state *state = machine->driver_data(); int tile = state->videoram[tile_index]; SET_TILE_INFO(0, tile, state->color_bank, 0); @@ -53,14 +54,14 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( superdq ) { - superdq_state *state = (superdq_state *)machine->driver_data; + superdq_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static VIDEO_UPDATE( superdq ) { - superdq_state *state = (superdq_state *)screen->machine->driver_data; + superdq_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap, 0, 0); @@ -116,7 +117,7 @@ static PALETTE_INIT( superdq ) static MACHINE_RESET( superdq ) { - superdq_state *state = (superdq_state *)machine->driver_data; + superdq_state *state = machine->driver_data(); state->ld_in_latch = 0; state->ld_out_latch = 0xff; @@ -125,7 +126,7 @@ static MACHINE_RESET( superdq ) static INTERRUPT_GEN( superdq_vblank ) { - superdq_state *state = (superdq_state *)device->machine->driver_data; + superdq_state *state = device->machine->driver_data(); /* status is read when the STATUS line from the laserdisc toggles (600usec after the vblank). We could set up a @@ -141,7 +142,7 @@ static INTERRUPT_GEN( superdq_vblank ) static WRITE8_HANDLER( superdq_videoram_w ) { - superdq_state *state = (superdq_state *)space->machine->driver_data; + superdq_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap,offset); @@ -149,7 +150,7 @@ static WRITE8_HANDLER( superdq_videoram_w ) static WRITE8_HANDLER( superdq_io_w ) { - superdq_state *state = (superdq_state *)space->machine->driver_data; + superdq_state *state = space->machine->driver_data(); int i; static const UINT8 black_color_entries[] = {7,15,16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; @@ -179,14 +180,14 @@ static WRITE8_HANDLER( superdq_io_w ) static READ8_HANDLER( superdq_ld_r ) { - superdq_state *state = (superdq_state *)space->machine->driver_data; + superdq_state *state = space->machine->driver_data(); return state->ld_in_latch; } static WRITE8_HANDLER( superdq_ld_w ) { - superdq_state *state = (superdq_state *)space->machine->driver_data; + superdq_state *state = space->machine->driver_data(); state->ld_out_latch = data; } @@ -317,7 +318,7 @@ GFXDECODE_END static MACHINE_START( superdq ) { - superdq_state *state = (superdq_state *)machine->driver_data; + superdq_state *state = machine->driver_data(); state->laserdisc = machine->device("laserdisc"); } diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index bfda60836ca..ffced49abc4 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -105,12 +105,13 @@ CRU lines: every 8 bytes */ #define NUM_PENS (8) -class supertnk_state +class supertnk_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supertnk_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supertnk_state(machine)); } - supertnk_state(running_machine &machine) { } + supertnk_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram[3]; UINT8 rom_bank; @@ -128,7 +129,7 @@ public: static WRITE8_HANDLER( supertnk_bankswitch_0_w ) { - supertnk_state *state = (supertnk_state *)space->machine->driver_data; + supertnk_state *state = space->machine->driver_data(); offs_t bank_address; state->rom_bank = (state->rom_bank & 0x02) | ((data << 0) & 0x01); @@ -141,7 +142,7 @@ static WRITE8_HANDLER( supertnk_bankswitch_0_w ) static WRITE8_HANDLER( supertnk_bankswitch_1_w ) { - supertnk_state *state = (supertnk_state *)space->machine->driver_data; + supertnk_state *state = space->machine->driver_data(); offs_t bank_address; state->rom_bank = (state->rom_bank & 0x01) | ((data << 1) & 0x02); @@ -181,7 +182,7 @@ static WRITE8_HANDLER( supertnk_interrupt_ack_w ) static VIDEO_START( supertnk ) { - supertnk_state *state = (supertnk_state *)machine->driver_data; + supertnk_state *state = machine->driver_data(); offs_t i; const UINT8 *prom = memory_region(machine, "proms"); @@ -200,7 +201,7 @@ static VIDEO_START( supertnk ) static WRITE8_HANDLER( supertnk_videoram_w ) { - supertnk_state *state = (supertnk_state *)space->machine->driver_data; + supertnk_state *state = space->machine->driver_data(); if (state->bitplane_select > 2) { @@ -217,7 +218,7 @@ static WRITE8_HANDLER( supertnk_videoram_w ) static READ8_HANDLER( supertnk_videoram_r ) { - supertnk_state *state = (supertnk_state *)space->machine->driver_data; + supertnk_state *state = space->machine->driver_data(); UINT8 ret = 0x00; if (state->bitplane_select < 3) @@ -229,7 +230,7 @@ static READ8_HANDLER( supertnk_videoram_r ) static WRITE8_HANDLER( supertnk_bitplane_select_0_w ) { - supertnk_state *state = (supertnk_state *)space->machine->driver_data; + supertnk_state *state = space->machine->driver_data(); state->bitplane_select = (state->bitplane_select & 0x02) | ((data << 0) & 0x01); } @@ -237,7 +238,7 @@ static WRITE8_HANDLER( supertnk_bitplane_select_0_w ) static WRITE8_HANDLER( supertnk_bitplane_select_1_w ) { - supertnk_state *state = (supertnk_state *)space->machine->driver_data; + supertnk_state *state = space->machine->driver_data(); state->bitplane_select = (state->bitplane_select & 0x01) | ((data << 1) & 0x02); } @@ -245,7 +246,7 @@ static WRITE8_HANDLER( supertnk_bitplane_select_1_w ) static VIDEO_UPDATE( supertnk ) { - supertnk_state *state = (supertnk_state *)screen->machine->driver_data; + supertnk_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < 0x2000; offs++) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 7009a90145f..0723fcbbec3 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -24,12 +24,13 @@ #include "sound/2203intf.h" #include "sound/msm5205.h" -class suprgolf_state +class suprgolf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprgolf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprgolf_state(machine)); } - suprgolf_state(running_machine &machine) { } + suprgolf_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *tilemap; UINT8 *videoram; @@ -50,7 +51,7 @@ public: static TILE_GET_INFO( get_tile_info ) { - suprgolf_state *state = (suprgolf_state *)machine->driver_data; + suprgolf_state *state = machine->driver_data(); int code = state->videoram[tile_index*2]+256*(state->videoram[tile_index*2+1]); int color = state->videoram[tile_index*2+0x800] & 0x7f; @@ -63,7 +64,7 @@ static TILE_GET_INFO( get_tile_info ) static VIDEO_START( suprgolf ) { - suprgolf_state *state = (suprgolf_state *)machine->driver_data; + suprgolf_state *state = machine->driver_data(); state->tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 ); state->paletteram = auto_alloc_array(machine, UINT8, 0x1000); @@ -76,7 +77,7 @@ static VIDEO_START( suprgolf ) static VIDEO_UPDATE( suprgolf ) { - suprgolf_state *state = (suprgolf_state *)screen->machine->driver_data; + suprgolf_state *state = screen->machine->driver_data(); int x,y,count,color; bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -121,7 +122,7 @@ static VIDEO_UPDATE( suprgolf ) static READ8_HANDLER( suprgolf_videoram_r ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); if (state->palette_switch) return state->paletteram[offset]; @@ -131,7 +132,7 @@ static READ8_HANDLER( suprgolf_videoram_r ) static WRITE8_HANDLER( suprgolf_videoram_w ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); if(state->palette_switch) { @@ -155,14 +156,14 @@ static WRITE8_HANDLER( suprgolf_videoram_w ) static READ8_HANDLER( suprgolf_vregs_r ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); return state->vreg_bank; } static WRITE8_HANDLER( suprgolf_vregs_w ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); //bits 0,1,2 and probably 3 controls the background vram banking state->vreg_bank = data; @@ -177,14 +178,14 @@ static WRITE8_HANDLER( suprgolf_vregs_w ) static READ8_HANDLER( suprgolf_bg_vram_r ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); return state->bg_vram[offset+state->bg_bank*0x2000]; } static WRITE8_HANDLER( suprgolf_bg_vram_w ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); UINT8 hi_nibble,lo_nibble; UINT8 hi_dirty_dot,lo_dirty_dot; // helpers @@ -230,28 +231,28 @@ static WRITE8_HANDLER( suprgolf_bg_vram_w ) static WRITE8_HANDLER( suprgolf_pen_w ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); state->vreg_pen = data; } static WRITE8_HANDLER( adpcm_data_w ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); state->msm5205next = data; } static READ8_HANDLER( rom_bank_select_r ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); return state->rom_bank; } static WRITE8_HANDLER( rom_bank_select_w ) { - suprgolf_state *state = (suprgolf_state *)space->machine->driver_data; + suprgolf_state *state = space->machine->driver_data(); UINT8 *region_base = memory_region(space->machine, "user1"); state->rom_bank = data; @@ -437,7 +438,7 @@ static const ym2203_interface ym2203_config = static void adpcm_int(running_device *device) { - suprgolf_state *state = (suprgolf_state *)device->machine->driver_data; + suprgolf_state *state = device->machine->driver_data(); { msm5205_reset_w(device,0); @@ -477,7 +478,7 @@ GFXDECODE_END static MACHINE_RESET( suprgolf ) { - suprgolf_state *state = (suprgolf_state *)machine->driver_data; + suprgolf_state *state = machine->driver_data(); state->msm_nmi_mask = 0; } diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index e70a154998d..1d59f928caf 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -92,7 +92,7 @@ EB26IC73.BIN 27C240 / Main Program static WRITE16_HANDLER( sound_command_w ) { - suprslam_state *state = (suprslam_state *)space->machine->driver_data; + suprslam_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->pending_command = 1; @@ -104,14 +104,14 @@ static WRITE16_HANDLER( sound_command_w ) #if 0 static READ16_HANDLER( pending_command_r ) { - suprslam_state *state = (suprslam_state *)space->machine->driver_data; + suprslam_state *state = space->machine->driver_data(); return pending_command; } #endif static WRITE8_HANDLER( pending_command_clear_w ) { - suprslam_state *state = (suprslam_state *)space->machine->driver_data; + suprslam_state *state = space->machine->driver_data(); state->pending_command = 0; } @@ -280,7 +280,7 @@ GFXDECODE_END static void irqhandler(running_device *device, int irq) { - suprslam_state *state = (suprslam_state *)device->machine->driver_data; + suprslam_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -298,7 +298,7 @@ static const k053936_interface suprslam_k053936_intf = static MACHINE_START( suprslam ) { - suprslam_state *state = (suprslam_state *)machine->driver_data; + suprslam_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->k053936 = machine->device("k053936"); @@ -310,7 +310,7 @@ static MACHINE_START( suprslam ) static MACHINE_RESET( suprslam ) { - suprslam_state *state = (suprslam_state *)machine->driver_data; + suprslam_state *state = machine->driver_data(); state->screen_bank = 0; state->bg_bank = 0; diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index e3758fe0110..da2022e48b1 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -20,14 +20,14 @@ static KONAMI_SETLINES_CALLBACK( surpratk_banking ); static INTERRUPT_GEN( surpratk_interrupt ) { - surpratk_state *state = (surpratk_state *)device->machine->driver_data; + surpratk_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) cpu_set_input_line(device, 0, HOLD_LINE); } static READ8_HANDLER( bankedram_r ) { - surpratk_state *state = (surpratk_state *)space->machine->driver_data; + surpratk_state *state = space->machine->driver_data(); if (state->videobank & 0x02) { @@ -44,7 +44,7 @@ static READ8_HANDLER( bankedram_r ) static WRITE8_HANDLER( bankedram_w ) { - surpratk_state *state = (surpratk_state *)space->machine->driver_data; + surpratk_state *state = space->machine->driver_data(); if (state->videobank & 0x02) { @@ -61,7 +61,7 @@ static WRITE8_HANDLER( bankedram_w ) static WRITE8_HANDLER( surpratk_videobank_w ) { - surpratk_state *state = (surpratk_state *)space->machine->driver_data; + surpratk_state *state = space->machine->driver_data(); logerror("%04x: videobank = %02x\n",cpu_get_pc(space->cpu),data); /* bit 0 = select 053245 at 0000-07ff */ @@ -72,7 +72,7 @@ static WRITE8_HANDLER( surpratk_videobank_w ) static WRITE8_HANDLER( surpratk_5fc0_w ) { - surpratk_state *state = (surpratk_state *)space->machine->driver_data; + surpratk_state *state = space->machine->driver_data(); if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",cpu_get_pc(space->cpu),data); @@ -170,7 +170,7 @@ INPUT_PORTS_END static void irqhandler( running_device *device, int linestate ) { - surpratk_state *state = (surpratk_state *)device->machine->driver_data; + surpratk_state *state = device->machine->driver_data(); cpu_set_input_line(state->maincpu, KONAMI_FIRQ_LINE, linestate); } @@ -200,7 +200,7 @@ static const k05324x_interface surpratk_k05324x_intf = static MACHINE_START( surpratk ) { - surpratk_state *state = (surpratk_state *)machine->driver_data; + surpratk_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 28, &ROM[0x10000], 0x2000); @@ -223,7 +223,7 @@ static MACHINE_START( surpratk ) static MACHINE_RESET( surpratk ) { - surpratk_state *state = (surpratk_state *)machine->driver_data; + surpratk_state *state = machine->driver_data(); int i; konami_configure_set_lines(machine->device("maincpu"), surpratk_banking); diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 7575ec96cc3..1f1a6a9c976 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -110,7 +110,7 @@ static INTERRUPT_GEN( sys16_interrupt ) static WRITE16_HANDLER( sound_command_nmi_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -149,7 +149,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( sound_command_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -160,7 +160,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( sys16_coinctrl_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -206,7 +206,7 @@ ADDRESS_MAP_END static READ16_HANDLER( passht4b_service_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT16 val = input_port_read(space->machine, "SERVICE"); if(!(input_port_read(space->machine, "P1") & 0x40)) val &= 0xef; @@ -244,19 +244,19 @@ static READ16_HANDLER( passht4b_service_r ) static READ16_HANDLER( passht4b_io1_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); return state->passht4b_io1_val; } static READ16_HANDLER( passht4b_io2_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); return state->passht4b_io2_val; } static READ16_HANDLER( passht4b_io3_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); return state->passht4b_io3_val; } @@ -293,7 +293,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( sys16_tilebank_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -366,13 +366,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( tturfbl_msm5205_data_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->sample_buffer = data; } static void tturfbl_msm5205_callback( running_device *device ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)device->machine->driver_data; + segas1x_bootleg_state *state = device->machine->driver_data(); msm5205_data_w(device, (state->sample_buffer >> 4) & 0x0f); state->sample_buffer <<= 4; @@ -390,7 +390,7 @@ static const msm5205_interface tturfbl_msm5205_interface = static READ8_HANDLER( tturfbl_soundbank_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (state->soundbank_ptr) return state->soundbank_ptr[offset & 0x3fff]; @@ -399,7 +399,7 @@ static READ8_HANDLER( tturfbl_soundbank_r ) static WRITE8_HANDLER( tturfbl_soundbank_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT8 *mem = memory_region(space->machine, "soundcpu"); switch(data) @@ -492,14 +492,14 @@ ADDRESS_MAP_END static void set_tile_bank( running_machine *machine, int data ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); state->tile_bank0 = (data >> 4) & 0x0f; state->tile_bank1 = data & 0x0f; } static void set_fg_page( running_machine *machine, int data ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); state->fg_page[0] = data >> 12; state->fg_page[1] = (data >> 8) & 0x0f; state->fg_page[2] = (data >> 4) & 0x0f; @@ -508,7 +508,7 @@ static void set_fg_page( running_machine *machine, int data ) static void set_bg_page( running_machine *machine, int data ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); state->bg_page[0] = data >> 12; state->bg_page[1] = (data >> 8) & 0x0f; state->bg_page[2] = (data >> 4) & 0x0f; @@ -561,7 +561,7 @@ static WRITE16_HANDLER( s16bl_fgpage_w ) static WRITE16_HANDLER( s16bl_fgscrollx_bank_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0x1ff; int bank = (data & 0xc000) >> 14; @@ -574,7 +574,7 @@ static WRITE16_HANDLER( s16bl_fgscrollx_bank_w ) static WRITE16_HANDLER( s16bl_fgscrollx_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0x1ff; scroll += 0x200; @@ -586,7 +586,7 @@ static WRITE16_HANDLER( s16bl_fgscrollx_w ) static WRITE16_HANDLER( s16bl_fgscrolly_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0xff; state->fg_scrolly = scroll; @@ -594,7 +594,7 @@ static WRITE16_HANDLER( s16bl_fgscrolly_w ) static WRITE16_HANDLER( s16bl_bgscrollx_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0x1ff; scroll+= 0x200; @@ -604,7 +604,7 @@ static WRITE16_HANDLER( s16bl_bgscrollx_w ) static WRITE16_HANDLER( s16bl_bgscrolly_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0xff; state->bg_scrolly = scroll; @@ -658,7 +658,7 @@ ADDRESS_MAP_END static void datsu_set_pages( running_machine *machine ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); UINT16 page; page = ((state->datsu_page[0] & 0x00f0) >>0) | @@ -679,7 +679,7 @@ static void datsu_set_pages( running_machine *machine ) static WRITE16_HANDLER( datsu_page0_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); COMBINE_DATA(&state->datsu_page[0]); datsu_set_pages(space->machine); @@ -687,7 +687,7 @@ static WRITE16_HANDLER( datsu_page0_w ) static WRITE16_HANDLER( datsu_page1_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); COMBINE_DATA(&state->datsu_page[1]); datsu_set_pages(space->machine); @@ -695,7 +695,7 @@ static WRITE16_HANDLER( datsu_page1_w ) static WRITE16_HANDLER( datsu_page2_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); COMBINE_DATA(&state->datsu_page[2]); datsu_set_pages(space->machine); @@ -703,7 +703,7 @@ static WRITE16_HANDLER( datsu_page2_w ) static WRITE16_HANDLER( datsu_page3_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); COMBINE_DATA(&state->datsu_page[3]); datsu_set_pages(space->machine); @@ -762,7 +762,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( goldnaxeb2_fgscrollx_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0x1ff; int bank = (data & 0xc000) >> 14; @@ -774,7 +774,7 @@ static WRITE16_HANDLER( goldnaxeb2_fgscrollx_w ) static WRITE16_HANDLER( goldnaxeb2_bgscrollx_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0x1ff; scroll += 0x1f4; @@ -785,7 +785,7 @@ static WRITE16_HANDLER( goldnaxeb2_bgscrollx_w ) static WRITE16_HANDLER( goldnaxeb2_fgscrolly_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0xff; scroll += 0x1; @@ -794,7 +794,7 @@ static WRITE16_HANDLER( goldnaxeb2_fgscrolly_w ) static WRITE16_HANDLER( goldnaxeb2_bgscrolly_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); int scroll = data & 0xff; scroll += 0x1; @@ -803,7 +803,7 @@ static WRITE16_HANDLER( goldnaxeb2_bgscrolly_w ) static WRITE16_HANDLER( goldnaxeb2_fgpage_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT16 page; COMBINE_DATA(&state->goldnaxeb2_fgpage[offset]); @@ -819,7 +819,7 @@ static WRITE16_HANDLER( goldnaxeb2_fgpage_w ) static WRITE16_HANDLER( goldnaxeb2_bgpage_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT16 page; COMBINE_DATA(&state->goldnaxeb2_bgpage[offset]); @@ -893,7 +893,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( eswat_tilebank0_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -959,7 +959,7 @@ ADDRESS_MAP_END static READ16_HANDLER( beautyb_unkx_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->beautyb_unkx++; state->beautyb_unkx &= 0x7f; @@ -1029,7 +1029,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( sys18_refreshenable_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1039,7 +1039,7 @@ static WRITE16_HANDLER( sys18_refreshenable_w ) static WRITE16_HANDLER( sys18_tilebank_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1050,7 +1050,7 @@ static WRITE16_HANDLER( sys18_tilebank_w ) static READ8_HANDLER( system18_bank_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (state->sound_bank != NULL) return state->sound_bank[offset]; @@ -1070,7 +1070,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sys18_soundbank_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT8 *mem = memory_region(space->machine, "soundcpu"); int rom = (data >> 6) & 3; int bank = (data & 0x3f); @@ -1136,7 +1136,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( sound_command_irq_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -1206,13 +1206,13 @@ ADDRESS_MAP_END static WRITE8_HANDLER( shdancbl_msm5205_data_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->sample_buffer = data; } static void shdancbl_msm5205_callback(running_device *device) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)device->machine->driver_data; + segas1x_bootleg_state *state = device->machine->driver_data(); msm5205_data_w(device, state->sample_buffer & 0x0f); state->sample_buffer >>= 4; @@ -1229,7 +1229,7 @@ static const msm5205_interface shdancbl_msm5205_interface = static READ8_HANDLER( shdancbl_soundbank_r ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); if (state->soundbank_ptr) return state->soundbank_ptr[offset & 0x3fff]; @@ -1238,7 +1238,7 @@ static READ8_HANDLER( shdancbl_soundbank_r ) static WRITE8_HANDLER( shdancbl_bankctrl_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT8 *mem = memory_region(space->machine, "soundcpu"); switch (data) @@ -2031,7 +2031,7 @@ MACHINE_DRIVER_END static void sound_cause_nmi( running_device *device, int chip ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)device->machine->driver_data; + segas1x_bootleg_state *state = device->machine->driver_data(); /* upd7759 callback */ cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, PULSE_LINE); @@ -3293,7 +3293,7 @@ ROM_END static DRIVER_INIT( common ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); state->bg1_trans = 0; state->splittab_bg_x = 0; @@ -3320,7 +3320,7 @@ static DRIVER_INIT( common ) /* Sys16A */ static DRIVER_INIT( shinobl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); DRIVER_INIT_CALL(common); @@ -3329,7 +3329,7 @@ static DRIVER_INIT( shinobl ) static DRIVER_INIT( passsht ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); DRIVER_INIT_CALL(common); @@ -3339,7 +3339,7 @@ static DRIVER_INIT( passsht ) static DRIVER_INIT( wb3bbl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); DRIVER_INIT_CALL(common); @@ -3352,7 +3352,7 @@ static DRIVER_INIT( wb3bbl ) /* Sys16B */ static DRIVER_INIT( goldnaxeb1 ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); int i; UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *KEY = memory_region(machine, "decryption"); @@ -3391,7 +3391,7 @@ static DRIVER_INIT( bayrouteb1 ) // // for now we use the code which is present in the unprotected bootleg set // and modify the rom to use it - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); UINT16 *ROM2; UINT16 *decrypted_region2; @@ -3422,7 +3422,7 @@ static DRIVER_INIT( bayrouteb2 ) static DRIVER_INIT( goldnaxeb2 ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); DRIVER_INIT_CALL(common); @@ -3445,7 +3445,7 @@ static DRIVER_INIT( dduxbl ) static DRIVER_INIT( eswatbl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); DRIVER_INIT_CALL(common); //state->splittab_fg_x = &sys16_textram[0x0f80]; @@ -3455,7 +3455,7 @@ static DRIVER_INIT( eswatbl ) static DRIVER_INIT( fpointbl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); DRIVER_INIT_CALL(common); //sys16_video_config(fpoint_update_proc, -0xb8, NULL); @@ -3485,7 +3485,7 @@ static DRIVER_INIT( beautyb ) /* Sys18 */ static DRIVER_INIT( shdancbl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); UINT8 *mem = memory_region(machine, "soundcpu");; /* Copy first 32K of IC45 to Z80 address space */ @@ -3500,7 +3500,7 @@ static DRIVER_INIT( shdancbl ) static DRIVER_INIT( mwalkbl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "soundcpu"); static const int mwalk_sound_info[] = { @@ -3522,7 +3522,7 @@ static DRIVER_INIT( mwalkbl ) static DRIVER_INIT( astormbl ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "soundcpu"); static const int astormbl_sound_info[] = { diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 22070f588ed..ed57c9e7144 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -19,7 +19,7 @@ static WRITE16_HANDLER( sound_command_w ) { - tail2nos_state *state = (tail2nos_state *)space->machine->driver_data; + tail2nos_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -180,7 +180,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - tail2nos_state *state = (tail2nos_state *)device->machine->driver_data; + tail2nos_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -208,7 +208,7 @@ static const k051316_interface tail2nos_k051316_intf = static MACHINE_START( tail2nos ) { - tail2nos_state *state = (tail2nos_state *)machine->driver_data; + tail2nos_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank3", 0, 2, &ROM[0x10000], 0x8000); @@ -225,7 +225,7 @@ static MACHINE_START( tail2nos ) static MACHINE_RESET( tail2nos ) { - tail2nos_state *state = (tail2nos_state *)machine->driver_data; + tail2nos_state *state = machine->driver_data(); /* point to the extra ROMs */ memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")); diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index ff5c4cfcf6d..be3c3c64551 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -188,7 +188,7 @@ static WRITE8_HANDLER( bankswitch_w ) static TIMER_CALLBACK( rsaga2_interrupt2 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 2, HOLD_LINE); } @@ -201,7 +201,7 @@ static INTERRUPT_GEN( rastansaga2_interrupt ) static TIMER_CALLBACK( crimec_interrupt3 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 3, HOLD_LINE); } @@ -214,7 +214,7 @@ static INTERRUPT_GEN( crimec_interrupt ) static TIMER_CALLBACK( hitice_interrupt6 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, HOLD_LINE); } @@ -227,7 +227,7 @@ static INTERRUPT_GEN( hitice_interrupt ) static TIMER_CALLBACK( rambo3_interrupt1 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 1, HOLD_LINE); } @@ -240,7 +240,7 @@ static INTERRUPT_GEN( rambo3_interrupt ) static TIMER_CALLBACK( pbobble_interrupt5 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 5, HOLD_LINE); } @@ -252,7 +252,7 @@ static INTERRUPT_GEN( pbobble_interrupt ) static TIMER_CALLBACK( viofight_interrupt1 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 1, HOLD_LINE); } @@ -264,7 +264,7 @@ static INTERRUPT_GEN( viofight_interrupt ) static TIMER_CALLBACK( masterw_interrupt4 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 4, HOLD_LINE); } @@ -276,7 +276,7 @@ static INTERRUPT_GEN( masterw_interrupt ) static TIMER_CALLBACK( silentd_interrupt4 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 4, HOLD_LINE); } @@ -288,7 +288,7 @@ static INTERRUPT_GEN( silentd_interrupt ) static TIMER_CALLBACK( selfeena_interrupt4 ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 4, HOLD_LINE); } @@ -300,7 +300,7 @@ static INTERRUPT_GEN( selfeena_interrupt ) static TIMER_CALLBACK( sbm_interrupt5 )//4 { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 5, HOLD_LINE); } @@ -355,7 +355,7 @@ static READ16_HANDLER( trackx2_lo_r ) static WRITE16_HANDLER( gain_control_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { if (offset == 0) @@ -390,13 +390,13 @@ static const eeprom_interface taitob_eeprom_intf = static READ16_HANDLER( eep_latch_r ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); return state->eep_latch; } static WRITE16_HANDLER( eeprom_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); COMBINE_DATA(&state->eep_latch); @@ -431,13 +431,13 @@ static WRITE16_HANDLER( eeprom_w ) static READ16_HANDLER( player_34_coin_ctrl_r ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); return state->coin_word; } static WRITE16_HANDLER( player_34_coin_ctrl_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); COMBINE_DATA(&state->coin_word); @@ -450,7 +450,7 @@ static WRITE16_HANDLER( player_34_coin_ctrl_w ) static READ16_HANDLER( pbobble_input_bypass_r ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); switch (offset) { case 0x01: @@ -463,7 +463,7 @@ static READ16_HANDLER( pbobble_input_bypass_r ) static WRITE16_HANDLER( spacedxo_tc0220ioc_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) tc0220ioc_w(state->tc0220ioc, offset, data & 0xff); else @@ -2091,7 +2091,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - taitob_state *state = (taitob_state *)device->machine->driver_data; + taitob_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -2126,7 +2126,7 @@ static const ym2203_interface ym2203_config = */ static void mb87078_gain_changed( running_machine *machine, int channel, int percent ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); if (channel == 1) { @@ -2192,7 +2192,7 @@ static const tc0140syt_interface taitob_tc0140syt_intf = static MACHINE_START( taitob ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -2208,7 +2208,7 @@ static MACHINE_START( taitob ) static MACHINE_RESET( taitob ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); state->eep_latch = 0; state->coin_word = 0; diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 1939fca8a48..22e07f8aeb1 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -355,7 +355,7 @@ static READ16_HANDLER( ninjak_input_r ) static READ16_HANDLER( cameltry_paddle_r ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); int curr, res = 0xff; switch (offset) @@ -400,7 +400,7 @@ static READ16_HANDLER( mjnquest_dsw_r ) static READ16_HANDLER( mjnquest_input_r ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); switch (state->mjnquest_input) { case 0x01: @@ -427,7 +427,7 @@ static READ16_HANDLER( mjnquest_input_r ) static WRITE16_HANDLER( mjnquest_inputselect_w ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); state->mjnquest_input = (data >> 6); } @@ -577,7 +577,7 @@ driftout 8000 0000/8 0000 0000 The first control changes from 8000 to 0000 static TIMER_CALLBACK( taitof2_interrupt6 ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, HOLD_LINE); } @@ -605,7 +605,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static READ8_HANDLER( driveout_sound_command_r) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, CLEAR_LINE); // logerror("sound IRQ OFF (sound command=%02x)\n", state->driveout_sound_latch); @@ -615,13 +615,13 @@ static READ8_HANDLER( driveout_sound_command_r) static void reset_driveout_sound_region( running_machine *machine ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->oki->set_bank_base(state->oki_bank * 0x40000); } static WRITE8_HANDLER( oki_bank_w ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); if ((data & 4) && (state->oki_bank != (data & 3)) ) { state->oki_bank = (data & 3); @@ -632,7 +632,7 @@ static WRITE8_HANDLER( oki_bank_w ) static WRITE16_HANDLER( driveout_sound_command_w ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -668,7 +668,7 @@ static WRITE16_HANDLER( driveout_sound_command_w ) static WRITE16_HANDLER( cchip2_word_w ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); logerror("cchip2_w pc: %06x offset %04x: %02x\n", cpu_get_pc(space->cpu), offset, data); @@ -677,7 +677,7 @@ static WRITE16_HANDLER( cchip2_word_w ) static READ16_HANDLER( cchip2_word_r ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); /* C-Chip ID */ if (offset == 0x401) @@ -3138,7 +3138,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irq_handler( running_device *device, int irq ) { - taitof2_state *state = (taitof2_state *)device->machine->driver_data; + taitof2_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -3346,7 +3346,7 @@ static const tc0140syt_interface taitof2_tc0140syt_intf = static MACHINE_START( common ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu");; @@ -5598,7 +5598,7 @@ static DRIVER_INIT( finalb ) static DRIVER_INIT( cameltry ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->last[0] = 0; state->last[1] = 0; @@ -5609,7 +5609,7 @@ static DRIVER_INIT( cameltry ) static DRIVER_INIT( mjnquest ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); int i, len = memory_region_length(machine, "gfx2"); UINT8 *gfx = memory_region(machine, "gfx2"); @@ -5636,7 +5636,7 @@ static STATE_POSTLOAD( driveout_postload ) static DRIVER_INIT( driveout ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->driveout_sound_latch = 0; state->oki_bank = 0; diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 59fc2ff9972..c6948af16fe 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -158,7 +158,7 @@ some kind of zoom table? /* Handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - taitoh_state *state = (taitoh_state *)device->machine->driver_data; + taitoh_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -183,7 +183,7 @@ static READ8_HANDLER( syvalion_input_bypass_r ) { /* Bypass TC0220IOC controller for analog input */ - taitoh_state *state = (taitoh_state *)space->machine->driver_data; + taitoh_state *state = space->machine->driver_data(); UINT8 port = tc0220ioc_port_r(state->tc0220ioc, 0); /* read port number */ switch( port ) @@ -231,13 +231,13 @@ static READ8_HANDLER( syvalion_input_bypass_r ) static void reset_sound_region(running_machine *machine) { - taitoh_state *state = (taitoh_state *)machine->driver_data; + taitoh_state *state = machine->driver_data(); memory_set_bank(machine, "bank1", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - taitoh_state *state = (taitoh_state *)space->machine->driver_data; + taitoh_state *state = space->machine->driver_data(); state->banknum = data & 3; reset_sound_region(space->machine); } @@ -518,13 +518,13 @@ static STATE_POSTLOAD( taitoh_postload ) static MACHINE_RESET( taitoh ) { - taitoh_state *state = (taitoh_state *)machine->driver_data; + taitoh_state *state = machine->driver_data(); state->banknum = 0; } static MACHINE_START( taitoh ) { - taitoh_state *state = (taitoh_state *)machine->driver_data; + taitoh_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 57f67a4c043..b40950c700d 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -87,7 +87,7 @@ static const struct static void palette_notifier(running_machine *machine, int addr) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); UINT8 *p = state->palette_ram + (addr & ~1); UINT8 byte0 = *p++; UINT8 byte1 = *p; @@ -109,7 +109,7 @@ static const UINT8 puzznic_mcu_reply[] = { 0x50, 0x1f, 0xb6, 0xba, 0x06, 0x03, 0 static void state_register( running_machine *machine ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); state_save_register_global_array(machine, state->irq_adr_table); state_save_register_global(machine, state->irq_enable); @@ -141,7 +141,7 @@ static void state_register( running_machine *machine ) static MACHINE_START( taito_l ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -159,7 +159,7 @@ static MACHINE_START( taito_l ) static void machine_reset(running_machine *machine) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); int i; for (i = 0; i < 3; i++) @@ -205,7 +205,7 @@ static void machine_reset(running_machine *machine) static MACHINE_RESET( fhawk ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = NULL; state->porte1_tag = NULL; @@ -215,7 +215,7 @@ static MACHINE_RESET( fhawk ) static MACHINE_RESET( raimais ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = NULL; state->porte1_tag = NULL; @@ -225,7 +225,7 @@ static MACHINE_RESET( raimais ) static MACHINE_RESET( champwr ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = NULL; state->porte1_tag = NULL; @@ -236,7 +236,7 @@ static MACHINE_RESET( champwr ) static MACHINE_RESET( kurikint ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = NULL; state->porte1_tag = NULL; @@ -246,7 +246,7 @@ static MACHINE_RESET( kurikint ) static MACHINE_RESET( evilston ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = NULL; state->porte1_tag = NULL; @@ -256,7 +256,7 @@ static MACHINE_RESET( evilston ) static MACHINE_RESET( puzznic ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = "DSWA"; state->porte1_tag = "DSWB"; @@ -266,7 +266,7 @@ static MACHINE_RESET( puzznic ) static MACHINE_RESET( plotting ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = "DSWA"; state->porte1_tag = "DSWB"; @@ -276,7 +276,7 @@ static MACHINE_RESET( plotting ) static MACHINE_RESET( palamed ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = "DSWA"; state->porte1_tag = NULL; @@ -286,7 +286,7 @@ static MACHINE_RESET( palamed ) static MACHINE_RESET( cachat ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = "DSWA"; state->porte1_tag = NULL; @@ -296,7 +296,7 @@ static MACHINE_RESET( cachat ) static MACHINE_RESET( horshoes ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); machine_reset(machine); state->porte0_tag = "DSWA"; state->porte1_tag = "DSWB"; @@ -307,13 +307,13 @@ static MACHINE_RESET( horshoes ) static IRQ_CALLBACK( irq_callback ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); return state->irq_adr_table[state->last_irq_level]; } static INTERRUPT_GEN( vbl_interrupt ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); cpu_set_irq_callback(device, irq_callback); /* kludge to make plgirls boot */ @@ -341,20 +341,20 @@ static INTERRUPT_GEN( vbl_interrupt ) static WRITE8_HANDLER( irq_adr_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); //logerror("irq_adr_table[%d] = %02x\n", offset, data); state->irq_adr_table[offset] = data; } static READ8_HANDLER( irq_adr_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->irq_adr_table[offset]; } static WRITE8_HANDLER( irq_enable_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); //logerror("irq_enable = %02x\n",data); state->irq_enable = data; @@ -365,14 +365,14 @@ static WRITE8_HANDLER( irq_enable_w ) static READ8_HANDLER( irq_enable_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->irq_enable; } static WRITE8_HANDLER( rombankswitch_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); if (state->cur_rombank != data) { @@ -390,7 +390,7 @@ static WRITE8_HANDLER( rombankswitch_w ) static WRITE8_HANDLER( rombank2switch_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); data &= 0xf; @@ -411,19 +411,19 @@ static WRITE8_HANDLER( rombank2switch_w ) static READ8_HANDLER( rombankswitch_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->cur_rombank; } static READ8_HANDLER( rombank2switch_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->cur_rombank2; } static WRITE8_HANDLER( rambankswitch_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); if (state->cur_rambank[offset] != data) { @@ -452,13 +452,13 @@ static WRITE8_HANDLER( rambankswitch_w ) static READ8_HANDLER( rambankswitch_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->cur_rambank[offset]; } static void bank_w(const address_space *space, offs_t offset, UINT8 data, int banknum ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); if (state->current_base[banknum][offset] != data) { @@ -498,26 +498,26 @@ static WRITE8_HANDLER( control2_w ) static READ8_DEVICE_HANDLER( portA_r ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); return input_port_read(device->machine, (state->extport == 0) ? state->porte0_tag : state->porte1_tag); } static READ8_DEVICE_HANDLER( portB_r ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); return input_port_read(device->machine, (state->extport == 0) ? state->portf0_tag : state->portf1_tag); } static READ8_DEVICE_HANDLER( extport_select_and_ym2203_r ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); state->extport = (offset >> 1) & 1; return ym2203_r(device, offset & 1); } static WRITE8_HANDLER( mcu_data_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); state->last_data = data; state->last_data_adr = cpu_get_pc(space->cpu); // logerror("mcu write %02x (%04x)\n", data, cpu_get_pc(space->cpu)); @@ -537,7 +537,7 @@ static WRITE8_HANDLER( mcu_control_w ) static READ8_HANDLER( mcu_data_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); // logerror("mcu read (%04x) [%02x, %04x]\n", cpu_get_pc(space->cpu), last_data, last_data_adr); if (state->mcu_pos == state->mcu_reply_len) @@ -561,19 +561,19 @@ static WRITE8_HANDLER( sound_w ) static READ8_HANDLER( shared_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->shared_ram[offset]; } static WRITE8_HANDLER( shared_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); state->shared_ram[offset] = data; } static READ8_HANDLER( mux_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); switch (state->mux_ctrl) { @@ -595,7 +595,7 @@ static READ8_HANDLER( mux_r ) static WRITE8_HANDLER( mux_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); switch (state->mux_ctrl) { @@ -609,14 +609,14 @@ static WRITE8_HANDLER( mux_w ) static WRITE8_HANDLER( mux_ctrl_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); state->mux_ctrl = data; } static void champwr_msm5205_vck( running_device *device ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); if (state->adpcm_data != -1) { @@ -633,13 +633,13 @@ static void champwr_msm5205_vck( running_device *device ) static WRITE8_HANDLER( champwr_msm5205_lo_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); state->adpcm_pos = (state->adpcm_pos & 0xff00ff) | (data << 8); } static WRITE8_HANDLER( champwr_msm5205_hi_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); state->adpcm_pos = ((state->adpcm_pos & 0x00ffff) | (data << 16)) & 0x1ffff; } @@ -650,7 +650,7 @@ static WRITE8_DEVICE_HANDLER( champwr_msm5205_start_w ) static WRITE8_DEVICE_HANDLER( champwr_msm5205_stop_w ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); msm5205_reset_w(device, 1); state->adpcm_pos &= 0x1ff00; @@ -663,7 +663,7 @@ static WRITE8_DEVICE_HANDLER( champwr_msm5205_volume_w ) static READ8_HANDLER( horshoes_tracky_reset_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); /* reset the trackball counter */ state->tracky = input_port_read(space->machine, "AN0"); @@ -672,7 +672,7 @@ static READ8_HANDLER( horshoes_tracky_reset_r ) static READ8_HANDLER( horshoes_trackx_reset_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); /* reset the trackball counter */ state->trackx = input_port_read(space->machine, "AN1"); @@ -681,25 +681,25 @@ static READ8_HANDLER( horshoes_trackx_reset_r ) static READ8_HANDLER( horshoes_tracky_lo_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "AN0") - state->tracky) & 0xff; } static READ8_HANDLER( horshoes_tracky_hi_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "AN0") - state->tracky) >> 8; } static READ8_HANDLER( horshoes_trackx_lo_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "AN1") - state->trackx) & 0xff; } static READ8_HANDLER( horshoes_trackx_hi_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return (input_port_read(space->machine, "AN1") - state->trackx) >> 8; } @@ -930,7 +930,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER (evilston_snd_w) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); state->shared_ram[0x7fe] = data & 0x7f; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -1942,13 +1942,13 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } static WRITE8_DEVICE_HANDLER( portA_w ) { - taitol_state *state = (taitol_state *)device->machine->driver_data; + taitol_state *state = device->machine->driver_data(); if (state->cur_bank != (data & 0x03)) { diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c index 770155da76f..2113be90eb3 100644 --- a/src/mame/drivers/taito_o.c +++ b/src/mame/drivers/taito_o.c @@ -240,7 +240,7 @@ static const tc0080vco_interface parentj_intf = static MACHINE_START( taitoo ) { - taitoo_state *state = (taitoo_state *)machine->driver_data; + taitoo_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->tc0080vco = machine->device("tc0080vco"); diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index e504835ae09..dda9e616684 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -895,14 +895,14 @@ static void parse_control( running_machine *machine ) /* bit 0 enables cpu B */ /* however this fails when recovering from a save state if cpu B is disabled !! */ - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, (state->cpua_ctrl & 0x1) ? CLEAR_LINE : ASSERT_LINE); } static WRITE16_HANDLER( cpua_ctrl_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); if ((data & 0xff00) && ((data & 0xff) == 0)) data = data >> 8; /* for Wgp */ @@ -931,7 +931,7 @@ static WRITE16_HANDLER( cpua_ctrl_w ) static TIMER_CALLBACK( taitoz_interrupt6 ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, HOLD_LINE); } @@ -939,14 +939,14 @@ static TIMER_CALLBACK( taitoz_interrupt6 ) static TIMER_CALLBACK( taitoz_cpub_interrupt5 ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, 5, HOLD_LINE); } #if 0 static TIMER_CALLBACK( taitoz_cpub_interrupt6 ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, 6, HOLD_LINE); } #endif @@ -961,7 +961,7 @@ static INTERRUPT_GEN( sci_interrupt ) causes all sprites to vanish! Spriteram has areas for 2 frames so in theory only needs updating every other frame. */ - taitoz_state *state = (taitoz_state *)device->machine->driver_data; + taitoz_state *state = device->machine->driver_data(); state->sci_int6 = !state->sci_int6; if (state->sci_int6) @@ -979,7 +979,7 @@ static INTERRUPT_GEN( dblaxle_interrupt ) { // Unsure how many int6's per frame, copy SCI for now - taitoz_state *state = (taitoz_state *)device->machine->driver_data; + taitoz_state *state = device->machine->driver_data(); state->dblaxle_int6 = !state->dblaxle_int6; if (state->dblaxle_int6) @@ -1029,14 +1029,14 @@ static const eeprom_interface spacegun_eeprom_intf = #if 0 static READ16_HANDLER( eep_latch_r ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); return state->eep_latch; } #endif static WRITE16_HANDLER( spacegun_output_bypass_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); switch (offset) { @@ -1066,7 +1066,7 @@ static READ8_HANDLER( contcirc_input_bypass_r ) { /* Bypass TC0220IOC controller for analog input */ - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); UINT8 port = tc0220ioc_port_r(state->tc0220ioc, 0); /* read port number */ int steer = 0; int fake = input_port_read(space->machine, "FAKE"); @@ -1107,7 +1107,7 @@ static READ8_HANDLER( chasehq_input_bypass_r ) { /* Bypass TC0220IOC controller for extra inputs */ - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); UINT8 port = tc0220ioc_port_r(state->tc0220ioc, 0); /* read port number */ int steer = 0; int fake = input_port_read(space->machine, "FAKE"); @@ -1251,7 +1251,7 @@ static READ16_HANDLER( sci_steer_input_r ) static READ16_HANDLER( spacegun_input_bypass_r ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); switch (offset) { @@ -1422,13 +1422,13 @@ static READ16_HANDLER( aquajack_unknown_r ) static void reset_sound_region( running_machine *machine ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); state->banknum = data & 7; reset_sound_region(space->machine); @@ -1436,7 +1436,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static WRITE16_HANDLER( taitoz_sound_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, data & 0xff); @@ -1456,7 +1456,7 @@ static WRITE16_HANDLER( taitoz_sound_w ) static READ16_HANDLER( taitoz_sound_r ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); if (offset == 1) return (tc0140syt_comm_r(state->tc0140syt, 0) & 0xff); @@ -1467,7 +1467,7 @@ static READ16_HANDLER( taitoz_sound_r ) #if 0 static WRITE16_HANDLER( taitoz_msb_sound_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, (data >> 8) & 0xff); @@ -1487,7 +1487,7 @@ static WRITE16_HANDLER( taitoz_msb_sound_w ) static READ16_HANDLER( taitoz_msb_sound_r ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); if (offset == 1) return ((tc0140syt_comm_r(state->tc0140syt, 0) & 0xff) << 8); @@ -1500,7 +1500,7 @@ static READ16_HANDLER( taitoz_msb_sound_r ) /**** sound pan control ****/ static WRITE8_HANDLER( taitoz_pancontrol ) { -// taitoz_state *state = (taitoz_state *)space->machine->driver_data; +// taitoz_state *state = space->machine->driver_data(); static const char *const fltname[] = { "2610.1.r", "2610.1.l", "2610.2.r", "2610.2.l" }; offset = offset & 3; @@ -2804,7 +2804,7 @@ Interface B is for games which lack a Z80 (Spacegun, Bshark). /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler(running_device *device, int irq) { - taitoz_state *state = (taitoz_state *)device->machine->driver_data; + taitoz_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -2812,7 +2812,7 @@ static void irqhandler(running_device *device, int irq) static void irqhandlerb(running_device *device, int irq) { // DG: this is probably specific to Z80 and wrong? -// taitoz_state *state = (taitoz_state *)device->machine->driver_data; +// taitoz_state *state = device->machine->driver_data(); // cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -2966,7 +2966,7 @@ static STATE_POSTLOAD( taitoz_postload ) static MACHINE_START( bshark ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); @@ -3001,7 +3001,7 @@ static MACHINE_START( taitoz ) static MACHINE_RESET( taitoz ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->banknum = -1; state->cpua_ctrl = 0xff; @@ -4894,14 +4894,14 @@ ROM_END static DRIVER_INIT( taitoz ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->chasehq_lamps = 0; state->dblaxle_vibration = 0; } static DRIVER_INIT( dblaxle ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->chasehq_lamps = 0; state->dblaxle_vibration = 1; } @@ -4913,7 +4913,7 @@ static STATE_POSTLOAD( bshark_postload ) static DRIVER_INIT( bshark ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->chasehq_lamps = 0; state->dblaxle_vibration = 0; state->eep_latch = 0; @@ -4924,7 +4924,7 @@ static DRIVER_INIT( bshark ) static DRIVER_INIT( chasehq ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->chasehq_lamps = 1; state->dblaxle_vibration = 0; } diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index d1f5b0a0692..01d6724bf14 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -232,7 +232,7 @@ cpu #2 (PC=0000060E): unmapped memory word read from 0000683A & FFFF static WRITE16_HANDLER( system_control_w ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); if ((ACCESSING_BITS_0_7 == 0) && ACCESSING_BITS_8_15) data >>= 8; @@ -246,13 +246,13 @@ static WRITE16_HANDLER( system_control_w ) static READ16_HANDLER( lineram_r ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); return state->line_ram[offset]; } static WRITE16_HANDLER( lineram_w ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7) state->line_ram[offset] = data; @@ -260,13 +260,13 @@ static WRITE16_HANDLER( lineram_w ) static READ16_HANDLER( dspram_r ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); return state->dsp_ram[offset]; } static WRITE16_HANDLER( dspram_w ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7) state->dsp_ram[offset] = data; @@ -274,7 +274,7 @@ static WRITE16_HANDLER( dspram_w ) static READ16_HANDLER( dsp_HOLD_signal_r ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); /* HOLD signal is active low */ // logerror("TMS32025:%04x Reading %01x level from HOLD signal\n", cpu_get_previouspc(space->cpu), state->dsp_hold_signal); @@ -291,7 +291,7 @@ static WRITE16_HANDLER( dsp_HOLDA_signal_w ) static WRITE16_HANDLER( airsys_paletteram16_w ) /* xxBBBBxRRRRxGGGG */ { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); int a; COMBINE_DATA(&state->paletteram[offset]); @@ -347,13 +347,13 @@ static READ16_HANDLER( stick2_input_r ) static void reset_sound_region( running_machine *machine ) { - taitoair_state *state = (taitoair_state *)machine->driver_data; + taitoair_state *state = machine->driver_data(); memory_set_bank(machine, "bank1", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - taitoair_state *state = (taitoair_state *)space->machine->driver_data; + taitoair_state *state = space->machine->driver_data(); state->banknum = data & 3; reset_sound_region(space->machine); @@ -571,7 +571,7 @@ GFXDECODE_END /* Handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - taitoair_state *state = (taitoair_state *)device->machine->driver_data; + taitoair_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -610,7 +610,7 @@ static STATE_POSTLOAD( taitoair_postload ) static MACHINE_START( taitoair ) { - taitoair_state *state = (taitoair_state *)machine->driver_data; + taitoair_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); int i; @@ -635,7 +635,7 @@ static MACHINE_START( taitoair ) static MACHINE_RESET( taitoair ) { - taitoair_state *state = (taitoair_state *)machine->driver_data; + taitoair_state *state = machine->driver_data(); int i; state->dsp_hold_signal = ASSERT_LINE; diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 606065ed0d8..f3cfdbe3057 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -365,14 +365,14 @@ extern UINT32 *f3_shared_ram; static READ32_HANDLER( taitojc_palette_r ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return state->palette_ram[offset]; } static WRITE32_HANDLER( taitojc_palette_w ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); int r, g, b; UINT32 color; @@ -481,7 +481,7 @@ static WRITE32_HANDLER (jc_control1_w) static UINT8 mcu_comm_reg_r(const address_space *space, int reg) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); UINT8 r = 0; switch (reg) @@ -508,7 +508,7 @@ static UINT8 mcu_comm_reg_r(const address_space *space, int reg) static void mcu_comm_reg_w(const address_space *space, int reg, UINT8 data) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); switch (reg) { @@ -585,7 +585,7 @@ static READ32_HANDLER(jc_unknown1_r) static READ32_HANDLER(dsp_shared_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return state->dsp_shared_ram[offset] << 16; } @@ -726,7 +726,7 @@ static void debug_dsp_command(void) static WRITE32_HANDLER(dsp_shared_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); //mame_printf_debug("dsp_shared_ram: %08X, %04X at %08X\n", offset, data >> 16, cpu_get_pc(space->cpu)); if (ACCESSING_BITS_24_31) @@ -825,7 +825,7 @@ ADDRESS_MAP_END static READ8_HANDLER(hc11_comm_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return state->mcu_comm_hc11; } @@ -836,7 +836,7 @@ static WRITE8_HANDLER(hc11_comm_w) static READ8_HANDLER(hc11_data_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->mcu_comm_hc11 |= 0x04; state->mcu_comm_main |= 0x20; @@ -845,7 +845,7 @@ static READ8_HANDLER(hc11_data_r) static WRITE8_HANDLER(hc11_data_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->mcu_data_main = data; } @@ -876,7 +876,7 @@ ADDRESS_MAP_END static READ16_HANDLER( dsp_rom_r ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); UINT16 *rom = (UINT16*)memory_region(space->machine, "gfx2"); UINT16 data = rom[state->dsp_rom_pos++]; @@ -886,7 +886,7 @@ static READ16_HANDLER( dsp_rom_r ) static WRITE16_HANDLER( dsp_rom_w ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); if (offset == 0) { @@ -902,7 +902,7 @@ static WRITE16_HANDLER( dsp_rom_w ) static WRITE16_HANDLER( dsp_texture_w ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); int index; int x, y; //mame_printf_debug("texture write %08X, %04X\n", dsp_addr1, data); @@ -921,14 +921,14 @@ static WRITE16_HANDLER( dsp_texture_w ) static READ16_HANDLER( dsp_texaddr_r ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return state->dsp_tex_address; } static WRITE16_HANDLER( dsp_texaddr_w ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->dsp_tex_address = data; // mame_printf_debug("texaddr = %08X at %08X\n", data, cpu_get_pc(space->cpu)); @@ -941,7 +941,7 @@ static WRITE16_HANDLER( dsp_texaddr_w ) static WRITE16_HANDLER( dsp_polygon_fifo_w ) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->polygon_fifo[state->polygon_fifo_ptr++] = data; if (state->polygon_fifo_ptr >= POLYGON_FIFO_SIZE) @@ -959,14 +959,14 @@ static READ16_HANDLER(dsp_unk_r) static WRITE16_HANDLER(dsp_viewport_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->viewport_data[offset] = (INT16)(data); } static WRITE16_HANDLER(dsp_projection_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->projection_data[offset] = (INT16)(data); @@ -987,7 +987,7 @@ static WRITE16_HANDLER(dsp_projection_w) static READ16_HANDLER(dsp_projection_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); if (offset == 0) { @@ -1003,7 +1003,7 @@ static READ16_HANDLER(dsp_projection_r) static WRITE16_HANDLER(dsp_unk2_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); if (offset == 0) { @@ -1016,14 +1016,14 @@ static WRITE16_HANDLER(dsp_unk2_w) static WRITE16_HANDLER(dsp_intersection_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); state->intersection_data[offset] = (INT32)(INT16)(data); } static READ16_HANDLER(dsp_intersection_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return (INT16)((state->intersection_data[0] * state->intersection_data[1]) / state->intersection_data[2]); } @@ -1270,7 +1270,7 @@ INPUT_PORTS_END static MACHINE_RESET( taitojc ) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); state->first_dsp_reset = 1; @@ -1355,7 +1355,7 @@ MACHINE_DRIVER_END static DRIVER_INIT( taitojc ) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); f3_shared_ram = auto_alloc_array(machine, UINT32, 0x800/4); diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 2fdbfd40fbb..aba7b403718 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -33,16 +33,16 @@ static void update_interrupts(running_machine *machine) { - thunderj_state *state = (thunderj_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "extra", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + thunderj_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "extra", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } static MACHINE_START( thunderj ) { - thunderj_state *state = (thunderj_state *)machine->driver_data; + thunderj_state *state = machine->driver_data(); atarigen_init(machine); state_save_register_global(machine, state->alpha_tile_bank); @@ -51,11 +51,11 @@ static MACHINE_START( thunderj ) static MACHINE_RESET( thunderj ) { - thunderj_state *state = (thunderj_state *)machine->driver_data; + thunderj_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); - atarivc_reset(*machine->primary_screen, state->atarigen.atarivc_eof_data, 2); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); + atarivc_reset(*machine->primary_screen, state->atarivc_eof_data, 2); atarijsa_reset(); } @@ -69,11 +69,11 @@ static MACHINE_RESET( thunderj ) static READ16_HANDLER( special_port2_r ) { - thunderj_state *state = (thunderj_state *)space->machine->driver_data; + thunderj_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "260012"); - if (state->atarigen.sound_to_cpu_ready) result ^= 0x0004; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0008; + if (state->sound_to_cpu_ready) result ^= 0x0004; + if (state->cpu_to_sound_ready) result ^= 0x0008; result ^= 0x0010; return result; @@ -82,7 +82,7 @@ static READ16_HANDLER( special_port2_r ) static WRITE16_HANDLER( latch_w ) { - thunderj_state *state = (thunderj_state *)space->machine->driver_data; + thunderj_state *state = space->machine->driver_data(); /* reset extra CPU */ if (ACCESSING_BITS_0_7) @@ -97,7 +97,7 @@ static WRITE16_HANDLER( latch_w ) if (state->alpha_tile_bank != ((data >> 2) & 7)) { space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); - tilemap_mark_all_tiles_dirty(state->atarigen.alpha_tilemap); + tilemap_mark_all_tiles_dirty(state->alpha_tilemap); state->alpha_tile_bank = (data >> 2) & 7; } } @@ -152,7 +152,7 @@ static WRITE16_HANDLER( thunderj_atarivc_w ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_ROM - AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(thunderj_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(thunderj_state, eeprom, eeprom_size) AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE("share1") AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x260000, 0x26000f) AM_READ_PORT("260000") @@ -164,13 +164,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(thunderj_atarivc_r, thunderj_atarivc_w) AM_BASE_MEMBER(thunderj_state, atarigen.atarivc_data) - AM_RANGE(0x3f0000, 0x3f1fff) AM_RAM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE_MEMBER(thunderj_state, atarigen.playfield2) - AM_RANGE(0x3f2000, 0x3f3fff) AM_RAM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(thunderj_state, atarigen.playfield) - AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE(atarigen_playfield_dual_upper_w) AM_BASE_MEMBER(thunderj_state, atarigen.playfield_upper) + AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(thunderj_atarivc_r, thunderj_atarivc_w) AM_BASE_MEMBER(thunderj_state, atarivc_data) + AM_RANGE(0x3f0000, 0x3f1fff) AM_RAM_WRITE(atarigen_playfield2_latched_msb_w) AM_BASE_MEMBER(thunderj_state, playfield2) + AM_RANGE(0x3f2000, 0x3f3fff) AM_RAM_WRITE(atarigen_playfield_latched_lsb_w) AM_BASE_MEMBER(thunderj_state, playfield) + AM_RANGE(0x3f4000, 0x3f5fff) AM_RAM_WRITE(atarigen_playfield_dual_upper_w) AM_BASE_MEMBER(thunderj_state, playfield_upper) AM_RANGE(0x3f6000, 0x3f7fff) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f8000, 0x3f8eff) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(thunderj_state, atarigen.alpha) - AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_BASE_MEMBER(thunderj_state, atarigen.atarivc_eof_data) + AM_RANGE(0x3f8000, 0x3f8eff) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(thunderj_state, alpha) + AM_RANGE(0x3f8f00, 0x3f8f7f) AM_RAM AM_BASE_MEMBER(thunderj_state, atarivc_eof_data) AM_RANGE(0x3f8f80, 0x3f8fff) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f9000, 0x3fffff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 59e59560042..e9a109463ca 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -23,7 +23,7 @@ static KONAMI_SETLINES_CALLBACK( thunderx_banking ); static INTERRUPT_GEN( scontra_interrupt ) { - thunderx_state *state = (thunderx_state *)device->machine->driver_data; + thunderx_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) cpu_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); @@ -31,13 +31,13 @@ static INTERRUPT_GEN( scontra_interrupt ) static TIMER_CALLBACK( thunderx_firq_callback ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, KONAMI_FIRQ_LINE, HOLD_LINE); } static READ8_HANDLER( scontra_bankedram_r ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); if (state->palette_selected) return space->machine->generic.paletteram.u8[offset]; @@ -47,7 +47,7 @@ static READ8_HANDLER( scontra_bankedram_r ) static WRITE8_HANDLER( scontra_bankedram_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); if (state->palette_selected) paletteram_xBBBBBGGGGGRRRRR_be_w(space, offset, data); @@ -57,7 +57,7 @@ static WRITE8_HANDLER( scontra_bankedram_w ) static READ8_HANDLER( thunderx_bankedram_r ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); if (state->rambank & 0x01) return state->ram[offset]; @@ -80,7 +80,7 @@ static READ8_HANDLER( thunderx_bankedram_r ) static WRITE8_HANDLER( thunderx_bankedram_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); if (state->rambank & 0x01) state->ram[offset] = data; @@ -187,7 +187,7 @@ this is the data written to internal ram on startup: static void run_collisions( running_machine *machine, int s0, int e0, int s1, int e1, int cm, int hm ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); UINT8* p0; UINT8* p1; int ii, jj; @@ -239,7 +239,7 @@ static void run_collisions( running_machine *machine, int s0, int e0, int s1, in static void calculate_collisions( running_machine *machine ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); int X0,Y0; int X1,Y1; int CM,HM; @@ -291,13 +291,13 @@ static void calculate_collisions( running_machine *machine ) static READ8_HANDLER( thunderx_1f98_r ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); return state->_1f98_data; } static WRITE8_HANDLER( thunderx_1f98_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); // logerror("%04x: 1f98_w %02x\n", cpu_get_pc(space->cpu),data); @@ -321,7 +321,7 @@ static WRITE8_HANDLER( thunderx_1f98_w ) static WRITE8_HANDLER( scontra_bankswitch_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); UINT8 *RAM = memory_region(space->machine, "maincpu"); int offs; @@ -344,7 +344,7 @@ static WRITE8_HANDLER( scontra_bankswitch_w ) static WRITE8_HANDLER( thunderx_videobank_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); //logerror("%04x: select video ram bank %02x\n",cpu_get_pc(space->cpu),data); /* 0x01 = work RAM at 4000-5fff */ /* 0x00 = palette at 5800-5fff */ @@ -361,7 +361,7 @@ static WRITE8_HANDLER( thunderx_videobank_w ) static WRITE8_HANDLER( thunderx_sh_irqtrigger_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -377,7 +377,7 @@ static WRITE8_DEVICE_HANDLER( scontra_snd_bankswitch_w ) static READ8_HANDLER( k052109_051960_r ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); if (k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) { @@ -394,7 +394,7 @@ static READ8_HANDLER( k052109_051960_r ) static WRITE8_HANDLER( k052109_051960_w ) { - thunderx_state *state = (thunderx_state *)space->machine->driver_data; + thunderx_state *state = space->machine->driver_data(); if (offset >= 0x3800 && offset < 0x3808) k051937_w(state->k051960, offset - 0x3800, data); @@ -627,7 +627,7 @@ static const k051960_interface thunderx_k051960_intf = static MACHINE_START( scontra ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); machine->generic.paletteram.u8 = auto_alloc_array_clear(machine, UINT8, 0x800); @@ -647,7 +647,7 @@ static MACHINE_START( scontra ) static MACHINE_START( thunderx ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); @@ -663,7 +663,7 @@ static MACHINE_START( thunderx ) static MACHINE_RESET( scontra ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); state->priority = 0; state->_1f98_data = 0; diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index ccc0349ce1a..22c8e2814b5 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -59,7 +59,7 @@ static INTERRUPT_GEN( timeplt_interrupt ) { - timeplt_state *state = (timeplt_state *)device->machine->driver_data; + timeplt_state *state = device->machine->driver_data(); if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE); @@ -68,7 +68,7 @@ static INTERRUPT_GEN( timeplt_interrupt ) static WRITE8_HANDLER( timeplt_nmi_enable_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->nmi_enable = data & 1; if (!state->nmi_enable) @@ -355,14 +355,14 @@ GFXDECODE_END static MACHINE_START( common ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); } static MACHINE_START( timeplt ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); MACHINE_START_CALL(common); @@ -371,7 +371,7 @@ static MACHINE_START( timeplt ) static MACHINE_RESET( timeplt ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->nmi_enable = 0; } diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index bb8e5b987f6..b0cfa0d8cb2 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -84,7 +84,7 @@ static UINT16 cuebrick_nvram[0x400 * 0x20]; // 32k paged in a 1k window static READ16_HANDLER( k052109_word_noA12_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); /* some games have the A12 line not connected, so the chip spans */ /* twice the memory range, with mirroring */ @@ -94,7 +94,7 @@ static READ16_HANDLER( k052109_word_noA12_r ) static WRITE16_HANDLER( k052109_word_noA12_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); /* some games have the A12 line not connected, so the chip spans */ /* twice the memory range, with mirroring */ @@ -104,7 +104,7 @@ static WRITE16_HANDLER( k052109_word_noA12_w ) static WRITE16_HANDLER( punkshot_k052109_word_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); /* it seems that a word write is supposed to affect only the MSB. The */ /* "ROUND 1" text in punkshtj goes lost otherwise. */ @@ -128,7 +128,7 @@ static WRITE16_HANDLER( punkshot_k052109_word_noA12_w ) /* A1, A5 and A6 don't go to the 053245. */ static READ16_HANDLER( k053245_scattered_word_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (offset & 0x0031) return space->machine->generic.spriteram.u16[offset]; @@ -141,7 +141,7 @@ static READ16_HANDLER( k053245_scattered_word_r ) static WRITE16_HANDLER( k053245_scattered_word_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); COMBINE_DATA(space->machine->generic.spriteram.u16 + offset); @@ -154,7 +154,7 @@ static WRITE16_HANDLER( k053245_scattered_word_w ) static READ16_HANDLER( k053244_word_noA1_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); offset &= ~1; /* handle mirror address */ @@ -163,7 +163,7 @@ static READ16_HANDLER( k053244_word_noA1_r ) static WRITE16_HANDLER( k053244_word_noA1_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); offset &= ~1; /* handle mirror address */ @@ -175,7 +175,7 @@ static WRITE16_HANDLER( k053244_word_noA1_w ) static INTERRUPT_GEN(cuebrick_interrupt) { - tmnt_state *state = (tmnt_state *)device->machine->driver_data; + tmnt_state *state = device->machine->driver_data(); // cheap IRQ multiplexing to avoid losing sound IRQs switch (cpu_getiloops(device)) @@ -193,7 +193,7 @@ static INTERRUPT_GEN(cuebrick_interrupt) static INTERRUPT_GEN( punkshot_interrupt ) { - tmnt_state *state = (tmnt_state *)device->machine->driver_data; + tmnt_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) irq4_line_hold(device); @@ -201,7 +201,7 @@ static INTERRUPT_GEN( punkshot_interrupt ) static INTERRUPT_GEN( lgtnfght_interrupt ) { - tmnt_state *state = (tmnt_state *)device->machine->driver_data; + tmnt_state *state = device->machine->driver_data(); if (k052109_is_irq_enabled(state->k052109)) irq5_line_hold(device); @@ -224,7 +224,7 @@ static READ8_DEVICE_HANDLER( punkshot_sound_r ) static WRITE8_DEVICE_HANDLER( glfgreat_sound_w ) { - tmnt_state *state = (tmnt_state *)device->machine->driver_data; + tmnt_state *state = device->machine->driver_data(); k053260_w(device, offset, data); if (offset) @@ -250,7 +250,7 @@ static WRITE16_HANDLER( prmrsocr_sound_cmd_w ) static WRITE16_HANDLER( prmrsocr_sound_irq_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -262,13 +262,13 @@ static WRITE8_HANDLER( prmrsocr_audio_bankswitch_w ) static READ8_HANDLER( tmnt_sres_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); return state->tmnt_soundlatch; } static WRITE8_HANDLER( tmnt_sres_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); /* bit 1 resets the UPD7795C sound chip */ upd7759_reset_w(state->upd, data & 2); @@ -298,7 +298,7 @@ static READ8_DEVICE_HANDLER( tmnt_upd_busy_r ) static SAMPLES_START( tmnt_decode_sample ) { running_machine *machine = device->machine; - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); int i; UINT8 *source = memory_region(machine, "title"); @@ -340,13 +340,13 @@ static void sound_nmi_callback( int param ) static TIMER_CALLBACK( nmi_callback ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( sound_arm_nmi_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); // sound_nmi_enabled = 1; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); timer_set(space->machine, ATTOTIME_IN_USEC(50), NULL, 0, nmi_callback); /* kludge until the K053260 is emulated correctly */ @@ -366,7 +366,7 @@ static READ16_HANDLER( punkshot_kludge_r ) /* protection simulation derived from a bootleg */ static READ16_HANDLER( ssriders_protection_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); int data = memory_read_word(space, 0x105a0a); int cmd = memory_read_word(space, 0x1058fc); @@ -410,7 +410,7 @@ static READ16_HANDLER( ssriders_protection_r ) static WRITE16_HANDLER( ssriders_protection_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (offset == 1) { @@ -456,7 +456,7 @@ static const eeprom_interface eeprom_intf = static READ16_HANDLER( blswhstl_coin_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); int res; /* bit 3 is service button */ @@ -469,7 +469,7 @@ static READ16_HANDLER( blswhstl_coin_r ) static READ16_HANDLER( ssriders_eeprom_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); int res; /* bit 0 is EEPROM data */ @@ -484,7 +484,7 @@ static READ16_HANDLER( ssriders_eeprom_r ) static READ16_HANDLER( sunsetbl_eeprom_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); int res; /* bit 0 is EEPROM data */ @@ -521,7 +521,7 @@ static const eeprom_interface thndrx2_eeprom_intf = static READ16_HANDLER( thndrx2_eeprom_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); int res; /* bit 0 is EEPROM data */ @@ -535,7 +535,7 @@ static READ16_HANDLER( thndrx2_eeprom_r ) static WRITE16_HANDLER( thndrx2_eeprom_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -572,19 +572,19 @@ static WRITE16_HANDLER( prmrsocr_eeprom_w ) static READ16_HANDLER( cuebrick_nv_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); return cuebrick_nvram[offset + (state->cuebrick_nvram_bank * 0x400 / 2)]; } static WRITE16_HANDLER( cuebrick_nv_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); COMBINE_DATA(&cuebrick_nvram[offset + (state->cuebrick_nvram_bank * 0x400 / 2)]); } static WRITE16_HANDLER( cuebrick_nvbank_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); state->cuebrick_nvram_bank = data >> 8; } @@ -695,7 +695,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( ssriders_soundkludge_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); /* I think this is more than just a trigger */ cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); @@ -725,7 +725,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( k053251_glfgreat_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); int i; if (ACCESSING_BITS_8_15) @@ -795,7 +795,7 @@ ADDRESS_MAP_END #if 1 INLINE UINT32 tmnt2_get_word( running_machine *machine, UINT32 addr ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); if (addr <= 0x07ffff / 2) return(state->tmnt2_rom[addr]); @@ -808,7 +808,7 @@ INLINE UINT32 tmnt2_get_word( running_machine *machine, UINT32 addr ) static void tmnt2_put_word( const address_space *space, UINT32 addr, UINT16 data ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); UINT32 offs; if (addr >= 0x180000 / 2 && addr <= 0x183fff / 2) @@ -827,7 +827,7 @@ static void tmnt2_put_word( const address_space *space, UINT32 addr, UINT16 data static WRITE16_HANDLER( tmnt2_1c0800_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); UINT32 src_addr, dst_addr, mod_addr, attr1, code, attr2, cbase, cmod, color; int xoffs, yoffs, xmod, ymod, zmod, xzoom, yzoom, i; UINT16 *mcu; @@ -948,7 +948,7 @@ static WRITE16_HANDLER( tmnt2_1c0800_w ) #else // for reference; do not remove static WRITE16_HANDLER( tmnt2_1c0800_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); COMBINE_DATA(state->tmnt2_1c0800 + offset); if (offset == 0x0008 && (state->tmnt2_1c0800[0x8] & 0xff00) == 0x8200) { @@ -2065,7 +2065,7 @@ INPUT_PORTS_END static void cuebrick_irq_handler( running_device *device, int state ) { - tmnt_state *tmnt = (tmnt_state *)device->machine->driver_data; + tmnt_state *tmnt = device->machine->driver_data(); tmnt->cuebrick_snd_irqlatch = state; } @@ -2235,7 +2235,7 @@ static const k053936_interface prmrsocr_k053936_interface = static MACHINE_START( common ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -2264,7 +2264,7 @@ static MACHINE_START( common ) static MACHINE_RESET( common ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->toggle = 0; state->last = 0; @@ -2366,7 +2366,7 @@ MACHINE_DRIVER_END static MACHINE_RESET( tmnt ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); /* the UPD7759 control flip-flops are cleared: /ST is 1, /RESET is 0 */ upd7759_start_w(state->upd, 0); @@ -2642,7 +2642,7 @@ MACHINE_DRIVER_END static void sound_nmi( running_device *device ) { - tmnt_state *state = (tmnt_state *)device->machine->driver_data; + tmnt_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index 631d401e28d..3527ca0e15c 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -632,7 +632,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06 static SAMPLES_START( kageki_init_samples ) { running_machine *machine = device->machine; - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); UINT8 *scan, *src; INT16 *dest; int start, size; @@ -676,7 +676,7 @@ static SAMPLES_START( kageki_init_samples ) static READ8_DEVICE_HANDLER( kageki_csport_r ) { - tnzs_state *state = (tnzs_state *)device->machine->driver_data; + tnzs_state *state = device->machine->driver_data(); int dsw, dsw1, dsw2; dsw1 = input_port_read(device->machine, "DSWA"); @@ -706,7 +706,7 @@ static READ8_DEVICE_HANDLER( kageki_csport_r ) static WRITE8_DEVICE_HANDLER( kageki_csport_w ) { - tnzs_state *state = (tnzs_state *)device->machine->driver_data; + tnzs_state *state = device->machine->driver_data(); char mess[80]; if (data > 0x3f) @@ -805,7 +805,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( tnzsb_sound_command_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); soundlatch_w(space, offset, data); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } @@ -1561,7 +1561,7 @@ static const ym2203_interface ym2203_config = /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - tnzs_state *state = (tnzs_state *)device->machine->driver_data; + tnzs_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, irq ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c index 4972669d558..bb4aa5c788f 100644 --- a/src/mame/drivers/toobin.c +++ b/src/mame/drivers/toobin.c @@ -35,10 +35,10 @@ static void update_interrupts(running_machine *machine) { - toobin_state *state = (toobin_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 3, state->atarigen.scanline_int_state && state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + toobin_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 3, state->scanline_int_state && state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -50,10 +50,10 @@ static MACHINE_START( toobin ) static MACHINE_RESET( toobin ) { - toobin_state *state = (toobin_state *)machine->driver_data; + toobin_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarijsa_reset(); } @@ -67,7 +67,7 @@ static MACHINE_RESET( toobin ) static WRITE16_HANDLER( interrupt_scan_w ) { - toobin_state *state = (toobin_state *)space->machine->driver_data; + toobin_state *state = space->machine->driver_data(); int oldword = state->interrupt_scan[offset]; int newword = oldword; COMBINE_DATA(&newword); @@ -90,10 +90,10 @@ static WRITE16_HANDLER( interrupt_scan_w ) static READ16_HANDLER( special_port1_r ) { - toobin_state *state = (toobin_state *)space->machine->driver_data; + toobin_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "FF9000"); if (atarigen_get_hblank(*space->machine->primary_screen)) result ^= 0x8000; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x2000; + if (state->cpu_to_sound_ready) result ^= 0x2000; return result; } @@ -109,8 +109,8 @@ static READ16_HANDLER( special_port1_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_GLOBAL_MASK(0xc7ffff) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0xc00000, 0xc07fff) AM_RAM_WRITE(atarigen_playfield_large_w) AM_BASE_MEMBER(toobin_state, atarigen.playfield) - AM_RANGE(0xc08000, 0xc097ff) AM_MIRROR(0x046000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(toobin_state, atarigen.alpha) + AM_RANGE(0xc00000, 0xc07fff) AM_RAM_WRITE(atarigen_playfield_large_w) AM_BASE_MEMBER(toobin_state, playfield) + AM_RANGE(0xc08000, 0xc097ff) AM_MIRROR(0x046000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(toobin_state, alpha) AM_RANGE(0xc09800, 0xc09fff) AM_MIRROR(0x046000) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) AM_RANGE(0xc10000, 0xc107ff) AM_MIRROR(0x047800) AM_RAM_WRITE(toobin_paletteram_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xff6000, 0xff6001) AM_READNOP /* who knows? read at controls time */ @@ -122,12 +122,12 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff83c0, 0xff83c1) AM_MIRROR(0x45003e) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0xff8400, 0xff8401) AM_MIRROR(0x4500fe) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0xff8500, 0xff8501) AM_MIRROR(0x4500fe) AM_WRITE(atarigen_eeprom_enable_w) - AM_RANGE(0xff8600, 0xff8601) AM_MIRROR(0x4500fe) AM_WRITE(toobin_xscroll_w) AM_BASE_MEMBER(toobin_state, atarigen.xscroll) - AM_RANGE(0xff8700, 0xff8701) AM_MIRROR(0x4500fe) AM_WRITE(toobin_yscroll_w) AM_BASE_MEMBER(toobin_state, atarigen.yscroll) + AM_RANGE(0xff8600, 0xff8601) AM_MIRROR(0x4500fe) AM_WRITE(toobin_xscroll_w) AM_BASE_MEMBER(toobin_state, xscroll) + AM_RANGE(0xff8700, 0xff8701) AM_MIRROR(0x4500fe) AM_WRITE(toobin_yscroll_w) AM_BASE_MEMBER(toobin_state, yscroll) AM_RANGE(0xff8800, 0xff8801) AM_MIRROR(0x4507fe) AM_READ_PORT("FF8800") AM_RANGE(0xff9000, 0xff9001) AM_MIRROR(0x4507fe) AM_READ(special_port1_r) AM_RANGE(0xff9800, 0xff9801) AM_MIRROR(0x4507fe) AM_READ(atarigen_sound_r) - AM_RANGE(0xffa000, 0xffafff) AM_MIRROR(0x451000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(toobin_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xffa000, 0xffafff) AM_MIRROR(0x451000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(toobin_state, eeprom, eeprom_size) AM_RANGE(0xffc000, 0xffffff) AM_MIRROR(0x450000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index de80a21ad08..8481b142860 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -245,13 +245,13 @@ Stephh's notes (based on the game M68000 code and some tests) : static READ16_HANDLER( sharedram_r ) { - topspeed_state *state = (topspeed_state *)space->machine->driver_data; + topspeed_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE16_HANDLER( sharedram_w ) { - topspeed_state *state = (topspeed_state *)space->machine->driver_data; + topspeed_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sharedram[offset]); } @@ -260,13 +260,13 @@ static void parse_control( running_machine *machine ) /* assumes Z80 sandwiched /* bit 0 enables cpu B */ /* however this fails when recovering from a save state if cpu B is disabled !! */ - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, (state->cpua_ctrl &0x1) ? CLEAR_LINE : ASSERT_LINE); } static WRITE16_HANDLER( cpua_ctrl_w ) { - topspeed_state *state = (topspeed_state *)space->machine->driver_data; + topspeed_state *state = space->machine->driver_data(); if ((data & 0xff00) && ((data & 0xff) == 0)) data = data >> 8; /* for Wgp */ @@ -287,7 +287,7 @@ static WRITE16_HANDLER( cpua_ctrl_w ) static TIMER_CALLBACK( topspeed_interrupt6 ) { - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, HOLD_LINE); } @@ -295,7 +295,7 @@ static TIMER_CALLBACK( topspeed_interrupt6 ) static TIMER_CALLBACK( topspeed_cpub_interrupt6 ) { - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, 6, HOLD_LINE); /* assumes Z80 sandwiched between the 68Ks */ } @@ -325,7 +325,7 @@ static INTERRUPT_GEN( topspeed_cpub_interrupt ) static READ8_HANDLER( topspeed_input_bypass_r ) { - topspeed_state *state = (topspeed_state *)space->machine->driver_data; + topspeed_state *state = space->machine->driver_data(); UINT8 port = tc0220ioc_port_r(state->tc0220ioc, 0); /* read port number */ int steer = 0; int analogue_steer = input_port_read_safe(space->machine, STEER_PORT_TAG, 0x00); @@ -395,20 +395,20 @@ static WRITE16_HANDLER( topspeed_motor_w ) static void reset_sound_region( running_machine *machine ) { - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) /* assumes Z80 sandwiched between 68Ks */ { - topspeed_state *state = (topspeed_state *)device->machine->driver_data; + topspeed_state *state = device->machine->driver_data(); state->banknum = data & 7; reset_sound_region(device->machine); } static void topspeed_msm5205_vck( running_device *device ) { - topspeed_state *state = (topspeed_state *)device->machine->driver_data; + topspeed_state *state = device->machine->driver_data(); if (state->adpcm_data != -1) { msm5205_data_w(device, state->adpcm_data & 0x0f); @@ -424,14 +424,14 @@ static void topspeed_msm5205_vck( running_device *device ) static WRITE8_DEVICE_HANDLER( topspeed_msm5205_address_w ) { - topspeed_state *state = (topspeed_state *)device->machine->driver_data; + topspeed_state *state = device->machine->driver_data(); state->adpcm_pos = (state->adpcm_pos & 0x00ff) | (data << 8); msm5205_reset_w(device, 0); } static WRITE8_DEVICE_HANDLER( topspeed_msm5205_stop_w ) { - topspeed_state *state = (topspeed_state *)device->machine->driver_data; + topspeed_state *state = device->machine->driver_data(); msm5205_reset_w(device, 1); state->adpcm_pos &= 0xff00; } @@ -619,7 +619,7 @@ GFXDECODE_END static void irq_handler( running_device *device, int irq ) /* assumes Z80 sandwiched between 68Ks */ { - topspeed_state *state = (topspeed_state *)device->machine->driver_data; + topspeed_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -648,7 +648,7 @@ static STATE_POSTLOAD( topspeed_postload ) static MACHINE_START( topspeed ) { - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); @@ -667,7 +667,7 @@ static MACHINE_START( topspeed ) static MACHINE_RESET( topspeed ) { - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); state->cpua_ctrl = 0xff; state->ioc220_port = 0; diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index 9c13e86ddd6..a6ad18f88bf 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -23,12 +23,13 @@ TODO: #include "sound/sn76477.h" -class toratora_state +class toratora_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toratora_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toratora_state(machine)); } - toratora_state(running_machine &machine) { } + toratora_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; @@ -68,7 +69,7 @@ static WRITE_LINE_DEVICE_HANDLER( cb2_u3_w ) static VIDEO_UPDATE( toratora ) { - toratora_state *state = (toratora_state *)screen->machine->driver_data; + toratora_state *state = screen->machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -101,7 +102,7 @@ static VIDEO_UPDATE( toratora ) static WRITE8_HANDLER( clear_tv_w ) { - toratora_state *state = (toratora_state *)space->machine->driver_data; + toratora_state *state = space->machine->driver_data(); state->clear_tv = 1; } @@ -129,7 +130,7 @@ static WRITE8_DEVICE_HANDLER( port_b_u1_w ) static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) { - toratora_state *toratora = (toratora_state *)device->machine->driver_data; + toratora_state *toratora = device->machine->driver_data(); int combined_state = pia6821_get_irq_a(device) | pia6821_get_irq_b(device); logerror("GEN IRQ: %x\n", combined_state); @@ -139,7 +140,7 @@ static WRITE_LINE_DEVICE_HANDLER( main_cpu_irq ) static INTERRUPT_GEN( toratora_timer ) { - toratora_state *state = (toratora_state *)device->machine->driver_data; + toratora_state *state = device->machine->driver_data(); state->timer++; /* timer counting at 16 Hz */ /* also, when the timer overflows (16 seconds) watchdog would kick in */ @@ -158,13 +159,13 @@ static INTERRUPT_GEN( toratora_timer ) static READ8_HANDLER( timer_r ) { - toratora_state *state = (toratora_state *)space->machine->driver_data; + toratora_state *state = space->machine->driver_data(); return state->timer; } static WRITE8_HANDLER( clear_timer_w ) { - toratora_state *state = (toratora_state *)space->machine->driver_data; + toratora_state *state = space->machine->driver_data(); state->timer = 0; } @@ -374,7 +375,7 @@ INPUT_PORTS_END static MACHINE_START( toratora ) { - toratora_state *state = (toratora_state *)machine->driver_data; + toratora_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->pia_u1 = machine->device("pia_u1"); @@ -388,7 +389,7 @@ static MACHINE_START( toratora ) static MACHINE_RESET( toratora ) { - toratora_state *state = (toratora_state *)machine->driver_data; + toratora_state *state = machine->driver_data(); state->timer = 0xff; state->last = 0; diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index 824ab9b6b20..62e09e04aa0 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -52,7 +52,7 @@ static WRITE8_DEVICE_HANDLER( toypop_sound_sharedram_w ) static READ16_HANDLER( toypop_m68000_sharedram_r ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); return state->m68000_sharedram[offset]; } @@ -60,7 +60,7 @@ static WRITE16_HANDLER( toypop_m68000_sharedram_w ) { if (ACCESSING_BITS_0_7) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); state->m68000_sharedram[offset] = data & 0xff; } } @@ -155,7 +155,7 @@ static WRITE8_HANDLER( toypop_m68000_assert_w ) static TIMER_CALLBACK( disable_interrupts ) { - toypop_state *state = (toypop_state *)machine->driver_data; + toypop_state *state = machine->driver_data(); cpu_interrupt_enable(machine->device("maincpu"), 0); cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE); cpu_interrupt_enable(machine->device("audiocpu"), 0); @@ -172,20 +172,20 @@ static MACHINE_RESET( toypop ) static INTERRUPT_GEN( toypop_m68000_interrupt ) { - toypop_state *state = (toypop_state *)device->machine->driver_data; + toypop_state *state = device->machine->driver_data(); if (state->interrupt_enable_68k) cpu_set_input_line(device, 6, HOLD_LINE); } static WRITE16_HANDLER( toypop_m68000_interrupt_enable_w ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); state->interrupt_enable_68k = 1; } static WRITE16_HANDLER( toypop_m68000_interrupt_disable_w ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); state->interrupt_enable_68k = 0; } diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index d7feb72d42b..f129d9c3a2e 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -222,27 +222,27 @@ static WRITE8_HANDLER( questions_bank_w ) WRITE8_HANDLER( hyprolyb_adpcm_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); soundlatch2_w(space, offset, data); state->hyprolyb_adpcm_ready = 0x80; } static READ8_HANDLER( hyprolyb_adpcm_busy_r ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); return state->hyprolyb_adpcm_busy ? 0x10 : 0x00; } static WRITE8_DEVICE_HANDLER( hyprolyb_msm_data_w ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); msm5205_data_w(device, data); state->hyprolyb_adpcm_busy = ~data & 0x80; } static READ8_DEVICE_HANDLER( hyprolyb_msm_vck_r ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); UINT8 old = state->hyprolyb_vck_ready; state->hyprolyb_vck_ready = 0x00; return old; @@ -250,13 +250,13 @@ static READ8_DEVICE_HANDLER( hyprolyb_msm_vck_r ) static READ8_HANDLER( hyprolyb_adpcm_ready_r ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); return state->hyprolyb_adpcm_ready; } static READ8_HANDLER( hyprolyb_adpcm_data_r ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->hyprolyb_adpcm_ready = 0x00; return soundlatch2_r(space, offset); } @@ -841,7 +841,7 @@ GFXDECODE_END static void adpcm_vck_callback( running_device *device ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); state->hyprolyb_vck_ready = 0x80; } @@ -855,7 +855,7 @@ const msm5205_interface hyprolyb_msm5205_config = static MACHINE_START( trackfld ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); state->vlm = machine->device("vlm"); @@ -874,7 +874,7 @@ static MACHINE_START( trackfld ) static MACHINE_START( hyprolyb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); MACHINE_START_CALL(trackfld); @@ -885,7 +885,7 @@ static MACHINE_START( hyprolyb ) static MACHINE_RESET( trackfld ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->bg_bank = 0; state->sprite_bank1 = 0; @@ -898,7 +898,7 @@ static MACHINE_RESET( trackfld ) static MACHINE_RESET( hyprolyb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); MACHINE_RESET_CALL(trackfld); diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 2d00a81cab3..eef27dd295e 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -290,7 +290,7 @@ GFXDECODE_END static MACHINE_RESET( travrusa ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->scrollx[0] = 0; state->scrollx[1] = 0; diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index 33804547113..50ae77db259 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -42,7 +42,7 @@ Notes: static READ8_HANDLER( trvquest_question_r ) { - gameplan_state *state = (gameplan_state *)space->machine->driver_data; + gameplan_state *state = space->machine->driver_data(); return memory_region(space->machine, "questions")[*state->trvquest_question * 0x2000 + offset]; } @@ -148,7 +148,7 @@ INPUT_PORTS_END static TIMER_CALLBACK( via_irq_delayed ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 0, param); } @@ -184,7 +184,7 @@ static const via6522_interface via_2_interface = static MACHINE_START( trvquest ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->via_0 = machine->device("via6522_0"); @@ -200,7 +200,7 @@ static MACHINE_START( trvquest ) static MACHINE_RESET( trvquest ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); state->video_x = 0; state->video_y = 0; @@ -210,7 +210,7 @@ static MACHINE_RESET( trvquest ) static INTERRUPT_GEN( trvquest_interrupt ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); via_ca1_w(state->via_2, 1); via_ca1_w(state->via_2, 0); } diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index b96b29f2c70..cf0b0945fb9 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -348,7 +348,7 @@ static READ16_HANDLER( tumblepb_prot_r ) #ifdef UNUSED_FUNCTION static WRITE16_HANDLER( tumblepb_sound_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -356,7 +356,7 @@ static WRITE16_HANDLER( tumblepb_sound_w ) static WRITE16_HANDLER( jumppop_sound_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, ASSERT_LINE); } @@ -452,7 +452,7 @@ command 1 - stop? static void tumbleb2_playmusic( running_device *device ) { - tumbleb_state *state = (tumbleb_state *)device->machine->driver_data; + tumbleb_state *state = device->machine->driver_data(); int status = okim6295_r(device, 0); if (state->music_is_playing) @@ -468,7 +468,7 @@ static void tumbleb2_playmusic( running_device *device ) static INTERRUPT_GEN( tumbleb2_interrupt ) { - tumbleb_state *state = (tumbleb_state *)device->machine->driver_data; + tumbleb_state *state = device->machine->driver_data(); cpu_set_input_line(device, 6, HOLD_LINE); tumbleb2_playmusic(state->oki); } @@ -535,7 +535,7 @@ static void tumbleb2_play_sound( running_device *device, int data ) static void process_tumbleb2_music_command( running_device *device, int data ) { - tumbleb_state *state = (tumbleb_state *)device->machine->driver_data; + tumbleb_state *state = device->machine->driver_data(); int status = okim6295_r(device, 0); if (data == 1) // stop? @@ -740,7 +740,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( jumpkids_sound_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -825,7 +825,7 @@ ADDRESS_MAP_END static READ8_HANDLER(jumppop_z80latch_r) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, CLEAR_LINE); return soundlatch_r(space, 0); } @@ -1985,7 +1985,7 @@ GFXDECODE_END static MACHINE_START( tumbleb ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -2002,7 +2002,7 @@ static MACHINE_START( tumbleb ) static MACHINE_RESET( tumbleb ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->music_command = 0; state->music_bank = 0; @@ -2162,7 +2162,7 @@ MACHINE_DRIVER_END static void semicom_irqhandler( running_device *device, int irq ) { - tumbleb_state *state = (tumbleb_state *)device->machine->driver_data; + tumbleb_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -2174,7 +2174,7 @@ static const ym2151_interface semicom_ym2151_interface = static MACHINE_RESET (htchctch) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); /* copy protection data every reset */ UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); @@ -3401,7 +3401,7 @@ static DRIVER_INIT ( bcstory ) static DRIVER_INIT( htchctch ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); // UINT16 *HCROM = (UINT16*)memory_region(machine, "maincpu"); UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); int i, len = memory_region_length(machine, "user1"); diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 830ed523c82..23fc17e70a1 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -68,7 +68,7 @@ static READ16_HANDLER( tumblep_prot_r ) static WRITE16_HANDLER( tumblep_sound_w ) { - tumblep_state *state = (tumblep_state *)space->machine->driver_data; + tumblep_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -76,7 +76,7 @@ static WRITE16_HANDLER( tumblep_sound_w ) #ifdef UNUSED_FUNCTION static WRITE16_HANDLER( jumppop_sound_w ) { - tumblep_state *state = (tumblep_state *)space->machine->driver_data; + tumblep_state *state = space->machine->driver_data(); soundlatch_w(space, 0, data & 0xff); cputag_set_input_line(state->audiocpu, 0, ASSERT_LINE ); } @@ -274,7 +274,7 @@ GFXDECODE_END static void sound_irq(running_device *device, int state) { - tumblep_state *driver_state = (tumblep_state *)device->machine->driver_data; + tumblep_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -295,7 +295,7 @@ static const deco16ic_interface tumblep_deco16ic_intf = static MACHINE_START( tumblep ) { - tumblep_state *state = (tumblep_state *)machine->driver_data; + tumblep_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c index 3f62f9103ee..adc1c1dbfd1 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -72,7 +72,7 @@ static WRITE8_HANDLER( tunhunt_control_w ) 0x40 start LED 0x80 in-game */ - tunhunt_state *state = (tunhunt_state *)space->machine->driver_data; + tunhunt_state *state = space->machine->driver_data(); state->control = data; coin_counter_w( space->machine, 0,data&0x01 ); diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index b41c14639d3..31230b74640 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -189,7 +189,7 @@ static READ8_DEVICE_HANDLER( turbo_analog_r ); static MACHINE_RESET( buckrog ) { - turbo_state *state = (turbo_state *)machine->driver_data; + turbo_state *state = machine->driver_data(); state->buckrog_command = 0x00; } @@ -212,7 +212,7 @@ static MACHINE_RESET( buckrog ) static WRITE8_DEVICE_HANDLER( turbo_ppi0a_w ) { /* bit0-7 = 0PA0-7 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_opa = data; } @@ -220,7 +220,7 @@ static WRITE8_DEVICE_HANDLER( turbo_ppi0a_w ) static WRITE8_DEVICE_HANDLER( turbo_ppi0b_w ) { /* bit0-7 = 0PB0-7 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_opb = data; } @@ -228,7 +228,7 @@ static WRITE8_DEVICE_HANDLER( turbo_ppi0b_w ) static WRITE8_DEVICE_HANDLER( turbo_ppi0c_w ) { /* bit0-7 = 0PC0-7 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_opc = data; } @@ -236,7 +236,7 @@ static WRITE8_DEVICE_HANDLER( turbo_ppi0c_w ) static WRITE8_DEVICE_HANDLER( turbo_ppi1a_w ) { /* bit0-7 = 1PA0-7 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_ipa = data; } @@ -244,7 +244,7 @@ static WRITE8_DEVICE_HANDLER( turbo_ppi1a_w ) static WRITE8_DEVICE_HANDLER( turbo_ppi1b_w ) { /* bit0-7 = 1PB0-7 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_ipb = data; } @@ -252,7 +252,7 @@ static WRITE8_DEVICE_HANDLER( turbo_ppi1b_w ) static WRITE8_DEVICE_HANDLER( turbo_ppi1c_w ) { /* bit0-7 = 1PC0-7 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_ipc = data; } @@ -262,7 +262,7 @@ static WRITE8_DEVICE_HANDLER( turbo_ppi3c_w ) /* bit 0-3 = PLA0-3 */ /* bit 4-6 = COL0-2 */ /* bit 7 = n/c */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->turbo_fbpla = data & 0x0f; state->turbo_fbcol = (data >> 4) & 0x07; } @@ -322,7 +322,7 @@ static WRITE8_DEVICE_HANDLER( subroc3d_ppi0a_w ) { /* bit 0-3 = PLY0-3 */ /* bit 4-7 = n/c */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->subroc3d_ply = data & 0x0f; } @@ -330,7 +330,7 @@ static WRITE8_DEVICE_HANDLER( subroc3d_ppi0a_w ) static WRITE8_DEVICE_HANDLER( subroc3d_ppi0c_w ) { /* bit 0-3 = COL0-3 */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->subroc3d_col = data & 0x0f; } @@ -342,7 +342,7 @@ static WRITE8_DEVICE_HANDLER( subroc3d_ppi0b_w ) /* bit 2 = STLA (START LAMP) */ /* bit 3 = NOUSE (n/c) */ /* bit 4 = FLIP (not really flip, just offset) */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); coin_counter_w(device->machine, 0, data & 0x01); coin_counter_w(device->machine, 1, data & 0x02); set_led_status(device->machine, 0, data & 0x04); @@ -381,7 +381,7 @@ static const ppi8255_interface subroc3d_8255_intf[2] = static WRITE8_DEVICE_HANDLER( buckrog_ppi0a_w ) { /* bit 0-7 = data to be read on the /IOREQ */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->buckrog_command = data; } @@ -390,7 +390,7 @@ static WRITE8_DEVICE_HANDLER( buckrog_ppi0b_w ) { /* bit 0-5 = MOV0-5 */ /* bit 6-7 = n/c */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->buckrog_mov = data & 0x3f; } @@ -401,7 +401,7 @@ static WRITE8_DEVICE_HANDLER( buckrog_ppi0c_w ) /* bit 3-5 = n/c */ /* bit 6 = /IOREQ on the 2nd CPU */ /* bit 7 = /INT on the 2nd CPU */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->buckrog_fchg = data & 0x07; cputag_set_input_line(device->machine, "sub", 0, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE); } @@ -415,7 +415,7 @@ static WRITE8_DEVICE_HANDLER( buckrog_ppi1c_w ) /* bit 5 = COM2 (COIN METER 2) */ /* bit 6 = STLA (START LAMP) */ /* bit 7 = NOUSE (BODY SONIC) */ - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); state->buckrog_obch = data & 0x07; coin_counter_w(device->machine, 0, data & 0x10); coin_counter_w(device->machine, 1, data & 0x20); @@ -479,7 +479,7 @@ static void update_outputs(i8279_state *chip, UINT16 which) static READ8_HANDLER( turbo_8279_r ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); i8279_state *chip = &state->i8279; UINT8 result = 0xff; UINT8 addr; @@ -520,7 +520,7 @@ static READ8_HANDLER( turbo_8279_r ) static WRITE8_HANDLER( turbo_8279_w ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); i8279_state *chip = &state->i8279; UINT8 addr; @@ -624,7 +624,7 @@ static WRITE8_HANDLER( turbo_8279_w ) static READ8_HANDLER( turbo_collision_r ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); return input_port_read(space->machine, "DSW3") | (state->turbo_collision & 15); } @@ -632,7 +632,7 @@ static READ8_HANDLER( turbo_collision_r ) static WRITE8_HANDLER( turbo_collision_clear_w ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); state->turbo_collision = 0; } @@ -640,14 +640,14 @@ static WRITE8_HANDLER( turbo_collision_clear_w ) static READ8_DEVICE_HANDLER( turbo_analog_r ) { - turbo_state *state = (turbo_state *)device->machine->driver_data; + turbo_state *state = device->machine->driver_data(); return input_port_read(device->machine, "DIAL") - state->turbo_last_analog; } static WRITE8_HANDLER( turbo_analog_reset_w ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); state->turbo_last_analog = input_port_read(space->machine, "DIAL"); } @@ -679,7 +679,7 @@ static WRITE8_HANDLER( turbo_coin_and_lamp_w ) static READ8_HANDLER( buckrog_cpu2_command_r ) { /* assert ACK */ - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); ppi8255_set_port_c(space->machine->device("ppi8255_0"), 0x00); return state->buckrog_command; } diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 03db20fde2e..c691895adbe 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -62,7 +62,7 @@ static INTERRUPT_GEN( tutankhm_interrupt ) { - timeplt_state *state = (timeplt_state *)device->machine->driver_data; + timeplt_state *state = device->machine->driver_data(); /* flip flops cause the interrupt to be signalled every other frame */ state->irq_toggle ^= 1; @@ -73,7 +73,7 @@ static INTERRUPT_GEN( tutankhm_interrupt ) static WRITE8_HANDLER( irq_enable_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->irq_enable = data & 1; if (!state->irq_enable) @@ -196,7 +196,7 @@ INPUT_PORTS_END static MACHINE_START( tutankhm ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); @@ -210,7 +210,7 @@ static MACHINE_START( tutankhm ) static MACHINE_RESET( tutankhm ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->irq_toggle = 0; state->irq_enable = 0; diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index c2bd7d76632..92e265a0cf9 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -25,7 +25,7 @@ static WRITE16_HANDLER( sound_cmd_w ) static WRITE16_HANDLER( sound_irq_trigger_w ) { - ultraman_state *state = (ultraman_state *)space->machine->driver_data; + ultraman_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -193,7 +193,7 @@ static const k051316_interface ultraman_k051316_intf_2 = static MACHINE_START( ultraman ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -209,7 +209,7 @@ static MACHINE_START( ultraman ) static MACHINE_RESET( ultraman ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); state->bank0 = -1; state->bank1 = -1; diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index 2a5401e21df..b7d38f6af31 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -21,7 +21,7 @@ static WRITE16_HANDLER( vaportra_sound_w ) { - vaportra_state *state = (vaportra_state *)space->machine->driver_data; + vaportra_state *state = space->machine->driver_data(); /* Force synchronisation between CPUs with fake timer */ timer_call_after_resynch(space->machine, NULL, 0, NULL); @@ -71,7 +71,7 @@ ADDRESS_MAP_END static READ8_HANDLER( vaportra_soundlatch_r ) { - vaportra_state *state = (vaportra_state *)space->machine->driver_data; + vaportra_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, CLEAR_LINE); return soundlatch_r(space, offset); } @@ -201,7 +201,7 @@ GFXDECODE_END static void sound_irq( running_device *device, int state ) { - vaportra_state *driver_state = (vaportra_state *)device->machine->driver_data; + vaportra_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->audiocpu, 1, state); /* IRQ 2 */ } @@ -232,7 +232,7 @@ static const deco16ic_interface vaportra_deco16ic_intf = static MACHINE_START( vaportra ) { - vaportra_state *state = (vaportra_state *)machine->driver_data; + vaportra_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -243,7 +243,7 @@ static MACHINE_START( vaportra ) static MACHINE_RESET( vaportra ) { - vaportra_state *state = (vaportra_state *)machine->driver_data; + vaportra_state *state = machine->driver_data(); state->priority[0] = 0; state->priority[1] = 0; diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index d8313e89e32..8f71509c236 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -84,14 +84,14 @@ static WRITE8_HANDLER( vastar_hold_cpu2_w ) static READ8_HANDLER( vastar_sharedram_r ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE8_HANDLER( vastar_sharedram_w ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); state->sharedram[offset] = data; } diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 9c900874b30..0367e815140 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -128,7 +128,7 @@ static WRITE8_HANDLER( vendetta_eeprom_w ) /* bit 6 - IRQ enable */ /* bit 7 - Unused */ - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); if (data == 0xff ) /* this is a bug in the eeprom write code */ return; @@ -145,13 +145,13 @@ static WRITE8_HANDLER( vendetta_eeprom_w ) static READ8_HANDLER( vendetta_K052109_r ) { - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); return k052109_r(state->k052109, offset + 0x2000); } static WRITE8_HANDLER( vendetta_K052109_w ) { - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); // ************************************************************************************* // * Escape Kids uses 052109's mirrored Tilemap ROM bank selector, but only during * @@ -165,7 +165,7 @@ static WRITE8_HANDLER( vendetta_K052109_w ) static void vendetta_video_banking( running_machine *machine, int select ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); if (select & 1) @@ -184,7 +184,7 @@ static void vendetta_video_banking( running_machine *machine, int select ) static WRITE8_HANDLER( vendetta_5fe0_w ) { - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); /* bit 0,1 coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -203,13 +203,13 @@ static WRITE8_HANDLER( vendetta_5fe0_w ) static TIMER_CALLBACK( z80_nmi_callback ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, ASSERT_LINE); } static WRITE8_HANDLER( z80_arm_nmi_w ) { - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, CLEAR_LINE); timer_set(space->machine, ATTOTIME_IN_USEC(25), NULL, 0, z80_nmi_callback); @@ -217,13 +217,13 @@ static WRITE8_HANDLER( z80_arm_nmi_w ) static WRITE8_HANDLER( z80_irq_w ) { - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); } static READ8_HANDLER( vendetta_sound_interrupt_r ) { - vendetta_state *state = (vendetta_state *)space->machine->driver_data; + vendetta_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff); return 0x00; } @@ -411,7 +411,7 @@ INPUT_PORTS_END static INTERRUPT_GEN( vendetta_irq ) { - vendetta_state *state = (vendetta_state *)device->machine->driver_data; + vendetta_state *state = device->machine->driver_data(); if (state->irq_enabled) cpu_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); } @@ -454,7 +454,7 @@ static const k053247_interface esckids_k053246_intf = static MACHINE_START( vendetta ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 28, &ROM[0x10000], 0x2000); @@ -479,7 +479,7 @@ static MACHINE_START( vendetta ) static MACHINE_RESET( vendetta ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); int i; konami_configure_set_lines(machine->device("maincpu"), vendetta_banking); @@ -793,13 +793,13 @@ static KONAMI_SETLINES_CALLBACK( vendetta_banking ) static DRIVER_INIT( vendetta ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); state->video_banking_base = 0x4000; } static DRIVER_INIT( esckids ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); state->video_banking_base = 0x2000; } diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c index 680dfe45f5a..f79f04fdaaa 100644 --- a/src/mame/drivers/vindictr.c +++ b/src/mame/drivers/vindictr.c @@ -32,9 +32,9 @@ static void update_interrupts(running_machine *machine) { - vindictr_state *state = (vindictr_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 4, state->atarigen.scanline_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 6, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + vindictr_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 4, state->scanline_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 6, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -46,10 +46,10 @@ static MACHINE_START( vindictr ) static MACHINE_RESET( vindictr ) { - vindictr_state *state = (vindictr_state *)machine->driver_data; + vindictr_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarigen_scanline_timer_reset(*machine->primary_screen, vindictr_scanline_update, 8); atarijsa_reset(); } @@ -64,10 +64,10 @@ static MACHINE_RESET( vindictr ) static READ16_HANDLER( port1_r ) { - vindictr_state *state = (vindictr_state *)space->machine->driver_data; + vindictr_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "260010"); - if (state->atarigen.sound_to_cpu_ready) result ^= 0x0004; - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0008; + if (state->sound_to_cpu_ready) result ^= 0x0004; + if (state->cpu_to_sound_ready) result ^= 0x0008; result ^= 0x0010; return result; } @@ -84,7 +84,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_GLOBAL_MASK(0x3fffff) AM_RANGE(0x000000, 0x05ffff) AM_ROM - AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(vindictr_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(vindictr_state, eeprom, eeprom_size) AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w) AM_RANGE(0x260000, 0x26000f) AM_READ_PORT("260000") AM_RANGE(0x260010, 0x26001f) AM_READ(port1_r) @@ -96,9 +96,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x360020, 0x360021) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0x360030, 0x360031) AM_WRITE(atarigen_sound_w) AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM_WRITE(vindictr_paletteram_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(vindictr_state, atarigen.playfield) + AM_RANGE(0x3f0000, 0x3f1fff) AM_MIRROR(0x8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(vindictr_state, playfield) AM_RANGE(0x3f2000, 0x3f3fff) AM_MIRROR(0x8000) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0x3f4000, 0x3f4f7f) AM_MIRROR(0x8000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(vindictr_state, atarigen.alpha) + AM_RANGE(0x3f4000, 0x3f4f7f) AM_MIRROR(0x8000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(vindictr_state, alpha) AM_RANGE(0x3f4f80, 0x3f4fff) AM_MIRROR(0x8000) AM_RAM_WRITE(atarimo_0_slipram_w) AM_BASE(&atarimo_0_slipram) AM_RANGE(0x3f5000, 0x3f7fff) AM_MIRROR(0x8000) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 92e2aa58339..58d13abc801 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -83,7 +83,7 @@ static READ16_HANDLER ( varia_crom_read ) { /* game reads the cgrom, result is 7772, verified to be correct on the real board */ - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); UINT8 *cgrom = memory_region(space->machine, "gfx1"); UINT16 retdat; @@ -98,7 +98,7 @@ static READ16_HANDLER ( varia_crom_read ) static void get_vmetal_tlookup(running_machine *machine, UINT16 data, UINT16 *tileno, UINT16 *color) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); int idx = ((data & 0x7fff) >> 4) * 2; UINT32 lookup = (state->vmetal_tlookup[idx] << 16) | state->vmetal_tlookup[idx + 1]; @@ -109,21 +109,21 @@ static void get_vmetal_tlookup(running_machine *machine, UINT16 data, UINT16 *ti static WRITE16_HANDLER( vmetal_texttileram_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vmetal_texttileram[offset]); tilemap_mark_tile_dirty(state->vmetal_texttilemap, offset); } static WRITE16_HANDLER( vmetal_mid1tileram_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vmetal_mid1tileram[offset]); tilemap_mark_tile_dirty(state->vmetal_mid1tilemap, offset); } static WRITE16_HANDLER( vmetal_mid2tileram_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vmetal_mid2tileram[offset]); tilemap_mark_tile_dirty(state->vmetal_mid2tilemap, offset); } @@ -343,7 +343,7 @@ GFXDECODE_END static TILE_GET_INFO( get_vmetal_texttilemap_tile_info ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); UINT32 tile; UINT16 color, data = state->vmetal_texttileram[tile_index]; int idx = ((data & 0x7fff) >> 4) * 2; @@ -361,7 +361,7 @@ static TILE_GET_INFO( get_vmetal_texttilemap_tile_info ) static TILE_GET_INFO( get_vmetal_mid1tilemap_tile_info ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); UINT16 tile, color, data = state->vmetal_mid1tileram[tile_index]; get_vmetal_tlookup(machine, data, &tile, &color); @@ -374,7 +374,7 @@ static TILE_GET_INFO( get_vmetal_mid1tilemap_tile_info ) static TILE_GET_INFO( get_vmetal_mid2tilemap_tile_info ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); UINT16 tile, color, data = state->vmetal_mid2tileram[tile_index]; get_vmetal_tlookup(machine, data, &tile, &color); @@ -387,7 +387,7 @@ static TILE_GET_INFO( get_vmetal_mid2tilemap_tile_info ) static VIDEO_START(varia) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->vmetal_texttilemap = tilemap_create(machine, get_vmetal_texttilemap_tile_info, tilemap_scan_rows, 8, 8, 256, 256); state->vmetal_mid1tilemap = tilemap_create(machine, get_vmetal_mid1tilemap_tile_info, tilemap_scan_rows, 16, 16, 256, 256); @@ -400,7 +400,7 @@ static VIDEO_START(varia) static VIDEO_UPDATE(varia) { - metro_state *state = (metro_state *)screen->machine->driver_data; + metro_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index bad00fc2768..0b116dc867f 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -209,7 +209,7 @@ GFXDECODE_END static void irqhandler( running_device *device, int irq ) { - volfied_state *state = (volfied_state *)device->machine->driver_data; + volfied_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -233,7 +233,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( volfied ) { - volfied_state *state = (volfied_state *)machine->driver_data; + volfied_state *state = machine->driver_data(); volfied_cchip_init(machine); diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 81978d5fd63..e74e3d918a9 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -166,13 +166,13 @@ static MACHINE_RESET( taito_dualscreen ); static void reset_sound_region( running_machine *machine ) { - warriorb_state *state = (warriorb_state *)machine->driver_data; + warriorb_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - warriorb_state *state = (warriorb_state *)space->machine->driver_data; + warriorb_state *state = space->machine->driver_data(); state->banknum = data & 7; reset_sound_region(space->machine); @@ -180,7 +180,7 @@ static WRITE8_HANDLER( sound_bankswitch_w ) static WRITE16_HANDLER( warriorb_sound_w ) { - warriorb_state *state = (warriorb_state *)space->machine->driver_data; + warriorb_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, data & 0xff); @@ -190,7 +190,7 @@ static WRITE16_HANDLER( warriorb_sound_w ) static READ16_HANDLER( warriorb_sound_r ) { - warriorb_state *state = (warriorb_state *)space->machine->driver_data; + warriorb_state *state = space->machine->driver_data(); if (offset == 1) return ((tc0140syt_comm_r(state->tc0140syt, 0) & 0xff)); @@ -201,7 +201,7 @@ static READ16_HANDLER( warriorb_sound_r ) static WRITE8_HANDLER( warriorb_pancontrol ) { - warriorb_state *state = (warriorb_state *)space->machine->driver_data; + warriorb_state *state = space->machine->driver_data(); running_device *flt = NULL; offset &= 3; @@ -221,7 +221,7 @@ static WRITE8_HANDLER( warriorb_pancontrol ) static WRITE16_HANDLER( tc0100scn_dual_screen_w ) { - warriorb_state *state = (warriorb_state *)space->machine->driver_data; + warriorb_state *state = space->machine->driver_data(); tc0100scn_word_w(state->tc0100scn_1, offset, data, mem_mask); tc0100scn_word_w(state->tc0100scn_2, offset, data, mem_mask); @@ -419,7 +419,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) { - warriorb_state *state = (warriorb_state *)device->machine->driver_data; + warriorb_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -538,7 +538,7 @@ static STATE_POSTLOAD( warriorb_postload ) static MACHINE_START( warriorb ) { - warriorb_state *state = (warriorb_state *)machine->driver_data; + warriorb_state *state = machine->driver_data(); memory_configure_bank(machine, "bank10", 0, 8, memory_region(machine, "audiocpu") + 0xc000, 0x4000); @@ -563,7 +563,7 @@ static MACHINE_START( warriorb ) static MACHINE_RESET( taito_dualscreen ) { - warriorb_state *state = (warriorb_state *)machine->driver_data; + warriorb_state *state = machine->driver_data(); state->banknum = 0; diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 3ee25531e01..ad8a7fe3ccc 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -332,7 +332,7 @@ static WRITE16_HANDLER( sound_command_w ) { if (ACCESSING_BITS_0_7) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); state->pending_command = 1; soundlatch_w(space, 0, data & 0xff); @@ -342,13 +342,13 @@ static WRITE16_HANDLER( sound_command_w ) static CUSTOM_INPUT( pending_sound_r ) { - welltris_state *state = (welltris_state *)field->port->machine->driver_data; + welltris_state *state = field->port->machine->driver_data(); return state->pending_command ? 1 : 0; } static WRITE8_HANDLER( pending_command_clear_w ) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); state->pending_command = 0; } diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 6aebb876a14..7c899cee814 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -405,13 +405,13 @@ Stephh's notes (based on the game M68000 code and some tests) : static READ16_HANDLER( sharedram_r ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); return state->sharedram[offset]; } static WRITE16_HANDLER( sharedram_w ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->sharedram[offset]); } @@ -420,7 +420,7 @@ static void parse_control(running_machine *machine) /* bit 0 enables cpu B */ /* however this fails when recovering from a save state if cpu B is disabled !! */ - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, INPUT_LINE_RESET, (state->cpua_ctrl & 0x1) ? CLEAR_LINE : ASSERT_LINE); /* bit 1 is "vibration" acc. to test mode */ @@ -428,7 +428,7 @@ static void parse_control(running_machine *machine) static WRITE16_HANDLER( cpua_ctrl_w ) /* assumes Z80 sandwiched between 68Ks */ { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); if ((data &0xff00) && ((data &0xff) == 0)) data = data >> 8; /* for Wgp */ @@ -449,14 +449,14 @@ static WRITE16_HANDLER( cpua_ctrl_w ) /* assumes Z80 sandwiched between 68Ks */ #ifdef UNUSED_FUNCTION static TIMER_CALLBACK( wgp_interrupt4 ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 4, HOLD_LINE); } #endif static TIMER_CALLBACK( wgp_interrupt6 ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 6, HOLD_LINE); } @@ -464,7 +464,7 @@ static TIMER_CALLBACK( wgp_interrupt6 ) static TIMER_CALLBACK( wgp_cpub_interrupt6 ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, 6, HOLD_LINE); /* assumes Z80 sandwiched between the 68Ks */ } @@ -510,7 +510,7 @@ static WRITE16_HANDLER( rotate_port_w ) which contains sets of 4 words (used for ports 0-3). NB: port 6 is not written. */ - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); switch (offset) { @@ -611,20 +611,20 @@ static WRITE16_HANDLER( wgp_adinput_w ) static void reset_sound_region( running_machine *machine ) /* assumes Z80 sandwiched between the 68Ks */ { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); memory_set_bank(machine, "bank10", state->banknum); } static WRITE8_HANDLER( sound_bankswitch_w ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); state->banknum = data & 7; reset_sound_region(space->machine); } static WRITE16_HANDLER( wgp_sound_w ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); if (offset == 0) tc0140syt_port_w(state->tc0140syt, 0, data & 0xff); @@ -634,7 +634,7 @@ static WRITE16_HANDLER( wgp_sound_w ) static READ16_HANDLER( wgp_sound_r ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); if (offset == 1) return ((tc0140syt_comm_r(state->tc0140syt, 0) & 0xff)); @@ -905,7 +905,7 @@ GFXDECODE_END /* handler called by the YM2610 emulator when the internal timers cause an IRQ */ static void irqhandler( running_device *device, int irq ) // assumes Z80 sandwiched between 68Ks { - wgp_state *state = (wgp_state *)device->machine->driver_data; + wgp_state *state = device->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); } @@ -931,7 +931,7 @@ static STATE_POSTLOAD( wgp_postload ) static MACHINE_RESET( wgp ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); int i; state->banknum = 0; @@ -951,7 +951,7 @@ static MACHINE_RESET( wgp ) static MACHINE_START( wgp ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 935833c0374..6404915d9f7 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -225,15 +225,16 @@ struct scroll_info }; -class wheelfir_state +class wheelfir_state : public driver_data_t { public: - static void *alloc(running_machine &machine) + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wheelfir_state(machine)); } - wheelfir_state(running_machine &machine) { } + wheelfir_state(running_machine &machine) + : driver_data_t(machine) { } running_device *maincpu; running_device *subcpu; @@ -289,20 +290,20 @@ static READ16_HANDLER( wheelfir_status_r ) ---------------x ? eeprom */ - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); return state->toggle_bit| (mame_rand(space->machine)&0x2000); } static WRITE16_HANDLER( wheelfir_scanline_cnt_w ) { - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scanline_cnt); } static WRITE16_HANDLER(wheelfir_blit_w) { - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_data[offset]); @@ -564,14 +565,14 @@ static WRITE16_HANDLER(wheelfir_blit_w) static VIDEO_START(wheelfir) { - wheelfir_state *state = (wheelfir_state *)machine->driver_data; + wheelfir_state *state = machine->driver_data(); state->tmp_bitmap[0] = auto_bitmap_alloc(machine, 512, 512, BITMAP_FORMAT_INDEXED16); state->tmp_bitmap[1] = auto_bitmap_alloc(machine, 512, 512, BITMAP_FORMAT_INDEXED16); } static VIDEO_UPDATE(wheelfir) { - wheelfir_state *state = (wheelfir_state *)screen->machine->driver_data; + wheelfir_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect,0); @@ -602,20 +603,20 @@ static VIDEO_UPDATE(wheelfir) static VIDEO_EOF( wheelfir ) { - wheelfir_state *state = (wheelfir_state *)machine->driver_data; + wheelfir_state *state = machine->driver_data(); bitmap_fill(state->tmp_bitmap[LAYER_FG], &machine->primary_screen->visible_area(),0); } static WRITE16_HANDLER( pal_reset_pos_w ) { - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); state->palpos = 0; } static WRITE16_HANDLER( pal_data_w ) { - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); int color=state->palpos/3; state->palette[state->palpos] = data & 0xff; ++state->palpos; @@ -638,7 +639,7 @@ static WRITE16_HANDLER(wheelfir_7c0000_w) static WRITE16_HANDLER(wheelfir_snd_w) { - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); COMBINE_DATA(&state->soundlatch); cputag_set_input_line(space->machine, "subcpu", 1, HOLD_LINE); /* guess, tested also with periodic interrupts and latch clear*/ timer_call_after_resynch(space->machine, NULL, 0, 0); @@ -646,7 +647,7 @@ static WRITE16_HANDLER(wheelfir_snd_w) static READ16_HANDLER( wheelfir_snd_r ) { - wheelfir_state *state = (wheelfir_state *)space->machine->driver_data; + wheelfir_state *state = space->machine->driver_data(); return state->soundlatch; } @@ -724,7 +725,7 @@ INPUT_PORTS_END static TIMER_DEVICE_CALLBACK( scanline_timer_callback ) { - wheelfir_state *state = (wheelfir_state *)timer.machine->driver_data; + wheelfir_state *state = timer.machine->driver_data(); timer_call_after_resynch(timer.machine, NULL, 0, 0); state->current_scanline=param; @@ -769,7 +770,7 @@ static MACHINE_RESET(wheelfir) static MACHINE_START( wheelfir ) { - wheelfir_state *state = (wheelfir_state *)machine->driver_data; + wheelfir_state *state = machine->driver_data(); state->maincpu = machine->device( "maincpu"); state->subcpu = machine->device( "subcpu"); diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 276ff479581..a54aad75e33 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -194,7 +194,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER ( wwfsstar_scrollwrite ) { - wwfsstar_state *state = (wwfsstar_state *)space->machine->driver_data; + wwfsstar_state *state = space->machine->driver_data(); switch (offset) { @@ -242,7 +242,7 @@ static WRITE16_HANDLER( wwfsstar_irqack_w ) static TIMER_DEVICE_CALLBACK( wwfsstar_scanline ) { - wwfsstar_state *state = (wwfsstar_state *)timer.machine->driver_data; + wwfsstar_state *state = timer.machine->driver_data(); int scanline = param; /* Vblank is lowered on scanline 0 */ @@ -274,7 +274,7 @@ static TIMER_DEVICE_CALLBACK( wwfsstar_scanline ) static CUSTOM_INPUT( wwfsstar_vblank_r ) { - wwfsstar_state *state = (wwfsstar_state *)field->port->machine->driver_data; + wwfsstar_state *state = field->port->machine->driver_data(); return state->vblank; } diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 7caab720dc8..6cbe755bc72 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -91,7 +91,7 @@ static const eeprom_interface eeprom_intf = /* A1, A5 and A6 don't go to the 053247. */ static READ16_HANDLER( K053247_scattered_word_r ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); if (offset & 0x0031) return state->spriteram[offset]; @@ -104,7 +104,7 @@ static READ16_HANDLER( K053247_scattered_word_r ) static WRITE16_HANDLER( K053247_scattered_word_w ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); if (offset & 0x0031) COMBINE_DATA(state->spriteram + offset); @@ -120,7 +120,7 @@ static WRITE16_HANDLER( K053247_scattered_word_w ) static void xexex_objdma( running_machine *machine, int limiter ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); int counter, num_inactive; UINT16 *src, *dst; @@ -154,19 +154,19 @@ static void xexex_objdma( running_machine *machine, int limiter ) static READ16_HANDLER( spriteram_mirror_r ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); return state->spriteram[offset]; } static WRITE16_HANDLER( spriteram_mirror_w ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); COMBINE_DATA(state->spriteram + offset); } static READ16_HANDLER( xexex_waitskip_r ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x1158) { @@ -180,7 +180,7 @@ static READ16_HANDLER( xexex_waitskip_r ) static void parse_control2( running_machine *machine ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); /* bit 0 is data */ /* bit 1 is cs (active low) */ @@ -199,13 +199,13 @@ static void parse_control2( running_machine *machine ) static READ16_HANDLER( control2_r ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); return state->cur_control2; } static WRITE16_HANDLER( control2_w ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); COMBINE_DATA(&state->cur_control2); parse_control2(space->machine); } @@ -213,7 +213,7 @@ static WRITE16_HANDLER( control2_w ) static WRITE16_HANDLER( sound_cmd1_w ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); if(ACCESSING_BITS_0_7) { @@ -234,7 +234,7 @@ static WRITE16_HANDLER( sound_cmd2_w ) static WRITE16_HANDLER( sound_irq_w ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -245,20 +245,20 @@ static READ16_HANDLER( sound_status_r ) static void reset_sound_region(running_machine *machine) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); memory_set_bank(machine, "bank2", state->cur_sound_region & 0x07); } static WRITE8_HANDLER( sound_bankswitch_w ) { - xexex_state *state = (xexex_state *)space->machine->driver_data; + xexex_state *state = space->machine->driver_data(); state->cur_sound_region = data & 7; reset_sound_region(space->machine); } static void ym_set_mixing(running_device *device, double left, double right) { - xexex_state *state = (xexex_state *)device->machine->driver_data; + xexex_state *state = device->machine->driver_data(); flt_volume_set_volume(state->filter1l, (71.0 * left) / 55.0); flt_volume_set_volume(state->filter1r, (71.0 * right) / 55.0); flt_volume_set_volume(state->filter2l, (71.0 * left) / 55.0); @@ -267,7 +267,7 @@ static void ym_set_mixing(running_device *device, double left, double right) static TIMER_CALLBACK( dmaend_callback ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); if (state->cur_control2 & 0x0040) { @@ -286,7 +286,7 @@ static TIMER_CALLBACK( dmaend_callback ) static INTERRUPT_GEN( xexex_interrupt ) { - xexex_state *state = (xexex_state *)device->machine->driver_data; + xexex_state *state = device->machine->driver_data(); if (state->suspension_active) { @@ -463,7 +463,7 @@ static STATE_POSTLOAD( xexex_postload ) static MACHINE_START( xexex ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x10000], 0x4000); @@ -500,7 +500,7 @@ static MACHINE_START( xexex ) static MACHINE_RESET( xexex ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); int i; for (i = 0; i < 4; i++) @@ -690,7 +690,7 @@ ROM_END static DRIVER_INIT( xexex ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); state->strip_0x1a = 0; diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index ffe39ceebce..752f3e840a0 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -44,7 +44,7 @@ static const eeprom_interface eeprom_intf = static WRITE16_HANDLER( eeprom_w ) { - xmen_state *state = (xmen_state *)space->machine->driver_data; + xmen_state *state = space->machine->driver_data(); logerror("%06x: write %04x to 108000\n",cpu_get_pc(space->cpu),data); if (ACCESSING_BITS_0_7) @@ -82,7 +82,7 @@ static WRITE16_HANDLER( sound_cmd_w ) static WRITE16_HANDLER( sound_irq_w ) { - xmen_state *state = (xmen_state *)space->machine->driver_data; + xmen_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, 0, HOLD_LINE); } @@ -97,13 +97,13 @@ static WRITE16_HANDLER( xmen_18fa00_w ) static void sound_reset_bank( running_machine *machine ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); memory_set_bank(machine, "bank4", state->sound_curbank & 0x07); } static WRITE8_HANDLER( sound_bankswitch_w ) { - xmen_state *state = (xmen_state *)space->machine->driver_data; + xmen_state *state = space->machine->driver_data(); state->sound_curbank = data; sound_reset_bank(space->machine); } @@ -258,7 +258,7 @@ INPUT_PORTS_END static CUSTOM_INPUT( xmen_frame_r ) { - xmen_state *state = (xmen_state *)field->port->machine->driver_data; + xmen_state *state = field->port->machine->driver_data(); return state->current_frame; } @@ -311,7 +311,7 @@ static STATE_POSTLOAD( xmen_postload ) static MACHINE_START( xmen ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "audiocpu"); memory_configure_bank(machine, "bank4", 0, 8, &ROM[0x10000], 0x4000); @@ -335,7 +335,7 @@ static MACHINE_START( xmen ) static MACHINE_RESET( xmen ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); int i; for (i = 0; i < 3; i++) @@ -416,7 +416,7 @@ MACHINE_DRIVER_END static MACHINE_START( xmen6p ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); MACHINE_START_CALL(xmen); @@ -425,7 +425,7 @@ static MACHINE_START( xmen6p ) static MACHINE_RESET( xmen6p ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); state->current_frame = 0x00; } diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index c7a1441fad9..d849c3980f9 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -33,9 +33,9 @@ static void update_interrupts(running_machine *machine) { - xybots_state *state = (xybots_state *)machine->driver_data; - cputag_set_input_line(machine, "maincpu", 1, state->atarigen.video_int_state ? ASSERT_LINE : CLEAR_LINE); - cputag_set_input_line(machine, "maincpu", 2, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); + xybots_state *state = machine->driver_data(); + cputag_set_input_line(machine, "maincpu", 1, state->video_int_state ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(machine, "maincpu", 2, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); } @@ -47,11 +47,11 @@ static MACHINE_START( xybots ) static MACHINE_RESET( xybots ) { - xybots_state *state = (xybots_state *)machine->driver_data; + xybots_state *state = machine->driver_data(); - atarigen_eeprom_reset(&state->atarigen); - atarigen_slapstic_reset(&state->atarigen); - atarigen_interrupt_reset(&state->atarigen, update_interrupts); + atarigen_eeprom_reset(state); + atarigen_slapstic_reset(state); + atarigen_interrupt_reset(state, update_interrupts); atarijsa_reset(); } @@ -65,10 +65,10 @@ static MACHINE_RESET( xybots ) static READ16_HANDLER( special_port1_r ) { - xybots_state *state = (xybots_state *)space->machine->driver_data; + xybots_state *state = space->machine->driver_data(); int result = input_port_read(space->machine, "FFE200"); - if (state->atarigen.cpu_to_sound_ready) result ^= 0x0200; + if (state->cpu_to_sound_ready) result ^= 0x0200; result ^= state->h256 ^= 0x0400; return result; } @@ -87,12 +87,12 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x007fff) AM_MIRROR(0x7c0000) AM_ROM AM_RANGE(0x008000, 0x00ffff) AM_MIRROR(0x7c0000) AM_ROM /* slapstic maps here */ AM_RANGE(0x010000, 0x03ffff) AM_MIRROR(0x7c0000) AM_ROM - AM_RANGE(0xff8000, 0xff8fff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(xybots_state, atarigen.alpha) + AM_RANGE(0xff8000, 0xff8fff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarigen_alpha_w) AM_BASE_MEMBER(xybots_state, alpha) AM_RANGE(0xff9000, 0xffadff) AM_MIRROR(0x7f8000) AM_RAM AM_RANGE(0xffae00, 0xffafff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarimo_0_spriteram_w) AM_BASE(&atarimo_0_spriteram) - AM_RANGE(0xffb000, 0xffbfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(xybots_state, atarigen.playfield) + AM_RANGE(0xffb000, 0xffbfff) AM_MIRROR(0x7f8000) AM_RAM_WRITE(atarigen_playfield_w) AM_BASE_MEMBER(xybots_state, playfield) AM_RANGE(0xffc000, 0xffc7ff) AM_MIRROR(0x7f8800) AM_RAM_WRITE(paletteram16_IIIIRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram) - AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(xybots_state, atarigen.eeprom, atarigen.eeprom_size) + AM_RANGE(0xffd000, 0xffdfff) AM_MIRROR(0x7f8000) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE_SIZE_MEMBER(xybots_state, eeprom, eeprom_size) AM_RANGE(0xffe000, 0xffe0ff) AM_MIRROR(0x7f8000) AM_READ(atarigen_sound_r) AM_RANGE(0xffe100, 0xffe1ff) AM_MIRROR(0x7f8000) AM_READ_PORT("FFE100") AM_RANGE(0xffe200, 0xffe2ff) AM_MIRROR(0x7f8000) AM_READ(special_port1_r) @@ -393,7 +393,7 @@ ROM_END static DRIVER_INIT( xybots ) { - xybots_state *state = (xybots_state *)machine->driver_data; + xybots_state *state = machine->driver_data(); state->h256 = 0x0400; atarigen_slapstic_init(machine->device("maincpu"), 0x008000, 0, 107); atarijsa_init(machine, "FFE200", 0x0100); diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index cae0c8e70cf..a117a499c36 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -36,7 +36,7 @@ static WRITE8_HANDLER( xyonix_irqack_w ) static void handle_coins(running_machine *machine, int coin) { static const int coinage_table[4][2] = {{2,3},{2,1},{1,2},{1,1}}; - xyonix_state *state = (xyonix_state *)machine->driver_data; + xyonix_state *state = machine->driver_data(); int tmp = 0; //popmessage("Coin %d", state->coin); @@ -74,7 +74,7 @@ static void handle_coins(running_machine *machine, int coin) static READ8_HANDLER ( xyonix_io_r ) { - xyonix_state *state = (xyonix_state *)space->machine->driver_data; + xyonix_state *state = space->machine->driver_data(); int regPC = cpu_get_pc(space->cpu); if (regPC == 0x27ba) @@ -126,7 +126,7 @@ static READ8_HANDLER ( xyonix_io_r ) static WRITE8_HANDLER ( xyonix_io_w ) { - xyonix_state *state = (xyonix_state *)space->machine->driver_data; + xyonix_state *state = space->machine->driver_data(); //logerror ("xyonix_port_e0_w %02x - PC = %04x\n", data, cpu_get_pc(space->cpu)); state->e0_data = data; diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index 37f4c9f9eaf..01ae18c0553 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -72,7 +72,7 @@ static WRITE8_DEVICE_HANDLER( yiear_VLM5030_control_w ) static INTERRUPT_GEN( yiear_nmi_interrupt ) { - trackfld_state *state = (trackfld_state *)device->machine->driver_data; + trackfld_state *state = device->machine->driver_data(); /* can't use nmi_line_pulse() because interrupt_enable_w() effects it */ if (state->yiear_nmi_enable) @@ -191,7 +191,7 @@ GFXDECODE_END static MACHINE_START( yiear ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->audiocpu = NULL; state->vlm = machine->device("vlm"); @@ -206,7 +206,7 @@ static MACHINE_START( yiear ) static MACHINE_RESET( yiear ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->yiear_nmi_enable = 0; state->SN76496_latch = 0; diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index cc7ea0f6138..55680eb311f 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -139,7 +139,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( magicbub_sound_command_w ) { - yunsun16_state *state = (yunsun16_state *)space->machine->driver_data; + yunsun16_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { /* @@ -557,7 +557,7 @@ GFXDECODE_END static MACHINE_START( yunsun16 ) { - yunsun16_state *state = (yunsun16_state *)machine->driver_data; + yunsun16_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -567,7 +567,7 @@ static MACHINE_START( yunsun16 ) static MACHINE_RESET( yunsun16 ) { - yunsun16_state *state = (yunsun16_state *)machine->driver_data; + yunsun16_state *state = machine->driver_data(); state->sprites_scrolldx = -0x40; state->sprites_scrolldy = -0x0f; @@ -579,7 +579,7 @@ static MACHINE_RESET( yunsun16 ) static void soundirq(running_device *device, int state) { - yunsun16_state *yunsun16 = (yunsun16_state *)device->machine->driver_data; + yunsun16_state *yunsun16 = device->machine->driver_data(); cpu_set_input_line(yunsun16->audiocpu, 0, state); } diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 3535b5b2b12..beda2214424 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -46,7 +46,7 @@ To Do: static WRITE8_HANDLER( yunsung8_bankswitch_w ) { - yunsung8_state *state = (yunsung8_state *)space->machine->driver_data; + yunsung8_state *state = space->machine->driver_data(); state->layers_ctrl = data & 0x30; // Layers enable @@ -107,7 +107,7 @@ static WRITE8_DEVICE_HANDLER( yunsung8_sound_bankswitch_w ) static WRITE8_HANDLER( yunsung8_adpcm_w ) { - yunsung8_state *state = (yunsung8_state *)space->machine->driver_data; + yunsung8_state *state = space->machine->driver_data(); /* Swap the nibbles */ state->adpcm = ((data & 0xf) << 4) | ((data >> 4) & 0xf); @@ -448,7 +448,7 @@ GFXDECODE_END static void yunsung8_adpcm_int( running_device *device ) { - yunsung8_state *state = (yunsung8_state *)device->machine->driver_data; + yunsung8_state *state = device->machine->driver_data(); msm5205_data_w(device, state->adpcm >> 4); state->adpcm <<= 4; @@ -467,7 +467,7 @@ static const msm5205_interface yunsung8_msm5205_interface = static MACHINE_START( yunsung8 ) { - yunsung8_state *state = (yunsung8_state *)machine->driver_data; + yunsung8_state *state = machine->driver_data(); UINT8 *MAIN = memory_region(machine, "maincpu"); UINT8 *AUDIO = memory_region(machine, "audiocpu"); @@ -491,7 +491,7 @@ static MACHINE_START( yunsung8 ) static MACHINE_RESET( yunsung8 ) { - yunsung8_state *state = (yunsung8_state *)machine->driver_data; + yunsung8_state *state = machine->driver_data(); state->videobank = 0; state->layers_ctrl = 0; diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index 7f0fcc97470..e29ce23694f 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -299,7 +299,7 @@ static INPUT_CHANGED( service_switch ) static INTERRUPT_GEN( vblank_int ) { - zaxxon_state *state = (zaxxon_state *)device->machine->driver_data; + zaxxon_state *state = device->machine->driver_data(); if (state->int_enabled) cpu_set_input_line(device, 0, ASSERT_LINE); @@ -308,7 +308,7 @@ static INTERRUPT_GEN( vblank_int ) static WRITE8_HANDLER( int_enable_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); state->int_enabled = data & 1; if (!state->int_enabled) @@ -325,7 +325,7 @@ static WRITE8_HANDLER( int_enable_w ) static MACHINE_START( zaxxon ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); /* register for save states */ state_save_register_global(machine, state->int_enabled); @@ -350,7 +350,7 @@ static MACHINE_RESET( razmataz ) static READ8_HANDLER( razmataz_counter_r ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* this behavior is really unknown; however, the code is using this */ /* counter as a sort of timeout when talking to the sound board */ @@ -362,7 +362,7 @@ static READ8_HANDLER( razmataz_counter_r ) static CUSTOM_INPUT( razmataz_dial_r ) { - zaxxon_state *state = (zaxxon_state *)field->port->machine->driver_data; + zaxxon_state *state = field->port->machine->driver_data(); static const char *const dialname[2] = { "DIAL0", "DIAL1" }; int num = (FPTR)param; int delta, res; @@ -403,7 +403,7 @@ static WRITE8_HANDLER( zaxxon_coin_counter_w ) // the coin input, which then needs to be explicitly cleared by the game. static WRITE8_HANDLER( zaxxon_coin_enable_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); state->coin_enable[offset] = data & 1; if (!state->coin_enable[offset]) @@ -415,7 +415,7 @@ static INPUT_CHANGED( zaxxon_coin_inserted ) { if (newval) { - zaxxon_state *state = (zaxxon_state *)field->port->machine->driver_data; + zaxxon_state *state = field->port->machine->driver_data(); state->coin_status[(int)(FPTR)param] = state->coin_enable[(int)(FPTR)param]; } @@ -424,7 +424,7 @@ static INPUT_CHANGED( zaxxon_coin_inserted ) static CUSTOM_INPUT( zaxxon_coin_r ) { - zaxxon_state *state = (zaxxon_state *)field->port->machine->driver_data; + zaxxon_state *state = field->port->machine->driver_data(); return state->coin_status[(int)(FPTR)param]; } @@ -1510,7 +1510,7 @@ static DRIVER_INIT( futspy ) static DRIVER_INIT( razmataz ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); nprinces_decode(machine, "maincpu"); diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 409334aebb9..0d5964971df 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -54,7 +54,7 @@ static READ16_HANDLER( zerozone_input_r ) static WRITE16_HANDLER( zerozone_sound_w ) { - zerozone_state *state = (zerozone_state *)space->machine->driver_data; + zerozone_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -171,7 +171,7 @@ GFXDECODE_END static MACHINE_START( zerozone ) { - zerozone_state *state = (zerozone_state *)machine->driver_data; + zerozone_state *state = machine->driver_data(); state->audiocpu = machine->device("audiocpu"); @@ -180,7 +180,7 @@ static MACHINE_START( zerozone ) static MACHINE_RESET( zerozone ) { - zerozone_state *state = (zerozone_state *)machine->driver_data; + zerozone_state *state = machine->driver_data(); state->tilebank = 0; } diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index 47b70fe3e73..9b075f24831 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -87,7 +87,7 @@ TODO: static MACHINE_START( zodiack ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state_save_register_global(machine, state->percuss_hardware); MACHINE_START_CALL(espial); @@ -95,7 +95,7 @@ static MACHINE_START( zodiack ) static MACHINE_RESET( zodiack ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->percuss_hardware = 0; MACHINE_RESET_CALL(espial); @@ -103,7 +103,7 @@ static MACHINE_RESET( zodiack ) static MACHINE_RESET( percuss ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->percuss_hardware = 1; MACHINE_RESET_CALL(espial); diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index f80856377e9..ab53e2cb696 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class _1942_state +class _1942_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1942_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1942_state(machine)); } - _1942_state(running_machine &machine) { } + _1942_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * fg_videoram; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 137661aa04c..67b72ec130c 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class _1943_state +class _1943_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1943_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1943_state(machine)); } - _1943_state(running_machine &machine) { } + _1943_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index c2ef23e4758..7b3017aabd7 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -7,12 +7,13 @@ ***************************************************************************/ -class _20pacgal_state +class _20pacgal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _20pacgal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _20pacgal_state(machine)); } - _20pacgal_state(running_machine &machine) { } + _20pacgal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 *char_gfx_ram; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index d988d4595ca..3c38f97ee97 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -4,12 +4,13 @@ *************************************************************************/ -class _4enraya_state +class _4enraya_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _4enraya_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _4enraya_state(machine)); } - _4enraya_state(running_machine &machine) { } + _4enraya_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index e3768d7d45f..cc3b5be8112 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -4,12 +4,13 @@ *************************************************************************/ -class _88games_state +class _88games_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _88games_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _88games_state(machine)); } - _88games_state(running_machine &machine) { } + _88games_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 54102cf118c..25fa68997be 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -4,12 +4,13 @@ *************************************************************************/ -class actfancr_state +class actfancr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, actfancr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, actfancr_state(machine)); } - actfancr_state(running_machine &machine) { } + actfancr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * pf1_data; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index a745475cc7b..f10a04c2aa0 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class aeroboto_state +class aeroboto_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aeroboto_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aeroboto_state(machine)); } - aeroboto_state(running_machine &machine) { } + aeroboto_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * mainram; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index f95640fde49..9d90c1af122 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -1,10 +1,11 @@ -class aerofgt_state +class aerofgt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aerofgt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aerofgt_state(machine)); } - aerofgt_state(running_machine &machine) { } + aerofgt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg1videoram; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index af1bc34f5c4..d4b97108f4c 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -4,12 +4,13 @@ *************************************************************************/ -class airbustr_state +class airbustr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, airbustr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, airbustr_state(machine)); } - airbustr_state(running_machine &machine) { } + airbustr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index f561f3d2baa..59f6d428983 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -1,10 +1,11 @@ -class ajax_state +class ajax_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ajax_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ajax_state(machine)); } - ajax_state(running_machine &machine) { } + ajax_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index cbfcb6886b9..1704ff019d4 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -4,12 +4,13 @@ *************************************************************************/ -class aliens_state +class aliens_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aliens_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aliens_state(machine)); } - aliens_state(running_machine &machine) { } + aliens_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 21891997107..2805d763bc8 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -4,12 +4,13 @@ *************************************************************************/ -class alpha68k_state +class alpha68k_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, alpha68k_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, alpha68k_state(machine)); } - alpha68k_state(running_machine &machine) { } + alpha68k_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index 57eb552f513..a194760bb59 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ambush_state +class ambush_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ambush_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ambush_state(machine)); } - ambush_state(running_machine &machine) { } + ambush_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 733d97dff98..fe3f09d2a0e 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -4,12 +4,13 @@ *************************************************************************/ -class amspdwy_state +class amspdwy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, amspdwy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, amspdwy_state(machine)); } - amspdwy_state(running_machine &machine) { } + amspdwy_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index be84ce84ee0..5a536462a58 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -4,12 +4,13 @@ *************************************************************************/ -class angelkds_state +class angelkds_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, angelkds_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, angelkds_state(machine)); } - angelkds_state(running_machine &machine) { } + angelkds_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * paletteram; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 853c9e9cbb8..6b80d3c37b4 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -1,11 +1,12 @@ -class appoooh_state +class appoooh_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, appoooh_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, appoooh_state(machine)); } - appoooh_state(running_machine &machine) { } + appoooh_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg_videoram; diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 2b90c893891..1d6bbbd666d 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -1,12 +1,13 @@ -class aquarium_state +class aquarium_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aquarium_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aquarium_state(machine)); } - aquarium_state(running_machine &machine) { } + aquarium_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * scroll; diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index e2e20b62859..2f220edd207 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -6,12 +6,13 @@ ***************************************************************************/ -class arabian_state +class arabian_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, arabian_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, arabian_state(machine)); } - arabian_state(running_machine &machine) { } + arabian_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * blitter; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 4a8f16035dd..4aac1f3819b 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -10,12 +10,13 @@ enum { PADDLE2 }; -class arkanoid_state +class arkanoid_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, arkanoid_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, arkanoid_state(machine)); } - arkanoid_state(running_machine &machine) { } + arkanoid_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 3f1df6f25b0..6150d16c06a 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -2,12 +2,13 @@ -class armedf_state +class armedf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, armedf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, armedf_state(machine)); } - armedf_state(running_machine &machine) { } + armedf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * text_videoram; diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index c11b3536c68..ed729caac54 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ashnojoe_state +class ashnojoe_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ashnojoe_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ashnojoe_state(machine)); } - ashnojoe_state(running_machine &machine) { } + ashnojoe_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * tileram; diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 5f5752cea20..5cbf0fb707d 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -4,12 +4,13 @@ *************************************************************************/ -class asterix_state +class asterix_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, asterix_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, asterix_state(machine)); } - asterix_state(running_machine &machine) { } + asterix_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index a3751d84bed..10743618815 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -4,12 +4,13 @@ ****************************************************************************/ -class astrof_state +class astrof_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrof_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrof_state(machine)); } - astrof_state(running_machine &machine) { } + astrof_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 * videoram; diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index ba00405c563..1dc6d0cbd7c 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -4,12 +4,13 @@ *************************************************************************/ -class asuka_state +class asuka_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, asuka_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, asuka_state(machine)); } - asuka_state(running_machine &machine) { } + asuka_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // this currently uses generic palette handlers diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index d5c53988a9d..9e37f0d6246 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -15,12 +15,13 @@ #define ATARIFB_HIT_EN NODE_05 -class atarifb_state +class atarifb_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarifb_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarifb_state(machine)); } - atarifb_state(running_machine &machine) { } + atarifb_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 * alphap1_videoram; diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index da7bc1dc1f6..caf29315511 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -6,14 +6,14 @@ #include "machine/atarigen.h" -class atarig1_state +class atarig1_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarig1_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarig1_state(machine)); } - atarig1_state(running_machine &machine) { } + atarig1_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT8 is_pitfight; UINT8 which_input; diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 81838a80526..b26277c6a51 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -6,14 +6,14 @@ #include "machine/atarigen.h" -class atarig42_state +class atarig42_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarig42_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarig42_state(machine)); } - atarig42_state(running_machine &machine) { } + atarig42_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT16 playfield_base; UINT16 motion_object_base; UINT16 motion_object_mask; diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index 69310d12925..80441feefe1 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -11,14 +11,14 @@ #define TRAM_ENTRIES 0x4000 #define MRAM_ENTRIES 0x8000 -class atarigt_state +class atarigt_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarigt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarigt_state(machine)); } - atarigt_state(running_machine &machine) { } + atarigt_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT8 is_primrage; UINT16 * colorram; diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 7f7275a20a8..325094c1e01 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -6,14 +6,14 @@ #include "machine/atarigen.h" -class atarigx2_state +class atarigx2_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarigx2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarigx2_state(machine)); } - atarigx2_state(running_machine &machine) { } + atarigx2_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT16 playfield_base; UINT16 motion_object_base; UINT16 motion_object_mask; diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index 8bf2a641ae1..9af5b52e8c9 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -6,19 +6,18 @@ #include "machine/atarigen.h" -class atarisy1_state +class atarisy1_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarisy1_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarisy1_state(machine)); } atarisy1_state(running_machine &machine) - : joystick_timer(machine.device("joystick_timer")), + : atarigen_state(machine), + joystick_timer(machine.device("joystick_timer")), yscroll_reset_timer(machine.device("yreset_timer")), scanline_timer(machine.device("scan_timer")), int3off_timer(machine.device("int3off_timer")) { } - atarigen_state atarigen; - UINT16 * bankselect; UINT8 joystick_type; diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 0840d160f52..34ed5d64568 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class atarisy2_state +class atarisy2_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarisy2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarisy2_state(machine)); } - atarisy2_state(running_machine &machine) { } - - atarigen_state atarigen; + atarisy2_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 * slapstic_base; diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 0ecf4430d11..74453b5265a 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -7,12 +7,13 @@ #include "sound/discrete.h" -class avalnche_state +class avalnche_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, avalnche_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, avalnche_state(machine)); } - avalnche_state(running_machine &machine) { } + avalnche_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 * videoram; diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index 118b2e1148b..61cdff0be45 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class badlands_state +class badlands_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, badlands_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, badlands_state(machine)); } - badlands_state(running_machine &machine) { } - - atarigen_state atarigen; + badlands_state(running_machine &machine) + : atarigen_state(machine) { } UINT8 pedal_value[2]; diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 0fb391bb9ab..1e56b54769f 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -26,13 +26,14 @@ #define POLY17_ADD 0x18000 -class balsente_state +class balsente_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, balsente_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, balsente_state(machine)); } balsente_state(running_machine &machine) - : scanline_timer(machine.device("scan_timer")), + : driver_data_t(machine), + scanline_timer(machine.device("scan_timer")), counter_0_timer(machine.device("8253_0_timer")) { astring temp; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 2b594773a4a..c1777b86599 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -9,12 +9,13 @@ #define BANKP_CPU_CLOCK (BANKP_MASTER_CLOCK/6) #define BANKP_SN76496_CLOCK (BANKP_MASTER_CLOCK/6) -class bankp_state +class bankp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bankp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bankp_state(machine)); } - bankp_state(running_machine &machine) { } + bankp_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index 82f66729ccb..fb54170c1c7 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class batman_state +class batman_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, batman_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, batman_state(machine)); } - batman_state(running_machine &machine) { } - - atarigen_state atarigen; + batman_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 latch_data; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index e15f125a2df..cce9989a2e1 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class battlane_state +class battlane_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlane_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlane_state(machine)); } - battlane_state(running_machine &machine) { } + battlane_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * tileram; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 0b33c0f03df..5fa99d823c3 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class battlex_state +class battlex_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlex_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlex_state(machine)); } - battlex_state(running_machine &machine) { } + battlex_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 6f943084787..91a8c10b043 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -4,12 +4,13 @@ *************************************************************************/ -class battlnts_state +class battlnts_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlnts_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlnts_state(machine)); } - battlnts_state(running_machine &machine) { } + battlnts_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // this currently uses generic palette handling diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h index 4e04e354718..0ce41ed1aba 100644 --- a/src/mame/includes/beathead.h +++ b/src/mame/includes/beathead.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class beathead_state +class beathead_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beathead_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beathead_state(machine)); } - beathead_state(running_machine &machine) { } - - atarigen_state atarigen; + beathead_state(running_machine &machine) + : atarigen_state(machine) { } UINT32 * vram_bulk_latch; UINT32 * palette_select; diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 82b131a543b..fa2fe19af46 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -1,10 +1,11 @@ -class bigevglf_state +class bigevglf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigevglf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigevglf_state(machine)); } - bigevglf_state(running_machine &machine) { } + bigevglf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * paletteram; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index f37d8e60089..73cd4fdb74c 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -1,9 +1,10 @@ -class bigstrkb_state +class bigstrkb_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigstrkb_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigstrkb_state(machine)); } - bigstrkb_state(running_machine &machine) { } + bigstrkb_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *tilemap; tilemap_t *tilemap2; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 244ce185d52..05da00a2431 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class bionicc_state +class bionicc_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bionicc_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bionicc_state(machine)); } - bionicc_state(running_machine &machine) { } + bionicc_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bgvideoram; diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 711dc3270ad..d1a9428a69b 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -7,12 +7,13 @@ #define CPU_CLOCK (XTAL_24MHz / 2) /* 68000 clock */ #define SOUND_CLOCK XTAL_16_9344MHz /* YMZ280 clock */ -class bishi_state +class bishi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bishi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bishi_state(machine)); } - bishi_state(running_machine &machine) { } + bishi_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 16ab06256a9..9aece9b324a 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -4,12 +4,13 @@ *************************************************************************/ -class bladestl_state +class bladestl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bladestl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bladestl_state(machine)); } - bladestl_state(running_machine &machine) { } + bladestl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * paletteram; diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 72b40b01f3b..46ad02036ec 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class blktiger_state +class blktiger_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blktiger_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blktiger_state(machine)); } - blktiger_state(running_machine &machine) { } + blktiger_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * txvideoram; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 10e9f9faa6d..2893bd26e4e 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class blmbycar_state +class blmbycar_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blmbycar_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blmbycar_state(machine)); } - blmbycar_state(running_machine &machine) { } + blmbycar_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * vram_0; diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index c7faf95a4e8..8301e8d98e2 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -1,12 +1,13 @@ #include "sound/discrete.h" #include "sound/samples.h" -class blockade_state +class blockade_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockade_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockade_state(machine)); } - blockade_state(running_machine &machine) { } + blockade_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 * videoram; diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index e4ca63a728a..7492a647e2e 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -4,12 +4,13 @@ *************************************************************************/ -class blockhl_state +class blockhl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockhl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockhl_state(machine)); } - blockhl_state(running_machine &machine) { } + blockhl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index b1efe5fe4f7..01ff3bcf8c0 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class blockout_state +class blockout_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockout_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockout_state(machine)); } - blockout_state(running_machine &machine) { } + blockout_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 5c95fdbbdbd..1fe51a28810 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class blstroid_state +class blstroid_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blstroid_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blstroid_state(machine)); } - blstroid_state(running_machine &machine) { } - - atarigen_state atarigen; + blstroid_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 * priorityram; }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 6decedd0729..9812303a2c5 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class blueprnt_state +class blueprnt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blueprnt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blueprnt_state(machine)); } - blueprnt_state(running_machine &machine) { } + blueprnt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index 567fe6b319d..66c566aed86 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -4,12 +4,13 @@ *************************************************************************/ -class bogeyman_state +class bogeyman_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bogeyman_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bogeyman_state(machine)); } - bogeyman_state(running_machine &machine) { } + bogeyman_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 6f42f8f7ef5..ae586822ba7 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -4,12 +4,13 @@ *************************************************************************/ -class bombjack_state +class bombjack_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bombjack_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bombjack_state(machine)); } - bombjack_state(running_machine &machine) { } + bombjack_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h index 68fde98664e..cca520bbf86 100644 --- a/src/mame/includes/boogwing.h +++ b/src/mame/includes/boogwing.h @@ -7,13 +7,14 @@ #include "sound/okim6295.h" #include "video/deco16ic.h" -class boogwing_state +class boogwing_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, boogwing_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, boogwing_state(machine)); } boogwing_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), audiocpu(machine.device("audiocpu")), deco16ic(machine.device("deco_custom")), oki1(machine.device("oki1")), diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 804bc1a72d9..faa5d78f119 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -4,12 +4,13 @@ *************************************************************************/ -class bottom9_state +class bottom9_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bottom9_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bottom9_state(machine)); } - bottom9_state(running_machine &machine) { } + bottom9_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 74bcca56d64..e5080c1f13f 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class brkthru_state +class brkthru_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, brkthru_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, brkthru_state(machine)); } - brkthru_state(running_machine &machine) { } + brkthru_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index a8b8aa19fa3..4aaaa33bd81 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -13,12 +13,13 @@ #define BSKTBALL_BOUNCE_EN NODE_04 -class bsktball_state +class bsktball_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bsktball_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bsktball_state(machine)); } - bsktball_state(running_machine &machine) { } + bsktball_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index dacfffd1a14..d0bd901111a 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -1,10 +1,11 @@ -class btime_state +class btime_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, btime_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, btime_state(machine)); } - btime_state(running_machine &machine) { } + btime_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index b327d969d27..f74e72bf6cc 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -1,10 +1,11 @@ -class bublbobl_state +class bublbobl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bublbobl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bublbobl_state(machine)); } - bublbobl_state(running_machine &machine) { } + bublbobl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * mcu_sharedram; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index f52d51082b8..837a32aff95 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -3,12 +3,13 @@ 40love.c, bking.c and msisaac.c */ -class buggychl_state +class buggychl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, buggychl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, buggychl_state(machine)); } - buggychl_state(running_machine &machine) { } + buggychl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; // buggychl, 40love, msisaac diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 5d17dcb0018..d4b608823cd 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -7,12 +7,13 @@ #define BW_DEBUG 0 #define MAX_SOUNDS 16 -class bwing_state +class bwing_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bwing_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bwing_state(machine)); } - bwing_state(running_machine &machine) { } + bwing_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index 09c4f42af34..4d24fc72b94 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -1,9 +1,10 @@ -class cabal_state +class cabal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cabal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cabal_state(machine)); } - cabal_state(running_machine &machine) { } + cabal_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *spriteram; UINT16 *colorram; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 2d7a411d367..43863ee54b0 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -17,12 +17,13 @@ -class canyon_state +class canyon_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, canyon_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, canyon_state(machine)); } - canyon_state(running_machine &machine) { } + canyon_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 7d525de804b..d0ee902f447 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -4,12 +4,13 @@ *************************************************************************/ -class capbowl_state +class capbowl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, capbowl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, capbowl_state(machine)); } - capbowl_state(running_machine &machine) { } + capbowl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * rowaddress; diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index fef16ad7ba0..f199441e955 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class carjmbre_state +class carjmbre_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, carjmbre_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, carjmbre_state(machine)); } - carjmbre_state(running_machine &machine) { } + carjmbre_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 52b2eb57f85..db637731605 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -21,12 +21,13 @@ struct sprite_cave #define MAX_PRIORITY 4 #define MAX_SPRITE_NUM 0x400 -class cave_state +class cave_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cave_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cave_state(machine)); } - cave_state(running_machine &machine) { } + cave_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoregs; diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index a22268f5188..758cd09b418 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -4,12 +4,13 @@ *************************************************************************/ -class cbasebal_state +class cbasebal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cbasebal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cbasebal_state(machine)); } - cbasebal_state(running_machine &machine) { } + cbasebal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * spriteram; diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index 08afeda8713..8cb7620f02e 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -4,12 +4,13 @@ *************************************************************************/ -class cbuster_state +class cbuster_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cbuster_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cbuster_state(machine)); } - cbuster_state(running_machine &machine) { } + cbuster_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index bd0d80cf48a..320ee4cd42d 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ccastles_state +class ccastles_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ccastles_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ccastles_state(machine)); } - ccastles_state(running_machine &machine) { } + ccastles_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 58b2bc0aecb..aeb80d26007 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -3,12 +3,13 @@ #define MCU_INITIAL_SEED 0x81 -class chaknpop_state +class chaknpop_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chaknpop_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chaknpop_state(machine)); } - chaknpop_state(running_machine &machine) { } + chaknpop_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * mcu_ram; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index c84e3e6fcbe..116d9327d2e 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -8,12 +8,13 @@ #define CPUTAG_MCU "mcu" -class champbas_state +class champbas_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, champbas_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, champbas_state(machine)); } - champbas_state(running_machine &machine) { } + champbas_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg_videoram; diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 4cffa36993b..48f6c38faba 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -1,11 +1,12 @@ -class changela_state +class changela_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, changela_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, changela_state(machine)); } - changela_state(running_machine &machine) { } + changela_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 5d5a4f071c4..f6d5298af32 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -5,12 +5,13 @@ *************************************************************************/ -class cheekyms_state +class cheekyms_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cheekyms_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cheekyms_state(machine)); } - cheekyms_state(running_machine &machine) { } + cheekyms_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 6b2e2e517ac..6cecce00998 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -4,12 +4,13 @@ *************************************************************************/ -class chqflag_state +class chqflag_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chqflag_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chqflag_state(machine)); } - chqflag_state(running_machine &machine) { } + chqflag_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index d9ab846693a..4cfdd0db4cb 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -24,12 +24,13 @@ #define DRACO_PAGERAM_MASK 0x7ff #define CIDELSA_CHARRAM_MASK 0x7ff -class cidelsa_state +class cidelsa_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cidelsa_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cidelsa_state(machine)); } - cidelsa_state(running_machine &machine) { } + cidelsa_state(running_machine &machine) + : driver_data_t(machine) { } /* cpu state */ cdp1802_control_mode cdp1802_mode; diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index a82603987a4..321e59b7d51 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -6,12 +6,13 @@ #define GAME_IS_RIPCORD (state->game_id == 4) -class circus_state +class circus_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, circus_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, circus_state(machine)); } - circus_state(running_machine &machine) { } + circus_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 6bb8aa74772..ab67707ac1a 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -4,12 +4,13 @@ *************************************************************************/ -class circusc_state +class circusc_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, circusc_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, circusc_state(machine)); } - circusc_state(running_machine &machine) { } + circusc_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 64176bbab98..78dcfb6886b 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -4,12 +4,13 @@ *************************************************************************/ -class citycon_state +class citycon_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, citycon_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, citycon_state(machine)); } - citycon_state(running_machine &machine) { } + citycon_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 9d446c594b8..19e69c88a52 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -4,12 +4,13 @@ *************************************************************************/ -class cloud9_state +class cloud9_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cloud9_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cloud9_state(machine)); } - cloud9_state(running_machine &machine) { } + cloud9_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index a37eb42cdff..40a98178284 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -7,13 +7,14 @@ #include "sound/okim6295.h" #include "video/deco16ic.h" -class cninja_state +class cninja_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cninja_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cninja_state(machine)); } cninja_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), audiocpu(machine.device("audiocpu")), deco16ic(machine.device("deco_custom")), raster_irq_timer(machine.device("raster_timer")), diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 63f2be9564b..eea07faf2d9 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -4,12 +4,13 @@ *************************************************************************/ -class combatsc_state +class combatsc_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, combatsc_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, combatsc_state(machine)); } - combatsc_state(running_machine &machine) { } + combatsc_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 3145dc6a7fd..61b0de8b8ac 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -4,12 +4,13 @@ *************************************************************************/ -class commando_state +class commando_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, commando_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, commando_state(machine)); } - commando_state(running_machine &machine) { } + commando_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 3a879ea5569..a18d751aace 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -4,12 +4,13 @@ *************************************************************************/ -class compgolf_state +class compgolf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, compgolf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, compgolf_state(machine)); } - compgolf_state(running_machine &machine) { } + compgolf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 6641cc459ce..3ad74b20222 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -4,12 +4,13 @@ *************************************************************************/ -class contra_state +class contra_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, contra_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, contra_state(machine)); } - contra_state(running_machine &machine) { } + contra_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * spriteram; diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index 578b0a41383..7ab1d42b86a 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -1,9 +1,10 @@ -class coolpool_state +class coolpool_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, coolpool_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, coolpool_state(machine)); } - coolpool_state(running_machine &machine) { } + coolpool_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *vram_base; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 1ee3325197a..d08e4decdc7 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -4,12 +4,13 @@ *************************************************************************/ -class cop01_state +class cop01_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cop01_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cop01_state(machine)); } - cop01_state(running_machine &machine) { } + cop01_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgvideoram; diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index a0fbf185208..ebd8c44b278 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -4,12 +4,13 @@ *************************************************************************/ -class copsnrob_state +class copsnrob_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, copsnrob_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, copsnrob_state(machine)); } - copsnrob_state(running_machine &machine) { } + copsnrob_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index cbf8a690160..68f3040afb0 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -8,12 +8,13 @@ #define Z80_MASTER_CLOCK XTAL_10_816MHz -class cosmic_state +class cosmic_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cosmic_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cosmic_state(machine)); } - cosmic_state(running_machine &machine) { } + cosmic_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 96e7bcbda21..8506c127193 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -57,12 +57,13 @@ struct CPS1config }; -class cps_state +class cps_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cps_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cps_state(machine)); } - cps_state(running_machine &machine) { } + cps_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // cps1 diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index ebdfceaa2a1..54f9a3e4738 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -7,12 +7,13 @@ #define MASTER_CLOCK 18432000 -class crgolf_state +class crgolf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crgolf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crgolf_state(machine)); } - crgolf_state(running_machine &machine) { } + crgolf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram_a; diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index a8fffa9a97a..e9103968f17 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -4,12 +4,13 @@ *************************************************************************/ -class crimfght_state +class crimfght_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crimfght_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crimfght_state(machine)); } - crimfght_state(running_machine &machine) { } + crimfght_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 0f3947569b1..f3628e3f3e6 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -4,12 +4,13 @@ *************************************************************************/ -class crospang_state +class crospang_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crospang_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crospang_state(machine)); } - crospang_state(running_machine &machine) { } + crospang_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_videoram; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 365f7eb1333..a650cb5794f 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -1,10 +1,11 @@ -class crshrace_state +class crshrace_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crshrace_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crshrace_state(machine)); } - crshrace_state(running_machine &machine) { } + crshrace_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram1; diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 3ab5ca0527c..b104ab4cbc7 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -16,12 +16,13 @@ struct cvs_star int x, y, code; }; -class cvs_state +class cvs_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cvs_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cvs_state(machine)); } - cvs_state(running_machine &machine) { } + cvs_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * video_ram; diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 36302ca60a2..3ae74826f0f 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class cyberbal_state +class cyberbal_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cyberbal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cyberbal_state(machine)); } - cyberbal_state(running_machine &machine) { } - - atarigen_state atarigen; + cyberbal_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 * paletteram_0; UINT16 * paletteram_1; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 92e43690671..60ae8291406 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -7,12 +7,13 @@ #define DARIUS_VOL_MAX (3*2 + 2) #define DARIUS_PAN_MAX (2 + 2 + 1) /* FM 2port + PSG 2port + DA 1port */ -class darius_state +class darius_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, darius_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, darius_state(machine)); } - darius_state(running_machine &machine) { } + darius_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 38e83efbd88..ed65aa53021 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -7,13 +7,14 @@ #include "sound/okim6295.h" #include "video/deco16ic.h" -class dassault_state +class dassault_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dassault_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dassault_state(machine)); } dassault_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), audiocpu(machine.device("audiocpu")), subcpu(machine.device("sub")), deco16ic(machine.device("deco_custom")), diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index deccc424bd1..88c96125cd3 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -4,12 +4,13 @@ *************************************************************************/ -class dbz_state +class dbz_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dbz_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dbz_state(machine)); } - dbz_state(running_machine &machine) { } + dbz_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg1_videoram; diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index dea6d7c1669..a3c302fa6d6 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -5,12 +5,13 @@ **************************************************************************/ -class dcheese_state +class dcheese_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dcheese_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dcheese_state(machine)); } - dcheese_state(running_machine &machine) { } + dcheese_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT16 blitter_color[2]; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 9f515e18911..8f47db1cbfa 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -5,12 +5,13 @@ *************************************************************************/ -class dday_state +class dday_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dday_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dday_state(machine)); } - dday_state(running_machine &machine) { } + dday_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgvideoram; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 03fcb99b4fe..9786c02cf5e 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -5,12 +5,13 @@ *************************************************************************/ -class ddragon_state +class ddragon_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddragon_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddragon_state(machine)); } - ddragon_state(running_machine &machine) { } + ddragon_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * rambase; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 333c68d5559..2c7f1458db5 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -5,12 +5,13 @@ *************************************************************************/ -class ddragon3_state +class ddragon3_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddragon3_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddragon3_state(machine)); } - ddragon3_state(running_machine &machine) { } + ddragon3_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_videoram; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 189a12dc1b7..59508ecdbdd 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class ddribble_state +class ddribble_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddribble_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddribble_state(machine)); } - ddribble_state(running_machine &machine) { } + ddribble_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * sharedram; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 1aba5fda0da..777ecea112c 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -1,10 +1,11 @@ -class dec8_state +class dec8_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dec8_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dec8_state(machine)); } - dec8_state(running_machine &machine) { } + dec8_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 5ddf4f5fd34..ba60fd6e5f1 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -5,12 +5,13 @@ *************************************************************************/ -class deniam_state +class deniam_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, deniam_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, deniam_state(machine)); } - deniam_state(running_machine &machine) { } + deniam_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index 0c6f35af5a8..621771204b9 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -4,12 +4,13 @@ *************************************************************************/ -class dietgo_state +class dietgo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dietgo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dietgo_state(machine)); } - dietgo_state(running_machine &machine) { } + dietgo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 783ddf814d7..130923dca7c 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -6,12 +6,13 @@ #define PROT_OUTPUT_BUFFER_SIZE 8 -class djboy_state +class djboy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, djboy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, djboy_state(machine)); } - djboy_state(running_machine &machine) { } + djboy_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 *videoram; diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 5766b9deb1e..63fc335f709 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -69,12 +69,13 @@ enum #define DK3_PALETTE_LENGTH (256+256+8+1) /* (256) */ #define RS_PALETTE_LENGTH (256+256+8+1) -class dkong_state +class dkong_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dkong_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dkong_state(machine)); } - dkong_state(running_machine &machine) { } + dkong_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * video_ram; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 961191f3d71..120e3875b93 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -1,11 +1,12 @@ -class docastle_state +class docastle_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, docastle_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, docastle_state(machine)); } - docastle_state(running_machine &machine) { } + docastle_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index c9204217aa7..bd65fd06f05 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -3,12 +3,13 @@ #define BITMAPRAM_SIZE 0x6000 -class dogfgt_state +class dogfgt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dogfgt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dogfgt_state(machine)); } - dogfgt_state(running_machine &machine) { } + dogfgt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgvideoram; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 84e1301b961..1275e6ba766 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -22,12 +22,13 @@ #define DRAGRACE_ATTRACT_EN NODE_09 -class dragrace_state +class dragrace_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dragrace_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dragrace_state(machine)); } - dragrace_state(running_machine &machine) { } + dragrace_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * playfield_ram; diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index d84da91538f..c97d990945d 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -1,13 +1,14 @@ #include "sound/okim6295.h" -class drgnmst_state +class drgnmst_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drgnmst_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drgnmst_state(machine)); } drgnmst_state(running_machine &machine) - : oki_1(machine.device("oki1")), + : driver_data_t(machine), + oki_1(machine.device("oki1")), oki_2(machine.device("oki2")) { } /* memory pointers */ diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index adb83a867e7..ae22370c0a2 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -6,12 +6,13 @@ -class dribling_state +class dribling_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dribling_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dribling_state(machine)); } - dribling_state(running_machine &machine) { } + dribling_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 5cf19a54706..050a357b58f 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -5,12 +5,13 @@ *************************************************************************/ -class drmicro_state +class drmicro_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drmicro_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drmicro_state(machine)); } - drmicro_state(running_machine &machine) { } + drmicro_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index d48a6168f7b..fb748229cfa 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -6,12 +6,13 @@ #include "sound/okim6295.h" -class dynax_state +class dynax_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dynax_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dynax_state(machine)); } - dynax_state(running_machine &machine) { } + dynax_state(running_machine &machine) + : driver_data_t(machine) { } // up to 8 layers, 2 images per layer (interleaved on screen) UINT8 * pixmap[8][2]; diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index cbbb39d225f..a81ae1329e5 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -4,12 +4,13 @@ **************************************************************************/ -class epos_state +class epos_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, epos_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, epos_state(machine)); } - epos_state(running_machine &machine) { } + epos_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 4a2c7a59768..ed5be51818e 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -6,14 +6,14 @@ #include "machine/atarigen.h" -class eprom_state +class eprom_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, eprom_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, eprom_state(machine)); } - eprom_state(running_machine &machine) { } + eprom_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; int screen_intensity; int video_disable; UINT16 * sync_data; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 2558028c939..db65afaa89d 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -2,12 +2,13 @@ #define POPDRUMKIT 0 -class equites_state +class equites_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, equites_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, equites_state(machine)); } - equites_state(running_machine &machine) { } + equites_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_videoram; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index e85541764d3..7f92b4e9079 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class esd16_state +class esd16_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, esd16_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, esd16_state(machine)); } - esd16_state(running_machine &machine) { } + esd16_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * vram_0; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 1adc5dcd217..70da71125d7 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class espial_state +class espial_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, espial_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, espial_state(machine)); } - espial_state(running_machine &machine) { } + espial_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 * videoram; // espial, zodiack, marineb UINT8 * colorram; // espial, marineb diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index c665dc7e59a..7a5790af20a 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -5,12 +5,13 @@ *************************************************************************/ -class exedexes_state +class exedexes_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exedexes_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exedexes_state(machine)); } - exedexes_state(running_machine &machine) { } + exedexes_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 840fd999371..67e0655b8da 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -18,12 +18,13 @@ #define EXERION_VBSTART (240) -class exerion_state +class exerion_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exerion_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exerion_state(machine)); } - exerion_state(running_machine &machine) { } + exerion_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * main_ram; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 1f579914745..92e84e14d07 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -5,12 +5,13 @@ *************************************************************************/ -class exprraid_state +class exprraid_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exprraid_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exprraid_state(machine)); } - exprraid_state(running_machine &machine) { } + exprraid_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * main_ram; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 547a2e72bd3..f0498352327 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -1,10 +1,11 @@ -class f1gp_state +class f1gp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, f1gp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, f1gp_state(machine)); } - f1gp_state(running_machine &machine) { } + f1gp_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * sharedram; diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 8b6c4145f3c..382f11e0156 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -1,11 +1,12 @@ -class fantland_state +class fantland_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fantland_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fantland_state(machine)); } - fantland_state(running_machine &machine) { } + fantland_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * spriteram; // currently directly used in a 16bit map... diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index bf123a97cb7..c45f2b62b12 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -4,12 +4,13 @@ *************************************************************************/ -class fastlane_state +class fastlane_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fastlane_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fastlane_state(machine)); } - fastlane_state(running_machine &machine) { } + fastlane_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram1; diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index c8b23becd25..2afed014a00 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -22,12 +22,13 @@ #define VISIBLE_Y_MAX (30*8) -class fcombat_state +class fcombat_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fcombat_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fcombat_state(machine)); } - fcombat_state(running_machine &machine) { } + fcombat_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 93aa738487d..e1b095e6244 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -1,11 +1,12 @@ -class fgoal_state +class fgoal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fgoal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fgoal_state(machine)); } - fgoal_state(running_machine &machine) { } + fgoal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * video_ram; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 2d2856f07c9..e75d7719032 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class finalizr_state +class finalizr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, finalizr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, finalizr_state(machine)); } - finalizr_state(running_machine &machine) { } + finalizr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 1cb4386948e..174133065ce 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class firetrap_state +class firetrap_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, firetrap_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, firetrap_state(machine)); } - firetrap_state(running_machine &machine) { } + firetrap_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg1videoram; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 2fd7f26c397..a9062603823 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -1,10 +1,11 @@ -class fitfight_state +class fitfight_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fitfight_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fitfight_state(machine)); } - fitfight_state(running_machine &machine) { } + fitfight_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * fof_100000; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 78f53e780d7..f50914024cd 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -4,12 +4,13 @@ *************************************************************************/ -class flkatck_state +class flkatck_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flkatck_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flkatck_state(machine)); } - flkatck_state(running_machine &machine) { } + flkatck_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * k007121_ram; diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 3cebc2f7f1d..6f528787b7d 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -1,10 +1,11 @@ -class flstory_state +class flstory_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flstory_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flstory_state(machine)); } - flstory_state(running_machine &machine) { } + flstory_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index 19f11a8c7e2..2e2db04abb7 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class foodf_state +class foodf_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, foodf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, foodf_state(machine)); } - foodf_state(running_machine &machine) { } - - atarigen_state atarigen; + foodf_state(running_machine &machine) + : atarigen_state(machine) { } double rweights[3]; double gweights[3]; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 5f1ef06fbc4..49c0938e99d 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -1,11 +1,12 @@ -class freekick_state +class freekick_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, freekick_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, freekick_state(machine)); } - freekick_state(running_machine &machine) { } + freekick_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index ff0487ca927..8fe909193b0 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -1,10 +1,11 @@ -class fromanc2_state +class fromanc2_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fromanc2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fromanc2_state(machine)); } - fromanc2_state(running_machine &machine) { } + fromanc2_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 *paletteram[2]; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 856ce5cef32..81baf3c6ab9 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -7,12 +7,13 @@ ***************************************************************************/ -class fromance_state +class fromance_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fromance_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fromance_state(machine)); } - fromance_state(running_machine &machine) { } + fromance_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers (used by pipedrm) */ UINT8 * videoram; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 71a3b01b180..4e8521124bb 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -1,11 +1,12 @@ -class funkybee_state +class funkybee_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funkybee_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funkybee_state(machine)); } - funkybee_state(running_machine &machine) { } + funkybee_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/funkyjet.h b/src/mame/includes/funkyjet.h index 3891c2005a0..8656aeda95c 100644 --- a/src/mame/includes/funkyjet.h +++ b/src/mame/includes/funkyjet.h @@ -4,12 +4,13 @@ *************************************************************************/ -class funkyjet_state +class funkyjet_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funkyjet_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funkyjet_state(machine)); } - funkyjet_state(running_machine &machine) { } + funkyjet_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index ba91c3b621f..6092409440d 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -1,11 +1,12 @@ -class funybubl_state +class funybubl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funybubl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funybubl_state(machine)); } - funybubl_state(running_machine &machine) { } + funybubl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * banked_vram; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 0955833603a..0e9a0feb554 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -1,11 +1,12 @@ -class fuuki16_state +class fuuki16_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fuuki16_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fuuki16_state(machine)); } - fuuki16_state(running_machine &machine) { } + fuuki16_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * vram_0; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index ae493fe064b..149edfff5f1 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -9,12 +9,13 @@ /* NOTE: YMF278B_STD_CLOCK is defined in /src/emu/sound/ymf278b.h */ -class fuuki32_state +class fuuki32_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fuuki32_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fuuki32_state(machine)); } - fuuki32_state(running_machine &machine) { } + fuuki32_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * vram_0; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 8a7fd78a1c6..1908e2036dd 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class gaelco_state +class gaelco_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gaelco_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gaelco_state(machine)); } - gaelco_state(running_machine &machine) { } + gaelco_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 9e8f34c3380..c92210f0b05 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class gaiden_state +class gaiden_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gaiden_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gaiden_state(machine)); } - gaiden_state(running_machine &machine) { } + gaiden_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 8a41368c90a..35fb9748921 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -1,11 +1,12 @@ #include "sound/discrete.h" -class _galaga_state +class _galaga_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _galaga_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _galaga_state(machine)); } _galaga_state(running_machine &machine) + : driver_data_t(machine) { xevious_bs[0] = 0; xevious_bs[1] = 0; diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 1e4bb26c47c..cec46aafa41 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class galivan_state +class galivan_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galivan_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galivan_state(machine)); } - galivan_state(running_machine &machine) { } + galivan_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 67f376a60d0..6af6fe96c43 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -5,12 +5,13 @@ *************************************************************************/ -class galspnbl_state +class galspnbl_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galspnbl_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galspnbl_state(machine)); } - galspnbl_state(running_machine &machine) { } + galspnbl_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index 5de5f48c814..9c10cb348be 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -21,12 +21,13 @@ driver by Chris Moore #define LEPRECHAUN_MAIN_CPU_CLOCK (LEPRECHAUN_MAIN_MASTER_CLOCK / 4) -class gameplan_state +class gameplan_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gameplan_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gameplan_state(machine)); } - gameplan_state(running_machine &machine) { } + gameplan_state(running_machine &machine) + : driver_data_t(machine) { } /* machine state */ UINT8 current_port; diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 2e2b5052107..8f28edec63c 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -6,14 +6,14 @@ #include "machine/atarigen.h" -class gauntlet_state +class gauntlet_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gauntlet_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gauntlet_state(machine)); } - gauntlet_state(running_machine &machine) { } + gauntlet_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT16 sound_reset_val; UINT8 vindctr2_screen_refresh; UINT8 playfield_tile_bank; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index f9023704abf..ca96b7a1c6f 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class gberet_state +class gberet_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gberet_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gberet_state(machine)); } - gberet_state(running_machine &machine) { } + gberet_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index 7b213fa6050..eff5618b0e2 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gbusters_state +class gbusters_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gbusters_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gbusters_state(machine)); } - gbusters_state(running_machine &machine) { } + gbusters_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 440edd43fe3..b4dbebc1782 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -2,13 +2,14 @@ #include "sound/okim6295.h" #include "sound/msm5205.h" -class gcpinbal_state +class gcpinbal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gcpinbal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gcpinbal_state(machine)); } gcpinbal_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), oki(machine.device("oki")), msm(machine.device("msm")) { } diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 7011134a1d0..aa1302d3cb0 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gijoe_state +class gijoe_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gijoe_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gijoe_state(machine)); } - gijoe_state(running_machine &machine) { } + gijoe_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * workram; diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index bd1d02761bb..b1b5e49bbca 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ginganin_state +class ginganin_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ginganin_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ginganin_state(machine)); } - ginganin_state(running_machine &machine) { } + ginganin_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * fgram; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 8af8b235fb4..7735d86803c 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -4,12 +4,13 @@ *************************************************************************/ -class glass_state +class glass_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, glass_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, glass_state(machine)); } - glass_state(running_machine &machine) { } + glass_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 58cff5c3b17..b180948d09f 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gng_state +class gng_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gng_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gng_state(machine)); } - gng_state(running_machine &machine) { } + gng_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgvideoram; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 88af796d906..cf7fbc60733 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -4,12 +4,13 @@ *************************************************************************/ -class goal92_state +class goal92_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goal92_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goal92_state(machine)); } - goal92_state(running_machine &machine) { } + goal92_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_data; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index f03c4d69975..dcc86fa7b64 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -4,12 +4,13 @@ *************************************************************************/ -class goindol_state +class goindol_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goindol_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goindol_state(machine)); } - goindol_state(running_machine &machine) { } + goindol_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg_videoram; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index cf0cbd0f97c..571169a7c36 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -1,9 +1,10 @@ -class goldstar_state +class goldstar_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goldstar_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goldstar_state(machine)); } - goldstar_state(running_machine &machine) { } + goldstar_state(running_machine &machine) + : driver_data_t(machine) { } int dataoffset; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index e89880be58e..bd2fa1c4569 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gotcha_state +class gotcha_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gotcha_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gotcha_state(machine)); } - gotcha_state(running_machine &machine) { } + gotcha_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * fgvideoram; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 8d1c4e37b5d..61dd5e716f5 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -1,10 +1,11 @@ -class gotya_state +class gotya_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gotya_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gotya_state(machine)); } - gotya_state(running_machine &machine) { } + gotya_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 25b71be277c..d4bc0f40225 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gradius3_state +class gradius3_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gradius3_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gradius3_state(machine)); } - gradius3_state(running_machine &machine) { } + gradius3_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * gfxram; diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 9a8b91bb78d..b85b9e7ff7f 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -6,12 +6,13 @@ #include "sound/discrete.h" -class grchamp_state +class grchamp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, grchamp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, grchamp_state(machine)); } - grchamp_state(running_machine &machine) { } + grchamp_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 cpu0_out[16]; UINT8 cpu1_out[16]; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 4b664f539a1..8e4d35d80d6 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gumbo_state +class gumbo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gumbo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gumbo_state(machine)); } - gumbo_state(running_machine &machine) { } + gumbo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_videoram; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 2c277b40105..79a8208fe83 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gundealr_state +class gundealr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gundealr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gundealr_state(machine)); } - gundealr_state(running_machine &machine) { } + gundealr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg_videoram; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 1de4da9474e..c55fe56626b 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gunsmoke_state +class gunsmoke_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gunsmoke_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gunsmoke_state(machine)); } - gunsmoke_state(running_machine &machine) { } + gunsmoke_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index c8772d1e983..899d46286af 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -4,12 +4,13 @@ *************************************************************************/ -class gyruss_state +class gyruss_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gyruss_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gyruss_state(machine)); } - gyruss_state(running_machine &machine) { } + gyruss_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index ef7848404f6..a963d936c25 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -4,12 +4,13 @@ *************************************************************************/ -class hanaawas_state +class hanaawas_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hanaawas_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hanaawas_state(machine)); } - hanaawas_state(running_machine &machine) { } + hanaawas_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index a590b0b5982..0e5872a3b97 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -7,13 +7,14 @@ #include "cpu/tms34010/tms34010.h" #include "machine/atarigen.h" -class harddriv_state +class harddriv_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, harddriv_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, harddriv_state(machine)); } harddriv_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : atarigen_state(machine), + maincpu(machine.device("maincpu")), gsp(machine.device("gsp")), msp(machine.device("msp")), adsp(machine.device("adsp")), @@ -23,8 +24,6 @@ public: dsp32(machine.device("dsp32")), duart_timer(machine.device("duart_timer")) { } - atarigen_state atarigen; - cpu_device * maincpu; cpu_device * gsp; cpu_device * msp; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 326232bdeac..e3627604281 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -4,12 +4,13 @@ *************************************************************************/ -class hcastle_state +class hcastle_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hcastle_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hcastle_state(machine)); } - hcastle_state(running_machine &machine) { } + hcastle_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * pf1_videoram; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index b83b75ba1d9..da14ecf21fb 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -4,12 +4,13 @@ *************************************************************************/ -class higemaru_state +class higemaru_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, higemaru_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, higemaru_state(machine)); } - higemaru_state(running_machine &machine) { } + higemaru_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 2178a7b5822..041ec92ee4e 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -4,12 +4,13 @@ *************************************************************************/ -class himesiki_state +class himesiki_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, himesiki_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, himesiki_state(machine)); } - himesiki_state(running_machine &machine) { } + himesiki_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg_ram; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index 47566a50340..246c750a2da 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -12,12 +12,13 @@ #define HITME_ENABLE_VAL NODE_03 #define HITME_OUT1 NODE_04 -class hitme_state +class hitme_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hitme_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hitme_state(machine)); } - hitme_state(running_machine &machine) { } + hitme_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index c1320b71edf..05625807cd1 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -4,12 +4,13 @@ *************************************************************************/ -class hnayayoi_state +class hnayayoi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hnayayoi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hnayayoi_state(machine)); } - hnayayoi_state(running_machine &machine) { } + hnayayoi_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ UINT8 *pixmap[8]; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 86228f2d166..c9ef13bc6bb 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -4,12 +4,13 @@ *************************************************************************/ -class holeland_state +class holeland_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, holeland_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, holeland_state(machine)); } - holeland_state(running_machine &machine) { } + holeland_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 15ac4222c11..7e9ae520f92 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -1,10 +1,11 @@ -class homedata_state +class homedata_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, homedata_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, homedata_state(machine)); } - homedata_state(running_machine &machine) { } + homedata_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * vreg; diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index bfbe5ce766c..854783378ef 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -4,12 +4,13 @@ *************************************************************************/ -class homerun_state +class homerun_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, homerun_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, homerun_state(machine)); } - homerun_state(running_machine &machine) { } + homerun_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 5d08e588027..6e378008e73 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -2,12 +2,13 @@ #define FIRST_VISIBLE_LINE 0 #define LAST_VISIBLE_LINE 223 -class hyprduel_state +class hyprduel_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hyprduel_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hyprduel_state(machine)); } - hyprduel_state(running_machine &machine) { } + hyprduel_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoregs; diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index e08dae83859..b1bdbbee545 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ikki_state +class ikki_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ikki_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ikki_state(machine)); } - ikki_state(running_machine &machine) { } + ikki_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 4981df2e61c..ecd6d3622dd 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -1,10 +1,11 @@ -class inufuku_state +class inufuku_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, inufuku_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, inufuku_state(machine)); } - inufuku_state(running_machine &machine) { } + inufuku_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bg_videoram; diff --git a/src/mame/includes/iremz80.h b/src/mame/includes/iremz80.h index 85150409610..96d59879cb1 100644 --- a/src/mame/includes/iremz80.h +++ b/src/mame/includes/iremz80.h @@ -6,12 +6,13 @@ /* These share sound hardware (in audio/irem.h) and hence driver data */ -class irem_z80_state +class irem_z80_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, irem_z80_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, irem_z80_state(machine)); } - irem_z80_state(running_machine &machine) { } + irem_z80_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; // m52, m57, m58 diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index ecd84a09d9e..70267860a56 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ironhors_state +class ironhors_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ironhors_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ironhors_state(machine)); } - ironhors_state(running_machine &machine) { } + ironhors_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index 8151ba18a2a..ec4597b92a4 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -4,12 +4,13 @@ *************************************************************************/ -class jack_state +class jack_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jack_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jack_state(machine)); } - jack_state(running_machine &machine) { } + jack_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 6beee7e5333..64e550391b9 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -4,12 +4,13 @@ -class jackal_state +class jackal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jackal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jackal_state(machine)); } - jackal_state(running_machine &machine) { } + jackal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoctrl; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 83eb703dd7b..c3a59458b0c 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -7,12 +7,13 @@ #define MASTER_CLOCK XTAL_18_432MHz #define VOICE_CLOCK XTAL_3_579545MHz -class jailbrek_state +class jailbrek_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jailbrek_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jailbrek_state(machine)); } - jailbrek_state(running_machine &machine) { } + jailbrek_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 6061d981d90..5cc30f46c5d 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -14,12 +14,13 @@ #define JEDI_TMS5220_CLOCK (JEDI_AUDIO_CPU_OSC / 2 / 9) /* div by 9 is via a binary counter that counts from 7 to 16 */ -class jedi_state +class jedi_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jedi_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jedi_state(machine)); } - jedi_state(running_machine &machine) { } + jedi_state(running_machine &machine) + : driver_data_t(machine) { } /* machine state */ UINT8 a2d_select; diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index fb418704c50..414745ded71 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -6,12 +6,13 @@ ***************************************************************************/ -class kangaroo_state +class kangaroo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kangaroo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kangaroo_state(machine)); } - kangaroo_state(running_machine &machine) { } + kangaroo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * video_control; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 427816f4f7d..fe273c1dcee 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -4,12 +4,13 @@ *************************************************************************/ -class karnov_state +class karnov_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, karnov_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, karnov_state(machine)); } - karnov_state(running_machine &machine) { } + karnov_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index c8d56ec1efd..2fd82b4527f 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -4,12 +4,13 @@ *************************************************************************/ -class kchamp_state +class kchamp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kchamp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kchamp_state(machine)); } - kchamp_state(running_machine &machine) { } + kchamp_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 3aaaf2bdd6c..5facf518b2c 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -7,13 +7,14 @@ #include "sound/okim6295.h" #include "machine/eeprom.h" -class kickgoal_state +class kickgoal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kickgoal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kickgoal_state(machine)); } kickgoal_state(running_machine &machine) - : adpcm(machine.device("oki")), + : driver_data_t(machine), + adpcm(machine.device("oki")), eeprom(machine.device("eeprom")) { } /* memory pointers */ diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 18269fe05ca..c0e55e722a4 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -4,12 +4,13 @@ *************************************************************************/ -class kingofb_state +class kingofb_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kingofb_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kingofb_state(machine)); } - kingofb_state(running_machine &machine) { } + kingofb_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index ab0c96ab044..44c8d8058ba 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class klax_state +class klax_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, klax_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, klax_state(machine)); } - klax_state(running_machine &machine) { } - - atarigen_state atarigen; + klax_state(running_machine &machine) + : atarigen_state(machine) { } }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 08f719bfe0a..dcffafc7fab 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -4,12 +4,13 @@ *************************************************************************/ -class kncljoe_state +class kncljoe_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kncljoe_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kncljoe_state(machine)); } - kncljoe_state(running_machine &machine) { } + kncljoe_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index 554b1dd54ed..4713f641489 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -4,12 +4,13 @@ *************************************************************************/ -class kopunch_state +class kopunch_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kopunch_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kopunch_state(machine)); } - kopunch_state(running_machine &machine) { } + kopunch_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index a67ddeea015..2583793cbe4 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ksayakyu_state +class ksayakyu_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ksayakyu_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ksayakyu_state(machine)); } - ksayakyu_state(running_machine &machine) { } + ksayakyu_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index c9ba07cbfc9..9208e906260 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class kyugo_state +class kyugo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kyugo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kyugo_state(machine)); } - kyugo_state(running_machine &machine) { } + kyugo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * fgvideoram; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 5018b3b2e48..b5001d52c7c 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -4,12 +4,13 @@ *************************************************************************/ -class labyrunr_state +class labyrunr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, labyrunr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, labyrunr_state(machine)); } - labyrunr_state(running_machine &machine) { } + labyrunr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram1; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 764d30374ff..95bf9f50275 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -6,12 +6,13 @@ *************************************************************************/ -class ladybug_state +class ladybug_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ladybug_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ladybug_state(machine)); } - ladybug_state(running_machine &machine) { } + ladybug_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 80c52bdbb99..8938ab304f1 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ladyfrog_state +class ladyfrog_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ladyfrog_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ladyfrog_state(machine)); } - ladyfrog_state(running_machine &machine) { } + ladyfrog_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 2c362308f1e..594256f3a39 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -4,12 +4,13 @@ *************************************************************************/ -class laserbat_state +class laserbat_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbat_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbat_state(machine)); } - laserbat_state(running_machine &machine) { } + laserbat_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ tilemap_t *bg_tilemap; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 8af0863bf43..bd293265a6c 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class lasso_state +class lasso_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lasso_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lasso_state(machine)); } - lasso_state(running_machine &machine) { } + lasso_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index a7675dafea5..28066029cda 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -4,12 +4,13 @@ *************************************************************************/ -class lastduel_state +class lastduel_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastduel_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastduel_state(machine)); } - lastduel_state(running_machine &machine) { } + lastduel_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * vram; diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 48b05038615..5066a2ed403 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -17,12 +17,13 @@ #define MARKER_HORZ_ADJ -1 #define MARKER_VERT_ADJ -10 -class lazercmd_state +class lazercmd_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lazercmd_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lazercmd_state(machine)); } - lazercmd_state(running_machine &machine) { } + lazercmd_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index feb769782fc..a8fd32b17e5 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -1,10 +1,11 @@ -class lemmings_state +class lemmings_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lemmings_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lemmings_state(machine)); } - lemmings_state(running_machine &machine) { } + lemmings_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pixel_0_data; diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index f7d4c36e57c..377e26db726 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -4,12 +4,13 @@ *************************************************************************/ -class lethal_state +class lethal_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lethal_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lethal_state(machine)); } - lethal_state(running_machine &machine) { } + lethal_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index cadfe853ea3..d304eb16dc6 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -1,9 +1,10 @@ -class liberate_state +class liberate_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, liberate_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, liberate_state(machine)); } - liberate_state(running_machine &machine) { } + liberate_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; UINT8 *colorram; diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index dafb5344cfd..dd041c05870 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -1,10 +1,11 @@ -class lkage_state +class lkage_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lkage_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lkage_state(machine)); } - lkage_state(running_machine &machine) { } + lkage_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 * scroll; UINT8 * vreg; diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index e68fddea817..b1d2f6202ca 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -15,12 +15,13 @@ #define VTOTAL 280 -class lockon_state +class lockon_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lockon_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lockon_state(machine)); } - lockon_state(running_machine &machine) { } + lockon_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 *char_ram; diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index cd20ac49845..e29402555c4 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -1,10 +1,11 @@ -class lsasquad_state +class lsasquad_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lsasquad_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lsasquad_state(machine)); } - lsasquad_state(running_machine &machine) { } + lsasquad_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * scrollram; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 390f55a096c..ad5fc78c6a0 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -1,10 +1,11 @@ -class lwings_state +class lwings_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lwings_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lwings_state(machine)); } - lwings_state(running_machine &machine) { } + lwings_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * fgvideoram; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index cf61b35eba9..14617f2d711 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -27,12 +27,13 @@ #define IREMM15_VBSTART (240) #define IREMM15_VBEND (16) -class m10_state +class m10_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m10_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m10_state(machine)); } - m10_state(running_machine &machine) { } + m10_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * chargen; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 057c4fc6a11..781368e5e34 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -4,12 +4,13 @@ *************************************************************************/ -class macrossp_state +class macrossp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, macrossp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, macrossp_state(machine)); } - macrossp_state(running_machine &machine) { } + macrossp_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * mainram; diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index ca39cd624b0..6de2224e06e 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -4,12 +4,13 @@ *************************************************************************/ -class madmotor_state +class madmotor_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, madmotor_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, madmotor_state(machine)); } - madmotor_state(running_machine &machine) { } + madmotor_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 09ef85309fa..6bd56e93713 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mainevt_state +class mainevt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mainevt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mainevt_state(machine)); } - mainevt_state(running_machine &machine) { } + mainevt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 06537bcbf39..062ff374471 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -5,12 +5,13 @@ *************************************************************************/ -class malzak_state +class malzak_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, malzak_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, malzak_state(machine)); } - malzak_state(running_machine &machine) { } + malzak_state(running_machine &machine) + : driver_data_t(machine) { } /* misc */ // int playfield_x[256]; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 869fcc80979..91dbafa772c 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -1,9 +1,10 @@ -class mappy_state +class mappy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mappy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mappy_state(machine)); } - mappy_state(running_machine &machine) { } + mappy_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; UINT8 *spriteram; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index d36cb1042d3..ba26b2c8464 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -30,12 +30,13 @@ #define MARIO_PALETTE_LENGTH (256) -class mario_state +class mario_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mario_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mario_state(machine)); } - mario_state(running_machine &machine) { } + mario_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index c3fd260bd90..dee28a14e91 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -4,12 +4,13 @@ *************************************************************************/ -class markham_state +class markham_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, markham_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, markham_state(machine)); } - markham_state(running_machine &machine) { } + markham_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index c08a8092f66..5705c531532 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -1,10 +1,11 @@ -class matmania_state +class matmania_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, matmania_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, matmania_state(machine)); } - matmania_state(running_machine &machine) { } + matmania_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 0da15416fc0..795e191befc 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -1,10 +1,11 @@ -class mcatadv_state +class mcatadv_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mcatadv_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mcatadv_state(machine)); } - mcatadv_state(running_machine &machine) { } + mcatadv_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram1; diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index a7581b5b69d..86195d1edcb 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -4,12 +4,13 @@ *************************************************************************/ -class megazone_state +class megazone_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, megazone_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, megazone_state(machine)); } - megazone_state(running_machine &machine) { } + megazone_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * scrollx; diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 7cf5ace9525..81622ff3aa1 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mermaid_state +class mermaid_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mermaid_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mermaid_state(machine)); } - mermaid_state(running_machine &machine) { } + mermaid_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index a4624e094c2..89ae88ac393 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -1,9 +1,10 @@ -class metalmx_state +class metalmx_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metalmx_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metalmx_state(machine)); } - metalmx_state(running_machine &machine) { } + metalmx_state(running_machine &machine) + : driver_data_t(machine) { } running_device *maincpu; running_device *gsp; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 5063c5a6ade..9319856dc5b 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -4,12 +4,13 @@ *************************************************************************/ -class metlclsh_state +class metlclsh_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metlclsh_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metlclsh_state(machine)); } - metlclsh_state(running_machine &machine) { } + metlclsh_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgram; diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 840b16fc4c2..ec323273d8a 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -8,13 +8,14 @@ #include "sound/2151intf.h" #include "video/konicdev.h" -class metro_state +class metro_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metro_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metro_state(machine)); } metro_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), audiocpu(machine.device("audiocpu")), oki(machine.device("oki")), ymsnd(machine.device("ymsnd")), diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index 65bef0a70c2..075d716a368 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -1,10 +1,11 @@ -class mexico86_state +class mexico86_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mexico86_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mexico86_state(machine)); } - mexico86_state(running_machine &machine) { } + mexico86_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * protection_ram; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 63f3b4b9b67..9e9cb784bf7 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -12,12 +12,13 @@ #define VGB_MONITOR_DISPLAY 0 #define DRMATH_MONITOR_DISPLAY 0 -class micro3d_state +class micro3d_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, micro3d_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, micro3d_state(machine)); } - micro3d_state(running_machine &machine) { } + micro3d_state(running_machine &machine) + : driver_data_t(machine) { } struct { diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 3538fde056f..ca0f2aec945 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mikie_state +class mikie_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mikie_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mikie_state(machine)); } - mikie_state(running_machine &machine) { } + mikie_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index d59b471862f..901ac16c1c3 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -6,13 +6,14 @@ #include "sound/okim6295.h" -class mitchell_state +class mitchell_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mitchell_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mitchell_state(machine)); } mitchell_state(running_machine &machine) - : audiocpu(machine.device("audiocpu")), + : driver_data_t(machine), + audiocpu(machine.device("audiocpu")), oki(machine.device("oki")) { } /* memory pointers */ diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index cffbf8616e6..0c58b6b6e61 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -1,9 +1,10 @@ -class mjkjidai_state +class mjkjidai_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjkjidai_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjkjidai_state(machine)); } - mjkjidai_state(running_machine &machine) { } + mjkjidai_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; UINT8 *spriteram1; diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 2e1732bfcc0..12500434f48 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -4,12 +4,13 @@ *************************************************************************/ -class momoko_state +class momoko_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, momoko_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, momoko_state(machine)); } - momoko_state(running_machine &machine) { } + momoko_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bg_scrollx; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index a29f924cbfe..fd7272ce628 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -4,12 +4,13 @@ *************************************************************************/ -class moo_state +class moo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, moo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, moo_state(machine)); } - moo_state(running_machine &machine) { } + moo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * workram; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 9f145d1b9e8..852f280a6ce 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mosaic_state +class mosaic_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaic_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaic_state(machine)); } - mosaic_state(running_machine &machine) { } + mosaic_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * fgvideoram; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index d2ddc751920..b9d6f3dfe7a 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mouser_state +class mouser_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mouser_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mouser_state(machine)); } - mouser_state(running_machine &machine) { } + mouser_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index b74ea45354a..d3e766d371e 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mrdo_state +class mrdo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrdo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrdo_state(machine)); } - mrdo_state(running_machine &machine) { } + mrdo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgvideoram; diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index e5847bf5b38..9f69702c8f1 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mrflea_state +class mrflea_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrflea_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrflea_state(machine)); } - mrflea_state(running_machine &machine) { } + mrflea_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 9aeeb5bf192..3a95b4b7d90 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -4,12 +4,13 @@ *************************************************************************/ -class mrjong_state +class mrjong_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrjong_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrjong_state(machine)); } - mrjong_state(running_machine &machine) { } + mrjong_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 919d300d961..b0bf97cbf69 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -1,10 +1,11 @@ -class mugsmash_state +class mugsmash_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mugsmash_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mugsmash_state(machine)); } - mugsmash_state(running_machine &machine) { } + mugsmash_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *videoram1; UINT16 *videoram2; diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 742b3937b52..5b5500928ce 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -4,12 +4,13 @@ *************************************************************************/ -class munchmo_state +class munchmo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, munchmo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, munchmo_state(machine)); } - munchmo_state(running_machine &machine) { } + munchmo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * vreg; diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 5fa8d5be7f2..d672bf40da5 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -30,12 +30,13 @@ #define MW8080BW_HPIXCOUNT (MW8080BW_HBSTART + 4) -class mw8080bw_state +class mw8080bw_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mw8080bw_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mw8080bw_state(machine)); } - mw8080bw_state(running_machine &machine) { } + mw8080bw_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * main_ram; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 38c54cd0ddb..5c885d3dbae 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -10,12 +10,13 @@ #define MYSTSTON_MASTER_CLOCK (XTAL_12MHz) -class mystston_state +class mystston_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mystston_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mystston_state(machine)); } - mystston_state(running_machine &machine) { } + mystston_state(running_machine &machine) + : driver_data_t(machine) { } /* machine state */ UINT8 *ay8910_data; diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index d397e5097dc..ce888f33b7c 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -6,12 +6,13 @@ /*----------- driver state -----------*/ -class _n64_state +class _n64_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _n64_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _n64_state(machine)); } - _n64_state(running_machine &machine) { } + _n64_state(running_machine &machine) + : driver_data_t(machine) { } /* video-related */ N64::RDP::Processor m_rdp; diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index 6f590cf4014..b0233494692 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -1,10 +1,11 @@ -class n8080_state +class n8080_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, n8080_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, n8080_state(machine)); } - n8080_state(running_machine &machine) { } + n8080_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 955dadc66d4..3f3cda4d6d3 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -1,9 +1,10 @@ -class nemesis_state +class nemesis_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nemesis_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nemesis_state(machine)); } - nemesis_state(running_machine &machine) { } + nemesis_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram1; diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 884d6bd8d63..29af86ab2a8 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -28,12 +28,13 @@ -class neogeo_state +class neogeo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, neogeo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, neogeo_state(machine)); } - neogeo_state(running_machine &machine) { } + neogeo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 *memcard_data; // this currently uses generic handlers diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 3b3858ac642..9455efaa976 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -1,10 +1,11 @@ -class news_state +class news_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, news_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, news_state(machine)); } - news_state(running_machine &machine) { } + news_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * bgram; diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 1059e19930f..08cb055e4ed 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ninjaw_state +class ninjaw_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ninjaw_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ninjaw_state(machine)); } - ninjaw_state(running_machine &machine) { } + ninjaw_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 2df1a487837..fe685f9c2f9 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -15,12 +15,13 @@ #define NITEDRVR_ATTRACT_EN NODE_06 -class nitedrvr_state +class nitedrvr_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nitedrvr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nitedrvr_state(machine)); } - nitedrvr_state(running_machine &machine) { } + nitedrvr_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * hvc; diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index c8958167770..94f0602109e 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -1,10 +1,11 @@ -class nycaptor_state +class nycaptor_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nycaptor_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nycaptor_state(machine)); } - nycaptor_state(running_machine &machine) { } + nycaptor_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * sharedram; diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 1bb5c6e5053..3ce0b560d53 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class offtwall_state +class offtwall_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, offtwall_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, offtwall_state(machine)); } - offtwall_state(running_machine &machine) { } - - atarigen_state atarigen; + offtwall_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 *bankswitch_base; UINT16 *bankrom_base; diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index b8542f2f6fa..edde2a7e840 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ohmygod_state +class ohmygod_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ohmygod_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ohmygod_state(machine)); } - ohmygod_state(running_machine &machine) { } + ohmygod_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index f9d08851ef4..578f9973180 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ojankohs_state +class ojankohs_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ojankohs_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ojankohs_state(machine)); } - ojankohs_state(running_machine &machine) { } + ojankohs_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 91218eeb4e0..66193596582 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -1,10 +1,11 @@ -class oneshot_state +class oneshot_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, oneshot_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, oneshot_state(machine)); } - oneshot_state(running_machine &machine) { } + oneshot_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * sprites; diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 63aaa4d14f1..3d26cd69183 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -4,12 +4,13 @@ *************************************************************************/ -class opwolf_state +class opwolf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, opwolf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, opwolf_state(machine)); } - opwolf_state(running_machine &machine) { } + opwolf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * cchip_ram; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 73e656e00a2..c17cdef72bb 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -15,12 +15,13 @@ #define ORBIT_WARNING_EN NODE_06 #define ORBIT_NOISE_EN NODE_07 -class orbit_state +class orbit_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, orbit_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, orbit_state(machine)); } - orbit_state(running_machine &machine) { } + orbit_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * playfield_ram; diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index 1e802f6e133..d9a40d2d935 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -6,12 +6,13 @@ #define OTHLDRBY_VREG_SIZE 18 -class othldrby_state +class othldrby_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othldrby_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othldrby_state(machine)); } - othldrby_state(running_machine &machine) { } + othldrby_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * vram; diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index dfeace5abf0..4110583705c 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -15,12 +15,13 @@ struct othunder_tempsprite }; -class othunder_state +class othunder_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othunder_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othunder_state(machine)); } - othunder_state(running_machine &machine) { } + othunder_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 8f915b6543b..a388879b659 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -4,12 +4,13 @@ *************************************************************************/ -class overdriv_state +class overdriv_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, overdriv_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, overdriv_state(machine)); } - overdriv_state(running_machine &machine) { } + overdriv_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index aa5dbe77143..a894566621f 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -4,12 +4,13 @@ *************************************************************************/ -class pandoras_state +class pandoras_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pandoras_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pandoras_state(machine)); } - pandoras_state(running_machine &machine) { } + pandoras_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 6364d6eee2e..85f47f40ff6 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -1,10 +1,11 @@ -class paradise_state +class paradise_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, paradise_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, paradise_state(machine)); } - paradise_state(running_machine &machine) { } + paradise_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * vram_0; diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index 0f86e66bb3c..71c071db915 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -4,12 +4,13 @@ *************************************************************************/ -class parodius_state +class parodius_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, parodius_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, parodius_state(machine)); } - parodius_state(running_machine &machine) { } + parodius_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index 7eb9b7a8087..fd5ca1882dd 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -1,9 +1,10 @@ -class pass_state +class pass_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pass_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pass_state(machine)); } - pass_state(running_machine &machine) { } + pass_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *bg_tilemap; tilemap_t *fg_tilemap; diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index 914b8eade44..f0ad59a8b9a 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -4,12 +4,13 @@ *************************************************************************/ -class pbaction_state +class pbaction_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pbaction_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pbaction_state(machine)); } - pbaction_state(running_machine &machine) { } + pbaction_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index dc09f6d6f2a..77d6a4b903e 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -1,10 +1,11 @@ -class pgm_state +class pgm_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pgm_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pgm_state(machine)); } - pgm_state(running_machine &machine) { } + pgm_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * mainram; // currently this is also used by nvram handler diff --git a/src/mame/includes/pktgaldx.h b/src/mame/includes/pktgaldx.h index 007c7969c6c..310ef3fce20 100644 --- a/src/mame/includes/pktgaldx.h +++ b/src/mame/includes/pktgaldx.h @@ -4,12 +4,13 @@ *************************************************************************/ -class pktgaldx_state +class pktgaldx_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pktgaldx_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pktgaldx_state(machine)); } - pktgaldx_state(running_machine &machine) { } + pktgaldx_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 1c1873da5c3..0b9696c8d04 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -1,10 +1,11 @@ -class playmark_state +class playmark_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, playmark_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, playmark_state(machine)); } - playmark_state(running_machine &machine) { } + playmark_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bgvideoram; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index ad17ce3f653..964b8a22a1c 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class popper_state +class popper_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, popper_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, popper_state(machine)); } - popper_state(running_machine &machine) { } + popper_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 74f770693ab..409cb5e5100 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -4,12 +4,13 @@ *************************************************************************/ -class psikyo_state +class psikyo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyo_state(machine)); } - psikyo_state(running_machine &machine) { } + psikyo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * vram_0; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 0a24f1d95e6..173c0251405 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -7,12 +7,13 @@ #define MASTER_CLOCK 57272700 // main oscillator frequency -class psikyo4_state +class psikyo4_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyo4_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyo4_state(machine)); } - psikyo4_state(running_machine &machine) { } + psikyo4_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * vidregs; diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 9970e43324c..e6b296e1fd0 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -16,12 +16,13 @@ #define SPRITE_PRI(n) (((state->vidregs[2] << (4*n)) & 0xf0000000 ) >> 28) -class psikyosh_state +class psikyosh_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyosh_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyosh_state(machine)); } - psikyosh_state(running_machine &machine) { } + psikyosh_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT32 * bgram; diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 50044dc725e..37ad252c7b6 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -4,12 +4,13 @@ *************************************************************************/ -class pushman_state +class pushman_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pushman_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pushman_state(machine)); } - pushman_state(running_machine &machine) { } + pushman_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index f836d06d7e5..5ea94f84ae3 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -17,12 +17,13 @@ #define QIX_CHARACTER_CLOCK (20000000/2/16) -class qix_state +class qix_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, qix_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, qix_state(machine)); } - qix_state(running_machine &machine) { } + qix_state(running_machine &machine) + : driver_data_t(machine) { } /* machine state */ UINT8 *_68705_port_out; diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index 82f32a683aa..b4166792e33 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -4,12 +4,13 @@ *************************************************************************/ -class rainbow_state +class rainbow_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rainbow_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rainbow_state(machine)); } - rainbow_state(running_machine &machine) { } + rainbow_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index d78b79773ee..d60c4241698 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -7,14 +7,14 @@ #include "machine/atarigen.h" /* shared with arcadecl hardware */ -class rampart_state +class rampart_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rampart_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rampart_state(machine)); } - rampart_state(running_machine &machine) { } + rampart_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT16 * bitmap; UINT8 has_mo; }; diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index ba07b3a7157..330d00fce52 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -4,12 +4,13 @@ *************************************************************************/ -class rastan_state +class rastan_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rastan_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rastan_state(machine)); } - rastan_state(running_machine &machine) { } + rastan_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // this currently uses generic palette handlers diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index 29e2199ea8e..34cd8bf9c9f 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class relief_state +class relief_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, relief_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, relief_state(machine)); } - relief_state(running_machine &machine) { } - - atarigen_state atarigen; + relief_state(running_machine &machine) + : atarigen_state(machine) { } UINT8 ym2413_volume; UINT8 overall_volume; diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 3151ab515f1..8f5e9d9b657 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -4,12 +4,13 @@ *************************************************************************/ -class rockrage_state +class rockrage_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rockrage_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rockrage_state(machine)); } - rockrage_state(running_machine &machine) { } + rockrage_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * paletteram; diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index 443c778fbad..a09d7661e43 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -7,13 +7,14 @@ #include "sound/okim6295.h" #include "video/deco16ic.h" -class rohga_state +class rohga_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rohga_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rohga_state(machine)); } rohga_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), audiocpu(machine.device("audiocpu")), deco16ic(machine.device("deco_custom")), oki1(machine.device("oki1")), diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index 3e1d8031379..8da3d1a750b 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -4,12 +4,13 @@ *************************************************************************/ -class rollerg_state +class rollerg_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rollerg_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rollerg_state(machine)); } - rollerg_state(running_machine &machine) { } + rollerg_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 4f4221d626b..cec1ea87266 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -4,12 +4,13 @@ *************************************************************************/ -class rungun_state +class rungun_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rungun_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rungun_state(machine)); } - rungun_state(running_machine &machine) { } + rungun_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * _936_videoram; diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index bb6e6fc62c2..f335338577c 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -1,9 +1,10 @@ -class sbugger_state +class sbugger_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbugger_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbugger_state(machine)); } - sbugger_state(running_machine &machine) { } + sbugger_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; UINT8 *videoram_attr; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 3e4a15e17f7..24aec8e4063 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -1,9 +1,10 @@ -class sderby_state +class sderby_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sderby_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sderby_state(machine)); } - sderby_state(running_machine &machine) { } + sderby_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *spriteram; size_t spriteram_size; diff --git a/src/mame/includes/segas16.h b/src/mame/includes/segas16.h index 85f7f7556ce..dd5fd807950 100644 --- a/src/mame/includes/segas16.h +++ b/src/mame/includes/segas16.h @@ -1,11 +1,12 @@ -class segas1x_state +class segas1x_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, segas1x_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, segas1x_state(machine)); } segas1x_state(running_machine &machine) - : interrupt_timer(machine.device("int_timer")) { } + : driver_data_t(machine), + interrupt_timer(machine.device("int_timer")) { } /* memory pointers */ // UINT16 * workram; // this is used in the nvram handler, hence it cannot be added here diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index 835855cb0cd..6c26f8fcca2 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -4,12 +4,13 @@ *************************************************************************/ -class sf_state +class sf_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sf_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sf_state(machine)); } - sf_state(running_machine &machine) { } + sf_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 3f7f95e9d78..6fa8fa874f6 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -1,9 +1,10 @@ -class shadfrce_state +class shadfrce_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shadfrce_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shadfrce_state(machine)); } - shadfrce_state(running_machine &machine) { } + shadfrce_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *fgtilemap; tilemap_t *bg0tilemap; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 10aa7a19025..6ea11468e60 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -1,9 +1,10 @@ -class shootout_state +class shootout_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shootout_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shootout_state(machine)); } - shootout_state(running_machine &machine) { } + shootout_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *background; tilemap_t *foreground; diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index 390e34c9832..74f875c05fd 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class shuuz_state +class shuuz_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shuuz_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shuuz_state(machine)); } - shuuz_state(running_machine &machine) { } - - atarigen_state atarigen; + shuuz_state(running_machine &machine) + : atarigen_state(machine) { } }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index d22ddbe0a58..d9f3464212f 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -1,9 +1,10 @@ -class sidearms_state +class sidearms_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sidearms_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sidearms_state(machine)); } - sidearms_state(running_machine &machine) { } + sidearms_state(running_machine &machine) + : driver_data_t(machine) { } int gameid; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index b4f1e663cff..1da1f4998e2 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -1,9 +1,10 @@ -class sidepckt_state +class sidepckt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sidepckt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sidepckt_state(machine)); } - sidepckt_state(running_machine &machine) { } + sidepckt_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *bg_tilemap; UINT8 *colorram; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index fdf09d84bbe..58753c2055f 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -1,9 +1,10 @@ -class silkroad_state +class silkroad_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, silkroad_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, silkroad_state(machine)); } - silkroad_state(running_machine &machine) { } + silkroad_state(running_machine &machine) + : driver_data_t(machine) { } UINT32 *vidram; UINT32 *vidram2; diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h index db1ecc5bcb9..58f1130226d 100644 --- a/src/mame/includes/simpl156.h +++ b/src/mame/includes/simpl156.h @@ -8,13 +8,14 @@ #include "sound/okim6295.h" #include "video/deco16ic.h" -class simpl156_state +class simpl156_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, simpl156_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, simpl156_state(machine)); } simpl156_state(running_machine &machine) - : maincpu(machine.device("maincpu")), + : driver_data_t(machine), + maincpu(machine.device("maincpu")), deco16ic(machine.device("deco_custom")), eeprom(machine.device("eeprom")), okimusic(machine.device("okimusic")) { } diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index d0dbd41a7d6..c291be78f71 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -1,10 +1,11 @@ -class simpsons_state +class simpsons_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, simpsons_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, simpsons_state(machine)); } - simpsons_state(running_machine &machine) { } + simpsons_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 44d31f67e75..34b18dd777d 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class skullxbo_state +class skullxbo_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skullxbo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skullxbo_state(machine)); } - skullxbo_state(running_machine &machine) { } - - atarigen_state atarigen; + skullxbo_state(running_machine &machine) + : atarigen_state(machine) { } }; diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index af893f43fe5..07d2dda4c16 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -4,12 +4,13 @@ *************************************************************************/ -class skyfox_state +class skyfox_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyfox_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyfox_state(machine)); } - skyfox_state(running_machine &machine) { } + skyfox_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * spriteram; diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 9778c1ba9d0..c0c14a45cf0 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -14,12 +14,13 @@ struct slapshot_tempsprite int primask; }; -class slapshot_state +class slapshot_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, slapshot_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, slapshot_state(machine)); } - slapshot_state(running_machine &machine) { } + slapshot_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * color_ram; diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 0f3a4863ba7..77a1d05f439 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -395,12 +395,13 @@ struct snes_superscope typedef void (*snes_io_read)(running_machine *machine); typedef UINT8 (*snes_oldjoy_read)(running_machine *machine); -class snes_state +class snes_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, snes_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, snes_state(machine)); } - snes_state(running_machine &machine) { } + snes_state(running_machine &machine) + : driver_data_t(machine) { } /* misc */ UINT16 htmult; /* in 512 wide, we run HTOTAL double and halve it on latching */ diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index bd08d1b7f41..d3bbcd3aeef 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -4,12 +4,13 @@ *************************************************************************/ -class sonson_state +class sonson_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sonson_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sonson_state(machine)); } - sonson_state(running_machine &machine) { } + sonson_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 9445c5c0019..5ec9d3daa54 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -1,9 +1,10 @@ -class spbactn_state +class spbactn_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spbactn_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spbactn_state(machine)); } - spbactn_state(running_machine &machine) { } + spbactn_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 *bgvideoram; UINT16 *fgvideoram; diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 30718675488..0992c4ef61e 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -4,12 +4,13 @@ *************************************************************************/ -class spy_state +class spy_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spy_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spy_state(machine)); } - spy_state(running_machine &machine) { } + spy_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 0cb420ed554..c2c0534fc33 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -1,9 +1,10 @@ -class srmp2_state +class srmp2_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp2_state(machine)); } - srmp2_state(running_machine &machine) { } + srmp2_state(running_machine &machine) + : driver_data_t(machine) { } int color_bank; int gfx_bank; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 94d537d8e61..afc34c447c1 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -1,9 +1,10 @@ -class sslam_state +class sslam_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sslam_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sslam_state(machine)); } - sslam_state(running_machine &machine) { } + sslam_state(running_machine &machine) + : driver_data_t(machine) { } emu_timer *music_timer; diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 386b2af69c3..710092d85a2 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -7,12 +7,13 @@ ****************************************************************************/ -class stactics_state +class stactics_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, stactics_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, stactics_state(machine)); } - stactics_state(running_machine &machine) { } + stactics_state(running_machine &machine) + : driver_data_t(machine) { } /* machine state */ int vert_pos; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 70e6129a92e..119b14c27af 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -1,9 +1,10 @@ -class stlforce_state +class stlforce_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, stlforce_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, stlforce_state(machine)); } - stlforce_state(running_machine &machine) { } + stlforce_state(running_machine &machine) + : driver_data_t(machine) { } tilemap_t *bg_tilemap; tilemap_t *mlow_tilemap; diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h index c91adcc5d69..19825594b84 100644 --- a/src/mame/includes/supbtime.h +++ b/src/mame/includes/supbtime.h @@ -4,12 +4,13 @@ *************************************************************************/ -class supbtime_state +class supbtime_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supbtime_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supbtime_state(machine)); } - supbtime_state(running_machine &machine) { } + supbtime_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 239d61e48e8..bde133d1758 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -4,12 +4,13 @@ *************************************************************************/ -class suprslam_state +class suprslam_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprslam_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprslam_state(machine)); } - suprslam_state(running_machine &machine) { } + suprslam_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * screen_videoram; diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 5c3c36e477e..c5d8e030c48 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -4,12 +4,13 @@ *************************************************************************/ -class surpratk_state +class surpratk_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, surpratk_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, surpratk_state(machine)); } - surpratk_state(running_machine &machine) { } + surpratk_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 4c44401c470..9b07e68196d 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -1,12 +1,13 @@ // later, this might be merged with segas1x_state in segas16.h -class segas1x_bootleg_state +class segas1x_bootleg_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, segas1x_bootleg_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, segas1x_bootleg_state(machine)); } - segas1x_bootleg_state(running_machine &machine) { } + segas1x_bootleg_state(running_machine &machine) + : driver_data_t(machine) { } UINT16 * bg0_tileram; UINT16 * bg1_tileram; diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index a6a62e27751..e18b715b1aa 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -4,12 +4,13 @@ *************************************************************************/ -class tail2nos_state +class tail2nos_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tail2nos_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tail2nos_state(machine)); } - tail2nos_state(running_machine &machine) { } + tail2nos_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * bgvideoram; diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 6f5bfc9c9e4..bf15be1dd47 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -1,10 +1,11 @@ -class taitob_state +class taitob_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitob_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitob_state(machine)); } - taitob_state(running_machine &machine) { } + taitob_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index d1aecbb9f3d..06a317c1093 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -10,13 +10,14 @@ struct f2_tempsprite int primask; }; -class taitof2_state +class taitof2_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitof2_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitof2_state(machine)); } taitof2_state(running_machine &machine) - : oki(machine.device("oki")) { } + : driver_data_t(machine), + oki(machine.device("oki")) { } /* memory pointers */ UINT16 * sprite_extension; diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index a10d9f66a3a..13dc7f5141f 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -4,12 +4,13 @@ *************************************************************************/ -class taitoh_state +class taitoh_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoh_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoh_state(machine)); } - taitoh_state(running_machine &machine) { } + taitoh_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * m68000_mainram; diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index b479c851c55..81f8e37e128 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -1,12 +1,13 @@ #define TAITOL_SPRITERAM_SIZE 0x400 -class taitol_state +class taitol_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitol_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitol_state(machine)); } - taitol_state(running_machine &machine) { } + taitol_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * rambanks; diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 3e18cb24c15..a4b20f611f7 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -4,12 +4,13 @@ *************************************************************************/ -class taitoo_state +class taitoo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoo_state(machine)); } - taitoo_state(running_machine &machine) { } + taitoo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index e5cbd10c038..44aeb157c8a 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -5,12 +5,13 @@ *************************************************************************/ -class taitoz_state +class taitoz_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoz_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoz_state(machine)); } - taitoz_state(running_machine &machine) { } + taitoz_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 49514ba521e..601f77af088 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -17,12 +17,13 @@ struct taitoair_poly { }; -class taitoair_state +class taitoair_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoair_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoair_state(machine)); } - taitoair_state(running_machine &machine) { } + taitoair_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * m68000_mainram; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 1b0db21276f..f59a9c3c6b4 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -1,11 +1,12 @@ #include "video/poly.h" -class taitojc_state +class taitojc_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitojc_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitojc_state(machine)); } - taitojc_state(running_machine &machine) { } + taitojc_state(running_machine &machine) + : driver_data_t(machine) { } int texture_x; int texture_y; diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index dd3d01234ab..356182e20ea 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -6,14 +6,14 @@ #include "machine/atarigen.h" -class thunderj_state +class thunderj_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, thunderj_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, thunderj_state(machine)); } - thunderj_state(running_machine &machine) { } + thunderj_state(running_machine &machine) + : atarigen_state(machine) { } - atarigen_state atarigen; UINT8 alpha_tile_bank; }; diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index d22e1a3c1ae..e49e6d5e311 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -4,12 +4,13 @@ *************************************************************************/ -class thunderx_state +class thunderx_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, thunderx_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, thunderx_state(machine)); } - thunderx_state(running_machine &machine) { } + thunderx_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index c1bc4a09881..0b753b5c82e 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -19,12 +19,13 @@ struct jungler_star #define JUNGLER_MAX_STARS 1000 -class timeplt_state +class timeplt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, timeplt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, timeplt_state(machine)); } - timeplt_state(running_machine &machine) { } + timeplt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; // timeplt, tutankham, junofrst, rocnrope, pooyan, rallyx diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index b446b48029a..3fe45c79290 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -1,10 +1,11 @@ -class tmnt_state +class tmnt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tmnt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tmnt_state(machine)); } - tmnt_state(running_machine &machine) { } + tmnt_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ INT16 * sampledata; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index faa40578943..37463279a1b 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -15,12 +15,13 @@ enum MCU_TNZS }; -class tnzs_state +class tnzs_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tnzs_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tnzs_state(machine)); } - tnzs_state(running_machine &machine) { } + tnzs_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * objram; diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index 718478a2188..fe8c000909f 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class toobin_state +class toobin_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toobin_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toobin_state(machine)); } - toobin_state(running_machine &machine) { } - - atarigen_state atarigen; + toobin_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 * interrupt_scan; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index 9d8065d39cd..ebe6ed17bb0 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -4,12 +4,13 @@ *************************************************************************/ -class topspeed_state +class topspeed_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, topspeed_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, topspeed_state(machine)); } - topspeed_state(running_machine &machine) { } + topspeed_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spritemap; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index 8f72cd2e475..879904d56f6 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -1,9 +1,10 @@ -class toypop_state +class toypop_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toypop_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toypop_state(machine)); } - toypop_state(running_machine &machine) { } + toypop_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *videoram; UINT8 *spriteram; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 54a330b9a39..c493921840e 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -8,12 +8,13 @@ #include "sound/msm5205.h" -class trackfld_state +class trackfld_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, trackfld_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, trackfld_state(machine)); } - trackfld_state(running_machine &machine) { } + trackfld_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; // trackfld, hyperspt, yiear, sbasketb diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index c091927307d..69a36bd704d 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -1,10 +1,11 @@ -class tumbleb_state +class tumbleb_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tumbleb_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tumbleb_state(machine)); } - tumbleb_state(running_machine &machine) { } + tumbleb_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_data; diff --git a/src/mame/includes/tumblep.h b/src/mame/includes/tumblep.h index 7ddff4578cf..f43008fbbde 100644 --- a/src/mame/includes/tumblep.h +++ b/src/mame/includes/tumblep.h @@ -4,12 +4,13 @@ *************************************************************************/ -class tumblep_state +class tumblep_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tumblep_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tumblep_state(machine)); } - tumblep_state(running_machine &machine) { } + tumblep_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index e32b0834f67..e50f16b27ea 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -1,9 +1,10 @@ -class tunhunt_state +class tunhunt_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tunhunt_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tunhunt_state(machine)); } - tunhunt_state(running_machine &machine) { } + tunhunt_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 control; UINT8 *workram; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 32a20ef60ad..6643efc25f1 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -22,12 +22,13 @@ struct i8279_state }; -class turbo_state +class turbo_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, turbo_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, turbo_state(machine)); } - turbo_state(running_machine &machine) { } + turbo_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 11c12451e33..8920115453e 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -4,12 +4,13 @@ *************************************************************************/ -class ultraman_state +class ultraman_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ultraman_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ultraman_state(machine)); } - ultraman_state(running_machine &machine) { } + ultraman_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index d1851b382fe..599f4f5b58a 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -4,12 +4,13 @@ *************************************************************************/ -class vaportra_state +class vaportra_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vaportra_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vaportra_state(machine)); } - vaportra_state(running_machine &machine) { } + vaportra_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * pf1_rowscroll; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 5849da78865..5f942cef97f 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -1,9 +1,10 @@ -class vastar_state +class vastar_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vastar_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vastar_state(machine)); } - vastar_state(running_machine &machine) { } + vastar_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *spriteram1; UINT8 *spriteram2; diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index 94e13ecf2f8..436ce1bb7cf 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -4,12 +4,13 @@ *************************************************************************/ -class vendetta_state +class vendetta_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vendetta_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vendetta_state(machine)); } - vendetta_state(running_machine &machine) { } + vendetta_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * ram; diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index 3727851a04f..1588edd01cf 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class vindictr_state +class vindictr_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vindictr_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vindictr_state(machine)); } - vindictr_state(running_machine &machine) { } - - atarigen_state atarigen; + vindictr_state(running_machine &machine) + : atarigen_state(machine) { } UINT8 playfield_tile_bank; UINT16 playfield_xscroll; diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index c3bfbb0f720..1aba266d86e 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -4,12 +4,13 @@ *************************************************************************/ -class volfied_state +class volfied_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, volfied_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, volfied_state(machine)); } - volfied_state(running_machine &machine) { } + volfied_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * video_ram; diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 99d0e62684e..7cb49633b73 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -4,12 +4,13 @@ *************************************************************************/ -class warriorb_state +class warriorb_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, warriorb_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, warriorb_state(machine)); } - warriorb_state(running_machine &machine) { } + warriorb_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spriteram; diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 9e8824f2811..46636478c2c 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -1,9 +1,10 @@ -class welltris_state +class welltris_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, welltris_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, welltris_state(machine)); } - welltris_state(running_machine &machine) { } + welltris_state(running_machine &machine) + : driver_data_t(machine) { } int pending_command; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index c1f6b2586a0..eb41696b3dd 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -4,12 +4,13 @@ *************************************************************************/ -class wgp_state +class wgp_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wgp_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wgp_state(machine)); } - wgp_state(running_machine &machine) { } + wgp_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * spritemap; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index cf99490ab9a..b06dfe672c2 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -1,9 +1,10 @@ -class wwfsstar_state +class wwfsstar_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wwfsstar_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wwfsstar_state(machine)); } - wwfsstar_state(running_machine &machine) { } + wwfsstar_state(running_machine &machine) + : driver_data_t(machine) { } int vblank; int scrollx; diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index e9631b51c99..238e5d4249c 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -4,12 +4,13 @@ *************************************************************************/ -class xexex_state +class xexex_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xexex_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xexex_state(machine)); } - xexex_state(running_machine &machine) { } + xexex_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * workram; diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index ef784e63d01..2cdaa5c0f45 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -1,10 +1,11 @@ -class xmen_state +class xmen_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xmen_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xmen_state(machine)); } - xmen_state(running_machine &machine) { } + xmen_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index 0f806b2d867..c8e0c3d975c 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -6,14 +6,13 @@ #include "machine/atarigen.h" -class xybots_state +class xybots_state : public atarigen_state { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xybots_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xybots_state(machine)); } - xybots_state(running_machine &machine) { } - - atarigen_state atarigen; + xybots_state(running_machine &machine) + : atarigen_state(machine) { } UINT16 h256; }; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index b76f5d04f89..3431e2671aa 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -1,9 +1,10 @@ -class xyonix_state +class xyonix_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xyonix_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xyonix_state(machine)); } - xyonix_state(running_machine &machine) { } + xyonix_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *vidram; tilemap_t *tilemap; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index e17cb0eab09..92c6c305d32 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -4,12 +4,13 @@ *************************************************************************/ -class yunsun16_state +class yunsun16_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, yunsun16_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, yunsun16_state(machine)); } - yunsun16_state(running_machine &machine) { } + yunsun16_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * vram_0; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index b5fe0ce8889..43352ae49b9 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -4,12 +4,13 @@ *************************************************************************/ -class yunsung8_state +class yunsung8_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, yunsung8_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, yunsung8_state(machine)); } - yunsung8_state(running_machine &machine) { } + yunsung8_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index f3779bf5f55..7fbf2a4846b 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -4,12 +4,13 @@ ***************************************************************************/ -class zaxxon_state +class zaxxon_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, zaxxon_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, zaxxon_state(machine)); } - zaxxon_state(running_machine &machine) { } + zaxxon_state(running_machine &machine) + : driver_data_t(machine) { } UINT8 *colorram; UINT8 *videoram; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index 4a2e51a7cc4..78c9fab6510 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -4,12 +4,13 @@ *************************************************************************/ -class zerozone_state +class zerozone_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, zerozone_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, zerozone_state(machine)); } - zerozone_state(running_machine &machine) { } + zerozone_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c index 6433cbce62c..efcbae073fd 100644 --- a/src/mame/machine/ajax.c +++ b/src/mame/machine/ajax.c @@ -33,7 +33,7 @@ static WRITE8_HANDLER( ajax_bankswitch_w ) { - ajax_state *state = (ajax_state *)space->machine->driver_data; + ajax_state *state = space->machine->driver_data(); int bank = 0; /* rom select */ @@ -135,7 +135,7 @@ READ8_HANDLER( ajax_ls138_f10_r ) WRITE8_HANDLER( ajax_ls138_f10_w ) { - ajax_state *state = (ajax_state *)space->machine->driver_data; + ajax_state *state = space->machine->driver_data(); switch ((offset & 0x01c0) >> 6) { @@ -182,7 +182,7 @@ WRITE8_HANDLER( ajax_ls138_f10_w ) WRITE8_HANDLER( ajax_bankswitch_2_w ) { - ajax_state *state = (ajax_state *)space->machine->driver_data; + ajax_state *state = space->machine->driver_data(); /* enable char ROM reading through the video RAM */ k052109_set_rmrd_line(state->k052109, (data & 0x40) ? ASSERT_LINE : CLEAR_LINE); @@ -199,7 +199,7 @@ WRITE8_HANDLER( ajax_bankswitch_2_w ) MACHINE_START( ajax ) { - ajax_state *state = (ajax_state *)machine->driver_data; + ajax_state *state = machine->driver_data(); UINT8 *MAIN = memory_region(machine, "maincpu"); UINT8 *SUB = memory_region(machine, "sub"); @@ -224,7 +224,7 @@ MACHINE_START( ajax ) MACHINE_RESET( ajax ) { - ajax_state *state = (ajax_state *)machine->driver_data; + ajax_state *state = machine->driver_data(); state->priority = 0; state->firq_enable = 0; @@ -232,7 +232,7 @@ MACHINE_RESET( ajax ) INTERRUPT_GEN( ajax_interrupt ) { - ajax_state *state = (ajax_state *)device->machine->driver_data; + ajax_state *state = device->machine->driver_data(); if (k051960_is_irq_enabled(state->k051960)) cpu_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); diff --git a/src/mame/machine/arkanoid.c b/src/mame/machine/arkanoid.c index bcacb7e7d9b..a751f064b1d 100644 --- a/src/mame/machine/arkanoid.c +++ b/src/mame/machine/arkanoid.c @@ -17,7 +17,7 @@ READ8_HANDLER( arkanoid_Z80_mcu_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); /* return the last value the 68705 wrote, and mark that we've read it */ state->m68705write = 0; @@ -26,7 +26,7 @@ READ8_HANDLER( arkanoid_Z80_mcu_r ) static TIMER_CALLBACK( test ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->z80write = 1; state->fromz80 = param; @@ -41,21 +41,21 @@ WRITE8_HANDLER( arkanoid_Z80_mcu_w ) READ8_HANDLER( arkanoid_68705_port_a_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); } WRITE8_HANDLER( arkanoid_68705_port_a_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); state->port_a_out = data; } WRITE8_HANDLER( arkanoid_68705_ddr_a_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -63,7 +63,7 @@ WRITE8_HANDLER( arkanoid_68705_ddr_a_w ) READ8_HANDLER( arkanoid_68705_port_c_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); int res = 0; /* bit 0 is high on a write strobe; clear it once we've detected it */ @@ -79,7 +79,7 @@ READ8_HANDLER( arkanoid_68705_port_c_r ) WRITE8_HANDLER( arkanoid_68705_port_c_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); if ((state->ddr_c & 0x04) && (~data & 0x04) && (state->port_c_out & 0x04)) { @@ -99,14 +99,14 @@ WRITE8_HANDLER( arkanoid_68705_port_c_w ) WRITE8_HANDLER( arkanoid_68705_ddr_c_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); state->ddr_c = data; } CUSTOM_INPUT( arkanoid_68705_input_r ) { - arkanoid_state *state = (arkanoid_state *)field->port->machine->driver_data; + arkanoid_state *state = field->port->machine->driver_data(); int res = 0; /* bit 0x40 of comes from the sticky bit */ @@ -122,7 +122,7 @@ CUSTOM_INPUT( arkanoid_68705_input_r ) CUSTOM_INPUT( arkanoid_input_mux ) { - arkanoid_state *state = (arkanoid_state *)field->port->machine->driver_data; + arkanoid_state *state = field->port->machine->driver_data(); const char *tag1 = (const char *)param; const char *tag2 = tag1 + strlen(tag1) + 1; return input_port_read(field->port->machine, (state->paddle_select == 0) ? tag1 : tag2); @@ -191,7 +191,7 @@ TO DO (2006.09.12) : /* Kludge for some bootlegs that read this address */ READ8_HANDLER( arkanoid_bootleg_f000_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); UINT8 arkanoid_bootleg_val = 0x00; switch (state->bootleg_id) @@ -234,7 +234,7 @@ READ8_HANDLER( arkanoid_bootleg_f000_r ) /* Kludge for some bootlegs that read this address */ READ8_HANDLER( arkanoid_bootleg_f002_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); UINT8 arkanoid_bootleg_val = 0x00; switch (state->bootleg_id) @@ -322,7 +322,7 @@ READ8_HANDLER( arkanoid_bootleg_f002_r ) /* Kludge for some bootlegs that write this address */ WRITE8_HANDLER( arkanoid_bootleg_d018_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); state->bootleg_cmd = 0x00; switch (state->bootleg_id) @@ -578,7 +578,7 @@ WRITE8_HANDLER( arkanoid_bootleg_d018_w ) #ifdef UNUSED_CODE READ8_HANDLER( block2_bootleg_f000_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); return state->bootleg_cmd; } #endif @@ -586,7 +586,7 @@ READ8_HANDLER( block2_bootleg_f000_r ) /* Kludge for some bootlegs that read this address */ READ8_HANDLER( arkanoid_bootleg_d008_r ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); UINT8 arkanoid_bootleg_d008_bit[8]; UINT8 arkanoid_bootleg_d008_val; UINT8 arkanoid_paddle_value = input_port_read(space->machine, "MUX"); diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c index 540759bf23f..368ab929839 100644 --- a/src/mame/machine/atarifb.c +++ b/src/mame/machine/atarifb.c @@ -12,7 +12,7 @@ WRITE8_HANDLER( atarifb_out1_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); running_device *discrete = space->machine->device("discrete"); state->CTRLD = data; @@ -26,7 +26,7 @@ WRITE8_HANDLER( atarifb_out1_w ) WRITE8_HANDLER( atarifb4_out1_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); running_device *discrete = space->machine->device("discrete"); state->CTRLD = data; @@ -42,7 +42,7 @@ WRITE8_HANDLER( atarifb4_out1_w ) WRITE8_HANDLER( abaseb_out1_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); running_device *discrete = space->machine->device("discrete"); state->CTRLD = data; @@ -69,7 +69,7 @@ WRITE8_HANDLER( abaseb_out1_w ) WRITE8_HANDLER( soccer_out1_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); running_device *discrete = space->machine->device("discrete"); state->CTRLD = data; @@ -123,7 +123,7 @@ WRITE8_HANDLER( soccer_out2_w ) WRITE8_HANDLER( atarifb_out3_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); int loop = cpu_getiloops(state->maincpu); switch (loop) @@ -155,7 +155,7 @@ WRITE8_HANDLER( atarifb_out3_w ) READ8_HANDLER( atarifb_in0_r ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); if ((state->CTRLD & 0x20) == 0x00) { int val; @@ -193,7 +193,7 @@ READ8_HANDLER( atarifb_in0_r ) READ8_HANDLER( atarifb_in2_r ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); if ((state->CTRLD & 0x20) == 0x00) { @@ -224,7 +224,7 @@ READ8_HANDLER( atarifb_in2_r ) READ8_HANDLER( atarifb4_in0_r ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); /* LD1 and LD2 low, return sign bits */ if ((state->CTRLD & 0x60) == 0x00) @@ -292,7 +292,7 @@ READ8_HANDLER( atarifb4_in0_r ) READ8_HANDLER( atarifb4_in2_r ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); if ((state->CTRLD & 0x40) == 0x00) { diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 4156e03b133..39a9f1afdd2 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -62,7 +62,7 @@ static TIMER_CALLBACK( atarivc_eof_update ); INLINE const atarigen_screen_timer *get_screen_timer(screen_device &screen) { - atarigen_state *state = (atarigen_state *)screen.machine->driver_data; + atarigen_state *state = screen.machine->driver_data(); int i; /* find the index of the timer that matches the screen */ @@ -82,7 +82,7 @@ INLINE const atarigen_screen_timer *get_screen_timer(screen_device &screen) void atarigen_init(running_machine *machine) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); screen_device *screen; int i; @@ -169,7 +169,7 @@ void atarigen_interrupt_reset(atarigen_state *state, atarigen_int_func update_in void atarigen_update_interrupts(running_machine *machine) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); (*state->update_int_callback)(machine); } @@ -193,7 +193,7 @@ void atarigen_scanline_int_set(screen_device &screen, int scanline) INTERRUPT_GEN( atarigen_scanline_int_gen ) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); state->scanline_int_state = 1; (*state->update_int_callback)(device->machine); } @@ -206,14 +206,14 @@ INTERRUPT_GEN( atarigen_scanline_int_gen ) WRITE16_HANDLER( atarigen_scanline_int_ack_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->scanline_int_state = 0; (*state->update_int_callback)(space->machine); } WRITE32_HANDLER( atarigen_scanline_int_ack32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->scanline_int_state = 0; (*state->update_int_callback)(space->machine); } @@ -226,7 +226,7 @@ WRITE32_HANDLER( atarigen_scanline_int_ack32_w ) INTERRUPT_GEN( atarigen_sound_int_gen ) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); state->sound_int_state = 1; (*state->update_int_callback)(device->machine); } @@ -239,14 +239,14 @@ INTERRUPT_GEN( atarigen_sound_int_gen ) WRITE16_HANDLER( atarigen_sound_int_ack_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->sound_int_state = 0; (*state->update_int_callback)(space->machine); } WRITE32_HANDLER( atarigen_sound_int_ack32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->sound_int_state = 0; (*state->update_int_callback)(space->machine); } @@ -259,7 +259,7 @@ WRITE32_HANDLER( atarigen_sound_int_ack32_w ) INTERRUPT_GEN( atarigen_video_int_gen ) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); state->video_int_state = 1; (*state->update_int_callback)(device->machine); } @@ -272,14 +272,14 @@ INTERRUPT_GEN( atarigen_video_int_gen ) WRITE16_HANDLER( atarigen_video_int_ack_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->video_int_state = 0; (*state->update_int_callback)(space->machine); } WRITE32_HANDLER( atarigen_video_int_ack32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->video_int_state = 0; (*state->update_int_callback)(space->machine); } @@ -326,13 +326,13 @@ void atarigen_eeprom_reset(atarigen_state *state) WRITE16_HANDLER( atarigen_eeprom_enable_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->eeprom_unlocked = 1; } WRITE32_HANDLER( atarigen_eeprom_enable32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->eeprom_unlocked = 1; } @@ -346,7 +346,7 @@ WRITE32_HANDLER( atarigen_eeprom_enable32_w ) WRITE16_HANDLER( atarigen_eeprom_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); if (!state->eeprom_unlocked) return; @@ -357,7 +357,7 @@ WRITE16_HANDLER( atarigen_eeprom_w ) WRITE32_HANDLER( atarigen_eeprom32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); if (!state->eeprom_unlocked) return; @@ -377,19 +377,19 @@ WRITE32_HANDLER( atarigen_eeprom32_w ) READ16_HANDLER( atarigen_eeprom_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); return state->eeprom[offset] | 0xff00; } READ16_HANDLER( atarigen_eeprom_upper_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); return state->eeprom[offset] | 0x00ff; } READ32_HANDLER( atarigen_eeprom_upper32_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); return (state->eeprom[offset * 2] << 16) | state->eeprom[offset * 2 + 1] | 0x00ff00ff; } @@ -400,7 +400,7 @@ READ32_HANDLER( atarigen_eeprom_upper32_r ) NVRAM_HANDLER( atarigen ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); if (read_or_write) mame_fwrite(file, state->eeprom, state->eeprom_size); else if (file) @@ -486,14 +486,14 @@ INLINE void update_bank(atarigen_state *state, int bank) static STATE_POSTLOAD( slapstic_postload ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); update_bank(state, slapstic_bank()); } static DIRECT_UPDATE_HANDLER( atarigen_slapstic_setdirect ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); /* if we jump to an address in the slapstic region, tweak the slapstic at that address and return ~0; this will cause us to be called on @@ -523,7 +523,7 @@ static DIRECT_UPDATE_HANDLER( atarigen_slapstic_setdirect ) void atarigen_slapstic_init(running_device *device, offs_t base, offs_t mirror, int chipnum) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); /* reset in case we have no state */ state->slapstic_num = chipnum; @@ -576,7 +576,7 @@ void atarigen_slapstic_reset(atarigen_state *state) WRITE16_HANDLER( atarigen_slapstic_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); update_bank(state, slapstic_tweak(space, offset)); } @@ -589,7 +589,7 @@ WRITE16_HANDLER( atarigen_slapstic_w ) READ16_HANDLER( atarigen_slapstic_r ) { /* fetch the result from the current bank first */ - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); int result = state->slapstic[offset & 0xfff]; /* then determine the new one */ @@ -609,7 +609,7 @@ READ16_HANDLER( atarigen_slapstic_r ) void atarigen_sound_io_reset(running_device *device) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); /* remember which CPU is the sound CPU */ state->sound_cpu = device; @@ -630,7 +630,7 @@ void atarigen_sound_io_reset(running_device *device) INTERRUPT_GEN( atarigen_6502_irq_gen ) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); state->timed_int = 1; update_6502_irq(device->machine); } @@ -643,7 +643,7 @@ INTERRUPT_GEN( atarigen_6502_irq_gen ) READ8_HANDLER( atarigen_6502_irq_ack_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->timed_int = 0; update_6502_irq(space->machine); return 0; @@ -651,7 +651,7 @@ READ8_HANDLER( atarigen_6502_irq_ack_r ) WRITE8_HANDLER( atarigen_6502_irq_ack_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->timed_int = 0; update_6502_irq(space->machine); } @@ -664,7 +664,7 @@ WRITE8_HANDLER( atarigen_6502_irq_ack_w ) void atarigen_ym2151_irq_gen(running_device *device, int irq) { - atarigen_state *state = (atarigen_state *)device->machine->driver_data; + atarigen_state *state = device->machine->driver_data(); state->ym2151_int = irq; update_6502_irq(device->machine); } @@ -727,7 +727,7 @@ WRITE32_HANDLER( atarigen_sound_upper32_w ) READ16_HANDLER( atarigen_sound_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->sound_to_cpu_ready = 0; atarigen_sound_int_ack_w(space, 0, 0, 0xffff); return state->sound_to_cpu | 0xff00; @@ -735,7 +735,7 @@ READ16_HANDLER( atarigen_sound_r ) READ16_HANDLER( atarigen_sound_upper_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->sound_to_cpu_ready = 0; atarigen_sound_int_ack_w(space, 0, 0, 0xffff); return (state->sound_to_cpu << 8) | 0x00ff; @@ -743,7 +743,7 @@ READ16_HANDLER( atarigen_sound_upper_r ) READ32_HANDLER( atarigen_sound_upper32_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->sound_to_cpu_ready = 0; atarigen_sound_int_ack32_w(space, 0, 0, 0xffff); return (state->sound_to_cpu << 24) | 0x00ffffff; @@ -768,7 +768,7 @@ WRITE8_HANDLER( atarigen_6502_sound_w ) READ8_HANDLER( atarigen_6502_sound_r ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); state->cpu_to_sound_ready = 0; cpu_set_input_line(state->sound_cpu, INPUT_LINE_NMI, CLEAR_LINE); return state->cpu_to_sound; @@ -784,7 +784,7 @@ READ8_HANDLER( atarigen_6502_sound_r ) static void update_6502_irq(running_machine *machine) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); if (state->timed_int || state->ym2151_int) cpu_set_input_line(state->sound_cpu, M6502_IRQ_LINE, ASSERT_LINE); else @@ -799,7 +799,7 @@ static void update_6502_irq(running_machine *machine) static TIMER_CALLBACK( delayed_sound_reset ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); const address_space *space = cpu_get_address_space(state->sound_cpu, ADDRESS_SPACE_PROGRAM); /* unhalt and reset the sound CPU */ @@ -826,7 +826,7 @@ static TIMER_CALLBACK( delayed_sound_reset ) static TIMER_CALLBACK( delayed_sound_w ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); /* warn if we missed something */ if (state->cpu_to_sound_ready) @@ -850,7 +850,7 @@ static TIMER_CALLBACK( delayed_sound_w ) static TIMER_CALLBACK( delayed_6502_sound_w ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); /* warn if we missed something */ if (state->sound_to_cpu_ready) @@ -924,7 +924,7 @@ void atarigen_set_oki6295_vol(running_machine *machine, int volume) void atarigen_scanline_timer_reset(screen_device &screen, atarigen_scanline_func update_graphics, int frequency) { - atarigen_state *state = (atarigen_state *)screen.machine->driver_data; + atarigen_state *state = screen.machine->driver_data(); /* set the scanline callback */ state->scanline_callback = update_graphics; @@ -946,7 +946,7 @@ void atarigen_scanline_timer_reset(screen_device &screen, atarigen_scanline_func static TIMER_CALLBACK( scanline_timer_callback ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); screen_device &screen = *reinterpret_cast(ptr); int scanline = param; @@ -976,7 +976,7 @@ static TIMER_CALLBACK( scanline_timer_callback ) static TIMER_CALLBACK( atarivc_eof_update ) { - atarigen_state *state = (atarigen_state *)machine->driver_data; + atarigen_state *state = machine->driver_data(); screen_device &screen = *reinterpret_cast(ptr); emu_timer *timer = get_screen_timer(screen)->atarivc_eof_update_timer; int i; @@ -1023,7 +1023,7 @@ static TIMER_CALLBACK( atarivc_eof_update ) void atarivc_reset(screen_device &screen, UINT16 *eof_data, int playfields) { - atarigen_state *state = (atarigen_state *)screen.machine->driver_data; + atarigen_state *state = screen.machine->driver_data(); /* this allows us to manually reset eof_data to NULL if it's not used */ state->atarivc_eof_data = eof_data; @@ -1053,7 +1053,7 @@ void atarivc_reset(screen_device &screen, UINT16 *eof_data, int playfields) void atarivc_w(screen_device &screen, offs_t offset, UINT16 data, UINT16 mem_mask) { - atarigen_state *state = (atarigen_state *)screen.machine->driver_data; + atarigen_state *state = screen.machine->driver_data(); int oldword = state->atarivc_data[offset]; int newword = oldword; @@ -1070,7 +1070,7 @@ void atarivc_w(screen_device &screen, offs_t offset, UINT16 data, UINT16 mem_mas static void atarivc_common_w(screen_device &screen, offs_t offset, UINT16 newword) { - atarigen_state *state = (atarigen_state *)screen.machine->driver_data; + atarigen_state *state = screen.machine->driver_data(); int oldword = state->atarivc_data[offset]; state->atarivc_data[offset] = newword; @@ -1180,7 +1180,7 @@ static void atarivc_common_w(screen_device &screen, offs_t offset, UINT16 newwor UINT16 atarivc_r(screen_device &screen, offs_t offset) { - atarigen_state *state = (atarigen_state *)screen.machine->driver_data; + atarigen_state *state = screen.machine->driver_data(); logerror("vc_r(%02X)\n", offset); @@ -1213,14 +1213,14 @@ UINT16 atarivc_r(screen_device &screen, offs_t offset) WRITE16_HANDLER( atarigen_alpha_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->alpha[offset]); tilemap_mark_tile_dirty(state->alpha_tilemap, offset); } WRITE32_HANDLER( atarigen_alpha32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->alpha32[offset]); if (ACCESSING_BITS_16_31) tilemap_mark_tile_dirty(state->alpha_tilemap, offset * 2); @@ -1230,7 +1230,7 @@ WRITE32_HANDLER( atarigen_alpha32_w ) WRITE16_HANDLER( atarigen_alpha2_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->alpha2[offset]); tilemap_mark_tile_dirty(state->alpha2_tilemap, offset); } @@ -1260,14 +1260,14 @@ void atarigen_set_playfield2_latch(atarigen_state *state, int data) WRITE16_HANDLER( atarigen_playfield_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield[offset]); tilemap_mark_tile_dirty(state->playfield_tilemap, offset); } WRITE32_HANDLER( atarigen_playfield32_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield32[offset]); if (ACCESSING_BITS_16_31) tilemap_mark_tile_dirty(state->playfield_tilemap, offset * 2); @@ -1277,7 +1277,7 @@ WRITE32_HANDLER( atarigen_playfield32_w ) WRITE16_HANDLER( atarigen_playfield2_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield2[offset]); tilemap_mark_tile_dirty(state->playfield2_tilemap, offset); } @@ -1291,7 +1291,7 @@ WRITE16_HANDLER( atarigen_playfield2_w ) WRITE16_HANDLER( atarigen_playfield_large_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield[offset]); tilemap_mark_tile_dirty(state->playfield_tilemap, offset / 2); } @@ -1305,7 +1305,7 @@ WRITE16_HANDLER( atarigen_playfield_large_w ) WRITE16_HANDLER( atarigen_playfield_upper_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield_upper[offset]); tilemap_mark_tile_dirty(state->playfield_tilemap, offset); } @@ -1319,7 +1319,7 @@ WRITE16_HANDLER( atarigen_playfield_upper_w ) WRITE16_HANDLER( atarigen_playfield_dual_upper_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield_upper[offset]); tilemap_mark_tile_dirty(state->playfield_tilemap, offset); tilemap_mark_tile_dirty(state->playfield2_tilemap, offset); @@ -1335,7 +1335,7 @@ WRITE16_HANDLER( atarigen_playfield_dual_upper_w ) WRITE16_HANDLER( atarigen_playfield_latched_lsb_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield[offset]); tilemap_mark_tile_dirty(state->playfield_tilemap, offset); @@ -1354,7 +1354,7 @@ WRITE16_HANDLER( atarigen_playfield_latched_lsb_w ) WRITE16_HANDLER( atarigen_playfield_latched_msb_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield[offset]); tilemap_mark_tile_dirty(state->playfield_tilemap, offset); @@ -1373,7 +1373,7 @@ WRITE16_HANDLER( atarigen_playfield_latched_msb_w ) WRITE16_HANDLER( atarigen_playfield2_latched_msb_w ) { - atarigen_state *state = (atarigen_state *)space->machine->driver_data; + atarigen_state *state = space->machine->driver_data(); COMBINE_DATA(&state->playfield2[offset]); tilemap_mark_tile_dirty(state->playfield2_tilemap, offset); diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 8e8d8d0f728..3ed1d3994ac 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -60,9 +60,12 @@ struct _atarigen_screen_timer }; -typedef struct _atarigen_state atarigen_state; -struct _atarigen_state +class atarigen_state : public driver_data_t { +public: + atarigen_state(running_machine &machine) + : driver_data_t(machine) { } + UINT8 scanline_int_state; UINT8 sound_int_state; UINT8 video_int_state; diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index b594f5ded6f..b6b29ce5c5a 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -37,7 +37,7 @@ static TIMER_CALLBACK( irq_off ) TIMER_DEVICE_CALLBACK( balsente_interrupt_timer ) { - balsente_state *state = (balsente_state *)timer.machine->driver_data; + balsente_state *state = timer.machine->driver_data(); /* next interrupt after scanline 256 is scanline 64 */ if (param == 256) @@ -78,7 +78,7 @@ TIMER_DEVICE_CALLBACK( balsente_interrupt_timer ) MACHINE_START( balsente ) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); int i; /* create the polynomial tables */ @@ -133,7 +133,7 @@ MACHINE_START( balsente ) MACHINE_RESET( balsente ) { const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); int numbanks; /* reset counters; counter 2's gate is tied high */ @@ -190,7 +190,7 @@ MACHINE_RESET( balsente ) static void poly17_init(running_machine *machine) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); UINT32 i, x = 0; UINT8 *p, *r; @@ -213,7 +213,7 @@ static void poly17_init(running_machine *machine) void balsente_noise_gen(running_device *device, int count, short *buffer) { - balsente_state *state = (balsente_state *)device->machine->driver_data; + balsente_state *state = device->machine->driver_data(); int chip; UINT32 step, noise_counter; @@ -253,7 +253,7 @@ WRITE8_HANDLER( balsente_random_reset_w ) READ8_HANDLER( balsente_random_num_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); UINT32 cc; /* CPU runs at 1.25MHz, noise source at 100kHz --> multiply by 12.5 */ @@ -338,7 +338,7 @@ WRITE8_HANDLER( balsente_misc_output_w ) static void m6850_update_io(running_machine *machine) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); UINT8 new_state; /* sound -> main CPU communications */ @@ -431,7 +431,7 @@ static void m6850_update_io(running_machine *machine) READ8_HANDLER( balsente_m6850_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); int result; /* status register is at offset 0 */ @@ -456,7 +456,7 @@ READ8_HANDLER( balsente_m6850_r ) static TIMER_CALLBACK( m6850_data_ready_callback ) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); /* set the output data byte and indicate that we're ready to go */ state->m6850_output = param; @@ -467,7 +467,7 @@ static TIMER_CALLBACK( m6850_data_ready_callback ) static TIMER_CALLBACK( m6850_w_callback ) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); /* indicate that the transmit buffer is no longer empty and update the I/O state */ state->m6850_status &= ~0x02; @@ -481,7 +481,7 @@ static TIMER_CALLBACK( m6850_w_callback ) WRITE8_HANDLER( balsente_m6850_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* control register is at offset 0 */ if (offset == 0) @@ -507,7 +507,7 @@ WRITE8_HANDLER( balsente_m6850_w ) READ8_HANDLER( balsente_m6850_sound_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); int result; /* status register is at offset 0 */ @@ -532,7 +532,7 @@ READ8_HANDLER( balsente_m6850_sound_r ) WRITE8_HANDLER( balsente_m6850_sound_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* control register is at offset 0 */ if (offset == 0) @@ -559,7 +559,7 @@ WRITE8_HANDLER( balsente_m6850_sound_w ) INTERRUPT_GEN( balsente_update_analog_inputs ) { - balsente_state *state = (balsente_state *)device->machine->driver_data; + balsente_state *state = device->machine->driver_data(); int i; static const char *const analog[] = { "AN0", "AN1", "AN2", "AN3" }; @@ -574,7 +574,7 @@ INTERRUPT_GEN( balsente_update_analog_inputs ) static TIMER_CALLBACK( adc_finished ) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); int which = param; /* analog controls are read in two pieces; the lower port returns the sign */ @@ -609,7 +609,7 @@ static TIMER_CALLBACK( adc_finished ) READ8_HANDLER( balsente_adc_data_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* just return the last value read */ return state->adc_value; @@ -681,7 +681,7 @@ INLINE void counter_update_count(balsente_state *state, int which) static void counter_set_gate(running_machine *machine, int which, int gate) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); int oldgate = state->counter[which].gate; /* remember the gate state */ @@ -715,7 +715,7 @@ static void counter_set_gate(running_machine *machine, int which, int gate) static void counter_set_out(running_machine *machine, int which, int out) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); /* OUT on counter 2 is hooked to the /INT line on the Z80 */ if (which == 2) @@ -732,7 +732,7 @@ static void counter_set_out(running_machine *machine, int which, int out) TIMER_DEVICE_CALLBACK( balsente_counter_callback ) { - balsente_state *state = (balsente_state *)timer.machine->driver_data; + balsente_state *state = timer.machine->driver_data(); /* reset the counter and the count */ state->counter[param].timer_active = 0; @@ -758,7 +758,7 @@ TIMER_DEVICE_CALLBACK( balsente_counter_callback ) READ8_HANDLER( balsente_counter_8253_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); int which; switch (offset & 3) @@ -793,7 +793,7 @@ READ8_HANDLER( balsente_counter_8253_r ) WRITE8_HANDLER( balsente_counter_8253_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); int which; switch (offset & 3) @@ -868,7 +868,7 @@ WRITE8_HANDLER( balsente_counter_8253_w ) static void set_counter_0_ff(timer_device &timer, int newstate) { - balsente_state *state = (balsente_state *)timer.machine->driver_data; + balsente_state *state = timer.machine->driver_data(); /* the flip/flop output is inverted, so if we went high to low, that's a clock */ if (state->counter_0_ff && !newstate) @@ -889,7 +889,7 @@ static void set_counter_0_ff(timer_device &timer, int newstate) TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff ) { - balsente_state *state = (balsente_state *)timer.machine->driver_data; + balsente_state *state = timer.machine->driver_data(); /* clock the D value through the flip-flop */ set_counter_0_ff(timer, (state->counter_control >> 3) & 1); @@ -942,7 +942,7 @@ static void update_counter_0_timer(balsente_state *state) READ8_HANDLER( balsente_counter_state_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* bit D0 is the inverse of the flip-flop state */ int result = !state->counter_0_ff; @@ -956,7 +956,7 @@ READ8_HANDLER( balsente_counter_state_r ) WRITE8_HANDLER( balsente_counter_control_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); UINT8 diff_counter_control = state->counter_control ^ data; /* set the new global value */ @@ -1017,7 +1017,7 @@ WRITE8_HANDLER( balsente_chip_select_w ) CEM3394_WAVE_SELECT }; - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); double voltage = (double)state->dac_value * (8.0 / 4096.0) - 4.0; int diffchip = data ^ state->chip_select, i; int reg = register_map[state->dac_register]; @@ -1069,7 +1069,7 @@ WRITE8_HANDLER( balsente_chip_select_w ) WRITE8_HANDLER( balsente_dac_data_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* LSB or MSB? */ if (offset & 1) @@ -1089,7 +1089,7 @@ WRITE8_HANDLER( balsente_dac_data_w ) WRITE8_HANDLER( balsente_register_addr_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); state->dac_register = data & 7; } @@ -1103,14 +1103,14 @@ WRITE8_HANDLER( balsente_register_addr_w ) CUSTOM_INPUT( nstocker_bits_r ) { - balsente_state *state = (balsente_state *)field->port->machine->driver_data; + balsente_state *state = field->port->machine->driver_data(); return state->nstocker_bits; } WRITE8_HANDLER( spiker_expand_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* offset 0 is the bit pattern */ if (offset == 0) @@ -1128,7 +1128,7 @@ WRITE8_HANDLER( spiker_expand_w ) READ8_HANDLER( spiker_expand_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); UINT8 left, right; /* first rotate each nibble */ @@ -1148,7 +1148,7 @@ READ8_HANDLER( spiker_expand_r ) static void update_grudge_steering(running_machine *machine) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); UINT8 wheel[3]; INT8 diff[3]; @@ -1190,7 +1190,7 @@ static void update_grudge_steering(running_machine *machine) READ8_HANDLER( grudge_steering_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); logerror("%04X:grudge_steering_r(@%d)\n", cpu_get_pc(space->cpu), space->machine->primary_screen->vpos()); state->grudge_steering_result |= 0x80; return state->grudge_steering_result; @@ -1206,7 +1206,7 @@ READ8_HANDLER( grudge_steering_r ) READ8_HANDLER( shrike_shared_6809_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); UINT16 mem_mask = offset & 1 ? 0xff00 : 0x00ff; switch( offset ) @@ -1221,7 +1221,7 @@ READ8_HANDLER( shrike_shared_6809_r ) WRITE8_HANDLER( shrike_shared_6809_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); UINT16 mem_mask = offset & 1 ? 0xff00 : 0x00ff; state->shrike_shared[offset >> 1] = ( state->shrike_shared[offset >> 1] & mem_mask ) | ( data << ( mem_mask & 0x8 ) ); } @@ -1230,13 +1230,13 @@ WRITE8_HANDLER( shrike_shared_6809_w ) // i.e. write 0xdeadbeef to 10000, read 0xde from 10001, 0xad from 10003, 0xbe from 10005... WRITE16_HANDLER( shrike_io_68k_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); COMBINE_DATA( &state->shrike_io[offset] ); } READ16_HANDLER( shrike_io_68k_r ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); return ( state->shrike_io[offset] & mem_mask ) >> ( 8 & ~mem_mask ); } diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c index 3c525cc7a2c..da4ca93fd77 100644 --- a/src/mame/machine/bigevglf.c +++ b/src/mame/machine/bigevglf.c @@ -13,31 +13,31 @@ READ8_HANDLER( bigevglf_68705_port_a_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); } WRITE8_HANDLER( bigevglf_68705_port_a_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->port_a_out = data; } WRITE8_HANDLER( bigevglf_68705_ddr_a_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->ddr_a = data; } READ8_HANDLER( bigevglf_68705_port_b_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( bigevglf_68705_port_b_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); if ((state->ddr_b & 0x02) && (~state->port_b_out & 0x02) && (data & 0x02)) /* positive going transition of the clock */ { @@ -56,13 +56,13 @@ WRITE8_HANDLER( bigevglf_68705_port_b_w ) WRITE8_HANDLER( bigevglf_68705_ddr_b_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->ddr_b = data; } READ8_HANDLER( bigevglf_68705_port_c_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->port_c_in = 0; if (state->main_sent) @@ -75,19 +75,19 @@ READ8_HANDLER( bigevglf_68705_port_c_r ) WRITE8_HANDLER( bigevglf_68705_port_c_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->port_c_out = data; } WRITE8_HANDLER( bigevglf_68705_ddr_c_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->ddr_c = data; } WRITE8_HANDLER( bigevglf_mcu_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->port_a_in = data; state->main_sent = 1; @@ -97,7 +97,7 @@ WRITE8_HANDLER( bigevglf_mcu_w ) READ8_HANDLER( bigevglf_mcu_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->mcu_sent = 1; return state->from_mcu; @@ -105,7 +105,7 @@ READ8_HANDLER( bigevglf_mcu_r ) READ8_HANDLER( bigevglf_mcu_status_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); int res = 0; if (!state->main_sent) diff --git a/src/mame/machine/bonzeadv.c b/src/mame/machine/bonzeadv.c index deb1cfca346..afae58e8078 100644 --- a/src/mame/machine/bonzeadv.c +++ b/src/mame/machine/bonzeadv.c @@ -304,7 +304,7 @@ static const struct cchip_mapping *const levelData[]= static void WriteLevelData( running_machine *machine ) { - asuka_state *state = (asuka_state *)machine->driver_data; + asuka_state *state = machine->driver_data(); int i; for (i = 0; i < 13; i++) @@ -329,7 +329,7 @@ static void WriteRestartPos( running_machine *machine, int level ) for the restart position to be returned. */ - asuka_state *state = (asuka_state *)machine->driver_data; + asuka_state *state = machine->driver_data(); int x = state->cval[0] + 256 * state->cval[1] + state->cval[4] + 256 * state->cval[5]; int y = state->cval[2] + 256 * state->cval[3] + state->cval[6] + 256 * state->cval[7]; @@ -376,13 +376,13 @@ WRITE16_HANDLER( bonzeadv_cchip_ctrl_w ) WRITE16_HANDLER( bonzeadv_cchip_bank_w ) { - asuka_state *state = (asuka_state *)space->machine->driver_data; + asuka_state *state = space->machine->driver_data(); state->current_bank = data & 7; } WRITE16_HANDLER( bonzeadv_cchip_ram_w ) { - asuka_state *state = (asuka_state *)space->machine->driver_data; + asuka_state *state = space->machine->driver_data(); // if (cpu_get_pc(space->cpu)!=0xa028) // logerror("%08x: write %04x %04x cchip\n", cpu_get_pc(space->cpu), offset, data); @@ -438,7 +438,7 @@ READ16_HANDLER( bonzeadv_cchip_ctrl_r ) READ16_HANDLER( bonzeadv_cchip_ram_r ) { - asuka_state *state = (asuka_state *)space->machine->driver_data; + asuka_state *state = space->machine->driver_data(); // logerror("%08x: read %04x cchip\n", cpu_get_pc(space->cpu), offset); diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c index 1bfa1c5d7ff..c5110cc4c59 100644 --- a/src/mame/machine/bsktball.c +++ b/src/mame/machine/bsktball.c @@ -12,7 +12,7 @@ ***************************************************************************/ WRITE8_HANDLER( bsktball_nmion_w ) { - bsktball_state *state = (bsktball_state *)space->machine->driver_data; + bsktball_state *state = space->machine->driver_data(); state->nmi_on = offset & 0x01; } @@ -22,7 +22,7 @@ WRITE8_HANDLER( bsktball_nmion_w ) /* NMI every 32V, IRQ every VBLANK */ INTERRUPT_GEN( bsktball_interrupt ) { - bsktball_state *state = (bsktball_state *)device->machine->driver_data; + bsktball_state *state = device->machine->driver_data(); /* We mod by 8 because we're interrupting 8x per frame, 1 per 32V */ state->i256v = (state->i256v + 1) % 8; @@ -39,13 +39,13 @@ INTERRUPT_GEN( bsktball_interrupt ) WRITE8_HANDLER( bsktball_ld1_w ) { - bsktball_state *state = (bsktball_state *)space->machine->driver_data; + bsktball_state *state = space->machine->driver_data(); state->ld1 = (offset & 0x01); } WRITE8_HANDLER( bsktball_ld2_w ) { - bsktball_state *state = (bsktball_state *)space->machine->driver_data; + bsktball_state *state = space->machine->driver_data(); state->ld2 = (offset & 0x01); } @@ -56,7 +56,7 @@ WRITE8_HANDLER( bsktball_ld2_w ) READ8_HANDLER( bsktball_in0_r ) { - bsktball_state *state = (bsktball_state *)space->machine->driver_data; + bsktball_state *state = space->machine->driver_data(); int p1_horiz; int p1_vert; int p2_horiz; diff --git a/src/mame/machine/btime.c b/src/mame/machine/btime.c index 7516d9d755a..d87970e2b59 100644 --- a/src/mame/machine/btime.c +++ b/src/mame/machine/btime.c @@ -6,7 +6,7 @@ READ8_HANDLER( mmonkey_protection_r ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); UINT8 *RAM = memory_region(space->machine, "maincpu"); int ret = 0; @@ -24,7 +24,7 @@ READ8_HANDLER( mmonkey_protection_r ) WRITE8_HANDLER( mmonkey_protection_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); UINT8 *RAM = memory_region(space->machine, "maincpu"); if (offset == 0) diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c index 5669c4ee335..e6385c156ed 100644 --- a/src/mame/machine/bublbobl.c +++ b/src/mame/machine/bublbobl.c @@ -15,7 +15,7 @@ WRITE8_HANDLER( bublbobl_bankswitch_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); /* bits 0-2 select ROM bank */ memory_set_bank(space->machine, "bank1", (data ^ 4) & 7); @@ -54,7 +54,7 @@ WRITE8_HANDLER( tokio_videoctrl_w ) WRITE8_HANDLER( bublbobl_nmitrigger_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); cpu_set_input_line(state->slave, INPUT_LINE_NMI, PULSE_LINE); } @@ -78,7 +78,7 @@ static const UINT8 tokio_prot_data[] = READ8_HANDLER( tokio_mcu_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->tokio_prot_count %= sizeof(tokio_prot_data); return tokio_prot_data[state->tokio_prot_count++]; @@ -92,7 +92,7 @@ READ8_HANDLER( tokiob_mcu_r ) static TIMER_CALLBACK( nmi_callback ) { - bublbobl_state *state = (bublbobl_state *)machine->driver_data; + bublbobl_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -108,13 +108,13 @@ WRITE8_HANDLER( bublbobl_sound_command_w ) WRITE8_HANDLER( bublbobl_sh_nmi_disable_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } WRITE8_HANDLER( bublbobl_sh_nmi_enable_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) @@ -126,19 +126,19 @@ WRITE8_HANDLER( bublbobl_sh_nmi_enable_w ) WRITE8_HANDLER( bublbobl_soundcpu_reset_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, data ? ASSERT_LINE : CLEAR_LINE); } READ8_HANDLER( bublbobl_sound_status_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); return state->sound_status; } WRITE8_HANDLER( bublbobl_sound_status_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->sound_status = data; } @@ -152,55 +152,55 @@ Bubble Bobble MCU READ8_HANDLER( bublbobl_mcu_ddr1_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); return state->ddr1; } WRITE8_HANDLER( bublbobl_mcu_ddr1_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->ddr1 = data; } READ8_HANDLER( bublbobl_mcu_ddr2_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); return state->ddr2; } WRITE8_HANDLER( bublbobl_mcu_ddr2_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->ddr2 = data; } READ8_HANDLER( bublbobl_mcu_ddr3_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); return state->ddr3; } WRITE8_HANDLER( bublbobl_mcu_ddr3_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->ddr3 = data; } READ8_HANDLER( bublbobl_mcu_ddr4_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); return state->ddr4; } WRITE8_HANDLER( bublbobl_mcu_ddr4_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->ddr4 = data; } READ8_HANDLER( bublbobl_mcu_port1_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 1 read\n", cpu_get_pc(space->cpu)); state->port1_in = input_port_read(space->machine, "IN0"); @@ -209,7 +209,7 @@ READ8_HANDLER( bublbobl_mcu_port1_r ) WRITE8_HANDLER( bublbobl_mcu_port1_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 1 write %02x\n", cpu_get_pc(space->cpu), data); // bit 4: coin lockout @@ -233,7 +233,7 @@ WRITE8_HANDLER( bublbobl_mcu_port1_w ) READ8_HANDLER( bublbobl_mcu_port2_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 2 read\n", cpu_get_pc(space->cpu)); return (state->port2_out & state->ddr2) | (state->port2_in & ~state->ddr2); @@ -241,7 +241,7 @@ READ8_HANDLER( bublbobl_mcu_port2_r ) WRITE8_HANDLER( bublbobl_mcu_port2_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 2 write %02x\n", cpu_get_pc(space->cpu), data); static const char *const portnames[] = { "DSW0", "DSW1", "IN1", "IN2" }; @@ -276,28 +276,28 @@ WRITE8_HANDLER( bublbobl_mcu_port2_w ) READ8_HANDLER( bublbobl_mcu_port3_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 3 read\n", cpu_get_pc(space->cpu)); return (state->port3_out & state->ddr3) | (state->port3_in & ~state->ddr3); } WRITE8_HANDLER( bublbobl_mcu_port3_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 3 write %02x\n", cpu_get_pc(space->cpu), data); state->port3_out = data; } READ8_HANDLER( bublbobl_mcu_port4_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 4 read\n", cpu_get_pc(space->cpu)); return (state->port4_out & state->ddr4) | (state->port4_in & ~state->ddr4); } WRITE8_HANDLER( bublbobl_mcu_port4_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 6801U4 port 4 write %02x\n", cpu_get_pc(space->cpu), data); // bits 0-7 of shared RAM address @@ -316,7 +316,7 @@ in boblbobl, so they don't matter. All checks are patched out in sboblbob. READ8_HANDLER( boblbobl_ic43_a_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); // if (offset >= 2) // logerror("%04x: ic43_a_r (offs %d) res = %02x\n", cpu_get_pc(space->cpu), offset, res); @@ -328,7 +328,7 @@ READ8_HANDLER( boblbobl_ic43_a_r ) WRITE8_HANDLER( boblbobl_ic43_a_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); int res = 0; switch (offset) @@ -367,7 +367,7 @@ WRITE8_HANDLER( boblbobl_ic43_a_w ) WRITE8_HANDLER( boblbobl_ic43_b_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); static const int xorval[4] = { 4, 1, 8, 2 }; // logerror("%04x: ic43_b_w (offs %d) %02x\n", cpu_get_pc(space->cpu), offset, data); @@ -376,7 +376,7 @@ WRITE8_HANDLER( boblbobl_ic43_b_w ) READ8_HANDLER( boblbobl_ic43_b_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); // logerror("%04x: ic43_b_r (offs %d)\n", cpu_get_pc(space->cpu), offset); if (offset == 0) return state->ic43_b << 4; @@ -410,21 +410,21 @@ INTERRUPT_GEN( bublbobl_m68705_interrupt ) READ8_HANDLER( bublbobl_68705_port_a_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); } WRITE8_HANDLER( bublbobl_68705_port_a_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; } WRITE8_HANDLER( bublbobl_68705_ddr_a_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -451,13 +451,13 @@ WRITE8_HANDLER( bublbobl_68705_ddr_a_w ) READ8_HANDLER( bublbobl_68705_port_b_r ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( bublbobl_68705_port_b_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(space->cpu), data); static const char *const portnames[] = { "DSW0", "DSW1", "IN1", "IN2" }; @@ -524,7 +524,7 @@ WRITE8_HANDLER( bublbobl_68705_port_b_w ) WRITE8_HANDLER( bublbobl_68705_ddr_b_w ) { - bublbobl_state *state = (bublbobl_state *)space->machine->driver_data; + bublbobl_state *state = space->machine->driver_data(); state->ddr_b = data; } diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c index b90d1ae81e6..2f260d6235d 100644 --- a/src/mame/machine/buggychl.c +++ b/src/mame/machine/buggychl.c @@ -13,21 +13,21 @@ READ8_HANDLER( buggychl_68705_port_a_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); } WRITE8_HANDLER( buggychl_68705_port_a_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; } WRITE8_HANDLER( buggychl_68705_ddr_a_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -54,13 +54,13 @@ WRITE8_HANDLER( buggychl_68705_ddr_a_w ) READ8_HANDLER( buggychl_68705_port_b_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( buggychl_68705_port_b_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(space->cpu), data); if ((state->ddr_b & 0x02) && (~data & 0x02) && (state->port_b_out & 0x02)) @@ -83,7 +83,7 @@ WRITE8_HANDLER( buggychl_68705_port_b_w ) WRITE8_HANDLER( buggychl_68705_ddr_b_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->ddr_b = data; } @@ -99,7 +99,7 @@ WRITE8_HANDLER( buggychl_68705_ddr_b_w ) READ8_HANDLER( buggychl_68705_port_c_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->port_c_in = 0; if (state->main_sent) state->port_c_in |= 0x01; @@ -111,21 +111,21 @@ READ8_HANDLER( buggychl_68705_port_c_r ) WRITE8_HANDLER( buggychl_68705_port_c_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(space->cpu), data); state->port_c_out = data; } WRITE8_HANDLER( buggychl_68705_ddr_c_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->ddr_c = data; } WRITE8_HANDLER( buggychl_mcu_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); logerror("%04x: mcu_w %02x\n", cpu_get_pc(space->cpu), data); state->from_main = data; state->main_sent = 1; @@ -134,7 +134,7 @@ WRITE8_HANDLER( buggychl_mcu_w ) READ8_HANDLER( buggychl_mcu_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); logerror("%04x: mcu_r %02x\n", cpu_get_pc(space->cpu), state->from_mcu); state->mcu_sent = 0; return state->from_mcu; @@ -142,7 +142,7 @@ READ8_HANDLER( buggychl_mcu_r ) READ8_HANDLER( buggychl_mcu_status_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); int res = 0; /* bit 0 = when 1, mcu is ready to receive data from main cpu */ diff --git a/src/mame/machine/chaknpop.c b/src/mame/machine/chaknpop.c index 8bd92e6b304..eab8c73e7ae 100644 --- a/src/mame/machine/chaknpop.c +++ b/src/mame/machine/chaknpop.c @@ -47,7 +47,7 @@ static const UINT8 mcu_data[256] = { static void mcu_update_seed( running_machine *machine, UINT8 data ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); if (!(data & 0x80)) { @@ -67,7 +67,7 @@ static void mcu_update_seed( running_machine *machine, UINT8 data ) READ8_HANDLER( chaknpop_mcu_port_a_r ) { - chaknpop_state *state = (chaknpop_state *)space->machine->driver_data; + chaknpop_state *state = space->machine->driver_data(); //logerror("%04x: MCU port_a read\n", cpu_get_pc(space->cpu)); return state->mcu_result; } @@ -88,7 +88,7 @@ READ8_HANDLER( chaknpop_mcu_port_c_r ) WRITE8_HANDLER( chaknpop_mcu_port_a_w ) { - chaknpop_state *state = (chaknpop_state *)space->machine->driver_data; + chaknpop_state *state = space->machine->driver_data(); UINT8 mcu_command; mcu_command = data + state->mcu_seed; diff --git a/src/mame/machine/copsnrob.c b/src/mame/machine/copsnrob.c index 1fbd42ae869..578929498f5 100644 --- a/src/mame/machine/copsnrob.c +++ b/src/mame/machine/copsnrob.c @@ -17,7 +17,7 @@ static const int gun_mask[] = {0x7e, 0x7d, 0x7b, 0x77, 0x6f, 0x5f, 0x3f}; READ8_HANDLER( copsnrob_gun_position_r ) { - copsnrob_state *state = (copsnrob_state *)space->machine->driver_data; + copsnrob_state *state = space->machine->driver_data(); int keys, current_car_image, current_gun_pos = 0; // Determine which player we need diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index efa809879cc..fb47797a9d9 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -58,7 +58,7 @@ WRITE8_HANDLER( decocass_coin_counter_w ) WRITE8_HANDLER( decocass_sound_command_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(2,("CPU %s sound command -> $%02x\n", space->cpu->tag(), data)); soundlatch_w(space, 0, data); state->sound_ack |= 0x80; @@ -76,7 +76,7 @@ READ8_HANDLER( decocass_sound_data_r ) READ8_HANDLER( decocass_sound_ack_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data = state->sound_ack; /* D6+D7 */ LOG(4,("CPU %s sound ack <- $%02x\n", space->cpu->tag(), data)); return data; @@ -84,7 +84,7 @@ READ8_HANDLER( decocass_sound_ack_r ) WRITE8_HANDLER( decocass_sound_data_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(2,("CPU %s sound data -> $%02x\n", space->cpu->tag(), data)); soundlatch2_w(space, 0, data); state->sound_ack |= 0x40; @@ -92,7 +92,7 @@ WRITE8_HANDLER( decocass_sound_data_w ) READ8_HANDLER( decocass_sound_command_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data = soundlatch_r(space, 0); LOG(4,("CPU %s sound command <- $%02x\n", space->cpu->tag(), data)); cpu_set_input_line(state->audiocpu, M6502_IRQ_LINE, CLEAR_LINE); @@ -102,7 +102,7 @@ READ8_HANDLER( decocass_sound_command_r ) TIMER_DEVICE_CALLBACK( decocass_audio_nmi_gen ) { - decocass_state *state = (decocass_state *)timer.machine->driver_data; + decocass_state *state = timer.machine->driver_data(); int scanline = param; state->audio_nmi_state = scanline & 8; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, (state->audio_nmi_enabled && state->audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE); @@ -110,14 +110,14 @@ TIMER_DEVICE_CALLBACK( decocass_audio_nmi_gen ) WRITE8_HANDLER( decocass_sound_nmi_enable_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->audio_nmi_enabled = 1; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, (state->audio_nmi_enabled && state->audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE); } READ8_HANDLER( decocass_sound_nmi_enable_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->audio_nmi_enabled = 1; cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, (state->audio_nmi_enabled && state->audio_nmi_state) ? ASSERT_LINE : CLEAR_LINE); return 0xff; @@ -125,7 +125,7 @@ READ8_HANDLER( decocass_sound_nmi_enable_r ) READ8_HANDLER( decocass_sound_data_ack_reset_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data = 0xff; LOG(2,("CPU %s sound ack rst <- $%02x\n", space->cpu->tag(), data)); state->sound_ack &= ~0x40; @@ -134,20 +134,20 @@ READ8_HANDLER( decocass_sound_data_ack_reset_r ) WRITE8_HANDLER( decocass_sound_data_ack_reset_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(2,("CPU %s sound ack rst -> $%02x\n", space->cpu->tag(), data)); state->sound_ack &= ~0x40; } WRITE8_HANDLER( decocass_nmi_reset_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); cpu_set_input_line(state->maincpu, INPUT_LINE_NMI, CLEAR_LINE ); } WRITE8_HANDLER( decocass_quadrature_decoder_reset_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); /* just latch the analog controls here */ state->quadrature_decoder[0] = input_port_read(space->machine, "AN0"); @@ -172,7 +172,7 @@ WRITE8_HANDLER( decocass_adc_w ) */ READ8_HANDLER( decocass_input_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data = 0xff; static const char *const portnames[] = { "IN0", "IN1", "IN2" }; @@ -207,7 +207,7 @@ READ8_HANDLER( decocass_input_r ) WRITE8_HANDLER( decocass_reset_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(1,("%10s 6502-PC: %04x decocass_reset_w(%02x): $%02x\n", attotime_string(timer_get_time(space->machine), 6), cpu_get_previouspc(space->cpu), offset, data)); state->decocass_reset = data; @@ -229,7 +229,7 @@ WRITE8_HANDLER( decocass_reset_w ) #ifdef MAME_DEBUG static void decocass_fno( running_machine *machine, offs_t offset, UINT8 data ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); /* 8041ENA/ and is this a FNO write (function number)? */ if (0 == (state->i8041_p2 & 0x01)) { @@ -276,7 +276,7 @@ static void decocass_fno( running_machine *machine, offs_t offset, UINT8 data ) static READ8_HANDLER( decocass_type1_latch_26_pass_3_inv_2_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -356,7 +356,7 @@ static READ8_HANDLER( decocass_type1_latch_26_pass_3_inv_2_r ) static READ8_HANDLER( decocass_type1_pass_136_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -436,7 +436,7 @@ static READ8_HANDLER( decocass_type1_pass_136_r ) static READ8_HANDLER( decocass_type1_latch_27_pass_3_inv_2_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -516,7 +516,7 @@ static READ8_HANDLER( decocass_type1_latch_27_pass_3_inv_2_r ) static READ8_HANDLER( decocass_type1_latch_26_pass_5_inv_2_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -598,7 +598,7 @@ static READ8_HANDLER( decocass_type1_latch_26_pass_5_inv_2_r ) static READ8_HANDLER( decocass_type1_latch_16_pass_3_inv_1_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -679,7 +679,7 @@ static READ8_HANDLER( decocass_type1_latch_16_pass_3_inv_1_r ) ***************************************************************************/ static READ8_HANDLER( decocass_type2_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == state->type2_xx_latch) @@ -709,7 +709,7 @@ static READ8_HANDLER( decocass_type2_r ) static WRITE8_HANDLER( decocass_type2_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (1 == state->type2_xx_latch) { if (1 == (offset & 1)) @@ -761,7 +761,7 @@ static WRITE8_HANDLER( decocass_type2_w ) ***************************************************************************/ static READ8_HANDLER( decocass_type3_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data, save; if (1 == (offset & 1)) @@ -949,7 +949,7 @@ static READ8_HANDLER( decocass_type3_r ) static WRITE8_HANDLER( decocass_type3_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (1 == (offset & 1)) { if (1 == state->type3_pal_19) @@ -989,7 +989,7 @@ static WRITE8_HANDLER( decocass_type3_w ) static READ8_HANDLER( decocass_type4_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -1035,7 +1035,7 @@ static READ8_HANDLER( decocass_type4_r ) static WRITE8_HANDLER( decocass_type4_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (1 == (offset & 1)) { if (1 == state->type4_latch) @@ -1074,7 +1074,7 @@ static WRITE8_HANDLER( decocass_type4_w ) static READ8_HANDLER( decocass_type5_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -1117,7 +1117,7 @@ static READ8_HANDLER( decocass_type5_r ) static WRITE8_HANDLER( decocass_type5_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (1 == (offset & 1)) { if (1 == state->type5_latch) @@ -1152,7 +1152,7 @@ static WRITE8_HANDLER( decocass_type5_w ) static READ8_HANDLER( decocass_nodong_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; if (1 == (offset & 1)) @@ -1193,7 +1193,7 @@ static READ8_HANDLER( decocass_nodong_r ) READ8_HANDLER( decocass_e5xx_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; /* E5x2-E5x3 and mirrors */ @@ -1236,7 +1236,7 @@ READ8_HANDLER( decocass_e5xx_r ) WRITE8_HANDLER( decocass_e5xx_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (state->dongle_w) { (*state->dongle_w)(space, offset, data); @@ -1271,7 +1271,7 @@ WRITE8_HANDLER( decocass_e5xx_w ) WRITE8_HANDLER( decocass_e900_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->de0091_enable = data & 1; memory_set_bank(space->machine, "bank1", data & 1); /* Perhaps the second row of ROMs is enabled by another bit. @@ -1283,7 +1283,7 @@ WRITE8_HANDLER( decocass_e900_w ) WRITE8_HANDLER( decocass_de0091_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); /* don't allow writes to the ROMs */ if (!state->de0091_enable) decocass_charram_w(space, offset, data); @@ -1297,7 +1297,7 @@ WRITE8_HANDLER( decocass_de0091_w ) /* To be called once from driver_init, i.e. decocass_init */ void decocass_machine_state_save_init( running_machine *machine ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); state_save_register_global(machine, state->firsttime); state_save_register_global(machine, state->decocass_reset); state_save_register_global(machine, state->i8041_p1); @@ -1335,7 +1335,7 @@ void decocass_machine_state_save_init( running_machine *machine ) MACHINE_START( decocass ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1345,7 +1345,7 @@ MACHINE_START( decocass ) static void decocass_reset_common( running_machine *machine ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); state->firsttime = 1; state->latch1 = 0; @@ -1404,7 +1404,7 @@ MACHINE_RESET( decocass ) MACHINE_RESET( ctsttape ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061)\n")); state->dongle_r = decocass_type1_pass_136_r; @@ -1412,7 +1412,7 @@ MACHINE_RESET( ctsttape ) MACHINE_RESET( chwy ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 own PROM)\n")); state->dongle_r = decocass_type1_latch_27_pass_3_inv_2_r; @@ -1420,7 +1420,7 @@ MACHINE_RESET( chwy ) MACHINE_RESET( clocknch ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 flip 2-3)\n")); state->dongle_r = decocass_type1_latch_26_pass_3_inv_2_r; @@ -1430,7 +1430,7 @@ MACHINE_RESET( clocknch ) MACHINE_RESET( ctisland ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 flip 0-2)\n")); state->dongle_r = decocass_type1_latch_26_pass_3_inv_2_r; @@ -1440,7 +1440,7 @@ MACHINE_RESET( ctisland ) MACHINE_RESET( csuperas ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 flip 4-5)\n")); state->dongle_r = decocass_type1_latch_26_pass_3_inv_2_r; @@ -1450,7 +1450,7 @@ MACHINE_RESET( csuperas ) MACHINE_RESET( castfant ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061)\n")); state->dongle_r = decocass_type1_latch_16_pass_3_inv_1_r; @@ -1458,7 +1458,7 @@ MACHINE_RESET( castfant ) MACHINE_RESET( cluckypo ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 flip 1-3)\n")); state->dongle_r = decocass_type1_latch_26_pass_3_inv_2_r; @@ -1468,7 +1468,7 @@ MACHINE_RESET( cluckypo ) MACHINE_RESET( cterrani ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 straight)\n")); state->dongle_r = decocass_type1_latch_26_pass_3_inv_2_r; @@ -1478,7 +1478,7 @@ MACHINE_RESET( cterrani ) MACHINE_RESET( cexplore ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 own PROM)\n")); state->dongle_r = decocass_type1_latch_26_pass_5_inv_2_r; @@ -1486,7 +1486,7 @@ MACHINE_RESET( cexplore ) MACHINE_RESET( cprogolf ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #1 (DE-0061 flip 0-1)\n")); state->dongle_r = decocass_type1_latch_26_pass_3_inv_2_r; @@ -1496,7 +1496,7 @@ MACHINE_RESET( cprogolf ) MACHINE_RESET( cmissnx ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #2 (CS82-007)\n")); state->dongle_r = decocass_type2_r; @@ -1505,7 +1505,7 @@ MACHINE_RESET( cmissnx ) MACHINE_RESET( cdiscon1 ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #2 (CS82-007)\n")); state->dongle_r = decocass_type2_r; @@ -1514,7 +1514,7 @@ MACHINE_RESET( cdiscon1 ) MACHINE_RESET( cptennis ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #2 (CS82-007)\n")); state->dongle_r = decocass_type2_r; @@ -1523,7 +1523,7 @@ MACHINE_RESET( cptennis ) MACHINE_RESET( ctornado ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #2 (CS82-007)\n")); state->dongle_r = decocass_type2_r; @@ -1532,7 +1532,7 @@ MACHINE_RESET( ctornado ) MACHINE_RESET( cbnj ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1542,7 +1542,7 @@ MACHINE_RESET( cbnj ) MACHINE_RESET( cburnrub ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1552,7 +1552,7 @@ MACHINE_RESET( cburnrub ) MACHINE_RESET( cbtime ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1562,7 +1562,7 @@ MACHINE_RESET( cbtime ) MACHINE_RESET( cgraplop ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1572,7 +1572,7 @@ MACHINE_RESET( cgraplop ) MACHINE_RESET( cgraplop2 ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1582,7 +1582,7 @@ MACHINE_RESET( cgraplop2 ) MACHINE_RESET( clapapa ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1592,7 +1592,7 @@ MACHINE_RESET( clapapa ) MACHINE_RESET( cfghtice ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1602,7 +1602,7 @@ MACHINE_RESET( cfghtice ) MACHINE_RESET( cprobowl ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1612,7 +1612,7 @@ MACHINE_RESET( cprobowl ) MACHINE_RESET( cnightst ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1622,7 +1622,7 @@ MACHINE_RESET( cnightst ) MACHINE_RESET( cprosocc ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1632,7 +1632,7 @@ MACHINE_RESET( cprosocc ) MACHINE_RESET( cppicf ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; @@ -1642,7 +1642,7 @@ MACHINE_RESET( cppicf ) MACHINE_RESET( cscrtry ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #4 (32K ROM)\n")); state->dongle_r = decocass_type4_r; @@ -1651,7 +1651,7 @@ MACHINE_RESET( cscrtry ) MACHINE_RESET( cbdash ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("dongle type #5 (NOP)\n")); state->dongle_r = decocass_type5_r; @@ -1660,7 +1660,7 @@ MACHINE_RESET( cbdash ) MACHINE_RESET( cflyball ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); decocass_reset_common(machine); LOG(0,("no dongle\n")); state->dongle_r = decocass_nodong_r; @@ -1668,7 +1668,7 @@ MACHINE_RESET( cflyball ) MACHINE_RESET( czeroize ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); UINT8 *mem = memory_region(machine, "dongle"); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); @@ -1698,7 +1698,7 @@ MACHINE_RESET( czeroize ) WRITE8_HANDLER( i8041_p1_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data != state->i8041_p1_write_latch) { LOG(4,("%10s 8041-PC: %03x i8041_p1_w: $%02x (%s%s%s%s%s%s%s%s)\n", @@ -1733,7 +1733,7 @@ WRITE8_HANDLER( i8041_p1_w ) READ8_HANDLER( i8041_p1_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data = state->i8041_p1; if (data != state->i8041_p1_read_latch) @@ -1757,7 +1757,7 @@ READ8_HANDLER( i8041_p1_r ) WRITE8_HANDLER( i8041_p2_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data != state->i8041_p2_write_latch) { LOG(4,("%10s 8041-PC: %03x i8041_p2_w: $%02x (%s%s%s%s%s%s%s%s)\n", @@ -1779,7 +1779,7 @@ WRITE8_HANDLER( i8041_p2_w ) READ8_HANDLER( i8041_p2_r ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); UINT8 data; data = (state->i8041_p2 & ~0xe0) | tape_get_status_bits(state->cassette); diff --git a/src/mame/machine/decocass.h b/src/mame/machine/decocass.h index d6d318e108a..d462ae7cb09 100644 --- a/src/mame/machine/decocass.h +++ b/src/mame/machine/decocass.h @@ -16,12 +16,13 @@ DECLARE_LEGACY_DEVICE(DECOCASS_TAPE, decocass_tape); -class decocass_state +class decocass_state : public driver_data_t { public: - static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, decocass_state(machine)); } + static driver_data_t *alloc(running_machine &machine) { return auto_alloc_clear(&machine, decocass_state(machine)); } - decocass_state(running_machine &machine) { } + decocass_state(running_machine &machine) + : driver_data_t(machine) { } /* memory pointers */ UINT8 * rambase; diff --git a/src/mame/machine/docastle.c b/src/mame/machine/docastle.c index 921529c8960..223a7fec4ed 100644 --- a/src/mame/machine/docastle.c +++ b/src/mame/machine/docastle.c @@ -29,7 +29,7 @@ if it was a small shared buffer. The order of operations is: */ READ8_HANDLER( docastle_shared0_r ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); if (offset == 8) logerror("CPU #0 shared0r clock = %d\n", (UINT32)state->maincpu->total_cycles()); return state->buffer0[offset]; } @@ -37,7 +37,7 @@ READ8_HANDLER( docastle_shared0_r ) READ8_HANDLER( docastle_shared1_r ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); if (offset == 8) logerror("CPU #1 shared1r clock = %d\n", (UINT32)state->slave->total_cycles()); return state->buffer1[offset]; } @@ -45,7 +45,7 @@ READ8_HANDLER( docastle_shared1_r ) WRITE8_HANDLER( docastle_shared0_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); if (offset == 8) logerror("CPU #1 shared0w %02x %02x %02x %02x %02x %02x %02x %02x %02x clock = %d\n", state->buffer0[0], state->buffer0[1], state->buffer0[2], state->buffer0[3], state->buffer0[4], state->buffer0[5], state->buffer0[6], state->buffer0[7], @@ -61,7 +61,7 @@ WRITE8_HANDLER( docastle_shared0_w ) WRITE8_HANDLER( docastle_shared1_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); state->buffer1[offset] = data; if (offset == 8) @@ -80,6 +80,6 @@ WRITE8_HANDLER( docastle_shared1_w ) WRITE8_HANDLER( docastle_nmitrigger_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); cpu_set_input_line(state->slave, INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c index beb7fd8803a..057cf49662f 100644 --- a/src/mame/machine/flstory.c +++ b/src/mame/machine/flstory.c @@ -22,7 +22,7 @@ READ8_HANDLER( flstory_68705_port_a_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); @@ -30,7 +30,7 @@ READ8_HANDLER( flstory_68705_port_a_r ) WRITE8_HANDLER( flstory_68705_port_a_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; @@ -38,7 +38,7 @@ WRITE8_HANDLER( flstory_68705_port_a_w ) WRITE8_HANDLER( flstory_68705_ddr_a_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -55,13 +55,13 @@ WRITE8_HANDLER( flstory_68705_ddr_a_w ) READ8_HANDLER( flstory_68705_port_b_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( flstory_68705_port_b_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port B write %02x\n",cpu_get_pc(space->cpu),data); if ((state->ddr_b & 0x02) && (~data & 0x02) && (state->port_b_out & 0x02)) @@ -84,14 +84,14 @@ WRITE8_HANDLER( flstory_68705_port_b_w ) WRITE8_HANDLER( flstory_68705_ddr_b_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->ddr_b = data; } READ8_HANDLER( flstory_68705_port_c_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->port_c_in = 0; if (state->main_sent) @@ -106,20 +106,20 @@ READ8_HANDLER( flstory_68705_port_c_r ) WRITE8_HANDLER( flstory_68705_port_c_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(space->cpu), data); state->port_c_out = data; } WRITE8_HANDLER( flstory_68705_ddr_c_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->ddr_c = data; } WRITE8_HANDLER( flstory_mcu_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); logerror("%04x: mcu_w %02x\n", cpu_get_pc(space->cpu), data); state->from_main = data; @@ -129,7 +129,7 @@ WRITE8_HANDLER( flstory_mcu_w ) READ8_HANDLER( flstory_mcu_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); logerror("%04x: mcu_r %02x\n",cpu_get_pc(space->cpu), state->from_mcu); state->mcu_sent = 0; @@ -138,7 +138,7 @@ READ8_HANDLER( flstory_mcu_r ) READ8_HANDLER( flstory_mcu_status_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); int res = 0; /* bit 0 = when 1, mcu is ready to receive data from main cpu */ @@ -154,7 +154,7 @@ READ8_HANDLER( flstory_mcu_status_r ) WRITE8_HANDLER( onna34ro_mcu_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); UINT16 score_adr = state->workram[0x29e] * 0x100 + state->workram[0x29d]; switch (data) @@ -184,7 +184,7 @@ WRITE8_HANDLER( onna34ro_mcu_w ) READ8_HANDLER( onna34ro_mcu_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); return state->from_mcu; } @@ -236,7 +236,7 @@ static const UINT8 victnine_mcu_data[0x100] = WRITE8_HANDLER( victnine_mcu_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); UINT8 seed = VICTNINE_MCU_SEED; if (!seed && (data & 0x37) == 0x37) @@ -273,7 +273,7 @@ WRITE8_HANDLER( victnine_mcu_w ) READ8_HANDLER( victnine_mcu_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); //logerror("%04x: mcu read (0x%02x)\n", cpu_get_previouspc(space->cpu), state->from_mcu); return state->from_mcu - VICTNINE_MCU_SEED; diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c index 698157de457..eded1dccf1f 100644 --- a/src/mame/machine/harddriv.c +++ b/src/mame/machine/harddriv.c @@ -54,7 +54,7 @@ static void hd68k_update_interrupts(running_machine *machine); MACHINE_START( harddriv ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); atarigen_init(machine); @@ -67,12 +67,12 @@ MACHINE_START( harddriv ) MACHINE_RESET( harddriv ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); /* generic reset */ - atarigen_eeprom_reset(&state->atarigen); + atarigen_eeprom_reset(state); slapstic_reset(); - atarigen_interrupt_reset(&state->atarigen, hd68k_update_interrupts); + atarigen_interrupt_reset(state, hd68k_update_interrupts); /* halt several of the DSPs to start */ if (state->adsp != NULL) cpu_set_input_line(state->adsp, INPUT_LINE_HALT, ASSERT_LINE); @@ -111,11 +111,11 @@ MACHINE_RESET( harddriv ) static void hd68k_update_interrupts(running_machine *machine) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 1, state->msp_irq_state ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->maincpu, 2, state->adsp_irq_state ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->maincpu, 3, state->gsp_irq_state ? ASSERT_LINE : CLEAR_LINE); - cpu_set_input_line(state->maincpu, 4, state->atarigen.sound_int_state ? ASSERT_LINE : CLEAR_LINE); /* /LINKIRQ on STUN Runner */ + cpu_set_input_line(state->maincpu, 4, state->sound_int_state ? ASSERT_LINE : CLEAR_LINE); /* /LINKIRQ on STUN Runner */ cpu_set_input_line(state->maincpu, 5, state->irq_state ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(state->maincpu, 6, state->duart_irq_state ? ASSERT_LINE : CLEAR_LINE); } @@ -123,7 +123,7 @@ static void hd68k_update_interrupts(running_machine *machine) INTERRUPT_GEN( hd68k_irq_gen ) { - harddriv_state *state = (harddriv_state *)device->machine->driver_data; + harddriv_state *state = device->machine->driver_data(); state->irq_state = 1; atarigen_update_interrupts(device->machine); } @@ -131,7 +131,7 @@ INTERRUPT_GEN( hd68k_irq_gen ) WRITE16_HANDLER( hd68k_irq_ack_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->irq_state = 0; atarigen_update_interrupts(space->machine); } @@ -139,7 +139,7 @@ WRITE16_HANDLER( hd68k_irq_ack_w ) void hdgsp_irq_gen(running_device *device, int irqstate) { - harddriv_state *state = (harddriv_state *)device->machine->driver_data; + harddriv_state *state = device->machine->driver_data(); state->gsp_irq_state = irqstate; atarigen_update_interrupts(device->machine); } @@ -147,7 +147,7 @@ void hdgsp_irq_gen(running_device *device, int irqstate) void hdmsp_irq_gen(running_device *device, int irqstate) { - harddriv_state *state = (harddriv_state *)device->machine->driver_data; + harddriv_state *state = device->machine->driver_data(); state->msp_irq_state = irqstate; atarigen_update_interrupts(device->machine); } @@ -162,7 +162,7 @@ void hdmsp_irq_gen(running_device *device, int irqstate) READ16_HANDLER( hd68k_gsp_io_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT16 result; offset = (offset / 2) ^ 1; state->hd34010_host_access = TRUE; @@ -174,7 +174,7 @@ READ16_HANDLER( hd68k_gsp_io_r ) WRITE16_HANDLER( hd68k_gsp_io_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); offset = (offset / 2) ^ 1; state->hd34010_host_access = TRUE; tms34010_host_w(state->gsp, offset, data); @@ -191,7 +191,7 @@ WRITE16_HANDLER( hd68k_gsp_io_w ) READ16_HANDLER( hd68k_msp_io_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT16 result; offset = (offset / 2) ^ 1; state->hd34010_host_access = TRUE; @@ -203,7 +203,7 @@ READ16_HANDLER( hd68k_msp_io_r ) WRITE16_HANDLER( hd68k_msp_io_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); offset = (offset / 2) ^ 1; if (state->msp != NULL) { @@ -247,7 +247,7 @@ READ16_HANDLER( hd68k_port0_r ) READ16_HANDLER( hdc68k_port1_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT16 result = input_port_read(space->machine, "a80000"); UINT16 diff = result ^ state->hdc68k_last_port1; @@ -276,7 +276,7 @@ READ16_HANDLER( hdc68k_port1_r ) READ16_HANDLER( hda68k_port1_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT16 result = input_port_read(space->machine, "a80000"); /* merge in the wheel edge latch bit */ @@ -289,7 +289,7 @@ READ16_HANDLER( hda68k_port1_r ) READ16_HANDLER( hdc68k_wheel_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* grab the new wheel value and upconvert to 12 bits */ UINT16 new_wheel = input_port_read(space->machine, "12BADC0") << 4; @@ -310,21 +310,21 @@ READ16_HANDLER( hdc68k_wheel_r ) READ16_HANDLER( hd68k_adc8_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->adc8_data; } READ16_HANDLER( hd68k_adc12_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->adc12_byte ? ((state->adc12_data >> 8) & 0x0f) : (state->adc12_data & 0xff); } READ16_HANDLER( hd68k_sound_reset_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->jsacpu != NULL) atarijsa_reset(); return ~0; @@ -342,7 +342,7 @@ WRITE16_HANDLER( hd68k_adc_control_w ) { static const char *const adc8names[] = { "8BADC0", "8BADC1", "8BADC2", "8BADC3", "8BADC4", "8BADC5", "8BADC6", "8BADC7" }; static const char *const adc12names[] = { "12BADC0", "12BADC1", "12BADC2", "12BADC3" }; - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->adc_control); @@ -408,7 +408,7 @@ WRITE16_HANDLER( hd68k_wr2_write ) WRITE16_HANDLER( hd68k_nwr_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* bit 3 selects the value; data is ignored */ data = (offset >> 3) & 1; @@ -448,7 +448,7 @@ WRITE16_HANDLER( hd68k_nwr_w ) WRITE16_HANDLER( hdc68k_wheel_edge_reset_w ) { /* reset the edge latch */ - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->hdc68k_wheel_edge = 0; } @@ -462,16 +462,16 @@ WRITE16_HANDLER( hdc68k_wheel_edge_reset_w ) READ16_HANDLER( hd68k_zram_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; - return state->atarigen.eeprom[offset]; + harddriv_state *state = space->machine->driver_data(); + return state->eeprom[offset]; } WRITE16_HANDLER( hd68k_zram_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->m68k_zp1 == 0 && state->m68k_zp2 == 1) - COMBINE_DATA(&state->atarigen.eeprom[offset]); + COMBINE_DATA(&state->eeprom[offset]); } @@ -525,7 +525,7 @@ INLINE attotime duart_clock_period(harddriv_state *state) TIMER_DEVICE_CALLBACK( hd68k_duart_callback ) { - harddriv_state *state = (harddriv_state *)timer.machine->driver_data; + harddriv_state *state = timer.machine->driver_data(); logerror("DUART timer fired\n"); if (state->duart_write_data[0x05] & 0x08) { @@ -540,7 +540,7 @@ TIMER_DEVICE_CALLBACK( hd68k_duart_callback ) READ16_HANDLER( hd68k_duart_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); switch (offset) { case 0x00: /* Mode Register A (MR1A, MR2A) */ @@ -585,7 +585,7 @@ READ16_HANDLER( hd68k_duart_r ) WRITE16_HANDLER( hd68k_duart_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { int newdata = (data >> 8) & 0xff; @@ -631,7 +631,7 @@ WRITE16_HANDLER( hd68k_duart_w ) WRITE16_HANDLER( hdgsp_io_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* detect an enabling of the shift register and force yielding */ if (offset == REG_DPYCTL) @@ -662,7 +662,7 @@ WRITE16_HANDLER( hdgsp_io_w ) WRITE16_HANDLER( hdgsp_protection_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* this memory address is incremented whenever a protection check fails */ /* after it reaches a certain value, the GSP will randomly trash a */ @@ -680,7 +680,7 @@ WRITE16_HANDLER( hdgsp_protection_w ) static TIMER_CALLBACK( stmsp_sync_update ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); int which = param >> 28; offs_t offset = (param >> 16) & 0xfff; UINT16 data = param; @@ -691,7 +691,7 @@ static TIMER_CALLBACK( stmsp_sync_update ) INLINE void stmsp_sync_w(const address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask, int which) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT16 newdata = state->stmsp_sync[which][offset]; COMBINE_DATA(&newdata); @@ -737,7 +737,7 @@ WRITE16_HANDLER( stmsp_sync2_w ) READ16_HANDLER( hd68k_adsp_program_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT32 word = state->adsp_pgm_memory[offset/2]; return (!(offset & 1)) ? (word >> 16) : (word & 0xffff); } @@ -745,7 +745,7 @@ READ16_HANDLER( hd68k_adsp_program_r ) WRITE16_HANDLER( hd68k_adsp_program_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT32 *base = &state->adsp_pgm_memory[offset/2]; UINT32 oldword = *base; UINT16 temp; @@ -775,14 +775,14 @@ WRITE16_HANDLER( hd68k_adsp_program_w ) READ16_HANDLER( hd68k_adsp_data_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->adsp_data_memory[offset]; } WRITE16_HANDLER( hd68k_adsp_data_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->adsp_data_memory[offset]); @@ -807,7 +807,7 @@ WRITE16_HANDLER( hd68k_adsp_data_w ) READ16_HANDLER( hd68k_adsp_buffer_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* logerror("hd68k_adsp_buffer_r(%04X)\n", offset);*/ return state->som_memory[state->m68k_adsp_buffer_bank * 0x2000 + offset]; } @@ -815,7 +815,7 @@ READ16_HANDLER( hd68k_adsp_buffer_r ) WRITE16_HANDLER( hd68k_adsp_buffer_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->som_memory[state->m68k_adsp_buffer_bank * 0x2000 + offset]); } @@ -829,7 +829,7 @@ WRITE16_HANDLER( hd68k_adsp_buffer_w ) static TIMER_CALLBACK( deferred_adsp_bank_switch ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); if (LOG_COMMANDS && state->m68k_adsp_buffer_bank != param && input_code_pressed(machine, KEYCODE_L)) { static FILE *commands; @@ -881,7 +881,7 @@ static TIMER_CALLBACK( deferred_adsp_bank_switch ) WRITE16_HANDLER( hd68k_adsp_control_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* bit 3 selects the value; data is ignored */ int val = (offset >> 3) & 1; @@ -949,7 +949,7 @@ WRITE16_HANDLER( hd68k_adsp_control_w ) WRITE16_HANDLER( hd68k_adsp_irq_clear_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); logerror("%06X:68k clears ADSP interrupt\n", cpu_get_previouspc(space->cpu)); state->adsp_irq_state = 0; atarigen_update_interrupts(space->machine); @@ -958,7 +958,7 @@ WRITE16_HANDLER( hd68k_adsp_irq_clear_w ) READ16_HANDLER( hd68k_adsp_irq_state_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int result = 0xfffd; if (state->adsp_xflag) result ^= 2; if (state->adsp_irq_state) result ^= 1; @@ -976,7 +976,7 @@ READ16_HANDLER( hd68k_adsp_irq_state_r ) READ16_HANDLER( hdadsp_special_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); switch (offset & 7) { case 0: /* /SIMBUF */ @@ -1004,7 +1004,7 @@ READ16_HANDLER( hdadsp_special_r ) WRITE16_HANDLER( hdadsp_special_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); switch (offset & 7) { case 1: /* /SIMCLK */ @@ -1064,7 +1064,7 @@ static void update_ds3_irq(harddriv_state *state) WRITE16_HANDLER( hd68k_ds3_control_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int val = (offset >> 3) & 1; switch (offset & 7) @@ -1129,7 +1129,7 @@ WRITE16_HANDLER( hd68k_ds3_control_w ) READ16_HANDLER( hd68k_ds3_girq_state_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int result = 0x0fff; if (state->ds3_g68flag) result ^= 0x8000; if (state->ds3_gflag) result ^= 0x4000; @@ -1141,7 +1141,7 @@ READ16_HANDLER( hd68k_ds3_girq_state_r ) READ16_HANDLER( hd68k_ds3_gdata_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); offs_t pc = cpu_get_pc(space->cpu); state->ds3_gflag = 0; @@ -1189,7 +1189,7 @@ READ16_HANDLER( hd68k_ds3_gdata_r ) WRITE16_HANDLER( hd68k_ds3_gdata_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); logerror("%06X:hd68k_ds3_gdata_w(%04X)\n", cpu_get_previouspc(space->cpu), state->ds3_gdata); @@ -1233,7 +1233,7 @@ WRITE16_HANDLER( hd68k_ds3_sdata_w ) READ16_HANDLER( hdds3_special_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int result; switch (offset & 7) @@ -1263,7 +1263,7 @@ READ16_HANDLER( hdds3_special_r ) WRITE16_HANDLER( hdds3_special_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* IMPORTANT! these data values also write through to the underlying RAM */ state->adsp_data_memory[offset] = data; @@ -1330,7 +1330,7 @@ WRITE16_HANDLER( hdds3_control_w ) READ16_HANDLER( hd68k_ds3_program_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT32 *base = &state->adsp_pgm_memory[offset & 0x1fff]; UINT32 word = *base; return (!(offset & 0x2000)) ? (word >> 8) : (word & 0xff); @@ -1339,7 +1339,7 @@ READ16_HANDLER( hd68k_ds3_program_r ) WRITE16_HANDLER( hd68k_ds3_program_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT32 *base = &state->adsp_pgm_memory[offset & 0x1fff]; UINT32 oldword = *base; UINT16 temp; @@ -1374,7 +1374,7 @@ WRITE16_HANDLER( hd68k_ds3_program_w ) void hddsk_update_pif(running_device *device, UINT32 pins) { - atarigen_state *atarigen = (atarigen_state *)device->machine->driver_data; + atarigen_state *atarigen = device->machine->driver_data(); atarigen->sound_int_state = ((pins & DSP32_OUTPUT_PIF) != 0); hd68k_update_interrupts(device->machine); } @@ -1389,7 +1389,7 @@ void hddsk_update_pif(running_device *device, UINT32 pins) WRITE16_HANDLER( hd68k_dsk_control_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int val = (offset >> 3) & 1; switch (offset & 7) { @@ -1430,42 +1430,42 @@ WRITE16_HANDLER( hd68k_dsk_control_w ) READ16_HANDLER( hd68k_dsk_ram_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->dsk_ram[offset]; } WRITE16_HANDLER( hd68k_dsk_ram_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->dsk_ram[offset]); } READ16_HANDLER( hd68k_dsk_zram_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->dsk_zram[offset]; } WRITE16_HANDLER( hd68k_dsk_zram_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->dsk_zram[offset]); } READ16_HANDLER( hd68k_dsk_small_rom_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->dsk_rom[offset & 0x1ffff]; } READ16_HANDLER( hd68k_dsk_rom_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->dsk_rom[offset]; } @@ -1479,7 +1479,7 @@ READ16_HANDLER( hd68k_dsk_rom_r ) WRITE16_HANDLER( hd68k_dsk_dsp32_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); state->dsk_pio_access = TRUE; dsp32c_pio_w(state->dsp32, offset, data); state->dsk_pio_access = FALSE; @@ -1488,7 +1488,7 @@ WRITE16_HANDLER( hd68k_dsk_dsp32_w ) READ16_HANDLER( hd68k_dsk_dsp32_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT16 result; state->dsk_pio_access = TRUE; result = dsp32c_pio_r(state->dsp32, offset); @@ -1505,14 +1505,14 @@ READ16_HANDLER( hd68k_dsk_dsp32_r ) static TIMER_CALLBACK( rddsp32_sync_cb ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); *state->dataptr[param] = state->dataval[param]; } WRITE32_HANDLER( rddsp32_sync0_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->dsk_pio_access) { UINT32 *dptr = &state->rddsp32_sync[0][offset]; @@ -1529,7 +1529,7 @@ WRITE32_HANDLER( rddsp32_sync0_w ) WRITE32_HANDLER( rddsp32_sync1_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->dsk_pio_access) { UINT32 *dptr = &state->rddsp32_sync[1][offset]; @@ -1592,7 +1592,7 @@ WRITE16_HANDLER( rd68k_slapstic_w ) READ16_HANDLER( rd68k_slapstic_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int bank = slapstic_tweak(space, offset & 0x3fff) * 0x4000; return state->m68k_slapstic_base[bank + (offset & 0x3fff)]; } @@ -1634,14 +1634,14 @@ static int st68k_sloop_tweak(harddriv_state *state, offs_t offset) WRITE16_HANDLER( st68k_sloop_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); st68k_sloop_tweak(state, offset & 0x3fff); } READ16_HANDLER( st68k_sloop_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int bank = st68k_sloop_tweak(state, offset) * 0x4000; return state->m68k_slapstic_base[bank + (offset & 0x3fff)]; } @@ -1649,7 +1649,7 @@ READ16_HANDLER( st68k_sloop_r ) READ16_HANDLER( st68k_sloop_alt_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (state->st68k_last_alt_sloop_offset == 0x00fe) { switch (offset*2) @@ -1702,14 +1702,14 @@ static int st68k_protosloop_tweak(harddriv_state *state, offs_t offset) WRITE16_HANDLER( st68k_protosloop_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); st68k_protosloop_tweak(state, offset & 0x3fff); } READ16_HANDLER( st68k_protosloop_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int bank = st68k_protosloop_tweak(state, offset) * 0x4000; return state->m68k_slapstic_base[bank + (offset & 0x3fff)]; } @@ -1732,7 +1732,7 @@ READ16_HANDLER( st68k_protosloop_r ) READ16_HANDLER( hdgsp_speedup_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int result = state->gsp_speedup_addr[0][offset]; /* if both this address and the other important address are not $ffff */ @@ -1750,7 +1750,7 @@ READ16_HANDLER( hdgsp_speedup_r ) WRITE16_HANDLER( hdgsp_speedup1_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->gsp_speedup_addr[0][offset]); @@ -1762,7 +1762,7 @@ WRITE16_HANDLER( hdgsp_speedup1_w ) WRITE16_HANDLER( hdgsp_speedup2_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->gsp_speedup_addr[1][offset]); @@ -1783,7 +1783,7 @@ WRITE16_HANDLER( hdgsp_speedup2_w ) READ16_HANDLER( rdgsp_speedup1_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int result = state->gsp_speedup_addr[0][offset]; /* if this address is equal to $f000, spin until something gets written */ @@ -1800,7 +1800,7 @@ READ16_HANDLER( rdgsp_speedup1_r ) WRITE16_HANDLER( rdgsp_speedup1_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->gsp_speedup_addr[0][offset]); if (space->cpu != state->gsp) cpu_triggerint(state->gsp); @@ -1821,7 +1821,7 @@ WRITE16_HANDLER( rdgsp_speedup1_w ) READ16_HANDLER( hdmsp_speedup_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int data = state->msp_speedup_addr[offset]; if (data == 0 && space->cpu == state->msp && cpu_get_pc(space->cpu) == state->msp_speedup_pc) @@ -1836,7 +1836,7 @@ READ16_HANDLER( hdmsp_speedup_r ) WRITE16_HANDLER( hdmsp_speedup_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->msp_speedup_addr[offset]); if (offset == 0 && state->msp_speedup_addr[offset] != 0) cpu_triggerint(state->msp); @@ -1845,7 +1845,7 @@ WRITE16_HANDLER( hdmsp_speedup_w ) READ16_HANDLER( stmsp_speedup_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* assumes: stmsp_sync[0] -> $80010, stmsp_sync[1] -> $99680, stmsp_sync[2] -> $99d30 */ if (state->stmsp_sync[0][0] == 0 && /* 80010 */ @@ -1882,7 +1882,7 @@ READ16_HANDLER( stmsp_speedup_r ) READ16_HANDLER( hdadsp_speedup_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int data = state->adsp_data_memory[0x1fff]; if (data == 0xffff && space->cpu == state->adsp && cpu_get_pc(space->cpu) <= 0x3b) @@ -1897,7 +1897,7 @@ READ16_HANDLER( hdadsp_speedup_r ) READ16_HANDLER( hdds3_speedup_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int data = *state->ds3_speedup_addr; if (data != 0 && space->cpu == state->adsp && cpu_get_pc(space->cpu) == state->ds3_speedup_pc) diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c index 3f544547ce8..85537c86e76 100644 --- a/src/mame/machine/lkage.c +++ b/src/mame/machine/lkage.c @@ -22,7 +22,7 @@ READ8_HANDLER( lkage_68705_port_a_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); @@ -30,7 +30,7 @@ READ8_HANDLER( lkage_68705_port_a_r ) WRITE8_HANDLER( lkage_68705_port_a_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; @@ -38,7 +38,7 @@ WRITE8_HANDLER( lkage_68705_port_a_w ) WRITE8_HANDLER( lkage_68705_ddr_a_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -55,13 +55,13 @@ WRITE8_HANDLER( lkage_68705_ddr_a_w ) READ8_HANDLER( lkage_68705_port_b_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( lkage_68705_port_b_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(space->cpu), data); @@ -87,7 +87,7 @@ WRITE8_HANDLER( lkage_68705_port_b_w ) WRITE8_HANDLER( lkage_68705_ddr_b_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->ddr_b = data; } @@ -95,7 +95,7 @@ WRITE8_HANDLER( lkage_68705_ddr_b_w ) READ8_HANDLER( lkage_68705_port_c_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->port_c_in = 0; if (state->main_sent) @@ -109,7 +109,7 @@ READ8_HANDLER( lkage_68705_port_c_r ) WRITE8_HANDLER( lkage_68705_port_c_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(space->cpu), data); state->port_c_out = data; @@ -117,14 +117,14 @@ WRITE8_HANDLER( lkage_68705_port_c_w ) WRITE8_HANDLER( lkage_68705_ddr_c_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->ddr_c = data; } WRITE8_HANDLER( lkage_mcu_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); logerror("%04x: mcu_w %02x\n", cpu_get_pc(space->cpu), data); state->from_main = data; @@ -134,7 +134,7 @@ WRITE8_HANDLER( lkage_mcu_w ) READ8_HANDLER( lkage_mcu_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); logerror("%04x: mcu_r %02x\n", cpu_get_pc(space->cpu), state->from_mcu); state->mcu_sent = 0; @@ -143,7 +143,7 @@ READ8_HANDLER( lkage_mcu_r ) READ8_HANDLER( lkage_mcu_status_r ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); int res = 0; /* bit 0 = when 1, mcu is ready to receive data from main cpu */ diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c index d98ae0884b3..14ac307ab5f 100644 --- a/src/mame/machine/lsasquad.c +++ b/src/mame/machine/lsasquad.c @@ -10,7 +10,7 @@ static TIMER_CALLBACK( nmi_callback ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); @@ -20,13 +20,13 @@ static TIMER_CALLBACK( nmi_callback ) WRITE8_HANDLER( lsasquad_sh_nmi_disable_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_nmi_enable = 0; } WRITE8_HANDLER( lsasquad_sh_nmi_enable_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_nmi_enable = 1; if (state->pending_nmi) @@ -38,7 +38,7 @@ WRITE8_HANDLER( lsasquad_sh_nmi_enable_w ) WRITE8_HANDLER( lsasquad_sound_command_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_pending |= 0x01; state->sound_cmd = data; @@ -48,7 +48,7 @@ WRITE8_HANDLER( lsasquad_sound_command_w ) READ8_HANDLER( lsasquad_sh_sound_command_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_pending &= ~0x01; //logerror("%04x: read sound cmd %02x\n", cpu_get_pc(space->cpu), state->sound_cmd); return state->sound_cmd; @@ -56,7 +56,7 @@ READ8_HANDLER( lsasquad_sh_sound_command_r ) WRITE8_HANDLER( lsasquad_sh_result_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_pending |= 0x02; //logerror("%04x: sound res %02x\n", cpu_get_pc(space->cpu), data); state->sound_result = data; @@ -64,7 +64,7 @@ WRITE8_HANDLER( lsasquad_sh_result_w ) READ8_HANDLER( lsasquad_sound_result_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_pending &= ~0x02; //logerror("%04x: read sound res %02x\n", cpu_get_pc(space->cpu), state->sound_result); return state->sound_result; @@ -72,7 +72,7 @@ READ8_HANDLER( lsasquad_sound_result_r ) READ8_HANDLER( lsasquad_sound_status_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); /* bit 0: message pending for sound cpu */ /* bit 1: message pending for main cpu */ @@ -82,7 +82,7 @@ READ8_HANDLER( lsasquad_sound_status_r ) READ8_HANDLER( daikaiju_sh_sound_command_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->sound_pending &= ~0x01; state->sound_pending |= 0x02; //logerror("%04x: read sound cmd %02x\n", cpu_get_pc(space->cpu), state->sound_cmd); @@ -91,7 +91,7 @@ READ8_HANDLER( daikaiju_sh_sound_command_r ) READ8_HANDLER( daikaiju_sound_status_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); /* bit 0: message pending for sound cpu */ /* bit 1: message pending for main cpu */ @@ -109,7 +109,7 @@ READ8_HANDLER( daikaiju_sound_status_r ) READ8_HANDLER( lsasquad_68705_port_a_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); @@ -117,7 +117,7 @@ READ8_HANDLER( lsasquad_68705_port_a_r ) WRITE8_HANDLER( lsasquad_68705_port_a_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; @@ -125,7 +125,7 @@ WRITE8_HANDLER( lsasquad_68705_port_a_w ) WRITE8_HANDLER( lsasquad_68705_ddr_a_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -142,13 +142,13 @@ WRITE8_HANDLER( lsasquad_68705_ddr_a_w ) READ8_HANDLER( lsasquad_68705_port_b_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( lsasquad_68705_port_b_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(space->cpu), data); @@ -173,13 +173,13 @@ WRITE8_HANDLER( lsasquad_68705_port_b_w ) WRITE8_HANDLER( lsasquad_68705_ddr_b_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); state->ddr_b = data; } WRITE8_HANDLER( lsasquad_mcu_w ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); //logerror("%04x: mcu_w %02x\n", cpu_get_pc(space->cpu), data); state->from_main = data; @@ -189,7 +189,7 @@ WRITE8_HANDLER( lsasquad_mcu_w ) READ8_HANDLER( lsasquad_mcu_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); //logerror("%04x: mcu_r %02x\n", cpu_get_pc(space->cpu), state->from_mcu); state->mcu_sent = 0; @@ -198,7 +198,7 @@ READ8_HANDLER( lsasquad_mcu_r ) READ8_HANDLER( lsasquad_mcu_status_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); int res = input_port_read(space->machine, "MCU"); /* bit 0 = when 1, mcu is ready to receive data from main cpu */ @@ -214,7 +214,7 @@ READ8_HANDLER( lsasquad_mcu_status_r ) READ8_HANDLER( daikaiju_mcu_status_r ) { - lsasquad_state *state = (lsasquad_state *)space->machine->driver_data; + lsasquad_state *state = space->machine->driver_data(); int res = input_port_read(space->machine, "MCU"); /* bit 0 = when 1, mcu is ready to receive data from main cpu */ diff --git a/src/mame/machine/maniach.c b/src/mame/machine/maniach.c index f5397aa412b..bf2df2a7d3b 100644 --- a/src/mame/machine/maniach.c +++ b/src/mame/machine/maniach.c @@ -21,7 +21,7 @@ READ8_HANDLER( maniach_68705_port_a_r ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); @@ -29,7 +29,7 @@ READ8_HANDLER( maniach_68705_port_a_r ) WRITE8_HANDLER( maniach_68705_port_a_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; @@ -37,7 +37,7 @@ WRITE8_HANDLER( maniach_68705_port_a_w ) WRITE8_HANDLER( maniach_68705_ddr_a_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -54,13 +54,13 @@ WRITE8_HANDLER( maniach_68705_ddr_a_w ) READ8_HANDLER( maniach_68705_port_b_r ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( maniach_68705_port_b_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(space->cpu), data); @@ -82,14 +82,14 @@ WRITE8_HANDLER( maniach_68705_port_b_w ) WRITE8_HANDLER( maniach_68705_ddr_b_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); state->ddr_b = data; } READ8_HANDLER( maniach_68705_port_c_r ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); state->port_c_in = 0; @@ -106,7 +106,7 @@ READ8_HANDLER( maniach_68705_port_c_r ) WRITE8_HANDLER( maniach_68705_port_c_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port C write %02x\n", cpu_get_pc(space->cpu), data); state->port_c_out = data; @@ -114,14 +114,14 @@ WRITE8_HANDLER( maniach_68705_port_c_w ) WRITE8_HANDLER( maniach_68705_ddr_c_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); state->ddr_c = data; } WRITE8_HANDLER( maniach_mcu_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); //logerror("%04x: 3040_w %02x\n", cpu_get_pc(space->cpu), data); state->from_main = data; @@ -130,7 +130,7 @@ WRITE8_HANDLER( maniach_mcu_w ) READ8_HANDLER( maniach_mcu_r ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); //logerror("%04x: 3040_r %02x\n", cpu_get_pc(space->cpu), state->from_mcu); state->mcu_sent = 0; @@ -139,7 +139,7 @@ READ8_HANDLER( maniach_mcu_r ) READ8_HANDLER( maniach_mcu_status_r ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); int res = 0; /* bit 0 = when 0, mcu has sent data to the main cpu */ diff --git a/src/mame/machine/mexico86.c b/src/mame/machine/mexico86.c index ee340fc5a1b..734e290e5bd 100644 --- a/src/mame/machine/mexico86.c +++ b/src/mame/machine/mexico86.c @@ -15,7 +15,7 @@ bit 0 = ? (unused?) */ WRITE8_HANDLER( mexico86_f008_w ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); cpu_set_input_line(state->audiocpu, INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE); @@ -46,7 +46,7 @@ WRITE8_HANDLER( mexico86_f008_w ) static void mcu_simulate( running_machine *machine ) { - mexico86_state *state = (mexico86_state *)machine->driver_data; + mexico86_state *state = machine->driver_data(); if (!state->mcu_initialised) { @@ -154,7 +154,7 @@ static void mcu_simulate( running_machine *machine ) INTERRUPT_GEN( kikikai_interrupt ) { - mexico86_state *state = (mexico86_state *)device->machine->driver_data; + mexico86_state *state = device->machine->driver_data(); if (state->mcu_running) mcu_simulate(device->machine); @@ -179,7 +179,7 @@ INTERRUPT_GEN( kikikai_interrupt ) static void kiki_clogic(running_machine *machine, int address, int latch) { - mexico86_state *state = (mexico86_state *)machine->driver_data; + mexico86_state *state = machine->driver_data(); static const UINT8 db[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x10,0x18,0x00,0x00,0x00,0x00}; static UINT8 queue[64]; static int qfront = 0, state = 0; @@ -236,7 +236,7 @@ INTERRUPT_GEN( mexico86_m68705_interrupt ) READ8_HANDLER( mexico86_68705_port_a_r ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A read %02x\n", cpu_get_pc(space->cpu), state->port_a_in); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); @@ -244,7 +244,7 @@ READ8_HANDLER( mexico86_68705_port_a_r ) WRITE8_HANDLER( mexico86_68705_port_a_w ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port A write %02x\n", cpu_get_pc(space->cpu), data); state->port_a_out = data; @@ -252,7 +252,7 @@ WRITE8_HANDLER( mexico86_68705_port_a_w ) WRITE8_HANDLER( mexico86_68705_ddr_a_w ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -276,13 +276,13 @@ WRITE8_HANDLER( mexico86_68705_ddr_a_w ) READ8_HANDLER( mexico86_68705_port_b_r ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( mexico86_68705_port_b_w ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); //logerror("%04x: 68705 port B write %02x\n", cpu_get_pc(space->cpu), data); if (BIT(state->ddr_b, 0) && BIT(~data, 0) && BIT(state->port_b_out, 0)) @@ -339,6 +339,6 @@ WRITE8_HANDLER( mexico86_68705_port_b_w ) WRITE8_HANDLER( mexico86_68705_ddr_b_w ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); state->ddr_b = data; } diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c index fb29d5749b8..1f1b9cdd47a 100644 --- a/src/mame/machine/micro3d.c +++ b/src/mame/machine/micro3d.c @@ -36,7 +36,7 @@ void micro3d_duart_irq_handler(running_device *device, UINT8 vector) void micro3d_duart_tx(running_device *device, int channel, UINT8 data) { - micro3d_state *state = (micro3d_state*)device->machine->driver_data; + micro3d_state *state = device->machine->driver_data(); if (channel == 0) { @@ -53,13 +53,13 @@ void micro3d_duart_tx(running_device *device, int channel, UINT8 data) static int data_to_i8031(running_device *device) { - micro3d_state *state = (micro3d_state*)device->machine->driver_data; + micro3d_state *state = device->machine->driver_data(); return state->m68681_tx0; } static void data_from_i8031(running_device *device, int data) { - micro3d_state *state = (micro3d_state*)device->machine->driver_data; + micro3d_state *state = device->machine->driver_data(); duart68681_rx_data(state->duart68681, 1, data); } @@ -115,7 +115,7 @@ enum static void micro3d_mc68901_int_gen(running_machine *machine, int source) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); UINT8 *ien = source & 8 ? &state->mc68901.ierb : &state->mc68901.iera; UINT8 *ipend = source & 8 ? &state->mc68901.iprb : &state->mc68901.ipra; UINT8 *imask = source & 8 ? &state->mc68901.imrb : &state->mc68901.imra; @@ -139,7 +139,7 @@ static TIMER_CALLBACK( mfp_timer_a_cb ) READ16_HANDLER( micro3d_mc68901_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); UINT16 val = 0; switch (offset) @@ -156,7 +156,7 @@ READ16_HANDLER( micro3d_mc68901_r ) WRITE16_HANDLER( micro3d_mc68901_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); data >>= 8; state->mc68901.regs[offset] = data; @@ -220,7 +220,7 @@ enum WRITE16_HANDLER( micro3d_ti_uart_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); switch (offset) { @@ -278,7 +278,7 @@ WRITE16_HANDLER( micro3d_ti_uart_w ) READ16_HANDLER( micro3d_ti_uart_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); switch (offset) { @@ -382,7 +382,7 @@ INLINE INT64 normalised_multiply(INT32 a, INT32 b) static TIMER_CALLBACK( mac_done_callback ) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); cputag_set_input_line(machine, "drmath", AM29000_INTR0, ASSERT_LINE); state->mac_stat = 0; @@ -391,7 +391,7 @@ static TIMER_CALLBACK( mac_done_callback ) WRITE32_HANDLER( micro3d_mac1_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->vtx_addr = (data & 0x3ffff); state->sram_w_addr = (data >> 18) & 0xfff; @@ -399,14 +399,14 @@ WRITE32_HANDLER( micro3d_mac1_w ) READ32_HANDLER( micro3d_mac2_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); return (state->mac_inst << 1) | state->mac_stat; } WRITE32_HANDLER( micro3d_mac2_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); UINT32 cnt = data & 0xff; UINT32 inst = (data >> 8) & 0x1f; @@ -627,7 +627,7 @@ READ16_HANDLER( micro3d_encoder_l_r ) static TIMER_CALLBACK( adc_done_callback ) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); switch (param) { @@ -644,7 +644,7 @@ static TIMER_CALLBACK( adc_done_callback ) READ16_HANDLER( micro3d_adc_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); return state->adc_val; } @@ -663,14 +663,14 @@ WRITE16_HANDLER( micro3d_adc_w ) CUSTOM_INPUT( botssa_hwchk_r ) { - micro3d_state *state = (micro3d_state*)field->port->machine->driver_data; + micro3d_state *state = field->port->machine->driver_data(); return state->botssa_latch; } READ16_HANDLER( botssa_140000_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->botssa_latch = 0; return 0xffff; @@ -678,7 +678,7 @@ READ16_HANDLER( botssa_140000_r ) READ16_HANDLER( botssa_180000_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->botssa_latch = 1; return 0xffff; @@ -713,7 +713,7 @@ WRITE16_HANDLER( host_drmath_int_w ) WRITE32_HANDLER( micro3d_shared_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->shared_ram[offset * 2 + 1] = data & 0xffff; state->shared_ram[offset * 2 + 0] = data >> 16; @@ -721,7 +721,7 @@ WRITE32_HANDLER( micro3d_shared_w ) READ32_HANDLER( micro3d_shared_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); return (state->shared_ram[offset * 2] << 16) | state->shared_ram[offset * 2 + 1]; } @@ -745,7 +745,7 @@ WRITE32_HANDLER( drmath_intr2_ack ) DRIVER_INIT( micro3d ) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "drmath", ADDRESS_SPACE_DATA); i8051_set_serial_tx_callback(machine->device("audiocpu"), data_from_i8031); @@ -778,7 +778,7 @@ DRIVER_INIT( botssa ) MACHINE_RESET( micro3d ) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); state->ti_uart[STATUS] = 1; diff --git a/src/mame/machine/mw8080bw.c b/src/mame/machine/mw8080bw.c index ab7285eb54e..1dc85bfba74 100644 --- a/src/mame/machine/mw8080bw.c +++ b/src/mame/machine/mw8080bw.c @@ -44,7 +44,7 @@ static int vysnc_chain_counter_to_vpos( UINT8 counter, int vblank ) static TIMER_CALLBACK( mw8080bw_interrupt_callback ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); UINT8 next_counter; int next_vpos; int next_vblank; @@ -74,14 +74,14 @@ static TIMER_CALLBACK( mw8080bw_interrupt_callback ) static void mw8080bw_create_interrupt_timer( running_machine *machine ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state->interrupt_timer = timer_alloc(machine, mw8080bw_interrupt_callback, NULL); } static void mw8080bw_start_interrupt_timer( running_machine *machine ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); int vpos = vysnc_chain_counter_to_vpos(MW8080BW_INT_TRIGGER_COUNT_1, MW8080BW_INT_TRIGGER_VBLANK_1); timer_adjust_oneshot(state->interrupt_timer, machine->primary_screen->time_until_pos(vpos), 0); } @@ -96,7 +96,7 @@ static void mw8080bw_start_interrupt_timer( running_machine *machine ) MACHINE_START( mw8080bw ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); mw8080bw_create_interrupt_timer(machine); diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index 13a504f75eb..27fac6bd97a 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -727,7 +727,7 @@ void dp_full_sync(running_machine *machine) READ32_DEVICE_HANDLER( n64_dp_reg_r ) { - _n64_state *state = (_n64_state *)device->machine->driver_data; + _n64_state *state = device->machine->driver_data<_n64_state>(); switch (offset) { @@ -753,7 +753,7 @@ READ32_DEVICE_HANDLER( n64_dp_reg_r ) WRITE32_DEVICE_HANDLER( n64_dp_reg_w ) { - _n64_state *state = (_n64_state *)device->machine->driver_data; + _n64_state *state = device->machine->driver_data<_n64_state>(); switch (offset) { @@ -814,7 +814,7 @@ static UINT32 n64_vi_intr, n64_vi_vburst; static void n64_vi_recalculate_resolution(running_machine *machine) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); int x_start = (n64_vi_hstart & 0x03ff0000) >> 16; int x_end = n64_vi_hstart & 0x000003ff; @@ -913,7 +913,7 @@ READ32_HANDLER( n64_vi_reg_r ) WRITE32_HANDLER( n64_vi_reg_w ) { - _n64_state *state = (_n64_state *)space->machine->driver_data; + _n64_state *state = space->machine->driver_data<_n64_state>(); switch (offset) { diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c index efa94d6441d..b6d10d5537d 100644 --- a/src/mame/machine/neoprot.c +++ b/src/mame/machine/neoprot.c @@ -24,7 +24,7 @@ static READ16_HANDLER( fatfury2_protection_16_r ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); UINT16 res = state->fatfury2_prot_data >> 24; switch (offset) @@ -50,7 +50,7 @@ static READ16_HANDLER( fatfury2_protection_16_r ) static WRITE16_HANDLER( fatfury2_protection_16_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); switch (offset) { @@ -97,7 +97,7 @@ static WRITE16_HANDLER( fatfury2_protection_16_w ) void fatfury2_install_protection( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); /* the protection involves reading and writing addresses in the */ /* 0x2xxxxx range. There are several checks all around the code. */ @@ -375,7 +375,7 @@ static READ16_HANDLER( prot_9a37_r ) static READ16_HANDLER( sma_random_r ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); UINT16 old = state->neogeo_rng; UINT16 newbit = ((state->neogeo_rng >> 2) ^ @@ -395,14 +395,14 @@ static READ16_HANDLER( sma_random_r ) void neogeo_reset_rng( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->neogeo_rng = 0x2345; } static void sma_install_random_read_handler( running_machine *machine, int addr1, int addr2 ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state_save_register_global(machine, state->neogeo_rng); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), addr1, addr1 + 1, 0, 0, sma_random_r); @@ -462,14 +462,14 @@ void kof2000_install_protection( running_machine *machine ) static void pvc_w8( running_machine *machine, offs_t offset, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); *(((UINT8*)state->pvc_cartridge_ram) + BYTE_XOR_LE(offset)) = data; } static UINT8 pvc_r8( running_machine *machine, offs_t offset ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); return *(((UINT8*)state->pvc_cartridge_ram) + BYTE_XOR_LE(offset)); } @@ -502,7 +502,7 @@ static void pvc_prot2( running_machine *machine ) // on writes to e8/e9/ea/eb static void pvc_write_bankswitch( const address_space *space ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); UINT32 bankaddress; bankaddress = ((state->pvc_cartridge_ram[0xff8] >> 8)|(state->pvc_cartridge_ram[0xff9] << 8)); @@ -515,14 +515,14 @@ static void pvc_write_bankswitch( const address_space *space ) static READ16_HANDLER( pvc_prot_r ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); return state->pvc_cartridge_ram[offset]; } static WRITE16_HANDLER( pvc_prot_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pvc_cartridge_ram[offset] ); if (offset == 0xff0) @@ -536,7 +536,7 @@ static WRITE16_HANDLER( pvc_prot_w ) void install_pvc_protection( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->pvc_cartridge_ram = auto_alloc_array(machine, UINT16, 0x2000 / 2); state_save_register_global_pointer(machine, state->pvc_cartridge_ram, 0x2000 / 2); diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c index 2b6c0519456..b94ee65b2f7 100644 --- a/src/mame/machine/nitedrvr.c +++ b/src/mame/machine/nitedrvr.c @@ -20,7 +20,7 @@ change in-between can affect the direction you move. static int nitedrvr_steering( running_machine *machine ) { - nitedrvr_state *state = (nitedrvr_state *)machine->driver_data; + nitedrvr_state *state = machine->driver_data(); int this_val = input_port_read(machine, "STEER"); int delta = this_val - state->last_steering_val; @@ -58,14 +58,14 @@ nitedrvr_steering_reset READ8_HANDLER( nitedrvr_steering_reset_r ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); state->steering_val = 0; return 0; } WRITE8_HANDLER( nitedrvr_steering_reset_w ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); state->steering_val = 0; } @@ -100,7 +100,7 @@ Fill in the steering and gear bits in a special way. READ8_HANDLER( nitedrvr_in0_r ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); int gear = input_port_read(space->machine, "GEARS"); if (gear & 0x10) state->gear = 1; @@ -164,7 +164,7 @@ Fill in the track difficulty switch and special signal in a special way. READ8_HANDLER( nitedrvr_in1_r ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); int port = input_port_read(space->machine, "IN0"); state->ac_line = (state->ac_line + 1) % 3; @@ -212,7 +212,7 @@ D5 = SKID2 WRITE8_HANDLER( nitedrvr_out0_w ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); discrete_sound_w(state->discrete, NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data discrete_sound_w(state->discrete, NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable @@ -232,7 +232,7 @@ D5 = Spare (Not used) WRITE8_HANDLER( nitedrvr_out1_w ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); set_led_status(space->machine, 0, data & 0x10); @@ -256,7 +256,7 @@ WRITE8_HANDLER( nitedrvr_out1_w ) TIMER_DEVICE_CALLBACK( nitedrvr_crash_toggle_callback ) { - nitedrvr_state *state = (nitedrvr_state *)timer.machine->driver_data; + nitedrvr_state *state = timer.machine->driver_data(); if (state->crash_en && state->crash_data_en) { @@ -282,7 +282,7 @@ TIMER_DEVICE_CALLBACK( nitedrvr_crash_toggle_callback ) MACHINE_START( nitedrvr ) { - nitedrvr_state *state = (nitedrvr_state *)machine->driver_data; + nitedrvr_state *state = machine->driver_data(); state->maincpu = machine->device("maincpu"); state->discrete = machine->device("discrete"); @@ -300,7 +300,7 @@ MACHINE_START( nitedrvr ) MACHINE_RESET( nitedrvr ) { - nitedrvr_state *state = (nitedrvr_state *)machine->driver_data; + nitedrvr_state *state = machine->driver_data(); state->gear = 1; state->track = 0; diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c index 14ded76f62f..7f974a43af5 100644 --- a/src/mame/machine/nycaptor.c +++ b/src/mame/machine/nycaptor.c @@ -12,19 +12,19 @@ READ8_HANDLER( nycaptor_68705_port_a_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return (state->port_a_out & state->ddr_a) | (state->port_a_in & ~state->ddr_a); } WRITE8_HANDLER( nycaptor_68705_port_a_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->port_a_out = data; } WRITE8_HANDLER( nycaptor_68705_ddr_a_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->ddr_a = data; } @@ -39,13 +39,13 @@ WRITE8_HANDLER( nycaptor_68705_ddr_a_w ) READ8_HANDLER( nycaptor_68705_port_b_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return (state->port_b_out & state->ddr_b) | (state->port_b_in & ~state->ddr_b); } WRITE8_HANDLER( nycaptor_68705_port_b_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); if (BIT(state->ddr_b, 1) && BIT(~data, 1) && BIT(state->port_b_out, 1)) { @@ -68,14 +68,14 @@ WRITE8_HANDLER( nycaptor_68705_port_b_w ) WRITE8_HANDLER( nycaptor_68705_ddr_b_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->ddr_b = data; } READ8_HANDLER( nycaptor_68705_port_c_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->port_c_in = 0; if (state->main_sent) @@ -88,19 +88,19 @@ READ8_HANDLER( nycaptor_68705_port_c_r ) WRITE8_HANDLER( nycaptor_68705_port_c_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->port_c_out = data; } WRITE8_HANDLER( nycaptor_68705_ddr_c_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->ddr_c = data; } WRITE8_HANDLER( nycaptor_mcu_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->from_main = data; state->main_sent = 1; @@ -109,7 +109,7 @@ WRITE8_HANDLER( nycaptor_mcu_w ) READ8_HANDLER( nycaptor_mcu_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->mcu_sent = 0; return state->from_mcu; @@ -117,7 +117,7 @@ READ8_HANDLER( nycaptor_mcu_r ) READ8_HANDLER( nycaptor_mcu_status_r1 ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); /* bit 1 = when 1, mcu has sent data to the main cpu */ return state->mcu_sent ? 2 : 0; @@ -125,7 +125,7 @@ READ8_HANDLER( nycaptor_mcu_status_r1 ) READ8_HANDLER( nycaptor_mcu_status_r2 ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); /* bit 0 = when 1, mcu is ready to receive data from main cpu */ return state->main_sent ? 0 : 1; diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c index 71d20f24763..966e472638d 100644 --- a/src/mame/machine/opwolf.c +++ b/src/mame/machine/opwolf.c @@ -275,7 +275,7 @@ static const UINT16 *const level_data_lookup[] = static TIMER_CALLBACK( opwolf_timer_callback ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); // Level data command if (state->current_cmd == 0xf5) @@ -316,7 +316,7 @@ static TIMER_CALLBACK( opwolf_timer_callback ) static void updateDifficulty( running_machine *machine, int mode ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); // The game is made up of 6 rounds, when you complete the // sixth you return to the start but with harder difficulty. @@ -394,7 +394,7 @@ WRITE16_HANDLER( opwolf_cchip_status_w ) // We use it to setup some initial state (it's not clear if the real // c-chip sets this here, or if it's as a side-effect of the other // init sequence data). - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); state->cchip_ram[0x3d] = 1; state->cchip_ram[0x7a] = 1; @@ -403,13 +403,13 @@ WRITE16_HANDLER( opwolf_cchip_status_w ) WRITE16_HANDLER( opwolf_cchip_bank_w ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); state->current_bank = data & 7; } WRITE16_HANDLER( opwolf_cchip_data_w ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); state->cchip_ram[(state->current_bank * 0x400) + offset] = data & 0xff; @@ -514,7 +514,7 @@ READ16_HANDLER( opwolf_cchip_status_r ) READ16_HANDLER( opwolf_cchip_data_r ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); // if (offset!=0x7f && offset!=0x1c && offset!=0x1d && offset!=0x1e && offset!=0x1f && offset!=0x20 && cpu_get_pc(space->cpu)!=0xc18 && cpu_get_pc(space->cpu)!=0xc2e && cpu_get_pc(space->cpu)!=0xc9e && offset!=0x50 && offset!=0x51 && offset!=0x52 && offset!=0x53 && offset!=0x5 && offset!=0x13 && offset!=0x79 && offset!=0x12 && offset!=0x34) // logerror("%08x: opwolf c read %04x (bank %04x)\n", cpu_get_pc(space->cpu), offset, state->current_bank); @@ -530,7 +530,7 @@ READ16_HANDLER( opwolf_cchip_data_r ) static TIMER_CALLBACK( cchip_timer ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); // Update input ports, these are used by both the 68k directly and by the c-chip state->cchip_ram[0x4] = input_port_read(machine, "IN0"); @@ -720,7 +720,7 @@ static TIMER_CALLBACK( cchip_timer ) void opwolf_cchip_init( running_machine *machine ) { - opwolf_state *state = (opwolf_state *)machine->driver_data; + opwolf_state *state = machine->driver_data(); state->cchip_ram = auto_alloc_array_clear(machine, UINT8, 0x400 * 8); diff --git a/src/mame/machine/pgmprot.c b/src/mame/machine/pgmprot.c index 1f246503f41..3ae9b54ccd4 100644 --- a/src/mame/machine/pgmprot.c +++ b/src/mame/machine/pgmprot.c @@ -108,7 +108,7 @@ static const int pstar_80[0x1a3]={ READ16_HANDLER( pstars_protram_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (offset == 4) //region return input_port_read(space->machine, "Region"); @@ -122,7 +122,7 @@ READ16_HANDLER( pstars_protram_r ) READ16_HANDLER( pstars_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (offset == 0) { @@ -147,7 +147,7 @@ READ16_HANDLER( pstars_r ) WRITE16_HANDLER( pstars_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (offset == 0) { @@ -276,7 +276,7 @@ WRITE16_HANDLER( pstars_w ) static void asic3_compute_hold(running_machine *machine) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); // The mode is dependent on the region static const int modes[4] = { 1, 1, 3, 2 }; @@ -313,7 +313,7 @@ static void asic3_compute_hold(running_machine *machine) READ16_HANDLER( pgm_asic3_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT8 res = 0; /* region is supplied by the protection device */ @@ -357,7 +357,7 @@ READ16_HANDLER( pgm_asic3_r ) WRITE16_HANDLER( pgm_asic3_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if(ACCESSING_BITS_0_7) { @@ -393,7 +393,7 @@ WRITE16_HANDLER( pgm_asic3_w ) WRITE16_HANDLER( pgm_asic3_reg_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if(ACCESSING_BITS_0_7) state->asic3_reg = data & 0xff; @@ -457,7 +457,7 @@ READ16_HANDLER( sango_protram_r ) READ16_HANDLER( asic28_r ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); UINT32 val = (state->asic28_regs[1] << 16) | (state->asic28_regs[0]); //logerror("Asic28 Read PC = %06x Command = %02x ??\n", cpu_get_pc(space->cpu), state->asic28_regs[1]); @@ -599,7 +599,7 @@ READ16_HANDLER( asic28_r ) WRITE16_HANDLER( asic28_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); if (offset == 0) { diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c index 6f62fa86b2b..3197323a1de 100644 --- a/src/mame/machine/qix.c +++ b/src/mame/machine/qix.c @@ -226,7 +226,7 @@ const pia6821_interface slither_pia_2_intf = MACHINE_RESET( qix ) { - qix_state *state = (qix_state *)machine->driver_data; + qix_state *state = machine->driver_data(); /* reset the coin counter register */ state->coinctrl = 0x00; @@ -235,7 +235,7 @@ MACHINE_RESET( qix ) MACHINE_START( qixmcu ) { - qix_state *state = (qix_state *)machine->driver_data; + qix_state *state = machine->driver_data(); /* set up save states */ state_save_register_global_array(machine, state->_68705_port_in); @@ -347,7 +347,7 @@ READ8_HANDLER( qix_video_firq_ack_r ) READ8_DEVICE_HANDLER( qixmcu_coin_r ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); logerror("6809:qixmcu_coin_r = %02X\n", state->_68705_port_out[0]); return state->_68705_port_out[0]; @@ -356,7 +356,7 @@ READ8_DEVICE_HANDLER( qixmcu_coin_r ) static WRITE8_DEVICE_HANDLER( qixmcu_coin_w ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); logerror("6809:qixmcu_coin_w = %02X\n", data); /* this is a callback called by pia6821_w(), so I don't need to synchronize */ @@ -367,7 +367,7 @@ static WRITE8_DEVICE_HANDLER( qixmcu_coin_w ) static WRITE8_DEVICE_HANDLER( qixmcu_coinctrl_w ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); /* if (!(data & 0x04)) */ if (data & 0x04) @@ -396,7 +396,7 @@ static WRITE8_DEVICE_HANDLER( qixmcu_coinctrl_w ) READ8_HANDLER( qix_68705_portA_r ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); UINT8 ddr = state->_68705_ddr[0]; UINT8 out = state->_68705_port_out[0]; @@ -408,7 +408,7 @@ READ8_HANDLER( qix_68705_portA_r ) READ8_HANDLER( qix_68705_portB_r ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); UINT8 ddr = state->_68705_ddr[1]; UINT8 out = state->_68705_port_out[1]; @@ -419,7 +419,7 @@ READ8_HANDLER( qix_68705_portB_r ) READ8_HANDLER( qix_68705_portC_r ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); UINT8 ddr = state->_68705_ddr[2]; UINT8 out = state->_68705_port_out[2]; @@ -437,7 +437,7 @@ READ8_HANDLER( qix_68705_portC_r ) WRITE8_HANDLER( qix_68705_portA_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); logerror("68705:portA_w = %02X\n", data); state->_68705_port_out[0] = data; @@ -446,7 +446,7 @@ WRITE8_HANDLER( qix_68705_portA_w ) WRITE8_HANDLER( qix_68705_portB_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); state->_68705_port_out[1] = data; coin_lockout_w(space->machine, 0, (~data >> 6) & 1); @@ -456,7 +456,7 @@ WRITE8_HANDLER( qix_68705_portB_w ) WRITE8_HANDLER( qix_68705_portC_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); state->_68705_port_out[2] = data; } @@ -536,7 +536,7 @@ static WRITE8_DEVICE_HANDLER( slither_76489_1_w ) static READ8_DEVICE_HANDLER( slither_trak_lr_r ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); return input_port_read(device->machine, state->flip ? "AN3" : "AN1"); } @@ -544,7 +544,7 @@ static READ8_DEVICE_HANDLER( slither_trak_lr_r ) static READ8_DEVICE_HANDLER( slither_trak_ud_r ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); return input_port_read(device->machine, state->flip ? "AN2" : "AN0"); } diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c index 1a706e316aa..010673fc2a5 100644 --- a/src/mame/machine/rainbow.c +++ b/src/mame/machine/rainbow.c @@ -644,7 +644,7 @@ static const UINT32 cchip_round_address[] = static void request_round_data( running_machine *machine ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); int round = state->CRAM[1][0x141]; /* 0...49 */ memcpy(state->CRAM[1], CROM_BANK1, sizeof CROM_BANK1); @@ -665,7 +665,7 @@ static void request_round_data( running_machine *machine ) static void request_world_data( running_machine *machine ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); int world = state->CRAM[0][0x00d] / 4; /* 0...9 */ /* the extra version has the world data swapped around */ @@ -713,7 +713,7 @@ static void request_world_data( running_machine *machine ) static void request_goalin_data( running_machine *machine ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); int n = mame_rand(machine) % 15; state->CRAM[1][0x14B] = 0x00; /* x coordinates */ @@ -733,7 +733,7 @@ static void request_goalin_data( running_machine *machine ) static TIMER_CALLBACK( cchip_timer ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); if (state->CRAM[1][0x100] == 1) { @@ -780,13 +780,13 @@ WRITE16_HANDLER( rainbow_cchip_ctrl_w ) WRITE16_HANDLER( rainbow_cchip_bank_w ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); state->current_bank = data & 7; } WRITE16_HANDLER( rainbow_cchip_ram_w ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); state->CRAM[state->current_bank][offset] = data; } @@ -807,7 +807,7 @@ READ16_HANDLER( rainbow_cchip_ctrl_r ) READ16_HANDLER( rainbow_cchip_ram_r ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); return state->CRAM[state->current_bank][offset]; } @@ -819,7 +819,7 @@ READ16_HANDLER( rainbow_cchip_ram_r ) void rainbow_cchip_init( running_machine *machine, int version ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); int i; state->extra_version = version; diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 68a0bb5800d..99172aef4d9 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -13,7 +13,7 @@ WRITE8_HANDLER( simpsons_eeprom_w ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); if (data == 0xff) return; @@ -34,7 +34,7 @@ WRITE8_HANDLER( simpsons_eeprom_w ) WRITE8_HANDLER( simpsons_coin_counter_w ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); /* bit 0,1 coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -49,7 +49,7 @@ WRITE8_HANDLER( simpsons_coin_counter_w ) READ8_HANDLER( simpsons_sound_interrupt_r ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); cpu_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff ); return 0x00; } @@ -73,14 +73,14 @@ static KONAMI_SETLINES_CALLBACK( simpsons_banking ) static STATE_POSTLOAD( simpsons_postload ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); simpsons_video_banking(machine, state->video_bank); } MACHINE_START( simpsons ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); machine->generic.paletteram.u8 = auto_alloc_array_clear(machine, UINT8, 0x1000); state->xtraram = auto_alloc_array_clear(machine, UINT8, 0x1000); @@ -106,7 +106,7 @@ MACHINE_START( simpsons ) MACHINE_RESET( simpsons ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); int i; konami_configure_set_lines(machine->device("maincpu"), simpsons_banking); diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 36ab65e2a61..4c68ae885d7 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -56,7 +56,7 @@ struct snes_cart_info snes_cart; static TIMER_CALLBACK( snes_nmi_tick ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); // pull NMI cpu_set_input_line(state->maincpu, G65816_LINE_NMI, ASSERT_LINE); @@ -67,7 +67,7 @@ static TIMER_CALLBACK( snes_nmi_tick ) static void snes_hirq_tick( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); // latch the counters and pull IRQ // (don't need to switch to the 65816 context, we don't do anything dependant on it) @@ -86,7 +86,7 @@ static TIMER_CALLBACK( snes_hirq_tick_callback ) static TIMER_CALLBACK( snes_reset_oam_address ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); // make sure we're in the 65816's context since we're messing with the OAM and stuff const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); @@ -100,14 +100,14 @@ static TIMER_CALLBACK( snes_reset_oam_address ) static TIMER_CALLBACK( snes_reset_hdma ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); snes_hdma_init(cpu0space); } static TIMER_CALLBACK( snes_update_io ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); state->io_read(cpu0space->machine); snes_ram[HVBJOY] &= 0xfe; /* Clear busy bit */ @@ -117,7 +117,7 @@ static TIMER_CALLBACK( snes_update_io ) static TIMER_CALLBACK( snes_scanline_tick ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); /* Increase current line - we want to latch on this line during it, not after it */ snes_ppu.beam.current_vert = machine->primary_screen->vpos(); @@ -209,7 +209,7 @@ static TIMER_CALLBACK( snes_scanline_tick ) /* This is called at the start of hblank *before* the scanline indicated in current_vert! */ static TIMER_CALLBACK( snes_hblank_tick ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM); int nextscan; @@ -304,7 +304,7 @@ READ8_HANDLER( snes_open_bus_r ) /* read & write to DMA addresses are defined separately, to be called by snessdd1 handlers */ static READ8_HANDLER( snes_io_dma_r ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); switch (offset) { @@ -352,7 +352,7 @@ static READ8_HANDLER( snes_io_dma_r ) static WRITE8_HANDLER( snes_io_dma_w ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); switch (offset) { @@ -418,7 +418,7 @@ static WRITE8_HANDLER( snes_io_dma_w ) */ READ8_HANDLER( snes_r_io ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0; // PPU accesses are from 2100 to 213f @@ -558,7 +558,7 @@ READ8_HANDLER( snes_r_io ) */ WRITE8_HANDLER( snes_w_io ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); // PPU accesses are from 2100 to 213f if (offset >= INIDISP && offset < APU00) @@ -765,7 +765,7 @@ WRITE8_HANDLER( snes_w_io ) WRITE_LINE_DEVICE_HANDLER( snes_extern_irq_w ) { - snes_state *driver_state = (snes_state *)device->machine->driver_data; + snes_state *driver_state = device->machine->driver_data(); cpu_set_input_line(driver_state->maincpu, G65816_LINE_IRQ, state); } @@ -909,7 +909,7 @@ static int snes_bank_0x80_0xbf_cycles(running_machine *machine,UINT32 offset) /* 0x000000 - 0x2fffff */ READ8_HANDLER( snes_r_bank1 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0xff; UINT16 address = offset & 0xffff; @@ -966,7 +966,7 @@ READ8_HANDLER( snes_r_bank1 ) /* 0x300000 - 0x3fffff */ READ8_HANDLER( snes_r_bank2 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0xff; UINT16 address = offset & 0xffff; @@ -1029,7 +1029,7 @@ READ8_HANDLER( snes_r_bank2 ) /* 0x400000 - 0x5fffff */ READ8_HANDLER( snes_r_bank3 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0xff; UINT16 address = offset & 0xffff; @@ -1070,7 +1070,7 @@ READ8_HANDLER( snes_r_bank3 ) /* 0x600000 - 0x6fffff */ READ8_HANDLER( snes_r_bank4 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0xff; UINT16 address = offset & 0xffff; @@ -1108,7 +1108,7 @@ READ8_HANDLER( snes_r_bank4 ) /* 0x700000 - 0x7dffff */ READ8_HANDLER( snes_r_bank5 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value; UINT16 address = offset & 0xffff; @@ -1144,7 +1144,7 @@ READ8_HANDLER( snes_r_bank5 ) /* 0x800000 - 0xbfffff */ READ8_HANDLER( snes_r_bank6 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0; UINT16 address = offset & 0xffff; @@ -1192,7 +1192,7 @@ READ8_HANDLER( snes_r_bank6 ) /* 0xc00000 - 0xffffff */ READ8_HANDLER( snes_r_bank7 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value = 0; UINT16 address = offset & 0xffff; @@ -1246,7 +1246,7 @@ READ8_HANDLER( snes_r_bank7 ) /* 0x000000 - 0x2fffff */ WRITE8_HANDLER( snes_w_bank1 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 address = offset & 0xffff; if (address < 0x2000) /* Mirror of Low RAM */ @@ -1297,7 +1297,7 @@ WRITE8_HANDLER( snes_w_bank1 ) /* 0x300000 - 0x3fffff */ WRITE8_HANDLER( snes_w_bank2 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 address = offset & 0xffff; if (address < 0x2000) /* Mirror of Low RAM */ @@ -1354,7 +1354,7 @@ WRITE8_HANDLER( snes_w_bank2 ) /* 0x600000 - 0x6fffff */ WRITE8_HANDLER( snes_w_bank4 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 address = offset & 0xffff; if (state->has_addon_chip == HAS_SUPERFX) @@ -1380,7 +1380,7 @@ WRITE8_HANDLER( snes_w_bank4 ) /* 0x700000 - 0x7dffff */ WRITE8_HANDLER( snes_w_bank5 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 address = offset & 0xffff; if (state->has_addon_chip == HAS_SUPERFX) @@ -1406,7 +1406,7 @@ WRITE8_HANDLER( snes_w_bank5 ) /* 0x800000 - 0xbfffff */ WRITE8_HANDLER( snes_w_bank6 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 address = offset & 0xffff; if (state->has_addon_chip == HAS_SUPERFX) @@ -1454,7 +1454,7 @@ WRITE8_HANDLER( snes_w_bank6 ) /* 0xc00000 - 0xffffff */ WRITE8_HANDLER( snes_w_bank7 ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 address = offset & 0xffff; if (state->has_addon_chip == HAS_SUPERFX) @@ -1499,7 +1499,7 @@ WRITE8_HANDLER( snes_w_bank7 ) static void nss_io_read( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); static const char *const portnames[2][4] = { { "SERIAL1_DATA1_L", "SERIAL1_DATA1_H", "SERIAL1_DATA2_L", "SERIAL1_DATA2_H" }, @@ -1545,7 +1545,7 @@ static void nss_io_read( running_machine *machine ) static UINT8 nss_oldjoy1_read( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); UINT8 res; if (state->read_idx[0] >= 16) @@ -1558,7 +1558,7 @@ static UINT8 nss_oldjoy1_read( running_machine *machine ) static UINT8 nss_oldjoy2_read( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); UINT8 res; if (state->read_idx[1] >= 16) @@ -1577,7 +1577,7 @@ static UINT8 nss_oldjoy2_read( running_machine *machine ) static void snes_init_timers( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); /* init timers and stop them */ state->scanline_timer = timer_alloc(machine, snes_scanline_tick, NULL); @@ -1603,7 +1603,7 @@ static void snes_init_timers( running_machine *machine ) static void snes_init_ram( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); const address_space *cpu0space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int i; @@ -1691,7 +1691,7 @@ static DIRECT_UPDATE_HANDLER( snes_direct ) MACHINE_START( snes ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); int i; memory_set_direct_update_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), snes_direct); @@ -1796,7 +1796,7 @@ MACHINE_START( snes ) MACHINE_RESET( snes ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); int i; snes_init_ram(machine); @@ -1835,7 +1835,7 @@ MACHINE_RESET( snes ) /* for mame we use an init, maybe we will need more for the different games */ DRIVER_INIT( snes ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT16 total_blocks, read_blocks; UINT8 *rom; @@ -1901,7 +1901,7 @@ DRIVER_INIT( snes ) DRIVER_INIT( snes_hirom ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT16 total_blocks, read_blocks; UINT8 *rom; @@ -1986,7 +1986,7 @@ INLINE UINT8 snes_abus_read( const address_space *space, UINT32 abus ) INLINE void snes_dma_transfer( const address_space *space, UINT8 dma, UINT32 abus, UINT16 bbus ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); /* every byte transfer takes 8 master cycles */ cpu_adjust_icount(space->cpu,-8); @@ -2030,19 +2030,19 @@ INLINE void snes_dma_transfer( const address_space *space, UINT8 dma, UINT32 abu check again if the transfer is direct/indirect at each step... is it worth? */ INLINE UINT32 snes_get_hdma_addr( running_machine *machine, int dma ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); return (state->dma_channel[dma].bank << 16) | (state->dma_channel[dma].hdma_addr++); } INLINE UINT32 snes_get_hdma_iaddr( running_machine *machine, int dma ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); return (state->dma_channel[dma].ibank << 16) | (state->dma_channel[dma].trans_size++); } INLINE int is_last_active_channel( running_machine *machine, int dma ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); int i; for (i = dma + 1; i < 8; i++) @@ -2057,7 +2057,7 @@ INLINE int is_last_active_channel( running_machine *machine, int dma ) static void snes_hdma_update( const address_space *space, int dma ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT32 abus = snes_get_hdma_addr(space->machine, dma); state->dma_channel[dma].hdma_line_counter = snes_abus_read(space, abus); @@ -2088,7 +2088,7 @@ static void snes_hdma_update( const address_space *space, int dma ) static void snes_hdma_init( const address_space *space ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); int i; state->hdmaen = snes_ram[HDMAEN]; @@ -2104,7 +2104,7 @@ static void snes_hdma_init( const address_space *space ) static void snes_hdma( const address_space *space ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT16 bbus; UINT32 abus; int i; @@ -2188,7 +2188,7 @@ static void snes_hdma( const address_space *space ) static void snes_dma( const address_space *space, UINT8 channels ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); int i; INT8 increment; UINT16 bbus; diff --git a/src/mame/machine/snes7110.c b/src/mame/machine/snes7110.c index ca5c757bfa6..0c6274a042c 100644 --- a/src/mame/machine/snes7110.c +++ b/src/mame/machine/snes7110.c @@ -875,7 +875,7 @@ static _snes_spc7110_t snes_spc7110; static void spc7110_init(running_machine* machine) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); snes_spc7110.r4801 = 0x00; snes_spc7110.r4802 = 0x00; diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c index 1e89474f78c..2f39cd1ea78 100644 --- a/src/mame/machine/tnzs.c +++ b/src/mame/machine/tnzs.c @@ -19,7 +19,7 @@ static READ8_HANDLER( mcu_tnzs_r ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); UINT8 data; data = upi41_master_r(state->mcu, offset & 1); @@ -32,7 +32,7 @@ static READ8_HANDLER( mcu_tnzs_r ) static WRITE8_HANDLER( mcu_tnzs_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); // logerror("PC %04x: write %02x to mcu $c00%01x\n", cpu_get_previouspc(space->cpu), data, offset); upi41_master_w(state->mcu, offset & 1, data); @@ -41,7 +41,7 @@ static WRITE8_HANDLER( mcu_tnzs_w ) READ8_HANDLER( tnzs_port1_r ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); int data = 0; switch (state->input_select & 0x0f) @@ -68,7 +68,7 @@ READ8_HANDLER( tnzs_port2_r ) WRITE8_HANDLER( tnzs_port2_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); // logerror("I8742:%04x Write %02x to port 2\n", cpu_get_previouspc(space->cpu), data); coin_lockout_w(space->machine, 0, (data & 0x40)); @@ -97,7 +97,7 @@ READ8_HANDLER( arknoid2_sh_f000_r ) static void mcu_reset( running_machine *machine ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_initializing = 3; state->mcu_coinage_init = 0; @@ -114,7 +114,7 @@ static void mcu_reset( running_machine *machine ) static void mcu_handle_coins( running_machine *machine, int coin ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); /* The coin inputs and coin counters are managed by the i8742 mcu. */ /* Here we simulate it. */ @@ -189,7 +189,7 @@ static void mcu_handle_coins( running_machine *machine, int coin ) static READ8_HANDLER( mcu_arknoid2_r ) { static const char mcu_startup[] = "\x55\xaa\x5a"; - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); // logerror("PC %04x: read mcu %04x\n", cpu_get_pc(space->cpu), 0xc000 + offset); @@ -250,7 +250,7 @@ static READ8_HANDLER( mcu_arknoid2_r ) static WRITE8_HANDLER( mcu_arknoid2_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); if (offset == 0) { // logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(space->cpu), data, 0xc000 + offset); @@ -296,7 +296,7 @@ static WRITE8_HANDLER( mcu_arknoid2_w ) static READ8_HANDLER( mcu_extrmatn_r ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); static const char mcu_startup[] = "\x5a\xa5\x55"; // logerror("PC %04x: read mcu %04x\n", cpu_get_pc(space->cpu), 0xc000 + offset); @@ -381,7 +381,7 @@ static READ8_HANDLER( mcu_extrmatn_r ) static WRITE8_HANDLER( mcu_extrmatn_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); if (offset == 0) { // logerror("PC %04x: write %02x to mcu %04x\n", cpu_get_pc(space->cpu), data, 0xc000 + offset); @@ -492,25 +492,25 @@ static WRITE8_HANDLER( tnzs_sync_kludge_w ) DRIVER_INIT( plumpop ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_PLUMPOP; } DRIVER_INIT( extrmatn ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_EXTRMATN; } DRIVER_INIT( arknoid2 ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_ARKANOID; } DRIVER_INIT( drtoppel ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_DRTOPPEL; /* drtoppel writes to the palette RAM area even if it has PROMs! We have to patch it out. */ @@ -519,13 +519,13 @@ DRIVER_INIT( drtoppel ) DRIVER_INIT( chukatai ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_CHUKATAI; } DRIVER_INIT( tnzs ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_TNZS; /* we need to install a kludge to avoid problems with a bug in the original code */ // memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w); @@ -533,7 +533,7 @@ DRIVER_INIT( tnzs ) DRIVER_INIT( tnzsb ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_NONE_TNZSB; /* we need to install a kludge to avoid problems with a bug in the original code */ @@ -542,7 +542,7 @@ DRIVER_INIT( tnzsb ) DRIVER_INIT( kabukiz ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); UINT8 *SOUND = memory_region(machine, "audiocpu"); state->mcu_type = MCU_NONE_KABUKIZ; @@ -551,7 +551,7 @@ DRIVER_INIT( kabukiz ) DRIVER_INIT( insectx ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_NONE_INSECTX; /* this game has no mcu, replace the handler with plain input port handlers */ @@ -562,14 +562,14 @@ DRIVER_INIT( insectx ) DRIVER_INIT( kageki ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->mcu_type = MCU_NONE_KAGEKI; } READ8_HANDLER( tnzs_mcu_r ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); switch (state->mcu_type) { case MCU_TNZS: @@ -588,7 +588,7 @@ READ8_HANDLER( tnzs_mcu_r ) WRITE8_HANDLER( tnzs_mcu_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); switch (state->mcu_type) { case MCU_TNZS: @@ -610,7 +610,7 @@ WRITE8_HANDLER( tnzs_mcu_w ) INTERRUPT_GEN( arknoid2_interrupt ) { - tnzs_state *state = (tnzs_state *)device->machine->driver_data; + tnzs_state *state = device->machine->driver_data(); int coin; switch (state->mcu_type) @@ -635,7 +635,7 @@ INTERRUPT_GEN( arknoid2_interrupt ) MACHINE_RESET( tnzs ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); /* initialize the mcu simulation */ switch (state->mcu_type) { @@ -658,7 +658,7 @@ MACHINE_RESET( tnzs ) MACHINE_RESET( jpopnics ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); state->screenflip = 0; state->mcu_type = -1; @@ -666,7 +666,7 @@ MACHINE_RESET( jpopnics ) static STATE_POSTLOAD( tnzs_postload ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); memory_set_bank(machine, "bank1", state->bank1); @@ -680,7 +680,7 @@ static STATE_POSTLOAD( tnzs_postload ) MACHINE_START( tnzs ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *SUB = memory_region(machine, "sub"); @@ -718,7 +718,7 @@ MACHINE_START( tnzs ) MACHINE_START( jpopnics ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); UINT8 *ROM = memory_region(machine, "maincpu"); UINT8 *SUB = memory_region(machine, "sub"); @@ -741,7 +741,7 @@ MACHINE_START( jpopnics ) WRITE8_HANDLER( tnzs_bankswitch_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); // logerror("PC %04x: writing %02x to bankswitch\n", cpu_get_pc(space->cpu),data); @@ -763,7 +763,7 @@ WRITE8_HANDLER( tnzs_bankswitch_w ) WRITE8_HANDLER( tnzs_bankswitch1_w ) { - tnzs_state *state = (tnzs_state *)space->machine->driver_data; + tnzs_state *state = space->machine->driver_data(); // logerror("PC %04x: writing %02x to bankswitch 1\n", cpu_get_pc(space->cpu),data); switch (state->mcu_type) diff --git a/src/mame/machine/volfied.c b/src/mame/machine/volfied.c index f204bd9f7bb..605307527e5 100644 --- a/src/mame/machine/volfied.c +++ b/src/mame/machine/volfied.c @@ -280,7 +280,7 @@ static const UINT16 *const palette_data_lookup[] = static TIMER_CALLBACK( volfied_timer_callback ) { - volfied_state *state = (volfied_state *)machine->driver_data; + volfied_state *state = machine->driver_data(); // Palette commands - palette data written to bank 0: $10 - $af if (state->current_cmd >= 0x1 && state->current_cmd < 0x12) @@ -335,13 +335,13 @@ WRITE16_HANDLER( volfied_cchip_ctrl_w ) WRITE16_HANDLER( volfied_cchip_bank_w ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); state->current_bank = data & 7; } WRITE16_HANDLER( volfied_cchip_ram_w ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); state->cchip_ram[(state->current_bank * 0x400) + offset] = data; @@ -432,7 +432,7 @@ READ16_HANDLER( volfied_cchip_ctrl_r ) READ16_HANDLER( volfied_cchip_ram_r ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); /* Check for input ports */ if (state->current_bank == 0) @@ -487,7 +487,7 @@ READ16_HANDLER( volfied_cchip_ram_r ) void volfied_cchip_init( running_machine *machine ) { - volfied_state *state = (volfied_state *)machine->driver_data; + volfied_state *state = machine->driver_data(); state->cchip_ram = auto_alloc_array_clear(machine, UINT8, 0x400 * 8); @@ -500,7 +500,7 @@ void volfied_cchip_init( running_machine *machine ) void volfied_cchip_reset( running_machine *machine ) { - volfied_state *state = (volfied_state *)machine->driver_data; + volfied_state *state = machine->driver_data(); state->current_bank = 0; state->current_flag = 0; diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 22931b2f60a..801f0102521 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -90,7 +90,7 @@ PALETTE_INIT( 1942 ) static TILE_GET_INFO( get_fg_tile_info ) { - _1942_state *state = (_1942_state *)machine->driver_data; + _1942_state *state = machine->driver_data<_1942_state>(); int code, color; code = state->fg_videoram[tile_index]; @@ -104,7 +104,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - _1942_state *state = (_1942_state *)machine->driver_data; + _1942_state *state = machine->driver_data<_1942_state>(); int code, color; tile_index = (tile_index & 0x0f) | ((tile_index & 0x01f0) << 1); @@ -126,7 +126,7 @@ static TILE_GET_INFO( get_bg_tile_info ) ***************************************************************************/ VIDEO_START( 1942 ) { - _1942_state *state = (_1942_state *)machine->driver_data; + _1942_state *state = machine->driver_data<_1942_state>(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 16); @@ -142,7 +142,7 @@ VIDEO_START( 1942 ) WRITE8_HANDLER( c1942_fgvideoram_w ) { - _1942_state *state = (_1942_state *)space->machine->driver_data; + _1942_state *state = space->machine->driver_data<_1942_state>(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); @@ -150,7 +150,7 @@ WRITE8_HANDLER( c1942_fgvideoram_w ) WRITE8_HANDLER( c1942_bgvideoram_w ) { - _1942_state *state = (_1942_state *)space->machine->driver_data; + _1942_state *state = space->machine->driver_data<_1942_state>(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, (offset & 0x0f) | ((offset >> 1) & 0x01f0)); @@ -159,7 +159,7 @@ WRITE8_HANDLER( c1942_bgvideoram_w ) WRITE8_HANDLER( c1942_palette_bank_w ) { - _1942_state *state = (_1942_state *)space->machine->driver_data; + _1942_state *state = space->machine->driver_data<_1942_state>(); if (state->palette_bank != data) { @@ -170,7 +170,7 @@ WRITE8_HANDLER( c1942_palette_bank_w ) WRITE8_HANDLER( c1942_scroll_w ) { - _1942_state *state = (_1942_state *)space->machine->driver_data; + _1942_state *state = space->machine->driver_data<_1942_state>(); state->scroll[offset] = data; tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll[0] | (state->scroll[1] << 8)); @@ -179,7 +179,7 @@ WRITE8_HANDLER( c1942_scroll_w ) WRITE8_HANDLER( c1942_c804_w ) { - _1942_state *state = (_1942_state *)space->machine->driver_data; + _1942_state *state = space->machine->driver_data<_1942_state>(); /* bit 7: flip screen bit 4: cpu B reset bit 0: coin counter */ @@ -200,7 +200,7 @@ WRITE8_HANDLER( c1942_c804_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - _1942_state *state = (_1942_state *)machine->driver_data; + _1942_state *state = machine->driver_data<_1942_state>(); int offs; for (offs = state->spriteram_size - 4; offs >= 0; offs -= 4) @@ -242,7 +242,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( 1942 ) { - _1942_state *state = (_1942_state *)screen->machine->driver_data; + _1942_state *state = screen->machine->driver_data<_1942_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 5a1a894afe3..21f4ace21c4 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -120,7 +120,7 @@ PALETTE_INIT( 1943 ) WRITE8_HANDLER( c1943_videoram_w ) { - _1943_state *state = (_1943_state *)space->machine->driver_data; + _1943_state *state = space->machine->driver_data<_1943_state>(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -128,7 +128,7 @@ WRITE8_HANDLER( c1943_videoram_w ) WRITE8_HANDLER( c1943_colorram_w ) { - _1943_state *state = (_1943_state *)space->machine->driver_data; + _1943_state *state = space->machine->driver_data<_1943_state>(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -136,7 +136,7 @@ WRITE8_HANDLER( c1943_colorram_w ) WRITE8_HANDLER( c1943_c804_w ) { - _1943_state *state = (_1943_state *)space->machine->driver_data; + _1943_state *state = space->machine->driver_data<_1943_state>(); int bank; /* bits 0 and 1 are coin counters */ @@ -161,7 +161,7 @@ WRITE8_HANDLER( c1943_c804_w ) WRITE8_HANDLER( c1943_d806_w ) { - _1943_state *state = (_1943_state *)space->machine->driver_data; + _1943_state *state = space->machine->driver_data<_1943_state>(); /* bit 4 enables bg 1 */ state->bg1_on = data & 0x10; @@ -202,7 +202,7 @@ static TILE_GET_INFO( c1943_get_bg_tile_info ) static TILE_GET_INFO( c1943_get_fg_tile_info ) { - _1943_state *state = (_1943_state *)machine->driver_data; + _1943_state *state = machine->driver_data<_1943_state>(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0xe0) << 3); int color = attr & 0x1f; @@ -212,7 +212,7 @@ static TILE_GET_INFO( c1943_get_fg_tile_info ) VIDEO_START( 1943 ) { - _1943_state *state = (_1943_state *)machine->driver_data; + _1943_state *state = machine->driver_data<_1943_state>(); state->bg2_tilemap = tilemap_create(machine, c1943_get_bg2_tile_info, tilemap_scan_cols, 32, 32, 2048, 8); state->bg_tilemap = tilemap_create(machine, c1943_get_bg_tile_info, tilemap_scan_cols, 32, 32, 2048, 8); state->fg_tilemap = tilemap_create(machine, c1943_get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -228,7 +228,7 @@ VIDEO_START( 1943 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - _1943_state *state = (_1943_state *)machine->driver_data; + _1943_state *state = machine->driver_data<_1943_state>(); int offs; for (offs = state->spriteram_size - 32; offs >= 0; offs -= 32) @@ -261,7 +261,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( 1943 ) { - _1943_state *state = (_1943_state *)screen->machine->driver_data; + _1943_state *state = screen->machine->driver_data<_1943_state>(); tilemap_set_scrollx(state->bg2_tilemap, 0, state->bgscrollx[0] + 256 * state->bgscrollx[1]); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * state->scrollx[1]); tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly[0]); diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c index 5b746c7b102..5c904e7c903 100644 --- a/src/mame/video/20pacgal.c +++ b/src/mame/video/20pacgal.c @@ -407,7 +407,7 @@ static void draw_stars(_20pacgal_state *state, bitmap_t *bitmap, const rectangle static VIDEO_UPDATE( 20pacgal ) { - _20pacgal_state *state = (_20pacgal_state *)screen->machine->driver_data; + _20pacgal_state *state = screen->machine->driver_data<_20pacgal_state>(); bitmap_fill(bitmap,cliprect,0); draw_stars(state, bitmap,cliprect); diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c index 6e789cb8666..e56b39953d3 100644 --- a/src/mame/video/40love.c +++ b/src/mame/video/40love.c @@ -63,7 +63,7 @@ colorram format (2 bytes per one tilemap character line, 8 pixels height): static TILE_GET_INFO( get_bg_tile_info ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int tile_number = state->videoram[tile_index]; int tile_attrib = state->colorram[(tile_index / 64) * 2]; int tile_h_bank = (tile_attrib & 0x40) << 3; /* 0x40->0x200 */ @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static STATE_POSTLOAD( redraw_pixels ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->pix_redraw = 1; tilemap_mark_all_tiles_dirty(state->bg_tilemap); } @@ -102,7 +102,7 @@ static STATE_POSTLOAD( redraw_pixels ) VIDEO_START( fortyl ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->pixram1 = auto_alloc_array_clear(machine, UINT8, 0x4000); state->pixram2 = auto_alloc_array_clear(machine, UINT8, 0x4000); @@ -135,7 +135,7 @@ VIDEO_START( fortyl ) static void fortyl_set_scroll_x( running_machine *machine, int offset ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int i = offset & ~1; int x = ((state->colorram[i] & 0x80) << 1) | state->colorram[i + 1]; /* 9 bits signed */ @@ -152,7 +152,7 @@ static void fortyl_set_scroll_x( running_machine *machine, int offset ) WRITE8_HANDLER( fortyl_pixram_sel_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); int offs; int f = data & 0x01; @@ -171,7 +171,7 @@ WRITE8_HANDLER( fortyl_pixram_sel_w ) READ8_HANDLER( fortyl_pixram_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); if (state->pixram_sel) return state->pixram2[offset]; else @@ -180,7 +180,7 @@ READ8_HANDLER( fortyl_pixram_r ) static void fortyl_plot_pix( running_machine *machine, int offset ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int x, y, i, c, d1, d2; x = (offset & 0x1f) * 8; @@ -209,7 +209,7 @@ static void fortyl_plot_pix( running_machine *machine, int offset ) WRITE8_HANDLER( fortyl_pixram_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); if (state->pixram_sel) state->pixram2[offset] = data; else @@ -221,20 +221,20 @@ WRITE8_HANDLER( fortyl_pixram_w ) WRITE8_HANDLER( fortyl_bg_videoram_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } READ8_HANDLER( fortyl_bg_videoram_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return state->videoram[offset]; } WRITE8_HANDLER( fortyl_bg_colorram_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); if (state->colorram[offset] != data) { int i; @@ -249,7 +249,7 @@ WRITE8_HANDLER( fortyl_bg_colorram_w ) READ8_HANDLER( fortyl_bg_colorram_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return state->colorram[offset]; } @@ -276,7 +276,7 @@ spriteram format (4 bytes per sprite): static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -340,7 +340,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_pixram( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int offs; int f = state->flipscreen ^ 1; @@ -360,7 +360,7 @@ static void draw_pixram( running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( fortyl ) { - buggychl_state *state = (buggychl_state *)screen->machine->driver_data; + buggychl_state *state = screen->machine->driver_data(); draw_pixram(screen->machine, bitmap, cliprect); tilemap_set_scrolldy(state->bg_tilemap, - state->video_ctrl[1] + 1, - state->video_ctrl[1] - 1 ); diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index 7bd9d7013fe..056c42e62ac 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -11,7 +11,7 @@ WRITE8_HANDLER( fenraya_videoram_w ) { - _4enraya_state *state = (_4enraya_state *)space->machine->driver_data; + _4enraya_state *state = space->machine->driver_data<_4enraya_state>(); state->videoram[(offset & 0x3ff) * 2] = data; state->videoram[(offset & 0x3ff) * 2 + 1] = (offset & 0xc00) >> 10; @@ -20,7 +20,7 @@ WRITE8_HANDLER( fenraya_videoram_w ) static TILE_GET_INFO( get_tile_info ) { - _4enraya_state *state = (_4enraya_state *)machine->driver_data; + _4enraya_state *state = machine->driver_data<_4enraya_state>(); int code = state->videoram[tile_index * 2] + (state->videoram[tile_index * 2 + 1] << 8); SET_TILE_INFO( @@ -32,14 +32,14 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( 4enraya ) { - _4enraya_state *state = (_4enraya_state *)machine->driver_data; + _4enraya_state *state = machine->driver_data<_4enraya_state>(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } VIDEO_UPDATE( 4enraya ) { - _4enraya_state *state = (_4enraya_state *)screen->machine->driver_data; + _4enraya_state *state = screen->machine->driver_data<_4enraya_state>(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/8080bw.c b/src/mame/video/8080bw.c index a0f9f8a29d6..0ab1e348491 100644 --- a/src/mame/video/8080bw.c +++ b/src/mame/video/8080bw.c @@ -15,7 +15,7 @@ MACHINE_START( extra_8080bw_vh ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state_save_register_global(machine, state->c8080bw_flip_screen); state_save_register_global(machine, state->color_map); @@ -65,7 +65,7 @@ static void cosmo_get_pens( pen_t *pens ) INLINE void set_pixel( running_machine *machine, bitmap_t *bitmap, UINT8 y, UINT8 x, pen_t *pens, UINT8 color ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); if (y >= MW8080BW_VCOUNTER_START_NO_VBLANK) { @@ -94,7 +94,7 @@ INLINE void set_8_pixels( running_machine *machine, bitmap_t *bitmap, UINT8 y, U /* this is needed as this driver doesn't emulate the shift register like mw8080bw does */ static void clear_extra_columns( running_machine *machine, bitmap_t *bitmap, pen_t *pens, UINT8 color ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); UINT8 x; for (x = 0; x < 4; x++) @@ -114,7 +114,7 @@ static void clear_extra_columns( running_machine *machine, bitmap_t *bitmap, pen VIDEO_UPDATE( invadpt2 ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; UINT8 *prom; @@ -146,7 +146,7 @@ VIDEO_UPDATE( invadpt2 ) VIDEO_UPDATE( ballbomb ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; UINT8 *color_map_base; @@ -179,7 +179,7 @@ VIDEO_UPDATE( ballbomb ) VIDEO_UPDATE( schaser ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; UINT8 *background_map_base; @@ -220,7 +220,7 @@ VIDEO_UPDATE( schaser ) VIDEO_UPDATE( schasercv ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; @@ -246,7 +246,7 @@ VIDEO_UPDATE( schasercv ) VIDEO_UPDATE( rollingc ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; @@ -271,7 +271,7 @@ VIDEO_UPDATE( rollingc ) VIDEO_UPDATE( polaris ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; UINT8 *color_map_base; @@ -343,7 +343,7 @@ VIDEO_UPDATE( polaris ) VIDEO_UPDATE( lupin3 ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; @@ -368,7 +368,7 @@ VIDEO_UPDATE( lupin3 ) VIDEO_UPDATE( cosmo ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; @@ -395,7 +395,7 @@ VIDEO_UPDATE( cosmo ) VIDEO_UPDATE( indianbt ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; UINT8 *color_map_base; @@ -427,7 +427,7 @@ VIDEO_UPDATE( indianbt ) VIDEO_UPDATE( shuttlei ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[2] = { RGB_BLACK, RGB_WHITE }; offs_t offs; @@ -458,7 +458,7 @@ VIDEO_UPDATE( shuttlei ) VIDEO_UPDATE( sflush ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); pen_t pens[NUM_PENS]; offs_t offs; diff --git a/src/mame/video/88games.c b/src/mame/video/88games.c index 2ae19962925..176e1094a5c 100644 --- a/src/mame/video/88games.c +++ b/src/mame/video/88games.c @@ -11,7 +11,7 @@ void _88games_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - _88games_state *state = (_88games_state *)machine->driver_data; + _88games_state *state = machine->driver_data<_88games_state>(); *code |= ((*color & 0x0f) << 8) | (bank << 12); *color = state->layer_colorbase[layer] + ((*color & 0xf0) >> 4); @@ -26,7 +26,7 @@ void _88games_tile_callback( running_machine *machine, int layer, int bank, int void _88games_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - _88games_state *state = (_88games_state *)machine->driver_data; + _88games_state *state = machine->driver_data<_88games_state>(); *priority = (*color & 0x20) >> 5; /* ??? */ *color = state->sprite_colorbase + (*color & 0x0f); @@ -41,7 +41,7 @@ void _88games_sprite_callback( running_machine *machine, int *code, int *color, void _88games_zoom_callback( running_machine *machine, int *code, int *color, int *flags ) { - _88games_state *state = (_88games_state *)machine->driver_data; + _88games_state *state = machine->driver_data<_88games_state>(); *flags = (*color & 0x40) ? TILE_FLIPX : 0; *code |= ((*color & 0x07) << 8); @@ -56,7 +56,7 @@ void _88games_zoom_callback( running_machine *machine, int *code, int *color, in VIDEO_UPDATE( 88games ) { - _88games_state *state = (_88games_state *)screen->machine->driver_data; + _88games_state *state = screen->machine->driver_data<_88games_state>(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index 36604af39ea..d66a67e75c0 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -22,7 +22,7 @@ static TILEMAP_MAPPER( actfancr_scan2 ) static TILE_GET_INFO( get_tile_info ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); int tile = state->pf1_data[2 * tile_index] + (state->pf1_data[2 * tile_index + 1] << 8); int color = tile >> 12; @@ -43,7 +43,7 @@ static TILEMAP_MAPPER( triothep_scan ) static TILE_GET_INFO( get_trio_tile_info ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); int tile = state->pf1_data[2 * tile_index] + (state->pf1_data[2 * tile_index + 1] << 8); int color = tile >> 12; @@ -58,7 +58,7 @@ static TILE_GET_INFO( get_trio_tile_info ) static TILE_GET_INFO( get_pf2_tile_info ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); int tile = state->pf2_data[2 * tile_index] + (state->pf2_data[2 * tile_index + 1] << 8); int color = tile >> 12; @@ -76,7 +76,7 @@ static TILE_GET_INFO( get_pf2_tile_info ) static void register_savestate( running_machine *machine ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); state_save_register_global_array(machine, state->control_1); state_save_register_global_array(machine, state->control_2); state_save_register_global(machine, state->flipscreen); @@ -84,7 +84,7 @@ static void register_savestate( running_machine *machine ) VIDEO_START( actfancr ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_tile_info, actfancr_scan, 16, 16, 256, 16); state->pf1_alt_tilemap = tilemap_create(machine, get_tile_info, actfancr_scan2, 16, 16, 128, 32); state->pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -96,7 +96,7 @@ VIDEO_START( actfancr ) VIDEO_START( triothep ) { - actfancr_state *state = (actfancr_state *)machine->driver_data; + actfancr_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_trio_tile_info, triothep_scan, 16, 16, 32, 32); state->pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->pf1_alt_tilemap = NULL; @@ -110,19 +110,19 @@ VIDEO_START( triothep ) WRITE8_HANDLER( actfancr_pf1_control_w ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); state->control_1[offset] = data; } WRITE8_HANDLER( actfancr_pf2_control_w ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); state->control_2[offset] = data; } WRITE8_HANDLER( actfancr_pf1_data_w ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); state->pf1_data[offset] = data; tilemap_mark_tile_dirty(state->pf1_tilemap, offset / 2); if (state->pf1_alt_tilemap) @@ -131,20 +131,20 @@ WRITE8_HANDLER( actfancr_pf1_data_w ) READ8_HANDLER( actfancr_pf1_data_r ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); return state->pf1_data[offset]; } WRITE8_HANDLER( actfancr_pf2_data_w ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); state->pf2_data[offset] = data; tilemap_mark_tile_dirty(state->pf2_tilemap, offset / 2); } READ8_HANDLER( actfancr_pf2_data_r ) { - actfancr_state *state = (actfancr_state *)space->machine->driver_data; + actfancr_state *state = space->machine->driver_data(); return state->pf2_data[offset]; } @@ -152,7 +152,7 @@ READ8_HANDLER( actfancr_pf2_data_r ) VIDEO_UPDATE( actfancr ) { - actfancr_state *state = (actfancr_state *)screen->machine->driver_data; + actfancr_state *state = screen->machine->driver_data(); UINT8 *buffered_spriteram = screen->machine->generic.buffered_spriteram.u8; int offs, mult; int scrollx = (state->control_1[0x10] + (state->control_1[0x11] << 8)); @@ -238,7 +238,7 @@ VIDEO_UPDATE( actfancr ) VIDEO_UPDATE( triothep ) { - actfancr_state *state = (actfancr_state *)screen->machine->driver_data; + actfancr_state *state = screen->machine->driver_data(); UINT8 *buffered_spriteram = screen->machine->generic.buffered_spriteram.u8; int offs, i, mult; int scrollx = (state->control_1[0x10] + (state->control_1[0x11] << 8)); diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 6c39ee7aed9..aa511843a31 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -23,7 +23,7 @@ static TILE_GET_INFO( get_tile_info ) { - aeroboto_state *state = (aeroboto_state *)machine->driver_data; + aeroboto_state *state = machine->driver_data(); UINT8 code = state->videoram[tile_index]; SET_TILE_INFO( 0, @@ -42,7 +42,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( aeroboto ) { - aeroboto_state *state = (aeroboto_state *)machine->driver_data; + aeroboto_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 64); tilemap_set_transparent_pen(state->bg_tilemap, 0); @@ -86,7 +86,7 @@ READ8_HANDLER( aeroboto_in0_r ) WRITE8_HANDLER( aeroboto_3000_w ) { - aeroboto_state *state = (aeroboto_state *)space->machine->driver_data; + aeroboto_state *state = space->machine->driver_data(); /* bit 0 selects both flip screen and player1/player2 controls */ flip_screen_set(space->machine, data & 0x01); @@ -104,7 +104,7 @@ WRITE8_HANDLER( aeroboto_3000_w ) WRITE8_HANDLER( aeroboto_videoram_w ) { - aeroboto_state *state = (aeroboto_state *)space->machine->driver_data; + aeroboto_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -112,7 +112,7 @@ WRITE8_HANDLER( aeroboto_videoram_w ) WRITE8_HANDLER( aeroboto_tilecolor_w ) { - aeroboto_state *state = (aeroboto_state *)space->machine->driver_data; + aeroboto_state *state = space->machine->driver_data(); if (state->tilecolor[offset] != data) { @@ -131,7 +131,7 @@ WRITE8_HANDLER( aeroboto_tilecolor_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - aeroboto_state *state = (aeroboto_state *)machine->driver_data; + aeroboto_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -156,7 +156,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( aeroboto ) { - aeroboto_state *state = (aeroboto_state *)screen->machine->driver_data; + aeroboto_state *state = screen->machine->driver_data(); static const rectangle splitrect1 = { 0, 255, 0, 39 }; static const rectangle splitrect2 = { 0, 255, 40, 255 }; diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index c6dcc7a31d3..cb65c498e9f 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -9,7 +9,7 @@ static TILE_GET_INFO( get_pspikes_tile_info ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); UINT16 code = state->bg1videoram[tile_index]; int bank = (code & 0x1000) >> 12; SET_TILE_INFO( @@ -21,7 +21,7 @@ static TILE_GET_INFO( get_pspikes_tile_info ) static TILE_GET_INFO( karatblz_bg1_tile_info ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); UINT16 code = state->bg1videoram[tile_index]; SET_TILE_INFO( 0, @@ -33,7 +33,7 @@ static TILE_GET_INFO( karatblz_bg1_tile_info ) /* also spinlbrk */ static TILE_GET_INFO( karatblz_bg2_tile_info ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); UINT16 code = state->bg2videoram[tile_index]; SET_TILE_INFO( 1, @@ -44,7 +44,7 @@ static TILE_GET_INFO( karatblz_bg2_tile_info ) static TILE_GET_INFO( spinlbrk_bg1_tile_info ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); UINT16 code = state->bg1videoram[tile_index]; SET_TILE_INFO( 0, @@ -55,7 +55,7 @@ static TILE_GET_INFO( spinlbrk_bg1_tile_info ) static TILE_GET_INFO( get_bg1_tile_info ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); UINT16 code = state->bg1videoram[tile_index]; int bank = (code & 0x1800) >> 11; SET_TILE_INFO( @@ -67,7 +67,7 @@ static TILE_GET_INFO( get_bg1_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); UINT16 code = state->bg2videoram[tile_index]; int bank = 4 + ((code & 0x1800) >> 11); SET_TILE_INFO( @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) static void aerofgt_register_state_globals( running_machine *machine ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state_save_register_global_array(machine, state->gfxbank); state_save_register_global_array(machine, state->bank); state_save_register_global(machine, state->bg1scrollx); @@ -99,7 +99,7 @@ static void aerofgt_register_state_globals( running_machine *machine ) VIDEO_START( pspikes ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state->bg1_tilemap = tilemap_create(machine, get_pspikes_tile_info,tilemap_scan_rows,8,8,64,32); /* no bg2 in this game */ @@ -112,7 +112,7 @@ VIDEO_START( pspikes ) VIDEO_START( karatblz ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state->bg1_tilemap = tilemap_create(machine, karatblz_bg1_tile_info,tilemap_scan_rows, 8,8,64,64); state->bg2_tilemap = tilemap_create(machine, karatblz_bg2_tile_info,tilemap_scan_rows,8,8,64,64); @@ -125,7 +125,7 @@ VIDEO_START( karatblz ) VIDEO_START( spinlbrk ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int i; state->bg1_tilemap = tilemap_create(machine, spinlbrk_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -156,7 +156,7 @@ VIDEO_START( spinlbrk ) VIDEO_START( turbofrc ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state->bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -170,7 +170,7 @@ VIDEO_START( turbofrc ) VIDEO_START( wbbc97 ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); state->bg1_tilemap = tilemap_create(machine, get_pspikes_tile_info, tilemap_scan_rows, 8, 8, 64, 32); /* no bg2 in this game */ @@ -191,14 +191,14 @@ VIDEO_START( wbbc97 ) WRITE16_HANDLER( aerofgt_bg1videoram_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg1videoram[offset]); tilemap_mark_tile_dirty(state->bg1_tilemap, offset); } WRITE16_HANDLER( aerofgt_bg2videoram_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg2videoram[offset]); tilemap_mark_tile_dirty(state->bg2_tilemap, offset); } @@ -206,7 +206,7 @@ WRITE16_HANDLER( aerofgt_bg2videoram_w ) static void setbank( running_machine *machine, tilemap_t *tmap, int num, int bank ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); if (state->gfxbank[num] != bank) { state->gfxbank[num] = bank; @@ -216,7 +216,7 @@ static void setbank( running_machine *machine, tilemap_t *tmap, int num, int ban WRITE16_HANDLER( pspikes_gfxbank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { setbank(space->machine, state->bg1_tilemap, 0, (data & 0xf0) >> 4); @@ -226,7 +226,7 @@ WRITE16_HANDLER( pspikes_gfxbank_w ) WRITE16_HANDLER( pspikesb_gfxbank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->rasterram[0x200 / 2]); setbank(space->machine, state->bg1_tilemap, 0, (data & 0xf000) >> 12); @@ -235,13 +235,13 @@ WRITE16_HANDLER( pspikesb_gfxbank_w ) WRITE16_HANDLER( spikes91_lookup_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); state->spikes91_lookup = data & 1; } WRITE16_HANDLER( karatblz_gfxbank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { setbank(space->machine, state->bg1_tilemap, 0, (data & 0x0100) >> 8); @@ -251,7 +251,7 @@ WRITE16_HANDLER( karatblz_gfxbank_w ) WRITE16_HANDLER( spinlbrk_gfxbank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { setbank(space->machine, state->bg1_tilemap, 0, (data & 0x07)); @@ -261,7 +261,7 @@ WRITE16_HANDLER( spinlbrk_gfxbank_w ) WRITE16_HANDLER( turbofrc_gfxbank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); tilemap_t *tmap = (offset == 0) ? state->bg1_tilemap : state->bg2_tilemap; data = COMBINE_DATA(&state->bank[offset]); @@ -274,7 +274,7 @@ WRITE16_HANDLER( turbofrc_gfxbank_w ) WRITE16_HANDLER( aerofgt_gfxbank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); tilemap_t *tmap = (offset < 2) ? state->bg1_tilemap : state->bg2_tilemap; data = COMBINE_DATA(&state->bank[offset]); @@ -285,31 +285,31 @@ WRITE16_HANDLER( aerofgt_gfxbank_w ) WRITE16_HANDLER( aerofgt_bg1scrollx_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg1scrollx); } WRITE16_HANDLER( aerofgt_bg1scrolly_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg1scrolly); } WRITE16_HANDLER( aerofgt_bg2scrollx_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg2scrollx); } WRITE16_HANDLER( aerofgt_bg2scrolly_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg2scrolly); } WRITE16_HANDLER( pspikes_palette_bank_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->spritepalettebank = data & 0x03; @@ -323,7 +323,7 @@ WRITE16_HANDLER( pspikes_palette_bank_w ) WRITE16_HANDLER( wbbc97_bitmap_enable_w ) { - aerofgt_state *state = (aerofgt_state *)space->machine->driver_data; + aerofgt_state *state = space->machine->driver_data(); COMBINE_DATA(&state->wbbc97_bitmap_enable); } @@ -335,7 +335,7 @@ WRITE16_HANDLER( wbbc97_bitmap_enable_w ) static void aerofgt_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int offs; priority <<= 12; @@ -406,7 +406,7 @@ static void aerofgt_draw_sprites( running_machine *machine, bitmap_t *bitmap, co static void turbofrc_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, int chip_disabled_pri ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int attr_start, base, first; base = chip * 0x0200; first = 4 * state->spriteram3[0x1fe + base]; @@ -491,7 +491,7 @@ static void turbofrc_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void spinlbrk_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, int chip_disabled_pri ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int attr_start, base, first; base = chip * 0x0200; first = 4 * state->spriteram3[0x1fe + base]; @@ -575,7 +575,7 @@ static void spinlbrk_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void aerfboo2_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, int chip_disabled_pri ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int attr_start, base, first; base = chip * 0x0200; @@ -660,7 +660,7 @@ static void aerfboo2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void pspikesb_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int i; for (i = 4; i < state->spriteram3_size / 2; i += 4) @@ -695,7 +695,7 @@ static void pspikesb_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void spikes91_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int i; UINT8 *lookup; lookup = memory_region(machine, "user1"); @@ -737,7 +737,7 @@ static void spikes91_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void aerfboot_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int attr_start, last; last = ((state->rasterram[0x404 / 2] << 5) - 0x8000) / 2; @@ -819,7 +819,7 @@ static void aerfboot_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void wbbc97_draw_bitmap( running_machine *machine, bitmap_t *bitmap ) { - aerofgt_state *state = (aerofgt_state *)machine->driver_data; + aerofgt_state *state = machine->driver_data(); int x, y, count; count = 16; // weird, the bitmap doesn't start at 0? @@ -840,7 +840,7 @@ static void wbbc97_draw_bitmap( running_machine *machine, bitmap_t *bitmap ) VIDEO_UPDATE( pspikes ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 256); @@ -859,7 +859,7 @@ VIDEO_UPDATE( pspikes ) VIDEO_UPDATE( pspikesb ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 256); @@ -875,7 +875,7 @@ VIDEO_UPDATE( pspikesb ) VIDEO_UPDATE( spikes91 ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; int y, x; int count; @@ -916,7 +916,7 @@ VIDEO_UPDATE( spikes91 ) VIDEO_UPDATE( karatblz ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg1_tilemap, 0, state->bg1scrollx - 8); tilemap_set_scrolly(state->bg1_tilemap, 0, state->bg1scrolly); tilemap_set_scrollx(state->bg2_tilemap, 0, state->bg2scrollx - 4); @@ -937,7 +937,7 @@ VIDEO_UPDATE( karatblz ) VIDEO_UPDATE( spinlbrk ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 512); @@ -963,7 +963,7 @@ VIDEO_UPDATE( spinlbrk ) VIDEO_UPDATE( turbofrc ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 512); @@ -990,7 +990,7 @@ VIDEO_UPDATE( turbofrc ) VIDEO_UPDATE( aerofgt ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg1_tilemap, 0, state->rasterram[0x0000] - 18); tilemap_set_scrolly(state->bg1_tilemap, 0, state->bg1scrolly); tilemap_set_scrollx(state->bg2_tilemap, 0, state->rasterram[0x0200] - 20); @@ -1013,7 +1013,7 @@ VIDEO_UPDATE( aerofgt ) VIDEO_UPDATE( aerfboot ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 512); @@ -1036,7 +1036,7 @@ VIDEO_UPDATE( aerfboot ) VIDEO_UPDATE( aerfboo2 ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 512); @@ -1063,7 +1063,7 @@ VIDEO_UPDATE( aerfboo2 ) VIDEO_UPDATE( wbbc97 ) { - aerofgt_state *state = (aerofgt_state *)screen->machine->driver_data; + aerofgt_state *state = screen->machine->driver_data(); int i, scrolly; tilemap_set_scroll_rows(state->bg1_tilemap, 256); diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index a05fd7b9b50..339a715843a 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -36,28 +36,28 @@ WRITE8_HANDLER( airbustr_videoram_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( airbustr_colorram_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( airbustr_videoram2_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( airbustr_colorram2_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -76,7 +76,7 @@ WRITE8_HANDLER( airbustr_colorram2_w ) WRITE8_HANDLER( airbustr_scrollregs_w ) { - airbustr_state *state = (airbustr_state *)space->machine->driver_data; + airbustr_state *state = space->machine->driver_data(); switch (offset) // offset 0 <-> port 4 { case 0x00: state->fg_scrolly = data; break; // low 8 bits @@ -96,7 +96,7 @@ WRITE8_HANDLER( airbustr_scrollregs_w ) static TILE_GET_INFO( get_fg_tile_info ) { - airbustr_state *state = (airbustr_state *)machine->driver_data; + airbustr_state *state = machine->driver_data(); int attr = state->colorram2[tile_index]; int code = state->videoram2[tile_index] + ((attr & 0x0f) << 8); int color = attr >> 4; @@ -106,7 +106,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - airbustr_state *state = (airbustr_state *)machine->driver_data; + airbustr_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0x0f) << 8); int color = (attr >> 4) + 16; @@ -116,7 +116,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( airbustr ) { - airbustr_state *state = (airbustr_state *)machine->driver_data; + airbustr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -135,7 +135,7 @@ VIDEO_START( airbustr ) VIDEO_UPDATE( airbustr ) { - airbustr_state *state = (airbustr_state *)screen->machine->driver_data; + airbustr_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); @@ -148,7 +148,7 @@ VIDEO_UPDATE( airbustr ) VIDEO_EOF( airbustr ) { - airbustr_state *state = (airbustr_state *)machine->driver_data; + airbustr_state *state = machine->driver_data(); // update the sprite bitmap pandora_eof(state->pandora); diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c index e724ae0fd00..2dbc0717cfc 100644 --- a/src/mame/video/ajax.c +++ b/src/mame/video/ajax.c @@ -19,7 +19,7 @@ void ajax_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - ajax_state *state = (ajax_state *)machine->driver_data; + ajax_state *state = machine->driver_data(); *code |= ((*color & 0x0f) << 8) | (bank << 12); *color = state->layer_colorbase[layer] + ((*color & 0xf0) >> 4); } @@ -39,7 +39,7 @@ void ajax_sprite_callback( running_machine *machine, int *code, int *color, int 6 over A (1 = have priority) never over F */ - ajax_state *state = (ajax_state *)machine->driver_data; + ajax_state *state = machine->driver_data(); *priority = 0xff00; /* F = 8 */ if ( *color & 0x10) *priority |= 0xf0f0; /* Z = 4 */ if (~*color & 0x40) *priority |= 0xcccc; /* A = 2 */ @@ -56,7 +56,7 @@ void ajax_sprite_callback( running_machine *machine, int *code, int *color, int void ajax_zoom_callback( running_machine *machine, int *code, int *color, int *flags ) { - ajax_state *state = (ajax_state *)machine->driver_data; + ajax_state *state = machine->driver_data(); *code |= ((*color & 0x07) << 8); *color = state->zoom_colorbase + ((*color & 0x08) >> 3); } @@ -70,7 +70,7 @@ void ajax_zoom_callback( running_machine *machine, int *code, int *color, int *f VIDEO_START( ajax ) { - ajax_state *state = (ajax_state *)machine->driver_data; + ajax_state *state = machine->driver_data(); state->layer_colorbase[0] = 64; state->layer_colorbase[1] = 0; @@ -89,7 +89,7 @@ VIDEO_START( ajax ) VIDEO_UPDATE( ajax ) { - ajax_state *state = (ajax_state *)screen->machine->driver_data; + ajax_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c index 46b781c269d..9d4ed739c1a 100644 --- a/src/mame/video/aliens.c +++ b/src/mame/video/aliens.c @@ -10,7 +10,7 @@ void aliens_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - aliens_state *state = (aliens_state *)machine->driver_data; + aliens_state *state = machine->driver_data(); *code |= ((*color & 0x3f) << 8) | (bank << 14); *color = state->layer_colorbase[layer] + ((*color & 0xc0) >> 6); @@ -25,7 +25,7 @@ void aliens_tile_callback( running_machine *machine, int layer, int bank, int *c void aliens_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask, int *shadow ) { - aliens_state *state = (aliens_state *)machine->driver_data; + aliens_state *state = machine->driver_data(); /* The PROM allows for mixed priorities, where sprites would have */ /* priority over text but not on one or both of the other two planes. */ @@ -55,7 +55,7 @@ void aliens_sprite_callback( running_machine *machine, int *code, int *color, in VIDEO_START( aliens ) { - aliens_state *state = (aliens_state *)machine->driver_data; + aliens_state *state = machine->driver_data(); machine->generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x400); @@ -77,7 +77,7 @@ VIDEO_START( aliens ) VIDEO_UPDATE( aliens ) { - aliens_state *state = (aliens_state *)screen->machine->driver_data; + aliens_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 930a310ae79..68fc3312fe1 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -10,19 +10,19 @@ void alpha68k_flipscreen_w( running_machine *machine, int flip ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->flipscreen = flip; } void alpha68k_V_video_bank_w( running_machine *machine, int bank ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->bank_base = bank & 0xf; } WRITE16_HANDLER( alpha68k_paletteram_w ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); int newword; int r, g, b; @@ -40,7 +40,7 @@ WRITE16_HANDLER( alpha68k_paletteram_w ) static TILE_GET_INFO( get_tile_info ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); int tile = state->videoram[2 * tile_index] & 0xff; int color = state->videoram[2 * tile_index + 1] & 0x0f; @@ -51,7 +51,7 @@ static TILE_GET_INFO( get_tile_info ) WRITE16_HANDLER( alpha68k_videoram_w ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); /* Doh. */ if(ACCESSING_BITS_0_7) if(ACCESSING_BITS_8_15) @@ -66,7 +66,7 @@ WRITE16_HANDLER( alpha68k_videoram_w ) VIDEO_START( alpha68k ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); state->fix_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fix_tilemap, 0); @@ -77,7 +77,7 @@ VIDEO_START( alpha68k ) //AT static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int j, int s, int e ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, mx, my, color, tile, fx, fy, i; @@ -130,7 +130,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( alpha68k_II ) { - alpha68k_state *state = (alpha68k_state *)screen->machine->driver_data; + alpha68k_state *state = screen->machine->driver_data(); if (state->last_bank != state->bank_base) tilemap_mark_all_tiles_dirty_all(screen->machine); @@ -171,7 +171,7 @@ VIDEO_UPDATE( alpha68k_II ) WRITE16_HANDLER( alpha68k_II_video_bank_w ) { - alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; + alpha68k_state *state = space->machine->driver_data(); switch (offset) { case 0x10: /* Reset */ @@ -223,7 +223,7 @@ WRITE16_HANDLER( alpha68k_V_video_control_w ) static void draw_sprites_V( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int j, int s, int e, int fx_mask, int fy_mask, int sprite_mask ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, mx, my, color, tile, fx, fy, i; @@ -277,7 +277,7 @@ static void draw_sprites_V( running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( alpha68k_V ) { - alpha68k_state *state = (alpha68k_state *)screen->machine->driver_data; + alpha68k_state *state = screen->machine->driver_data(); UINT16 *spriteram = state->spriteram; if (state->last_bank != state->bank_base) @@ -318,7 +318,7 @@ VIDEO_UPDATE( alpha68k_V ) VIDEO_UPDATE( alpha68k_V_sb ) { - alpha68k_state *state = (alpha68k_state *)screen->machine->driver_data; + alpha68k_state *state = screen->machine->driver_data(); if (state->last_bank != state->bank_base) tilemap_mark_all_tiles_dirty_all(screen->machine); @@ -342,7 +342,7 @@ VIDEO_UPDATE( alpha68k_V_sb ) //AT static void draw_sprites_I( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int c, int d, int yshift ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int data, offs, mx, my, tile, color, fy, i; UINT8 *color_prom = memory_region(machine, "user1"); @@ -370,7 +370,7 @@ static void draw_sprites_I( running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( alpha68k_I ) { - alpha68k_state *state = (alpha68k_state *)screen->machine->driver_data; + alpha68k_state *state = screen->machine->driver_data(); int yshift = (state->microcontroller_id == 0x890a) ? 1 : 0; // The Next Space is 1 pixel off bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -450,7 +450,7 @@ static void jongbou_video_banking(int *bank, int data) static void kyros_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int c, int d ) { - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, mx, my, color, tile, i, bank, fy, fx; int data; @@ -503,7 +503,7 @@ static void kyros_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( kyros ) { - alpha68k_state *state = (alpha68k_state *)screen->machine->driver_data; + alpha68k_state *state = screen->machine->driver_data(); colortable_entry_set_value(screen->machine->colortable, 0x100, *state->videoram & 0xff); bitmap_fill(bitmap, cliprect, 0x100); //AT @@ -518,7 +518,7 @@ VIDEO_UPDATE( kyros ) static void sstingry_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int c, int d ) { //AT - alpha68k_state *state = (alpha68k_state *)machine->driver_data; + alpha68k_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int data, offs, mx, my, color, tile, i, bank, fy, fx; @@ -563,7 +563,7 @@ static void sstingry_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( sstingry ) { - alpha68k_state *state = (alpha68k_state *)screen->machine->driver_data; + alpha68k_state *state = screen->machine->driver_data(); colortable_entry_set_value(screen->machine->colortable, 0x100, *state->videoram & 0xff); bitmap_fill(bitmap, cliprect, 0x100); //AT diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c index ed1e237948b..bd673e40660 100644 --- a/src/mame/video/ambush.c +++ b/src/mame/video/ambush.c @@ -49,7 +49,7 @@ PALETTE_INIT( ambush ) static void draw_chars( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - ambush_state *state = (ambush_state *)machine->driver_data; + ambush_state *state = machine->driver_data(); int offs, transpen; transpen = (priority == 0) ? -1 : 0; @@ -90,7 +90,7 @@ static void draw_chars( running_machine *machine, bitmap_t *bitmap, const rectan VIDEO_UPDATE( ambush ) { - ambush_state *state = (ambush_state *)screen->machine->driver_data; + ambush_state *state = screen->machine->driver_data(); int offs; bitmap_fill(bitmap, cliprect, 0); diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index c997bd3ea0b..bb55c475d1d 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -25,7 +25,7 @@ WRITE8_HANDLER( amspdwy_paletteram_w ) WRITE8_HANDLER( amspdwy_flipscreen_w ) { - amspdwy_state *state = (amspdwy_state *)space->machine->driver_data; + amspdwy_state *state = space->machine->driver_data(); state->flipscreen ^= 1; flip_screen_set(space->machine, state->flipscreen); } @@ -45,7 +45,7 @@ WRITE8_HANDLER( amspdwy_flipscreen_w ) static TILE_GET_INFO( get_tile_info ) { - amspdwy_state *state = (amspdwy_state *)machine->driver_data; + amspdwy_state *state = machine->driver_data(); UINT8 code = state->videoram[tile_index]; UINT8 color = state->colorram[tile_index]; SET_TILE_INFO( @@ -57,14 +57,14 @@ static TILE_GET_INFO( get_tile_info ) WRITE8_HANDLER( amspdwy_videoram_w ) { - amspdwy_state *state = (amspdwy_state *)space->machine->driver_data; + amspdwy_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( amspdwy_colorram_w ) { - amspdwy_state *state = (amspdwy_state *)space->machine->driver_data; + amspdwy_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -79,7 +79,7 @@ static TILEMAP_MAPPER( tilemap_scan_cols_back ) VIDEO_START( amspdwy ) { - amspdwy_state *state = (amspdwy_state *)machine->driver_data; + amspdwy_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols_back, 8, 8, 0x20, 0x20); } @@ -105,7 +105,7 @@ Offset: Format: Value: static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - amspdwy_state *state = (amspdwy_state *)machine->driver_data; + amspdwy_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int i; int max_x = machine->primary_screen->width() - 1; @@ -148,7 +148,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( amspdwy ) { - amspdwy_state *state = (amspdwy_state *)screen->machine->driver_data; + amspdwy_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 77bc3195986..4446e194936 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -16,7 +16,7 @@ enable / disable tilemap bits might be wrong static TILE_GET_INFO( get_tx_tile_info ) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); int tileno; tileno = state->txvideoram[tile_index] + (state->txbank * 0x100); @@ -25,7 +25,7 @@ static TILE_GET_INFO( get_tx_tile_info ) WRITE8_HANDLER( angelkds_txvideoram_w ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); state->txvideoram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -33,7 +33,7 @@ WRITE8_HANDLER( angelkds_txvideoram_w ) WRITE8_HANDLER( angelkds_txbank_write ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); if (state->txbank != data) { @@ -48,7 +48,7 @@ WRITE8_HANDLER( angelkds_txbank_write ) static TILE_GET_INFO( get_bgtop_tile_info ) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); int tileno; tileno = state->bgtopvideoram[tile_index]; @@ -59,7 +59,7 @@ static TILE_GET_INFO( get_bgtop_tile_info ) WRITE8_HANDLER( angelkds_bgtopvideoram_w ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); state->bgtopvideoram[offset] = data; tilemap_mark_tile_dirty(state->bgtop_tilemap, offset); @@ -67,7 +67,7 @@ WRITE8_HANDLER( angelkds_bgtopvideoram_w ) WRITE8_HANDLER( angelkds_bgtopbank_write ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); if (state->bgtopbank != data) { @@ -78,7 +78,7 @@ WRITE8_HANDLER( angelkds_bgtopbank_write ) WRITE8_HANDLER( angelkds_bgtopscroll_write ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bgtop_tilemap, 0, data); } @@ -89,7 +89,7 @@ WRITE8_HANDLER( angelkds_bgtopscroll_write ) static TILE_GET_INFO( get_bgbot_tile_info ) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); int tileno; tileno = state->bgbotvideoram[tile_index]; @@ -100,7 +100,7 @@ static TILE_GET_INFO( get_bgbot_tile_info ) WRITE8_HANDLER( angelkds_bgbotvideoram_w ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); state->bgbotvideoram[offset] = data; tilemap_mark_tile_dirty(state->bgbot_tilemap, offset); @@ -109,7 +109,7 @@ WRITE8_HANDLER( angelkds_bgbotvideoram_w ) WRITE8_HANDLER( angelkds_bgbotbank_write ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); if (state->bgbotbank != data) { @@ -120,7 +120,7 @@ WRITE8_HANDLER( angelkds_bgbotbank_write ) WRITE8_HANDLER( angelkds_bgbotscroll_write ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bgbot_tilemap, 0, data); } @@ -128,7 +128,7 @@ WRITE8_HANDLER( angelkds_bgbotscroll_write ) WRITE8_HANDLER( angelkds_layer_ctrl_write ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); state->layer_ctrl = data; } @@ -142,7 +142,7 @@ a split down the middle of the screen static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int enable_n) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); const UINT8 *source = state->spriteram + 0x100 - 4; const UINT8 *finish = state->spriteram; const gfx_element *gfx = machine->gfx[3]; @@ -243,7 +243,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta WRITE8_HANDLER( angelkds_paletteram_w ) { - angelkds_state *state = (angelkds_state *)space->machine->driver_data; + angelkds_state *state = space->machine->driver_data(); int no; state->paletteram[offset] = data; @@ -258,7 +258,7 @@ WRITE8_HANDLER( angelkds_paletteram_w ) VIDEO_START( angelkds ) { - angelkds_state *state = (angelkds_state *)machine->driver_data; + angelkds_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->tx_tilemap, 0); @@ -274,7 +274,7 @@ VIDEO_START( angelkds ) VIDEO_UPDATE( angelkds ) { - angelkds_state *state = (angelkds_state *)screen->machine->driver_data; + angelkds_state *state = screen->machine->driver_data(); const rectangle &visarea = screen->visible_area(); rectangle clip; diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index f17db299da2..4a6ce61381e 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -100,7 +100,7 @@ PALETTE_INIT( robowres ) static TILE_GET_INFO( get_fg_tile_info ) { - appoooh_state *state = (appoooh_state *)machine->driver_data; + appoooh_state *state = machine->driver_data(); int code = state->fg_videoram[tile_index] + 256 * ((state->fg_colorram[tile_index] >> 5) & 7); SET_TILE_INFO( @@ -113,7 +113,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - appoooh_state *state = (appoooh_state *)machine->driver_data; + appoooh_state *state = machine->driver_data(); int code = state->bg_videoram[tile_index] + 256 * ((state->bg_colorram[tile_index] >> 5) & 7); SET_TILE_INFO( @@ -132,7 +132,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( appoooh ) { - appoooh_state *state = (appoooh_state *)machine->driver_data; + appoooh_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -147,42 +147,42 @@ VIDEO_START( appoooh ) WRITE8_HANDLER( appoooh_scroll_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); state->scroll_x = data; } WRITE8_HANDLER( appoooh_fg_videoram_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( appoooh_fg_colorram_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); state->fg_colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( appoooh_bg_videoram_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( appoooh_bg_colorram_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); state->bg_colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( appoooh_out_w ) { - appoooh_state *state = (appoooh_state *)space->machine->driver_data; + appoooh_state *state = space->machine->driver_data(); /* bit 0 controls NMI */ interrupt_enable_w(space,0,data & 0x01); @@ -272,7 +272,7 @@ static void robowres_draw_sprites( bitmap_t *dest_bmp, const rectangle *cliprect VIDEO_UPDATE( appoooh ) { - appoooh_state *state = (appoooh_state *)screen->machine->driver_data; + appoooh_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); if (state->priority == 0) /* fg behind sprites */ @@ -302,7 +302,7 @@ VIDEO_UPDATE( appoooh ) VIDEO_UPDATE( robowres ) { - appoooh_state *state = (appoooh_state *)screen->machine->driver_data; + appoooh_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); if (state->priority == 0) /* fg behind sprites */ diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c index 4096055267a..c192866989d 100644 --- a/src/mame/video/aquarium.c +++ b/src/mame/video/aquarium.c @@ -6,7 +6,7 @@ /* gcpinbal.c modified */ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); int offs, chain_pos; int x, y, curx, cury; UINT8 col, flipx, flipy, chain; @@ -88,7 +88,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /* TXT Layer */ static TILE_GET_INFO( get_aquarium_txt_tile_info ) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); int tileno, colour; tileno = (state->txt_videoram[tile_index] & 0x0fff); @@ -98,7 +98,7 @@ static TILE_GET_INFO( get_aquarium_txt_tile_info ) WRITE16_HANDLER( aquarium_txt_videoram_w ) { - aquarium_state *state = (aquarium_state *)space->machine->driver_data; + aquarium_state *state = space->machine->driver_data(); state->txt_videoram[offset] = data; tilemap_mark_tile_dirty(state->txt_tilemap, offset); } @@ -106,7 +106,7 @@ WRITE16_HANDLER( aquarium_txt_videoram_w ) /* MID Layer */ static TILE_GET_INFO( get_aquarium_mid_tile_info ) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); int tileno, colour, flag; tileno = (state->mid_videoram[tile_index * 2] & 0x0fff); @@ -120,7 +120,7 @@ static TILE_GET_INFO( get_aquarium_mid_tile_info ) WRITE16_HANDLER( aquarium_mid_videoram_w ) { - aquarium_state *state = (aquarium_state *)space->machine->driver_data; + aquarium_state *state = space->machine->driver_data(); state->mid_videoram[offset] = data; tilemap_mark_tile_dirty(state->mid_tilemap, offset / 2); } @@ -128,7 +128,7 @@ WRITE16_HANDLER( aquarium_mid_videoram_w ) /* BAK Layer */ static TILE_GET_INFO( get_aquarium_bak_tile_info ) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); int tileno, colour, flag; tileno = (state->bak_videoram[tile_index * 2] & 0x0fff); @@ -142,14 +142,14 @@ static TILE_GET_INFO( get_aquarium_bak_tile_info ) WRITE16_HANDLER( aquarium_bak_videoram_w ) { - aquarium_state *state = (aquarium_state *)space->machine->driver_data; + aquarium_state *state = space->machine->driver_data(); state->bak_videoram[offset] = data; tilemap_mark_tile_dirty(state->bak_tilemap, offset / 2); } VIDEO_START(aquarium) { - aquarium_state *state = (aquarium_state *)machine->driver_data; + aquarium_state *state = machine->driver_data(); state->txt_tilemap = tilemap_create(machine, get_aquarium_txt_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->bak_tilemap = tilemap_create(machine, get_aquarium_bak_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->mid_tilemap = tilemap_create(machine, get_aquarium_mid_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -160,7 +160,7 @@ VIDEO_START(aquarium) VIDEO_UPDATE(aquarium) { - aquarium_state *state = (aquarium_state *)screen->machine->driver_data; + aquarium_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->mid_tilemap, 0, state->scroll[0]); tilemap_set_scrolly(state->mid_tilemap, 0, state->scroll[1]); tilemap_set_scrollx(state->bak_tilemap, 0, state->scroll[2]); diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c index 6d5f73fc7a2..2eb8d089a3e 100644 --- a/src/mame/video/arabian.c +++ b/src/mame/video/arabian.c @@ -153,7 +153,7 @@ PALETTE_INIT( arabian ) VIDEO_START( arabian ) { - arabian_state *state = (arabian_state *)machine->driver_data; + arabian_state *state = machine->driver_data(); UINT8 *gfxbase = memory_region(machine, "gfx1"); int offs; @@ -222,7 +222,7 @@ VIDEO_START( arabian ) static void blit_area( running_machine *machine, UINT8 plane, UINT16 src, UINT8 x, UINT8 y, UINT8 sx, UINT8 sy ) { - arabian_state *state = (arabian_state *)machine->driver_data; + arabian_state *state = machine->driver_data(); UINT8 *srcdata = &state->converted_gfx[src * 4]; int i,j; @@ -269,7 +269,7 @@ static void blit_area( running_machine *machine, UINT8 plane, UINT16 src, UINT8 WRITE8_HANDLER( arabian_blitter_w ) { - arabian_state *state = (arabian_state *)space->machine->driver_data; + arabian_state *state = space->machine->driver_data(); /* write the data */ state->blitter[offset] = data; @@ -300,7 +300,7 @@ WRITE8_HANDLER( arabian_blitter_w ) WRITE8_HANDLER( arabian_videoram_w ) { - arabian_state *state = (arabian_state *)space->machine->driver_data; + arabian_state *state = space->machine->driver_data(); UINT8 *base; UINT8 x, y; @@ -370,7 +370,7 @@ WRITE8_HANDLER( arabian_videoram_w ) VIDEO_UPDATE( arabian ) { - arabian_state *state = (arabian_state *)screen->machine->driver_data; + arabian_state *state = screen->machine->driver_data(); const pen_t *pens = &screen->machine->pens[(state->video_control >> 3) << 8]; int y; diff --git a/src/mame/video/arcadecl.c b/src/mame/video/arcadecl.c index c0e83b46588..bfa51030d58 100644 --- a/src/mame/video/arcadecl.c +++ b/src/mame/video/arcadecl.c @@ -57,7 +57,7 @@ VIDEO_START( arcadecl ) 0, /* resulting value to indicate "special" */ 0, /* callback routine for special entries */ }; - rampart_state *state = (rampart_state *)machine->driver_data; + rampart_state *state = machine->driver_data(); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -78,7 +78,7 @@ VIDEO_START( arcadecl ) VIDEO_UPDATE( arcadecl ) { - rampart_state *state = (rampart_state *)screen->machine->driver_data; + rampart_state *state = screen->machine->driver_data(); /* draw the playfield */ rampart_bitmap_render(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index b4b6edf5e50..23474c3b892 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -12,14 +12,14 @@ WRITE8_HANDLER( arkanoid_videoram_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( arkanoid_d008_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); int bank; /* bits 0 and 1 flip X and Y, I don't know which is which */ @@ -75,7 +75,7 @@ WRITE8_HANDLER( arkanoid_d008_w ) /* different hook-up, everything except for bits 0-1 and 7 aren't tested afaik. */ WRITE8_HANDLER( tetrsark_d008_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); int bank; /* bits 0 and 1 flip X and Y, I don't know which is which */ @@ -122,7 +122,7 @@ WRITE8_HANDLER( tetrsark_d008_w ) WRITE8_HANDLER( hexa_d008_w ) { - arkanoid_state *state = (arkanoid_state *)space->machine->driver_data; + arkanoid_state *state = space->machine->driver_data(); /* bit 0 = flipx (or y?) */ if (flip_screen_x_get(space->machine) != (data & 0x01)) @@ -155,7 +155,7 @@ WRITE8_HANDLER( hexa_d008_w ) static TILE_GET_INFO( get_bg_tile_info ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); int offs = tile_index * 2; int code = state->videoram[offs + 1] + ((state->videoram[offs] & 0x07) << 8) + 2048 * state->gfxbank; int color = ((state->videoram[offs] & 0xf8) >> 3) + 32 * state->palettebank; @@ -165,14 +165,14 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( arkanoid ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - arkanoid_state *state = (arkanoid_state *)machine->driver_data; + arkanoid_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -204,7 +204,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( arkanoid ) { - arkanoid_state *state = (arkanoid_state *)screen->machine->driver_data; + arkanoid_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); @@ -213,7 +213,7 @@ VIDEO_UPDATE( arkanoid ) VIDEO_UPDATE( hexa ) { - arkanoid_state *state = (arkanoid_state *)screen->machine->driver_data; + arkanoid_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index 683253f1b58..6fa444fc6b0 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -27,7 +27,7 @@ static TILEMAP_MAPPER( armedf_scan_type3 ) static TILE_GET_INFO( get_tx_tile_info ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); int tile_number = state->text_videoram[tile_index] & 0xff; int attributes; @@ -45,7 +45,7 @@ static TILE_GET_INFO( get_tx_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); int data = state->fg_videoram[tile_index]; SET_TILE_INFO( 1, @@ -57,7 +57,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); int data = state->bg_videoram[tile_index]; SET_TILE_INFO( 2, @@ -76,7 +76,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( armedf ) { - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); if (state->scroll_type == 4 || /* cclimbr2 */ state->scroll_type == 3 || /* legion */ @@ -122,7 +122,7 @@ VIDEO_START( armedf ) WRITE16_HANDLER( armedf_text_videoram_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->text_videoram[offset]); if (state->scroll_type == 1) tilemap_mark_tile_dirty(state->tx_tilemap, offset & 0x7ff); @@ -141,21 +141,21 @@ WRITE16_HANDLER( armedf_text_videoram_w ) WRITE16_HANDLER( armedf_fg_videoram_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE16_HANDLER( armedf_bg_videoram_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE16_HANDLER( terraf_fg_scrollx_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { state->fg_scrollx = data >> 8; @@ -165,7 +165,7 @@ WRITE16_HANDLER( terraf_fg_scrollx_w ) WRITE16_HANDLER( terraf_fg_scrolly_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { if (state->waiting_msb) @@ -177,40 +177,40 @@ WRITE16_HANDLER( terraf_fg_scrolly_w ) WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->waiting_msb = 0; } WRITE16_HANDLER( armedf_fg_scrollx_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_scrollx); } WRITE16_HANDLER( armedf_fg_scrolly_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_scrolly); } WRITE16_HANDLER( armedf_bg_scrollx_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_scrollx); tilemap_set_scrollx(state->bg_tilemap, 0, state->bg_scrollx); } WRITE16_HANDLER( armedf_bg_scrolly_w ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_scrolly); tilemap_set_scrolly(state->bg_tilemap, 0, state->bg_scrolly); } WRITE16_HANDLER( armedf_mcu_cmd ) { - armedf_state *state = (armedf_state *)space->machine->driver_data; + armedf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mcu_mode); } @@ -225,7 +225,7 @@ WRITE16_HANDLER( armedf_mcu_cmd ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { UINT16 *buffered_spriteram = machine->generic.buffered_spriteram.u16; - armedf_state *state = (armedf_state *)machine->driver_data; + armedf_state *state = machine->driver_data(); int offs; for (offs = 0; offs < machine->generic.spriteram_size / 2; offs += 4) @@ -260,7 +260,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( armedf ) { - armedf_state *state = (armedf_state *)screen->machine->driver_data; + armedf_state *state = screen->machine->driver_data(); int sprite_enable = state->vreg & 0x200; tilemap_set_enable(state->bg_tilemap, state->vreg & 0x800); diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index 671e9148b0d..22109c73986 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -11,7 +11,7 @@ static TILE_GET_INFO( get_joe_tile_info ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram[tile_index]; SET_TILE_INFO( @@ -23,7 +23,7 @@ static TILE_GET_INFO( get_joe_tile_info ) static TILE_GET_INFO( get_joe_tile_info_2 ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram_2[tile_index * 2]; int attr = state->tileram_2[tile_index * 2 + 1]; @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_joe_tile_info_2 ) static TILE_GET_INFO( get_joe_tile_info_3 ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram_3[tile_index]; SET_TILE_INFO( @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_joe_tile_info_3 ) static TILE_GET_INFO( get_joe_tile_info_4 ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram_4[tile_index]; SET_TILE_INFO( @@ -60,7 +60,7 @@ static TILE_GET_INFO( get_joe_tile_info_4 ) static TILE_GET_INFO( get_joe_tile_info_5 ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram_5[tile_index * 2]; int attr = state->tileram_5[tile_index * 2 + 1]; @@ -73,7 +73,7 @@ static TILE_GET_INFO( get_joe_tile_info_5 ) static TILE_GET_INFO( get_joe_tile_info_6 ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram_6[tile_index * 2]; int attr = state->tileram_6[tile_index * 2 + 1]; @@ -87,7 +87,7 @@ static TILE_GET_INFO( get_joe_tile_info_6 ) static TILE_GET_INFO( get_joe_tile_info_7 ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); int code = state->tileram_7[tile_index * 2]; int attr = state->tileram_7[tile_index * 2 + 1]; @@ -100,7 +100,7 @@ static TILE_GET_INFO( get_joe_tile_info_7 ) WRITE16_HANDLER( ashnojoe_tileram_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram[offset] = data; tilemap_mark_tile_dirty(state->joetilemap, offset); @@ -109,7 +109,7 @@ WRITE16_HANDLER( ashnojoe_tileram_w ) WRITE16_HANDLER( ashnojoe_tileram2_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram_2[offset] = data; tilemap_mark_tile_dirty(state->joetilemap2, offset / 2); @@ -117,7 +117,7 @@ WRITE16_HANDLER( ashnojoe_tileram2_w ) WRITE16_HANDLER( ashnojoe_tileram3_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram_3[offset] = data; tilemap_mark_tile_dirty(state->joetilemap3, offset); @@ -125,7 +125,7 @@ WRITE16_HANDLER( ashnojoe_tileram3_w ) WRITE16_HANDLER( ashnojoe_tileram4_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram_4[offset] = data; tilemap_mark_tile_dirty(state->joetilemap4, offset); @@ -133,7 +133,7 @@ WRITE16_HANDLER( ashnojoe_tileram4_w ) WRITE16_HANDLER( ashnojoe_tileram5_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram_5[offset] = data; tilemap_mark_tile_dirty(state->joetilemap5, offset / 2); @@ -141,7 +141,7 @@ WRITE16_HANDLER( ashnojoe_tileram5_w ) WRITE16_HANDLER( ashnojoe_tileram6_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram_6[offset] = data; tilemap_mark_tile_dirty(state->joetilemap6, offset / 2); @@ -149,7 +149,7 @@ WRITE16_HANDLER( ashnojoe_tileram6_w ) WRITE16_HANDLER( ashnojoe_tileram7_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); state->tileram_7[offset] = data; tilemap_mark_tile_dirty(state->joetilemap7, offset / 2); @@ -157,7 +157,7 @@ WRITE16_HANDLER( ashnojoe_tileram7_w ) WRITE16_HANDLER( joe_tilemaps_xscroll_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); switch( offset ) { @@ -182,7 +182,7 @@ WRITE16_HANDLER( joe_tilemaps_xscroll_w ) WRITE16_HANDLER( joe_tilemaps_yscroll_w ) { - ashnojoe_state *state = (ashnojoe_state *)space->machine->driver_data; + ashnojoe_state *state = space->machine->driver_data(); switch( offset ) { @@ -207,7 +207,7 @@ WRITE16_HANDLER( joe_tilemaps_yscroll_w ) VIDEO_START( ashnojoe ) { - ashnojoe_state *state = (ashnojoe_state *)machine->driver_data; + ashnojoe_state *state = machine->driver_data(); state->joetilemap = tilemap_create(machine, get_joe_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->joetilemap2 = tilemap_create(machine, get_joe_tile_info_2, tilemap_scan_rows, 16, 16, 32, 32); @@ -226,7 +226,7 @@ VIDEO_START( ashnojoe ) VIDEO_UPDATE( ashnojoe ) { - ashnojoe_state *state = (ashnojoe_state *)screen->machine->driver_data; + ashnojoe_state *state = screen->machine->driver_data(); //state->tilemap_reg[0] & 0x10 // ?? on coin insertion diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c index 7b3d37bfd28..a102f2248ab 100644 --- a/src/mame/video/asterix.c +++ b/src/mame/video/asterix.c @@ -5,7 +5,7 @@ static void reset_spritebank( running_machine *machine ) { - asterix_state *state = (asterix_state *)machine->driver_data; + asterix_state *state = machine->driver_data(); k053244_bankselect(state->k053244, state->spritebank & 7); state->spritebanks[0] = (state->spritebank << 12) & 0x7000; state->spritebanks[1] = (state->spritebank << 9) & 0x7000; @@ -15,14 +15,14 @@ static void reset_spritebank( running_machine *machine ) WRITE16_HANDLER( asterix_spritebank_w ) { - asterix_state *state = (asterix_state *)space->machine->driver_data; + asterix_state *state = space->machine->driver_data(); COMBINE_DATA(&state->spritebank); reset_spritebank(space->machine); } void asterix_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - asterix_state *state = (asterix_state *)machine->driver_data; + asterix_state *state = machine->driver_data(); int pri = (*color & 0x00e0) >> 2; if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -39,7 +39,7 @@ void asterix_sprite_callback( running_machine *machine, int *code, int *color, i void asterix_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { - asterix_state *state = (asterix_state *)machine->driver_data; + asterix_state *state = machine->driver_data(); *flags = *code & 0x1000 ? TILE_FLIPX : 0; *color = (state->layer_colorbase[layer] + ((*code & 0xe000) >> 13)) & 0x7f; @@ -48,7 +48,7 @@ void asterix_tile_callback( running_machine *machine, int layer, int *code, int VIDEO_UPDATE( asterix ) { - asterix_state *state = (asterix_state *)screen->machine->driver_data; + asterix_state *state = screen->machine->driver_data(); static const int K053251_CI[4] = { K053251_CI0, K053251_CI2, K053251_CI3, K053251_CI4 }; int layer[3], plane, new_colorbase; diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c index 509b6a0c56a..013e9d2f3fc 100644 --- a/src/mame/video/asuka.c +++ b/src/mame/video/asuka.c @@ -8,7 +8,7 @@ WRITE16_HANDLER( asuka_spritectrl_w ) { - asuka_state *state = (asuka_state *)space->machine->driver_data; + asuka_state *state = space->machine->driver_data(); /* Bits 2-5 are color bank; in asuka games bit 0 is global priority */ pc090oj_set_sprite_ctrl(state->pc090oj, ((data & 0x3c) >> 2) | ((data & 0x1) << 15)); @@ -21,7 +21,7 @@ WRITE16_HANDLER( asuka_spritectrl_w ) VIDEO_UPDATE( asuka ) { - asuka_state *state = (asuka_state *)screen->machine->driver_data; + asuka_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -47,7 +47,7 @@ VIDEO_UPDATE( asuka ) VIDEO_UPDATE( bonzeadv ) { - asuka_state *state = (asuka_state *)screen->machine->driver_data; + asuka_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 665a5553856..abeb761b6d3 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -29,21 +29,21 @@ static void get_tile_info_common( running_machine *machine, tile_data *tileinfo, static TILE_GET_INFO( alpha1_get_tile_info ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); get_tile_info_common(machine, tileinfo, tile_index, state->alphap1_videoram); } static TILE_GET_INFO( alpha2_get_tile_info ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); get_tile_info_common(machine, tileinfo, tile_index, state->alphap2_videoram); } static TILE_GET_INFO( field_get_tile_info ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); int code = state->field_videoram[tile_index] & 0x3f; int flipyx = state->field_videoram[tile_index] >> 6; @@ -61,7 +61,7 @@ static TILE_GET_INFO( field_get_tile_info ) WRITE8_HANDLER( atarifb_alpha1_videoram_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); state->alphap1_videoram[offset] = data; tilemap_mark_tile_dirty(state->alpha1_tilemap, offset); @@ -70,7 +70,7 @@ WRITE8_HANDLER( atarifb_alpha1_videoram_w ) WRITE8_HANDLER( atarifb_alpha2_videoram_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); state->alphap2_videoram[offset] = data; tilemap_mark_tile_dirty(state->alpha2_tilemap, offset); @@ -79,7 +79,7 @@ WRITE8_HANDLER( atarifb_alpha2_videoram_w ) WRITE8_HANDLER( atarifb_field_videoram_w ) { - atarifb_state *state = (atarifb_state *)space->machine->driver_data; + atarifb_state *state = space->machine->driver_data(); state->field_videoram[offset] = data; tilemap_mark_tile_dirty(state->field_tilemap, offset); @@ -95,7 +95,7 @@ WRITE8_HANDLER( atarifb_field_videoram_w ) VIDEO_START( atarifb ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); state->alpha1_tilemap = tilemap_create(machine, alpha1_get_tile_info, tilemap_scan_cols, 8, 8, 3, 32); state->alpha2_tilemap = tilemap_create(machine, alpha2_get_tile_info, tilemap_scan_cols, 8, 8, 3, 32); @@ -106,7 +106,7 @@ VIDEO_START( atarifb ) static void draw_playfield_and_alpha( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int playfield_x_offset, int playfield_y_offset ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); static const rectangle bigfield_area = { 4 * 8, 34 * 8 - 1, 0 * 8, 32 * 8 - 1 }; int scroll_x[1]; @@ -123,7 +123,7 @@ static void draw_playfield_and_alpha( running_machine *machine, bitmap_t *bitmap static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int gfx, int is_soccer ) { - atarifb_state *state = (atarifb_state *)machine->driver_data; + atarifb_state *state = machine->driver_data(); static const rectangle bigfield_area = { 4 * 8, 34 * 8 - 1, 0 * 8, 32 * 8 - 1 }; int obj; diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index 342198dbd52..9959ebcc4bc 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - atarig1_state *state = (atarig1_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + atarig1_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; @@ -29,8 +29,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - atarig1_state *state = (atarig1_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + atarig1_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = (state->playfield_tile_bank << 12) | (data & 0xfff); int color = (data >> 12) & 7; SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -87,20 +87,20 @@ VIDEO_START( atarig1 ) {{ 0 }}, /* mask for the priority */ {{ 0 }} /* mask for the VRAM target */ }; - atarig1_state *state = (atarig1_state *)machine->driver_data; + atarig1_state *state = machine->driver_data(); /* blend the playfields and free the temporary one */ atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x10); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); /* initialize the motion objects */ atarirle_init(machine, 0, state->is_pitfight ? &modesc_pitfight : &modesc_hydra); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* reset statics */ state->pfscroll_xoffset = state->is_pitfight ? 2 : 0; @@ -122,7 +122,7 @@ VIDEO_START( atarig1 ) WRITE16_HANDLER( atarig1_mo_control_w ) { - atarig1_state *state = (atarig1_state *)space->machine->driver_data; + atarig1_state *state = space->machine->driver_data(); logerror("MOCONT = %d (scan = %d)\n", data, space->machine->primary_screen->vpos()); @@ -133,14 +133,14 @@ WRITE16_HANDLER( atarig1_mo_control_w ) void atarig1_scanline_update(screen_device &screen, int scanline) { - atarig1_state *state = (atarig1_state *)screen.machine->driver_data; - UINT16 *base = &state->atarigen.alpha[(scanline / 8) * 64 + 48]; + atarig1_state *state = screen.machine->driver_data(); + UINT16 *base = &state->alpha[(scanline / 8) * 64 + 48]; int i; //if (scanline == 0) logerror("-------\n"); /* keep in range */ - if (base >= &state->atarigen.alpha[0x800]) + if (base >= &state->alpha[0x800]) return; screen.update_partial(MAX(scanline - 1, 0)); @@ -157,7 +157,7 @@ void atarig1_scanline_update(screen_device &screen, int scanline) if (newscroll != state->playfield_xscroll) { screen.update_partial(MAX(scanline + i - 1, 0)); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll); state->playfield_xscroll = newscroll; } } @@ -171,13 +171,13 @@ void atarig1_scanline_update(screen_device &screen, int scanline) if (newscroll != state->playfield_yscroll) { screen.update_partial(MAX(scanline + i - 1, 0)); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll); state->playfield_yscroll = newscroll; } if (newbank != state->playfield_tile_bank) { screen.update_partial(MAX(scanline + i - 1, 0)); - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); state->playfield_tile_bank = newbank; } } @@ -194,15 +194,15 @@ void atarig1_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( atarig1 ) { - atarig1_state *state = (atarig1_state *)screen->machine->driver_data; + atarig1_state *state = screen->machine->driver_data(); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* copy the motion objects on top */ copybitmap_trans(bitmap, atarirle_get_vram(0, 0), 0, 0, 0, 0, cliprect, 0); /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 7da0668793f..21ccf0d67a3 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -33,8 +33,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - atarig42_state *state = (atarig42_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + atarig42_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; @@ -44,8 +44,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - atarig42_state *state = (atarig42_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + atarig42_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = (state->playfield_tile_bank << 12) | (data & 0xfff); int color = (state->playfield_base >> 5) + ((state->playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -89,7 +89,7 @@ VIDEO_START( atarig42 ) {{ 0,0x0e00,0,0,0,0,0,0 }}, /* mask for the priority */ {{ 0 }} /* mask for the VRAM target */ }; - atarig42_state *state = (atarig42_state *)machine->driver_data; + atarig42_state *state = machine->driver_data(); atarirle_desc adjusted_modesc = modesc; int i; @@ -97,7 +97,7 @@ VIDEO_START( atarig42 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarig42_playfield_scan, 8,8, 128,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarig42_playfield_scan, 8,8, 128,64); /* initialize the motion objects */ adjusted_modesc.palettebase = state->motion_object_base; @@ -106,8 +106,8 @@ VIDEO_START( atarig42 ) atarirle_init(machine, 0, &adjusted_modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* save states */ state_save_register_global(machine, state->current_control); @@ -127,7 +127,7 @@ VIDEO_START( atarig42 ) WRITE16_HANDLER( atarig42_mo_control_w ) { - atarig42_state *state = (atarig42_state *)space->machine->driver_data; + atarig42_state *state = space->machine->driver_data(); logerror("MOCONT = %d (scan = %d)\n", data, space->machine->primary_screen->vpos()); @@ -138,14 +138,14 @@ WRITE16_HANDLER( atarig42_mo_control_w ) void atarig42_scanline_update(screen_device &screen, int scanline) { - atarig42_state *state = (atarig42_state *)screen.machine->driver_data; - UINT16 *base = &state->atarigen.alpha[(scanline / 8) * 64 + 48]; + atarig42_state *state = screen.machine->driver_data(); + UINT16 *base = &state->alpha[(scanline / 8) * 64 + 48]; int i; if (scanline == 0) logerror("-------\n"); /* keep in range */ - if (base >= &state->atarigen.alpha[0x800]) + if (base >= &state->alpha[0x800]) return; /* update the playfield scrolls */ @@ -162,14 +162,14 @@ void atarig42_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll); state->playfield_xscroll = newscroll; } if (newbank != state->playfield_color_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); state->playfield_color_bank = newbank; } } @@ -183,14 +183,14 @@ void atarig42_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll); state->playfield_yscroll = newscroll; } if (newbank != state->playfield_tile_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); state->playfield_tile_bank = newbank; } } @@ -207,19 +207,19 @@ void atarig42_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( atarig42 ) { - atarig42_state *state = (atarig42_state *)screen->machine->driver_data; + atarig42_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 1, 1); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 2, 2); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 3, 3); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 4, 4); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 5, 5); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 6, 6); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 7, 7); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 1, 1); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 2, 2); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 3, 3); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 4, 4); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 5, 5); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 6, 6); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 7, 7); /* copy the motion objects on top */ { @@ -248,6 +248,6 @@ VIDEO_UPDATE( atarig42 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index 40f3c3234df..358398b4ddb 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -44,8 +44,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - atarigt_state *state = (atarigt_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); + atarigt_state *state = machine->driver_data(); + UINT16 data = state->alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); int code = data & 0xfff; int color = (data >> 12) & 0x0f; SET_TILE_INFO(1, code, color, 0); @@ -54,8 +54,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - atarigt_state *state = (atarigt_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); + atarigt_state *state = machine->driver_data(); + UINT16 data = state->playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); int code = (state->playfield_tile_bank << 12) | (data & 0xfff); int color = (data >> 12) & 7; SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -98,7 +98,7 @@ VIDEO_START( atarigt ) {{ 0,0x0e00,0,0,0,0,0,0 }}, /* mask for the priority */ {{ 0,0x8000,0,0,0,0,0,0 }} /* mask for the VRAM target */ }; - atarigt_state *state = (atarigt_state *)machine->driver_data; + atarigt_state *state = machine->driver_data(); atarirle_desc adjusted_modesc = modesc; pen_t *substitute_pens; int i, width, height; @@ -107,13 +107,13 @@ VIDEO_START( atarigt ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigt_playfield_scan, 8,8, 128,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigt_playfield_scan, 8,8, 128,64); /* initialize the motion objects */ atarirle_init(machine, 0, &adjusted_modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); /* allocate temp bitmaps */ width = machine->primary_screen->width(); @@ -188,12 +188,12 @@ UINT16 atarigt_colorram_r(atarigt_state *state, offs_t address) void atarigt_scanline_update(screen_device &screen, int scanline) { - atarigt_state *state = (atarigt_state *)screen.machine->driver_data; - UINT32 *base = &state->atarigen.alpha32[(scanline / 8) * 32 + 24]; + atarigt_state *state = screen.machine->driver_data(); + UINT32 *base = &state->alpha32[(scanline / 8) * 32 + 24]; int i; /* keep in range */ - if (base >= &state->atarigen.alpha32[0x400]) + if (base >= &state->alpha32[0x400]) return; /* update the playfield scrolls */ @@ -209,14 +209,14 @@ void atarigt_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll); state->playfield_xscroll = newscroll; } if (newbank != state->playfield_color_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_palette_offset(state->atarigen.playfield_tilemap, (newbank & 0x1f) << 8); + tilemap_set_palette_offset(state->playfield_tilemap, (newbank & 0x1f) << 8); state->playfield_color_bank = newbank; } } @@ -229,14 +229,14 @@ void atarigt_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll); state->playfield_yscroll = newscroll; } if (newbank != state->playfield_tile_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); state->playfield_tile_bank = newbank; } } @@ -529,7 +529,7 @@ PrimRage GALs: VIDEO_UPDATE( atarigt ) { - atarigt_state *state = (atarigt_state *)screen->machine->driver_data; + atarigt_state *state = screen->machine->driver_data(); bitmap_t *mo_bitmap = atarirle_get_vram(0, 0); bitmap_t *tm_bitmap = atarirle_get_vram(0, 1); UINT16 *cram, *tram; @@ -538,10 +538,10 @@ VIDEO_UPDATE( atarigt ) int x, y; /* draw the playfield */ - tilemap_draw(state->pf_bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(state->pf_bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw the alpha layer */ - tilemap_draw(state->an_bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(state->an_bitmap, cliprect, state->alpha_tilemap, 0, 0); /* cache pointers */ color_latch = state->colorram[0x30000/2]; diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index 645e7e1b256..e8c6f9e7926 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -33,8 +33,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); + atarigx2_state *state = machine->driver_data(); + UINT16 data = state->alpha32[tile_index / 2] >> (16 * (~tile_index & 1)); int code = data & 0xfff; int color = (data >> 12) & 0x0f; int opaque = data & 0x8000; @@ -44,8 +44,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - atarigx2_state *state = (atarigx2_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); + atarigx2_state *state = machine->driver_data(); + UINT16 data = state->playfield32[tile_index / 2] >> (16 * (~tile_index & 1)); int code = (state->playfield_tile_bank << 12) | (data & 0xfff); int color = (state->playfield_base >> 5) + ((state->playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7); SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -89,7 +89,7 @@ VIDEO_START( atarigx2 ) {{ 0,0x0e00,0,0,0,0,0,0 }}, /* mask for the priority */ {{ 0 }} /* mask for the VRAM target */ }; - atarigx2_state *state = (atarigx2_state *)machine->driver_data; + atarigx2_state *state = machine->driver_data(); atarirle_desc adjusted_modesc = modesc; int i; @@ -97,7 +97,7 @@ VIDEO_START( atarigx2 ) atarigen_blend_gfx(machine, 0, 2, 0x0f, 0x30); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigx2_playfield_scan, 8,8, 128,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, atarigx2_playfield_scan, 8,8, 128,64); /* initialize the motion objects */ adjusted_modesc.palettebase = state->motion_object_base; @@ -106,8 +106,8 @@ VIDEO_START( atarigx2 ) atarirle_init(machine, 0, &adjusted_modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* save states */ state_save_register_global(machine, state->current_control); @@ -127,7 +127,7 @@ VIDEO_START( atarigx2 ) WRITE16_HANDLER( atarigx2_mo_control_w ) { - atarigx2_state *state = (atarigx2_state *)space->machine->driver_data; + atarigx2_state *state = space->machine->driver_data(); logerror("MOCONT = %d (scan = %d)\n", data, space->machine->primary_screen->vpos()); @@ -138,14 +138,14 @@ WRITE16_HANDLER( atarigx2_mo_control_w ) void atarigx2_scanline_update(screen_device &screen, int scanline) { - atarigx2_state *state = (atarigx2_state *)screen.machine->driver_data; - UINT32 *base = &state->atarigen.alpha32[(scanline / 8) * 32 + 24]; + atarigx2_state *state = screen.machine->driver_data(); + UINT32 *base = &state->alpha32[(scanline / 8) * 32 + 24]; int i; if (scanline == 0) logerror("-------\n"); /* keep in range */ - if (base >= &state->atarigen.alpha32[0x400]) + if (base >= &state->alpha32[0x400]) return; /* update the playfield scrolls */ @@ -161,14 +161,14 @@ void atarigx2_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll); state->playfield_xscroll = newscroll; } if (newbank != state->playfield_color_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); state->playfield_color_bank = newbank; } } @@ -181,14 +181,14 @@ void atarigx2_scanline_update(screen_device &screen, int scanline) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll); state->playfield_yscroll = newscroll; } if (newbank != state->playfield_tile_bank) { if (scanline + i > 0) screen.update_partial(scanline + i - 1); - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); state->playfield_tile_bank = newbank; } } @@ -205,19 +205,19 @@ void atarigx2_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( atarigx2 ) { - atarigx2_state *state = (atarigx2_state *)screen->machine->driver_data; + atarigx2_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 1, 1); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 2, 2); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 3, 3); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 4, 4); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 5, 5); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 6, 6); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 7, 7); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 1, 1); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 2, 2); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 3, 3); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 4, 4); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 5, 5); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 6, 6); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 7, 7); /* copy the motion objects on top */ { @@ -241,6 +241,6 @@ VIDEO_UPDATE( atarigx2 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index 24b95de6a60..4fde3037e47 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -93,8 +93,8 @@ static int get_bank(running_machine *machine, UINT8 prom1, UINT8 prom2, int bpp) static TILE_GET_INFO( get_alpha_tile_info ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + atarisy1_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 10) & 0x07; int opaque = data & 0x2000; @@ -104,8 +104,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + atarisy1_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; UINT16 lookup = state->playfield_lookup[((data >> 8) & 0x7f) | (state->playfield_tile_bank << 7)]; int gfxindex = (lookup >> 8) & 15; int code = ((lookup & 0xff) << 8) | (data & 0xff); @@ -160,7 +160,7 @@ VIDEO_START( atarisy1 ) 0 /* callback routine for special entries */ }; - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); UINT16 motable[256]; UINT16 *codelookup; UINT8 *colorlookup, *gfxlookup; @@ -170,14 +170,14 @@ VIDEO_START( atarisy1 ) decode_gfx(machine, state->playfield_lookup, motable); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* modify the motion object code lookup */ codelookup = atarimo_get_code_lookup(0, &size); @@ -213,7 +213,7 @@ VIDEO_START( atarisy1 ) WRITE16_HANDLER( atarisy1_bankselect_w ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); UINT16 oldselect = *state->bankselect; UINT16 newselect = oldselect, diff; int scanline = space->machine->primary_screen->vpos(); @@ -241,7 +241,7 @@ WRITE16_HANDLER( atarisy1_bankselect_w ) if (diff & 0x0004) { state->playfield_tile_bank = (newselect >> 2) & 1; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } /* stash the new value */ @@ -258,7 +258,7 @@ WRITE16_HANDLER( atarisy1_bankselect_w ) WRITE16_HANDLER( atarisy1_priority_w ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; + atarisy1_state *state = space->machine->driver_data(); UINT16 oldpens = state->playfield_priority_pens; UINT16 newpens = oldpens; @@ -279,8 +279,8 @@ WRITE16_HANDLER( atarisy1_priority_w ) WRITE16_HANDLER( atarisy1_xscroll_w ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; - UINT16 oldscroll = *state->atarigen.xscroll; + atarisy1_state *state = space->machine->driver_data(); + UINT16 oldscroll = *state->xscroll; UINT16 newscroll = oldscroll; /* force a partial update in case this changes mid-screen */ @@ -289,10 +289,10 @@ WRITE16_HANDLER( atarisy1_xscroll_w ) space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* set the new scroll value */ - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll); /* update the data */ - *state->atarigen.xscroll = newscroll; + *state->xscroll = newscroll; } @@ -305,15 +305,15 @@ WRITE16_HANDLER( atarisy1_xscroll_w ) TIMER_DEVICE_CALLBACK( atarisy1_reset_yscroll_callback ) { - atarisy1_state *state = (atarisy1_state *)timer.machine->driver_data; - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, param); + atarisy1_state *state = timer.machine->driver_data(); + tilemap_set_scrolly(state->playfield_tilemap, 0, param); } WRITE16_HANDLER( atarisy1_yscroll_w ) { - atarisy1_state *state = (atarisy1_state *)space->machine->driver_data; - UINT16 oldscroll = *state->atarigen.yscroll; + atarisy1_state *state = space->machine->driver_data(); + UINT16 oldscroll = *state->yscroll; UINT16 newscroll = oldscroll; int scanline = space->machine->primary_screen->vpos(); int adjusted_scroll; @@ -327,14 +327,14 @@ WRITE16_HANDLER( atarisy1_yscroll_w ) adjusted_scroll = newscroll; if (scanline <= space->machine->primary_screen->visible_area().max_y) adjusted_scroll -= (scanline + 1); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, adjusted_scroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, adjusted_scroll); /* but since we've adjusted it, we must reset it to the normal value once we hit scanline 0 again */ state->yscroll_reset_timer->adjust(space->machine->primary_screen->time_until_pos(0), newscroll); /* update the data */ - *state->atarigen.yscroll = newscroll; + *state->yscroll = newscroll; } @@ -395,7 +395,7 @@ TIMER_DEVICE_CALLBACK( atarisy1_int3off_callback ) TIMER_DEVICE_CALLBACK( atarisy1_int3_callback ) { - atarisy1_state *state = (atarisy1_state *)timer.machine->driver_data; + atarisy1_state *state = timer.machine->driver_data(); int scanline = param; /* update the state */ @@ -419,7 +419,7 @@ TIMER_DEVICE_CALLBACK( atarisy1_int3_callback ) READ16_HANDLER( atarisy1_int3state_r ) { - atarigen_state *atarigen = (atarigen_state *)space->machine->driver_data; + atarigen_state *atarigen = space->machine->driver_data(); return atarigen->scanline_int_state ? 0x0080 : 0x0000; } @@ -433,7 +433,7 @@ READ16_HANDLER( atarisy1_int3state_r ) static void update_timers(running_machine *machine, int scanline) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); UINT16 *base = &atarimo_0_spriteram[atarimo_get_bank(0) * 64 * 4]; int link = 0, best = scanline, found = 0; UINT8 spritevisit[64]; @@ -499,13 +499,13 @@ static void update_timers(running_machine *machine, int scanline) VIDEO_UPDATE( atarisy1 ) { - atarisy1_state *state = (atarisy1_state *)screen->machine->driver_data; + atarisy1_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -539,7 +539,7 @@ VIDEO_UPDATE( atarisy1 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } @@ -553,7 +553,7 @@ VIDEO_UPDATE( atarisy1 ) static void decode_gfx(running_machine *machine, UINT16 *pflookup, UINT16 *molookup) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); UINT8 *prom1 = &machine->region("proms")->u8(0x000); UINT8 *prom2 = &machine->region("proms")->u8(0x200); int obj, i; @@ -616,7 +616,7 @@ static void decode_gfx(running_machine *machine, UINT16 *pflookup, UINT16 *moloo static int get_bank(running_machine *machine, UINT8 prom1, UINT8 prom2, int bpp) { - atarisy1_state *state = (atarisy1_state *)machine->driver_data; + atarisy1_state *state = machine->driver_data(); const UINT8 *srcdata; int bank_index, gfx_index; diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c index 7800ef21b9a..20eeacafca5 100644 --- a/src/mame/video/atarisy2.c +++ b/src/mame/video/atarisy2.c @@ -28,8 +28,8 @@ static TIMER_CALLBACK( reset_yscroll_callback ); static TILE_GET_INFO( get_alpha_tile_info ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + atarisy2_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 13) & 0x07; SET_TILE_INFO(2, code, color, 0); @@ -38,8 +38,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + atarisy2_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = state->playfield_tile_bank[(data >> 10) & 1] + (data & 0x3ff); int color = (data >> 11) & 7; SET_TILE_INFO(0, code, color, 0); @@ -92,22 +92,22 @@ VIDEO_START( atarisy2 ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - atarisy2_state *state = (atarisy2_state *)machine->driver_data; + atarisy2_state *state = machine->driver_data(); /* initialize banked memory */ - state->atarigen.alpha = &state->vram[0x0000]; + state->alpha = &state->vram[0x0000]; atarimo_0_spriteram = &state->vram[0x0c00]; - state->atarigen.playfield = &state->vram[0x2000]; + state->playfield = &state->vram[0x2000]; /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* reset the statics */ state->yscroll_reset_timer = timer_alloc(machine, reset_yscroll_callback, NULL); @@ -129,8 +129,8 @@ VIDEO_START( atarisy2 ) WRITE16_HANDLER( atarisy2_xscroll_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; - UINT16 oldscroll = *state->atarigen.xscroll; + atarisy2_state *state = space->machine->driver_data(); + UINT16 oldscroll = *state->xscroll; UINT16 newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -139,31 +139,31 @@ WRITE16_HANDLER( atarisy2_xscroll_w ) space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* update the playfield scrolling - hscroll is clocked on the following scanline */ - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll >> 6); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll >> 6); /* update the playfield banking */ if (state->playfield_tile_bank[0] != (newscroll & 0x0f) * 0x400) { state->playfield_tile_bank[0] = (newscroll & 0x0f) * 0x400; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } /* update the data */ - *state->atarigen.xscroll = newscroll; + *state->xscroll = newscroll; } static TIMER_CALLBACK( reset_yscroll_callback ) { - atarisy2_state *state = (atarisy2_state *)machine->driver_data; - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, param); + atarisy2_state *state = machine->driver_data(); + tilemap_set_scrolly(state->playfield_tilemap, 0, param); } WRITE16_HANDLER( atarisy2_yscroll_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; - UINT16 oldscroll = *state->atarigen.yscroll; + atarisy2_state *state = space->machine->driver_data(); + UINT16 oldscroll = *state->yscroll; UINT16 newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -173,7 +173,7 @@ WRITE16_HANDLER( atarisy2_yscroll_w ) /* if bit 4 is zero, the scroll value is clocked in right away */ if (!(newscroll & 0x10)) - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, (newscroll >> 6) - space->machine->primary_screen->vpos()); + tilemap_set_scrolly(state->playfield_tilemap, 0, (newscroll >> 6) - space->machine->primary_screen->vpos()); else timer_adjust_oneshot(state->yscroll_reset_timer, space->machine->primary_screen->time_until_pos(0), newscroll >> 6); @@ -181,11 +181,11 @@ WRITE16_HANDLER( atarisy2_yscroll_w ) if (state->playfield_tile_bank[1] != (newscroll & 0x0f) * 0x400) { state->playfield_tile_bank[1] = (newscroll & 0x0f) * 0x400; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } /* update the data */ - *state->atarigen.yscroll = newscroll; + *state->yscroll = newscroll; } @@ -233,7 +233,7 @@ WRITE16_HANDLER( atarisy2_paletteram_w ) READ16_HANDLER( atarisy2_slapstic_r ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); int result = state->slapstic_base[offset]; slapstic_tweak(space, offset); @@ -245,7 +245,7 @@ READ16_HANDLER( atarisy2_slapstic_r ) WRITE16_HANDLER( atarisy2_slapstic_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); slapstic_tweak(space, offset); @@ -263,21 +263,21 @@ WRITE16_HANDLER( atarisy2_slapstic_w ) READ16_HANDLER( atarisy2_videoram_r ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); return state->vram[offset | state->videobank]; } WRITE16_HANDLER( atarisy2_videoram_w ) { - atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; + atarisy2_state *state = space->machine->driver_data(); int offs = offset | state->videobank; /* alpharam? */ if (offs < 0x0c00) { - COMBINE_DATA(&state->atarigen.alpha[offs]); - tilemap_mark_tile_dirty(state->atarigen.alpha_tilemap, offs); + COMBINE_DATA(&state->alpha[offs]); + tilemap_mark_tile_dirty(state->alpha_tilemap, offs); } /* spriteram? */ @@ -293,8 +293,8 @@ WRITE16_HANDLER( atarisy2_videoram_w ) else if (offs >= 0x2000) { offs -= 0x2000; - COMBINE_DATA(&state->atarigen.playfield[offs]); - tilemap_mark_tile_dirty(state->atarigen.playfield_tilemap, offs); + COMBINE_DATA(&state->playfield[offs]); + tilemap_mark_tile_dirty(state->playfield_tilemap, offs); } /* generic case */ @@ -314,7 +314,7 @@ WRITE16_HANDLER( atarisy2_videoram_w ) VIDEO_UPDATE( atarisy2 ) { - atarisy2_state *state = (atarisy2_state *)screen->machine->driver_data; + atarisy2_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; atarimo_rect_list rectlist; bitmap_t *mobitmap; @@ -322,10 +322,10 @@ VIDEO_UPDATE( atarisy2 ) /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 1, 1); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 2, 2); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 3, 3); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 1, 1); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 2, 2); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 3, 3); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -358,6 +358,6 @@ VIDEO_UPDATE( atarisy2 ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c index 40666c39d79..d3ac197b541 100644 --- a/src/mame/video/badlands.c +++ b/src/mame/video/badlands.c @@ -17,8 +17,8 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - badlands_state *state = (badlands_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + badlands_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = (data & 0x1fff) + ((data & 0x1000) ? (state->playfield_tile_bank << 12) : 0); int color = (data >> 13) & 0x07; SET_TILE_INFO(0, code, color, 0); @@ -70,10 +70,10 @@ VIDEO_START( badlands ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - badlands_state *state = (badlands_state *)machine->driver_data; + badlands_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -92,13 +92,13 @@ VIDEO_START( badlands ) WRITE16_HANDLER( badlands_pf_bank_w ) { - badlands_state *state = (badlands_state *)space->machine->driver_data; + badlands_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) if (state->playfield_tile_bank != (data & 1)) { space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); state->playfield_tile_bank = data & 1; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } } @@ -112,13 +112,13 @@ WRITE16_HANDLER( badlands_pf_bank_w ) VIDEO_UPDATE( badlands ) { - badlands_state *state = (badlands_state *)screen->machine->driver_data; + badlands_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c index 395b9bd967c..012dcb58427 100644 --- a/src/mame/video/balsente.c +++ b/src/mame/video/balsente.c @@ -18,7 +18,7 @@ VIDEO_START( balsente ) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); /* reset the system */ state->palettebank_vis = 0; @@ -44,7 +44,7 @@ VIDEO_START( balsente ) WRITE8_HANDLER( balsente_videoram_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); space->machine->generic.videoram.u8[offset] = data; @@ -63,7 +63,7 @@ WRITE8_HANDLER( balsente_videoram_w ) WRITE8_HANDLER( balsente_palette_select_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); /* only update if changed */ if (state->palettebank_vis != (data & 3)) @@ -107,7 +107,7 @@ WRITE8_HANDLER( balsente_paletteram_w ) WRITE8_HANDLER( shrike_sprite_select_w ) { - balsente_state *state = (balsente_state *)space->machine->driver_data; + balsente_state *state = space->machine->driver_data(); if( state->sprite_data != state->sprite_bank[(data & 0x80 >> 7) ^ 1 ]) { logerror( "shrike_sprite_select_w( 0x%02x )\n", data ); @@ -128,7 +128,7 @@ WRITE8_HANDLER( shrike_sprite_select_w ) static void draw_one_sprite(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 *sprite) { - balsente_state *state = (balsente_state *)machine->driver_data; + balsente_state *state = machine->driver_data(); int flags = sprite[0]; int image = sprite[1] | ((flags & 7) << 8); int ypos = sprite[2] + 17 + BALSENTE_VBEND; @@ -212,7 +212,7 @@ static void draw_one_sprite(running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( balsente ) { - balsente_state *state = (balsente_state *)screen->machine->driver_data; + balsente_state *state = screen->machine->driver_data(); const pen_t *pens = &screen->machine->pens[state->palettebank_vis * 256]; int y, i; diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index 7fd44cc8d40..805025fa4e5 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -82,14 +82,14 @@ PALETTE_INIT( bankp ) WRITE8_HANDLER( bankp_scroll_w ) { - bankp_state *state = (bankp_state *)space->machine->driver_data; + bankp_state *state = space->machine->driver_data(); state->scroll_x = data; } WRITE8_HANDLER( bankp_videoram_w ) { - bankp_state *state = (bankp_state *)space->machine->driver_data; + bankp_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -97,7 +97,7 @@ WRITE8_HANDLER( bankp_videoram_w ) WRITE8_HANDLER( bankp_colorram_w ) { - bankp_state *state = (bankp_state *)space->machine->driver_data; + bankp_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -105,7 +105,7 @@ WRITE8_HANDLER( bankp_colorram_w ) WRITE8_HANDLER( bankp_videoram2_w ) { - bankp_state *state = (bankp_state *)space->machine->driver_data; + bankp_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -113,7 +113,7 @@ WRITE8_HANDLER( bankp_videoram2_w ) WRITE8_HANDLER( bankp_colorram2_w ) { - bankp_state *state = (bankp_state *)space->machine->driver_data; + bankp_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -121,7 +121,7 @@ WRITE8_HANDLER( bankp_colorram2_w ) WRITE8_HANDLER( bankp_out_w ) { - bankp_state *state = (bankp_state *)space->machine->driver_data; + bankp_state *state = space->machine->driver_data(); /* bits 0-1 are playfield priority */ /* TODO: understand how this works */ state->priority = data & 0x03; @@ -139,7 +139,7 @@ WRITE8_HANDLER( bankp_out_w ) static TILE_GET_INFO( get_bg_tile_info ) { - bankp_state *state = (bankp_state *)machine->driver_data; + bankp_state *state = machine->driver_data(); int code = state->videoram2[tile_index] + 256 * (state->colorram2[tile_index] & 0x07); int color = state->colorram2[tile_index] >> 4; int flags = (state->colorram2[tile_index] & 0x08) ? TILE_FLIPX : 0; @@ -150,7 +150,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - bankp_state *state = (bankp_state *)machine->driver_data; + bankp_state *state = machine->driver_data(); int code = state->videoram[tile_index] + 256 * ((state->colorram[tile_index] & 3) >> 0); int color = state->colorram[tile_index] >> 3; int flags = (state->colorram[tile_index] & 0x04) ? TILE_FLIPX : 0; @@ -161,7 +161,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( bankp ) { - bankp_state *state = (bankp_state *)machine->driver_data; + bankp_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -175,7 +175,7 @@ VIDEO_START( bankp ) VIDEO_UPDATE( bankp ) { - bankp_state *state = (bankp_state *)screen->machine->driver_data; + bankp_state *state = screen->machine->driver_data(); if (flip_screen_get(screen->machine)) { diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c index d07746c6655..678744330b8 100644 --- a/src/mame/video/batman.c +++ b/src/mame/video/batman.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - batman_state *state = (batman_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + batman_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = ((data & 0x400) ? (state->alpha_tile_bank * 0x400) : 0) + (data & 0x3ff); int color = (data >> 11) & 0x0f; int opaque = data & 0x8000; @@ -29,9 +29,9 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - batman_state *state = (batman_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] & 0xff; + batman_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] & 0xff; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -41,9 +41,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) static TILE_GET_INFO( get_playfield2_tile_info ) { - batman_state *state = (batman_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield2[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + batman_state *state = machine->driver_data(); + UINT16 data1 = state->playfield2[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -96,21 +96,21 @@ VIDEO_START( batman ) 0, /* resulting value to indicate "special" */ NULL /* callback routine for special entries */ }; - batman_state *state = (batman_state *)machine->driver_data; + batman_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the second playfield */ - state->atarigen.playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); - tilemap_set_transparent_pen(state->atarigen.playfield2_tilemap, 0); + state->playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); + tilemap_set_transparent_pen(state->playfield2_tilemap, 0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); } @@ -123,12 +123,12 @@ VIDEO_START( batman ) void batman_scanline_update(screen_device &screen, int scanline) { - batman_state *state = (batman_state *)screen.machine->driver_data; + batman_state *state = screen.machine->driver_data(); /* update the scanline parameters */ - if (scanline <= screen.visible_area().max_y && state->atarigen.atarivc_state.rowscroll_enable) + if (scanline <= screen.visible_area().max_y && state->atarivc_state.rowscroll_enable) { - UINT16 *base = &state->atarigen.alpha[scanline / 8 * 64 + 48]; + UINT16 *base = &state->alpha[scanline / 8 * 64 + 48]; int scan, i; for (scan = 0; scan < 8; scan++, scanline++) @@ -140,46 +140,46 @@ void batman_scanline_update(screen_device &screen, int scanline) case 9: if (scanline > 0) screen.update_partial(scanline - 1); - state->atarigen.atarivc_state.mo_xscroll = (data >> 7) & 0x1ff; - atarimo_set_xscroll(0, state->atarigen.atarivc_state.mo_xscroll); + state->atarivc_state.mo_xscroll = (data >> 7) & 0x1ff; + atarimo_set_xscroll(0, state->atarivc_state.mo_xscroll); break; case 10: if (scanline > 0) screen.update_partial(scanline - 1); - state->atarigen.atarivc_state.pf1_xscroll_raw = (data >> 7) & 0x1ff; - atarivc_update_pf_xscrolls(&state->atarigen); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, state->atarigen.atarivc_state.pf0_xscroll); - tilemap_set_scrollx(state->atarigen.playfield2_tilemap, 0, state->atarigen.atarivc_state.pf1_xscroll); + state->atarivc_state.pf1_xscroll_raw = (data >> 7) & 0x1ff; + atarivc_update_pf_xscrolls(state); + tilemap_set_scrollx(state->playfield_tilemap, 0, state->atarivc_state.pf0_xscroll); + tilemap_set_scrollx(state->playfield2_tilemap, 0, state->atarivc_state.pf1_xscroll); break; case 11: if (scanline > 0) screen.update_partial(scanline - 1); - state->atarigen.atarivc_state.pf0_xscroll_raw = (data >> 7) & 0x1ff; - atarivc_update_pf_xscrolls(&state->atarigen); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, state->atarigen.atarivc_state.pf0_xscroll); + state->atarivc_state.pf0_xscroll_raw = (data >> 7) & 0x1ff; + atarivc_update_pf_xscrolls(state); + tilemap_set_scrollx(state->playfield_tilemap, 0, state->atarivc_state.pf0_xscroll); break; case 13: if (scanline > 0) screen.update_partial(scanline - 1); - state->atarigen.atarivc_state.mo_yscroll = (data >> 7) & 0x1ff; - atarimo_set_yscroll(0, state->atarigen.atarivc_state.mo_yscroll); + state->atarivc_state.mo_yscroll = (data >> 7) & 0x1ff; + atarimo_set_yscroll(0, state->atarivc_state.mo_yscroll); break; case 14: if (scanline > 0) screen.update_partial(scanline - 1); - state->atarigen.atarivc_state.pf1_yscroll = (data >> 7) & 0x1ff; - tilemap_set_scrolly(state->atarigen.playfield2_tilemap, 0, state->atarigen.atarivc_state.pf1_yscroll); + state->atarivc_state.pf1_yscroll = (data >> 7) & 0x1ff; + tilemap_set_scrolly(state->playfield2_tilemap, 0, state->atarivc_state.pf1_yscroll); break; case 15: if (scanline > 0) screen.update_partial(scanline - 1); - state->atarigen.atarivc_state.pf0_yscroll = (data >> 7) & 0x1ff; - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, state->atarigen.atarivc_state.pf0_yscroll); + state->atarivc_state.pf0_yscroll = (data >> 7) & 0x1ff; + tilemap_set_scrolly(state->playfield_tilemap, 0, state->atarivc_state.pf0_yscroll); break; } } @@ -196,7 +196,7 @@ void batman_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( batman ) { - batman_state *state = (batman_state *)screen->machine->driver_data; + batman_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; atarimo_rect_list rectlist; bitmap_t *mobitmap; @@ -204,14 +204,14 @@ VIDEO_UPDATE( batman ) /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0x00); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 1, 0x01); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 2, 0x02); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 3, 0x03); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 0, 0x80); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 1, 0x84); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 2, 0x88); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 3, 0x8c); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0x00); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 1, 0x01); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 2, 0x02); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 3, 0x03); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 0, 0x80); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 1, 0x84); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 2, 0x88); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 3, 0x8c); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -284,7 +284,7 @@ VIDEO_UPDATE( batman ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index 7983a931cf7..a7de05b8b67 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -17,7 +17,7 @@ WRITE8_HANDLER( battlane_palette_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); int r, g, b; int bit0, bit1, bit2; @@ -47,32 +47,32 @@ WRITE8_HANDLER( battlane_palette_w ) WRITE8_HANDLER( battlane_scrollx_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, ((state->video_ctrl & 0x01) << 8) + data); } WRITE8_HANDLER( battlane_scrolly_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, ((state->cpu_control & 0x01) << 8) + data); } WRITE8_HANDLER( battlane_tileram_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); state->tileram[offset] = data; //tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( battlane_spriteram_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); state->spriteram[offset] = data; } WRITE8_HANDLER( battlane_bitmap_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); int i, orval; orval = (~state->video_ctrl >> 1) & 0x07; @@ -95,13 +95,13 @@ WRITE8_HANDLER( battlane_bitmap_w ) WRITE8_HANDLER( battlane_video_ctrl_w ) { - battlane_state *state = (battlane_state *)space->machine->driver_data; + battlane_state *state = space->machine->driver_data(); state->video_ctrl = data; } static TILE_GET_INFO( get_tile_info_bg ) { - battlane_state *state = (battlane_state *)machine->driver_data; + battlane_state *state = machine->driver_data(); int code = state->tileram[tile_index]; int attr = state->tileram[tile_index + 0x400]; int gfxn = (attr & 0x01) + 1; @@ -143,14 +143,14 @@ static TILEMAP_MAPPER( battlane_tilemap_scan_rows_2x2 ) VIDEO_START( battlane ) { - battlane_state *state = (battlane_state *)machine->driver_data; + battlane_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info_bg, battlane_tilemap_scan_rows_2x2, 16, 16, 32, 32); state->screen_bitmap = auto_bitmap_alloc(machine, 32 * 8, 32 * 8, BITMAP_FORMAT_INDEXED8); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - battlane_state *state = (battlane_state *)machine->driver_data; + battlane_state *state = machine->driver_data(); int offs, attr, code, color, sx, sy, flipx, flipy, dy; for (offs = 0; offs < 0x100; offs += 4) @@ -214,7 +214,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_fg_bitmap( running_machine *machine, bitmap_t *bitmap ) { - battlane_state *state = (battlane_state *)machine->driver_data; + battlane_state *state = machine->driver_data(); int x, y, data; for (y = 0; y < 32 * 8; y++) @@ -236,7 +236,7 @@ static void draw_fg_bitmap( running_machine *machine, bitmap_t *bitmap ) VIDEO_UPDATE( battlane ) { - battlane_state *state = (battlane_state *)screen->machine->driver_data; + battlane_state *state = screen->machine->driver_data(); tilemap_mark_all_tiles_dirty(state->bg_tilemap); // HACK diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 5b768ef42ef..cd2b1f58e89 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -42,19 +42,19 @@ WRITE8_HANDLER( battlex_palette_w ) WRITE8_HANDLER( battlex_scroll_x_lsb_w ) { - battlex_state *state = (battlex_state *)space->machine->driver_data; + battlex_state *state = space->machine->driver_data(); state->scroll_lsb = data; } WRITE8_HANDLER( battlex_scroll_x_msb_w ) { - battlex_state *state = (battlex_state *)space->machine->driver_data; + battlex_state *state = space->machine->driver_data(); state->scroll_msb = data; } WRITE8_HANDLER( battlex_videoram_w ) { - battlex_state *state = (battlex_state *)space->machine->driver_data; + battlex_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -74,7 +74,7 @@ WRITE8_HANDLER( battlex_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - battlex_state *state = (battlex_state *)machine->driver_data; + battlex_state *state = machine->driver_data(); int tile = state->videoram[tile_index * 2] | (((state->videoram[tile_index * 2 + 1] & 0x01)) << 8); int color = (state->videoram[tile_index * 2 + 1] & 0x0e) >> 1; @@ -83,7 +83,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( battlex ) { - battlex_state *state = (battlex_state *)machine->driver_data; + battlex_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state_save_register_global(machine, state->scroll_lsb); @@ -92,7 +92,7 @@ VIDEO_START( battlex ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - battlex_state *state = (battlex_state *)machine->driver_data; + battlex_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[1]; UINT8 *source = state->spriteram; UINT8 *finish = state->spriteram + 0x200; @@ -122,7 +122,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE(battlex) { - battlex_state *state = (battlex_state *)screen->machine->driver_data; + battlex_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll_lsb | (state->scroll_msb << 8)); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/battlnts.c b/src/mame/video/battlnts.c index f23510c5bd2..af96a522b7b 100644 --- a/src/mame/video/battlnts.c +++ b/src/mame/video/battlnts.c @@ -10,7 +10,7 @@ void battlnts_tile_callback(running_machine *machine, int layer, int bank, int *code, int *color, int *flags) { - battlnts_state *state = (battlnts_state *)machine->driver_data; + battlnts_state *state = machine->driver_data(); *code |= ((*color & 0x0f) << 9) | ((*color & 0x40) << 2); *color = state->layer_colorbase[layer]; @@ -24,7 +24,7 @@ void battlnts_tile_callback(running_machine *machine, int layer, int bank, int * void battlnts_sprite_callback(running_machine *machine, int *code,int *color) { - battlnts_state *state = (battlnts_state *)machine->driver_data; + battlnts_state *state = machine->driver_data(); *code |= ((*color & 0xc0) << 2) | state->spritebank; *code = (*code << 2) | ((*color & 0x30) >> 4); @@ -33,7 +33,7 @@ void battlnts_sprite_callback(running_machine *machine, int *code,int *color) WRITE8_HANDLER( battlnts_spritebank_w ) { - battlnts_state *state = (battlnts_state *)space->machine->driver_data; + battlnts_state *state = space->machine->driver_data(); state->spritebank = 1024 * (data & 1); } @@ -45,7 +45,7 @@ WRITE8_HANDLER( battlnts_spritebank_w ) VIDEO_UPDATE( battlnts ) { - battlnts_state *state = (battlnts_state *)screen->machine->driver_data; + battlnts_state *state = screen->machine->driver_data(); k007342_tilemap_update(state->k007342); diff --git a/src/mame/video/beathead.c b/src/mame/video/beathead.c index 6fe1d0822c0..9d9f11eac29 100644 --- a/src/mame/video/beathead.c +++ b/src/mame/video/beathead.c @@ -17,7 +17,7 @@ VIDEO_START( beathead ) { - beathead_state *state = (beathead_state *)machine->driver_data; + beathead_state *state = machine->driver_data(); state_save_register_global(machine, state->finescroll); state_save_register_global(machine, state->vram_latch_offset); state_save_register_global(machine, state->hsyncram_offset); @@ -46,7 +46,7 @@ WRITE32_HANDLER( beathead_vram_transparent_w ) WRITE32_HANDLER( beathead_vram_bulk_w ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); /* it appears that writes to this area pass in a mask for 4 words in VRAM */ /* allowing them to be filled from a preset latch */ @@ -67,7 +67,7 @@ WRITE32_HANDLER( beathead_vram_bulk_w ) WRITE32_HANDLER( beathead_vram_latch_w ) { /* latch the address */ - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); state->vram_latch_offset = (4 * offset) & 0x7ffff; } @@ -75,7 +75,7 @@ WRITE32_HANDLER( beathead_vram_latch_w ) WRITE32_HANDLER( beathead_vram_copy_w ) { /* copy from VRAM to VRAM, for 1024 bytes */ - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); offs_t dest_offset = (4 * offset) & 0x7ffff; memcpy(&space->machine->generic.videoram.u32[dest_offset / 4], &space->machine->generic.videoram.u32[state->vram_latch_offset / 4], 0x400); } @@ -90,7 +90,7 @@ WRITE32_HANDLER( beathead_vram_copy_w ) WRITE32_HANDLER( beathead_finescroll_w ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); UINT32 oldword = state->finescroll; UINT32 newword = COMBINE_DATA(&state->finescroll); @@ -129,7 +129,7 @@ WRITE32_HANDLER( beathead_palette_w ) READ32_HANDLER( beathead_hsync_ram_r ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); /* offset 0 is probably write-only */ if (offset == 0) @@ -144,7 +144,7 @@ READ32_HANDLER( beathead_hsync_ram_r ) WRITE32_HANDLER( beathead_hsync_ram_w ) { - beathead_state *state = (beathead_state *)space->machine->driver_data; + beathead_state *state = space->machine->driver_data(); /* offset 0 selects the address, and can specify the start address */ if (offset == 0) @@ -169,7 +169,7 @@ WRITE32_HANDLER( beathead_hsync_ram_w ) VIDEO_UPDATE( beathead ) { - beathead_state *state = (beathead_state *)screen->machine->driver_data; + beathead_state *state = screen->machine->driver_data(); UINT8 *videoram = screen->machine->generic.videoram.u8; int x, y; diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index d237391137e..2ed559e9d77 100644 --- a/src/mame/video/bigevglf.c +++ b/src/mame/video/bigevglf.c @@ -11,7 +11,7 @@ WRITE8_HANDLER(bigevglf_palette_w) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); int color; state->paletteram[offset] = data; @@ -21,7 +21,7 @@ WRITE8_HANDLER(bigevglf_palette_w) WRITE8_HANDLER( bigevglf_gfxcontrol_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); /* bits used: 0,1,2,3 0 and 2 select plane, @@ -33,13 +33,13 @@ WRITE8_HANDLER( bigevglf_gfxcontrol_w ) WRITE8_HANDLER( bigevglf_vidram_addr_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); state->vidram_bank = (data & 0xff) * 0x100; } WRITE8_HANDLER( bigevglf_vidram_w ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); UINT32 x, y, o; o = state->vidram_bank + offset; state->vidram[o + 0x10000 * state->plane_selected] = data; @@ -50,13 +50,13 @@ WRITE8_HANDLER( bigevglf_vidram_w ) READ8_HANDLER( bigevglf_vidram_r ) { - bigevglf_state *state = (bigevglf_state *)space->machine->driver_data; + bigevglf_state *state = space->machine->driver_data(); return state->vidram[0x10000 * state->plane_selected + state->vidram_bank + offset]; } VIDEO_START( bigevglf ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); state->tmp_bitmap[0] = machine->primary_screen->alloc_compatible_bitmap(); state->tmp_bitmap[1] = machine->primary_screen->alloc_compatible_bitmap(); @@ -74,7 +74,7 @@ VIDEO_START( bigevglf ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - bigevglf_state *state = (bigevglf_state *)machine->driver_data; + bigevglf_state *state = machine->driver_data(); int i, j; for (i = 0xc0-4; i >= 0; i-= 4) { @@ -93,7 +93,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( bigevglf ) { - bigevglf_state *state = (bigevglf_state *)screen->machine->driver_data; + bigevglf_state *state = screen->machine->driver_data(); copybitmap(bitmap, state->tmp_bitmap[state->plane_visible], 0, 0, 0, 0, cliprect); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 5db839f57fd..8639f27859b 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -16,7 +16,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta ( rest unused ) **- End of Comments -*/ - bigstrkb_state *state = (bigstrkb_state *)machine->driver_data; + bigstrkb_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[2]; UINT16 *source = state->spriteram; UINT16 *finish = source + 0x800/2; @@ -61,7 +61,7 @@ static TILEMAP_MAPPER( bsb_bg_scan ) static TILE_GET_INFO( get_bsb_tile_info ) { - bigstrkb_state *state = (bigstrkb_state *)machine->driver_data; + bigstrkb_state *state = machine->driver_data(); int tileno,col; tileno = state->videoram[tile_index] & 0x0fff; @@ -72,14 +72,14 @@ static TILE_GET_INFO( get_bsb_tile_info ) WRITE16_HANDLER( bsb_videoram_w ) { - bigstrkb_state *state = (bigstrkb_state *)space->machine->driver_data; + bigstrkb_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap,offset); } static TILE_GET_INFO( get_bsb_tile2_info ) { - bigstrkb_state *state = (bigstrkb_state *)machine->driver_data; + bigstrkb_state *state = machine->driver_data(); int tileno,col; tileno = state->videoram2[tile_index] & 0x0fff; @@ -90,7 +90,7 @@ static TILE_GET_INFO( get_bsb_tile2_info ) WRITE16_HANDLER( bsb_videoram2_w ) { - bigstrkb_state *state = (bigstrkb_state *)space->machine->driver_data; + bigstrkb_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->tilemap2,offset); } @@ -98,7 +98,7 @@ WRITE16_HANDLER( bsb_videoram2_w ) static TILE_GET_INFO( get_bsb_tile3_info ) { - bigstrkb_state *state = (bigstrkb_state *)machine->driver_data; + bigstrkb_state *state = machine->driver_data(); int tileno,col; tileno = state->videoram3[tile_index] & 0x0fff; @@ -109,7 +109,7 @@ static TILE_GET_INFO( get_bsb_tile3_info ) WRITE16_HANDLER( bsb_videoram3_w ) { - bigstrkb_state *state = (bigstrkb_state *)space->machine->driver_data; + bigstrkb_state *state = space->machine->driver_data(); state->videoram3[offset] = data; tilemap_mark_tile_dirty(state->tilemap3,offset); } @@ -118,7 +118,7 @@ WRITE16_HANDLER( bsb_videoram3_w ) VIDEO_START(bigstrkb) { - bigstrkb_state *state = (bigstrkb_state *)machine->driver_data; + bigstrkb_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_bsb_tile_info,tilemap_scan_cols, 8, 8,64,32); state->tilemap2 = tilemap_create(machine, get_bsb_tile2_info,bsb_bg_scan, 16, 16,128,64); state->tilemap3 = tilemap_create(machine, get_bsb_tile3_info,bsb_bg_scan, 16, 16,128,64); @@ -130,7 +130,7 @@ VIDEO_START(bigstrkb) VIDEO_UPDATE(bigstrkb) { - bigstrkb_state *state = (bigstrkb_state *)screen->machine->driver_data; + bigstrkb_state *state = screen->machine->driver_data(); // bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 5bfbe1b96a7..e66fc3740d7 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -35,7 +35,7 @@ static TILE_GET_INFO( get_bg_tile_info ) { - bionicc_state *state = (bionicc_state *)machine->driver_data; + bionicc_state *state = machine->driver_data(); int attr = state->bgvideoram[2 * tile_index + 1]; SET_TILE_INFO( @@ -47,7 +47,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - bionicc_state *state = (bionicc_state *)machine->driver_data; + bionicc_state *state = machine->driver_data(); int attr = state->fgvideoram[2 * tile_index + 1]; int flags; @@ -74,7 +74,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - bionicc_state *state = (bionicc_state *)machine->driver_data; + bionicc_state *state = machine->driver_data(); int attr = state->txvideoram[tile_index + 0x400]; SET_TILE_INFO( @@ -94,7 +94,7 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( bionicc ) { - bionicc_state *state = (bionicc_state *)machine->driver_data; + bionicc_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); @@ -116,7 +116,7 @@ VIDEO_START( bionicc ) WRITE16_HANDLER( bionicc_bgvideoram_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bgvideoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -124,7 +124,7 @@ WRITE16_HANDLER( bionicc_bgvideoram_w ) WRITE16_HANDLER( bionicc_fgvideoram_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fgvideoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); @@ -132,7 +132,7 @@ WRITE16_HANDLER( bionicc_fgvideoram_w ) WRITE16_HANDLER( bionicc_txvideoram_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); COMBINE_DATA(&state->txvideoram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset & 0x3ff); @@ -140,7 +140,7 @@ WRITE16_HANDLER( bionicc_txvideoram_w ) WRITE16_HANDLER( bionicc_paletteram_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); int r, g, b, bright; data = COMBINE_DATA(&state->paletteram[offset]); @@ -162,7 +162,7 @@ WRITE16_HANDLER( bionicc_paletteram_w ) WRITE16_HANDLER( bionicc_scroll_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); @@ -185,7 +185,7 @@ WRITE16_HANDLER( bionicc_scroll_w ) WRITE16_HANDLER( bionicc_gfxctrl_w ) { - bionicc_state *state = (bionicc_state *)space->machine->driver_data; + bionicc_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { @@ -210,7 +210,7 @@ WRITE16_HANDLER( bionicc_gfxctrl_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { UINT16 *buffered_spriteram = machine->generic.buffered_spriteram.u16; -// bionicc_state *state = (bionicc_state *)machine->driver_data; +// bionicc_state *state = machine->driver_data(); int offs; const gfx_element *gfx = machine->gfx[3]; @@ -248,7 +248,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( bionicc ) { - bionicc_state *state = (bionicc_state *)screen->machine->driver_data; + bionicc_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 1 | TILEMAP_DRAW_LAYER1, 0); /* nothing in FRONT */ diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c index c55339c3216..b060b090e72 100644 --- a/src/mame/video/bishi.c +++ b/src/mame/video/bishi.c @@ -15,7 +15,7 @@ void bishi_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { - bishi_state *state = (bishi_state *)machine->driver_data; + bishi_state *state = machine->driver_data(); // *code -= '0'; // *color = state->layer_colorbase[layer] | (*color>>2 & 0x0f); @@ -27,7 +27,7 @@ void bishi_tile_callback( running_machine *machine, int layer, int *code, int *c VIDEO_START( bishi ) { - bishi_state *state = (bishi_state *)machine->driver_data; + bishi_state *state = machine->driver_data(); assert(machine->primary_screen->format() == BITMAP_FORMAT_RGB32); @@ -47,7 +47,7 @@ VIDEO_START( bishi ) VIDEO_UPDATE(bishi) { - bishi_state *state = (bishi_state *)screen->machine->driver_data; + bishi_state *state = screen->machine->driver_data(); int layers[4], layerpri[4], i;/*, old;*/ /* int bg_colorbase, new_colorbase, plane, dirty; */ static const int pris[4] = { K55_PRIINP_0, K55_PRIINP_3, K55_PRIINP_6, K55_PRIINP_7 }; diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index 399a634b34f..14e149cd5ba 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -84,44 +84,44 @@ PALETTE_INIT( bking ) WRITE8_HANDLER( bking_xld1_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->xld1 = -data; } WRITE8_HANDLER( bking_yld1_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->yld1 = -data; } WRITE8_HANDLER( bking_xld2_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->xld2 = -data; } WRITE8_HANDLER( bking_yld2_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->yld2 = -data; } WRITE8_HANDLER( bking_xld3_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->xld3 = -data; } WRITE8_HANDLER( bking_yld3_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->yld3 = -data; } WRITE8_HANDLER( bking_cont1_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); /* D0 = COIN LOCK */ /* D1 = BALL 5 (Controller selection) */ @@ -142,7 +142,7 @@ WRITE8_HANDLER( bking_cont1_w ) WRITE8_HANDLER( bking_cont2_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); /* D0-D2 = BALL10 - BALL12 (Selects player 1 ball picture) */ /* D3-D5 = BALL20 - BALL22 (Selects player 2 ball picture) */ @@ -157,7 +157,7 @@ WRITE8_HANDLER( bking_cont2_w ) WRITE8_HANDLER( bking_cont3_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); /* D0 = CROW INV (inverts Crow picture and coordinates) */ /* D1-D2 = COLOR 0 - COLOR 1 (switches 4 color palettes, global across all graphics) */ @@ -178,14 +178,14 @@ WRITE8_HANDLER( bking_cont3_w ) WRITE8_HANDLER( bking_msk_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->pc3259_mask++; } WRITE8_HANDLER( bking_hitclr_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->pc3259_mask = 0; state->pc3259_output[0] = 0; @@ -197,7 +197,7 @@ WRITE8_HANDLER( bking_hitclr_w ) WRITE8_HANDLER( bking_playfield_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->playfield_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -205,26 +205,26 @@ WRITE8_HANDLER( bking_playfield_w ) READ8_HANDLER( bking_input_port_5_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return input_port_read(space->machine, state->controller ? "TRACK1_X" : "TRACK0_X"); } READ8_HANDLER( bking_input_port_6_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return input_port_read(space->machine, state->controller ? "TRACK1_Y" : "TRACK0_Y"); } READ8_HANDLER( bking_pos_r ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); return state->pc3259_output[offset / 8] << 4; } static TILE_GET_INFO( get_tile_info ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); UINT8 code0 = state->playfield_ram[2 * tile_index + 0]; UINT8 code1 = state->playfield_ram[2 * tile_index + 1]; @@ -239,7 +239,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( bking ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->tmp_bitmap1 = machine->primary_screen->alloc_compatible_bitmap(); state->tmp_bitmap2 = machine->primary_screen->alloc_compatible_bitmap(); @@ -251,7 +251,7 @@ VIDEO_START( bking ) VIDEO_UPDATE( bking ) { - buggychl_state *state = (buggychl_state *)screen->machine->driver_data; + buggychl_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -280,7 +280,7 @@ VIDEO_UPDATE( bking ) VIDEO_EOF( bking ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); static const rectangle rect = { 0, 7, 0, 15 }; int xld = 0; diff --git a/src/mame/video/bladestl.c b/src/mame/video/bladestl.c index 41d1e646b59..e5e87351c55 100644 --- a/src/mame/video/bladestl.c +++ b/src/mame/video/bladestl.c @@ -25,7 +25,7 @@ PALETTE_INIT( bladestl ) static void set_pens( running_machine *machine ) { - bladestl_state *state = (bladestl_state *)machine->driver_data; + bladestl_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x60; i += 2) @@ -48,7 +48,7 @@ static void set_pens( running_machine *machine ) void bladestl_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags ) { - bladestl_state *state = (bladestl_state *)machine->driver_data; + bladestl_state *state = machine->driver_data(); *code |= ((*color & 0x0f) << 8) | ((*color & 0x40) << 6); *color = state->layer_colorbase[layer]; @@ -62,7 +62,7 @@ void bladestl_tile_callback( running_machine *machine, int layer, int bank, int void bladestl_sprite_callback( running_machine *machine, int *code,int *color ) { - bladestl_state *state = (bladestl_state *)machine->driver_data; + bladestl_state *state = machine->driver_data(); *code |= ((*color & 0xc0) << 2) + state->spritebank; *code = (*code << 2) | ((*color & 0x30) >> 4); @@ -78,7 +78,7 @@ void bladestl_sprite_callback( running_machine *machine, int *code,int *color ) VIDEO_UPDATE( bladestl ) { - bladestl_state *state = (bladestl_state *)screen->machine->driver_data; + bladestl_state *state = screen->machine->driver_data(); set_pens(screen->machine); k007342_tilemap_update(state->k007342); diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index feb31cfbe9d..8a0790323e7 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -26,7 +26,7 @@ static TILEMAP_MAPPER( bg4x8_scan ) static TILE_GET_INFO( get_bg_tile_info ) { - blktiger_state *state = (blktiger_state *)machine->driver_data; + blktiger_state *state = machine->driver_data(); /* the tile priority table is a guess compiled by looking at the game. It was not derived from a PROM so it could be wrong. */ static const UINT8 split_table[16] = @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - blktiger_state *state = (blktiger_state *)machine->driver_data; + blktiger_state *state = machine->driver_data(); UINT8 attr = state->txvideoram[tile_index + 0x400]; SET_TILE_INFO( 0, @@ -66,7 +66,7 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( blktiger ) { - blktiger_state *state = (blktiger_state *)machine->driver_data; + blktiger_state *state = machine->driver_data(); state->scroll_ram = auto_alloc_array(machine, UINT8, BGRAM_BANK_SIZE * BGRAM_BANKS); @@ -98,20 +98,20 @@ VIDEO_START( blktiger ) WRITE8_HANDLER( blktiger_txvideoram_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); state->txvideoram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap,offset & 0x3ff); } READ8_HANDLER( blktiger_bgvideoram_r ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); return state->scroll_ram[offset + state->scroll_bank]; } WRITE8_HANDLER( blktiger_bgvideoram_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); offset += state->scroll_bank; state->scroll_ram[offset] = data; @@ -121,14 +121,14 @@ WRITE8_HANDLER( blktiger_bgvideoram_w ) WRITE8_HANDLER( blktiger_bgvideoram_bank_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); state->scroll_bank = (data % BGRAM_BANKS) * BGRAM_BANK_SIZE; } WRITE8_HANDLER( blktiger_scrolly_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); int scrolly; state->scroll_y[offset] = data; @@ -139,7 +139,7 @@ WRITE8_HANDLER( blktiger_scrolly_w ) WRITE8_HANDLER( blktiger_scrollx_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); int scrollx; state->scroll_x[offset] = data; @@ -151,7 +151,7 @@ WRITE8_HANDLER( blktiger_scrollx_w ) WRITE8_HANDLER( blktiger_video_control_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); /* bits 0 and 1 are coin counters */ coin_counter_w(space->machine, 0,data & 1); coin_counter_w(space->machine, 1,data & 2); @@ -168,7 +168,7 @@ WRITE8_HANDLER( blktiger_video_control_w ) WRITE8_HANDLER( blktiger_video_enable_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); /* not sure which is which, but I think that bit 1 and 2 enable background and sprites */ /* bit 1 enables bg ? */ @@ -180,7 +180,7 @@ WRITE8_HANDLER( blktiger_video_enable_w ) WRITE8_HANDLER( blktiger_screen_layout_w ) { - blktiger_state *state = (blktiger_state *)space->machine->driver_data; + blktiger_state *state = space->machine->driver_data(); state->screen_layout = data; tilemap_set_enable(state->bg_tilemap8x4, state->screen_layout); tilemap_set_enable(state->bg_tilemap4x8, !state->screen_layout); @@ -196,7 +196,7 @@ WRITE8_HANDLER( blktiger_screen_layout_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { -// blktiger_state *state = (blktiger_state *)machine->driver_data; +// blktiger_state *state = machine->driver_data(); UINT8 *buffered_spriteram = machine->generic.buffered_spriteram.u8; int offs; @@ -227,7 +227,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( blktiger ) { - blktiger_state *state = (blktiger_state *)screen->machine->driver_data; + blktiger_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 1023); diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index 6a9459c9ce7..f923dd10d8e 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -44,7 +44,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: WRITE16_HANDLER( blmbycar_palette_w ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->paletteram[offset]); palette_set_color_rgb( space->machine, offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8)); @@ -73,7 +73,7 @@ WRITE16_HANDLER( blmbycar_palette_w ) static TILE_GET_INFO( get_tile_info_0 ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); UINT16 code = state->vram_0[tile_index * 2 + 0]; UINT16 attr = state->vram_0[tile_index * 2 + 1]; SET_TILE_INFO( @@ -87,7 +87,7 @@ static TILE_GET_INFO( get_tile_info_0 ) static TILE_GET_INFO( get_tile_info_1 ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); UINT16 code = state->vram_1[tile_index * 2 + 0]; UINT16 attr = state->vram_1[tile_index * 2 + 1]; SET_TILE_INFO( @@ -102,14 +102,14 @@ static TILE_GET_INFO( get_tile_info_1 ) WRITE16_HANDLER( blmbycar_vram_0_w ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_0[offset]); tilemap_mark_tile_dirty(state->tilemap_0, offset / 2); } WRITE16_HANDLER( blmbycar_vram_1_w ) { - blmbycar_state *state = (blmbycar_state *)space->machine->driver_data; + blmbycar_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_1[offset]); tilemap_mark_tile_dirty(state->tilemap_1, offset / 2); } @@ -125,7 +125,7 @@ WRITE16_HANDLER( blmbycar_vram_1_w ) VIDEO_START( blmbycar ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); state->tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 16, 16, DIM_NX, DIM_NY ); state->tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 16, 16, DIM_NX, DIM_NY ); @@ -167,7 +167,7 @@ VIDEO_START( blmbycar ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - blmbycar_state *state = (blmbycar_state *)machine->driver_data; + blmbycar_state *state = machine->driver_data(); UINT16 *source, *finish; source = state->spriteram + 0x6 / 2; // ! @@ -221,7 +221,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( blmbycar ) { - blmbycar_state *state = (blmbycar_state *)screen->machine->driver_data; + blmbycar_state *state = screen->machine->driver_data(); int i, layers_ctrl = -1; tilemap_set_scrolly(state->tilemap_0, 0, state->scroll_0[0]); diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index a975c251844..b39e99aac36 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -3,7 +3,7 @@ WRITE8_HANDLER( blockade_videoram_w ) { - blockade_state *state = (blockade_state *)space->machine->driver_data; + blockade_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -16,7 +16,7 @@ WRITE8_HANDLER( blockade_videoram_w ) static TILE_GET_INFO( get_bg_tile_info ) { - blockade_state *state = (blockade_state *)machine->driver_data; + blockade_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO(0, code, 0, 0); @@ -24,13 +24,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( blockade ) { - blockade_state *state = (blockade_state *)machine->driver_data; + blockade_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } VIDEO_UPDATE( blockade ) { - blockade_state *state = (blockade_state *)screen->machine->driver_data; + blockade_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c index 122bde2cb31..26040a17c70 100644 --- a/src/mame/video/blockhl.c +++ b/src/mame/video/blockhl.c @@ -11,7 +11,7 @@ void blockhl_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - blockhl_state *state = (blockhl_state *)machine->driver_data; + blockhl_state *state = machine->driver_data(); *code |= ((*color & 0x0f) << 8); *color = state->layer_colorbase[layer] + ((*color & 0xe0) >> 5); } @@ -24,7 +24,7 @@ void blockhl_tile_callback( running_machine *machine, int layer, int bank, int * void blockhl_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - blockhl_state *state = (blockhl_state *)machine->driver_data; + blockhl_state *state = machine->driver_data(); if(*color & 0x10) *priority = 0xfe; // under K052109_tilemap[0] @@ -43,7 +43,7 @@ void blockhl_sprite_callback( running_machine *machine, int *code, int *color, i VIDEO_START( blockhl ) { - blockhl_state *state = (blockhl_state *)machine->driver_data; + blockhl_state *state = machine->driver_data(); machine->generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x800); @@ -57,7 +57,7 @@ VIDEO_START( blockhl ) VIDEO_UPDATE( blockhl ) { - blockhl_state *state = (blockhl_state *)screen->machine->driver_data; + blockhl_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c index eeef6a534e1..b2d6fbd2508 100644 --- a/src/mame/video/blockout.c +++ b/src/mame/video/blockout.c @@ -40,7 +40,7 @@ static void setcolor( running_machine *machine, int color, int rgb ) WRITE16_HANDLER( blockout_paletteram_w ) { - blockout_state *state = (blockout_state *)space->machine->driver_data; + blockout_state *state = space->machine->driver_data(); COMBINE_DATA(&state->paletteram[offset]); setcolor(space->machine, offset, state->paletteram[offset]); @@ -48,7 +48,7 @@ WRITE16_HANDLER( blockout_paletteram_w ) WRITE16_HANDLER( blockout_frontcolor_w ) { - blockout_state *state = (blockout_state *)space->machine->driver_data; + blockout_state *state = space->machine->driver_data(); COMBINE_DATA(&state->color); setcolor(space->machine, 512, state->color); @@ -63,7 +63,7 @@ WRITE16_HANDLER( blockout_frontcolor_w ) ***************************************************************************/ VIDEO_START( blockout ) { - blockout_state *state = (blockout_state *)machine->driver_data; + blockout_state *state = machine->driver_data(); /* Allocate temporary bitmaps */ state->tmpbitmap = machine->primary_screen->alloc_compatible_bitmap(); @@ -72,7 +72,7 @@ VIDEO_START( blockout ) static void update_pixels( running_machine *machine, int x, int y ) { - blockout_state *state = (blockout_state *)machine->driver_data; + blockout_state *state = machine->driver_data(); UINT16 front, back; int color; const rectangle &visarea = machine->primary_screen->visible_area(); @@ -102,7 +102,7 @@ static void update_pixels( running_machine *machine, int x, int y ) WRITE16_HANDLER( blockout_videoram_w ) { - blockout_state *state = (blockout_state *)space->machine->driver_data; + blockout_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); update_pixels(space->machine, (offset % 256) * 2, (offset / 256) % 256); @@ -112,7 +112,7 @@ WRITE16_HANDLER( blockout_videoram_w ) VIDEO_UPDATE( blockout ) { - blockout_state *state = (blockout_state *)screen->machine->driver_data; + blockout_state *state = screen->machine->driver_data(); int x, y; pen_t color = 512; diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c index d6428a5e14d..b3bda386389 100644 --- a/src/mame/video/blstroid.c +++ b/src/mame/video/blstroid.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - blstroid_state *state = (blstroid_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + blstroid_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = data & 0x1fff; int color = (data >> 13) & 0x07; SET_TILE_INFO(0, code, color, 0); @@ -71,10 +71,10 @@ VIDEO_START( blstroid ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - blstroid_state *state = (blstroid_state *)machine->driver_data; + blstroid_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -107,12 +107,12 @@ static TIMER_CALLBACK( irq_on ) void blstroid_scanline_update(screen_device &screen, int scanline) { - blstroid_state *state = (blstroid_state *)screen.machine->driver_data; + blstroid_state *state = screen.machine->driver_data(); int offset = (scanline / 8) * 64 + 40; /* check for interrupts */ if (offset < 0x1000) - if (state->atarigen.playfield[offset] & 0x8000) + if (state->playfield[offset] & 0x8000) { int width, vpos; attotime period_on; @@ -145,13 +145,13 @@ void blstroid_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( blstroid ) { - blstroid_state *state = (blstroid_state *)screen->machine->driver_data; + blstroid_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c index d927788c70c..418582b248c 100644 --- a/src/mame/video/blueprnt.c +++ b/src/mame/video/blueprnt.c @@ -48,7 +48,7 @@ PALETTE_INIT( blueprnt ) WRITE8_HANDLER( blueprnt_videoram_w ) { - blueprnt_state *state = (blueprnt_state *)space->machine->driver_data; + blueprnt_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -56,7 +56,7 @@ WRITE8_HANDLER( blueprnt_videoram_w ) WRITE8_HANDLER( blueprnt_colorram_w ) { - blueprnt_state *state = (blueprnt_state *)space->machine->driver_data; + blueprnt_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -64,7 +64,7 @@ WRITE8_HANDLER( blueprnt_colorram_w ) WRITE8_HANDLER( blueprnt_flipscreen_w ) { - blueprnt_state *state = (blueprnt_state *)space->machine->driver_data; + blueprnt_state *state = space->machine->driver_data(); flip_screen_set(space->machine, ~data & 0x02); @@ -77,7 +77,7 @@ WRITE8_HANDLER( blueprnt_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - blueprnt_state *state = (blueprnt_state *)machine->driver_data; + blueprnt_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + 256 * state->gfx_bank; int color = attr & 0x7f; @@ -89,7 +89,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( blueprnt ) { - blueprnt_state *state = (blueprnt_state *)machine->driver_data; + blueprnt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 8, 8, 32, 32); tilemap_set_transparent_pen(state->bg_tilemap, 0); @@ -100,7 +100,7 @@ VIDEO_START( blueprnt ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - blueprnt_state *state = (blueprnt_state *)machine->driver_data; + blueprnt_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -126,7 +126,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( blueprnt ) { - blueprnt_state *state = (blueprnt_state *)screen->machine->driver_data; + blueprnt_state *state = screen->machine->driver_data(); int i; if (flip_screen_get(screen->machine)) diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index c2ca4ee3824..effedffa24e 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -37,7 +37,7 @@ PALETTE_INIT( bogeyman ) WRITE8_HANDLER( bogeyman_videoram_w ) { - bogeyman_state *state = (bogeyman_state *)space->machine->driver_data; + bogeyman_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -45,7 +45,7 @@ WRITE8_HANDLER( bogeyman_videoram_w ) WRITE8_HANDLER( bogeyman_colorram_w ) { - bogeyman_state *state = (bogeyman_state *)space->machine->driver_data; + bogeyman_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -53,7 +53,7 @@ WRITE8_HANDLER( bogeyman_colorram_w ) WRITE8_HANDLER( bogeyman_videoram2_w ) { - bogeyman_state *state = (bogeyman_state *)space->machine->driver_data; + bogeyman_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -61,7 +61,7 @@ WRITE8_HANDLER( bogeyman_videoram2_w ) WRITE8_HANDLER( bogeyman_colorram2_w ) { - bogeyman_state *state = (bogeyman_state *)space->machine->driver_data; + bogeyman_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -75,7 +75,7 @@ WRITE8_HANDLER( bogeyman_paletteram_w ) static TILE_GET_INFO( get_bg_tile_info ) { - bogeyman_state *state = (bogeyman_state *)machine->driver_data; + bogeyman_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int gfxbank = ((((attr & 0x01) << 8) + state->videoram[tile_index]) / 0x80) + 3; int code = state->videoram[tile_index] & 0x7f; @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - bogeyman_state *state = (bogeyman_state *)machine->driver_data; + bogeyman_state *state = machine->driver_data(); int attr = state->colorram2[tile_index]; int tile = state->videoram2[tile_index] | ((attr & 0x03) << 8); int gfxbank = tile / 0x200; @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( bogeyman ) { - bogeyman_state *state = (bogeyman_state *)machine->driver_data; + bogeyman_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -106,7 +106,7 @@ VIDEO_START( bogeyman ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - bogeyman_state *state = (bogeyman_state *)machine->driver_data; + bogeyman_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -153,7 +153,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( bogeyman ) { - bogeyman_state *state = (bogeyman_state *)screen->machine->driver_data; + bogeyman_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index acc37119ee2..2ea79aaf6c5 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -11,21 +11,21 @@ WRITE8_HANDLER( bombjack_videoram_w ) { - bombjack_state *state = (bombjack_state *)space->machine->driver_data; + bombjack_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( bombjack_colorram_w ) { - bombjack_state *state = (bombjack_state *)space->machine->driver_data; + bombjack_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( bombjack_background_w ) { - bombjack_state *state = (bombjack_state *)space->machine->driver_data; + bombjack_state *state = space->machine->driver_data(); if (state->background_image != data) { @@ -45,7 +45,7 @@ WRITE8_HANDLER( bombjack_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); UINT8 *tilerom = memory_region(machine, "gfx4"); int offs = (state->background_image & 0x07) * 0x200 + tile_index; @@ -59,7 +59,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); int code = state->videoram[tile_index] + 16 * (state->colorram[tile_index] & 0x10); int color = state->colorram[tile_index] & 0x0f; @@ -68,7 +68,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( bombjack ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -77,7 +77,7 @@ VIDEO_START( bombjack ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - bombjack_state *state = (bombjack_state *)machine->driver_data; + bombjack_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_size - 4; offs >= 0; offs -= 4) @@ -135,7 +135,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( bombjack ) { - bombjack_state *state = (bombjack_state *)screen->machine->driver_data; + bombjack_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c index 4e1ad358b8d..443f80becaa 100644 --- a/src/mame/video/boogwing.c +++ b/src/mame/video/boogwing.c @@ -4,7 +4,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT16* spriteram_base, int gfx_region ) { - boogwing_state *state = (boogwing_state *)machine->driver_data; + boogwing_state *state = machine->driver_data(); int offs; int flipscreen = !flip_screen_get(machine); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); @@ -139,7 +139,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( boogwing ) { - boogwing_state *state = (boogwing_state *)screen->machine->driver_data; + boogwing_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index 8a3c8a65d09..8cf6d83dc6f 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -93,7 +93,7 @@ static TILEMAP_MAPPER( fg_tilemap_scan ) INLINE void get_tile_info(running_machine *machine,tile_data *tileinfo,int tile_index,int ram_offs) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 attr = state->videoram[ram_offs + tile_index + 0x800]; tileinfo->category = (attr & 0x20) >> 5; @@ -125,7 +125,7 @@ static TILE_GET_INFO( fg_get_tile_info ) VIDEO_START( bosco ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); state->bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan_rows,8,8,32,32); state->fg_tilemap = tilemap_create(machine, fg_get_tile_info,fg_tilemap_scan, 8,8, 8,32); @@ -156,7 +156,7 @@ VIDEO_START( bosco ) WRITE8_HANDLER( bosco_videoram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->videoram[offset] = data; if (offset & 0x400) @@ -167,14 +167,14 @@ WRITE8_HANDLER( bosco_videoram_w ) WRITE8_HANDLER( bosco_scrollx_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); tilemap_set_scrollx(state->bg_tilemap,0,data); } WRITE8_HANDLER( bosco_scrolly_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); tilemap_set_scrolly(state->bg_tilemap,0,data); } @@ -217,7 +217,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void draw_bullets(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); int offs; for (offs = 4; offs < 0x10;offs++) @@ -239,7 +239,7 @@ static void draw_bullets(running_machine *machine, bitmap_t *bitmap, const recta static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int flip) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); if (1) { @@ -275,7 +275,7 @@ static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectang VIDEO_UPDATE( bosco ) { - _galaga_state *state = (_galaga_state *) screen->machine->driver_data; + _galaga_state *state = screen->machine->driver_data<_galaga_state>(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across the screen, and clip it to only the position where it is supposed to be shown */ @@ -312,7 +312,7 @@ VIDEO_UPDATE( bosco ) VIDEO_EOF( bosco ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); static const int speedsx[8] = { -1, -2, -3, 0, 3, 2, 1, 0 }; static const int speedsy[8] = { 0, -1, -2, -3, 0, 3, 2, 1 }; diff --git a/src/mame/video/bottom9.c b/src/mame/video/bottom9.c index f4115b07d48..6c4d797afb0 100644 --- a/src/mame/video/bottom9.c +++ b/src/mame/video/bottom9.c @@ -11,7 +11,7 @@ void bottom9_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - bottom9_state *state = (bottom9_state *)machine->driver_data; + bottom9_state *state = machine->driver_data(); *code |= (*color & 0x3f) << 8; *color = state->layer_colorbase[layer] + ((*color & 0xc0) >> 6); } @@ -27,7 +27,7 @@ void bottom9_sprite_callback( running_machine *machine, int *code, int *color, i { /* bit 4 = priority over zoom (0 = have priority) */ /* bit 5 = priority over B (1 = have priority) */ - bottom9_state *state = (bottom9_state *)machine->driver_data; + bottom9_state *state = machine->driver_data(); *priority = (*color & 0x30) >> 4; *color = state->sprite_colorbase + (*color & 0x0f); } @@ -41,7 +41,7 @@ void bottom9_sprite_callback( running_machine *machine, int *code, int *color, i void bottom9_zoom_callback( running_machine *machine, int *code, int *color, int *flags ) { - bottom9_state *state = (bottom9_state *)machine->driver_data; + bottom9_state *state = machine->driver_data(); *flags = (*color & 0x40) ? TILE_FLIPX : 0; *code |= ((*color & 0x03) << 8); *color = state->zoom_colorbase + ((*color & 0x3c) >> 2); @@ -56,7 +56,7 @@ void bottom9_zoom_callback( running_machine *machine, int *code, int *color, int VIDEO_START( bottom9 ) { - bottom9_state *state = (bottom9_state *)machine->driver_data; + bottom9_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; /* not used */ state->layer_colorbase[1] = 0; @@ -75,7 +75,7 @@ VIDEO_START( bottom9 ) VIDEO_UPDATE( bottom9 ) { - bottom9_state *state = (bottom9_state *)screen->machine->driver_data; + bottom9_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index e63cf513dd8..d4a1ea345a4 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -72,7 +72,7 @@ PALETTE_INIT( brkthru ) static TILE_GET_INFO( get_bg_tile_info ) { - brkthru_state *state = (brkthru_state *)machine->driver_data; + brkthru_state *state = machine->driver_data(); /* BG RAM format 0 1 ---- -c-- ---- ---- = Color @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info ) WRITE8_HANDLER( brkthru_bgram_w ) { - brkthru_state *state = (brkthru_state *)space->machine->driver_data; + brkthru_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -97,14 +97,14 @@ WRITE8_HANDLER( brkthru_bgram_w ) static TILE_GET_INFO( get_fg_tile_info ) { - brkthru_state *state = (brkthru_state *)machine->driver_data; + brkthru_state *state = machine->driver_data(); UINT8 code = state->fg_videoram[tile_index]; SET_TILE_INFO(0, code, 0, 0); } WRITE8_HANDLER( brkthru_fgram_w ) { - brkthru_state *state = (brkthru_state *)space->machine->driver_data; + brkthru_state *state = space->machine->driver_data(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -112,7 +112,7 @@ WRITE8_HANDLER( brkthru_fgram_w ) VIDEO_START( brkthru ) { - brkthru_state *state = (brkthru_state *)machine->driver_data; + brkthru_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 16); @@ -124,7 +124,7 @@ VIDEO_START( brkthru ) WRITE8_HANDLER( brkthru_1800_w ) { - brkthru_state *state = (brkthru_state *)space->machine->driver_data; + brkthru_state *state = space->machine->driver_data(); if (offset == 0) /* low 8 bits of scroll */ state->bgscroll = (state->bgscroll & 0x100) | data; @@ -168,7 +168,7 @@ static void show_register( bitmap_t *bitmap, int x, int y, UINT32 data ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int prio ) { - brkthru_state *state = (brkthru_state *)machine->driver_data; + brkthru_state *state = machine->driver_data(); int offs; /* Draw the sprites. Note that it is important to draw them exactly in this */ /* order, to have the correct priorities. */ @@ -252,7 +252,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( brkthru ) { - brkthru_state *state = (brkthru_state *)screen->machine->driver_data; + brkthru_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->bgscroll); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index d6ccf9798aa..96c5ff5f850 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -10,7 +10,7 @@ WRITE8_HANDLER( bsktball_videoram_w ) { - bsktball_state *state = (bsktball_state *)space->machine->driver_data; + bsktball_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -18,7 +18,7 @@ WRITE8_HANDLER( bsktball_videoram_w ) static TILE_GET_INFO( get_bg_tile_info ) { - bsktball_state *state = (bsktball_state *)machine->driver_data; + bsktball_state *state = machine->driver_data(); int attr = state->videoram[tile_index]; int code = ((attr & 0x0f) << 2) | ((attr & 0x30) >> 4); int color = (attr & 0x40) >> 6; @@ -29,13 +29,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( bsktball ) { - bsktball_state *state = (bsktball_state *)machine->driver_data; + bsktball_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - bsktball_state *state = (bsktball_state *)machine->driver_data; + bsktball_state *state = machine->driver_data(); int mot; for (mot = 0; mot < 16; mot++) @@ -55,7 +55,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rec VIDEO_UPDATE( bsktball ) { - bsktball_state *state = (bsktball_state *)screen->machine->driver_data; + bsktball_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index bbbbefb09fd..a3aab75c4f0 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -114,7 +114,7 @@ Start the video hardware emulation. VIDEO_START( btime ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); if (machine->gfx[0]->srcdata == NULL) gfx_element_set_source(machine->gfx[0], state->deco_charram); @@ -125,7 +125,7 @@ VIDEO_START( btime ) VIDEO_START( bnj ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); /* the background area is twice as wide as the screen */ int width = 256; int height = 256; @@ -146,14 +146,14 @@ WRITE8_HANDLER( btime_paletteram_w ) WRITE8_HANDLER( lnc_videoram_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); state->videoram[offset] = data; state->colorram[offset] = *state->lnc_charbank; } READ8_HANDLER( btime_mirrorvideoram_r ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); int x, y; /* swap x and y coordinates */ @@ -166,7 +166,7 @@ READ8_HANDLER( btime_mirrorvideoram_r ) READ8_HANDLER( btime_mirrorcolorram_r ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); int x, y; /* swap x and y coordinates */ @@ -179,7 +179,7 @@ READ8_HANDLER( btime_mirrorcolorram_r ) WRITE8_HANDLER( btime_mirrorvideoram_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); int x, y; /* swap x and y coordinates */ @@ -204,7 +204,7 @@ WRITE8_HANDLER( lnc_mirrorvideoram_w ) WRITE8_HANDLER( btime_mirrorcolorram_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); int x, y; /* swap x and y coordinates */ @@ -217,7 +217,7 @@ WRITE8_HANDLER( btime_mirrorcolorram_w ) WRITE8_HANDLER( deco_charram_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); if (state->deco_charram[offset] == data) return; @@ -234,19 +234,19 @@ WRITE8_HANDLER( deco_charram_w ) WRITE8_HANDLER( bnj_background_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); state->bnj_backgroundram[offset] = data; } WRITE8_HANDLER( bnj_scroll1_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); state->bnj_scroll1 = data; } WRITE8_HANDLER( bnj_scroll2_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); state->bnj_scroll2 = data; } @@ -278,7 +278,7 @@ WRITE8_HANDLER( bnj_video_control_w ) WRITE8_HANDLER( zoar_video_control_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); // Zoar video control // // Bit 0-2 = Unknown (always 0). Marked as MCOL on schematics @@ -293,7 +293,7 @@ WRITE8_HANDLER( zoar_video_control_w ) WRITE8_HANDLER( disco_video_control_w ) { - btime_state *state = (btime_state *)space->machine->driver_data; + btime_state *state = space->machine->driver_data(); state->btime_palette = (data >> 2) & 0x03; if (!(input_port_read(space->machine, "DSW1") & 0x40)) /* cocktail mode */ @@ -303,7 +303,7 @@ WRITE8_HANDLER( disco_video_control_w ) static void draw_chars( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 transparency, UINT8 color, int priority ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -384,7 +384,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8* tmap, UINT8 color ) { - btime_state *state = (btime_state *)machine->driver_data; + btime_state *state = machine->driver_data(); int i; const UINT8 *gfx = memory_region(machine, "bg_map"); int scroll = -(state->bnj_scroll2 | ((state->bnj_scroll1 & 0x03) << 8)); @@ -424,7 +424,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r VIDEO_UPDATE( btime ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); if (state->bnj_scroll1 & 0x10) { int i, start; @@ -455,7 +455,7 @@ VIDEO_UPDATE( btime ) VIDEO_UPDATE( eggs ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); draw_chars(screen->machine, bitmap, cliprect, FALSE, 0, -1); draw_sprites(screen->machine, bitmap, cliprect, 0, 0, 0, state->videoram, 0x20); @@ -465,7 +465,7 @@ VIDEO_UPDATE( eggs ) VIDEO_UPDATE( lnc ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); draw_chars(screen->machine, bitmap, cliprect, FALSE, 0, -1); draw_sprites(screen->machine, bitmap, cliprect, 0, 1, 2, state->videoram, 0x20); @@ -475,7 +475,7 @@ VIDEO_UPDATE( lnc ) VIDEO_UPDATE( zoar ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); if (state->bnj_scroll1 & 0x04) { draw_background(screen->machine, bitmap, cliprect, state->zoar_scrollram, state->btime_palette); @@ -494,7 +494,7 @@ VIDEO_UPDATE( zoar ) VIDEO_UPDATE( bnj ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); if (state->bnj_scroll1) { int scroll, offs; @@ -544,7 +544,7 @@ VIDEO_UPDATE( bnj ) VIDEO_UPDATE( cookrace ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); int offs; for (offs = state->bnj_backgroundram_size - 1; offs >=0; offs--) @@ -576,7 +576,7 @@ VIDEO_UPDATE( cookrace ) VIDEO_UPDATE( disco ) { - btime_state *state = (btime_state *)screen->machine->driver_data; + btime_state *state = screen->machine->driver_data(); draw_chars(screen->machine, bitmap, cliprect, FALSE, state->btime_palette, -1); draw_sprites(screen->machine, bitmap, cliprect, state->btime_palette, 0, 0, state->spriteram, 1); diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c index da704b4aac5..3acc1097929 100644 --- a/src/mame/video/bublbobl.c +++ b/src/mame/video/bublbobl.c @@ -12,7 +12,7 @@ VIDEO_UPDATE( bublbobl ) { - bublbobl_state *state = (bublbobl_state *)screen->machine->driver_data; + bublbobl_state *state = screen->machine->driver_data(); int offs; int sx, sy, xc, yc; int gfx_num, gfx_attr, gfx_offs; diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index a030641ecee..13c163e5b86 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -14,7 +14,7 @@ PALETTE_INIT( buggychl ) VIDEO_START( buggychl ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->tmp_bitmap1 = machine->primary_screen->alloc_compatible_bitmap(); state->tmp_bitmap2 = machine->primary_screen->alloc_compatible_bitmap(); @@ -28,7 +28,7 @@ VIDEO_START( buggychl ) WRITE8_HANDLER( buggychl_chargen_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); if (state->charram[offset] != data) { state->charram[offset] = data; @@ -38,19 +38,19 @@ WRITE8_HANDLER( buggychl_chargen_w ) WRITE8_HANDLER( buggychl_sprite_lookup_bank_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sl_bank = (data & 0x10) << 8; } WRITE8_HANDLER( buggychl_sprite_lookup_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->sprite_lookup[offset + state->sl_bank] = data; } WRITE8_HANDLER( buggychl_ctrl_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); /* bit7 = lamp bit6 = lockout @@ -75,7 +75,7 @@ WRITE8_HANDLER( buggychl_ctrl_w ) WRITE8_HANDLER( buggychl_bg_scrollx_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->bg_scrollx = -(data - 0x12); } @@ -92,7 +92,7 @@ static void draw_sky( bitmap_t *bitmap, const rectangle *cliprect ) static void draw_bg( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int offs; int scroll[256]; @@ -136,7 +136,7 @@ static void draw_bg( running_machine *machine, bitmap_t *bitmap, const rectangle static void draw_fg( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int offs; for (offs = 0; offs < 0x400; offs++) @@ -165,7 +165,7 @@ static void draw_fg( running_machine *machine, bitmap_t *bitmap, const rectangle static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; const UINT8 *gfx; @@ -238,7 +238,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( buggychl ) { - buggychl_state *state = (buggychl_state *)screen->machine->driver_data; + buggychl_state *state = screen->machine->driver_data(); if (state->sky_on) draw_sky(bitmap, cliprect); diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 9fccd1cf99d..0dc9764a9f4 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -62,7 +62,7 @@ WRITE8_HANDLER( bwing_spriteram_w ) WRITE8_HANDLER( bwing_videoram_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->charmap, offset); } @@ -70,7 +70,7 @@ WRITE8_HANDLER( bwing_videoram_w ) READ8_HANDLER ( bwing_scrollram_r ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); int offs; if (!state->srbank) @@ -84,7 +84,7 @@ READ8_HANDLER ( bwing_scrollram_r ) WRITE8_HANDLER( bwing_scrollram_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); int offs; if (!state->srbank) @@ -110,7 +110,7 @@ WRITE8_HANDLER( bwing_scrollram_w ) WRITE8_HANDLER( bwing_scrollreg_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); state->sreg[offset] = data; switch (offset) @@ -136,7 +136,7 @@ WRITE8_HANDLER( bwing_scrollreg_w ) WRITE8_HANDLER( bwing_paletteram_w ) { - bwing_state *state = (bwing_state *)space->machine->driver_data; + bwing_state *state = space->machine->driver_data(); static const float rgb[4][3] = { {0.85f, 0.95f, 1.00f}, {0.90f, 1.00f, 1.00f}, @@ -177,21 +177,21 @@ WRITE8_HANDLER( bwing_paletteram_w ) static TILE_GET_INFO( get_fgtileinfo ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); tileinfo->pen_data = gfx_element_get_data(machine->gfx[2], state->fgdata[tile_index] & (BW_NTILES - 1)); tileinfo->palette_base = machine->gfx[2]->color_base + ((state->fgdata[tile_index] >> 7) << 3); } static TILE_GET_INFO( get_bgtileinfo ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); tileinfo->pen_data = gfx_element_get_data(machine->gfx[3], state->bgdata[tile_index] & (BW_NTILES - 1)); tileinfo->palette_base = machine->gfx[3]->color_base + ((state->bgdata[tile_index] >> 7) << 3); } static TILE_GET_INFO( get_charinfo ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); SET_TILE_INFO(0, state->videoram[tile_index], 0, 0); } @@ -203,7 +203,7 @@ static TILEMAP_MAPPER( bwing_scan_cols ) VIDEO_START( bwing ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); UINT32 *dwptr; int i; @@ -248,7 +248,7 @@ VIDEO_START( bwing ) static void draw_sprites( running_machine *machine, bitmap_t *bmp, const rectangle *clip, UINT8 *ram, int pri ) { - bwing_state *state = (bwing_state *)machine->driver_data; + bwing_state *state = machine->driver_data(); int attrib, fx, fy, code, x, y, color, i; gfx_element *gfx = machine->gfx[1]; @@ -290,7 +290,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bmp, const rectang VIDEO_UPDATE( bwing ) { - bwing_state *state = (bwing_state *)screen->machine->driver_data; + bwing_state *state = screen->machine->driver_data(); unsigned x, y, shiftx; if (state->mapmask & 0x20) diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index 1d22e6660ca..3af140c46bc 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -11,7 +11,7 @@ static TILE_GET_INFO( get_back_tile_info ) { - cabal_state *state = (cabal_state *)machine->driver_data; + cabal_state *state = machine->driver_data(); int tile = state->videoram[tile_index]; int color = (tile>>12)&0xf; @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_back_tile_info ) static TILE_GET_INFO( get_text_tile_info ) { - cabal_state *state = (cabal_state *)machine->driver_data; + cabal_state *state = machine->driver_data(); int tile = state->colorram[tile_index]; int color = (tile>>10); @@ -44,7 +44,7 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( cabal ) { - cabal_state *state = (cabal_state *)machine->driver_data; + cabal_state *state = machine->driver_data(); state->background_layer = tilemap_create(machine, get_back_tile_info,tilemap_scan_rows,16,16,16,16); state->text_layer = tilemap_create(machine, get_text_tile_info,tilemap_scan_rows, 8,8,32,32); @@ -60,7 +60,7 @@ WRITE16_HANDLER( cabal_flipscreen_w ) { if (ACCESSING_BITS_0_7) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); int flip = (data & 0x20) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; tilemap_set_flip(state->background_layer,flip); tilemap_set_flip(state->text_layer,flip); @@ -71,14 +71,14 @@ WRITE16_HANDLER( cabal_flipscreen_w ) WRITE16_HANDLER( cabal_background_videoram16_w ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->background_layer,offset); } WRITE16_HANDLER( cabal_text_videoram16_w ) { - cabal_state *state = (cabal_state *)space->machine->driver_data; + cabal_state *state = space->machine->driver_data(); COMBINE_DATA(&state->colorram[offset]); tilemap_mark_tile_dirty(state->text_layer,offset); } @@ -107,7 +107,7 @@ WRITE16_HANDLER( cabal_text_videoram16_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - cabal_state *state = (cabal_state *)machine->driver_data; + cabal_state *state = machine->driver_data(); int offs,data0,data1,data2; UINT16 *spriteram16 = state->spriteram; @@ -148,7 +148,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( cabal ) { - cabal_state *state = (cabal_state *)screen->machine->driver_data; + cabal_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->background_layer,TILEMAP_DRAW_OPAQUE,0); draw_sprites(screen->machine,bitmap,cliprect); tilemap_draw(bitmap,cliprect,state->text_layer,0,0); diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index 321f5dce2ac..224e38feed5 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -10,7 +10,7 @@ Atari Canyon Bomber video emulation WRITE8_HANDLER( canyon_videoram_w ) { - canyon_state *state = (canyon_state *)space->machine->driver_data; + canyon_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -18,7 +18,7 @@ WRITE8_HANDLER( canyon_videoram_w ) static TILE_GET_INFO( get_bg_tile_info ) { - canyon_state *state = (canyon_state *)machine->driver_data; + canyon_state *state = machine->driver_data(); UINT8 code = state->videoram[tile_index]; SET_TILE_INFO(0, code & 0x3f, code >> 7, 0); @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( canyon ) { - canyon_state *state = (canyon_state *)machine->driver_data; + canyon_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -35,7 +35,7 @@ VIDEO_START( canyon ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle* cliprect ) { - canyon_state *state = (canyon_state *)machine->driver_data; + canyon_state *state = machine->driver_data(); int i; for (i = 0; i < 2; i++) @@ -57,7 +57,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_bombs( running_machine *machine, bitmap_t *bitmap, const rectangle* cliprect ) { - canyon_state *state = (canyon_state *)machine->driver_data; + canyon_state *state = machine->driver_data(); int i; for (i = 0; i < 2; i++) @@ -84,7 +84,7 @@ static void draw_bombs( running_machine *machine, bitmap_t *bitmap, const rectan VIDEO_UPDATE( canyon ) { - canyon_state *state = (canyon_state *)screen->machine->driver_data; + canyon_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c index 58fb23ea251..18d35352b3d 100644 --- a/src/mame/video/capbowl.c +++ b/src/mame/video/capbowl.c @@ -18,7 +18,7 @@ static void generate_interrupt( running_machine *machine, int state ) { - capbowl_state *driver = (capbowl_state *)machine->driver_data; + capbowl_state *driver = machine->driver_data(); cpu_set_input_line(driver->maincpu, M6809_FIRQ_LINE, state); } @@ -54,7 +54,7 @@ VIDEO_START( capbowl ) WRITE8_HANDLER( capbowl_tms34061_w ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); int func = (offset >> 8) & 3; int col = offset & 0xff; @@ -70,7 +70,7 @@ WRITE8_HANDLER( capbowl_tms34061_w ) READ8_HANDLER( capbowl_tms34061_r ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); int func = (offset >> 8) & 3; int col = offset & 0xff; @@ -93,7 +93,7 @@ READ8_HANDLER( capbowl_tms34061_r ) WRITE8_HANDLER( bowlrama_blitter_w ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); switch (offset) { @@ -118,7 +118,7 @@ WRITE8_HANDLER( bowlrama_blitter_w ) READ8_HANDLER( bowlrama_blitter_r ) { - capbowl_state *state = (capbowl_state *)space->machine->driver_data; + capbowl_state *state = space->machine->driver_data(); UINT8 data = memory_region(space->machine, "gfx1")[state->blitter_addr]; UINT8 result = 0; diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index 6e33dfa3c25..ea017d6edd2 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -37,7 +37,7 @@ PALETTE_INIT( carjmbre ) WRITE8_HANDLER( carjmbre_flipscreen_w ) { - carjmbre_state *state = (carjmbre_state *)space->machine->driver_data; + carjmbre_state *state = space->machine->driver_data(); state->flipscreen = data ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; tilemap_set_flip_all(space->machine, state->flipscreen); @@ -45,7 +45,7 @@ WRITE8_HANDLER( carjmbre_flipscreen_w ) WRITE8_HANDLER( carjmbre_bgcolor_w ) { - carjmbre_state *state = (carjmbre_state *)space->machine->driver_data; + carjmbre_state *state = space->machine->driver_data(); int oldbg, i; oldbg = state->bgcolor; @@ -63,7 +63,7 @@ WRITE8_HANDLER( carjmbre_bgcolor_w ) static TILE_GET_INFO( get_carjmbre_tile_info ) { - carjmbre_state *state = (carjmbre_state *)machine->driver_data; + carjmbre_state *state = machine->driver_data(); UINT32 tile_number = state->videoram[tile_index] & 0xff; UINT8 attr = state->videoram[tile_index + 0x400]; tile_number += (attr & 0x80) << 1; /* bank */ @@ -76,7 +76,7 @@ static TILE_GET_INFO( get_carjmbre_tile_info ) WRITE8_HANDLER( carjmbre_videoram_w ) { - carjmbre_state *state = (carjmbre_state *)space->machine->driver_data; + carjmbre_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->cj_tilemap, offset & 0x3ff); @@ -86,7 +86,7 @@ WRITE8_HANDLER( carjmbre_videoram_w ) VIDEO_START( carjmbre ) { - carjmbre_state *state = (carjmbre_state *)machine->driver_data; + carjmbre_state *state = machine->driver_data(); state->cj_tilemap = tilemap_create(machine, get_carjmbre_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state_save_register_global(machine, state->flipscreen); @@ -95,7 +95,7 @@ VIDEO_START( carjmbre ) VIDEO_UPDATE( carjmbre ) { - carjmbre_state *state = (carjmbre_state *)screen->machine->driver_data; + carjmbre_state *state = screen->machine->driver_data(); int offs, troffs, sx, sy, flipx, flipy; //colorram diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 91eeaf6b129..eb063de5b02 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -75,7 +75,7 @@ static STATE_POSTLOAD(cave_sprite_postload); PALETTE_INIT( cave ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int maxpen = state->paletteram_size / 2; int pen; @@ -88,7 +88,7 @@ PALETTE_INIT( cave ) PALETTE_INIT( dfeveron ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int color, pen; /* Fill the 0-3fff range, used by sprites ($40 color codes * $100 pens) @@ -105,7 +105,7 @@ PALETTE_INIT( dfeveron ) PALETTE_INIT( ddonpach ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int color, pen; /* Fill the 8000-83ff range ($40 color codes * $10 pens) for @@ -122,7 +122,7 @@ PALETTE_INIT( ddonpach ) PALETTE_INIT( mazinger ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int color, pen; PALETTE_INIT_CALL(cave); @@ -141,7 +141,7 @@ PALETTE_INIT( mazinger ) PALETTE_INIT( sailormn ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int color, pen; PALETTE_INIT_CALL(cave); @@ -160,7 +160,7 @@ PALETTE_INIT( sailormn ) PALETTE_INIT( pwrinst2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int color, pen; PALETTE_INIT_CALL(cave); @@ -175,7 +175,7 @@ PALETTE_INIT( pwrinst2 ) PALETTE_INIT( korokoro ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int color, pen; PALETTE_INIT_CALL(cave); @@ -188,7 +188,7 @@ PALETTE_INIT( korokoro ) static void set_pens( running_machine *machine ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int pen; for (pen = 0; pen < machine->total_colors(); pen++) @@ -259,7 +259,7 @@ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int ti void sailormn_tilebank_w( running_machine *machine, int bank ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); if (state->sailormn_tilebank != bank) { state->sailormn_tilebank = bank; @@ -269,7 +269,7 @@ void sailormn_tilebank_w( running_machine *machine, int bank ) static TILE_GET_INFO( sailormn_get_tile_info_2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); UINT32 code, color, pri; if (state->tiledim_2) @@ -337,56 +337,56 @@ INLINE void vram_8x8_w( UINT16 *VRAM, tilemap_t *TILEMAP, ATTR_UNUSED offs_t off } -static TILE_GET_INFO( get_tile_info_0 ) { cave_state *state = (cave_state *)machine->driver_data; get_tile_info(machine, tileinfo, tile_index, 0, state->vram_0, state->tiledim_0); } -static TILE_GET_INFO( get_tile_info_1 ) { cave_state *state = (cave_state *)machine->driver_data; get_tile_info(machine, tileinfo, tile_index, 1, state->vram_1, state->tiledim_1); } -static TILE_GET_INFO( get_tile_info_2 ) { cave_state *state = (cave_state *)machine->driver_data; get_tile_info(machine, tileinfo, tile_index, 2, state->vram_2, state->tiledim_2); } -static TILE_GET_INFO( get_tile_info_3 ) { cave_state *state = (cave_state *)machine->driver_data; get_tile_info(machine, tileinfo, tile_index, 3, state->vram_3, state->tiledim_3); } +static TILE_GET_INFO( get_tile_info_0 ) { cave_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, 0, state->vram_0, state->tiledim_0); } +static TILE_GET_INFO( get_tile_info_1 ) { cave_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, 1, state->vram_1, state->tiledim_1); } +static TILE_GET_INFO( get_tile_info_2 ) { cave_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, 2, state->vram_2, state->tiledim_2); } +static TILE_GET_INFO( get_tile_info_3 ) { cave_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, 3, state->vram_3, state->tiledim_3); } WRITE16_HANDLER( cave_vram_0_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_w(state->vram_0, state->tilemap_0, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_0_8x8_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_8x8_w(state->vram_0, state->tilemap_0, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_1_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_w(state->vram_1, state->tilemap_1, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_1_8x8_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_8x8_w(state->vram_1, state->tilemap_1, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_2_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_w(state->vram_2, state->tilemap_2, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_2_8x8_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_8x8_w(state->vram_2, state->tilemap_2, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_3_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_w(state->vram_3, state->tilemap_3, offset, data, mem_mask); } WRITE16_HANDLER( cave_vram_3_8x8_w ) { - cave_state *state = (cave_state *)space->machine->driver_data; + cave_state *state = space->machine->driver_data(); vram_8x8_w(state->vram_3, state->tilemap_3, offset, data, mem_mask); } @@ -402,7 +402,7 @@ WRITE16_HANDLER( cave_vram_3_8x8_w ) static void cave_vh_start( running_machine *machine, int num ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); assert(state->palette_map != NULL); @@ -496,7 +496,7 @@ VIDEO_START( cave_4_layers ) { cave_vh_start(machine, 4); } VIDEO_START( sailormn_3_layers ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); cave_vh_start(machine, 2); /* Layer 2 (8x8) needs to be handled differently */ @@ -541,7 +541,7 @@ VIDEO_START( sailormn_3_layers ) static void get_sprite_info_cave( running_machine *machine ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); pen_t base_pal = 0; const UINT8 *base_gfx = memory_region(machine, "sprites"); int code_max = memory_region_length(machine, "sprites") / (16*16); @@ -670,7 +670,7 @@ static void get_sprite_info_cave( running_machine *machine ) static void get_sprite_info_donpachi( running_machine *machine ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); pen_t base_pal = 0; const UINT8 *base_gfx = memory_region(machine, "sprites"); int code_max = memory_region_length(machine, "sprites") / (16*16); @@ -757,7 +757,7 @@ static void get_sprite_info_donpachi( running_machine *machine ) static void sprite_init_cave( running_machine *machine ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int screen_width = machine->primary_screen->width(); int screen_height = machine->primary_screen->height(); @@ -799,7 +799,7 @@ static void sprite_init_cave( running_machine *machine ) static void cave_sprite_check( screen_device &screen, const rectangle *clip ) { - cave_state *state = (cave_state *)screen.machine->driver_data; + cave_state *state = screen.machine->driver_data(); { /* set clip */ int left = clip->min_x; @@ -878,7 +878,7 @@ static void cave_sprite_check( screen_device &screen, const rectangle *clip ) static void do_blit_zoom16_cave( running_machine *machine, const struct sprite_cave *sprite ) { /* assumes SPRITE_LIST_RAW_DATA flag is set */ - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int x1, x2, y1, y2, dx, dy; int xcount0 = 0x10000 + sprite->xcount0, ycount0 = 0x10000 + sprite->ycount0; @@ -1011,7 +1011,7 @@ static void do_blit_zoom16_cave( running_machine *machine, const struct sprite_c static void do_blit_zoom16_cave_zb( running_machine *machine, const struct sprite_cave *sprite ) { /* assumes SPRITE_LIST_RAW_DATA flag is set */ - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int x1, x2, y1, y2, dx, dy; int xcount0 = 0x10000 + sprite->xcount0, ycount0 = 0x10000 + sprite->ycount0; @@ -1147,7 +1147,7 @@ static void do_blit_zoom16_cave_zb( running_machine *machine, const struct sprit static void do_blit_16_cave( running_machine *machine, const struct sprite_cave *sprite ) { /* assumes SPRITE_LIST_RAW_DATA flag is set */ - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int x1, x2, y1, y2, dx, dy; int xcount0 = 0, ycount0 = 0; @@ -1243,7 +1243,7 @@ static void do_blit_16_cave( running_machine *machine, const struct sprite_cave static void do_blit_16_cave_zb( running_machine *machine, const struct sprite_cave *sprite ) { /* assumes SPRITE_LIST_RAW_DATA flag is set */ - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int x1, x2, y1, y2, dx, dy; int xcount0 = 0, ycount0 = 0; @@ -1346,7 +1346,7 @@ static void do_blit_16_cave_zb( running_machine *machine, const struct sprite_c static void sprite_draw_cave( running_machine *machine, int priority ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int i = 0; while (state->sprite_table[priority][i]) { @@ -1360,7 +1360,7 @@ static void sprite_draw_cave( running_machine *machine, int priority ) static void sprite_draw_cave_zbuf( running_machine *machine, int priority ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int i = 0; while (state->sprite_table[priority][i]) { @@ -1374,7 +1374,7 @@ static void sprite_draw_cave_zbuf( running_machine *machine, int priority ) static void sprite_draw_donpachi( running_machine *machine, int priority ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int i = 0; while (state->sprite_table[priority][i]) do_blit_16_cave(machine, state->sprite_table[priority][i++]); @@ -1382,7 +1382,7 @@ static void sprite_draw_donpachi( running_machine *machine, int priority ) static void sprite_draw_donpachi_zbuf( running_machine *machine, int priority ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int i = 0; while (state->sprite_table[priority][i]) do_blit_16_cave_zb(machine, state->sprite_table[priority][i++]); @@ -1450,7 +1450,7 @@ INLINE void cave_tilemap_draw( tilemap_t *TILEMAP, UINT16 *VRAM, UINT16 *VCTRL, UINT32 flags, UINT32 priority, UINT32 priority2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); int sx, sy, flipx, flipy, offs_x, offs_y, offs_row; /* Bail out if ... */ @@ -1567,32 +1567,32 @@ INLINE void cave_tilemap_draw( static void cave_tilemap_0_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 flags, UINT32 priority, UINT32 priority2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); cave_tilemap_draw(machine, bitmap, cliprect, state->tilemap_0, state->vram_0, state->vctrl_0, flags, priority, priority2); } static void cave_tilemap_1_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 flags, UINT32 priority, UINT32 priority2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); cave_tilemap_draw(machine, bitmap, cliprect, state->tilemap_1, state->vram_1, state->vctrl_1, flags, priority, priority2); } static void cave_tilemap_2_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 flags, UINT32 priority, UINT32 priority2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); cave_tilemap_draw(machine, bitmap, cliprect, state->tilemap_2, state->vram_2, state->vctrl_2, flags, priority, priority2); } static void cave_tilemap_3_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 flags, UINT32 priority, UINT32 priority2 ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); cave_tilemap_draw(machine, bitmap, cliprect, state->tilemap_3, state->vram_3, state->vctrl_3, flags, priority, priority2); } VIDEO_UPDATE( cave ) { - cave_state *state = (cave_state *)screen->machine->driver_data; + cave_state *state = screen->machine->driver_data(); int pri, pri2; int layers_ctrl = -1; @@ -1740,7 +1740,7 @@ VIDEO_UPDATE( cave ) void cave_get_sprite_info( running_machine *machine ) { - cave_state *state = (cave_state *)machine->driver_data; + cave_state *state = machine->driver_data(); if (state->kludge == 3) /* mazinger metmqstr */ { if (video_skip_this_frame() == 0) diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index da23ed27045..a4758df9d8d 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -10,7 +10,7 @@ static TILE_GET_INFO( get_bg_tile_info ) { - cbasebal_state *state = (cbasebal_state *)machine->driver_data; + cbasebal_state *state = machine->driver_data(); UINT8 attr = state->scrollram[2 * tile_index + 1]; SET_TILE_INFO( 1, @@ -21,7 +21,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - cbasebal_state *state = (cbasebal_state *)machine->driver_data; + cbasebal_state *state = machine->driver_data(); UINT8 attr = state->textram[tile_index + 0x800]; SET_TILE_INFO( 0, @@ -40,7 +40,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( cbasebal ) { - cbasebal_state *state = (cbasebal_state *)machine->driver_data; + cbasebal_state *state = machine->driver_data(); state->textram = auto_alloc_array(machine, UINT8, 0x1000); state->scrollram = auto_alloc_array(machine, UINT8, 0x1000); @@ -64,7 +64,7 @@ VIDEO_START( cbasebal ) WRITE8_HANDLER( cbasebal_textram_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); state->textram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x7ff); @@ -72,13 +72,13 @@ WRITE8_HANDLER( cbasebal_textram_w ) READ8_HANDLER( cbasebal_textram_r ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); return state->textram[offset]; } WRITE8_HANDLER( cbasebal_scrollram_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); state->scrollram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -86,13 +86,13 @@ WRITE8_HANDLER( cbasebal_scrollram_w ) READ8_HANDLER( cbasebal_scrollram_r ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); return state->scrollram[offset]; } WRITE8_HANDLER( cbasebal_gfxctrl_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); /* bit 0 is unknown - toggles continuously */ @@ -124,14 +124,14 @@ WRITE8_HANDLER( cbasebal_gfxctrl_w ) WRITE8_HANDLER( cbasebal_scrollx_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); state->scroll_x[offset] = data; tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll_x[0] + 256 * state->scroll_x[1]); } WRITE8_HANDLER( cbasebal_scrolly_w ) { - cbasebal_state *state = (cbasebal_state *)space->machine->driver_data; + cbasebal_state *state = space->machine->driver_data(); state->scroll_y[offset] = data; tilemap_set_scrolly(state->bg_tilemap, 0, state->scroll_y[0] + 256 * state->scroll_y[1]); } @@ -146,7 +146,7 @@ WRITE8_HANDLER( cbasebal_scrolly_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cbasebal_state *state = (cbasebal_state *)machine->driver_data; + cbasebal_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs, sx, sy; @@ -180,7 +180,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( cbasebal ) { - cbasebal_state *state = (cbasebal_state *)screen->machine->driver_data; + cbasebal_state *state = screen->machine->driver_data(); if (state->bg_on) tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c index 90246c166e6..c50c24330a1 100644 --- a/src/mame/video/cbuster.c +++ b/src/mame/video/cbuster.c @@ -115,7 +115,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( twocrude ) { - cbuster_state *state = (cbuster_state *)screen->machine->driver_data; + cbuster_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, !BIT(flip, 7)); diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index f3ae47fc2ae..14d7d60f487 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -17,7 +17,7 @@ VIDEO_START( ccastles ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); static const int resistances[3] = { 22000, 10000, 4700 }; /* get pointers to our PROMs */ @@ -51,7 +51,7 @@ VIDEO_START( ccastles ) WRITE8_HANDLER( ccastles_hscroll_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); state->hscroll = data; } @@ -59,14 +59,14 @@ WRITE8_HANDLER( ccastles_hscroll_w ) WRITE8_HANDLER( ccastles_vscroll_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); state->vscroll = data; } WRITE8_HANDLER( ccastles_video_control_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); /* only D3 matters */ state->video_control[offset] = (data >> 3) & 1; } @@ -81,7 +81,7 @@ WRITE8_HANDLER( ccastles_video_control_w ) WRITE8_HANDLER( ccastles_paletteram_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); int bit0, bit1, bit2; int r, g, b; @@ -122,7 +122,7 @@ WRITE8_HANDLER( ccastles_paletteram_w ) INLINE void ccastles_write_vram( running_machine *machine, UINT16 addr, UINT8 data, UINT8 bitmd, UINT8 pixba ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); UINT8 *dest = &state->videoram[addr & 0x7ffe]; UINT8 promaddr = 0; UINT8 wpbits; @@ -169,7 +169,7 @@ INLINE void ccastles_write_vram( running_machine *machine, UINT16 addr, UINT8 da INLINE void bitmode_autoinc( running_machine *machine ) { - ccastles_state *state = (ccastles_state *)machine->driver_data; + ccastles_state *state = machine->driver_data(); /* auto increment in the x-direction if it's enabled */ if (!state->video_control[0]) /* /AX */ @@ -214,7 +214,7 @@ WRITE8_HANDLER( ccastles_videoram_w ) READ8_HANDLER( ccastles_bitmode_r ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (state->bitmode_addr[1] << 7) | (state->bitmode_addr[0] >> 1); @@ -232,7 +232,7 @@ READ8_HANDLER( ccastles_bitmode_r ) WRITE8_HANDLER( ccastles_bitmode_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (state->bitmode_addr[1] << 7) | (state->bitmode_addr[0] >> 1); @@ -250,7 +250,7 @@ WRITE8_HANDLER( ccastles_bitmode_w ) WRITE8_HANDLER( ccastles_bitmode_addr_w ) { - ccastles_state *state = (ccastles_state *)space->machine->driver_data; + ccastles_state *state = space->machine->driver_data(); /* write through to video RAM and also to the addressing latches */ ccastles_write_vram(space->machine, offset, data, 0, 0); @@ -267,7 +267,7 @@ WRITE8_HANDLER( ccastles_bitmode_addr_w ) VIDEO_UPDATE( ccastles ) { - ccastles_state *state = (ccastles_state *)screen->machine->driver_data; + ccastles_state *state = screen->machine->driver_data(); UINT8 *spriteaddr = &state->spriteram[state->video_control[7] * 0x100]; /* BUF1/BUF2 */ int flip = state->video_control[4] ? 0xff : 0x00; /* PLAYER2 */ pen_t black = get_black_pen(screen->machine); diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index 74cf4840ea7..b7185ca012d 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -61,7 +61,7 @@ PALETTE_INIT( chaknpop ) static void tx_tilemap_mark_all_dirty( running_machine *machine ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); tilemap_mark_all_tiles_dirty(state->tx_tilemap); tilemap_set_flip(state->tx_tilemap, state->flip_x | state->flip_y); @@ -69,13 +69,13 @@ static void tx_tilemap_mark_all_dirty( running_machine *machine ) READ8_HANDLER( chaknpop_gfxmode_r ) { - chaknpop_state *state = (chaknpop_state *)space->machine->driver_data; + chaknpop_state *state = space->machine->driver_data(); return state->gfxmode; } WRITE8_HANDLER( chaknpop_gfxmode_w ) { - chaknpop_state *state = (chaknpop_state *)space->machine->driver_data; + chaknpop_state *state = space->machine->driver_data(); if (state->gfxmode != data) { @@ -103,7 +103,7 @@ WRITE8_HANDLER( chaknpop_gfxmode_w ) WRITE8_HANDLER( chaknpop_txram_w ) { - chaknpop_state *state = (chaknpop_state *)space->machine->driver_data; + chaknpop_state *state = space->machine->driver_data(); state->tx_ram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -111,7 +111,7 @@ WRITE8_HANDLER( chaknpop_txram_w ) WRITE8_HANDLER( chaknpop_attrram_w ) { - chaknpop_state *state = (chaknpop_state *)space->machine->driver_data; + chaknpop_state *state = space->machine->driver_data(); if (state->attr_ram[offset] != data) { @@ -133,7 +133,7 @@ WRITE8_HANDLER( chaknpop_attrram_w ) static TILE_GET_INFO( chaknpop_get_tx_tile_info ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); int tile = state->tx_ram[tile_index]; int tile_h_bank = (state->gfxmode & GFX_TX_BANK2) << 2; /* 0x00-0xff -> 0x200-0x2ff */ int color = state->attr_ram[TX_COLOR2]; @@ -162,7 +162,7 @@ static STATE_POSTLOAD( chaknpop_postload ) VIDEO_START( chaknpop ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "maincpu"); /* info offset type w h col row */ @@ -191,7 +191,7 @@ VIDEO_START( chaknpop ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); int offs; /* Draw the sprites */ @@ -226,7 +226,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - chaknpop_state *state = (chaknpop_state *)machine->driver_data; + chaknpop_state *state = machine->driver_data(); int dx = state->flip_x ? -1 : 1; int offs, i; @@ -266,7 +266,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( chaknpop ) { - chaknpop_state *state = (chaknpop_state *)screen->machine->driver_data; + chaknpop_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tx_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c index 55102cdb874..3ed4436834d 100644 --- a/src/mame/video/champbas.c +++ b/src/mame/video/champbas.c @@ -129,7 +129,7 @@ PALETTE_INIT( exctsccr ) static TILE_GET_INFO( champbas_get_bg_tile_info ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); int code = state->bg_videoram[tile_index] | (state->gfx_bank << 8); int color = (state->bg_videoram[tile_index + 0x400] & 0x1f) | 0x20; @@ -138,7 +138,7 @@ static TILE_GET_INFO( champbas_get_bg_tile_info ) static TILE_GET_INFO( exctsccr_get_bg_tile_info ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); int code = state->bg_videoram[tile_index] | (state->gfx_bank << 8); int color = state->bg_videoram[tile_index + 0x400] & 0x0f; @@ -149,13 +149,13 @@ static TILE_GET_INFO( exctsccr_get_bg_tile_info ) VIDEO_START( champbas ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, champbas_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } VIDEO_START( exctsccr ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, exctsccr_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -163,14 +163,14 @@ VIDEO_START( exctsccr ) WRITE8_HANDLER( champbas_bg_videoram_w ) { - champbas_state *state = (champbas_state *)space->machine->driver_data; + champbas_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x3ff); } WRITE8_HANDLER( champbas_gfxbank_w ) { - champbas_state *state = (champbas_state *)space->machine->driver_data; + champbas_state *state = space->machine->driver_data(); data &= 1; if (state->gfx_bank != data) { @@ -181,7 +181,7 @@ WRITE8_HANDLER( champbas_gfxbank_w ) WRITE8_HANDLER( champbas_palette_bank_w ) { - champbas_state *state = (champbas_state *)space->machine->driver_data; + champbas_state *state = space->machine->driver_data(); state->palette_bank = data & 1; tilemap_set_palette_offset(state->bg_tilemap, state->palette_bank << 8); } @@ -195,7 +195,7 @@ WRITE8_HANDLER( champbas_flipscreen_w ) static void champbas_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); int offs; const gfx_element* const gfx = machine->gfx[1]; @@ -227,7 +227,7 @@ static void champbas_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void exctsccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - champbas_state *state = (champbas_state *)machine->driver_data; + champbas_state *state = machine->driver_data(); int offs; UINT8 *obj1, *obj2; @@ -284,7 +284,7 @@ static void exctsccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( champbas ) { - champbas_state *state = (champbas_state *)screen->machine->driver_data; + champbas_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); champbas_draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -292,7 +292,7 @@ VIDEO_UPDATE( champbas ) VIDEO_UPDATE( exctsccr ) { - champbas_state *state = (champbas_state *)screen->machine->driver_data; + champbas_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); exctsccr_draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c index 1b4e0cfe69a..494067c2d09 100644 --- a/src/mame/video/changela.c +++ b/src/mame/video/changela.c @@ -19,7 +19,7 @@ static TIMER_CALLBACK( changela_scanline_callback ); VIDEO_START( changela ) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); state->memory_devices = auto_alloc_array(machine, UINT8, 4 * 0x800); /* 0 - not connected, 1,2,3 - RAMs*/ state->tree_ram = auto_alloc_array(machine, UINT8, 2 * 0x20); @@ -44,7 +44,7 @@ VIDEO_START( changela ) static void draw_obj0( running_machine *machine, bitmap_t *bitmap, int sy ) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); int sx, i; UINT8* ROM = memory_region(machine, "user1"); @@ -107,7 +107,7 @@ static void draw_obj0( running_machine *machine, bitmap_t *bitmap, int sy ) static void draw_obj1( running_machine *machine, bitmap_t *bitmap ) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); int sx, sy; UINT8* ROM = memory_region(machine, "gfx2"); @@ -172,7 +172,7 @@ static void draw_obj1( running_machine *machine, bitmap_t *bitmap ) static void draw_river( running_machine *machine, bitmap_t *bitmap, int sy ) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); int sx, i, j; UINT8* ROM = memory_region(machine, "user2"); @@ -351,7 +351,7 @@ static void draw_river( running_machine *machine, bitmap_t *bitmap, int sy ) static void draw_tree( running_machine *machine, bitmap_t *bitmap, int sy, int tree_num ) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); int sx, i, j; /* State machine */ @@ -647,7 +647,7 @@ e:|7 6 5 4 3 2 1 0 Hex|/RAMw /RAMr /ROM /AdderOutput AdderInput TrainInputs| static TIMER_CALLBACK( changela_scanline_callback ) { - changela_state *state = (changela_state *)machine->driver_data; + changela_state *state = machine->driver_data(); int sy = param; int sx; @@ -724,7 +724,7 @@ static TIMER_CALLBACK( changela_scanline_callback ) VIDEO_UPDATE( changela ) { - changela_state *state = (changela_state *)screen->machine->driver_data; + changela_state *state = screen->machine->driver_data(); copybitmap(bitmap, state->river_bitmap, 0, 0, 0, 0, cliprect); copybitmap_trans(bitmap, state->obj0_bitmap, 0, 0, 0, 0, cliprect, 0); copybitmap_trans(bitmap, state->tree0_bitmap, 0, 0, 0, 0, cliprect, 0); @@ -773,7 +773,7 @@ WRITE8_HANDLER( changela_colors_w ) WRITE8_HANDLER( changela_mem_device_select_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->mem_dev_selected = (data & 0x07) * 0x800; state->tree_en = (data & 0x30) >> 4; @@ -790,7 +790,7 @@ WRITE8_HANDLER( changela_mem_device_select_w ) WRITE8_HANDLER( changela_mem_device_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->memory_devices[state->mem_dev_selected + offset] = data; if (state->mem_dev_selected == 0x800) @@ -803,20 +803,20 @@ WRITE8_HANDLER( changela_mem_device_w ) READ8_HANDLER( changela_mem_device_r ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); return state->memory_devices[state->mem_dev_selected + offset]; } WRITE8_HANDLER( changela_slope_rom_addr_hi_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->slopeROM_bank = (data & 0x03) << 9; } WRITE8_HANDLER( changela_slope_rom_addr_lo_w ) { - changela_state *state = (changela_state *)space->machine->driver_data; + changela_state *state = space->machine->driver_data(); state->horizon = data; } diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index da26c10cc9e..ca7dfec706f 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -41,7 +41,7 @@ PALETTE_INIT( cheekyms ) WRITE8_HANDLER( cheekyms_port_40_w ) { - cheekyms_state *state = (cheekyms_state *)space->machine->driver_data; + cheekyms_state *state = space->machine->driver_data(); /* the lower bits probably trigger sound samples */ dac_data_w(state->dac, data ? 0x80 : 0); @@ -50,7 +50,7 @@ WRITE8_HANDLER( cheekyms_port_40_w ) WRITE8_HANDLER( cheekyms_port_80_w ) { - cheekyms_state *state = (cheekyms_state *)space->machine->driver_data; + cheekyms_state *state = space->machine->driver_data(); /* d0-d1 - sound enables, not sure which bit is which */ /* d3-d5 - man scroll amount */ @@ -66,7 +66,7 @@ WRITE8_HANDLER( cheekyms_port_80_w ) static TILE_GET_INFO( cheekyms_get_tile_info ) { - cheekyms_state *state = (cheekyms_state *)machine->driver_data; + cheekyms_state *state = machine->driver_data(); int color; int x = tile_index & 0x1f; @@ -96,7 +96,7 @@ static TILE_GET_INFO( cheekyms_get_tile_info ) VIDEO_START( cheekyms ) { - cheekyms_state *state = (cheekyms_state *)machine->driver_data; + cheekyms_state *state = machine->driver_data(); int width, height; width = machine->primary_screen->width(); @@ -110,7 +110,7 @@ VIDEO_START( cheekyms ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const gfx_element *gfx, int flip ) { - cheekyms_state *state = (cheekyms_state *)machine->driver_data; + cheekyms_state *state = machine->driver_data(); offs_t offs; for (offs = 0; offs < 0x20; offs += 4) @@ -150,7 +150,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( cheekyms ) { - cheekyms_state *state = (cheekyms_state *)screen->machine->driver_data; + cheekyms_state *state = screen->machine->driver_data(); int y, x; int scrolly = ((*state->port_80 >> 3) & 0x07); int flip = *state->port_80 & 0x80; diff --git a/src/mame/video/chqflag.c b/src/mame/video/chqflag.c index 0a052dbdb93..ef19bbac2db 100644 --- a/src/mame/video/chqflag.c +++ b/src/mame/video/chqflag.c @@ -19,7 +19,7 @@ void chqflag_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - chqflag_state *state = (chqflag_state *)machine->driver_data; + chqflag_state *state = machine->driver_data(); *priority = (*color & 0x10) >> 4; *color = state->sprite_colorbase + (*color & 0x0f); } @@ -33,14 +33,14 @@ void chqflag_sprite_callback( running_machine *machine, int *code, int *color, i void chqflag_zoom_callback_0( running_machine *machine, int *code, int *color, int *flags ) { - chqflag_state *state = (chqflag_state *)machine->driver_data; + chqflag_state *state = machine->driver_data(); *code |= ((*color & 0x03) << 8); *color = state->zoom_colorbase[0] + ((*color & 0x3c) >> 2); } void chqflag_zoom_callback_1( running_machine *machine, int *code, int *color, int *flags ) { - chqflag_state *state = (chqflag_state *)machine->driver_data; + chqflag_state *state = machine->driver_data(); *flags = TILE_FLIPYX((*color & 0xc0) >> 6); *code |= ((*color & 0x0f) << 8); *color = state->zoom_colorbase[1] + ((*color & 0x10) >> 4); @@ -54,7 +54,7 @@ void chqflag_zoom_callback_1( running_machine *machine, int *code, int *color, i VIDEO_START( chqflag ) { - chqflag_state *state = (chqflag_state *)machine->driver_data; + chqflag_state *state = machine->driver_data(); machine->generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x800); @@ -73,7 +73,7 @@ VIDEO_START( chqflag ) VIDEO_UPDATE( chqflag ) { - chqflag_state *state = (chqflag_state *)screen->machine->driver_data; + chqflag_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0); diff --git a/src/mame/video/cidelsa.c b/src/mame/video/cidelsa.c index f658d1d900a..3f834b29f34 100644 --- a/src/mame/video/cidelsa.c +++ b/src/mame/video/cidelsa.c @@ -7,7 +7,7 @@ static READ8_DEVICE_HANDLER( cidelsa_pageram_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT16 addr = offset & CIDELSA_PAGERAM_MASK; @@ -21,7 +21,7 @@ static READ8_DEVICE_HANDLER( cidelsa_pageram_r ) static WRITE8_DEVICE_HANDLER( cidelsa_pageram_w ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT16 addr = offset & CIDELSA_PAGERAM_MASK; @@ -35,7 +35,7 @@ static WRITE8_DEVICE_HANDLER( cidelsa_pageram_w ) static READ8_DEVICE_HANDLER( draco_pageram_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT16 addr = offset & DRACO_PAGERAM_MASK; @@ -44,7 +44,7 @@ static READ8_DEVICE_HANDLER( draco_pageram_r ) static WRITE8_DEVICE_HANDLER( draco_pageram_w ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT16 addr = offset & DRACO_PAGERAM_MASK; @@ -55,7 +55,7 @@ static WRITE8_DEVICE_HANDLER( draco_pageram_w ) static CDP1869_CHAR_RAM_READ( cidelsa_charram_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT8 column = BIT(pma, 10) ? 0xff : state->pageram[pma & CIDELSA_PAGERAM_MASK]; UINT16 addr = ((column << 3) | (cma & 0x07)) & CIDELSA_CHARRAM_MASK; @@ -68,7 +68,7 @@ static CDP1869_CHAR_RAM_READ( cidelsa_charram_r ) static CDP1869_CHAR_RAM_WRITE( cidelsa_charram_w ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT8 column = BIT(pma, 10) ? 0xff : state->pageram[pma & CIDELSA_PAGERAM_MASK]; UINT16 addr = ((column << 3) | (cma & 0x07)) & CIDELSA_CHARRAM_MASK; @@ -79,7 +79,7 @@ static CDP1869_CHAR_RAM_WRITE( cidelsa_charram_w ) static CDP1869_CHAR_RAM_READ( draco_charram_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT8 column = state->pageram[pma & DRACO_PAGERAM_MASK]; UINT16 addr = ((column << 3) | (cma & 0x07)) & CIDELSA_CHARRAM_MASK; @@ -92,7 +92,7 @@ static CDP1869_CHAR_RAM_READ( draco_charram_r ) static CDP1869_CHAR_RAM_WRITE( draco_charram_w ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT8 column = state->pageram[pma & DRACO_PAGERAM_MASK]; UINT16 addr = ((column << 3) | (cma & 0x07)) & CIDELSA_CHARRAM_MASK; @@ -105,7 +105,7 @@ static CDP1869_CHAR_RAM_WRITE( draco_charram_w ) static CDP1869_PCB_READ( cidelsa_pcb_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT8 column = state->pageram[pma & CIDELSA_PAGERAM_MASK]; UINT16 addr = ((column << 3) | (cma & 0x07)) & CIDELSA_CHARRAM_MASK; @@ -115,7 +115,7 @@ static CDP1869_PCB_READ( cidelsa_pcb_r ) static CDP1869_PCB_READ( draco_pcb_r ) { - cidelsa_state *state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *state = device->machine->driver_data(); UINT8 column = state->pageram[pma & DRACO_PAGERAM_MASK]; UINT16 addr = ((column << 3) | (cma & 0x07)) & CIDELSA_CHARRAM_MASK; @@ -127,7 +127,7 @@ static CDP1869_PCB_READ( draco_pcb_r ) static WRITE_LINE_DEVICE_HANDLER( cidelsa_prd_w ) { - cidelsa_state *driver_state = (cidelsa_state *)device->machine->driver_data; + cidelsa_state *driver_state = device->machine->driver_data(); /* invert PRD signal */ cpu_set_input_line(driver_state->cdp1802, INPUT_LINE_IRQ0, !state); @@ -182,7 +182,7 @@ static CDP1869_INTERFACE( draco_cdp1869_intf ) static void video_start(running_machine *machine, UINT16 pageram_size) { - cidelsa_state *state = (cidelsa_state *)machine->driver_data; + cidelsa_state *state = machine->driver_data(); /* allocate memory */ state->pageram = auto_alloc_array(machine, UINT8, pageram_size); @@ -213,7 +213,7 @@ static VIDEO_START(draco) static VIDEO_UPDATE( cidelsa ) { - cidelsa_state *state = (cidelsa_state *)screen->machine->driver_data; + cidelsa_state *state = screen->machine->driver_data(); cdp1869_update(state->cdp1869, bitmap, cliprect); diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c index 4ebfc49bc79..11837170046 100644 --- a/src/mame/video/circus.c +++ b/src/mame/video/circus.c @@ -17,26 +17,26 @@ WRITE8_HANDLER( circus_videoram_w ) { - circus_state *state = (circus_state *)space->machine->driver_data; + circus_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( circus_clown_x_w ) { - circus_state *state = (circus_state *)space->machine->driver_data; + circus_state *state = space->machine->driver_data(); state->clown_x = 240 - data; } WRITE8_HANDLER( circus_clown_y_w ) { - circus_state *state = (circus_state *)space->machine->driver_data; + circus_state *state = space->machine->driver_data(); state->clown_y = 240 - data; } static TILE_GET_INFO( get_bg_tile_info ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO(0, code, 0, 0); @@ -44,7 +44,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( circus ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -87,7 +87,7 @@ static void draw_robot_box( bitmap_t *bitmap, const rectangle *cliprect, int x, static void circus_draw_fg( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); /* The sync generator hardware is used to */ /* draw the border and diving boards */ @@ -111,7 +111,7 @@ static void circus_draw_fg( running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( circus ) { - circus_state *state = (circus_state *)screen->machine->driver_data; + circus_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); circus_draw_fg(screen->machine, bitmap, cliprect); return 0; @@ -152,7 +152,7 @@ static void robotbwl_draw_bowling_alley( bitmap_t *bitmap, const rectangle *clip static void robotbwl_draw_ball( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); drawgfx_transpen(bitmap,/* Y is horizontal position */ cliprect,machine->gfx[1], state->clown_z, @@ -163,7 +163,7 @@ static void robotbwl_draw_ball( running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( robotbwl ) { - circus_state *state = (circus_state *)screen->machine->driver_data; + circus_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); robotbwl_draw_scoreboard(bitmap, cliprect); robotbwl_draw_bowling_alley(bitmap, cliprect); @@ -173,7 +173,7 @@ VIDEO_UPDATE( robotbwl ) static void crash_draw_car( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); drawgfx_transpen(bitmap,/* Y is horizontal position */ cliprect,machine->gfx[1], state->clown_z, @@ -184,7 +184,7 @@ static void crash_draw_car( running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( crash ) { - circus_state *state = (circus_state *)screen->machine->driver_data; + circus_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); crash_draw_car(screen->machine, bitmap, cliprect); return 0; @@ -192,7 +192,7 @@ VIDEO_UPDATE( crash ) static void ripcord_draw_skydiver( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - circus_state *state = (circus_state *)machine->driver_data; + circus_state *state = machine->driver_data(); const gfx_element *gfx; const UINT8 *src_lineptr, *src_pixptr; UINT16 *dst_lineptr, *dst_lineend; @@ -255,7 +255,7 @@ static void ripcord_draw_skydiver( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( ripcord ) { - circus_state *state = (circus_state *)screen->machine->driver_data; + circus_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); ripcord_draw_skydiver(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c index 5f015690014..637d0f2e96c 100644 --- a/src/mame/video/circusc.c +++ b/src/mame/video/circusc.c @@ -100,7 +100,7 @@ PALETTE_INIT( circusc ) static TILE_GET_INFO( get_tile_info ) { - circusc_state *state = (circusc_state *)machine->driver_data; + circusc_state *state = machine->driver_data(); UINT8 attr = state->colorram[tile_index]; tileinfo->category = (attr & 0x10) >> 4; @@ -120,7 +120,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( circusc ) { - circusc_state *state = (circusc_state *)machine->driver_data; + circusc_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->bg_tilemap, 32); @@ -136,14 +136,14 @@ VIDEO_START( circusc ) WRITE8_HANDLER( circusc_videoram_w ) { - circusc_state *state = (circusc_state *)space->machine->driver_data; + circusc_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( circusc_colorram_w ) { - circusc_state *state = (circusc_state *)space->machine->driver_data; + circusc_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -163,7 +163,7 @@ WRITE8_HANDLER( circusc_flipscreen_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - circusc_state *state = (circusc_state *)machine->driver_data; + circusc_state *state = machine->driver_data(); int offs; UINT8 *sr; @@ -200,7 +200,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( circusc ) { - circusc_state *state = (circusc_state *)screen->machine->driver_data; + circusc_state *state = screen->machine->driver_data(); int i; for (i = 0; i < 10; i++) diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index ce4094e2a00..9be73671b0b 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -24,7 +24,7 @@ static TILEMAP_MAPPER( citycon_scan ) static TILE_GET_INFO( get_fg_tile_info ) { - citycon_state *state = (citycon_state *)machine->driver_data; + citycon_state *state = machine->driver_data(); SET_TILE_INFO( 0, state->videoram[tile_index], @@ -34,7 +34,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - citycon_state *state = (citycon_state *)machine->driver_data; + citycon_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "gfx4"); int code = rom[0x1000 * state->bg_image + tile_index]; SET_TILE_INFO( @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( citycon ) { - citycon_state *state = (citycon_state *)machine->driver_data; + citycon_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, citycon_scan, 8, 8, 128, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, citycon_scan, 8, 8, 128, 32); @@ -72,7 +72,7 @@ VIDEO_START( citycon ) WRITE8_HANDLER( citycon_videoram_w ) { - citycon_state *state = (citycon_state *)space->machine->driver_data; + citycon_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -80,14 +80,14 @@ WRITE8_HANDLER( citycon_videoram_w ) WRITE8_HANDLER( citycon_linecolor_w ) { - citycon_state *state = (citycon_state *)space->machine->driver_data; + citycon_state *state = space->machine->driver_data(); state->linecolor[offset] = data; } WRITE8_HANDLER( citycon_background_w ) { - citycon_state *state = (citycon_state *)space->machine->driver_data; + citycon_state *state = space->machine->driver_data(); /* bits 4-7 control the background image */ if (state->bg_image != (data >> 4)) @@ -108,7 +108,7 @@ WRITE8_HANDLER( citycon_background_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - citycon_state *state = (citycon_state *)machine->driver_data; + citycon_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_size - 4; offs >= 0; offs -= 4) @@ -142,7 +142,7 @@ INLINE void changecolor_RRRRGGGGBBBBxxxx( running_machine *machine, int color, i VIDEO_UPDATE( citycon ) { - citycon_state *state = (citycon_state *)screen->machine->driver_data; + citycon_state *state = screen->machine->driver_data(); int offs, scroll; /* Update the virtual palette to support text color code changing on every scanline. */ diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index d7afdf709c8..f49a4fd7f00 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -17,7 +17,7 @@ VIDEO_START( cloud9 ) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); static const int resistances[3] = { 22000, 10000, 4700 }; /* allocate second bank of videoram */ @@ -54,7 +54,7 @@ VIDEO_START( cloud9 ) WRITE8_HANDLER( cloud9_video_control_w ) { - cloud9_state *state = (cloud9_state *)space->machine->driver_data; + cloud9_state *state = space->machine->driver_data(); /* only D7 matters */ state->video_control[offset] = (data >> 7) & 1; @@ -70,7 +70,7 @@ WRITE8_HANDLER( cloud9_video_control_w ) WRITE8_HANDLER( cloud9_paletteram_w ) { - cloud9_state *state = (cloud9_state *)space->machine->driver_data; + cloud9_state *state = space->machine->driver_data(); int bit0, bit1, bit2; int r, g, b; @@ -111,7 +111,7 @@ WRITE8_HANDLER( cloud9_paletteram_w ) INLINE void cloud9_write_vram( running_machine *machine, UINT16 addr, UINT8 data, UINT8 bitmd, UINT8 pixba ) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); UINT8 *dest = &state->videoram[0x0000 | (addr & 0x3fff)]; UINT8 *dest2 = &state->videoram[0x4000 | (addr & 0x3fff)]; UINT8 promaddr = 0; @@ -161,7 +161,7 @@ INLINE void cloud9_write_vram( running_machine *machine, UINT16 addr, UINT8 data INLINE void bitmode_autoinc( running_machine *machine ) { - cloud9_state *state = (cloud9_state *)machine->driver_data; + cloud9_state *state = machine->driver_data(); /* auto increment in the x-direction if it's enabled */ if (!state->video_control[0]) /* /AX */ @@ -196,7 +196,7 @@ WRITE8_HANDLER( cloud9_videoram_w ) READ8_HANDLER( cloud9_bitmode_r ) { - cloud9_state *state = (cloud9_state *)space->machine->driver_data; + cloud9_state *state = space->machine->driver_data(); /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (state->bitmode_addr[1] << 6) | (state->bitmode_addr[0] >> 2); @@ -214,7 +214,7 @@ READ8_HANDLER( cloud9_bitmode_r ) WRITE8_HANDLER( cloud9_bitmode_w ) { - cloud9_state *state = (cloud9_state *)space->machine->driver_data; + cloud9_state *state = space->machine->driver_data(); /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (state->bitmode_addr[1] << 6) | (state->bitmode_addr[0] >> 2); @@ -232,7 +232,7 @@ WRITE8_HANDLER( cloud9_bitmode_w ) WRITE8_HANDLER( cloud9_bitmode_addr_w ) { - cloud9_state *state = (cloud9_state *)space->machine->driver_data; + cloud9_state *state = space->machine->driver_data(); /* write through to video RAM and also to the addressing latches */ cloud9_write_vram(space->machine, offset, data, 0, 0); @@ -249,7 +249,7 @@ WRITE8_HANDLER( cloud9_bitmode_addr_w ) VIDEO_UPDATE( cloud9 ) { - cloud9_state *state = (cloud9_state *)screen->machine->driver_data; + cloud9_state *state = screen->machine->driver_data(); UINT8 *spriteaddr = state->spriteram; int flip = state->video_control[5] ? 0xff : 0x00; /* PLAYER2 */ pen_t black = get_black_pen(screen->machine); diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 415c4b26702..2ea3edf544d 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -12,7 +12,7 @@ VIDEO_START( stoneage ) { - cninja_state *state = (cninja_state *)machine->driver_data; + cninja_state *state = machine->driver_data(); /* The bootleg has broken scroll registers */ deco16ic_set_scrolldx(state->deco16ic, 3, 0, -10, -10); /* pf4 16x16 tilemap */ @@ -391,7 +391,7 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( cninja ) { - cninja_state *state = (cninja_state *)screen->machine->driver_data; + cninja_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); @@ -412,7 +412,7 @@ VIDEO_UPDATE( cninja ) VIDEO_UPDATE( cninjabl ) { - cninja_state *state = (cninja_state *)screen->machine->driver_data; + cninja_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); @@ -433,7 +433,7 @@ VIDEO_UPDATE( cninjabl ) VIDEO_UPDATE( edrandy ) { - cninja_state *state = (cninja_state *)screen->machine->driver_data; + cninja_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); @@ -452,7 +452,7 @@ VIDEO_UPDATE( edrandy ) VIDEO_UPDATE( robocop2 ) { - cninja_state *state = (cninja_state *)screen->machine->driver_data; + cninja_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); @@ -503,7 +503,7 @@ VIDEO_UPDATE( robocop2 ) VIDEO_UPDATE( mutantf ) { - cninja_state *state = (cninja_state *)screen->machine->driver_data; + cninja_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index a4f9bdb2563..e7db4402765 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -90,7 +90,7 @@ PALETTE_INIT( combatscb ) static void set_pens( running_machine *machine ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x100; i += 2) @@ -113,7 +113,7 @@ static void set_pens( running_machine *machine ) static TILE_GET_INFO( get_tile_info0 ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_1, 6); UINT8 attributes = state->page[0][tile_index]; int bank = 4 * ((state->vreg & 0x0f) - 1); @@ -148,7 +148,7 @@ static TILE_GET_INFO( get_tile_info0 ) static TILE_GET_INFO( get_tile_info1 ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_2, 6); UINT8 attributes = state->page[1][tile_index]; int bank = 4 * ((state->vreg >> 4) - 1); @@ -183,7 +183,7 @@ static TILE_GET_INFO( get_tile_info1 ) static TILE_GET_INFO( get_text_info ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); UINT8 attributes = state->page[0][tile_index + 0x800]; int number = state->page[0][tile_index + 0xc00]; int color = 16 + (attributes & 0x0f); @@ -198,7 +198,7 @@ static TILE_GET_INFO( get_text_info ) static TILE_GET_INFO( get_tile_info0_bootleg ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); UINT8 attributes = state->page[0][tile_index]; int bank = 4 * ((state->vreg & 0x0f) - 1); int number, pal, color; @@ -231,7 +231,7 @@ static TILE_GET_INFO( get_tile_info0_bootleg ) static TILE_GET_INFO( get_tile_info1_bootleg ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); UINT8 attributes = state->page[1][tile_index]; int bank = 4*((state->vreg >> 4) - 1); int number, pal, color; @@ -264,7 +264,7 @@ static TILE_GET_INFO( get_tile_info1_bootleg ) static TILE_GET_INFO( get_text_info_bootleg ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); // UINT8 attributes = state->page[0][tile_index + 0x800]; int number = state->page[0][tile_index + 0xc00]; int color = 16;// + (attributes & 0x0f); @@ -284,7 +284,7 @@ static TILE_GET_INFO( get_text_info_bootleg ) VIDEO_START( combatsc ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); state->bg_tilemap[0] = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap[1] = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 8, 8, 32, 32); @@ -305,7 +305,7 @@ VIDEO_START( combatsc ) VIDEO_START( combatscb ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); state->bg_tilemap[0] = tilemap_create(machine, get_tile_info0_bootleg, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap[1] = tilemap_create(machine, get_tile_info1_bootleg, tilemap_scan_rows, 8, 8, 32, 32); @@ -333,13 +333,13 @@ VIDEO_START( combatscb ) READ8_HANDLER( combatsc_video_r ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); return state->videoram[offset]; } WRITE8_HANDLER( combatsc_video_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); state->videoram[offset] = data; if (offset < 0x800) @@ -357,7 +357,7 @@ WRITE8_HANDLER( combatsc_video_w ) WRITE8_HANDLER( combatsc_pf_control_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); running_device *k007121 = state->video_circuit ? state->k007121_2 : state->k007121_1; k007121_ctrl_w(k007121, offset, data); @@ -375,13 +375,13 @@ WRITE8_HANDLER( combatsc_pf_control_w ) READ8_HANDLER( combatsc_scrollram_r ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); return state->scrollram[offset]; } WRITE8_HANDLER( combatsc_scrollram_w ) { - combatsc_state *state = (combatsc_state *)space->machine->driver_data; + combatsc_state *state = space->machine->driver_data(); state->scrollram[offset] = data; } @@ -395,7 +395,7 @@ WRITE8_HANDLER( combatsc_scrollram_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const UINT8 *source, int circuit, UINT32 pri_mask ) { - combatsc_state *state = (combatsc_state *)machine->driver_data; + combatsc_state *state = machine->driver_data(); running_device *k007121 = circuit ? state->k007121_2 : state->k007121_1; int base_color = (circuit * 4) * 16 + (k007121_ctrlram_r(k007121, 6) & 0x10) * 2; @@ -405,7 +405,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( combatsc ) { - combatsc_state *state = (combatsc_state *)screen->machine->driver_data; + combatsc_state *state = screen->machine->driver_data(); int i; set_pens(screen->machine); @@ -563,7 +563,7 @@ static void bootleg_draw_sprites( running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( combatscb ) { - combatsc_state *state = (combatsc_state *)screen->machine->driver_data; + combatsc_state *state = screen->machine->driver_data(); int i; set_pens(screen->machine); diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index fe04cafd5d4..effc86d514d 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -12,7 +12,7 @@ WRITE8_HANDLER( commando_videoram_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -20,7 +20,7 @@ WRITE8_HANDLER( commando_videoram_w ) WRITE8_HANDLER( commando_colorram_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -28,7 +28,7 @@ WRITE8_HANDLER( commando_colorram_w ) WRITE8_HANDLER( commando_videoram2_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -36,7 +36,7 @@ WRITE8_HANDLER( commando_videoram2_w ) WRITE8_HANDLER( commando_colorram2_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -44,7 +44,7 @@ WRITE8_HANDLER( commando_colorram2_w ) WRITE8_HANDLER( commando_scrollx_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); state->scroll_x[offset] = data; tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll_x[0] | (state->scroll_x[1] << 8)); @@ -52,7 +52,7 @@ WRITE8_HANDLER( commando_scrollx_w ) WRITE8_HANDLER( commando_scrolly_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); state->scroll_y[offset] = data; tilemap_set_scrolly(state->bg_tilemap, 0, state->scroll_y[0] | (state->scroll_y[1] << 8)); @@ -60,7 +60,7 @@ WRITE8_HANDLER( commando_scrolly_w ) WRITE8_HANDLER( commando_c804_w ) { - commando_state *state = (commando_state *)space->machine->driver_data; + commando_state *state = space->machine->driver_data(); // bits 0 and 1 are coin counters coin_counter_w(space->machine, 0, data & 0x01); @@ -75,7 +75,7 @@ WRITE8_HANDLER( commando_c804_w ) static TILE_GET_INFO( get_bg_tile_info ) { - commando_state *state = (commando_state *)machine->driver_data; + commando_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - commando_state *state = (commando_state *)machine->driver_data; + commando_state *state = machine->driver_data(); int attr = state->colorram2[tile_index]; int code = state->videoram2[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( commando ) { - commando_state *state = (commando_state *)machine->driver_data; + commando_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -137,7 +137,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( commando ) { - commando_state *state = (commando_state *)screen->machine->driver_data; + commando_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c index 65223a089c9..2b45c2dd32f 100644 --- a/src/mame/video/compgolf.c +++ b/src/mame/video/compgolf.c @@ -35,21 +35,21 @@ PALETTE_INIT( compgolf ) WRITE8_HANDLER( compgolf_video_w ) { - compgolf_state *state = (compgolf_state *)space->machine->driver_data; + compgolf_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->text_tilemap, offset / 2); } WRITE8_HANDLER( compgolf_back_w ) { - compgolf_state *state = (compgolf_state *)space->machine->driver_data; + compgolf_state *state = space->machine->driver_data(); state->bg_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } static TILE_GET_INFO( get_text_info ) { - compgolf_state *state = (compgolf_state *)machine->driver_data; + compgolf_state *state = machine->driver_data(); tile_index <<= 1; SET_TILE_INFO(2, state->videoram[tile_index + 1] | (state->videoram[tile_index] << 8), state->videoram[tile_index] >> 2, 0); } @@ -62,7 +62,7 @@ static TILEMAP_MAPPER( back_scan ) static TILE_GET_INFO( get_back_info ) { - compgolf_state *state = (compgolf_state *)machine->driver_data; + compgolf_state *state = machine->driver_data(); int attr = state->bg_ram[tile_index * 2]; int code = state->bg_ram[tile_index * 2 + 1] + ((attr & 1) << 8); int color = (attr & 0x3e) >> 1; @@ -72,7 +72,7 @@ static TILE_GET_INFO( get_back_info ) VIDEO_START( compgolf ) { - compgolf_state *state = (compgolf_state *)machine->driver_data; + compgolf_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_back_info, back_scan, 16, 16, 32, 32); state->text_tilemap = tilemap_create(machine, get_text_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -92,7 +92,7 @@ xx------ xxxxxxxx -------- -------- sprite code */ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - compgolf_state *state = (compgolf_state *)machine->driver_data; + compgolf_state *state = machine->driver_data(); int offs, fx, fy, x, y, color, sprite; for (offs = 0; offs < 0x60; offs += 4) @@ -120,7 +120,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( compgolf ) { - compgolf_state *state = (compgolf_state *)screen->machine->driver_data; + compgolf_state *state = screen->machine->driver_data(); int scrollx = state->scrollx_hi + state->scrollx_lo; int scrolly = state->scrolly_hi + state->scrolly_lo; diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index 0e7fefa787a..15b6bca9989 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -54,7 +54,7 @@ PALETTE_INIT( contra ) static void set_pens( running_machine *machine ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x100; i += 2) @@ -77,7 +77,7 @@ static void set_pens( running_machine *machine ) static TILE_GET_INFO( get_fg_tile_info ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121_1, 3); UINT8 ctrl_4 = k007121_ctrlram_r(state->k007121_1, 4); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121_1, 5); @@ -106,7 +106,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121_2, 3); UINT8 ctrl_4 = k007121_ctrlram_r(state->k007121_2, 4); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121_2, 5); @@ -136,7 +136,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121_1, 5); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_1, 6); int attr = state->tx_cram[tile_index]; @@ -166,7 +166,7 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( contra ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -199,7 +199,7 @@ VIDEO_START( contra ) WRITE8_HANDLER( contra_fg_vram_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); state->fg_vram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -207,7 +207,7 @@ WRITE8_HANDLER( contra_fg_vram_w ) WRITE8_HANDLER( contra_fg_cram_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); state->fg_cram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -215,7 +215,7 @@ WRITE8_HANDLER( contra_fg_cram_w ) WRITE8_HANDLER( contra_bg_vram_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); state->bg_vram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -223,7 +223,7 @@ WRITE8_HANDLER( contra_bg_vram_w ) WRITE8_HANDLER( contra_bg_cram_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); state->bg_cram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -231,7 +231,7 @@ WRITE8_HANDLER( contra_bg_cram_w ) WRITE8_HANDLER( contra_text_vram_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); state->tx_vram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -239,7 +239,7 @@ WRITE8_HANDLER( contra_text_vram_w ) WRITE8_HANDLER( contra_text_cram_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); state->tx_cram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -247,7 +247,7 @@ WRITE8_HANDLER( contra_text_cram_w ) WRITE8_HANDLER( contra_K007121_ctrl_0_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_1, 6); if (offset == 3) @@ -272,7 +272,7 @@ WRITE8_HANDLER( contra_K007121_ctrl_0_w ) WRITE8_HANDLER( contra_K007121_ctrl_1_w ) { - contra_state *state = (contra_state *)space->machine->driver_data; + contra_state *state = space->machine->driver_data(); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_2, 6); if (offset == 3) @@ -303,7 +303,7 @@ WRITE8_HANDLER( contra_K007121_ctrl_1_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int bank ) { - contra_state *state = (contra_state *)machine->driver_data; + contra_state *state = machine->driver_data(); running_device *k007121 = bank ? state->k007121_2 : state->k007121_1; int base_color = (k007121_ctrlram_r(k007121, 6) & 0x30) * 2; const UINT8 *source; @@ -318,7 +318,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( contra ) { - contra_state *state = (contra_state *)screen->machine->driver_data; + contra_state *state = screen->machine->driver_data(); UINT8 ctrl_1_0 = k007121_ctrlram_r(state->k007121_1, 0); UINT8 ctrl_1_2 = k007121_ctrlram_r(state->k007121_1, 2); UINT8 ctrl_2_0 = k007121_ctrlram_r(state->k007121_2, 0); diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c index 726c27a7267..f8fe2e1beaa 100644 --- a/src/mame/video/cop01.c +++ b/src/mame/video/cop01.c @@ -62,7 +62,7 @@ PALETTE_INIT( cop01 ) static TILE_GET_INFO( get_bg_tile_info ) { - cop01_state *state = (cop01_state *)machine->driver_data; + cop01_state *state = machine->driver_data(); int tile = state->bgvideoram[tile_index]; int attr = state->bgvideoram[tile_index + 0x800]; int pri = (attr & 0x80) >> 7; @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - cop01_state *state = (cop01_state *)machine->driver_data; + cop01_state *state = machine->driver_data(); int tile = state->fgvideoram[tile_index]; SET_TILE_INFO(0, tile, 0, 0); } @@ -101,7 +101,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( cop01 ) { - cop01_state *state = (cop01_state *)machine->driver_data; + cop01_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8, 8, 64, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows, 8, 8, 32, 32); @@ -122,14 +122,14 @@ VIDEO_START( cop01 ) WRITE8_HANDLER( cop01_background_w ) { - cop01_state *state = (cop01_state *)space->machine->driver_data; + cop01_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x7ff); } WRITE8_HANDLER( cop01_foreground_w ) { - cop01_state *state = (cop01_state *)space->machine->driver_data; + cop01_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -147,7 +147,7 @@ WRITE8_HANDLER( cop01_vreg_w ) * -------x msb xscroll * 0x43: xxxxxxxx yscroll */ - cop01_state *state = (cop01_state *)space->machine->driver_data; + cop01_state *state = space->machine->driver_data(); state->vreg[offset] = data; if (offset == 0) @@ -168,7 +168,7 @@ WRITE8_HANDLER( cop01_vreg_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cop01_state *state = (cop01_state *)machine->driver_data; + cop01_state *state = machine->driver_data(); int offs, code, attr, sx, sy, flipx, flipy, color; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -208,7 +208,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( cop01 ) { - cop01_state *state = (cop01_state *)screen->machine->driver_data; + cop01_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->vreg[1] + 256 * (state->vreg[2] & 1)); tilemap_set_scrolly(state->bg_tilemap, 0, state->vreg[3]); diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c index 6c84597e001..b7b3a6ac091 100644 --- a/src/mame/video/copsnrob.c +++ b/src/mame/video/copsnrob.c @@ -10,7 +10,7 @@ VIDEO_UPDATE( copsnrob ) { - copsnrob_state *state = (copsnrob_state *)screen->machine->driver_data; + copsnrob_state *state = screen->machine->driver_data(); int offs, x, y; /* redrawing the entire display is faster in this case */ diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c index 9b2a10e3de5..342abe9eeba 100644 --- a/src/mame/video/cosmic.c +++ b/src/mame/video/cosmic.c @@ -12,14 +12,14 @@ WRITE8_HANDLER( cosmic_color_register_w ) { - cosmic_state *state = (cosmic_state *)space->machine->driver_data; + cosmic_state *state = space->machine->driver_data(); state->color_registers[offset] = data ? 1 : 0; } static pen_t panic_map_color( running_machine *machine, UINT8 x, UINT8 y ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 9) | (state->color_registers[2] << 10) | ((x >> 4) << 5) | (y >> 3); pen_t pen = memory_region(machine, "user1")[offs]; @@ -31,7 +31,7 @@ static pen_t panic_map_color( running_machine *machine, UINT8 x, UINT8 y ) static pen_t cosmica_map_color( running_machine *machine, UINT8 x, UINT8 y ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 9) | ((x >> 4) << 5) | (y >> 3); pen_t pen = memory_region(machine, "user1")[offs]; @@ -43,7 +43,7 @@ static pen_t cosmica_map_color( running_machine *machine, UINT8 x, UINT8 y ) static pen_t cosmicg_map_color( running_machine *machine, UINT8 x, UINT8 y ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 8) | (state->color_registers[1] << 9) | ((y >> 4) << 4) | (x >> 4); pen_t pen = memory_region(machine, "user1")[offs]; @@ -53,7 +53,7 @@ static pen_t cosmicg_map_color( running_machine *machine, UINT8 x, UINT8 y ) static pen_t magspot_map_color( running_machine *machine, UINT8 x, UINT8 y ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 9) | ((x >> 3) << 4) | (y >> 4); pen_t pen = memory_region(machine, "user1")[offs]; @@ -78,7 +78,7 @@ static pen_t magspot_map_color( running_machine *machine, UINT8 x, UINT8 y ) PALETTE_INIT( panic ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); int i; /* allocate the colortable */ @@ -120,7 +120,7 @@ PALETTE_INIT( panic ) PALETTE_INIT( cosmica ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); int i; /* allocate the colortable */ @@ -163,7 +163,7 @@ PALETTE_INIT( cosmica ) */ PALETTE_INIT( cosmicg ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); int i; for (i = 0; i < machine->total_colors(); i++) @@ -181,7 +181,7 @@ PALETTE_INIT( cosmicg ) PALETTE_INIT( magspot ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); int i; /* allocate the colortable */ @@ -215,7 +215,7 @@ PALETTE_INIT( magspot ) PALETTE_INIT( nomnlnd ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); int i; /* allocate the colortable */ @@ -246,14 +246,14 @@ PALETTE_INIT( nomnlnd ) WRITE8_HANDLER( cosmic_background_enable_w ) { - cosmic_state *state = (cosmic_state *)space->machine->driver_data; + cosmic_state *state = space->machine->driver_data(); state->background_enable = data; } static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); offs_t offs; for (offs = 0; offs < state->videoram_size; offs++) @@ -285,7 +285,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const recta static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int color_mask, int extra_sprites ) { - cosmic_state *state = (cosmic_state *)machine->driver_data; + cosmic_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_size - 4;offs >= 0;offs -= 4) @@ -584,7 +584,7 @@ VIDEO_UPDATE( magspot ) VIDEO_UPDATE( devzone ) { - cosmic_state *state = (cosmic_state *)screen->machine->driver_data; + cosmic_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0); @@ -599,7 +599,7 @@ VIDEO_UPDATE( devzone ) VIDEO_UPDATE( nomnlnd ) { - cosmic_state *state = (cosmic_state *)screen->machine->driver_data; + cosmic_state *state = screen->machine->driver_data(); /* according to the video summation logic on pg4, the trees and river have the highest priority */ diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index 97e5b759fc4..6f7b672c351 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1383,7 +1383,7 @@ static void cps1_build_palette(running_machine *machine, const UINT16* const pal static MACHINE_RESET( cps ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); const char *gamename = machine->gamedrv->name; const struct CPS1config *pCFG = &cps1_config_table[0]; @@ -1451,7 +1451,7 @@ static MACHINE_RESET( cps ) INLINE UINT16 *cps1_base( running_machine *machine, int offset, int boundary ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int base = state->cps_a_regs[offset] * 256; /* @@ -1470,7 +1470,7 @@ INLINE UINT16 *cps1_base( running_machine *machine, int offset, int boundary ) WRITE16_HANDLER( cps1_cps_a_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->cps_a_regs[offset]); /* @@ -1497,7 +1497,7 @@ WRITE16_HANDLER( cps1_cps_a_w ) READ16_HANDLER( cps1_cps_b_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); /* Some games interrogate a couple of registers on bootup. */ /* These are CPS1 board B self test checks. They wander from game to */ @@ -1541,7 +1541,7 @@ READ16_HANDLER( cps1_cps_b_r ) WRITE16_HANDLER( cps1_cps_b_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->cps_b_regs[offset]); if (state->cps_version == 2) @@ -1608,7 +1608,7 @@ WRITE16_HANDLER( cps1_cps_b_w ) INLINE int cps2_port( running_machine *machine, int offset ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); return state->output[offset / 2]; } @@ -1683,7 +1683,7 @@ static void cps2_gfx_decode( running_machine *machine ) DRIVER_INIT( cps1 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); cps1_gfx_decode(machine); @@ -1699,7 +1699,7 @@ DRIVER_INIT( cps1 ) DRIVER_INIT( cps2_video ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); cps2_gfx_decode(machine); @@ -1715,7 +1715,7 @@ DRIVER_INIT( cps2_video ) void cps1_get_video_base( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int layercontrol, videocontrol, scroll1xoff, scroll2xoff, scroll3xoff; /* Re-calculate the VIDEO RAM base */ @@ -1808,7 +1808,7 @@ void cps1_get_video_base( running_machine *machine ) WRITE16_HANDLER( cps1_gfxram_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); int page = (offset >> 7) & 0x3c0; COMBINE_DATA(&state->gfxram[offset]); @@ -1826,7 +1826,7 @@ WRITE16_HANDLER( cps1_gfxram_w ) static int gfxrom_bank_mapper( running_machine *machine, int type, int code ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); const struct gfx_range *range = state->game_config->bank_mapper; int shift = 0; @@ -1895,7 +1895,7 @@ static TILEMAP_MAPPER( tilemap2_scan ) static TILE_GET_INFO( get_tile0_info ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int code = state->scroll1[2 * tile_index]; int attr = state->scroll1[2 * tile_index + 1]; int gfxset; @@ -1922,7 +1922,7 @@ static TILE_GET_INFO( get_tile0_info ) static TILE_GET_INFO( get_tile1_info ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int code = state->scroll2[2 * tile_index]; int attr = state->scroll2[2 * tile_index + 1]; @@ -1942,7 +1942,7 @@ static TILE_GET_INFO( get_tile1_info ) static TILE_GET_INFO( get_tile2_info ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int code = state->scroll3[2 * tile_index] & 0x3fff; int attr = state->scroll3[2 * tile_index + 1]; @@ -1965,7 +1965,7 @@ static TILE_GET_INFO( get_tile2_info ) static void cps1_update_transmasks( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int i; for (i = 0; i < 4; i++) @@ -1991,7 +1991,7 @@ static STATE_POSTLOAD( cps_postload ) static VIDEO_START( cps ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int i; MACHINE_RESET_CALL(cps); @@ -2090,7 +2090,7 @@ static VIDEO_START( cps ) VIDEO_START( cps1 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->cps_version = 1; VIDEO_START_CALL(cps); @@ -2098,7 +2098,7 @@ VIDEO_START( cps1 ) VIDEO_START( cps2 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->cps_version = 2; VIDEO_START_CALL(cps); @@ -2114,7 +2114,7 @@ VIDEO_START( cps2 ) static void cps1_build_palette( running_machine *machine, const UINT16* const palette_base ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int offset, page; const UINT16 *palette_ram = palette_base; int ctrl = state->cps_b_regs[state->game_config->palette_control/2]; @@ -2192,7 +2192,7 @@ static void cps1_build_palette( running_machine *machine, const UINT16* const pa static void cps1_find_last_sprite( running_machine *machine ) /* Find the offset of last sprite */ { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int offset = 0; /* Locate the end of table marker */ while (offset < state->obj_size / 2) @@ -2214,7 +2214,7 @@ static void cps1_find_last_sprite( running_machine *machine ) /* Find the off static void cps1_render_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); #define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \ { \ @@ -2373,7 +2373,7 @@ static void cps1_render_sprites( running_machine *machine, bitmap_t *bitmap, con WRITE16_HANDLER( cps2_objram_bank_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) state->objram_bank = data & 1; @@ -2381,7 +2381,7 @@ WRITE16_HANDLER( cps2_objram_bank_w ) READ16_HANDLER( cps2_objram1_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (state->objram_bank & 1) return state->objram2[offset]; else @@ -2390,7 +2390,7 @@ READ16_HANDLER( cps2_objram1_r ) READ16_HANDLER( cps2_objram2_r ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (state->objram_bank & 1) return state->objram1[offset]; else @@ -2399,7 +2399,7 @@ READ16_HANDLER( cps2_objram2_r ) WRITE16_HANDLER( cps2_objram1_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (state->objram_bank & 1) COMBINE_DATA(&state->objram2[offset]); else @@ -2408,7 +2408,7 @@ WRITE16_HANDLER( cps2_objram1_w ) WRITE16_HANDLER( cps2_objram2_w ) { - cps_state *state = (cps_state *)space->machine->driver_data; + cps_state *state = space->machine->driver_data(); if (state->objram_bank & 1) COMBINE_DATA(&state->objram1[offset]); else @@ -2417,7 +2417,7 @@ WRITE16_HANDLER( cps2_objram2_w ) static UINT16 *cps2_objbase( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int baseptr; baseptr = 0x7000; @@ -2435,7 +2435,7 @@ static UINT16 *cps2_objbase( running_machine *machine ) static void cps2_find_last_sprite( running_machine *machine ) /* Find the offset of last sprite */ { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); int offset = 0; UINT16 *base = state->cps2_buffered_obj; @@ -2457,7 +2457,7 @@ static void cps2_find_last_sprite( running_machine *machine ) /* Find the off static void cps2_render_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int *primasks ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); #define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \ { \ @@ -2606,7 +2606,7 @@ static void cps2_render_sprites( running_machine *machine, bitmap_t *bitmap, con static void cps1_render_stars( screen_device *screen, bitmap_t *bitmap, const rectangle *cliprect ) { - cps_state *state = (cps_state *)screen->machine->driver_data; + cps_state *state = screen->machine->driver_data(); int offs; UINT8 *stars_rom = memory_region(screen->machine, "stars"); @@ -2674,7 +2674,7 @@ static void cps1_render_stars( screen_device *screen, bitmap_t *bitmap, const re static void cps1_render_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer, int primask ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); switch (layer) { case 0: @@ -2690,7 +2690,7 @@ static void cps1_render_layer( running_machine *machine, bitmap_t *bitmap, const static void cps1_render_high_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); switch (layer) { case 0: @@ -2713,7 +2713,7 @@ static void cps1_render_high_layer( running_machine *machine, bitmap_t *bitmap, VIDEO_UPDATE( cps1 ) { - cps_state *state = (cps_state *)screen->machine->driver_data; + cps_state *state = screen->machine->driver_data(); int layercontrol, l0, l1, l2, l3; int videocontrol = state->cps_a_regs[CPS1_VIDEOCONTROL]; @@ -2865,7 +2865,7 @@ if (0 && input_code_pressed(screen->machine, KEYCODE_Z)) VIDEO_EOF( cps1 ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); /* Get video memory base registers */ cps1_get_video_base(machine); @@ -2879,13 +2879,13 @@ VIDEO_EOF( cps1 ) void cps2_set_sprite_priorities( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); state->pri_ctrl = cps2_port(machine, CPS2_OBJ_PRI); } void cps2_objram_latch( running_machine *machine ) { - cps_state *state = (cps_state *)machine->driver_data; + cps_state *state = machine->driver_data(); cps2_set_sprite_priorities(machine); memcpy(state->cps2_buffered_obj, cps2_objbase(machine), state->cps2_obj_size); } diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c index 9cf63f9b91b..87eaa1dfa98 100644 --- a/src/mame/video/crgolf.c +++ b/src/mame/video/crgolf.c @@ -20,7 +20,7 @@ WRITE8_HANDLER( crgolf_videoram_w ) { - crgolf_state *state = (crgolf_state *)space->machine->driver_data; + crgolf_state *state = space->machine->driver_data(); if (*state->screen_select & 1) state->videoram_b[offset] = data; @@ -31,7 +31,7 @@ WRITE8_HANDLER( crgolf_videoram_w ) READ8_HANDLER( crgolf_videoram_r ) { - crgolf_state *state = (crgolf_state *)space->machine->driver_data; + crgolf_state *state = space->machine->driver_data(); UINT8 ret; if (*state->screen_select & 1) @@ -92,7 +92,7 @@ static void get_pens( running_machine *machine, pen_t *pens ) static VIDEO_START( crgolf ) { - crgolf_state *state = (crgolf_state *)machine->driver_data; + crgolf_state *state = machine->driver_data(); /* allocate memory for the two bitmaps */ state->videoram_a = auto_alloc_array(machine, UINT8, VIDEORAM_SIZE); @@ -113,7 +113,7 @@ static VIDEO_START( crgolf ) static VIDEO_UPDATE( crgolf ) { - crgolf_state *state = (crgolf_state *)screen->machine->driver_data; + crgolf_state *state = screen->machine->driver_data(); int flip = *state->screen_flip & 1; offs_t offs; diff --git a/src/mame/video/crimfght.c b/src/mame/video/crimfght.c index 8ed2816be43..b8698124385 100644 --- a/src/mame/video/crimfght.c +++ b/src/mame/video/crimfght.c @@ -11,7 +11,7 @@ void crimfght_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - crimfght_state *state = (crimfght_state *)machine->driver_data; + crimfght_state *state = machine->driver_data(); *flags = (*color & 0x20) ? TILE_FLIPX : 0; *code |= ((*color & 0x1f) << 8) | (bank << 13); @@ -30,7 +30,7 @@ void crimfght_sprite_callback( running_machine *machine, int *code, int *color, /* The PROM allows for mixed priorities, where sprites would have */ /* priority over text but not on one or both of the other two planes. */ /* Luckily, this isn't used by the game. */ - crimfght_state *state = (crimfght_state *)machine->driver_data; + crimfght_state *state = machine->driver_data(); switch (*color & 0x70) { @@ -57,7 +57,7 @@ void crimfght_sprite_callback( running_machine *machine, int *code, int *color, VIDEO_START( crimfght ) { - crimfght_state *state = (crimfght_state *)machine->driver_data; + crimfght_state *state = machine->driver_data(); machine->generic.paletteram.u8 = auto_alloc_array(machine, UINT8, 0x400); @@ -79,7 +79,7 @@ VIDEO_START( crimfght ) VIDEO_UPDATE( crimfght ) { - crimfght_state *state = (crimfght_state *)screen->machine->driver_data; + crimfght_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index ebfd133b11d..010c517577b 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -14,7 +14,7 @@ WRITE16_HANDLER( bestri_tilebank_w) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); state->bestri_tilebank = (data>>10) & 0xf; //printf("bestri %04x\n", data); @@ -26,7 +26,7 @@ WRITE16_HANDLER( bestri_tilebank_w) WRITE16_HANDLER ( bestri_bg_scrolly_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); /* Very Strange */ int scroll = (data & 0x3ff) ^ 0x0155; @@ -35,7 +35,7 @@ WRITE16_HANDLER ( bestri_bg_scrolly_w ) WRITE16_HANDLER ( bestri_fg_scrolly_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); /* Very Strange */ int scroll = (data & 0x3ff) ^ 0x00ab; @@ -44,7 +44,7 @@ WRITE16_HANDLER ( bestri_fg_scrolly_w ) WRITE16_HANDLER ( bestri_fg_scrollx_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); // printf("fg_layer x %04x\n",data); tilemap_set_scrollx(state->fg_layer, 0, data + 32); @@ -52,7 +52,7 @@ WRITE16_HANDLER ( bestri_fg_scrollx_w ) WRITE16_HANDLER ( bestri_bg_scrollx_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); // printf("bg_layer x %04x\n",data); tilemap_set_scrollx(state->bg_layer, 0, data - 60); @@ -61,46 +61,46 @@ WRITE16_HANDLER ( bestri_bg_scrollx_w ) WRITE16_HANDLER ( crospang_fg_scrolly_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->fg_layer, 0, data + 8); } WRITE16_HANDLER ( crospang_bg_scrolly_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_layer, 0, data + 8); } WRITE16_HANDLER ( crospang_fg_scrollx_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->fg_layer, 0, data); } WRITE16_HANDLER ( crospang_bg_scrollx_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_layer, 0, data + 4); } WRITE16_HANDLER ( crospang_fg_videoram_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_layer, offset); } WRITE16_HANDLER ( crospang_bg_videoram_w ) { - crospang_state *state = (crospang_state *)space->machine->driver_data; + crospang_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_layer, offset); } static TILE_GET_INFO( get_bg_tile_info ) { - crospang_state *state = (crospang_state *)machine->driver_data; + crospang_state *state = machine->driver_data(); int data = state->bg_videoram[tile_index]; int tile = data & 0xfff; int color = (data >> 12) & 0x0f; @@ -110,7 +110,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - crospang_state *state = (crospang_state *)machine->driver_data; + crospang_state *state = machine->driver_data(); int data = state->fg_videoram[tile_index]; int tile = data & 0xfff; int color = (data >> 12) & 0x0f; @@ -142,7 +142,7 @@ static TILE_GET_INFO( get_fg_tile_info ) /* jumpkids / tumbleb.c! */ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - crospang_state *state = (crospang_state *)machine->driver_data; + crospang_state *state = machine->driver_data(); int offs; int flipscreen = 0; @@ -208,7 +208,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_START( crospang ) { - crospang_state *state = (crospang_state *)machine->driver_data; + crospang_state *state = machine->driver_data(); state->bg_layer = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_layer = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -217,7 +217,7 @@ VIDEO_START( crospang ) VIDEO_UPDATE( crospang ) { - crospang_state *state = (crospang_state *)screen->machine->driver_data; + crospang_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_layer, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_layer, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 79b645f2d11..8b764252d0a 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -11,7 +11,7 @@ static TILE_GET_INFO( get_tile_info1 ) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); int code = state->videoram1[tile_index]; SET_TILE_INFO(1, (code & 0xfff) + (state->roz_bank << 12), code >> 12, 0); @@ -19,7 +19,7 @@ static TILE_GET_INFO( get_tile_info1 ) static TILE_GET_INFO( get_tile_info2 ) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); int code = state->videoram2[tile_index]; SET_TILE_INFO(0, code, 0, 0); @@ -34,7 +34,7 @@ static TILE_GET_INFO( get_tile_info2 ) VIDEO_START( crshrace ) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); state->tilemap1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 16, 16, 64, 64); state->tilemap2 = tilemap_create(machine, get_tile_info2, tilemap_scan_rows, 8, 8, 64, 64); @@ -52,7 +52,7 @@ VIDEO_START( crshrace ) WRITE16_HANDLER( crshrace_videoram1_w ) { - crshrace_state *state = (crshrace_state *)space->machine->driver_data; + crshrace_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram1[offset]); tilemap_mark_tile_dirty(state->tilemap1, offset); @@ -60,7 +60,7 @@ WRITE16_HANDLER( crshrace_videoram1_w ) WRITE16_HANDLER( crshrace_videoram2_w ) { - crshrace_state *state = (crshrace_state *)space->machine->driver_data; + crshrace_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram2[offset]); tilemap_mark_tile_dirty(state->tilemap2, offset); @@ -68,7 +68,7 @@ WRITE16_HANDLER( crshrace_videoram2_w ) WRITE16_HANDLER( crshrace_roz_bank_w ) { - crshrace_state *state = (crshrace_state *)space->machine->driver_data; + crshrace_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -83,7 +83,7 @@ WRITE16_HANDLER( crshrace_roz_bank_w ) WRITE16_HANDLER( crshrace_gfxctrl_w ) { - crshrace_state *state = (crshrace_state *)space->machine->driver_data; + crshrace_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -101,7 +101,7 @@ WRITE16_HANDLER( crshrace_gfxctrl_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); UINT16 *buffered_spriteram = machine->generic.buffered_spriteram.u16; UINT16 *buffered_spriteram_2 = machine->generic.buffered_spriteram2.u16; int offs; @@ -173,21 +173,21 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan static void draw_bg( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap2, 0, 0); } static void draw_fg(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - crshrace_state *state = (crshrace_state *)machine->driver_data; + crshrace_state *state = machine->driver_data(); k053936_zoom_draw(state->k053936, bitmap, cliprect, state->tilemap1, 0, 0, 1); } VIDEO_UPDATE( crshrace ) { - crshrace_state *state = (crshrace_state *)screen->machine->driver_data; + crshrace_state *state = screen->machine->driver_data(); if (state->gfxctrl & 0x04) /* display disable? */ { diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c index 5cb0634d7d8..cd4f810f5f4 100644 --- a/src/mame/video/cvs.c +++ b/src/mame/video/cvs.c @@ -68,7 +68,7 @@ PALETTE_INIT( cvs ) static void set_pens( running_machine *machine ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); int i; for (i = 0; i < 0x10; i++) @@ -85,7 +85,7 @@ static void set_pens( running_machine *machine ) WRITE8_HANDLER( cvs_video_fx_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); if (data & 0xce) logerror("%4x : CVS: Unimplemented CVS video fx = %2x\n",cpu_get_pc(space->cpu), data & 0xce); @@ -107,13 +107,13 @@ WRITE8_HANDLER( cvs_video_fx_w ) READ8_HANDLER( cvs_collision_r ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); return state->collision_register; } READ8_HANDLER( cvs_collision_clear ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); state->collision_register = 0; return 0; } @@ -121,14 +121,14 @@ READ8_HANDLER( cvs_collision_clear ) WRITE8_HANDLER( cvs_scroll_w ) { - cvs_state *state = (cvs_state *)space->machine->driver_data; + cvs_state *state = space->machine->driver_data(); state->scroll_reg = 255 - data; } VIDEO_START( cvs ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); int generator = 0; int y; @@ -182,14 +182,14 @@ VIDEO_START( cvs ) void cvs_scroll_stars( running_machine *machine ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); state->stars_scroll++; } VIDEO_UPDATE( cvs ) { - cvs_state *state = (cvs_state *)screen->machine->driver_data; + cvs_state *state = screen->machine->driver_data(); static const int ram_based_char_start_indices[] = { 0xe0, 0xc0, 0x100, 0x80 }; offs_t offs; int scroll[8]; diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 74ed950bc6a..739b7f461db 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -21,8 +21,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + cyberbal_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x07; SET_TILE_INFO(2, code, color, (data >> 15) & 1); @@ -31,8 +31,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_alpha2_tile_info ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha2[tile_index]; + cyberbal_state *state = machine->driver_data(); + UINT16 data = state->alpha2[tile_index]; int code = data & 0xfff; int color = (data >> 12) & 0x07; SET_TILE_INFO(2, code, 0x80 | color, (data >> 15) & 1); @@ -41,8 +41,8 @@ static TILE_GET_INFO( get_alpha2_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + cyberbal_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = data & 0x1fff; int color = (data >> 11) & 0x0f; SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -51,8 +51,8 @@ static TILE_GET_INFO( get_playfield_tile_info ) static TILE_GET_INFO( get_playfield2_tile_info ) { - cyberbal_state *state = (cyberbal_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield2[tile_index]; + cyberbal_state *state = machine->driver_data(); + UINT16 data = state->playfield2[tile_index]; int code = data & 0x1fff; int color = (data >> 11) & 0x0f; SET_TILE_INFO(0, code, 0x80 | color, (data >> 15) & 1); @@ -141,36 +141,36 @@ static void video_start_cyberbal_common(running_machine* machine, int screens) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - cyberbal_state *state = (cyberbal_state *)machine->driver_data; + cyberbal_state *state = machine->driver_data(); /* set the slip variables */ atarimo_0_slipram = &state->current_slip[0]; atarimo_1_slipram = &state->current_slip[1]; /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &mo0desc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* allocate the second screen if necessary */ if (screens == 2) { /* initialize the playfield */ - state->atarigen.playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_rows, 16,8, 64,64); - tilemap_set_scrollx(state->atarigen.playfield2_tilemap, 0, 0); + state->playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_rows, 16,8, 64,64); + tilemap_set_scrollx(state->playfield2_tilemap, 0, 0); /* initialize the motion objects */ atarimo_init(machine, 1, &mo1desc); /* initialize the alphanumerics */ - state->atarigen.alpha2_tilemap = tilemap_create(machine, get_alpha2_tile_info, tilemap_scan_rows, 16,8, 64,32); - tilemap_set_scrollx(state->atarigen.alpha2_tilemap, 0, 0); - tilemap_set_transparent_pen(state->atarigen.alpha2_tilemap, 0); + state->alpha2_tilemap = tilemap_create(machine, get_alpha2_tile_info, tilemap_scan_rows, 16,8, 64,32); + tilemap_set_scrollx(state->alpha2_tilemap, 0, 0); + tilemap_set_transparent_pen(state->alpha2_tilemap, 0); } /* save states */ @@ -228,28 +228,28 @@ INLINE void set_palette_entry(running_machine *machine, int entry, UINT16 value) WRITE16_HANDLER( cyberbal_paletteram_0_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); COMBINE_DATA(&state->paletteram_0[offset]); set_palette_entry(space->machine, offset, state->paletteram_0[offset]); } READ16_HANDLER( cyberbal_paletteram_0_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); return state->paletteram_0[offset]; } WRITE16_HANDLER( cyberbal_paletteram_1_w ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); COMBINE_DATA(&state->paletteram_1[offset]); set_palette_entry(space->machine, offset + 0x800, state->paletteram_1[offset]); } READ16_HANDLER( cyberbal_paletteram_1_r ) { - cyberbal_state *state = (cyberbal_state *)space->machine->driver_data; + cyberbal_state *state = space->machine->driver_data(); return state->paletteram_1[offset]; } @@ -263,14 +263,14 @@ READ16_HANDLER( cyberbal_paletteram_1_r ) void cyberbal_scanline_update(screen_device &screen, int scanline) { - cyberbal_state *state = (cyberbal_state *)screen.machine->driver_data; + cyberbal_state *state = screen.machine->driver_data(); int i; screen_device *update_screen; /* loop over screens */ for (i = 0, update_screen = screen_first(*screen.machine); update_screen != NULL; i++, update_screen = screen_next(update_screen)) { - UINT16 *vram = i ? state->atarigen.alpha2 : state->atarigen.alpha; + UINT16 *vram = i ? state->alpha2 : state->alpha; UINT16 *base = &vram[((scanline - 8) / 8) * 64 + 47]; /* keep in range */ @@ -287,7 +287,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) if (scanline > 0) update_screen->update_partial(scanline - 1); state->playfield_palette_bank[i] = (base[3] >> 1) & 7; - tilemap_set_palette_offset(i ? state->atarigen.playfield2_tilemap : state->atarigen.playfield_tilemap, state->playfield_palette_bank[i] << 8); + tilemap_set_palette_offset(i ? state->playfield2_tilemap : state->playfield_tilemap, state->playfield_palette_bank[i] << 8); } } if (!(base[4] & 1)) @@ -297,7 +297,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) { if (scanline > 0) update_screen->update_partial(scanline - 1); - tilemap_set_scrollx(i ? state->atarigen.playfield2_tilemap : state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrollx(i ? state->playfield2_tilemap : state->playfield_tilemap, 0, newscroll); state->playfield_xscroll[i] = newscroll; } } @@ -309,7 +309,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) { if (scanline > 0) update_screen->update_partial(scanline - 1); - tilemap_set_scrolly(i ? state->atarigen.playfield2_tilemap : state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrolly(i ? state->playfield2_tilemap : state->playfield_tilemap, 0, newscroll); state->playfield_yscroll[i] = newscroll; } } @@ -335,7 +335,7 @@ void cyberbal_scanline_update(screen_device &screen, int scanline) static void update_one_screen(screen_device &screen, bitmap_t *bitmap, const rectangle *cliprect) { - cyberbal_state *state = (cyberbal_state *)screen.machine->driver_data; + cyberbal_state *state = screen.machine->driver_data(); atarimo_rect_list rectlist; rectangle tempclip = *cliprect; bitmap_t *mobitmap; @@ -348,7 +348,7 @@ static void update_one_screen(screen_device &screen, bitmap_t *bitmap, const rec left_screen = screen.machine->device("screen"); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, (&screen == left_screen) ? state->atarigen.playfield_tilemap : state->atarigen.playfield2_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, (&screen == left_screen) ? state->playfield_tilemap : state->playfield2_tilemap, 0, 0); /* draw the MOs -- note some kludging to get this to work correctly for 2 screens */ mooffset = 0; @@ -381,7 +381,7 @@ static void update_one_screen(screen_device &screen, bitmap_t *bitmap, const rec } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, (&screen == left_screen) ? state->atarigen.alpha_tilemap : state->atarigen.alpha2_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, (&screen == left_screen) ? state->alpha_tilemap : state->alpha2_tilemap, 0, 0); } diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index efa270f2da0..c558bd07f28 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -18,7 +18,7 @@ INLINE void actual_get_fg_tile_info( running_machine *machine, tile_data *tilein static TILE_GET_INFO( get_fg_tile_info ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); actual_get_fg_tile_info(machine, tileinfo, tile_index, state->fg_ram, 2); } @@ -26,7 +26,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( darius ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,128,64); @@ -37,7 +37,7 @@ VIDEO_START( darius ) WRITE16_HANDLER( darius_fg_layer_w ) { - darius_state *state = (darius_state *)space->machine->driver_data; + darius_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_ram[offset]); if (offset < 0x4000) @@ -48,7 +48,7 @@ WRITE16_HANDLER( darius_fg_layer_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int primask, int x_offs, int y_offs ) { - darius_state *state = (darius_state *)machine->driver_data; + darius_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, curx, cury; UINT16 code, data, sx, sy; @@ -94,7 +94,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( darius ) { - darius_state *state = (darius_state *)screen->machine->driver_data; + darius_state *state = screen->machine->driver_data(); int xoffs = 0; if (screen == state->lscreen) diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c index d88b4d325a2..c7533e032fa 100644 --- a/src/mame/video/dassault.c +++ b/src/mame/video/dassault.c @@ -12,7 +12,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect, int pf_priority ) { - dassault_state *state = (dassault_state *)machine->driver_data; + dassault_state *state = machine->driver_data(); UINT16 *buffered_spriteram = machine->generic.buffered_spriteram.u16; int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; int offs, bank, gfxbank; @@ -174,7 +174,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( dassault ) { - dassault_state *state = (dassault_state *)screen->machine->driver_data; + dassault_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index 1efc0e06550..8f1c8526e20 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -15,13 +15,13 @@ void dbz_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); *color = (state->layer_colorbase[layer] << 1) + ((*color & 0x3c) >> 2); } void dbz_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); int pri = (*color & 0x3c0) >> 5; if (pri <= state->layerpri[3]) @@ -40,14 +40,14 @@ void dbz_sprite_callback( running_machine *machine, int *code, int *color, int * WRITE16_HANDLER( dbz_bg2_videoram_w ) { - dbz_state *state = (dbz_state *)space->machine->driver_data; + dbz_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg2_videoram[offset]); tilemap_mark_tile_dirty(state->bg2_tilemap, offset / 2); } static TILE_GET_INFO( get_dbz_bg2_tile_info ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); int tileno, colour, flag; tileno = state->bg2_videoram[tile_index * 2 + 1] & 0x7fff; @@ -59,14 +59,14 @@ static TILE_GET_INFO( get_dbz_bg2_tile_info ) WRITE16_HANDLER( dbz_bg1_videoram_w ) { - dbz_state *state = (dbz_state *)space->machine->driver_data; + dbz_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg1_videoram[offset]); tilemap_mark_tile_dirty(state->bg1_tilemap, offset / 2); } static TILE_GET_INFO( get_dbz_bg1_tile_info ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); int tileno, colour, flag; tileno = state->bg1_videoram[tile_index * 2 + 1] & 0x7fff; @@ -78,7 +78,7 @@ static TILE_GET_INFO( get_dbz_bg1_tile_info ) VIDEO_START( dbz ) { - dbz_state *state = (dbz_state *)machine->driver_data; + dbz_state *state = machine->driver_data(); state->bg1_tilemap = tilemap_create(machine, get_dbz_bg1_tile_info, tilemap_scan_rows, 16, 16, 64, 32); state->bg2_tilemap = tilemap_create(machine, get_dbz_bg2_tile_info, tilemap_scan_rows, 16, 16, 64, 32); @@ -99,7 +99,7 @@ VIDEO_START( dbz ) VIDEO_UPDATE( dbz ) { - dbz_state *state = (dbz_state *)screen->machine->driver_data; + dbz_state *state = screen->machine->driver_data(); static const int K053251_CI[6] = { K053251_CI3, K053251_CI4, K053251_CI4, K053251_CI4, K053251_CI2, K053251_CI1 }; int layer[5], plane, new_colorbase; diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c index 3f26c2c1f3d..f9af61d1d22 100644 --- a/src/mame/video/dcheese.c +++ b/src/mame/video/dcheese.c @@ -49,7 +49,7 @@ PALETTE_INIT( dcheese ) static void update_scanline_irq( running_machine *machine ) { - dcheese_state *state = (dcheese_state *)machine->driver_data; + dcheese_state *state = machine->driver_data(); /* if not in range, don't bother */ if (state->blitter_vidparam[0x22/2] <= state->blitter_vidparam[0x1e/2]) @@ -92,7 +92,7 @@ static TIMER_CALLBACK( dcheese_signal_irq_callback ) VIDEO_START( dcheese ) { - dcheese_state *state = (dcheese_state *)machine->driver_data; + dcheese_state *state = machine->driver_data(); /* the destination bitmap is not directly accessible to the CPU */ state->dstbitmap = auto_bitmap_alloc(machine, DSTBITMAP_WIDTH, DSTBITMAP_HEIGHT, machine->primary_screen->format()); @@ -118,7 +118,7 @@ VIDEO_START( dcheese ) VIDEO_UPDATE( dcheese ) { - dcheese_state *state = (dcheese_state *)screen->machine->driver_data; + dcheese_state *state = screen->machine->driver_data(); int x, y; /* update the pixels */ @@ -143,7 +143,7 @@ VIDEO_UPDATE( dcheese ) static void do_clear( running_machine *machine ) { - dcheese_state *state = (dcheese_state *)machine->driver_data; + dcheese_state *state = machine->driver_data(); int y; /* clear the requested scanlines */ @@ -157,7 +157,7 @@ static void do_clear( running_machine *machine ) static void do_blit( running_machine *machine ) { - dcheese_state *state = (dcheese_state *)machine->driver_data; + dcheese_state *state = machine->driver_data(); INT32 srcminx = state->blitter_xparam[0] << 12; INT32 srcmaxx = state->blitter_xparam[1] << 12; INT32 srcminy = state->blitter_yparam[0] << 12; @@ -236,28 +236,28 @@ static void do_blit( running_machine *machine ) WRITE16_HANDLER( madmax_blitter_color_w ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_color[offset]); } WRITE16_HANDLER( madmax_blitter_xparam_w ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_xparam[offset]); } WRITE16_HANDLER( madmax_blitter_yparam_w ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_yparam[offset]); } WRITE16_HANDLER( madmax_blitter_vidparam_w ) { - dcheese_state *state = (dcheese_state *)space->machine->driver_data; + dcheese_state *state = space->machine->driver_data(); COMBINE_DATA(&state->blitter_vidparam[offset]); switch (offset) diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 138d4200d4c..0eee17a0233 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -20,13 +20,13 @@ READ8_HANDLER( dday_countdown_timer_r ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); return ((state->timer_value / 10) << 4) | (state->timer_value % 10); } static TIMER_CALLBACK( countdown_timer_callback ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); state->timer_value--; if (state->timer_value < 0) @@ -35,7 +35,7 @@ static TIMER_CALLBACK( countdown_timer_callback ) static void start_countdown_timer(running_machine *machine) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); state->timer_value = 0; @@ -155,7 +155,7 @@ PALETTE_INIT( dday ) static TILE_GET_INFO( get_bg_tile_info ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); int code; code = state->bgvideoram[tile_index]; @@ -164,7 +164,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); int code, flipx; flipx = state->colorram[tile_index & 0x03e0] & 0x01; @@ -174,7 +174,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_text_tile_info ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); int code; code = state->textvideoram[tile_index]; @@ -183,7 +183,7 @@ static TILE_GET_INFO( get_text_tile_info ) static TILE_GET_INFO( get_sl_tile_info ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); int code, sl_flipx, flipx; UINT8* sl_map; @@ -213,7 +213,7 @@ static TILE_GET_INFO( get_sl_tile_info ) VIDEO_START( dday ) { - dday_state *state = (dday_state *)machine->driver_data; + dday_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->text_tilemap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -230,7 +230,7 @@ VIDEO_START( dday ) WRITE8_HANDLER( dday_bgvideoram_w ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -238,7 +238,7 @@ WRITE8_HANDLER( dday_bgvideoram_w ) WRITE8_HANDLER( dday_fgvideoram_w ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -247,7 +247,7 @@ WRITE8_HANDLER( dday_fgvideoram_w ) WRITE8_HANDLER( dday_textvideoram_w ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); state->textvideoram[offset] = data; tilemap_mark_tile_dirty(state->text_tilemap, offset); @@ -255,7 +255,7 @@ WRITE8_HANDLER( dday_textvideoram_w ) WRITE8_HANDLER( dday_colorram_w ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); int i; offset &= 0x03e0; @@ -268,14 +268,14 @@ WRITE8_HANDLER( dday_colorram_w ) READ8_HANDLER( dday_colorram_r ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); return state->colorram[offset & 0x03e0]; } WRITE8_HANDLER( dday_sl_control_w ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); if (state->sl_image != data) { @@ -287,7 +287,7 @@ WRITE8_HANDLER( dday_sl_control_w ) WRITE8_HANDLER( dday_control_w ) { - dday_state *state = (dday_state *)space->machine->driver_data; + dday_state *state = space->machine->driver_data(); //if (data & 0xac) logerror("Control = %02X\n", data & 0xac); @@ -317,7 +317,7 @@ WRITE8_HANDLER( dday_control_w ) VIDEO_UPDATE( dday ) { - dday_state *state = (dday_state *)screen->machine->driver_data; + dday_state *state = screen->machine->driver_data(); tilemap_draw(state->main_bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); tilemap_draw(state->main_bitmap, cliprect, state->fg_tilemap, 0, 0); diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index a4bce21664d..fb2a545d41e 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -58,7 +58,7 @@ static TILEMAP_MAPPER( background_scan ) static TILE_GET_INFO( get_bg_tile_info ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); UINT8 attr = state->bgvideoram[2 * tile_index]; SET_TILE_INFO( 2, @@ -69,7 +69,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); UINT8 attr = state->fgvideoram[2 * tile_index]; SET_TILE_INFO( 0, @@ -80,7 +80,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_fg_16color_tile_info ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); UINT8 attr = state->fgvideoram[2 * tile_index]; SET_TILE_INFO( 0, @@ -98,7 +98,7 @@ static TILE_GET_INFO( get_fg_16color_tile_info ) VIDEO_START( ddragon ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, background_scan, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -112,7 +112,7 @@ VIDEO_START( ddragon ) VIDEO_START( chinagat ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info,background_scan, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_16color_tile_info,tilemap_scan_rows, 8, 8, 32, 32); @@ -131,14 +131,14 @@ VIDEO_START( chinagat ) WRITE8_HANDLER( ddragon_bgvideoram_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( ddragon_fgvideoram_w ) { - ddragon_state *state = (ddragon_state *)space->machine->driver_data; + ddragon_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } @@ -156,7 +156,7 @@ WRITE8_HANDLER( ddragon_fgvideoram_w ) static void draw_sprites( running_machine* machine, bitmap_t *bitmap,const rectangle *cliprect ) { - ddragon_state *state = (ddragon_state *)machine->driver_data; + ddragon_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[1]; UINT8 *src; @@ -242,7 +242,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( ddragon ) { - ddragon_state *state = (ddragon_state *)screen->machine->driver_data; + ddragon_state *state = screen->machine->driver_data(); int scrollx = (state->scrollx_hi << 8) | *state->scrollx_lo; int scrolly = (state->scrolly_hi << 8) | *state->scrolly_lo; diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 827bd5dba9c..029e75b36e1 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -9,7 +9,7 @@ WRITE16_HANDLER( ddragon3_scroll_w ) { - ddragon3_state *state = (ddragon3_state *)space->machine->driver_data; + ddragon3_state *state = space->machine->driver_data(); switch (offset) { @@ -29,7 +29,7 @@ WRITE16_HANDLER( ddragon3_scroll_w ) READ16_HANDLER( ddragon3_scroll_r ) { - ddragon3_state *state = (ddragon3_state *)space->machine->driver_data; + ddragon3_state *state = space->machine->driver_data(); switch (offset) { @@ -46,21 +46,21 @@ READ16_HANDLER( ddragon3_scroll_r ) WRITE16_HANDLER( ddragon3_bg_videoram_w ) { - ddragon3_state *state = (ddragon3_state *)space->machine->driver_data; + ddragon3_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE16_HANDLER( ddragon3_fg_videoram_w ) { - ddragon3_state *state = (ddragon3_state *)space->machine->driver_data; + ddragon3_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } static TILE_GET_INFO( get_bg_tile_info ) { - ddragon3_state *state = (ddragon3_state *)machine->driver_data; + ddragon3_state *state = machine->driver_data(); UINT16 attr = state->bg_videoram[tile_index]; int code = (attr & 0x0fff) | ((state->bg_tilebase & 0x01) << 12); int color = ((attr & 0xf000) >> 12) + 16; @@ -70,7 +70,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - ddragon3_state *state = (ddragon3_state *)machine->driver_data; + ddragon3_state *state = machine->driver_data(); int offs = tile_index * 2; UINT16 attr = state->fg_videoram[offs]; int code = state->fg_videoram[offs + 1] & 0x1fff; @@ -82,7 +82,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( ddragon3 ) { - ddragon3_state *state = (ddragon3_state *)machine->driver_data; + ddragon3_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -118,7 +118,7 @@ VIDEO_START( ddragon3 ) static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ddragon3_state *state = (ddragon3_state *)machine->driver_data; + ddragon3_state *state = machine->driver_data(); UINT16 *source = state->spriteram; UINT16 *finish = source + 0x800; @@ -164,7 +164,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( ddragon3 ) { - ddragon3_state *state = (ddragon3_state *)screen->machine->driver_data; + ddragon3_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->bg_scrollx); tilemap_set_scrolly(state->bg_tilemap, 0, state->bg_scrolly); @@ -194,7 +194,7 @@ VIDEO_UPDATE( ddragon3 ) VIDEO_UPDATE( ctribe ) { - ddragon3_state *state = (ddragon3_state *)screen->machine->driver_data; + ddragon3_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->bg_scrollx); tilemap_set_scrolly(state->bg_tilemap, 0, state->bg_scrolly); diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index 53d4517750d..ed11c363e3b 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -31,7 +31,7 @@ PALETTE_INIT( ddribble ) static void set_pens( running_machine *machine ) { - ddribble_state *state = (ddribble_state *)machine->driver_data; + ddribble_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x80; i += 2) @@ -46,7 +46,7 @@ static void set_pens( running_machine *machine ) WRITE8_HANDLER( K005885_0_w ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); switch (offset) { case 0x03: /* char bank selection for set 1 */ @@ -65,7 +65,7 @@ WRITE8_HANDLER( K005885_0_w ) WRITE8_HANDLER( K005885_1_w ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); switch (offset) { case 0x03: /* char bank selection for set 2 */ @@ -96,7 +96,7 @@ static TILEMAP_MAPPER( tilemap_scan ) static TILE_GET_INFO( get_fg_tile_info ) { - ddribble_state *state = (ddribble_state *)machine->driver_data; + ddribble_state *state = machine->driver_data(); UINT8 attr = state->fg_videoram[tile_index]; int num = state->fg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + ((state->charbank[0] & 2) << 10); SET_TILE_INFO( @@ -108,7 +108,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - ddribble_state *state = (ddribble_state *)machine->driver_data; + ddribble_state *state = machine->driver_data(); UINT8 attr = state->bg_videoram[tile_index]; int num = state->bg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + (state->charbank[1] << 11); SET_TILE_INFO( @@ -126,7 +126,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( ddribble ) { - ddribble_state *state = (ddribble_state *)machine->driver_data; + ddribble_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan, 8, 8, 64, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan, 8, 8, 64, 32); @@ -142,14 +142,14 @@ VIDEO_START( ddribble ) WRITE8_HANDLER( ddribble_fg_videoram_w ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0xbff); } WRITE8_HANDLER( ddribble_bg_videoram_w ) { - ddribble_state *state = (ddribble_state *)space->machine->driver_data; + ddribble_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0xbff); } @@ -252,7 +252,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( ddribble ) { - ddribble_state *state = (ddribble_state *)screen->machine->driver_data; + ddribble_state *state = screen->machine->driver_data(); set_pens(screen->machine); tilemap_set_flip(state->fg_tilemap, (state->vregs[0][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 97ba81af35a..c07211fa993 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -101,52 +101,52 @@ PALETTE_INIT( ghostb ) WRITE8_HANDLER( dec8_bac06_0_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->pf0_control[offset] = data; } WRITE8_HANDLER( dec8_bac06_1_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->pf1_control[offset] = data; } WRITE8_HANDLER( dec8_pf0_data_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->pf0_data[offset] = data; tilemap_mark_tile_dirty(state->pf0_tilemap, offset / 2); } WRITE8_HANDLER( dec8_pf1_data_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->pf1_data[offset] = data; tilemap_mark_tile_dirty(state->pf1_tilemap, offset / 2); } READ8_HANDLER( dec8_pf0_data_r ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); return state->pf0_data[offset]; } READ8_HANDLER( dec8_pf1_data_r ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); return state->pf1_data[offset]; } WRITE8_HANDLER( dec8_videoram_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fix_tilemap, offset / 2); } WRITE8_HANDLER( srdarwin_videoram_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fix_tilemap, offset); } @@ -154,20 +154,20 @@ WRITE8_HANDLER( srdarwin_videoram_w ) #ifdef UNUSED_FUNCTION WRITE8_HANDLER( dec8_scroll1_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->scroll1[offset] = data; } #endif WRITE8_HANDLER( dec8_scroll2_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->scroll2[offset] = data; } WRITE8_HANDLER( srdarwin_control_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); switch (offset) { @@ -184,7 +184,7 @@ WRITE8_HANDLER( srdarwin_control_w ) WRITE8_HANDLER( lastmisn_control_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); /* Bit 0x0f - ROM bank switch. @@ -206,7 +206,7 @@ WRITE8_HANDLER( lastmisn_control_w ) WRITE8_HANDLER( shackled_control_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); /* Bottom 4 bits - bank switch, Bits 4 & 5 - Scroll MSBs */ memory_set_bank(space->machine, "bank1", data & 0x0f); @@ -217,19 +217,19 @@ WRITE8_HANDLER( shackled_control_w ) WRITE8_HANDLER( lastmisn_scrollx_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->scroll2[1] = data; } WRITE8_HANDLER( lastmisn_scrolly_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); state->scroll2[3] = data; } WRITE8_HANDLER( gondo_scroll_w ) { - dec8_state *state = (dec8_state *)space->machine->driver_data; + dec8_state *state = space->machine->driver_data(); switch (offset) { case 0x0: @@ -429,7 +429,7 @@ static void srdarwin_draw_sprites( running_machine* machine, bitmap_t *bitmap, c #if 0 static void draw_characters( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect, int mask, int shift ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int mx, my, tile, color, offs; for (offs = 0x800 - 2; offs >= 0; offs -= 2) @@ -452,7 +452,7 @@ static void draw_characters( running_machine* machine, bitmap_t *bitmap, const r VIDEO_UPDATE( cobracom ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap, 0, (state->pf0_control[0x10] << 8) + state->pf0_control[0x11]); tilemap_set_scrolly(state->pf0_tilemap, 0, (state->pf0_control[0x12] << 8) + state->pf0_control[0x13]); tilemap_set_scrollx(state->pf1_tilemap, 0, (state->pf1_control[0x10] << 8) + state->pf1_control[0x11]); @@ -471,7 +471,7 @@ VIDEO_UPDATE( cobracom ) static TILE_GET_INFO( get_bac0_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int tile, color, offs = tile_index << 1; tile = (state->pf0_data[offs] << 8) | state->pf0_data[offs + 1]; @@ -490,7 +490,7 @@ static TILE_GET_INFO( get_bac0_tile_info ) static TILE_GET_INFO( get_bac1_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int tile, color, offs = tile_index << 1; tile = (state->pf1_data[offs] << 8) | state->pf1_data[offs + 1]; @@ -515,7 +515,7 @@ static TILEMAP_MAPPER( bac0_scan_rows ) static TILE_GET_INFO( get_cobracom_fix_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index << 1; int tile = state->videoram[offs + 1] + (state->videoram[offs] << 8); int color = (tile & 0xe000) >> 13; @@ -529,7 +529,7 @@ static TILE_GET_INFO( get_cobracom_fix_tile_info ) VIDEO_START( cobracom ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->pf0_tilemap = tilemap_create(machine, get_bac0_tile_info, bac0_scan_rows, 16, 16, 32, 32); state->pf1_tilemap = tilemap_create(machine, get_bac1_tile_info, bac0_scan_rows, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_cobracom_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -545,7 +545,7 @@ VIDEO_START( cobracom ) VIDEO_UPDATE( ghostb ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); if (state->pf0_control[0] & 0x4) { /* Rowscroll */ int offs; @@ -570,7 +570,7 @@ VIDEO_UPDATE( ghostb ) static TILE_GET_INFO( get_ghostb_fix_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index << 1; int tile = state->videoram[offs + 1] + (state->videoram[offs] << 8); int color = (tile & 0xc00) >> 10; @@ -584,7 +584,7 @@ static TILE_GET_INFO( get_ghostb_fix_tile_info ) VIDEO_START( ghostb ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->pf0_tilemap = tilemap_create(machine, get_bac0_tile_info, bac0_scan_rows, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_ghostb_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fix_tilemap, 0); @@ -597,7 +597,7 @@ VIDEO_START( ghostb ) VIDEO_UPDATE( oscar ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap,0, (state->pf0_control[0x10] << 8) + state->pf0_control[0x11]); tilemap_set_scrolly(state->pf0_tilemap,0, (state->pf0_control[0x12] << 8) + state->pf0_control[0x13]); flip_screen_set(screen->machine, state->pf0_control[1] >> 7); @@ -613,7 +613,7 @@ VIDEO_UPDATE( oscar ) static TILE_GET_INFO( get_oscar_fix_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index << 1; int tile = state->videoram[offs + 1] + (state->videoram[offs] << 8); int color = (tile & 0xf000) >> 14; @@ -627,7 +627,7 @@ static TILE_GET_INFO( get_oscar_fix_tile_info ) VIDEO_START( oscar ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->pf0_tilemap = tilemap_create(machine, get_bac0_tile_info, bac0_scan_rows, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_oscar_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -642,7 +642,7 @@ VIDEO_START( oscar ) VIDEO_UPDATE( lastmisn ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8)+ state->scroll2[1])); tilemap_set_scrolly(state->pf0_tilemap, 0, ((state->scroll2[2] << 8)+ state->scroll2[3])); @@ -654,7 +654,7 @@ VIDEO_UPDATE( lastmisn ) VIDEO_UPDATE( shackled ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8) + state->scroll2[1])); tilemap_set_scrolly(state->pf0_tilemap, 0, ((state->scroll2[2] << 8) + state->scroll2[3])); @@ -675,7 +675,7 @@ static TILEMAP_MAPPER( lastmisn_scan_rows ) static TILE_GET_INFO( get_lastmisn_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index * 2; int tile = state->pf0_data[offs + 1] + (state->pf0_data[offs] << 8); int color = tile >> 12; @@ -694,7 +694,7 @@ static TILE_GET_INFO( get_lastmisn_tile_info ) static TILE_GET_INFO( get_lastmisn_fix_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index << 1; int tile = state->videoram[offs + 1] + (state->videoram[offs] << 8); int color = (tile & 0xc000) >> 14; @@ -708,7 +708,7 @@ static TILE_GET_INFO( get_lastmisn_fix_tile_info ) VIDEO_START( lastmisn ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->pf0_tilemap = tilemap_create(machine, get_lastmisn_tile_info, lastmisn_scan_rows, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_lastmisn_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -718,7 +718,7 @@ VIDEO_START( lastmisn ) VIDEO_START( shackled ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->pf0_tilemap = tilemap_create(machine, get_lastmisn_tile_info, lastmisn_scan_rows, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_lastmisn_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -731,7 +731,7 @@ VIDEO_START( shackled ) VIDEO_UPDATE( srdarwin ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap, 0, (state->scroll2[0] << 8) + state->scroll2[1]); tilemap_draw(bitmap, cliprect, state->pf0_tilemap, TILEMAP_DRAW_LAYER1, 0); @@ -744,7 +744,7 @@ VIDEO_UPDATE( srdarwin ) static TILE_GET_INFO( get_srdarwin_fix_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int tile = state->videoram[tile_index]; int color = 0; /* ? */ @@ -763,7 +763,7 @@ static TILE_GET_INFO( get_srdarwin_fix_tile_info ) //AT: improved priority and fixed stage 4+ crashes caused by bank overflow static TILE_GET_INFO( get_srdarwin_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int tile = state->pf0_data[2 * tile_index + 1] + (state->pf0_data[2 * tile_index] << 8); int color = tile >> 12 & 3; int bank; @@ -781,7 +781,7 @@ static TILE_GET_INFO( get_srdarwin_tile_info ) VIDEO_START( srdarwin ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->pf0_tilemap = tilemap_create(machine, get_srdarwin_tile_info, tilemap_scan_rows, 16, 16, 32, 16); state->fix_tilemap = tilemap_create(machine, get_srdarwin_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -796,7 +796,7 @@ VIDEO_START( srdarwin ) VIDEO_UPDATE( gondo ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8) + state->scroll2[1])); tilemap_set_scrolly(state->pf0_tilemap, 0, ((state->scroll2[2] << 8) + state->scroll2[3])); @@ -810,7 +810,7 @@ VIDEO_UPDATE( gondo ) VIDEO_UPDATE( garyoret ) { - dec8_state *state = (dec8_state *)screen->machine->driver_data; + dec8_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf0_tilemap, 0, ((state->scroll2[0] << 8) + state->scroll2[1])); tilemap_set_scrolly(state->pf0_tilemap, 0, ((state->scroll2[2] << 8) + state->scroll2[3])); @@ -823,7 +823,7 @@ VIDEO_UPDATE( garyoret ) static TILE_GET_INFO( get_gondo_fix_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index * 2; int tile = state->videoram[offs + 1] + (state->videoram[offs] << 8); int color = (tile & 0x7000) >> 12; @@ -837,7 +837,7 @@ static TILE_GET_INFO( get_gondo_fix_tile_info ) static TILE_GET_INFO( get_gondo_tile_info ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); int offs = tile_index * 2; int tile = state->pf0_data[offs + 1] + (state->pf0_data[offs] << 8); int color = tile>> 12; @@ -856,7 +856,7 @@ static TILE_GET_INFO( get_gondo_tile_info ) VIDEO_START( gondo ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->fix_tilemap = tilemap_create(machine, get_gondo_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->pf0_tilemap = tilemap_create(machine, get_gondo_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -867,7 +867,7 @@ VIDEO_START( gondo ) VIDEO_START( garyoret ) { - dec8_state *state = (dec8_state *)machine->driver_data; + dec8_state *state = machine->driver_data(); state->fix_tilemap = tilemap_create(machine, get_gondo_fix_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->pf0_tilemap = tilemap_create(machine, get_gondo_tile_info, tilemap_scan_rows, 16, 16, 32, 32); diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index 22b91f0bf04..5c24bc7f352 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -48,7 +48,7 @@ static const UINT32 tile_offset[32*32] = { ********************************************/ void decocass_video_state_save_init( running_machine *machine ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); state_save_register_global(machine, state->watchdog_count); state_save_register_global(machine, state->watchdog_flip); @@ -82,7 +82,7 @@ static TILEMAP_MAPPER( bgvideoram_scan_cols ) static TILE_GET_INFO( get_bg_l_tile_info ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); int color = (state->color_center_bot >> 7) & 1; SET_TILE_INFO( 2, @@ -93,7 +93,7 @@ static TILE_GET_INFO( get_bg_l_tile_info ) static TILE_GET_INFO( get_bg_r_tile_info ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); int color = (state->color_center_bot >> 7) & 1; SET_TILE_INFO( 2, @@ -104,7 +104,7 @@ static TILE_GET_INFO( get_bg_r_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); UINT8 code = state->fgvideoram[tile_index]; UINT8 attr = state->colorram[tile_index]; SET_TILE_INFO( @@ -120,7 +120,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static void draw_object( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); int sx, sy, color; if (0 == (state->mode_set & 0x80)) /* part_h_enable off? */ @@ -143,7 +143,7 @@ static void draw_object( running_machine* machine, bitmap_t *bitmap, const recta static void draw_center( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); int sx, sy, x, y, color; color = 0; @@ -185,7 +185,7 @@ WRITE8_HANDLER( decocass_paletteram_w ) WRITE8_HANDLER( decocass_charram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->charram[offset] = data; /* dirty sprite */ gfx_element_mark_dirty(space->machine->gfx[1], (offset >> 5) & 255); @@ -196,21 +196,21 @@ WRITE8_HANDLER( decocass_charram_w ) WRITE8_HANDLER( decocass_fgvideoram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( decocass_colorram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } static void mark_bg_tile_dirty( running_machine *machine, offs_t offset ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); if (offset & 0x80) tilemap_mark_tile_dirty(state->bg_tilemap_r, offset); else @@ -219,7 +219,7 @@ static void mark_bg_tile_dirty( running_machine *machine, offs_t offset ) WRITE8_HANDLER( decocass_tileram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->tileram[offset] = data; /* dirty tile (64 bytes per tile) */ gfx_element_mark_dirty(space->machine->gfx[2], (offset / 64) & 15); @@ -230,7 +230,7 @@ WRITE8_HANDLER( decocass_tileram_w ) WRITE8_HANDLER( decocass_objectram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->objectram[offset] = data; /* dirty the object */ gfx_element_mark_dirty(space->machine->gfx[3], 0); @@ -239,7 +239,7 @@ WRITE8_HANDLER( decocass_objectram_w ) WRITE8_HANDLER( decocass_bgvideoram_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; mark_bg_tile_dirty(space->machine, offset); } @@ -247,21 +247,21 @@ WRITE8_HANDLER( decocass_bgvideoram_w ) /* The watchdog is a 4bit counter counting down every frame */ WRITE8_HANDLER( decocass_watchdog_count_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(1,("decocass_watchdog_count_w: $%02x\n", data)); state->watchdog_count = data & 0x0f; } WRITE8_HANDLER( decocass_watchdog_flip_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(1,("decocass_watchdog_flip_w: $%02x\n", data)); state->watchdog_flip = data; } WRITE8_HANDLER( decocass_color_missiles_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(1,("decocass_color_missiles_w: $%02x\n", data)); /* only bits D0-D2 and D4-D6 are connected to * the color RAM demux: @@ -283,7 +283,7 @@ WRITE8_HANDLER( decocass_color_missiles_w ) */ WRITE8_HANDLER( decocass_mode_set_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->mode_set) return; LOG(1,("decocass_mode_set_w: $%02x (%s%s%s%s%s%s%s%s)\n", data, @@ -301,7 +301,7 @@ WRITE8_HANDLER( decocass_mode_set_w ) WRITE8_HANDLER( decocass_color_center_bot_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->color_center_bot) return; LOG(1,("decocass_color_center_bot_w: $%02x (color:%d, center_bot:%d)\n", data, data & 3, data >> 4)); @@ -328,7 +328,7 @@ WRITE8_HANDLER( decocass_color_center_bot_w ) WRITE8_HANDLER( decocass_back_h_shift_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->back_h_shift) return; LOG(1,("decocass_back_h_shift_w: $%02x\n", data)); @@ -337,7 +337,7 @@ WRITE8_HANDLER( decocass_back_h_shift_w ) WRITE8_HANDLER( decocass_back_vl_shift_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->back_vl_shift) return; LOG(1,("decocass_back_vl_shift_w: $%02x\n", data)); @@ -346,7 +346,7 @@ WRITE8_HANDLER( decocass_back_vl_shift_w ) WRITE8_HANDLER( decocass_back_vr_shift_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->back_vr_shift) return; LOG(1,("decocass_back_vr_shift_w: $%02x\n", data)); @@ -355,7 +355,7 @@ WRITE8_HANDLER( decocass_back_vr_shift_w ) WRITE8_HANDLER( decocass_part_h_shift_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->part_v_shift ) return; LOG(1,("decocass_part_h_shift_w: $%02x\n", data)); @@ -364,7 +364,7 @@ WRITE8_HANDLER( decocass_part_h_shift_w ) WRITE8_HANDLER( decocass_part_v_shift_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->part_v_shift ) return; LOG(1,("decocass_part_v_shift_w: $%02x\n", data)); @@ -373,7 +373,7 @@ WRITE8_HANDLER( decocass_part_v_shift_w ) WRITE8_HANDLER( decocass_center_h_shift_space_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); if (data == state->center_h_shift_space) return; LOG(1,("decocass_center_h_shift_space_w: $%02x\n", data)); @@ -382,7 +382,7 @@ WRITE8_HANDLER( decocass_center_h_shift_space_w ) WRITE8_HANDLER( decocass_center_v_shift_w ) { - decocass_state *state = (decocass_state *)space->machine->driver_data; + decocass_state *state = space->machine->driver_data(); LOG(1,("decocass_center_v_shift_w: $%02x\n", data)); state->center_v_shift = data; } @@ -444,7 +444,7 @@ static void draw_missiles(running_machine *machine,bitmap_t *bitmap, const recta int missile_y_adjust, int missile_y_adjust_flip_screen, UINT8 *missile_ram, int interleave) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); int i, offs, x; /* Draw the missiles (16 of them) seemingly with alternating colors @@ -490,7 +490,7 @@ static void draw_missiles(running_machine *machine,bitmap_t *bitmap, const recta VIDEO_START( decocass ) { - decocass_state *state = (decocass_state *)machine->driver_data; + decocass_state *state = machine->driver_data(); state->bg_tilemap_l = tilemap_create(machine, get_bg_l_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32); state->bg_tilemap_r = tilemap_create(machine, get_bg_r_tile_info, bgvideoram_scan_cols, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, fgvideoram_scan_cols, 8, 8, 32, 32); @@ -521,7 +521,7 @@ VIDEO_START( decocass ) VIDEO_UPDATE( decocass ) { - decocass_state *state = (decocass_state *)screen->machine->driver_data; + decocass_state *state = screen->machine->driver_data(); int scrollx, scrolly_l, scrolly_r; rectangle clip; diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index 6581da6f2f9..290977d03e3 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -4,7 +4,7 @@ static void deniam_common_init( running_machine *machine ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); int i; state->bg_scrollx_reg = 0x00a4/2; @@ -26,7 +26,7 @@ static void deniam_common_init( running_machine *machine ) DRIVER_INIT( logicpro ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); deniam_common_init(machine); @@ -38,7 +38,7 @@ DRIVER_INIT( logicpro ) DRIVER_INIT( karianx ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); deniam_common_init(machine); @@ -64,7 +64,7 @@ static TILEMAP_MAPPER( scan_pages ) static TILE_GET_INFO( get_bg_tile_info ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); int page = tile_index >> 11; UINT16 attr = state->videoram[state->bg_page[page] * 0x0800 + (tile_index & 0x7ff)]; SET_TILE_INFO( @@ -76,7 +76,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); int page = tile_index >> 11; UINT16 attr = state->videoram[state->fg_page[page] * 0x0800 + (tile_index & 0x7ff)]; SET_TILE_INFO( @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); UINT16 attr = state->textram[tile_index]; SET_TILE_INFO( 0, @@ -107,7 +107,7 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( deniam ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, scan_pages, 8, 8, 128, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, scan_pages, 8, 8, 128, 64); state->tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -126,7 +126,7 @@ VIDEO_START( deniam ) WRITE16_HANDLER( deniam_videoram_w ) { - deniam_state *state = (deniam_state *)space->machine->driver_data; + deniam_state *state = space->machine->driver_data(); int page, i; COMBINE_DATA(&state->videoram[offset]); @@ -143,7 +143,7 @@ WRITE16_HANDLER( deniam_videoram_w ) WRITE16_HANDLER( deniam_textram_w ) { - deniam_state *state = (deniam_state *)space->machine->driver_data; + deniam_state *state = space->machine->driver_data(); COMBINE_DATA(&state->textram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); } @@ -151,7 +151,7 @@ WRITE16_HANDLER( deniam_textram_w ) WRITE16_HANDLER( deniam_palette_w ) { - deniam_state *state = (deniam_state *)space->machine->driver_data; + deniam_state *state = space->machine->driver_data(); int r, g, b; data = COMBINE_DATA(&state->paletteram[offset]); @@ -164,13 +164,13 @@ WRITE16_HANDLER( deniam_palette_w ) READ16_HANDLER( deniam_coinctrl_r ) { - deniam_state *state = (deniam_state *)space->machine->driver_data; + deniam_state *state = space->machine->driver_data(); return state->coinctrl; } WRITE16_HANDLER( deniam_coinctrl_w ) { - deniam_state *state = (deniam_state *)space->machine->driver_data; + deniam_state *state = space->machine->driver_data(); COMBINE_DATA(&state->coinctrl); /* bit 0 is coin counter */ @@ -216,7 +216,7 @@ WRITE16_HANDLER( deniam_coinctrl_w ) */ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); int offs; UINT8 *gfx = memory_region(machine, "gfx2"); @@ -353,7 +353,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void set_bg_page( running_machine *machine, int page, int value ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); int tile_index; if (state->bg_page[page] != value) @@ -366,7 +366,7 @@ static void set_bg_page( running_machine *machine, int page, int value ) static void set_fg_page( running_machine *machine, int page, int value ) { - deniam_state *state = (deniam_state *)machine->driver_data; + deniam_state *state = machine->driver_data(); int tile_index; if (state->fg_page[page] != value) @@ -379,7 +379,7 @@ static void set_fg_page( running_machine *machine, int page, int value ) VIDEO_UPDATE( deniam ) { - deniam_state *state = (deniam_state *)screen->machine->driver_data; + deniam_state *state = screen->machine->driver_data(); int bg_scrollx, bg_scrolly, fg_scrollx, fg_scrolly; int page; diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c index beb633067d9..dd734486f8e 100644 --- a/src/mame/video/dietgo.c +++ b/src/mame/video/dietgo.c @@ -5,7 +5,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect ) { - dietgo_state *state = (dietgo_state *)machine->driver_data; + dietgo_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -74,7 +74,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( dietgo ) { - dietgo_state *state = (dietgo_state *)screen->machine->driver_data; + dietgo_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index 2927b30fbcb..c357e6de283 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -90,7 +90,7 @@ static TILEMAP_MAPPER( tilemap_scan ) static TILE_GET_INFO( bg_get_tile_info ) { UINT8 *rom = memory_region(machine, "gfx4"); - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); int code = rom[tile_index | (state->bg_select << 10)]; /* when the background is "disabled", it is actually still drawn, but using @@ -108,7 +108,7 @@ static TILE_GET_INFO( bg_get_tile_info ) static TILE_GET_INFO( tx_get_tile_info ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 code = state->videoram[tile_index]; int color; @@ -144,7 +144,7 @@ static TILE_GET_INFO( tx_get_tile_info ) VIDEO_START( digdug ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); state->bg_tilemap = tilemap_create(machine, bg_get_tile_info,tilemap_scan, 8,8,36,28); state->fg_tilemap = tilemap_create(machine, tx_get_tile_info,tilemap_scan,8,8,36,28); @@ -167,7 +167,7 @@ VIDEO_START( digdug ) WRITE8_HANDLER( digdug_videoram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset & 0x3ff); @@ -175,7 +175,7 @@ WRITE8_HANDLER( digdug_videoram_w ) WRITE8_HANDLER( digdug_PORT_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); switch (offset) { @@ -248,7 +248,7 @@ static const rectangle spritevisiblearea = static void draw_sprites(running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 *spriteram = state->digdug_objram + 0x380; UINT8 *spriteram_2 = state->digdug_posram + 0x380; UINT8 *spriteram_3 = state->digdug_flpram + 0x380; @@ -307,7 +307,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( digdug ) { - _galaga_state *state = (_galaga_state *) screen->machine->driver_data; + _galaga_state *state = screen->machine->driver_data<_galaga_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); tilemap_draw(bitmap,cliprect,state->fg_tilemap,0,0); diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index 70aff74f07e..1602b5585c9 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -9,19 +9,19 @@ WRITE8_HANDLER( djboy_scrollx_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->scrollx = data; } WRITE8_HANDLER( djboy_scrolly_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->scrolly = data; } static TILE_GET_INFO( get_bg_tile_info ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); UINT8 attr = state->videoram[tile_index + 0x800]; int code = state->videoram[tile_index] + (attr & 0xf) * 256; int color = attr >> 4; @@ -34,7 +34,7 @@ static TILE_GET_INFO( get_bg_tile_info ) WRITE8_HANDLER( djboy_videoram_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->background, offset & 0x7ff); @@ -42,13 +42,13 @@ WRITE8_HANDLER( djboy_videoram_w ) VIDEO_START( djboy ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); state->background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); } WRITE8_HANDLER( djboy_paletteram_w ) { - djboy_state *state = (djboy_state *)space->machine->driver_data; + djboy_state *state = space->machine->driver_data(); int val; state->paletteram[offset] = data; @@ -66,7 +66,7 @@ VIDEO_UPDATE( djboy ) * ---x---- flipscreen? * ----xxxx ROM bank */ - djboy_state *state = (djboy_state *)screen->machine->driver_data; + djboy_state *state = screen->machine->driver_data(); int scroll; scroll = state->scrollx | ((state->videoreg & 0xc0) << 2); @@ -83,6 +83,6 @@ VIDEO_UPDATE( djboy ) VIDEO_EOF( djboy ) { - djboy_state *state = (djboy_state *)machine->driver_data; + djboy_state *state = machine->driver_data(); pandora_eof(state->pandora); } diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 4dd2057ce8a..77d7305865e 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -201,7 +201,7 @@ static const res_net_info radarscp_grid_net_info = PALETTE_INIT( dkong2b) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); rgb_t *rgb; int i; @@ -231,7 +231,7 @@ PALETTE_INIT( dkong2b) #ifdef UNUSED_FUNCTION PALETTE_INIT( dkong4b ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int i; int r,g,b; @@ -270,7 +270,7 @@ PALETTE_INIT( dkong4b ) PALETTE_INIT( radarscp ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int i; int r,g,b; @@ -334,7 +334,7 @@ PALETTE_INIT( radarscp ) PALETTE_INIT( radarscp1 ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int i; int r,g,b; @@ -434,7 +434,7 @@ PALETTE_INIT( radarscp1 ) PALETTE_INIT( dkong3 ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); rgb_t *rgb; rgb = compute_res_net_all(machine, color_prom, &dkong3_decode_info, &dkong3_net_info); @@ -449,7 +449,7 @@ PALETTE_INIT( dkong3 ) static TILE_GET_INFO( dkong_bg_tile_info ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int code = state->video_ram[tile_index] + 256 * state->gfx_bank; int color = (state->color_codes[tile_index % 32 + 32 * (tile_index / 32 / 4)] & 0x0f) + 0x10 * state->palette_bank; @@ -458,7 +458,7 @@ static TILE_GET_INFO( dkong_bg_tile_info ) static TILE_GET_INFO( radarscp1_bg_tile_info ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int code = state->video_ram[tile_index] + 256 * state->gfx_bank; int color = (state->color_codes[tile_index % 32] & 0x0f); color = color | (state->palette_bank<<4); @@ -474,7 +474,7 @@ static TILE_GET_INFO( radarscp1_bg_tile_info ) WRITE8_HANDLER( dkong_videoram_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); if (state->video_ram[offset] != data) { @@ -485,7 +485,7 @@ WRITE8_HANDLER( dkong_videoram_w ) WRITE8_HANDLER( dkongjr_gfxbank_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); if (state->gfx_bank != (data & 0x01)) { @@ -496,7 +496,7 @@ WRITE8_HANDLER( dkongjr_gfxbank_w ) WRITE8_HANDLER( dkong3_gfxbank_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); if (state->gfx_bank != (~data & 0x01)) { @@ -507,7 +507,7 @@ WRITE8_HANDLER( dkong3_gfxbank_w ) WRITE8_HANDLER( dkong_palettebank_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); int newbank; newbank = state->palette_bank; @@ -526,14 +526,14 @@ WRITE8_HANDLER( dkong_palettebank_w ) WRITE8_HANDLER( radarscp_grid_enable_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); state->grid_on = data & 0x01; } WRITE8_HANDLER( radarscp_grid_color_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); state->grid_col = (data & 0x07) ^ 0x07; /* popmessage("Gridcol: %d", state->grid_col); */ @@ -541,14 +541,14 @@ WRITE8_HANDLER( radarscp_grid_color_w ) WRITE8_HANDLER( dkong_flipscreen_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); state->flip = ~data & 0x01; } WRITE8_HANDLER( dkong_spritebank_w ) { - dkong_state *state = (dkong_state *)space->machine->driver_data; + dkong_state *state = space->machine->driver_data(); state->sprite_bank = data & 0x01; } @@ -561,7 +561,7 @@ WRITE8_HANDLER( dkong_spritebank_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 mask_bank, UINT32 shift_bits) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int offs; int scanline_vf; /* buffering scanline including flip */ int scanline_vfc; /* line buffering scanline including flip - this is the cached scanline_vf*/ @@ -691,7 +691,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta INLINE double CD4049(running_machine *machine, double x) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); if (x>0) return exp(-state->cd4049_a * pow(x,state->cd4049_b)); @@ -713,7 +713,7 @@ INLINE double CD4049(running_machine *machine, double x) static void radarscp_step(running_machine *machine, int line_cnt) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); /* Condensator is illegible in schematics for TRS2 board. * TRS1 board states 3.3u. @@ -837,7 +837,7 @@ static void radarscp_draw_background(running_machine *machine, dkong_state *stat static void radarscp_scanline(running_machine *machine, int scanline) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); const UINT8 *table = state->gfx3; int table_len = state->gfx3_len; int x,y,offset; @@ -874,7 +874,7 @@ static void radarscp_scanline(running_machine *machine, int scanline) static TIMER_CALLBACK( scanline_callback ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); int scanline = param; if ((state->hardware_type == HARDWARE_TRS02) || (state->hardware_type == HARDWARE_TRS01)) @@ -890,7 +890,7 @@ static TIMER_CALLBACK( scanline_callback ) static void check_palette(running_machine *machine) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); const input_port_config *port; int newset; @@ -919,7 +919,7 @@ static void check_palette(running_machine *machine) static VIDEO_START( dkong_base ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); state->cd4049_b = (log(0.0 - log(cd4049_al)) - log(0.0 - log((1.0-cd4049_al))) ) / log(cd4049_vh/cd4049_vl); state->cd4049_a = log(0.0 - log(cd4049_al)) - state->cd4049_b * log(cd4049_vh); @@ -940,7 +940,7 @@ static VIDEO_START( dkong_base ) VIDEO_START( dkong ) { - dkong_state *state = (dkong_state *)machine->driver_data; + dkong_state *state = machine->driver_data(); VIDEO_START_CALL(dkong_base); @@ -976,7 +976,7 @@ VIDEO_START( dkong ) VIDEO_UPDATE( dkong ) { - dkong_state *state = (dkong_state *)screen->machine->driver_data; + dkong_state *state = screen->machine->driver_data(); tilemap_set_flip_all(screen->machine, state->flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); tilemap_set_scrollx(state->bg_tilemap, 0, state->flip ? 0 : 0); @@ -1004,7 +1004,7 @@ VIDEO_UPDATE( dkong ) VIDEO_UPDATE( pestplce ) { - dkong_state *state = (dkong_state *)screen->machine->driver_data; + dkong_state *state = screen->machine->driver_data(); int offs; tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -1026,7 +1026,7 @@ VIDEO_UPDATE( pestplce ) VIDEO_UPDATE( spclforc ) { - dkong_state *state = (dkong_state *)screen->machine->driver_data; + dkong_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index d1c3d05b73a..8ee824d96f9 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -64,21 +64,21 @@ PALETTE_INIT( docastle ) WRITE8_HANDLER( docastle_videoram_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->do_tilemap, offset); } WRITE8_HANDLER( docastle_colorram_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->do_tilemap, offset); } READ8_HANDLER( docastle_flipscreen_off_r ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); flip_screen_set(space->machine, 0); tilemap_mark_all_tiles_dirty(state->do_tilemap); return 0; @@ -86,7 +86,7 @@ READ8_HANDLER( docastle_flipscreen_off_r ) READ8_HANDLER( docastle_flipscreen_on_r ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); flip_screen_set(space->machine, 1); tilemap_mark_all_tiles_dirty(state->do_tilemap); return 1; @@ -94,21 +94,21 @@ READ8_HANDLER( docastle_flipscreen_on_r ) WRITE8_HANDLER( docastle_flipscreen_off_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); flip_screen_set(space->machine, 0); tilemap_mark_all_tiles_dirty(state->do_tilemap); } WRITE8_HANDLER( docastle_flipscreen_on_w ) { - docastle_state *state = (docastle_state *)space->machine->driver_data; + docastle_state *state = space->machine->driver_data(); flip_screen_set(space->machine, 1); tilemap_mark_all_tiles_dirty(state->do_tilemap); } static TILE_GET_INFO( get_tile_info ) { - docastle_state *state = (docastle_state *)machine->driver_data; + docastle_state *state = machine->driver_data(); int code = state->videoram[tile_index] + 8 * (state->colorram[tile_index] & 0x20); int color = state->colorram[tile_index] & 0x1f; @@ -117,7 +117,7 @@ static TILE_GET_INFO( get_tile_info ) static void video_start_common( running_machine *machine, UINT32 tile_transmask ) { - docastle_state *state = (docastle_state *)machine->driver_data; + docastle_state *state = machine->driver_data(); state->do_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transmask(state->do_tilemap, 0, tile_transmask, 0x0000); } @@ -134,7 +134,7 @@ VIDEO_START( dorunrun ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - docastle_state *state = (docastle_state *)machine->driver_data; + docastle_state *state = machine->driver_data(); int offs; bitmap_fill(machine->priority_bitmap, NULL, 1); @@ -226,7 +226,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( docastle ) { - docastle_state *state = (docastle_state *)screen->machine->driver_data; + docastle_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->do_tilemap, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index 46b8558f117..1874afe0e16 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -50,7 +50,7 @@ PALETTE_INIT( dogfgt ) static TILE_GET_INFO( get_tile_info ) { - dogfgt_state *state = (dogfgt_state *)machine->driver_data; + dogfgt_state *state = machine->driver_data(); SET_TILE_INFO( 0, state->bgvideoram[tile_index], @@ -67,7 +67,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( dogfgt ) { - dogfgt_state *state = (dogfgt_state *)machine->driver_data; + dogfgt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->bitmapram = auto_alloc_array(machine, UINT8, BITMAPRAM_SIZE); @@ -86,14 +86,14 @@ VIDEO_START( dogfgt ) WRITE8_HANDLER( dogfgt_plane_select_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); state->bm_plane = data; } READ8_HANDLER( dogfgt_bitmapram_r ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); if (state->bm_plane > 2) { @@ -106,7 +106,7 @@ READ8_HANDLER( dogfgt_bitmapram_r ) static WRITE8_HANDLER( internal_bitmapram_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); int x, y, subx; state->bitmapram[offset] = data; @@ -131,7 +131,7 @@ static WRITE8_HANDLER( internal_bitmapram_w ) WRITE8_HANDLER( dogfgt_bitmapram_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); if (state->bm_plane > 2) { @@ -144,7 +144,7 @@ WRITE8_HANDLER( dogfgt_bitmapram_w ) WRITE8_HANDLER( dogfgt_bgvideoram_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x3ff); @@ -152,7 +152,7 @@ WRITE8_HANDLER( dogfgt_bgvideoram_w ) WRITE8_HANDLER( dogfgt_scroll_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); state->scroll[offset] = data; tilemap_set_scrollx(state->bg_tilemap, 0, state->scroll[0] + 256 * state->scroll[1] + 256); @@ -161,7 +161,7 @@ WRITE8_HANDLER( dogfgt_scroll_w ) WRITE8_HANDLER( dogfgt_1800_w ) { - dogfgt_state *state = (dogfgt_state *)space->machine->driver_data; + dogfgt_state *state = space->machine->driver_data(); /* bits 0 and 1 are probably text color (not verified because PROM is missing) */ state->pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1); @@ -186,7 +186,7 @@ WRITE8_HANDLER( dogfgt_1800_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - dogfgt_state *state = (dogfgt_state *)machine->driver_data; + dogfgt_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -219,7 +219,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( dogfgt ) { - dogfgt_state *state = (dogfgt_state *)screen->machine->driver_data; + dogfgt_state *state = screen->machine->driver_data(); int offs; if (state->lastflip != flip_screen_get(screen->machine) || state->lastpixcolor != state->pixcolor) diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c index 308f3992e5f..d5cf61b4598 100644 --- a/src/mame/video/dragrace.c +++ b/src/mame/video/dragrace.c @@ -10,7 +10,7 @@ Atari Drag Race video emulation static TILE_GET_INFO( get_tile_info ) { - dragrace_state *state = (dragrace_state *)machine->driver_data; + dragrace_state *state = machine->driver_data(); UINT8 code = state->playfield_ram[tile_index]; int num = 0; int col = 0; @@ -42,14 +42,14 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( dragrace ) { - dragrace_state *state = (dragrace_state *)machine->driver_data; + dragrace_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 16, 16, 16); } VIDEO_UPDATE( dragrace ) { - dragrace_state *state = (dragrace_state *)screen->machine->driver_data; + dragrace_state *state = screen->machine->driver_data(); int y; tilemap_mark_all_tiles_dirty(state->bg_tilemap); diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c index c18d0fe229a..4e6678899ff 100644 --- a/src/mame/video/drgnmst.c +++ b/src/mame/video/drgnmst.c @@ -8,7 +8,7 @@ static TILE_GET_INFO( get_drgnmst_fg_tile_info ) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); int tileno, colour, flipyx; tileno = state->fg_videoram[tile_index * 2] & 0xfff; colour = state->fg_videoram[tile_index * 2 + 1] & 0x1f; @@ -19,14 +19,14 @@ static TILE_GET_INFO( get_drgnmst_fg_tile_info ) WRITE16_HANDLER( drgnmst_fg_videoram_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } static TILE_GET_INFO( get_drgnmst_bg_tile_info ) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); int tileno, colour, flipyx; tileno = (state->bg_videoram[tile_index * 2]& 0x1fff) + 0x800; colour = state->bg_videoram[tile_index * 2 + 1] & 0x1f; @@ -37,14 +37,14 @@ static TILE_GET_INFO( get_drgnmst_bg_tile_info ) WRITE16_HANDLER( drgnmst_bg_videoram_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } static TILE_GET_INFO( get_drgnmst_md_tile_info ) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); int tileno, colour, flipyx; tileno = (state->md_videoram[tile_index * 2] & 0x7fff) - 0x2000; colour = state->md_videoram[tile_index * 2 + 1] & 0x1f; @@ -55,14 +55,14 @@ static TILE_GET_INFO( get_drgnmst_md_tile_info ) WRITE16_HANDLER( drgnmst_md_videoram_w ) { - drgnmst_state *state = (drgnmst_state *)space->machine->driver_data; + drgnmst_state *state = space->machine->driver_data(); COMBINE_DATA(&state->md_videoram[offset]); tilemap_mark_tile_dirty(state->md_tilemap, offset / 2); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; UINT16 *source = state->spriteram; UINT16 *finish = source + 0x800 / 2; @@ -125,7 +125,7 @@ static TILEMAP_MAPPER( drgnmst_bg_tilemap_scan_cols ) VIDEO_START(drgnmst) { - drgnmst_state *state = (drgnmst_state *)machine->driver_data; + drgnmst_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_drgnmst_fg_tile_info, drgnmst_fg_tilemap_scan_cols, 8, 8, 64,64); tilemap_set_transparent_pen(state->fg_tilemap, 15); @@ -141,7 +141,7 @@ VIDEO_START(drgnmst) VIDEO_UPDATE(drgnmst) { - drgnmst_state *state = (drgnmst_state *)screen->machine->driver_data; + drgnmst_state *state = screen->machine->driver_data(); int y, rowscroll_bank; tilemap_set_scrollx(state->bg_tilemap, 0, state->vidregs[10] - 18); // verify diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c index e8ad0c6d506..6cd3882ed31 100644 --- a/src/mame/video/dribling.c +++ b/src/mame/video/dribling.c @@ -44,7 +44,7 @@ PALETTE_INIT( dribling ) WRITE8_HANDLER( dribling_colorram_w ) { - dribling_state *state = (dribling_state *)space->machine->driver_data; + dribling_state *state = space->machine->driver_data(); /* it is very important that we mask off the two bits here */ state->colorram[offset & 0x1f9f] = data; @@ -60,7 +60,7 @@ WRITE8_HANDLER( dribling_colorram_w ) VIDEO_UPDATE( dribling ) { - dribling_state *state = (dribling_state *)screen->machine->driver_data; + dribling_state *state = screen->machine->driver_data(); UINT8 *prombase = memory_region(screen->machine, "proms"); UINT8 *gfxbase = memory_region(screen->machine, "gfx1"); int x, y; diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index 4c6c2e330f1..780923e5be3 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -15,7 +15,7 @@ Video hardware WRITE8_HANDLER( drmicro_videoram_w ) { - drmicro_state *state = (drmicro_state *)space->machine->driver_data; + drmicro_state *state = space->machine->driver_data(); state->videoram[offset] = data; if (offset < 0x800) @@ -29,7 +29,7 @@ WRITE8_HANDLER( drmicro_videoram_w ) static TILE_GET_INFO( get_bg1_tile_info ) { - drmicro_state *state = (drmicro_state *)machine->driver_data; + drmicro_state *state = machine->driver_data(); int code, col, flags; code = state->videoram[tile_index + 0x0800]; @@ -44,7 +44,7 @@ static TILE_GET_INFO( get_bg1_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - drmicro_state *state = (drmicro_state *)machine->driver_data; + drmicro_state *state = machine->driver_data(); int code, col, flags; code = state->videoram[tile_index + 0x0000]; @@ -105,7 +105,7 @@ PALETTE_INIT( drmicro ) VIDEO_START( drmicro) { - drmicro_state *state = (drmicro_state *)machine->driver_data; + drmicro_state *state = machine->driver_data(); state->videoram = auto_alloc_array(machine, UINT8, 0x1000); state_save_register_global_pointer(machine, state->videoram, 0x1000); @@ -118,7 +118,7 @@ VIDEO_START( drmicro) VIDEO_UPDATE( drmicro ) { - drmicro_state *state = (drmicro_state *)screen->machine->driver_data; + drmicro_state *state = screen->machine->driver_data(); int offs, adr, g; int chr, col, attr; int x, y, fx, fy; diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 7644a2841d8..211a86137f6 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -57,13 +57,13 @@ PALETTE_INIT( sprtmtch ) WRITE8_HANDLER( dynax_extra_scrollx_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->extra_scroll_x = data; } WRITE8_HANDLER( dynax_extra_scrolly_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->extra_scroll_y = data; } @@ -71,14 +71,14 @@ WRITE8_HANDLER( dynax_extra_scrolly_w ) /* Destination Pen */ WRITE8_HANDLER( dynax_blit_pen_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit_pen = data; LOG(("P=%02X ", data)); } WRITE8_HANDLER( dynax_blit2_pen_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit2_pen = data; LOG(("P'=%02X ", data)); } @@ -87,7 +87,7 @@ WRITE8_HANDLER( dynax_blit2_pen_w ) /* Destination Layers */ WRITE8_HANDLER( dynax_blit_dest_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit_dest = data; if (state->layer_layout == LAYOUT_HNORIDUR) state->blit_dest = BITSWAP8(state->blit_dest ^ 0x0f, 7, 6, 5, 4, 0, 1, 2, 3); @@ -97,7 +97,7 @@ WRITE8_HANDLER( dynax_blit_dest_w ) WRITE8_HANDLER( dynax_blit2_dest_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit2_dest = data; LOG(("D'=%02X ", data)); } @@ -111,7 +111,7 @@ WRITE8_HANDLER( tenkai_blit_dest_w ) /* Background Color */ WRITE8_HANDLER( dynax_blit_backpen_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit_backpen = data; LOG(("B=%02X ", data)); } @@ -120,7 +120,7 @@ WRITE8_HANDLER( dynax_blit_backpen_w ) /* Layers 0&1 Palettes (Low Bits) */ WRITE8_HANDLER( dynax_blit_palette01_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->layer_layout == LAYOUT_HNORIDUR) state->blit_palettes = (state->blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4); else @@ -130,7 +130,7 @@ WRITE8_HANDLER( dynax_blit_palette01_w ) WRITE8_HANDLER( tenkai_blit_palette01_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit_palettes = (state->blit_palettes & 0xff00) | data; LOG(("P01=%02X ", data)); } @@ -139,7 +139,7 @@ WRITE8_HANDLER( tenkai_blit_palette01_w ) /* Layers 4&5 Palettes (Low Bits) */ WRITE8_HANDLER( dynax_blit_palette45_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->layer_layout == LAYOUT_HNORIDUR) state->blit2_palettes = (state->blit2_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4); @@ -152,7 +152,7 @@ WRITE8_HANDLER( dynax_blit_palette45_w ) /* Layer 2&3 Palettes (Low Bits) */ WRITE8_HANDLER( dynax_blit_palette23_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->layer_layout == LAYOUT_HNORIDUR) state->blit_palettes = (state->blit_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4); @@ -163,7 +163,7 @@ WRITE8_HANDLER( dynax_blit_palette23_w ) WRITE8_HANDLER( tenkai_blit_palette23_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit_palettes = (state->blit_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4); LOG(("P23=%02X ", data)); } @@ -172,7 +172,7 @@ WRITE8_HANDLER( tenkai_blit_palette23_w ) /* Layer 6&7 Palettes (Low Bits) */ WRITE8_HANDLER( dynax_blit_palette67_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (state->layer_layout == LAYOUT_HNORIDUR) state->blit2_palettes = (state->blit2_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4); @@ -185,14 +185,14 @@ WRITE8_HANDLER( dynax_blit_palette67_w ) /* Layers Palettes (High Bits) */ WRITE8_HANDLER( dynax_blit_palbank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit_palbank = data; LOG(("PB=%02X ", data)); } WRITE8_HANDLER( dynax_blit2_palbank_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->blit2_palbank = data; LOG(("PB'=%02X ", data)); } @@ -201,7 +201,7 @@ WRITE8_HANDLER( dynax_blit2_palbank_w ) /* Which half of the layers to write two (interleaved games only) */ WRITE8_HANDLER( hanamai_layer_half_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->hanamai_layer_half = (~data) & 1; LOG(("H=%02X ", data)); } @@ -210,14 +210,14 @@ WRITE8_HANDLER( hanamai_layer_half_w ) /* Write to both halves of the layers (interleaved games only) */ WRITE8_HANDLER( hnoridur_layer_half2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->hnoridur_layer_half2 = (~data) & 1; LOG(("H2=%02X ", data)); } WRITE8_HANDLER( mjdialq2_blit_dest_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int mask = (2 >> offset); /* 1 or 2 */ state->blit_dest &= ~mask; @@ -230,14 +230,14 @@ WRITE8_HANDLER( mjdialq2_blit_dest_w ) /* Layers Enable */ WRITE8_HANDLER( dynax_layer_enable_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->layer_enable = data; LOG(("E=%02X ", data)); } WRITE8_HANDLER( jantouki_layer_enable_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int mask = 1 << (7 - offset); state->layer_enable = (state->layer_enable & ~mask) | ((data & 1) ? mask : 0); state->layer_enable |= 1; @@ -245,7 +245,7 @@ WRITE8_HANDLER( jantouki_layer_enable_w ) WRITE8_HANDLER( mjdialq2_layer_enable_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); int mask = (2 >> offset); /* 1 or 2 */ state->layer_enable &= ~mask; @@ -256,7 +256,7 @@ WRITE8_HANDLER( mjdialq2_layer_enable_w ) WRITE8_HANDLER( dynax_flipscreen_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->flipscreen = data & 1; if (data & ~1) logerror("CPU#0 PC %06X: Warning, flip screen <- %02X\n", cpu_get_pc(space->cpu), data); @@ -268,7 +268,7 @@ static const char *const gfxregions[] = { "gfx1", "gfx2", "gfx3", "gfx4", "gfx5" WRITE8_HANDLER( dynax_blit_romregion_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (data < ARRAY_LENGTH(gfxregions)) state->blit_romregion = data; LOG(("GFX%X ", data + 1)); @@ -276,7 +276,7 @@ WRITE8_HANDLER( dynax_blit_romregion_w ) WRITE8_HANDLER( dynax_blit2_romregion_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); if (data + 1 < ARRAY_LENGTH(gfxregions)) state->blit2_romregion = data + 1; LOG(("GFX%X' ", data + 2)); @@ -312,7 +312,7 @@ WRITE8_HANDLER( dynax_blit2_romregion_w ) /* Plot a pixel (in the pixmaps specified by dynax_blit_dest) */ INLINE void blitter_plot_pixel( running_machine *machine, int layer, int mask, int x, int y, int pen, int wrap, int flags ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int addr; if ((y > 0xff) && (!(wrap & 2))) return; // fixes mjdialq2 & mjangels title screens @@ -377,7 +377,7 @@ INLINE void blitter_plot_pixel( running_machine *machine, int layer, int mask, i static int blitter_drawgfx( running_machine *machine, int layer, int mask, const char *gfx, int src, int pen, int x, int y, int wrap, int flags ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); UINT8 cmd; UINT8 *ROM = memory_region(machine, gfx); size_t ROM_size = memory_region_length(machine, gfx); @@ -531,7 +531,7 @@ static int blitter_drawgfx( running_machine *machine, int layer, int mask, const static void dynax_blitter_start( running_machine *machine, int flags ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int blit_newsrc; LOG(("XY=%X,%X SRC=%X BLIT=%X\n", state->blit_x, state->blit_y, state->blit_src, flags)); @@ -560,7 +560,7 @@ static void dynax_blitter_start( running_machine *machine, int flags ) static void jantouki_blitter_start( running_machine *machine, int flags ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int blit_newsrc; LOG(("XY=%X,%X SRC=%X BLIT=%X\n", state->blit_x, state->blit_y, state->blit_src, flags)); @@ -589,7 +589,7 @@ static void jantouki_blitter_start( running_machine *machine, int flags ) static void jantouki_blitter2_start( running_machine *machine, int flags ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int blit2_newsrc; LOG(("XY'=%X,%X SRC'=%X BLIT'=%02X\n", state->blit2_x, state->blit2_y, state->blit2_src, flags)); @@ -620,7 +620,7 @@ static void jantouki_blitter2_start( running_machine *machine, int flags ) static WRITE8_HANDLER( dynax_blit_scroll_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->blit_src & 0xc00000) { @@ -640,7 +640,7 @@ static WRITE8_HANDLER( dynax_blit_scroll_w ) // inverted scroll values static WRITE8_HANDLER( tenkai_blit_scroll_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->blit_src & 0xc00000) { @@ -659,7 +659,7 @@ static WRITE8_HANDLER( tenkai_blit_scroll_w ) static WRITE8_HANDLER( dynax_blit2_scroll_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (state->blit2_src & 0xc00000) { @@ -678,7 +678,7 @@ static WRITE8_HANDLER( dynax_blit2_scroll_w ) WRITE8_HANDLER( dynax_blitter_rev2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (offset) { @@ -695,7 +695,7 @@ WRITE8_HANDLER( dynax_blitter_rev2_w ) // different scroll_w WRITE8_HANDLER( tenkai_blitter_rev2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (offset) { @@ -712,7 +712,7 @@ WRITE8_HANDLER( tenkai_blitter_rev2_w ) WRITE8_HANDLER( jantouki_blitter_rev2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (offset) { @@ -728,7 +728,7 @@ WRITE8_HANDLER( jantouki_blitter_rev2_w ) WRITE8_HANDLER( jantouki_blitter2_rev2_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); switch (offset) { @@ -759,7 +759,7 @@ static const int priority_mjelctrn[8] = { 0x0231, 0x0321, 0x2031, 0x2301, 0x3021 static void dynax_common_reset( running_machine *machine ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->blit_romregion = 0; state->blit2_romregion = 0; @@ -832,7 +832,7 @@ static void dynax_common_reset( running_machine *machine ) VIDEO_START( hanamai ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->pixmap[0][0] = auto_alloc_array(machine, UINT8, 256 * 256); state->pixmap[0][1] = auto_alloc_array(machine, UINT8, 256 * 256); @@ -858,7 +858,7 @@ VIDEO_START( hanamai ) VIDEO_START( hnoridur ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->pixmap[0][0] = auto_alloc_array(machine, UINT8, 256 * 256); state->pixmap[0][1] = auto_alloc_array(machine, UINT8, 256 * 256); @@ -886,7 +886,7 @@ VIDEO_START( hnoridur ) VIDEO_START( mcnpshnt ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); VIDEO_START_CALL(hnoridur); state->priority_table = priority_mcnpshnt; @@ -894,7 +894,7 @@ VIDEO_START( mcnpshnt ) VIDEO_START( sprtmtch ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->pixmap[0][0] = auto_alloc_array(machine, UINT8, 256 * 256); state->pixmap[0][1] = auto_alloc_array(machine, UINT8, 256 * 256); @@ -916,7 +916,7 @@ VIDEO_START( sprtmtch ) VIDEO_START( jantouki ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->pixmap[0][0] = auto_alloc_array(machine, UINT8, 256 * 256); state->pixmap[0][1] = auto_alloc_array(machine, UINT8, 256 * 256); @@ -959,7 +959,7 @@ VIDEO_START( jantouki ) VIDEO_START( mjdialq2 ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); state->pixmap[0][0] = auto_alloc_array(machine, UINT8, 256 * 256); state->pixmap[1][0] = auto_alloc_array(machine, UINT8, 256 * 256); @@ -974,7 +974,7 @@ VIDEO_START( mjdialq2 ) VIDEO_START( mjelctrn ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); VIDEO_START_CALL(hnoridur); @@ -984,7 +984,7 @@ VIDEO_START( mjelctrn ) VIDEO_START( neruton ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); VIDEO_START_CALL(hnoridur); @@ -1002,7 +1002,7 @@ VIDEO_START( neruton ) static void hanamai_copylayer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int i ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int color; int scrollx, scrolly; @@ -1066,7 +1066,7 @@ static void hanamai_copylayer( running_machine *machine, bitmap_t *bitmap, const static void jantouki_copylayer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int i, int y ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int color, scrollx, scrolly, palettes, palbank; if (i < 4) @@ -1141,7 +1141,7 @@ static void jantouki_copylayer( running_machine *machine, bitmap_t *bitmap, cons static void mjdialq2_copylayer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int i ) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); int color; int scrollx, scrolly; @@ -1191,13 +1191,13 @@ static void mjdialq2_copylayer( running_machine *machine, bitmap_t *bitmap, cons WRITE8_HANDLER( hanamai_priority_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->hanamai_priority = data; } WRITE8_HANDLER( tenkai_priority_w ) { - dynax_state *state = (dynax_state *)space->machine->driver_data; + dynax_state *state = space->machine->driver_data(); state->hanamai_priority = BITSWAP8(data, 3, 2, 1, 0, 4, 7, 5, 6); } @@ -1235,7 +1235,7 @@ static int debug_viewer( running_machine *machine, bitmap_t *bitmap, const recta if (input_code_pressed_once(machine, KEYCODE_T)) toggle = 1 - toggle; if (toggle) { - dynax_state *state = (dynax_state *)machine->driver_data; + dynax_state *state = machine->driver_data(); UINT8 *RAM = memory_region( machine, "gfx1" ); size_t size = memory_region_length( machine, "gfx1" ); static int i = 0, c = 0, r = 0; @@ -1280,7 +1280,7 @@ static int debug_viewer( running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( hanamai ) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); int layers_ctrl = ~state->layer_enable; int lay[4]; @@ -1316,7 +1316,7 @@ VIDEO_UPDATE( hanamai ) VIDEO_UPDATE( hnoridur ) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); int layers_ctrl = ~BITSWAP8(state->hanamai_priority, 7, 6, 5, 4, 0, 1, 2, 3); int lay[4]; int pri; @@ -1353,7 +1353,7 @@ VIDEO_UPDATE( hnoridur ) VIDEO_UPDATE( sprtmtch ) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); int layers_ctrl = ~state->layer_enable; if (debug_viewer(screen->machine,bitmap,cliprect)) @@ -1371,7 +1371,7 @@ VIDEO_UPDATE( sprtmtch ) VIDEO_UPDATE( jantouki ) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); int layers_ctrl = state->layer_enable; if (debug_viewer(screen->machine, bitmap, cliprect)) @@ -1402,7 +1402,7 @@ VIDEO_UPDATE( jantouki ) VIDEO_UPDATE( mjdialq2 ) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); int layers_ctrl = ~state->layer_enable; if (debug_viewer(screen->machine, bitmap, cliprect)) @@ -1427,7 +1427,7 @@ VIDEO_START(htengoku) VIDEO_UPDATE(htengoku) { - dynax_state *state = (dynax_state *)screen->machine->driver_data; + dynax_state *state = screen->machine->driver_data(); int layer, x, y; // render the layers, one by one, "dynax.c" style. Then convert the pixmaps to "ddenlovr.c" diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c index 3c28c7fe4ce..787a08601e6 100644 --- a/src/mame/video/epos.c +++ b/src/mame/video/epos.c @@ -55,7 +55,7 @@ static void get_pens( running_machine *machine, pen_t *pens ) WRITE8_HANDLER( epos_port_1_w ) { - epos_state *state = (epos_state *)space->machine->driver_data; + epos_state *state = space->machine->driver_data(); /* D0 - start light #1 D1 - start light #2 D2 - coin counter @@ -74,7 +74,7 @@ WRITE8_HANDLER( epos_port_1_w ) VIDEO_UPDATE( epos ) { - epos_state *state = (epos_state *)screen->machine->driver_data; + epos_state *state = screen->machine->driver_data(); pen_t pens[0x20]; offs_t offs; diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index 80d07630214..f1b24c4b0fa 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -17,7 +17,7 @@ static void update_palette(running_machine *machine) { - eprom_state *state = (eprom_state *)machine->driver_data; + eprom_state *state = machine->driver_data(); int color; for (color = 0; color < 0x800; ++color) @@ -53,8 +53,8 @@ static void update_palette(running_machine *machine) static TILE_GET_INFO( get_alpha_tile_info ) { - eprom_state *state = (eprom_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + eprom_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; @@ -64,9 +64,9 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - eprom_state *state = (eprom_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + eprom_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -75,9 +75,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) static TILE_GET_INFO( guts_get_playfield_tile_info ) { - eprom_state *state = (eprom_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + eprom_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(2, code, color, (data1 >> 15) & 1); @@ -129,17 +129,17 @@ VIDEO_START( eprom ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - eprom_state *state = (eprom_state *)machine->driver_data; + eprom_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* save states */ state_save_register_global(machine, state->screen_intensity); @@ -185,17 +185,17 @@ VIDEO_START( guts ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - eprom_state *state = (eprom_state *)machine->driver_data; + eprom_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, guts_get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, guts_get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* save states */ state_save_register_global(machine, state->screen_intensity); @@ -212,15 +212,15 @@ VIDEO_START( guts ) void eprom_scanline_update(screen_device &screen, int scanline) { - eprom_state *state = (eprom_state *)screen.machine->driver_data; + eprom_state *state = screen.machine->driver_data(); /* update the playfield */ if (scanline == 0) { - int xscroll = (state->atarigen.alpha[0x780] >> 7) & 0x1ff; - int yscroll = (state->atarigen.alpha[0x781] >> 7) & 0x1ff; - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, xscroll); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, yscroll); + int xscroll = (state->alpha[0x780] >> 7) & 0x1ff; + int yscroll = (state->alpha[0x781] >> 7) & 0x1ff; + tilemap_set_scrollx(state->playfield_tilemap, 0, xscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, yscroll); atarimo_set_xscroll(0, xscroll); atarimo_set_yscroll(0, yscroll); } @@ -236,7 +236,7 @@ void eprom_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( eprom ) { - eprom_state *state = (eprom_state *)screen->machine->driver_data; + eprom_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; @@ -250,7 +250,7 @@ VIDEO_UPDATE( eprom ) update_palette(screen->machine); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -359,7 +359,7 @@ VIDEO_UPDATE( eprom ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; @@ -391,7 +391,7 @@ VIDEO_UPDATE( eprom ) VIDEO_UPDATE( guts ) { - eprom_state *state = (eprom_state *)screen->machine->driver_data; + eprom_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; @@ -405,7 +405,7 @@ VIDEO_UPDATE( guts ) update_palette(screen->machine); /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -433,7 +433,7 @@ VIDEO_UPDATE( guts ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index 06055fa0831..bace23fbc68 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -62,7 +62,7 @@ PALETTE_INIT( splndrbt ) static TILE_GET_INFO( equites_fg_info ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); int tile = state->fg_videoram[2 * tile_index]; int color = state->fg_videoram[2 * tile_index + 1] & 0x1f; @@ -73,7 +73,7 @@ static TILE_GET_INFO( equites_fg_info ) static TILE_GET_INFO( splndrbt_fg_info ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); int tile = state->fg_videoram[2 * tile_index] + (state->fg_char_bank << 8); int color = state->fg_videoram[2 * tile_index + 1] & 0x3f; @@ -84,7 +84,7 @@ static TILE_GET_INFO( splndrbt_fg_info ) static TILE_GET_INFO( equites_bg_info ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); int data = state->bg_videoram[tile_index]; int tile = data & 0x1ff; int color = (data & 0xf000) >> 12; @@ -95,7 +95,7 @@ static TILE_GET_INFO( equites_bg_info ) static TILE_GET_INFO( splndrbt_bg_info ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); int data = state->bg_videoram[tile_index]; int tile = data & 0x1ff; int color = (data & 0xf800) >> 11; @@ -115,7 +115,7 @@ static TILE_GET_INFO( splndrbt_bg_info ) VIDEO_START( equites ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); state->fg_videoram = auto_alloc_array(machine, UINT8, 0x800); state_save_register_global_pointer(machine, state->fg_videoram, 0x800); @@ -129,7 +129,7 @@ VIDEO_START( equites ) VIDEO_START( splndrbt ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); assert(machine->primary_screen->format() == BITMAP_FORMAT_INDEXED16); state->fg_videoram = auto_alloc_array(machine, UINT8, 0x800); @@ -153,13 +153,13 @@ VIDEO_START( splndrbt ) READ16_HANDLER(equites_fg_videoram_r) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); return 0xff00 | state->fg_videoram[offset]; } WRITE16_HANDLER(equites_fg_videoram_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->fg_videoram[offset] = data & 0xff; @@ -170,7 +170,7 @@ WRITE16_HANDLER(equites_fg_videoram_w) WRITE16_HANDLER(equites_bg_videoram_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); COMBINE_DATA(state->bg_videoram + offset); tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -178,14 +178,14 @@ WRITE16_HANDLER(equites_bg_videoram_w) WRITE16_HANDLER(equites_bgcolor_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->bgcolor = data >> 8; } WRITE16_HANDLER(equites_scrollreg_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) tilemap_set_scrolly(state->bg_tilemap, 0, data & 0xff); @@ -195,7 +195,7 @@ WRITE16_HANDLER(equites_scrollreg_w) WRITE16_HANDLER(splndrbt_selchar0_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (state->fg_char_bank != 0) { state->fg_char_bank = 0; @@ -205,7 +205,7 @@ WRITE16_HANDLER(splndrbt_selchar0_w) WRITE16_HANDLER(splndrbt_selchar1_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (state->fg_char_bank != 1) { state->fg_char_bank = 1; @@ -225,7 +225,7 @@ WRITE16_HANDLER(equites_flip1_w) WRITE16_HANDLER(splndrbt_flip0_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) flip_screen_set(space->machine, 0); @@ -241,13 +241,13 @@ WRITE16_HANDLER(splndrbt_flip1_w) WRITE16_HANDLER(splndrbt_bg_scrollx_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); COMBINE_DATA(&state->splndrbt_bg_scrollx); } WRITE16_HANDLER(splndrbt_bg_scrolly_w) { - equites_state *state = (equites_state *)space->machine->driver_data; + equites_state *state = space->machine->driver_data(); COMBINE_DATA(&state->splndrbt_bg_scrolly); } @@ -260,7 +260,7 @@ WRITE16_HANDLER(splndrbt_bg_scrolly_w) static void equites_draw_sprites_block( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int start, int end ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); int offs; for (offs = end - 2; offs >= start; offs -= 2) @@ -334,7 +334,7 @@ Also, note that sprites are 30x30, not 32x32. static void splndrbt_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); const UINT8 * const xrom = memory_region(machine, "user2"); const UINT8 * const yrom = xrom + 0x100; const gfx_element* const gfx = machine->gfx[2]; @@ -410,7 +410,7 @@ static void splndrbt_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void splndrbt_copy_bg( running_machine *machine, bitmap_t *dst_bitmap, const rectangle *cliprect ) { - equites_state *state = (equites_state *)machine->driver_data; + equites_state *state = machine->driver_data(); bitmap_t * const src_bitmap = tilemap_get_pixmap(state->bg_tilemap); bitmap_t * const flags_bitmap = tilemap_get_flagsmap(state->bg_tilemap); const UINT8 * const xrom = memory_region(machine, "user1"); @@ -465,7 +465,7 @@ static void splndrbt_copy_bg( running_machine *machine, bitmap_t *dst_bitmap, co VIDEO_UPDATE( equites ) { - equites_state *state = (equites_state *)screen->machine->driver_data; + equites_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, state->bgcolor); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -479,7 +479,7 @@ VIDEO_UPDATE( equites ) VIDEO_UPDATE( splndrbt ) { - equites_state *state = (equites_state *)screen->machine->driver_data; + equites_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, state->bgcolor); splndrbt_copy_bg(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index fcdd8ea6ff0..71c9a4d5ceb 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -52,7 +52,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: static TILE_GET_INFO( get_tile_info_0 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); UINT16 code = state->vram_0[tile_index]; SET_TILE_INFO( 1, @@ -63,7 +63,7 @@ static TILE_GET_INFO( get_tile_info_0 ) static TILE_GET_INFO( get_tile_info_0_16x16 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); UINT16 code = state->vram_0[tile_index]; SET_TILE_INFO( 2, @@ -75,7 +75,7 @@ static TILE_GET_INFO( get_tile_info_0_16x16 ) static TILE_GET_INFO( get_tile_info_1 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); UINT16 code = state->vram_1[tile_index]; SET_TILE_INFO( 1, @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_tile_info_1 ) static TILE_GET_INFO( get_tile_info_1_16x16 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); UINT16 code = state->vram_1[tile_index]; SET_TILE_INFO( 2, @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_tile_info_1_16x16 ) WRITE16_HANDLER( esd16_vram_0_w ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_0[offset]); tilemap_mark_tile_dirty(state->tilemap_0, offset); tilemap_mark_tile_dirty(state->tilemap_0_16x16, offset); @@ -105,7 +105,7 @@ WRITE16_HANDLER( esd16_vram_0_w ) WRITE16_HANDLER( esd16_vram_1_w ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_1[offset]); tilemap_mark_tile_dirty(state->tilemap_1, offset); tilemap_mark_tile_dirty(state->tilemap_1_16x16, offset); @@ -113,7 +113,7 @@ WRITE16_HANDLER( esd16_vram_1_w ) WRITE16_HANDLER( esd16_tilemap0_color_w ) { - esd16_state *state = (esd16_state *)space->machine->driver_data; + esd16_state *state = space->machine->driver_data(); state->tilemap0_color = data & 3; tilemap_mark_all_tiles_dirty(state->tilemap_0); @@ -132,7 +132,7 @@ WRITE16_HANDLER( esd16_tilemap0_color_w ) VIDEO_START( esd16 ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); state->tilemap_0 = tilemap_create( machine, get_tile_info_0, tilemap_scan_rows, 8, 8, 0x80, 0x40); state->tilemap_1 = tilemap_create( machine, get_tile_info_1, tilemap_scan_rows, 8, 8, 0x80, 0x40); @@ -185,7 +185,7 @@ VIDEO_START( esd16 ) static void esd16_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); int offs; int max_x = machine->primary_screen->width(); @@ -249,7 +249,7 @@ static void esd16_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons /* note, check if i can re-merge this with the other or if its really different */ static void hedpanic_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - esd16_state *state = (esd16_state *)machine->driver_data; + esd16_state *state = machine->driver_data(); int offs; int max_x = machine->primary_screen->width(); @@ -325,7 +325,7 @@ static void hedpanic_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( esd16 ) { - esd16_state *state = (esd16_state *)screen->machine->driver_data; + esd16_state *state = screen->machine->driver_data(); int layers_ctrl = -1; bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -359,7 +359,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) VIDEO_UPDATE( hedpanic ) { - esd16_state *state = (esd16_state *)screen->machine->driver_data; + esd16_state *state = screen->machine->driver_data(); int layers_ctrl = -1; bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -422,7 +422,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) // uses older style sprites VIDEO_UPDATE( hedpanio ) { - esd16_state *state = (esd16_state *)screen->machine->driver_data; + esd16_state *state = screen->machine->driver_data(); int layers_ctrl = -1; bitmap_fill(screen->machine->priority_bitmap,cliprect,0); diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index 555130510e5..e07c56a1849 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -67,7 +67,7 @@ PALETTE_INIT( espial ) static TILE_GET_INFO( get_tile_info ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); UINT8 code = state->videoram[tile_index]; UINT8 col = state->colorram[tile_index]; UINT8 attr = state->attributeram[tile_index]; @@ -87,7 +87,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( espial ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->bg_tilemap, 32); @@ -97,7 +97,7 @@ VIDEO_START( espial ) VIDEO_START( netwars ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); /* Net Wars has a tile map that's twice as big as Espial's */ state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 64); @@ -117,7 +117,7 @@ VIDEO_START( netwars ) WRITE8_HANDLER( espial_videoram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -126,7 +126,7 @@ WRITE8_HANDLER( espial_videoram_w ) WRITE8_HANDLER( espial_colorram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -135,7 +135,7 @@ WRITE8_HANDLER( espial_colorram_w ) WRITE8_HANDLER( espial_attributeram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->attributeram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -144,7 +144,7 @@ WRITE8_HANDLER( espial_attributeram_w ) WRITE8_HANDLER( espial_scrollram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->scrollram[offset] = data; tilemap_set_scrolly(state->bg_tilemap, offset, data); @@ -153,7 +153,7 @@ WRITE8_HANDLER( espial_scrollram_w ) WRITE8_HANDLER( espial_flipscreen_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->flipscreen = data; tilemap_set_flip(state->bg_tilemap, state->flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); @@ -168,7 +168,7 @@ WRITE8_HANDLER( espial_flipscreen_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); int offs; /* Note that it is important to draw them exactly in this */ @@ -234,7 +234,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( espial ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index 75545348b9e..0f30addd5e0 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -82,7 +82,7 @@ PALETTE_INIT( exedexes ) WRITE8_HANDLER( exedexes_videoram_w ) { - exedexes_state *state = (exedexes_state *)space->machine->driver_data; + exedexes_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -90,7 +90,7 @@ WRITE8_HANDLER( exedexes_videoram_w ) WRITE8_HANDLER( exedexes_colorram_w ) { - exedexes_state *state = (exedexes_state *)space->machine->driver_data; + exedexes_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -98,7 +98,7 @@ WRITE8_HANDLER( exedexes_colorram_w ) WRITE8_HANDLER( exedexes_c804_w ) { - exedexes_state *state = (exedexes_state *)space->machine->driver_data; + exedexes_state *state = space->machine->driver_data(); /* bits 0 and 1 are coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -115,7 +115,7 @@ WRITE8_HANDLER( exedexes_c804_w ) WRITE8_HANDLER( exedexes_gfxctrl_w ) { - exedexes_state *state = (exedexes_state *)space->machine->driver_data; + exedexes_state *state = space->machine->driver_data(); /* bit 4 is bg enable */ state->sc2on = data & 0x10; @@ -151,7 +151,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - exedexes_state *state = (exedexes_state *)machine->driver_data; + exedexes_state *state = machine->driver_data(); int code = state->videoram[tile_index] + 2 * (state->colorram[tile_index] & 0x80); int color = state->colorram[tile_index] & 0x3f; @@ -174,7 +174,7 @@ static TILEMAP_MAPPER( exedexes_fg_tilemap_scan ) VIDEO_START( exedexes ) { - exedexes_state *state = (exedexes_state *)machine->driver_data; + exedexes_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, exedexes_bg_tilemap_scan, 32, 32, 64, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, exedexes_fg_tilemap_scan, 16, 16, 128, 128); @@ -186,7 +186,7 @@ VIDEO_START( exedexes ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - exedexes_state *state = (exedexes_state *)machine->driver_data; + exedexes_state *state = machine->driver_data(); UINT8 *buffered_spriteram = machine->generic.buffered_spriteram.u8; int offs; @@ -219,7 +219,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( exedexes ) { - exedexes_state *state = (exedexes_state *)screen->machine->driver_data; + exedexes_state *state = screen->machine->driver_data(); if (state->sc2on) { tilemap_set_scrollx(state->bg_tilemap, 0, ((state->bg_scroll[1]) << 8) + state->bg_scroll[0]); diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index a44ff4785a9..9fffe1c6599 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -105,7 +105,7 @@ PALETTE_INIT( exerion ) VIDEO_START( exerion ) { - exerion_state *state = (exerion_state *)machine->driver_data; + exerion_state *state = machine->driver_data(); int i; UINT8 *gfx; @@ -185,7 +185,7 @@ VIDEO_START( exerion ) WRITE8_HANDLER( exerion_videoreg_w ) { - exerion_state *state = (exerion_state *)space->machine->driver_data; + exerion_state *state = space->machine->driver_data(); /* bit 0 = flip screen and joystick input multiplexer */ state->cocktail_flip = data & 1; @@ -205,7 +205,7 @@ WRITE8_HANDLER( exerion_videoreg_w ) WRITE8_HANDLER( exerion_video_latch_w ) { - exerion_state *state = (exerion_state *)space->machine->driver_data; + exerion_state *state = space->machine->driver_data(); int scanline = space->machine->primary_screen->vpos(); if (scanline > 0) space->machine->primary_screen->update_partial(scanline - 1); @@ -236,7 +236,7 @@ READ8_HANDLER( exerion_video_timing_r ) static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - exerion_state *state = (exerion_state *)machine->driver_data; + exerion_state *state = machine->driver_data(); int x, y; /* loop over all visible scanlines */ @@ -352,7 +352,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r VIDEO_UPDATE( exerion ) { - exerion_state *state = (exerion_state *)screen->machine->driver_data; + exerion_state *state = screen->machine->driver_data(); int sx, sy, offs, i; /* draw background */ diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index f4c7a8f3571..ff32c043b3f 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -4,14 +4,14 @@ WRITE8_HANDLER( exprraid_videoram_w ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( exprraid_colorram_w ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -27,7 +27,7 @@ WRITE8_HANDLER( exprraid_flipscreen_w ) WRITE8_HANDLER( exprraid_bgselect_w ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); if (state->bg_index[offset] != data) { state->bg_index[offset] = data; @@ -37,19 +37,19 @@ WRITE8_HANDLER( exprraid_bgselect_w ) WRITE8_HANDLER( exprraid_scrollx_w ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, offset, data); } WRITE8_HANDLER( exprraid_scrolly_w ) { - exprraid_state *state = (exprraid_state *)space->machine->driver_data; + exprraid_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, data); } static TILE_GET_INFO( get_bg_tile_info ) { - exprraid_state *state = (exprraid_state *)machine->driver_data; + exprraid_state *state = machine->driver_data(); UINT8 *tilerom = memory_region(machine, "gfx4"); int data, attr, bank, code, color, flags; @@ -77,7 +77,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - exprraid_state *state = (exprraid_state *)machine->driver_data; + exprraid_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0x07) << 8); int color = (attr & 0x10) >> 4; @@ -87,7 +87,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( exprraid ) { - exprraid_state *state = (exprraid_state *)machine->driver_data; + exprraid_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -98,7 +98,7 @@ VIDEO_START( exprraid ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - exprraid_state *state = (exprraid_state *)machine->driver_data; + exprraid_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -138,7 +138,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( exprraid ) { - exprraid_state *state = (exprraid_state *)screen->machine->driver_data; + exprraid_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 1, 0); diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index 71144fbef40..2860d314a1b 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -14,7 +14,7 @@ static TILE_GET_INFO( f1gp_get_roz_tile_info ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); int code = state->rozvideoram[tile_index]; SET_TILE_INFO(3, code & 0x7ff, code >> 12, 0); @@ -22,7 +22,7 @@ static TILE_GET_INFO( f1gp_get_roz_tile_info ) static TILE_GET_INFO( f1gp2_get_roz_tile_info ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); int code = state->rozvideoram[tile_index]; SET_TILE_INFO(2, (code & 0x7ff) + (state->roz_bank << 11), code >> 12, 0); @@ -30,7 +30,7 @@ static TILE_GET_INFO( f1gp2_get_roz_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); int code = state->fgvideoram[tile_index]; SET_TILE_INFO(0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0); @@ -45,7 +45,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( f1gp ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); state->roz_tilemap = tilemap_create(machine, f1gp_get_roz_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -61,7 +61,7 @@ VIDEO_START( f1gp ) VIDEO_START( f1gpb ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); state->roz_tilemap = tilemap_create(machine, f1gp_get_roz_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -76,7 +76,7 @@ VIDEO_START( f1gpb ) VIDEO_START( f1gp2 ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); state->roz_tilemap = tilemap_create(machine, f1gp2_get_roz_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -97,40 +97,40 @@ VIDEO_START( f1gp2 ) READ16_HANDLER( f1gp_zoomdata_r ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); return state->zoomdata[offset]; } WRITE16_HANDLER( f1gp_zoomdata_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->zoomdata[offset]); gfx_element_mark_dirty(space->machine->gfx[3], offset / 64); } READ16_HANDLER( f1gp_rozvideoram_r ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); return state->rozvideoram[offset]; } WRITE16_HANDLER( f1gp_rozvideoram_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->rozvideoram[offset]); tilemap_mark_tile_dirty(state->roz_tilemap, offset); } WRITE16_HANDLER( f1gp_fgvideoram_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fgvideoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE16_HANDLER( f1gp_fgscroll_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll[offset]); tilemap_set_scrollx(state->fg_tilemap, 0, state->scroll[0]); @@ -139,7 +139,7 @@ WRITE16_HANDLER( f1gp_fgscroll_w ) WRITE16_HANDLER( f1gp_gfxctrl_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->flipscreen = data & 0x20; @@ -149,7 +149,7 @@ WRITE16_HANDLER( f1gp_gfxctrl_w ) WRITE16_HANDLER( f1gp2_gfxctrl_w ) { - f1gp_state *state = (f1gp_state *)space->machine->driver_data; + f1gp_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->flipscreen = data & 0x20; @@ -179,7 +179,7 @@ WRITE16_HANDLER( f1gp2_gfxctrl_w ) static void f1gp_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, int primask ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); int attr_start, first; UINT16 *spram = chip ? state->spr2vram : state->spr1vram; @@ -252,7 +252,7 @@ static void f1gp_draw_sprites( running_machine *machine, bitmap_t *bitmap, const VIDEO_UPDATE( f1gp ) { - f1gp_state *state = (f1gp_state *)screen->machine->driver_data; + f1gp_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -277,7 +277,7 @@ VIDEO_UPDATE( f1gp ) static void f1gpb_draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int attr_start, start_offset = state->spriteram_size / 2 - 4; @@ -345,7 +345,7 @@ static void f1gpb_draw_sprites( running_machine *machine, bitmap_t *bitmap,const VIDEO_UPDATE( f1gpb ) { - f1gp_state *state = (f1gp_state *)screen->machine->driver_data; + f1gp_state *state = screen->machine->driver_data(); UINT32 startx, starty; int incxx, incxy, incyx, incyy; @@ -374,7 +374,7 @@ VIDEO_UPDATE( f1gpb ) static void f1gp2_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - f1gp_state *state = (f1gp_state *)machine->driver_data; + f1gp_state *state = machine->driver_data(); int offs; offs = 0; @@ -446,7 +446,7 @@ static void f1gp2_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( f1gp2 ) { - f1gp_state *state = (f1gp_state *)screen->machine->driver_data; + f1gp_state *state = screen->machine->driver_data(); if (state->gfxctrl & 4) /* blank screen */ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index b0654ffe141..9f3bfd20e7d 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -25,7 +25,7 @@ PALETTE_INIT( fastlane ) static void set_pens( running_machine *machine ) { - fastlane_state *state = (fastlane_state *)machine->driver_data; + fastlane_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x800; i += 2) @@ -48,7 +48,7 @@ static void set_pens( running_machine *machine ) static TILE_GET_INFO( get_tile_info0 ) { - fastlane_state *state = (fastlane_state *)machine->driver_data; + fastlane_state *state = machine->driver_data(); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121, 3); UINT8 ctrl_4 = k007121_ctrlram_r(state->k007121, 4); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121, 5); @@ -77,7 +77,7 @@ static TILE_GET_INFO( get_tile_info0 ) static TILE_GET_INFO( get_tile_info1 ) { - fastlane_state *state = (fastlane_state *)machine->driver_data; + fastlane_state *state = machine->driver_data(); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121, 3); UINT8 ctrl_4 = k007121_ctrlram_r(state->k007121, 4); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121, 5); @@ -112,7 +112,7 @@ static TILE_GET_INFO( get_tile_info1 ) VIDEO_START( fastlane ) { - fastlane_state *state = (fastlane_state *)machine->driver_data; + fastlane_state *state = machine->driver_data(); state->layer0 = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 8, 8, 32, 32); state->layer1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 8, 8, 32, 32); @@ -135,14 +135,14 @@ VIDEO_START( fastlane ) WRITE8_HANDLER( fastlane_vram1_w ) { - fastlane_state *state = (fastlane_state *)space->machine->driver_data; + fastlane_state *state = space->machine->driver_data(); state->videoram1[offset] = data; tilemap_mark_tile_dirty(state->layer0, offset & 0x3ff); } WRITE8_HANDLER( fastlane_vram2_w ) { - fastlane_state *state = (fastlane_state *)space->machine->driver_data; + fastlane_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->layer1, offset & 0x3ff); } @@ -157,7 +157,7 @@ WRITE8_HANDLER( fastlane_vram2_w ) VIDEO_UPDATE( fastlane ) { - fastlane_state *state = (fastlane_state *)screen->machine->driver_data; + fastlane_state *state = screen->machine->driver_data(); rectangle finalclip0 = state->clip0, finalclip1 = state->clip1; int i, xoffs; diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 7c8ab15fdc6..92ba2dd4ab9 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -100,7 +100,7 @@ PALETTE_INIT( fcombat ) VIDEO_START( fcombat ) { - fcombat_state *state = (fcombat_state *)machine->driver_data; + fcombat_state *state = machine->driver_data(); state->bgmap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 32 * 8 * 2, 32); } @@ -114,7 +114,7 @@ VIDEO_START( fcombat ) WRITE8_HANDLER( fcombat_videoreg_w ) { - fcombat_state *state = (fcombat_state *)space->machine->driver_data; + fcombat_state *state = space->machine->driver_data(); /* bit 0 = flip screen and joystick input multiplexor */ state->cocktail_flip = data & 1; @@ -136,7 +136,7 @@ WRITE8_HANDLER( fcombat_videoreg_w ) VIDEO_UPDATE( fcombat ) { - fcombat_state *state = (fcombat_state *)screen->machine->driver_data; + fcombat_state *state = screen->machine->driver_data(); int sx, sy, offs, i; /* draw background */ diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c index 3e82c8b25b0..82542e4e38c 100644 --- a/src/mame/video/fgoal.c +++ b/src/mame/video/fgoal.c @@ -10,28 +10,28 @@ WRITE8_HANDLER( fgoal_color_w ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); state->current_color = data & 3; } WRITE8_HANDLER( fgoal_ypos_w ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); state->ypos = data; } WRITE8_HANDLER( fgoal_xpos_w ) { - fgoal_state *state = (fgoal_state *)space->machine->driver_data; + fgoal_state *state = space->machine->driver_data(); state->xpos = data; } VIDEO_START( fgoal ) { - fgoal_state *state = (fgoal_state *)machine->driver_data; + fgoal_state *state = machine->driver_data(); state->fgbitmap = machine->primary_screen->alloc_compatible_bitmap(); state->bgbitmap = machine->primary_screen->alloc_compatible_bitmap(); @@ -42,7 +42,7 @@ VIDEO_START( fgoal ) VIDEO_UPDATE( fgoal ) { - fgoal_state *state = (fgoal_state *)screen->machine->driver_data; + fgoal_state *state = screen->machine->driver_data(); const UINT8* VRAM = state->video_ram; int x; diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index 478eb5cc52a..dd473ed7087 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -45,7 +45,7 @@ PALETTE_INIT( finalizr ) static TILE_GET_INFO( get_bg_tile_info ) { - finalizr_state *state = (finalizr_state *)machine->driver_data; + finalizr_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0xc0) << 2) + (state->charbank << 10); int color = attr & 0x0f; @@ -56,7 +56,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - finalizr_state *state = (finalizr_state *)machine->driver_data; + finalizr_state *state = machine->driver_data(); int attr = state->colorram2[tile_index]; int code = state->videoram2[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; @@ -67,7 +67,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( finalizr ) { - finalizr_state *state = (finalizr_state *)machine->driver_data; + finalizr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -77,7 +77,7 @@ VIDEO_START( finalizr ) WRITE8_HANDLER( finalizr_videoctrl_w ) { - finalizr_state *state = (finalizr_state *)space->machine->driver_data; + finalizr_state *state = space->machine->driver_data(); state->charbank = data & 3; state->spriterambank = data & 8; /* other bits unknown */ @@ -87,7 +87,7 @@ WRITE8_HANDLER( finalizr_videoctrl_w ) VIDEO_UPDATE( finalizr ) { - finalizr_state *state = (finalizr_state *)screen->machine->driver_data; + finalizr_state *state = screen->machine->driver_data(); int offs; tilemap_mark_all_tiles_dirty(state->bg_tilemap); diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c index 590925b97d6..8ca25cced2f 100644 --- a/src/mame/video/firetrap.c +++ b/src/mame/video/firetrap.c @@ -85,7 +85,7 @@ static TILEMAP_MAPPER( get_bg_memory_offset ) static TILE_GET_INFO( get_fg_tile_info ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); int code = state->fgvideoram[tile_index]; int color = state->fgvideoram[tile_index + 0x400]; SET_TILE_INFO( @@ -108,13 +108,13 @@ INLINE void get_bg_tile_info(running_machine *machine, tile_data *tileinfo, int static TILE_GET_INFO( get_bg1_tile_info ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); get_bg_tile_info(machine, tileinfo, tile_index, state->bg1videoram, 1); } static TILE_GET_INFO( get_bg2_tile_info ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); get_bg_tile_info(machine, tileinfo, tile_index, state->bg2videoram, 2); } @@ -127,7 +127,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( firetrap ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, get_fg_memory_offset, 8, 8, 32, 32); state->bg1_tilemap = tilemap_create(machine, get_bg1_tile_info, get_bg_memory_offset, 16, 16, 32, 32); state->bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, get_bg_memory_offset, 16, 16, 32, 32); @@ -145,21 +145,21 @@ VIDEO_START( firetrap ) WRITE8_HANDLER( firetrap_fgvideoram_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); } WRITE8_HANDLER( firetrap_bg1videoram_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->bg1videoram[offset] = data; tilemap_mark_tile_dirty(state->bg1_tilemap, offset & 0x6ff); } WRITE8_HANDLER( firetrap_bg2videoram_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->bg2videoram[offset] = data; tilemap_mark_tile_dirty(state->bg2_tilemap, offset & 0x6ff); } @@ -167,28 +167,28 @@ WRITE8_HANDLER( firetrap_bg2videoram_w ) WRITE8_HANDLER( firetrap_bg1_scrollx_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->scroll1_x[offset] = data; tilemap_set_scrollx(state->bg1_tilemap, 0, state->scroll1_x[0] | (state->scroll1_x[1] << 8)); } WRITE8_HANDLER( firetrap_bg1_scrolly_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->scroll1_y[offset] = data; tilemap_set_scrolly(state->bg1_tilemap, 0, -(state->scroll1_y[0] | (state->scroll1_y[1] << 8))); } WRITE8_HANDLER( firetrap_bg2_scrollx_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->scroll2_x[offset] = data; tilemap_set_scrollx(state->bg2_tilemap, 0, state->scroll2_x[0] | (state->scroll2_x[1] << 8)); } WRITE8_HANDLER( firetrap_bg2_scrolly_w ) { - firetrap_state *state = (firetrap_state *)space->machine->driver_data; + firetrap_state *state = space->machine->driver_data(); state->scroll2_y[offset] = data; tilemap_set_scrolly(state->bg2_tilemap, 0, -(state->scroll2_y[0] | (state->scroll2_y[1] << 8))); } @@ -202,7 +202,7 @@ WRITE8_HANDLER( firetrap_bg2_scrolly_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - firetrap_state *state = (firetrap_state *)machine->driver_data; + firetrap_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -273,7 +273,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( firetrap ) { - firetrap_state *state = (firetrap_state *)screen->machine->driver_data; + firetrap_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg2_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->bg1_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index 3f3729686c5..faa187d080a 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -6,7 +6,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[3]; UINT16 *source = state->spriteram; UINT16 *finish = source + 0x800 / 2; @@ -43,7 +43,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static TILE_GET_INFO( get_fof_bak_tile_info ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); int code = state->fof_bak_tileram[tile_index * 2 + 1]; int colr = state->fof_bak_tileram[tile_index * 2] & 0x1f; int xflip = (state->fof_bak_tileram[tile_index * 2] & 0x0020) >> 5; @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_fof_bak_tile_info ) WRITE16_HANDLER( fof_bak_tileram_w ) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fof_bak_tileram[offset]); tilemap_mark_tile_dirty(state->fof_bak_tilemap, offset / 2); @@ -63,7 +63,7 @@ WRITE16_HANDLER( fof_bak_tileram_w ) static TILE_GET_INFO( get_fof_mid_tile_info ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); int code = state->fof_mid_tileram[tile_index * 2 + 1]; int colr = state->fof_mid_tileram[tile_index * 2] & 0x1f; int xflip = (state->fof_mid_tileram[tile_index * 2] & 0x0020) >> 5; @@ -74,7 +74,7 @@ static TILE_GET_INFO( get_fof_mid_tile_info ) WRITE16_HANDLER( fof_mid_tileram_w ) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fof_mid_tileram[offset]); tilemap_mark_tile_dirty(state->fof_mid_tilemap, offset / 2); @@ -82,7 +82,7 @@ WRITE16_HANDLER( fof_mid_tileram_w ) static TILE_GET_INFO( get_fof_txt_tile_info ) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); int code = state->fof_txt_tileram[tile_index * 2 + 1]; int colr = state->fof_txt_tileram[tile_index * 2] & 0x1f; int xflip = (state->fof_txt_tileram[tile_index * 2] & 0x0020) >> 5; @@ -93,7 +93,7 @@ static TILE_GET_INFO( get_fof_txt_tile_info ) WRITE16_HANDLER( fof_txt_tileram_w ) { - fitfight_state *state = (fitfight_state *)space->machine->driver_data; + fitfight_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fof_txt_tileram[offset]); tilemap_mark_tile_dirty(state->fof_txt_tilemap, offset / 2); @@ -103,7 +103,7 @@ WRITE16_HANDLER( fof_txt_tileram_w ) VIDEO_START(fitfight) { - fitfight_state *state = (fitfight_state *)machine->driver_data; + fitfight_state *state = machine->driver_data(); state->fof_bak_tilemap = tilemap_create(machine, get_fof_bak_tile_info, tilemap_scan_cols, 8, 8, 128, 32); /* opaque */ @@ -116,7 +116,7 @@ VIDEO_START(fitfight) VIDEO_UPDATE(fitfight) { - fitfight_state *state = (fitfight_state *)screen->machine->driver_data; + fitfight_state *state = screen->machine->driver_data(); /* scroll isn't right */ diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index 05bdab42313..b26338ed4b0 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -16,7 +16,7 @@ static TILE_GET_INFO( get_tile_info_A ) { - flkatck_state *state = (flkatck_state *)machine->driver_data; + flkatck_state *state = machine->driver_data(); UINT8 ctrl_0 = k007121_ctrlram_r(state->k007121, 0); UINT8 ctrl_2 = k007121_ctrlram_r(state->k007121, 2); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121, 3); @@ -51,7 +51,7 @@ static TILE_GET_INFO( get_tile_info_A ) static TILE_GET_INFO( get_tile_info_B ) { - flkatck_state *state = (flkatck_state *)machine->driver_data; + flkatck_state *state = machine->driver_data(); int attr = state->k007121_ram[tile_index + 0x800]; int code = state->k007121_ram[tile_index + 0xc00]; @@ -71,7 +71,7 @@ static TILE_GET_INFO( get_tile_info_B ) VIDEO_START( flkatck ) { - flkatck_state *state = (flkatck_state *)machine->driver_data; + flkatck_state *state = machine->driver_data(); state->k007121_tilemap[0] = tilemap_create(machine, get_tile_info_A, tilemap_scan_rows, 8, 8, 32, 32); state->k007121_tilemap[1] = tilemap_create(machine, get_tile_info_B, tilemap_scan_rows, 8, 8, 32, 32); } @@ -85,7 +85,7 @@ VIDEO_START( flkatck ) WRITE8_HANDLER( flkatck_k007121_w ) { - flkatck_state *state = (flkatck_state *)space->machine->driver_data; + flkatck_state *state = space->machine->driver_data(); state->k007121_ram[offset] = data; if (offset < 0x1000) /* tiles */ @@ -99,7 +99,7 @@ WRITE8_HANDLER( flkatck_k007121_w ) WRITE8_HANDLER( flkatck_k007121_regs_w ) { - flkatck_state *state = (flkatck_state *)space->machine->driver_data; + flkatck_state *state = space->machine->driver_data(); switch (offset) { @@ -134,7 +134,7 @@ WRITE8_HANDLER( flkatck_k007121_regs_w ) VIDEO_UPDATE( flkatck ) { - flkatck_state *state = (flkatck_state *)screen->machine->driver_data; + flkatck_state *state = screen->machine->driver_data(); rectangle clip[2]; const rectangle &visarea = screen->visible_area(); diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c index 93baec4decb..ba39f016d7a 100644 --- a/src/mame/video/flstory.c +++ b/src/mame/video/flstory.c @@ -11,7 +11,7 @@ static TILE_GET_INFO( get_tile_info ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); int code = state->videoram[tile_index * 2]; int attr = state->videoram[tile_index * 2 + 1]; int tile_number = code + ((attr & 0xc0) << 2) + 0x400 + 0x800 * state->char_bank; @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_tile_info ) static TILE_GET_INFO( victnine_get_tile_info ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); int code = state->videoram[tile_index * 2]; int attr = state->videoram[tile_index * 2 + 1]; int tile_number = ((attr & 0x38) << 5) + code; @@ -43,7 +43,7 @@ static TILE_GET_INFO( victnine_get_tile_info ) VIDEO_START( flstory ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); // tilemap_set_transparent_pen(state->bg_tilemap, 15); tilemap_set_transmask(state->bg_tilemap, 0, 0x3fff, 0xc000); /* split type 0 has pens 0-13 transparent in front half */ @@ -58,7 +58,7 @@ VIDEO_START( flstory ) VIDEO_START( victnine ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, victnine_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->bg_tilemap, 32); @@ -70,14 +70,14 @@ VIDEO_START( victnine ) WRITE8_HANDLER( flstory_videoram_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( flstory_palette_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); if (offset & 0x100) paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (state->palette_bank << 8),data); else @@ -86,7 +86,7 @@ WRITE8_HANDLER( flstory_palette_w ) READ8_HANDLER( flstory_palette_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); if (offset & 0x100) return space->machine->generic.paletteram2.u8[ (offset & 0xff) + (state->palette_bank << 8) ]; else @@ -95,7 +95,7 @@ READ8_HANDLER( flstory_palette_r ) WRITE8_HANDLER( flstory_gfxctrl_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); if (state->gfxctrl == data) return; state->gfxctrl = data; @@ -116,13 +116,13 @@ WRITE8_HANDLER( flstory_gfxctrl_w ) READ8_HANDLER( victnine_gfxctrl_r ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); return state->gfxctrl; } WRITE8_HANDLER( victnine_gfxctrl_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); if (state->gfxctrl == data) return; state->gfxctrl = data; @@ -141,7 +141,7 @@ WRITE8_HANDLER( victnine_gfxctrl_w ) WRITE8_HANDLER( flstory_scrlram_w ) { - flstory_state *state = (flstory_state *)space->machine->driver_data; + flstory_state *state = space->machine->driver_data(); state->scrlram[offset] = data; tilemap_set_scrolly(state->bg_tilemap, offset, data); } @@ -149,7 +149,7 @@ WRITE8_HANDLER( flstory_scrlram_w ) static void flstory_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); int i; for (i = 0; i < 0x20; i++) @@ -194,7 +194,7 @@ static void flstory_draw_sprites( running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( flstory ) { - flstory_state *state = (flstory_state *)screen->machine->driver_data; + flstory_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0 | TILEMAP_DRAW_LAYER1, 0); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 1 | TILEMAP_DRAW_LAYER1, 0); flstory_draw_sprites(screen->machine, bitmap, cliprect, 0x00); @@ -206,7 +206,7 @@ VIDEO_UPDATE( flstory ) static void victnine_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - flstory_state *state = (flstory_state *)machine->driver_data; + flstory_state *state = machine->driver_data(); int i; for (i = 0; i < 0x20; i++) @@ -251,7 +251,7 @@ static void victnine_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( victnine ) { - flstory_state *state = (flstory_state *)screen->machine->driver_data; + flstory_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); victnine_draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c index 6fc95a0ba02..6b0c6b9df16 100644 --- a/src/mame/video/foodf.c +++ b/src/mame/video/foodf.c @@ -17,8 +17,8 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - foodf_state *state = (foodf_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + foodf_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = (data & 0xff) | ((data >> 7) & 0x100); int color = (data >> 8) & 0x3f; SET_TILE_INFO(0, code, color, state->playfield_flip ? (TILE_FLIPX | TILE_FLIPY) : 0); @@ -35,14 +35,14 @@ static TILE_GET_INFO( get_playfield_tile_info ) VIDEO_START( foodf ) { static const int resistances[3] = { 1000, 470, 220 }; - foodf_state *state = (foodf_state *)machine->driver_data; + foodf_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 32,32); - tilemap_set_transparent_pen(state->atarigen.playfield_tilemap, 0); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 32,32); + tilemap_set_transparent_pen(state->playfield_tilemap, 0); /* adjust the playfield for the 8 pixel offset */ - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, -8); + tilemap_set_scrollx(state->playfield_tilemap, 0, -8); state_save_register_global(machine, state->playfield_flip); /* compute the color output resistor weights */ @@ -65,7 +65,7 @@ void foodf_set_flip(foodf_state *state, int flip) if (flip != state->playfield_flip) { state->playfield_flip = flip; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } } @@ -79,7 +79,7 @@ void foodf_set_flip(foodf_state *state, int flip) WRITE16_HANDLER( foodf_paletteram_w ) { - foodf_state *state = (foodf_state *)space->machine->driver_data; + foodf_state *state = space->machine->driver_data(); int newword, r, g, b, bit0, bit1, bit2; COMBINE_DATA(&space->machine->generic.paletteram.u16[offset]); @@ -116,18 +116,18 @@ WRITE16_HANDLER( foodf_paletteram_w ) VIDEO_UPDATE( foodf ) { - foodf_state *state = (foodf_state *)screen->machine->driver_data; + foodf_state *state = screen->machine->driver_data(); int offs; const gfx_element *gfx = screen->machine->gfx[1]; bitmap_t *priority_bitmap = screen->machine->priority_bitmap; UINT16 *spriteram16 = screen->machine->generic.spriteram.u16; /* first draw the playfield opaquely */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, TILEMAP_DRAW_OPAQUE, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, TILEMAP_DRAW_OPAQUE, 0); /* then draw the non-transparent parts with a priority of 1 */ bitmap_fill(priority_bitmap, 0, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 1); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 1); /* draw the motion objects front-to-back */ for (offs = 0x80-2; offs >= 0x20; offs -= 2) diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c index 336234ee633..0b67ec9dc63 100644 --- a/src/mame/video/freekick.c +++ b/src/mame/video/freekick.c @@ -6,7 +6,7 @@ static TILE_GET_INFO( get_freek_tile_info ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); int tileno, palno; tileno = state->videoram[tile_index] + ((state->videoram[tile_index + 0x400] & 0xe0) << 3); @@ -17,21 +17,21 @@ static TILE_GET_INFO( get_freek_tile_info ) VIDEO_START( freekick ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); state->freek_tilemap = tilemap_create(machine, get_freek_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } WRITE8_HANDLER( freek_videoram_w ) { - freekick_state *state = (freekick_state *)space->machine->driver_data; + freekick_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->freek_tilemap, offset & 0x3ff); } static void gigas_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -66,7 +66,7 @@ static void gigas_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons static void pbillrd_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -102,7 +102,7 @@ static void pbillrd_draw_sprites( running_machine *machine, bitmap_t *bitmap, co static void freekick_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - freekick_state *state = (freekick_state *)machine->driver_data; + freekick_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -136,7 +136,7 @@ static void freekick_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( gigas ) { - freekick_state *state = (freekick_state *)screen->machine->driver_data; + freekick_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->freek_tilemap, 0, 0); gigas_draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -144,7 +144,7 @@ VIDEO_UPDATE( gigas ) VIDEO_UPDATE( pbillrd ) { - freekick_state *state = (freekick_state *)screen->machine->driver_data; + freekick_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->freek_tilemap, 0, 0); pbillrd_draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -152,7 +152,7 @@ VIDEO_UPDATE( pbillrd ) VIDEO_UPDATE( freekick ) { - freekick_state *state = (freekick_state *)screen->machine->driver_data; + freekick_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->freek_tilemap, 0, 0); freekick_draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index cf07f9b6c34..3b2a201033c 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -17,7 +17,7 @@ INLINE void fromanc2_get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int vram, int layer ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); int tile, color; tile = (state->videoram[vram][layer][tile_index] & 0x3fff) | (state->gfxbank[vram][layer] << 14); @@ -38,7 +38,7 @@ static TILE_GET_INFO( fromanc2_get_v1_l3_tile_info ) { fromanc2_get_tile_info(ma INLINE void fromancr_get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int vram, int layer ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); int tile, color; tile = state->videoram[vram][layer][tile_index] | (state->gfxbank[vram][layer] << 16); @@ -63,19 +63,19 @@ static TILE_GET_INFO( fromancr_get_v1_l2_tile_info ) { fromancr_get_tile_info(ma READ16_HANDLER( fromanc2_paletteram_0_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->paletteram[0][offset]; } READ16_HANDLER( fromanc2_paletteram_1_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->paletteram[1][offset]; } WRITE16_HANDLER( fromanc2_paletteram_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 color; COMBINE_DATA(&state->paletteram[0][offset]); @@ -87,7 +87,7 @@ WRITE16_HANDLER( fromanc2_paletteram_0_w ) WRITE16_HANDLER( fromanc2_paletteram_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 color; COMBINE_DATA(&state->paletteram[1][offset]); @@ -100,19 +100,19 @@ WRITE16_HANDLER( fromanc2_paletteram_1_w ) READ16_HANDLER( fromancr_paletteram_0_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->paletteram[0][offset]; } READ16_HANDLER( fromancr_paletteram_1_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->paletteram[1][offset]; } WRITE16_HANDLER( fromancr_paletteram_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 color; COMBINE_DATA(&state->paletteram[0][offset]); @@ -124,7 +124,7 @@ WRITE16_HANDLER( fromancr_paletteram_0_w ) WRITE16_HANDLER( fromancr_paletteram_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 color; COMBINE_DATA(&state->paletteram[1][offset]); @@ -137,19 +137,19 @@ WRITE16_HANDLER( fromancr_paletteram_1_w ) READ16_HANDLER( fromanc4_paletteram_0_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->paletteram[0][offset]; } READ16_HANDLER( fromanc4_paletteram_1_r ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); return state->paletteram[1][offset]; } WRITE16_HANDLER( fromanc4_paletteram_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 color; COMBINE_DATA(&state->paletteram[0][offset]); @@ -161,7 +161,7 @@ WRITE16_HANDLER( fromanc4_paletteram_0_w ) WRITE16_HANDLER( fromanc4_paletteram_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); UINT16 color; COMBINE_DATA(&state->paletteram[1][offset]); @@ -174,7 +174,7 @@ WRITE16_HANDLER( fromanc4_paletteram_1_w ) INLINE void fromanc2_dispvram_w( running_machine *machine, offs_t offset, UINT16 data, UINT16 mem_mask, int vram, int layer ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); layer += (offset < 0x1000) ? 0 : 1; COMBINE_DATA(&state->videoram[vram][layer][offset & 0x0fff]); @@ -188,7 +188,7 @@ WRITE16_HANDLER( fromanc2_videoram_3_w ) { fromanc2_dispvram_w(space->machine, o WRITE16_HANDLER( fromanc2_gfxreg_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][0] = -(data - 0x000); break; @@ -202,7 +202,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_0_w ) WRITE16_HANDLER( fromanc2_gfxreg_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[1][0] = -(data - 0x1be); break; @@ -216,7 +216,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_1_w ) WRITE16_HANDLER( fromanc2_gfxreg_2_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][2] = -(data - 0x1c0); break; @@ -230,7 +230,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_2_w ) WRITE16_HANDLER( fromanc2_gfxreg_3_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[1][2] = -(data - 0x1bf); break; @@ -244,7 +244,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_3_w ) WRITE16_HANDLER( fromanc2_gfxbank_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->gfxbank[0][0] = (data & 0x000f) >> 0; state->gfxbank[0][1] = (data & 0x00f0) >> 4; state->gfxbank[0][2] = (data & 0x0f00) >> 8; @@ -257,7 +257,7 @@ WRITE16_HANDLER( fromanc2_gfxbank_0_w ) WRITE16_HANDLER( fromanc2_gfxbank_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); state->gfxbank[1][0] = (data & 0x000f) >> 0; state->gfxbank[1][1] = (data & 0x00f0) >> 4; state->gfxbank[1][2] = (data & 0x0f00) >> 8; @@ -271,7 +271,7 @@ WRITE16_HANDLER( fromanc2_gfxbank_1_w ) INLINE void fromancr_vram_w(running_machine *machine, offs_t offset, UINT16 data, UINT16 mem_mask, int layer ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); int vram = (offset < 0x1000) ? 0 : 1; COMBINE_DATA(&state->videoram[vram][layer][offset & 0x0fff]); @@ -284,7 +284,7 @@ WRITE16_HANDLER( fromancr_videoram_2_w ) { fromancr_vram_w(space->machine, offse WRITE16_HANDLER( fromancr_gfxreg_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][0] = -(data - 0x1bf); break; @@ -298,7 +298,7 @@ WRITE16_HANDLER( fromancr_gfxreg_0_w ) WRITE16_HANDLER( fromancr_gfxreg_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][1] = -(data - 0x000); break; @@ -312,7 +312,7 @@ WRITE16_HANDLER( fromancr_gfxreg_1_w ) void fromancr_gfxbank_w( running_machine *machine, int data ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->gfxbank[0][0] = (data & 0x0010) >> 4; // BG (1P) state->gfxbank[0][1] = (data & 0xf000) >> 12; // FG (1P) @@ -327,7 +327,7 @@ void fromancr_gfxbank_w( running_machine *machine, int data ) INLINE void fromanc4_vram_w( running_machine *machine, offs_t offset, UINT16 data, UINT16 mem_mask, int layer ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); int vram = (offset < 0x4000) ? 0 : 1; COMBINE_DATA(&state->videoram[vram][layer][offset & 0x3fff]); @@ -340,7 +340,7 @@ WRITE16_HANDLER( fromanc4_videoram_2_w ) { fromanc4_vram_w(space->machine, offse WRITE16_HANDLER( fromanc4_gfxreg_0_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][2] = -(data - 0xfbb); break; @@ -359,7 +359,7 @@ WRITE16_HANDLER( fromanc4_gfxreg_0_w ) WRITE16_HANDLER( fromanc4_gfxreg_1_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][1] = -(data - 0xfba); break; @@ -378,7 +378,7 @@ WRITE16_HANDLER( fromanc4_gfxreg_1_w ) WRITE16_HANDLER( fromanc4_gfxreg_2_w ) { - fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; + fromanc2_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->scrollx[0][0] = -(data - 0xfbb); break; @@ -404,7 +404,7 @@ WRITE16_HANDLER( fromanc4_gfxreg_2_w ) VIDEO_START( fromanc2 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->tilemap[0][0] = tilemap_create(machine, fromanc2_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->tilemap[0][1] = tilemap_create(machine, fromanc2_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -454,7 +454,7 @@ VIDEO_START( fromanc2 ) VIDEO_START( fromancr ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->tilemap[0][0] = tilemap_create(machine, fromancr_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->tilemap[0][1] = tilemap_create(machine, fromancr_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -499,7 +499,7 @@ VIDEO_START( fromancr ) VIDEO_START( fromanc4 ) { - fromanc2_state *state = (fromanc2_state *)machine->driver_data; + fromanc2_state *state = machine->driver_data(); state->tilemap[0][0] = tilemap_create(machine, fromancr_get_v0_l0_tile_info, tilemap_scan_rows, 8, 8, 256, 64); state->tilemap[0][1] = tilemap_create(machine, fromancr_get_v0_l1_tile_info, tilemap_scan_rows, 8, 8, 256, 64); @@ -549,7 +549,7 @@ VIDEO_START( fromanc4 ) VIDEO_UPDATE( fromanc2 ) { - fromanc2_state *state = (fromanc2_state *)screen->machine->driver_data; + fromanc2_state *state = screen->machine->driver_data(); int i; int *scrollx = NULL; int *scrolly = NULL; diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index b3d7b20a8b8..bf69e78f9d3 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -21,7 +21,7 @@ static TIMER_CALLBACK( crtc_interrupt_gen ); INLINE void get_fromance_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int layer ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); int tile = ((state->local_videoram[layer][0x0000 + tile_index] & 0x80) << 9) | (state->local_videoram[layer][0x1000 + tile_index] << 8) | state->local_videoram[layer][0x2000 + tile_index]; @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_fromance_fg_tile_info ) { get_fromance_tile_info(machi INLINE void get_nekkyoku_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int layer ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); int tile = (state->local_videoram[layer][0x0000 + tile_index] << 8) | state->local_videoram[layer][0x1000 + tile_index]; int color = state->local_videoram[layer][tile_index + 0x2000] & 0x3f; @@ -57,7 +57,7 @@ static TILE_GET_INFO( get_nekkyoku_fg_tile_info ) { get_nekkyoku_tile_info(machi static void init_common( running_machine *machine ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); /* allocate local videoram */ state->local_videoram[0] = auto_alloc_array(machine, UINT8, 0x1000 * 3); @@ -91,7 +91,7 @@ static void init_common( running_machine *machine ) VIDEO_START( fromance ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); /* allocate tilemaps */ state->bg_tilemap = tilemap_create(machine, get_fromance_bg_tile_info, tilemap_scan_rows, 8, 4, 64, 64); @@ -102,7 +102,7 @@ VIDEO_START( fromance ) VIDEO_START( nekkyoku ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); /* allocate tilemaps */ state->bg_tilemap = tilemap_create(machine, get_nekkyoku_bg_tile_info, tilemap_scan_rows, 8, 4, 64, 64); @@ -113,7 +113,7 @@ VIDEO_START( nekkyoku ) VIDEO_START( pipedrm ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); VIDEO_START_CALL(fromance); state->scrolly_ofs = 0x00; @@ -121,7 +121,7 @@ VIDEO_START( pipedrm ) VIDEO_START( hatris ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); VIDEO_START_CALL(fromance); state->scrollx_ofs = 0xB9; @@ -136,7 +136,7 @@ VIDEO_START( hatris ) WRITE8_HANDLER( fromance_gfxreg_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->gfxreg = data; state->flipscreen = (data & 0x01); @@ -160,7 +160,7 @@ WRITE8_HANDLER( fromance_gfxreg_w ) READ8_HANDLER( fromance_paletteram_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); /* adjust for banking and read */ offset |= state->selected_paletteram << 11; @@ -170,7 +170,7 @@ READ8_HANDLER( fromance_paletteram_r ) WRITE8_HANDLER( fromance_paletteram_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); int palword; /* adjust for banking and modify */ @@ -192,14 +192,14 @@ WRITE8_HANDLER( fromance_paletteram_w ) READ8_HANDLER( fromance_videoram_r ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); return state->local_videoram[state->selected_videoram][offset]; } WRITE8_HANDLER( fromance_videoram_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->local_videoram[state->selected_videoram][offset] = data; tilemap_mark_tile_dirty(state->selected_videoram ? state->fg_tilemap : state->bg_tilemap, offset & 0x0fff); } @@ -214,7 +214,7 @@ WRITE8_HANDLER( fromance_videoram_w ) WRITE8_HANDLER( fromance_scroll_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); if (state->flipscreen) { switch (offset) @@ -263,7 +263,7 @@ WRITE8_HANDLER( fromance_scroll_w ) static TIMER_CALLBACK( crtc_interrupt_gen ) { - fromance_state *state = (fromance_state *)machine->driver_data; + fromance_state *state = machine->driver_data(); cpu_set_input_line(state->subcpu, 0, HOLD_LINE); if (param != 0) timer_adjust_periodic(state->crtc_timer, attotime_div(machine->primary_screen->frame_period(), param), 0, attotime_div(machine->primary_screen->frame_period(), param)); @@ -272,7 +272,7 @@ static TIMER_CALLBACK( crtc_interrupt_gen ) WRITE8_HANDLER( fromance_crtc_data_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->crtc_data[state->crtc_register] = data; switch (state->crtc_register) @@ -291,7 +291,7 @@ WRITE8_HANDLER( fromance_crtc_data_w ) WRITE8_HANDLER( fromance_crtc_register_w ) { - fromance_state *state = (fromance_state *)space->machine->driver_data; + fromance_state *state = space->machine->driver_data(); state->crtc_register = data; } @@ -305,7 +305,7 @@ WRITE8_HANDLER( fromance_crtc_register_w ) static void draw_sprites( screen_device &screen, bitmap_t *bitmap, const rectangle *cliprect, int draw_priority ) { - fromance_state *state = (fromance_state *)screen.machine->driver_data; + fromance_state *state = screen.machine->driver_data(); static const UINT8 zoomtable[16] = { 0,7,14,20,25,30,34,38,42,46,49,52,54,57,59,61 }; const rectangle &visarea = screen.visible_area(); UINT8 *spriteram = state->spriteram; @@ -424,7 +424,7 @@ static void draw_sprites( screen_device &screen, bitmap_t *bitmap, const rectang VIDEO_UPDATE( fromance ) { - fromance_state *state = (fromance_state *)screen->machine->driver_data; + fromance_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0]); tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly[0]); @@ -439,7 +439,7 @@ VIDEO_UPDATE( fromance ) VIDEO_UPDATE( pipedrm ) { - fromance_state *state = (fromance_state *)screen->machine->driver_data; + fromance_state *state = screen->machine->driver_data(); /* there seems to be no logical mapping for the X scroll register -- maybe it's gone */ tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly[1]); diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c index 9f81d689bbc..eb947c11601 100644 --- a/src/mame/video/funkybee.c +++ b/src/mame/video/funkybee.c @@ -41,21 +41,21 @@ PALETTE_INIT( funkybee ) WRITE8_HANDLER( funkybee_videoram_w ) { - funkybee_state *state = (funkybee_state *)space->machine->driver_data; + funkybee_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( funkybee_colorram_w ) { - funkybee_state *state = (funkybee_state *)space->machine->driver_data; + funkybee_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( funkybee_gfx_bank_w ) { - funkybee_state *state = (funkybee_state *)space->machine->driver_data; + funkybee_state *state = space->machine->driver_data(); if (state->gfx_bank != (data & 0x01)) { state->gfx_bank = data & 0x01; @@ -65,7 +65,7 @@ WRITE8_HANDLER( funkybee_gfx_bank_w ) WRITE8_HANDLER( funkybee_scroll_w ) { - funkybee_state *state = (funkybee_state *)space->machine->driver_data; + funkybee_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen_get(space->machine) ? -data : data); } @@ -76,7 +76,7 @@ WRITE8_HANDLER( funkybee_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - funkybee_state *state = (funkybee_state *)machine->driver_data; + funkybee_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x80) << 1); int color = state->colorram[tile_index] & 0x03; @@ -91,13 +91,13 @@ static TILEMAP_MAPPER( funkybee_tilemap_scan ) VIDEO_START( funkybee ) { - funkybee_state *state = (funkybee_state *)machine->driver_data; + funkybee_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, funkybee_tilemap_scan, 8, 8, 32, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - funkybee_state *state = (funkybee_state *)machine->driver_data; + funkybee_state *state = machine->driver_data(); int offs; for (offs = 0x0f; offs >= 0; offs--) @@ -126,7 +126,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_columns( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - funkybee_state *state = (funkybee_state *)machine->driver_data; + funkybee_state *state = machine->driver_data(); int offs; for (offs = 0x1f; offs >= 0; offs--) @@ -162,7 +162,7 @@ static void draw_columns( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( funkybee ) { - funkybee_state *state = (funkybee_state *)screen->machine->driver_data; + funkybee_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); draw_columns(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c index 7c6912f4705..dd8e76fdfe2 100644 --- a/src/mame/video/funkyjet.c +++ b/src/mame/video/funkyjet.c @@ -12,7 +12,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - funkyjet_state *state = (funkyjet_state *)machine->driver_data; + funkyjet_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -79,7 +79,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( funkyjet ) { - funkyjet_state *state = (funkyjet_state *)screen->machine->driver_data; + funkyjet_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c index dbc1c5f9988..7dee39cf7d1 100644 --- a/src/mame/video/funybubl.c +++ b/src/mame/video/funybubl.c @@ -11,7 +11,7 @@ todo - convert to tilemap WRITE8_HANDLER ( funybubl_paldatawrite ) { - funybubl_state *state = (funybubl_state *)space->machine->driver_data; + funybubl_state *state = space->machine->driver_data(); int colchanged ; UINT32 coldat; @@ -30,7 +30,7 @@ VIDEO_START(funybubl) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - funybubl_state *state = (funybubl_state *)machine->driver_data; + funybubl_state *state = machine->driver_data(); UINT8 *source = &state->banked_vram[0x2000 - 0x20]; UINT8 *finish = source - 0x1000; @@ -75,7 +75,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE(funybubl) { - funybubl_state *state = (funybubl_state *)screen->machine->driver_data; + funybubl_state *state = screen->machine->driver_data(); int x, y, offs; offs = 0; diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c index afa18c044db..7ea534e3eba 100644 --- a/src/mame/video/fuukifg2.c +++ b/src/mame/video/fuukifg2.c @@ -48,7 +48,7 @@ \ static TILE_GET_INFO( get_tile_info_##_N_ ) \ { \ - fuuki16_state *state = (fuuki16_state *)machine->driver_data; \ + fuuki16_state *state = machine->driver_data(); \ UINT16 code = state->vram_##_N_[2 * tile_index + 0]; \ UINT16 attr = state->vram_##_N_[2 * tile_index + 1]; \ SET_TILE_INFO(1 + _N_, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3)); \ @@ -56,7 +56,7 @@ static TILE_GET_INFO( get_tile_info_##_N_ ) \ \ WRITE16_HANDLER( fuuki16_vram_##_N_##_w ) \ { \ - fuuki16_state *state = (fuuki16_state *)space->machine->driver_data; \ + fuuki16_state *state = space->machine->driver_data(); \ COMBINE_DATA(&state->vram_##_N_[offset]); \ tilemap_mark_tile_dirty(state->tilemap_##_N_, offset / 2); \ } @@ -90,7 +90,7 @@ PALETTE_INIT( fuuki16 ) VIDEO_START( fuuki16 ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); state->tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 16, 16, 64, 32); state->tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 16, 16, 64, 32); state->tilemap_2 = tilemap_create(machine, get_tile_info_2, tilemap_scan_rows, 8, 8, 64, 32); @@ -134,7 +134,7 @@ VIDEO_START( fuuki16 ) static void draw_sprites( screen_device &screen, bitmap_t *bitmap, const rectangle *cliprect ) { - fuuki16_state *state = (fuuki16_state *)screen.machine->driver_data; + fuuki16_state *state = screen.machine->driver_data(); int offs; const gfx_element *gfx = screen.machine->gfx[0]; bitmap_t *priority_bitmap = screen.machine->priority_bitmap; @@ -264,7 +264,7 @@ if (input_code_pressed(screen.machine, KEYCODE_X)) /* Wrapper to handle bg and bg2 ttogether */ static void fuuki16_draw_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int i, int flag, int pri ) { - fuuki16_state *state = (fuuki16_state *)machine->driver_data; + fuuki16_state *state = machine->driver_data(); int buffer = (state->vregs[0x1e / 2] & 0x40); switch( i ) @@ -281,7 +281,7 @@ static void fuuki16_draw_layer( running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( fuuki16 ) { - fuuki16_state *state = (fuuki16_state *)screen->machine->driver_data; + fuuki16_state *state = screen->machine->driver_data(); UINT16 layer0_scrollx, layer0_scrolly; UINT16 layer1_scrollx, layer1_scrolly; UINT16 layer2_scrollx, layer2_scrolly; diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index 3e1e7124a77..d3fbdd4f16e 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -52,7 +52,7 @@ \ static TILE_GET_INFO( get_tile_info_##_N_ ) \ { \ - fuuki32_state *state = (fuuki32_state *)machine->driver_data; \ + fuuki32_state *state = machine->driver_data(); \ UINT16 code = (state->vram_##_N_[tile_index] & 0xffff0000) >> 16; \ UINT16 attr = (state->vram_##_N_[tile_index] & 0x0000ffff); \ SET_TILE_INFO(1 + _N_, code, (attr & 0x3f) >> 4, TILE_FLIPYX((attr >> 6) & 3)); \ @@ -60,7 +60,7 @@ static TILE_GET_INFO( get_tile_info_##_N_ ) \ \ WRITE32_HANDLER( fuuki32_vram_##_N_##_w ) \ { \ - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; \ + fuuki32_state *state = space->machine->driver_data(); \ COMBINE_DATA(&state->vram_##_N_[offset]); \ tilemap_mark_tile_dirty(state->tilemap_##_N_,offset); \ } @@ -69,7 +69,7 @@ WRITE32_HANDLER( fuuki32_vram_##_N_##_w ) \ \ static TILE_GET_INFO( get_tile_info_##_N_ ) \ { \ - fuuki32_state *state = (fuuki32_state *)machine->driver_data; \ + fuuki32_state *state = machine->driver_data(); \ UINT16 code = (state->vram_##_N_[tile_index] & 0xffff0000) >> 16; \ UINT16 attr = (state->vram_##_N_[tile_index] & 0x0000ffff); \ SET_TILE_INFO(1 + _N_, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3)); \ @@ -77,7 +77,7 @@ static TILE_GET_INFO( get_tile_info_##_N_ ) \ \ WRITE32_HANDLER( fuuki32_vram_##_N_##_w ) \ { \ - fuuki32_state *state = (fuuki32_state *)space->machine->driver_data; \ + fuuki32_state *state = space->machine->driver_data(); \ COMBINE_DATA(&state->vram_##_N_[offset]); \ tilemap_mark_tile_dirty(state->tilemap_##_N_, offset); \ } @@ -99,7 +99,7 @@ LAYER_4BPP( 3 ) VIDEO_START( fuuki32 ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); state->buf_spriteram = auto_alloc_array(machine, UINT32, state->spriteram_size / 4); state->buf_spriteram2 = auto_alloc_array(machine, UINT32, state->spriteram_size / 4); @@ -151,7 +151,7 @@ VIDEO_START( fuuki32 ) static void draw_sprites( screen_device &screen, bitmap_t *bitmap, const rectangle *cliprect ) { - fuuki32_state *state = (fuuki32_state *)screen.machine->driver_data; + fuuki32_state *state = screen.machine->driver_data(); int offs; const gfx_element *gfx = screen.machine->gfx[0]; bitmap_t *priority_bitmap = screen.machine->priority_bitmap; @@ -297,7 +297,7 @@ if (input_code_pressed(screen.machine, KEYCODE_X)) /* Wrapper to handle bg and bg2 ttogether */ static void fuuki32_draw_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int i, int flag, int pri ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); int buffer = ((state->vregs[0x1e / 4] & 0x0000ffff) & 0x40); switch( i ) @@ -314,7 +314,7 @@ static void fuuki32_draw_layer( running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( fuuki32 ) { - fuuki32_state *state = (fuuki32_state *)screen->machine->driver_data; + fuuki32_state *state = screen->machine->driver_data(); UINT16 layer0_scrollx, layer0_scrolly; UINT16 layer1_scrollx, layer1_scrolly; UINT16 layer2_scrollx, layer2_scrolly; @@ -375,7 +375,7 @@ VIDEO_UPDATE( fuuki32 ) VIDEO_EOF( fuuki32 ) { - fuuki32_state *state = (fuuki32_state *)machine->driver_data; + fuuki32_state *state = machine->driver_data(); /* Buffer sprites and tilebank by 2 frames */ state->spr_buffered_tilebank[1] = state->spr_buffered_tilebank[0]; diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index ddcad476eab..2a591040fb3 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -33,7 +33,7 @@ static TILE_GET_INFO( get_tile_info_gaelco_screen0 ) { - gaelco_state *state = (gaelco_state *)machine->driver_data; + gaelco_state *state = machine->driver_data(); int data = state->videoram[tile_index << 1]; int data2 = state->videoram[(tile_index << 1) + 1]; int code = ((data & 0xfffc) >> 2); @@ -46,7 +46,7 @@ static TILE_GET_INFO( get_tile_info_gaelco_screen0 ) static TILE_GET_INFO( get_tile_info_gaelco_screen1 ) { - gaelco_state *state = (gaelco_state *)machine->driver_data; + gaelco_state *state = machine->driver_data(); int data = state->videoram[(0x1000 / 2) + (tile_index << 1)]; int data2 = state->videoram[(0x1000 / 2) + (tile_index << 1) + 1]; int code = ((data & 0xfffc) >> 2); @@ -64,7 +64,7 @@ static TILE_GET_INFO( get_tile_info_gaelco_screen1 ) WRITE16_HANDLER( gaelco_vram_w ) { - gaelco_state *state = (gaelco_state *)space->machine->driver_data; + gaelco_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->tilemap[offset >> 11], ((offset << 1) & 0x0fff) >> 2); } @@ -77,7 +77,7 @@ WRITE16_HANDLER( gaelco_vram_w ) VIDEO_START( bigkarnk ) { - gaelco_state *state = (gaelco_state *)machine->driver_data; + gaelco_state *state = machine->driver_data(); state->tilemap[0] = tilemap_create(machine, get_tile_info_gaelco_screen0, tilemap_scan_rows, 16, 16, 32, 32); state->tilemap[1] = tilemap_create(machine, get_tile_info_gaelco_screen1, tilemap_scan_rows, 16, 16, 32, 32); @@ -87,7 +87,7 @@ VIDEO_START( bigkarnk ) VIDEO_START( maniacsq ) { - gaelco_state *state = (gaelco_state *)machine->driver_data; + gaelco_state *state = machine->driver_data(); state->tilemap[0] = tilemap_create(machine, get_tile_info_gaelco_screen0, tilemap_scan_rows, 16, 16, 32, 32); state->tilemap[1] = tilemap_create(machine, get_tile_info_gaelco_screen1, tilemap_scan_rows, 16, 16, 32, 32); @@ -123,7 +123,7 @@ VIDEO_START( maniacsq ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - gaelco_state *state = (gaelco_state *)machine->driver_data; + gaelco_state *state = machine->driver_data(); int i, x, y, ex, ey; const gfx_element *gfx = machine->gfx[0]; @@ -189,7 +189,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( maniacsq ) { - gaelco_state *state = (gaelco_state *)screen->machine->driver_data; + gaelco_state *state = screen->machine->driver_data(); /* set scroll registers */ tilemap_set_scrolly(state->tilemap[0], 0, state->vregs[0]); @@ -218,7 +218,7 @@ VIDEO_UPDATE( maniacsq ) VIDEO_UPDATE( bigkarnk ) { - gaelco_state *state = (gaelco_state *)screen->machine->driver_data; + gaelco_state *state = screen->machine->driver_data(); /* set scroll registers */ tilemap_set_scrolly(state->tilemap[0], 0, state->vregs[0]); diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index 4d8bc789848..b590324e3d2 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -15,7 +15,7 @@ static TILE_GET_INFO( get_bg_tile_info ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); UINT16 *videoram1 = &state->videoram3[0x0800]; UINT16 *videoram2 = state->videoram3; SET_TILE_INFO( @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); UINT16 *videoram1 = &state->videoram2[0x0800]; UINT16 *videoram2 = state->videoram2; SET_TILE_INFO( @@ -39,7 +39,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_fg_tile_info_raiga ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); UINT16 *videoram1 = &state->videoram2[0x0800]; UINT16 *videoram2 = state->videoram2; @@ -55,7 +55,7 @@ static TILE_GET_INFO( get_fg_tile_info_raiga ) static TILE_GET_INFO( get_tx_tile_info ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); UINT16 *videoram1 = &state->videoram[0x0400]; UINT16 *videoram2 = state->videoram; SET_TILE_INFO( @@ -74,7 +74,7 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( gaiden ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -97,7 +97,7 @@ VIDEO_START( gaiden ) VIDEO_START( mastninj ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -122,7 +122,7 @@ VIDEO_START( mastninj ) VIDEO_START( raiga ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -144,7 +144,7 @@ VIDEO_START( raiga ) VIDEO_START( drgnbowl ) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); /* set up tile layers */ state->background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); state->foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); @@ -173,49 +173,49 @@ WRITE16_HANDLER( gaiden_flip_w ) WRITE16_HANDLER( gaiden_txscrollx_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tx_scroll_x); tilemap_set_scrollx(state->text_layer, 0, state->tx_scroll_x); } WRITE16_HANDLER( gaiden_txscrolly_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tx_scroll_y); tilemap_set_scrolly(state->text_layer, 0, (state->tx_scroll_y - state->tx_offset_y) & 0xffff); } WRITE16_HANDLER( gaiden_fgscrollx_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_scroll_x); tilemap_set_scrollx(state->foreground, 0, state->fg_scroll_x); } WRITE16_HANDLER( gaiden_fgscrolly_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_scroll_y); tilemap_set_scrolly(state->foreground, 0, (state->fg_scroll_y - state->fg_offset_y) & 0xffff); } WRITE16_HANDLER( gaiden_bgscrollx_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_scroll_x); tilemap_set_scrollx(state->background, 0, state->bg_scroll_x); } WRITE16_HANDLER( gaiden_bgscrolly_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_scroll_y); tilemap_set_scrolly(state->background, 0, (state->bg_scroll_y - state->bg_offset_y) & 0xffff); } WRITE16_HANDLER( gaiden_txoffsety_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->tx_offset_y = data; @@ -225,7 +225,7 @@ WRITE16_HANDLER( gaiden_txoffsety_w ) WRITE16_HANDLER( gaiden_fgoffsety_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->fg_offset_y = data; @@ -235,7 +235,7 @@ WRITE16_HANDLER( gaiden_fgoffsety_w ) WRITE16_HANDLER( gaiden_bgoffsety_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->bg_offset_y = data; @@ -245,7 +245,7 @@ WRITE16_HANDLER( gaiden_bgoffsety_w ) WRITE16_HANDLER( gaiden_sproffsety_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->spr_offset_y = data; @@ -256,33 +256,33 @@ WRITE16_HANDLER( gaiden_sproffsety_w ) WRITE16_HANDLER( gaiden_videoram3_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram3[offset]); tilemap_mark_tile_dirty(state->background, offset & 0x07ff); } READ16_HANDLER( gaiden_videoram3_r ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); return state->videoram3[offset]; } WRITE16_HANDLER( gaiden_videoram2_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram2[offset]); tilemap_mark_tile_dirty(state->foreground, offset & 0x07ff); } READ16_HANDLER( gaiden_videoram2_r ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); return state->videoram2[offset]; } WRITE16_HANDLER( gaiden_videoram_w ) { - gaiden_state *state = (gaiden_state *)space->machine->driver_data; + gaiden_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->text_layer, offset & 0x03ff); } @@ -373,7 +373,7 @@ static void gaiden_draw_sprites( running_machine *machine, bitmap_t *bitmap_bg, {42,43,46,47,58,59,62,63} }; - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[3]; const UINT16 *source = (NUM_SPRITES - 1) * 8 + state->spriteram; int count = NUM_SPRITES; @@ -495,7 +495,7 @@ static void raiga_draw_sprites( running_machine *machine, bitmap_t *bitmap_bg, b {42,43,46,47,58,59,62,63} }; - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[3]; const UINT16 *source = (NUM_SPRITES - 1) * 8 + state->spriteram; int count = NUM_SPRITES; @@ -623,7 +623,7 @@ static void raiga_draw_sprites( running_machine *machine, bitmap_t *bitmap_bg, b static void drgnbowl_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - gaiden_state *state = (gaiden_state *)machine->driver_data; + gaiden_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int i, code, color, x, y, flipx, flipy, priority_mask; @@ -664,7 +664,7 @@ static void drgnbowl_draw_sprites(running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( gaiden ) { - gaiden_state *state = (gaiden_state *)screen->machine->driver_data; + gaiden_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); bitmap_fill(state->tile_bitmap_bg, cliprect, 0x200); @@ -690,7 +690,7 @@ VIDEO_UPDATE( gaiden ) VIDEO_UPDATE( raiga ) { - gaiden_state *state = (gaiden_state *)screen->machine->driver_data; + gaiden_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); bitmap_fill(state->tile_bitmap_bg, cliprect, 0x200); @@ -715,7 +715,7 @@ VIDEO_UPDATE( raiga ) VIDEO_UPDATE( drgnbowl ) { - gaiden_state *state = (gaiden_state *)screen->machine->driver_data; + gaiden_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); tilemap_draw(bitmap, cliprect, state->background, 0, 1); diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index 9c7b3e795d5..9228000a597 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -412,7 +412,7 @@ static TILE_GET_INFO( get_tile_info ) timing signals, while x flip is done by selecting the 2nd character set. We reproduce this here, but since the tilemap system automatically flips characters when screen is flipped, we have to flip them back. */ - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); int color = state->videoram[tile_index + 0x400] & 0x3f; SET_TILE_INFO( 0, @@ -432,7 +432,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( galaga ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); state->fg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan,8,8,36,28); colortable_configure_tilemap_groups(machine->colortable, state->fg_tilemap, machine->gfx[0], 0x1f); @@ -454,7 +454,7 @@ VIDEO_START( galaga ) WRITE8_HANDLER( galaga_videoram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset & 0x3ff); @@ -462,7 +462,7 @@ WRITE8_HANDLER( galaga_videoram_w ) WRITE8_HANDLER ( gatsbee_bank_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->galaga_gfxbank = data & 0x1; tilemap_mark_all_tiles_dirty(state->fg_tilemap); @@ -478,7 +478,7 @@ WRITE8_HANDLER ( gatsbee_bank_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 *spriteram = state->galaga_ram1 + 0x380; UINT8 *spriteram_2 = state->galaga_ram2 + 0x380; @@ -531,7 +531,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); /* draw the stars */ /* $a005 controls the stars ON/OFF */ @@ -568,7 +568,7 @@ static void draw_stars(running_machine *machine, bitmap_t *bitmap, const rectang VIDEO_UPDATE( galaga ) { - _galaga_state *state = (_galaga_state *) screen->machine->driver_data; + _galaga_state *state = screen->machine->driver_data<_galaga_state>(); bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); draw_stars(screen->machine,bitmap,cliprect); @@ -581,7 +581,7 @@ VIDEO_UPDATE( galaga ) VIDEO_EOF( galaga ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); /* this function is called by galaga_interrupt_1() */ int s0,s1,s2; static const int speeds[8] = { -1, -2, -3, 0, 3, 2, 1, 0 }; diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index 83f665b82da..6fe18adc8dd 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -133,7 +133,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] | ((attr & 0x01) << 8); SET_TILE_INFO( @@ -158,7 +158,7 @@ static TILE_GET_INFO( ninjemak_get_bg_tile_info ) static TILE_GET_INFO( ninjemak_get_tx_tile_info ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] | ((attr & 0x03) << 8); SET_TILE_INFO( @@ -178,7 +178,7 @@ static TILE_GET_INFO( ninjemak_get_tx_tile_info ) VIDEO_START( galivan ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 128, 128); state->tx_tilemap = tilemap_create(machine, get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); @@ -188,7 +188,7 @@ VIDEO_START( galivan ) VIDEO_START( ninjemak ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, ninjemak_get_bg_tile_info, tilemap_scan_cols, 16, 16, 512, 32); state->tx_tilemap = tilemap_create(machine, ninjemak_get_tx_tile_info, tilemap_scan_cols, 8, 8, 32, 32); @@ -206,14 +206,14 @@ VIDEO_START( ninjemak ) WRITE8_HANDLER( galivan_videoram_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); } WRITE8_HANDLER( galivan_colorram_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset); } @@ -221,7 +221,7 @@ WRITE8_HANDLER( galivan_colorram_w ) /* Written through port 40 */ WRITE8_HANDLER( galivan_gfxbank_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); /* bits 0 and 1 coin counters */ coin_counter_w(space->machine, 0,data & 1); @@ -240,7 +240,7 @@ WRITE8_HANDLER( galivan_gfxbank_w ) WRITE8_HANDLER( ninjemak_gfxbank_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); /* bits 0 and 1 coin counters */ coin_counter_w(space->machine, 0,data & 1); @@ -296,7 +296,7 @@ WRITE8_HANDLER( ninjemak_gfxbank_w ) /* Written through port 41-42 */ WRITE8_HANDLER( galivan_scrollx_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); if (offset == 1) { if (data & 0x80) @@ -313,20 +313,20 @@ WRITE8_HANDLER( galivan_scrollx_w ) /* Written through port 43-44 */ WRITE8_HANDLER( galivan_scrolly_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); state->scrolly[offset] = data; } WRITE8_HANDLER( ninjemak_scrollx_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); state->scrollx[offset] = data; } WRITE8_HANDLER( ninjemak_scrolly_w ) { - galivan_state *state = (galivan_state *)space->machine->driver_data; + galivan_state *state = space->machine->driver_data(); state->scrolly[offset] = data; } @@ -340,7 +340,7 @@ WRITE8_HANDLER( ninjemak_scrolly_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - galivan_state *state = (galivan_state *)machine->driver_data; + galivan_state *state = machine->driver_data(); const UINT8 *spritepalettebank = memory_region(machine, "user1"); UINT8 *spriteram = state->spriteram; int offs; @@ -379,7 +379,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( galivan ) { - galivan_state *state = (galivan_state *)screen->machine->driver_data; + galivan_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * (state->scrollx[1] & 0x07)); tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly[0] + 256 * (state->scrolly[1] & 0x07)); @@ -406,7 +406,7 @@ VIDEO_UPDATE( galivan ) VIDEO_UPDATE( ninjemak ) { - galivan_state *state = (galivan_state *)screen->machine->driver_data; + galivan_state *state = screen->machine->driver_data(); /* (scrollx[1] & 0x40) does something */ tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * (state->scrollx[1] & 0x1f)); diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c index 7f1980149af..362b13bbf44 100644 --- a/src/mame/video/galspnbl.c +++ b/src/mame/video/galspnbl.c @@ -31,7 +31,7 @@ PALETTE_INIT( galspnbl ) */ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - galspnbl_state *state = (galspnbl_state *)machine->driver_data; + galspnbl_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; static const UINT8 layout[8][8] = @@ -86,7 +86,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - galspnbl_state *state = (galspnbl_state *)machine->driver_data; + galspnbl_state *state = machine->driver_data(); offs_t offs; // int screenscroll = 4 - (state->scroll[0] & 0xff); @@ -103,7 +103,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r VIDEO_UPDATE( galspnbl ) { - galspnbl_state *state = (galspnbl_state *)screen->machine->driver_data; + galspnbl_state *state = screen->machine->driver_data(); int offs; draw_background(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index db190a88230..d8aef109568 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -71,7 +71,7 @@ static void leprechn_get_pens( pen_t *pens ) static VIDEO_UPDATE( gameplan ) { - gameplan_state *state = (gameplan_state *)screen->machine->driver_data; + gameplan_state *state = screen->machine->driver_data(); pen_t pens[GAMEPLAN_NUM_PENS]; offs_t offs; @@ -91,7 +91,7 @@ static VIDEO_UPDATE( gameplan ) static VIDEO_UPDATE( leprechn ) { - gameplan_state *state = (gameplan_state *)screen->machine->driver_data; + gameplan_state *state = screen->machine->driver_data(); pen_t pens[LEPRECHN_NUM_PENS]; offs_t offs; @@ -118,7 +118,7 @@ static VIDEO_UPDATE( leprechn ) static WRITE8_DEVICE_HANDLER( video_data_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); state->video_data = data; } @@ -126,7 +126,7 @@ static WRITE8_DEVICE_HANDLER( video_data_w ) static WRITE8_DEVICE_HANDLER( gameplan_video_command_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); state->video_command = data & 0x07; } @@ -134,7 +134,7 @@ static WRITE8_DEVICE_HANDLER( gameplan_video_command_w ) static WRITE8_DEVICE_HANDLER( leprechn_video_command_w ) { - gameplan_state *state = (gameplan_state *)device->machine->driver_data; + gameplan_state *state = device->machine->driver_data(); state->video_command = (data >> 3) & 0x07; } @@ -142,7 +142,7 @@ static WRITE8_DEVICE_HANDLER( leprechn_video_command_w ) static TIMER_CALLBACK( clear_screen_done_callback ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); /* indicate that the we are done clearing the screen */ via_ca1_w(state->via_0, 0); @@ -151,7 +151,7 @@ static TIMER_CALLBACK( clear_screen_done_callback ) static WRITE_LINE_DEVICE_HANDLER( video_command_trigger_w ) { - gameplan_state *driver_state = (gameplan_state *)device->machine->driver_data; + gameplan_state *driver_state = device->machine->driver_data(); if (state == 0) { @@ -213,7 +213,7 @@ static WRITE_LINE_DEVICE_HANDLER( video_command_trigger_w ) static TIMER_CALLBACK( via_irq_delayed ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); cpu_set_input_line(state->maincpu, 0, param); } @@ -266,7 +266,7 @@ const via6522_interface trvquest_via_0_interface = static TIMER_CALLBACK( via_0_ca1_timer_callback ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); /* !VBLANK is connected to CA1 */ via_ca1_w(state->via_0, param); @@ -286,7 +286,7 @@ static TIMER_CALLBACK( via_0_ca1_timer_callback ) static VIDEO_START( common ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); state->videoram_size = (HBSTART - HBEND) * (VBSTART - VBEND); state->videoram = auto_alloc_array(machine, UINT8, state->videoram_size); @@ -325,7 +325,7 @@ static VIDEO_START( trvquest ) static VIDEO_RESET( gameplan ) { - gameplan_state *state = (gameplan_state *)machine->driver_data; + gameplan_state *state = machine->driver_data(); timer_adjust_oneshot(state->via_0_ca1_timer, machine->primary_screen->time_until_pos(VBSTART), 0); } diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c index 511f3a1ac08..3553ec5c510 100644 --- a/src/mame/video/gauntlet.c +++ b/src/mame/video/gauntlet.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - gauntlet_state *state = (gauntlet_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + gauntlet_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; @@ -29,8 +29,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - gauntlet_state *state = (gauntlet_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + gauntlet_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = ((state->playfield_tile_bank * 0x1000) + (data & 0xfff)) ^ 0x800; int color = 0x10 + (state->playfield_color_bank * 8) + ((data >> 12) & 7); SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -83,19 +83,19 @@ VIDEO_START( gauntlet ) 0 /* callback routine for special entries */ }; - gauntlet_state *state = (gauntlet_state *)machine->driver_data; + gauntlet_state *state = machine->driver_data(); UINT16 *codelookup; int i, size; /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* modify the motion object code lookup table to account for the code XOR */ codelookup = atarimo_get_code_lookup(0, &size); @@ -120,18 +120,18 @@ VIDEO_START( gauntlet ) WRITE16_HANDLER( gauntlet_xscroll_w ) { - gauntlet_state *state = (gauntlet_state *)space->machine->driver_data; - UINT16 oldxscroll = *state->atarigen.xscroll; - COMBINE_DATA(state->atarigen.xscroll); + gauntlet_state *state = space->machine->driver_data(); + UINT16 oldxscroll = *state->xscroll; + COMBINE_DATA(state->xscroll); /* if something changed, force a partial update */ - if (*state->atarigen.xscroll != oldxscroll) + if (*state->xscroll != oldxscroll) { space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* adjust the scrolls */ - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, *state->atarigen.xscroll); - atarimo_set_xscroll(0, *state->atarigen.xscroll & 0x1ff); + tilemap_set_scrollx(state->playfield_tilemap, 0, *state->xscroll); + atarimo_set_xscroll(0, *state->xscroll & 0x1ff); } } @@ -145,25 +145,25 @@ WRITE16_HANDLER( gauntlet_xscroll_w ) WRITE16_HANDLER( gauntlet_yscroll_w ) { - gauntlet_state *state = (gauntlet_state *)space->machine->driver_data; - UINT16 oldyscroll = *state->atarigen.yscroll; - COMBINE_DATA(state->atarigen.yscroll); + gauntlet_state *state = space->machine->driver_data(); + UINT16 oldyscroll = *state->yscroll; + COMBINE_DATA(state->yscroll); /* if something changed, force a partial update */ - if (*state->atarigen.yscroll != oldyscroll) + if (*state->yscroll != oldyscroll) { space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* if the bank changed, mark all tiles dirty */ - if (state->playfield_tile_bank != (*state->atarigen.yscroll & 3)) + if (state->playfield_tile_bank != (*state->yscroll & 3)) { - state->playfield_tile_bank = *state->atarigen.yscroll & 3; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + state->playfield_tile_bank = *state->yscroll & 3; + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } /* adjust the scrolls */ - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, *state->atarigen.yscroll >> 7); - atarimo_set_yscroll(0, (*state->atarigen.yscroll >> 7) & 0x1ff); + tilemap_set_scrolly(state->playfield_tilemap, 0, *state->yscroll >> 7); + atarimo_set_yscroll(0, (*state->yscroll >> 7) & 0x1ff); } } @@ -177,13 +177,13 @@ WRITE16_HANDLER( gauntlet_yscroll_w ) VIDEO_UPDATE( gauntlet ) { - gauntlet_state *state = (gauntlet_state *)screen->machine->driver_data; + gauntlet_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -214,6 +214,6 @@ VIDEO_UPDATE( gauntlet ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index eb8213d8138..b53162802f4 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -79,21 +79,21 @@ PALETTE_INIT( gberet ) WRITE8_HANDLER( gberet_videoram_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( gberet_colorram_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( gberet_scroll_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); int scroll; state->scrollram[offset] = data; @@ -104,13 +104,13 @@ WRITE8_HANDLER( gberet_scroll_w ) WRITE8_HANDLER( gberet_sprite_bank_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); state->spritebank = data; } static TILE_GET_INFO( get_bg_tile_info ) { - gberet_state *state = (gberet_state *)machine->driver_data; + gberet_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0x40) << 2); int color = attr & 0x0f; @@ -124,7 +124,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( gberet ) { - gberet_state *state = (gberet_state *)machine->driver_data; + gberet_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); colortable_configure_tilemap_groups(machine->colortable, state->bg_tilemap, machine->gfx[0], 0x10); @@ -133,7 +133,7 @@ VIDEO_START( gberet ) static void gberet_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - gberet_state *state = (gberet_state *)machine->driver_data; + gberet_state *state = machine->driver_data(); int offs; UINT8 *sr; @@ -170,7 +170,7 @@ static void gberet_draw_sprites( running_machine *machine, bitmap_t *bitmap, con VIDEO_UPDATE( gberet ) { - gberet_state *state = (gberet_state *)screen->machine->driver_data; + gberet_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); gberet_draw_sprites(screen->machine, bitmap, cliprect); @@ -182,7 +182,7 @@ VIDEO_UPDATE( gberet ) WRITE8_HANDLER( gberetb_scroll_w ) { - gberet_state *state = (gberet_state *)space->machine->driver_data; + gberet_state *state = space->machine->driver_data(); int scroll = data; if (offset) @@ -194,7 +194,7 @@ WRITE8_HANDLER( gberetb_scroll_w ) static void gberetb_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - gberet_state *state = (gberet_state *)machine->driver_data; + gberet_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -226,7 +226,7 @@ static void gberetb_draw_sprites( running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( gberetb ) { - gberet_state *state = (gberet_state *)screen->machine->driver_data; + gberet_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); gberetb_draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/gbusters.c b/src/mame/video/gbusters.c index aae15fc5e0c..6b367be4b22 100644 --- a/src/mame/video/gbusters.c +++ b/src/mame/video/gbusters.c @@ -11,7 +11,7 @@ void gbusters_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - gbusters_state *state = (gbusters_state *)machine->driver_data; + gbusters_state *state = machine->driver_data(); /* (color & 0x02) is flip y handled internally by the 052109 */ *code |= ((*color & 0x0d) << 8) | ((*color & 0x10) << 5) | (bank << 12); *color = state->layer_colorbase[layer] + ((*color & 0xe0) >> 5); @@ -25,7 +25,7 @@ void gbusters_tile_callback( running_machine *machine, int layer, int bank, int void gbusters_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - gbusters_state *state = (gbusters_state *)machine->driver_data; + gbusters_state *state = machine->driver_data(); *priority = (*color & 0x30) >> 4; *color = state->sprite_colorbase + (*color & 0x0f); } @@ -39,7 +39,7 @@ void gbusters_sprite_callback( running_machine *machine, int *code, int *color, VIDEO_START( gbusters ) { - gbusters_state *state = (gbusters_state *)machine->driver_data; + gbusters_state *state = machine->driver_data(); state->layer_colorbase[0] = 48; state->layer_colorbase[1] = 0; state->layer_colorbase[2] = 16; @@ -49,7 +49,7 @@ VIDEO_START( gbusters ) VIDEO_UPDATE( gbusters ) { - gbusters_state *state = (gbusters_state *)screen->machine->driver_data; + gbusters_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c index 9c99a4772b6..ea1980ca2cf 100644 --- a/src/mame/video/gcpinbal.c +++ b/src/mame/video/gcpinbal.c @@ -7,7 +7,7 @@ static TILE_GET_INFO( get_bg0_tile_info ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); UINT16 tilenum = state->tilemapram[0 + tile_index * 2]; UINT16 attr = state->tilemapram[1 + tile_index * 2]; @@ -20,7 +20,7 @@ static TILE_GET_INFO( get_bg0_tile_info ) static TILE_GET_INFO( get_bg1_tile_info ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); UINT16 tilenum = state->tilemapram[0x800 + tile_index * 2]; UINT16 attr = state->tilemapram[0x801 + tile_index * 2]; @@ -33,7 +33,7 @@ static TILE_GET_INFO( get_bg1_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); UINT16 tilenum = state->tilemapram[0x1000 + tile_index]; SET_TILE_INFO( @@ -45,7 +45,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static void gcpinbal_core_vh_start( running_machine *machine ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); int xoffs = 0; int yoffs = 0; @@ -78,13 +78,13 @@ VIDEO_START( gcpinbal ) READ16_HANDLER( gcpinbal_tilemaps_word_r ) { - gcpinbal_state *state = (gcpinbal_state *)space->machine->driver_data; + gcpinbal_state *state = space->machine->driver_data(); return state->tilemapram[offset]; } WRITE16_HANDLER( gcpinbal_tilemaps_word_w ) { - gcpinbal_state *state = (gcpinbal_state *)space->machine->driver_data; + gcpinbal_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tilemapram[offset]); if (offset < 0x800) /* BG0 */ @@ -171,7 +171,7 @@ WRITE16_HANDLER( gcpinbal_ctrl_word_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - gcpinbal_state *state = (gcpinbal_state *)machine->driver_data; + gcpinbal_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, chain_pos; int x, y, curx, cury; @@ -250,7 +250,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( gcpinbal ) { - gcpinbal_state *state = (gcpinbal_state *)screen->machine->driver_data; + gcpinbal_state *state = screen->machine->driver_data(); int i; UINT16 tile_sets = 0; UINT8 layer[3]; diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c index 8ac2aa332bc..cae57faa73e 100644 --- a/src/mame/video/gijoe.c +++ b/src/mame/video/gijoe.c @@ -4,7 +4,7 @@ void gijoe_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); int pri = (*color & 0x03e0) >> 4; if (pri <= state->layer_pri[3]) @@ -23,7 +23,7 @@ void gijoe_sprite_callback( running_machine *machine, int *code, int *color, int void gijoe_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); int tile = *code; if (tile >= 0xf000 && tile <= 0xf4ff) @@ -52,7 +52,7 @@ void gijoe_tile_callback( running_machine *machine, int layer, int *code, int *c VIDEO_START( gijoe ) { - gijoe_state *state = (gijoe_state *)machine->driver_data; + gijoe_state *state = machine->driver_data(); int i; k056832_linemap_enable(state->k056832, 1); @@ -77,7 +77,7 @@ VIDEO_START( gijoe ) VIDEO_UPDATE( gijoe ) { - gijoe_state *state = (gijoe_state *)screen->machine->driver_data; + gijoe_state *state = screen->machine->driver_data(); static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 }; int layer[4]; int vrc_mode, vrc_new, colorbase_new, /*primode,*/ dirty, i; diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index ca59d159055..e66a0a8be27 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -94,7 +94,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - ginganin_state *state = (ginganin_state *)machine->driver_data; + ginganin_state *state = machine->driver_data(); UINT16 code = state->fgram[tile_index]; SET_TILE_INFO( FG_GFX, @@ -105,7 +105,7 @@ static TILE_GET_INFO( get_fg_tile_info ) WRITE16_HANDLER( ginganin_fgram16_w ) { - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fgram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -119,7 +119,7 @@ WRITE16_HANDLER( ginganin_fgram16_w ) static TILE_GET_INFO( get_txt_tile_info ) { - ginganin_state *state = (ginganin_state *)machine->driver_data; + ginganin_state *state = machine->driver_data(); UINT16 code = state->txtram[tile_index]; SET_TILE_INFO( TXT_GFX, @@ -130,7 +130,7 @@ static TILE_GET_INFO( get_txt_tile_info ) WRITE16_HANDLER( ginganin_txtram16_w ) { - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); COMBINE_DATA(&state->txtram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); } @@ -138,7 +138,7 @@ WRITE16_HANDLER( ginganin_txtram16_w ) VIDEO_START( ginganin ) { - ginganin_state *state = (ginganin_state *)machine->driver_data; + ginganin_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, BG_NX, BG_NY); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 16, 16, FG_NX, FG_NY); state->tx_tilemap = tilemap_create(machine, get_txt_tile_info, tilemap_scan_rows, 8, 8, TXT_NX, TXT_NY); @@ -150,7 +150,7 @@ VIDEO_START( ginganin ) WRITE16_HANDLER( ginganin_vregs16_w ) { - ginganin_state *state = (ginganin_state *)space->machine->driver_data; + ginganin_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vregs[offset]); data = state->vregs[offset]; @@ -211,7 +211,7 @@ Offset: Values: Format: static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - ginganin_state *state = (ginganin_state *)machine->driver_data; + ginganin_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -247,7 +247,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( ginganin ) { - ginganin_state *state = (ginganin_state *)screen->machine->driver_data; + ginganin_state *state = screen->machine->driver_data(); int layers_ctrl1 = state->layers_ctrl; #ifdef MAME_DEBUG diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 754cfa31bb9..2c2d5458918 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -33,7 +33,7 @@ static TILE_GET_INFO( get_tile_info_glass_screen0 ) { - glass_state *state = (glass_state *)machine->driver_data; + glass_state *state = machine->driver_data(); int data = state->videoram[tile_index << 1]; int data2 = state->videoram[(tile_index << 1) + 1]; int code = ((data & 0x03) << 14) | ((data & 0x0fffc) >> 2); @@ -44,7 +44,7 @@ static TILE_GET_INFO( get_tile_info_glass_screen0 ) static TILE_GET_INFO( get_tile_info_glass_screen1 ) { - glass_state *state = (glass_state *)machine->driver_data; + glass_state *state = machine->driver_data(); int data = state->videoram[(0x1000 / 2) + (tile_index << 1)]; int data2 = state->videoram[(0x1000 / 2) + (tile_index << 1) + 1]; int code = ((data & 0x03) << 14) | ((data & 0x0fffc) >> 2); @@ -69,7 +69,7 @@ static TILE_GET_INFO( get_tile_info_glass_screen1 ) WRITE16_HANDLER( glass_blitter_w ) { - glass_state *state = (glass_state *)space->machine->driver_data; + glass_state *state = space->machine->driver_data(); state->blitter_serial_buffer[state->current_bit] = data & 0x01; state->current_bit++; @@ -115,7 +115,7 @@ WRITE16_HANDLER( glass_blitter_w ) WRITE16_HANDLER( glass_vram_w ) { - glass_state *state = (glass_state *)space->machine->driver_data; + glass_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->pant[offset >> 11], ((offset << 1) & 0x0fff) >> 2); } @@ -129,7 +129,7 @@ WRITE16_HANDLER( glass_vram_w ) VIDEO_START( glass ) { - glass_state *state = (glass_state *)machine->driver_data; + glass_state *state = machine->driver_data(); state->pant[0] = tilemap_create(machine, get_tile_info_glass_screen0, tilemap_scan_rows, 16, 16, 32, 32); state->pant[1] = tilemap_create(machine, get_tile_info_glass_screen1, tilemap_scan_rows, 16, 16, 32, 32); state->screen_bitmap = auto_bitmap_alloc (machine, 320, 200, machine->primary_screen->format()); @@ -166,7 +166,7 @@ VIDEO_START( glass ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - glass_state *state = (glass_state *)machine->driver_data; + glass_state *state = machine->driver_data(); int i; const gfx_element *gfx = machine->gfx[0]; @@ -197,7 +197,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( glass ) { - glass_state *state = (glass_state *)screen->machine->driver_data; + glass_state *state = screen->machine->driver_data(); /* set scroll registers */ tilemap_set_scrolly(state->pant[0], 0, state->vregs[0]); tilemap_set_scrollx(state->pant[0], 0, state->vregs[1] + 0x04); diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index 5db5b10acde..28f1bfa7ac3 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -18,7 +18,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - gng_state *state = (gng_state *)machine->driver_data; + gng_state *state = machine->driver_data(); UINT8 attr = state->fgvideoram[tile_index + 0x400]; SET_TILE_INFO( 0, @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - gng_state *state = (gng_state *)machine->driver_data; + gng_state *state = machine->driver_data(); UINT8 attr = state->bgvideoram[tile_index + 0x400]; SET_TILE_INFO( 1, @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( gng ) { - gng_state *state = (gng_state *)machine->driver_data; + gng_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 32, 32); @@ -67,14 +67,14 @@ VIDEO_START( gng ) WRITE8_HANDLER( gng_fgvideoram_w ) { - gng_state *state = (gng_state *)space->machine->driver_data; + gng_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); } WRITE8_HANDLER( gng_bgvideoram_w ) { - gng_state *state = (gng_state *)space->machine->driver_data; + gng_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x3ff); } @@ -82,14 +82,14 @@ WRITE8_HANDLER( gng_bgvideoram_w ) WRITE8_HANDLER( gng_bgscrollx_w ) { - gng_state *state = (gng_state *)space->machine->driver_data; + gng_state *state = space->machine->driver_data(); state->scrollx[offset] = data; tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * state->scrollx[1]); } WRITE8_HANDLER( gng_bgscrolly_w ) { - gng_state *state = (gng_state *)space->machine->driver_data; + gng_state *state = space->machine->driver_data(); state->scrolly[offset] = data; tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly[0] + 256 * state->scrolly[1]); } @@ -141,7 +141,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( gng ) { - gng_state *state = (gng_state *)screen->machine->driver_data; + gng_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c index 2d6d5e38aa3..3872d87a0df 100644 --- a/src/mame/video/goal92.c +++ b/src/mame/video/goal92.c @@ -9,13 +9,13 @@ READ16_HANDLER( goal92_fg_bank_r ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); return state->fg_bank; } WRITE16_HANDLER( goal92_fg_bank_w ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_bank); if (ACCESSING_BITS_0_7) @@ -26,28 +26,28 @@ WRITE16_HANDLER( goal92_fg_bank_w ) WRITE16_HANDLER( goal92_text_w ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tx_data[offset]); tilemap_mark_tile_dirty(state->tx_layer, offset); } WRITE16_HANDLER( goal92_background_w ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_data[offset]); tilemap_mark_tile_dirty(state->bg_layer, offset); } WRITE16_HANDLER( goal92_foreground_w ) { - goal92_state *state = (goal92_state *)space->machine->driver_data; + goal92_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_data[offset]); tilemap_mark_tile_dirty(state->fg_layer, offset); } static TILE_GET_INFO( get_text_tile_info ) { - goal92_state *state = (goal92_state *)machine->driver_data; + goal92_state *state = machine->driver_data(); int tile = state->tx_data[tile_index]; int color = (tile >> 12) & 0xf; @@ -60,7 +60,7 @@ static TILE_GET_INFO( get_text_tile_info ) static TILE_GET_INFO( get_back_tile_info ) { - goal92_state *state = (goal92_state *)machine->driver_data; + goal92_state *state = machine->driver_data(); int tile = state->bg_data[tile_index]; int color = (tile >> 12) & 0xf; @@ -71,7 +71,7 @@ static TILE_GET_INFO( get_back_tile_info ) static TILE_GET_INFO( get_fore_tile_info ) { - goal92_state *state = (goal92_state *)machine->driver_data; + goal92_state *state = machine->driver_data(); int tile = state->fg_data[tile_index]; int color = (tile >> 12) & 0xf; int region; @@ -138,7 +138,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_START( goal92 ) { - goal92_state *state = (goal92_state *)machine->driver_data; + goal92_state *state = machine->driver_data(); state->bg_layer = tilemap_create(machine, get_back_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_layer = tilemap_create(machine, get_fore_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->tx_layer = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -153,7 +153,7 @@ VIDEO_START( goal92 ) VIDEO_UPDATE( goal92 ) { - goal92_state *state = (goal92_state *)screen->machine->driver_data; + goal92_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_layer, 0, state->scrollram[0] + 60); tilemap_set_scrolly(state->bg_layer, 0, state->scrollram[1] + 8); diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c index 59adb02d497..ca7a89da504 100644 --- a/src/mame/video/goindol.c +++ b/src/mame/video/goindol.c @@ -17,7 +17,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - goindol_state *state = (goindol_state *)machine->driver_data; + goindol_state *state = machine->driver_data(); int code = state->fg_videoram[2 * tile_index + 1]; int attr = state->fg_videoram[2 * tile_index]; SET_TILE_INFO( @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - goindol_state *state = (goindol_state *)machine->driver_data; + goindol_state *state = machine->driver_data(); int code = state->bg_videoram[2 * tile_index + 1]; int attr = state->bg_videoram[2 * tile_index]; SET_TILE_INFO( @@ -49,7 +49,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( goindol ) { - goindol_state *state = (goindol_state *)machine->driver_data; + goindol_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -65,14 +65,14 @@ VIDEO_START( goindol ) WRITE8_HANDLER( goindol_fg_videoram_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } WRITE8_HANDLER( goindol_bg_videoram_w ) { - goindol_state *state = (goindol_state *)space->machine->driver_data; + goindol_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -87,7 +87,7 @@ WRITE8_HANDLER( goindol_bg_videoram_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int gfxbank, UINT8 *sprite_ram ) { - goindol_state *state = (goindol_state *)machine->driver_data; + goindol_state *state = machine->driver_data(); int offs, sx, sy, tile, palette; for (offs = 0; offs < state->spriteram_size; offs += 4) @@ -125,7 +125,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( goindol ) { - goindol_state *state = (goindol_state *)screen->machine->driver_data; + goindol_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->fg_tilemap, 0, *state->fg_scrollx); tilemap_set_scrolly(state->fg_tilemap, 0, *state->fg_scrolly); diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index fbd1e535c18..d615757b7ad 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -21,7 +21,7 @@ WRITE8_HANDLER( cm_girl_scroll_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->cm_girl_scroll = data; /* @@ -35,7 +35,7 @@ WRITE8_HANDLER( cm_girl_scroll_w ) WRITE8_HANDLER( cm_outport0_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->cm_enable_reg = data; /* @@ -52,7 +52,7 @@ WRITE8_HANDLER( cm_outport0_w ) WRITE8_HANDLER( goldstar_fg_vidram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->fg_vidram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -60,7 +60,7 @@ WRITE8_HANDLER( goldstar_fg_vidram_w ) WRITE8_HANDLER( goldstar_fg_atrram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->fg_atrram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -68,7 +68,7 @@ WRITE8_HANDLER( goldstar_fg_atrram_w ) static TILE_GET_INFO( get_goldstar_fg_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->fg_vidram[tile_index]; int attr = state->fg_atrram[tile_index]; @@ -81,7 +81,7 @@ static TILE_GET_INFO( get_goldstar_fg_tile_info ) static TILE_GET_INFO( get_magical_fg_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->fg_vidram[tile_index]; int attr = state->fg_atrram[tile_index]; @@ -96,7 +96,7 @@ static TILE_GET_INFO( get_magical_fg_tile_info ) // colour / high tile bits are swapped around static TILE_GET_INFO( get_cherrym_fg_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->fg_vidram[tile_index]; int attr = state->fg_atrram[tile_index]; @@ -111,7 +111,7 @@ static TILE_GET_INFO( get_cherrym_fg_tile_info ) WRITE8_HANDLER( goldstar_reel1_ram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->reel1_ram[offset] = data; tilemap_mark_tile_dirty(state->reel1_tilemap,offset); @@ -119,7 +119,7 @@ WRITE8_HANDLER( goldstar_reel1_ram_w ) static TILE_GET_INFO( get_goldstar_reel1_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->reel1_ram[tile_index]; SET_TILE_INFO( @@ -132,14 +132,14 @@ static TILE_GET_INFO( get_goldstar_reel1_tile_info ) WRITE8_HANDLER( goldstar_reel2_ram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->reel2_ram[offset] = data; tilemap_mark_tile_dirty(state->reel2_tilemap,offset); } static TILE_GET_INFO( get_goldstar_reel2_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->reel2_ram[tile_index]; SET_TILE_INFO( @@ -151,7 +151,7 @@ static TILE_GET_INFO( get_goldstar_reel2_tile_info ) WRITE8_HANDLER( goldstar_reel3_ram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->reel3_ram[offset] = data; tilemap_mark_tile_dirty(state->reel3_tilemap,offset); @@ -159,7 +159,7 @@ WRITE8_HANDLER( goldstar_reel3_ram_w ) static TILE_GET_INFO( get_goldstar_reel3_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->reel3_ram[tile_index]; SET_TILE_INFO( @@ -171,7 +171,7 @@ static TILE_GET_INFO( get_goldstar_reel3_tile_info ) WRITE8_HANDLER( unkch_reel1_attrram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->reel1_attrram[offset] = data; tilemap_mark_tile_dirty(state->reel1_tilemap,offset); @@ -179,7 +179,7 @@ WRITE8_HANDLER( unkch_reel1_attrram_w ) WRITE8_HANDLER( unkch_reel2_attrram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->reel2_attrram[offset] = data; tilemap_mark_tile_dirty(state->reel2_tilemap,offset); @@ -188,7 +188,7 @@ WRITE8_HANDLER( unkch_reel2_attrram_w ) WRITE8_HANDLER( unkch_reel3_attrram_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); state->reel3_attrram[offset] = data; tilemap_mark_tile_dirty(state->reel3_tilemap,offset); @@ -197,7 +197,7 @@ WRITE8_HANDLER( unkch_reel3_attrram_w ) static TILE_GET_INFO( get_unkch_reel1_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->reel1_ram[tile_index]; int attr = state->reel1_attrram[tile_index]; @@ -210,7 +210,7 @@ static TILE_GET_INFO( get_unkch_reel1_tile_info ) static TILE_GET_INFO( get_unkch_reel2_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->reel2_ram[tile_index]; int attr = state->reel2_attrram[tile_index]; @@ -223,7 +223,7 @@ static TILE_GET_INFO( get_unkch_reel2_tile_info ) static TILE_GET_INFO( get_unkch_reel3_tile_info ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); int code = state->reel3_ram[tile_index]; int attr = state->reel3_attrram[tile_index]; @@ -239,7 +239,7 @@ static TILE_GET_INFO( get_unkch_reel3_tile_info ) VIDEO_START( goldstar ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); state->reel1_tilemap = tilemap_create(machine,get_goldstar_reel1_tile_info,tilemap_scan_rows,8,32, 64, 8); state->reel2_tilemap = tilemap_create(machine,get_goldstar_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); @@ -258,7 +258,7 @@ VIDEO_START( goldstar ) VIDEO_START( magical ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); state->reel1_tilemap = tilemap_create(machine,get_goldstar_reel1_tile_info,tilemap_scan_rows,8,32, 64, 8); state->reel2_tilemap = tilemap_create(machine,get_goldstar_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); @@ -277,7 +277,7 @@ VIDEO_START( magical ) VIDEO_START( unkch ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); state->reel1_tilemap = tilemap_create(machine,get_unkch_reel1_tile_info,tilemap_scan_rows,8,32, 64, 8); state->reel2_tilemap = tilemap_create(machine,get_unkch_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); @@ -299,7 +299,7 @@ VIDEO_START( unkch ) VIDEO_START( cherrym ) { - goldstar_state *state = (goldstar_state *)machine->driver_data; + goldstar_state *state = machine->driver_data(); state->reel1_tilemap = tilemap_create(machine,get_goldstar_reel1_tile_info,tilemap_scan_rows,8,32, 64, 8); state->reel2_tilemap = tilemap_create(machine,get_goldstar_reel2_tile_info,tilemap_scan_rows,8,32, 64, 8); @@ -322,7 +322,7 @@ VIDEO_START( cherrym ) WRITE8_HANDLER( goldstar_fa00_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); /* bit 1 toggles continuously - might be irq enable or watchdog reset */ @@ -335,7 +335,7 @@ WRITE8_HANDLER( goldstar_fa00_w ) WRITE8_HANDLER( cm_background_col_w ) { - goldstar_state *state = (goldstar_state *)space->machine->driver_data; + goldstar_state *state = space->machine->driver_data(); //printf("cm_background_col_w %02x\n",data); @@ -398,7 +398,7 @@ static const rectangle magical_visible2alt = { 0*8, (16+48)*8-1, 16*8, 28*8-1 } VIDEO_UPDATE( goldstar ) { - goldstar_state *state = (goldstar_state *)screen->machine->driver_data; + goldstar_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); @@ -444,7 +444,7 @@ VIDEO_UPDATE( goldstar ) VIDEO_UPDATE( magical ) { - goldstar_state *state = (goldstar_state *)screen->machine->driver_data; + goldstar_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); @@ -496,7 +496,7 @@ VIDEO_UPDATE( magical ) VIDEO_UPDATE( unkch ) { - goldstar_state *state = (goldstar_state *)screen->machine->driver_data; + goldstar_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); @@ -546,7 +546,7 @@ VIDEO_UPDATE( unkch ) VIDEO_UPDATE( cmast91 ) { - goldstar_state *state = (goldstar_state *)screen->machine->driver_data; + goldstar_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); @@ -578,7 +578,7 @@ VIDEO_UPDATE( cmast91 ) VIDEO_UPDATE( amcoe1a ) { - goldstar_state *state = (goldstar_state *)screen->machine->driver_data; + goldstar_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index 3548875c9cf..5988ebc3e12 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -14,7 +14,7 @@ static TILEMAP_MAPPER( gotcha_tilemap_scan ) INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index ,UINT16 *vram, int color_offs) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); UINT16 data = vram[tile_index]; int code = (data & 0x3ff) | (state->gfxbank[(data & 0x0c00) >> 10] << 10); @@ -23,13 +23,13 @@ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int ti static TILE_GET_INFO( fg_get_tile_info ) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, state->fgvideoram, 0); } static TILE_GET_INFO( bg_get_tile_info ) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); get_tile_info(machine, tileinfo, tile_index, state->bgvideoram, 16); } @@ -43,7 +43,7 @@ static TILE_GET_INFO( bg_get_tile_info ) VIDEO_START( gotcha ) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, fg_get_tile_info, gotcha_tilemap_scan, 16, 16, 64, 32); state->bg_tilemap = tilemap_create(machine, bg_get_tile_info, gotcha_tilemap_scan, 16, 16, 64, 32); @@ -56,28 +56,28 @@ VIDEO_START( gotcha ) WRITE16_HANDLER( gotcha_fgvideoram_w ) { - gotcha_state *state = (gotcha_state *)space->machine->driver_data; + gotcha_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fgvideoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE16_HANDLER( gotcha_bgvideoram_w ) { - gotcha_state *state = (gotcha_state *)space->machine->driver_data; + gotcha_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bgvideoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE16_HANDLER( gotcha_gfxbank_select_w ) { - gotcha_state *state = (gotcha_state *)space->machine->driver_data; + gotcha_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->banksel = (data & 0x0300) >> 8; } WRITE16_HANDLER( gotcha_gfxbank_w ) { - gotcha_state *state = (gotcha_state *)space->machine->driver_data; + gotcha_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) { if (state->gfxbank[state->banksel] != ((data & 0x0f00) >> 8)) @@ -90,7 +90,7 @@ WRITE16_HANDLER( gotcha_gfxbank_w ) WRITE16_HANDLER( gotcha_scroll_w ) { - gotcha_state *state = (gotcha_state *)space->machine->driver_data; + gotcha_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll[offset]); switch (offset) @@ -107,7 +107,7 @@ WRITE16_HANDLER( gotcha_scroll_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - gotcha_state *state = (gotcha_state *)machine->driver_data; + gotcha_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -137,7 +137,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( gotcha ) { - gotcha_state *state = (gotcha_state *)screen->machine->driver_data; + gotcha_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index e64db2de364..19c059347b0 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -63,21 +63,21 @@ PALETTE_INIT( gotya ) WRITE8_HANDLER( gotya_videoram_w ) { - gotya_state *state = (gotya_state *)space->machine->driver_data; + gotya_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( gotya_colorram_w ) { - gotya_state *state = (gotya_state *)space->machine->driver_data; + gotya_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( gotya_video_control_w ) { - gotya_state *state = (gotya_state *)space->machine->driver_data; + gotya_state *state = space->machine->driver_data(); /* bit 0 - scroll bit 8 bit 1 - flip screen @@ -94,7 +94,7 @@ WRITE8_HANDLER( gotya_video_control_w ) static TILE_GET_INFO( get_bg_tile_info ) { - gotya_state *state = (gotya_state *)machine->driver_data; + gotya_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = state->colorram[tile_index] & 0x0f; @@ -111,13 +111,13 @@ static TILEMAP_MAPPER( tilemap_scan_rows_thehand ) VIDEO_START( gotya ) { - gotya_state *state = (gotya_state *)machine->driver_data; + gotya_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_thehand, 8, 8, 64, 32); } static void draw_status_row( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int sx, int col ) { - gotya_state *state = (gotya_state *)machine->driver_data; + gotya_state *state = machine->driver_data(); int row; if (flip_screen_get(machine)) @@ -145,7 +145,7 @@ static void draw_status_row( running_machine *machine, bitmap_t *bitmap, const r static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - gotya_state *state = (gotya_state *)machine->driver_data; + gotya_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -179,7 +179,7 @@ static void draw_status( running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( gotya ) { - gotya_state *state = (gotya_state *)screen->machine->driver_data; + gotya_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, -(*state->scroll + (state->scroll_bit_8 * 256)) - 2 * 8); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c index 30f127ee572..d85ca5df475 100644 --- a/src/mame/video/gradius3.c +++ b/src/mame/video/gradius3.c @@ -14,7 +14,7 @@ void gradius3_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - gradius3_state *state = (gradius3_state *)machine->driver_data; + gradius3_state *state = machine->driver_data(); /* (color & 0x02) is flip y handled internally by the 052109 */ *code |= ((*color & 0x01) << 8) | ((*color & 0x1c) << 7); @@ -38,7 +38,7 @@ void gradius3_sprite_callback( running_machine *machine, int *code, int *color, { L0|L2, L0, L0|L2, L0|L1|L2 }, { L1|L2, L2, 0, L0|L1|L2 } }; - gradius3_state *state = (gradius3_state *)machine->driver_data; + gradius3_state *state = machine->driver_data(); int pri = ((*color & 0x60) >> 5); if (state->priority == 0) @@ -70,7 +70,7 @@ static STATE_POSTLOAD( gradius3_postload ) VIDEO_START( gradius3 ) { - gradius3_state *state = (gradius3_state *)machine->driver_data; + gradius3_state *state = machine->driver_data(); int i; state->layer_colorbase[0] = 0; @@ -108,7 +108,7 @@ READ16_HANDLER( gradius3_gfxrom_r ) WRITE16_HANDLER( gradius3_gfxram_w ) { - gradius3_state *state = (gradius3_state *)space->machine->driver_data; + gradius3_state *state = space->machine->driver_data(); int oldword = state->gfxram[offset]; COMBINE_DATA(&state->gfxram[offset]); @@ -125,7 +125,7 @@ WRITE16_HANDLER( gradius3_gfxram_w ) VIDEO_UPDATE( gradius3 ) { - gradius3_state *state = (gradius3_state *)screen->machine->driver_data; + gradius3_state *state = screen->machine->driver_data(); /* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */ k052109_w(state->k052109, 0x1d80, 0x10); diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index b2f571bf5b8..e879321cd58 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -16,7 +16,7 @@ PALETTE_INIT( grchamp ) { static const int resistances[3] = { 100, 270, 470 }; double rweights[3], gweights[3], bweights[2]; - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); int i; /* compute the color output resistor weights */ @@ -54,46 +54,46 @@ PALETTE_INIT( grchamp ) WRITE8_HANDLER( grchamp_left_w ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); state->leftram[offset] = data; tilemap_mark_tile_dirty(state->left_tilemap, offset); } WRITE8_HANDLER( grchamp_center_w ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); state->centerram[offset] = data; tilemap_mark_tile_dirty(state->center_tilemap, offset); } WRITE8_HANDLER( grchamp_right_w ) { - grchamp_state *state = (grchamp_state *)space->machine->driver_data; + grchamp_state *state = space->machine->driver_data(); state->rightram[offset] = data; tilemap_mark_tile_dirty(state->right_tilemap, offset); } static TILE_GET_INFO( get_text_tile_info ) { - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); SET_TILE_INFO(0, state->videoram[tile_index], 0, 0); } static TILE_GET_INFO( get_left_tile_info ) { - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); SET_TILE_INFO(1, state->leftram[tile_index], 0, 0); } static TILE_GET_INFO( get_right_tile_info ) { - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); SET_TILE_INFO(2, state->rightram[tile_index], 0, 0); } static TILE_GET_INFO( get_center_tile_info ) { - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); SET_TILE_INFO(3, state->centerram[tile_index], 0, 0); } @@ -105,7 +105,7 @@ static TILEMAP_MAPPER( get_memory_offset ) VIDEO_START( grchamp ) { - grchamp_state *state = (grchamp_state *)machine->driver_data; + grchamp_state *state = machine->driver_data(); state->work_bitmap = auto_bitmap_alloc(machine,32,32,machine->primary_screen->format()); @@ -366,7 +366,7 @@ VIDEO_UPDATE( grchamp ) MAKE_RGB(RGB_MAX,RGB_MAX,RGB_MAX) }; - grchamp_state *state = (grchamp_state *)screen->machine->driver_data; + grchamp_state *state = screen->machine->driver_data(); const UINT8 *amedata = memory_region(screen->machine, "gfx5"); const UINT8 *headdata = memory_region(screen->machine, "gfx6"); const UINT8 *pldata = memory_region(screen->machine, "gfx7"); diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c index 5501fed9573..f7a0b364c03 100644 --- a/src/mame/video/gumbo.c +++ b/src/mame/video/gumbo.c @@ -6,14 +6,14 @@ WRITE16_HANDLER( gumbo_bg_videoram_w ) { - gumbo_state *state = (gumbo_state *)space->machine->driver_data; + gumbo_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static TILE_GET_INFO( get_gumbo_bg_tile_info ) { - gumbo_state *state = (gumbo_state *)machine->driver_data; + gumbo_state *state = machine->driver_data(); int tileno = state->bg_videoram[tile_index]; SET_TILE_INFO(0, tileno, 0, 0); } @@ -21,14 +21,14 @@ static TILE_GET_INFO( get_gumbo_bg_tile_info ) WRITE16_HANDLER( gumbo_fg_videoram_w ) { - gumbo_state *state = (gumbo_state *)space->machine->driver_data; + gumbo_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); } static TILE_GET_INFO( get_gumbo_fg_tile_info ) { - gumbo_state *state = (gumbo_state *)machine->driver_data; + gumbo_state *state = machine->driver_data(); int tileno = state->fg_videoram[tile_index]; SET_TILE_INFO(1, tileno, 1, 0); } @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_gumbo_fg_tile_info ) VIDEO_START( gumbo ) { - gumbo_state *state = (gumbo_state *)machine->driver_data; + gumbo_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_gumbo_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->fg_tilemap = tilemap_create(machine, get_gumbo_fg_tile_info, tilemap_scan_rows, 4, 4, 128, 64); tilemap_set_transparent_pen(state->fg_tilemap, 0xff); @@ -44,7 +44,7 @@ VIDEO_START( gumbo ) VIDEO_UPDATE( gumbo ) { - gumbo_state *state = (gumbo_state *)screen->machine->driver_data; + gumbo_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c index 125b808b5ea..f3005186444 100644 --- a/src/mame/video/gundealr.c +++ b/src/mame/video/gundealr.c @@ -18,7 +18,7 @@ static TILE_GET_INFO( get_bg_tile_info ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); UINT8 attr = state->bg_videoram[2 * tile_index + 1]; SET_TILE_INFO( 0, @@ -35,7 +35,7 @@ static TILEMAP_MAPPER( gundealr_scan ) static TILE_GET_INFO( get_fg_tile_info ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); UINT8 attr = state->fg_videoram[2 * tile_index + 1]; SET_TILE_INFO( 1, @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( gundealr ) { - gundealr_state *state = (gundealr_state *)machine->driver_data; + gundealr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, gundealr_scan, 16, 16, 64, 32); @@ -71,21 +71,21 @@ VIDEO_START( gundealr ) WRITE8_HANDLER( gundealr_bg_videoram_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( gundealr_fg_videoram_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } WRITE8_HANDLER( gundealr_paletteram_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); int r,g,b,val; state->paletteram[offset] = data; @@ -103,7 +103,7 @@ WRITE8_HANDLER( gundealr_paletteram_w ) WRITE8_HANDLER( gundealr_fg_scroll_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); state->scroll[offset] = data; tilemap_set_scrollx(state->fg_tilemap, 0, state->scroll[1] | ((state->scroll[0] & 0x03) << 8)); tilemap_set_scrolly(state->fg_tilemap, 0, state->scroll[3] | ((state->scroll[2] & 0x03) << 8)); @@ -111,7 +111,7 @@ WRITE8_HANDLER( gundealr_fg_scroll_w ) WRITE8_HANDLER( yamyam_fg_scroll_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); state->scroll[offset] = data; tilemap_set_scrollx(state->fg_tilemap, 0, state->scroll[0] | ((state->scroll[1] & 0x03) << 8)); tilemap_set_scrolly(state->fg_tilemap, 0, state->scroll[2] | ((state->scroll[3] & 0x03) << 8)); @@ -119,7 +119,7 @@ WRITE8_HANDLER( yamyam_fg_scroll_w ) WRITE8_HANDLER( gundealr_flipscreen_w ) { - gundealr_state *state = (gundealr_state *)space->machine->driver_data; + gundealr_state *state = space->machine->driver_data(); state->flipscreen = data; tilemap_set_flip_all(space->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } @@ -134,7 +134,7 @@ WRITE8_HANDLER( gundealr_flipscreen_w ) VIDEO_UPDATE( gundealr ) { - gundealr_state *state = (gundealr_state *)screen->machine->driver_data; + gundealr_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index d30b5975295..674a6015ed1 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -60,21 +60,21 @@ PALETTE_INIT( gunsmoke ) WRITE8_HANDLER( gunsmoke_videoram_w ) { - gunsmoke_state *state = (gunsmoke_state *)space->machine->driver_data; + gunsmoke_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( gunsmoke_colorram_w ) { - gunsmoke_state *state = (gunsmoke_state *)space->machine->driver_data; + gunsmoke_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( gunsmoke_c804_w ) { - gunsmoke_state *state = (gunsmoke_state *)space->machine->driver_data; + gunsmoke_state *state = space->machine->driver_data(); /* bits 0 and 1 are for coin counters */ coin_counter_w(space->machine, 1, data & 0x01); @@ -94,7 +94,7 @@ WRITE8_HANDLER( gunsmoke_c804_w ) WRITE8_HANDLER( gunsmoke_d806_w ) { - gunsmoke_state *state = (gunsmoke_state *)space->machine->driver_data; + gunsmoke_state *state = space->machine->driver_data(); /* bits 0-2 select the sprite 3 bank */ state->sprite3bank = data & 0x07; @@ -121,7 +121,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - gunsmoke_state *state = (gunsmoke_state *)machine->driver_data; + gunsmoke_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0xe0) << 2); int color = attr & 0x1f; @@ -133,7 +133,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( gunsmoke ) { - gunsmoke_state *state = (gunsmoke_state *)machine->driver_data; + gunsmoke_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 32, 32, 2048, 8); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -142,7 +142,7 @@ VIDEO_START( gunsmoke ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - gunsmoke_state *state = (gunsmoke_state *)machine->driver_data; + gunsmoke_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -176,7 +176,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( gunsmoke ) { - gunsmoke_state *state = (gunsmoke_state *)screen->machine->driver_data; + gunsmoke_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx[0] + 256 * state->scrollx[1]); tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly[0]); diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 6613f218612..0eaf8917e4b 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -93,7 +93,7 @@ PALETTE_INIT( gyruss ) WRITE8_HANDLER( gyruss_spriteram_w ) { - gyruss_state *state = (gyruss_state *)space->machine->driver_data; + gyruss_state *state = space->machine->driver_data(); space->machine->primary_screen->update_now(); state->spriteram[offset] = data; } @@ -101,7 +101,7 @@ WRITE8_HANDLER( gyruss_spriteram_w ) static TILE_GET_INFO( gyruss_get_tile_info ) { - gyruss_state *state = (gyruss_state *)machine->driver_data; + gyruss_state *state = machine->driver_data(); int code = ((state->colorram[tile_index] & 0x20) << 3) | state->videoram[tile_index]; int color = state->colorram[tile_index] & 0x0f; int flags = TILE_FLIPYX(state->colorram[tile_index] >> 6); @@ -114,7 +114,7 @@ static TILE_GET_INFO( gyruss_get_tile_info ) VIDEO_START( gyruss ) { - gyruss_state *state = (gyruss_state *)machine->driver_data; + gyruss_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, gyruss_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transmask(state->tilemap, 0, 0x00, 0); /* opaque */ tilemap_set_transmask(state->tilemap, 1, 0x0f, 0); /* transparent */ @@ -131,7 +131,7 @@ READ8_HANDLER( gyruss_scanline_r ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, gfx_element **gfx ) { - gyruss_state *state = (gyruss_state *)machine->driver_data; + gyruss_state *state = machine->driver_data(); int offs; for (offs = 0xbc; offs >= 0; offs -= 4) @@ -152,7 +152,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( gyruss ) { - gyruss_state *state = (gyruss_state *)screen->machine->driver_data; + gyruss_state *state = screen->machine->driver_data(); if (cliprect->min_y == screen->visible_area().min_y) { diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c index 3feb3a2400b..1730fae07a2 100644 --- a/src/mame/video/hanaawas.c +++ b/src/mame/video/hanaawas.c @@ -64,14 +64,14 @@ PALETTE_INIT( hanaawas ) WRITE8_HANDLER( hanaawas_videoram_w ) { - hanaawas_state *state = (hanaawas_state *)space->machine->driver_data; + hanaawas_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( hanaawas_colorram_w ) { - hanaawas_state *state = (hanaawas_state *)space->machine->driver_data; + hanaawas_state *state = space->machine->driver_data(); state->colorram[offset] = data; /* dirty both current and next offsets */ @@ -91,7 +91,7 @@ WRITE8_DEVICE_HANDLER( hanaawas_portB_w ) static TILE_GET_INFO( get_bg_tile_info ) { - hanaawas_state *state = (hanaawas_state *)machine->driver_data; + hanaawas_state *state = machine->driver_data(); /* the color is determined by the current color byte, but the bank is via the previous one!!! */ int offset = (tile_index + (flip_screen_get(machine) ? 1 : -1)) & 0x3ff; int attr = state->colorram[offset]; @@ -104,13 +104,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hanaawas ) { - hanaawas_state *state = (hanaawas_state *)machine->driver_data; + hanaawas_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } VIDEO_UPDATE( hanaawas ) { - hanaawas_state *state = (hanaawas_state *)screen->machine->driver_data; + hanaawas_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c index 420c5f6e055..feb86e8cfb2 100644 --- a/src/mame/video/harddriv.c +++ b/src/mame/video/harddriv.c @@ -30,7 +30,7 @@ VIDEO_START( harddriv ) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); UINT32 *destmask, mask; int i; @@ -98,7 +98,7 @@ VIDEO_START( harddriv ) void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* access to the 1bpp/2bpp area */ if (address >= 0x02000000 && address <= 0x020fffff) @@ -126,7 +126,7 @@ void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16 void hdgsp_read_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); if (!state->shiftreg_enable) return; @@ -164,7 +164,7 @@ void hdgsp_read_from_shiftreg(const address_space *space, UINT32 address, UINT16 static void update_palette_bank(running_machine *machine, int newbank) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); machine->primary_screen->update_partial(machine->primary_screen->vpos()); state->gfx_palettebank = newbank; } @@ -179,14 +179,14 @@ static void update_palette_bank(running_machine *machine, int newbank) READ16_HANDLER( hdgsp_control_lo_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->gsp_control_lo[offset]; } WRITE16_HANDLER( hdgsp_control_lo_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int oldword = state->gsp_control_lo[offset]; int newword; @@ -207,14 +207,14 @@ WRITE16_HANDLER( hdgsp_control_lo_w ) READ16_HANDLER( hdgsp_control_hi_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); return state->gsp_control_hi[offset]; } WRITE16_HANDLER( hdgsp_control_hi_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); int val = (offset >> 3) & 1; int oldword = state->gsp_control_hi[offset]; @@ -275,7 +275,7 @@ READ16_HANDLER( hdgsp_vram_2bpp_r ) WRITE16_HANDLER( hdgsp_vram_1bpp_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT32 *dest = (UINT32 *)&state->gsp_vram[offset * 16]; UINT32 *mask = &state->mask_table[data * 4]; UINT32 color = state->gsp_control_lo[0] & 0xff; @@ -304,7 +304,7 @@ WRITE16_HANDLER( hdgsp_vram_1bpp_w ) WRITE16_HANDLER( hdgsp_vram_2bpp_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); UINT32 *dest = (UINT32 *)&state->gsp_vram[offset * 8]; UINT32 *mask = &state->mask_table[data * 2]; UINT32 color = state->gsp_control_lo[0]; @@ -331,7 +331,7 @@ WRITE16_HANDLER( hdgsp_vram_2bpp_w ) INLINE void gsp_palette_change(running_machine *machine, int offset) { - harddriv_state *state = (harddriv_state *)machine->driver_data; + harddriv_state *state = machine->driver_data(); int red = (state->gsp_paletteram_lo[offset] >> 8) & 0xff; int green = state->gsp_paletteram_lo[offset] & 0xff; int blue = state->gsp_paletteram_hi[offset] & 0xff; @@ -341,7 +341,7 @@ INLINE void gsp_palette_change(running_machine *machine, int offset) READ16_HANDLER( hdgsp_paletteram_lo_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* note that the palette is only accessed via the first 256 entries */ /* others are selected via the palette bank */ @@ -353,7 +353,7 @@ READ16_HANDLER( hdgsp_paletteram_lo_r ) WRITE16_HANDLER( hdgsp_paletteram_lo_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* note that the palette is only accessed via the first 256 entries */ /* others are selected via the palette bank */ @@ -373,7 +373,7 @@ WRITE16_HANDLER( hdgsp_paletteram_lo_w ) READ16_HANDLER( hdgsp_paletteram_hi_r ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* note that the palette is only accessed via the first 256 entries */ /* others are selected via the palette bank */ @@ -385,7 +385,7 @@ READ16_HANDLER( hdgsp_paletteram_hi_r ) WRITE16_HANDLER( hdgsp_paletteram_hi_w ) { - harddriv_state *state = (harddriv_state *)space->machine->driver_data; + harddriv_state *state = space->machine->driver_data(); /* note that the palette is only accessed via the first 256 entries */ /* others are selected via the palette bank */ @@ -425,7 +425,7 @@ static void display_speedups(void) void harddriv_scanline_driver(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params) { - harddriv_state *state = (harddriv_state *)screen.machine->driver_data; + harddriv_state *state = screen.machine->driver_data(); UINT8 *vram_base = &state->gsp_vram[(params->rowaddr << 12) & state->vram_mask]; UINT16 *dest = BITMAP_ADDR16(bitmap, scanline, 0); int coladdr = (params->yoffset << 9) + ((params->coladdr & 0xff) << 4) - 15 + (state->gfx_finescroll & 0x0f); @@ -441,7 +441,7 @@ void harddriv_scanline_driver(screen_device &screen, bitmap_t *bitmap, int scanl void harddriv_scanline_multisync(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params) { - harddriv_state *state = (harddriv_state *)screen.machine->driver_data; + harddriv_state *state = screen.machine->driver_data(); UINT8 *vram_base = &state->gsp_vram[(params->rowaddr << 11) & state->vram_mask]; UINT16 *dest = BITMAP_ADDR16(bitmap, scanline, 0); int coladdr = (params->yoffset << 9) + ((params->coladdr & 0xff) << 3) - 7 + (state->gfx_finescroll & 0x07); diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index 0a84a38699d..a8e3b390c46 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -43,7 +43,7 @@ PALETTE_INIT( hcastle ) static void set_pens(running_machine *machine) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x100; i += 2) @@ -72,7 +72,7 @@ static TILEMAP_MAPPER( tilemap_scan ) static TILE_GET_INFO( get_fg_tile_info ) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121_1, 5); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_1, 6); int bit0 = (ctrl_5 >> 0) & 0x03; @@ -97,7 +97,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121_2, 5); UINT8 ctrl_6 = k007121_ctrlram_r(state->k007121_2, 6); int bit0 = (ctrl_5 >> 0) & 0x03; @@ -130,7 +130,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hcastle ) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan, 8, 8, 64, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan, 8, 8, 64, 32); @@ -148,33 +148,33 @@ VIDEO_START( hcastle ) WRITE8_HANDLER( hcastle_pf1_video_w ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); state->pf1_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0xbff); } WRITE8_HANDLER( hcastle_pf2_video_w ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); state->pf2_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0xbff); } WRITE8_HANDLER( hcastle_gfxbank_w ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); state->gfx_bank = data; } READ8_HANDLER( hcastle_gfxbank_r ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); return state->gfx_bank; } WRITE8_HANDLER( hcastle_pf1_control_w ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); if (offset == 3) { @@ -192,7 +192,7 @@ WRITE8_HANDLER( hcastle_pf1_control_w ) WRITE8_HANDLER( hcastle_pf2_control_w ) { - hcastle_state *state = (hcastle_state *)space->machine->driver_data; + hcastle_state *state = space->machine->driver_data(); if (offset == 3) { @@ -212,7 +212,7 @@ WRITE8_HANDLER( hcastle_pf2_control_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 *sbank, int bank ) { - hcastle_state *state = (hcastle_state *)machine->driver_data; + hcastle_state *state = machine->driver_data(); running_device *k007121 = bank ? state->k007121_2 : state->k007121_1; int base_color = (k007121_ctrlram_r(k007121, 6) & 0x30) * 2; int bank_base = (bank == 0) ? 0x4000 * (state->gfx_bank & 1) : 0; @@ -224,7 +224,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( hcastle ) { - hcastle_state *state = (hcastle_state *)screen->machine->driver_data; + hcastle_state *state = screen->machine->driver_data(); UINT8 ctrl_1_0 = k007121_ctrlram_r(state->k007121_1, 0); UINT8 ctrl_1_1 = k007121_ctrlram_r(state->k007121_1, 1); diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index edb6ce42c46..7ff068e3cfc 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -3,14 +3,14 @@ WRITE8_HANDLER( higemaru_videoram_w ) { - higemaru_state *state = (higemaru_state *)space->machine->driver_data; + higemaru_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( higemaru_colorram_w ) { - higemaru_state *state = (higemaru_state *)space->machine->driver_data; + higemaru_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -75,7 +75,7 @@ PALETTE_INIT( higemaru ) WRITE8_HANDLER( higemaru_c800_w ) { - higemaru_state *state = (higemaru_state *)space->machine->driver_data; + higemaru_state *state = space->machine->driver_data(); if (data & 0x7c) logerror("c800 = %02x\n",data); @@ -93,7 +93,7 @@ WRITE8_HANDLER( higemaru_c800_w ) static TILE_GET_INFO( get_bg_tile_info ) { - higemaru_state *state = (higemaru_state *)machine->driver_data; + higemaru_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x80) << 1); int color = state->colorram[tile_index] & 0x1f; @@ -102,13 +102,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( higemaru ) { - higemaru_state *state = (higemaru_state *)machine->driver_data; + higemaru_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - higemaru_state *state = (higemaru_state *)machine->driver_data; + higemaru_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -147,7 +147,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( higemaru ) { - higemaru_state *state = (higemaru_state *)screen->machine->driver_data; + higemaru_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c index da3e9566e33..0e24d37e3dc 100644 --- a/src/mame/video/himesiki.c +++ b/src/mame/video/himesiki.c @@ -12,7 +12,7 @@ Video hardware static TILE_GET_INFO( get_bg_tile_info ) { - himesiki_state *state = (himesiki_state *)machine->driver_data; + himesiki_state *state = machine->driver_data(); int code = state->bg_ram[tile_index * 2] + state->bg_ram[tile_index * 2 + 1] * 0x100 ; int col = code >> 12; @@ -23,26 +23,26 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( himesiki ) { - himesiki_state *state = (himesiki_state *)machine->driver_data; + himesiki_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create( machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); } WRITE8_HANDLER( himesiki_bg_ram_w ) { - himesiki_state *state = (himesiki_state *)space->machine->driver_data; + himesiki_state *state = space->machine->driver_data(); state->bg_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( himesiki_scrollx_w ) { - himesiki_state *state = (himesiki_state *)space->machine->driver_data; + himesiki_state *state = space->machine->driver_data(); state->scrollx[offset] = data; } WRITE8_HANDLER( himesiki_flip_w ) { - himesiki_state *state = (himesiki_state *)space->machine->driver_data; + himesiki_state *state = space->machine->driver_data(); state->flipscreen = data & 0xc0; flip_screen_set(space->machine, state->flipscreen); @@ -52,7 +52,7 @@ WRITE8_HANDLER( himesiki_flip_w ) static void himesiki_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - himesiki_state *state = (himesiki_state *)machine->driver_data; + himesiki_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -119,7 +119,7 @@ static void himesiki_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( himesiki ) { - himesiki_state *state = (himesiki_state *)screen->machine->driver_data; + himesiki_state *state = screen->machine->driver_data(); int x = -(state->scrollx[0] << 8 | state->scrollx[1]) & 0x1ff; tilemap_set_scrolldx(state->bg_tilemap, x, x); diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c index 679f9cddce8..f83dc8d2077 100644 --- a/src/mame/video/hnayayoi.c +++ b/src/mame/video/hnayayoi.c @@ -14,7 +14,7 @@ The blitter reads compressed data from ROM and copies it to the bitmap RAM. static void common_vh_start( running_machine *machine, int num_pixmaps ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); int i; state->total_pixmaps = num_pixmaps; @@ -32,7 +32,7 @@ static void common_vh_start( running_machine *machine, int num_pixmaps ) VIDEO_START( hnayayoi ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); common_vh_start(machine, 4); /* 4 bitmaps -> 2 layers */ state_save_register_global_pointer(machine, state->pixmap[0], 256 * 256); @@ -43,7 +43,7 @@ VIDEO_START( hnayayoi ) VIDEO_START( untoucha ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); common_vh_start(machine, 8); /* 8 bitmaps -> 4 layers */ state_save_register_global_pointer(machine, state->pixmap[0], 256 * 256); @@ -102,7 +102,7 @@ up blit_src for the second call. WRITE8_HANDLER( dynax_blitter_rev1_param_w ) { - hnayayoi_state *state = (hnayayoi_state *)space->machine->driver_data; + hnayayoi_state *state = space->machine->driver_data(); switch (offset) { case 0: state->blit_dest = (state->blit_dest & 0xff00) | (data << 0); break; @@ -116,7 +116,7 @@ WRITE8_HANDLER( dynax_blitter_rev1_param_w ) static void copy_pixel( running_machine *machine, int x, int y, int pen ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); if (x >= 0 && x <= 255 && y >= 0 && y <= 255) { int i; @@ -131,7 +131,7 @@ static void copy_pixel( running_machine *machine, int x, int y, int pen ) WRITE8_HANDLER( dynax_blitter_rev1_start_w ) { - hnayayoi_state *state = (hnayayoi_state *)space->machine->driver_data; + hnayayoi_state *state = space->machine->driver_data(); UINT8 *rom = memory_region(space->machine, "gfx1"); int romlen = memory_region_length(space->machine, "gfx1"); int sx = state->blit_dest & 0xff; @@ -207,7 +207,7 @@ WRITE8_HANDLER( dynax_blitter_rev1_start_w ) WRITE8_HANDLER( dynax_blitter_rev1_clear_w ) { - hnayayoi_state *state = (hnayayoi_state *)space->machine->driver_data; + hnayayoi_state *state = space->machine->driver_data(); int pen = data >> 4; int i; @@ -221,7 +221,7 @@ WRITE8_HANDLER( dynax_blitter_rev1_clear_w ) WRITE8_HANDLER( hnayayoi_palbank_w ) { - hnayayoi_state *state = (hnayayoi_state *)space->machine->driver_data; + hnayayoi_state *state = space->machine->driver_data(); offset *= 8; state->palbank = (state->palbank & (0xff00 >> offset)) | (data << offset); } @@ -229,7 +229,7 @@ WRITE8_HANDLER( hnayayoi_palbank_w ) static void draw_layer_interleaved( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int left_pixmap, int right_pixmap, int palbase, int transp ) { - hnayayoi_state *state = (hnayayoi_state *)machine->driver_data; + hnayayoi_state *state = machine->driver_data(); int county, countx, pen; UINT8 *src1 = state->pixmap[left_pixmap]; UINT8 *src2 = state->pixmap[right_pixmap]; @@ -265,7 +265,7 @@ static void draw_layer_interleaved( running_machine *machine, bitmap_t *bitmap, VIDEO_UPDATE( hnayayoi ) { - hnayayoi_state *state = (hnayayoi_state *)screen->machine->driver_data; + hnayayoi_state *state = screen->machine->driver_data(); int col0 = (state->palbank >> 0) & 0x0f; int col1 = (state->palbank >> 4) & 0x0f; int col2 = (state->palbank >> 8) & 0x0f; diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index b828386a3ca..0cdc2889f22 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -18,7 +18,7 @@ static TILE_GET_INFO( holeland_get_tile_info ) { - holeland_state *state = (holeland_state *)machine->driver_data; + holeland_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int tile_number = state->videoram[tile_index] | ((attr & 0x03) << 8); @@ -36,7 +36,7 @@ static TILE_GET_INFO( holeland_get_tile_info ) static TILE_GET_INFO( crzrally_get_tile_info ) { - holeland_state *state = (holeland_state *)machine->driver_data; + holeland_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int tile_number = state->videoram[tile_index] | ((attr & 0x03) << 8); @@ -56,7 +56,7 @@ static TILE_GET_INFO( crzrally_get_tile_info ) VIDEO_START( holeland ) { - holeland_state *state = (holeland_state *)machine->driver_data; + holeland_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, holeland_get_tile_info, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xff, 0x00); /* split type 0 is totally transparent in front half */ @@ -65,27 +65,27 @@ VIDEO_START( holeland ) VIDEO_START( crzrally ) { - holeland_state *state = (holeland_state *)machine->driver_data; + holeland_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, crzrally_get_tile_info, tilemap_scan_cols, 8, 8, 32, 32); } WRITE8_HANDLER( holeland_videoram_w ) { - holeland_state *state = (holeland_state *)space->machine->driver_data; + holeland_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( holeland_colorram_w ) { - holeland_state *state = (holeland_state *)space->machine->driver_data; + holeland_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( holeland_pal_offs_w ) { - holeland_state *state = (holeland_state *)space->machine->driver_data; + holeland_state *state = space->machine->driver_data(); if ((data & 1) != state->po[offset]) { state->po[offset] = data & 1; @@ -96,7 +96,7 @@ WRITE8_HANDLER( holeland_pal_offs_w ) WRITE8_HANDLER( holeland_scroll_w ) { - holeland_state *state = (holeland_state *)space->machine->driver_data; + holeland_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, data); } @@ -111,7 +111,7 @@ WRITE8_HANDLER( holeland_flipscreen_w ) static void holeland_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - holeland_state *state = (holeland_state *)machine->driver_data; + holeland_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs, code, sx, sy, color, flipx, flipy; @@ -151,7 +151,7 @@ static void holeland_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void crzrally_draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - holeland_state *state = (holeland_state *)machine->driver_data; + holeland_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs, code, sx, sy, color, flipx, flipy; @@ -190,7 +190,7 @@ static void crzrally_draw_sprites( running_machine *machine, bitmap_t *bitmap,co VIDEO_UPDATE( holeland ) { - holeland_state *state = (holeland_state *)screen->machine->driver_data; + holeland_state *state = screen->machine->driver_data(); /*tilemap_mark_all_tiles_dirty(state->bg_tilemap); */ tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); holeland_draw_sprites(screen->machine, bitmap, cliprect); @@ -200,7 +200,7 @@ VIDEO_UPDATE( holeland ) VIDEO_UPDATE( crzrally ) { - holeland_state *state = (holeland_state *)screen->machine->driver_data; + holeland_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); crzrally_draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index 8f78bab1d8e..517bc071e7b 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -34,7 +34,7 @@ static void mrokumei_handleblit( const address_space *space, int rom_base ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); int i; int dest_param; int source_addr; @@ -121,7 +121,7 @@ finish: static void reikaids_handleblit( const address_space *space, int rom_base ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); int i; UINT16 dest_param; int flipx; @@ -219,7 +219,7 @@ finish: static void pteacher_handleblit( const address_space *space, int rom_base ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); int i; int dest_param; int source_addr; @@ -402,7 +402,7 @@ PALETTE_INIT( mirderby ) INLINE void mrokumei_info0( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 2 + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 1] + ((attr & 0x03) << 8) + (gfxbank << 10); @@ -412,7 +412,7 @@ INLINE void mrokumei_info0( running_machine *machine, tile_data *tileinfo, int t } INLINE void mrokumei_info1( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 2 + 0x1000 + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11); @@ -423,32 +423,32 @@ INLINE void mrokumei_info1( running_machine *machine, tile_data *tileinfo, int t static TILE_GET_INFO( mrokumei_get_info0_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); mrokumei_info0( machine, tileinfo, tile_index, 0, state->blitter_bank & 0x03 ); } static TILE_GET_INFO( mrokumei_get_info1_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); mrokumei_info0( machine, tileinfo, tile_index, 1, state->blitter_bank & 0x03 ); } static TILE_GET_INFO( mrokumei_get_info0_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); mrokumei_info1( machine, tileinfo, tile_index, 0, (state->blitter_bank & 0x38) >> 3 ); } static TILE_GET_INFO( mrokumei_get_info1_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); mrokumei_info1( machine, tileinfo, tile_index, 1, (state->blitter_bank & 0x38) >> 3 ); } INLINE void reikaids_info( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int layer, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 4 + layer + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 0x1000] + ((attr & 0x03) << 8) + (gfxbank << 10); @@ -470,56 +470,56 @@ INLINE void reikaids_info( running_machine *machine, tile_data *tileinfo, int ti */ static TILE_GET_INFO( reikaids_get_info0_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 0, 0, (state->gfx_bank[1] >> 3)); } static TILE_GET_INFO( reikaids_get_info1_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 1, 0, (state->gfx_bank[1] >> 3)); } static TILE_GET_INFO( reikaids_get_info0_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 0, 1, ((state->gfx_bank[0] & 0x78) >> 3)); } static TILE_GET_INFO( reikaids_get_info1_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 1, 1, ((state->gfx_bank[0] & 0x78) >> 3)); } static TILE_GET_INFO( reikaids_get_info0_2 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 0, 2, (state->gfx_bank[1] & 0x7)); } static TILE_GET_INFO( reikaids_get_info1_2 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 1, 2, (state->gfx_bank[1] & 0x7)); } static TILE_GET_INFO( reikaids_get_info0_3 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 0, 3, (state->gfx_bank[0] & 0x7)); } static TILE_GET_INFO( reikaids_get_info1_3 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); reikaids_info(machine, tileinfo, tile_index, 1, 3, (state->gfx_bank[0] & 0x7)); } INLINE void pteacher_info( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int layer, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 2 + 0x1000 * layer + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11); @@ -530,32 +530,32 @@ INLINE void pteacher_info( running_machine *machine, tile_data *tileinfo, int ti static TILE_GET_INFO( pteacher_get_info0_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); pteacher_info(machine, tileinfo, tile_index, 0, 0, state->gfx_bank[0] & 0x0f); } static TILE_GET_INFO( pteacher_get_info1_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); pteacher_info(machine, tileinfo, tile_index, 1, 0, state->gfx_bank[0] & 0x0f); } static TILE_GET_INFO( pteacher_get_info0_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); pteacher_info(machine, tileinfo, tile_index, 0, 1, state->gfx_bank[0] >> 4); } static TILE_GET_INFO( pteacher_get_info1_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); pteacher_info(machine, tileinfo, tile_index, 1, 1, state->gfx_bank[0] >> 4); } INLINE void lemnangl_info( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int layer, int gfxset, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 2 + 0x1000 * layer + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11); @@ -566,33 +566,33 @@ INLINE void lemnangl_info( running_machine *machine, tile_data *tileinfo, int ti static TILE_GET_INFO( lemnangl_get_info0_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); lemnangl_info( machine, tileinfo, tile_index, 0, 0, state->blitter_bank & 1, state->gfx_bank[0] & 0x0f ); } static TILE_GET_INFO( lemnangl_get_info1_0 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); lemnangl_info( machine, tileinfo, tile_index, 1, 0, state->blitter_bank & 1, state->gfx_bank[0] & 0x0f ); } static TILE_GET_INFO( lemnangl_get_info0_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); lemnangl_info( machine, tileinfo, tile_index, 0, 1, (state->blitter_bank & 2) >> 1, state->gfx_bank[0] >> 4 ); } static TILE_GET_INFO( lemnangl_get_info1_1 ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); lemnangl_info( machine, tileinfo, tile_index, 1, 1, (state->blitter_bank & 2) >> 1, state->gfx_bank[0] >> 4 ); } INLINE void mirderby_info0( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 2 + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 1] + ((attr & 0x03) << 8) + 0x400;// + (gfxbank << 10); @@ -602,7 +602,7 @@ INLINE void mirderby_info0( running_machine *machine, tile_data *tileinfo, int t } INLINE void mirderby_info1( running_machine *machine, tile_data *tileinfo, int tile_index, int page, int gfxbank ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); int addr = tile_index * 2 + 0x1000 + 0x2000 * page; int attr = state->videoram[addr]; int code = state->videoram[addr + 1] + ((attr & 0x07) << 8) + 0x400;//(gfxbank << 11); @@ -613,25 +613,25 @@ INLINE void mirderby_info1( running_machine *machine, tile_data *tileinfo, int t static TILE_GET_INFO( mirderby_get_info0_0 ) { -// homedata_state *state = (homedata_state *)machine->driver_data; +// homedata_state *state = machine->driver_data(); mirderby_info0( machine, tileinfo, tile_index, 0, 0);// state->blitter_bank & 0x03 ); } static TILE_GET_INFO( mirderby_get_info1_0 ) { -// homedata_state *state = (homedata_state *)machine->driver_data; +// homedata_state *state = machine->driver_data(); mirderby_info0( machine, tileinfo, tile_index, 1, 0);// state->blitter_bank & 0x03 ); } static TILE_GET_INFO( mirderby_get_info0_1 ) { -// homedata_state *state = (homedata_state *)machine->driver_data; +// homedata_state *state = machine->driver_data(); mirderby_info1( machine, tileinfo, tile_index, 0, 0);//(state->blitter_bank & 0x38) >> 3 ); } static TILE_GET_INFO( mirderby_get_info1_1 ) { -// homedata_state *state = (homedata_state *)machine->driver_data; +// homedata_state *state = machine->driver_data(); mirderby_info1( machine, tileinfo, tile_index, 1, 0);//(state->blitter_bank & 0x38) >> 3 ); } @@ -645,7 +645,7 @@ static TILE_GET_INFO( mirderby_get_info1_1 ) VIDEO_START( mrokumei ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->bg_tilemap[0][0] = tilemap_create( machine, mrokumei_get_info0_0, tilemap_scan_rows, 8, 8, 64, 32 ); state->bg_tilemap[0][1] = tilemap_create( machine, mrokumei_get_info0_1, tilemap_scan_rows, 8, 8, 64, 32 ); state->bg_tilemap[1][0] = tilemap_create( machine, mrokumei_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32 ); @@ -657,7 +657,7 @@ VIDEO_START( mrokumei ) VIDEO_START( reikaids ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->bg_tilemap[0][0] = tilemap_create(machine, reikaids_get_info0_0, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap[0][1] = tilemap_create(machine, reikaids_get_info0_1, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap[0][2] = tilemap_create(machine, reikaids_get_info0_2, tilemap_scan_rows, 8, 8, 32, 32); @@ -679,7 +679,7 @@ VIDEO_START( reikaids ) VIDEO_START( pteacher ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->bg_tilemap[0][0] = tilemap_create(machine, pteacher_get_info0_0, tilemap_scan_rows, 8, 8, 64, 32); state->bg_tilemap[0][1] = tilemap_create(machine, pteacher_get_info0_1, tilemap_scan_rows, 8, 8, 64, 32); state->bg_tilemap[1][0] = tilemap_create(machine, pteacher_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32); @@ -691,7 +691,7 @@ VIDEO_START( pteacher ) VIDEO_START( lemnangl ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->bg_tilemap[0][0] = tilemap_create(machine, lemnangl_get_info0_0, tilemap_scan_rows, 8, 8, 64, 32); state->bg_tilemap[0][1] = tilemap_create(machine, lemnangl_get_info0_1, tilemap_scan_rows, 8, 8, 64, 32); state->bg_tilemap[1][0] = tilemap_create(machine, lemnangl_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32); @@ -703,7 +703,7 @@ VIDEO_START( lemnangl ) VIDEO_START( mirderby ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->bg_tilemap[0][0] = tilemap_create( machine, mirderby_get_info0_0, tilemap_scan_rows, 8, 8, 64, 32 ); state->bg_tilemap[0][1] = tilemap_create( machine, mirderby_get_info0_1, tilemap_scan_rows, 8, 8, 64, 32 ); state->bg_tilemap[1][0] = tilemap_create( machine, mirderby_get_info1_0, tilemap_scan_rows, 8, 8, 64, 32 ); @@ -721,14 +721,14 @@ VIDEO_START( mirderby ) WRITE8_HANDLER( mrokumei_videoram_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap[(offset & 0x2000) >> 13][(offset & 0x1000) >> 12], (offset & 0xffe) >> 1); } WRITE8_HANDLER( reikaids_videoram_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap[(offset & 0x2000) >> 13][offset & 3], (offset & 0xffc) >> 2); } @@ -736,7 +736,7 @@ WRITE8_HANDLER( reikaids_videoram_w ) WRITE8_HANDLER( reikaids_gfx_bank_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); //logerror( "%04x: [setbank %02x]\n",cpu_get_pc(space->cpu),data); if (state->gfx_bank[state->reikaids_which] != data) @@ -750,7 +750,7 @@ WRITE8_HANDLER( reikaids_gfx_bank_w ) WRITE8_HANDLER( pteacher_gfx_bank_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); // logerror("%04x: gfxbank:=%02x\n", cpu_get_pc(space->cpu), data); if (state->gfx_bank[0] != data) { @@ -761,7 +761,7 @@ WRITE8_HANDLER( pteacher_gfx_bank_w ) WRITE8_HANDLER( homedata_blitter_param_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); //logerror("%04x: blitter_param_w %02x\n", cpu_get_pc(space->cpu), data); state->blitter_param[state->blitter_param_count] = data; state->blitter_param_count++; @@ -770,7 +770,7 @@ WRITE8_HANDLER( homedata_blitter_param_w ) WRITE8_HANDLER( mrokumei_blitter_bank_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* --xxx--- layer 1 gfx bank -----x-- blitter ROM bank ------xx layer 0 gfx bank @@ -784,7 +784,7 @@ WRITE8_HANDLER( mrokumei_blitter_bank_w ) WRITE8_HANDLER( reikaids_blitter_bank_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* xxx----- priority control ----x--- target page? what's this for? ------xx blitter ROM bank @@ -794,7 +794,7 @@ WRITE8_HANDLER( reikaids_blitter_bank_w ) WRITE8_HANDLER( pteacher_blitter_bank_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); /* xxx----- blitter ROM bank -----x-- pixel clock (normal/slow) ------x- layer #1 gfx charset (lemnangl only) @@ -809,7 +809,7 @@ WRITE8_HANDLER( pteacher_blitter_bank_w ) WRITE8_HANDLER( mrokumei_blitter_start_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); if (data & 0x80) mrokumei_handleblit(space, ((state->blitter_bank & 0x04) >> 2) * 0x10000); @@ -819,13 +819,13 @@ WRITE8_HANDLER( mrokumei_blitter_start_w ) WRITE8_HANDLER( reikaids_blitter_start_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); reikaids_handleblit(space, (state->blitter_bank & 3) * 0x10000); } WRITE8_HANDLER( pteacher_blitter_start_w ) { - homedata_state *state = (homedata_state *)space->machine->driver_data; + homedata_state *state = space->machine->driver_data(); pteacher_handleblit(space, (state->blitter_bank >> 5) * 0x10000 & (memory_region_length(space->machine, "user1") - 1)); } @@ -839,7 +839,7 @@ WRITE8_HANDLER( pteacher_blitter_start_w ) VIDEO_UPDATE( mrokumei ) { - homedata_state *state = (homedata_state *)screen->machine->driver_data; + homedata_state *state = screen->machine->driver_data(); int flags,width; /* blank screen */ @@ -884,7 +884,7 @@ VIDEO_UPDATE( mrokumei ) #ifdef UNUSED_FUNCTION VIDEO_UPDATE( reikaids ) { - homedata_state *state = (homedata_state *)screen->machine->driver_data; + homedata_state *state = screen->machine->driver_data(); int flags; static const int pritable[8][4] = { @@ -919,7 +919,7 @@ VIDEO_UPDATE( reikaids ) VIDEO_UPDATE( reikaids ) { - homedata_state *state = (homedata_state *)screen->machine->driver_data; + homedata_state *state = screen->machine->driver_data(); int flags; static const int pritable[2][8][4] = /* table of priorities derived from the PROM */ { @@ -966,7 +966,7 @@ VIDEO_UPDATE( reikaids ) VIDEO_UPDATE( pteacher ) { - homedata_state *state = (homedata_state *)screen->machine->driver_data; + homedata_state *state = screen->machine->driver_data(); int flags, scroll_low, scroll_high; @@ -1051,6 +1051,6 @@ VIDEO_UPDATE( mirderby ) VIDEO_EOF( homedata ) { - homedata_state *state = (homedata_state *)machine->driver_data; + homedata_state *state = machine->driver_data(); state->visible_page ^= 1; } diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index aaf0924d258..8a78239bef5 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -6,7 +6,7 @@ WRITE8_DEVICE_HANDLER(homerun_banking_w) { - homerun_state *state = (homerun_state *)device->machine->driver_data; + homerun_state *state = device->machine->driver_data(); if (device->machine->primary_screen->vpos() > half_screen) state->gc_down = data & 3; else @@ -20,7 +20,7 @@ WRITE8_DEVICE_HANDLER(homerun_banking_w) WRITE8_HANDLER( homerun_videoram_w ) { - homerun_state *state = (homerun_state *)space->machine->driver_data; + homerun_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap, offset & 0xfff); } @@ -46,7 +46,7 @@ WRITE8_HANDLER(homerun_color_w) static TILE_GET_INFO( get_homerun_tile_info ) { - homerun_state *state = (homerun_state *)machine->driver_data; + homerun_state *state = machine->driver_data(); int tileno = (state->videoram[tile_index]) + ((state->videoram[tile_index + 0x1000] & 0x38) << 5) + ((state->gfx_ctrl & 1) << 11); int palno = (state->videoram[tile_index + 0x1000] & 0x07); @@ -55,13 +55,13 @@ static TILE_GET_INFO( get_homerun_tile_info ) VIDEO_START( homerun ) { - homerun_state *state = (homerun_state *)machine->driver_data; + homerun_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_homerun_tile_info, tilemap_scan_rows, 8, 8, 64, 64); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - homerun_state *state = (homerun_state *)machine->driver_data; + homerun_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -84,7 +84,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE(homerun) { - homerun_state *state = (homerun_state *)screen->machine->driver_data; + homerun_state *state = screen->machine->driver_data(); rectangle myclip = *cliprect; /* upper part */ diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 09ce1d0e7d7..ce418b8f6a6 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -91,14 +91,14 @@ PALETTE_INIT( hyperspt ) WRITE8_HANDLER( hyperspt_videoram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( hyperspt_colorram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -114,7 +114,7 @@ WRITE8_HANDLER( hyperspt_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x80) << 1) + ((state->colorram[tile_index] & 0x40) << 3); int color = state->colorram[tile_index] & 0x0f; int flags = ((state->colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((state->colorram[tile_index] & 0x20) ? TILE_FLIPY : 0); @@ -124,7 +124,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( hyperspt ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); @@ -132,7 +132,7 @@ VIDEO_START( hyperspt ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -176,7 +176,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( hyperspt ) { - trackfld_state *state = (trackfld_state *)screen->machine->driver_data; + trackfld_state *state = screen->machine->driver_data(); int row; for (row = 0; row < 32; row++) @@ -194,7 +194,7 @@ VIDEO_UPDATE( hyperspt ) /* Road Fighter */ static TILE_GET_INFO( roadf_get_bg_tile_info ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x80) << 1) + ((state->colorram[tile_index] & 0x60) << 4); int color = state->colorram[tile_index] & 0x0f; int flags = (state->colorram[tile_index] & 0x10) ? TILE_FLIPX : 0; @@ -204,7 +204,7 @@ static TILE_GET_INFO( roadf_get_bg_tile_info ) VIDEO_START( roadf ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, roadf_get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index e54ae602d1e..a21c66d37fd 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -63,7 +63,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: WRITE16_HANDLER( hyprduel_paletteram_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->paletteram[offset]); palette_set_color_rgb(space->machine, offset, pal5bit(data >> 6), pal5bit(data >> 11), pal5bit(data >> 1)); } @@ -106,7 +106,7 @@ WRITE16_HANDLER( hyprduel_paletteram_w ) /* 8x8x4 tiles only */ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int layer, UINT16 *vram) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); UINT16 code; int table_index; UINT32 tile; @@ -145,7 +145,7 @@ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int ti bits are high ($f,$1f,$2f etc) the tile is 8bpp, otherwise it's 4bpp */ INLINE void get_tile_info_8bit( running_machine *machine, tile_data *tileinfo, int tile_index, int layer, UINT16 *vram ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); UINT16 code; int table_index; UINT32 tile; @@ -193,7 +193,7 @@ INLINE void get_tile_info_8bit( running_machine *machine, tile_data *tileinfo, i bits are high ($f,$1f,$2f etc) the tile is 8bpp, otherwise it's 4bpp */ INLINE void get_tile_info_16x16_8bit( running_machine *machine, tile_data *tileinfo, int tile_index, int layer, UINT16 *vram ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); UINT16 code; int table_index; UINT32 tile; @@ -240,7 +240,7 @@ INLINE void get_tile_info_16x16_8bit( running_machine *machine, tile_data *tilei INLINE void hyprduel_vram_w( running_machine *machine, offs_t offset, UINT16 data, UINT16 mem_mask, int layer, UINT16 *vram ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); COMBINE_DATA(&vram[offset]); { /* Account for the window */ @@ -259,37 +259,37 @@ INLINE void hyprduel_vram_w( running_machine *machine, offs_t offset, UINT16 dat static TILE_GET_INFO( get_tile_info_0_8bit ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); get_tile_info_8bit(machine, tileinfo, tile_index, 0, state->vram_0); } static TILE_GET_INFO( get_tile_info_1_8bit ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); get_tile_info_8bit(machine, tileinfo, tile_index, 1, state->vram_1); } static TILE_GET_INFO( get_tile_info_2_8bit ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); get_tile_info_8bit(machine, tileinfo, tile_index, 2, state->vram_2); } WRITE16_HANDLER( hyprduel_vram_0_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); hyprduel_vram_w(space->machine, offset, data, mem_mask, 0, state->vram_0); } WRITE16_HANDLER( hyprduel_vram_1_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); hyprduel_vram_w(space->machine, offset, data, mem_mask, 1, state->vram_1); } WRITE16_HANDLER( hyprduel_vram_2_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); hyprduel_vram_w(space->machine, offset, data, mem_mask, 2, state->vram_2); } @@ -297,7 +297,7 @@ WRITE16_HANDLER( hyprduel_vram_2_w ) /* Dirty the relevant tilemap when its window changes */ WRITE16_HANDLER( hyprduel_window_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); UINT16 olddata = state->window[offset]; UINT16 newdata = COMBINE_DATA(&state->window[offset]); if (newdata != olddata) @@ -321,7 +321,7 @@ WRITE16_HANDLER( hyprduel_window_w ) static void alloc_empty_tiles( running_machine *machine ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); int code,i; state->empty_tiles = auto_alloc_array(machine, UINT8, 16*16*16); @@ -335,7 +335,7 @@ static void alloc_empty_tiles( running_machine *machine ) static STATE_POSTLOAD( hyprduel_postload ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); int i; for (i = 0; i < 3; i++) @@ -353,7 +353,7 @@ static STATE_POSTLOAD( hyprduel_postload ) static VIDEO_START( common_14220 ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); alloc_empty_tiles(machine); state->tiletable_old = auto_alloc_array(machine, UINT16, state->tiletable_size / 2); state->dirtyindex = auto_alloc_array(machine, UINT8, state->tiletable_size / 4); @@ -386,7 +386,7 @@ static VIDEO_START( common_14220 ) VIDEO_START( hyprduel_14220 ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->sprite_yoffs_sub = 2; @@ -395,7 +395,7 @@ VIDEO_START( hyprduel_14220 ) VIDEO_START( magerror_14220 ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); state->sprite_yoffs_sub = 0; @@ -461,7 +461,7 @@ VIDEO_START( magerror_14220 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); UINT8 *base_gfx = memory_region(machine, "gfx1"); UINT8 *gfx_max = base_gfx + memory_region_length(machine, "gfx1"); @@ -604,7 +604,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect WRITE16_HANDLER( hyprduel_scrollreg_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); UINT16 window = state->window[offset]; COMBINE_DATA(&state->scroll[offset]); @@ -617,7 +617,7 @@ WRITE16_HANDLER( hyprduel_scrollreg_w ) WRITE16_HANDLER( hyprduel_scrollreg_init_w ) { - hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; + hyprduel_state *state = space->machine->driver_data(); int i; for (i = 0; i < 3; i++) @@ -636,7 +636,7 @@ WRITE16_HANDLER( hyprduel_scrollreg_init_w ) static void draw_layers( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri, int layers_ctrl ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); UINT16 layers_pri = state->videoregs[0x10/2]; int layer; @@ -654,7 +654,7 @@ static void draw_layers( running_machine *machine, bitmap_t *bitmap, const recta /* Dirty tilemaps when the tiles set changes */ static void dirty_tiles( running_machine *machine, int layer, UINT16 *vram ) { - hyprduel_state *state = (hyprduel_state *)machine->driver_data; + hyprduel_state *state = machine->driver_data(); int col, row; for (row = 0; row < WIN_NY; row++) @@ -673,7 +673,7 @@ static void dirty_tiles( running_machine *machine, int layer, UINT16 *vram ) VIDEO_UPDATE( hyprduel ) { - hyprduel_state *state = (hyprduel_state *)screen->machine->driver_data; + hyprduel_state *state = screen->machine->driver_data(); int i, pri, layers_ctrl = -1; UINT16 screenctrl = *state->screenctrl; diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c index 2f179bf8c64..fa34f89d43a 100644 --- a/src/mame/video/ikki.c +++ b/src/mame/video/ikki.c @@ -13,7 +13,7 @@ Video hardware driver by Uki PALETTE_INIT( ikki ) { - ikki_state *state = (ikki_state *)machine->driver_data; + ikki_state *state = machine->driver_data(); int i; /* allocate the colortable - extra pen for the punch through pen */ @@ -57,14 +57,14 @@ PALETTE_INIT( ikki ) WRITE8_HANDLER( ikki_scrn_ctrl_w ) { - ikki_state *state = (ikki_state *)space->machine->driver_data; + ikki_state *state = space->machine->driver_data(); state->flipscreen = (data >> 2) & 1; } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ikki_state *state = (ikki_state *)machine->driver_data; + ikki_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int y; offs_t offs; @@ -118,7 +118,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_START( ikki ) { - ikki_state *state = (ikki_state *)machine->driver_data; + ikki_state *state = machine->driver_data(); state->sprite_bitmap = machine->primary_screen->alloc_compatible_bitmap(); state_save_register_global_bitmap(machine, state->sprite_bitmap); } @@ -126,7 +126,7 @@ VIDEO_START( ikki ) VIDEO_UPDATE( ikki ) { - ikki_state *state = (ikki_state *)screen->machine->driver_data; + ikki_state *state = screen->machine->driver_data(); offs_t offs; UINT8 *VIDEOATTR = memory_region(screen->machine, "user1"); diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index f187bf3f35e..75b7af97161 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -23,7 +23,7 @@ WRITE16_HANDLER( inufuku_palettereg_w ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); switch (offset) { case 0x02: state->bg_palettebank = (data & 0xf000) >> 12; @@ -37,7 +37,7 @@ WRITE16_HANDLER( inufuku_palettereg_w ) WRITE16_HANDLER( inufuku_scrollreg_w ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); switch (offset) { case 0x00: state->bg_scrollx = data + 1; break; @@ -57,7 +57,7 @@ WRITE16_HANDLER( inufuku_scrollreg_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - inufuku_state *state = (inufuku_state *)machine->driver_data; + inufuku_state *state = machine->driver_data(); int offs; for (offs = (state->spriteram1_size / 16) - 1; offs >= 0; offs--) @@ -165,7 +165,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static TILE_GET_INFO( get_inufuku_bg_tile_info ) { - inufuku_state *state = (inufuku_state *)machine->driver_data; + inufuku_state *state = machine->driver_data(); SET_TILE_INFO( 0, state->bg_videoram[tile_index], @@ -175,7 +175,7 @@ static TILE_GET_INFO( get_inufuku_bg_tile_info ) static TILE_GET_INFO( get_inufuku_tx_tile_info ) { - inufuku_state *state = (inufuku_state *)machine->driver_data; + inufuku_state *state = machine->driver_data(); SET_TILE_INFO( 1, state->tx_videoram[tile_index], @@ -185,26 +185,26 @@ static TILE_GET_INFO( get_inufuku_tx_tile_info ) READ16_HANDLER( inufuku_bg_videoram_r ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); return state->bg_videoram[offset]; } WRITE16_HANDLER( inufuku_bg_videoram_w ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } READ16_HANDLER( inufuku_tx_videoram_r ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); return state->tx_videoram[offset]; } WRITE16_HANDLER( inufuku_tx_videoram_w ) { - inufuku_state *state = (inufuku_state *)space->machine->driver_data; + inufuku_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tx_videoram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); } @@ -218,7 +218,7 @@ WRITE16_HANDLER( inufuku_tx_videoram_w ) VIDEO_START( inufuku ) { - inufuku_state *state = (inufuku_state *)machine->driver_data; + inufuku_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_inufuku_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->tx_tilemap = tilemap_create(machine, get_inufuku_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -236,7 +236,7 @@ VIDEO_START( inufuku ) VIDEO_UPDATE( inufuku ) { - inufuku_state *state = (inufuku_state *)screen->machine->driver_data; + inufuku_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index 7eaf0f44cd9..fb01e9d7202 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -80,21 +80,21 @@ PALETTE_INIT( ironhors ) WRITE8_HANDLER( ironhors_videoram_w ) { - ironhors_state *state = (ironhors_state *)space->machine->driver_data; + ironhors_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( ironhors_colorram_w ) { - ironhors_state *state = (ironhors_state *)space->machine->driver_data; + ironhors_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( ironhors_charbank_w ) { - ironhors_state *state = (ironhors_state *)space->machine->driver_data; + ironhors_state *state = space->machine->driver_data(); if (state->charbank != (data & 0x03)) { state->charbank = data & 0x03; @@ -108,7 +108,7 @@ WRITE8_HANDLER( ironhors_charbank_w ) WRITE8_HANDLER( ironhors_palettebank_w ) { - ironhors_state *state = (ironhors_state *)space->machine->driver_data; + ironhors_state *state = space->machine->driver_data(); if (state->palettebank != (data & 0x07)) { state->palettebank = data & 0x07; @@ -137,7 +137,7 @@ WRITE8_HANDLER( ironhors_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x40) << 2) + ((state->colorram[tile_index] & 0x20) << 4) + (state->charbank << 10); int color = (state->colorram[tile_index] & 0x0f) + 16 * state->palettebank; @@ -149,7 +149,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( ironhors ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); @@ -157,7 +157,7 @@ VIDEO_START( ironhors ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); int offs; UINT8 *sr; @@ -241,7 +241,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( ironhors ) { - ironhors_state *state = (ironhors_state *)screen->machine->driver_data; + ironhors_state *state = screen->machine->driver_data(); int row; for (row = 0; row < 32; row++) @@ -254,7 +254,7 @@ VIDEO_UPDATE( ironhors ) static TILE_GET_INFO( farwest_get_bg_tile_info ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x40) << 2) + ((state->colorram[tile_index] & 0x20) << 4) + (state->charbank << 10); int color = (state->colorram[tile_index] & 0x0f) + 16 * state->palettebank; @@ -265,7 +265,7 @@ static TILE_GET_INFO( farwest_get_bg_tile_info ) VIDEO_START( farwest ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, farwest_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); @@ -273,7 +273,7 @@ VIDEO_START( farwest ) static void farwest_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ironhors_state *state = (ironhors_state *)machine->driver_data; + ironhors_state *state = machine->driver_data(); int offs; UINT8 *sr = state->spriteram2; UINT8 *sr2 = state->spriteram; @@ -354,7 +354,7 @@ static void farwest_draw_sprites( running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( farwest) { - ironhors_state *state = (ironhors_state *)screen->machine->driver_data; + ironhors_state *state = screen->machine->driver_data(); int row; for (row = 0; row < 32; row++) diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c index 334f20a1d37..d5bb370aaa3 100644 --- a/src/mame/video/jack.c +++ b/src/mame/video/jack.c @@ -12,14 +12,14 @@ WRITE8_HANDLER( jack_videoram_w ) { - jack_state *state = (jack_state *)space->machine->driver_data; + jack_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( jack_colorram_w ) { - jack_state *state = (jack_state *)space->machine->driver_data; + jack_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -43,7 +43,7 @@ WRITE8_HANDLER( jack_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x18) << 5); int color = state->colorram[tile_index] & 0x07; @@ -60,13 +60,13 @@ static UINT32 tilemap_scan_cols_flipy( UINT32 col, UINT32 row, UINT32 num_cols, VIDEO_START( jack ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flipy, 8, 8, 32, 32); } static void jack_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -99,7 +99,7 @@ static void jack_draw_sprites( running_machine *machine, bitmap_t *bitmap, const VIDEO_UPDATE( jack ) { - jack_state *state = (jack_state *)screen->machine->driver_data; + jack_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); jack_draw_sprites(screen->machine, bitmap, cliprect); return 0; @@ -136,7 +136,7 @@ PALETTE_INIT( joinem ) static TILE_GET_INFO( joinem_get_bg_tile_info ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x03) << 8); int color = (state->colorram[tile_index] & 0x38) >> 3; @@ -145,13 +145,13 @@ static TILE_GET_INFO( joinem_get_bg_tile_info ) VIDEO_START( joinem ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, joinem_get_bg_tile_info, tilemap_scan_cols_flipy, 8, 8, 32, 32); } static void joinem_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - jack_state *state = (jack_state *)machine->driver_data; + jack_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -184,7 +184,7 @@ static void joinem_draw_sprites( running_machine *machine, bitmap_t *bitmap, con VIDEO_UPDATE( joinem ) { - jack_state *state = (jack_state *)screen->machine->driver_data; + jack_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); joinem_draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index e513240c5f7..44fe8cb40b8 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -41,7 +41,7 @@ PALETTE_INIT( jackal ) static void set_pens( running_machine *machine ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); int i; for (i = 0; i < 0x400; i += 2) @@ -57,7 +57,7 @@ static void set_pens( running_machine *machine ) void jackal_mark_tile_dirty( running_machine *machine, int offset ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -75,13 +75,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( jackal ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "master"); int i; @@ -203,7 +203,7 @@ static void draw_sprites_region( running_machine *machine, bitmap_t *bitmap, con static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - jackal_state *state = (jackal_state *)machine->driver_data; + jackal_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "master"); UINT8 *sr, *ss; diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c index 4ed8cfc22f5..f2a23d7537f 100644 --- a/src/mame/video/jailbrek.c +++ b/src/mame/video/jailbrek.c @@ -36,21 +36,21 @@ PALETTE_INIT( jailbrek ) WRITE8_HANDLER( jailbrek_videoram_w ) { - jailbrek_state *state = (jailbrek_state *)space->machine->driver_data; + jailbrek_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( jailbrek_colorram_w ) { - jailbrek_state *state = (jailbrek_state *)space->machine->driver_data; + jailbrek_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } static TILE_GET_INFO( get_bg_tile_info ) { - jailbrek_state *state = (jailbrek_state *)machine->driver_data; + jailbrek_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0xc0) << 2); int color = attr & 0x0f; @@ -60,14 +60,14 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( jailbrek ) { - jailbrek_state *state = (jailbrek_state *)machine->driver_data; + jailbrek_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scrolldx(state->bg_tilemap, 0, 396 - 256); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - jailbrek_state *state = (jailbrek_state *)machine->driver_data; + jailbrek_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int i; @@ -97,7 +97,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( jailbrek ) { - jailbrek_state *state = (jailbrek_state *)screen->machine->driver_data; + jailbrek_state *state = screen->machine->driver_data(); int i; // added support for vertical scrolling (credits). 23/1/2002 -BR diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c index 9f8fa022dd9..85f744f04ed 100644 --- a/src/mame/video/jedi.c +++ b/src/mame/video/jedi.c @@ -30,7 +30,7 @@ static VIDEO_START( jedi ) { - jedi_state *state = (jedi_state *)machine->driver_data; + jedi_state *state = machine->driver_data(); /* register for saving */ state_save_register_global(machine, state->vscroll); @@ -110,7 +110,7 @@ static void do_pen_lookup(jedi_state *state, bitmap_t *bitmap, const rectangle * WRITE8_HANDLER( jedi_vscroll_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); state->vscroll = data | (offset << 8); } @@ -118,7 +118,7 @@ WRITE8_HANDLER( jedi_vscroll_w ) WRITE8_HANDLER( jedi_hscroll_w ) { - jedi_state *state = (jedi_state *)space->machine->driver_data; + jedi_state *state = space->machine->driver_data(); state->hscroll = data | (offset << 8); } @@ -329,7 +329,7 @@ static void draw_sprites(running_machine *machine, jedi_state *state, bitmap_t * static VIDEO_UPDATE( jedi ) { - jedi_state *state = (jedi_state *)screen->machine->driver_data; + jedi_state *state = screen->machine->driver_data(); /* if no video, clear it all to black */ if (*state->video_off & 0x01) diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c index 38064d5d6d1..77a7815cf0e 100644 --- a/src/mame/video/kangaroo.c +++ b/src/mame/video/kangaroo.c @@ -18,7 +18,7 @@ static void blitter_execute(running_machine *machine); VIDEO_START( kangaroo ) { - kangaroo_state *state = (kangaroo_state *)machine->driver_data; + kangaroo_state *state = machine->driver_data(); /* video RAM is accessed 32 bits at a time (two planes, 4bpp each, 4 pixels) */ state->videoram = auto_alloc_array(machine, UINT32, 256 * 64); @@ -35,7 +35,7 @@ VIDEO_START( kangaroo ) static void videoram_write( running_machine *machine, UINT16 offset, UINT8 data, UINT8 mask ) { - kangaroo_state *state = (kangaroo_state *)machine->driver_data; + kangaroo_state *state = machine->driver_data(); UINT32 expdata, layermask; /* data contains 4 2-bit values packed as DCBADCBA; expand these into 4 8-bit values */ @@ -63,7 +63,7 @@ static void videoram_write( running_machine *machine, UINT16 offset, UINT8 data, WRITE8_HANDLER( kangaroo_videoram_w ) { - kangaroo_state *state = (kangaroo_state *)space->machine->driver_data; + kangaroo_state *state = space->machine->driver_data(); videoram_write(space->machine, offset, data, state->video_control[8]); } @@ -77,7 +77,7 @@ WRITE8_HANDLER( kangaroo_videoram_w ) WRITE8_HANDLER( kangaroo_video_control_w ) { - kangaroo_state *state = (kangaroo_state *)space->machine->driver_data; + kangaroo_state *state = space->machine->driver_data(); state->video_control[offset] = data; switch (offset) @@ -102,7 +102,7 @@ WRITE8_HANDLER( kangaroo_video_control_w ) static void blitter_execute( running_machine *machine ) { - kangaroo_state *state = (kangaroo_state *)machine->driver_data; + kangaroo_state *state = machine->driver_data(); UINT32 gfxhalfsize = memory_region_length(machine, "gfx1") / 2; const UINT8 *gfxbase = memory_region(machine, "gfx1"); UINT16 src = state->video_control[0] + 256 * state->video_control[1]; @@ -138,7 +138,7 @@ static void blitter_execute( running_machine *machine ) VIDEO_UPDATE( kangaroo ) { - kangaroo_state *state = (kangaroo_state *)screen->machine->driver_data; + kangaroo_state *state = screen->machine->driver_data(); UINT8 scrolly = state->video_control[6]; UINT8 scrollx = state->video_control[7]; UINT8 maska = (state->video_control[10] & 0x28) >> 3; diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 46bcb4f4310..a8a382e25c5 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -66,14 +66,14 @@ PALETTE_INIT( karnov ) void karnov_flipscreen_w( running_machine *machine, int data ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); state->flipscreen = data; tilemap_set_flip_all(machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); int my, mx, offs, color, tile, fx, fy; int scrollx = state->scroll[0]; int scrolly = state->scroll[1]; @@ -122,7 +122,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); UINT16 *buffered_spriteram16 = machine->generic.buffered_spriteram.u16; int offs; @@ -187,7 +187,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( karnov ) { - karnov_state *state = (karnov_state *)screen->machine->driver_data; + karnov_state *state = screen->machine->driver_data(); draw_background(screen->machine, bitmap, cliprect); draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, state->fix_tilemap, 0, 0); @@ -198,7 +198,7 @@ VIDEO_UPDATE( karnov ) static TILE_GET_INFO( get_fix_tile_info ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); int tile = state->videoram[tile_index]; SET_TILE_INFO( 0, @@ -209,14 +209,14 @@ static TILE_GET_INFO( get_fix_tile_info ) WRITE16_HANDLER( karnov_videoram_w ) { - karnov_state *state = (karnov_state *)space->machine->driver_data; + karnov_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->fix_tilemap, offset); } WRITE16_HANDLER( karnov_playfield_swap_w ) { - karnov_state *state = (karnov_state *)space->machine->driver_data; + karnov_state *state = space->machine->driver_data(); offset = ((offset & 0x1f) << 5) | ((offset & 0x3e0) >> 5); COMBINE_DATA(&state->pf_data[offset]); } @@ -225,7 +225,7 @@ WRITE16_HANDLER( karnov_playfield_swap_w ) VIDEO_START( karnov ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); /* Allocate bitmap & tilemap */ state->bitmap_f = auto_bitmap_alloc(machine, 512, 512, machine->primary_screen->format()); @@ -238,7 +238,7 @@ VIDEO_START( karnov ) VIDEO_START( wndrplnt ) { - karnov_state *state = (karnov_state *)machine->driver_data; + karnov_state *state = machine->driver_data(); /* Allocate bitmap & tilemap */ state->bitmap_f = auto_bitmap_alloc(machine, 512, 512, machine->primary_screen->format()); diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index c33342af933..3af5e0b6528 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -26,14 +26,14 @@ PALETTE_INIT( kchamp ) WRITE8_HANDLER( kchamp_videoram_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( kchamp_colorram_w ) { - kchamp_state *state = (kchamp_state *)space->machine->driver_data; + kchamp_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -45,7 +45,7 @@ WRITE8_HANDLER( kchamp_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 7) << 8); int color = (state->colorram[tile_index] >> 3) & 0x1f; @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( kchamp ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -70,7 +70,7 @@ VIDEO_START( kchamp ) static void kchamp_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -99,7 +99,7 @@ static void kchamp_draw_sprites( running_machine *machine, bitmap_t *bitmap, con static void kchampvs_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - kchamp_state *state = (kchamp_state *)machine->driver_data; + kchamp_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -129,7 +129,7 @@ static void kchampvs_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( kchamp ) { - kchamp_state *state = (kchamp_state *)screen->machine->driver_data; + kchamp_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); kchamp_draw_sprites(screen->machine, bitmap, cliprect); @@ -138,7 +138,7 @@ VIDEO_UPDATE( kchamp ) VIDEO_UPDATE( kchampvs ) { - kchamp_state *state = (kchamp_state *)screen->machine->driver_data; + kchamp_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); kchampvs_draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index e8ba42259b1..4241a485861 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -6,21 +6,21 @@ WRITE16_HANDLER( kickgoal_fgram_w ) { - kickgoal_state *state = (kickgoal_state *)space->machine->driver_data; + kickgoal_state *state = space->machine->driver_data(); state->fgram[offset] = data; tilemap_mark_tile_dirty(state->fgtm, offset / 2); } WRITE16_HANDLER( kickgoal_bgram_w ) { - kickgoal_state *state = (kickgoal_state *)space->machine->driver_data; + kickgoal_state *state = space->machine->driver_data(); state->bgram[offset] = data; tilemap_mark_tile_dirty(state->bgtm, offset / 2); } WRITE16_HANDLER( kickgoal_bg2ram_w ) { - kickgoal_state *state = (kickgoal_state *)space->machine->driver_data; + kickgoal_state *state = space->machine->driver_data(); state->bg2ram[offset] = data; tilemap_mark_tile_dirty(state->bg2tm, offset / 2); } @@ -30,7 +30,7 @@ WRITE16_HANDLER( kickgoal_bg2ram_w ) /* FG */ static TILE_GET_INFO( get_kickgoal_fg_tile_info ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); int tileno = state->fgram[tile_index * 2] & 0x0fff; int color = state->fgram[tile_index * 2 + 1] & 0x000f; @@ -40,7 +40,7 @@ static TILE_GET_INFO( get_kickgoal_fg_tile_info ) /* BG */ static TILE_GET_INFO( get_kickgoal_bg_tile_info ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); int tileno = state->bgram[tile_index * 2] & 0x0fff; int color = state->bgram[tile_index * 2 + 1] & 0x000f; @@ -50,7 +50,7 @@ static TILE_GET_INFO( get_kickgoal_bg_tile_info ) /* BG 2 */ static TILE_GET_INFO( get_kickgoal_bg2_tile_info ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); int tileno = state->bg2ram[tile_index * 2] & 0x07ff; int color = state->bg2ram[tile_index * 2 + 1] & 0x000f; int flipx = state->bg2ram[tile_index * 2 + 1] & 0x0020; @@ -80,7 +80,7 @@ static TILEMAP_MAPPER( tilemap_scan_kicksfg ) VIDEO_START( kickgoal ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); state->fgtm = tilemap_create(machine, get_kickgoal_fg_tile_info, tilemap_scan_kicksfg, 8, 16, 64, 64); state->bgtm = tilemap_create(machine, get_kickgoal_bg_tile_info, tilemap_scan_kicksbg, 16, 32, 64, 64); @@ -94,7 +94,7 @@ VIDEO_START( kickgoal ) static void kickgoal_draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; const gfx_element *gfx = machine->gfx[1]; int offs; @@ -124,7 +124,7 @@ static void kickgoal_draw_sprites( running_machine *machine, bitmap_t *bitmap,co VIDEO_UPDATE( kickgoal ) { - kickgoal_state *state = (kickgoal_state *)screen->machine->driver_data; + kickgoal_state *state = screen->machine->driver_data(); /* set scroll */ tilemap_set_scrollx(state->fgtm, 0, state->scrram[0]); @@ -161,7 +161,7 @@ VIDEO_UPDATE( kickgoal ) /* FG */ static TILE_GET_INFO( get_actionhw_fg_tile_info ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); int tileno = state->fgram[tile_index * 2] & 0x0fff; int color = state->fgram[tile_index * 2 + 1] & 0x000f; @@ -171,7 +171,7 @@ static TILE_GET_INFO( get_actionhw_fg_tile_info ) /* BG */ static TILE_GET_INFO( get_actionhw_bg_tile_info ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); int tileno = state->bgram[tile_index * 2] & 0x1fff; int color = state->bgram[tile_index * 2 + 1] & 0x000f; int flipx = state->bgram[tile_index * 2 + 1] & 0x0020; @@ -183,7 +183,7 @@ static TILE_GET_INFO( get_actionhw_bg_tile_info ) /* BG 2 */ static TILE_GET_INFO( get_actionhw_bg2_tile_info ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); int tileno = state->bg2ram[tile_index * 2] & 0x1fff; int color = state->bg2ram[tile_index * 2 + 1] & 0x000f; int flipx = state->bg2ram[tile_index * 2 + 1] & 0x0020; @@ -214,7 +214,7 @@ static TILEMAP_MAPPER( tilemap_scan_actionhwfg ) VIDEO_START( actionhw ) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); state->fgtm = tilemap_create(machine, get_actionhw_fg_tile_info, tilemap_scan_actionhwfg, 8, 8, 64, 64); state->bgtm = tilemap_create(machine, get_actionhw_bg_tile_info, tilemap_scan_actionhwbg, 16, 16, 64, 64); @@ -227,7 +227,7 @@ VIDEO_START( actionhw ) static void actionhw_draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - kickgoal_state *state = (kickgoal_state *)machine->driver_data; + kickgoal_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; const gfx_element *gfx = machine->gfx[1]; int offs; @@ -255,7 +255,7 @@ static void actionhw_draw_sprites(running_machine *machine, bitmap_t *bitmap,con VIDEO_UPDATE( actionhw ) { - kickgoal_state *state = (kickgoal_state *)screen->machine->driver_data; + kickgoal_state *state = screen->machine->driver_data(); /* set scroll */ tilemap_set_scrollx(state->fgtm, 0, state->scrram[0]); tilemap_set_scrolly(state->fgtm, 0, state->scrram[1]); diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index da505666bc0..109ee051880 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -133,35 +133,35 @@ PALETTE_INIT( ringking ) WRITE8_HANDLER( kingofb_videoram_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( kingofb_colorram_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( kingofb_videoram2_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( kingofb_colorram2_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( kingofb_f800_w ) { - kingofb_state *state = (kingofb_state *)space->machine->driver_data; + kingofb_state *state = space->machine->driver_data(); state->nmi_enable = data & 0x20; if (state->palette_bank != ((data & 0x18) >> 3)) @@ -179,7 +179,7 @@ WRITE8_HANDLER( kingofb_f800_w ) static TILE_GET_INFO( get_bg_tile_info ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int bank = ((attr & 0x04) >> 2) + 2; int code = (tile_index / 16) ? state->videoram[tile_index] + ((attr & 0x03) << 8) : 0; @@ -190,7 +190,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); int attr = state->colorram2[tile_index]; int bank = (attr & 0x02) >> 1; int code = state->videoram2[tile_index] + ((attr & 0x01) << 8); @@ -201,7 +201,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( kingofb ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); @@ -210,7 +210,7 @@ VIDEO_START( kingofb ) static void kingofb_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -248,7 +248,7 @@ static void kingofb_draw_sprites(running_machine *machine, bitmap_t *bitmap, con VIDEO_UPDATE( kingofb ) { - kingofb_state *state = (kingofb_state *)screen->machine->driver_data; + kingofb_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, -(*state->scroll_y)); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -261,7 +261,7 @@ VIDEO_UPDATE( kingofb ) static TILE_GET_INFO( ringking_get_bg_tile_info ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); int code = (tile_index / 16) ? state->videoram[tile_index] : 0; int color = ((state->colorram[tile_index] & 0x70) >> 4) + 8 * state->palette_bank; @@ -270,7 +270,7 @@ static TILE_GET_INFO( ringking_get_bg_tile_info ) VIDEO_START( ringking ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, ringking_get_bg_tile_info, tilemap_scan_cols_flip_y, 16, 16, 16, 16); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols_flip_y, 8, 8, 32, 32); @@ -279,7 +279,7 @@ VIDEO_START( ringking ) static void ringking_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - kingofb_state *state = (kingofb_state *)machine->driver_data; + kingofb_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -310,7 +310,7 @@ static void ringking_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( ringking ) { - kingofb_state *state = (kingofb_state *)screen->machine->driver_data; + kingofb_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, -(*state->scroll_y)); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c index e12177eda7a..cffa745a721 100644 --- a/src/mame/video/klax.c +++ b/src/mame/video/klax.c @@ -17,9 +17,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - klax_state *state = (klax_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + klax_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x1fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -71,10 +71,10 @@ VIDEO_START( klax ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - klax_state *state = (klax_state *)machine->driver_data; + klax_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,32); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -102,13 +102,13 @@ WRITE16_HANDLER( klax_latch_w ) VIDEO_UPDATE( klax ) { - klax_state *state = (klax_state *)screen->machine->driver_data; + klax_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 6954ddd55f3..5b2e233ab21 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -82,7 +82,7 @@ PALETTE_INIT( kncljoe ) static TILE_GET_INFO( get_bg_tile_info ) { - kncljoe_state *state = (kncljoe_state *)machine->driver_data; + kncljoe_state *state = machine->driver_data(); int attr = state->videoram[2 * tile_index + 1]; int code = state->videoram[2 * tile_index] + ((attr & 0xc0) << 2) + (state->tile_bank << 10); @@ -103,7 +103,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( kncljoe ) { - kncljoe_state *state = (kncljoe_state *)machine->driver_data; + kncljoe_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(state->bg_tilemap, 4); @@ -119,14 +119,14 @@ VIDEO_START( kncljoe ) WRITE8_HANDLER( kncljoe_videoram_w ) { - kncljoe_state *state = (kncljoe_state *)space->machine->driver_data; + kncljoe_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( kncljoe_control_w ) { - kncljoe_state *state = (kncljoe_state *)space->machine->driver_data; + kncljoe_state *state = space->machine->driver_data(); int i; /* 0x01 screen flip @@ -161,7 +161,7 @@ WRITE8_HANDLER( kncljoe_control_w ) WRITE8_HANDLER( kncljoe_scroll_w ) { - kncljoe_state *state = (kncljoe_state *)space->machine->driver_data; + kncljoe_state *state = space->machine->driver_data(); int scrollx; state->scrollregs[offset] = data; @@ -182,7 +182,7 @@ WRITE8_HANDLER( kncljoe_scroll_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - kncljoe_state *state = (kncljoe_state *)machine->driver_data; + kncljoe_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; rectangle clip = *cliprect; const gfx_element *gfx = machine->gfx[1 + state->sprite_bank]; @@ -240,7 +240,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( kncljoe ) { - kncljoe_state *state = (kncljoe_state *)screen->machine->driver_data; + kncljoe_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index a2b84ee7eb2..2fd8b0dacef 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -34,33 +34,33 @@ PALETTE_INIT( kopunch ) WRITE8_HANDLER( kopunch_videoram_w ) { - kopunch_state *state = (kopunch_state *)space->machine->driver_data; + kopunch_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( kopunch_videoram2_w ) { - kopunch_state *state = (kopunch_state *)space->machine->driver_data; + kopunch_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( kopunch_scroll_x_w ) { - kopunch_state *state = (kopunch_state *)space->machine->driver_data; + kopunch_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, data); } WRITE8_HANDLER( kopunch_scroll_y_w ) { - kopunch_state *state = (kopunch_state *)space->machine->driver_data; + kopunch_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, data); } WRITE8_HANDLER( kopunch_gfxbank_w ) { - kopunch_state *state = (kopunch_state *)space->machine->driver_data; + kopunch_state *state = space->machine->driver_data(); if (state->gfxbank != (data & 0x07)) { state->gfxbank = data & 0x07; @@ -72,7 +72,7 @@ WRITE8_HANDLER( kopunch_gfxbank_w ) static TILE_GET_INFO( get_fg_tile_info ) { - kopunch_state *state = (kopunch_state *)machine->driver_data; + kopunch_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO(0, code, 0, 0); @@ -80,7 +80,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - kopunch_state *state = (kopunch_state *)machine->driver_data; + kopunch_state *state = machine->driver_data(); int code = (state->videoram2[tile_index] & 0x7f) + 128 * state->gfxbank; SET_TILE_INFO(1, code, 0, 0); @@ -88,7 +88,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( kopunch ) { - kopunch_state *state = (kopunch_state *)machine->driver_data; + kopunch_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 16, 16, 16, 16); @@ -99,7 +99,7 @@ VIDEO_START( kopunch ) VIDEO_UPDATE( kopunch ) { - kopunch_state *state = (kopunch_state *)screen->machine->driver_data; + kopunch_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 21af7c67459..c3eaa935d56 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -4,7 +4,7 @@ WRITE8_HANDLER(ksayakyu_videoram_w) { - ksayakyu_state *state = (ksayakyu_state *)space->machine->driver_data; + ksayakyu_state *state = space->machine->driver_data(); state->videoram[offset]=data; tilemap_mark_tile_dirty(state->textmap, offset >> 1); } @@ -20,7 +20,7 @@ WRITE8_HANDLER(ksayakyu_videoctrl_w) xxx - scroll offset */ - ksayakyu_state *state = (ksayakyu_state *)space->machine->driver_data; + ksayakyu_state *state = space->machine->driver_data(); state->video_ctrl = data; state->flipscreen = data & 4; @@ -62,7 +62,7 @@ xy-- ---- flip bits */ static TILE_GET_INFO( get_text_tile_info ) { - ksayakyu_state *state = (ksayakyu_state *)machine->driver_data; + ksayakyu_state *state = machine->driver_data(); int code = state->videoram[tile_index * 2 + 1]; int attr = state->videoram[tile_index * 2]; int flags = ((attr & 0x80) ? TILE_FLIPX : 0) | ((attr & 0x40) ? TILE_FLIPY : 0); @@ -83,7 +83,7 @@ static TILE_GET_INFO( get_text_tile_info ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ksayakyu_state *state = (ksayakyu_state *)machine->driver_data; + ksayakyu_state *state = machine->driver_data(); const UINT8 *source = state->spriteram + state->spriteram_size - 4; const UINT8 *finish = state->spriteram; @@ -118,7 +118,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_START(ksayakyu) { - ksayakyu_state *state = (ksayakyu_state *)machine->driver_data; + ksayakyu_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_ksayakyu_tile_info, tilemap_scan_rows, 8, 8, 32, 32 * 8); state->textmap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->textmap, 0); @@ -126,7 +126,7 @@ VIDEO_START(ksayakyu) VIDEO_UPDATE(ksayakyu) { - ksayakyu_state *state = (ksayakyu_state *)screen->machine->driver_data; + ksayakyu_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0); diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index c08950ac149..29b4b239b14 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -16,7 +16,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); int code = state->fgvideoram[tile_index]; SET_TILE_INFO(0, code, @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); int code = state->bgvideoram[tile_index]; int attr = state->bgattribram[tile_index]; SET_TILE_INFO(1, @@ -45,7 +45,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( kyugo ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); state->color_codes = memory_region(machine, "proms") + 0x300; @@ -67,7 +67,7 @@ VIDEO_START( kyugo ) WRITE8_HANDLER( kyugo_fgvideoram_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -76,7 +76,7 @@ WRITE8_HANDLER( kyugo_fgvideoram_w ) WRITE8_HANDLER( kyugo_bgvideoram_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -85,7 +85,7 @@ WRITE8_HANDLER( kyugo_bgvideoram_w ) WRITE8_HANDLER( kyugo_bgattribram_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); state->bgattribram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -94,7 +94,7 @@ WRITE8_HANDLER( kyugo_bgattribram_w ) READ8_HANDLER( kyugo_spriteram_2_r ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); // only the lower nibble is connected return state->spriteram_2[offset] | 0xf0; @@ -103,14 +103,14 @@ READ8_HANDLER( kyugo_spriteram_2_r ) WRITE8_HANDLER( kyugo_scroll_x_lo_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); state->scroll_x_lo = data; } WRITE8_HANDLER( kyugo_gfxctrl_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); /* bit 0 is scroll MSB */ state->scroll_x_hi = data & 0x01; @@ -137,14 +137,14 @@ WRITE8_HANDLER( kyugo_gfxctrl_w ) WRITE8_HANDLER( kyugo_scroll_y_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); state->scroll_y = data; } WRITE8_HANDLER( kyugo_flipscreen_w ) { - kyugo_state *state = (kyugo_state *)space->machine->driver_data; + kyugo_state *state = space->machine->driver_data(); if (state->flipscreen != (data & 0x01)) { @@ -162,7 +162,7 @@ WRITE8_HANDLER( kyugo_flipscreen_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - kyugo_state *state = (kyugo_state *)machine->driver_data; + kyugo_state *state = machine->driver_data(); /* sprite information is scattered through memory */ /* and uses a portion of the text layer memory (outside the visible area) */ @@ -222,7 +222,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( kyugo ) { - kyugo_state *state = (kyugo_state *)screen->machine->driver_data; + kyugo_state *state = screen->machine->driver_data(); if (state->flipscreen) tilemap_set_scrollx(state->bg_tilemap, 0, -(state->scroll_x_lo + (state->scroll_x_hi * 256))); diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index bffdae1840b..ae71a50f4c8 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -42,7 +42,7 @@ PALETTE_INIT( labyrunr ) static void set_pens( running_machine *machine ) { - labyrunr_state *state = (labyrunr_state *)machine->driver_data; + labyrunr_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x100; i += 2) @@ -65,7 +65,7 @@ static void set_pens( running_machine *machine ) static TILE_GET_INFO( get_tile_info0 ) { - labyrunr_state *state = (labyrunr_state *)machine->driver_data; + labyrunr_state *state = machine->driver_data(); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121, 3); UINT8 ctrl_4 = k007121_ctrlram_r(state->k007121, 4); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121, 5); @@ -95,7 +95,7 @@ static TILE_GET_INFO( get_tile_info0 ) static TILE_GET_INFO( get_tile_info1 ) { - labyrunr_state *state = (labyrunr_state *)machine->driver_data; + labyrunr_state *state = machine->driver_data(); UINT8 ctrl_3 = k007121_ctrlram_r(state->k007121, 3); UINT8 ctrl_4 = k007121_ctrlram_r(state->k007121, 4); UINT8 ctrl_5 = k007121_ctrlram_r(state->k007121, 5); @@ -132,7 +132,7 @@ static TILE_GET_INFO( get_tile_info1 ) VIDEO_START( labyrunr ) { - labyrunr_state *state = (labyrunr_state *)machine->driver_data; + labyrunr_state *state = machine->driver_data(); state->layer0 = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 8, 8, 32, 32); state->layer1 = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 8, 8, 32, 32); @@ -160,14 +160,14 @@ VIDEO_START( labyrunr ) WRITE8_HANDLER( labyrunr_vram1_w ) { - labyrunr_state *state = (labyrunr_state *)space->machine->driver_data; + labyrunr_state *state = space->machine->driver_data(); state->videoram1[offset] = data; tilemap_mark_tile_dirty(state->layer0, offset & 0x3ff); } WRITE8_HANDLER( labyrunr_vram2_w ) { - labyrunr_state *state = (labyrunr_state *)space->machine->driver_data; + labyrunr_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->layer1, offset & 0x3ff); } @@ -182,7 +182,7 @@ WRITE8_HANDLER( labyrunr_vram2_w ) VIDEO_UPDATE( labyrunr ) { - labyrunr_state *state = (labyrunr_state *)screen->machine->driver_data; + labyrunr_state *state = screen->machine->driver_data(); UINT8 ctrl_0 = k007121_ctrlram_r(state->k007121, 0); rectangle finalclip0, finalclip1; diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index 79a6a8765f9..82ee0974f13 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -137,14 +137,14 @@ PALETTE_INIT( sraider ) WRITE8_HANDLER( ladybug_videoram_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( ladybug_colorram_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -160,7 +160,7 @@ WRITE8_HANDLER( ladybug_flipscreen_w ) WRITE8_HANDLER( sraider_io_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); // bit7 = flip // bit6 = grid red @@ -190,7 +190,7 @@ WRITE8_HANDLER( sraider_io_w ) static TILE_GET_INFO( get_bg_tile_info ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); int code = state->videoram[tile_index] + 32 * (state->colorram[tile_index] & 0x08); int color = state->colorram[tile_index] & 0x07; @@ -211,7 +211,7 @@ static TILE_GET_INFO( get_grid_tile_info ) VIDEO_START( ladybug ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); @@ -220,7 +220,7 @@ VIDEO_START( ladybug ) VIDEO_START( sraider ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->grid_tilemap = tilemap_create(machine, get_grid_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(state->grid_tilemap, 32); @@ -233,7 +233,7 @@ VIDEO_START( sraider ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -284,7 +284,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( ladybug ) { - ladybug_state *state = (ladybug_state *)screen->machine->driver_data; + ladybug_state *state = screen->machine->driver_data(); int offs; // clear the bg bitmap @@ -313,7 +313,7 @@ VIDEO_EOF( sraider ) /* update starfield position */ VIDEO_UPDATE( sraider ) { - ladybug_state *state = (ladybug_state *)screen->machine->driver_data; + ladybug_state *state = screen->machine->driver_data(); // this part is boilerplate from ladybug, not sure if hardware does this, // since it's not used diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index 7a5ddfbdc6a..7223f342cf8 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -11,19 +11,19 @@ WRITE8_HANDLER(ladyfrog_spriteram_w) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->spriteram[offset] = data; } READ8_HANDLER(ladyfrog_spriteram_r) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); return state->spriteram[offset]; } static TILE_GET_INFO( get_tile_info ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); int pal = state->videoram[tile_index * 2 + 1] & 0x0f; int tile = state->videoram[tile_index * 2] + ((state->videoram[tile_index * 2 + 1] & 0xc0) << 2)+ ((state->videoram[tile_index * 2 + 1] & 0x30) << 6); SET_TILE_INFO( @@ -35,20 +35,20 @@ static TILE_GET_INFO( get_tile_info ) WRITE8_HANDLER( ladyfrog_videoram_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset >> 1); } READ8_HANDLER( ladyfrog_videoram_r ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); return state->videoram[offset]; } WRITE8_HANDLER( ladyfrog_palette_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); if (offset & 0x100) paletteram_xxxxBBBBGGGGRRRR_split2_w(space, (offset & 0xff) + (state->palette_bank << 8), data); @@ -58,7 +58,7 @@ WRITE8_HANDLER( ladyfrog_palette_w ) READ8_HANDLER( ladyfrog_palette_r ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); if (offset & 0x100) return space->machine->generic.paletteram2.u8[(offset & 0xff) + (state->palette_bank << 8)]; @@ -68,13 +68,13 @@ READ8_HANDLER( ladyfrog_palette_r ) WRITE8_HANDLER( ladyfrog_gfxctrl_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->palette_bank = (data & 0x20) >> 5; } WRITE8_HANDLER( ladyfrog_gfxctrl2_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->tilebank = ((data & 0x18) >> 3) ^ 3; tilemap_mark_all_tiles_dirty(state->bg_tilemap); } @@ -91,13 +91,13 @@ READ8_HANDLER( ladyfrog_gfxctrl_r ) READ8_HANDLER( ladyfrog_scrlram_r ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); return state->scrlram[offset]; } WRITE8_HANDLER( ladyfrog_scrlram_w ) { - ladyfrog_state *state = (ladyfrog_state *)space->machine->driver_data; + ladyfrog_state *state = space->machine->driver_data(); state->scrlram[offset] = data; tilemap_set_scrolly(state->bg_tilemap, offset, data); @@ -105,7 +105,7 @@ WRITE8_HANDLER( ladyfrog_scrlram_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); int i; for (i = 0; i < 0x20; i++) { @@ -140,7 +140,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static VIDEO_START( ladyfrog_common ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); state->spriteram = auto_alloc_array(machine, UINT8, 160); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -157,7 +157,7 @@ static VIDEO_START( ladyfrog_common ) VIDEO_START( ladyfrog ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); // weird, there are sprite tiles at 0x000 and 0x400, but they don't contain all the sprites! state->spritetilebase = 0x800; @@ -166,7 +166,7 @@ VIDEO_START( ladyfrog ) VIDEO_START( toucheme ) { - ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; + ladyfrog_state *state = machine->driver_data(); state->spritetilebase = 0x000; VIDEO_START_CALL(ladyfrog_common); @@ -175,7 +175,7 @@ VIDEO_START( toucheme ) VIDEO_UPDATE( ladyfrog ) { - ladyfrog_state *state = (ladyfrog_state *)screen->machine->driver_data; + ladyfrog_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 59fc54ab8a3..3bd8ee5ef95 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -104,7 +104,7 @@ PALETTE_INIT( wwjgtin ) static void wwjgtin_set_last_four_colors( running_machine *machine, colortable_t *colortable ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); int i; /* the last palette entries can be changed */ @@ -122,7 +122,7 @@ static void wwjgtin_set_last_four_colors( running_machine *machine, colortable_t static TILE_GET_INFO( lasso_get_bg_tile_info ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = state->colorram[tile_index]; @@ -146,7 +146,7 @@ static TILE_GET_INFO( wwjgtin_get_track_tile_info ) static TILE_GET_INFO( pinbo_get_bg_tile_info ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = state->colorram[tile_index]; @@ -165,7 +165,7 @@ static TILE_GET_INFO( pinbo_get_bg_tile_info ) VIDEO_START( lasso ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); /* create tilemap */ state->bg_tilemap = tilemap_create(machine, lasso_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -175,7 +175,7 @@ VIDEO_START( lasso ) VIDEO_START( wwjgtin ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); /* create tilemaps */ state->bg_tilemap = tilemap_create(machine, lasso_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -186,7 +186,7 @@ VIDEO_START( wwjgtin ) VIDEO_START( pinbo ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); /* create tilemap */ state->bg_tilemap = tilemap_create(machine, pinbo_get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -201,14 +201,14 @@ VIDEO_START( pinbo ) WRITE8_HANDLER( lasso_videoram_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( lasso_colorram_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -226,7 +226,7 @@ static WRITE8_HANDLER( lasso_flip_screen_w ) WRITE8_HANDLER( lasso_video_control_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); int bank = (data & 0x04) >> 2; if (state->gfxbank != bank) @@ -240,7 +240,7 @@ WRITE8_HANDLER( lasso_video_control_w ) WRITE8_HANDLER( wwjgtin_video_control_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); int bank = ((data & 0x04) ? 0 : 1) + ((data & 0x10) ? 2 : 0); state->track_enable = data & 0x08; @@ -255,7 +255,7 @@ WRITE8_HANDLER( wwjgtin_video_control_w ) WRITE8_HANDLER( pinbo_video_control_w ) { - lasso_state *state = (lasso_state *)space->machine->driver_data; + lasso_state *state = space->machine->driver_data(); /* no need to dirty the tilemap -- only the sprites use the global bank */ state->gfxbank = (data & 0x0c) >> 2; @@ -272,7 +272,7 @@ WRITE8_HANDLER( pinbo_video_control_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int reverse ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); const UINT8 *finish, *source; int inc; @@ -326,7 +326,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_lasso( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - lasso_state *state = (lasso_state *)machine->driver_data; + lasso_state *state = machine->driver_data(); offs_t offs; pen_t pen = 0x3f; @@ -367,7 +367,7 @@ static void draw_lasso( running_machine *machine, bitmap_t *bitmap, const rectan VIDEO_UPDATE( lasso ) { - lasso_state *state = (lasso_state *)screen->machine->driver_data; + lasso_state *state = screen->machine->driver_data(); palette_set_color(screen->machine, 0, get_color(*state->back_color)); bitmap_fill(bitmap, cliprect, 0); @@ -380,7 +380,7 @@ VIDEO_UPDATE( lasso ) VIDEO_UPDATE( chameleo ) { - lasso_state *state = (lasso_state *)screen->machine->driver_data; + lasso_state *state = screen->machine->driver_data(); palette_set_color(screen->machine, 0, get_color(*state->back_color)); bitmap_fill(bitmap, cliprect, 0); @@ -393,7 +393,7 @@ VIDEO_UPDATE( chameleo ) VIDEO_UPDATE( wwjgtin ) { - lasso_state *state = (lasso_state *)screen->machine->driver_data; + lasso_state *state = screen->machine->driver_data(); colortable_palette_set_color(screen->machine->colortable, 0, get_color(*state->back_color)); wwjgtin_set_last_four_colors(screen->machine, screen->machine->colortable); @@ -414,7 +414,7 @@ VIDEO_UPDATE( wwjgtin ) VIDEO_UPDATE( pinbo ) { - lasso_state *state = (lasso_state *)screen->machine->driver_data; + lasso_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect, 0); diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index 5c02345bd7f..a47405fff31 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -18,7 +18,7 @@ static TILE_GET_INFO( ld_get_bg_tile_info ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); int tile = state->scroll2[2 * tile_index] & 0x1fff; int color = state->scroll2[2 * tile_index + 1]; SET_TILE_INFO( @@ -29,7 +29,7 @@ static TILE_GET_INFO( ld_get_bg_tile_info ) static TILE_GET_INFO( ld_get_fg_tile_info ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); int tile = state->scroll1[2 * tile_index] & 0x1fff; int color = state->scroll1[2 * tile_index + 1]; SET_TILE_INFO( @@ -42,7 +42,7 @@ static TILE_GET_INFO( ld_get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); int tile = state->scroll2[tile_index] & 0x1fff; int color = state->scroll2[tile_index + 0x0800]; SET_TILE_INFO( @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); int tile = state->scroll1[tile_index] & 0x1fff; int color = state->scroll1[tile_index + 0x0800]; SET_TILE_INFO( @@ -67,7 +67,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_fix_info ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); int tile = state->vram[tile_index]; SET_TILE_INFO( 1, @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_fix_info ) VIDEO_START( lastduel ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, ld_get_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg_tilemap = tilemap_create(machine, ld_get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->tx_tilemap = tilemap_create(machine, get_fix_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -102,7 +102,7 @@ VIDEO_START( lastduel ) VIDEO_START( madgear ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_cols,16,16,64,32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_cols,16,16,64,32); state->tx_tilemap = tilemap_create(machine, get_fix_info,tilemap_scan_rows,8,8,64,32); @@ -139,7 +139,7 @@ WRITE16_HANDLER( lastduel_flip_w ) WRITE16_HANDLER( lastduel_scroll_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); switch (offset) @@ -157,7 +157,7 @@ WRITE16_HANDLER( lastduel_scroll_w ) WRITE16_HANDLER( lastduel_scroll1_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll1[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); @@ -165,7 +165,7 @@ WRITE16_HANDLER( lastduel_scroll1_w ) WRITE16_HANDLER( lastduel_scroll2_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll2[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -173,7 +173,7 @@ WRITE16_HANDLER( lastduel_scroll2_w ) WRITE16_HANDLER( lastduel_vram_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -181,7 +181,7 @@ WRITE16_HANDLER( lastduel_vram_w ) WRITE16_HANDLER( madgear_scroll1_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll1[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x7ff); @@ -189,7 +189,7 @@ WRITE16_HANDLER( madgear_scroll1_w ) WRITE16_HANDLER( madgear_scroll2_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scroll2[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x7ff); @@ -197,7 +197,7 @@ WRITE16_HANDLER( madgear_scroll2_w ) WRITE16_HANDLER( lastduel_palette_word_w ) { - lastduel_state *state = (lastduel_state *)space->machine->driver_data; + lastduel_state *state = space->machine->driver_data(); int red, green, blue, bright; data = COMBINE_DATA(&state->paletteram[offset]); @@ -220,7 +220,7 @@ WRITE16_HANDLER( lastduel_palette_word_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - lastduel_state *state = (lastduel_state *)machine->driver_data; + lastduel_state *state = machine->driver_data(); UINT16 *buffered_spriteram16 = machine->generic.buffered_spriteram.u16; int offs; @@ -271,7 +271,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( lastduel ) { - lastduel_state *state = (lastduel_state *)screen->machine->driver_data; + lastduel_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, TILEMAP_DRAW_LAYER1, 0); @@ -284,7 +284,7 @@ VIDEO_UPDATE( lastduel ) VIDEO_UPDATE( madgear ) { - lastduel_state *state = (lastduel_state *)screen->machine->driver_data; + lastduel_state *state = screen->machine->driver_data(); if (state->tilemap_priority) { diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c index 229e4275d2c..6e2f4749364 100644 --- a/src/mame/video/lazercmd.c +++ b/src/mame/video/lazercmd.c @@ -52,7 +52,7 @@ static void plot_pattern( running_machine *machine, bitmap_t *bitmap, int x, int VIDEO_UPDATE( lazercmd ) { - lazercmd_state *state = (lazercmd_state *)screen->machine->driver_data; + lazercmd_state *state = screen->machine->driver_data(); int i, x, y; int video_inverted = input_port_read(screen->machine, "DSW") & 0x20; diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index a9c99a08119..ff78d001c11 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -74,7 +74,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static TILE_GET_INFO( get_tile_info ) { - lemmings_state *state = (lemmings_state *)machine->driver_data; + lemmings_state *state = machine->driver_data(); UINT16 tile = state->vram_data[tile_index]; SET_TILE_INFO( @@ -86,7 +86,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( lemmings ) { - lemmings_state *state = (lemmings_state *)machine->driver_data; + lemmings_state *state = machine->driver_data(); state->bitmap0 = auto_bitmap_alloc(machine, 2048, 256, machine->primary_screen->format()); state->vram_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_cols, 8, 8, 64, 32); @@ -107,7 +107,7 @@ VIDEO_START( lemmings ) VIDEO_EOF( lemmings ) { - lemmings_state *state = (lemmings_state *)machine->driver_data; + lemmings_state *state = machine->driver_data(); memcpy(state->sprite_triple_buffer_0, machine->generic.buffered_spriteram.u16, 0x800); memcpy(state->sprite_triple_buffer_1, machine->generic.buffered_spriteram2.u16, 0x800); @@ -117,7 +117,7 @@ VIDEO_EOF( lemmings ) WRITE16_HANDLER( lemmings_pixel_0_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); int sx, sy, src, old; old = state->pixel_0_data[offset]; @@ -138,7 +138,7 @@ WRITE16_HANDLER( lemmings_pixel_0_w ) WRITE16_HANDLER( lemmings_pixel_1_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); int sx, sy, src, /*old,*/ tile; // old = state->pixel_1_data[offset]; @@ -161,14 +161,14 @@ WRITE16_HANDLER( lemmings_pixel_1_w ) WRITE16_HANDLER( lemmings_vram_w ) { - lemmings_state *state = (lemmings_state *)space->machine->driver_data; + lemmings_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_data[offset]); tilemap_mark_tile_dirty(state->vram_tilemap, offset); } VIDEO_UPDATE( lemmings ) { - lemmings_state *state = (lemmings_state *)screen->machine->driver_data; + lemmings_state *state = screen->machine->driver_data(); int x1 = -state->control_data[0]; int x0 = -state->control_data[2]; int y = 0; diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c index 92c2c1e030c..20bd4052d39 100644 --- a/src/mame/video/lethal.c +++ b/src/mame/video/lethal.c @@ -43,13 +43,13 @@ void lethalen_sprite_callback( running_machine *machine, int *code, int *color, void lethalen_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { - lethal_state *state = (lethal_state *)machine->driver_data; + lethal_state *state = machine->driver_data(); *color = state->layer_colorbase[layer] + ((*color & 0x3c) << 2); } VIDEO_START(lethalen) { - lethal_state *state = (lethal_state *)machine->driver_data; + lethal_state *state = machine->driver_data(); // this game uses external linescroll RAM k056832_SetExtLinescroll(state->k056832); @@ -78,7 +78,7 @@ VIDEO_START(lethalen) WRITE8_HANDLER(lethalen_palette_control) { - lethal_state *state = (lethal_state *)space->machine->driver_data; + lethal_state *state = space->machine->driver_data(); switch (offset) { @@ -104,7 +104,7 @@ WRITE8_HANDLER(lethalen_palette_control) VIDEO_UPDATE(lethalen) { - lethal_state *state = (lethal_state *)screen->machine->driver_data; + lethal_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 7168); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index a7c94cadb17..0b5d492e4e6 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -39,7 +39,7 @@ static TILEMAP_MAPPER( fix_scan ) static TILE_GET_INFO( get_back_tile_info ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); const UINT8 *RAM = memory_region(machine, "user1"); int tile, bank; @@ -69,7 +69,7 @@ static TILE_GET_INFO( get_back_tile_info ) static TILE_GET_INFO( get_fix_tile_info ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); UINT8 *videoram = state->videoram; UINT8 *colorram = state->colorram; int tile, color; @@ -82,7 +82,7 @@ static TILE_GET_INFO( get_fix_tile_info ) static TILE_GET_INFO( prosport_get_back_tile_info ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); int tile; /* @@ -104,7 +104,7 @@ static TILE_GET_INFO( prosport_get_back_tile_info ) WRITE8_HANDLER( deco16_io_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->io_ram[offset] = data; if (offset > 1 && offset < 6) tilemap_mark_all_tiles_dirty(state->back_tilemap); @@ -135,7 +135,7 @@ WRITE8_HANDLER( deco16_io_w ) WRITE8_HANDLER( prosoccr_io_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->io_ram[offset] = data; if (offset > 1 && offset < 6) tilemap_mark_all_tiles_dirty(state->back_tilemap); @@ -165,7 +165,7 @@ WRITE8_HANDLER( prosoccr_io_w ) /* completely different i/o...*/ WRITE8_HANDLER( prosport_io_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->io_ram[offset] = data; switch (offset) @@ -187,21 +187,21 @@ WRITE8_HANDLER( prosport_io_w ) WRITE8_HANDLER( liberate_videoram_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fix_tilemap, offset); } WRITE8_HANDLER( liberate_colorram_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fix_tilemap, offset); } WRITE8_HANDLER( prosport_bg_vram_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->bg_vram[offset] = data; tilemap_mark_tile_dirty(state->back_tilemap, offset); } @@ -210,7 +210,7 @@ WRITE8_HANDLER( prosport_bg_vram_w ) VIDEO_START( prosoccr ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); state->back_tilemap = tilemap_create(machine, get_back_tile_info, back_scan, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); @@ -221,7 +221,7 @@ VIDEO_START( prosoccr ) VIDEO_START( boomrang ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); state->back_tilemap = tilemap_create(machine, get_back_tile_info, back_scan, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); @@ -231,7 +231,7 @@ VIDEO_START( boomrang ) VIDEO_START( liberate ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); state->back_tilemap = tilemap_create(machine, get_back_tile_info, back_scan, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); @@ -240,7 +240,7 @@ VIDEO_START( liberate ) VIDEO_START( prosport ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); state->back_tilemap = tilemap_create(machine, prosport_get_back_tile_info, back_scan, 16, 16, 32, 32); state->fix_tilemap = tilemap_create(machine, get_fix_tile_info, fix_scan, 8, 8, 32, 32); @@ -251,7 +251,7 @@ VIDEO_START( prosport ) WRITE8_HANDLER( prosport_paletteram_w ) { - liberate_state *state = (liberate_state *)space->machine->driver_data; + liberate_state *state = space->machine->driver_data(); state->paletteram[offset] = data; /* RGB output is inverted */ @@ -292,7 +292,7 @@ PALETTE_INIT( liberate ) static void liberate_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -361,7 +361,7 @@ static void liberate_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void prosport_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); int offs, multi, fx, fy, sx, sy, sy2, code, code2, color, gfx_region; UINT8 *spriteram = state->spriteram; @@ -426,7 +426,7 @@ static void prosport_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void boomrang_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs, multi, fx, fy, sx, sy, sy2, code, code2, color; @@ -487,7 +487,7 @@ static void boomrang_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void prosoccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - liberate_state *state = (liberate_state *)machine->driver_data; + liberate_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs, code, fx, fy, sx, sy; @@ -514,7 +514,7 @@ static void prosoccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( prosoccr ) { - liberate_state *state = (liberate_state *)screen->machine->driver_data; + liberate_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->back_tilemap, 0, state->io_ram[1]); tilemap_set_scrollx(state->back_tilemap, 0, -state->io_ram[0]); @@ -531,7 +531,7 @@ VIDEO_UPDATE( prosoccr ) VIDEO_UPDATE( prosport ) { - liberate_state *state = (liberate_state *)screen->machine->driver_data; + liberate_state *state = screen->machine->driver_data(); UINT8 *videoram = state->videoram; UINT8 *colorram = state->colorram; int mx, my, tile, offs, gfx_region; @@ -575,7 +575,7 @@ VIDEO_UPDATE( prosport ) VIDEO_UPDATE( boomrang ) { - liberate_state *state = (liberate_state *)screen->machine->driver_data; + liberate_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->back_tilemap, 0, state->io_ram[1]); tilemap_set_scrollx(state->back_tilemap, 0, -state->io_ram[0]); @@ -595,7 +595,7 @@ VIDEO_UPDATE( boomrang ) VIDEO_UPDATE( liberate ) { - liberate_state *state = (liberate_state *)screen->machine->driver_data; + liberate_state *state = screen->machine->driver_data(); tilemap_set_scrolly(state->back_tilemap, 0, state->io_ram[1]); tilemap_set_scrollx(state->back_tilemap, 0, -state->io_ram[0]); diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index e77b7255d00..32b6c6490f7 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -42,7 +42,7 @@ WRITE8_HANDLER( lkage_videoram_w ) { - lkage_state *state = (lkage_state *)space->machine->driver_data; + lkage_state *state = space->machine->driver_data(); state->videoram[offset] = data; @@ -67,28 +67,28 @@ WRITE8_HANDLER( lkage_videoram_w ) static TILE_GET_INFO( get_bg_tile_info ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); int code = state->videoram[tile_index + 0x800] + 256 * (state->bg_tile_bank ? 5 : 1); SET_TILE_INFO( 0/*gfx*/, code, 0/*color*/, 0/*flags*/ ); } static TILE_GET_INFO( get_fg_tile_info ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); int code = state->videoram[tile_index + 0x400] + 256 * (state->fg_tile_bank ? 1 : 0); SET_TILE_INFO( 0/*gfx*/, code, 0/*color*/, 0/*flags*/); } static TILE_GET_INFO( get_tx_tile_info ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO( 0/*gfx*/, code, 0/*color*/, 0/*flags*/); } VIDEO_START( lkage ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -105,7 +105,7 @@ VIDEO_START( lkage ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - lkage_state *state = (lkage_state *)machine->driver_data; + lkage_state *state = machine->driver_data(); const UINT8 *source = state->spriteram; const UINT8 *finish = source + 0x60; @@ -173,7 +173,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( lkage ) { - lkage_state *state = (lkage_state *)screen->machine->driver_data; + lkage_state *state = screen->machine->driver_data(); int bank; flip_screen_x_set(screen->machine, ~state->vreg[2] & 0x01); diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 89926051c66..c229000b453 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -64,7 +64,7 @@ WRITE16_HANDLER( lockon_crtc_w ) static TIMER_CALLBACK( cursor_callback ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); if (state->main_inten) cpu_set_input_line_and_vector(state->maincpu, 0, HOLD_LINE, 0xff); @@ -134,14 +134,14 @@ PALETTE_INIT( lockon ) WRITE16_HANDLER( lockon_char_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->char_ram[offset] = data; tilemap_mark_tile_dirty(state->tilemap, offset); } static TILE_GET_INFO( get_lockon_tile_info ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); UINT32 tileno = state->char_ram[tile_index] & 0x03ff; UINT32 col = (state->char_ram[tile_index] >> 10) & 0x3f; @@ -158,19 +158,19 @@ static TILE_GET_INFO( get_lockon_tile_info ) WRITE16_HANDLER( lockon_scene_h_scr_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->scroll_h = data & 0x1ff; } WRITE16_HANDLER( lockon_scene_v_scr_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->scroll_v = data & 0x81ff; } static void scene_draw( running_machine *machine ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); UINT32 y; /* 3bpp characters */ @@ -281,13 +281,13 @@ static void scene_draw( running_machine *machine ) WRITE16_HANDLER( lockon_ground_ctrl_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->ground_ctrl = data & 0xff; } static TIMER_CALLBACK( bufend_callback ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); cpu_set_input_line_and_vector(state->ground, 0, HOLD_LINE, 0xff); cpu_set_input_line(state->object, NEC_INPUT_LINE_POLL, ASSERT_LINE); } @@ -308,7 +308,7 @@ static TIMER_CALLBACK( bufend_callback ) static void ground_draw( running_machine *machine ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); /* ROM pointers */ const UINT8 *const gfx_rom = memory_region(machine, "gfx4"); @@ -436,7 +436,7 @@ do { \ static void objects_draw( running_machine *machine ) { UINT32 offs; - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); const UINT8 *const romlut = memory_region(machine, "user1"); const UINT16 *const chklut = (UINT16*)memory_region(machine, "user2"); @@ -610,7 +610,7 @@ static void objects_draw( running_machine *machine ) /* The mechanism used by the object CPU to update the object ASICs palette RAM */ WRITE16_HANDLER( lockon_tza112_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); if (state->iden) { @@ -622,7 +622,7 @@ WRITE16_HANDLER( lockon_tza112_w ) READ16_HANDLER( lockon_obj_4000_r ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); cpu_set_input_line(state->object, NEC_INPUT_LINE_POLL, CLEAR_LINE); return 0xffff; @@ -630,7 +630,7 @@ READ16_HANDLER( lockon_obj_4000_r ) WRITE16_HANDLER( lockon_obj_4000_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); state->iden = data & 1; } @@ -668,7 +668,7 @@ WRITE16_HANDLER( lockon_fb_clut_w ) /* Rotation control register */ WRITE16_HANDLER( lockon_rotate_w ) { - lockon_state *state = (lockon_state *)space->machine->driver_data; + lockon_state *state = space->machine->driver_data(); switch (offset & 7) { @@ -700,7 +700,7 @@ do { \ static void rotate_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); UINT32 y; /* Counters */ @@ -805,7 +805,7 @@ static void rotate_draw( running_machine *machine, bitmap_t *bitmap, const recta static void hud_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); UINT8 *tile_rom = memory_region(machine, "gfx3"); UINT32 offs; @@ -905,7 +905,7 @@ static void hud_draw( running_machine *machine, bitmap_t *bitmap, const rectangl VIDEO_START( lockon ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_lockon_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(state->tilemap, 0); @@ -931,7 +931,7 @@ VIDEO_START( lockon ) VIDEO_UPDATE( lockon ) { - lockon_state *state = (lockon_state *)screen->machine->driver_data; + lockon_state *state = screen->machine->driver_data(); /* If screen output is disabled, fill with black */ if (!BIT(state->ctrl_reg, 7)) @@ -954,7 +954,7 @@ VIDEO_UPDATE( lockon ) VIDEO_EOF( lockon ) { - lockon_state *state = (lockon_state *)machine->driver_data; + lockon_state *state = machine->driver_data(); /* Swap the frame buffers */ bitmap_t *tmp = state->front_buffer; diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c index 0f9652c8820..24a092289bd 100644 --- a/src/mame/video/lsasquad.c +++ b/src/mame/video/lsasquad.c @@ -3,7 +3,7 @@ static void draw_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 *scrollram ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); int offs, scrollx, scrolly; scrollx = scrollram[3]; @@ -50,7 +50,7 @@ static void draw_layer( running_machine *machine, bitmap_t *bitmap, const rectan static int draw_layer_daikaiju( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int offs, int * previd, int type ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); int id, scrollx, scrolly, initoffs, globalscrollx; int stepx = 0; @@ -140,7 +140,7 @@ static int draw_layer_daikaiju( running_machine *machine, bitmap_t *bitmap, cons static void drawbg( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int type ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); int i = 0; int id = -1; @@ -160,7 +160,7 @@ static void drawbg( running_machine *machine, bitmap_t *bitmap, const rectangle static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - lsasquad_state *state = (lsasquad_state *)machine->driver_data; + lsasquad_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -200,7 +200,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( lsasquad ) { - lsasquad_state *state = (lsasquad_state *)screen->machine->driver_data; + lsasquad_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 511); draw_layer(screen->machine, bitmap, cliprect, state->scrollram + 0x000); diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index e8073f086d5..133acaf304e 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -22,7 +22,7 @@ static TILEMAP_MAPPER( get_bg2_memory_offset ) static TILE_GET_INFO( get_fg_tile_info ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); int code = state->fgvideoram[tile_index]; int color = state->fgvideoram[tile_index + 0x400]; SET_TILE_INFO( @@ -34,7 +34,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( lwings_get_bg1_tile_info ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); int code = state->bg1videoram[tile_index]; int color = state->bg1videoram[tile_index + 0x400]; SET_TILE_INFO( @@ -46,7 +46,7 @@ static TILE_GET_INFO( lwings_get_bg1_tile_info ) static TILE_GET_INFO( trojan_get_bg1_tile_info ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); int code = state->bg1videoram[tile_index]; int color = state->bg1videoram[tile_index + 0x400]; code += (color & 0xe0)<<3; @@ -61,7 +61,7 @@ static TILE_GET_INFO( trojan_get_bg1_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); int code, color; UINT8 *rom = memory_region(machine, "gfx5"); int mask = memory_region_length(machine, "gfx5") - 1; @@ -84,7 +84,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( lwings ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg1_tilemap = tilemap_create(machine, lwings_get_bg1_tile_info, tilemap_scan_cols, 16, 16, 32, 32); @@ -94,7 +94,7 @@ VIDEO_START( lwings ) VIDEO_START( trojan ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg1_tilemap = tilemap_create(machine, trojan_get_bg1_tile_info,tilemap_scan_cols, 16, 16, 32, 32); @@ -109,7 +109,7 @@ VIDEO_START( trojan ) VIDEO_START( avengers ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); VIDEO_START_CALL(trojan); state->bg2_avenger_hw = 1; @@ -123,14 +123,14 @@ VIDEO_START( avengers ) WRITE8_HANDLER( lwings_fgvideoram_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); } WRITE8_HANDLER( lwings_bg1videoram_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); state->bg1videoram[offset] = data; tilemap_mark_tile_dirty(state->bg1_tilemap, offset & 0x3ff); } @@ -138,27 +138,27 @@ WRITE8_HANDLER( lwings_bg1videoram_w ) WRITE8_HANDLER( lwings_bg1_scrollx_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); state->scroll_x[offset] = data; tilemap_set_scrollx(state->bg1_tilemap, 0, state->scroll_x[0] | (state->scroll_x[1] << 8)); } WRITE8_HANDLER( lwings_bg1_scrolly_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); state->scroll_y[offset] = data; tilemap_set_scrolly(state->bg1_tilemap, 0, state->scroll_y[0] | (state->scroll_y[1] << 8)); } WRITE8_HANDLER( trojan_bg2_scrollx_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg2_tilemap, 0, data); } WRITE8_HANDLER( trojan_bg2_image_w ) { - lwings_state *state = (lwings_state *)space->machine->driver_data; + lwings_state *state = space->machine->driver_data(); if (state->bg2_image != data) { @@ -222,7 +222,7 @@ static void lwings_draw_sprites( running_machine *machine, bitmap_t *bitmap, con static void trojan_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - lwings_state *state = (lwings_state *)machine->driver_data; + lwings_state *state = machine->driver_data(); UINT8 *buffered_spriteram = machine->generic.buffered_spriteram.u8; int offs; @@ -271,7 +271,7 @@ static void trojan_draw_sprites( running_machine *machine, bitmap_t *bitmap, con VIDEO_UPDATE( lwings ) { - lwings_state *state = (lwings_state *)screen->machine->driver_data; + lwings_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg1_tilemap, 0, 0); lwings_draw_sprites(screen->machine, bitmap, cliprect); @@ -281,7 +281,7 @@ VIDEO_UPDATE( lwings ) VIDEO_UPDATE( trojan ) { - lwings_state *state = (lwings_state *)screen->machine->driver_data; + lwings_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg2_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->bg1_tilemap, TILEMAP_DRAW_LAYER1, 0); diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 5d20e4be1da..2b9136cb0cc 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -47,7 +47,7 @@ static UINT32 tilemap_scan( UINT32 col, UINT32 row, UINT32 num_cols, UINT32 num_ static void get_tile_info( running_machine *machine, tile_data *tileinfo, tilemap_memory_index tile_index, void *param ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); SET_TILE_INFO(0, state->videoram[tile_index], state->colorram[tile_index] & 0x07, 0); } @@ -55,7 +55,7 @@ static void get_tile_info( running_machine *machine, tile_data *tileinfo, tilema WRITE8_HANDLER( m10_colorram_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); if (state->colorram[offset] != data) { @@ -67,7 +67,7 @@ WRITE8_HANDLER( m10_colorram_w ) WRITE8_HANDLER( m10_chargen_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); if (state->chargen[offset] != data) { @@ -79,7 +79,7 @@ WRITE8_HANDLER( m10_chargen_w ) WRITE8_HANDLER( m15_chargen_w ) { - m10_state *state = (m10_state *)space->machine->driver_data; + m10_state *state = space->machine->driver_data(); if (state->chargen[offset] != data) { @@ -91,7 +91,7 @@ WRITE8_HANDLER( m15_chargen_w ) INLINE void plot_pixel_m10( running_machine *machine, bitmap_t *bm, int x, int y, int col ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); if (!state->flip) *BITMAP_ADDR16(bm, y, x) = col; @@ -102,7 +102,7 @@ INLINE void plot_pixel_m10( running_machine *machine, bitmap_t *bm, int x, int y VIDEO_START( m10 ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); int i; for (i = 0; i < 32 * 8; i++) @@ -121,7 +121,7 @@ VIDEO_START( m10 ) VIDEO_START( m15 ) { - m10_state *state = (m10_state *)machine->driver_data; + m10_state *state = machine->driver_data(); machine->gfx[0] = gfx_element_alloc(machine, &charlayout, state->chargen, 8, 0); @@ -140,7 +140,7 @@ VIDEO_START( m15 ) VIDEO_UPDATE( m10 ) { - m10_state *state = (m10_state *)screen->machine->driver_data; + m10_state *state = screen->machine->driver_data(); int offs; static const int color[4]= { 3, 3, 5, 5 }; static const int xpos[4] = { 4*8, 26*8, 7*8, 6*8}; @@ -180,7 +180,7 @@ VIDEO_UPDATE( m10 ) VIDEO_UPDATE( m15 ) { - m10_state *state = (m10_state *)screen->machine->driver_data; + m10_state *state = screen->machine->driver_data(); int offs; for (offs = state->videoram_size - 1; offs >= 0; offs--) diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 26058e50ade..1a26e281bc0 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -116,7 +116,7 @@ PALETTE_INIT( m52 ) static TILE_GET_INFO( get_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); UINT8 video = state->videoram[tile_index]; UINT8 color = state->colorram[tile_index]; @@ -148,7 +148,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( m52 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -174,7 +174,7 @@ VIDEO_START( m52 ) WRITE8_HANDLER( m52_scroll_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); /* According to the schematics there is only one video register that holds the X scroll value with a NAND gate on the V64 and V128 lines to control when it's read, and when @@ -198,7 +198,7 @@ WRITE8_HANDLER( m52_scroll_w ) WRITE8_HANDLER( m52_videoram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -207,7 +207,7 @@ WRITE8_HANDLER( m52_videoram_w ) WRITE8_HANDLER( m52_colorram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -226,7 +226,7 @@ WRITE8_HANDLER( m52_colorram_w ) follows: result = popcount(value & 0x7f) ^ (value >> 7) */ READ8_HANDLER( m52_protection_r ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); int popcount = 0; int temp; @@ -245,31 +245,31 @@ READ8_HANDLER( m52_protection_r ) WRITE8_HANDLER( m52_bg1ypos_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->bg1ypos = data; } WRITE8_HANDLER( m52_bg1xpos_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->bg1xpos = data; } WRITE8_HANDLER( m52_bg2xpos_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->bg2xpos = data; } WRITE8_HANDLER( m52_bg2ypos_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->bg2ypos = data; } WRITE8_HANDLER( m52_bgcontrol_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->bgcontrol = data; } @@ -362,7 +362,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( m52 ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); int offs; bitmap_fill(bitmap, cliprect, 0); diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index e4480c8fa60..79e228e5d05 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -111,7 +111,7 @@ PALETTE_INIT( m57 ) static TILE_GET_INFO( get_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); UINT8 attr = state->videoram[tile_index * 2 + 0]; UINT16 code = state->videoram[tile_index * 2 + 1] | ((attr & 0xc0) << 2); @@ -128,7 +128,7 @@ static TILE_GET_INFO( get_tile_info ) WRITE8_HANDLER( m57_videoram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -143,7 +143,7 @@ WRITE8_HANDLER( m57_videoram_w ) VIDEO_START( m57 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(state->bg_tilemap, 256); @@ -160,7 +160,7 @@ VIDEO_START( m57 ) WRITE8_HANDLER( m57_flipscreen_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); /* screen flip is handled both by software and hardware */ state->flipscreen = (data & 0x01) ^ (~input_port_read(space->machine, "DSW2") & 0x01); @@ -179,7 +179,7 @@ WRITE8_HANDLER( m57_flipscreen_w ) static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int y,x; INT16 scrolly; @@ -223,7 +223,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_size - 4; offs >= 0; offs -= 4) diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index 07b149d5552..7e20de8212b 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -105,7 +105,7 @@ PALETTE_INIT( yard ) WRITE8_HANDLER( yard_videoram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -114,7 +114,7 @@ WRITE8_HANDLER( yard_videoram_w ) WRITE8_HANDLER( yard_scroll_panel_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); int sx,sy,i; @@ -147,7 +147,7 @@ WRITE8_HANDLER( yard_scroll_panel_w ) static TILE_GET_INFO( yard_get_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int offs = tile_index * 2; int attr = state->videoram[offs + 1]; @@ -178,7 +178,7 @@ static UINT32 yard_tilemap_scan_rows( UINT32 col, UINT32 row, UINT32 num_cols, U VIDEO_START( yard ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -221,7 +221,7 @@ WRITE8_HANDLER( yard_flipscreen_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int offs; const rectangle &visarea = machine->primary_screen->visible_area(); @@ -276,7 +276,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void draw_panel( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); if (!*state->yard_score_panel_disabled) { @@ -314,7 +314,7 @@ static void draw_panel( running_machine *machine, bitmap_t *bitmap, const rectan VIDEO_UPDATE( yard ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, (*state->yard_scroll_x_high * 0x100) + *state->yard_scroll_x_low); tilemap_set_scrolly(state->bg_tilemap, 0, *state->yard_scroll_y_low); diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index f7c94dfa9e0..1b3cc667c06 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -182,7 +182,7 @@ static const res_net_decode_info spelunk2_sprite_decode_info = PALETTE_INIT( m62 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); rgb_t *rgb; rgb = compute_res_net_all(machine, color_prom, &m62_tile_decode_info, &m62_tile_net_info); @@ -202,7 +202,7 @@ PALETTE_INIT( m62 ) PALETTE_INIT( lotlot ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); rgb_t *rgb; rgb = compute_res_net_all(machine, color_prom, &lotlot_tile_decode_info, &m62_tile_net_info); @@ -222,7 +222,7 @@ PALETTE_INIT( lotlot ) PALETTE_INIT( battroad ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); rgb_t *rgb; rgb = compute_res_net_all(machine, color_prom, &m62_tile_decode_info, &m62_tile_net_info); @@ -245,7 +245,7 @@ PALETTE_INIT( battroad ) PALETTE_INIT( spelunk2 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); rgb_t *rgb; rgb = compute_res_net_all(machine, color_prom, &spelunk2_tile_decode_info, &m62_tile_net_info); @@ -265,7 +265,7 @@ PALETTE_INIT( spelunk2 ) static void register_savestate( running_machine *machine ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state_save_register_global(machine, state->flipscreen); state_save_register_global(machine, state->m62_background_hscroll); @@ -280,7 +280,7 @@ static void register_savestate( running_machine *machine ) WRITE8_HANDLER( m62_flipscreen_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); /* screen flip is handled both by software and hardware */ data ^= ~input_port_read(space->machine, "DSW2") & 1; @@ -296,38 +296,38 @@ WRITE8_HANDLER( m62_flipscreen_w ) WRITE8_HANDLER( m62_hscroll_low_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_background_hscroll = (state->m62_background_hscroll & 0xff00) | data; } WRITE8_HANDLER( m62_hscroll_high_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_background_hscroll = (state->m62_background_hscroll & 0xff) | (data << 8); } WRITE8_HANDLER( m62_vscroll_low_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_background_vscroll = (state->m62_background_vscroll & 0xff00) | data; } WRITE8_HANDLER( m62_vscroll_high_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_background_vscroll = (state->m62_background_vscroll & 0xff) | (data << 8); } WRITE8_HANDLER( m62_tileram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_tileram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset >> 1); } WRITE8_HANDLER( m62_textram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_textram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset >> 1); } @@ -335,7 +335,7 @@ WRITE8_HANDLER( m62_textram_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int colormask, int prioritymask, int priority ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->spriteram_size; offs += 8) @@ -394,7 +394,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void m62_start( running_machine *machine, tile_get_info_func tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, tile_get_info, tilemap_scan_rows, x1, y1, x2, y2); register_savestate(machine); @@ -408,7 +408,7 @@ static void m62_start( running_machine *machine, tile_get_info_func tile_get_inf static void m62_textlayer( running_machine *machine, tile_get_info_func tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, tile_get_info, tilemap_scan_rows, x1, y1, x2, y2); if (rows != 0) @@ -420,14 +420,14 @@ static void m62_textlayer( running_machine *machine, tile_get_info_func tile_get WRITE8_HANDLER( kungfum_tileram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->m62_tileram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x7ff); } static TILE_GET_INFO( get_kungfum_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; int flags; @@ -454,7 +454,7 @@ VIDEO_START( kungfum ) VIDEO_UPDATE( kungfum ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); int i; for (i = 0; i < 6; i++) { @@ -473,7 +473,7 @@ VIDEO_UPDATE( kungfum ) static TILE_GET_INFO( get_ldrun_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; @@ -494,7 +494,7 @@ static TILE_GET_INFO( get_ldrun_bg_tile_info ) VIDEO_START( ldrun ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); m62_start(machine, get_ldrun_bg_tile_info, 1, 1, 8, 8, 64, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -503,7 +503,7 @@ VIDEO_START( ldrun ) VIDEO_UPDATE( ldrun ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); tilemap_set_scrolly(state->bg_tilemap, 0, state->m62_background_vscroll); @@ -516,7 +516,7 @@ VIDEO_UPDATE( ldrun ) static TILE_GET_INFO( get_ldrun2_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; int flags; @@ -536,7 +536,7 @@ static TILE_GET_INFO( get_ldrun2_bg_tile_info ) VIDEO_START( ldrun2 ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); m62_start(machine, get_ldrun2_bg_tile_info, 1, 1, 8, 8, 64, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(state->bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ @@ -545,13 +545,13 @@ VIDEO_START( ldrun2 ) WRITE8_HANDLER( ldrun3_topbottom_mask_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->ldrun3_topbottom_mask = data & 1; } VIDEO_UPDATE( ldrun3 ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); VIDEO_UPDATE_CALL(ldrun); if (state->ldrun3_topbottom_mask) @@ -573,7 +573,7 @@ VIDEO_UPDATE( ldrun3 ) static TILE_GET_INFO( get_battroad_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; int flags; @@ -593,7 +593,7 @@ static TILE_GET_INFO( get_battroad_bg_tile_info ) static TILE_GET_INFO( get_battroad_fg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_textram[tile_index << 1]; @@ -603,7 +603,7 @@ static TILE_GET_INFO( get_battroad_fg_tile_info ) VIDEO_START( battroad ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); m62_start(machine, get_battroad_bg_tile_info, 1, 1, 8, 8, 64, 32); m62_textlayer(machine, get_battroad_fg_tile_info, 1, 1, 8, 8, 32, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -612,7 +612,7 @@ VIDEO_START( battroad ) VIDEO_UPDATE( battroad ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); tilemap_set_scrolly(state->bg_tilemap, 0, state->m62_background_vscroll); tilemap_set_scrollx(state->fg_tilemap, 0, 128); @@ -632,7 +632,7 @@ VIDEO_UPDATE( battroad ) /* no char x flip, and more sprites */ static TILE_GET_INFO( get_ldrun4_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_tileram[tile_index << 1]; @@ -647,7 +647,7 @@ VIDEO_START( ldrun4 ) VIDEO_UPDATE( ldrun4 ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll - 2); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); @@ -658,7 +658,7 @@ VIDEO_UPDATE( ldrun4 ) static TILE_GET_INFO( get_lotlot_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; int flags; @@ -674,7 +674,7 @@ static TILE_GET_INFO( get_lotlot_bg_tile_info ) static TILE_GET_INFO( get_lotlot_fg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_textram[tile_index << 1]; @@ -690,7 +690,7 @@ VIDEO_START( lotlot ) VIDEO_UPDATE( lotlot ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll - 64); tilemap_set_scrolly(state->bg_tilemap, 0, state->m62_background_vscroll + 32); tilemap_set_scrollx(state->fg_tilemap, 0, -64); @@ -706,19 +706,19 @@ VIDEO_UPDATE( lotlot ) WRITE8_HANDLER( kidniki_text_vscroll_low_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->kidniki_text_vscroll = (state->kidniki_text_vscroll & 0xff00) | data; } WRITE8_HANDLER( kidniki_text_vscroll_high_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->kidniki_text_vscroll = (state->kidniki_text_vscroll & 0xff) | (data << 8); } WRITE8_HANDLER( kidniki_background_bank_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); if (state->kidniki_background_bank != (data & 1)) { state->kidniki_background_bank = data & 1; @@ -728,7 +728,7 @@ WRITE8_HANDLER( kidniki_background_bank_w ) static TILE_GET_INFO( get_kidniki_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_tileram[tile_index << 1]; @@ -739,7 +739,7 @@ static TILE_GET_INFO( get_kidniki_bg_tile_info ) static TILE_GET_INFO( get_kidniki_fg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_textram[tile_index << 1]; @@ -749,7 +749,7 @@ static TILE_GET_INFO( get_kidniki_fg_tile_info ) VIDEO_START( kidniki ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_kidniki_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -762,7 +762,7 @@ VIDEO_START( kidniki ) VIDEO_UPDATE( kidniki ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); tilemap_set_scrollx(state->fg_tilemap, 0, -64); tilemap_set_scrolly(state->fg_tilemap, 0, state->kidniki_text_vscroll + 128); @@ -778,7 +778,7 @@ VIDEO_UPDATE( kidniki ) WRITE8_HANDLER( spelunkr_palbank_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); if (state->spelunkr_palbank != (data & 0x01)) { state->spelunkr_palbank = data & 0x01; @@ -789,7 +789,7 @@ WRITE8_HANDLER( spelunkr_palbank_w ) static TILE_GET_INFO( get_spelunkr_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_tileram[tile_index << 1]; @@ -799,7 +799,7 @@ static TILE_GET_INFO( get_spelunkr_bg_tile_info ) static TILE_GET_INFO( get_spelunkr_fg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_textram[tile_index << 1]; @@ -816,7 +816,7 @@ VIDEO_START( spelunkr ) VIDEO_UPDATE( spelunkr ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); tilemap_set_scrolly(state->bg_tilemap, 0, state->m62_background_vscroll + 128); tilemap_set_scrollx(state->fg_tilemap, 0, -64); @@ -832,7 +832,7 @@ VIDEO_UPDATE( spelunkr ) WRITE8_HANDLER( spelunk2_gfxport_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); m62_hscroll_high_w(space, 0, (data & 2) >> 1); m62_vscroll_high_w(space, 0, (data & 1)); if (state->spelunkr_palbank != ((data & 0x0c) >> 2)) @@ -845,7 +845,7 @@ WRITE8_HANDLER( spelunk2_gfxport_w ) static TILE_GET_INFO( get_spelunk2_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_tileram[tile_index << 1]; @@ -861,7 +861,7 @@ VIDEO_START( spelunk2 ) VIDEO_UPDATE( spelunk2 ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll - 1); tilemap_set_scrolly(state->bg_tilemap, 0, state->m62_background_vscroll + 128); tilemap_set_scrollx(state->fg_tilemap, 0, -65); @@ -877,7 +877,7 @@ VIDEO_UPDATE( spelunk2 ) static TILE_GET_INFO( get_youjyudn_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_tileram[tile_index << 1]; @@ -891,7 +891,7 @@ static TILE_GET_INFO( get_youjyudn_bg_tile_info ) static TILE_GET_INFO( get_youjyudn_fg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_textram[tile_index << 1]; @@ -901,7 +901,7 @@ static TILE_GET_INFO( get_youjyudn_fg_tile_info ) VIDEO_START( youjyudn ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); m62_start(machine, get_youjyudn_bg_tile_info, 1, 0, 8, 16, 64, 16); m62_textlayer(machine, get_youjyudn_fg_tile_info, 1, 1, 12, 8, 32, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ @@ -910,7 +910,7 @@ VIDEO_START( youjyudn ) VIDEO_UPDATE( youjyudn ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, state->m62_background_hscroll); tilemap_set_scrollx(state->fg_tilemap, 0, -64); tilemap_set_scrolly(state->fg_tilemap, 0, 0); @@ -926,13 +926,13 @@ VIDEO_UPDATE( youjyudn ) WRITE8_HANDLER( horizon_scrollram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->scrollram[offset] = data; } static TILE_GET_INFO( get_horizon_bg_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int code; int color; code = state->m62_tileram[tile_index << 1]; @@ -947,7 +947,7 @@ static TILE_GET_INFO( get_horizon_bg_tile_info ) VIDEO_START( horizon ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); m62_start(machine, get_horizon_bg_tile_info, 32, 0, 8, 8, 64, 32); tilemap_set_transmask(state->bg_tilemap, 0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ tilemap_set_transmask(state->bg_tilemap, 1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ @@ -955,7 +955,7 @@ VIDEO_START( horizon ) VIDEO_UPDATE( horizon ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); int i; for (i = 0; i < 32; i++) { diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index 6d8b06619c2..9b83cc6faee 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -8,7 +8,7 @@ WRITE32_HANDLER( macrossp_scra_videoram_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scra_videoram[offset]); @@ -18,7 +18,7 @@ WRITE32_HANDLER( macrossp_scra_videoram_w ) static TILE_GET_INFO( get_macrossp_scra_tile_info ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); UINT32 attr, tileno, color; attr = state->scra_videoram[tile_index]; @@ -46,7 +46,7 @@ static TILE_GET_INFO( get_macrossp_scra_tile_info ) WRITE32_HANDLER( macrossp_scrb_videoram_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scrb_videoram[offset]); @@ -56,7 +56,7 @@ WRITE32_HANDLER( macrossp_scrb_videoram_w ) static TILE_GET_INFO( get_macrossp_scrb_tile_info ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); UINT32 attr, tileno, color; attr = state->scrb_videoram[tile_index]; @@ -84,7 +84,7 @@ static TILE_GET_INFO( get_macrossp_scrb_tile_info ) WRITE32_HANDLER( macrossp_scrc_videoram_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scrc_videoram[offset]); @@ -94,7 +94,7 @@ WRITE32_HANDLER( macrossp_scrc_videoram_w ) static TILE_GET_INFO( get_macrossp_scrc_tile_info ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); UINT32 attr, tileno, color; attr = state->scrc_videoram[tile_index]; @@ -122,7 +122,7 @@ static TILE_GET_INFO( get_macrossp_scrc_tile_info ) WRITE32_HANDLER( macrossp_text_videoram_w ) { - macrossp_state *state = (macrossp_state *)space->machine->driver_data; + macrossp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->text_videoram[offset]); @@ -132,7 +132,7 @@ WRITE32_HANDLER( macrossp_text_videoram_w ) static TILE_GET_INFO( get_macrossp_text_tile_info ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); UINT32 tileno, colour; tileno = state->text_videoram[tile_index] & 0x0000ffff; @@ -147,7 +147,7 @@ static TILE_GET_INFO( get_macrossp_text_tile_info ) VIDEO_START( macrossp ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); state->spriteram_old = auto_alloc_array_clear(machine, UINT32, state->spriteram_size / 4); state->spriteram_old2 = auto_alloc_array_clear(machine, UINT32, state->spriteram_size / 4); @@ -175,7 +175,7 @@ VIDEO_START( macrossp ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; // UINT32 *source = state->spriteram; UINT32 *source = state->spriteram_old2; /* buffers by two frames */ @@ -322,7 +322,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void draw_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); tilemap_t *tm; UINT32 *vr; @@ -389,7 +389,7 @@ static void sortlayers(int *layer,int *pri) VIDEO_UPDATE( macrossp ) { - macrossp_state *state = (macrossp_state *)screen->machine->driver_data; + macrossp_state *state = screen->machine->driver_data(); int layers[3],layerpri[3]; bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -431,7 +431,7 @@ state->scrc_videoregs[2]);// 08 - 0b VIDEO_EOF( macrossp ) { - macrossp_state *state = (macrossp_state *)machine->driver_data; + macrossp_state *state = machine->driver_data(); /* looks like sprites are *two* frames ahead, like nmk16 */ memcpy(state->spriteram_old2, state->spriteram_old, state->spriteram_size); diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index eb49a12dc5d..812503da211 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -19,7 +19,7 @@ static TILEMAP_MAPPER( pf1_scan ) static TILE_GET_INFO( get_pf1_tile_info ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); int tile = state->pf1_data[tile_index]; int color = tile >> 12; @@ -41,7 +41,7 @@ static TILEMAP_MAPPER( pf2_scan ) static TILE_GET_INFO( get_pf2_tile_info ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); int tile = state->pf2_data[tile_index]; int color = tile >> 12; @@ -63,7 +63,7 @@ static TILEMAP_MAPPER( pf3_scan ) static TILE_GET_INFO( get_pf3_tile_info ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); int tile = state->pf3_data[tile_index]; int color = tile >> 12; @@ -85,7 +85,7 @@ static TILEMAP_MAPPER( pf3a_scan ) static TILE_GET_INFO( get_pf3a_tile_info ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); int tile = state->pf3_data[tile_index]; int color = tile >> 12; @@ -102,7 +102,7 @@ static TILE_GET_INFO( get_pf3a_tile_info ) VIDEO_START( madmotor ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_pf1_tile_info, pf1_scan, 8, 8, 64, 64); state->pf2_tilemap = tilemap_create(machine, get_pf2_tile_info, pf2_scan, 16, 16, 32, 32); @@ -118,7 +118,7 @@ VIDEO_START( madmotor ) WRITE16_HANDLER( madmotor_pf1_data_w ) { - madmotor_state *state = (madmotor_state *)space->machine->driver_data; + madmotor_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf1_data[offset]); tilemap_mark_tile_dirty(state->pf1_tilemap, offset); @@ -126,7 +126,7 @@ WRITE16_HANDLER( madmotor_pf1_data_w ) WRITE16_HANDLER( madmotor_pf2_data_w ) { - madmotor_state *state = (madmotor_state *)space->machine->driver_data; + madmotor_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf2_data[offset]); tilemap_mark_tile_dirty(state->pf2_tilemap, offset); @@ -134,7 +134,7 @@ WRITE16_HANDLER( madmotor_pf2_data_w ) WRITE16_HANDLER( madmotor_pf3_data_w ) { - madmotor_state *state = (madmotor_state *)space->machine->driver_data; + madmotor_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf3_data[offset]); @@ -149,7 +149,7 @@ WRITE16_HANDLER( madmotor_pf3_data_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri_mask, int pri_val ) { - madmotor_state *state = (madmotor_state *)machine->driver_data; + madmotor_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -224,7 +224,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( madmotor ) { - madmotor_state *state = (madmotor_state *)screen->machine->driver_data; + madmotor_state *state = screen->machine->driver_data(); int offs; /* Update flipscreen */ diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c index ab66cf285e4..ff8b6213e20 100644 --- a/src/mame/video/mainevt.c +++ b/src/mame/video/mainevt.c @@ -19,7 +19,7 @@ void mainevt_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); *flags = (*color & 0x02) ? TILE_FLIPX : 0; @@ -31,7 +31,7 @@ void mainevt_tile_callback( running_machine *machine, int layer, int bank, int * void dv_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); /* (color & 0x02) is flip y handled internally by the 052109 */ *code |= ((*color & 0x01) << 8) | ((*color & 0x3c) << 7); @@ -47,7 +47,7 @@ void dv_tile_callback( running_machine *machine, int layer, int bank, int *code, void mainevt_sprite_callback(running_machine *machine, int *code,int *color,int *priority_mask,int *shadow) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); /* bit 5 = priority over layer B (has precedence) */ /* bit 6 = HALF priority over layer B (used for crowd when you get out of the ring) */ @@ -64,7 +64,7 @@ void mainevt_sprite_callback(running_machine *machine, int *code,int *color,int void dv_sprite_callback(running_machine *machine, int *code,int *color,int *priority,int *shadow) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); /* TODO: the priority/shadow handling (bits 5-7) seems to be quite complex (see PROM) */ *color = state->sprite_colorbase + (*color & 0x07); @@ -75,7 +75,7 @@ void dv_sprite_callback(running_machine *machine, int *code,int *color,int *prio VIDEO_START( mainevt ) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; state->layer_colorbase[1] = 8; state->layer_colorbase[2] = 4; @@ -84,7 +84,7 @@ VIDEO_START( mainevt ) VIDEO_START( dv ) { - mainevt_state *state = (mainevt_state *)machine->driver_data; + mainevt_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; state->layer_colorbase[1] = 0; state->layer_colorbase[2] = 4; @@ -95,7 +95,7 @@ VIDEO_START( dv ) VIDEO_UPDATE( mainevt ) { - mainevt_state *state = (mainevt_state *)screen->machine->driver_data; + mainevt_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); @@ -111,7 +111,7 @@ VIDEO_UPDATE( mainevt ) VIDEO_UPDATE( dv ) { - mainevt_state *state = (mainevt_state *)screen->machine->driver_data; + mainevt_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c index b2d8dda02a8..7cb4ba1eda8 100644 --- a/src/mame/video/malzak.c +++ b/src/mame/video/malzak.c @@ -20,7 +20,7 @@ VIDEO_UPDATE( malzak ) { - malzak_state *state = (malzak_state *)screen->machine->driver_data; + malzak_state *state = screen->machine->driver_data(); int sx, sy; int x,y; bitmap_t *s2636_0_bitmap; @@ -77,7 +77,7 @@ VIDEO_UPDATE( malzak ) WRITE8_HANDLER( malzak_playfield_w ) { - malzak_state *state = (malzak_state *)space->machine->driver_data; + malzak_state *state = space->machine->driver_data(); int tile = ((state->malzak_x / 16) * 16) + (offset / 16); // state->playfield_x[tile] = state->malzak_x / 16; diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index 3f2add652ce..ae87d9eb6c3 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -270,7 +270,7 @@ static TILEMAP_MAPPER( mappy_tilemap_scan ) static TILE_GET_INFO( superpac_get_tile_info ) { - mappy_state *state = (mappy_state *)machine->driver_data; + mappy_state *state = machine->driver_data(); UINT8 attr = state->videoram[tile_index + 0x400]; tileinfo->category = (attr & 0x40) >> 6; @@ -284,7 +284,7 @@ static TILE_GET_INFO( superpac_get_tile_info ) static TILE_GET_INFO( phozon_get_tile_info ) { - mappy_state *state = (mappy_state *)machine->driver_data; + mappy_state *state = machine->driver_data(); UINT8 attr = state->videoram[tile_index + 0x400]; tileinfo->category = (attr & 0x40) >> 6; @@ -298,7 +298,7 @@ static TILE_GET_INFO( phozon_get_tile_info ) static TILE_GET_INFO( mappy_get_tile_info ) { - mappy_state *state = (mappy_state *)machine->driver_data; + mappy_state *state = machine->driver_data(); UINT8 attr = state->videoram[tile_index + 0x800]; tileinfo->category = (attr & 0x40) >> 6; @@ -320,7 +320,7 @@ static TILE_GET_INFO( mappy_get_tile_info ) VIDEO_START( superpac ) { - mappy_state *state = (mappy_state *)machine->driver_data; + mappy_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, superpac_get_tile_info,superpac_tilemap_scan,8,8,36,28); state->sprite_bitmap = machine->primary_screen->alloc_compatible_bitmap(); @@ -330,7 +330,7 @@ VIDEO_START( superpac ) VIDEO_START( phozon ) { - mappy_state *state = (mappy_state *)machine->driver_data; + mappy_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, phozon_get_tile_info,superpac_tilemap_scan,8,8,36,28); @@ -341,7 +341,7 @@ VIDEO_START( phozon ) VIDEO_START( mappy ) { - mappy_state *state = (mappy_state *)machine->driver_data; + mappy_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, mappy_get_tile_info,mappy_tilemap_scan,8,8,36,60); @@ -359,7 +359,7 @@ VIDEO_START( mappy ) WRITE8_HANDLER( superpac_videoram_w ) { - mappy_state *state = (mappy_state *)space->machine->driver_data; + mappy_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset & 0x3ff); @@ -367,7 +367,7 @@ WRITE8_HANDLER( superpac_videoram_w ) WRITE8_HANDLER( mappy_videoram_w ) { - mappy_state *state = (mappy_state *)space->machine->driver_data; + mappy_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset & 0x7ff); @@ -386,7 +386,7 @@ READ8_HANDLER( superpac_flipscreen_r ) WRITE8_HANDLER( mappy_scroll_w ) { - mappy_state *state = (mappy_state *)space->machine->driver_data; + mappy_state *state = space->machine->driver_data(); state->scroll = offset >> 3; } @@ -537,7 +537,7 @@ static void phozon_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( superpac ) { - mappy_state *state = (mappy_state *)screen->machine->driver_data; + mappy_state *state = screen->machine->driver_data(); bitmap_t *sprite_bitmap = state->sprite_bitmap; int x,y; @@ -567,7 +567,7 @@ VIDEO_UPDATE( superpac ) VIDEO_UPDATE( phozon ) { - mappy_state *state = (mappy_state *)screen->machine->driver_data; + mappy_state *state = screen->machine->driver_data(); /* flip screen control is embedded in RAM */ flip_screen_set(screen->machine, state->spriteram[0x1f7f-0x800] & 1); @@ -586,7 +586,7 @@ VIDEO_UPDATE( phozon ) VIDEO_UPDATE( mappy ) { - mappy_state *state = (mappy_state *)screen->machine->driver_data; + mappy_state *state = screen->machine->driver_data(); int offs; tilemap_set_scrolldx(state->bg_tilemap, 0, 96); diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index ab785f1df87..b8f9d8ea921 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -18,7 +18,7 @@ static TILE_GET_INFO( get_tile_info ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); UINT8 code = state->videoram[tile_index]; UINT8 col = state->colorram[tile_index]; @@ -39,7 +39,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( marineb ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->bg_tilemap, 32); @@ -60,7 +60,7 @@ VIDEO_START( marineb ) WRITE8_HANDLER( marineb_videoram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -69,7 +69,7 @@ WRITE8_HANDLER( marineb_videoram_w ) WRITE8_HANDLER( marineb_colorram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -78,14 +78,14 @@ WRITE8_HANDLER( marineb_colorram_w ) WRITE8_HANDLER( marineb_column_scroll_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->column_scroll = data; } WRITE8_HANDLER( marineb_palette_bank_0_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); UINT8 old = state->palette_bank; state->palette_bank = (state->palette_bank & 0x02) | (data & 0x01); @@ -99,7 +99,7 @@ WRITE8_HANDLER( marineb_palette_bank_0_w ) WRITE8_HANDLER( marineb_palette_bank_1_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); UINT8 old = state->palette_bank; state->palette_bank = (state->palette_bank & 0x01) | ((data & 0x01) << 1); @@ -113,7 +113,7 @@ WRITE8_HANDLER( marineb_palette_bank_1_w ) WRITE8_HANDLER( marineb_flipscreen_x_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->flipscreen_x = data ^ state->marineb_active_low_flipscreen; tilemap_set_flip(state->bg_tilemap, (state->flipscreen_x ? TILEMAP_FLIPX : 0) | (state->flipscreen_y ? TILEMAP_FLIPY : 0)); @@ -122,7 +122,7 @@ WRITE8_HANDLER( marineb_flipscreen_x_w ) WRITE8_HANDLER( marineb_flipscreen_y_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->flipscreen_y = data ^ state->marineb_active_low_flipscreen; tilemap_set_flip(state->bg_tilemap, (state->flipscreen_x ? TILEMAP_FLIPX : 0) | (state->flipscreen_y ? TILEMAP_FLIPY : 0)); @@ -138,7 +138,7 @@ WRITE8_HANDLER( marineb_flipscreen_y_w ) static void set_tilemap_scrolly( running_machine *machine, int cols ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); int col; for (col = 0; col < cols; col++) @@ -151,7 +151,7 @@ static void set_tilemap_scrolly( running_machine *machine, int cols ) VIDEO_UPDATE( marineb ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); int offs; set_tilemap_scrolly(screen->machine, 24); @@ -213,7 +213,7 @@ VIDEO_UPDATE( marineb ) VIDEO_UPDATE( changes ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); int offs, sx, sy, code, col, flipx, flipy; set_tilemap_scrolly(screen->machine, 26); @@ -292,7 +292,7 @@ VIDEO_UPDATE( changes ) VIDEO_UPDATE( springer ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); int offs; set_tilemap_scrolly(screen->machine, 0); @@ -352,7 +352,7 @@ VIDEO_UPDATE( springer ) VIDEO_UPDATE( hoccer ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); int offs; set_tilemap_scrolly(screen->machine, 0); @@ -396,7 +396,7 @@ VIDEO_UPDATE( hoccer ) VIDEO_UPDATE( hopprobo ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); int offs; set_tilemap_scrolly(screen->machine, 0); diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index 3f91979ad90..60befd2085b 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -79,7 +79,7 @@ PALETTE_INIT( mario ) WRITE8_HANDLER( mario_videoram_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -87,7 +87,7 @@ WRITE8_HANDLER( mario_videoram_w ) WRITE8_HANDLER( mario_gfxbank_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); if (state->gfx_bank != (data & 0x01)) { @@ -98,7 +98,7 @@ WRITE8_HANDLER( mario_gfxbank_w ) WRITE8_HANDLER( mario_palettebank_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); if (state->palette_bank != (data & 0x01)) { @@ -109,14 +109,14 @@ WRITE8_HANDLER( mario_palettebank_w ) WRITE8_HANDLER( mario_scroll_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); state->gfx_scroll = data + 17; } WRITE8_HANDLER( mario_flip_w ) { - mario_state *state = (mario_state *)space->machine->driver_data; + mario_state *state = space->machine->driver_data(); if (state->flip != (data & 0x01)) { @@ -131,7 +131,7 @@ WRITE8_HANDLER( mario_flip_w ) static TILE_GET_INFO( get_bg_tile_info ) { - mario_state *state = (mario_state *)machine->driver_data; + mario_state *state = machine->driver_data(); int code = state->videoram[tile_index] + 256 * state->gfx_bank; int color; @@ -142,7 +142,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mario ) { - mario_state *state = (mario_state *)machine->driver_data; + mario_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -166,7 +166,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta /* TODO: draw_sprites should adopt the scanline logic from dkong.c * The schematics have the same logic for sprite buffering. */ - mario_state *state = (mario_state *)machine->driver_data; + mario_state *state = machine->driver_data(); int offs; for (offs = 0;offs < state->spriteram_size;offs += 4) @@ -210,7 +210,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mario ) { - mario_state *state = (mario_state *)screen->machine->driver_data; + mario_state *state = screen->machine->driver_data(); int t; t = input_port_read(screen->machine, "MONITOR"); diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c index d255000f493..5b0c9922d16 100644 --- a/src/mame/video/markham.c +++ b/src/mame/video/markham.c @@ -41,7 +41,7 @@ PALETTE_INIT( markham ) WRITE8_HANDLER( markham_videoram_w ) { - markham_state *state = (markham_state *)space->machine->driver_data; + markham_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -57,7 +57,7 @@ WRITE8_HANDLER( markham_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - markham_state *state = (markham_state *)machine->driver_data; + markham_state *state = machine->driver_data(); int attr = state->videoram[tile_index * 2]; int code = state->videoram[(tile_index * 2) + 1] + ((attr & 0x60) << 3); int color = (attr & 0x1f) | ((attr & 0x80) >> 2); @@ -67,7 +67,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( markham ) { - markham_state *state = (markham_state *)machine->driver_data; + markham_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 8, 8, 32, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); @@ -75,7 +75,7 @@ VIDEO_START( markham ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - markham_state *state = (markham_state *)machine->driver_data; + markham_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -119,7 +119,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( markham ) { - markham_state *state = (markham_state *)screen->machine->driver_data; + markham_state *state = screen->machine->driver_data(); int i; for (i = 0; i < 32; i++) diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c index 5fb3e31118b..adc95cc787e 100644 --- a/src/mame/video/matmania.c +++ b/src/mame/video/matmania.c @@ -74,7 +74,7 @@ PALETTE_INIT( matmania ) WRITE8_HANDLER( matmania_paletteram_w ) { - matmania_state *state = (matmania_state *)space->machine->driver_data; + matmania_state *state = space->machine->driver_data(); int bit0, bit1, bit2, bit3, val; int r, g, b; int offs2; @@ -115,7 +115,7 @@ WRITE8_HANDLER( matmania_paletteram_w ) VIDEO_START( matmania ) { - matmania_state *state = (matmania_state *)machine->driver_data; + matmania_state *state = machine->driver_data(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); bitmap_format format = machine->primary_screen->format(); @@ -129,7 +129,7 @@ VIDEO_START( matmania ) VIDEO_UPDATE( matmania ) { - matmania_state *state = (matmania_state *)screen->machine->driver_data; + matmania_state *state = screen->machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -201,7 +201,7 @@ VIDEO_UPDATE( matmania ) VIDEO_UPDATE( maniach ) { - matmania_state *state = (matmania_state *)screen->machine->driver_data; + matmania_state *state = screen->machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 062ccdb15ba..9bda2973318 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -16,7 +16,7 @@ ToDo: Fix Sprites & Rowscroll/Select for Cocktail static TILE_GET_INFO( get_mcatadv_tile_info1 ) { - mcatadv_state *state = (mcatadv_state *)machine->driver_data; + mcatadv_state *state = machine->driver_data(); int tileno = state->videoram1[tile_index * 2 + 1]; int colour = (state->videoram1[tile_index * 2] & 0x3f00) >> 8; int pri = (state->videoram1[tile_index * 2] & 0xc000) >> 14; @@ -27,7 +27,7 @@ static TILE_GET_INFO( get_mcatadv_tile_info1 ) WRITE16_HANDLER( mcatadv_videoram1_w ) { - mcatadv_state *state = (mcatadv_state *)space->machine->driver_data; + mcatadv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram1[offset]); tilemap_mark_tile_dirty(state->tilemap1, offset / 2); @@ -35,7 +35,7 @@ WRITE16_HANDLER( mcatadv_videoram1_w ) static TILE_GET_INFO( get_mcatadv_tile_info2 ) { - mcatadv_state *state = (mcatadv_state *)machine->driver_data; + mcatadv_state *state = machine->driver_data(); int tileno = state->videoram2[tile_index * 2 + 1]; int colour = (state->videoram2[tile_index * 2] & 0x3f00) >> 8; int pri = (state->videoram2[tile_index * 2] & 0xc000) >> 14; @@ -46,7 +46,7 @@ static TILE_GET_INFO( get_mcatadv_tile_info2 ) WRITE16_HANDLER( mcatadv_videoram2_w ) { - mcatadv_state *state = (mcatadv_state *)space->machine->driver_data; + mcatadv_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram2[offset]); tilemap_mark_tile_dirty(state->tilemap2, offset / 2); @@ -55,7 +55,7 @@ WRITE16_HANDLER( mcatadv_videoram2_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mcatadv_state *state = (mcatadv_state *)machine->driver_data; + mcatadv_state *state = machine->driver_data(); UINT16 *source = state->spriteram_old; UINT16 *finish = source + (state->spriteram_size / 2) / 2; int global_x = state->vidregs[0] - 0x184; @@ -202,7 +202,7 @@ static void mcatadv_draw_tilemap_part( UINT16* current_scroll, UINT16* current_v VIDEO_UPDATE( mcatadv ) { - mcatadv_state *state = (mcatadv_state *)screen->machine->driver_data; + mcatadv_state *state = screen->machine->driver_data(); int i; bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -252,7 +252,7 @@ VIDEO_UPDATE( mcatadv ) VIDEO_START( mcatadv ) { - mcatadv_state *state = (mcatadv_state *)machine->driver_data; + mcatadv_state *state = machine->driver_data(); state->tilemap1 = tilemap_create(machine, get_mcatadv_tile_info1, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transparent_pen(state->tilemap1, 0); @@ -271,7 +271,7 @@ VIDEO_START( mcatadv ) VIDEO_EOF( mcatadv ) { - mcatadv_state *state = (mcatadv_state *)machine->driver_data; + mcatadv_state *state = machine->driver_data(); memcpy(state->spriteram_old, state->spriteram, state->spriteram_size); memcpy(state->vidregs_old, state->vidregs, 0xf); } diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c index f47614aba4e..0dbc0eecabb 100644 --- a/src/mame/video/megazone.c +++ b/src/mame/video/megazone.c @@ -98,13 +98,13 @@ PALETTE_INIT( megazone ) WRITE8_HANDLER( megazone_flipscreen_w ) { - megazone_state *state = (megazone_state *)space->machine->driver_data; + megazone_state *state = space->machine->driver_data(); state->flipscreen = data & 1; } VIDEO_START( megazone ) { - megazone_state *state = (megazone_state *)machine->driver_data; + megazone_state *state = machine->driver_data(); state->tmpbitmap = auto_bitmap_alloc(machine, 256, 256, machine->primary_screen->format()); state_save_register_global_bitmap(machine, state->tmpbitmap); @@ -113,7 +113,7 @@ VIDEO_START( megazone ) VIDEO_UPDATE( megazone ) { - megazone_state *state = (megazone_state *)screen->machine->driver_data; + megazone_state *state = screen->machine->driver_data(); int offs; int x, y; diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 44a93e34d3e..6f902912b28 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -46,21 +46,21 @@ PALETTE_INIT( mermaid ) WRITE8_HANDLER( mermaid_videoram2_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( mermaid_videoram_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( mermaid_colorram_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -77,27 +77,27 @@ WRITE8_HANDLER( mermaid_flip_screen_y_w ) WRITE8_HANDLER( mermaid_bg_scroll_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->bg_scrollram[offset] = data; tilemap_set_scrolly(state->bg_tilemap, offset, data); } WRITE8_HANDLER( mermaid_fg_scroll_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->fg_scrollram[offset] = data; tilemap_set_scrolly(state->fg_tilemap, offset, data); } WRITE8_HANDLER( rougien_gfxbankswitch1_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->rougien_gfxbank1 = data & 0x01; } WRITE8_HANDLER( rougien_gfxbankswitch2_w ) { - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); state->rougien_gfxbank2 = data & 0x01; } @@ -118,7 +118,7 @@ READ8_HANDLER( mermaid_collision_r ) Bit 7 */ - mermaid_state *state = (mermaid_state *)space->machine->driver_data; + mermaid_state *state = space->machine->driver_data(); int collision = 0xff; if (state->coll_bit0) collision ^= 0x01; @@ -132,7 +132,7 @@ READ8_HANDLER( mermaid_collision_r ) static TILE_GET_INFO( get_bg_tile_info ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); int code = state->videoram2[tile_index]; int sx = tile_index % 32; int color = (sx >= 26) ? 0 : 1; @@ -142,7 +142,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0x30) << 4); int color = attr & 0x0f; @@ -156,7 +156,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( mermaid ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->bg_tilemap, 32); @@ -171,7 +171,7 @@ VIDEO_START( mermaid ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -210,7 +210,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( mermaid ) { - mermaid_state *state = (mermaid_state *)screen->machine->driver_data; + mermaid_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); @@ -220,7 +220,7 @@ VIDEO_UPDATE( mermaid ) static UINT8 collision_check( running_machine *machine, rectangle* rect ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); UINT8 data = 0; int x; @@ -242,7 +242,7 @@ static UINT8 collision_check( running_machine *machine, rectangle* rect ) VIDEO_EOF( mermaid ) { - mermaid_state *state = (mermaid_state *)machine->driver_data; + mermaid_state *state = machine->driver_data(); const rectangle &visarea = machine->primary_screen->visible_area(); UINT8 *spriteram = state->spriteram; diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 16881404e8a..1dcb127f592 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -24,7 +24,7 @@ WRITE8_HANDLER( metlclsh_rambank_w ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); if (data & 1) { @@ -40,7 +40,7 @@ WRITE8_HANDLER( metlclsh_rambank_w ) WRITE8_HANDLER( metlclsh_gfxbank_w ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); if (!(data & 4) && (state->gfxbank != data)) { @@ -73,13 +73,13 @@ static TILEMAP_MAPPER( metlclsh_bgtilemap_scan ) static TILE_GET_INFO( get_bg_tile_info ) { - metlclsh_state *state = (metlclsh_state *)machine->driver_data; + metlclsh_state *state = machine->driver_data(); SET_TILE_INFO(1, state->bgram[tile_index] + (state->gfxbank << 7), 0, 0); } WRITE8_HANDLER( metlclsh_bgram_w ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); /* This ram is banked: it's either the tilemap (e401 = 1) or bit n of another area (e401 = n << 1)? (that I don't understand) */ @@ -117,7 +117,7 @@ WRITE8_HANDLER( metlclsh_bgram_w ) static TILE_GET_INFO( get_fg_tile_info ) { - metlclsh_state *state = (metlclsh_state *)machine->driver_data; + metlclsh_state *state = machine->driver_data(); UINT8 code = state->fgram[tile_index + 0x000]; UINT8 attr = state->fgram[tile_index + 0x400]; SET_TILE_INFO(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0); @@ -126,7 +126,7 @@ static TILE_GET_INFO( get_fg_tile_info ) WRITE8_HANDLER( metlclsh_fgram_w ) { - metlclsh_state *state = (metlclsh_state *)space->machine->driver_data; + metlclsh_state *state = space->machine->driver_data(); state->fgram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); } @@ -140,7 +140,7 @@ WRITE8_HANDLER( metlclsh_fgram_w ) VIDEO_START( metlclsh ) { - metlclsh_state *state = (metlclsh_state *)machine->driver_data; + metlclsh_state *state = machine->driver_data(); state->otherram = auto_alloc_array(machine, UINT8, 0x800); // banked ram @@ -176,7 +176,7 @@ VIDEO_START( metlclsh ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - metlclsh_state *state = (metlclsh_state *)machine->driver_data; + metlclsh_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; gfx_element *gfx = machine->gfx[0]; int offs; @@ -244,7 +244,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( metlclsh ) { - metlclsh_state *state = (metlclsh_state *)screen->machine->driver_data; + metlclsh_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0x10); diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 99ec39d2ad1..d757c9725e3 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -57,7 +57,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: static TILE_GET_INFO( metro_k053936_get_tile_info ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); int code = state->k053936_ram[tile_index]; SET_TILE_INFO( @@ -69,7 +69,7 @@ static TILE_GET_INFO( metro_k053936_get_tile_info ) static TILE_GET_INFO( metro_k053936_gstrik2_get_tile_info ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); int code = state->k053936_ram[tile_index]; SET_TILE_INFO( @@ -81,7 +81,7 @@ static TILE_GET_INFO( metro_k053936_gstrik2_get_tile_info ) WRITE16_HANDLER( metro_k053936_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); COMBINE_DATA(&state->k053936_ram[offset]); tilemap_mark_tile_dirty(state->k053936_tilemap, offset); } @@ -144,7 +144,7 @@ static TILEMAP_MAPPER( tilemap_scan_gstrik2 ) // returns if to draw the pixel or not, pixel colour is placed in pix INLINE UINT8 get_tile_pix( running_machine *machine, UINT16 code, UINT8 x, UINT8 y, int big, UINT16* pix ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); int table_index; UINT32 tile; @@ -250,16 +250,16 @@ INLINE void metro_vram_w( running_machine *machine, offs_t offset, UINT16 data, COMBINE_DATA(&vram[offset]); } -WRITE16_HANDLER( metro_vram_0_w ) { metro_state *state = (metro_state *)space->machine->driver_data; metro_vram_w(space->machine, offset, data, mem_mask, 0, state->vram_0); } -WRITE16_HANDLER( metro_vram_1_w ) { metro_state *state = (metro_state *)space->machine->driver_data; metro_vram_w(space->machine, offset, data, mem_mask, 1, state->vram_1); } -WRITE16_HANDLER( metro_vram_2_w ) { metro_state *state = (metro_state *)space->machine->driver_data; metro_vram_w(space->machine, offset, data, mem_mask, 2, state->vram_2); } +WRITE16_HANDLER( metro_vram_0_w ) { metro_state *state = space->machine->driver_data(); metro_vram_w(space->machine, offset, data, mem_mask, 0, state->vram_0); } +WRITE16_HANDLER( metro_vram_1_w ) { metro_state *state = space->machine->driver_data(); metro_vram_w(space->machine, offset, data, mem_mask, 1, state->vram_1); } +WRITE16_HANDLER( metro_vram_2_w ) { metro_state *state = space->machine->driver_data(); metro_vram_w(space->machine, offset, data, mem_mask, 2, state->vram_2); } /* Dirty the relevant tilemap when its window changes */ WRITE16_HANDLER( metro_window_w ) { - metro_state *state = (metro_state *)space->machine->driver_data; + metro_state *state = space->machine->driver_data(); COMBINE_DATA(&state->window[offset]); } @@ -286,7 +286,7 @@ WRITE16_HANDLER( metro_window_w ) VIDEO_START( metro_14100 ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->support_8bpp = 0; state->support_16x16 = 0; @@ -307,7 +307,7 @@ VIDEO_START( metro_14100 ) VIDEO_START( metro_14220 ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->support_8bpp = 1; state->support_16x16 = 0; @@ -328,7 +328,7 @@ VIDEO_START( metro_14220 ) VIDEO_START( metro_14300 ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); state->support_8bpp = 1; state->support_16x16 = 1; @@ -349,7 +349,7 @@ VIDEO_START( metro_14300 ) VIDEO_START( blzntrnd ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); VIDEO_START_CALL(metro_14220); @@ -364,7 +364,7 @@ VIDEO_START( blzntrnd ) VIDEO_START( gstrik2 ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); VIDEO_START_CALL(metro_14220); @@ -441,7 +441,7 @@ VIDEO_START( gstrik2 ) void metro_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); UINT8 *base_gfx = memory_region(machine, "gfx1"); UINT8 *gfx_max = base_gfx + memory_region_length(machine, "gfx1"); @@ -592,7 +592,7 @@ void metro_draw_sprites( running_machine *machine, bitmap_t *bitmap, const recta static void draw_tilemap( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 flags, UINT32 pcode, int sx, int sy, int wx, int wy, int big, UINT16* tilemapram, int layer ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); int y; bitmap_t *priority_bitmap = machine->priority_bitmap; @@ -688,7 +688,7 @@ static void draw_tilemap( running_machine *machine, bitmap_t *bitmap, const rect /* Draw all the layers that match the given priority */ static void draw_layers( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri, int layers_ctrl ) { - metro_state *state = (metro_state *)machine->driver_data; + metro_state *state = machine->driver_data(); UINT16 layers_pri = state->videoregs[0x10 / 2]; int layer; @@ -722,7 +722,7 @@ static void draw_layers( running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( metro ) { - metro_state *state = (metro_state *)screen->machine->driver_data; + metro_state *state = screen->machine->driver_data(); int pri, layers_ctrl = -1; UINT16 screenctrl = *state->screenctrl; diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index 216a528911d..acb3c0c4ae6 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -4,7 +4,7 @@ WRITE8_HANDLER( mexico86_bankswitch_w ) { - mexico86_state *state = (mexico86_state *)space->machine->driver_data; + mexico86_state *state = space->machine->driver_data(); if ((data & 7) > 5) popmessage("Switching to invalid bank!"); @@ -18,7 +18,7 @@ WRITE8_HANDLER( mexico86_bankswitch_w ) VIDEO_UPDATE( mexico86 ) { - mexico86_state *state = (mexico86_state *)screen->machine->driver_data; + mexico86_state *state = screen->machine->driver_data(); int offs; int sx, sy, xc, yc; int gfx_num, gfx_attr, gfx_offs; @@ -101,7 +101,7 @@ VIDEO_UPDATE( mexico86 ) VIDEO_UPDATE( kikikai ) { - mexico86_state *state = (mexico86_state *)screen->machine->driver_data; + mexico86_state *state = screen->machine->driver_data(); int offs; int sx, sy, yc; int gfx_num, /*gfx_attr,*/ gfx_offs; diff --git a/src/mame/video/micro3d.c b/src/mame/video/micro3d.c index 0a98051ba07..3b2b8833df0 100644 --- a/src/mame/video/micro3d.c +++ b/src/mame/video/micro3d.c @@ -37,7 +37,7 @@ enum VIDEO_START( micro3d ) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); /* Allocate 512x12 x 2 3D frame buffers */ state->frame_buffers[0] = auto_alloc_array(machine, UINT16, 1024 * 512); @@ -48,7 +48,7 @@ VIDEO_START( micro3d ) VIDEO_RESET( micro3d ) { - micro3d_state *state = (micro3d_state*)machine->driver_data; + micro3d_state *state = machine->driver_data(); state->pipeline_state = 0; state->creg = 0; @@ -66,7 +66,7 @@ VIDEO_RESET( micro3d ) void micro3d_scanline_update(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params) { - micro3d_state *state = (micro3d_state*)screen.machine->driver_data; + micro3d_state *state = screen.machine->driver_data(); UINT16 *src = &state->micro3d_sprite_vram[(params->rowaddr << 8) & 0x7fe00]; UINT16 *dest = BITMAP_ADDR16(bitmap, scanline, 0); @@ -118,7 +118,7 @@ WRITE16_HANDLER( micro3d_clut_w ) WRITE16_HANDLER( micro3d_creg_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); if (~data & 0x80) cputag_set_input_line(space->machine, "vgb", 0, CLEAR_LINE); @@ -128,7 +128,7 @@ WRITE16_HANDLER( micro3d_creg_w ) WRITE16_HANDLER( micro3d_xfer3dk_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->xfer3dk = data; } @@ -648,7 +648,7 @@ bc000000-1fc DPRAM address for read access WRITE32_HANDLER( micro3d_fifo_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); UINT32 opcode = data >> 24; switch (state->draw_state) @@ -749,14 +749,14 @@ WRITE32_HANDLER( micro3d_fifo_w ) WRITE32_HANDLER( micro3d_alt_fifo_w ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); state->vtx_fifo[state->fifo_idx++] = VTX_SEX(data); } READ32_HANDLER( micro3d_pipe_r ) { - micro3d_state *state = (micro3d_state*)space->machine->driver_data; + micro3d_state *state = space->machine->driver_data(); cputag_set_input_line(space->machine, "drmath", AM29000_INTR1, CLEAR_LINE); return state->pipe_data; @@ -765,7 +765,7 @@ READ32_HANDLER( micro3d_pipe_r ) INTERRUPT_GEN( micro3d_vblank ) { // mc68901_int_gen(device->machine, GPIP7); - micro3d_state *state = (micro3d_state*)device->machine->driver_data; + micro3d_state *state = device->machine->driver_data(); state->display_buffer = state->drawing_buffer ^ 1; } diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index 9fc71a1b585..b87cda692d8 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -89,7 +89,7 @@ PALETTE_INIT( mikie ) WRITE8_HANDLER( mikie_videoram_w ) { - mikie_state *state = (mikie_state *)space->machine->driver_data; + mikie_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -97,7 +97,7 @@ WRITE8_HANDLER( mikie_videoram_w ) WRITE8_HANDLER( mikie_colorram_w ) { - mikie_state *state = (mikie_state *)space->machine->driver_data; + mikie_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -105,7 +105,7 @@ WRITE8_HANDLER( mikie_colorram_w ) WRITE8_HANDLER( mikie_palettebank_w ) { - mikie_state *state = (mikie_state *)space->machine->driver_data; + mikie_state *state = space->machine->driver_data(); if (state->palettebank != (data & 0x07)) { @@ -125,7 +125,7 @@ WRITE8_HANDLER( mikie_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - mikie_state *state = (mikie_state *)machine->driver_data; + mikie_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x20) << 3); int color = (state->colorram[tile_index] & 0x0f) + 16 * state->palettebank; int flags = ((state->colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((state->colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); @@ -141,13 +141,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mikie ) { - mikie_state *state = (mikie_state *)machine->driver_data; + mikie_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - mikie_state *state = (mikie_state *)machine->driver_data; + mikie_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -177,7 +177,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( mikie ) { - mikie_state *state = (mikie_state *)screen->machine->driver_data; + mikie_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_CATEGORY(0), 0); draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_CATEGORY(1), 0); diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index c7530beadf5..23acc09ac49 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -16,7 +16,7 @@ static TILE_GET_INFO( get_tile_info ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); UINT8 attr = state->colorram[tile_index]; int code = state->videoram[2 * tile_index] + (state->videoram[2 * tile_index + 1] << 8); SET_TILE_INFO( @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( pang ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(state->bg_tilemap, 15); @@ -65,7 +65,7 @@ VIDEO_START( pang ) WRITE8_HANDLER( pang_video_bank_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); /* Bank handler (sets base pointers for video write) (doesn't apply to mgakuen) */ state->video_bank = data; @@ -73,7 +73,7 @@ WRITE8_HANDLER( pang_video_bank_w ) WRITE8_HANDLER( mstworld_video_bank_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); /* Monsters World seems to freak out if more bits are used.. */ state->video_bank = data & 1; @@ -82,7 +82,7 @@ WRITE8_HANDLER( mstworld_video_bank_w ) WRITE8_HANDLER( mgakuen_videoram_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -90,25 +90,25 @@ WRITE8_HANDLER( mgakuen_videoram_w ) READ8_HANDLER( mgakuen_videoram_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); return state->videoram[offset]; } WRITE8_HANDLER( mgakuen_objram_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); state->objram[offset] = data; } READ8_HANDLER( mgakuen_objram_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); return state->objram[offset]; } WRITE8_HANDLER( pang_videoram_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); if (state->video_bank) mgakuen_objram_w(space, offset, data); @@ -118,7 +118,7 @@ WRITE8_HANDLER( pang_videoram_w ) READ8_HANDLER( pang_videoram_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); if (state->video_bank) return mgakuen_objram_r(space, offset); @@ -132,7 +132,7 @@ READ8_HANDLER( pang_videoram_r ) WRITE8_HANDLER( pang_colorram_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -140,7 +140,7 @@ WRITE8_HANDLER( pang_colorram_w ) READ8_HANDLER( pang_colorram_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); return state->colorram[offset]; } @@ -150,7 +150,7 @@ READ8_HANDLER( pang_colorram_r ) WRITE8_HANDLER( pang_gfxctrl_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); { @@ -190,7 +190,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); WRITE8_HANDLER( pangbl_gfxctrl_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); { @@ -228,7 +228,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); WRITE8_HANDLER( mstworld_gfxctrl_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); { @@ -264,7 +264,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",cpu_get_pc(space->cpu),data); WRITE8_HANDLER( pang_paletteram_w ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); if (state->paletteram_bank) paletteram_xxxxRRRRGGGGBBBB_le_w(space, offset + 0x800, data); @@ -274,7 +274,7 @@ WRITE8_HANDLER( pang_paletteram_w ) READ8_HANDLER( pang_paletteram_r ) { - mitchell_state *state = (mitchell_state *)space->machine->driver_data; + mitchell_state *state = space->machine->driver_data(); if (state->paletteram_bank) return space->machine->generic.paletteram.u8[offset + 0x800]; @@ -302,7 +302,7 @@ READ8_HANDLER( mgakuen_paletteram_r ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mitchell_state *state = (mitchell_state *)machine->driver_data; + mitchell_state *state = machine->driver_data(); int offs, sx, sy; /* the last entry is not a sprite, we skip it otherwise spang shows a bubble */ @@ -330,7 +330,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( pang ) { - mitchell_state *state = (mitchell_state *)screen->machine->driver_data; + mitchell_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, 0); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index cde6259c7da..65a1553466f 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -14,7 +14,7 @@ static tilemap_t *bg_tilemap; static TILE_GET_INFO( get_tile_info ) { - mjkjidai_state *state = (mjkjidai_state *)machine->driver_data; + mjkjidai_state *state = machine->driver_data(); int attr = state->videoram[tile_index + 0x800]; int code = state->videoram[tile_index] + ((attr & 0x1f) << 8); @@ -45,7 +45,7 @@ VIDEO_START( mjkjidai ) WRITE8_HANDLER( mjkjidai_videoram_w ) { - mjkjidai_state *state = (mjkjidai_state *)space->machine->driver_data; + mjkjidai_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(bg_tilemap,offset & 0x7ff); @@ -91,7 +91,7 @@ WRITE8_HANDLER( mjkjidai_ctrl_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - mjkjidai_state *state = (mjkjidai_state *)machine->driver_data; + mjkjidai_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram1; UINT8 *spriteram_2 = state->spriteram2; UINT8 *spriteram_3 = state->spriteram3; diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c index 3bf76651c7b..4fe311511da 100644 --- a/src/mame/video/momoko.c +++ b/src/mame/video/momoko.c @@ -14,63 +14,63 @@ WRITE8_HANDLER ( momoko_fg_scrollx_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->fg_scrollx = data; } WRITE8_HANDLER ( momoko_fg_scrolly_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->fg_scrolly = data; } WRITE8_HANDLER ( momoko_fg_select_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->fg_select = data & 0x0f; state->fg_mask = data & 0x10; } WRITE8_HANDLER ( momoko_text_scrolly_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->text_scrolly = data; } WRITE8_HANDLER ( momoko_text_mode_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->text_mode = data; } WRITE8_HANDLER ( momoko_bg_scrollx_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->bg_scrollx[offset] = data; } WRITE8_HANDLER ( momoko_bg_scrolly_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->bg_scrolly[offset] = data; } WRITE8_HANDLER( momoko_bg_select_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->bg_select = data & 0x0f; state->bg_mask = data & 0x10; } WRITE8_HANDLER( momoko_bg_priority_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->bg_priority = data & 0x01; } WRITE8_HANDLER( momoko_flipscreen_w ) { - momoko_state *state = (momoko_state *)space->machine->driver_data; + momoko_state *state = space->machine->driver_data(); state->flipscreen = data & 0x01; } @@ -113,7 +113,7 @@ static void momoko_draw_bg_pri( running_machine *machine, bitmap_t *bitmap, int VIDEO_UPDATE( momoko ) { - momoko_state *state = (momoko_state *)screen->machine->driver_data; + momoko_state *state = screen->machine->driver_data(); int x, y, dx, dy, rx, ry, radr, chr, sy, fx, fy, px, py, offs, col, pri, flip ; UINT8 *spriteram = state->spriteram; diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c index 65661cf83d1..808e6b3a987 100644 --- a/src/mame/video/moo.c +++ b/src/mame/video/moo.c @@ -14,7 +14,7 @@ void moo_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); int pri = (*color & 0x03e0) >> 4; if (pri <= state->layerpri[2]) @@ -31,13 +31,13 @@ void moo_sprite_callback( running_machine *machine, int *code, int *color, int * void moo_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); *color = state->layer_colorbase[layer] | (*color >> 2 & 0x0f); } VIDEO_START(moo) { - moo_state *state = (moo_state *)machine->driver_data; + moo_state *state = machine->driver_data(); assert(machine->primary_screen->format() == BITMAP_FORMAT_RGB32); @@ -65,7 +65,7 @@ VIDEO_START(moo) VIDEO_UPDATE(moo) { - moo_state *state = (moo_state *)screen->machine->driver_data; + moo_state *state = screen->machine->driver_data(); static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 }; int layers[3]; int new_colorbase, plane, dirty, alpha; diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index 0fcfd18b6bd..7a6e7d27782 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -17,7 +17,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - mosaic_state *state = (mosaic_state *)machine->driver_data; + mosaic_state *state = machine->driver_data(); tile_index *= 2; SET_TILE_INFO( 0, @@ -28,7 +28,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - mosaic_state *state = (mosaic_state *)machine->driver_data; + mosaic_state *state = machine->driver_data(); tile_index *= 2; SET_TILE_INFO( 1, @@ -47,7 +47,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mosaic ) { - mosaic_state *state = (mosaic_state *)machine->driver_data; + mosaic_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -64,7 +64,7 @@ VIDEO_START( mosaic ) WRITE8_HANDLER( mosaic_fgvideoram_w ) { - mosaic_state *state = (mosaic_state *)space->machine->driver_data; + mosaic_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); @@ -72,7 +72,7 @@ WRITE8_HANDLER( mosaic_fgvideoram_w ) WRITE8_HANDLER( mosaic_bgvideoram_w ) { - mosaic_state *state = (mosaic_state *)space->machine->driver_data; + mosaic_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -82,7 +82,7 @@ WRITE8_HANDLER( mosaic_bgvideoram_w ) VIDEO_UPDATE( mosaic ) { - mosaic_state *state = (mosaic_state *)screen->machine->driver_data; + mosaic_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c index 864dcfe8b08..26e1cd1fb8b 100644 --- a/src/mame/video/mouser.c +++ b/src/mame/video/mouser.c @@ -56,7 +56,7 @@ WRITE8_HANDLER( mouser_flip_screen_y_w ) VIDEO_UPDATE( mouser ) { - mouser_state *state = (mouser_state *)screen->machine->driver_data; + mouser_state *state = screen->machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; int sx, sy; diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 717201c39cb..45a85f9aae3 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -134,7 +134,7 @@ PALETTE_INIT( mrdo ) static TILE_GET_INFO( get_bg_tile_info ) { - mrdo_state *state = (mrdo_state *)machine->driver_data; + mrdo_state *state = machine->driver_data(); UINT8 attr = state->bgvideoram[tile_index]; SET_TILE_INFO( 1, @@ -145,7 +145,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - mrdo_state *state = (mrdo_state *)machine->driver_data; + mrdo_state *state = machine->driver_data(); UINT8 attr = state->fgvideoram[tile_index]; SET_TILE_INFO( 0, @@ -164,7 +164,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( mrdo ) { - mrdo_state *state = (mrdo_state *)machine->driver_data; + mrdo_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows,8,8,32,32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,32,32); @@ -192,14 +192,14 @@ VIDEO_START( mrdo ) WRITE8_HANDLER( mrdo_bgvideoram_w ) { - mrdo_state *state = (mrdo_state *)space->machine->driver_data; + mrdo_state *state = space->machine->driver_data(); state->bgvideoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset & 0x3ff); } WRITE8_HANDLER( mrdo_fgvideoram_w ) { - mrdo_state *state = (mrdo_state *)space->machine->driver_data; + mrdo_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset & 0x3ff); } @@ -207,13 +207,13 @@ WRITE8_HANDLER( mrdo_fgvideoram_w ) WRITE8_HANDLER( mrdo_scrollx_w ) { - mrdo_state *state = (mrdo_state *)space->machine->driver_data; + mrdo_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, data); } WRITE8_HANDLER( mrdo_scrolly_w ) { - mrdo_state *state = (mrdo_state *)space->machine->driver_data; + mrdo_state *state = space->machine->driver_data(); /* This is NOT affected by flipscreen (so stop it happening) */ if (state->flipscreen) @@ -225,7 +225,7 @@ WRITE8_HANDLER( mrdo_scrolly_w ) WRITE8_HANDLER( mrdo_flipscreen_w ) { - mrdo_state *state = (mrdo_state *)space->machine->driver_data; + mrdo_state *state = space->machine->driver_data(); /* bits 1-3 control the playfield priority, but they are not used by */ /* Mr. Do! so we don't emulate them */ @@ -244,7 +244,7 @@ WRITE8_HANDLER( mrdo_flipscreen_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - mrdo_state *state = (mrdo_state *)machine->driver_data; + mrdo_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -262,7 +262,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( mrdo ) { - mrdo_state *state = (mrdo_state *)screen->machine->driver_data; + mrdo_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect,0); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c index ffb14eed4cf..b06be691b7b 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -10,7 +10,7 @@ Mr. F. Lea WRITE8_HANDLER( mrflea_gfx_bank_w ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); state->gfx_bank = data; if (data & ~0x14) @@ -19,7 +19,7 @@ WRITE8_HANDLER( mrflea_gfx_bank_w ) WRITE8_HANDLER( mrflea_videoram_w ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); int bank = offset / 0x400; offset &= 0x3ff; @@ -31,7 +31,7 @@ WRITE8_HANDLER( mrflea_videoram_w ) WRITE8_HANDLER( mrflea_spriteram_w ) { - mrflea_state *state = (mrflea_state *)space->machine->driver_data; + mrflea_state *state = space->machine->driver_data(); if (offset & 2) { @@ -45,7 +45,7 @@ WRITE8_HANDLER( mrflea_spriteram_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mrflea_state *state = (mrflea_state *)machine->driver_data; + mrflea_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; const UINT8 *source = state->spriteram; const UINT8 *finish = source + 0x100; @@ -76,7 +76,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mrflea_state *state = (mrflea_state *)machine->driver_data; + mrflea_state *state = machine->driver_data(); const UINT8 *source = state->videoram; const gfx_element *gfx = machine->gfx[1]; int sx, sy; diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c index 3241bf04ee9..65bf0e84ae5 100644 --- a/src/mame/video/mrjong.c +++ b/src/mame/video/mrjong.c @@ -70,14 +70,14 @@ PALETTE_INIT( mrjong ) WRITE8_HANDLER( mrjong_videoram_w ) { - mrjong_state *state = (mrjong_state *)space->machine->driver_data; + mrjong_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( mrjong_colorram_w ) { - mrjong_state *state = (mrjong_state *)space->machine->driver_data; + mrjong_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -93,7 +93,7 @@ WRITE8_HANDLER( mrjong_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - mrjong_state *state = (mrjong_state *)machine->driver_data; + mrjong_state *state = machine->driver_data(); int code = state->videoram[tile_index] | ((state->colorram[tile_index] & 0x20) << 3); int color = state->colorram[tile_index] & 0x1f; int flags = ((state->colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((state->colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); @@ -103,7 +103,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( mrjong ) { - mrjong_state *state = (mrjong_state *)machine->driver_data; + mrjong_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows_flip_xy, 8, 8, 32, 32); } @@ -112,7 +112,7 @@ Note: First 0x40 entries in the videoram are actually spriteram */ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - mrjong_state *state = (mrjong_state *)machine->driver_data; + mrjong_state *state = machine->driver_data(); int offs; for (offs = (0x40 - 4); offs >= 0; offs -= 4) @@ -147,7 +147,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( mrjong ) { - mrjong_state *state = (mrjong_state *)screen->machine->driver_data; + mrjong_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c index d8138469546..77e6f2723c4 100644 --- a/src/mame/video/msisaac.c +++ b/src/mame/video/msisaac.c @@ -14,7 +14,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int tile_number = state->videoram[tile_index]; SET_TILE_INFO( 0, tile_number, @@ -24,7 +24,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int tile_number = state->videoram2[tile_index]; SET_TILE_INFO( 1, 0x100 + tile_number, @@ -34,7 +34,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); int tile_number = state->videoram3[tile_index]; /* graphics 0 or 1 */ @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( msisaac ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->bg2_tilemap = tilemap_create(machine, get_bg2_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -72,37 +72,37 @@ VIDEO_START( msisaac ) WRITE8_HANDLER( msisaac_fg_scrolly_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->fg_tilemap, 0, data); } WRITE8_HANDLER( msisaac_fg_scrollx_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->fg_tilemap, 0, 9 + data); } WRITE8_HANDLER( msisaac_bg2_scrolly_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg2_tilemap, 0, data); } WRITE8_HANDLER( msisaac_bg2_scrollx_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg2_tilemap, 0, 9 + 2 + data); } WRITE8_HANDLER( msisaac_bg_scrolly_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, data); } WRITE8_HANDLER( msisaac_bg_scrollx_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, 9 + 4 + data); } @@ -120,7 +120,7 @@ WRITE8_HANDLER( msisaac_textbank1_w ) WRITE8_HANDLER( msisaac_bg2_textbank_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); if (state->bg2_textbank != data ) { state->bg2_textbank = data; @@ -136,21 +136,21 @@ WRITE8_HANDLER( msisaac_bg2_textbank_w ) WRITE8_HANDLER( msisaac_bg_videoram_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( msisaac_bg2_videoram_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->videoram3[offset] = data; tilemap_mark_tile_dirty(state->bg2_tilemap, offset); } WRITE8_HANDLER( msisaac_fg_videoram_w ) { - buggychl_state *state = (buggychl_state *)space->machine->driver_data; + buggychl_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -163,7 +163,7 @@ WRITE8_HANDLER( msisaac_fg_videoram_w ) ***************************************************************************/ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - buggychl_state *state = (buggychl_state *)machine->driver_data; + buggychl_state *state = machine->driver_data(); const UINT8 *source = state->spriteram + 32 * 4 - 4; const UINT8 *finish = state->spriteram; /* ? */ @@ -246,7 +246,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( msisaac ) { - buggychl_state *state = (buggychl_state *)screen->machine->driver_data; + buggychl_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->bg2_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index e068059aa60..44879a2060b 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -25,7 +25,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta */ - mugsmash_state *state = (mugsmash_state *)machine->driver_data; + mugsmash_state *state = machine->driver_data(); const UINT16 *source = state->spriteram; const UINT16 *finish = source + 0x2000; const gfx_element *gfx = machine->gfx[0]; @@ -70,7 +70,7 @@ static TILE_GET_INFO( get_mugsmash_tile_info1 ) f = flip-Y */ - mugsmash_state *state = (mugsmash_state *)machine->driver_data; + mugsmash_state *state = machine->driver_data(); int tileno, colour, fx; tileno = state->videoram1[tile_index * 2 + 1]; @@ -82,7 +82,7 @@ static TILE_GET_INFO( get_mugsmash_tile_info1 ) WRITE16_HANDLER( mugsmash_videoram1_w ) { - mugsmash_state *state = (mugsmash_state *)space->machine->driver_data; + mugsmash_state *state = space->machine->driver_data(); state->videoram1[offset] = data; tilemap_mark_tile_dirty(state->tilemap1, offset / 2); @@ -99,7 +99,7 @@ static TILE_GET_INFO( get_mugsmash_tile_info2 ) f = flip-Y */ - mugsmash_state *state = (mugsmash_state *)machine->driver_data; + mugsmash_state *state = machine->driver_data(); int tileno, colour, fx; tileno = state->videoram2[tile_index * 2 + 1]; @@ -111,7 +111,7 @@ static TILE_GET_INFO( get_mugsmash_tile_info2 ) WRITE16_HANDLER( mugsmash_videoram2_w ) { - mugsmash_state *state = (mugsmash_state *)space->machine->driver_data; + mugsmash_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->tilemap2, offset / 2); @@ -119,7 +119,7 @@ WRITE16_HANDLER( mugsmash_videoram2_w ) WRITE16_HANDLER (mugsmash_reg_w) { - mugsmash_state *state = (mugsmash_state *)space->machine->driver_data; + mugsmash_state *state = space->machine->driver_data(); state->regs1[offset] = data; // popmessage ("Regs %04x, %04x, %04x, %04x", mugsmash_regs1[0], mugsmash_regs1[1],mugsmash_regs1[2], mugsmash_regs1[3]); @@ -143,7 +143,7 @@ WRITE16_HANDLER (mugsmash_reg_w) VIDEO_START( mugsmash ) { - mugsmash_state *state = (mugsmash_state *)machine->driver_data; + mugsmash_state *state = machine->driver_data(); state->tilemap1 = tilemap_create(machine, get_mugsmash_tile_info1, tilemap_scan_rows, 16, 16, 32, 32); tilemap_set_transparent_pen(state->tilemap1, 0); @@ -153,7 +153,7 @@ VIDEO_START( mugsmash ) VIDEO_UPDATE( mugsmash ) { - mugsmash_state *state = (mugsmash_state *)screen->machine->driver_data; + mugsmash_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap2, 0, 0); tilemap_draw(bitmap, cliprect, state->tilemap1, 0, 0); diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c index cb72a746e55..eb66d1a2e3d 100644 --- a/src/mame/video/munchmo.c +++ b/src/mame/video/munchmo.c @@ -31,26 +31,26 @@ PALETTE_INIT( mnchmobl ) WRITE8_HANDLER( mnchmobl_palette_bank_w ) { - munchmo_state *state = (munchmo_state *)space->machine->driver_data; + munchmo_state *state = space->machine->driver_data(); state->palette_bank = data & 0x3; } WRITE8_HANDLER( mnchmobl_flipscreen_w ) { - munchmo_state *state = (munchmo_state *)space->machine->driver_data; + munchmo_state *state = space->machine->driver_data(); state->flipscreen = data; } VIDEO_START( mnchmobl ) { - munchmo_state *state = (munchmo_state *)machine->driver_data; + munchmo_state *state = machine->driver_data(); state->tmpbitmap = auto_bitmap_alloc(machine, 512, 512, machine->primary_screen->format()); } static void draw_status( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - munchmo_state *state = (munchmo_state *)machine->driver_data; + munchmo_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; int row; @@ -82,7 +82,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r ROM B1.2C contains 256 tilemaps defining 4x4 configurations of the tiles in ROM B2.2B */ - munchmo_state *state = (munchmo_state *)machine->driver_data; + munchmo_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "gfx2"); const gfx_element *gfx = machine->gfx[1]; int offs; @@ -117,7 +117,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - munchmo_state *state = (munchmo_state *)machine->driver_data; + munchmo_state *state = machine->driver_data(); int scroll = state->vreg[6]; int flags = state->vreg[7]; /* XB?????? */ int xadjust = - 128 - 16 - ((flags & 0x80) ? 1 : 0); diff --git a/src/mame/video/mw8080bw.c b/src/mame/video/mw8080bw.c index 032484464f8..b7cf61b2ccb 100644 --- a/src/mame/video/mw8080bw.c +++ b/src/mame/video/mw8080bw.c @@ -10,7 +10,7 @@ VIDEO_UPDATE( mw8080bw ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); UINT8 x = 0; UINT8 y = MW8080BW_VCOUNTER_START_NO_VBLANK; UINT8 video_data = 0; @@ -77,7 +77,7 @@ VIDEO_UPDATE( mw8080bw ) VIDEO_UPDATE( spcenctr ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); UINT8 line_buf[256]; /* 256x1 bit RAM */ UINT8 x = 0; @@ -221,7 +221,7 @@ VIDEO_UPDATE( spcenctr ) VIDEO_UPDATE( phantom2 ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); UINT8 x = 0; UINT8 y = MW8080BW_VCOUNTER_START_NO_VBLANK; UINT8 video_data = 0; @@ -313,7 +313,7 @@ VIDEO_UPDATE( phantom2 ) VIDEO_EOF( phantom2 ) { - mw8080bw_state *state = (mw8080bw_state *)machine->driver_data; + mw8080bw_state *state = machine->driver_data(); state->phantom2_cloud_counter += MW8080BW_VTOTAL; @@ -333,7 +333,7 @@ VIDEO_EOF( phantom2 ) VIDEO_UPDATE( invaders ) { - mw8080bw_state *state = (mw8080bw_state *)screen->machine->driver_data; + mw8080bw_state *state = screen->machine->driver_data(); UINT8 x = 0; UINT8 y = MW8080BW_VCOUNTER_START_NO_VBLANK; UINT8 video_data = 0; diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index bb2fdde0e90..3bea930d743 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -47,7 +47,7 @@ static TIMER_CALLBACK( interrupt_callback ) { - mystston_state *state = (mystston_state *)machine->driver_data; + mystston_state *state = machine->driver_data(); int scanline = param; mystston_on_scanline_interrupt(machine); @@ -125,7 +125,7 @@ static void set_palette(running_machine *machine, mystston_state *state) WRITE8_HANDLER( mystston_video_control_w ) { - mystston_state *state = (mystston_state *)space->machine->driver_data; + mystston_state *state = space->machine->driver_data(); *state->video_control = data; @@ -151,7 +151,7 @@ WRITE8_HANDLER( mystston_video_control_w ) static TILE_GET_INFO( get_bg_tile_info ) { - mystston_state *state = (mystston_state *)machine->driver_data; + mystston_state *state = machine->driver_data(); int page = (*state->video_control & 0x04) << 8; int code = ((state->bg_videoram[page | 0x200 | tile_index] & 0x01) << 8) | state->bg_videoram[page | tile_index]; @@ -163,7 +163,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - mystston_state *state = (mystston_state *)machine->driver_data; + mystston_state *state = machine->driver_data(); int code = ((state->fg_videoram[0x400 | tile_index] & 0x07) << 8) | state->fg_videoram[tile_index]; int color = ((*state->video_control & 0x01) << 1) | ((*state->video_control & 0x02) >> 1); @@ -181,7 +181,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static void draw_sprites(bitmap_t *bitmap, const rectangle *cliprect, const gfx_element *gfx, int flip) { - mystston_state *state = (mystston_state *)gfx->machine->driver_data; + mystston_state *state = gfx->machine->driver_data(); int offs; for (offs = 0; offs < 0x60; offs += 4) @@ -220,7 +220,7 @@ static void draw_sprites(bitmap_t *bitmap, const rectangle *cliprect, const gfx_ static VIDEO_START( mystston ) { - mystston_state *state = (mystston_state *)machine->driver_data; + mystston_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols_flip_x, 16, 16, 16, 32); @@ -241,7 +241,7 @@ static VIDEO_START( mystston ) static VIDEO_RESET( mystston ) { - mystston_state *state = (mystston_state *)machine->driver_data; + mystston_state *state = machine->driver_data(); timer_adjust_oneshot(state->interrupt_timer, machine->primary_screen->time_until_pos(FIRST_INT_VPOS - 1, INT_HPOS), FIRST_INT_VPOS); } @@ -256,7 +256,7 @@ static VIDEO_RESET( mystston ) static VIDEO_UPDATE( mystston ) { - mystston_state *state = (mystston_state *)screen->machine->driver_data; + mystston_state *state = screen->machine->driver_data(); int flip = (*state->video_control & 0x80) ^ ((input_port_read(screen->machine, "DSW1") & 0x20) << 2); diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c index 5d721e46c90..421d42a8bd4 100644 --- a/src/mame/video/n64.c +++ b/src/mame/video/n64.c @@ -1177,7 +1177,7 @@ N64::RDP::Triangle::Triangle(running_machine *machine, bool shade, bool texture, void N64::RDP::Triangle::InitFromData(running_machine *machine, bool shade, bool texture, bool zbuffer) { m_machine = machine; - m_rdp = &((_n64_state *)machine->driver_data)->m_rdp; + m_rdp = &(machine->driver_data<_n64_state>())->m_rdp; m_cmd_data = m_rdp->GetCommandData(); m_misc_state = m_rdp->GetMiscState(); m_shade = shade; @@ -2503,7 +2503,7 @@ void N64::RDP::Processor::ProcessList() VIDEO_START(n64) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); state->m_rdp.SetMachine(machine); state->m_rdp.InitInternalState(); @@ -2526,7 +2526,7 @@ VIDEO_START(n64) VIDEO_UPDATE(n64) { - _n64_state *state = (_n64_state *)screen->machine->driver_data; + _n64_state *state = screen->machine->driver_data<_n64_state>(); int height = state->m_rdp.GetMiscState()->m_fb_height; //UINT16 *frame_buffer = (UINT16*)&rdram[(n64_vi_origin & 0xffffff) >> 2]; diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c index 0757daf66e0..e75d9e2ff26 100644 --- a/src/mame/video/n8080.c +++ b/src/mame/video/n8080.c @@ -10,7 +10,7 @@ WRITE8_HANDLER( n8080_video_control_w ) { - n8080_state *state = (n8080_state *)space->machine->driver_data; + n8080_state *state = space->machine->driver_data(); state->sheriff_color_mode = (data >> 3) & 3; state->sheriff_color_data = (data >> 0) & 7; @@ -48,7 +48,7 @@ PALETTE_INIT( helifire ) void spacefev_start_red_cannon( running_machine *machine ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->spacefev_red_cannon = 1; timer_adjust_oneshot(state->cannon_timer, ATTOTIME_IN_USEC(550 * 68 * 10), 0); @@ -57,7 +57,7 @@ void spacefev_start_red_cannon( running_machine *machine ) static TIMER_CALLBACK( spacefev_stop_red_cannon ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->spacefev_red_cannon = 0; timer_adjust_oneshot(state->cannon_timer, attotime_never, 0); @@ -66,7 +66,7 @@ static TIMER_CALLBACK( spacefev_stop_red_cannon ) static void helifire_next_line( running_machine *machine ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->helifire_mv++; @@ -91,7 +91,7 @@ static void helifire_next_line( running_machine *machine ) VIDEO_START( spacefev ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); state->cannon_timer = timer_alloc(machine, spacefev_stop_red_cannon, NULL); @@ -104,7 +104,7 @@ VIDEO_START( spacefev ) VIDEO_START( sheriff ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); flip_screen_set_no_update(machine, 0); @@ -115,7 +115,7 @@ VIDEO_START( sheriff ) VIDEO_START( helifire ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); UINT8 data = 0; int i; @@ -141,7 +141,7 @@ VIDEO_START( helifire ) VIDEO_UPDATE( spacefev ) { - n8080_state *state = (n8080_state *)screen->machine->driver_data; + n8080_state *state = screen->machine->driver_data(); UINT8 mask = flip_screen_get(screen->machine) ? 0xff : 0x00; int x; @@ -211,7 +211,7 @@ VIDEO_UPDATE( spacefev ) VIDEO_UPDATE( sheriff ) { - n8080_state *state = (n8080_state *)screen->machine->driver_data; + n8080_state *state = screen->machine->driver_data(); UINT8 mask = flip_screen_get(screen->machine) ? 0xff : 0x00; const UINT8* pPROM = memory_region(screen->machine, "proms"); @@ -254,7 +254,7 @@ VIDEO_UPDATE( sheriff ) VIDEO_UPDATE( helifire ) { - n8080_state *state = (n8080_state *)screen->machine->driver_data; + n8080_state *state = screen->machine->driver_data(); int SUN_BRIGHTNESS = input_port_read(screen->machine, "POT0"); int SEA_BRIGHTNESS = input_port_read(screen->machine, "POT1"); @@ -354,7 +354,7 @@ VIDEO_UPDATE( helifire ) VIDEO_EOF( helifire ) { - n8080_state *state = (n8080_state *)machine->driver_data; + n8080_state *state = machine->driver_data(); int n = (machine->primary_screen->frame_number() >> 1) % sizeof state->helifire_LSFR; int i; diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index 44f23d7c2d2..f699a1e831f 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -23,7 +23,7 @@ sprite_data[8] = static TILE_GET_INFO( get_bg_tile_info ) { - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); int code, color, flags, mask, layer; code = state->videoram2[tile_index]; @@ -59,7 +59,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); int code, color, flags, mask, layer; code = state->videoram1[tile_index]; @@ -96,7 +96,7 @@ static TILE_GET_INFO( get_fg_tile_info ) WRITE16_HANDLER( nemesis_gfx_flipx_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -119,7 +119,7 @@ WRITE16_HANDLER( nemesis_gfx_flipx_word_w ) WRITE16_HANDLER( nemesis_gfx_flipy_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -135,7 +135,7 @@ WRITE16_HANDLER( nemesis_gfx_flipy_word_w ) WRITE16_HANDLER( salamand_control_port_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -176,7 +176,7 @@ WRITE16_HANDLER( salamand_control_port_word_w ) WRITE16_HANDLER( nemesis_palette_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); int r, g, b, bit1, bit2, bit3, bit4, bit5; COMBINE_DATA(state->paletteram + offset); @@ -218,7 +218,7 @@ WRITE16_HANDLER( nemesis_palette_word_w ) WRITE16_HANDLER( salamander_palette_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); COMBINE_DATA(state->paletteram + offset); offset &= ~1; @@ -230,7 +230,7 @@ WRITE16_HANDLER( salamander_palette_word_w ) WRITE16_HANDLER( nemesis_videoram1_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); COMBINE_DATA(state->videoram1 + offset); tilemap_mark_tile_dirty(state->foreground, offset); @@ -238,7 +238,7 @@ WRITE16_HANDLER( nemesis_videoram1_word_w ) WRITE16_HANDLER( nemesis_videoram2_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); COMBINE_DATA(state->videoram2 + offset); tilemap_mark_tile_dirty(state->background, offset); @@ -246,7 +246,7 @@ WRITE16_HANDLER( nemesis_videoram2_word_w ) WRITE16_HANDLER( nemesis_colorram1_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); COMBINE_DATA(state->colorram1 + offset); tilemap_mark_tile_dirty(state->foreground, offset); @@ -254,7 +254,7 @@ WRITE16_HANDLER( nemesis_colorram1_word_w ) WRITE16_HANDLER( nemesis_colorram2_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); COMBINE_DATA(state->colorram2 + offset); tilemap_mark_tile_dirty(state->background, offset); @@ -264,7 +264,7 @@ WRITE16_HANDLER( nemesis_colorram2_word_w ) /* we have to straighten out the 16-bit word into bytes for gfxdecode() to work */ WRITE16_HANDLER( nemesis_charram_word_w ) { - nemesis_state *state = (nemesis_state *)space->machine->driver_data; + nemesis_state *state = space->machine->driver_data(); UINT16 oldword = state->charram[offset]; COMBINE_DATA(state->charram + offset); @@ -285,7 +285,7 @@ WRITE16_HANDLER( nemesis_charram_word_w ) static STATE_POSTLOAD( nemesis_postload ) { - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); int i, offs; for (offs = 0; offs < state->charram_size; offs++) @@ -305,7 +305,7 @@ static STATE_POSTLOAD( nemesis_postload ) /* claim a palette dirty array */ VIDEO_START( nemesis ) { - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); state->spriteram_words = state->spriteram_size / 2; @@ -351,7 +351,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect * byte E : not used. */ - nemesis_state *state = (nemesis_state *)machine->driver_data; + nemesis_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int adress; /* start of sprite in spriteram */ int sx; /* sprite X-pos */ @@ -427,7 +427,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( nemesis ) { - nemesis_state *state = (nemesis_state *)screen->machine->driver_data; + nemesis_state *state = screen->machine->driver_data(); int offs; rectangle clip; diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c index 51b09880ade..7cb49821f47 100644 --- a/src/mame/video/neogeo.c +++ b/src/mame/video/neogeo.c @@ -20,7 +20,7 @@ static void set_videoram_offset( running_machine *machine, UINT16 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->videoram_offset = data; /* the read happens right away */ @@ -30,14 +30,14 @@ static void set_videoram_offset( running_machine *machine, UINT16 data ) static UINT16 get_videoram_data( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); return state->videoram_read_buffer; } static void set_videoram_data( running_machine *machine, UINT16 data) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->videoram[state->videoram_offset] = data; /* auto increment/decrement the current offset - A15 is NOT effected */ @@ -50,14 +50,14 @@ static void set_videoram_data( running_machine *machine, UINT16 data) static void set_videoram_modulo( running_machine *machine, UINT16 data) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->videoram_modulo = data; } static UINT16 get_videoram_modulo( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); return state->videoram_modulo; } @@ -71,7 +71,7 @@ static UINT16 get_videoram_modulo( running_machine *machine ) static void compute_rgb_weights( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); static const int resistances[] = { 220, 470, 1000, 2200, 3900 }; /* compute four sets of weights - with or without the pulldowns - @@ -101,7 +101,7 @@ static void compute_rgb_weights( running_machine *machine ) static pen_t get_pen( running_machine *machine, UINT16 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); double *weights; UINT8 r, g, b; @@ -147,7 +147,7 @@ static pen_t get_pen( running_machine *machine, UINT16 data ) static STATE_POSTLOAD( regenerate_pens ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); int i; for (i = 0; i < NUM_PENS; i++) @@ -157,7 +157,7 @@ static STATE_POSTLOAD( regenerate_pens ) void neogeo_set_palette_bank( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (data != state->palette_bank) { state->palette_bank = data; @@ -169,7 +169,7 @@ void neogeo_set_palette_bank( running_machine *machine, UINT8 data ) void neogeo_set_screen_dark( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (data != state->screen_dark) { state->screen_dark = data; @@ -181,14 +181,14 @@ void neogeo_set_screen_dark( running_machine *machine, UINT8 data ) READ16_HANDLER( neogeo_paletteram_r ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); return state->palettes[state->palette_bank][offset]; } WRITE16_HANDLER( neogeo_paletteram_w ) { - neogeo_state *state = (neogeo_state *)space->machine->driver_data; + neogeo_state *state = space->machine->driver_data(); UINT16 *addr = &state->palettes[state->palette_bank][offset]; COMBINE_DATA(addr); @@ -206,28 +206,28 @@ WRITE16_HANDLER( neogeo_paletteram_w ) static void set_auto_animation_speed( running_machine *machine, UINT8 data) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->auto_animation_speed = data; } static void set_auto_animation_disabled( running_machine *machine, UINT8 data) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->auto_animation_disabled = data; } UINT8 neogeo_get_auto_animation_counter( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); return state->auto_animation_counter; } static TIMER_CALLBACK( auto_animation_timer_callback ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); if (state->auto_animation_frame_counter == 0) { state->auto_animation_frame_counter = state->auto_animation_speed; @@ -242,14 +242,14 @@ static TIMER_CALLBACK( auto_animation_timer_callback ) static void create_auto_animation_timer( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->auto_animation_timer = timer_alloc(machine, auto_animation_timer_callback, NULL); } static void start_auto_animation_timer( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); timer_adjust_oneshot(state->auto_animation_timer, machine->primary_screen->time_until_pos(NEOGEO_VSSTART), 0); } @@ -263,14 +263,14 @@ static void start_auto_animation_timer( running_machine *machine ) void neogeo_set_fixed_layer_source( running_machine *machine, UINT8 data ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->fixed_layer_source = data; } static void draw_fixed_layer( running_machine *machine, bitmap_t *bitmap, int scanline ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); int x; UINT8* gfx_base = memory_region(machine, state->fixed_layer_source ? "fixed" : "fixedbios"); @@ -403,7 +403,7 @@ INLINE int sprite_on_scanline(int scanline, int y, int rows) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, int scanline ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); int sprite_index; int max_sprite_index; @@ -592,7 +592,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, int scanli static void parse_sprites( running_machine *machine, int scanline ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); UINT16 sprite_number; int y = 0; int rows = 0; @@ -644,7 +644,7 @@ static void parse_sprites( running_machine *machine, int scanline ) static TIMER_CALLBACK( sprite_line_timer_callback ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); int scanline = param; /* we are at the beginning of a scanline - @@ -663,21 +663,21 @@ static TIMER_CALLBACK( sprite_line_timer_callback ) static void create_sprite_line_timer( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); state->sprite_line_timer = timer_alloc(machine, sprite_line_timer_callback, NULL); } static void start_sprite_line_timer( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); timer_adjust_oneshot(state->sprite_line_timer, machine->primary_screen->time_until_pos(0), 0); } static void optimize_sprite_data( running_machine *machine ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); /* convert the sprite graphics data into a format that allows faster blitting */ @@ -849,7 +849,7 @@ WRITE16_HANDLER( neogeo_video_register_w ) VIDEO_START( neogeo ) { - neogeo_state *state = (neogeo_state *)machine->driver_data; + neogeo_state *state = machine->driver_data(); /* allocate memory not directly mapped */ state->palettes[0] = auto_alloc_array(machine, UINT16, NUM_PENS); @@ -921,7 +921,7 @@ VIDEO_RESET( neogeo ) VIDEO_UPDATE( neogeo ) { - neogeo_state *state = (neogeo_state *)screen->machine->driver_data; + neogeo_state *state = screen->machine->driver_data(); /* fill with background color first */ bitmap_fill(bitmap, cliprect, state->pens[0x0fff]); diff --git a/src/mame/video/news.c b/src/mame/video/news.c index 5df3e1b4b0b..7f00f4dedb4 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -10,7 +10,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - news_state *state = (news_state *)machine->driver_data; + news_state *state = machine->driver_data(); int code = (state->fgram[tile_index * 2] << 8) | state->fgram[tile_index * 2 + 1]; SET_TILE_INFO( 0, @@ -21,7 +21,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - news_state *state = (news_state *)machine->driver_data; + news_state *state = machine->driver_data(); int code = (state->bgram[tile_index * 2] << 8) | state->bgram[tile_index * 2 + 1]; int color = (code & 0xf000) >> 12; @@ -46,7 +46,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( news ) { - news_state *state = (news_state *)machine->driver_data; + news_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fg_tilemap, 0); @@ -64,7 +64,7 @@ VIDEO_START( news ) WRITE8_HANDLER( news_fgram_w ) { - news_state *state = (news_state *)space->machine->driver_data; + news_state *state = space->machine->driver_data(); state->fgram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); @@ -72,7 +72,7 @@ WRITE8_HANDLER( news_fgram_w ) WRITE8_HANDLER( news_bgram_w ) { - news_state *state = (news_state *)space->machine->driver_data; + news_state *state = space->machine->driver_data(); state->bgram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -80,7 +80,7 @@ WRITE8_HANDLER( news_bgram_w ) WRITE8_HANDLER( news_bgpic_w ) { - news_state *state = (news_state *)space->machine->driver_data; + news_state *state = space->machine->driver_data(); if (state->bgpic != data) { @@ -99,7 +99,7 @@ WRITE8_HANDLER( news_bgpic_w ) VIDEO_UPDATE( news ) { - news_state *state = (news_state *)screen->machine->driver_data; + news_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index df72db79b06..d0bdaa93548 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -6,7 +6,7 @@ VIDEO_START( ninjaw ) { - ninjaw_state *state = (ninjaw_state *)machine->driver_data; + ninjaw_state *state = machine->driver_data(); /* Ensure palette from correct TC0110PCR used for each screen */ tc0100scn_set_colbanks(state->tc0100scn_1, 0x0, 0x100, 0x200); @@ -18,7 +18,7 @@ VIDEO_START( ninjaw ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int primask, int x_offs, int y_offs ) { - ninjaw_state *state = (ninjaw_state *)machine->driver_data; + ninjaw_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; @@ -99,7 +99,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( ninjaw ) { - ninjaw_state *state = (ninjaw_state *)screen->machine->driver_data; + ninjaw_state *state = screen->machine->driver_data(); int xoffs = 0; UINT8 layer[3], nodraw; running_device *tc0100scn = NULL; diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c index b08b7f537e0..0d39ac31eb6 100644 --- a/src/mame/video/nitedrvr.c +++ b/src/mame/video/nitedrvr.c @@ -9,7 +9,7 @@ WRITE8_HANDLER( nitedrvr_videoram_w ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -17,7 +17,7 @@ WRITE8_HANDLER( nitedrvr_videoram_w ) WRITE8_HANDLER( nitedrvr_hvc_w ) { - nitedrvr_state *state = (nitedrvr_state *)space->machine->driver_data; + nitedrvr_state *state = space->machine->driver_data(); state->hvc[offset & 0x3f] = data; @@ -27,7 +27,7 @@ WRITE8_HANDLER( nitedrvr_hvc_w ) static TILE_GET_INFO( get_bg_tile_info ) { - nitedrvr_state *state = (nitedrvr_state *)machine->driver_data; + nitedrvr_state *state = machine->driver_data(); int code = state->videoram[tile_index] & 0x3f; SET_TILE_INFO(0, code, 0, 0); @@ -37,7 +37,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( nitedrvr ) { - nitedrvr_state *state = (nitedrvr_state *)machine->driver_data; + nitedrvr_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -57,7 +57,7 @@ static void draw_box( bitmap_t *bitmap, int bx, int by, int ex, int ey ) static void draw_roadway( running_machine *machine, bitmap_t *bitmap ) { - nitedrvr_state *state = (nitedrvr_state *)machine->driver_data; + nitedrvr_state *state = machine->driver_data(); int roadway; for (roadway = 0; roadway < 16; roadway++) @@ -75,7 +75,7 @@ static void draw_roadway( running_machine *machine, bitmap_t *bitmap ) VIDEO_UPDATE( nitedrvr ) { - nitedrvr_state *state = (nitedrvr_state *)screen->machine->driver_data; + nitedrvr_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_roadway(screen->machine, bitmap); diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index d06cc9e0874..e140c5e9a4b 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -22,7 +22,7 @@ static int nycaptor_mask = 0; */ static int nycaptor_spot( running_machine *machine ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); if (state->gametype == 0 || state->gametype == 2) return state->sharedram[0x299] ? state->sharedram[0x298] : 0; @@ -32,19 +32,19 @@ static int nycaptor_spot( running_machine *machine ) WRITE8_HANDLER(nycaptor_spriteram_w) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->spriteram[offset] = data; } READ8_HANDLER(nycaptor_spriteram_r) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->spriteram[offset]; } static TILE_GET_INFO( get_tile_info ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); int pal = state->videoram[tile_index * 2 + 1] & 0x0f; tileinfo->category = (state->videoram[tile_index * 2 + 1] & 0x30) >> 4; @@ -79,7 +79,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( nycaptor ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); state->spriteram = auto_alloc_array(machine, UINT8, 160); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32 ); @@ -100,20 +100,20 @@ VIDEO_START( nycaptor ) WRITE8_HANDLER( nycaptor_videoram_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset >> 1); } READ8_HANDLER( nycaptor_videoram_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->videoram[offset]; } WRITE8_HANDLER( nycaptor_palette_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); if (state->gametype == 2) //colt return; @@ -126,7 +126,7 @@ WRITE8_HANDLER( nycaptor_palette_w ) READ8_HANDLER( nycaptor_palette_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); if (offset & 0x100) return space->machine->generic.paletteram2.u8[(offset & 0xff) + (state->palette_bank << 8)]; @@ -136,7 +136,7 @@ READ8_HANDLER( nycaptor_palette_r ) WRITE8_HANDLER( nycaptor_gfxctrl_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); if (state->gfxctrl == data) return; @@ -155,26 +155,26 @@ WRITE8_HANDLER( nycaptor_gfxctrl_w ) READ8_HANDLER( nycaptor_gfxctrl_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->gfxctrl; } READ8_HANDLER( nycaptor_scrlram_r ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); return state->scrlram[offset]; } WRITE8_HANDLER( nycaptor_scrlram_w ) { - nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; + nycaptor_state *state = space->machine->driver_data(); state->scrlram[offset] = data; tilemap_set_scrolly(state->bg_tilemap, offset, data); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); int i; for (i = 0; i < 0x20; i++) @@ -233,7 +233,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void nycaptor_setmask( running_machine *machine ) { - nycaptor_state *state = (nycaptor_state *)machine->driver_data; + nycaptor_state *state = machine->driver_data(); mKEY_MASK(KEYCODE_Q, 1); /* bg */ mKEY_MASK(KEYCODE_W, 2); @@ -256,7 +256,7 @@ static void nycaptor_setmask( running_machine *machine ) VIDEO_UPDATE( nycaptor ) { - nycaptor_state *state = (nycaptor_state *)screen->machine->driver_data; + nycaptor_state *state = screen->machine->driver_data(); #if NYCAPTOR_DEBUG nycaptor_setmask(screen->machine); diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c index 713f461a26c..ebde69e0627 100644 --- a/src/mame/video/offtwall.c +++ b/src/mame/video/offtwall.c @@ -17,9 +17,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - offtwall_state *state = (offtwall_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + offtwall_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -71,10 +71,10 @@ VIDEO_START( offtwall ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - offtwall_state *state = (offtwall_state *)machine->driver_data; + offtwall_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -90,13 +90,13 @@ VIDEO_START( offtwall ) VIDEO_UPDATE( offtwall ) { - offtwall_state *state = (offtwall_state *)screen->machine->driver_data; + offtwall_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 1d3052f5844..937ed2cb5ff 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -9,7 +9,7 @@ static TILE_GET_INFO( get_tile_info ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); UINT16 code = state->videoram[2 * tile_index + 1]; UINT16 attr = state->videoram[2 * tile_index]; SET_TILE_INFO( @@ -29,7 +29,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( ohmygod ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); } @@ -43,28 +43,28 @@ VIDEO_START( ohmygod ) WRITE16_HANDLER( ohmygod_videoram_w ) { - ohmygod_state *state = (ohmygod_state *)space->machine->driver_data; + ohmygod_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE16_HANDLER( ohmygod_spritebank_w ) { - ohmygod_state *state = (ohmygod_state *)space->machine->driver_data; + ohmygod_state *state = space->machine->driver_data(); if (ACCESSING_BITS_8_15) state->spritebank = data & 0x8000; } WRITE16_HANDLER( ohmygod_scrollx_w ) { - ohmygod_state *state = (ohmygod_state *)space->machine->driver_data; + ohmygod_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scrollx); tilemap_set_scrollx(state->bg_tilemap, 0, state->scrollx - 0x81ec); } WRITE16_HANDLER( ohmygod_scrolly_w ) { - ohmygod_state *state = (ohmygod_state *)space->machine->driver_data; + ohmygod_state *state = space->machine->driver_data(); COMBINE_DATA(&state->scrolly); tilemap_set_scrolly(state->bg_tilemap, 0, state->scrolly - 0x81ef); } @@ -78,7 +78,7 @@ WRITE16_HANDLER( ohmygod_scrolly_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ohmygod_state *state = (ohmygod_state *)machine->driver_data; + ohmygod_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -107,7 +107,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( ohmygod ) { - ohmygod_state *state = (ohmygod_state *)screen->machine->driver_data; + ohmygod_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 506089374c9..91790c23c3e 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -50,7 +50,7 @@ PALETTE_INIT( ojankoy ) WRITE8_HANDLER( ojankohs_palette_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int r, g, b; state->paletteram[offset] = data; @@ -66,7 +66,7 @@ WRITE8_HANDLER( ojankohs_palette_w ) WRITE8_HANDLER( ccasino_palette_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int r, g, b; /* get top 8 bits of the I/O port address */ @@ -85,7 +85,7 @@ WRITE8_HANDLER( ccasino_palette_w ) WRITE8_HANDLER( ojankoc_palette_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int r, g, b, color; if (state->paletteram[offset] == data) @@ -112,21 +112,21 @@ WRITE8_HANDLER( ojankoc_palette_w ) WRITE8_HANDLER( ojankohs_videoram_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap, offset); } WRITE8_HANDLER( ojankohs_colorram_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->tilemap, offset); } WRITE8_HANDLER( ojankohs_gfxreg_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); if (state->gfxreg != data) { @@ -137,7 +137,7 @@ WRITE8_HANDLER( ojankohs_gfxreg_w ) WRITE8_HANDLER( ojankohs_flipscreen_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); if (state->flipscreen != BIT(data, 0)) { @@ -161,7 +161,7 @@ WRITE8_HANDLER( ojankohs_flipscreen_w ) static TILE_GET_INFO( ojankohs_get_tile_info ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); int tile = state->videoram[tile_index] | ((state->colorram[tile_index] & 0x0f) << 8); int color = (state->colorram[tile_index] & 0xe0) >> 5; @@ -176,7 +176,7 @@ static TILE_GET_INFO( ojankohs_get_tile_info ) static TILE_GET_INFO( ojankoy_get_tile_info ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); int tile = state->videoram[tile_index] | (state->videoram[tile_index + 0x1000] << 8); int color = state->colorram[tile_index] & 0x3f; int flipx = ((state->colorram[tile_index] & 0x40) >> 6) ? TILEMAP_FLIPX : 0; @@ -194,7 +194,7 @@ static TILE_GET_INFO( ojankoy_get_tile_info ) void ojankoc_flipscreen( const address_space *space, int data ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int x, y; UINT8 color1, color2; @@ -224,7 +224,7 @@ void ojankoc_flipscreen( const address_space *space, int data ) WRITE8_HANDLER( ojankoc_videoram_w ) { - ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; + ojankohs_state *state = space->machine->driver_data(); int i; UINT8 x, y, xx, px, py ; UINT8 color, color1, color2; @@ -268,7 +268,7 @@ WRITE8_HANDLER( ojankoc_videoram_w ) VIDEO_START( ojankohs ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, ojankohs_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64); state->videoram = auto_alloc_array(machine, UINT8, 0x2000); @@ -282,7 +282,7 @@ VIDEO_START( ojankohs ) VIDEO_START( ojankoy ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, ojankoy_get_tile_info, tilemap_scan_rows, 8, 4, 64, 64); state->videoram = auto_alloc_array(machine, UINT8, 0x2000); @@ -296,7 +296,7 @@ VIDEO_START( ojankoy ) VIDEO_START( ojankoc ) { - ojankohs_state *state = (ojankohs_state *)machine->driver_data; + ojankohs_state *state = machine->driver_data(); state->tmpbitmap = machine->primary_screen->alloc_compatible_bitmap(); state->videoram = auto_alloc_array(machine, UINT8, 0x8000); @@ -316,7 +316,7 @@ VIDEO_START( ojankoc ) VIDEO_UPDATE( ojankohs ) { - ojankohs_state *state = (ojankohs_state *)screen->machine->driver_data; + ojankohs_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->tilemap, 0, state->scrollx); tilemap_set_scrolly(state->tilemap, 0, state->scrolly); @@ -327,7 +327,7 @@ VIDEO_UPDATE( ojankohs ) VIDEO_UPDATE( ojankoc ) { - ojankohs_state *state = (ojankohs_state *)screen->machine->driver_data; + ojankohs_state *state = screen->machine->driver_data(); int offs; if (state->screen_refresh) diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 0b52b9bfd8a..718b737978b 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -7,7 +7,7 @@ /* bg tilemap */ static TILE_GET_INFO( get_oneshot_bg_tile_info ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); int tileno = state->bg_videoram[tile_index * 2 + 1]; SET_TILE_INFO(0, tileno, 0, 0); @@ -15,7 +15,7 @@ static TILE_GET_INFO( get_oneshot_bg_tile_info ) WRITE16_HANDLER( oneshot_bg_videoram_w ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_videoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -23,7 +23,7 @@ WRITE16_HANDLER( oneshot_bg_videoram_w ) /* mid tilemap */ static TILE_GET_INFO( get_oneshot_mid_tile_info ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); int tileno = state->mid_videoram[tile_index * 2 + 1]; SET_TILE_INFO(0, tileno, 2, 0); @@ -31,7 +31,7 @@ static TILE_GET_INFO( get_oneshot_mid_tile_info ) WRITE16_HANDLER( oneshot_mid_videoram_w ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); COMBINE_DATA(&state->mid_videoram[offset]); tilemap_mark_tile_dirty(state->mid_tilemap, offset / 2); } @@ -40,7 +40,7 @@ WRITE16_HANDLER( oneshot_mid_videoram_w ) /* fg tilemap */ static TILE_GET_INFO( get_oneshot_fg_tile_info ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); int tileno = state->fg_videoram[tile_index * 2 + 1]; SET_TILE_INFO(0, tileno, 3, 0); @@ -48,14 +48,14 @@ static TILE_GET_INFO( get_oneshot_fg_tile_info ) WRITE16_HANDLER( oneshot_fg_videoram_w ) { - oneshot_state *state = (oneshot_state *)space->machine->driver_data; + oneshot_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); } VIDEO_START( oneshot ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_oneshot_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->mid_tilemap = tilemap_create(machine, get_oneshot_mid_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -68,7 +68,7 @@ VIDEO_START( oneshot ) static void draw_crosshairs( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); //int xpos,ypos; /* get gun raw coordinates (player 1) */ @@ -101,7 +101,7 @@ static void draw_crosshairs( running_machine *machine, bitmap_t *bitmap, const r static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - oneshot_state *state = (oneshot_state *)machine->driver_data; + oneshot_state *state = machine->driver_data(); const UINT16 *source = state->sprites; const UINT16 *finish = source + (0x1000 / 2); const gfx_element *gfx = machine->gfx[1]; @@ -158,7 +158,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( oneshot ) { - oneshot_state *state = (oneshot_state *)screen->machine->driver_data; + oneshot_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -175,7 +175,7 @@ VIDEO_UPDATE( oneshot ) VIDEO_UPDATE( maddonna ) { - oneshot_state *state = (oneshot_state *)screen->machine->driver_data; + oneshot_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index e3e0a6a6f7f..b453d66639b 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -9,7 +9,7 @@ Atari Orbit video emulation WRITE8_HANDLER( orbit_playfield_w ) { - orbit_state *state = (orbit_state *)space->machine->driver_data; + orbit_state *state = space->machine->driver_data(); state->playfield_ram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -17,7 +17,7 @@ WRITE8_HANDLER( orbit_playfield_w ) static TILE_GET_INFO( get_tile_info ) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); UINT8 code = state->playfield_ram[tile_index]; int flags = 0; @@ -32,14 +32,14 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( orbit ) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 16, 16, 32, 30); } static void draw_sprites( running_machine *machine, bitmap_t* bitmap, const rectangle* cliprect ) { - orbit_state *state = (orbit_state *)machine->driver_data; + orbit_state *state = machine->driver_data(); const UINT8* p = state->sprite_ram; int i; @@ -81,7 +81,7 @@ static void draw_sprites( running_machine *machine, bitmap_t* bitmap, const rect VIDEO_UPDATE( orbit ) { - orbit_state *state = (orbit_state *)screen->machine->driver_data; + orbit_state *state = screen->machine->driver_data(); state->flip_screen = input_port_read(screen->machine, "DSW2") & 8; diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index 64bc2e55bff..04198f9deb5 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -15,7 +15,7 @@ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int plane ) { - othldrby_state *state = (othldrby_state *)machine->driver_data; + othldrby_state *state = machine->driver_data(); UINT16 attr; tile_index = 2 * tile_index + 0x800 * plane; @@ -53,7 +53,7 @@ static TILE_GET_INFO( get_tile_info2 ) VIDEO_START( othldrby ) { - othldrby_state *state = (othldrby_state *)machine->driver_data; + othldrby_state *state = machine->driver_data(); state->bg_tilemap[0] = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 16, 16, 32, 32); state->bg_tilemap[1] = tilemap_create(machine, get_tile_info1, tilemap_scan_rows, 16, 16, 32, 32); @@ -81,13 +81,13 @@ VIDEO_START( othldrby ) WRITE16_HANDLER( othldrby_videoram_addr_w ) { - othldrby_state *state = (othldrby_state *)space->machine->driver_data; + othldrby_state *state = space->machine->driver_data(); state->vram_addr = data; } READ16_HANDLER( othldrby_videoram_r ) { - othldrby_state *state = (othldrby_state *)space->machine->driver_data; + othldrby_state *state = space->machine->driver_data(); if (state->vram_addr < VIDEORAM_SIZE) return state->vram[state->vram_addr++]; @@ -100,7 +100,7 @@ READ16_HANDLER( othldrby_videoram_r ) WRITE16_HANDLER( othldrby_videoram_w ) { - othldrby_state *state = (othldrby_state *)space->machine->driver_data; + othldrby_state *state = space->machine->driver_data(); if (state->vram_addr < VIDEORAM_SIZE) { @@ -114,13 +114,13 @@ WRITE16_HANDLER( othldrby_videoram_w ) WRITE16_HANDLER( othldrby_vreg_addr_w ) { - othldrby_state *state = (othldrby_state *)space->machine->driver_data; + othldrby_state *state = space->machine->driver_data(); state->vreg_addr = data & 0x7f; /* bit 7 is set when screen is flipped */ } WRITE16_HANDLER( othldrby_vreg_w ) { - othldrby_state *state = (othldrby_state *)space->machine->driver_data; + othldrby_state *state = space->machine->driver_data(); if (state->vreg_addr < OTHLDRBY_VREG_SIZE) state->vreg[state->vreg_addr++] = data; @@ -138,7 +138,7 @@ WRITE16_HANDLER( othldrby_vreg_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - othldrby_state *state = (othldrby_state *)machine->driver_data; + othldrby_state *state = machine->driver_data(); int offs; for (offs = 0; offs < SPRITERAM_SIZE; offs += 4) @@ -182,7 +182,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( othldrby ) { - othldrby_state *state = (othldrby_state *)screen->machine->driver_data; + othldrby_state *state = screen->machine->driver_data(); int layer; flip_screen_set(screen->machine, state->vreg[0x0f] & 0x80); @@ -226,7 +226,7 @@ VIDEO_UPDATE( othldrby ) VIDEO_EOF( othldrby ) { - othldrby_state *state = (othldrby_state *)machine->driver_data; + othldrby_state *state = machine->driver_data(); /* sprites need to be delayed two frames */ memcpy(state->buf_spriteram, state->buf_spriteram2, SPRITERAM_SIZE * sizeof(state->buf_spriteram[0])); diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c index 4e77f40681b..d5e27fde337 100644 --- a/src/mame/video/othunder.c +++ b/src/mame/video/othunder.c @@ -8,7 +8,7 @@ VIDEO_START( othunder ) /* Up to $800/8 big sprites, requires 0x100 * sizeof(*spritelist) Multiply this by 32 to give room for the number of small sprites, which are what actually get put in the structure. */ - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); state->spritelist = auto_alloc_array(machine, struct othunder_tempsprite, 0x2000); } @@ -65,7 +65,7 @@ spriteram is being tested, take no notice of that.] static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const int *primasks, int y_offs ) { - othunder_state *state = (othunder_state *)machine->driver_data; + othunder_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 tile_mask = (machine->gfx[0]->total_elements) - 1; UINT16 *spriteram16 = state->spriteram; @@ -202,7 +202,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); VIDEO_UPDATE( othunder ) { - othunder_state *state = (othunder_state *)screen->machine->driver_data; + othunder_state *state = screen->machine->driver_data(); int layer[3]; tc0100scn_tilemap_update(state->tc0100scn); diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c index aa4e208b63c..30854e54954 100644 --- a/src/mame/video/overdriv.c +++ b/src/mame/video/overdriv.c @@ -10,7 +10,7 @@ void overdriv_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - overdriv_state *state = (overdriv_state *)machine->driver_data; + overdriv_state *state = machine->driver_data(); int pri = (*color & 0xffe0) >> 5; /* ??????? */ if (pri) *priority_mask = 0x02; @@ -29,7 +29,7 @@ void overdriv_sprite_callback( running_machine *machine, int *code, int *color, void overdriv_zoom_callback_0( running_machine *machine, int *code, int *color, int *flags ) { - overdriv_state *state = (overdriv_state *)machine->driver_data; + overdriv_state *state = machine->driver_data(); *flags = (*color & 0x40) ? TILE_FLIPX : 0; *code |= ((*color & 0x03) << 8); *color = state->zoom_colorbase[0] + ((*color & 0x3c) >> 2); @@ -37,7 +37,7 @@ void overdriv_zoom_callback_0( running_machine *machine, int *code, int *color, void overdriv_zoom_callback_1( running_machine *machine, int *code, int *color, int *flags ) { - overdriv_state *state = (overdriv_state *)machine->driver_data; + overdriv_state *state = machine->driver_data(); *flags = (*color & 0x40) ? TILE_FLIPX : 0; *code |= ((*color & 0x03) << 8); *color = state->zoom_colorbase[1] + ((*color & 0x3c) >> 2); @@ -52,7 +52,7 @@ void overdriv_zoom_callback_1( running_machine *machine, int *code, int *color, VIDEO_UPDATE( overdriv ) { - overdriv_state *state = (overdriv_state *)screen->machine->driver_data; + overdriv_state *state = screen->machine->driver_data(); state->sprite_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); state->road_colorbase[1] = k053251_get_palette_index(state->k053251, K053251_CI1); diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index ea884d47182..92910eb33ec 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -89,7 +89,7 @@ PALETTE_INIT( pandoras ) static TILE_GET_INFO( get_tile_info0 ) { - pandoras_state *state = (pandoras_state *)machine->driver_data; + pandoras_state *state = machine->driver_data(); UINT8 attr = state->colorram[tile_index]; SET_TILE_INFO( 1, @@ -107,7 +107,7 @@ static TILE_GET_INFO( get_tile_info0 ) VIDEO_START( pandoras ) { - pandoras_state *state = (pandoras_state *)machine->driver_data; + pandoras_state *state = machine->driver_data(); state->layer0 = tilemap_create(machine, get_tile_info0, tilemap_scan_rows, 8, 8, 32, 32); state_save_register_global(machine, state->flipscreen); @@ -121,7 +121,7 @@ VIDEO_START( pandoras ) WRITE8_HANDLER( pandoras_vram_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); tilemap_mark_tile_dirty(state->layer0, offset); state->videoram[offset] = data; @@ -129,7 +129,7 @@ WRITE8_HANDLER( pandoras_vram_w ) WRITE8_HANDLER( pandoras_cram_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); tilemap_mark_tile_dirty(state->layer0, offset); state->colorram[offset] = data; @@ -137,14 +137,14 @@ WRITE8_HANDLER( pandoras_cram_w ) WRITE8_HANDLER( pandoras_scrolly_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->layer0, 0, data); } WRITE8_HANDLER( pandoras_flipscreen_w ) { - pandoras_state *state = (pandoras_state *)space->machine->driver_data; + pandoras_state *state = space->machine->driver_data(); state->flipscreen = data; tilemap_set_flip_all(space->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); @@ -179,7 +179,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( pandoras ) { - pandoras_state *state = (pandoras_state *)screen->machine->driver_data; + pandoras_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect, state->layer0, 1 ,0); draw_sprites(screen->machine, bitmap, cliprect, &state->spriteram[0x800] ); tilemap_draw(bitmap,cliprect, state->layer0, 0 ,0); diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index c9f84b6994b..42463ecaf3f 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -42,7 +42,7 @@ WRITE8_HANDLER( tgtball_flipscreen_w ) /* 800 bytes for red, followed by 800 bytes for green & 800 bytes for blue */ WRITE8_HANDLER( paradise_palette_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); state->paletteram[offset] = data; offset %= 0x800; palette_set_color_rgb(space->machine, offset, state->paletteram[offset + 0x800 * 0], state->paletteram[offset + 0x800 * 1], @@ -63,7 +63,7 @@ WRITE8_HANDLER( paradise_palette_w ) /* Background */ WRITE8_HANDLER( paradise_vram_0_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); state->vram_0[offset] = data; tilemap_mark_tile_dirty(state->tilemap_0, offset % 0x400); } @@ -71,7 +71,7 @@ WRITE8_HANDLER( paradise_vram_0_w ) /* 16 color tiles with paradise_palbank as color code */ WRITE8_HANDLER( paradise_palbank_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); int i; int bank1 = (data & 0x0e) | 1; int bank2 = (data & 0xf0); @@ -89,7 +89,7 @@ WRITE8_HANDLER( paradise_palbank_w ) static TILE_GET_INFO( get_tile_info_0 ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); int code = state->vram_0[tile_index] + (state->vram_0[tile_index + 0x400] << 8); SET_TILE_INFO(1, code, state->palbank, 0); } @@ -98,14 +98,14 @@ static TILE_GET_INFO( get_tile_info_0 ) /* Midground */ WRITE8_HANDLER( paradise_vram_1_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); state->vram_1[offset] = data; tilemap_mark_tile_dirty(state->tilemap_1, offset % 0x400); } static TILE_GET_INFO( get_tile_info_1 ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); int code = state->vram_1[tile_index] + (state->vram_1[tile_index + 0x400] << 8); SET_TILE_INFO(2, code, 0, 0); } @@ -114,14 +114,14 @@ static TILE_GET_INFO( get_tile_info_1 ) /* Foreground */ WRITE8_HANDLER( paradise_vram_2_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); state->vram_2[offset] = data; tilemap_mark_tile_dirty(state->tilemap_2, offset % 0x400); } static TILE_GET_INFO( get_tile_info_2 ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); int code = state->vram_2[tile_index] + (state->vram_2[tile_index + 0x400] << 8); SET_TILE_INFO(3, code, 0, 0); } @@ -130,7 +130,7 @@ static TILE_GET_INFO( get_tile_info_2 ) WRITE8_HANDLER( paradise_pixmap_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); int x, y; state->videoram[offset] = data; @@ -151,7 +151,7 @@ WRITE8_HANDLER( paradise_pixmap_w ) VIDEO_START( paradise ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); state->tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 8, 8, 0x20, 0x20); state->tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 8, 8, 0x20, 0x20); @@ -177,13 +177,13 @@ VIDEO_START( paradise ) /* Sprites / Layers priority */ WRITE8_HANDLER( paradise_priority_w ) { - paradise_state *state = (paradise_state *)space->machine->driver_data; + paradise_state *state = space->machine->driver_data(); state->priority = data; } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - paradise_state *state = (paradise_state *)machine->driver_data; + paradise_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int i; for (i = 0; i < state->spriteram_size ; i += state->sprite_inc) @@ -232,7 +232,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( paradise ) { - paradise_state *state = (paradise_state *)screen->machine->driver_data; + paradise_state *state = screen->machine->driver_data(); int layers_ctrl = -1; #ifdef MAME_DEBUG @@ -283,7 +283,7 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) /* no pix layer, no tilemap_0, different priority bits */ VIDEO_UPDATE( torus ) { - paradise_state *state = (paradise_state *)screen->machine->driver_data; + paradise_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -315,7 +315,7 @@ VIDEO_UPDATE( torus ) /* I don't know how the priority bits work on this one */ VIDEO_UPDATE( madball ) { - paradise_state *state = (paradise_state *)screen->machine->driver_data; + paradise_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); tilemap_draw(bitmap, cliprect, state->tilemap_0, 0, 0); diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c index 26f8bc2cd4a..d76246e968f 100644 --- a/src/mame/video/parodius.c +++ b/src/mame/video/parodius.c @@ -11,7 +11,7 @@ void parodius_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - parodius_state *state = (parodius_state *)machine->driver_data; + parodius_state *state = machine->driver_data(); *code |= ((*color & 0x03) << 8) | ((*color & 0x10) << 6) | ((*color & 0x0c) << 9) | (bank << 13); *color = state->layer_colorbase[layer] + ((*color & 0xe0) >> 5); } @@ -24,7 +24,7 @@ void parodius_tile_callback( running_machine *machine, int layer, int bank, int void parodius_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - parodius_state *state = (parodius_state *)machine->driver_data; + parodius_state *state = machine->driver_data(); int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -47,7 +47,7 @@ void parodius_sprite_callback( running_machine *machine, int *code, int *color, VIDEO_UPDATE( parodius ) { - parodius_state *state = (parodius_state *)screen->machine->driver_data; + parodius_state *state = screen->machine->driver_data(); int layer[3], bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index 206220fd362..ec3d85dd03a 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -7,7 +7,7 @@ static TILE_GET_INFO( get_pass_bg_tile_info ) { - pass_state *state = (pass_state *)machine->driver_data; + pass_state *state = machine->driver_data(); int tileno, fx; tileno = state->bg_videoram[tile_index] & 0x1fff; @@ -18,7 +18,7 @@ static TILE_GET_INFO( get_pass_bg_tile_info ) WRITE16_HANDLER( pass_bg_videoram_w ) { - pass_state *state = (pass_state *)space->machine->driver_data; + pass_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -28,7 +28,7 @@ WRITE16_HANDLER( pass_bg_videoram_w ) static TILE_GET_INFO( get_pass_fg_tile_info ) { - pass_state *state = (pass_state *)machine->driver_data; + pass_state *state = machine->driver_data(); int tileno, flip; tileno = state->fg_videoram[tile_index] & 0x3fff; @@ -40,7 +40,7 @@ static TILE_GET_INFO( get_pass_fg_tile_info ) WRITE16_HANDLER( pass_fg_videoram_w ) { - pass_state *state = (pass_state *)space->machine->driver_data; + pass_state *state = space->machine->driver_data(); state->fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } @@ -49,7 +49,7 @@ WRITE16_HANDLER( pass_fg_videoram_w ) VIDEO_START( pass ) { - pass_state *state = (pass_state *)machine->driver_data; + pass_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_pass_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->fg_tilemap = tilemap_create(machine, get_pass_fg_tile_info, tilemap_scan_rows, 4, 4, 128, 64); @@ -59,7 +59,7 @@ VIDEO_START( pass ) VIDEO_UPDATE( pass ) { - pass_state *state = (pass_state *)screen->machine->driver_data; + pass_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->bg_tilemap, 0, 0); tilemap_draw(bitmap,cliprect,state->fg_tilemap, 0, 0); diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index c79f4d87517..81069bc42cf 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -11,35 +11,35 @@ WRITE8_HANDLER( pbaction_videoram_w ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( pbaction_colorram_w ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( pbaction_videoram2_w ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); state->videoram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( pbaction_colorram2_w ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); state->colorram2[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); } WRITE8_HANDLER( pbaction_scroll_w ) { - pbaction_state *state = (pbaction_state *)space->machine->driver_data; + pbaction_state *state = space->machine->driver_data(); state->scroll = data - 3; if (flip_screen_get(space->machine)) state->scroll = -state->scroll; @@ -55,7 +55,7 @@ WRITE8_HANDLER( pbaction_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - pbaction_state *state = (pbaction_state *)machine->driver_data; + pbaction_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + 0x10 * (attr & 0x70); int color = attr & 0x07; @@ -66,7 +66,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - pbaction_state *state = (pbaction_state *)machine->driver_data; + pbaction_state *state = machine->driver_data(); int attr = state->colorram2[tile_index]; int code = state->videoram2[tile_index] + 0x10 * (attr & 0x30); int color = attr & 0x0f; @@ -77,7 +77,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( pbaction ) { - pbaction_state *state = (pbaction_state *)machine->driver_data; + pbaction_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -86,7 +86,7 @@ VIDEO_START( pbaction ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - pbaction_state *state = (pbaction_state *)machine->driver_data; + pbaction_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -134,7 +134,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( pbaction ) { - pbaction_state *state = (pbaction_state *)screen->machine->driver_data; + pbaction_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 19a37dbab1a..1005757baab 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -9,7 +9,7 @@ /* this decodes one of the funky sprites to a bitmap so we can draw it more easily -- slow but easier to use*/ static void pgm_prepare_sprite( running_machine *machine, int wide, int high, int palt, int boffset ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); UINT8 *bdata = memory_region(machine, "sprmask"); size_t bdatasize = memory_region_length(machine, "sprmask") - 1; UINT8 *adata = state->sprite_a_region; @@ -56,7 +56,7 @@ static void pgm_prepare_sprite( running_machine *machine, int wide, int high, in // in the dest bitmap 0x10000 is used to mark 'used pixel' and 0x8000 is used to mark 'high priority' static void draw_sprite_line( running_machine *machine, int wide, UINT32* dest, int xzoom, int xgrow, int yoffset, int flip, int xpos, int pri ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); int xcnt,xcntdraw; int xzoombit; int xoffset; @@ -220,7 +220,7 @@ static void draw_sprites( running_machine *machine, bitmap_t* spritebitmap, UINT */ - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); const UINT16 *finish = state->spritebufferram + (0xa00 / 2); while (sprite_source < finish) @@ -274,7 +274,7 @@ static void draw_sprites( running_machine *machine, bitmap_t* spritebitmap, UINT /* TX Layer */ WRITE16_HANDLER( pgm_tx_videoram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); state->tx_videoram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap, offset / 2); } @@ -296,7 +296,7 @@ static TILE_GET_INFO( get_pgm_tx_tilemap_tile_info ) p = palette f = flip */ - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); int tileno, colour, flipyx; //,game; tileno = state->tx_videoram[tile_index * 2] & 0xffff; @@ -312,7 +312,7 @@ static TILE_GET_INFO( get_pgm_tx_tilemap_tile_info ) WRITE16_HANDLER( pgm_bg_videoram_w ) { - pgm_state *state = (pgm_state *)space->machine->driver_data; + pgm_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -321,7 +321,7 @@ static TILE_GET_INFO( get_pgm_bg_tilemap_tile_info ) { /* pretty much the same as tx layer */ - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); int tileno, colour, flipyx; tileno = state->bg_videoram[tile_index *2] & 0xffff; @@ -339,7 +339,7 @@ static TILE_GET_INFO( get_pgm_bg_tilemap_tile_info ) VIDEO_START( pgm ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); int i; state->tx_tilemap = tilemap_create(machine, get_pgm_tx_tilemap_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -367,7 +367,7 @@ VIDEO_START( pgm ) VIDEO_UPDATE( pgm ) { - pgm_state *state = (pgm_state *)screen->machine->driver_data; + pgm_state *state = screen->machine->driver_data(); int y; bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -423,7 +423,7 @@ VIDEO_UPDATE( pgm ) VIDEO_EOF( pgm ) { - pgm_state *state = (pgm_state *)machine->driver_data; + pgm_state *state = machine->driver_data(); /* first 0xa00 of main ram = sprites, seems to be buffered, DMA? */ memcpy(state->spritebufferram, pgm_mainram, 0xa00); diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c index 9cc27e2f5aa..2d0377bc1af 100644 --- a/src/mame/video/pktgaldx.c +++ b/src/mame/video/pktgaldx.c @@ -4,7 +4,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - pktgaldx_state *state = (pktgaldx_state *)machine->driver_data; + pktgaldx_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; int flipscreen = !flip_screen_get(machine); @@ -75,7 +75,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( pktgaldx ) { - pktgaldx_state *state = (pktgaldx_state *)screen->machine->driver_data; + pktgaldx_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); @@ -94,7 +94,7 @@ VIDEO_UPDATE( pktgaldx ) VIDEO_UPDATE( pktgaldb ) { - pktgaldx_state *state = (pktgaldx_state *)screen->machine->driver_data; + pktgaldx_state *state = screen->machine->driver_data(); int x, y; int offset = 0; int tileno; diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index 089950e42ad..b5f9ce07403 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -10,7 +10,7 @@ static TILE_GET_INFO( bigtwin_get_tx_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT16 code = state->videoram1[2 * tile_index]; UINT16 color = state->videoram1[2 * tile_index + 1]; SET_TILE_INFO( @@ -22,7 +22,7 @@ static TILE_GET_INFO( bigtwin_get_tx_tile_info ) static TILE_GET_INFO( bigtwin_get_fg_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT16 code = state->videoram2[2 * tile_index]; UINT16 color = state->videoram2[2 * tile_index + 1]; SET_TILE_INFO( @@ -34,7 +34,7 @@ static TILE_GET_INFO( bigtwin_get_fg_tile_info ) static TILE_GET_INFO( wbeachvl_get_tx_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT16 code = state->videoram1[2 * tile_index]; UINT16 color = state->videoram1[2 * tile_index + 1]; @@ -47,7 +47,7 @@ static TILE_GET_INFO( wbeachvl_get_tx_tile_info ) static TILE_GET_INFO( wbeachvl_get_fg_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT16 code = state->videoram2[2 * tile_index]; UINT16 color = state->videoram2[2 * tile_index + 1]; @@ -60,7 +60,7 @@ static TILE_GET_INFO( wbeachvl_get_fg_tile_info ) static TILE_GET_INFO( wbeachvl_get_bg_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); UINT16 code = state->videoram3[2 * tile_index]; UINT16 color = state->videoram3[2 * tile_index + 1]; @@ -73,7 +73,7 @@ static TILE_GET_INFO( wbeachvl_get_bg_tile_info ) static TILE_GET_INFO( hrdtimes_get_tx_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); int code = state->videoram1[tile_index] & 0x03ff; int colr = state->videoram1[tile_index] & 0xe000; @@ -82,7 +82,7 @@ static TILE_GET_INFO( hrdtimes_get_tx_tile_info ) static TILE_GET_INFO( hrdtimes_get_fg_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); int code = state->videoram2[tile_index] & 0x1fff; int colr = state->videoram2[tile_index] & 0xe000; @@ -91,7 +91,7 @@ static TILE_GET_INFO( hrdtimes_get_fg_tile_info ) static TILE_GET_INFO( hrdtimes_get_bg_tile_info ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); int code = state->videoram3[tile_index] & 0x1fff; int colr = state->videoram3[tile_index] & 0xe000; @@ -106,7 +106,7 @@ static TILE_GET_INFO( hrdtimes_get_bg_tile_info ) VIDEO_START( bigtwin ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, bigtwin_get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->fg_tilemap = tilemap_create(machine, bigtwin_get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -125,7 +125,7 @@ VIDEO_START( bigtwin ) VIDEO_START( wbeachvl ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, wbeachvl_get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->fg_tilemap = tilemap_create(machine, wbeachvl_get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 32); @@ -145,7 +145,7 @@ VIDEO_START( wbeachvl ) VIDEO_START( excelsr ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, bigtwin_get_tx_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->fg_tilemap = tilemap_create(machine, bigtwin_get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -163,7 +163,7 @@ VIDEO_START( excelsr ) VIDEO_START( hotmind ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, hrdtimes_get_tx_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -187,7 +187,7 @@ VIDEO_START( hotmind ) VIDEO_START( hrdtimes ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); state->tx_tilemap = tilemap_create(machine, hrdtimes_get_tx_tile_info,tilemap_scan_rows, 8, 8, 64, 64); state->fg_tilemap = tilemap_create(machine, hrdtimes_get_fg_tile_info,tilemap_scan_rows, 16, 16, 32, 32); @@ -217,7 +217,7 @@ VIDEO_START( hrdtimes ) WRITE16_HANDLER( wbeachvl_txvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram1[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset / 2); @@ -225,7 +225,7 @@ WRITE16_HANDLER( wbeachvl_txvideoram_w ) WRITE16_HANDLER( wbeachvl_fgvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram2[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset / 2); @@ -233,7 +233,7 @@ WRITE16_HANDLER( wbeachvl_fgvideoram_w ) WRITE16_HANDLER( wbeachvl_bgvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram3[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); @@ -241,7 +241,7 @@ WRITE16_HANDLER( wbeachvl_bgvideoram_w ) WRITE16_HANDLER( hrdtimes_txvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram1[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); @@ -249,7 +249,7 @@ WRITE16_HANDLER( hrdtimes_txvideoram_w ) WRITE16_HANDLER( hrdtimes_fgvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram2[offset]); tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -257,7 +257,7 @@ WRITE16_HANDLER( hrdtimes_fgvideoram_w ) WRITE16_HANDLER( hrdtimes_bgvideoram_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram3[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -284,7 +284,7 @@ WRITE16_HANDLER( bigtwin_paletteram_w ) WRITE16_HANDLER( bigtwin_scroll_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); @@ -304,7 +304,7 @@ WRITE16_HANDLER( bigtwin_scroll_w ) WRITE16_HANDLER( wbeachvl_scroll_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); @@ -323,7 +323,7 @@ WRITE16_HANDLER( wbeachvl_scroll_w ) WRITE16_HANDLER( excelsr_scroll_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); @@ -343,7 +343,7 @@ WRITE16_HANDLER( excelsr_scroll_w ) WRITE16_HANDLER( hrdtimes_scroll_w ) { - playmark_state *state = (playmark_state *)space->machine->driver_data; + playmark_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); @@ -366,7 +366,7 @@ WRITE16_HANDLER( hrdtimes_scroll_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int codeshift ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); int offs, start_offset = state->spriteram_size / 2 - 4; int height = machine->gfx[0]->height; int colordiv = machine->gfx[0]->color_granularity / 16; @@ -409,7 +409,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - playmark_state *state = (playmark_state *)machine->driver_data; + playmark_state *state = machine->driver_data(); int x, y, count; int color; UINT8 *pri; @@ -450,7 +450,7 @@ static void draw_bitmap( running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( bigtwin ) { - playmark_state *state = (playmark_state *)screen->machine->driver_data; + playmark_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -464,7 +464,7 @@ VIDEO_UPDATE( bigtwin ) VIDEO_UPDATE( excelsr ) { - playmark_state *state = (playmark_state *)screen->machine->driver_data; + playmark_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); @@ -478,7 +478,7 @@ VIDEO_UPDATE( excelsr ) VIDEO_UPDATE( wbeachvl ) { - playmark_state *state = (playmark_state *)screen->machine->driver_data; + playmark_state *state = screen->machine->driver_data(); if (state->fg_rowscroll_enable) { @@ -505,7 +505,7 @@ VIDEO_UPDATE( wbeachvl ) VIDEO_UPDATE( hrdtimes ) { - playmark_state *state = (playmark_state *)screen->machine->driver_data; + playmark_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index 08a7d25d250..99f6651be33 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -97,7 +97,7 @@ PALETTE_INIT( pooyan ) static TILE_GET_INFO( get_bg_tile_info ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index]; int color = attr & 0x0f; @@ -116,7 +116,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( pooyan ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -130,7 +130,7 @@ VIDEO_START( pooyan ) WRITE8_HANDLER( pooyan_videoram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -138,7 +138,7 @@ WRITE8_HANDLER( pooyan_videoram_w ) WRITE8_HANDLER( pooyan_colorram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -159,7 +159,7 @@ WRITE8_HANDLER( pooyan_flipscreen_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -194,7 +194,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( pooyan ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 6a92e488802..d7793b8e9b5 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -56,7 +56,7 @@ PALETTE_INIT( popper ) WRITE8_HANDLER( popper_ol_videoram_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); state->ol_videoram[offset] = data; tilemap_mark_tile_dirty(state->ol_p123_tilemap, offset); @@ -65,7 +65,7 @@ WRITE8_HANDLER( popper_ol_videoram_w ) WRITE8_HANDLER( popper_videoram_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->p123_tilemap, offset); @@ -74,7 +74,7 @@ WRITE8_HANDLER( popper_videoram_w ) WRITE8_HANDLER( popper_ol_attribram_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); state->ol_attribram[offset] = data; tilemap_mark_tile_dirty(state->ol_p123_tilemap, offset); @@ -83,7 +83,7 @@ WRITE8_HANDLER( popper_ol_attribram_w ) WRITE8_HANDLER( popper_attribram_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); state->attribram[offset] = data; tilemap_mark_tile_dirty(state->p123_tilemap, offset); @@ -92,7 +92,7 @@ WRITE8_HANDLER( popper_attribram_w ) WRITE8_HANDLER( popper_flipscreen_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); state->flipscreen = data; tilemap_set_flip_all(space->machine, state->flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); @@ -105,13 +105,13 @@ WRITE8_HANDLER( popper_flipscreen_w ) WRITE8_HANDLER( popper_e002_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); state->e002 = data; } WRITE8_HANDLER( popper_gfx_bank_w ) { - popper_state *state = (popper_state *)space->machine->driver_data; + popper_state *state = space->machine->driver_data(); if (state->gfx_bank != data) { @@ -122,7 +122,7 @@ WRITE8_HANDLER( popper_gfx_bank_w ) static TILE_GET_INFO( get_popper_p123_tile_info ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); UINT32 tile_number = state->videoram[tile_index]; UINT8 attr = state->attribram[tile_index]; tile_number += state->gfx_bank << 8; @@ -137,7 +137,7 @@ static TILE_GET_INFO( get_popper_p123_tile_info ) static TILE_GET_INFO( get_popper_p0_tile_info ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); UINT32 tile_number = state->videoram[tile_index]; UINT8 attr = state->attribram[tile_index]; tile_number += state->gfx_bank << 8; @@ -154,7 +154,7 @@ static TILE_GET_INFO( get_popper_p0_tile_info ) static TILE_GET_INFO( get_popper_ol_p123_tile_info ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); UINT32 tile_number = state->ol_videoram[tile_index]; UINT8 attr = state->ol_attribram[tile_index]; tile_number += state->gfx_bank << 8; @@ -169,7 +169,7 @@ static TILE_GET_INFO( get_popper_ol_p123_tile_info ) static TILE_GET_INFO( get_popper_ol_p0_tile_info ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); UINT32 tile_number = state->ol_videoram[tile_index]; UINT8 attr = state->ol_attribram[tile_index]; tile_number += state->gfx_bank << 8; @@ -186,7 +186,7 @@ static TILE_GET_INFO( get_popper_ol_p0_tile_info ) VIDEO_START( popper ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); state->p123_tilemap = tilemap_create(machine, get_popper_p123_tile_info, tilemap_scan_cols, 8, 8, 33, 32 ); state->p0_tilemap = tilemap_create(machine, get_popper_p0_tile_info, tilemap_scan_cols, 8, 8, 33, 32); state->ol_p123_tilemap = tilemap_create(machine, get_popper_ol_p123_tile_info, tilemap_scan_cols, 8, 8, 2, 32); @@ -206,7 +206,7 @@ VIDEO_START( popper ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - popper_state *state = (popper_state *)machine->driver_data; + popper_state *state = machine->driver_data(); int offs, sx, sy, flipx, flipy; for (offs = 0; offs < state->spriteram_size - 4; offs += 4) @@ -248,7 +248,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( popper ) { - popper_state *state = (popper_state *)screen->machine->driver_data; + popper_state *state = screen->machine->driver_data(); rectangle finalclip = state->tilemap_clip; sect_rect(&finalclip, cliprect); diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 334e6259b92..16638505296 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -73,7 +73,7 @@ Offset: static TILE_GET_INFO( get_tile_info_0 ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); UINT16 code = ((UINT16 *)state->vram_0)[BYTE_XOR_BE(tile_index)]; SET_TILE_INFO( 1, @@ -84,7 +84,7 @@ static TILE_GET_INFO( get_tile_info_0 ) static TILE_GET_INFO( get_tile_info_1 ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); UINT16 code = ((UINT16 *)state->vram_1)[BYTE_XOR_BE(tile_index)]; SET_TILE_INFO( 1, @@ -96,7 +96,7 @@ static TILE_GET_INFO( get_tile_info_1 ) WRITE32_HANDLER( psikyo_vram_0_w ) { - psikyo_state *state = (psikyo_state *)space->machine->driver_data; + psikyo_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_0[offset]); if (ACCESSING_BITS_16_31) @@ -118,7 +118,7 @@ WRITE32_HANDLER( psikyo_vram_0_w ) WRITE32_HANDLER( psikyo_vram_1_w ) { - psikyo_state *state = (psikyo_state *)space->machine->driver_data; + psikyo_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_1[offset]); if (ACCESSING_BITS_16_31) @@ -140,7 +140,7 @@ WRITE32_HANDLER( psikyo_vram_1_w ) void psikyo_switch_banks( running_machine *machine, int tmap, int bank ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); if ((tmap == 0) && (bank != state->tilemap_0_bank)) { @@ -163,7 +163,7 @@ void psikyo_switch_banks( running_machine *machine, int tmap, int bank ) VIDEO_START( psikyo ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* The Hardware is Capable of Changing the Dimensions of the Tilemaps, its safer to create the various sized tilemaps now as opposed to later */ @@ -265,7 +265,7 @@ Note: Not all sprites are displayed: in the top part of spriteram static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int trans_pen ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* tile layers 0 & 1 have priorities 1 & 2 */ static const int pri[] = { 0, 0xfc, 0xff, 0xff }; @@ -384,7 +384,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect // it might be a problem with the actual bootleg static void draw_sprites_bootleg( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int trans_pen ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); /* tile layers 0 & 1 have priorities 1 & 2 */ static const int pri[] = { 0, 0xfc, 0xff, 0xff }; @@ -526,7 +526,7 @@ static int tilemap_width( int size ) VIDEO_UPDATE( psikyo ) { - psikyo_state *state = (psikyo_state *)screen->machine->driver_data; + psikyo_state *state = screen->machine->driver_data(); int i, layers_ctrl = -1; UINT32 tm0size, tm1size; @@ -700,7 +700,7 @@ VIDEO_UPDATE( psikyo ) VIDEO_UPDATE( psikyo_bootleg ) { - psikyo_state *state = (psikyo_state *)screen->machine->driver_data; + psikyo_state *state = screen->machine->driver_data(); int i, layers_ctrl = -1; UINT32 tm0size, tm1size; @@ -867,7 +867,7 @@ VIDEO_UPDATE( psikyo_bootleg ) VIDEO_EOF( psikyo ) { - psikyo_state *state = (psikyo_state *)machine->driver_data; + psikyo_state *state = machine->driver_data(); memcpy(state->spritebuf2, state->spritebuf1, 0x2000); memcpy(state->spritebuf1, machine->generic.spriteram.u32, 0x2000); } diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index eb728d709ca..cdf3a8e49df 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -52,7 +52,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect **- End Sprite Format -*/ - psikyo4_state *state = (psikyo4_state *)machine->driver_data; + psikyo4_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; UINT32 *source = state->spriteram; UINT16 *list = (UINT16 *)state->spriteram + 0x2c00/2 + 0x04/2; /* 0x2c00/0x2c02 what are these for, pointers? one for each screen */ diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index da0976826e8..e4de1de69fd 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -281,7 +281,7 @@ static void drawgfx_alphatable(bitmap_t *dest, const rectangle *cliprect, const Zooming isn't supported just because it's not used and it would be slow */ static void draw_bglayer( running_machine *machine, int layer, bitmap_t *bitmap, const rectangle *cliprect, UINT8 req_pri ) { - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); gfx_element *gfx; int offs = 0, sx, sy; int scrollx, scrolly, regbank, tilebank, alpha, alphamap, zoom, pri, size, width; @@ -389,7 +389,7 @@ From there we extract data as we compose the image, one scanline at a time, blen into the RGB32 bitmap (with either the alpha information from the ARGB, or per-line alpha */ static void draw_bglayerscroll( running_machine *machine, int layer, bitmap_t *bitmap, const rectangle *cliprect, UINT8 req_pri ) { - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); assert(BG_LINE(layer)); gfx_element *gfx = BG_DEPTH_8BPP(layer) ? machine->gfx[1] : machine->gfx[0]; @@ -484,7 +484,7 @@ static void draw_bglayerscroll( running_machine *machine, int layer, bitmap_t *b /* 3 BG layers, with priority */ static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 req_pri ) { - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); int i; #ifdef DEBUG_KEYS @@ -534,7 +534,7 @@ static void psikyosh_drawgfxzoom( running_machine *machine, UINT32 code,UINT32 color,int flipx,int flipy,int offsx,int offsy, int alpha, int zoomx, int zoomy, int wide, int high, UINT32 z) { - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); rectangle myclip; /* Clip to screen boundaries */ int code_offset = 0; int xtile, ytile, xpixel, ypixel; @@ -1115,7 +1115,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta #endif - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); const gfx_element *gfx; UINT32 *src = machine->generic.buffered_spriteram.u32; /* Use buffered spriteram */ UINT16 *list = (UINT16 *)src + 0x3800 / 2; @@ -1195,7 +1195,7 @@ static void psikyosh_prelineblend( running_machine *machine, bitmap_t *bitmap, c /* I suspect that it should be blended against black by the amount specified as gnbarich sets the 0x000000ff to 0x7f in test mode whilst the others use 0x80. tgm2 sets it to 0x00 on warning screen. Likely has no effect. */ - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); UINT32 *dstline; int bank = (state->vidregs[7] & 0xff000000) >> 24; /* bank is always 8 (0x4000) except for daraku/soldivid */ UINT32 *linefill = &state->bgram[(bank * 0x800) / 4 - 0x4000 / 4]; /* Per row */ @@ -1219,7 +1219,7 @@ static void psikyosh_prelineblend( running_machine *machine, bitmap_t *bitmap, c static void psikyosh_postlineblend( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 req_pri ) { /* There are 224 values for post-lineblending. Using one for every row currently */ - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); UINT32 *dstline; int bank = (state->vidregs[7] & 0xff000000) >> 24; /* bank is always 8 (i.e. 0x4000) except for daraku/soldivid */ UINT32 *lineblend = &state->bgram[(bank * 0x800) / 4 - 0x4000 / 4 + 0x400 / 4]; /* Per row */ @@ -1253,7 +1253,7 @@ static void psikyosh_postlineblend( running_machine *machine, bitmap_t *bitmap, VIDEO_START( psikyosh ) { - psikyosh_state *state = (psikyosh_state *)machine->driver_data; + psikyosh_state *state = machine->driver_data(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -1291,7 +1291,7 @@ VIDEO_START( psikyosh ) VIDEO_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct priority */ { int i; - psikyosh_state *state = (psikyosh_state *)screen->machine->driver_data; + psikyosh_state *state = screen->machine->driver_data(); // show only the priority associated with a given keypress(s) and/or hide sprites/tilemaps int pri_debug = false; diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index 62fb72cebb1..1f12f1574d7 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -28,7 +28,7 @@ static TILE_GET_INFO( get_back_tile_info ) static TILE_GET_INFO( get_text_tile_info ) { - pushman_state *state = (pushman_state *)machine->driver_data; + pushman_state *state = machine->driver_data(); int tile = state->videoram[tile_index]; SET_TILE_INFO( @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_text_tile_info ) VIDEO_START( pushman ) { - pushman_state *state = (pushman_state *)machine->driver_data; + pushman_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_back_tile_info, background_scan_rows, 32, 32, 128, 64); state->tx_tilemap = tilemap_create(machine, get_text_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -66,13 +66,13 @@ VIDEO_START( pushman ) WRITE16_HANDLER( pushman_scroll_w ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); COMBINE_DATA(&state->control[offset]); } WRITE16_HANDLER( pushman_videoram_w ) { - pushman_state *state = (pushman_state *)space->machine->driver_data; + pushman_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); } @@ -87,7 +87,7 @@ WRITE16_HANDLER( pushman_videoram_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - pushman_state *state = (pushman_state *)machine->driver_data; + pushman_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, x, y, color, sprite, flipx, flipy; @@ -122,7 +122,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( pushman ) { - pushman_state *state = (pushman_state *)screen->machine->driver_data; + pushman_state *state = screen->machine->driver_data(); /* Setup the tilemaps */ tilemap_set_scrollx(state->bg_tilemap, 0, state->control[0]); diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index 5a588ab9593..764375ebf1d 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -43,7 +43,7 @@ static WRITE_LINE_DEVICE_HANDLER( display_enable_changed ); static VIDEO_START( qix ) { - qix_state *state = (qix_state *)machine->driver_data; + qix_state *state = machine->driver_data(); /* allocate memory for the full video RAM */ state->videoram = auto_alloc_array(machine, UINT8, 256 * 256); @@ -65,7 +65,7 @@ static VIDEO_START( qix ) static WRITE_LINE_DEVICE_HANDLER( display_enable_changed ) { - qix_state *driver_state = (qix_state *)device->machine->driver_data; + qix_state *driver_state = device->machine->driver_data(); /* on the rising edge, latch the scanline */ if (state) @@ -88,7 +88,7 @@ static WRITE_LINE_DEVICE_HANDLER( display_enable_changed ) WRITE8_DEVICE_HANDLER( qix_flip_screen_w ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); state->flip = data; } @@ -112,7 +112,7 @@ WRITE8_DEVICE_HANDLER( qix_flip_screen_w ) static READ8_HANDLER( qix_videoram_r ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* add in the upper bit of the address latch */ offset += (state->videoram_address[0] & 0x80) << 8; @@ -122,7 +122,7 @@ static READ8_HANDLER( qix_videoram_r ) static WRITE8_HANDLER( qix_videoram_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* update the screen in case the game is writing "behind" the beam - Zookeeper likes to do this */ @@ -138,7 +138,7 @@ static WRITE8_HANDLER( qix_videoram_w ) static WRITE8_HANDLER( slither_videoram_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* update the screen in case the game is writing "behind" the beam - Zookeeper likes to do this */ @@ -170,7 +170,7 @@ static WRITE8_HANDLER( slither_videoram_w ) static READ8_HANDLER( qix_addresslatch_r ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* compute the value at the address latch */ offset = (state->videoram_address[0] << 8) | state->videoram_address[1]; @@ -180,7 +180,7 @@ static READ8_HANDLER( qix_addresslatch_r ) static WRITE8_HANDLER( qix_addresslatch_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* update the screen in case the game is writing "behind" the beam */ space->machine->primary_screen->update_now(); @@ -195,7 +195,7 @@ static WRITE8_HANDLER( qix_addresslatch_w ) static WRITE8_HANDLER( slither_addresslatch_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* update the screen in case the game is writing "behind" the beam */ space->machine->primary_screen->update_now(); @@ -220,7 +220,7 @@ static WRITE8_HANDLER( slither_addresslatch_w ) static WRITE8_HANDLER( qix_paletteram_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); UINT8 old_data = state->paletteram[offset]; @@ -236,7 +236,7 @@ static WRITE8_HANDLER( qix_paletteram_w ) WRITE8_HANDLER( qix_palettebank_w ) { - qix_state *state = (qix_state *)space->machine->driver_data; + qix_state *state = space->machine->driver_data(); /* set the bank value */ if (state->palette_bank != (data & 3)) @@ -308,7 +308,7 @@ static void get_pens(qix_state *state, pen_t *pens) static MC6845_BEGIN_UPDATE( begin_update ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); #if 0 // note the confusing bit order! @@ -326,7 +326,7 @@ static MC6845_BEGIN_UPDATE( begin_update ) static MC6845_UPDATE_ROW( update_row ) { - qix_state *state = (qix_state *)device->machine->driver_data; + qix_state *state = device->machine->driver_data(); UINT32 *dest = BITMAP_ADDR32(bitmap, y, 0); UINT16 x; diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c index d09ff56640d..ec977904b4d 100644 --- a/src/mame/video/quasar.c +++ b/src/mame/video/quasar.c @@ -92,7 +92,7 @@ PALETTE_INIT( quasar ) VIDEO_START( quasar ) { - cvs_state *state = (cvs_state *)machine->driver_data; + cvs_state *state = machine->driver_data(); state->effectram = auto_alloc_array(machine, UINT8, 0x400); /* create helper bitmap */ @@ -105,7 +105,7 @@ VIDEO_START( quasar ) VIDEO_UPDATE( quasar ) { - cvs_state *state = (cvs_state *)screen->machine->driver_data; + cvs_state *state = screen->machine->driver_data(); int offs; bitmap_t *s2636_0_bitmap, *s2636_1_bitmap, *s2636_2_bitmap; diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 36ee8b98c0e..7ff78a77a79 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -222,7 +222,7 @@ static TILEMAP_MAPPER( fg_tilemap_scan ) INLINE void rallyx_get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int ram_offs) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 attr = state->videoram[ram_offs + tile_index + 0x800]; tileinfo->category = (attr & 0x20) >> 5; SET_TILE_INFO( @@ -245,7 +245,7 @@ static TILE_GET_INFO( rallyx_fg_get_tile_info ) INLINE void locomotn_get_tile_info(running_machine *machine,tile_data *tileinfo,int tile_index,int ram_offs) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 attr = state->videoram[ram_offs + tile_index + 0x800]; int code = state->videoram[ram_offs + tile_index]; code = (code & 0x7f) + 2 * (attr & 0x40) + 2 * (code & 0x80); @@ -277,7 +277,7 @@ static TILE_GET_INFO( locomotn_fg_get_tile_info ) static void calculate_star_field( running_machine *machine ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int generator; int x, y; @@ -317,7 +317,7 @@ static void calculate_star_field( running_machine *machine ) static void rallyx_video_start_common( running_machine *machine ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int i; state->spriteram = state->videoram + 0x00; @@ -339,7 +339,7 @@ static void rallyx_video_start_common( running_machine *machine ) VIDEO_START( rallyx ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, rallyx_bg_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, rallyx_fg_get_tile_info, fg_tilemap_scan, 8, 8, 8, 32); @@ -355,7 +355,7 @@ VIDEO_START( rallyx ) VIDEO_START( jungler ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, rallyx_bg_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, rallyx_fg_get_tile_info, fg_tilemap_scan, 8, 8, 8, 32); @@ -369,7 +369,7 @@ VIDEO_START( jungler ) VIDEO_START( locomotn ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, locomotn_bg_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, locomotn_fg_get_tile_info, fg_tilemap_scan, 8, 8, 8, 32); @@ -390,7 +390,7 @@ VIDEO_START( locomotn ) VIDEO_START( commsega ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, locomotn_bg_get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, locomotn_fg_get_tile_info, fg_tilemap_scan, 8, 8, 8, 32); @@ -418,7 +418,7 @@ VIDEO_START( commsega ) WRITE8_HANDLER( rallyx_videoram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->videoram[offset] = data; if (offset & 0x400) @@ -429,19 +429,19 @@ WRITE8_HANDLER( rallyx_videoram_w ) WRITE8_HANDLER( rallyx_scrollx_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); tilemap_set_scrollx(state->bg_tilemap, 0, data); } WRITE8_HANDLER( rallyx_scrolly_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); tilemap_set_scrolly(state->bg_tilemap, 0, data); } WRITE8_HANDLER( tactcian_starson_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->stars_enable = data & 1; } @@ -464,7 +464,7 @@ static void plot_star( running_machine *machine, bitmap_t *bitmap, const rectang static void draw_stars( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->total_stars; offs++) @@ -480,7 +480,7 @@ static void draw_stars( running_machine *machine, bitmap_t *bitmap, const rectan static void rallyx_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int displacement ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -507,7 +507,7 @@ static void rallyx_draw_sprites( running_machine *machine, bitmap_t *bitmap, con static void locomotn_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int displacement ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -531,7 +531,7 @@ static void locomotn_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void rallyx_draw_bullets( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int transpen ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_base; offs < 0x20; offs++) @@ -562,7 +562,7 @@ static void rallyx_draw_bullets( running_machine *machine, bitmap_t *bitmap, con static void jungler_draw_bullets( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int transpen ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_base; offs < 0x20; offs++) @@ -591,7 +591,7 @@ static void jungler_draw_bullets( running_machine *machine, bitmap_t *bitmap, co static void locomotn_draw_bullets( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int transpen ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_base; offs < 0x20; offs++) @@ -629,7 +629,7 @@ static void locomotn_draw_bullets( running_machine *machine, bitmap_t *bitmap, c VIDEO_UPDATE( rallyx ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across the screen, and clip it to only the position where it is supposed to be shown */ rectangle fg_clip = *cliprect; @@ -663,7 +663,7 @@ VIDEO_UPDATE( rallyx ) VIDEO_UPDATE( jungler ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across the screen, and clip it to only the position where it is supposed to be shown */ rectangle fg_clip = *cliprect; @@ -701,7 +701,7 @@ VIDEO_UPDATE( jungler ) VIDEO_UPDATE( locomotn ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across the screen, and clip it to only the position where it is supposed to be shown */ rectangle fg_clip = *cliprect; diff --git a/src/mame/video/rampart.c b/src/mame/video/rampart.c index c601a444381..8a83ce0c40d 100644 --- a/src/mame/video/rampart.c +++ b/src/mame/video/rampart.c @@ -109,7 +109,7 @@ VIDEO_UPDATE( rampart ) void rampart_bitmap_render(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - rampart_state *state = (rampart_state *)machine->driver_data; + rampart_state *state = machine->driver_data(); int x, y; /* update any dirty scanlines */ diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c index 3e1b7084e17..c8a7f03b75f 100644 --- a/src/mame/video/rastan.c +++ b/src/mame/video/rastan.c @@ -19,7 +19,7 @@ VIDEO_START( jumping ) { - rainbow_state *state = (rainbow_state *)machine->driver_data; + rainbow_state *state = machine->driver_data(); pc080sn_set_trans_pen(state->pc080sn, 1, 15); @@ -34,7 +34,7 @@ VIDEO_START( jumping ) WRITE16_HANDLER( rastan_spritectrl_w ) { - rastan_state *state = (rastan_state *)space->machine->driver_data; + rastan_state *state = space->machine->driver_data(); /* bits 5-7 are the sprite palette bank */ pc090oj_set_sprite_ctrl(state->pc090oj, (data & 0xe0) >> 5); @@ -52,7 +52,7 @@ WRITE16_HANDLER( rastan_spritectrl_w ) WRITE16_HANDLER( rainbow_spritectrl_w ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); if (offset == 0) { @@ -66,7 +66,7 @@ WRITE16_HANDLER( rainbow_spritectrl_w ) WRITE16_HANDLER( opwolf_spritectrl_w ) { - opwolf_state *state = (opwolf_state *)space->machine->driver_data; + opwolf_state *state = space->machine->driver_data(); if (offset == 0) { @@ -90,7 +90,7 @@ WRITE16_HANDLER( opwolf_spritectrl_w ) WRITE16_HANDLER( jumping_spritectrl_w ) { - rainbow_state *state = (rainbow_state *)space->machine->driver_data; + rainbow_state *state = space->machine->driver_data(); if (offset == 0) { @@ -108,7 +108,7 @@ WRITE16_HANDLER( jumping_spritectrl_w ) VIDEO_UPDATE( rastan ) { - rastan_state *state = (rastan_state *)screen->machine->driver_data; + rastan_state *state = screen->machine->driver_data(); int layer[2]; pc080sn_tilemap_update(state->pc080sn); @@ -129,7 +129,7 @@ VIDEO_UPDATE( rastan ) VIDEO_UPDATE( opwolf ) { - opwolf_state *state = (opwolf_state *)screen->machine->driver_data; + opwolf_state *state = screen->machine->driver_data(); int layer[2]; pc080sn_tilemap_update(state->pc080sn); @@ -154,7 +154,7 @@ VIDEO_UPDATE( opwolf ) VIDEO_UPDATE( rainbow ) { - rainbow_state *state = (rainbow_state *)screen->machine->driver_data; + rainbow_state *state = screen->machine->driver_data(); int layer[2]; pc080sn_tilemap_update(state->pc080sn); @@ -183,7 +183,7 @@ the Y settings are active low. VIDEO_UPDATE( jumping ) { - rainbow_state *state = (rainbow_state *)screen->machine->driver_data; + rainbow_state *state = screen->machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, layer[2]; int sprite_colbank = (state->sprite_ctrl & 0xe0) >> 1; diff --git a/src/mame/video/rdpfetch.c b/src/mame/video/rdpfetch.c index 28eaf1733b7..bb1ea844174 100644 --- a/src/mame/video/rdpfetch.c +++ b/src/mame/video/rdpfetch.c @@ -10,7 +10,7 @@ namespace RDP void TexFetch::SetMachine(running_machine *machine) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); m_machine = machine; m_rdp = &state->m_rdp; diff --git a/src/mame/video/rdpfrect.c b/src/mame/video/rdpfrect.c index 87afa088057..79020a8b5c9 100644 --- a/src/mame/video/rdpfrect.c +++ b/src/mame/video/rdpfrect.c @@ -12,7 +12,7 @@ namespace RDP void Rectangle::SetMachine(running_machine* machine) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); m_machine = machine; m_rdp = &state->m_rdp; diff --git a/src/mame/video/rdpspn16.c b/src/mame/video/rdpspn16.c index 43984539377..84805bde6ed 100644 --- a/src/mame/video/rdpspn16.c +++ b/src/mame/video/rdpspn16.c @@ -75,7 +75,7 @@ void Span::Dump() void Span::SetMachine(running_machine *machine) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); m_machine = machine; m_rdp = &state->m_rdp; diff --git a/src/mame/video/rdptpipe.c b/src/mame/video/rdptpipe.c index 89eb574830c..939a352b7eb 100644 --- a/src/mame/video/rdptpipe.c +++ b/src/mame/video/rdptpipe.c @@ -12,7 +12,7 @@ namespace RDP void TexturePipe::SetMachine(running_machine *machine) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); m_machine = machine; m_rdp = &state->m_rdp; diff --git a/src/mame/video/rdptrect.c b/src/mame/video/rdptrect.c index ba2dfed4e32..bd5e017ba66 100644 --- a/src/mame/video/rdptrect.c +++ b/src/mame/video/rdptrect.c @@ -12,7 +12,7 @@ namespace RDP void TexRectangle::SetMachine(running_machine* machine) { - _n64_state *state = (_n64_state *)machine->driver_data; + _n64_state *state = machine->driver_data<_n64_state>(); m_machine = machine; m_rdp = &state->m_rdp; diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index 75fecd76104..166adf7f528 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -101,7 +101,7 @@ PALETTE_INIT( redclash ) WRITE8_HANDLER( redclash_videoram_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -109,7 +109,7 @@ WRITE8_HANDLER( redclash_videoram_w ) WRITE8_HANDLER( redclash_gfxbank_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); if (state->gfxbank != (data & 0x01)) { @@ -139,7 +139,7 @@ star_speed: */ WRITE8_HANDLER( redclash_star0_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->star_speed = (state->star_speed & ~1) | ((data & 1) << 0); redclash_set_stars_speed(space->machine, state->star_speed); @@ -147,7 +147,7 @@ WRITE8_HANDLER( redclash_star0_w ) WRITE8_HANDLER( redclash_star1_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->star_speed = (state->star_speed & ~2) | ((data & 1) << 1); redclash_set_stars_speed(space->machine, state->star_speed); @@ -155,7 +155,7 @@ WRITE8_HANDLER( redclash_star1_w ) WRITE8_HANDLER( redclash_star2_w ) { - ladybug_state *state = (ladybug_state *)space->machine->driver_data; + ladybug_state *state = space->machine->driver_data(); state->star_speed = (state->star_speed & ~4) | ((data & 1) << 2); redclash_set_stars_speed(space->machine, state->star_speed); @@ -168,7 +168,7 @@ WRITE8_HANDLER( redclash_star_reset_w ) static TILE_GET_INFO( get_fg_tile_info ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = (state->videoram[tile_index] & 0x70) >> 4; // ?? @@ -177,7 +177,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( redclash ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_transparent_pen(state->fg_tilemap, 0); @@ -185,7 +185,7 @@ VIDEO_START( redclash ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int i, offs; @@ -269,7 +269,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_bullets( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); int offs; for (offs = 0; offs < 0x20; offs++) @@ -304,7 +304,7 @@ static void draw_bullets( running_machine *machine, bitmap_t *bitmap, const rect /* This line can reset the LFSR to zero and disables the star generator */ void redclash_set_stars_enable( running_machine *machine, UINT8 on ) -{ ladybug_state *state = (ladybug_state *)machine->driver_data; +{ ladybug_state *state = machine->driver_data(); if ((state->stars_enable == 0) && (on == 1)) { @@ -319,7 +319,7 @@ void redclash_set_stars_enable( running_machine *machine, UINT8 on ) void redclash_update_stars_state( running_machine *machine ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); if (state->stars_enable == 0) return; @@ -351,7 +351,7 @@ void redclash_update_stars_state( running_machine *machine ) void redclash_set_stars_speed( running_machine *machine, UINT8 speed ) { - ladybug_state *state = (ladybug_state *)machine->driver_data; + ladybug_state *state = machine->driver_data(); state->stars_speed = speed; } @@ -362,7 +362,7 @@ void redclash_set_stars_speed( running_machine *machine, UINT8 speed ) void redclash_draw_stars( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 palette_offset, UINT8 sraider, UINT8 firstx, UINT8 lastx ) { - ladybug_state *redclash = (ladybug_state *)machine->driver_data; + ladybug_state *redclash = machine->driver_data(); int i; UINT8 tempbit, feedback, star_color, xloc, yloc; UINT32 state; @@ -425,7 +425,7 @@ VIDEO_EOF( redclash ) VIDEO_UPDATE( redclash ) { - ladybug_state *state = (ladybug_state *)screen->machine->driver_data; + ladybug_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); redclash_draw_stars(screen->machine, bitmap, cliprect, 0x60, 0, 0x00, 0xff); diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c index 2c82a6a3169..aaa6594e64c 100644 --- a/src/mame/video/relief.c +++ b/src/mame/video/relief.c @@ -18,9 +18,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - relief_state *state = (relief_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] & 0xff; + relief_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] & 0xff; int code = data1 & 0x7fff; int color = 0x20 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -29,9 +29,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) static TILE_GET_INFO( get_playfield2_tile_info ) { - relief_state *state = (relief_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield2[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + relief_state *state = machine->driver_data(); + UINT16 data1 = state->playfield2[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -83,17 +83,17 @@ VIDEO_START( relief ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - relief_state *state = (relief_state *)machine->driver_data; + relief_state *state = machine->driver_data(); /* MOs are 5bpp but with a 4-bit color granularity */ machine->gfx[1]->color_granularity = 16; /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the second playfield */ - state->atarigen.playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); - tilemap_set_transparent_pen(state->atarigen.playfield2_tilemap, 0); + state->playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); + tilemap_set_transparent_pen(state->playfield2_tilemap, 0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -109,7 +109,7 @@ VIDEO_START( relief ) VIDEO_UPDATE( relief ) { - relief_state *state = (relief_state *)screen->machine->driver_data; + relief_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; atarimo_rect_list rectlist; bitmap_t *mobitmap; @@ -117,8 +117,8 @@ VIDEO_UPDATE( relief ) /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 0, 1); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 0, 1); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c index c8db9c3c1f8..620445f2d53 100644 --- a/src/mame/video/rockrage.c +++ b/src/mame/video/rockrage.c @@ -29,7 +29,7 @@ PALETTE_INIT( rockrage ) static void set_pens( running_machine *machine ) { - rockrage_state *state = (rockrage_state *)machine->driver_data; + rockrage_state *state = machine->driver_data(); int i; for (i = 0x00; i < 0x80; i += 2) @@ -51,7 +51,7 @@ static void set_pens( running_machine *machine ) void rockrage_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags ) { - rockrage_state *state = (rockrage_state *)machine->driver_data; + rockrage_state *state = machine->driver_data(); if (layer == 1) *code |= ((*color & 0x40) << 2) | ((bank & 0x01) << 9); @@ -68,7 +68,7 @@ void rockrage_tile_callback( running_machine *machine, int layer, int bank, int void rockrage_sprite_callback( running_machine *machine, int *code, int *color ) { - rockrage_state *state = (rockrage_state *)machine->driver_data; + rockrage_state *state = machine->driver_data(); *code |= ((*color & 0x40) << 2) | ((*color & 0x80) << 1) * ((state->vreg & 0x03) << 1); *code = (*code << 2) | ((*color & 0x30) >> 4); @@ -82,7 +82,7 @@ WRITE8_HANDLER( rockrage_vreg_w ) /* bit 3: bit 4 of bank # (layer 0) */ /* bit 2: bit 1 of bank # (layer 0) */ /* bits 0-1: sprite bank select */ - rockrage_state *state = (rockrage_state *)space->machine->driver_data; + rockrage_state *state = space->machine->driver_data(); if ((data & 0x0c) != (state->vreg & 0x0c)) tilemap_mark_all_tiles_dirty_all(space->machine); @@ -98,7 +98,7 @@ WRITE8_HANDLER( rockrage_vreg_w ) VIDEO_UPDATE( rockrage ) { - rockrage_state *state = (rockrage_state *)screen->machine->driver_data; + rockrage_state *state = screen->machine->driver_data(); set_pens(screen->machine); diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c index 872b50c554d..f2bbbabf932 100644 --- a/src/mame/video/rocnrope.c +++ b/src/mame/video/rocnrope.c @@ -84,14 +84,14 @@ PALETTE_INIT( rocnrope ) WRITE8_HANDLER( rocnrope_videoram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( rocnrope_colorram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -107,7 +107,7 @@ WRITE8_HANDLER( rocnrope_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + 2 * (attr & 0x80); int color = attr & 0x0f; @@ -118,13 +118,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( rocnrope ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -144,7 +144,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( rocnrope ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c index 50034dcf622..7e1cfe3cb8d 100644 --- a/src/mame/video/rohga.c +++ b/src/mame/video/rohga.c @@ -13,14 +13,14 @@ WRITE16_HANDLER( rohga_buffer_spriteram16_w ) { // Spriteram seems to be triple buffered (no sprite lag on real pcb, but there // is on driver with only double buffering) - rohga_state *state = (rohga_state *)space->machine->driver_data; + rohga_state *state = space->machine->driver_data(); memcpy(state->spriteram, space->machine->generic.buffered_spriteram.u16, 0x800); memcpy(space->machine->generic.buffered_spriteram.u16, space->machine->generic.spriteram.u16, 0x800); } VIDEO_START( rohga ) { - rohga_state *state = (rohga_state *)machine->driver_data; + rohga_state *state = machine->driver_data(); state->spriteram = auto_alloc_array(machine, UINT16, 0x800/2); state_save_register_global_pointer(machine, state->spriteram, 0x800/2); } @@ -213,7 +213,7 @@ static void wizdfire_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void nitrobal_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const UINT16 *spriteptr, int gfxbank ) { - rohga_state *state = (rohga_state *)machine->driver_data; + rohga_state *state = machine->driver_data(); int offs, end, inc; UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); @@ -421,7 +421,7 @@ sprite 2: static void update_rohga( running_device *screen, bitmap_t *bitmap, const rectangle *cliprect, int is_schmeisr ) { - rohga_state *state = (rohga_state *)screen->machine->driver_data; + rohga_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); @@ -482,7 +482,7 @@ VIDEO_UPDATE( schmeisr ) VIDEO_UPDATE( wizdfire ) { - rohga_state *state = (rohga_state *)screen->machine->driver_data; + rohga_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); @@ -515,7 +515,7 @@ VIDEO_UPDATE( wizdfire ) VIDEO_UPDATE( nitrobal ) { - rohga_state *state = (rohga_state *)screen->machine->driver_data; + rohga_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); /* Update playfields */ diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c index 8d625a35cd8..411711aabad 100644 --- a/src/mame/video/rollerg.c +++ b/src/mame/video/rollerg.c @@ -10,7 +10,7 @@ void rollerg_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - rollerg_state *state = (rollerg_state *)machine->driver_data; + rollerg_state *state = machine->driver_data(); #if 0 if (input_code_pressed(machine, KEYCODE_Q) && (*color & 0x80)) *color = rand(); if (input_code_pressed(machine, KEYCODE_W) && (*color & 0x40)) *color = rand(); @@ -30,7 +30,7 @@ void rollerg_sprite_callback( running_machine *machine, int *code, int *color, i void rollerg_zoom_callback( running_machine *machine, int *code, int *color, int *flags ) { - rollerg_state *state = (rollerg_state *)machine->driver_data; + rollerg_state *state = machine->driver_data(); *flags = TILE_FLIPYX((*color & 0xc0) >> 6); *code |= ((*color & 0x0f) << 8); *color = state->zoom_colorbase + ((*color & 0x30) >> 4); @@ -46,7 +46,7 @@ void rollerg_zoom_callback( running_machine *machine, int *code, int *color, int VIDEO_START( rollerg ) { - rollerg_state *state = (rollerg_state *)machine->driver_data; + rollerg_state *state = machine->driver_data(); state->sprite_colorbase = 16; state->zoom_colorbase = 0; } @@ -61,7 +61,7 @@ VIDEO_START( rollerg ) VIDEO_UPDATE( rollerg ) { - rollerg_state *state = (rollerg_state *)screen->machine->driver_data; + rollerg_state *state = screen->machine->driver_data(); int bg_colorbase = 16; bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index f1b0e714712..2c0752531e1 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -16,7 +16,7 @@ /* TTL text plane stuff */ static TILE_GET_INFO( ttl_get_tile_info ) { - rungun_state *state = (rungun_state *)machine->driver_data; + rungun_state *state = machine->driver_data(); UINT8 *lvram = (UINT8 *)state->ttl_vram; int attr, code; @@ -28,33 +28,33 @@ static TILE_GET_INFO( ttl_get_tile_info ) void rng_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - rungun_state *state = (rungun_state *)machine->driver_data; + rungun_state *state = machine->driver_data(); *color = state->sprite_colorbase | (*color & 0x001f); } READ16_HANDLER( rng_ttl_ram_r ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); return state->ttl_vram[offset]; } WRITE16_HANDLER( rng_ttl_ram_w ) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); COMBINE_DATA(&state->ttl_vram[offset]); } /* 53936 (PSAC2) rotation/zoom plane */ WRITE16_HANDLER(rng_936_videoram_w) { - rungun_state *state = (rungun_state *)space->machine->driver_data; + rungun_state *state = space->machine->driver_data(); COMBINE_DATA(&state->_936_videoram[offset]); tilemap_mark_tile_dirty(state->_936_tilemap, offset / 2); } static TILE_GET_INFO( get_rng_936_tile_info ) { - rungun_state *state = (rungun_state *)machine->driver_data; + rungun_state *state = machine->driver_data(); int tileno, colour, flipx; tileno = state->_936_videoram[tile_index * 2 + 1] & 0x3fff; @@ -78,7 +78,7 @@ VIDEO_START( rng ) 8*8*4 }; - rungun_state *state = (rungun_state *)machine->driver_data; + rungun_state *state = machine->driver_data(); int gfx_index; state->_936_tilemap = tilemap_create(machine, get_rng_936_tile_info, tilemap_scan_rows, 16, 16, 128, 128); @@ -105,7 +105,7 @@ VIDEO_START( rng ) VIDEO_UPDATE(rng) { - rungun_state *state = (rungun_state *)screen->machine->driver_data; + rungun_state *state = screen->machine->driver_data(); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index 94106436014..5bbd20a044a 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -96,14 +96,14 @@ PALETTE_INIT( sbasketb ) WRITE8_HANDLER( sbasketb_videoram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( sbasketb_colorram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -119,7 +119,7 @@ WRITE8_HANDLER( sbasketb_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); int code = state->videoram[tile_index] + ((state->colorram[tile_index] & 0x20) << 3); int color = state->colorram[tile_index] & 0x0f; int flags = ((state->colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((state->colorram[tile_index] & 0x80) ? TILE_FLIPY : 0); @@ -129,7 +129,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( sbasketb ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_cols(state->bg_tilemap, 32); @@ -137,7 +137,7 @@ VIDEO_START( sbasketb ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs = (*state->spriteram_select & 0x01) * 0x100; int i; @@ -173,7 +173,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( sbasketb ) { - trackfld_state *state = (trackfld_state *)screen->machine->driver_data; + trackfld_state *state = screen->machine->driver_data(); int col; for (col = 6; col < 32; col++) diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index 91d75acc09e..392cb780504 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -5,7 +5,7 @@ static TILE_GET_INFO( get_sbugger_tile_info ) { - sbugger_state *state = (sbugger_state *)machine->driver_data; + sbugger_state *state = machine->driver_data(); int tileno, color; tileno = state->videoram[tile_index]; @@ -16,7 +16,7 @@ static TILE_GET_INFO( get_sbugger_tile_info ) WRITE8_HANDLER( sbugger_videoram_w ) { - sbugger_state *state = (sbugger_state *)space->machine->driver_data; + sbugger_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->tilemap,offset); @@ -24,7 +24,7 @@ WRITE8_HANDLER( sbugger_videoram_w ) WRITE8_HANDLER( sbugger_videoram_attr_w ) { - sbugger_state *state = (sbugger_state *)space->machine->driver_data; + sbugger_state *state = space->machine->driver_data(); state->videoram_attr[offset] = data; tilemap_mark_tile_dirty(state->tilemap,offset); @@ -32,13 +32,13 @@ WRITE8_HANDLER( sbugger_videoram_attr_w ) VIDEO_START(sbugger) { - sbugger_state *state = (sbugger_state *)machine->driver_data; + sbugger_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_sbugger_tile_info, tilemap_scan_rows, 8, 16, 64, 16); } VIDEO_UPDATE(sbugger) { - sbugger_state *state = (sbugger_state *)screen->machine->driver_data; + sbugger_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->tilemap,0,0); return 0; } diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index 40a77f1fe71..79b65e21a00 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -5,7 +5,7 @@ static TILE_GET_INFO( get_sderby_tile_info ) { - sderby_state *state = (sderby_state *)machine->driver_data; + sderby_state *state = machine->driver_data(); int tileno,colour; tileno = state->videoram[tile_index*2]; @@ -16,7 +16,7 @@ static TILE_GET_INFO( get_sderby_tile_info ) WRITE16_HANDLER( sderby_videoram_w ) { - sderby_state *state = (sderby_state *)space->machine->driver_data; + sderby_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->tilemap,offset/2); @@ -26,7 +26,7 @@ WRITE16_HANDLER( sderby_videoram_w ) static TILE_GET_INFO( get_sderby_md_tile_info ) { - sderby_state *state = (sderby_state *)machine->driver_data; + sderby_state *state = machine->driver_data(); int tileno,colour; tileno = state->md_videoram[tile_index*2]; @@ -37,7 +37,7 @@ static TILE_GET_INFO( get_sderby_md_tile_info ) WRITE16_HANDLER( sderby_md_videoram_w ) { - sderby_state *state = (sderby_state *)space->machine->driver_data; + sderby_state *state = space->machine->driver_data(); COMBINE_DATA(&state->md_videoram[offset]); tilemap_mark_tile_dirty(state->md_tilemap,offset/2); @@ -47,7 +47,7 @@ WRITE16_HANDLER( sderby_md_videoram_w ) static TILE_GET_INFO( get_sderby_fg_tile_info ) { - sderby_state *state = (sderby_state *)machine->driver_data; + sderby_state *state = machine->driver_data(); int tileno,colour; tileno = state->fg_videoram[tile_index*2]; @@ -58,7 +58,7 @@ static TILE_GET_INFO( get_sderby_fg_tile_info ) WRITE16_HANDLER( sderby_fg_videoram_w ) { - sderby_state *state = (sderby_state *)space->machine->driver_data; + sderby_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg_videoram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap,offset/2); @@ -67,7 +67,7 @@ WRITE16_HANDLER( sderby_fg_videoram_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int codeshift) { - sderby_state *state = (sderby_state *)machine->driver_data; + sderby_state *state = machine->driver_data(); UINT16 *spriteram16 = state->spriteram; int offs; int height = machine->gfx[0]->height; @@ -97,7 +97,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_START( sderby ) { - sderby_state *state = (sderby_state *)machine->driver_data; + sderby_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_sderby_tile_info,tilemap_scan_rows, 16, 16,32,32); state->md_tilemap = tilemap_create(machine, get_sderby_md_tile_info,tilemap_scan_rows, 16, 16,32,32); @@ -110,7 +110,7 @@ VIDEO_START( sderby ) VIDEO_UPDATE( sderby ) { - sderby_state *state = (sderby_state *)screen->machine->driver_data; + sderby_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->tilemap,0,0); draw_sprites(screen->machine, bitmap,cliprect,0); @@ -121,7 +121,7 @@ VIDEO_UPDATE( sderby ) VIDEO_UPDATE( pmroulet ) { - sderby_state *state = (sderby_state *)screen->machine->driver_data; + sderby_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->tilemap,0,0); tilemap_draw(bitmap,cliprect,state->md_tilemap,0,0); @@ -133,7 +133,7 @@ VIDEO_UPDATE( pmroulet ) WRITE16_HANDLER( sderby_scroll_w ) { - sderby_state *state = (sderby_state *)space->machine->driver_data; + sderby_state *state = space->machine->driver_data(); data = COMBINE_DATA(&state->scroll[offset]); diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c index 537ce0ee561..ccb35deecd6 100644 --- a/src/mame/video/segas18.c +++ b/src/mame/video/segas18.c @@ -28,7 +28,7 @@ VIDEO_START( system18 ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); int width, height; state->grayscale_enable = 0; @@ -66,7 +66,7 @@ VIDEO_START( system18 ) void system18_set_grayscale(running_machine *machine, int enable) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); enable = (enable != 0); if (enable != state->grayscale_enable) @@ -80,7 +80,7 @@ void system18_set_grayscale(running_machine *machine, int enable) void system18_set_vdp_enable(running_machine *machine, int enable) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); enable = (enable != 0); if (enable != state->vdp_enable) @@ -96,7 +96,7 @@ void system18_set_vdp_enable(running_machine *machine, int enable) void system18_set_vdp_mixing(running_machine *machine, int mixing) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); if (mixing != state->vdp_mixing) { @@ -118,7 +118,7 @@ void system18_set_vdp_mixing(running_machine *machine, int mixing) static void draw_vdp(running_device *screen, bitmap_t *bitmap, const rectangle *cliprect, int priority) { - segas1x_state *state = (segas1x_state *)screen->machine->driver_data; + segas1x_state *state = screen->machine->driver_data(); int x, y; bitmap_t *priority_bitmap = screen->machine->priority_bitmap; @@ -150,7 +150,7 @@ static void draw_vdp(running_device *screen, bitmap_t *bitmap, const rectangle * VIDEO_UPDATE( system18 ) { - segas1x_state *state = (segas1x_state *)screen->machine->driver_data; + segas1x_state *state = screen->machine->driver_data(); int vdppri, vdplayer; /* diff --git a/src/mame/video/segaxbd.c b/src/mame/video/segaxbd.c index 4b306b4d594..e711c4cd9c4 100644 --- a/src/mame/video/segaxbd.c +++ b/src/mame/video/segaxbd.c @@ -36,7 +36,7 @@ VIDEO_START( xboard ) VIDEO_UPDATE( xboard ) { - segas1x_state *state = (segas1x_state *)screen->machine->driver_data; + segas1x_state *state = screen->machine->driver_data(); /* if no drawing is happening, fill with black and get out */ if (!segaic16_display_enable) diff --git a/src/mame/video/segaybd.c b/src/mame/video/segaybd.c index 7590b4cfcc9..b5203dcf0a0 100644 --- a/src/mame/video/segaybd.c +++ b/src/mame/video/segaybd.c @@ -17,7 +17,7 @@ VIDEO_START( yboard ) { - segas1x_state *state = (segas1x_state *)machine->driver_data; + segas1x_state *state = machine->driver_data(); /* compute palette info */ segaic16_palette_init(0x2000); @@ -41,7 +41,7 @@ VIDEO_START( yboard ) VIDEO_UPDATE( yboard ) { - segas1x_state *state = (segas1x_state *)screen->machine->driver_data; + segas1x_state *state = screen->machine->driver_data(); rectangle yboard_clip; /* if no drawing is happening, fill with black and get out */ diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index a7767e7d9f0..2105b422abc 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -35,7 +35,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_tx_tile_info ) { - sf_state *state = (sf_state *)machine->driver_data; + sf_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO( 3, @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_tx_tile_info ) VIDEO_START( sf ) { - sf_state *state = (sf_state *)machine->driver_data; + sf_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_cols, 16, 16, 2048, 16); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_cols, 16, 16, 2048, 16); @@ -74,21 +74,21 @@ VIDEO_START( sf ) WRITE16_HANDLER( sf_videoram_w ) { - sf_state *state = (sf_state *)space->machine->driver_data; + sf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap, offset); } WRITE16_HANDLER( sf_bg_scroll_w ) { - sf_state *state = (sf_state *)space->machine->driver_data; + sf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bgscroll); tilemap_set_scrollx(state->bg_tilemap, 0, state->bgscroll); } WRITE16_HANDLER( sf_fg_scroll_w ) { - sf_state *state = (sf_state *)space->machine->driver_data; + sf_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fgscroll); tilemap_set_scrollx(state->fg_tilemap, 0, state->fgscroll); } @@ -104,7 +104,7 @@ WRITE16_HANDLER( sf_gfxctrl_w ) /* b6 = active middle plane */ /* b7 = active sprites */ - sf_state *state = (sf_state *)space->machine->driver_data; + sf_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { state->sf_active = data & 0xff; @@ -131,7 +131,7 @@ INLINE int sf_invert( int nb ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect ) { - sf_state *state = (sf_state *)machine->driver_data; + sf_state *state = machine->driver_data(); int offs; for (offs = 0x1000 - 0x20; offs >= 0; offs -= 0x20) @@ -220,7 +220,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_UPDATE( sf ) { - sf_state *state = (sf_state *)screen->machine->driver_data; + sf_state *state = screen->machine->driver_data(); if (state->sf_active & 0x20) tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 3f804b309d7..3858bf31bd6 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -5,7 +5,7 @@ static TILE_GET_INFO( get_shadfrce_fgtile_info ) { /* ---- ---- tttt tttt ---- ---- pppp TTTT */ - shadfrce_state *state = (shadfrce_state *)machine->driver_data; + shadfrce_state *state = machine->driver_data(); int tileno, colour; tileno = (state->fgvideoram[tile_index *2] & 0x00ff) | ((state->fgvideoram[tile_index *2+1] & 0x000f) << 8); @@ -16,7 +16,7 @@ static TILE_GET_INFO( get_shadfrce_fgtile_info ) WRITE16_HANDLER( shadfrce_fgvideoram_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fgtilemap,offset/2); @@ -26,7 +26,7 @@ static TILE_GET_INFO( get_shadfrce_bg0tile_info ) { /* ---- ---- ---- cccc --TT TTTT TTTT TTTT */ - shadfrce_state *state = (shadfrce_state *)machine->driver_data; + shadfrce_state *state = machine->driver_data(); int tileno, colour,fyx; tileno = (state->bg0videoram[tile_index *2+1] & 0x3fff); @@ -39,7 +39,7 @@ static TILE_GET_INFO( get_shadfrce_bg0tile_info ) WRITE16_HANDLER( shadfrce_bg0videoram_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); state->bg0videoram[offset] = data; tilemap_mark_tile_dirty(state->bg0tilemap,offset/2); @@ -47,7 +47,7 @@ WRITE16_HANDLER( shadfrce_bg0videoram_w ) static TILE_GET_INFO( get_shadfrce_bg1tile_info ) { - shadfrce_state *state = (shadfrce_state *)machine->driver_data; + shadfrce_state *state = machine->driver_data(); int tileno, colour; tileno = (state->bg1videoram[tile_index] & 0x0fff); @@ -58,7 +58,7 @@ static TILE_GET_INFO( get_shadfrce_bg1tile_info ) WRITE16_HANDLER( shadfrce_bg1videoram_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); state->bg1videoram[offset] = data; tilemap_mark_tile_dirty(state->bg1tilemap,offset); @@ -69,7 +69,7 @@ WRITE16_HANDLER( shadfrce_bg1videoram_w ) VIDEO_START( shadfrce ) { - shadfrce_state *state = (shadfrce_state *)machine->driver_data; + shadfrce_state *state = machine->driver_data(); state->fgtilemap = tilemap_create(machine, get_shadfrce_fgtile_info,tilemap_scan_rows, 8, 8,64,32); tilemap_set_transparent_pen(state->fgtilemap,0); @@ -84,28 +84,28 @@ VIDEO_START( shadfrce ) WRITE16_HANDLER ( shadfrce_bg0scrollx_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); tilemap_set_scrollx( state->bg0tilemap, 0, data & 0x1ff ); } WRITE16_HANDLER ( shadfrce_bg0scrolly_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); tilemap_set_scrolly( state->bg0tilemap, 0, data & 0x1ff ); } WRITE16_HANDLER ( shadfrce_bg1scrollx_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); tilemap_set_scrollx( state->bg1tilemap, 0, data & 0x1ff ); } WRITE16_HANDLER ( shadfrce_bg1scrolly_w ) { - shadfrce_state *state = (shadfrce_state *)space->machine->driver_data; + shadfrce_state *state = space->machine->driver_data(); tilemap_set_scrolly( state->bg1tilemap, 0, data & 0x1ff ); } @@ -130,7 +130,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta P = priority */ - shadfrce_state *state = (shadfrce_state *)machine->driver_data; + shadfrce_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[1]; UINT16 *finish = state->spvideoram_old; UINT16 *source = finish + 0x2000/2 - 8; @@ -164,7 +164,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( shadfrce ) { - shadfrce_state *state = (shadfrce_state *)screen->machine->driver_data; + shadfrce_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap,cliprect,0); if (state->video_enable) @@ -184,7 +184,7 @@ VIDEO_UPDATE( shadfrce ) VIDEO_EOF( shadfrce ) { - shadfrce_state *state = (shadfrce_state *)machine->driver_data; + shadfrce_state *state = machine->driver_data(); /* looks like sprites are *two* frames ahead */ memcpy(state->spvideoram_old, state->spvideoram, state->spvideoram_size); diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index 5665d956a96..db06d786fcb 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -40,7 +40,7 @@ PALETTE_INIT( shootout ) static TILE_GET_INFO( get_bg_tile_info ) { - shootout_state *state = (shootout_state *)machine->driver_data; + shootout_state *state = machine->driver_data(); int attributes = state->videoram[tile_index+0x400]; /* CCCC -TTT */ int tile_number = state->videoram[tile_index] + 256*(attributes&7); int color = attributes>>4; @@ -54,7 +54,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - shootout_state *state = (shootout_state *)machine->driver_data; + shootout_state *state = machine->driver_data(); int attributes = state->textram[tile_index+0x400]; /* CCCC --TT */ int tile_number = state->textram[tile_index] + 256*(attributes&0x3); int color = attributes>>4; @@ -68,7 +68,7 @@ static TILE_GET_INFO( get_fg_tile_info ) WRITE8_HANDLER( shootout_videoram_w ) { - shootout_state *state = (shootout_state *)space->machine->driver_data; + shootout_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty( state->background, offset&0x3ff ); @@ -76,7 +76,7 @@ WRITE8_HANDLER( shootout_videoram_w ) WRITE8_HANDLER( shootout_textram_w ) { - shootout_state *state = (shootout_state *)space->machine->driver_data; + shootout_state *state = space->machine->driver_data(); state->textram[offset] = data; tilemap_mark_tile_dirty( state->foreground, offset&0x3ff ); @@ -84,7 +84,7 @@ WRITE8_HANDLER( shootout_textram_w ) VIDEO_START( shootout ) { - shootout_state *state = (shootout_state *)machine->driver_data; + shootout_state *state = machine->driver_data(); state->background = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->foreground = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -93,7 +93,7 @@ VIDEO_START( shootout ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int bank_bits ) { - shootout_state *state = (shootout_state *)machine->driver_data; + shootout_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; static int bFlicker; const gfx_element *gfx = machine->gfx[1]; @@ -174,7 +174,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( shootout ) { - shootout_state *state = (shootout_state *)screen->machine->driver_data; + shootout_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap,cliprect,0); @@ -186,7 +186,7 @@ VIDEO_UPDATE( shootout ) VIDEO_UPDATE( shootouj ) { - shootout_state *state = (shootout_state *)screen->machine->driver_data; + shootout_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap,cliprect,0); diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c index 13f8575cbff..06f6e63a093 100644 --- a/src/mame/video/shuuz.c +++ b/src/mame/video/shuuz.c @@ -17,9 +17,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) { - shuuz_state *state = (shuuz_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + shuuz_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x3fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -71,10 +71,10 @@ VIDEO_START( shuuz ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - shuuz_state *state = (shuuz_state *)machine->driver_data; + shuuz_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); @@ -90,13 +90,13 @@ VIDEO_START( shuuz ) VIDEO_UPDATE( shuuz ) { - shuuz_state *state = (shuuz_state *)screen->machine->driver_data; + shuuz_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 04126c33e86..f5e200b70ba 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -11,7 +11,7 @@ WRITE8_HANDLER( sidearms_videoram_w ) { - sidearms_state *state = (sidearms_state *)space->machine->driver_data; + sidearms_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -19,7 +19,7 @@ WRITE8_HANDLER( sidearms_videoram_w ) WRITE8_HANDLER( sidearms_colorram_w ) { - sidearms_state *state = (sidearms_state *)space->machine->driver_data; + sidearms_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -27,7 +27,7 @@ WRITE8_HANDLER( sidearms_colorram_w ) WRITE8_HANDLER( sidearms_c804_w ) { - sidearms_state *state = (sidearms_state *)space->machine->driver_data; + sidearms_state *state = space->machine->driver_data(); /* bits 0 and 1 are coin counters */ coin_counter_w(space->machine, 0, data & 0x01); @@ -73,14 +73,14 @@ WRITE8_HANDLER( sidearms_c804_w ) WRITE8_HANDLER( sidearms_gfxctrl_w ) { - sidearms_state *state = (sidearms_state *)space->machine->driver_data; + sidearms_state *state = space->machine->driver_data(); state->objon = data & 0x01; state->bgon = data & 0x02; } WRITE8_HANDLER( sidearms_star_scrollx_w ) { - sidearms_state *state = (sidearms_state *)space->machine->driver_data; + sidearms_state *state = space->machine->driver_data(); UINT32 last_state = state->hcount_191; state->hcount_191++; @@ -93,7 +93,7 @@ WRITE8_HANDLER( sidearms_star_scrollx_w ) WRITE8_HANDLER( sidearms_star_scrolly_w ) { - sidearms_state *state = (sidearms_state *)space->machine->driver_data; + sidearms_state *state = space->machine->driver_data(); state->vcount_191++; state->vcount_191 &= 0xff; } @@ -101,7 +101,7 @@ WRITE8_HANDLER( sidearms_star_scrolly_w ) static TILE_GET_INFO( get_sidearms_bg_tile_info ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); int code, attr, color, flags; code = state->tilerom[tile_index]; @@ -115,7 +115,7 @@ static TILE_GET_INFO( get_sidearms_bg_tile_info ) static TILE_GET_INFO( get_philko_bg_tile_info ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); int code, attr, color, flags; code = state->tilerom[tile_index]; @@ -129,7 +129,7 @@ static TILE_GET_INFO( get_philko_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + (attr<<2 & 0x300); int color = attr & 0x3f; @@ -148,7 +148,7 @@ static TILEMAP_MAPPER( sidearms_tilemap_scan ) VIDEO_START( sidearms ) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); state->tilerom = memory_region(machine, "gfx4"); if (!state->gameid) @@ -179,7 +179,7 @@ static void draw_sprites_region(running_machine *machine, bitmap_t *bitmap, cons UINT8 *buffered_spriteram = machine->generic.buffered_spriteram.u8; const gfx_element *gfx = machine->gfx[2]; int offs, attr, color, code, x, y, flipx, flipy; - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); flipy = flipx = state->flipon; @@ -214,7 +214,7 @@ static void sidearms_draw_starfield( running_machine *machine, bitmap_t *bitmap UINT8 *sf_rom; UINT16 *lineptr; int pixadv, lineadv; - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); // clear starfield background lineptr = BITMAP_ADDR16(bitmap, 16, 64); @@ -333,7 +333,7 @@ static void sidearms_draw_starfield( running_machine *machine, bitmap_t *bitmap static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - sidearms_state *state = (sidearms_state *)machine->driver_data; + sidearms_state *state = machine->driver_data(); if (state->gameid == 2 || state->gameid == 3) // Dyger and Whizz have simple front-to-back sprite priority draw_sprites_region(machine, bitmap, cliprect, 0x0000, 0x1000); @@ -348,7 +348,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( sidearms ) { - sidearms_state *state = (sidearms_state *)screen->machine->driver_data; + sidearms_state *state = screen->machine->driver_data(); sidearms_draw_starfield(screen->machine, bitmap); diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c index 8a79434f61f..1aa3bf9b812 100644 --- a/src/mame/video/sidepckt.c +++ b/src/mame/video/sidepckt.c @@ -43,7 +43,7 @@ PALETTE_INIT( sidepckt ) static TILE_GET_INFO( get_tile_info ) { - sidepckt_state *state = (sidepckt_state *)machine->driver_data; + sidepckt_state *state = machine->driver_data(); UINT8 attr = state->colorram[tile_index]; SET_TILE_INFO( 0, @@ -63,7 +63,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( sidepckt ) { - sidepckt_state *state = (sidepckt_state *)machine->driver_data; + sidepckt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info,tilemap_scan_rows,8,8,32,32); tilemap_set_transmask(state->bg_tilemap,0,0xff,0x00); /* split type 0 is totally transparent in front half */ @@ -82,14 +82,14 @@ VIDEO_START( sidepckt ) WRITE8_HANDLER( sidepckt_videoram_w ) { - sidepckt_state *state = (sidepckt_state *)space->machine->driver_data; + sidepckt_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); } WRITE8_HANDLER( sidepckt_colorram_w ) { - sidepckt_state *state = (sidepckt_state *)space->machine->driver_data; + sidepckt_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); } @@ -109,7 +109,7 @@ WRITE8_HANDLER( sidepckt_flipscreen_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - sidepckt_state *state = (sidepckt_state *)machine->driver_data; + sidepckt_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -143,7 +143,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( sidepckt ) { - sidepckt_state *state = (sidepckt_state *)screen->machine->driver_data; + sidepckt_state *state = screen->machine->driver_data(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,TILEMAP_DRAW_LAYER1,0); draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap,cliprect,state->bg_tilemap,TILEMAP_DRAW_LAYER0,0); diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index c1631c8b23e..4da2e9d50e3 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -9,7 +9,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - silkroad_state *state = (silkroad_state *)machine->driver_data; + silkroad_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; UINT32 *source = state->sprram; UINT32 *finish = source + 0x1000/4; @@ -57,7 +57,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static TILE_GET_INFO( get_fg_tile_info ) { - silkroad_state *state = (silkroad_state *)machine->driver_data; + silkroad_state *state = machine->driver_data(); int code = ((state->vidram[tile_index] & 0xffff0000) >> 16 ); int color = ((state->vidram[tile_index] & 0x000001f)); int flipx = ((state->vidram[tile_index] & 0x0000080) >> 7); @@ -75,7 +75,7 @@ static TILE_GET_INFO( get_fg_tile_info ) WRITE32_HANDLER( silkroad_fgram_w ) { - silkroad_state *state = (silkroad_state *)space->machine->driver_data; + silkroad_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vidram[offset]); tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -83,7 +83,7 @@ WRITE32_HANDLER( silkroad_fgram_w ) static TILE_GET_INFO( get_fg2_tile_info ) { - silkroad_state *state = (silkroad_state *)machine->driver_data; + silkroad_state *state = machine->driver_data(); int code = ((state->vidram2[tile_index] & 0xffff0000) >> 16 ); int color = ((state->vidram2[tile_index] & 0x000001f)); int flipx = ((state->vidram2[tile_index] & 0x0000080) >> 7); @@ -99,7 +99,7 @@ static TILE_GET_INFO( get_fg2_tile_info ) WRITE32_HANDLER( silkroad_fgram2_w ) { - silkroad_state *state = (silkroad_state *)space->machine->driver_data; + silkroad_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vidram2[offset]); tilemap_mark_tile_dirty(state->fg2_tilemap,offset); @@ -107,7 +107,7 @@ WRITE32_HANDLER( silkroad_fgram2_w ) static TILE_GET_INFO( get_fg3_tile_info ) { - silkroad_state *state = (silkroad_state *)machine->driver_data; + silkroad_state *state = machine->driver_data(); int code = ((state->vidram3[tile_index] & 0xffff0000) >> 16 ); int color = ((state->vidram3[tile_index] & 0x000001f)); int flipx = ((state->vidram3[tile_index] & 0x0000080) >> 7); @@ -123,7 +123,7 @@ static TILE_GET_INFO( get_fg3_tile_info ) WRITE32_HANDLER( silkroad_fgram3_w ) { - silkroad_state *state = (silkroad_state *)space->machine->driver_data; + silkroad_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vidram3[offset]); tilemap_mark_tile_dirty(state->fg3_tilemap,offset); @@ -131,7 +131,7 @@ WRITE32_HANDLER( silkroad_fgram3_w ) VIDEO_START(silkroad) { - silkroad_state *state = (silkroad_state *)machine->driver_data; + silkroad_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg2_tilemap = tilemap_create(machine, get_fg2_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->fg3_tilemap = tilemap_create(machine, get_fg3_tile_info, tilemap_scan_rows, 16, 16, 64, 64); @@ -143,7 +143,7 @@ VIDEO_START(silkroad) VIDEO_UPDATE(silkroad) { - silkroad_state *state = (silkroad_state *)screen->machine->driver_data; + silkroad_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap,cliprect,0); bitmap_fill(bitmap,cliprect,0x7c0); diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c index 001dec6f429..16123721546 100644 --- a/src/mame/video/simpl156.c +++ b/src/mame/video/simpl156.c @@ -119,7 +119,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta VIDEO_START( simpl156 ) { - simpl156_state *state = (simpl156_state *)machine->driver_data; + simpl156_state *state = machine->driver_data(); /* allocate the ram as 16-bit (we do it here because the CPU is 32-bit) */ state->pf1_rowscroll = auto_alloc_array(machine, UINT16, 0x800/2); @@ -134,7 +134,7 @@ VIDEO_START( simpl156 ) VIDEO_UPDATE( simpl156 ) { - simpl156_state *state = (simpl156_state *)screen->machine->driver_data; + simpl156_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, NULL, 0); diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c index c4a47960c8f..ae8b10f9daf 100644 --- a/src/mame/video/simpsons.c +++ b/src/mame/video/simpsons.c @@ -10,7 +10,7 @@ void simpsons_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); *code |= ((*color & 0x3f) << 8) | (bank << 14); *color = state->layer_colorbase[layer] + ((*color & 0xc0) >> 6); } @@ -24,7 +24,7 @@ void simpsons_tile_callback( running_machine *machine, int layer, int bank, int void simpsons_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); int pri = (*color & 0x0f80) >> 6; /* ??????? */ if (pri <= state->layerpri[2]) @@ -48,19 +48,19 @@ void simpsons_sprite_callback( running_machine *machine, int *code, int *color, static READ8_HANDLER( simpsons_k052109_r ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); return k052109_r(state->k052109, offset + 0x2000); } static WRITE8_HANDLER( simpsons_k052109_w ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); k052109_w(state->k052109, offset + 0x2000, data); } static READ8_HANDLER( simpsons_k053247_r ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); int offs; if (offset < 0x1000) @@ -78,7 +78,7 @@ static READ8_HANDLER( simpsons_k053247_r ) static WRITE8_HANDLER( simpsons_k053247_w ) { - simpsons_state *state = (simpsons_state *)space->machine->driver_data; + simpsons_state *state = space->machine->driver_data(); int offs; if (offset < 0x1000) @@ -96,7 +96,7 @@ static WRITE8_HANDLER( simpsons_k053247_w ) void simpsons_video_banking( running_machine *machine, int bank ) { - simpsons_state *state = (simpsons_state *)machine->driver_data; + simpsons_state *state = machine->driver_data(); const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); if (bank & 1) @@ -124,7 +124,7 @@ void simpsons_video_banking( running_machine *machine, int bank ) VIDEO_UPDATE( simpsons ) { - simpsons_state *state = (simpsons_state *)screen->machine->driver_data; + simpsons_state *state = screen->machine->driver_data(); int layer[3], bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c index 047e49dfd2f..4bd16313fdd 100644 --- a/src/mame/video/skullxbo.c +++ b/src/mame/video/skullxbo.c @@ -17,8 +17,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - skullxbo_state *state = (skullxbo_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + skullxbo_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = (data ^ 0x400) & 0x7ff; int color = (data >> 11) & 0x0f; int opaque = data & 0x8000; @@ -28,9 +28,9 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - skullxbo_state *state = (skullxbo_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] & 0xff; + skullxbo_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] & 0xff; int code = data1 & 0x7fff; int color = data2 & 0x0f; SET_TILE_INFO(1, code, color, (data1 >> 15) & 1); @@ -82,17 +82,17 @@ VIDEO_START( skullxbo ) 0, /* resulting value to indicate "special" */ 0, /* callback routine for special entries */ }; - skullxbo_state *state = (skullxbo_state *)machine->driver_data; + skullxbo_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 16,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 16,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 16,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); } @@ -105,10 +105,10 @@ VIDEO_START( skullxbo ) WRITE16_HANDLER( skullxbo_xscroll_w ) { - skullxbo_state *state = (skullxbo_state *)space->machine->driver_data; + skullxbo_state *state = space->machine->driver_data(); /* combine data */ - UINT16 oldscroll = *state->atarigen.xscroll; + UINT16 oldscroll = *state->xscroll; UINT16 newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -117,21 +117,21 @@ WRITE16_HANDLER( skullxbo_xscroll_w ) space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* adjust the actual scrolls */ - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, 2 * (newscroll >> 7)); + tilemap_set_scrollx(state->playfield_tilemap, 0, 2 * (newscroll >> 7)); atarimo_set_xscroll(0, 2 * (newscroll >> 7)); /* update the data */ - *state->atarigen.xscroll = newscroll; + *state->xscroll = newscroll; } WRITE16_HANDLER( skullxbo_yscroll_w ) { - skullxbo_state *state = (skullxbo_state *)space->machine->driver_data; + skullxbo_state *state = space->machine->driver_data(); /* combine data */ int scanline = space->machine->primary_screen->vpos(); - UINT16 oldscroll = *state->atarigen.yscroll; + UINT16 oldscroll = *state->yscroll; UINT16 newscroll = oldscroll; UINT16 effscroll; COMBINE_DATA(&newscroll); @@ -146,11 +146,11 @@ WRITE16_HANDLER( skullxbo_yscroll_w ) effscroll = (newscroll >> 7) - scanline; /* adjust the actual scrolls */ - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, effscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, effscroll); atarimo_set_yscroll(0, effscroll & 0x1ff); /* update the data */ - *state->atarigen.yscroll = newscroll; + *state->yscroll = newscroll; } @@ -177,8 +177,8 @@ WRITE16_HANDLER( skullxbo_mobmsb_w ) WRITE16_HANDLER( skullxbo_playfieldlatch_w ) { - skullxbo_state *state = (skullxbo_state *)space->machine->driver_data; - atarigen_set_playfield_latch(&state->atarigen, data); + skullxbo_state *state = space->machine->driver_data(); + atarigen_set_playfield_latch(state, data); } @@ -191,19 +191,19 @@ WRITE16_HANDLER( skullxbo_playfieldlatch_w ) void skullxbo_scanline_update(running_machine *machine, int scanline) { - skullxbo_state *state = (skullxbo_state *)machine->driver_data; - UINT16 *base = &state->atarigen.alpha[(scanline / 8) * 64 + 42]; + skullxbo_state *state = machine->driver_data(); + UINT16 *base = &state->alpha[(scanline / 8) * 64 + 42]; int x; /* keep in range */ - if (base >= &state->atarigen.alpha[0x7c0]) + if (base >= &state->alpha[0x7c0]) return; /* special case: scanline 0 should re-latch the previous raw scroll */ if (scanline == 0) { - int newscroll = (*state->atarigen.yscroll >> 7) & 0x1ff; - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll); + int newscroll = (*state->yscroll >> 7) & 0x1ff; + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll); atarimo_set_yscroll(0, newscroll); } @@ -224,12 +224,12 @@ void skullxbo_scanline_update(running_machine *machine, int scanline) machine->primary_screen->update_partial(scanline - 1); /* update the new scroll */ - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll); + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll); atarimo_set_yscroll(0, newscroll); /* make sure we change this value so that writes to the scroll register */ /* know whether or not they are a different scroll */ - *state->atarigen.yscroll = data; + *state->yscroll = data; } } } @@ -244,13 +244,13 @@ void skullxbo_scanline_update(running_machine *machine, int scanline) VIDEO_UPDATE( skullxbo ) { - skullxbo_state *state = (skullxbo_state *)screen->machine->driver_data; + skullxbo_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -314,6 +314,6 @@ VIDEO_UPDATE( skullxbo ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index 01e05192846..66ef2e8d67c 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -48,14 +48,14 @@ #ifdef UNUSED_FUNCTION READ8_HANDLER( skyfox_vregs_r ) // for debug { - skyfox_state *state = (skyfox_state *)space->machine->driver_data; + skyfox_state *state = space->machine->driver_data(); return state->vreg[offset]; } #endif WRITE8_HANDLER( skyfox_vregs_w ) { - skyfox_state *state = (skyfox_state *)space->machine->driver_data; + skyfox_state *state = space->machine->driver_data(); state->vreg[offset] = data; @@ -161,7 +161,7 @@ Offset: Value: static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - skyfox_state *state = (skyfox_state *)machine->driver_data; + skyfox_state *state = machine->driver_data(); int offs; int width = machine->primary_screen->width(); @@ -240,7 +240,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - skyfox_state *state = (skyfox_state *)machine->driver_data; + skyfox_state *state = machine->driver_data(); UINT8 *RAM = memory_region(machine, "gfx2"); int x, y, i; diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c index 0ff78e36a84..509a877481f 100644 --- a/src/mame/video/slapshot.c +++ b/src/mame/video/slapshot.c @@ -6,7 +6,7 @@ VIDEO_START( slapshot ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); int i; state->spriteram_delayed = auto_alloc_array(machine, UINT16, state->spriteram_size / 2); @@ -89,7 +89,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect 000b - 000f : unused */ - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); int x, y, off, extoffs; int code, color, spritedata, spritecont, flipx, flipy; int xcurrent, ycurrent, big_sprite = 0; @@ -379,7 +379,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void taito_handle_sprite_buffering( running_machine *machine ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); if (state->prepare_sprites) /* no buffering */ { @@ -390,7 +390,7 @@ static void taito_handle_sprite_buffering( running_machine *machine ) static void taito_update_sprites_active_area( running_machine *machine ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); int off; /* if the frame was skipped, we'll have to do the buffering now */ @@ -430,7 +430,7 @@ static void taito_update_sprites_active_area( running_machine *machine ) VIDEO_EOF( taito_no_buffer ) { - slapshot_state *state = (slapshot_state *)machine->driver_data; + slapshot_state *state = machine->driver_data(); taito_update_sprites_active_area(machine); @@ -456,7 +456,7 @@ a bg layer given priority over some sprites. VIDEO_UPDATE( slapshot ) { - slapshot_state *state = (slapshot_state *)screen->machine->driver_data; + slapshot_state *state = screen->machine->driver_data(); UINT8 layer[5]; UINT8 tilepri[5]; UINT8 spritepri[4]; diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c index c34afe62bf9..e35d7e07975 100644 --- a/src/mame/video/snes.c +++ b/src/mame/video/snes.c @@ -1812,7 +1812,7 @@ static const UINT16 vram_fgr_shiftab[4] = { 0, 5, 6, 7 }; // utility function - latches the H/V counters. Used by IRQ, writes to WRIO, etc. void snes_latch_counters( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); snes_ppu.beam.current_horz = machine->primary_screen->hpos() / state->htmult; snes_ppu.beam.latch_vert = machine->primary_screen->vpos(); @@ -1825,7 +1825,7 @@ void snes_latch_counters( running_machine *machine ) static void snes_dynamic_res_change( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); rectangle visarea = machine->primary_screen->visible_area(); attoseconds_t refresh; @@ -1869,7 +1869,7 @@ static void snes_dynamic_res_change( running_machine *machine ) INLINE UINT32 snes_get_vram_address( running_machine *machine ) { - snes_state *state = (snes_state *)machine->driver_data; + snes_state *state = machine->driver_data(); UINT32 addr = state->vmadd; if (state->vram_fgr_count) @@ -2091,7 +2091,7 @@ static WRITE8_HANDLER( snes_cgram_write ) READ8_HANDLER( snes_ppu_read ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); UINT8 value; switch (offset) @@ -2239,7 +2239,7 @@ READ8_HANDLER( snes_ppu_read ) WRITE8_HANDLER( snes_ppu_write ) { - snes_state *state = (snes_state *)space->machine->driver_data; + snes_state *state = space->machine->driver_data(); switch (offset) { diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index daef1e8866e..be5b80855ca 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -96,21 +96,21 @@ PALETTE_INIT( sonson ) WRITE8_HANDLER( sonson_videoram_w ) { - sonson_state *state = (sonson_state *)space->machine->driver_data; + sonson_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( sonson_colorram_w ) { - sonson_state *state = (sonson_state *)space->machine->driver_data; + sonson_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( sonson_scrollx_w ) { - sonson_state *state = (sonson_state *)space->machine->driver_data; + sonson_state *state = space->machine->driver_data(); int row; for (row = 5; row < 32; row++) @@ -124,7 +124,7 @@ WRITE8_HANDLER( sonson_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { - sonson_state *state = (sonson_state *)machine->driver_data; + sonson_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + 256 * (attr & 0x03); int color = attr >> 2; @@ -134,7 +134,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( sonson ) { - sonson_state *state = (sonson_state *)machine->driver_data; + sonson_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); @@ -142,7 +142,7 @@ VIDEO_START( sonson ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - sonson_state *state = (sonson_state *)machine->driver_data; + sonson_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; int offs; @@ -177,7 +177,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( sonson ) { - sonson_state *state = (sonson_state *)screen->machine->driver_data; + sonson_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); return 0; diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c index fcdcacf11ed..0737969b316 100644 --- a/src/mame/video/spbactn.c +++ b/src/mame/video/spbactn.c @@ -49,7 +49,7 @@ static int draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectan {42,43,46,47,58,59,62,63} }; - spbactn_state *state = (spbactn_state *)machine->driver_data; + spbactn_state *state = machine->driver_data(); int count = 0; int offs; @@ -108,7 +108,7 @@ static int draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectan VIDEO_START( spbactn ) { - spbactn_state *state = (spbactn_state *)machine->driver_data; + spbactn_state *state = machine->driver_data(); /* allocate bitmaps */ int width = machine->primary_screen->width(); @@ -120,7 +120,7 @@ VIDEO_START( spbactn ) VIDEO_UPDATE( spbactn ) { - spbactn_state *state = (spbactn_state *)screen->machine->driver_data; + spbactn_state *state = screen->machine->driver_data(); int offs, sx, sy; bitmap_fill(state->tile_bitmap_fg, cliprect, 0); diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c index 8d55d91d1b1..947085d5c01 100644 --- a/src/mame/video/spy.c +++ b/src/mame/video/spy.c @@ -11,7 +11,7 @@ void spy_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - spy_state *state = (spy_state *)machine->driver_data; + spy_state *state = machine->driver_data(); *flags = (*color & 0x20) ? TILE_FLIPX : 0; *code |= ((*color & 0x03) << 8) | ((*color & 0x10) << 6) | ((*color & 0x0c) << 9) | (bank << 13); *color = state->layer_colorbase[layer] + ((*color & 0xc0) >> 6); @@ -26,7 +26,7 @@ void spy_tile_callback( running_machine *machine, int layer, int bank, int *code void spy_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask, int *shadow ) { - spy_state *state = (spy_state *)machine->driver_data; + spy_state *state = machine->driver_data(); /* bit 4 = priority over layer A (0 = have priority) */ /* bit 5 = priority over layer B (1 = have priority) */ @@ -46,7 +46,7 @@ void spy_sprite_callback( running_machine *machine, int *code, int *color, int * VIDEO_START( spy ) { - spy_state *state = (spy_state *)machine->driver_data; + spy_state *state = machine->driver_data(); state->layer_colorbase[0] = 48; state->layer_colorbase[1] = 0; @@ -64,7 +64,7 @@ VIDEO_START( spy ) VIDEO_UPDATE( spy ) { - spy_state *state = (spy_state *)screen->machine->driver_data; + spy_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c index e4b75cd7c14..82484cee7b0 100644 --- a/src/mame/video/srmp2.c +++ b/src/mame/video/srmp2.c @@ -61,7 +61,7 @@ static void srmp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, const ---- ---- -x-- ---- : Flip screen */ - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); UINT16 *spriteram16 = state->spriteram1.u16; UINT16 *spriteram16_2 = state->spriteram2.u16; int offs; @@ -115,7 +115,7 @@ static void srmp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, const static void srmp3_draw_sprites_map(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram1.u8; UINT8 *spriteram_2 = state->spriteram2.u8; UINT8 *spriteram_3 = state->spriteram3.u8; @@ -225,7 +225,7 @@ static void srmp3_draw_sprites(running_machine *machine, bitmap_t *bitmap, const -x-- ---- : Flip screen */ - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram1.u8; UINT8 *spriteram_2 = state->spriteram2.u8; UINT8 *spriteram_3 = state->spriteram3.u8; @@ -279,7 +279,7 @@ static void srmp3_draw_sprites(running_machine *machine, bitmap_t *bitmap, const static void mjyuugi_draw_sprites_map(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); UINT16 *spriteram16 = state->spriteram1.u16; UINT16 *spriteram16_2 = state->spriteram2.u16; int offs, col; @@ -384,7 +384,7 @@ static void mjyuugi_draw_sprites(running_machine *machine, bitmap_t *bitmap, con ---- ---- -x-- ---- : Flip screen */ - srmp2_state *state = (srmp2_state *)machine->driver_data; + srmp2_state *state = machine->driver_data(); UINT16 *spriteram16 = state->spriteram1.u16; UINT16 *spriteram16_2 = state->spriteram2.u16; int offs; diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index c40d44794f1..6e0da01e55a 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -6,7 +6,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[0]; UINT16 *source = state->spriteram; UINT16 *finish = source + 0x1000/2; @@ -75,7 +75,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static TILE_GET_INFO( get_sslam_tx_tile_info ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); int code = state->tx_tileram[tile_index] & 0x0fff; int colr = state->tx_tileram[tile_index] & 0xf000; @@ -84,7 +84,7 @@ static TILE_GET_INFO( get_sslam_tx_tile_info ) WRITE16_HANDLER( sslam_tx_tileram_w ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tx_tileram[offset]); tilemap_mark_tile_dirty(state->tx_tilemap,offset); @@ -94,7 +94,7 @@ WRITE16_HANDLER( sslam_tx_tileram_w ) static TILE_GET_INFO( get_sslam_md_tile_info ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); int code = state->md_tileram[tile_index] & 0x0fff; int colr = state->md_tileram[tile_index] & 0xf000; @@ -103,7 +103,7 @@ static TILE_GET_INFO( get_sslam_md_tile_info ) WRITE16_HANDLER( sslam_md_tileram_w ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); COMBINE_DATA(&state->md_tileram[offset]); tilemap_mark_tile_dirty(state->md_tilemap,offset); @@ -113,7 +113,7 @@ WRITE16_HANDLER( sslam_md_tileram_w ) static TILE_GET_INFO( get_sslam_bg_tile_info ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); int code = state->bg_tileram[tile_index] & 0x1fff; int colr = state->bg_tileram[tile_index] & 0xe000; @@ -122,7 +122,7 @@ static TILE_GET_INFO( get_sslam_bg_tile_info ) WRITE16_HANDLER( sslam_bg_tileram_w ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_tileram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -130,7 +130,7 @@ WRITE16_HANDLER( sslam_bg_tileram_w ) static TILE_GET_INFO( get_powerbls_bg_tile_info ) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); int code = state->bg_tileram[tile_index*2+1] & 0x0fff; int colr = (state->bg_tileram[tile_index*2+1] & 0xf000) >> 12; code |= (state->bg_tileram[tile_index*2] & 0x0f00) << 4; @@ -142,7 +142,7 @@ static TILE_GET_INFO( get_powerbls_bg_tile_info ) WRITE16_HANDLER( powerbls_bg_tileram_w ) { - sslam_state *state = (sslam_state *)space->machine->driver_data; + sslam_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg_tileram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap,offset>>1); @@ -150,7 +150,7 @@ WRITE16_HANDLER( powerbls_bg_tileram_w ) VIDEO_START(sslam) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_sslam_bg_tile_info, tilemap_scan_rows, 16, 16, 32, 32); state->md_tilemap = tilemap_create(machine, get_sslam_md_tile_info, tilemap_scan_rows, 16, 16, 32, 32); @@ -165,7 +165,7 @@ VIDEO_START(sslam) VIDEO_START(powerbls) { - sslam_state *state = (sslam_state *)machine->driver_data; + sslam_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_powerbls_bg_tile_info,tilemap_scan_rows,8,8,64,64); @@ -175,7 +175,7 @@ VIDEO_START(powerbls) VIDEO_UPDATE(sslam) { - sslam_state *state = (sslam_state *)screen->machine->driver_data; + sslam_state *state = screen->machine->driver_data(); if (!(state->regs[6] & 1)) { @@ -215,7 +215,7 @@ VIDEO_UPDATE(sslam) VIDEO_UPDATE(powerbls) { - sslam_state *state = (sslam_state *)screen->machine->driver_data; + sslam_state *state = screen->machine->driver_data(); if (!(state->regs[6] & 1)) { diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c index 7db470dc724..8606a79ff47 100644 --- a/src/mame/video/stactics.c +++ b/src/mame/video/stactics.c @@ -91,7 +91,7 @@ static PALETTE_INIT( stactics ) WRITE8_HANDLER( stactics_scroll_ram_w ) { - stactics_state *state = (stactics_state *)space->machine->driver_data; + stactics_state *state = space->machine->driver_data(); if (data & 0x01) { @@ -114,7 +114,7 @@ WRITE8_HANDLER( stactics_scroll_ram_w ) CUSTOM_INPUT( stactics_get_frame_count_d3 ) { - stactics_state *state = (stactics_state *)field->port->machine->driver_data; + stactics_state *state = field->port->machine->driver_data(); return (state->frame_count >> 3) & 0x01; } @@ -129,7 +129,7 @@ CUSTOM_INPUT( stactics_get_frame_count_d3 ) WRITE8_HANDLER( stactics_speed_latch_w ) { - stactics_state *state = (stactics_state *)space->machine->driver_data; + stactics_state *state = space->machine->driver_data(); /* This writes to a shift register which is clocked by */ /* a 555 oscillator. This value determines the speed of */ @@ -156,7 +156,7 @@ WRITE8_HANDLER( stactics_speed_latch_w ) WRITE8_HANDLER( stactics_shot_trigger_w ) { - stactics_state *state = (stactics_state *)space->machine->driver_data; + stactics_state *state = space->machine->driver_data(); state->shot_standby = 0; } @@ -164,7 +164,7 @@ WRITE8_HANDLER( stactics_shot_trigger_w ) WRITE8_HANDLER( stactics_shot_flag_clear_w ) { - stactics_state *state = (stactics_state *)space->machine->driver_data; + stactics_state *state = space->machine->driver_data(); state->shot_arrive = 0; } @@ -172,7 +172,7 @@ WRITE8_HANDLER( stactics_shot_flag_clear_w ) CUSTOM_INPUT( stactics_get_shot_standby ) { - stactics_state *state = (stactics_state *)field->port->machine->driver_data; + stactics_state *state = field->port->machine->driver_data(); return state->shot_standby; } @@ -180,7 +180,7 @@ CUSTOM_INPUT( stactics_get_shot_standby ) CUSTOM_INPUT( stactics_get_not_shot_arrive ) { - stactics_state *state = (stactics_state *)field->port->machine->driver_data; + stactics_state *state = field->port->machine->driver_data(); return !state->shot_arrive; } @@ -367,7 +367,7 @@ static void update_artwork(running_machine *machine, stactics_state *state) static VIDEO_START( stactics ) { - stactics_state *state = (stactics_state *)machine->driver_data; + stactics_state *state = machine->driver_data(); state->y_scroll_d = 0; state->y_scroll_e = 0; @@ -390,7 +390,7 @@ static VIDEO_START( stactics ) static VIDEO_UPDATE( stactics ) { - stactics_state *state = (stactics_state *)screen->machine->driver_data; + stactics_state *state = screen->machine->driver_data(); update_beam(state); draw_background(state, bitmap, cliprect); diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 3ba88071ed9..0d4500e0fe4 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -7,7 +7,7 @@ static TILE_GET_INFO( get_stlforce_bg_tile_info ) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); int tileno,colour; tileno = state->bg_videoram[tile_index] & 0x0fff; @@ -18,7 +18,7 @@ static TILE_GET_INFO( get_stlforce_bg_tile_info ) WRITE16_HANDLER( stlforce_bg_videoram_w ) { - stlforce_state *state = (stlforce_state *)space->machine->driver_data; + stlforce_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -28,7 +28,7 @@ WRITE16_HANDLER( stlforce_bg_videoram_w ) static TILE_GET_INFO( get_stlforce_mlow_tile_info ) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); int tileno,colour; tileno = state->mlow_videoram[tile_index] & 0x0fff; @@ -42,7 +42,7 @@ static TILE_GET_INFO( get_stlforce_mlow_tile_info ) WRITE16_HANDLER( stlforce_mlow_videoram_w ) { - stlforce_state *state = (stlforce_state *)space->machine->driver_data; + stlforce_state *state = space->machine->driver_data(); state->mlow_videoram[offset] = data; tilemap_mark_tile_dirty(state->mlow_tilemap,offset); @@ -52,7 +52,7 @@ WRITE16_HANDLER( stlforce_mlow_videoram_w ) static TILE_GET_INFO( get_stlforce_mhigh_tile_info ) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); int tileno,colour; tileno = state->mhigh_videoram[tile_index] & 0x0fff; @@ -66,7 +66,7 @@ static TILE_GET_INFO( get_stlforce_mhigh_tile_info ) WRITE16_HANDLER( stlforce_mhigh_videoram_w ) { - stlforce_state *state = (stlforce_state *)space->machine->driver_data; + stlforce_state *state = space->machine->driver_data(); state->mhigh_videoram[offset] = data; tilemap_mark_tile_dirty(state->mhigh_tilemap,offset); @@ -76,7 +76,7 @@ WRITE16_HANDLER( stlforce_mhigh_videoram_w ) static TILE_GET_INFO( get_stlforce_tx_tile_info ) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); int tileno,colour; tileno = state->tx_videoram[tile_index] & 0x0fff; @@ -91,7 +91,7 @@ static TILE_GET_INFO( get_stlforce_tx_tile_info ) WRITE16_HANDLER( stlforce_tx_videoram_w ) { - stlforce_state *state = (stlforce_state *)space->machine->driver_data; + stlforce_state *state = space->machine->driver_data(); state->tx_videoram[offset] = data; tilemap_mark_tile_dirty(state->tx_tilemap,offset); @@ -101,7 +101,7 @@ WRITE16_HANDLER( stlforce_tx_videoram_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); const UINT16 *source = state->spriteram+0x0; const UINT16 *finish = state->spriteram+0x800; const gfx_element *gfx = machine->gfx[2]; @@ -133,7 +133,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( stlforce ) { - stlforce_state *state = (stlforce_state *)screen->machine->driver_data; + stlforce_state *state = screen->machine->driver_data(); int i; if (state->vidattrram[6] & 1) @@ -186,7 +186,7 @@ VIDEO_UPDATE( stlforce ) VIDEO_START( stlforce ) { - stlforce_state *state = (stlforce_state *)machine->driver_data; + stlforce_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_stlforce_bg_tile_info, tilemap_scan_cols, 16,16,64,16); state->mlow_tilemap = tilemap_create(machine, get_stlforce_mlow_tile_info, tilemap_scan_cols, 16,16,64,16); diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c index 5714172f5d3..da0e8469b79 100644 --- a/src/mame/video/supbtime.c +++ b/src/mame/video/supbtime.c @@ -20,7 +20,7 @@ End sequence uses rowscroll '98 c0' on pf1 (jmp to 1d61a on supbtimj) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - supbtime_state *state = (supbtime_state *)machine->driver_data; + supbtime_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -90,7 +90,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE(supbtime) { - supbtime_state *state = (supbtime_state *)screen->machine->driver_data; + supbtime_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index 35c8a288ad1..e04cff19b64 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -30,7 +30,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect */ - suprslam_state *state = (suprslam_state *)machine->driver_data; + suprslam_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[1]; UINT16 *source = state->spriteram; UINT16 *source2 = state->spriteram; @@ -99,7 +99,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect WRITE16_HANDLER( suprslam_screen_videoram_w ) { - suprslam_state *state = (suprslam_state *)space->machine->driver_data; + suprslam_state *state = space->machine->driver_data(); state->screen_videoram[offset] = data; tilemap_mark_tile_dirty(state->screen_tilemap, offset); @@ -108,7 +108,7 @@ WRITE16_HANDLER( suprslam_screen_videoram_w ) static TILE_GET_INFO( get_suprslam_tile_info ) { - suprslam_state *state = (suprslam_state *)machine->driver_data; + suprslam_state *state = machine->driver_data(); int tileno = state->screen_videoram[tile_index] & 0x0fff; int colour = state->screen_videoram[tile_index] & 0xf000; @@ -122,7 +122,7 @@ static TILE_GET_INFO( get_suprslam_tile_info ) /* BG LAYER */ WRITE16_HANDLER( suprslam_bg_videoram_w ) { - suprslam_state *state = (suprslam_state *)space->machine->driver_data; + suprslam_state *state = space->machine->driver_data(); state->bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -131,7 +131,7 @@ WRITE16_HANDLER( suprslam_bg_videoram_w ) static TILE_GET_INFO( get_suprslam_bg_tile_info ) { - suprslam_state *state = (suprslam_state *)machine->driver_data; + suprslam_state *state = machine->driver_data(); int tileno = state->bg_videoram[tile_index] & 0x0fff; int colour = state->bg_videoram[tile_index] & 0xf000; @@ -144,7 +144,7 @@ static TILE_GET_INFO( get_suprslam_bg_tile_info ) VIDEO_START( suprslam ) { - suprslam_state *state = (suprslam_state *)machine->driver_data; + suprslam_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_suprslam_bg_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->screen_tilemap = tilemap_create(machine, get_suprslam_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -154,7 +154,7 @@ VIDEO_START( suprslam ) VIDEO_UPDATE( suprslam ) { - suprslam_state *state = (suprslam_state *)screen->machine->driver_data; + suprslam_state *state = screen->machine->driver_data(); tilemap_set_scrollx( state->screen_tilemap,0, state->screen_vregs[0x04/2] ); bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -169,7 +169,7 @@ VIDEO_UPDATE( suprslam ) WRITE16_HANDLER (suprslam_bank_w) { - suprslam_state *state = (suprslam_state *)space->machine->driver_data; + suprslam_state *state = space->machine->driver_data(); UINT16 old_screen_bank, old_bg_bank; old_screen_bank = state->screen_bank; old_bg_bank = state->bg_bank; diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c index d73e781458c..329b4df50b9 100644 --- a/src/mame/video/surpratk.c +++ b/src/mame/video/surpratk.c @@ -11,7 +11,7 @@ void surpratk_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - surpratk_state *state = (surpratk_state *)machine->driver_data; + surpratk_state *state = machine->driver_data(); *flags = (*color & 0x80) ? TILE_FLIPX : 0; *code |= ((*color & 0x03) << 8) | ((*color & 0x10) << 6) | ((*color & 0x0c) << 9) | (bank << 13); *color = state->layer_colorbase[layer] + ((*color & 0x60) >> 5); @@ -25,7 +25,7 @@ void surpratk_tile_callback( running_machine *machine, int layer, int bank, int void surpratk_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - surpratk_state *state = (surpratk_state *)machine->driver_data; + surpratk_state *state = machine->driver_data(); int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -48,7 +48,7 @@ void surpratk_sprite_callback( running_machine *machine, int *code, int *color, VIDEO_UPDATE( surpratk ) { - surpratk_state *state = (surpratk_state *)screen->machine->driver_data; + surpratk_state *state = screen->machine->driver_data(); int layer[3], bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index b756fff450c..98e2ca4a11f 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -32,7 +32,7 @@ static void setup_system16_bootleg_spritebanking( running_machine* machine ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); if (state->spritebank_type == 1) { @@ -112,7 +112,7 @@ static const int resistances_sh[6] = {3900, 2000, 1000, 1000/2, 1000/4, 470}; #ifdef UNUSED_CODE WRITE16_HANDLER( sys16_paletteram_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT16 newword; COMBINE_DATA(&space->machine->generic.paletteram.u16[offset]); @@ -162,7 +162,7 @@ WRITE16_HANDLER( sys16_paletteram_w ) static void update_page( running_machine *machine ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); int all_dirty = 0; int i, offset; @@ -238,7 +238,7 @@ static void update_page( running_machine *machine ) static TILE_GET_INFO( get_bg_tile_info ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); const UINT16 *source = 64 * 32 * state->bg_page[tile_index / (64 * 32)] + state->tileram; int data = source[tile_index%(64*32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & state->tilebank_switch) ? state->tile_bank1 : state->tile_bank0); @@ -252,7 +252,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); const UINT16 *source = 64 * 32 * state->fg_page[tile_index / (64 * 32)] + state->tileram; int data = source[tile_index % (64 * 32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & state->tilebank_switch) ? state->tile_bank1 : state->tile_bank0); @@ -266,7 +266,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); const UINT16 *source = 64 * 32 * state->bg2_page[tile_index / (64 * 32)] + state->tileram; int data = source[tile_index % (64 * 32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & 0x1000) ? state->tile_bank1 : state->tile_bank0); @@ -280,7 +280,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) static TILE_GET_INFO( get_fg2_tile_info ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); const UINT16 *source = 64 * 32 * state->fg2_page[tile_index / (64 * 32)] + state->tileram; int data = source[tile_index % (64 * 32)]; int tile_number = (data & 0xfff) + 0x1000 * ((data & 0x1000) ? state->tile_bank1 : state->tile_bank0); @@ -294,7 +294,7 @@ static TILE_GET_INFO( get_fg2_tile_info ) WRITE16_HANDLER( sys16_tileram_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); UINT16 oldword = state->tileram[offset]; COMBINE_DATA(&state->tileram[offset]); @@ -333,7 +333,7 @@ WRITE16_HANDLER( sys16_tileram_w ) static TILE_GET_INFO( get_text_tile_info ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); const UINT16 *source = state->textram; int tile_number = source[tile_index]; int pri = tile_number >> 8; @@ -363,7 +363,7 @@ static TILE_GET_INFO( get_text_tile_info ) WRITE16_HANDLER( sys16_textram_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); COMBINE_DATA(&state->textram[offset]); tilemap_mark_tile_dirty(state->text_layer, offset); @@ -373,7 +373,7 @@ WRITE16_HANDLER( sys16_textram_w ) VIDEO_START( system16 ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); /* Normal colors */ compute_resistor_weights(0, 255, -1.0, @@ -442,7 +442,7 @@ VIDEO_START( system16 ) VIDEO_START( system18old ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); VIDEO_START_CALL(system16); @@ -499,7 +499,7 @@ VIDEO_START( system18old ) static TILE_GET_INFO( get_s16a_bootleg_tile_infotxt ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); int data, tile_number; data = state->textram[tile_index]; @@ -514,7 +514,7 @@ static TILE_GET_INFO( get_s16a_bootleg_tile_infotxt ) static TILE_GET_INFO( get_s16a_bootleg_tile_info0 ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); int data, tile_number; data = state->bg0_tileram[tile_index]; @@ -530,7 +530,7 @@ static TILE_GET_INFO( get_s16a_bootleg_tile_info0 ) static TILE_GET_INFO( get_s16a_bootleg_tile_info1 ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); int data, tile_number; data = state->bg1_tileram[tile_index]; @@ -545,31 +545,31 @@ static TILE_GET_INFO( get_s16a_bootleg_tile_info1 ) WRITE16_HANDLER( s16a_bootleg_bgscrolly_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->bg_scrolly = data; } WRITE16_HANDLER( s16a_bootleg_bgscrollx_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->bg_scrollx = data; } WRITE16_HANDLER( s16a_bootleg_fgscrolly_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->fg_scrolly = data; } WRITE16_HANDLER( s16a_bootleg_fgscrollx_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); state->fg_scrollx = data; } WRITE16_HANDLER( s16a_bootleg_tilemapselect_w ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)space->machine->driver_data; + segas1x_bootleg_state *state = space->machine->driver_data(); COMBINE_DATA(&state->tilemapselect); //printf("system16 bootleg tilemapselect %04x\n", state->tilemapselect); @@ -578,7 +578,7 @@ WRITE16_HANDLER( s16a_bootleg_tilemapselect_w ) VIDEO_START( s16a_bootleg ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)machine->driver_data; + segas1x_bootleg_state *state = machine->driver_data(); /* Normal colors */ compute_resistor_weights(0, 255, -1.0, @@ -631,7 +631,7 @@ VIDEO_START( s16a_bootleg_passsht ) // Passing Shot (2 player), Shinobi (Datsu), Wonderboy 3 VIDEO_UPDATE( s16a_bootleg ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)screen->machine->driver_data; + segas1x_bootleg_state *state = screen->machine->driver_data(); // passing shot int offset_txtx = 192; @@ -689,7 +689,7 @@ VIDEO_UPDATE( s16a_bootleg ) /* The Passing Shot 4 Player bootleg has weird scroll registers (different offsets, ^0x7 xor) */ VIDEO_UPDATE( s16a_bootleg_passht4b ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)screen->machine->driver_data; + segas1x_bootleg_state *state = screen->machine->driver_data(); // passing shot int offset_txtx = 192; @@ -732,7 +732,7 @@ VIDEO_UPDATE( s16a_bootleg_passht4b ) VIDEO_UPDATE( system16 ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)screen->machine->driver_data; + segas1x_bootleg_state *state = screen->machine->driver_data(); if (!state->refreshenable) { @@ -778,7 +778,7 @@ VIDEO_UPDATE( system16 ) VIDEO_UPDATE( system18old ) { - segas1x_bootleg_state *state = (segas1x_bootleg_state *)screen->machine->driver_data; + segas1x_bootleg_state *state = screen->machine->driver_data(); if (!state->refreshenable) { diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 75dfe982f85..52e6b270fcb 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -13,7 +13,7 @@ static TILE_GET_INFO( get_tile_info ) { - tail2nos_state *state = (tail2nos_state *)machine->driver_data; + tail2nos_state *state = machine->driver_data(); UINT16 code = state->bgvideoram[tile_index]; SET_TILE_INFO( 0, @@ -43,7 +43,7 @@ void tail2nos_zoom_callback( running_machine *machine, int *code, int *color, in static STATE_POSTLOAD( tail2nos_postload ) { - tail2nos_state *state = (tail2nos_state *)machine->driver_data; + tail2nos_state *state = machine->driver_data(); int i; tilemap_mark_all_tiles_dirty(state->bg_tilemap); @@ -56,7 +56,7 @@ static STATE_POSTLOAD( tail2nos_postload ) VIDEO_START( tail2nos ) { - tail2nos_state *state = (tail2nos_state *)machine->driver_data; + tail2nos_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -78,7 +78,7 @@ VIDEO_START( tail2nos ) WRITE16_HANDLER( tail2nos_bgvideoram_w ) { - tail2nos_state *state = (tail2nos_state *)space->machine->driver_data; + tail2nos_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bgvideoram[offset]); tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -86,13 +86,13 @@ WRITE16_HANDLER( tail2nos_bgvideoram_w ) READ16_HANDLER( tail2nos_zoomdata_r ) { - tail2nos_state *state = (tail2nos_state *)space->machine->driver_data; + tail2nos_state *state = space->machine->driver_data(); return state->zoomdata[offset]; } WRITE16_HANDLER( tail2nos_zoomdata_w ) { - tail2nos_state *state = (tail2nos_state *)space->machine->driver_data; + tail2nos_state *state = space->machine->driver_data(); int oldword = state->zoomdata[offset]; COMBINE_DATA(&state->zoomdata[offset]); @@ -102,7 +102,7 @@ WRITE16_HANDLER( tail2nos_zoomdata_w ) WRITE16_HANDLER( tail2nos_gfxbank_w ) { - tail2nos_state *state = (tail2nos_state *)space->machine->driver_data; + tail2nos_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -148,7 +148,7 @@ WRITE16_HANDLER( tail2nos_gfxbank_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - tail2nos_state *state = (tail2nos_state *)machine->driver_data; + tail2nos_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -179,7 +179,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( tail2nos ) { - tail2nos_state *state = (tail2nos_state *)screen->machine->driver_data; + tail2nos_state *state = screen->machine->driver_data(); if (state->video_enable) { diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index 23186f8edc8..6d158f7360e 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -5,7 +5,7 @@ WRITE16_HANDLER( hitice_pixelram_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); int sy = offset >> 9; int sx = offset & 0x1ff; @@ -21,7 +21,7 @@ WRITE16_HANDLER( hitice_pixelram_w ) WRITE16_HANDLER( hitice_pixel_scroll_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pixel_scroll[offset]); } @@ -37,7 +37,7 @@ static void hitice_clear_pixel_bitmap( running_machine *machine ) static VIDEO_START( taitob_core ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); state->framebuffer[0] = auto_bitmap_alloc(machine, 512, 256, machine->primary_screen->format()); state->framebuffer[1] = auto_bitmap_alloc(machine, 512, 256, machine->primary_screen->format()); @@ -56,7 +56,7 @@ VIDEO_START( taitob_color_order0 ) /*Note that in both this and color order 1 pixel_color_base/color_granularity is equal to sprites color base. Pure coincidence? */ - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); state->b_sp_color_base = 0x40 * 16; /*sprites */ /* bg, fg, tx color_base are set in the tc0180vcu interface */ @@ -67,7 +67,7 @@ VIDEO_START( taitob_color_order0 ) VIDEO_START( taitob_color_order1 ) { /* this is the reversed layout used in: Crime City, Puzzle Bobble */ - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); state->b_sp_color_base = 0x80 * 16; VIDEO_START_CALL(taitob_core); @@ -76,7 +76,7 @@ VIDEO_START( taitob_color_order1 ) VIDEO_START( taitob_color_order2 ) { /*this is used in: rambo3a, masterw, silentd, selfeena, ryujin */ - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); state->b_sp_color_base = 0x10 * 16; VIDEO_START_CALL(taitob_core); @@ -85,7 +85,7 @@ VIDEO_START( taitob_color_order2 ) VIDEO_START( hitice ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); VIDEO_START_CALL(taitob_color_order0); @@ -105,7 +105,7 @@ VIDEO_RESET( hitice ) READ16_HANDLER( tc0180vcu_framebuffer_word_r ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); int sy = offset >> 8; int sx = 2 * (offset & 0xff); @@ -114,7 +114,7 @@ READ16_HANDLER( tc0180vcu_framebuffer_word_r ) WRITE16_HANDLER( tc0180vcu_framebuffer_word_w ) { - taitob_state *state = (taitob_state *)space->machine->driver_data; + taitob_state *state = space->machine->driver_data(); int sy = offset >> 8; int sx = 2 * (offset & 0xff); @@ -156,7 +156,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect 000c - 000f: unused */ - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); int x, y, xlatch = 0, ylatch = 0, x_no = 0, y_no = 0, x_num = 0, y_num = 0, big_sprite = 0; int offs, code, color, flipx, flipy; UINT32 data, zoomx, zoomy, zx, zy, zoomxlatch = 0, zoomylatch = 0; @@ -252,7 +252,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_framebuffer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int priority ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); rectangle myclip = *cliprect; int x, y; UINT8 video_control = tc0180vcu_get_videoctrl(state->tc0180vcu, 0); @@ -357,7 +357,7 @@ profiler_mark_end(); VIDEO_UPDATE( taitob ) { - taitob_state *state = (taitob_state *)screen->machine->driver_data; + taitob_state *state = screen->machine->driver_data(); UINT8 video_control = tc0180vcu_get_videoctrl(state->tc0180vcu, 0); if ((video_control & 0x20) == 0) @@ -393,7 +393,7 @@ VIDEO_UPDATE( taitob ) VIDEO_EOF( taitob ) { - taitob_state *state = (taitob_state *)machine->driver_data; + taitob_state *state = machine->driver_data(); UINT8 video_control = tc0180vcu_get_videoctrl(state->tc0180vcu, 0); UINT8 framebuffer_page = tc0180vcu_get_fb_page(state->tc0180vcu, 0); diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c index c10d9375006..9e2754d342e 100644 --- a/src/mame/video/taito_f2.c +++ b/src/mame/video/taito_f2.c @@ -29,7 +29,7 @@ enum static void taitof2_core_vh_start (running_machine *machine, int sprite_type, int hide, int flip_hide ) { int i; - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->sprite_type = sprite_type; state->hide_pixels = hide; state->flip_hide_pixels = flip_hide; @@ -137,7 +137,7 @@ VIDEO_START( taitof2_thundfox ) VIDEO_START( taitof2_mjnquest ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); taitof2_core_vh_start(machine, 0, 0, 0); @@ -146,7 +146,7 @@ VIDEO_START( taitof2_mjnquest ) VIDEO_START( taitof2_footchmp ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); taitof2_core_vh_start(machine, 0, 3, 3); @@ -155,7 +155,7 @@ VIDEO_START( taitof2_footchmp ) VIDEO_START( taitof2_hthero ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); taitof2_core_vh_start(machine, 0, 3, 3); @@ -194,7 +194,7 @@ VIDEO_START( taitof2_dinorex ) VIDEO_START( taitof2_dondokod ) /* dondokod, cameltry */ { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->pivot_xdisp = -16; state->pivot_ydisp = 0; @@ -203,7 +203,7 @@ VIDEO_START( taitof2_dondokod ) /* dondokod, cameltry */ VIDEO_START( taitof2_pulirula ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->pivot_xdisp = -10; /* alignment seems correct (see level 2, falling */ state->pivot_ydisp = 16; /* block of ice after armour man) */ @@ -212,7 +212,7 @@ VIDEO_START( taitof2_pulirula ) VIDEO_START( taitof2_driftout ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); state->pivot_xdisp = -16; state->pivot_ydisp = 16; @@ -233,7 +233,7 @@ altering spritebanks of sprites while they're on screen. WRITE16_HANDLER( taitof2_sprite_extension_w ) { /* areas above 0x1000 cleared in some games, but not used */ - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); if (offset < 0x800) { @@ -244,7 +244,7 @@ WRITE16_HANDLER( taitof2_sprite_extension_w ) WRITE16_HANDLER( taitof2_spritebank_w ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); int i = 0; int j = 0; @@ -274,7 +274,7 @@ WRITE16_HANDLER( taitof2_spritebank_w ) WRITE16_HANDLER( koshien_spritebank_w ) { - taitof2_state *state = (taitof2_state *)space->machine->driver_data; + taitof2_state *state = space->machine->driver_data(); state->spritebank_buffered[0] = 0x0000; /* never changes */ state->spritebank_buffered[1] = 0x0400; @@ -289,7 +289,7 @@ WRITE16_HANDLER( koshien_spritebank_w ) static void taito_f2_tc360_spritemixdraw( running_machine *machine, bitmap_t *dest_bmp, const rectangle *clip, const gfx_element *gfx, UINT32 code, UINT32 color, int flipx, int flipy, int sx, int sy, int scalex, int scaley ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); int pal_base = gfx->color_base + gfx->color_granularity * (color % gfx->total_colors); const UINT8 *source_base = gfx_element_get_data(gfx, code % gfx->total_elements); bitmap_t *priority_bitmap = gfx->machine->priority_bitmap; @@ -494,7 +494,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect non zoom parts. */ - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); int i, x, y, off, extoffs; int code, color, spritedata, spritecont, flipx, flipy; int xcurrent, ycurrent, big_sprite = 0; @@ -819,7 +819,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void update_spritebanks( running_machine *machine ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); int i; #if 1 for (i = 0; i < 8; i ++) @@ -838,7 +838,7 @@ static void update_spritebanks( running_machine *machine ) static void taitof2_handle_sprite_buffering( running_machine *machine ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); if (state->prepare_sprites) /* no buffering */ { @@ -849,7 +849,7 @@ static void taitof2_handle_sprite_buffering( running_machine *machine ) static void taitof2_update_sprites_active_area( running_machine *machine ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); int off; update_spritebanks(machine); @@ -895,7 +895,7 @@ static void taitof2_update_sprites_active_area( running_machine *machine ) VIDEO_EOF( taitof2_no_buffer ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); taitof2_update_sprites_active_area(machine); @@ -904,7 +904,7 @@ VIDEO_EOF( taitof2_no_buffer ) VIDEO_EOF( taitof2_full_buffer_delayed ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int i; @@ -919,7 +919,7 @@ VIDEO_EOF( taitof2_full_buffer_delayed ) VIDEO_EOF( taitof2_partial_buffer_delayed ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int i; @@ -934,7 +934,7 @@ VIDEO_EOF( taitof2_partial_buffer_delayed ) VIDEO_EOF( taitof2_partial_buffer_delayed_thundfox ) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int i; @@ -956,7 +956,7 @@ VIDEO_EOF( taitof2_partial_buffer_delayed_qzchikyu ) /* spriteram[2] and [3] are 1 frame behind... probably thundfox_eof_callback would work fine */ - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int i; @@ -993,7 +993,7 @@ VIDEO_UPDATE( taitof2_ssi ) VIDEO_UPDATE( taitof2_yesnoj ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); taitof2_handle_sprite_buffering(screen->machine); @@ -1011,7 +1011,7 @@ VIDEO_UPDATE( taitof2_yesnoj ) VIDEO_UPDATE( taitof2 ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); taitof2_handle_sprite_buffering(screen->machine); @@ -1029,7 +1029,7 @@ VIDEO_UPDATE( taitof2 ) VIDEO_UPDATE( taitof2_pri ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); int layer[3]; taitof2_handle_sprite_buffering(screen->machine); @@ -1065,7 +1065,7 @@ VIDEO_UPDATE( taitof2_pri ) static void draw_roz_layer( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 priority) { - taitof2_state *state = (taitof2_state *)machine->driver_data; + taitof2_state *state = machine->driver_data(); if (state->tc0280grd != NULL) tc0280grd_zoom_draw(state->tc0280grd, bitmap, cliprect, state->pivot_xdisp, state->pivot_ydisp, priority); @@ -1076,7 +1076,7 @@ static void draw_roz_layer( running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( taitof2_pri_roz ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); int tilepri[3]; int rozpri; int layer[3]; @@ -1145,7 +1145,7 @@ VIDEO_UPDATE( taitof2_pri_roz ) /* Thunderfox */ VIDEO_UPDATE( taitof2_thundfox ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); int tilepri[2][3]; int spritepri[4]; int layer[2][3]; @@ -1282,7 +1282,7 @@ and it changes these (and the sprite pri settings) a lot. VIDEO_UPDATE( taitof2_metalb ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); UINT8 layer[5], invlayer[4]; UINT16 priority; @@ -1333,7 +1333,7 @@ VIDEO_UPDATE( taitof2_metalb ) /* Deadconx, Footchmp */ VIDEO_UPDATE( taitof2_deadconx ) { - taitof2_state *state = (taitof2_state *)screen->machine->driver_data; + taitof2_state *state = screen->machine->driver_data(); UINT8 layer[5]; UINT8 tilepri[5]; UINT8 spritepri[4]; diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c index 4e36f2bd424..d0ae942be98 100644 --- a/src/mame/video/taito_h.c +++ b/src/mame/video/taito_h.c @@ -75,7 +75,7 @@ static void syvalion_draw_sprites( running_machine *machine,bitmap_t *bitmap, co /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - taitoh_state *state = (taitoh_state *)machine->driver_data; + taitoh_state *state = machine->driver_data(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, ex, zx; int ysize; @@ -168,7 +168,7 @@ static void recordbr_draw_sprites( running_machine *machine, bitmap_t *bitmap, c /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - taitoh_state *state = (taitoh_state *)machine->driver_data; + taitoh_state *state = machine->driver_data(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, dy, ex, ey, zx, zy; int ysize; @@ -280,7 +280,7 @@ static void dleague_draw_sprites( running_machine *machine, bitmap_t *bitmap, co /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - taitoh_state *state = (taitoh_state *)machine->driver_data; + taitoh_state *state = machine->driver_data(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, ex, zx; int ysize; @@ -393,7 +393,7 @@ static void taitoh_log_vram(running_machine *machine) VIDEO_UPDATE( syvalion ) { - taitoh_state *state = (taitoh_state *)screen->machine->driver_data; + taitoh_state *state = screen->machine->driver_data(); tc0080vco_tilemap_update(state->tc0080vco); @@ -412,7 +412,7 @@ VIDEO_UPDATE( syvalion ) VIDEO_UPDATE( recordbr ) { - taitoh_state *state = (taitoh_state *)screen->machine->driver_data; + taitoh_state *state = screen->machine->driver_data(); tc0080vco_tilemap_update(state->tc0080vco); @@ -443,7 +443,7 @@ VIDEO_UPDATE( recordbr ) VIDEO_UPDATE( dleague ) { - taitoh_state *state = (taitoh_state *)screen->machine->driver_data; + taitoh_state *state = screen->machine->driver_data(); tc0080vco_tilemap_update(state->tc0080vco); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index bb7de98513a..07157055105 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -9,7 +9,7 @@ static TILE_GET_INFO( get_bg18_tile_info ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); int attr = state->rambanks[2 * tile_index + 0x8000 + 1]; int code = state->rambanks[2 * tile_index + 0x8000] | ((attr & 0x03) << 8) @@ -25,7 +25,7 @@ static TILE_GET_INFO( get_bg18_tile_info ) static TILE_GET_INFO( get_bg19_tile_info ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); int attr = state->rambanks[2 * tile_index + 0x9000 + 1]; int code = state->rambanks[2 * tile_index + 0x9000] | ((attr & 0x03) << 8) @@ -41,7 +41,7 @@ static TILE_GET_INFO( get_bg19_tile_info ) static TILE_GET_INFO( get_ch1a_tile_info ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); int attr = state->rambanks[2 * tile_index + 0xa000 + 1]; int code = state->rambanks[2 * tile_index + 0xa000] | ((attr & 0x01) << 8) | ((attr & 0x04) << 7); @@ -62,7 +62,7 @@ static TILE_GET_INFO( get_ch1a_tile_info ) VIDEO_START( taitol ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); int i; state->bg18_tilemap = tilemap_create(machine, get_bg18_tile_info, tilemap_scan_rows, 8, 8, 64, 32); @@ -90,7 +90,7 @@ VIDEO_START( taitol ) WRITE8_HANDLER( horshoes_bankg_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); if (state->horshoes_gfxbank != data) { @@ -103,7 +103,7 @@ WRITE8_HANDLER( horshoes_bankg_w ) WRITE8_HANDLER( taitol_bankc_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); if (state->bankc[offset] != data) { @@ -117,14 +117,14 @@ WRITE8_HANDLER( taitol_bankc_w ) READ8_HANDLER( taitol_bankc_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); return state->bankc[offset]; } WRITE8_HANDLER( taitol_control_w ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); // logerror("Control Write %02x (%04x)\n", data, cpu_get_pc(space->cpu)); @@ -146,7 +146,7 @@ WRITE8_HANDLER( taitol_control_w ) READ8_HANDLER( taitol_control_r ) { - taitol_state *state = (taitol_state *)space->machine->driver_data; + taitol_state *state = space->machine->driver_data(); // logerror("Control Read %02x (%04x)\n", cur_ctrl, cpu_get_pc(space->cpu)); return state->cur_ctrl; @@ -194,19 +194,19 @@ void taitol_chardef1f_m( running_machine *machine, int offset ) void taitol_bg18_m( running_machine *machine, int offset ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); tilemap_mark_tile_dirty(state->bg18_tilemap, offset / 2); } void taitol_bg19_m( running_machine *machine, int offset ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); tilemap_mark_tile_dirty(state->bg19_tilemap, offset / 2); } void taitol_char1a_m( running_machine *machine, int offset ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); tilemap_mark_tile_dirty(state->ch1a_tilemap, offset / 2); } @@ -245,7 +245,7 @@ void taitol_obj1b_m( running_machine *machine, int offset ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); int offs; /* at spriteram + 0x3f0 and 03f8 are the tilemap control registers; spriteram + 0x3e8 seems to be unused */ @@ -286,7 +286,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( taitol ) { - taitol_state *state = (taitol_state *)screen->machine->driver_data; + taitol_state *state = screen->machine->driver_data(); int dx, dy; dx = state->rambanks[0xb3f4] | (state->rambanks[0xb3f5] << 8); @@ -329,7 +329,7 @@ VIDEO_UPDATE( taitol ) VIDEO_EOF( taitol ) { - taitol_state *state = (taitol_state *)machine->driver_data; + taitol_state *state = machine->driver_data(); UINT8 *spriteram = state->rambanks + 0xb000; memcpy(state->buff_spriteram, spriteram, TAITOL_SPRITERAM_SIZE); diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c index 9c79d4af0d1..656f0c832ad 100644 --- a/src/mame/video/taito_o.c +++ b/src/mame/video/taito_o.c @@ -30,7 +30,7 @@ static void parentj_draw_sprites( running_machine *machine, bitmap_t *bitmap, co /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - taitoo_state *state = (taitoo_state *)machine->driver_data; + taitoo_state *state = machine->driver_data(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, dy, ex, ey, zx, zy; int ysize; @@ -140,7 +140,7 @@ static void parentj_draw_sprites( running_machine *machine, bitmap_t *bitmap, co VIDEO_UPDATE( parentj ) { - taitoo_state *state = (taitoo_state *)screen->machine->driver_data; + taitoo_state *state = screen->machine->driver_data(); tc0080vco_tilemap_update(state->tc0080vco); diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c index b5186ee2c56..f94aeedbdfb 100644 --- a/src/mame/video/taito_z.c +++ b/src/mame/video/taito_z.c @@ -6,7 +6,7 @@ VIDEO_START( taitoz ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); state->road_palbank = 3; state->sci_spriteframe = 0; @@ -21,13 +21,13 @@ VIDEO_START( taitoz ) READ16_HANDLER( sci_spriteframe_r ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); return (state->sci_spriteframe << 8); } WRITE16_HANDLER( sci_spriteframe_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); state->sci_spriteframe = (data >> 8) & 0xff; } @@ -148,7 +148,7 @@ confirmed static void contcirc_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; @@ -243,7 +243,7 @@ static void contcirc_draw_sprites_16x8( running_machine *machine, bitmap_t *bitm static void chasehq_draw_sprites_16x16( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; @@ -429,7 +429,7 @@ static void chasehq_draw_sprites_16x16( running_machine *machine, bitmap_t *bitm static void bshark_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; @@ -525,7 +525,7 @@ static void bshark_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap static void sci_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 *spriteram = state->spriteram; int offs, start_offs, data, tilenum, color, flipx, flipy; @@ -630,7 +630,7 @@ static void sci_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, c static void aquajack_draw_sprites_16x8(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int y_offs) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; @@ -725,7 +725,7 @@ static void aquajack_draw_sprites_16x8(running_machine *machine, bitmap_t *bitma static void spacegun_draw_sprites_16x8(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int y_offs) { - taitoz_state *state = (taitoz_state *)machine->driver_data; + taitoz_state *state = machine->driver_data(); UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; @@ -823,7 +823,7 @@ static void spacegun_draw_sprites_16x8(running_machine *machine, bitmap_t *bitma WRITE16_HANDLER( contcirc_out_w ) { - taitoz_state *state = (taitoz_state *)space->machine->driver_data; + taitoz_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -844,7 +844,7 @@ WRITE16_HANDLER( contcirc_out_w ) VIDEO_UPDATE( contcirc ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -871,7 +871,7 @@ VIDEO_UPDATE( contcirc ) VIDEO_UPDATE( chasehq ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -897,7 +897,7 @@ VIDEO_UPDATE( chasehq ) VIDEO_UPDATE( bshark ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -923,7 +923,7 @@ VIDEO_UPDATE( bshark ) VIDEO_UPDATE( sci ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -949,7 +949,7 @@ VIDEO_UPDATE( sci ) VIDEO_UPDATE( aquajack ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -975,7 +975,7 @@ VIDEO_UPDATE( aquajack ) VIDEO_UPDATE( spacegun ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[3]; tc0100scn_tilemap_update(state->tc0100scn); @@ -1001,7 +1001,7 @@ VIDEO_UPDATE( spacegun ) VIDEO_UPDATE( dblaxle ) { - taitoz_state *state = (taitoz_state *)screen->machine->driver_data; + taitoz_state *state = screen->machine->driver_data(); UINT8 layer[5]; UINT16 priority; diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index 2ee7236c110..b1c9bbf1b1d 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -74,7 +74,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - taitoair_state *state = (taitoair_state *)machine->driver_data; + taitoair_state *state = machine->driver_data(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, dy, ex, ey, zx, zy; int ysize; @@ -343,7 +343,7 @@ static void fill_poly( bitmap_t *bitmap, const rectangle *cliprect, const struct VIDEO_UPDATE( taitoair ) { - taitoair_state *state = (taitoair_state *)screen->machine->driver_data; + taitoair_state *state = screen->machine->driver_data(); tc0080vco_tilemap_update(state->tc0080vco); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index 3a0ba743a50..79203fb2183 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -31,7 +31,7 @@ static const gfx_layout taitojc_char_layout = static TILE_GET_INFO( taitojc_tile_info ) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); UINT32 val = state->tile_ram[tile_index]; int color = (val >> 22) & 0xff; @@ -41,21 +41,21 @@ static TILE_GET_INFO( taitojc_tile_info ) READ32_HANDLER(taitojc_tile_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return state->tile_ram[offset]; } READ32_HANDLER(taitojc_char_r) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); return state->char_ram[offset]; } WRITE32_HANDLER(taitojc_tile_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); COMBINE_DATA(state->tile_ram + offset); tilemap_mark_tile_dirty(state->tilemap, offset); @@ -63,7 +63,7 @@ WRITE32_HANDLER(taitojc_tile_w) WRITE32_HANDLER(taitojc_char_w) { - taitojc_state *state = (taitojc_state *)space->machine->driver_data; + taitojc_state *state = space->machine->driver_data(); COMBINE_DATA(state->char_ram + offset); gfx_element_mark_dirty(space->machine->gfx[state->gfx_index], offset/32); @@ -81,7 +81,7 @@ WRITE32_HANDLER(taitojc_char_w) static void draw_object(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT32 w1, UINT32 w2) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); int x, y, width, height, palette; int i, j; int x1, x2, y1, y2; @@ -167,13 +167,13 @@ static void draw_object(running_machine *machine, bitmap_t *bitmap, const rectan static void taitojc_exit(running_machine &machine) { - taitojc_state *state = (taitojc_state *)machine.driver_data; + taitojc_state *state = machine.driver_data(); poly_free(state->poly); } VIDEO_START( taitojc ) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); int width, height; state->poly = poly_alloc(machine, 4000, sizeof(poly_extra_data), POLYFLAG_ALLOW_QUADS); @@ -208,7 +208,7 @@ VIDEO_START( taitojc ) //static int tick = 0; VIDEO_UPDATE( taitojc ) { - taitojc_state *state = (taitojc_state *)screen->machine->driver_data; + taitojc_state *state = screen->machine->driver_data(); int i; #if 0 @@ -412,7 +412,7 @@ static void render_texture_scan(void *dest, INT32 scanline, const poly_extent *e void taitojc_render_polygons(running_machine *machine, UINT16 *polygon_fifo, int length) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); poly_vertex vert[4]; int i; int ptr; @@ -622,7 +622,7 @@ void taitojc_render_polygons(running_machine *machine, UINT16 *polygon_fifo, int void taitojc_clear_frame(running_machine *machine) { - taitojc_state *state = (taitojc_state *)machine->driver_data; + taitojc_state *state = machine->driver_data(); rectangle cliprect; cliprect.min_x = 0; diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index 8e32c61b3ff..3f35b33aa18 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - thunderj_state *state = (thunderj_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + thunderj_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = ((data & 0x200) ? (state->alpha_tile_bank * 0x200) : 0) + (data & 0x1ff); int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; @@ -29,9 +29,9 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - thunderj_state *state = (thunderj_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] & 0xff; + thunderj_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] & 0xff; int code = data1 & 0x7fff; int color = 0x10 + (data2 & 0x0f); SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -41,9 +41,9 @@ static TILE_GET_INFO( get_playfield_tile_info ) static TILE_GET_INFO( get_playfield2_tile_info ) { - thunderj_state *state = (thunderj_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield2[tile_index]; - UINT16 data2 = state->atarigen.playfield_upper[tile_index] >> 8; + thunderj_state *state = machine->driver_data(); + UINT16 data1 = state->playfield2[tile_index]; + UINT16 data2 = state->playfield_upper[tile_index] >> 8; int code = data1 & 0x7fff; int color = data2 & 0x0f; SET_TILE_INFO(0, code, color, (data1 >> 15) & 1); @@ -96,21 +96,21 @@ VIDEO_START( thunderj ) 0, /* resulting value to indicate "special" */ NULL /* callback routine for special entries */ }; - thunderj_state *state = (thunderj_state *)machine->driver_data; + thunderj_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the second playfield */ - state->atarigen.playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); - tilemap_set_transparent_pen(state->atarigen.playfield2_tilemap, 0); + state->playfield2_tilemap = tilemap_create(machine, get_playfield2_tile_info, tilemap_scan_cols, 8,8, 64,64); + tilemap_set_transparent_pen(state->playfield2_tilemap, 0); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); } @@ -148,7 +148,7 @@ void thunderj_mark_high_palette(bitmap_t *bitmap, UINT16 *pf, UINT16 *mo, int x, VIDEO_UPDATE( thunderj ) { - thunderj_state *state = (thunderj_state *)screen->machine->driver_data; + thunderj_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; atarimo_rect_list rectlist; bitmap_t *mobitmap; @@ -156,14 +156,14 @@ VIDEO_UPDATE( thunderj ) /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0x00); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 1, 0x01); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 2, 0x02); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 3, 0x03); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 0, 0x80); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 1, 0x84); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 2, 0x88); - tilemap_draw(bitmap, cliprect, state->atarigen.playfield2_tilemap, 3, 0x8c); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0x00); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 1, 0x01); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 2, 0x02); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 3, 0x03); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 0, 0x80); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 1, 0x84); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 2, 0x88); + tilemap_draw(bitmap, cliprect, state->playfield2_tilemap, 3, 0x8c); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -262,7 +262,7 @@ VIDEO_UPDATE( thunderj ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c index d1c6189abb3..389151e48fc 100644 --- a/src/mame/video/thunderx.c +++ b/src/mame/video/thunderx.c @@ -10,7 +10,7 @@ void thunderx_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); *code |= ((*color & 0x1f) << 8) | (bank << 13); *color = state->layer_colorbase[layer] + ((*color & 0xe0) >> 5); } @@ -24,7 +24,7 @@ void thunderx_tile_callback( running_machine *machine, int layer, int bank, int void thunderx_sprite_callback( running_machine *machine, int *code,int *color, int *priority_mask, int *shadow ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); /* Sprite priority 1 means appear behind background, used only to mask sprites */ /* in the foreground */ @@ -50,7 +50,7 @@ void thunderx_sprite_callback( running_machine *machine, int *code,int *color, i VIDEO_START( scontra ) { - thunderx_state *state = (thunderx_state *)machine->driver_data; + thunderx_state *state = machine->driver_data(); state->layer_colorbase[0] = 48; state->layer_colorbase[1] = 0; state->layer_colorbase[2] = 16; @@ -68,7 +68,7 @@ VIDEO_START( scontra ) VIDEO_UPDATE( scontra ) { - thunderx_state *state = (thunderx_state *)screen->machine->driver_data; + thunderx_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index 9bdeed2afdc..9138df49148 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -91,7 +91,7 @@ PALETTE_INIT( timeplt ) static TILE_GET_INFO( get_tile_info ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + 8 * (attr & 0x20); int color = attr & 0x1f; @@ -103,7 +103,7 @@ static TILE_GET_INFO( get_tile_info ) static TILE_GET_INFO( get_chkun_tile_info ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + ((attr & 0x60) << 3); int color = attr & 0x1f; @@ -123,13 +123,13 @@ static TILE_GET_INFO( get_chkun_tile_info ) VIDEO_START( timeplt ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } VIDEO_START( chkun ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_chkun_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } @@ -143,7 +143,7 @@ VIDEO_START( chkun ) WRITE8_HANDLER( timeplt_videoram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -151,7 +151,7 @@ WRITE8_HANDLER( timeplt_videoram_w ) WRITE8_HANDLER( timeplt_colorram_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -178,7 +178,7 @@ READ8_HANDLER( timeplt_scanline_r ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -211,7 +211,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( timeplt ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index ff91f9a7d94..23af13d8a3f 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -4,7 +4,7 @@ static TILE_GET_INFO( glfgreat_get_roz_tile_info ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); UINT8 *rom = memory_region(machine, "user1"); int code; @@ -35,7 +35,7 @@ static TILE_GET_INFO( prmrsocr_get_roz_tile_info ) void mia_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); *flags = (*color & 0x04) ? TILE_FLIPX : 0; if (layer == 0) { @@ -51,7 +51,7 @@ void mia_tile_callback( running_machine *machine, int layer, int bank, int *code void cuebrick_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); if ((k052109_get_rmrd_line(state->k052109) == CLEAR_LINE) && (layer == 0)) { @@ -67,14 +67,14 @@ void cuebrick_tile_callback( running_machine *machine, int layer, int bank, int void tmnt_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); *code |= ((*color & 0x03) << 8) | ((*color & 0x10) << 6) | ((*color & 0x0c) << 9) | (bank << 13); *color = state->layer_colorbase[layer] + ((*color & 0xe0) >> 5); } void ssbl_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); if (layer == 0) { *code |= ((*color & 0x03) << 8) | ((*color & 0x10) << 6) | ((*color & 0x0c) << 9) | (bank << 13); @@ -90,7 +90,7 @@ void ssbl_tile_callback( running_machine *machine, int layer, int bank, int *cod void blswhstl_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); /* (color & 0x02) is flip y handled internally by the 052109 */ *code |= ((*color & 0x01) << 8) | ((*color & 0x10) << 5) | ((*color & 0x0c) << 8) | (bank << 12) | state->blswhstl_rombank << 14; @@ -107,20 +107,20 @@ void blswhstl_tile_callback( running_machine *machine, int layer, int bank, int void mia_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); *color = state->sprite_colorbase + (*color & 0x0f); } void tmnt_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); *code |= (*color & 0x10) << 9; *color = state->sprite_colorbase + (*color & 0x0f); } void punkshot_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask, int *shadow ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -137,7 +137,7 @@ void punkshot_sprite_callback( running_machine *machine, int *code, int *color, void thndrx2_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask, int *shadow ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -160,7 +160,7 @@ void thndrx2_sprite_callback( running_machine *machine, int *code, int *color, i void lgtnfght_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -176,7 +176,7 @@ void lgtnfght_sprite_callback( running_machine *machine, int *code, int *color, void blswhstl_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); #if 0 if (input_code_pressed(machine, KEYCODE_Q) && (*color & 0x20)) *color = rand(); if (input_code_pressed(machine, KEYCODE_W) && (*color & 0x40)) *color = rand(); @@ -197,7 +197,7 @@ if (input_code_pressed(machine, KEYCODE_E) && (*color & 0x80)) *color = rand(); void prmrsocr_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); int pri = 0x20 | ((*color & 0x60) >> 2); if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -223,7 +223,7 @@ void prmrsocr_sprite_callback( running_machine *machine, int *code, int *color, VIDEO_START( cuebrick ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; state->layer_colorbase[1] = 32; state->layer_colorbase[2] = 40; @@ -232,7 +232,7 @@ VIDEO_START( cuebrick ) VIDEO_START( mia ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; state->layer_colorbase[1] = 32; state->layer_colorbase[2] = 40; @@ -244,7 +244,7 @@ VIDEO_START( mia ) VIDEO_START( tmnt ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->layer_colorbase[0] = 0; state->layer_colorbase[1] = 32; state->layer_colorbase[2] = 40; @@ -258,7 +258,7 @@ VIDEO_START( tmnt ) VIDEO_START( lgtnfght ) /* also tmnt2, ssriders */ { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); k05324x_set_z_rejection(state->k053245, 0); @@ -272,7 +272,7 @@ VIDEO_START( lgtnfght ) /* also tmnt2, ssriders */ VIDEO_START( glfgreat ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->roz_tilemap = tilemap_create(machine, glfgreat_get_roz_tile_info, tilemap_scan_rows, 16, 16, 512, 512); tilemap_set_transparent_pen(state->roz_tilemap,0); @@ -287,7 +287,7 @@ VIDEO_START( glfgreat ) VIDEO_START( prmrsocr ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->roz_tilemap = tilemap_create(machine, prmrsocr_get_roz_tile_info, tilemap_scan_rows, 16, 16, 512, 256); tilemap_set_transparent_pen(state->roz_tilemap,0); @@ -300,7 +300,7 @@ VIDEO_START( prmrsocr ) VIDEO_START( blswhstl ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); state->blswhstl_rombank = -1; state_save_register_global(machine, state->blswhstl_rombank); @@ -326,7 +326,7 @@ WRITE16_HANDLER( tmnt_paletteram_word_w ) WRITE16_HANDLER( tmnt_0a0000_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -352,7 +352,7 @@ WRITE16_HANDLER( tmnt_0a0000_w ) WRITE16_HANDLER( punkshot_0a0020_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -372,7 +372,7 @@ WRITE16_HANDLER( punkshot_0a0020_w ) WRITE16_HANDLER( lgtnfght_0a0018_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -393,7 +393,7 @@ WRITE16_HANDLER( lgtnfght_0a0018_w ) WRITE16_HANDLER( blswhstl_700300_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -418,7 +418,7 @@ WRITE16_HANDLER( blswhstl_700300_w ) READ16_HANDLER( glfgreat_rom_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (state->glfgreat_roz_rom_mode) return memory_region(space->machine, "gfx3")[state->glfgreat_roz_char_bank * 0x80000 + offset]; @@ -433,7 +433,7 @@ READ16_HANDLER( glfgreat_rom_r ) WRITE16_HANDLER( glfgreat_122000_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -466,7 +466,7 @@ WRITE16_HANDLER( glfgreat_122000_w ) WRITE16_HANDLER( ssriders_eeprom_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -487,7 +487,7 @@ WRITE16_HANDLER( ssriders_eeprom_w ) WRITE16_HANDLER( ssriders_1c0300_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -505,7 +505,7 @@ WRITE16_HANDLER( ssriders_1c0300_w ) WRITE16_HANDLER( prmrsocr_122000_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -529,7 +529,7 @@ WRITE16_HANDLER( prmrsocr_122000_w ) READ16_HANDLER( prmrsocr_rom_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if(state->glfgreat_roz_char_bank) return memory_region(space->machine, "gfx3")[offset]; @@ -542,7 +542,7 @@ READ16_HANDLER( prmrsocr_rom_r ) WRITE16_HANDLER( tmnt_priority_w ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -578,7 +578,7 @@ WRITE16_HANDLER( tmnt_priority_w ) VIDEO_UPDATE( mia ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); @@ -593,7 +593,7 @@ VIDEO_UPDATE( mia ) VIDEO_UPDATE( tmnt ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); k052109_tilemap_update(state->k052109); @@ -609,7 +609,7 @@ VIDEO_UPDATE( tmnt ) VIDEO_UPDATE( punkshot ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); state->sprite_colorbase = k053251_get_palette_index(state->k053251, K053251_CI1); state->layer_colorbase[0] = k053251_get_palette_index(state->k053251, K053251_CI2); @@ -639,7 +639,7 @@ VIDEO_UPDATE( punkshot ) VIDEO_UPDATE( lgtnfght ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); int bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); @@ -672,7 +672,7 @@ VIDEO_UPDATE( lgtnfght ) READ16_HANDLER( glfgreat_ball_r ) { - tmnt_state *state = (tmnt_state *)space->machine->driver_data; + tmnt_state *state = space->machine->driver_data(); #ifdef MAME_DEBUG popmessage("%04x", state->glfgreat_pixel); @@ -686,7 +686,7 @@ popmessage("%04x", state->glfgreat_pixel); VIDEO_UPDATE( glfgreat ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); int bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); @@ -740,7 +740,7 @@ VIDEO_UPDATE( glfgreat ) VIDEO_UPDATE( tmnt2 ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); double brt; int i, newdim, newen, cb, ce; @@ -793,7 +793,7 @@ VIDEO_UPDATE( tmnt2 ) VIDEO_UPDATE( thndrx2 ) { - tmnt_state *state = (tmnt_state *)screen->machine->driver_data; + tmnt_state *state = screen->machine->driver_data(); int bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI0); @@ -833,6 +833,6 @@ VIDEO_UPDATE( thndrx2 ) VIDEO_EOF( blswhstl ) { - tmnt_state *state = (tmnt_state *)machine->driver_data; + tmnt_state *state = machine->driver_data(); k053245_clear_buffer(state->k053245); } diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c index 69ad1080359..e639a21c248 100644 --- a/src/mame/video/tnzs.c +++ b/src/mame/video/tnzs.c @@ -45,7 +45,7 @@ PALETTE_INIT( arknoid2 ) static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 *m ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); int x, y, column, tot, transpen; int scrollx, scrolly; UINT32 upperbits; @@ -129,7 +129,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r static void draw_foreground( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT8 *char_pointer, UINT8 *x_pointer, UINT8 *y_pointer, UINT8 *ctrl_pointer, UINT8 *color_pointer) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); int i; int ctrl2 = state->objctrl[1]; @@ -180,7 +180,7 @@ static void draw_foreground( running_machine *machine, bitmap_t *bitmap, const r VIDEO_UPDATE( tnzs ) { - tnzs_state *state = (tnzs_state *)screen->machine->driver_data; + tnzs_state *state = screen->machine->driver_data(); /* If the byte at f300 has bit 6 set, flip the screen (I'm not 100% sure about this) */ state->screenflip = (state->objctrl[0] & 0x40) >> 6; @@ -204,7 +204,7 @@ VIDEO_UPDATE( tnzs ) VIDEO_EOF( tnzs ) { - tnzs_state *state = (tnzs_state *)machine->driver_data; + tnzs_state *state = machine->driver_data(); int ctrl2 = state->objctrl[1]; if (~ctrl2 & 0x20) { diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c index ee1fd24f8b6..749a87b84b5 100644 --- a/src/mame/video/toobin.c +++ b/src/mame/video/toobin.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - toobin_state *state = (toobin_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + toobin_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 12) & 0x0f; SET_TILE_INFO(2, code, color, (data >> 10) & 1); @@ -28,9 +28,9 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - toobin_state *state = (toobin_state *)machine->driver_data; - UINT16 data1 = state->atarigen.playfield[tile_index * 2]; - UINT16 data2 = state->atarigen.playfield[tile_index * 2 + 1]; + toobin_state *state = machine->driver_data(); + UINT16 data1 = state->playfield[tile_index * 2]; + UINT16 data2 = state->playfield[tile_index * 2 + 1]; int code = data2 & 0x3fff; int color = data1 & 0x0f; SET_TILE_INFO(0, code, color, TILE_FLIPYX(data2 >> 14)); @@ -83,17 +83,17 @@ VIDEO_START( toobin ) 0, /* resulting value to indicate "special" */ 0 /* callback routine for special entries */ }; - toobin_state *state = (toobin_state *)machine->driver_data; + toobin_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 128,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,48); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* allocate a playfield bitmap for rendering */ state->pfbitmap = auto_bitmap_alloc(machine, machine->primary_screen->width(), machine->primary_screen->height(), BITMAP_FORMAT_INDEXED16); @@ -111,7 +111,7 @@ VIDEO_START( toobin ) WRITE16_HANDLER( toobin_paletteram_w ) { - toobin_state *state = (toobin_state *)space->machine->driver_data; + toobin_state *state = space->machine->driver_data(); int newword; COMBINE_DATA(&space->machine->generic.paletteram.u16[offset]); @@ -137,7 +137,7 @@ WRITE16_HANDLER( toobin_paletteram_w ) WRITE16_HANDLER( toobin_intensity_w ) { - toobin_state *state = (toobin_state *)space->machine->driver_data; + toobin_state *state = space->machine->driver_data(); int i; if (ACCESSING_BITS_0_7) @@ -160,8 +160,8 @@ WRITE16_HANDLER( toobin_intensity_w ) WRITE16_HANDLER( toobin_xscroll_w ) { - toobin_state *state = (toobin_state *)space->machine->driver_data; - UINT16 oldscroll = *state->atarigen.xscroll; + toobin_state *state = space->machine->driver_data(); + UINT16 oldscroll = *state->xscroll; UINT16 newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -170,18 +170,18 @@ WRITE16_HANDLER( toobin_xscroll_w ) space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* update the playfield scrolling - hscroll is clocked on the following scanline */ - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, newscroll >> 6); + tilemap_set_scrollx(state->playfield_tilemap, 0, newscroll >> 6); atarimo_set_xscroll(0, newscroll >> 6); /* update the data */ - *state->atarigen.xscroll = newscroll; + *state->xscroll = newscroll; } WRITE16_HANDLER( toobin_yscroll_w ) { - toobin_state *state = (toobin_state *)space->machine->driver_data; - UINT16 oldscroll = *state->atarigen.yscroll; + toobin_state *state = space->machine->driver_data(); + UINT16 oldscroll = *state->yscroll; UINT16 newscroll = oldscroll; COMBINE_DATA(&newscroll); @@ -190,11 +190,11 @@ WRITE16_HANDLER( toobin_yscroll_w ) space->machine->primary_screen->update_partial(space->machine->primary_screen->vpos()); /* if bit 4 is zero, the scroll value is clocked in right away */ - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, newscroll >> 6); + tilemap_set_scrolly(state->playfield_tilemap, 0, newscroll >> 6); atarimo_set_yscroll(0, (newscroll >> 6) & 0x1ff); /* update the data */ - *state->atarigen.yscroll = newscroll; + *state->yscroll = newscroll; } @@ -229,7 +229,7 @@ WRITE16_HANDLER( toobin_slip_w ) VIDEO_UPDATE( toobin ) { - toobin_state *state = (toobin_state *)screen->machine->driver_data; + toobin_state *state = screen->machine->driver_data(); bitmap_t *priority_bitmap = screen->machine->priority_bitmap; const rgb_t *palette = palette_entry_list_adjusted(screen->machine->palette); atarimo_rect_list rectlist; @@ -238,10 +238,10 @@ VIDEO_UPDATE( toobin ) /* draw the playfield */ bitmap_fill(priority_bitmap, cliprect, 0); - tilemap_draw(state->pfbitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); - tilemap_draw(state->pfbitmap, cliprect, state->atarigen.playfield_tilemap, 1, 1); - tilemap_draw(state->pfbitmap, cliprect, state->atarigen.playfield_tilemap, 2, 2); - tilemap_draw(state->pfbitmap, cliprect, state->atarigen.playfield_tilemap, 3, 3); + tilemap_draw(state->pfbitmap, cliprect, state->playfield_tilemap, 0, 0); + tilemap_draw(state->pfbitmap, cliprect, state->playfield_tilemap, 1, 1); + tilemap_draw(state->pfbitmap, cliprect, state->playfield_tilemap, 2, 2); + tilemap_draw(state->pfbitmap, cliprect, state->playfield_tilemap, 3, 3); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -274,6 +274,6 @@ VIDEO_UPDATE( toobin ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c index 4b7ed998d61..3d6e7e6396c 100644 --- a/src/mame/video/topspeed.c +++ b/src/mame/video/topspeed.c @@ -28,7 +28,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - topspeed_state *state = (topspeed_state *)machine->driver_data; + topspeed_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, map_offset, x, y, curx, cury, sprite_chunk; UINT16 *spritemap = state->spritemap; @@ -111,7 +111,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( topspeed ) { - topspeed_state *state = (topspeed_state *)screen->machine->driver_data; + topspeed_state *state = screen->machine->driver_data(); UINT8 layer[4]; #ifdef MAME_DEBUG diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index 6dfbaea8da0..f96b75f8f1b 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -96,7 +96,7 @@ static TILEMAP_MAPPER( tilemap_scan ) static TILE_GET_INFO( get_tile_info ) { - toypop_state *state = (toypop_state *)machine->driver_data; + toypop_state *state = machine->driver_data(); UINT8 attr = state->videoram[tile_index + 0x400]; SET_TILE_INFO( 0, @@ -115,7 +115,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( toypop ) { - toypop_state *state = (toypop_state *)machine->driver_data; + toypop_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine,get_tile_info,tilemap_scan,8,8,36,28); tilemap_set_transparent_pen(state->bg_tilemap, 0); @@ -131,14 +131,14 @@ VIDEO_START( toypop ) WRITE8_HANDLER( toypop_videoram_w ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset & 0x3ff); } WRITE8_HANDLER( toypop_palettebank_w ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); if (state->palettebank != (offset & 1)) { state->palettebank = offset & 1; @@ -148,13 +148,13 @@ WRITE8_HANDLER( toypop_palettebank_w ) WRITE16_HANDLER( toypop_flipscreen_w ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); state->bitmapflip = offset & 1; } READ16_HANDLER( toypop_merged_background_r ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); int data1, data2; // 0x0a0b0c0d is read as 0xabcd @@ -165,7 +165,7 @@ READ16_HANDLER( toypop_merged_background_r ) WRITE16_HANDLER( toypop_merged_background_w ) { - toypop_state *state = (toypop_state *)space->machine->driver_data; + toypop_state *state = space->machine->driver_data(); // 0xabcd is written as 0x0a0b0c0d in the background image if (ACCESSING_BITS_8_15) @@ -177,7 +177,7 @@ WRITE16_HANDLER( toypop_merged_background_w ) static void draw_background(running_machine *machine, bitmap_t *bitmap) { - toypop_state *state = (toypop_state *)machine->driver_data; + toypop_state *state = machine->driver_data(); int offs, x, y; pen_t pen_base = 0x300 + 0x10*state->palettebank; @@ -225,7 +225,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap) VIDEO_UPDATE( toypop ) { - toypop_state *state = (toypop_state *)screen->machine->driver_data; + toypop_state *state = screen->machine->driver_data(); draw_background(screen->machine, bitmap); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); mappy_draw_sprites(screen->machine, bitmap, cliprect, state->spriteram, -31, -8, 0xff); diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c index c1f1882cf53..43349da84a3 100644 --- a/src/mame/video/trackfld.c +++ b/src/mame/video/trackfld.c @@ -91,14 +91,14 @@ PALETTE_INIT( trackfld ) WRITE8_HANDLER( trackfld_videoram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } WRITE8_HANDLER( trackfld_colorram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); } @@ -114,7 +114,7 @@ WRITE8_HANDLER( trackfld_flipscreen_w ) WRITE8_HANDLER( atlantol_gfxbank_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); if (data & 1) { /* male / female sprites switch */ @@ -162,7 +162,7 @@ WRITE8_HANDLER( atlantol_gfxbank_w ) static TILE_GET_INFO( get_bg_tile_info ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); int attr = state->colorram[tile_index]; int code = state->videoram[tile_index] + 4 * (attr & 0xc0); int color = attr & 0x0f; @@ -176,14 +176,14 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( trackfld ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_scroll_rows(state->bg_tilemap, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -227,7 +227,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( trackfld ) { - trackfld_state *state = (trackfld_state *)screen->machine->driver_data; + trackfld_state *state = screen->machine->driver_data(); int row, scrollx; for (row = 0; row < 32; row++) diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index 2d253c75f67..8b2a1d503eb 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -197,7 +197,7 @@ PALETTE_INIT( shtrider ) static TILE_GET_INFO( get_tile_info ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); UINT8 attr = state->videoram[2 * tile_index + 1]; int flags = TILE_FLIPXY((attr & 0x30) >> 4); @@ -220,7 +220,7 @@ static TILE_GET_INFO( get_tile_info ) VIDEO_START( travrusa ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); state_save_register_global_array(machine, state->scrollx); @@ -242,7 +242,7 @@ VIDEO_START( travrusa ) WRITE8_HANDLER( travrusa_videoram_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } @@ -250,7 +250,7 @@ WRITE8_HANDLER( travrusa_videoram_w ) static void set_scroll( running_machine *machine ) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int i; for (i = 0; i <= 2; i++) @@ -261,14 +261,14 @@ static void set_scroll( running_machine *machine ) WRITE8_HANDLER( travrusa_scroll_x_low_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->scrollx[0] = data; set_scroll(space->machine); } WRITE8_HANDLER( travrusa_scroll_x_high_w ) { - irem_z80_state *state = (irem_z80_state *)space->machine->driver_data; + irem_z80_state *state = space->machine->driver_data(); state->scrollx[1] = data; set_scroll(space->machine); } @@ -295,7 +295,7 @@ WRITE8_HANDLER( travrusa_flipscreen_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - irem_z80_state *state = (irem_z80_state *)machine->driver_data; + irem_z80_state *state = machine->driver_data(); int offs; static const rectangle spritevisiblearea = { @@ -342,7 +342,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( travrusa ) { - irem_z80_state *state = (irem_z80_state *)screen->machine->driver_data; + irem_z80_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER1, 0); draw_sprites(screen->machine, bitmap,cliprect); tilemap_draw(bitmap, cliprect, state->bg_tilemap, TILEMAP_DRAW_LAYER0, 0); diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index 0646c3a3fa5..22fc6d118e7 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -21,7 +21,7 @@ to switch between 8*8 tiles and 16*16 tiles. static void tumblepb_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -87,7 +87,7 @@ static void tumblepb_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void jumpkids_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -154,7 +154,7 @@ static void jumpkids_draw_sprites( running_machine *machine, bitmap_t *bitmap, c static void fncywld_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -221,7 +221,7 @@ static void fncywld_draw_sprites( running_machine *machine, bitmap_t *bitmap, co WRITE16_HANDLER( bcstory_tilebank_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); state->tilebank = data; tilemap_mark_all_tiles_dirty(state->pf1_tilemap); @@ -231,7 +231,7 @@ WRITE16_HANDLER( bcstory_tilebank_w ) WRITE16_HANDLER( chokchok_tilebank_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); state->tilebank = data << 1; tilemap_mark_all_tiles_dirty(state->pf1_tilemap); @@ -241,7 +241,7 @@ WRITE16_HANDLER( chokchok_tilebank_w ) WRITE16_HANDLER( wlstar_tilebank_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); /* it just writes 0000 or ffff */ state->tilebank = data & 0x4000; @@ -253,7 +253,7 @@ WRITE16_HANDLER( wlstar_tilebank_w ) WRITE16_HANDLER( suprtrio_tilebank_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); state->tilebank = data << 14; // shift it here, makes using bcstory_tilebank easier tilemap_mark_all_tiles_dirty(state->pf1_tilemap); @@ -264,7 +264,7 @@ WRITE16_HANDLER( suprtrio_tilebank_w ) WRITE16_HANDLER( tumblepb_pf1_data_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf1_data[offset]); tilemap_mark_tile_dirty(state->pf1_tilemap, offset); @@ -273,7 +273,7 @@ WRITE16_HANDLER( tumblepb_pf1_data_w ) WRITE16_HANDLER( tumblepb_pf2_data_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf2_data[offset]); tilemap_mark_tile_dirty(state->pf2_tilemap, offset); @@ -284,7 +284,7 @@ WRITE16_HANDLER( tumblepb_pf2_data_w ) WRITE16_HANDLER( fncywld_pf1_data_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf1_data[offset]); tilemap_mark_tile_dirty(state->pf1_tilemap, offset / 2); @@ -293,7 +293,7 @@ WRITE16_HANDLER( fncywld_pf1_data_w ) WRITE16_HANDLER( fncywld_pf2_data_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf2_data[offset]); tilemap_mark_tile_dirty(state->pf2_tilemap, offset / 2); @@ -301,14 +301,14 @@ WRITE16_HANDLER( fncywld_pf2_data_w ) WRITE16_HANDLER( tumblepb_control_0_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->control_0[offset]); } WRITE16_HANDLER( pangpang_pf1_data_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf1_data[offset]); tilemap_mark_tile_dirty(state->pf1_tilemap, offset / 2); @@ -317,7 +317,7 @@ WRITE16_HANDLER( pangpang_pf1_data_w ) WRITE16_HANDLER( pangpang_pf2_data_w ) { - tumbleb_state *state = (tumbleb_state *)space->machine->driver_data; + tumbleb_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pf2_data[offset]); tilemap_mark_tile_dirty(state->pf2_tilemap, offset / 2); @@ -336,7 +336,7 @@ static TILEMAP_MAPPER( tumblep_scan ) INLINE void get_bg_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int gfx_bank, UINT16 *gfx_base) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = gfx_base[tile_index]; SET_TILE_INFO( @@ -346,12 +346,12 @@ INLINE void get_bg_tile_info( running_machine *machine, tile_data *tileinfo, int 0); } -static TILE_GET_INFO( get_bg1_tile_info ) { tumbleb_state *state = (tumbleb_state *)machine->driver_data; get_bg_tile_info(machine, tileinfo, tile_index, 2, state->pf1_data); } -static TILE_GET_INFO( get_bg2_tile_info ) { tumbleb_state *state = (tumbleb_state *)machine->driver_data; get_bg_tile_info(machine, tileinfo, tile_index, 1, state->pf2_data); } +static TILE_GET_INFO( get_bg1_tile_info ) { tumbleb_state *state = machine->driver_data(); get_bg_tile_info(machine, tileinfo, tile_index, 2, state->pf1_data); } +static TILE_GET_INFO( get_bg2_tile_info ) { tumbleb_state *state = machine->driver_data(); get_bg_tile_info(machine, tileinfo, tile_index, 1, state->pf2_data); } static TILE_GET_INFO( get_fg_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf1_data[tile_index]; SET_TILE_INFO( @@ -373,12 +373,12 @@ INLINE void get_fncywld_bg_tile_info( running_machine *machine, tile_data *tilei 0); } -static TILE_GET_INFO( get_fncywld_bg1_tile_info ) { tumbleb_state *state = (tumbleb_state *)machine->driver_data; get_fncywld_bg_tile_info(machine, tileinfo, tile_index, 2, state->pf1_data); } -static TILE_GET_INFO( get_fncywld_bg2_tile_info ) { tumbleb_state *state = (tumbleb_state *)machine->driver_data; get_fncywld_bg_tile_info(machine, tileinfo, tile_index, 1, state->pf2_data); } +static TILE_GET_INFO( get_fncywld_bg1_tile_info ) { tumbleb_state *state = machine->driver_data(); get_fncywld_bg_tile_info(machine, tileinfo, tile_index, 2, state->pf1_data); } +static TILE_GET_INFO( get_fncywld_bg2_tile_info ) { tumbleb_state *state = machine->driver_data(); get_fncywld_bg_tile_info(machine, tileinfo, tile_index, 1, state->pf2_data); } static TILE_GET_INFO( get_fncywld_fg_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf1_data[tile_index * 2]; int attr = state->pf1_data[tile_index * 2 + 1]; @@ -393,7 +393,7 @@ static TILE_GET_INFO( get_fncywld_fg_tile_info ) /* jump pop */ static TILE_GET_INFO( get_jumppop_bg1_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf1_data[tile_index]; SET_TILE_INFO( @@ -405,7 +405,7 @@ static TILE_GET_INFO( get_jumppop_bg1_tile_info ) static TILE_GET_INFO( get_jumppop_bg2_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf2_data[tile_index]; SET_TILE_INFO( @@ -417,7 +417,7 @@ static TILE_GET_INFO( get_jumppop_bg2_tile_info ) static TILE_GET_INFO( get_jumppop_bg2_alt_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf2_data[tile_index]; SET_TILE_INFO( @@ -430,7 +430,7 @@ static TILE_GET_INFO( get_jumppop_bg2_alt_tile_info ) static TILE_GET_INFO( get_jumppop_fg_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf1_data[tile_index]; SET_TILE_INFO( @@ -465,12 +465,12 @@ INLINE void pangpang_get_bg2x_tile_info( running_machine *machine, tile_data *ti } -static TILE_GET_INFO( pangpang_get_bg1_tile_info ) { tumbleb_state *state = (tumbleb_state *)machine->driver_data; pangpang_get_bg_tile_info(machine, tileinfo, tile_index, 2, state->pf1_data); } -static TILE_GET_INFO( pangpang_get_bg2_tile_info ) { tumbleb_state *state = (tumbleb_state *)machine->driver_data; pangpang_get_bg2x_tile_info(machine, tileinfo, tile_index, 1, state->pf2_data); } +static TILE_GET_INFO( pangpang_get_bg1_tile_info ) { tumbleb_state *state = machine->driver_data(); pangpang_get_bg_tile_info(machine, tileinfo, tile_index, 2, state->pf1_data); } +static TILE_GET_INFO( pangpang_get_bg2_tile_info ) { tumbleb_state *state = machine->driver_data(); pangpang_get_bg2x_tile_info(machine, tileinfo, tile_index, 1, state->pf2_data); } static TILE_GET_INFO( pangpang_get_fg_tile_info ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); int data = state->pf1_data[tile_index * 2 + 1]; int attr = state->pf1_data[tile_index * 2]; @@ -484,7 +484,7 @@ static TILE_GET_INFO( pangpang_get_fg_tile_info ) static STATE_POSTLOAD( tumbleb_tilemap_redraw ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); tilemap_mark_all_tiles_dirty(state->pf1_tilemap); tilemap_mark_all_tiles_dirty(state->pf1_alt_tilemap); @@ -495,7 +495,7 @@ static STATE_POSTLOAD( tumbleb_tilemap_redraw ) VIDEO_START( pangpang ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, pangpang_get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->pf1_alt_tilemap = tilemap_create(machine, pangpang_get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); @@ -513,7 +513,7 @@ VIDEO_START( pangpang ) VIDEO_START( tumblepb ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); @@ -530,7 +530,7 @@ VIDEO_START( tumblepb ) VIDEO_START( sdfight ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 64); // 64*64 to prevent bad tilemap wrapping? - check real behavior state->pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); @@ -548,7 +548,7 @@ VIDEO_START( sdfight ) VIDEO_START( fncywld ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_fncywld_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->pf1_alt_tilemap = tilemap_create(machine, get_fncywld_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); @@ -565,7 +565,7 @@ VIDEO_START( fncywld ) VIDEO_START( jumppop ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_jumppop_fg_tile_info, tilemap_scan_rows, 8, 8, 128, 64); state->pf1_alt_tilemap = tilemap_create(machine, get_jumppop_bg1_tile_info, tilemap_scan_rows, 16, 16, 64, 64); @@ -589,7 +589,7 @@ VIDEO_START( jumppop ) VIDEO_START( suprtrio ) { - tumbleb_state *state = (tumbleb_state *)machine->driver_data; + tumbleb_state *state = machine->driver_data(); state->pf1_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->pf1_alt_tilemap = tilemap_create(machine, get_bg1_tile_info, tumblep_scan, 16, 16, 64, 32); @@ -605,7 +605,7 @@ VIDEO_START( suprtrio ) VIDEO_UPDATE( tumblepb ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -641,7 +641,7 @@ VIDEO_UPDATE( tumblepb ) VIDEO_UPDATE( jumpkids ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -677,7 +677,7 @@ VIDEO_UPDATE( jumpkids ) VIDEO_UPDATE( semicom ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -713,7 +713,7 @@ VIDEO_UPDATE( semicom ) VIDEO_UPDATE( semicom_altoffsets ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offsx, offsy, offsx2; state->flipscreen = state->control_0[0] & 0x80; @@ -742,7 +742,7 @@ VIDEO_UPDATE( semicom_altoffsets ) VIDEO_UPDATE( bcstory ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -780,7 +780,7 @@ VIDEO_UPDATE( bcstory ) VIDEO_UPDATE( semibase ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -809,7 +809,7 @@ VIDEO_UPDATE( semibase ) VIDEO_UPDATE( sdfight ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -839,7 +839,7 @@ VIDEO_UPDATE( sdfight ) VIDEO_UPDATE( fncywld ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; @@ -876,7 +876,7 @@ VIDEO_UPDATE( fncywld ) VIDEO_UPDATE( jumppop ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); // bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); @@ -908,7 +908,7 @@ VIDEO_UPDATE( jumppop ) VIDEO_UPDATE( suprtrio ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->pf1_alt_tilemap, 0, -state->control[1] - 6); tilemap_set_scrolly(state->pf1_alt_tilemap, 0, -state->control[2]); @@ -936,7 +936,7 @@ popmessage("%04x %04x %04x %04x %04x %04x %04x %04x", VIDEO_UPDATE( pangpang ) { - tumbleb_state *state = (tumbleb_state *)screen->machine->driver_data; + tumbleb_state *state = screen->machine->driver_data(); int offs, offs2; state->flipscreen = state->control_0[0] & 0x80; diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c index bfea0835a74..96a0ec0e024 100644 --- a/src/mame/video/tumblep.c +++ b/src/mame/video/tumblep.c @@ -19,7 +19,7 @@ to switch between 8*8 tiles and 16*16 tiles. static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - tumblep_state *state = (tumblep_state *)machine->driver_data; + tumblep_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs; @@ -86,7 +86,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( tumblep ) { - tumblep_state *state = (tumblep_state *)screen->machine->driver_data; + tumblep_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); flip_screen_set(screen->machine, BIT(flip, 7)); diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index f631864edb7..f8cce5839a3 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -50,7 +50,7 @@ WRITE8_HANDLER( tunhunt_videoram_w ) { - tunhunt_state *state = (tunhunt_state *)space->machine->driver_data; + tunhunt_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -58,7 +58,7 @@ WRITE8_HANDLER( tunhunt_videoram_w ) static TILE_GET_INFO( get_fg_tile_info ) { - tunhunt_state *state = (tunhunt_state *)machine->driver_data; + tunhunt_state *state = machine->driver_data(); int attr = state->videoram[tile_index]; int code = attr & 0x3f; int color = attr >> 6; @@ -74,7 +74,7 @@ VIDEO_START( tunhunt ) We keep track of dirty lines and cache the expanded bitmap. With max RLE expansion, bitmap size is 256x64. */ - tunhunt_state *state = (tunhunt_state *)machine->driver_data; + tunhunt_state *state = machine->driver_data(); machine->generic.tmpbitmap = auto_bitmap_alloc(machine, 256, 64, machine->primary_screen->format()); @@ -213,7 +213,7 @@ static void draw_motion_object(running_machine *machine, bitmap_t *bitmap, const * always 0x00? */ - tunhunt_state *state = (tunhunt_state *)machine->driver_data; + tunhunt_state *state = machine->driver_data(); bitmap_t *tmpbitmap = machine->generic.tmpbitmap; UINT8 *spriteram = state->spriteram; UINT8 *tunhunt_ram = state->workram; @@ -292,7 +292,7 @@ static void draw_box(running_machine *machine, bitmap_t *bitmap, const rectangle 1280: 07 03 00 01 07 06 04 05 02 07 03 00 09 0a 0b 0c palette select ->hue 06 02 ff 60 06 05 03 04 01 06 02 ff d2 00 c2 ff */ - tunhunt_state *state = (tunhunt_state *)machine->driver_data; + tunhunt_state *state = machine->driver_data(); UINT8 *tunhunt_ram = state->workram; int span,x,y; int color; @@ -378,7 +378,7 @@ static void draw_shell(running_machine *machine, VIDEO_UPDATE( tunhunt ) { - tunhunt_state *state = (tunhunt_state *)screen->machine->driver_data; + tunhunt_state *state = screen->machine->driver_data(); set_pens(screen->machine); draw_box(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index ddd65349292..1325850e3b4 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -167,7 +167,7 @@ PALETTE_INIT( buckrog ) static TILE_GET_INFO( get_fg_tile_info ) { - turbo_state *state = (turbo_state *)machine->driver_data; + turbo_state *state = machine->driver_data(); int code = state->videoram[tile_index]; SET_TILE_INFO(0, code, code >> 2, 0); } @@ -175,7 +175,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( turbo ) { - turbo_state *state = (turbo_state *)machine->driver_data; + turbo_state *state = machine->driver_data(); /* initialize the foreground tilemap */ state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8,8, 32,32); @@ -184,7 +184,7 @@ VIDEO_START( turbo ) VIDEO_START( buckrog ) { - turbo_state *state = (turbo_state *)machine->driver_data; + turbo_state *state = machine->driver_data(); /* initialize the foreground tilemap */ state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8,8, 32,32); @@ -204,7 +204,7 @@ VIDEO_START( buckrog ) WRITE8_HANDLER( turbo_videoram_w ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); state->videoram[offset] = data; if (offset < 0x400) { @@ -216,7 +216,7 @@ WRITE8_HANDLER( turbo_videoram_w ) WRITE8_HANDLER( buckrog_bitmap_w ) { - turbo_state *state = (turbo_state *)space->machine->driver_data; + turbo_state *state = space->machine->driver_data(); state->buckrog_bitmap_ram[offset] = data & 1; } @@ -406,7 +406,7 @@ static UINT32 turbo_get_sprite_bits(running_machine *machine, UINT8 road, sprite VIDEO_UPDATE( turbo ) { - turbo_state *state = (turbo_state *)screen->machine->driver_data; + turbo_state *state = screen->machine->driver_data(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); const UINT8 *road_gfxdata = memory_region(screen->machine, "gfx3"); const UINT8 *prom_base = memory_region(screen->machine, "proms"); @@ -761,7 +761,7 @@ static UINT32 subroc3d_get_sprite_bits(running_machine *machine, sprite_info *sp VIDEO_UPDATE( subroc3d ) { - turbo_state *state = (turbo_state *)screen->machine->driver_data; + turbo_state *state = screen->machine->driver_data(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); const UINT8 *prom_base = memory_region(screen->machine, "proms"); const UINT8 *pr1419 = prom_base + 0x000; @@ -981,7 +981,7 @@ static UINT32 buckrog_get_sprite_bits(running_machine *machine, sprite_info *spr VIDEO_UPDATE( buckrog ) { - turbo_state *state = (turbo_state *)screen->machine->driver_data; + turbo_state *state = screen->machine->driver_data(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); const UINT8 *bgcolor = memory_region(screen->machine, "gfx3"); const UINT8 *prom_base = memory_region(screen->machine, "proms"); diff --git a/src/mame/video/tutankhm.c b/src/mame/video/tutankhm.c index d98123b21d2..d14469ccb4d 100644 --- a/src/mame/video/tutankhm.c +++ b/src/mame/video/tutankhm.c @@ -21,14 +21,14 @@ WRITE8_HANDLER( tutankhm_flip_screen_x_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->flip_x = data & 0x01; } WRITE8_HANDLER( tutankhm_flip_screen_y_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->flip_y = data & 0x01; } @@ -41,7 +41,7 @@ WRITE8_HANDLER( tutankhm_flip_screen_y_w ) static void get_pens( running_machine *machine, pen_t *pens ) { - timeplt_state *state = (timeplt_state *)machine->driver_data; + timeplt_state *state = machine->driver_data(); offs_t i; for (i = 0; i < NUM_PENS; i++) @@ -61,7 +61,7 @@ static void get_pens( running_machine *machine, pen_t *pens ) VIDEO_UPDATE( tutankhm ) { - timeplt_state *state = (timeplt_state *)screen->machine->driver_data; + timeplt_state *state = screen->machine->driver_data(); int xorx = state->flip_x ? 255 : 0; int xory = state->flip_y ? 255 : 0; pen_t pens[NUM_PENS]; @@ -109,7 +109,7 @@ VIDEO_UPDATE( tutankhm ) WRITE8_HANDLER( junofrst_blitter_w ) { - timeplt_state *state = (timeplt_state *)space->machine->driver_data; + timeplt_state *state = space->machine->driver_data(); state->blitterdata[offset] = data; /* blitter is triggered by $8073 */ diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c index 3f4fc12d9bc..ff9a99a0aab 100644 --- a/src/mame/video/ultraman.c +++ b/src/mame/video/ultraman.c @@ -10,7 +10,7 @@ void ultraman_sprite_callback( running_machine *machine, int *code, int *color, int *priority, int *shadow ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); *priority = (*color & 0x80) >> 7; *color = state->sprite_colorbase + ((*color & 0x7e) >> 1); @@ -26,21 +26,21 @@ void ultraman_sprite_callback( running_machine *machine, int *code, int *color, void ultraman_zoom_callback_0(running_machine *machine, int *code, int *color, int *flags ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); *code |= ((*color & 0x07) << 8) | (state->bank0 << 11); *color = state->zoom_colorbase[0] + ((*color & 0xf8) >> 3); } void ultraman_zoom_callback_1(running_machine *machine, int *code, int *color, int *flags ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); *code |= ((*color & 0x07) << 8) | (state->bank1 << 11); *color = state->zoom_colorbase[1] + ((*color & 0xf8) >> 3); } void ultraman_zoom_callback_2(running_machine *machine, int *code, int *color, int *flags ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); *code |= ((*color & 0x07) << 8) | (state->bank2 << 11); *color = state->zoom_colorbase[2] + ((*color & 0xf8) >> 3); } @@ -55,7 +55,7 @@ void ultraman_zoom_callback_2(running_machine *machine, int *code, int *color, i VIDEO_START( ultraman ) { - ultraman_state *state = (ultraman_state *)machine->driver_data; + ultraman_state *state = machine->driver_data(); state->sprite_colorbase = 192; state->zoom_colorbase[0] = 0; state->zoom_colorbase[1] = 64; @@ -72,7 +72,7 @@ VIDEO_START( ultraman ) WRITE16_HANDLER( ultraman_gfxctrl_w ) { - ultraman_state *state = (ultraman_state *)space->machine->driver_data; + ultraman_state *state = space->machine->driver_data(); if (ACCESSING_BITS_0_7) { @@ -124,7 +124,7 @@ WRITE16_HANDLER( ultraman_gfxctrl_w ) VIDEO_UPDATE( ultraman ) { - ultraman_state *state = (ultraman_state *)screen->machine->driver_data; + ultraman_state *state = screen->machine->driver_data(); k051316_zoom_draw(state->k051316_3, bitmap, cliprect, 0, 0); k051316_zoom_draw(state->k051316_2, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c index bb70b667d55..08ea26d8554 100644 --- a/src/mame/video/vaportra.c +++ b/src/mame/video/vaportra.c @@ -17,7 +17,7 @@ WRITE16_HANDLER( vaportra_priority_w ) { - vaportra_state *state = (vaportra_state *)space->machine->driver_data; + vaportra_state *state = space->machine->driver_data(); COMBINE_DATA(&state->priority[offset]); } @@ -50,7 +50,7 @@ WRITE16_HANDLER( vaportra_palette_24bit_b_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - vaportra_state *state = (vaportra_state *)machine->driver_data; + vaportra_state *state = machine->driver_data(); UINT16 *buffered_spriteram = machine->generic.buffered_spriteram.u16; int offs; int priority_value = state->priority[1]; @@ -124,7 +124,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( vaportra ) { - vaportra_state *state = (vaportra_state *)screen->machine->driver_data; + vaportra_state *state = screen->machine->driver_data(); UINT16 flip = deco16ic_pf12_control_r(state->deco16ic, 0, 0xffff); int pri = state->priority[0] & 0x03; diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c index 439666541de..29a422fb70a 100644 --- a/src/mame/video/vastar.c +++ b/src/mame/video/vastar.c @@ -18,7 +18,7 @@ static TILE_GET_INFO( get_fg_tile_info ) { - vastar_state *state = (vastar_state *)machine->driver_data; + vastar_state *state = machine->driver_data(); UINT8 *videoram = state->fgvideoram; int code, color; @@ -33,7 +33,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg1_tile_info ) { - vastar_state *state = (vastar_state *)machine->driver_data; + vastar_state *state = machine->driver_data(); UINT8 *videoram = state->bg1videoram; int code, color; @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_bg1_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { - vastar_state *state = (vastar_state *)machine->driver_data; + vastar_state *state = machine->driver_data(); UINT8 *videoram = state->bg2videoram; int code, color; @@ -70,7 +70,7 @@ static TILE_GET_INFO( get_bg2_tile_info ) VIDEO_START( vastar ) { - vastar_state *state = (vastar_state *)machine->driver_data; + vastar_state *state = machine->driver_data(); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,8,8,32,32); state->bg1_tilemap = tilemap_create(machine, get_bg1_tile_info,tilemap_scan_rows,8,8,32,32); @@ -93,7 +93,7 @@ VIDEO_START( vastar ) WRITE8_HANDLER( vastar_fgvideoram_w ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); state->fgvideoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset & 0x3ff); @@ -101,7 +101,7 @@ WRITE8_HANDLER( vastar_fgvideoram_w ) WRITE8_HANDLER( vastar_bg1videoram_w ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); state->bg1videoram[offset] = data; tilemap_mark_tile_dirty(state->bg1_tilemap,offset & 0x3ff); @@ -109,7 +109,7 @@ WRITE8_HANDLER( vastar_bg1videoram_w ) WRITE8_HANDLER( vastar_bg2videoram_w ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); state->bg2videoram[offset] = data; tilemap_mark_tile_dirty(state->bg2_tilemap,offset & 0x3ff); @@ -118,14 +118,14 @@ WRITE8_HANDLER( vastar_bg2videoram_w ) READ8_HANDLER( vastar_bg1videoram_r ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); return state->bg1videoram[offset]; } READ8_HANDLER( vastar_bg2videoram_r ) { - vastar_state *state = (vastar_state *)space->machine->driver_data; + vastar_state *state = space->machine->driver_data(); return state->bg2videoram[offset]; } @@ -139,7 +139,7 @@ READ8_HANDLER( vastar_bg2videoram_r ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - vastar_state *state = (vastar_state *)machine->driver_data; + vastar_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram1; UINT8 *spriteram_2 = state->spriteram2; UINT8 *spriteram_3 = state->spriteram3; @@ -198,7 +198,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( vastar ) { - vastar_state *state = (vastar_state *)screen->machine->driver_data; + vastar_state *state = screen->machine->driver_data(); int i; diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c index 36af6abed5f..5812b1162aa 100644 --- a/src/mame/video/vendetta.c +++ b/src/mame/video/vendetta.c @@ -10,14 +10,14 @@ void vendetta_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); *code |= ((*color & 0x03) << 8) | ((*color & 0x30) << 6) | ((*color & 0x0c) << 10) | (bank << 14); *color = state->layer_colorbase[layer] + ((*color & 0xc0) >> 6); } void esckids_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); *code |= ((*color & 0x03) << 8) | ((*color & 0x10) << 6) | ((*color & 0x0c) << 9) | (bank << 13); *color = state->layer_colorbase[layer] + ((*color & 0xe0) >> 5); } @@ -31,7 +31,7 @@ void esckids_tile_callback( running_machine *machine, int layer, int bank, int * void vendetta_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - vendetta_state *state = (vendetta_state *)machine->driver_data; + vendetta_state *state = machine->driver_data(); int pri = (*color & 0x03e0) >> 4; /* ??????? */ if (pri <= state->layerpri[2]) *priority_mask = 0; @@ -54,7 +54,7 @@ void vendetta_sprite_callback( running_machine *machine, int *code, int *color, VIDEO_UPDATE( vendetta ) { - vendetta_state *state = (vendetta_state *)screen->machine->driver_data; + vendetta_state *state = screen->machine->driver_data(); int layer[3]; state->sprite_colorbase = k053251_get_palette_index(state->k053251, K053251_CI1); diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c index 18da2ac9b7a..a17c71dd952 100644 --- a/src/mame/video/vindictr.c +++ b/src/mame/video/vindictr.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - vindictr_state *state = (vindictr_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + vindictr_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20); int opaque = data & 0x8000; @@ -29,8 +29,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - vindictr_state *state = (vindictr_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + vindictr_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = (state->playfield_tile_bank * 0x1000) + (data & 0xfff); int color = 0x10 + 2 * ((data >> 12) & 7); SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -82,17 +82,17 @@ VIDEO_START( vindictr ) 0, /* resulting value to indicate "special" */ NULL /* callback routine for special entries */ }; - vindictr_state *state = (vindictr_state *)machine->driver_data; + vindictr_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_cols, 8,8, 64,64); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); /* save states */ state_save_register_global(machine, state->playfield_tile_bank); @@ -140,14 +140,14 @@ WRITE16_HANDLER( vindictr_paletteram_w ) void vindictr_scanline_update(screen_device &screen, int scanline) { - vindictr_state *state = (vindictr_state *)screen.machine->driver_data; - UINT16 *base = &state->atarigen.alpha[((scanline - 8) / 8) * 64 + 42]; + vindictr_state *state = screen.machine->driver_data(); + UINT16 *base = &state->alpha[((scanline - 8) / 8) * 64 + 42]; int x; /* keep in range */ - if (base < state->atarigen.alpha) + if (base < state->alpha) base += 0x7c0; - else if (base >= &state->atarigen.alpha[0x7c0]) + else if (base >= &state->alpha[0x7c0]) return; /* update the current parameters */ @@ -162,7 +162,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) { screen.update_partial(scanline - 1); state->playfield_tile_bank = data & 7; - tilemap_mark_all_tiles_dirty(state->atarigen.playfield_tilemap); + tilemap_mark_all_tiles_dirty(state->playfield_tilemap); } break; @@ -170,7 +170,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) if (state->playfield_xscroll != (data & 0x1ff)) { screen.update_partial(scanline - 1); - tilemap_set_scrollx(state->atarigen.playfield_tilemap, 0, data); + tilemap_set_scrollx(state->playfield_tilemap, 0, data); state->playfield_xscroll = data & 0x1ff; } break; @@ -201,7 +201,7 @@ void vindictr_scanline_update(screen_device &screen, int scanline) if (state->playfield_yscroll != ((data - offset) & 0x1ff)) { screen.update_partial(scanline - 1); - tilemap_set_scrolly(state->atarigen.playfield_tilemap, 0, data - offset); + tilemap_set_scrolly(state->playfield_tilemap, 0, data - offset); atarimo_set_yscroll(0, (data - offset) & 0x1ff); } break; @@ -220,13 +220,13 @@ void vindictr_scanline_update(screen_device &screen, int scanline) VIDEO_UPDATE( vindictr ) { - vindictr_state *state = (vindictr_state *)screen->machine->driver_data; + vindictr_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -267,7 +267,7 @@ VIDEO_UPDATE( vindictr ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); /* now go back and process the upper bit of MO priority */ rectlist.rect -= rectlist.numrects; diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c index 3be6c8bdc1c..558b16bcf8f 100644 --- a/src/mame/video/volfied.c +++ b/src/mame/video/volfied.c @@ -8,7 +8,7 @@ VIDEO_START( volfied ) { - volfied_state *state = (volfied_state *)machine->driver_data; + volfied_state *state = machine->driver_data(); state->video_ram = auto_alloc_array(machine, UINT16, 0x40000); state->video_ctrl = 0; @@ -26,13 +26,13 @@ VIDEO_START( volfied ) READ16_HANDLER( volfied_video_ram_r ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); return state->video_ram[offset]; } WRITE16_HANDLER( volfied_video_ram_w ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); mem_mask &= state->video_mask; @@ -41,7 +41,7 @@ WRITE16_HANDLER( volfied_video_ram_w ) WRITE16_HANDLER( volfied_video_ctrl_w ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); COMBINE_DATA(&state->video_ctrl); } @@ -58,13 +58,13 @@ READ16_HANDLER( volfied_video_ctrl_r ) WRITE16_HANDLER( volfied_video_mask_w ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); COMBINE_DATA(&state->video_mask); } WRITE16_HANDLER( volfied_sprite_ctrl_w ) { - volfied_state *state = (volfied_state *)space->machine->driver_data; + volfied_state *state = space->machine->driver_data(); pc090oj_set_sprite_ctrl(state->pc090oj, (data & 0x3c) >> 2); } @@ -97,7 +97,7 @@ static void refresh_pixel_layer( running_machine *machine, bitmap_t *bitmap ) *********************************************************/ - volfied_state *state = (volfied_state *)machine->driver_data; + volfied_state *state = machine->driver_data(); UINT16* p = state->video_ram; int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -130,7 +130,7 @@ static void refresh_pixel_layer( running_machine *machine, bitmap_t *bitmap ) VIDEO_UPDATE( volfied ) { - volfied_state *state = (volfied_state *)screen->machine->driver_data; + volfied_state *state = screen->machine->driver_data(); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); refresh_pixel_layer(screen->machine, bitmap); diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index c3f498897b6..5f669022765 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -6,7 +6,7 @@ VIDEO_START( warriorb ) { - warriorb_state *state = (warriorb_state *)machine->driver_data; + warriorb_state *state = machine->driver_data(); /* Ensure palette from correct TC0110PCR used for each screen */ tc0100scn_set_colbanks(state->tc0100scn_1, 0x0, 0x100, 0x0); @@ -19,7 +19,7 @@ VIDEO_START( warriorb ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int x_offs, int y_offs ) { - warriorb_state *state = (warriorb_state *)machine->driver_data; + warriorb_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, data, data2, tilenum, color, flipx, flipy; int x, y, priority, pri_mask; @@ -86,7 +86,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( warriorb ) { - warriorb_state *state = (warriorb_state *)screen->machine->driver_data; + warriorb_state *state = screen->machine->driver_data(); int xoffs = 0; UINT8 layer[3], nodraw; running_device *tc0100scn = NULL; diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 05be4e3c3b2..af015782577 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -13,7 +13,7 @@ READ16_HANDLER( welltris_spriteram_r ) WRITE16_HANDLER( welltris_spriteram_w ) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); int offs; COMBINE_DATA(&state->spriteram[offset]); @@ -32,7 +32,7 @@ WRITE16_HANDLER( welltris_spriteram_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { static const UINT8 zoomtable[16] = { 0,7,14,20,25,30,34,38,42,46,49,52,54,57,59,61 }; - welltris_state *state = (welltris_state *)machine->driver_data; + welltris_state *state = machine->driver_data(); int offs; const rectangle &visarea = machine->primary_screen->visible_area(); @@ -159,7 +159,7 @@ WRITE16_HANDLER( welltris_palette_bank_w ) { if (ACCESSING_BITS_0_7) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); if (state->charpalettebank != (data & 0x03)) { @@ -178,7 +178,7 @@ WRITE16_HANDLER( welltris_gfxbank_w ) { if (ACCESSING_BITS_0_7) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); setbank(state, 0, (data & 0xf0) >> 4); setbank(state, 1, data & 0x0f); @@ -187,7 +187,7 @@ WRITE16_HANDLER( welltris_gfxbank_w ) WRITE16_HANDLER( welltris_scrollreg_w ) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); switch (offset) { case 0: state->scrollx = data - 14; break; @@ -197,7 +197,7 @@ WRITE16_HANDLER( welltris_scrollreg_w ) static TILE_GET_INFO( get_welltris_tile_info ) { - welltris_state *state = (welltris_state *)machine->driver_data; + welltris_state *state = machine->driver_data(); UINT16 code = state->charvideoram[tile_index]; int bank = (code & 0x1000) >> 12; @@ -210,7 +210,7 @@ static TILE_GET_INFO( get_welltris_tile_info ) WRITE16_HANDLER( welltris_charvideoram_w ) { - welltris_state *state = (welltris_state *)space->machine->driver_data; + welltris_state *state = space->machine->driver_data(); COMBINE_DATA(&state->charvideoram[offset]); tilemap_mark_tile_dirty(state->char_tilemap, offset); @@ -218,7 +218,7 @@ WRITE16_HANDLER( welltris_charvideoram_w ) VIDEO_START( welltris ) { - welltris_state *state = (welltris_state *)machine->driver_data; + welltris_state *state = machine->driver_data(); state->char_tilemap = tilemap_create(machine, get_welltris_tile_info, tilemap_scan_rows, 8, 8, 64, 32); tilemap_set_transparent_pen(state->char_tilemap, 15); @@ -226,7 +226,7 @@ VIDEO_START( welltris ) static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - welltris_state *state = (welltris_state *)machine->driver_data; + welltris_state *state = machine->driver_data(); int x, y; int pixdata; @@ -242,7 +242,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re VIDEO_UPDATE( welltris ) { - welltris_state *state = (welltris_state *)screen->machine->driver_data; + welltris_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->char_tilemap, 0, state->scrollx); tilemap_set_scrolly(state->char_tilemap, 0, state->scrolly); diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index c54614e901b..66d1d4e5263 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -7,7 +7,7 @@ INLINE void common_get_piv_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, int num ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); UINT16 tilenum = state->pivram[tile_index + num * 0x1000]; /* 3 blocks of $2000 */ UINT16 attr = state->pivram[tile_index + num * 0x1000 + 0x8000]; /* 3 blocks of $2000 */ @@ -36,7 +36,7 @@ static TILE_GET_INFO( get_piv2_tile_info ) static void wgp_core_vh_start( running_machine *machine, int piv_xoffs, int piv_yoffs ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); state->piv_tilemap[0] = tilemap_create(machine, get_piv0_tile_info, tilemap_scan_rows, 16, 16, 64, 64); state->piv_tilemap[1] = tilemap_create(machine, get_piv1_tile_info, tilemap_scan_rows, 16, 16, 64, 64); @@ -124,13 +124,13 @@ custom chip capable of four rather than three tilemaps.) READ16_HANDLER( wgp_pivram_word_r ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); return state->pivram[offset]; } WRITE16_HANDLER( wgp_pivram_word_w ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); COMBINE_DATA(&state->pivram[offset]); @@ -150,13 +150,13 @@ WRITE16_HANDLER( wgp_pivram_word_w ) READ16_HANDLER( wgp_piv_ctrl_word_r ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); return state->piv_ctrlram[offset]; } WRITE16_HANDLER( wgp_piv_ctrl_word_w ) { - wgp_state *state = (wgp_state *)space->machine->driver_data; + wgp_state *state = space->machine->driver_data(); UINT16 a, b; COMBINE_DATA(&state->piv_ctrlram[offset]); @@ -348,7 +348,7 @@ static const UINT8 ylookup[16] = static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int offs, i, j, k; int x, y, curx, cury; @@ -520,7 +520,7 @@ INLINE void bryan2_drawscanline( bitmap_t *bitmap, int x, int y, int length, static void wgp_piv_layer_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer, int flags, UINT32 priority ) { - wgp_state *state = (wgp_state *)machine->driver_data; + wgp_state *state = machine->driver_data(); bitmap_t *srcbitmap = tilemap_get_pixmap(state->piv_tilemap[layer]); bitmap_t *flagsbitmap = tilemap_get_flagsmap(state->piv_tilemap[layer]); @@ -645,7 +645,7 @@ static void wgp_piv_layer_draw( running_machine *machine, bitmap_t *bitmap, cons VIDEO_UPDATE( wgp ) { - wgp_state *state = (wgp_state *)screen->machine->driver_data; + wgp_state *state = screen->machine->driver_data(); int i; UINT8 layer[3]; diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index bf0a7a911f9..3860522f499 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -17,7 +17,7 @@ WRITE16_HANDLER( wwfsstar_fg0_videoram_w ) { - wwfsstar_state *state = (wwfsstar_state *)space->machine->driver_data; + wwfsstar_state *state = space->machine->driver_data(); COMBINE_DATA(&state->fg0_videoram[offset]); tilemap_mark_tile_dirty(state->fg0_tilemap,offset/2); @@ -25,7 +25,7 @@ WRITE16_HANDLER( wwfsstar_fg0_videoram_w ) WRITE16_HANDLER( wwfsstar_bg0_videoram_w ) { - wwfsstar_state *state = (wwfsstar_state *)space->machine->driver_data; + wwfsstar_state *state = space->machine->driver_data(); COMBINE_DATA(&state->bg0_videoram[offset]); tilemap_mark_tile_dirty(state->bg0_tilemap,offset/2); @@ -52,7 +52,7 @@ static TILE_GET_INFO( get_fg0_tile_info ) **- End of Comments -*/ - wwfsstar_state *state = (wwfsstar_state *)machine->driver_data; + wwfsstar_state *state = machine->driver_data(); UINT16 *tilebase; int tileno; int colbank; @@ -90,7 +90,7 @@ static TILE_GET_INFO( get_bg0_tile_info ) **- End of Comments -*/ - wwfsstar_state *state = (wwfsstar_state *)machine->driver_data; + wwfsstar_state *state = machine->driver_data(); UINT16 *tilebase; int tileno, colbank, flipx; @@ -134,7 +134,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta **- End of Comments -*/ - wwfsstar_state *state = (wwfsstar_state *)machine->driver_data; + wwfsstar_state *state = machine->driver_data(); const gfx_element *gfx = machine->gfx[1]; UINT16 *source = state->spriteram; UINT16 *finish = source + 0x3ff/2; @@ -211,7 +211,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_START( wwfsstar ) { - wwfsstar_state *state = (wwfsstar_state *)machine->driver_data; + wwfsstar_state *state = machine->driver_data(); state->fg0_tilemap = tilemap_create(machine, get_fg0_tile_info,tilemap_scan_rows, 8, 8,32,32); tilemap_set_transparent_pen(state->fg0_tilemap,0); @@ -222,7 +222,7 @@ VIDEO_START( wwfsstar ) VIDEO_UPDATE( wwfsstar ) { - wwfsstar_state *state = (wwfsstar_state *)screen->machine->driver_data; + wwfsstar_state *state = screen->machine->driver_data(); tilemap_set_scrolly( state->bg0_tilemap, 0, state->scrolly ); tilemap_set_scrollx( state->bg0_tilemap, 0, state->scrollx ); diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index f2871454fc1..e09a016de70 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -176,7 +176,7 @@ PALETTE_INIT( battles ) static TILE_GET_INFO( get_fg_tile_info ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 attr = state->xevious_fg_colorram[tile_index]; @@ -195,7 +195,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 code = state->xevious_bg_videoram[tile_index]; UINT8 attr = state->xevious_bg_colorram[tile_index]; @@ -217,7 +217,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( xevious ) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info,tilemap_scan_rows, 8,8,64,32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info,tilemap_scan_rows,8,8,64,32); @@ -243,7 +243,7 @@ VIDEO_START( xevious ) WRITE8_HANDLER( xevious_fg_videoram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->xevious_fg_videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -251,7 +251,7 @@ WRITE8_HANDLER( xevious_fg_videoram_w ) WRITE8_HANDLER( xevious_fg_colorram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->xevious_fg_colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap,offset); @@ -259,7 +259,7 @@ WRITE8_HANDLER( xevious_fg_colorram_w ) WRITE8_HANDLER( xevious_bg_videoram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->xevious_bg_videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -267,7 +267,7 @@ WRITE8_HANDLER( xevious_bg_videoram_w ) WRITE8_HANDLER( xevious_bg_colorram_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->xevious_bg_colorram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap,offset); @@ -275,7 +275,7 @@ WRITE8_HANDLER( xevious_bg_colorram_w ) WRITE8_HANDLER( xevious_vh_latch_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); int reg; int scroll = data + ((offset&0x01)<<8); /* A0 -> D8 */ @@ -309,14 +309,14 @@ WRITE8_HANDLER( xevious_vh_latch_w ) /* emulation for schematic 9B */ WRITE8_HANDLER( xevious_bs_w ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); state->xevious_bs[offset & 1] = data; } READ8_HANDLER( xevious_bb_r ) { - _galaga_state *state = (_galaga_state *) space->machine->driver_data; + _galaga_state *state = space->machine->driver_data<_galaga_state>(); UINT8 *rom2a = memory_region(space->machine, "gfx4"); UINT8 *rom2b = rom2a+0x1000; @@ -416,7 +416,7 @@ ROM 3M,3L color replace table for sprite static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { - _galaga_state *state = (_galaga_state *) machine->driver_data; + _galaga_state *state = machine->driver_data<_galaga_state>(); UINT8 *spriteram = state->xevious_sr3 + 0x780; UINT8 *spriteram_2 = state->xevious_sr1 + 0x780; @@ -499,7 +499,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( xevious ) { - _galaga_state *state = (_galaga_state *) screen->machine->driver_data; + _galaga_state *state = screen->machine->driver_data<_galaga_state>(); tilemap_draw(bitmap,cliprect,state->bg_tilemap,0,0); draw_sprites(screen->machine, bitmap,cliprect); diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c index c0350b3d005..11750bdeca6 100644 --- a/src/mame/video/xexex.c +++ b/src/mame/video/xexex.c @@ -4,7 +4,7 @@ void xexex_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); int pri; // Xexex doesn't seem to use bit8 and 9 as effect selectors so this should be safe. @@ -27,13 +27,13 @@ void xexex_sprite_callback( running_machine *machine, int *code, int *color, int void xexex_tile_callback(running_machine *machine, int layer, int *code, int *color, int *flags) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); *color = state->layer_colorbase[layer] | (*color >> 2 & 0x0f); } VIDEO_START( xexex ) { - xexex_state *state = (xexex_state *)machine->driver_data; + xexex_state *state = machine->driver_data(); assert(machine->primary_screen->format() == BITMAP_FORMAT_RGB32); @@ -49,7 +49,7 @@ VIDEO_START( xexex ) VIDEO_UPDATE( xexex ) { static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 }; - xexex_state *state = (xexex_state *)screen->machine->driver_data; + xexex_state *state = screen->machine->driver_data(); int layer[4]; int bg_colorbase, new_colorbase, plane, alpha; diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c index 115d1fcf811..28c9cf72474 100644 --- a/src/mame/video/xmen.c +++ b/src/mame/video/xmen.c @@ -11,7 +11,7 @@ void xmen_tile_callback( running_machine *machine, int layer, int bank, int *code, int *color, int *flags, int *priority ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); /* (color & 0x02) is flip y handled internally by the 052109 */ if (layer == 0) @@ -28,7 +28,7 @@ void xmen_tile_callback( running_machine *machine, int layer, int bank, int *cod void xmen_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); int pri = (*color & 0x00e0) >> 4; /* ??????? */ if (pri <= state->layerpri[2]) @@ -53,7 +53,7 @@ void xmen_sprite_callback( running_machine *machine, int *code, int *color, int VIDEO_START( xmen6p ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); k053247_get_ram(state->k053246, &state->k053247_ram); @@ -73,7 +73,7 @@ VIDEO_START( xmen6p ) VIDEO_UPDATE( xmen ) { - xmen_state *state = (xmen_state *)screen->machine->driver_data; + xmen_state *state = screen->machine->driver_data(); int layer[3], bg_colorbase; bg_colorbase = k053251_get_palette_index(state->k053251, K053251_CI4); @@ -109,7 +109,7 @@ VIDEO_UPDATE( xmen ) VIDEO_UPDATE( xmen6p ) { - xmen_state *state = (xmen_state *)screen->machine->driver_data; + xmen_state *state = screen->machine->driver_data(); int x, y; if (screen == state->lscreen) @@ -137,7 +137,7 @@ VIDEO_UPDATE( xmen6p ) /* my lefts and rights are mixed up in several places.. */ VIDEO_EOF( xmen6p ) { - xmen_state *state = (xmen_state *)machine->driver_data; + xmen_state *state = machine->driver_data(); int layer[3], bg_colorbase; bitmap_t * renderbitmap; rectangle cliprect; diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c index 54480752eaf..b9a97420c11 100644 --- a/src/mame/video/xybots.c +++ b/src/mame/video/xybots.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) { - xybots_state *state = (xybots_state *)machine->driver_data; - UINT16 data = state->atarigen.alpha[tile_index]; + xybots_state *state = machine->driver_data(); + UINT16 data = state->alpha[tile_index]; int code = data & 0x3ff; int color = (data >> 12) & 7; int opaque = data & 0x8000; @@ -29,8 +29,8 @@ static TILE_GET_INFO( get_alpha_tile_info ) static TILE_GET_INFO( get_playfield_tile_info ) { - xybots_state *state = (xybots_state *)machine->driver_data; - UINT16 data = state->atarigen.playfield[tile_index]; + xybots_state *state = machine->driver_data(); + UINT16 data = state->playfield[tile_index]; int code = data & 0x1fff; int color = (data >> 11) & 0x0f; SET_TILE_INFO(0, code, color, (data >> 15) & 1); @@ -82,17 +82,17 @@ VIDEO_START( xybots ) 0, /* resulting value to indicate "special" */ NULL /* callback routine for special entries */ }; - xybots_state *state = (xybots_state *)machine->driver_data; + xybots_state *state = machine->driver_data(); /* initialize the playfield */ - state->atarigen.playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); + state->playfield_tilemap = tilemap_create(machine, get_playfield_tile_info, tilemap_scan_rows, 8,8, 64,32); /* initialize the motion objects */ atarimo_init(machine, 0, &modesc); /* initialize the alphanumerics */ - state->atarigen.alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); - tilemap_set_transparent_pen(state->atarigen.alpha_tilemap, 0); + state->alpha_tilemap = tilemap_create(machine, get_alpha_tile_info, tilemap_scan_rows, 8,8, 64,32); + tilemap_set_transparent_pen(state->alpha_tilemap, 0); } @@ -105,13 +105,13 @@ VIDEO_START( xybots ) VIDEO_UPDATE( xybots ) { - xybots_state *state = (xybots_state *)screen->machine->driver_data; + xybots_state *state = screen->machine->driver_data(); atarimo_rect_list rectlist; bitmap_t *mobitmap; int x, y, r; /* draw the playfield */ - tilemap_draw(bitmap, cliprect, state->atarigen.playfield_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->playfield_tilemap, 0, 0); /* draw and merge the MO */ mobitmap = atarimo_render(0, cliprect, &rectlist); @@ -165,6 +165,6 @@ VIDEO_UPDATE( xybots ) } /* add the alpha on top */ - tilemap_draw(bitmap, cliprect, state->atarigen.alpha_tilemap, 0, 0); + tilemap_draw(bitmap, cliprect, state->alpha_tilemap, 0, 0); return 0; } diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index d43967a9136..25592d26d1f 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -32,7 +32,7 @@ PALETTE_INIT( xyonix ) static TILE_GET_INFO( get_xyonix_tile_info ) { - xyonix_state *state = (xyonix_state *)machine->driver_data; + xyonix_state *state = machine->driver_data(); int tileno; int attr = state->vidram[tile_index+0x1000+1]; @@ -43,7 +43,7 @@ static TILE_GET_INFO( get_xyonix_tile_info ) WRITE8_HANDLER( xyonix_vidram_w ) { - xyonix_state *state = (xyonix_state *)space->machine->driver_data; + xyonix_state *state = space->machine->driver_data(); state->vidram[offset] = data; tilemap_mark_tile_dirty(state->tilemap,(offset-1)&0x0fff); @@ -51,14 +51,14 @@ WRITE8_HANDLER( xyonix_vidram_w ) VIDEO_START(xyonix) { - xyonix_state *state = (xyonix_state *)machine->driver_data; + xyonix_state *state = machine->driver_data(); state->tilemap = tilemap_create(machine, get_xyonix_tile_info, tilemap_scan_rows, 4, 8, 80, 32); } VIDEO_UPDATE(xyonix) { - xyonix_state *state = (xyonix_state *)screen->machine->driver_data; + xyonix_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->tilemap, 0, 0); return 0; diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 7f3bea875a9..92a7f0898fc 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -61,14 +61,14 @@ PALETTE_INIT( yiear ) WRITE8_HANDLER( yiear_videoram_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset / 2); } WRITE8_HANDLER( yiear_control_w ) { - trackfld_state *state = (trackfld_state *)space->machine->driver_data; + trackfld_state *state = space->machine->driver_data(); /* bit 0 flips screen */ if (flip_screen_get(space->machine) != (data & 0x01)) { @@ -89,7 +89,7 @@ WRITE8_HANDLER( yiear_control_w ) static TILE_GET_INFO( get_bg_tile_info ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); int offs = tile_index * 2; int attr = state->videoram[offs]; int code = state->videoram[offs + 1] | ((attr & 0x10) << 4); @@ -101,13 +101,13 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( yiear ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); } static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - trackfld_state *state = (trackfld_state *)machine->driver_data; + trackfld_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; UINT8 *spriteram_2 = state->spriteram2; int offs; @@ -143,7 +143,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( yiear ) { - trackfld_state *state = (trackfld_state *)screen->machine->driver_data; + trackfld_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); draw_sprites(screen->machine, bitmap, cliprect); diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index a1ca72da2e5..6657aece3f5 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -49,7 +49,7 @@ static TILEMAP_MAPPER( yunsun16_tilemap_scan_pages ) static TILE_GET_INFO( get_tile_info_0 ) { - yunsun16_state *state = (yunsun16_state *)machine->driver_data; + yunsun16_state *state = machine->driver_data(); UINT16 code = state->vram_0[2 * tile_index + 0]; UINT16 attr = state->vram_0[2 * tile_index + 1]; SET_TILE_INFO( @@ -61,7 +61,7 @@ static TILE_GET_INFO( get_tile_info_0 ) static TILE_GET_INFO( get_tile_info_1 ) { - yunsun16_state *state = (yunsun16_state *)machine->driver_data; + yunsun16_state *state = machine->driver_data(); UINT16 code = state->vram_1[2 * tile_index + 0]; UINT16 attr = state->vram_1[2 * tile_index + 1]; SET_TILE_INFO( @@ -73,7 +73,7 @@ static TILE_GET_INFO( get_tile_info_1 ) WRITE16_HANDLER( yunsun16_vram_0_w ) { - yunsun16_state *state = (yunsun16_state *)space->machine->driver_data; + yunsun16_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_0[offset]); tilemap_mark_tile_dirty(state->tilemap_0, offset / 2); @@ -81,7 +81,7 @@ WRITE16_HANDLER( yunsun16_vram_0_w ) WRITE16_HANDLER( yunsun16_vram_1_w ) { - yunsun16_state *state = (yunsun16_state *)space->machine->driver_data; + yunsun16_state *state = space->machine->driver_data(); COMBINE_DATA(&state->vram_1[offset]); tilemap_mark_tile_dirty(state->tilemap_1, offset / 2); @@ -98,7 +98,7 @@ WRITE16_HANDLER( yunsun16_vram_1_w ) VIDEO_START( yunsun16 ) { - yunsun16_state *state = (yunsun16_state *)machine->driver_data; + yunsun16_state *state = machine->driver_data(); state->tilemap_0 = tilemap_create(machine, get_tile_info_0,yunsun16_tilemap_scan_pages, 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); @@ -138,7 +138,7 @@ VIDEO_START( yunsun16 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - yunsun16_state *state = (yunsun16_state *)machine->driver_data; + yunsun16_state *state = machine->driver_data(); int offs; const rectangle &visarea = machine->primary_screen->visible_area(); @@ -202,7 +202,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( yunsun16 ) { - yunsun16_state *state = (yunsun16_state *)screen->machine->driver_data; + yunsun16_state *state = screen->machine->driver_data(); tilemap_set_scrollx(state->tilemap_0, 0, state->scrollram_0[0]); tilemap_set_scrolly(state->tilemap_0, 0, state->scrollram_0[1]); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index 7c06218a3ae..c51673e3a12 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -39,14 +39,14 @@ Note: if MAME_DEBUG is defined, pressing Z with: WRITE8_HANDLER( yunsung8_videobank_w ) { - yunsung8_state *state = (yunsung8_state *)space->machine->driver_data; + yunsung8_state *state = space->machine->driver_data(); state->videobank = data; } READ8_HANDLER( yunsung8_videoram_r ) { - yunsung8_state *state = (yunsung8_state *)space->machine->driver_data; + yunsung8_state *state = space->machine->driver_data(); int bank; /* Bit 1 of the bankswitching register contols the c000-c7ff @@ -66,7 +66,7 @@ READ8_HANDLER( yunsung8_videoram_r ) WRITE8_HANDLER( yunsung8_videoram_w ) { - yunsung8_state *state = (yunsung8_state *)space->machine->driver_data; + yunsung8_state *state = space->machine->driver_data(); if (offset < 0x0800) // c000-c7ff Banked Palette RAM { @@ -136,7 +136,7 @@ WRITE8_HANDLER( yunsung8_flipscreen_w ) static TILE_GET_INFO( get_tile_info_0 ) { - yunsung8_state *state = (yunsung8_state *)machine->driver_data; + yunsung8_state *state = machine->driver_data(); int code = state->videoram_0[0x1000 + tile_index * 2 + 0] + state->videoram_0[0x1000 + tile_index * 2 + 1] * 256; int color = state->videoram_0[0x0800 + tile_index] & 0x07; SET_TILE_INFO( @@ -153,7 +153,7 @@ static TILE_GET_INFO( get_tile_info_0 ) static TILE_GET_INFO( get_tile_info_1 ) { - yunsung8_state *state = (yunsung8_state *)machine->driver_data; + yunsung8_state *state = machine->driver_data(); int code = state->videoram_1[0x1000 + tile_index * 2 + 0] + state->videoram_1[0x1000 + tile_index * 2 + 1] * 256; int color = state->videoram_1[0x0800 + tile_index] & 0x3f; SET_TILE_INFO( @@ -176,7 +176,7 @@ static TILE_GET_INFO( get_tile_info_1 ) VIDEO_START( yunsung8 ) { - yunsung8_state *state = (yunsung8_state *)machine->driver_data; + yunsung8_state *state = machine->driver_data(); state->tilemap_0 = tilemap_create(machine, get_tile_info_0, tilemap_scan_rows, 8, 8, DIM_NX_0, DIM_NY_0 ); state->tilemap_1 = tilemap_create(machine, get_tile_info_1, tilemap_scan_rows, 8, 8, DIM_NX_1, DIM_NY_1 ); @@ -196,7 +196,7 @@ VIDEO_START( yunsung8 ) VIDEO_UPDATE( yunsung8 ) { - yunsung8_state *state = (yunsung8_state *)screen->machine->driver_data; + yunsung8_state *state = screen->machine->driver_data(); int layers_ctrl = (~state->layers_ctrl) >> 4; #ifdef MAME_DEBUG diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index 8e3658a86e8..99343fd401e 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -17,7 +17,7 @@ PALETTE_INIT( zaxxon ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); static const int resistances[3] = { 1000, 470, 220 }; double rweights[3], gweights[3], bweights[2]; int i; @@ -80,7 +80,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( zaxxon_get_fg_tile_info ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); int sx = tile_index % 32; int sy = tile_index / 32; int code = state->videoram[tile_index]; @@ -92,7 +92,7 @@ static TILE_GET_INFO( zaxxon_get_fg_tile_info ) static TILE_GET_INFO( razmataz_get_fg_tile_info ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = state->color_codes[code] & 0x0f; @@ -102,7 +102,7 @@ static TILE_GET_INFO( razmataz_get_fg_tile_info ) static TILE_GET_INFO( congo_get_fg_tile_info ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); int code = state->videoram[tile_index] + (state->congo_fg_bank << 8); int color = state->colorram[tile_index] & 0x1f; @@ -119,7 +119,7 @@ static TILE_GET_INFO( congo_get_fg_tile_info ) static void video_start_common(running_machine *machine, tile_get_info_func fg_tile_info) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); /* reset globals */ state->bg_enable = 0; @@ -161,7 +161,7 @@ VIDEO_START( razmataz ) VIDEO_START( congo ) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); /* allocate our own spriteram since it is not accessible by the main CPU */ state->spriteram = auto_alloc_array(machine, UINT8, 0x100); @@ -185,7 +185,7 @@ VIDEO_START( congo ) WRITE8_HANDLER( zaxxon_flipscreen_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* low bit controls flip; background and sprite flip are handled at render time */ flip_screen_set_no_update(space->machine, ~data & 1); @@ -195,7 +195,7 @@ WRITE8_HANDLER( zaxxon_flipscreen_w ) WRITE8_HANDLER( zaxxon_fg_color_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* low bit selects high color palette index */ state->fg_color = (data & 1) * 0x80; @@ -205,7 +205,7 @@ WRITE8_HANDLER( zaxxon_fg_color_w ) WRITE8_HANDLER( zaxxon_bg_position_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* 11 bits of scroll position are stored */ if (offset == 0) @@ -217,7 +217,7 @@ WRITE8_HANDLER( zaxxon_bg_position_w ) WRITE8_HANDLER( zaxxon_bg_color_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* low bit selects high color palette index */ state->bg_color = (data & 1) * 0x80; @@ -226,7 +226,7 @@ WRITE8_HANDLER( zaxxon_bg_color_w ) WRITE8_HANDLER( zaxxon_bg_enable_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* low bit enables/disables the background layer */ state->bg_enable = data & 1; @@ -235,7 +235,7 @@ WRITE8_HANDLER( zaxxon_bg_enable_w ) WRITE8_HANDLER( congo_fg_bank_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* low bit controls the topmost character bit */ state->congo_fg_bank = data & 1; @@ -245,7 +245,7 @@ WRITE8_HANDLER( congo_fg_bank_w ) WRITE8_HANDLER( congo_color_bank_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); /* low bit controls the topmost bit into the color PROM */ state->congo_color_bank = data & 1; @@ -262,7 +262,7 @@ WRITE8_HANDLER( congo_color_bank_w ) WRITE8_HANDLER( zaxxon_videoram_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -271,7 +271,7 @@ WRITE8_HANDLER( zaxxon_videoram_w ) WRITE8_HANDLER( congo_colorram_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); state->colorram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -287,7 +287,7 @@ WRITE8_HANDLER( congo_colorram_w ) WRITE8_HANDLER( congo_sprite_custom_w ) { - zaxxon_state *state = (zaxxon_state *)space->machine->driver_data; + zaxxon_state *state = space->machine->driver_data(); UINT8 *spriteram = state->spriteram; state->congo_custom[offset] = data; @@ -324,7 +324,7 @@ WRITE8_HANDLER( congo_sprite_custom_w ) static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int skew) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); /* only draw if enabled */ if (state->bg_enable) @@ -442,7 +442,7 @@ INLINE int find_minimum_x(UINT8 value, int flip) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT16 flipxmask, UINT16 flipymask) { - zaxxon_state *state = (zaxxon_state *)machine->driver_data; + zaxxon_state *state = machine->driver_data(); UINT8 *spriteram = state->spriteram; const gfx_element *gfx = machine->gfx[2]; int flip = flip_screen_get(machine); @@ -477,7 +477,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( zaxxon ) { - zaxxon_state *state = (zaxxon_state *)screen->machine->driver_data; + zaxxon_state *state = screen->machine->driver_data(); draw_background(screen->machine, bitmap, cliprect, TRUE); draw_sprites(screen->machine, bitmap, cliprect, 0x140, 0x180); @@ -488,7 +488,7 @@ VIDEO_UPDATE( zaxxon ) VIDEO_UPDATE( futspy ) { - zaxxon_state *state = (zaxxon_state *)screen->machine->driver_data; + zaxxon_state *state = screen->machine->driver_data(); draw_background(screen->machine, bitmap, cliprect, TRUE); draw_sprites(screen->machine, bitmap, cliprect, 0x180, 0x180); @@ -499,7 +499,7 @@ VIDEO_UPDATE( futspy ) VIDEO_UPDATE( razmataz ) { - zaxxon_state *state = (zaxxon_state *)screen->machine->driver_data; + zaxxon_state *state = screen->machine->driver_data(); draw_background(screen->machine, bitmap, cliprect, FALSE); draw_sprites(screen->machine, bitmap, cliprect, 0x140, 0x180); @@ -510,7 +510,7 @@ VIDEO_UPDATE( razmataz ) VIDEO_UPDATE( congo ) { - zaxxon_state *state = (zaxxon_state *)screen->machine->driver_data; + zaxxon_state *state = screen->machine->driver_data(); draw_background(screen->machine, bitmap, cliprect, TRUE); draw_sprites(screen->machine, bitmap, cliprect, 0x280, 0x180); diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c index a242a072d22..5b1041937dc 100644 --- a/src/mame/video/zerozone.c +++ b/src/mame/video/zerozone.c @@ -9,7 +9,7 @@ WRITE16_HANDLER( zerozone_tilemap_w ) { - zerozone_state *state = (zerozone_state *)space->machine->driver_data; + zerozone_state *state = space->machine->driver_data(); COMBINE_DATA(&state->videoram[offset]); tilemap_mark_tile_dirty(state->zz_tilemap,offset); @@ -18,7 +18,7 @@ WRITE16_HANDLER( zerozone_tilemap_w ) WRITE16_HANDLER(zerozone_tilebank_w) { - zerozone_state *state = (zerozone_state *)space->machine->driver_data; + zerozone_state *state = space->machine->driver_data(); // popmessage ("Data %04x",data); state->tilebank = data & 0x07; @@ -27,7 +27,7 @@ WRITE16_HANDLER(zerozone_tilebank_w) static TILE_GET_INFO( get_zerozone_tile_info ) { - zerozone_state *state = (zerozone_state *)machine->driver_data; + zerozone_state *state = machine->driver_data(); int tileno = state->videoram[tile_index] & 0x07ff; int colour = state->videoram[tile_index] & 0xf000; @@ -39,7 +39,7 @@ static TILE_GET_INFO( get_zerozone_tile_info ) VIDEO_START( zerozone ) { - zerozone_state *state = (zerozone_state *)machine->driver_data; + zerozone_state *state = machine->driver_data(); // i'm not 100% sure it should be opaque, pink title screen looks strange in las vegas girls // but if its transparent other things look incorrect @@ -48,7 +48,7 @@ VIDEO_START( zerozone ) VIDEO_UPDATE( zerozone ) { - zerozone_state *state = (zerozone_state *)screen->machine->driver_data; + zerozone_state *state = screen->machine->driver_data(); tilemap_draw(bitmap, cliprect, state->zz_tilemap, 0, 0); return 0; diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index b9e1fe7a46c..7a703be376e 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -11,7 +11,7 @@ WRITE8_HANDLER( zodiack_videoram_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->videoram[offset] = data; tilemap_mark_tile_dirty(state->fg_tilemap, offset); @@ -19,7 +19,7 @@ WRITE8_HANDLER( zodiack_videoram_w ) WRITE8_HANDLER( zodiack_videoram2_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); state->videoram_2[offset] = data; tilemap_mark_tile_dirty(state->bg_tilemap, offset); @@ -27,7 +27,7 @@ WRITE8_HANDLER( zodiack_videoram2_w ) WRITE8_HANDLER( zodiack_attributes_w ) { - espial_state *state = (espial_state *)space->machine->driver_data; + espial_state *state = space->machine->driver_data(); if ((offset & 1) && state->attributeram[offset] != data) { @@ -106,7 +106,7 @@ PALETTE_INIT( zodiack ) static TILE_GET_INFO( get_bg_tile_info ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); int code = state->videoram_2[tile_index]; int color = (state->attributeram[2 * (tile_index % 32) + 1] >> 4) & 0x07; @@ -116,7 +116,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); int code = state->videoram[tile_index]; int color = state->attributeram[2 * (tile_index % 32) + 1] & 0x07; @@ -126,7 +126,7 @@ static TILE_GET_INFO( get_fg_tile_info ) VIDEO_START( zodiack ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32); @@ -140,7 +140,7 @@ VIDEO_START( zodiack ) static void draw_bullets( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); int offs; for (offs = 0; offs < state->bulletsram_size; offs += 4) @@ -167,7 +167,7 @@ static void draw_bullets( running_machine *machine, bitmap_t *bitmap, const rect static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - espial_state *state = (espial_state *)machine->driver_data; + espial_state *state = machine->driver_data(); int offs; for (offs = state->spriteram_size - 4; offs >= 0; offs -= 4) @@ -197,7 +197,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect VIDEO_UPDATE( zodiack ) { - espial_state *state = (espial_state *)screen->machine->driver_data; + espial_state *state = screen->machine->driver_data(); int i; for (i = 0; i < 32; i++)