summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2000-11-14 03:56:33 +0000
committerJason Wright <jason@cvs.openbsd.org>2000-11-14 03:56:33 +0000
commitef66d2da33078b1900f5c3c934a41f63424a09e4 (patch)
tree043fb0b6d0cfc72bd270f4aed1ebf443ff8774fc /sys
parent80971b9187972156b330b2a6aaec2ea987b0471a (diff)
remove diagnostic around TL_INTR_INVALID (this is a valid condition when two
devices are on the same interrupt).
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_tl.c8
-rw-r--r--sys/dev/pci/if_tlreg.h3
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 8bf42724b14..2e78b143e35 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tl.c,v 1.13 2000/09/21 04:03:52 jason Exp $ */
+/* $OpenBSD: if_tl.c,v 1.14 2000/11/14 03:56:32 jason Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1773,10 +1773,6 @@ int tl_intr(xsc)
switch(ints) {
case (TL_INTR_INVALID):
-#ifdef DIAGNOSTIC
- if (sc->tl_empty_intr == 0)
- printf("tl%d: got an invalid interrupt!\n", sc->tl_unit);
-#endif
/* Re-enable interrupts but don't ack this one. */
CMD_PUT(sc, type);
r = 0;
@@ -2648,9 +2644,7 @@ tl_attach(parent, self, aux)
/*
* Attempt to clear stray interrupts
*/
- sc->tl_empty_intr = 1;
tl_intr((void *)sc);
- sc->tl_empty_intr = 0;
/*
* Attach us everywhere.
diff --git a/sys/dev/pci/if_tlreg.h b/sys/dev/pci/if_tlreg.h
index cd4d307dbdb..0da151792ca 100644
--- a/sys/dev/pci/if_tlreg.h
+++ b/sys/dev/pci/if_tlreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tlreg.h,v 1.4 1999/09/13 20:45:26 jason Exp $ */
+/* $OpenBSD: if_tlreg.h,v 1.5 2000/11/14 03:56:32 jason Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -122,7 +122,6 @@ struct tl_softc {
u_int8_t tl_ctlr; /* chip number */
u_int8_t tl_unit; /* interface number */
u_int8_t tl_eeaddr;
- u_int8_t tl_empty_intr; /* expecting empty interrupt */
u_int8_t tl_phy_addr; /* PHY address */
u_int8_t tl_tx_pend; /* TX pending */
u_int8_t tl_want_auto; /* autoneg scheduled */