summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-08-17 20:55:35 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-08-17 20:55:35 +0000
commit23128a2cc52e858ca06c0ce4451f3724c757a93c (patch)
treeb7d7eb83876108de46e9adf49e960b9cee6ba01b /sys
parentd517243f5c79c8288b6549f5c37946c14d63752d (diff)
Remove some #ifdef'ed out (bogus) debug code.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_msk.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 1bd1ffc8ccb..3830085a3ab 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_msk.c,v 1.5 2006/08/17 20:07:52 brad Exp $ */
+/* $OpenBSD: if_msk.c,v 1.6 2006/08/17 20:55:34 kettenis Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1778,7 +1778,6 @@ msk_intr(void *xsc)
u_int16_t idx;
struct msk_status_desc *cur_st;
-#if 1
status = CSR_READ_4(sc, SK_Y2_ISSR2);
if (status == 0) {
CSR_WRITE_4(sc, SK_Y2_ICR, 2);
@@ -1786,11 +1785,6 @@ msk_intr(void *xsc)
}
status = CSR_READ_4(sc, SK_ISR);
-#else
- status = CSR_READ_4(sc, SK_Y2_EISR);
- if (status == 0)
- return (0);
-#endif
if (sc_if0 != NULL)
ifp0 = &sc_if0->arpcom.ac_if;
@@ -1838,11 +1832,7 @@ msk_intr(void *xsc)
claimed = 1;
}
-#if 1
CSR_WRITE_4(sc, SK_Y2_ICR, 2);
-#else
- CSR_READ_4(sc, SK_Y2_LISR);
-#endif
if (ifp0 != NULL && !IFQ_IS_EMPTY(&ifp0->if_snd))
msk_start(ifp0);