Regression fixes for crashes and asserts that arose from previous patches from Atari Ace (no whatsnew)

This commit is contained in:
Scott Stone 2011-04-10 03:14:34 +00:00
parent af76c915a3
commit 92d885fa63
3 changed files with 7 additions and 5 deletions

View File

@ -106,6 +106,7 @@ static TIMER_CALLBACK( kengo_scanline_interrupt );
static MACHINE_START( m72 )
{
m72_state *state = machine.driver_data<m72_state>();
state->m_audio = machine.device("m72");
state->m_scanline_timer = machine.scheduler().timer_alloc(FUNC(m72_scanline_interrupt));
state->save_item(NAME(state->m_mcu_sample_addr));
@ -456,7 +457,7 @@ static INTERRUPT_GEN(fake_nmi)
m72_state *state = device->machine().driver_data<m72_state>();
int sample = m72_sample_r(state->m_audio,0);
if (sample)
m72_sample_w(device->machine().device("dac"),0,sample);
m72_sample_w(state->m_audio,0,sample);
}
@ -1110,7 +1111,7 @@ static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
AM_RANGE(0x06, 0x06) AM_DEVWRITE("m72", m72_sound_irq_ack_w)
AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w)
AM_RANGE(0x82, 0x82) AM_DEVWRITE("m72", m72_sample_w)
AM_RANGE(0x84, 0x84) AM_DEVREAD("m72", m72_sample_r)
ADDRESS_MAP_END
@ -1119,7 +1120,7 @@ static ADDRESS_MAP_START( rtype2_sound_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("m72", rtype2_sample_addr_w)
AM_RANGE(0x82, 0x82) AM_DEVWRITE("dac", m72_sample_w)
AM_RANGE(0x82, 0x82) AM_DEVWRITE("m72", m72_sample_w)
AM_RANGE(0x83, 0x83) AM_DEVWRITE("m72", m72_sound_irq_ack_w)
AM_RANGE(0x84, 0x84) AM_DEVREAD("m72", m72_sample_r)
// AM_RANGE(0x87, 0x87) AM_WRITENOP /* ??? */

View File

@ -1382,7 +1382,7 @@ static DRIVER_INIT( tacscan )
state->m_decrypt = segag80_security(76);
/* configure sound */
state->m_usb = machine.device("segausb");
state->m_usb = machine.device("usbsnd");
iospace->install_legacy_readwrite_handler(*state->m_usb, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
pgmspace->install_legacy_readwrite_handler(*state->m_usb, 0xd000, 0xdfff, FUNC(sega_usb_ram_r), FUNC(usb_ram_w));
@ -1402,7 +1402,7 @@ static DRIVER_INIT( startrek )
state->m_decrypt = segag80_security(64);
/* configure sound */
state->m_usb = machine.device("segausb");
state->m_usb = machine.device("usbsnd");
iospace->install_legacy_write_handler(*machine.device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
iospace->install_legacy_write_handler(*machine.device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));

View File

@ -591,6 +591,7 @@ mydrawgfxzoom(
vert[3].p[1] = flipy ? 0 : fheight;
extra = (poly_extra_data *)poly_get_extra_data(state->m_poly);
extra->machine = &gfx->machine();
extra->z = z;
extra->alpha = alpha;
extra->prioverchar = prioverchar;