From 78486f55efc580960b86c5bbc75a5ac0842a503a Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 3 Oct 2005 15:47:15 +0000
Subject: [PATCH] - Use PCIR_BAR(). - Remove unused TXP_PCI_INTLINE and
 TXP_DEVNAME macros.

---
 sys/dev/txp/if_txpreg.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sys/dev/txp/if_txpreg.h b/sys/dev/txp/if_txpreg.h
index df37b5170369..66acbb0ee1d3 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;