vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix ATAPI support

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-24 17:10:41 +01:00
parent 22a7cc9a6f
commit 8f5ac9e570
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/disk/ata.c
View file

@ -113,13 +113,12 @@ grub_ata_identify (struct grub_ata *dev)
parms.taskfile.cmd = GRUB_ATA_CMD_IDENTIFY_DEVICE; parms.taskfile.cmd = GRUB_ATA_CMD_IDENTIFY_DEVICE;
err = dev->dev->readwrite (dev, &parms); err = dev->dev->readwrite (dev, &parms);
if (err)
return err;
if (parms.size != GRUB_DISK_SECTOR_SIZE) if (err || parms.size != GRUB_DISK_SECTOR_SIZE)
{ {
grub_uint8_t sts = parms.taskfile.status; grub_uint8_t sts = parms.taskfile.status;
grub_free (info); grub_free (info);
grub_errno = GRUB_ERR_NONE;
if ((sts & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ if ((sts & (GRUB_ATA_STATUS_BUSY | GRUB_ATA_STATUS_DRQ
| GRUB_ATA_STATUS_ERR)) == GRUB_ATA_STATUS_ERR | GRUB_ATA_STATUS_ERR)) == GRUB_ATA_STATUS_ERR
&& (parms.taskfile.error & 0x04 /* ABRT */)) && (parms.taskfile.error & 0x04 /* ABRT */))
@ -503,6 +502,7 @@ grub_atapi_open (int id, int bus, struct grub_scsi *scsi)
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such ATAPI device"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such ATAPI device");
scsi->data = ata; scsi->data = ata;
scsi->luns = 1;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }