aboutsummaryrefslogtreecommitdiffstats
path: root/src/cdrom.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2009-08-10 00:06:37 -0400
committerKevin O'Connor <kevin@koconnor.net>2009-08-10 00:06:37 -0400
commit42337662b032eb539a40fe6e18b1e7bf64c3fa10 (patch)
tree286f0bbd08f48a4ea1023cd21337fafe20522592 /src/cdrom.c
parenteaa2e55cc8385b993b1adba7c8babfb290c08983 (diff)
downloadseabios-42337662b032eb539a40fe6e18b1e7bf64c3fa10.tar.gz
Misc ATA cleanups.
Remove some unused defines. Rename ATA_TYPE_* to DTYPE_* and move from atabits.h to disk.h. Rename ATA_TRANSLATION_* to TRANSLATION_* and move from atabits.h to disk.h. Convert bios is-drive-ready call to use send_disk_op(). Only add atapi devices to the cdmap if they are cd/dvd roms. Remove 'device' from struct ata_devices_s.
Diffstat (limited to 'src/cdrom.c')
-rw-r--r--src/cdrom.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cdrom.c b/src/cdrom.c
index 2cb3f0f9..c62829a4 100644
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -9,7 +9,7 @@
#include "util.h" // memset
#include "bregs.h" // struct bregs
#include "biosvar.h" // GET_EBDA
-#include "atabits.h" // ATA_TYPE_ATAPI
+#include "atabits.h" // ATA_CMD_REQUEST_SENSE
/****************************************************************
@@ -404,8 +404,6 @@ cdrom_boot(int cdid)
if (cdid >= ATA.cdcount)
return 1;
int driveid = GET_GLOBAL(ATA.idmap[1][cdid]);
- if (GET_GLOBAL(ATA.devices[driveid].device) != ATA_DEVICE_CDROM)
- return 2;
int ret = atapi_is_ready(driveid);
if (ret)