mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-12 14:29:28 +00:00
Code Issues Releases Activity

- Retire BARBIT in favor of new PCI_RID2BAR.

Browse Source 
- Fix build.
This commit is contained in:
Gleb Smirnoff 2005-12-30 11:31:47 +00:00
parent a311d8fc4c
commit 6afb2250fb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153875
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/cardbus/cardbus.c
View File

@ -184,7 +184,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
if (rle->type == SYS_RES_IOPORT) {
io_size += rle->count;
} else if (rle->type == SYS_RES_MEMORY) {
if (dinfo->mprefetchable & BARBIT(rle->rid))
if (dinfo->mprefetchable & PCI_RID2BAR(rle->rid))
mem_psize += rle->count;
else
mem_nsize += rle->count;
@ -205,7 +205,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
rle = barlist[tmp];
if (rle->res == NULL &&
rle->type == SYS_RES_MEMORY &&
dinfo->mprefetchable & BARBIT(rle->rid)) {
dinfo->mprefetchable & PCI_RID2BAR(rle->rid)) {
flags = rman_make_alignment_flags(rle->count);
break;
}
@ -240,7 +240,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
for (tmp = 0; tmp < count; tmp++) {
rle = barlist[tmp];
if (rle->type == SYS_RES_MEMORY &&
dinfo->mprefetchable & BARBIT(rle->rid)) {
dinfo->mprefetchable & PCI_RID2BAR(rle->rid)) {
rle->res = bus_alloc_resource(cbdev,
rle->type, &rle->rid, start, end,
rle->count,
@ -260,7 +260,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
for (tmp = 0; tmp < count; tmp++) {
rle = barlist[tmp];
if (rle->type == SYS_RES_MEMORY &&
(dinfo->mprefetchable & BARBIT(rle->rid)) == 0) {
(dinfo->mprefetchable & PCI_RID2BAR(rle->rid)) == 0) {
flags = rman_make_alignment_flags(rle->count);
break;
}
@ -296,7 +296,7 @@ cardbus_alloc_resources(device_t cbdev, device_t child)
for (tmp = 0; tmp < count; tmp++) {
rle = barlist[tmp];
if (rle->type == SYS_RES_MEMORY &&
(dinfo->mprefetchable & BARBIT(rle->rid)) == 0) {
(dinfo->mprefetchable & PCI_RID2BAR(rle->rid)) == 0) {
rle->res = bus_alloc_resource(cbdev,
rle->type, &rle->rid, start, end,
rle->count,