Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ata: fix bad timeout on ATAPI initialization, fixes vbox seeing the CD

Browse Source
This commit is contained in:
K. Lange 2021-10-07 20:21:01 +09:00
parent 178841882b
commit 70e4d82524
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ata.c
View File

@ -594,7 +594,7 @@ static int atapi_device_init(struct ata_device * dev) {
while (1) { while (1) {
uint8_t status = inportb(dev->io_base + ATA_REG_STATUS); uint8_t status = inportb(dev->io_base + ATA_REG_STATUS);
if ((status & ATA_SR_ERR)) goto atapi_error; if ((status & ATA_SR_ERR)) goto atapi_error;
if (timeout-- < 100) goto atapi_timeout; if (timeout-- < 0) goto atapi_timeout;
if (!(status & ATA_SR_BSY) && (status & ATA_SR_DRDY)) break; if (!(status & ATA_SR_BSY) && (status & ATA_SR_DRDY)) break;
} }
@ -607,7 +607,7 @@ static int atapi_device_init(struct ata_device * dev) {
while (1) { while (1) {
uint8_t status = inportb(dev->io_base + ATA_REG_STATUS); uint8_t status = inportb(dev->io_base + ATA_REG_STATUS);
if ((status & ATA_SR_ERR)) goto atapi_error_read; if ((status & ATA_SR_ERR)) goto atapi_error_read;
if (timeout-- < 100) goto atapi_timeout; if (timeout-- < 0) goto atapi_timeout;
if (!(status & ATA_SR_BSY) && (status & ATA_SR_DRDY)) break; if (!(status & ATA_SR_BSY) && (status & ATA_SR_DRDY)) break;
if ((status & ATA_SR_DRQ)) break; if ((status & ATA_SR_DRQ)) break;
} }