From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 15:55: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 CD8C016A4CE; Thu, 30 Oct 2003 15:55:09 -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 E465616A4CE
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:55:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2FE0743F93
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:55:08 -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 h9UNt8XJ087251
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 15:55:08 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UNt75D087248
	for perforce@freebsd.org; Thu, 30 Oct 2003 15:55:07 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Thu, 30 Oct 2003 15:55:07 -0800 (PST)
Message-Id: <200310302355.h9UNt75D087248@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 40899 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: Thu, 30 Oct 2003 23:55:22 -0000

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

Change 40899 by peter@peter_daintree on 2003/10/30 15:54:59

	sync up with jhb

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/icu.h#8 edit

Differences ...

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

@@ -121,12 +121,15 @@
  */
 #define	ICU_OFFSET	32		/* 0-31 are processor exceptions */
 #define	ICU_LEN		16		/* 32-47 are ISA interrupts */
-#define	HWI_MASK	0xffff		/* bits for h/w interrupts */
-#define	NHWI		16
-
 #define	ICU_IMR_OFFSET	1
 #define	ICU_SLAVEID	2
 #define	ICU_EOI		(OCW2_EOI)	/* non-specific EOI */
 #define	ICU_SETPRI	(OCW2_R | OCW2_SL) /* set rotation priority */
+#define	HWI_MASK	0xffff		/* bits for h/w interrupts */
+
+#ifndef LOCORE
+void	atpic_sched_ithd(void *cookie, struct intrframe iframe);
+void	atpic_startup(void);
+#endif
 
 #endif /* !_I386_ISA_ICU_H_ */