Revert r204992 and just wrap it all in ifdef INVARIANTS to fix the debug and

non-debug cases.
This commit is contained in:
Andrew Thompson 2010-03-11 08:03:56 +00:00
parent 7e0e1004f3
commit 5bbc70dde9

View File

@ -2031,11 +2031,13 @@ siba_pcie_mdio_write(struct siba_pci *spc, uint8_t device, uint8_t address,
uint32_t
siba_dma_translation(device_t dev)
{
#ifdef INVARIANTS
struct siba_dev_softc *sd = device_get_ivars(dev);
struct siba_softc *siba = sd->sd_bus;
KASSERT(device_get_ivars(dev)->sd_bus->siba_type == SIBA_TYPE_PCI,
("unsupported bustype %d\n",
device_get_ivars(dev)->sd_bus->siba_type));
KASSERT(siba->siba_type == SIBA_TYPE_PCI,
("unsupported bustype %d\n", siba->siba_type));
#endif
return (SIBA_PCI_DMA);
}