d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mis-merge from p4 by adding line getting sc.

Browse Source 
Attempt to deal with larger memory allocation better.
This commit is contained in:
Warner Losh 2004-04-06 22:41:14 +00:00
parent 640c4d40fb
commit 70fc36e89c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/pccbb/pccbb.c
View File

@ -1346,6 +1346,7 @@ done:;
static int
cbb_do_power(device_t brdev)
{
struct cbb_softc *sc = device_get_softc(brdev);
int voltage;
/* Don't enable OE */
@ -1612,6 +1613,7 @@ cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type,
struct cbb_softc *sc = device_get_softc(brdev);
int tmp;
struct resource *res;
u_long align;
switch (type) {
case SYS_RES_IRQ:
@ -1636,9 +1638,14 @@ 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 (RF_ALIGNMENT(flags) < CBB_MEMALIGN_BITS) {
if (count < CBB_MEMALIGN)
align = CBB_MEMALIGN;
else
align = count;
flags = (flags & ~RF_ALIGNMENT_MASK) |
rman_make_alignment_flags(CBB_MEMALIGN);
rman_make_alignment_flags(align);
}
break;
}