Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-04 03:46:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

konami hell resolve (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2013-04-13 14:25:45 +00:00
parent 58c73283d8
commit 3d158cc97b
92 changed files with 469 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/drivers/88games.c
View File

@ -298,10 +298,6 @@ static KONAMI_SETLINES_CALLBACK( k88games_banking )
void _88games_state::machine_start()
{
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k051316 = machine().device("k051316");
save_item(NAME(m_videobank));
save_item(NAME(m_zoomreadroms));
save_item(NAME(m_speech_chip));

9
src/mame/drivers/ajax.c
View File

@ -152,21 +152,20 @@ WRITE8_MEMBER(ajax_state::sound_bank_w)
WRITE8_MEMBER(ajax_state::volume_callback0)
{
k007232_set_volume(machine().device("k007232_1"), 0, (data >> 4) * 0x11, 0);
k007232_set_volume(machine().device("k007232_1"), 1, 0, (data & 0x0f) * 0x11);
k007232_set_volume(m_k007232_1, 0, (data >> 4) * 0x11, 0);
k007232_set_volume(m_k007232_1, 1, 0, (data & 0x0f) * 0x11);
}
WRITE8_MEMBER(ajax_state::k007232_extvol_w)
{
device_t *device = machine().device("k007232_2");
/* channel A volume (mono) */
k007232_set_volume(device, 0, (data & 0x0f) * 0x11/2, (data & 0x0f) * 0x11/2);
k007232_set_volume(m_k007232_2, 0, (data & 0x0f) * 0x11/2, (data & 0x0f) * 0x11/2);
}
WRITE8_MEMBER(ajax_state::volume_callback1)
{
/* channel B volume/pan */
k007232_set_volume(machine().device("k007232_2"), 1, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2);
k007232_set_volume(m_k007232_2, 1, (data & 0x0f) * 0x11/2, (data >> 4) * 0x11/2);
}
static const k007232_interface k007232_interface_1 =

4
src/mame/drivers/aliens.c
View File

@ -220,10 +220,6 @@ void aliens_state::machine_start()
membank("bank1")->configure_entries(0, 20, &ROM[0x10000], 0x2000);
membank("bank1")->set_entry(0);
m_k007232 = machine().device("k007232");
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
save_item(NAME(m_palette_selected));
}

8
src/mame/drivers/asterix.c
View File

@ -63,8 +63,7 @@ INTERRUPT_GEN_MEMBER(asterix_state::asterix_interrupt)
READ8_MEMBER(asterix_state::asterix_sound_r)
{
k053260_device *device = machine().device<k053260_device>("k053260");
return device->k053260_r(space, 2 + offset);
return m_k053260->k053260_r(space, 2 + offset);
}
TIMER_CALLBACK_MEMBER(asterix_state::nmi_callback)
@ -240,11 +239,6 @@ static const k05324x_interface asterix_k05324x_intf =
void asterix_state::machine_start()
{
m_k053260 = machine().device("k053260");
m_k056832 = machine().device("k056832");
m_k053244 = machine().device("k053244");
m_k053251 = machine().device("k053251");
save_item(NAME(m_cur_control2));
save_item(NAME(m_prot));

3
src/mame/drivers/battlnts.c
View File

@ -226,9 +226,6 @@ void battlnts_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
m_k007342 = machine().device("k007342");
m_k007420 = machine().device("k007420");
save_item(NAME(m_spritebank));
save_item(NAME(m_layer_colorbase));
}

4
src/mame/drivers/bishi.c
View File

@ -387,10 +387,6 @@ static const k054338_interface bishi_k054338_intf =
void bishi_state::machine_start()
{
m_k056832 = machine().device("k056832");
m_k054338 = machine().device("k054338");
m_k055555 = machine().device("k055555");
save_item(NAME(m_cur_control));
save_item(NAME(m_cur_control2));
}

3
src/mame/drivers/bladestl.c
View File

@ -301,9 +301,6 @@ void bladestl_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
m_k007342 = machine().device("k007342");
m_k007420 = machine().device("k007420");
save_item(NAME(m_spritebank));
save_item(NAME(m_layer_colorbase));
save_item(NAME(m_last_track));

3
src/mame/drivers/blockhl.c
View File

@ -186,9 +186,6 @@ void blockhl_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
save_item(NAME(m_palette_selected));
save_item(NAME(m_rombank));
}

6
src/mame/drivers/bottom9.c
View File

@ -315,12 +315,6 @@ void bottom9_state::machine_start()
membank("bank1")->configure_entries(0, 12, &ROM[0x10000], 0x2000);
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k051316 = machine().device("k051316");
m_k007232_1 = machine().device("k007232_1");
m_k007232_2 = machine().device("k007232_2");
save_item(NAME(m_video_enable));
save_item(NAME(m_zoomreadroms));
save_item(NAME(m_k052109_selected));

6
src/mame/drivers/chqflag.c
View File

@ -311,12 +311,6 @@ void chqflag_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
m_k051316_1 = machine().device("k051316_1");
m_k051316_2 = machine().device("k051316_2");
m_k051960 = machine().device("k051960");
m_k007232_1 = machine().device("k007232_1");
m_k007232_2 = machine().device("k007232_2");
save_item(NAME(m_k051316_readroms));
save_item(NAME(m_last_vreg));
save_item(NAME(m_analog_ctrl));

10
src/mame/drivers/cobra.c
View File

@ -607,13 +607,15 @@ public:
m_maincpu(*this, "maincpu"),
m_subcpu(*this, "subcpu"),
m_gfxcpu(*this, "gfxcpu"),
m_gfx_pagetable(*this, "pagetable")
m_gfx_pagetable(*this, "pagetable"),
m_k001604(*this, "k001604")
{ }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<cpu_device> m_gfxcpu;
required_shared_ptr<UINT64> m_gfx_pagetable;
required_device<k001604_device> m_k001604;
DECLARE_READ64_MEMBER(main_comram_r);
DECLARE_WRITE64_MEMBER(main_comram_w);
@ -1001,10 +1003,8 @@ UINT32 cobra_state::screen_update_cobra(screen_device &screen, bitmap_rgb32 &bit
{
if (m_has_psac)
{
device_t *k001604 = machine().device("k001604");
k001604_draw_back_layer(k001604, bitmap, cliprect);
k001604_draw_front_layer(k001604, bitmap, cliprect);
k001604_draw_back_layer(m_k001604, bitmap, cliprect);
k001604_draw_front_layer(m_k001604, bitmap, cliprect);
}
m_renderer->display(&bitmap, cliprect);

3
src/mame/drivers/combatsc.c
View File

@ -675,9 +675,6 @@ MACHINE_START_MEMBER(combatsc_state,combatsc)
m_interleave_timer = machine().scheduler().timer_alloc(FUNC_NULL);
m_k007121_1 = machine().device("k007121_1");
m_k007121_2 = machine().device("k007121_2");
membank("bank1")->configure_entries(0, 10, memregion("maincpu")->base() + 0x10000, 0x4000);
save_item(NAME(m_priority));

3
src/mame/drivers/contra.c
View File

@ -180,9 +180,6 @@ void contra_state::machine_start()
UINT8 *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000);
m_k007121_1 = machine().device("k007121_1");
m_k007121_2 = machine().device("k007121_2");
}
static MACHINE_CONFIG_START( contra, contra_state )

4
src/mame/drivers/crimfght.c
View File

@ -254,10 +254,6 @@ void crimfght_state::machine_start()
membank("bank2")->configure_entries(0, 12, &ROM[0x10000], 0x2000);
membank("bank2")->set_entry(0);
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k007232 = machine().device("k007232");
}
void crimfght_state::machine_reset()

6
src/mame/drivers/dbz.c
View File

@ -335,12 +335,6 @@ static const k053252_interface dbz_k053252_intf =
void dbz_state::machine_start()
{
m_k053936_1 = machine().device("k053936_1");
m_k053936_2 = machine().device("k053936_2");
m_k056832 = machine().device("k056832");
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
save_item(NAME(m_control));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_layerpri));

3
src/mame/drivers/djmain.c
View File

@ -205,9 +205,8 @@ WRITE32_MEMBER(djmain_state::v_ctrl_w)
READ32_MEMBER(djmain_state::v_rom_r)
{
device_t *k056832 = machine().device("k056832");
UINT8 *mem8 = memregion("gfx2")->base();
int bank = k056832_word_r(k056832, space, 0x34/2, 0xffff);
int bank = k056832_word_r(m_k056832, space, 0x34/2, 0xffff);
offset *= 2;

2
src/mame/drivers/f1gp.c
View File

@ -426,8 +426,6 @@ MACHINE_START_MEMBER(f1gp_state,f1gp)
membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x8000);
m_k053936 = machine().device("k053936");
MACHINE_START_CALL_MEMBER(f1gpb);
}

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

@ -208,7 +208,6 @@ void fastlane_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
m_konami2 = machine().device("konami2");
m_k007121 = machine().device("k007121");
}
static MACHINE_CONFIG_START( fastlane, fastlane_state )

2
src/mame/drivers/flkatck.c
View File

@ -195,8 +195,6 @@ void flkatck_state::machine_start()
membank("bank1")->configure_entries(0, 3, &ROM[0x10000], 0x2000);
m_k007121 = machine().device("k007121");
save_item(NAME(m_irq_enabled));
save_item(NAME(m_multiply_reg));
save_item(NAME(m_flipscreen));

7
src/mame/drivers/gbusters.c
View File

@ -100,10 +100,9 @@ WRITE8_MEMBER(gbusters_state::gbusters_sh_irqtrigger_w)
WRITE8_MEMBER(gbusters_state::gbusters_snd_bankswitch_w)
{
device_t *device = machine().device("k007232");
int bank_B = BIT(data, 2); /* ?? */
int bank_A = BIT(data, 0); /* ?? */
k007232_set_bank(device, bank_A, bank_B );
k007232_set_bank(m_k007232, bank_A, bank_B );
#if 0
{
@ -267,10 +266,6 @@ void gbusters_state::machine_start()
m_generic_paletteram_8.allocate(0x800);
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k007232 = machine().device("k007232");
save_item(NAME(m_palette_selected));
save_item(NAME(m_priority));
}

5
src/mame/drivers/gijoe.c
View File

@ -267,11 +267,6 @@ static const k053247_interface gijoe_k053247_intf =
void gijoe_state::machine_start()
{
m_k054539 = machine().device("k054539");
m_k056832 = machine().device("k056832");
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
m_dmadelay_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gijoe_state::dmaend_callback),this));
save_item(NAME(m_cur_control2));

7
src/mame/drivers/gradius3.c
View File

