diff options
| author | fsmp <fsmp@FreeBSD.org> | 1997-04-27 21:18:59 +0000 |
|---|---|---|
| committer | fsmp <fsmp@FreeBSD.org> | 1997-04-27 21:18:59 +0000 |
| commit | b1042863dff19807cf2cf1c5270339b74ff3157c (patch) | |
| tree | ffc6d2cfb0815f952561a9e5da848ac7b3198344 /sys/i386/isa/if_ze.c | |
| parent | 9b85100220bea3138bfa8f7426ffb9e2486650f3 (diff) | |
| download | FreeBSD-src-b1042863dff19807cf2cf1c5270339b74ff3157c.zip FreeBSD-src-b1042863dff19807cf2cf1c5270339b74ff3157c.tar.gz | |
informal discussion between Bruce Evans <bde@zeta.org.au>,
Peter Wemm <peter@spinner.DIALix.COM>, Steve Passe <smp@csn.net>
removed all the IPI_INTS code.
made the XFAST_IPI32 code default, renaming Xfastipi32 to Xinvltlb.
cleanup of i386/isa/isa_device.h to eliminate SMP dependancies:
made the id_irq member of struct isa_device an u_int.
made the id_drq member of struct isa_device an int.
removed all other '#ifdefs' concerning SMP & APIC_IO.
removed SMP/APIC_IO dependancies from if_ze.c.
Diffstat (limited to 'sys/i386/isa/if_ze.c')
| -rw-r--r-- | sys/i386/isa/if_ze.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index ac988a9..1b211cd 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id: if_ze.c,v 1.41 1997/03/24 11:32:55 bde Exp $ + * $Id: if_ze.c,v 1.42 1997/04/26 11:45:57 peter Exp $ */ /* XXX - Don't mix different PCCARD support code */ @@ -64,7 +64,6 @@ #include "ze.h" #if NZE > 0 #include "bpfilter.h" -#include "opt_smp.h" #include <sys/param.h> #include <sys/systm.h> @@ -117,11 +116,6 @@ #include <machine/apm_bios.h> #endif /* NAPM > 0 */ -#if defined(APIC_IO) -#include <machine/smp.h> -#include <machine/mpapic.h> -#endif /* APIC_IO */ - /***************************************************************************** * Driver for Ethernet Adapter * @@ -733,11 +727,7 @@ ze_watchdog(ifp) #if 1 struct ze_softc *sc = (struct ze_softc *)ifp; u_char isr, imr; -#if defined(APIC_IO) u_int imask; -#else - u_short imask; -#endif /* APIC_IO */ if(!(ifp->if_flags & IFF_UP)) return; @@ -755,11 +745,7 @@ ze_watchdog(ifp) /* read interrupt mask register */ imr = inb (sc->nic_addr + ED_P2_IMR) & 0xff; -#if defined(APIC_IO) imask = INTRGET(); -#else - imask = inb(IO_ICU2) << 8 | inb(IO_ICU1); -#endif /* APIC_IO */ log (LOG_ERR, "ze%d: device timeout, isr=%02x, imr=%02x, imask=%04x\n", ifp->if_unit, isr, imr, imask); |
