PERFORCE change 171814 for review

[Rafal Jaworowski]

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

Change 171814 by raj at 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");