@ -137,13 +137,12 @@ WRITE16_MEMBER(gradius3_state::sound_irq_w)
WRITE8_MEMBER(gradius3_state::sound_bank_w)
{
device_t *device = machine().device("k007232");
int bank_A, bank_B;
/* banks # for the 007232 (chip 1) */
bank_A = ((data >> 0) & 0x03);
bank_B = ((data >> 2) & 0x03);
k007232_set_bank(device, bank_A, bank_B);
k007232_set_bank(m_k007232, bank_A, bank_B);
}
@ -281,10 +280,6 @@ static const k051960_interface gradius3_k051960_intf =
void gradius3_state::machine_start()
{
m_k007232 = machine().device("k007232");
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
save_item(NAME(m_irqAen));
save_item(NAME(m_irqBmask));
save_item(NAME(m_priority));

3
src/mame/drivers/hcastle.c
View File

@ -183,9 +183,6 @@ void hcastle_state::machine_start()
membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000);
m_k007121_1 = machine().device("k007121_1");
m_k007121_2 = machine().device("k007121_2");
save_item(NAME(m_pf2_bankbase));
save_item(NAME(m_pf1_bankbase));
save_item(NAME(m_gfx_bank));

27
src/mame/drivers/hornet.c
View File

@ -334,7 +334,9 @@ public:
m_sharc_dataram1(*this, "sharc_dataram1") ,
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_eeprom(*this, "eeprom") { }
m_eeprom(*this, "eeprom"),
m_k037122_1(*this, "k037122_1"),
m_k037122_2(*this, "k037122_2" ) { }
UINT8 m_led_reg0;
UINT8 m_led_reg1;
@ -381,6 +383,8 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<eeprom_device> m_eeprom;
optional_device<k037122_device> m_k037122_1;
optional_device<k037122_device> m_k037122_2;
};
@ -388,38 +392,38 @@ public:
READ32_MEMBER(hornet_state::hornet_k037122_sram_r)
{
device_t *k037122 = machine().device(get_cgboard_id() ? "k037122_2" : "k037122_1");
k037122_device *k037122 = get_cgboard_id() ? m_k037122_2 : m_k037122_1;
return k037122_sram_r(k037122, space, offset, mem_mask);
}
WRITE32_MEMBER(hornet_state::hornet_k037122_sram_w)
{
device_t *k037122 = machine().device(get_cgboard_id() ? "k037122_2" : "k037122_1");
k037122_device *k037122 = get_cgboard_id() ? m_k037122_2 : m_k037122_1;
k037122_sram_w(k037122, space, offset, data, mem_mask);
}
READ32_MEMBER(hornet_state::hornet_k037122_char_r)
{
device_t *k037122 = machine().device(get_cgboard_id() ? "k037122_2" : "k037122_1");
k037122_device *k037122 = get_cgboard_id() ? m_k037122_2 : m_k037122_1;
return k037122_char_r(k037122, space, offset, mem_mask);
}
WRITE32_MEMBER(hornet_state::hornet_k037122_char_w)
{
device_t *k037122 = machine().device(get_cgboard_id() ? "k037122_2" : "k037122_1");
k037122_device *k037122 = get_cgboard_id() ? m_k037122_2 : m_k037122_1;
k037122_char_w(k037122, space, offset, data, mem_mask);
}
READ32_MEMBER(hornet_state::hornet_k037122_reg_r)
{
device_t *k037122 = machine().device(get_cgboard_id() ? "k037122_2" : "k037122_1");
k037122_device *k037122 = get_cgboard_id() ? m_k037122_2 : m_k037122_1;
return k037122_reg_r(k037122, space, offset, mem_mask);
}
WRITE32_MEMBER(hornet_state::hornet_k037122_reg_w)
{
device_t *k037122 = machine().device(get_cgboard_id() ? "k037122_2" : "k037122_1");
k037122_device *k037122 = get_cgboard_id() ? m_k037122_2 : m_k037122_1;
k037122_reg_w(k037122, space, offset, data, mem_mask);
}
@ -435,11 +439,10 @@ static void voodoo_vblank_1(device_t *device, int param)
UINT32 hornet_state::screen_update_hornet(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
device_t *voodoo = machine().device("voodoo0");
device_t *k037122 = machine().device("k037122_1");
voodoo_update(voodoo, bitmap, cliprect);
k037122_tile_draw(k037122, bitmap, cliprect);
k037122_tile_draw(m_k037122_1, bitmap, cliprect);
draw_7segment_led(bitmap, 3, 3, m_led_reg0);
draw_7segment_led(bitmap, 9, 3, m_led_reg1);
@ -450,21 +453,19 @@ UINT32 hornet_state::screen_update_hornet_2board(screen_device &screen, bitmap_r
{
if (strcmp(screen.tag(), ":lscreen") == 0)
{
device_t *k037122 = machine().device("k037122_1");
device_t *voodoo = machine().device("voodoo0");
voodoo_update(voodoo, bitmap, cliprect);
/* TODO: tilemaps per screen */
k037122_tile_draw(k037122, bitmap, cliprect);
k037122_tile_draw(m_k037122_1, bitmap, cliprect);
}
else if (strcmp(screen.tag(), ":rscreen") == 0)
{
device_t *k037122 = machine().device("k037122_2");
device_t *voodoo = machine().device("voodoo1");
voodoo_update(voodoo, bitmap, cliprect);
/* TODO: tilemaps per screen */
k037122_tile_draw(k037122, bitmap, cliprect);
k037122_tile_draw(m_k037122_2, bitmap, cliprect);
}
draw_7segment_led(bitmap, 3, 3, m_led_reg0);

2
src/mame/drivers/labyrunr.c
View File

@ -186,8 +186,6 @@ void labyrunr_state::machine_start()
UINT8 *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 6, &ROM[0x10000], 0x4000);
m_k007121 = machine().device("k007121");
}
static MACHINE_CONFIG_START( labyrunr, labyrunr_state )

5
src/mame/drivers/lethal.c
View File

@ -581,11 +581,6 @@ void lethal_state::machine_start()
m_generic_paletteram_8.allocate(0x3800 + 0x02);
m_k054539 = machine().device("k054539");
m_k053244 = machine().device("k053244");
m_k056832 = machine().device("k056832");
m_k054000 = machine().device("k054000");
save_item(NAME(m_cur_control2));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_layer_colorbase));

7
src/mame/drivers/mainevt.c
View File

@ -115,7 +115,6 @@ WRITE8_MEMBER(mainevt_state::mainevt_sh_bankswitch_w)
WRITE8_MEMBER(mainevt_state::dv_sh_bankswitch_w)
{
device_t *device = machine().device("k007232");
int bank_A, bank_B;
//logerror("CPU #1 PC: %04x bank switch = %02x\n",space.device().safe_pc(),data);
@ -123,7 +122,7 @@ WRITE8_MEMBER(mainevt_state::dv_sh_bankswitch_w)
/* bits 0-3 select the 007232 banks */
bank_A = (data & 0x3);
bank_B = ((data >> 2) & 0x3);
k007232_set_bank(device, bank_A, bank_B);
k007232_set_bank(m_k007232, bank_A, bank_B);
}
READ8_MEMBER(mainevt_state::k052109_051960_r)
@ -407,10 +406,6 @@ void mainevt_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
m_k007232 = machine().device("k007232");
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
save_item(NAME(m_nmi_enable));
}

6
src/mame/drivers/moo.c
View File

