diff options
| author | jhb <jhb@FreeBSD.org> | 2003-09-02 17:30:40 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2003-09-02 17:30:40 +0000 |
| commit | dc11e45b68dec5003e226a26f7fa2ee9a1e351c2 (patch) | |
| tree | 1a7743437055722d93fce73b145dde1eb1915e7f /sys/dev/mpt | |
| parent | 480ed8b5934d938866a31bd84aa636de31845487 (diff) | |
| download | FreeBSD-src-dc11e45b68dec5003e226a26f7fa2ee9a1e351c2.zip FreeBSD-src-dc11e45b68dec5003e226a26f7fa2ee9a1e351c2.tar.gz | |
Use PCIR_BAR(x) instead of PCIR_MAPS.
Glanced over by: imp, gibbs
Tested by: i386 LINT
Diffstat (limited to 'sys/dev/mpt')
| -rw-r--r-- | sys/dev/mpt/mpt_pci.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c index d090d58..afc0684 100644 --- a/sys/dev/mpt/mpt_pci.c +++ b/sys/dev/mpt/mpt_pci.c @@ -653,11 +653,11 @@ mpt_read_config_regs(mpt_softc_t *mpt) mpt->pci_cfg.Command = pci_read_config(mpt->dev, PCIR_COMMAND, 2); mpt->pci_cfg.LatencyTimer_LineSize = pci_read_config(mpt->dev, PCIR_CACHELNSZ, 2); - mpt->pci_cfg.IO_BAR = pci_read_config(mpt->dev, PCIR_MAPS, 4); - mpt->pci_cfg.Mem0_BAR[0] = pci_read_config(mpt->dev, PCIR_MAPS+0x4, 4); - mpt->pci_cfg.Mem0_BAR[1] = pci_read_config(mpt->dev, PCIR_MAPS+0x8, 4); - mpt->pci_cfg.Mem1_BAR[0] = pci_read_config(mpt->dev, PCIR_MAPS+0xC, 4); - mpt->pci_cfg.Mem1_BAR[1] = pci_read_config(mpt->dev, PCIR_MAPS+0x10, 4); + mpt->pci_cfg.IO_BAR = pci_read_config(mpt->dev, PCIR_BAR(0), 4); + mpt->pci_cfg.Mem0_BAR[0] = pci_read_config(mpt->dev, PCIR_BAR(1), 4); + mpt->pci_cfg.Mem0_BAR[1] = pci_read_config(mpt->dev, PCIR_BAR(2), 4); + mpt->pci_cfg.Mem1_BAR[0] = pci_read_config(mpt->dev, PCIR_BAR(3), 4); + mpt->pci_cfg.Mem1_BAR[1] = pci_read_config(mpt->dev, PCIR_BAR(4), 4); mpt->pci_cfg.ROM_BAR = pci_read_config(mpt->dev, PCIR_BIOS, 4); mpt->pci_cfg.IntLine = pci_read_config(mpt->dev, PCIR_INTLINE, 1); mpt->pci_cfg.PMCSR = pci_read_config(mpt->dev, 0x44, 4); @@ -680,11 +680,11 @@ mpt_set_config_regs(mpt_softc_t *mpt) if (mpt->verbose) { MPT_CHECK(Command, PCIR_COMMAND, 2); MPT_CHECK(LatencyTimer_LineSize, PCIR_CACHELNSZ, 2); - MPT_CHECK(IO_BAR, PCIR_MAPS, 4); - MPT_CHECK(Mem0_BAR[0], PCIR_MAPS+0x4, 4); - MPT_CHECK(Mem0_BAR[1], PCIR_MAPS+0x8, 4); - MPT_CHECK(Mem1_BAR[0], PCIR_MAPS+0xC, 4); - MPT_CHECK(Mem1_BAR[1], PCIR_MAPS+0x10, 4); + MPT_CHECK(IO_BAR, PCIR_BAR(0), 4); + MPT_CHECK(Mem0_BAR[0], PCIR_BAR(1), 4); + MPT_CHECK(Mem0_BAR[1], PCIR_BAR(2), 4); + MPT_CHECK(Mem1_BAR[0], PCIR_BAR(3), 4); + MPT_CHECK(Mem1_BAR[1], PCIR_BAR(4), 4); MPT_CHECK(ROM_BAR, PCIR_BIOS, 4); MPT_CHECK(IntLine, PCIR_INTLINE, 1); MPT_CHECK(PMCSR, 0x44, 4); @@ -694,11 +694,11 @@ mpt_set_config_regs(mpt_softc_t *mpt) pci_write_config(mpt->dev, PCIR_COMMAND, mpt->pci_cfg.Command, 2); pci_write_config(mpt->dev, PCIR_CACHELNSZ, mpt->pci_cfg.LatencyTimer_LineSize, 2); - pci_write_config(mpt->dev, PCIR_MAPS, mpt->pci_cfg.IO_BAR, 4); - pci_write_config(mpt->dev, PCIR_MAPS+0x4, mpt->pci_cfg.Mem0_BAR[0], 4); - pci_write_config(mpt->dev, PCIR_MAPS+0x8, mpt->pci_cfg.Mem0_BAR[1], 4); - pci_write_config(mpt->dev, PCIR_MAPS+0xC, mpt->pci_cfg.Mem1_BAR[0], 4); - pci_write_config(mpt->dev, PCIR_MAPS+0x10, mpt->pci_cfg.Mem1_BAR[1], 4); + pci_write_config(mpt->dev, PCIR_BAR(0), mpt->pci_cfg.IO_BAR, 4); + pci_write_config(mpt->dev, PCIR_BAR(1), mpt->pci_cfg.Mem0_BAR[0], 4); + pci_write_config(mpt->dev, PCIR_BAR(2), mpt->pci_cfg.Mem0_BAR[1], 4); + pci_write_config(mpt->dev, PCIR_BAR(3), mpt->pci_cfg.Mem1_BAR[0], 4); + pci_write_config(mpt->dev, PCIR_BAR(4), mpt->pci_cfg.Mem1_BAR[1], 4); pci_write_config(mpt->dev, PCIR_BIOS, mpt->pci_cfg.ROM_BAR, 4); pci_write_config(mpt->dev, PCIR_INTLINE, mpt->pci_cfg.IntLine, 1); pci_write_config(mpt->dev, 0x44, mpt->pci_cfg.PMCSR, 4); |
