- diskd implemented now. Only panic if diskd and cdrom are used together,

since at present there's no way to actually manage this.  To use both,
  we will need to put the cdrom (or diskd) onto second ide controller with
  a different IRQ.
This commit is contained in:
Bryce Denney 2001-05-03 20:59:38 +00:00
parent 3a6b2e929e
commit 80a0130cd6
1 changed files with 3 additions and 1 deletions

View File

@ -534,7 +534,6 @@ parse_line_formatted(int num_params, char *params[])
bx_options.diskc.present = 1;
}
else if (!strcmp(params[0], "diskd")) {
bx_panic("Diskd not implemented. Use cdromd for CD-ROM support.\n");
if (num_params != 5) {
fprintf(stderr, ".bochsrc: diskd directive malformed.\n");
exit(1);
@ -897,6 +896,9 @@ parse_line_formatted(int num_params, char *params[])
fprintf(stderr, ".bochsrc: directive '%s' not understood\n", params[0]);
exit(1);
}
if (bx_options.diskd.present && bx_options.cdromd.present)
bx_panic ("At present, using both diskd and cdromd at once is not supported.");
}
#endif // #if BX_PROVIDE_MAIN