2c2
< /* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 86272 2001-11-11 20:15:47Z imp $ */
---
> /* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 87352 2001-12-04 13:48:16Z imp $ */
171d170
< ret = 1; goto done; /* XXX IMP XXX */
316a316
>
325,328d324
< #ifdef XXX /* I'm not up to this tonight, need to implement new API */
< /* to deal with moving windows and such. At least that's */
< /* what it appears at this instant */
<
338,339d333
< pccard_chip_mem_unmap(pct, pch, window);
<
341,360c335,337
< /*
< * if the longlink is to attribute memory,
< * then it is unindexed. That is, if the
< * link value is 0x100, then the actual
< * memory address is 0x200. This means that
< * we need to multiply by 2 before calling
< * mem_map, and then divide the resulting ptr
< * by 2 after.
< */
<
< if (!longlink_common)
< longlink_addr *= 2;
<
< pccard_chip_mem_map(pct, pch, longlink_common ?
< PCCARD_MEM_COMMON : PCCARD_MEM_ATTR,
< longlink_addr, PCCARD_CIS_SIZE,
< &pcmh, &tuple.ptr, &window);
<
< if (!longlink_common)
< tuple.ptr /= 2;
---
> CARD_SET_RES_FLAGS(device_get_parent(dev), dev,
> SYS_RES_MEMORY, rid, longlink_common ?
> PCCARD_A_MEM_ATTR : PCCARD_A_MEM_ATTR);
368,378c345,347
< if (!mfc[mfc_index].common)
< mfc[mfc_index].addr *= 2;
<
< pccard_chip_mem_map(pct, pch,
< mfc[mfc_index].common ?
< PCCARD_MEM_COMMON : PCCARD_MEM_ATTR,
< mfc[mfc_index].addr, PCCARD_CIS_SIZE,
< &pcmh, &tuple.ptr, &window);
<
< if (!mfc[mfc_index].common)
< tuple.ptr /= 2;
---
> CARD_SET_RES_FLAGS(device_get_parent(dev), dev,
> SYS_RES_MEMORY, rid, mfc[mfc_index].common
> ? PCCARD_A_MEM_ATTR : PCCARD_A_MEM_ATTR);
382d350
<
384d351
<
414d380
<
417d382
< #endif /* XXX */