diff options
| author | glebius <glebius@FreeBSD.org> | 2005-12-30 11:31:47 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2005-12-30 11:31:47 +0000 |
| commit | eebd01e3004ae06a6b9dca96229fd98892943a73 (patch) | |
| tree | f03d3ea7e8b523d4fd25c50a66d9cbf96b729c21 | |
| parent | 784dda0030f1a305af62806c924806f4de4bcbee (diff) | |
| download | FreeBSD-src-eebd01e3004ae06a6b9dca96229fd98892943a73.zip FreeBSD-src-eebd01e3004ae06a6b9dca96229fd98892943a73.tar.gz | |
- Retire BARBIT in favor of new PCI_RID2BAR.
- Fix build.
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 10 |
1 files changed, 5 insertions, 5 deletions
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, |
