From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 16:07:29 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB16B16A4D0; Thu, 30 Oct 2003 16:07:28 -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 966CF16A4CE
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 16:07:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 162D643F3F
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 16:07:28 -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 h9V07RXJ088915
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 16:07:27 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V07Rw4088912
	for perforce@freebsd.org; Thu, 30 Oct 2003 16:07:27 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Oct 2003 16:07:27 -0800 (PST)
Message-Id: <200310310007.h9V07Rw4088912@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 40906 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, 31 Oct 2003 00:07:29 -0000

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

Change 40906 by peter@peter_daintree on 2003/10/30 16:07:12

	AUTO_EOI? whats that?

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/atpic.c#8 edit
.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#6 edit

Differences ...

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

@@ -161,11 +161,9 @@
 
 	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
 }
 
 static void
@@ -174,14 +172,10 @@
 
 	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
@@ -250,19 +244,10 @@
 		outb(imr_addr, IRQ_SLAVE);	/* slave on line 7 */
 
 	/* Set mode. */
-	if (slave) {
-#ifdef AUTO_EOI_2
-		outb(imr_addr, ICW4_AEOI | ICW4_8086);
-#else
+	if (slave)
 		outb(imr_addr, ICW4_8086);
-#endif
-	} else {
-#ifdef AUTO_EOI_1
-		outb(imr_addr, ICW4_AEOI | ICW4_8086);
-#else
+	else
 		outb(imr_addr, ICW4_8086);
-#endif
-	}
 
 	/* Set interrupt enable mask. */
 	outb(imr_addr, *pic->at_imen);

==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#6 (text+ko) ====

@@ -56,7 +56,7 @@
 #define	ENABLE_ICU1_AND_2						\
 	movb	$ICU_EOI,%al ;	/* as above */				\
 	outb	%al,$IO_ICU2 ;	/* but do second icu first ... */	\
-	outb	%al,$IO_ICU1	/* ... then first icu (if !AUTO_EOI_1) */
+	outb	%al,$IO_ICU1	/* ... then first icu */
 
 
 #define PUSH_FRAME							\