@ -425,12 +425,6 @@ INPUT_PORTS_END
MACHINE_START_MEMBER(moo_state,moo)
{
m_k054539 = machine().device("k054539");
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
m_k056832 = machine().device("k056832");
m_k054338 = machine().device("k054338");
save_item(NAME(m_cur_control2));
save_item(NAME(m_alpha_enabled));
save_item(NAME(m_sprite_colorbase));

53
src/mame/drivers/nemesis.c
View File

@ -248,10 +248,9 @@ READ8_MEMBER(nemesis_state::nemesis_portA_r)
WRITE8_MEMBER(nemesis_state::city_sound_bank_w)
{
device_t *device = machine().device("k007232");
int bank_A = (data & 0x03);
int bank_B = ((data >> 2) & 0x03);
k007232_set_bank(device, bank_A, bank_B);
k007232_set_bank(m_k007232, bank_A, bank_B);
}
@ -392,11 +391,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, nemesis_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("k007232", k005289_device, k005289_pitch_A_w)
AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("k007232", k005289_device, k005289_pitch_B_w)
AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("k005289", k005289_device, k005289_pitch_A_w)
AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("k005289", k005289_device, k005289_pitch_B_w)
AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe003, 0xe003) AM_DEVWRITE("k007232", k005289_device, k005289_keylatch_A_w)
AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("k007232", k005289_device, k005289_keylatch_B_w)
AM_RANGE(0xe003, 0xe003) AM_DEVWRITE("k005289", k005289_device, k005289_keylatch_A_w)
AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("k005289", k005289_device, k005289_keylatch_B_w)
AM_RANGE(0xe005, 0xe005) AM_DEVWRITE_LEGACY("ay2", ay8910_address_w)
AM_RANGE(0xe006, 0xe006) AM_DEVWRITE_LEGACY("ay1", ay8910_address_w)
AM_RANGE(0xe086, 0xe086) AM_DEVREAD_LEGACY("ay1", ay8910_r)
@ -408,12 +407,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gx400_sound_map, AS_PROGRAM, 8, nemesis_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x87ff) AM_RAM AM_SHARE("gx400_shared")
AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("k007232", k005289_device, k005289_pitch_A_w)
AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("k007232", k005289_device, k005289_pitch_B_w)
AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("k005289", k005289_device, k005289_pitch_A_w)
AM_RANGE(0xc000, 0xcfff) AM_DEVWRITE("k005289", k005289_device, k005289_pitch_B_w)
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE_LEGACY("vlm", vlm5030_data_w)
AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_byte_r)
AM_RANGE(0xe003, 0xe003) AM_DEVWRITE("k007232", k005289_device, k005289_keylatch_A_w)
AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("k007232", k005289_device, k005289_keylatch_B_w)
AM_RANGE(0xe003, 0xe003) AM_DEVWRITE("k005289", k005289_device, k005289_keylatch_A_w)
AM_RANGE(0xe004, 0xe004) AM_DEVWRITE("k005289", k005289_device, k005289_keylatch_B_w)
AM_RANGE(0xe005, 0xe005) AM_DEVWRITE_LEGACY("ay2", ay8910_address_w)
AM_RANGE(0xe006, 0xe006) AM_DEVWRITE_LEGACY("ay1", ay8910_address_w)
AM_RANGE(0xe030, 0xe030) AM_WRITE(gx400_speech_start_w)
@ -1476,8 +1475,8 @@ static const ay8910_interface ay8910_interface_2 =
AY8910_DEFAULT_LOADS,
DEVCB_NULL,
DEVCB_NULL,
DEVCB_DEVICE_MEMBER("k007232", k005289_device, k005289_control_A_w),
DEVCB_DEVICE_MEMBER("k007232", k005289_device, k005289_control_B_w)
DEVCB_DEVICE_MEMBER("k005289", k005289_device, k005289_control_A_w),
DEVCB_DEVICE_MEMBER("k005289", k005289_device, k005289_control_B_w)
};
WRITE_LINE_MEMBER(nemesis_state::sound_irq)
@ -1494,8 +1493,8 @@ static const ym3812_interface ym3812_config =
WRITE8_MEMBER(nemesis_state::volume_callback)
{
k007232_set_volume(machine().device("k007232"), 0, (data >> 4) * 0x11, 0);
k007232_set_volume(machine().device("k007232"), 1, 0, (data & 0x0f) * 0x11);
k007232_set_volume(m_k007232, 0, (data >> 4) * 0x11, 0);
k007232_set_volume(m_k007232, 1, 0, (data & 0x0f) * 0x11);
}
static const k007232_interface k007232_config =
@ -1572,7 +1571,7 @@ static MACHINE_CONFIG_START( nemesis, nemesis_state )
MCFG_SOUND_CONFIG(ay8910_interface_2) /* fixed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
MCFG_K005289_ADD("k007232", 3579545/2)
MCFG_K005289_ADD("k005289", 3579545/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
@ -1615,7 +1614,7 @@ static MACHINE_CONFIG_START( gx400, nemesis_state )
MCFG_SOUND_CONFIG(ay8910_interface_2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
MCFG_K005289_ADD("k007232", 3579545/2)
MCFG_K005289_ADD("k005289", 3579545/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
@ -1657,7 +1656,7 @@ static MACHINE_CONFIG_START( konamigt, nemesis_state )
MCFG_SOUND_CONFIG(ay8910_interface_2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_K005289_ADD("k007232", 3579545/2)
MCFG_K005289_ADD("k005289", 3579545/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@ -1697,7 +1696,7 @@ static MACHINE_CONFIG_START( rf2_gx400, nemesis_state )
MCFG_SOUND_CONFIG(ay8910_interface_2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_K005289_ADD("k007232", 3579545/2)
MCFG_K005289_ADD("k005289", 3579545/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
@ -1948,7 +1947,7 @@ ROM_START( nemesis )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "456-d09.9c", 0x00000, 0x4000, CRC(26bf9636) SHA1(009dcbf18ea6230fc75a72232bd4fc29ad28dbf0) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -1967,7 +1966,7 @@ ROM_START( nemesisuk )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "456-b09.9c", 0x00000, 0x4000, CRC(26bf9636) SHA1(009dcbf18ea6230fc75a72232bd4fc29ad28dbf0) ) /* Labeled "B09" but same as above set */
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -1986,7 +1985,7 @@ ROM_START( konamigt )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "561-b09.9c", 0x00000, 0x4000, CRC(539d0c49) SHA1(4c16b07fbd876b6445fc0ec49c3ad5ab1a92cbf6) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -2001,7 +2000,7 @@ ROM_START( rf2 )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "400-e03.5l", 0x00000, 0x02000, CRC(a5a8e57d) SHA1(f4236770093392dec3f76835a5766e9b3ed64e2e) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -2016,7 +2015,7 @@ ROM_START( twinbee )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "400-e03.5l", 0x00000, 0x02000, CRC(a5a8e57d) SHA1(f4236770093392dec3f76835a5766e9b3ed64e2e) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -2031,7 +2030,7 @@ ROM_START( gradius )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "400-e03.5l", 0x00000, 0x2000, CRC(a5a8e57d) SHA1(f4236770093392dec3f76835a5766e9b3ed64e2e) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -2046,7 +2045,7 @@ ROM_START( gwarrior )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "400-e03.5l", 0x00000, 0x02000, CRC(a5a8e57d) SHA1(f4236770093392dec3f76835a5766e9b3ed64e2e) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400-a01.fse", 0x00000, 0x0100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400-a02.fse", 0x00100, 0x0100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )
ROM_END
@ -2666,7 +2665,7 @@ static MACHINE_CONFIG_START( bubsys, nemesis_state )
MCFG_SOUND_CONFIG(ay8910_interface_2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* verified with OST */
MCFG_SOUND_ADD("k007232", K005289, 3579545/2)
MCFG_SOUND_ADD("k005289", K005289, 3579545/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) /* verified with OST */
MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
@ -2685,7 +2684,7 @@ ROM_START( bubsys )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for sound */
ROM_LOAD( "400b03.8g", 0x00000, 0x2000, CRC(85c2afc5) SHA1(387842d02d50d0d78a27270e7267af19555b9e63) )
ROM_REGION( 0x0200, "k007232", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_REGION( 0x0200, "k005289", 0 ) /* 2x 256 byte for 0005289 wavetable data */
ROM_LOAD( "400a1.2b", 0x000, 0x100, CRC(5827b1e8) SHA1(fa8cf5f868cfb08bce203baaebb6c4055ee2a000) )
ROM_LOAD( "400a2.1b", 0x100, 0x100, CRC(2f44f970) SHA1(7ab46f9d5d587665782cefc623b8de0124a6d38a) )

7
src/mame/drivers/nwk-tr.c
View File

@ -233,7 +233,8 @@ public:
: driver_device(mconfig, type, tag),
m_work_ram(*this, "work_ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k001604(*this, "k001604") { }
UINT8 m_led_reg0;
UINT8 m_led_reg1;
@ -261,6 +262,7 @@ public:
void lanc2_init();
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<k001604_device> m_k001604;
};
@ -283,7 +285,6 @@ static void voodoo_vblank_0(device_t *device, int param)
UINT32 nwktr_state::screen_update_nwktr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
device_t *voodoo = machine().device("voodoo");
device_t *k001604 = machine().device("k001604");
bitmap.fill(machine().pens[0], cliprect);
@ -292,7 +293,7 @@ UINT32 nwktr_state::screen_update_nwktr(screen_device &screen, bitmap_rgb32 &bit
const rectangle &visarea = screen.visible_area();
const rectangle tilemap_rect(visarea.min_x, visarea.max_x, visarea.min_y+16, visarea.max_y);
k001604_draw_front_layer(k001604, bitmap, tilemap_rect);
k001604_draw_front_layer(m_k001604, bitmap, tilemap_rect);
draw_7segment_led(bitmap, 3, 3, m_led_reg0);
draw_7segment_led(bitmap, 9, 3, m_led_reg1);

13
src/mame/drivers/overdriv.c
View File

@ -133,14 +133,12 @@ WRITE16_MEMBER(overdriv_state::cpuB_ctrl_w)
READ8_MEMBER(overdriv_state::overdriv_1_sound_r)
{
k053260_device *device = machine().device<k053260_device>("k053260_1");
return device->k053260_r(space, 2 + offset);
return m_k053260_1->k053260_r(space, 2 + offset);
}
READ8_MEMBER(overdriv_state::overdriv_2_sound_r)
{
k053260_device *device = machine().device<k053260_device>("k053260_2");
return device->k053260_r(space, 2 + offset);
return m_k053260_2->k053260_r(space, 2 + offset);
}
WRITE16_MEMBER(overdriv_state::overdriv_soundirq_w)
@ -279,13 +277,6 @@ static const k051316_interface overdriv_k051316_intf_2 =
void overdriv_state::machine_start()
{
m_k051316_1 = machine().device("k051316_1");
m_k051316_2 = machine().device("k051316_2");
m_k053260_1 = machine().device("k053260_1");
m_k053260_2 = machine().device("k053260_2");
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
save_item(NAME(m_cpuB_ctrl));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_zoom_colorbase));

8
src/mame/drivers/parodius.c
View File

@ -95,8 +95,7 @@ WRITE8_MEMBER(parodius_state::parodius_3fc0_w)
READ8_MEMBER(parodius_state::parodius_sound_r)
{
k053260_device *device = machine().device<k053260_device>("k053260");
return device->k053260_r(space, 2 + offset);
return m_k053260->k053260_r(space, 2 + offset);
}
WRITE8_MEMBER(parodius_state::parodius_sh_irqtrigger_w)
@ -246,11 +245,6 @@ void parodius_state::machine_start()
m_generic_paletteram_8.allocate(0x1000);
m_k053260 = machine().device("k053260");
m_k053245 = machine().device("k053245");
m_k053251 = machine().device("k053251");
m_k052109 = machine().device("k052109");
save_item(NAME(m_videobank));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_layer_colorbase));

27
src/mame/drivers/qdrmfgp.c
View File

@ -116,9 +116,8 @@ WRITE16_MEMBER(qdrmfgp_state::gp2_control_w)
READ16_MEMBER(qdrmfgp_state::v_rom_r)
{
device_t *k056832 = machine().device("k056832");
UINT8 *mem8 = memregion("gfx1")->base();
int bank = k056832_word_r(k056832, space, 0x34/2, 0xffff);
int bank = k056832_word_r(m_k056832, space, 0x34/2, 0xffff);
offset += bank * 0x800 * 4;
@ -131,42 +130,34 @@ READ16_MEMBER(qdrmfgp_state::v_rom_r)
READ16_MEMBER(qdrmfgp_state::gp2_vram_r)
{
device_t *k056832 = machine().device("k056832");
if (offset < 0x1000 / 2)
return k056832_ram_word_r(k056832, space, offset * 2 + 1, mem_mask);
return k056832_ram_word_r(m_k056832, space, offset * 2 + 1, mem_mask);
else
return k056832_ram_word_r(k056832, space, (offset - 0x1000 / 2) * 2, mem_mask);
return k056832_ram_word_r(m_k056832, space, (offset - 0x1000 / 2) * 2, mem_mask);
}
READ16_MEMBER(qdrmfgp_state::gp2_vram_mirror_r)
{
device_t *k056832 = machine().device("k056832");
if (offset < 0x1000 / 2)
return k056832_ram_word_r(k056832, space, offset * 2, mem_mask);
return k056832_ram_word_r(m_k056832, space, offset * 2, mem_mask);
else
return k056832_ram_word_r(k056832, space, (offset - 0x1000 / 2) * 2 + 1, mem_mask);
return k056832_ram_word_r(m_k056832, space, (offset - 0x1000 / 2) * 2 + 1, mem_mask);
}
WRITE16_MEMBER(qdrmfgp_state::gp2_vram_w)
{
device_t *k056832 = machine().device("k056832");
if (offset < 0x1000 / 2)
k056832_ram_word_w(k056832, space, offset * 2 + 1, data, mem_mask);
k056832_ram_word_w(m_k056832, space, offset * 2 + 1, data, mem_mask);
else
k056832_ram_word_w(k056832, space, (offset - 0x1000 / 2) * 2, data, mem_mask);
k056832_ram_word_w(m_k056832, space, (offset - 0x1000 / 2) * 2, data, mem_mask);
}
WRITE16_MEMBER(qdrmfgp_state::gp2_vram_mirror_w)
{
device_t *k056832 = machine().device("k056832");
if (offset < 0x1000 / 2)
k056832_ram_word_w(k056832, space, offset * 2, data, mem_mask);
k056832_ram_word_w(m_k056832, space, offset * 2, data, mem_mask);
else
k056832_ram_word_w(k056832, space, (offset - 0x1000 / 2) * 2 + 1, data, mem_mask);
k056832_ram_word_w(m_k056832, space, (offset - 0x1000 / 2) * 2 + 1, data, mem_mask);
}

3
src/mame/drivers/rockrage.c
View File

@ -241,9 +241,6 @@ void rockrage_state::machine_start()
membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x2000);
m_k007342 = machine().device("k007342");
m_k007420 = machine().device("k007420");
save_item(NAME(m_vreg));
save_item(NAME(m_layer_colorbase));
}

