Get order right when initializing task file bus resources. ATA drives are

now recognised when booting from the drive, as opposed to net-booting which
the previous botched commit was tested with.
This commit is contained in:
grehan 2005-04-20 02:26:31 +00:00
parent c67b019336
commit 708e4e1098
2 changed files with 4 additions and 4 deletions

View File

@ -177,9 +177,9 @@ ata_kauai_probe(device_t dev)
ch->r_io[i].res = mem; ch->r_io[i].res = mem;
ch->r_io[i].offset = i*ATA_KAUAI_REGGAP + ATA_KAUAI_REGOFFSET; ch->r_io[i].offset = i*ATA_KAUAI_REGGAP + ATA_KAUAI_REGOFFSET;
} }
ch->r_io[ATA_CONTROL].res = mem;
ch->r_io[ATA_CONTROL].offset = ATA_KAUAI_ALTOFFSET;
ata_default_registers(ch); ata_default_registers(ch);
ch->r_io[ATA_ALTSTAT].res = mem;
ch->r_io[ATA_ALTSTAT].offset = ATA_KAUAI_ALTOFFSET;
ch->unit = 0; ch->unit = 0;
ch->flags |= ATA_USE_16BIT|ATA_NO_SLAVE; ch->flags |= ATA_USE_16BIT|ATA_NO_SLAVE;

View File

@ -114,9 +114,9 @@ ata_macio_probe(device_t dev)
ch->r_io[i].res = mem; ch->r_io[i].res = mem;
ch->r_io[i].offset = i * ATA_MACIO_REGGAP; ch->r_io[i].offset = i * ATA_MACIO_REGGAP;
} }
ch->r_io[ATA_CONTROL].res = mem;
ch->r_io[ATA_CONTROL].offset = ATA_MACIO_ALTOFFSET;
ata_default_registers(ch); ata_default_registers(ch);
ch->r_io[ATA_ALTSTAT].res = mem;
ch->r_io[ATA_ALTSTAT].offset = ATA_MACIO_ALTOFFSET;
ch->unit = 0; ch->unit = 0;
ch->flags |= ATA_USE_16BIT; ch->flags |= ATA_USE_16BIT;