aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-12-29 09:48:24 -0500
committerKevin O'Connor <kevin@koconnor.net>2014-12-29 09:48:24 -0500
commit8ed94b42c0b7f76d2776d9277dc8fa5e0f614ac0 (patch)
treead0f56029d82b243ef74dec8b33712323f1a0f30
parentf0a22eb69ba62f937e5fb236d1a8ad9291ff81d6 (diff)
downloadseabios-8ed94b42c0b7f76d2776d9277dc8fa5e0f614ac0.zip
seabios-8ed94b42c0b7f76d2776d9277dc8fa5e0f614ac0.tar.gz
seabios-8ed94b42c0b7f76d2776d9277dc8fa5e0f614ac0.tar.bz2
cdrom: call scsi_process_op() instead of cdb_read()
Use the scsi_process_op() function instead of the lower level cdb_read() function. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--src/cdrom.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cdrom.c b/src/cdrom.c
index 86e3f0c..de0e7de 100644
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -154,10 +154,11 @@ cdrom_boot(struct drive_s *drive)
// Read the Boot Record Volume Descriptor
u8 buffer[CDROM_SECTOR_SIZE];
+ dop.command = CMD_READ;
dop.lba = 0x11;
dop.count = 1;
dop.buf_fl = buffer;
- ret = cdb_read(&dop);
+ ret = scsi_process_op(&dop);
if (ret)
return 3;
@@ -173,7 +174,7 @@ cdrom_boot(struct drive_s *drive)
// And we read the Boot Catalog
dop.lba = lba;
dop.count = 1;
- ret = cdb_read(&dop);
+ ret = scsi_process_op(&dop);
if (ret)
return 7;
@@ -214,7 +215,7 @@ cdrom_boot(struct drive_s *drive)
dop.lba = lba;
dop.count = DIV_ROUND_UP(nbsectors, 4);
dop.buf_fl = MAKE_FLATPTR(boot_segment, 0);
- ret = cdb_read(&dop);
+ ret = scsi_process_op(&dop);
if (ret)
return 12;