summaryrefslogtreecommitdiffstats
path: root/sys/i4b/layer1
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2000-05-28 16:24:17 +0000
committerpeter <peter@FreeBSD.org>2000-05-28 16:24:17 +0000
commit256d18b0e284b31999136a99c0065a351532b66c (patch)
treecca80ecfa38e736008e949c382e421560b326c43 /sys/i4b/layer1
parent51a6e2c56d7ca685ef071362bbf6dfdbe9ef70a4 (diff)
downloadFreeBSD-src-256d18b0e284b31999136a99c0065a351532b66c.zip
FreeBSD-src-256d18b0e284b31999136a99c0065a351532b66c.tar.gz
Make this compile without the old 2.2 compatability defines.
Diffstat (limited to 'sys/i4b/layer1')
-rw-r--r--sys/i4b/layer1/i4b_avm_fritz_pci.c6
-rw-r--r--sys/i4b/layer1/i4b_elsa_qs1p.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pci.c b/sys/i4b/layer1/i4b_avm_fritz_pci.c
index a26abc4..dc86c92 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pci.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pci.c
@@ -503,7 +503,7 @@ isic_attach_avma1pp(device_t dev)
asc->avma1pp_unit = unit;
- rid = PCI_MAP_REG_START+4;
+ rid = PCIR_MAPS+4;
asc->avma1pp_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
0, ~0, 1, RF_ACTIVE);
@@ -522,7 +522,7 @@ isic_attach_avma1pp(device_t dev)
RF_SHAREABLE | RF_ACTIVE);
if (asc->avma1pp_irq == NULL) {
- bus_release_resource(dev, SYS_RES_IOPORT, PCI_MAP_REG_START+4, asc->avma1pp_res);
+ bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, asc->avma1pp_res);
printf("avma1pp%d: couldn't map interrupt\n", unit);
error = ENXIO;
goto fail;
@@ -532,7 +532,7 @@ isic_attach_avma1pp(device_t dev)
if (error) {
bus_release_resource(dev, SYS_RES_IRQ, 0, asc->avma1pp_res);
- bus_release_resource(dev, SYS_RES_IOPORT, PCI_MAP_REG_START+4, asc->avma1pp_res);
+ bus_release_resource(dev, SYS_RES_IOPORT, PCIR_MAPS+4, asc->avma1pp_res);
printf("avma1pp%d: couldn't set up irq\n", unit);
goto fail;
}
diff --git a/sys/i4b/layer1/i4b_elsa_qs1p.c b/sys/i4b/layer1/i4b_elsa_qs1p.c
index 24d7494..aac277c 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1p.c
@@ -76,8 +76,8 @@
#define PORT0_MAPOFF 4
#define PORT1_MAPOFF 12
-#define ELSA_PORT0_MAPOFF (PCI_MAP_REG_START+PORT0_MAPOFF)
-#define ELSA_PORT1_MAPOFF (PCI_MAP_REG_START+PORT1_MAPOFF)
+#define ELSA_PORT0_MAPOFF (PCIR_MAPS+PORT0_MAPOFF)
+#define ELSA_PORT1_MAPOFF (PCIR_MAPS+PORT1_MAPOFF)
#define PCI_QS1000_DID 0x1000
#define PCI_QS1000_VID 0x1048
OpenPOWER on IntegriCloud