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

rearrange wait_not_busy

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-24 17:11:21 +01:00
parent 8f5ac9e570
commit ee2b985ef6
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
grub-core/disk/pata.c
View file

@ -182,17 +182,18 @@ grub_pata_readwrite (struct grub_ata *disk,
/* Start command. */ /* Start command. */
grub_pata_regset (dev, GRUB_ATA_REG_CMD, parms->taskfile.cmd); grub_pata_regset (dev, GRUB_ATA_REG_CMD, parms->taskfile.cmd);
/* Wait for !BSY. */
if (grub_pata_wait_not_busy (dev, GRUB_ATA_TOUT_DATA))
return grub_errno;
/* Check status. */ /* Check status. */
grub_int8_t sts = grub_pata_regget (dev, GRUB_ATA_REG_STATUS); grub_int8_t sts = grub_pata_regget (dev, GRUB_ATA_REG_STATUS);
grub_dprintf ("pata", "status=0x%x\n", sts); grub_dprintf ("pata", "status=0x%x\n", sts);
if (parms->cmdsize) if (parms->cmdsize)
{ {
grub_uint8_t irs = grub_pata_regget (dev, GRUB_ATAPI_REG_IREASON); grub_uint8_t irs;
/* Wait for !BSY. */
if (grub_pata_wait_not_busy (dev, GRUB_ATA_TOUT_DATA))
return grub_errno;
irs = grub_pata_regget (dev, GRUB_ATAPI_REG_IREASON);
/* OK if DRQ is asserted and interrupt reason is as expected. */ /* OK if DRQ is asserted and interrupt reason is as expected. */
if (!((sts & GRUB_ATA_STATUS_DRQ) if (!((sts & GRUB_ATA_STATUS_DRQ)
&& (irs & GRUB_ATAPI_IREASON_MASK) == GRUB_ATAPI_IREASON_CMD_OUT)) && (irs & GRUB_ATAPI_IREASON_MASK) == GRUB_ATAPI_IREASON_CMD_OUT))
@ -210,6 +211,11 @@ grub_pata_readwrite (struct grub_ata *disk,
& GRUB_ATAPI_IREASON_MASK) == GRUB_ATAPI_IREASON_DATA_IN))) & GRUB_ATAPI_IREASON_MASK) == GRUB_ATAPI_IREASON_DATA_IN)))
{ {
unsigned cnt; unsigned cnt;
/* Wait for !BSY. */
if (grub_pata_wait_not_busy (dev, GRUB_ATA_TOUT_DATA))
return grub_errno;
if (parms->cmdsize) if (parms->cmdsize)
{ {
cnt = grub_pata_regget (dev, GRUB_ATAPI_REG_CNTHIGH) << 8 cnt = grub_pata_regget (dev, GRUB_ATAPI_REG_CNTHIGH) << 8
@ -246,6 +252,10 @@ grub_pata_readwrite (struct grub_ata *disk,
} }
parms->size = nread; parms->size = nread;
/* Wait for !BSY. */
if (grub_pata_wait_not_busy (dev, GRUB_ATA_TOUT_DATA))
return grub_errno;
/* Return registers. */ /* Return registers. */
for (i = GRUB_ATA_REG_ERROR; i <= GRUB_ATA_REG_STATUS; i++) for (i = GRUB_ATA_REG_ERROR; i <= GRUB_ATA_REG_STATUS; i++)
parms->taskfile.raw[i - GRUB_ATA_REG_FEATURES] = grub_pata_regget (dev, i); parms->taskfile.raw[i - GRUB_ATA_REG_FEATURES] = grub_pata_regget (dev, i);