From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 18:44:22 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74B9116A4D0; Tue, 11 Nov 2003 18:44:22 -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 4FFCD16A4CE
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 18:44:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C571643FA3
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 18:44:21 -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 hAC2iLXJ027695
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 18:44:21 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC2iLb3027692
	for perforce@freebsd.org; Tue, 11 Nov 2003 18:44:21 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 11 Nov 2003 18:44:21 -0800 (PST)
Message-Id: <200311120244.hAC2iLb3027692@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 42073 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: Wed, 12 Nov 2003 02:44:22 -0000

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

Change 42073 by peter@peter_daintree on 2003/11/11 18:43:20

	clean up a leftover merge turd.  Add note about moving the EOI and
	masking into C, along with the curthread->td_intr_nesting_level++;
	frobbing etc.

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#2 edit

Differences ...

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

@@ -58,15 +58,6 @@
 	outb	%al,$IO_ICU2 ;	/* but do second icu first ... */	\
 	outb	%al,$IO_ICU1	/* ... then first icu */
 
-
-#define PUSH_FRAME							\
-
-#define MASK_IRQ(icu, irq_num)						\
-	movb	imen + IRQ_BYTE(irq_num),%al ;				\
-	orb	$IRQ_BIT(irq_num),%al ;					\
-	movb	%al,imen + IRQ_BYTE(irq_num) ;				\
-	outb	%al,$icu+ICU_IMR_OFFSET
-
 /*
  * Macros for interrupt interrupt entry, call to handler, and exit.
  *
@@ -75,6 +66,7 @@
  * XXX we really shouldn't return via doreti if we just schedule the
  * interrupt handler and don't run anything.  We could just do an
  * iret.  FIXME.
+ * XXX move the mask, EOI and td_intr_nesting_level frobbing into C code.
  */
 #define	INTR(irq_num, vec_name, icu, enable_icus, maybe_extra_ipending) \
 	.text ;								\