Make things compile again with ATA_STATIC_ID.

This commit is contained in:
Søren Schmidt 2005-04-15 14:19:41 +00:00
parent f305048664
commit d1719942b3

View File

@ -632,7 +632,7 @@ ata_identify(device_t dev)
if (ch->devices & ATA_ATA_SLAVE) { if (ch->devices & ATA_ATA_SLAVE) {
slave_res = ata_getparam(dev, slave, ATA_ATA_IDENTIFY); slave_res = ata_getparam(dev, slave, ATA_ATA_IDENTIFY);
#ifdef ATA_STATIC_ID #ifdef ATA_STATIC_ID
slave_unit = (device_get_unit(parent) << 1) + 1; slave_unit = (device_get_unit(dev) << 1) + 1;
#endif #endif
} }
else if (ch->devices & ATA_ATAPI_SLAVE) else if (ch->devices & ATA_ATAPI_SLAVE)
@ -641,7 +641,7 @@ ata_identify(device_t dev)
if (ch->devices & ATA_ATA_MASTER) { if (ch->devices & ATA_ATA_MASTER) {
master_res = ata_getparam(dev, master, ATA_ATA_IDENTIFY); master_res = ata_getparam(dev, master, ATA_ATA_IDENTIFY);
#ifdef ATA_STATIC_ID #ifdef ATA_STATIC_ID
master_unit = (device_get_unit(parent) << 1); master_unit = (device_get_unit(dev) << 1);
#endif #endif
} }
else if (ch->devices & ATA_ATAPI_MASTER) else if (ch->devices & ATA_ATAPI_MASTER)