diff options
| author | gavin <gavin@FreeBSD.org> | 2012-09-18 22:04:59 +0000 |
|---|---|---|
| committer | gavin <gavin@FreeBSD.org> | 2012-09-18 22:04:59 +0000 |
| commit | 5005c75c5d4c3cea0b6150e4a8c7a1d2f928c052 (patch) | |
| tree | 7ed0c63fa2cebe3a1c0f0d218ef7d4208fbecfc4 /sys/dev/et | |
| parent | 2f179bd308efd2cd4801f4373a8ac9fb8d37d848 (diff) | |
| download | FreeBSD-src-5005c75c5d4c3cea0b6150e4a8c7a1d2f928c052.zip FreeBSD-src-5005c75c5d4c3cea0b6150e4a8c7a1d2f928c052.tar.gz | |
Align the PCI Express #defines with the style used for the PCI-X
#defines. This also has the advantage that it makes the names more
compact, iand also allows us to correct the non-uniform naming of
the PCIM_LINK_* defines, making them all consistent amongst themselves.
This is a mostly mechanical rename:
s/PCIR_EXPRESS_/PCIER_/g
s/PCIM_EXP_/PCIEM_/g
s/PCIM_LINK_/PCIEM_LINK_/g
When this is MFC'd, #defines will be added for the old names to assist
out-of-tree drivers.
Discussed with: jhb
MFC after: 1 week
Diffstat (limited to 'sys/dev/et')
| -rw-r--r-- | sys/dev/et/if_et.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index bde680e..dfdcde7 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -700,8 +700,8 @@ et_bus_config(struct et_softc *sc) * max playload size */ val = pci_read_config(sc->dev, - sc->sc_expcap + PCIR_EXPRESS_DEVICE_CAP, 4); - max_plsz = val & PCIM_EXP_CAP_MAX_PAYLOAD; + sc->sc_expcap + PCIER_DEVICE_CAP, 4); + max_plsz = val & PCIEM_CAP_MAX_PAYLOAD; switch (max_plsz) { case ET_PCIV_DEVICE_CAPS_PLSZ_128: @@ -732,7 +732,7 @@ et_bus_config(struct et_softc *sc) * Set L0s and L1 latency timer to 2us */ val = pci_read_config(sc->dev, ET_PCIR_L0S_L1_LATENCY, 4); - val &= ~(PCIM_LINK_CAP_L0S_EXIT | PCIM_LINK_CAP_L1_EXIT); + val &= ~(PCIEM_LINK_CAP_L0S_EXIT | PCIEM_LINK_CAP_L1_EXIT); /* L0s exit latency : 2us */ val |= 0x00005000; /* L1 exit latency : 2us */ |
