From d5c05044c681ac4003fd35bea0951e7e6cf93085 Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Sun, 13 Jan 2008 01:50:58 +0000 Subject: [PATCH] ATAPI fix git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23474 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/ata/ata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ata/ata.c b/src/add-ons/kernel/bus_managers/ata/ata.c index 7ad67b58a0..8327e1b85f 100644 --- a/src/add-ons/kernel/bus_managers/ata/ata.c +++ b/src/add-ons/kernel/bus_managers/ata/ata.c @@ -1115,7 +1115,7 @@ ata_identify_device(ide_device_info *device, bool isAtapi) return B_ERROR; } - if (ata_wait(bus, ide_status_drq, ide_status_bsy, 0, 500000) != B_OK) { + if (ata_wait(bus, ide_status_drq, ide_status_bsy, 0, isAtapi ? 3000000 : 500000) != B_OK) { TRACE("ata_identify_device: wait failed\n"); return B_ERROR; } @@ -1129,7 +1129,7 @@ ata_identify_device(ide_device_info *device, bool isAtapi) return B_ERROR; } - if (ata_finish_command(device, &request, ATA_WAIT_FINISH | ATA_DRDY_REQUIRED, ide_error_abrt) != B_OK) + if (ata_finish_command(device, &request, ATA_WAIT_FINISH | ( isAtapi ? 0 : ATA_DRDY_REQUIRED), ide_error_abrt) != B_OK) return B_ERROR; TRACE("ata_identify_device: success\n");