From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 11:58:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA29016A4D2; Fri, 14 Nov 2003 11:58:01 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A388516A4D0
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:58:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B357643F85
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:58:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAEJw0XJ062735
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 11:58:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEJw09S062732
	for perforce@freebsd.org; Fri, 14 Nov 2003 11:58:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 11:58:00 -0800 (PST)
Message-Id: <200311141958.hAEJw09S062732@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42369 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2003 19:58:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=42369

Change 42369 by peter@peter_overcee on 2003/11/14 11:57:20

	begin restoring the auto-eoi stuff, as much as I dislike it.

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/atpic.c#23 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/isa/atpic.c#23 (text+ko) ====

@@ -55,13 +55,22 @@
 #include <amd64/isa/icu.h>
 #include <amd64/isa/isa.h>
 
-#ifdef DEV_ISA
 #include <isa/isavar.h>
 
 #define	MASTER	0
 #define	SLAVE	1
 
+#ifdef AUTO_EOI_1
+#define	MASTER_MODE	(ICW4_8086 | ICW4_AEOI)
+#else
+#define	MASTER_MODE	ICW4_8086
 #endif
+#ifdef AUTO_EOI_2
+#define	SLAVE_MODE	(ICW4_8086 | ICW4_AEOI)
+#else
+#define	SLAVE_MODE	ICW4_8086
+#endif
+
 
 static void	atpic_init(void *dummy);
 
@@ -164,9 +173,11 @@
 
 	KASSERT(isrc->is_pic == &atpics[MASTER].at_pic,
 	    ("%s: mismatched pic", __func__));
+#ifndef AUTO_EOI_1
 	mtx_lock_spin(&icu_lock);
 	outb(atpics[MASTER].at_ioaddr, ICU_EOI);
 	mtx_unlock_spin(&icu_lock);
+#endif
 }
 
 /*
@@ -179,10 +190,14 @@
 
 	KASSERT(isrc->is_pic == &atpics[SLAVE].at_pic,
 	    ("%s: mismatched pic", __func__));
+#ifndef AUTO_EOI_2
 	mtx_lock_spin(&icu_lock);
 	outb(atpics[SLAVE].at_ioaddr, ICU_EOI);
+#ifndef AUTO_EOI_1
 	outb(atpics[MASTER].at_ioaddr, ICU_EOI);
+#endif
 	mtx_unlock_spin(&icu_lock);
+#endif
 }
 
 static void
@@ -243,9 +258,9 @@
 
 	/* Set mode. */
 	if (slave)
-		outb(imr_addr, ICW4_8086);
+		outb(imr_addr, SLAVE_MODE);
 	else
-		outb(imr_addr, ICW4_8086);
+		outb(imr_addr, MASTER_MODE);
 
 	/* Set interrupt enable mask. */
 	outb(imr_addr, *pic->at_imen);