7
src/mame/drivers/rollerg.c
View File

@ -51,8 +51,7 @@ READ8_MEMBER(rollerg_state::rollerg_sound_r)
{
/* If the sound CPU is running, read the status, otherwise
just make it pass the test */
k053260_device *device = machine().device<k053260_device>("k053260");
return device->k053260_r(space, 2 + offset);
return m_k053260->k053260_r(space, 2 + offset);
}
WRITE8_MEMBER(rollerg_state::soundirq_w)
@ -253,10 +252,6 @@ void rollerg_state::machine_start()
membank("bank1")->configure_entries(6, 2, &ROM[0x10000], 0x4000);
membank("bank1")->set_entry(0);
m_k053244 = machine().device("k053244");
m_k051316 = machine().device("k051316");
m_k053260 = machine().device("k053260");
save_item(NAME(m_readzoomroms));
}

8
src/mame/drivers/rungun.c
View File

@ -361,12 +361,6 @@ void rungun_state::machine_start()
membank("bank2")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
m_k053936 = machine().device("k053936");
m_k055673 = machine().device("k055673");
m_k053252 = machine().device("k053252");
m_k054539_1 = machine().device("k054539_1");
m_k054539_2 = machine().device("k054539_2");
save_item(NAME(m_z80_control));
save_item(NAME(m_sound_status));
save_item(NAME(m_ttl_vram));
@ -374,7 +368,7 @@ void rungun_state::machine_start()
void rungun_state::machine_reset()
{
machine().device<k054539_device>("k054539_1")->init_flags(k054539_device::REVERSE_STEREO);
m_k054539_1->init_flags(k054539_device::REVERSE_STEREO);
memset(m_sysreg, 0, 0x20);
memset(m_ttl_vram, 0, 0x1000 * sizeof(UINT16));

5
src/mame/drivers/spy.c
View File

@ -505,11 +505,6 @@ void spy_state::machine_start()
m_generic_paletteram_8.allocate(0x800);
memset(m_pmcram, 0, sizeof(m_pmcram));
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k007232_1 = machine().device("k007232_1");
m_k007232_2 = machine().device("k007232_2");
save_item(NAME(m_rambank));
save_item(NAME(m_pmcbank));
save_item(NAME(m_video_enable));

2
src/mame/drivers/suprslam.c
View File

@ -295,8 +295,6 @@ static const k053936_interface suprslam_k053936_intf =
void suprslam_state::machine_start()
{
m_k053936 = machine().device("k053936");
save_item(NAME(m_screen_bank));
save_item(NAME(m_bg_bank));
save_item(NAME(m_pending_command));

4
src/mame/drivers/surpratk.c
View File

@ -180,10 +180,6 @@ void surpratk_state::machine_start()
m_generic_paletteram_8.allocate(0x1000);
m_k053244 = machine().device("k053244");
m_k053251 = machine().device("k053251");
m_k052109 = machine().device("k052109");
save_item(NAME(m_videobank));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_layer_colorbase));

2
src/mame/drivers/tail2nos.c
View File

@ -210,8 +210,6 @@ void tail2nos_state::machine_start()
membank("bank3")->configure_entries(0, 2, &ROM[0x10000], 0x8000);
membank("bank3")->set_entry(0);
m_k051316 = machine().device("k051316");
save_item(NAME(m_charbank));
save_item(NAME(m_charpalette));
save_item(NAME(m_video_enable));

22
src/mame/drivers/tasman.c
View File

@ -46,13 +46,11 @@ VIDEO_START_MEMBER(kongambl_state,kongambl)
#if CUSTOM_DRAW
#else
device_t *k056832 = machine().device("k056832");
k056832_set_layer_association(k056832, 0);
k056832_set_layer_offs(k056832, 0, -2, 0);
k056832_set_layer_offs(k056832, 1, 2, 0);
k056832_set_layer_offs(k056832, 2, 4, 0);
k056832_set_layer_offs(k056832, 3, 6, 0);
k056832_set_layer_association(m_k056832, 0);
k056832_set_layer_offs(m_k056832, 0, -2, 0);
k056832_set_layer_offs(m_k056832, 1, 2, 0);
k056832_set_layer_offs(m_k056832, 2, 4, 0);
k056832_set_layer_offs(m_k056832, 3, 6, 0);
#endif
}
@ -94,15 +92,13 @@ UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind1
#else
device_t *k056832 = machine().device("k056832");
bitmap.fill(0, cliprect);
machine().priority_bitmap.fill(0, cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 3, 0, 0);
k056832_tilemap_draw(k056832, bitmap, cliprect, 2, 0, 0);
k056832_tilemap_draw(k056832, bitmap, cliprect, 1, 0, 0);
k056832_tilemap_draw(k056832, bitmap, cliprect, 0, 0, 0);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 3, 0, 0);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 2, 0, 0);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 1, 0, 0);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 0, 0, 0);
#endif
return 0;
}

7
src/mame/drivers/thunderx.c
View File

@ -352,13 +352,12 @@ WRITE8_MEMBER(thunderx_state::thunderx_sh_irqtrigger_w)
WRITE8_MEMBER(thunderx_state::scontra_snd_bankswitch_w)
{
device_t *device = machine().device("k007232");
/* b3-b2: bank for chanel B */
/* b1-b0: bank for chanel A */
int bank_A = (data & 0x03);
int bank_B = ((data >> 2) & 0x03);
k007232_set_bank(device, bank_A, bank_B);
k007232_set_bank(m_k007232, bank_A, bank_B);
}
READ8_MEMBER(thunderx_state::k052109_051960_r)
@ -599,10 +598,6 @@ MACHINE_START_MEMBER(thunderx_state,scontra)
{
m_generic_paletteram_8.allocate(0x800);
m_k007232 = machine().device("k007232");
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
save_item(NAME(m_priority));
save_item(NAME(m_1f98_data));
save_item(NAME(m_palette_selected));

19
src/mame/drivers/tmnt.c
View File

@ -187,14 +187,12 @@ READ8_MEMBER(tmnt_state::punkshot_sound_r)
{
/* If the sound CPU is running, read the status, otherwise
just make it pass the test */
k053260_device *device = machine().device<k053260_device>("k053260");
return device->k053260_r(space, 2 + offset);
return m_k053260->k053260_r(space, 2 + offset);
}
WRITE8_MEMBER(tmnt_state::glfgreat_sound_w)
{
k053260_device *device = machine().device<k053260_device>("k053260");
device->k053260_w(space, offset, data);
m_k053260->k053260_w(space, offset, data);
if (offset)
m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff);
@ -1139,12 +1137,12 @@ ADDRESS_MAP_END
READ8_MEMBER(tmnt_state::k054539_ctrl_r)
{
return machine().device<k054539_device>("k054539")->read(space, 0x200 + offset, 0xff);
return m_k054539->read(space, 0x200 + offset, 0xff);
}
WRITE8_MEMBER(tmnt_state::k054539_ctrl_w)
{
machine().device<k054539_device>("k054539")->write(space, 0x200 + offset, data, 0xff);
m_k054539->write(space, 0x200 + offset, data, 0xff);
}
static ADDRESS_MAP_START( prmrsocr_audio_map, AS_PROGRAM, 8, tmnt_state )
@ -2169,16 +2167,7 @@ static const k053936_interface prmrsocr_k053936_interface =
MACHINE_START_MEMBER(tmnt_state,common)
{
m_k007232 = machine().device("k007232");
m_k053260 = machine().device("k053260");
m_k054539 = machine().device("k054539");
m_samples = machine().device<samples_device>("samples");
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k053245 = machine().device("k053245");
m_k053251 = machine().device("k053251");
m_k053936 = machine().device("k053936");
m_k054000 = machine().device("k054000");
save_item(NAME(m_toggle));
save_item(NAME(m_last));

5
src/mame/drivers/ultraman.c
View File

@ -191,11 +191,6 @@ static const k051316_interface ultraman_k051316_intf_2 =
void ultraman_state::machine_start()
{
m_k051960 = machine().device("k051960");
m_k051316_1 = machine().device("k051316_1");
m_k051316_2 = machine().device("k051316_2");
m_k051316_3 = machine().device("k051316_3");
save_item(NAME(m_bank0));
save_item(NAME(m_bank1));
save_item(NAME(m_bank2));

15
src/mame/drivers/ultrsprt.c
View File

@ -24,7 +24,8 @@ public:
: driver_device(mconfig, type, tag),
m_vram(*this, "vram"),
m_workram(*this, "workram"),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_k056800(*this, "k056800") { }
required_shared_ptr<UINT32> m_vram;
required_shared_ptr<UINT32> m_workram;
@ -39,6 +40,7 @@ public:
UINT32 screen_update_ultrsprt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(ultrsprt_vblank);
required_device<cpu_device> m_maincpu;
required_device<k056800_device> m_k056800;
};
@ -135,27 +137,24 @@ ADDRESS_MAP_END
READ16_MEMBER(ultrsprt_state::K056800_68k_r)
{
device_t *k056800 = machine().device("k056800");
UINT16 r = 0;
if (ACCESSING_BITS_8_15)
r |= k056800_sound_r(k056800, space, (offset*2)+0, 0xffff) << 8;
r |= k056800_sound_r(m_k056800, space, (offset*2)+0, 0xffff) << 8;
if (ACCESSING_BITS_0_7)
r |= k056800_sound_r(k056800, space, (offset*2)+1, 0xffff) << 0;
r |= k056800_sound_r(m_k056800, space, (offset*2)+1, 0xffff) << 0;
return r;
}
WRITE16_MEMBER(ultrsprt_state::K056800_68k_w)
{
device_t *k056800 = machine().device("k056800");
if (ACCESSING_BITS_8_15)
k056800_sound_w(k056800, space, (offset*2)+0, (data >> 8) & 0xff, 0x00ff);
k056800_sound_w(m_k056800, space, (offset*2)+0, (data >> 8) & 0xff, 0x00ff);
if (ACCESSING_BITS_0_7)
k056800_sound_w(k056800, space, (offset*2)+1, (data >> 0) & 0xff, 0x00ff);
k056800_sound_w(m_k056800, space, (offset*2)+1, (data >> 0) & 0xff, 0x00ff);
}
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16, ultrsprt_state )

9
src/mame/drivers/vendetta.c
View File

@ -219,8 +219,7 @@ READ8_MEMBER(vendetta_state::vendetta_sound_interrupt_r)
READ8_MEMBER(vendetta_state::vendetta_sound_r)
{
k053260_device *device = machine().device<k053260_device>("k053260");
return device->k053260_r(space, 2 + offset);
return m_k053260->k053260_r(space, 2 + offset);
}
/********************************************/
@ -460,12 +459,6 @@ void vendetta_state::machine_start()
m_generic_paletteram_8.allocate(0x1000);
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
m_k052109 = machine().device("k052109");
m_k054000 = machine().device("k054000");
m_k053260 = machine().device("k053260");
save_item(NAME(m_irq_enabled));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_layer_colorbase));

