mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't panic at unknown commands (aborting the command is okay here)

Browse Source
This commit is contained in:
Volker Ruppert 2006-01-07 12:52:05 +00:00
parent 3d7ddc90a5
commit b9e46e8cf4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/iodev/harddrv.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: harddrv.cc,v 1.156 2005-12-27 13:21:25 vruppert Exp $ // $Id: harddrv.cc,v 1.157 2006-01-07 12:52:05 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -144,7 +144,7 @@ bx_hard_drive_c::init(void)
char string[5]; char string[5];
char sbtext[8]; char sbtext[8];
BX_DEBUG(("Init $Id: harddrv.cc,v 1.156 2005-12-27 13:21:25 vruppert Exp $")); BX_DEBUG(("Init $Id: harddrv.cc,v 1.157 2006-01-07 12:52:05 vruppert Exp $"));
for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) { for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
if (bx_options.ata[channel].Opresent->get() == 1) { if (bx_options.ata[channel].Opresent->get() == 1) {
@ -2485,9 +2485,7 @@ bx_hard_drive_c::write(Bit32u address, Bit32u value, unsigned io_len)
case 0xF9: BX_ERROR(("write cmd 0xF9 (SET MAX ADDRESS) not supported"));command_aborted(channel, 0xF9); break; case 0xF9: BX_ERROR(("write cmd 0xF9 (SET MAX ADDRESS) not supported"));command_aborted(channel, 0xF9); break;
default: default:
BX_PANIC(("IO write(0x%04x): command 0x%02x", address, (unsigned) value)); BX_ERROR(("IO write to 0x%04x: unknown command 0x%02x", address, value));
// if user foolishly decides to continue, abort the command
// so that the software knows the drive didn't understand it.
command_aborted(channel, value); command_aborted(channel, value);
} }
break; break;