summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>1999-12-08 00:38:09 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>1999-12-08 00:38:09 +0000
commitf150170880f50ae34ea1e8a8c4b66ac221990d8e (patch)
tree6a81b587536096df84f65f4be5bf3bce9eeb6531
parentb27a83cfd2cc6caa98d68e327c231887e8f8f851 (diff)
Remove unused #define cruft.
-rw-r--r--sys/dev/pci/if_al.c10
-rw-r--r--sys/dev/pci/if_sf.c10
-rw-r--r--sys/dev/pci/if_sis.c10
-rw-r--r--sys/dev/pci/if_sk.c10
-rw-r--r--sys/dev/pci/if_ste.c10
5 files changed, 5 insertions, 45 deletions
diff --git a/sys/dev/pci/if_al.c b/sys/dev/pci/if_al.c
index 3bbc2bcf738..a4fdb8f8e70 100644
--- a/sys/dev/pci/if_al.c
+++ b/sys/dev/pci/if_al.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_al.c,v 1.3 1999/11/28 16:43:47 aaron Exp $ */
+/* $OpenBSD: if_al.c,v 1.4 1999/12/08 00:38:07 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -149,14 +149,6 @@ void al_reset __P((struct al_softc *));
int al_list_rx_init __P((struct al_softc *));
int al_list_tx_init __P((struct al_softc *));
-#ifdef AL_USEIOSPACE
-#define AL_RES SYS_RES_IOPORT
-#define AL_RID AL_PCI_LOIO
-#else
-#define AL_RES SYS_RES_MEMORY
-#define AL_RID AL_PCI_LOMEM
-#endif
-
#define AL_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
CSR_READ_4(sc, reg) | x)
diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c
index 47d90d524a5..c8c65d1b47a 100644
--- a/sys/dev/pci/if_sf.c
+++ b/sys/dev/pci/if_sf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sf.c,v 1.3 1999/12/08 00:29:26 aaron Exp $ */
+/* $OpenBSD: if_sf.c,v 1.4 1999/12/08 00:38:07 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -162,14 +162,6 @@ void sf_miibus_statchg __P((struct device *));
u_int32_t csr_read_4 __P((struct sf_softc *, int));
void csr_write_4 __P((struct sf_softc *, int, u_int32_t));
-#ifdef SF_USEIOSPACE
-#define SF_RES SYS_RES_IOPORT
-#define SF_RID SF_PCI_LOIO
-#else
-#define SF_RES SYS_RES_MEMORY
-#define SF_RID SF_PCI_LOMEM
-#endif
-
#define SF_SETBIT(sc, reg, x) \
csr_write_4(sc, reg, csr_read_4(sc, reg) | x)
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index eec491c6e50..d4e6e273dd5 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sis.c,v 1.1 1999/12/04 20:27:36 aaron Exp $ */
+/* $OpenBSD: if_sis.c,v 1.2 1999/12/08 00:38:08 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -136,14 +136,6 @@ void sis_reset __P((struct sis_softc *));
int sis_list_rx_init __P((struct sis_softc *));
int sis_list_tx_init __P((struct sis_softc *));
-#ifdef SIS_USEIOSPACE
-#define SIS_RES SYS_RES_IOPORT
-#define SIS_RID SIS_PCI_LOIO
-#else
-#define SIS_RES SYS_RES_MEMORY
-#define SIS_RID SIS_PCI_LOMEM
-#endif
-
#define SIS_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, \
CSR_READ_4(sc, reg) | (x))
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index eea995ed97c..b7c8a34da25 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.4 1999/10/22 07:14:42 deraadt Exp $ */
+/* $OpenBSD: if_sk.c,v 1.5 1999/12/08 00:38:08 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -152,14 +152,6 @@ u_int32_t sk_calchash __P((caddr_t));
void sk_setfilt __P((struct sk_if_softc *, caddr_t, int));
void sk_setmulti __P((struct sk_if_softc *));
-#ifdef SK_USEIOSPACE
-#define SK_RES SYS_RES_IOPORT
-#define SK_RID SK_PCI_LOIO
-#else
-#define SK_RES SYS_RES_MEMORY
-#define SK_RID SK_PCI_LOMEM
-#endif
-
#define SK_SETBIT(sc, reg, x) \
CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x)
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index d40eab5f4ae..32a1a00d823 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ste.c,v 1.4 1999/12/08 00:29:26 aaron Exp $ */
+/* $OpenBSD: if_ste.c,v 1.5 1999/12/08 00:38:08 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -120,14 +120,6 @@ void ste_setmulti __P((struct ste_softc *));
int ste_init_rx_list __P((struct ste_softc *));
void ste_init_tx_list __P((struct ste_softc *));
-#ifdef STE_USEIOSPACE
-#define STE_RES SYS_RES_IOPORT
-#define STE_RID STE_PCI_LOIO
-#else
-#define STE_RES SYS_RES_MEMORY
-#define STE_RID STE_PCI_LOMEM
-#endif
-
#define STE_SETBIT4(sc, reg, x) \
CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x)