9
src/mame/drivers/xexex.c
View File

@ -449,13 +449,6 @@ void xexex_state::machine_start()
membank("bank2")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
membank("bank2")->set_entry(0);
m_k053246 = machine().device("k053246");
m_k053250 = machine().device<k053250_device>("k053250");
m_k053251 = machine().device("k053251");
m_k053252 = machine().device("k053252");
m_k056832 = machine().device("k056832");
m_k054338 = machine().device("k054338");
m_k054539 = machine().device("k054539");
m_filter1l = machine().device<filter_volume_device>("filter1l");
m_filter1r = machine().device<filter_volume_device>("filter1r");
m_filter2l = machine().device<filter_volume_device>("filter2l");
@ -493,7 +486,7 @@ void xexex_state::machine_reset()
m_suspension_active = 0;
m_resume_trigger = 1000;
m_frame = -1;
machine().device<k054539_device>("k054539")->init_flags(k054539_device::REVERSE_STEREO);
m_k054539->init_flags(k054539_device::REVERSE_STEREO);
}
static MACHINE_CONFIG_START( xexex, xexex_state )

4
src/mame/drivers/xmen.c
View File

@ -296,10 +296,6 @@ void xmen_state::machine_start()
membank("bank4")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
membank("bank4")->set_entry(0);
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
m_k052109 = machine().device("k052109");
m_k054539 = machine().device("k054539");
m_lscreen = machine().device("lscreen");
m_rscreen = machine().device("rscreen");

35
src/mame/drivers/zr107.c
View File

