diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2000-05-28 15:47:00 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2000-05-28 15:47:00 +0000 |
| commit | 9e5c01ffe678f39651567ea10636768ffe570abf (patch) | |
| tree | 4638c3654e4428075019fc403a451035a69c7a87 /sys | |
| parent | ca2e05343b6046701865194f10d326f71b11acce (diff) | |
| download | src-9e5c01ffe678f39651567ea10636768ffe570abf.tar.gz src-9e5c01ffe678f39651567ea10636768ffe570abf.zip | |
Use the correct register names, not the FreeBSD 2.2 compatability ones.
Notes
Notes:
svn path=/head/; revision=61034
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/advansys/adv_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/advansys/adw_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/ahc_pci.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index 85031c825b0c..b965ce6a3cfa 100644 --- a/sys/dev/advansys/adv_pci.c +++ b/sys/dev/advansys/adv_pci.c @@ -75,8 +75,8 @@ #include <dev/advansys/advansys.h> -#define PCI_BASEADR0 PCI_MAP_REG_START /* I/O Address */ -#define PCI_BASEADR1 PCI_MAP_REG_START + 4 /* Mem I/O Address */ +#define PCI_BASEADR0 PCIR_MAPS /* I/O Address */ +#define PCI_BASEADR1 PCIR_MAPS + 4 /* Mem I/O Address */ #define PCI_DEVICE_ID_ADVANSYS_1200A 0x110010CD #define PCI_DEVICE_ID_ADVANSYS_1200B 0x120010CD @@ -143,7 +143,7 @@ adv_pci_attach(device_t dev) /* * Determine the chip version. */ - id = pci_read_config(dev, PCI_ID_REG, /*bytes*/4); + id = pci_read_config(dev, PCIR_DEVVENDOR, /*bytes*/4); command = pci_read_config(dev, PCIR_COMMAND, /*bytes*/1); /* diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index 3089a1559280..f7b83821e6ca 100644 --- a/sys/dev/advansys/adw_pci.c +++ b/sys/dev/advansys/adw_pci.c @@ -57,8 +57,8 @@ #include <dev/advansys/adwlib.h> #include <dev/advansys/adwmcode.h> -#define ADW_PCI_IOBASE PCI_MAP_REG_START /* I/O Address */ -#define ADW_PCI_MEMBASE PCI_MAP_REG_START + 4 /* Mem I/O Address */ +#define ADW_PCI_IOBASE PCIR_MAPS /* I/O Address */ +#define ADW_PCI_MEMBASE PCIR_MAPS + 4 /* Mem I/O Address */ #define PCI_ID_ADVANSYS_3550 0x230010CD00000000ull #define PCI_ID_ADVANSYS_38C0800_REV1 0x250010CD00000000ull @@ -218,7 +218,7 @@ adw_pci_attach(device_t dev) ®s_id, 0, ~0, 1, RF_ACTIVE); } #endif - if (regs == NULL && (command & PCI_COMMAND_IO_ENABLE) != 0) { + if (regs == NULL && (command & PCIM_CMD_PORTEN) != 0) { regs_type = SYS_RES_IOPORT; regs_id = ADW_PCI_IOBASE; regs = bus_alloc_resource(dev, regs_type, diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c index 67bb43ab916f..d457f6c2dc28 100644 --- a/sys/dev/aic7xxx/ahc_pci.c +++ b/sys/dev/aic7xxx/ahc_pci.c @@ -666,7 +666,7 @@ ahc_pci_attach(device_t dev) ®s_id, 0, ~0, 1, RF_ACTIVE); } #endif - if (regs == NULL && (command & PCI_COMMAND_IO_ENABLE) != 0) { + if (regs == NULL && (command & PCIM_CMD_PORTEN) != 0) { regs_type = SYS_RES_IOPORT; regs_id = AHC_PCI_IOADDR; regs = bus_alloc_resource(dev, regs_type, |