Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed crash if no disk (nw)

Browse Source
This commit is contained in:
smf- 2013-06-12 20:39:44 +00:00
parent 5a86df85fd
commit 2a6048249d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emu/machine/idectrl.c
View File

@ -102,6 +102,8 @@ void ide_controller_device::set_irq(int state)
/* signal an interrupt */ /* signal an interrupt */
m_irq_handler(state); m_irq_handler(state);
if (dev != NULL)
dev->interrupt_pending = state; dev->interrupt_pending = state;
} }
@ -1330,17 +1332,11 @@ void ide_controller_device::device_start()
void ide_controller_device::device_reset() void ide_controller_device::device_reset()
{ {
ide_device_interface *dev = slot[cur_drive]->dev();
LOG(("IDE controller reset performed\n")); LOG(("IDE controller reset performed\n"));
/* reset the drive state */ /* reset the drive state */
cur_drive = 0; cur_drive = 0;
status = IDE_STATUS_DRIVE_READY | IDE_STATUS_SEEK_COMPLETE; status = IDE_STATUS_DRIVE_READY | IDE_STATUS_SEEK_COMPLETE;
error = IDE_ERROR_DEFAULT; error = IDE_ERROR_DEFAULT;
dev->buffer_offset = 0;
dev->gnetreadlock = 0;
dev->master_password_enable = (dev->master_password != NULL);
dev->user_password_enable = (dev->user_password != NULL);
set_irq(CLEAR_LINE); set_irq(CLEAR_LINE);
set_dmarq(0); set_dmarq(0);
} }

5
src/emu/machine/idehd.c
View File

@ -304,6 +304,11 @@ void ide_hdd_device::device_reset()
if (m_handle->read_metadata (HARD_DISK_IDENT_METADATA_TAG, 0, m_features, IDE_DISK_SECTOR_SIZE, metalength) != CHDERR_NONE) if (m_handle->read_metadata (HARD_DISK_IDENT_METADATA_TAG, 0, m_features, IDE_DISK_SECTOR_SIZE, metalength) != CHDERR_NONE)
ide_build_features(); ide_build_features();
} }
buffer_offset = 0;
gnetreadlock = 0;
master_password_enable = (master_password != NULL);
user_password_enable = (user_password != NULL);
} }
//------------------------------------------------- //-------------------------------------------------