summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2005-10-03 15:47:15 +0000
committerjhb <jhb@FreeBSD.org>2005-10-03 15:47:15 +0000
commite9d4f7764c822f14d141673157541dd944414539 (patch)
tree71be632c1c25cd071780e44cc468ee0fdfe54212 /sys
parent8d7cf8436309b88e5cf0e7802a0c53441cedff72 (diff)
downloadFreeBSD-src-e9d4f7764c822f14d141673157541dd944414539.zip
FreeBSD-src-e9d4f7764c822f14d141673157541dd944414539.tar.gz
- Use PCIR_BAR().
- Remove unused TXP_PCI_INTLINE and TXP_DEVNAME macros.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/txp/if_txpreg.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index df37b51..66acbb0 100644
--- a/sys/dev/txp/if_txpreg.h
+++ b/sys/dev/txp/if_txpreg.h
@@ -32,9 +32,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define TXP_PCI_LOMEM 0x14 /* pci conf, memory map BAR */
-#define TXP_PCI_LOIO 0x10 /* pci conf, IO map BAR */
-#define TXP_PCI_INTLINE 0x3C
+#define TXP_PCI_LOMEM PCIR_BAR(1) /* memory map BAR */
+#define TXP_PCI_LOIO PCIR_BAR(0) /* IO map BAR */
/*
* Typhoon registers.
@@ -618,8 +617,6 @@ struct txp_softc {
u_int32_t sc_rx_capability, sc_tx_capability;
};
-#define TXP_DEVNAME(sc) ((sc)->sc_cold ? "" : (sc)->sc_dev.dv_xname)
-
struct txp_fw_file_header {
u_int8_t magicid[8]; /* TYPHOON\0 */
u_int32_t version;
OpenPOWER on IntegriCloud