Better checks to make sure that we get good alignment. This code is a

bit of a bandaide until I get better pci bus code committed to head
from my p4 tree.
This commit is contained in:
Warner Losh 2004-04-06 22:50:50 +00:00
parent 70fc36e89c
commit 0a6c6a6dd2

View File

@ -1638,14 +1638,13 @@ cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type,
start = cbb_start_mem;
if (end < start)
end = start;
if (RF_ALIGNMENT(flags) < CBB_MEMALIGN_BITS) {
if (count < CBB_MEMALIGN)
align = CBB_MEMALIGN;
else
align = count;
flags = (flags & ~RF_ALIGNMENT_MASK) |
if (count < CBB_MEMALIGN)
align = CBB_MEMALIGN;
else
align = count;
if (align > (1 << RF_ALIGNMENT(flags)))
flags = (flags & ~RF_ALIGNMENT_MASK) |
rman_make_alignment_flags(align);
}
break;
}