@ -184,7 +184,9 @@ public:
: driver_device(mconfig, type, tag),
m_workram(*this, "workram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k001604(*this, "k001604"),
m_k056832(*this, "k056832") { }
UINT8 m_led_reg0;
UINT8 m_led_reg1;
@ -214,6 +216,8 @@ public:
TIMER_CALLBACK_MEMBER(irq_off);
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
optional_device<k001604_device> m_k001604;
optional_device<k056832_device> m_k056832;
};
@ -229,15 +233,13 @@ VIDEO_START_MEMBER(zr107_state,jetwave)
UINT32 zr107_state::screen_update_jetwave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
device_t *k001604 = machine().device("k001604");
bitmap.fill(machine().pens[0], cliprect);
k001604_draw_back_layer(k001604, bitmap, cliprect);
k001604_draw_back_layer(m_k001604, bitmap, cliprect);
K001005_draw(bitmap, cliprect);
k001604_draw_front_layer(k001604, bitmap, cliprect);
k001604_draw_front_layer(m_k001604, bitmap, cliprect);
draw_7segment_led(bitmap, 3, 3, m_led_reg0);
draw_7segment_led(bitmap, 9, 3, m_led_reg1);
@ -266,16 +268,14 @@ static void game_tile_callback(running_machine &machine, int layer, int *code, i
VIDEO_START_MEMBER(zr107_state,zr107)
{
device_t *k056832 = machine().device("k056832");
k056832_set_layer_offs(k056832, 0, -29, -27);
k056832_set_layer_offs(k056832, 1, -29, -27);
k056832_set_layer_offs(k056832, 2, -29, -27);
k056832_set_layer_offs(k056832, 3, -29, -27);
k056832_set_layer_offs(k056832, 4, -29, -27);
k056832_set_layer_offs(k056832, 5, -29, -27);
k056832_set_layer_offs(k056832, 6, -29, -27);
k056832_set_layer_offs(k056832, 7, -29, -27);
k056832_set_layer_offs(m_k056832, 0, -29, -27);
k056832_set_layer_offs(m_k056832, 1, -29, -27);
k056832_set_layer_offs(m_k056832, 2, -29, -27);
k056832_set_layer_offs(m_k056832, 3, -29, -27);
k056832_set_layer_offs(m_k056832, 4, -29, -27);
k056832_set_layer_offs(m_k056832, 5, -29, -27);
k056832_set_layer_offs(m_k056832, 6, -29, -27);
k056832_set_layer_offs(m_k056832, 7, -29, -27);
K001006_init(machine());
K001005_init(machine());
@ -283,12 +283,11 @@ VIDEO_START_MEMBER(zr107_state,zr107)
UINT32 zr107_state::screen_update_zr107(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
device_t *k056832 = machine().device("k056832");
bitmap.fill(machine().pens[0], cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 1, 0, 0);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 1, 0, 0);
K001005_draw(bitmap, cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 0, 0, 0);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 0, 0, 0);
draw_7segment_led(bitmap, 3, 3, m_led_reg0);
draw_7segment_led(bitmap, 9, 3, m_led_reg1);

9
src/mame/includes/88games.h
View File

@ -14,6 +14,9 @@ public:
m_paletteram_1000(*this, "paletteram_1000"),
m_ram(*this, "ram"),
m_audiocpu(*this, "audiocpu"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960"),
m_k051316(*this, "k051316"),
m_upd7759_1(*this, "upd1"),
m_upd7759_2(*this, "upd2"),
m_maincpu(*this, "maincpu") { }
@ -36,9 +39,9 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
device_t *m_k052109;
device_t *m_k051960;
device_t *m_k051316;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
required_device<k051316_device> m_k051316;
required_device<upd7759_device> m_upd7759_1;
required_device<upd7759_device> m_upd7759_2;
DECLARE_READ8_MEMBER(bankedram_r);

19
src/mame/includes/ajax.h
View File

@ -1,4 +1,4 @@
#include "sound/k007232.h"
class ajax_state : public driver_device
{
public:
@ -6,7 +6,12 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub") { }
m_subcpu(*this, "sub"),
m_k007232_1(*this, "k007232_1"),
m_k007232_2(*this, "k007232_2"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960"),
m_k051316(*this, "k051316") { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
@ -24,11 +29,11 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
device_t *m_k007232_1;
device_t *m_k007232_2;
device_t *m_k052109;
device_t *m_k051960;
device_t *m_k051316;
required_device<k007232_device> m_k007232_1;
required_device<k007232_device> m_k007232_2;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
required_device<k051316_device> m_k051316;
DECLARE_WRITE8_MEMBER(sound_bank_w);
DECLARE_READ8_MEMBER(ajax_ls138_f10_r);
DECLARE_WRITE8_MEMBER(ajax_ls138_f10_w);

12
src/mame/includes/aliens.h
View File

@ -3,6 +3,7 @@
Aliens
*************************************************************************/
#include "sound/k007232.h"
class aliens_state : public driver_device
{
@ -11,7 +12,10 @@ public:
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k007232(*this, "k007232"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -27,9 +31,9 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232;
device_t *m_k052109;
device_t *m_k051960;
required_device<k007232_device> m_k007232;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_READ8_MEMBER(bankedram_r);
DECLARE_WRITE8_MEMBER(bankedram_w);
DECLARE_WRITE8_MEMBER(aliens_coin_counter_w);

15
src/mame/includes/asterix.h
View File

@ -3,6 +3,7 @@
Asterix
*************************************************************************/
#include "sound/k053260.h"
class asterix_state : public driver_device
{
@ -10,7 +11,11 @@ public:
asterix_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k053260(*this, "k053260"),
m_k056832(*this, "k056832"),
m_k053244(*this, "k053244"),
m_k053251(*this, "k053251") { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
@ -30,10 +35,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053260;
device_t *m_k056832;
device_t *m_k053244;
device_t *m_k053251;
required_device<k053260_device> m_k053260;
required_device<k056832_device> m_k056832;
required_device<k05324x_device> m_k053244;
required_device<k053251_device> m_k053251;
DECLARE_READ16_MEMBER(control2_r);
DECLARE_WRITE16_MEMBER(control2_w);
DECLARE_WRITE8_MEMBER(sound_arm_nmi_w);

15
src/mame/includes/bishi.h
View File

@ -3,6 +3,7 @@
Bishi Bashi Champ Mini Game Senshuken
*************************************************************************/
#include "sound/k007232.h"
#define CPU_CLOCK (XTAL_24MHz / 2) /* 68000 clock */
#define SOUND_CLOCK XTAL_16_9344MHz /* YMZ280 clock */
@ -13,7 +14,11 @@ public:
bishi_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k007232(*this, "k007232"),
m_k056832(*this, "k056832"),
m_k054338(*this, "k054338"),
m_k055555(*this, "k055555") { }
/* memory pointers */
UINT8 * m_ram;
@ -29,10 +34,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
device_t *m_k007232;
device_t *m_k056832;
device_t *m_k054338;
device_t *m_k055555;
optional_device<k007232_device> m_k007232;
required_device<k056832_device> m_k056832;
required_device<k054338_device> m_k054338;
required_device<k055555_device> m_k055555;
DECLARE_READ16_MEMBER(control_r);
DECLARE_WRITE16_MEMBER(control_w);
DECLARE_WRITE16_MEMBER(control2_w);

8
src/mame/includes/blockhl.h
View File

@ -11,7 +11,9 @@ public:
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -28,8 +30,8 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k052109;
device_t *m_k051960;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_READ8_MEMBER(bankedram_r);
DECLARE_WRITE8_MEMBER(bankedram_w);
DECLARE_WRITE8_MEMBER(blockhl_sh_irqtrigger_w);

18
src/mame/includes/bottom9.h
View File

@ -3,6 +3,7 @@
Bottom of the Ninth
*************************************************************************/
#include "sound/k007232.h"
class bottom9_state : public driver_device
{
@ -10,7 +11,12 @@ public:
bottom9_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k007232_1(*this, "k007232_1"),
m_k007232_2(*this, "k007232_2"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960"),
m_k051316(*this, "k051316") { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
@ -29,11 +35,11 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232_1;
device_t *m_k007232_2;
device_t *m_k052109;
device_t *m_k051960;
device_t *m_k051316;
required_device<k007232_device> m_k007232_1;
required_device<k007232_device> m_k007232_2;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
required_device<k051316_device> m_k051316;
DECLARE_READ8_MEMBER(k052109_051960_r);
DECLARE_WRITE8_MEMBER(k052109_051960_w);
DECLARE_READ8_MEMBER(bottom9_bankedram1_r);

18
src/mame/includes/chqflag.h
View File

@ -3,6 +3,7 @@
Chequered Flag
*************************************************************************/
#include "sound/k007232.h"
class chqflag_state : public driver_device
{
@ -10,7 +11,12 @@ public:
chqflag_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k007232_1(*this, "k007232_1"),
m_k007232_2(*this, "k007232_2"),
m_k051960(*this, "k051960"),
m_k051316_1(*this, "k051316_1"),
m_k051316_2(*this, "k051316_2") { }
/* memory pointers */
UINT8 * m_ram;
@ -30,11 +36,11 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232_1;
device_t *m_k007232_2;
device_t *m_k051960;
device_t *m_k051316_1;
device_t *m_k051316_2;
required_device<k007232_device> m_k007232_1;
required_device<k007232_device> m_k007232_2;
required_device<k051960_device> m_k051960;
required_device<k051316_device> m_k051316_1;
required_device<k051316_device> m_k051316_2;
DECLARE_WRITE8_MEMBER(chqflag_bankswitch_w);
DECLARE_WRITE8_MEMBER(chqflag_vreg_w);
DECLARE_WRITE8_MEMBER(select_analog_ctrl_w);

12
src/mame/includes/crimfght.h
View File

@ -3,6 +3,7 @@
Crime Fighters
*************************************************************************/
#include "sound/k007232.h"
class crimfght_state : public driver_device
{
@ -10,7 +11,10 @@ public:
crimfght_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k007232(*this, "k007232"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
@ -22,9 +26,9 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232;
device_t *m_k052109;
device_t *m_k051960;
required_device<k007232_device> m_k007232;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_WRITE8_MEMBER(crimfght_coin_w);
DECLARE_WRITE8_MEMBER(crimfght_sh_irqtrigger_w);
DECLARE_READ8_MEMBER(k052109_051960_r);

18
src/mame/includes/dbz.h
View File

@ -3,6 +3,7 @@
Dragonball Z
*************************************************************************/
#include "video/konicdev.h"
class dbz_state : public driver_device
{
@ -12,7 +13,12 @@ public:
m_bg1_videoram(*this, "bg1_videoram"),
m_bg2_videoram(*this, "bg2_videoram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251"),
m_k056832(*this, "k056832"),
m_k053936_1(*this, "k053936_1"),
m_k053936_2(*this, "k053936_2") { }
/* memory pointers */
required_shared_ptr<UINT16> m_bg1_videoram;
@ -32,11 +38,11 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053246;
device_t *m_k053251;
device_t *m_k056832;
device_t *m_k053936_1;
device_t *m_k053936_2;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
required_device<k056832_device> m_k056832;
required_device<k053936_device> m_k053936_1;
required_device<k053936_device> m_k053936_2;
DECLARE_READ16_MEMBER(dbzcontrol_r);
DECLARE_WRITE16_MEMBER(dbzcontrol_w);
DECLARE_WRITE16_MEMBER(dbz_sound_command_w);

6
src/mame/includes/djmain.h
View File

@ -4,7 +4,9 @@ public:
djmain_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_obj_ram(*this, "obj_ram"),
m_maincpu(*this, "maincpu") { }
m_maincpu(*this, "maincpu"),
m_k056832(*this, "k056832"),
m_k055555(*this, "k055555") { }
int m_sndram_bank;
UINT8 *m_sndram;
@ -60,6 +62,8 @@ public:
void sndram_set_bank();
void draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<k056832_device> m_k056832;
required_device<k055555_device> m_k055555;
};
/*----------- defined in video/djmain.c -----------*/

3
src/mame/includes/f1gp.h
View File

@ -22,6 +22,7 @@ public:
m_spr_old2(*this, "vsystem_spr_ol2"),
m_spr(*this, "vsystem_spr"),
m_audiocpu(*this, "audiocpu"),
m_k053936(*this, "k053936"),
m_maincpu(*this, "maincpu") { }
/* memory pointers */
@ -63,7 +64,7 @@ public:
/* devices */
optional_device<cpu_device> m_audiocpu;
device_t *m_k053936;
optional_device<k053936_device> m_k053936;
DECLARE_READ16_MEMBER(sharedram_r);
DECLARE_WRITE16_MEMBER(sharedram_w);
DECLARE_READ16_MEMBER(extrarom_r);

13
src/mame/includes/gbusters.h
View File

@ -4,6 +4,8 @@
*************************************************************************/
#include "sound/k007232.h"
class gbusters_state : public driver_device
{
public:
@ -11,7 +13,10 @@ public:
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k007232(*this, "k007232"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -27,9 +32,9 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232;
device_t *m_k052109;
device_t *m_k051960;
required_device<k007232_device> m_k007232;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_READ8_MEMBER(bankedram_r);
DECLARE_WRITE8_MEMBER(bankedram_w);
DECLARE_WRITE8_MEMBER(gbusters_1f98_w);

15
src/mame/includes/gijoe.h
View File

@ -3,6 +3,7 @@
GI Joe
*************************************************************************/
#include "sound/k054539.h"
class gijoe_state : public driver_device
{
@ -12,7 +13,11 @@ public:
m_spriteram(*this, "spriteram"),
m_workram(*this, "workram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k054539(*this, "k054539"),
m_k056832(*this, "k056832"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251") { }
/* memory pointers */
required_shared_ptr<UINT16> m_spriteram;
@ -34,10 +39,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k054539;
device_t *m_k056832;
device_t *m_k053246;
device_t *m_k053251;
required_device<k054539_device> m_k054539;
required_device<k056832_device> m_k056832;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
DECLARE_READ16_MEMBER(control2_r);
DECLARE_WRITE16_MEMBER(control2_w);
DECLARE_WRITE16_MEMBER(sound_cmd_w);

12
src/mame/includes/gradius3.h
View File

@ -3,6 +3,7 @@
Gradius 3
*************************************************************************/
#include "sound/k007232.h"
class gradius3_state : public driver_device
{
@ -12,7 +13,10 @@ public:
m_gfxram(*this, "gfxram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub"){ }
m_subcpu(*this, "sub"),
m_k007232(*this, "k007232"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
required_shared_ptr<UINT16> m_gfxram;
@ -31,9 +35,9 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
device_t *m_k007232;
device_t *m_k052109;
device_t *m_k051960;
required_device<k007232_device> m_k007232;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_READ16_MEMBER(k052109_halfword_r);
DECLARE_WRITE16_MEMBER(k052109_halfword_w);
DECLARE_READ16_MEMBER(k051937_halfword_r);

15
src/mame/includes/lethal.h
View File

@ -3,6 +3,7 @@
Lethal Enforcers
*************************************************************************/
#include "sound/k054539.h"
class lethal_state : public driver_device
{
@ -10,7 +11,11 @@ public:
lethal_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu") { }
m_soundcpu(*this, "soundcpu"),
m_k054539(*this, "k054539"),
m_k056832(*this, "k056832"),
m_k053244(*this, "k053244"),
m_k054000(*this, "k054000") { }
/* video-related */
int m_layer_colorbase[4];
@ -22,10 +27,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
device_t *m_k054539;
device_t *m_k056832;
device_t *m_k053244;
device_t *m_k054000;
required_device<k054539_device> m_k054539;
required_device<k056832_device> m_k056832;
required_device<k05324x_device> m_k053244;
required_device<k054000_device> m_k054000;
DECLARE_WRITE8_MEMBER(control2_w);
DECLARE_WRITE8_MEMBER(sound_cmd_w);
DECLARE_WRITE8_MEMBER(sound_irq_w);

12
src/mame/includes/mainevt.h
View File

@ -4,6 +4,7 @@
*************************************************************************/
#include "sound/upd7759.h"
#include "sound/k007232.h"
class mainevt_state : public driver_device
{
@ -12,7 +13,10 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_upd7759(*this, "upd") { }
m_upd7759(*this, "upd"),
m_k007232(*this, "k007232"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
@ -29,9 +33,9 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
optional_device<upd7759_device> m_upd7759;
device_t *m_k007232;
device_t *m_k052109;
device_t *m_k051960;
required_device<k007232_device> m_k007232;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_WRITE8_MEMBER(dv_nmienable_w);
DECLARE_WRITE8_MEMBER(mainevt_bankswitch_w);
DECLARE_WRITE8_MEMBER(mainevt_coin_w);

18
src/mame/includes/moo.h
View File

@ -4,6 +4,7 @@
*************************************************************************/
#include "sound/okim6295.h"
#include "sound/k054539.h"
class moo_state : public driver_device
{
@ -14,7 +15,12 @@ public:
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"),
m_oki(*this, "oki"){ }
m_oki(*this, "oki"),
m_k054539(*this, "k054539"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251"),
m_k056832(*this, "k056832"),
m_k054338(*this, "k054338") { }
/* memory pointers */
optional_shared_ptr<UINT16> m_workram;
@ -36,11 +42,11 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_soundcpu;
optional_device<okim6295_device> m_oki;
device_t *m_k054539;
device_t *m_k053246;
device_t *m_k053251;
device_t *m_k056832;
device_t *m_k054338;
optional_device<k054539_device> m_k054539;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
required_device<k056832_device> m_k056832;
required_device<k054338_device> m_k054338;
emu_timer *m_dmaend_timer;
DECLARE_READ16_MEMBER(control2_r);

7
src/mame/includes/nemesis.h
View File

@ -1,3 +1,6 @@
#include "sound/k007232.h"
#include "sound/k005289.h"
class nemesis_state : public driver_device
{
public:
@ -15,6 +18,8 @@ public:
m_spriteram(*this, "spriteram"),
m_paletteram(*this, "paletteram"),
m_gx400_shared_ram(*this, "gx400_shared"),
m_k007232(*this, "k007232"),
m_k005289(*this, "k005289"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
@ -31,6 +36,8 @@ public:
required_shared_ptr<UINT16> m_spriteram;
required_shared_ptr<UINT16> m_paletteram;
optional_shared_ptr<UINT8> m_gx400_shared_ram;
optional_device<k007232_device> m_k007232;
optional_device<k005289_device> m_k005289;
/* video-related */
tilemap_t *m_background;

21
src/mame/includes/overdriv.h
View File

@ -3,6 +3,7 @@
Over Drive
*************************************************************************/
#include "sound/k053260.h"
class overdriv_state : public driver_device
{
@ -11,7 +12,13 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_subcpu(*this, "sub"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k053260_1(*this, "k053260_1"),
m_k053260_2(*this, "k053260_2"),
m_k051316_1(*this, "k051316_1"),
m_k051316_2(*this, "k051316_2"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251") { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
@ -28,12 +35,12 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053260_1;
device_t *m_k053260_2;
device_t *m_k051316_1;
device_t *m_k051316_2;
device_t *m_k053246;
device_t *m_k053251;
required_device<k053260_device> m_k053260_1;
required_device<k053260_device> m_k053260_2;
required_device<k051316_device> m_k051316_1;
required_device<k051316_device> m_k051316_2;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
DECLARE_WRITE16_MEMBER(eeprom_w);
DECLARE_WRITE16_MEMBER(cpuA_ctrl_w);
DECLARE_READ16_MEMBER(cpuB_ctrl_r);

15
src/mame/includes/parodius.h
View File

@ -3,6 +3,7 @@
Parodius
*************************************************************************/
#include "sound/k053260.h"
class parodius_state : public driver_device
{
@ -11,7 +12,11 @@ public:
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k053260(*this, "k053260"),
m_k052109(*this, "k052109"),
m_k053245(*this, "k053245"),
m_k053251(*this, "k053251") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -29,10 +34,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053260;
device_t *m_k052109;
device_t *m_k053245;
device_t *m_k053251;
required_device<k053260_device> m_k053260;
required_device<k052109_device> m_k052109;
required_device<k05324x_device> m_k053245;
required_device<k053251_device> m_k053251;
DECLARE_READ8_MEMBER(bankedram_r);
DECLARE_WRITE8_MEMBER(bankedram_w);
DECLARE_READ8_MEMBER(parodius_052109_053245_r);

4
src/mame/includes/plygonet.h
View File

@ -16,7 +16,8 @@ public:
m_dsp56k_p_8000(*this, "dsp56k_p_8000"),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"),
m_eeprom(*this, "eeprom") { }
m_eeprom(*this, "eeprom"),
m_k053936(*this, "k053936") { }
/* 68k-side shared ram */
required_shared_ptr<UINT32> m_shared_ram;
@ -84,4 +85,5 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
required_device<eeprom_device> m_eeprom;
required_device<k053936_device> m_k053936;
};

4
src/mame/includes/qdrmfgp.h
View File

@ -5,12 +5,14 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_nvram(*this, "nvram"),
m_workram(*this, "workram"){ }
m_workram(*this, "workram"),
m_k056832(*this, "k056832") { }
required_device<cpu_device> m_maincpu;
required_shared_ptr<UINT16> m_nvram;
UINT8 *m_sndram;
required_shared_ptr<UINT16> m_workram;
required_device<k056832_device> m_k056832;
UINT16 m_control;
INT32 m_gp2_irq_control;
INT32 m_pal;

12
src/mame/includes/rollerg.h
View File

@ -3,6 +3,7 @@
Rollergames
*************************************************************************/
#include "sound/k053260.h"
class rollerg_state : public driver_device
{
@ -10,7 +11,10 @@ public:
rollerg_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k053260(*this, "k053260"),
m_k053244(*this, "k053244"),
m_k051316(*this, "k051316") { }
/* memory pointers */
// UINT8 * m_paletteram; // currently this uses generic palette handling
@ -25,9 +29,9 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053260;
device_t *m_k053244;
device_t *m_k051316;
required_device<k053260_device> m_k053260;
required_device<k05324x_device> m_k053244;
required_device<k051316_device> m_k051316;
DECLARE_WRITE8_MEMBER(rollerg_0010_w);
DECLARE_READ8_MEMBER(rollerg_k051316_r);
DECLARE_WRITE8_MEMBER(soundirq_w);

19
src/mame/includes/rungun.h
View File

@ -3,6 +3,8 @@
Run and Gun / Slam Dunk
*************************************************************************/
#include "sound/k054539.h"
#include "machine/k053252.h"
class rungun_state : public driver_device
{
@ -12,7 +14,12 @@ public:
m_sysreg(*this, "sysreg"),
m_936_videoram(*this, "936_videoram"),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"){ }
m_soundcpu(*this, "soundcpu"),
m_k054539_1(*this, "k054539_1"),
m_k054539_2(*this, "k054539_2"),
m_k053936(*this, "k053936"),
m_k055673(*this, "k055673"),
m_k053252(*this, "k053252") { }
/* memory pointers */
required_shared_ptr<UINT16> m_sysreg;
@ -33,11 +40,11 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
device_t *m_k054539_1;
device_t *m_k054539_2;
device_t *m_k053936;
device_t *m_k055673;
device_t *m_k053252;
required_device<k054539_device> m_k054539_1;
required_device<k054539_device> m_k054539_2;
required_device<k053936_device> m_k053936;
required_device<k055673_device> m_k055673;
required_device<k053252_device> m_k053252;
DECLARE_READ16_MEMBER(rng_sysregs_r);
DECLARE_WRITE16_MEMBER(rng_sysregs_w);
DECLARE_WRITE16_MEMBER(sound_cmd1_w);

15
src/mame/includes/simpsons.h
View File

@ -1,3 +1,4 @@
#include "sound/k053260.h"
class simpsons_state : public driver_device
{
@ -5,7 +6,11 @@ public:
simpsons_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k053260(*this, "k053260"),
m_k052109(*this, "k052109"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251") { }
/* memory pointers */
UINT8 * m_ram;
@ -26,10 +31,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053260;
device_t *m_k052109;
device_t *m_k053246;
device_t *m_k053251;
required_device<k053260_device> m_k053260;
required_device<k052109_device> m_k052109;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
DECLARE_WRITE8_MEMBER(z80_bankswitch_w);
DECLARE_WRITE8_MEMBER(z80_arm_nmi_w);
DECLARE_WRITE8_MEMBER(simpsons_eeprom_w);

15
src/mame/includes/spy.h
View File

@ -3,6 +3,7 @@
S.P.Y.
*************************************************************************/
#include "sound/k007232.h"
class spy_state : public driver_device
{
@ -11,7 +12,11 @@ public:
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k007232_1(*this, "k007232_1"),
m_k007232_2(*this, "k007232_2"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -31,10 +36,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232_1;
device_t *m_k007232_2;
device_t *m_k052109;
device_t *m_k051960;
required_device<k007232_device> m_k007232_1;
required_device<k007232_device> m_k007232_2;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_READ8_MEMBER(spy_bankedram1_r);
DECLARE_WRITE8_MEMBER(spy_bankedram1_w);
DECLARE_WRITE8_MEMBER(bankswitch_w);

3
src/mame/includes/suprslam.h
View File

@ -17,6 +17,7 @@ public:
m_screen_vregs(*this, "screen_vregs"),
m_spr(*this, "vsystem_spr"),
m_audiocpu(*this, "audiocpu"),
m_k053936(*this, "k053936"),
m_maincpu(*this, "maincpu") { }
/* memory pointers */
@ -41,7 +42,7 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
device_t *m_k053936;
required_device<k053936_device> m_k053936;
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_READ16_MEMBER(pending_command_r);
DECLARE_WRITE8_MEMBER(pending_command_clear_w);

11
src/mame/includes/surpratk.h
View File

@ -10,7 +10,10 @@ public:
surpratk_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"){ }
m_maincpu(*this, "maincpu"),
m_k052109(*this, "k052109"),
m_k053244(*this, "k053244"),
m_k053251(*this, "k053251") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -26,9 +29,9 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
device_t *m_k052109;
device_t *m_k053244;
device_t *m_k053251;
required_device<k052109_device> m_k052109;
required_device<k05324x_device> m_k053244;
required_device<k053251_device> m_k053251;
DECLARE_READ8_MEMBER(bankedram_r);
DECLARE_WRITE8_MEMBER(bankedram_w);
DECLARE_WRITE8_MEMBER(surpratk_videobank_w);

5
src/mame/includes/tail2nos.h
View File

@ -12,7 +12,8 @@ public:
m_bgvideoram(*this, "bgvideoram"),
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k051316(*this, "k051316") { }
/* memory pointers */
required_shared_ptr<UINT16> m_bgvideoram;
@ -29,7 +30,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k051316;
required_device<k051316_device> m_k051316;
DECLARE_WRITE16_MEMBER(sound_command_w);
DECLARE_WRITE16_MEMBER(tail2nos_bgvideoram_w);
DECLARE_READ16_MEMBER(tail2nos_zoomdata_r);

12
src/mame/includes/thunderx.h
View File

@ -3,6 +3,7 @@
Super Contra / Thunder Cross
*************************************************************************/
#include "sound/k007232.h"
class thunderx_state : public driver_device
{
@ -11,7 +12,10 @@ public:
: driver_device(mconfig, type, tag),
m_ram(*this, "ram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k007232(*this, "k007232"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960") { }
/* memory pointers */
required_shared_ptr<UINT8> m_ram;
@ -32,9 +36,9 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k007232;
device_t *m_k052109;
device_t *m_k051960;
optional_device<k007232_device> m_k007232;
required_device<k052109_device> m_k052109;
required_device<k051960_device> m_k051960;
DECLARE_READ8_MEMBER(scontra_bankedram_r);
DECLARE_WRITE8_MEMBER(scontra_bankedram_w);
DECLARE_READ8_MEMBER(thunderx_bankedram_r);

30
src/mame/includes/tmnt.h
View File

@ -1,5 +1,8 @@
#include "sound/samples.h"
#include "sound/upd7759.h"
#include "sound/k007232.h"
#include "sound/k053260.h"
#include "sound/k054539.h"
class tmnt_state : public driver_device
{
@ -12,6 +15,15 @@ public:
m_tmnt2_1c0800(*this, "tmnt2_1c0800"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_k007232(*this, "k007232"),
m_k053260(*this, "k053260"),
m_k054539(*this, "k054539"),
m_k052109(*this, "k052109"),
m_k051960(*this, "k051960"),
m_k053245(*this, "k053245"),
m_k053251(*this, "k053251"),
m_k053936(*this, "k053936"),
m_k054000(*this, "k054000"),
m_upd7759(*this, "upd"){ }
/* memory pointers */
@ -53,15 +65,15 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
device_t *m_k007232;
device_t *m_k053260;
device_t *m_k054539;
device_t *m_k052109;
device_t *m_k051960;
device_t *m_k053245;
device_t *m_k053251;
device_t *m_k053936;
device_t *m_k054000;
optional_device<k007232_device> m_k007232;
optional_device<k053260_device> m_k053260;
optional_device<k054539_device> m_k054539;
required_device<k052109_device> m_k052109;
optional_device<k051960_device> m_k051960;
optional_device<k05324x_device> m_k053245;
optional_device<k053251_device> m_k053251;
optional_device<k053936_device> m_k053936;
optional_device<k054000_device> m_k054000;
optional_device<upd7759_device> m_upd7759;
samples_device *m_samples;

14
src/mame/includes/ultraman.h
View File

@ -10,7 +10,11 @@ public:
ultraman_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k051316_1(*this, "k051316_1"),
m_k051316_2(*this, "k051316_2"),
m_k051316_3(*this, "k051316_3"),
m_k051960(*this, "k051960") { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
@ -25,10 +29,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k051316_1;
device_t *m_k051316_2;
device_t *m_k051316_3;
device_t *m_k051960;
required_device<k051316_device> m_k051316_1;
required_device<k051316_device> m_k051316_2;
required_device<k051316_device> m_k051316_3;
required_device<k051960_device> m_k051960;
DECLARE_WRITE16_MEMBER(sound_cmd_w);
DECLARE_WRITE16_MEMBER(sound_irq_trigger_w);
DECLARE_WRITE16_MEMBER(ultraman_gfxctrl_w);

18
src/mame/includes/vendetta.h
View File

@ -3,6 +3,7 @@
Vendetta
*************************************************************************/
#include "sound/k053260.h"
class vendetta_state : public driver_device
{
@ -10,7 +11,12 @@ public:
vendetta_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k053260(*this, "k053260"),
m_k052109(*this, "k052109"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251"),
m_k054000(*this, "k054000") { }
/* memory pointers */
UINT8 * m_ram;
@ -28,11 +34,11 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k053260;
device_t *m_k052109;
device_t *m_k053246;
device_t *m_k053251;
device_t *m_k054000;
required_device<k053260_device> m_k053260;
required_device<k052109_device> m_k052109;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
optional_device<k054000_device> m_k054000;
DECLARE_WRITE8_MEMBER(vendetta_eeprom_w);
DECLARE_READ8_MEMBER(vendetta_K052109_r);
DECLARE_WRITE8_MEMBER(vendetta_K052109_w);

6
src/mame/includes/wecleman.h
View File

@ -12,7 +12,9 @@ public:
m_roadram(*this, "roadram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub") { }
m_subcpu(*this, "sub"),
m_k051316_1(*this, "k051316_1"),
m_k051316_2(*this, "k051316_2") { }
optional_shared_ptr<UINT16> m_videostatus;
optional_shared_ptr<UINT16> m_protection_ram;
@ -90,6 +92,8 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
optional_device<k051316_device> m_k051316_1;
optional_device<k051316_device> m_k051316_2;
};
/*----------- defined in video/wecleman.c -----------*/

25
src/mame/includes/xexex.h
View File

@ -6,6 +6,8 @@
#include <video/k053250.h>
#include <sound/flt_vol.h>
#include "sound/k054539.h"
#include "machine/k053252.h"
class xexex_state : public driver_device
{
@ -15,7 +17,14 @@ public:
m_workram(*this, "workram"),
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"){ }
m_audiocpu(*this, "audiocpu"),
m_k054539(*this, "k054539"),
m_k056832(*this, "k056832"),
m_k053246(*this, "k053246"),
m_k053250(*this, "k053250"),
m_k053251(*this, "k053251"),
m_k053252(*this, "k053252"),
m_k054338(*this, "k054338") { }
/* memory pointers */
required_shared_ptr<UINT16> m_workram;
@ -40,17 +49,17 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k054539;
required_device<k054539_device> m_k054539;
filter_volume_device *m_filter1l;
filter_volume_device *m_filter1r;
filter_volume_device *m_filter2l;
filter_volume_device *m_filter2r;
device_t *m_k056832;
device_t *m_k053246;
k053250_device *m_k053250;
device_t *m_k053251;
device_t *m_k053252;
device_t *m_k054338;
required_device<k056832_device> m_k056832;
required_device<k053247_device> m_k053246;
required_device<k053250_device> m_k053250;
required_device<k053251_device> m_k053251;
required_device<k053252_device> m_k053252;
required_device<k054338_device> m_k054338;
DECLARE_READ16_MEMBER(K053247_scattered_word_r);
DECLARE_WRITE16_MEMBER(K053247_scattered_word_w);
DECLARE_READ16_MEMBER(spriteram_mirror_r);

15
src/mame/includes/xmen.h
View File

@ -1,3 +1,4 @@
#include "sound/k054539.h"
class xmen_state : public driver_device
{
@ -9,7 +10,11 @@ public:
m_xmen6p_tilemapleft(*this, "tilemapleft"),
m_xmen6p_tilemapright(*this, "tilemapright"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu") { }
m_audiocpu(*this, "audiocpu"),
m_k054539(*this, "k054539"),
m_k052109(*this, "k052109"),
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251") { }
/* memory pointers */
// UINT16 * m_paletteram; // currently this uses generic palette handling
@ -35,10 +40,10 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
device_t *m_k054539;
device_t *m_k052109;
device_t *m_k053246;
device_t *m_k053251;
required_device<k054539_device> m_k054539;
required_device<k052109_device> m_k052109;
required_device<k053247_device> m_k053246;
required_device<k053251_device> m_k053251;
device_t *m_lscreen;
device_t *m_rscreen;
DECLARE_WRITE16_MEMBER(eeprom_w);

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

@ -203,12 +203,6 @@ void ajax_state::machine_start()
membank("bank1")->set_entry(0);
membank("bank2")->set_entry(0);
m_k007232_1 = machine().device("k007232_1");
m_k007232_2 = machine().device("k007232_2");
m_k052109 = machine().device("k052109");
m_k051960 = machine().device("k051960");
m_k051316 = machine().device("k051316");
save_item(NAME(m_priority));
save_item(NAME(m_firq_enable));
}

7
src/mame/machine/simpsons.c
View File

@ -51,7 +51,7 @@ READ8_MEMBER(simpsons_state::simpsons_sound_interrupt_r)
READ8_MEMBER(simpsons_state::simpsons_sound_r)
{
return machine().device<k053260_device>("k053260")->k053260_r(space, 2 + offset);
return m_k053260->k053260_r(space, 2 + offset);
}
@ -77,11 +77,6 @@ void simpsons_state::machine_start()
m_xtraram = auto_alloc_array_clear(machine(), UINT8, 0x1000);
m_spriteram = auto_alloc_array_clear(machine(), UINT16, 0x1000 / 2);
m_k053260 = machine().device("k053260");
m_k052109 = machine().device("k052109");
m_k053246 = machine().device("k053246");
m_k053251 = machine().device("k053251");
save_item(NAME(m_firq_enabled));
save_item(NAME(m_video_bank));
save_item(NAME(m_sprite_colorbase));

21
src/mame/video/djmain.c
View File

@ -14,11 +14,10 @@
void djmain_state::draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
device_t *k055555 = machine().device("k055555");
int offs, pri_code;
int sortedlist[NUM_SPRITES];
machine().gfx[0]->set_colorbase(k055555_read_register(k055555, K55_PALBASE_SUB2) * 0x400);
machine().gfx[0]->set_colorbase(k055555_read_register(m_k055555, K55_PALBASE_SUB2) * 0x400);
for (offs = 0; offs < NUM_SPRITES; offs++)
sortedlist[offs] = -1;
@ -135,25 +134,21 @@ void djmain_tile_callback(running_machine& machine, int layer, int *code, int *c
void djmain_state::video_start()
{
device_t *k056832 = machine().device("k056832");
k056832_set_layer_offs(k056832, 0, -92, -27);
// k056832_set_layer_offs(k056832, 1, -87, -27);
k056832_set_layer_offs(k056832, 1, -88, -27);
k056832_set_layer_offs(m_k056832, 0, -92, -27);
// k056832_set_layer_offs(m_k056832, 1, -87, -27);
k056832_set_layer_offs(m_k056832, 1, -88, -27);
}
UINT32 djmain_state::screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
device_t *k056832 = machine().device("k056832");
device_t *k055555 = machine().device("k055555");
int enables = k055555_read_register(k055555, K55_INPUT_ENABLES);
int enables = k055555_read_register(m_k055555, K55_INPUT_ENABLES);
int pri[NUM_LAYERS + 1];
int order[NUM_LAYERS + 1];
int i, j;
for (i = 0; i < NUM_LAYERS; i++)
pri[i] = k055555_read_register(k055555, K55_PRIINP_0 + i * 3);
pri[i] = k055555_read_register(k055555, K55_PRIINP_10);
pri[i] = k055555_read_register(m_k055555, K55_PRIINP_0 + i * 3);
pri[i] = k055555_read_register(m_k055555, K55_PRIINP_10);
for (i = 0; i < NUM_LAYERS + 1; i++)
order[i] = i;
@ -182,7 +177,7 @@ UINT32 djmain_state::screen_update_djmain(screen_device &screen, bitmap_rgb32 &b
else
{
if (enables & (K55_INP_VRAM_A << layer))
k056832_tilemap_draw_dj(k056832, bitmap, cliprect, layer, 0, 1 << i);
k056832_tilemap_draw_dj(m_k056832, bitmap, cliprect, layer, 0, 1 << i);
}
}
return 0;

3
src/mame/video/plygonet.c
View File

@ -118,11 +118,10 @@ void polygonet_state::video_start()
UINT32 polygonet_state::screen_update_polygonet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
device_t *k053936 = machine().device("k053936");
machine().priority_bitmap.fill(0);
bitmap.fill(get_black_pen(machine()), cliprect);
k053936_zoom_draw(k053936, bitmap, cliprect, m_roz_tilemap, 0, 0, 0);
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_roz_tilemap, 0, 0, 0);
m_ttl_tilemap->draw(bitmap, cliprect, 0, 1<<0);
return 0;

33
src/mame/video/qdrmfgp.c
View File

@ -29,26 +29,22 @@ void qdrmfgp2_tile_callback(running_machine &machine, int layer, int *code, int
VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp)
{
device_t *k056832 = machine().device("k056832");
k056832_set_layer_association(m_k056832, 0);
k056832_set_layer_association(k056832, 0);
k056832_set_layer_offs(k056832, 0, 2, 0);
k056832_set_layer_offs(k056832, 1, 4, 0);
k056832_set_layer_offs(k056832, 2, 6, 0);
k056832_set_layer_offs(k056832, 3, 8, 0);
k056832_set_layer_offs(m_k056832, 0, 2, 0);
k056832_set_layer_offs(m_k056832, 1, 4, 0);
k056832_set_layer_offs(m_k056832, 2, 6, 0);
k056832_set_layer_offs(m_k056832, 3, 8, 0);
}
VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp2)
{
device_t *k056832 = machine().device("k056832");
k056832_set_layer_association(m_k056832, 0);
k056832_set_layer_association(k056832, 0);
k056832_set_layer_offs(k056832, 0, 3, 1);
k056832_set_layer_offs(k056832, 1, 5, 1);
k056832_set_layer_offs(k056832, 2, 7, 1);
k056832_set_layer_offs(k056832, 3, 9, 1);
k056832_set_layer_offs(m_k056832, 0, 3, 1);
k056832_set_layer_offs(m_k056832, 1, 5, 1);
k056832_set_layer_offs(m_k056832, 2, 7, 1);
k056832_set_layer_offs(m_k056832, 3, 9, 1);
}
/***************************************************************************
@ -59,12 +55,11 @@ VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp2)
UINT32 qdrmfgp_state::screen_update_qdrmfgp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
device_t *k056832 = machine().device("k056832");
bitmap.fill(get_black_pen(machine()), cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 3, 0, 1);
k056832_tilemap_draw(k056832, bitmap, cliprect, 2, 0, 2);
k056832_tilemap_draw(k056832, bitmap, cliprect, 1, 0, 4);
k056832_tilemap_draw(k056832, bitmap, cliprect, 0, 0, 8);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 3, 0, 1);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 2, 0, 2);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 1, 0, 4);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 0, 0, 8);
return 0;
}

6
src/mame/video/wecleman.c
View File

@ -1109,8 +1109,6 @@ UINT32 wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rgb3
UINT32 wecleman_state::screen_update_hotchase(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
device_t *k051316_1 = machine().device("k051316_1");
device_t *k051316_2 = machine().device("k051316_2");
int video_on;
video_on = m_irqctrl & 0x40;
@ -1123,7 +1121,7 @@ UINT32 wecleman_state::screen_update_hotchase(screen_device &screen, bitmap_ind1
/* Draw the background */
if (video_on)
k051316_zoom_draw(k051316_1, bitmap, cliprect, 0, 0);
k051316_zoom_draw(m_k051316_1, bitmap, cliprect, 0, 0);
/* Draw the road */
if (video_on)
@ -1135,6 +1133,6 @@ UINT32 wecleman_state::screen_update_hotchase(screen_device &screen, bitmap_ind1
/* Draw the foreground (text) */
if (video_on)
k051316_zoom_draw(k051316_2, bitmap, cliprect, 0, 0);
k051316_zoom_draw(m_k051316_2, bitmap, cliprect, 0, 0);
return 0;
}