From owner-p4-projects@FreeBSD.ORG  Tue Dec 15 22:08:16 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 089AB106568B; Tue, 15 Dec 2009 22:08:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C11801065676
	for <perforce@freebsd.org>; Tue, 15 Dec 2009 22:08:15 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AFC138FC1A
	for <perforce@freebsd.org>; Tue, 15 Dec 2009 22:08:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBFM8FWl070846
	for <perforce@freebsd.org>; Tue, 15 Dec 2009 22:08:15 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBFM8FaB070844
	for perforce@freebsd.org; Tue, 15 Dec 2009 22:08:15 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 15 Dec 2009 22:08:15 GMT
Message-Id: <200912152208.nBFM8FaB070844@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 171814 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 15 Dec 2009 22:08:16 -0000

http://p4web.freebsd.org/chv.cgi?CH=171814

Change 171814 by raj@raj_fdt on 2009/12/15 22:07:44

	Move ISA IRQ count definiton to a common header.
	
	This will be used by the simplebus driver code besides the intr
	machdep area.

Affected files ...

.. //depot/projects/fdt/sys/powerpc/include/intr_machdep.h#2 edit
.. //depot/projects/fdt/sys/powerpc/powerpc/intr_machdep.c#2 edit

Differences ...

==== //depot/projects/fdt/sys/powerpc/include/intr_machdep.h#2 (text+ko) ====

@@ -28,8 +28,18 @@
 #ifndef	_MACHINE_INTR_MACHDEP_H_
 #define	_MACHINE_INTR_MACHDEP_H_
 
+#include "opt_platform.h"
+
 #define	INTR_VECTORS	256
 
+#ifdef MPC85XX
+#define	ISA_IRQ_COUNT	16
+#endif
+
+#ifndef ISA_IRQ_COUNT
+#define	ISA_IRQ_COUNT	0
+#endif
+
 extern device_t pic;
 extern device_t pic8259;
 

==== //depot/projects/fdt/sys/powerpc/powerpc/intr_machdep.c#2 (text+ko) ====

@@ -60,8 +60,6 @@
  * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.26 2009/04/24 03:51:11 marcel Exp $
  */
 
-#include "opt_platform.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -85,14 +83,6 @@
 
 #include "pic_if.h"
 
-#ifdef MPC85XX
-#define	ISA_IRQ_COUNT	16
-#endif
-
-#ifndef ISA_IRQ_COUNT
-#define	ISA_IRQ_COUNT	0
-#endif
-
 #define	MAX_STRAY_LOG	5
 
 MALLOC_DEFINE(M_INTR, "intr", "interrupt handler data");