From eebd01e3004ae06a6b9dca96229fd98892943a73 Mon Sep 17 00:00:00 2001 From: glebius Date: Fri, 30 Dec 2005 11:31:47 +0000 Subject: - Retire BARBIT in favor of new PCI_RID2BAR. - Fix build. --- sys/dev/cardbus/cardbus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev/cardbus') diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 6b6ec83..d36ce54 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -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, -- cgit v1.1