diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2009-08-16 12:09:44 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2009-08-16 12:09:44 -0400 |
| commit | 0a0e42e98538e959fece731be9262b1a8e874c7d (patch) | |
| tree | f832825c7bfdccc0fd1e257c66396d292492e660 /src/cdrom.c | |
| parent | 669e6449565018e72e3833ff39fcf677d5a5b824 (diff) | |
| download | seabios-0a0e42e98538e959fece731be9262b1a8e874c7d.tar.gz | |
Add floppy controllers to "drives" list also.
The Drives.drives list now contains floppies, harddrives, and cdroms.
Add mapping table for external/internal drive ids for floppies.
Rename CONFIG_FLOPPY_SUPPORT to CONFIG_FLOPPY (for consistency).
Be consistent with "driveid" and "floppyid" variable names.
Replace switch statements of drive parameters into a global array.
There are some externally visible changes with this patch:
- Some calls will now return EPARAM instead of ETIMEOUT (or ECHANGED)
- floppy_1301/1308 are now only available when regs->dl is valid
- floppy_1308/1315 return EPARAM on invalid drives
Diffstat (limited to 'src/cdrom.c')
| -rw-r--r-- | src/cdrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cdrom.c b/src/cdrom.c index 8823f9b7..6f9f00df 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -404,7 +404,7 @@ cdrom_boot(int cdid) // Verify device is a cdrom. if (cdid >= Drives.cdcount) return 1; - int driveid = GET_GLOBAL(Drives.idmap[1][cdid]); + int driveid = GET_GLOBAL(Drives.idmap[EXTTYPE_CD][cdid]); int ret = atapi_is_ready(driveid); if (ret) |