PERFORCE change 153134 for review

[Nathan Whitehorn]

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

Change 153134 by nwhitehorn at nwhitehorn_trantor on 2008/11/18 13:52:59

	Update sun4v to new interrupt map handling scheme as well, and fix
	two missed files from the pluggable OF update.

Affected files ...

.. //depot/projects/ppc-g5/sys/conf/files.sun4v#3 edit
.. //depot/projects/ppc-g5/sys/sun4v/include/ofw_bus.h#2 delete
.. //depot/projects/ppc-g5/sys/sun4v/include/ofw_machdep.h#3 edit

Differences ...

==== //depot/projects/ppc-g5/sys/conf/files.sun4v#3 (text+ko) ====

@@ -21,8 +21,10 @@
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/ofw/ofw_bus_if.m		standard
+dev/ofw/ofw_if.m		standard
 dev/ofw/ofw_bus_subr.c		standard
 dev/ofw/ofw_console.c		optional	ofw_console
+dev/ofw/ofw_standard.c		standard
 dev/ofw/openfirm.c		standard
 dev/ofw/openfirmio.c		standard
 dev/ofw/openpromio.c		standard
@@ -65,7 +67,6 @@
 sun4v/sun4v/mp_machdep.c	optional	smp
 sun4v/sun4v/nexus.c		standard
 sun4v/cddl/t1_copy.S		standard
-sparc64/sparc64/ofw_bus.c	standard
 sparc64/sparc64/ofw_machdep.c	standard
 sun4v/sun4v/pmap.c		standard
 sparc64/sparc64/prof_machdep.c	optional	profiling-routine

==== //depot/projects/ppc-g5/sys/sun4v/include/ofw_machdep.h#3 (text+ko) ====

@@ -22,17 +22,22 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sun4v/include/ofw_machdep.h,v 1.1 2006/10/05 06:14:26 kmacy Exp $
+ * $FreeBSD: src/sys/sparc64/include/ofw_machdep.h,v 1.6 2005/02/12 19:13:51 marius Exp $
  */
 
 #ifndef _MACHINE_OFW_MACHDEP_H_
 #define _MACHINE_OFW_MACHDEP_H_
 
 #include <sys/bus.h>
+#include <machine/bus.h>
+#include <dev/ofw/openfirm.h>
 
+typedef uint64_t cell_t;
+
 int  OF_decode_addr(phandle_t, int, int *, bus_addr_t *);
 void OF_getetheraddr(device_t, u_char *);
 void cpu_shutdown(void *);
-void openfirmware_exit(void *);
+int  ofw_entry(void *);
+void ofw_exit(void *);
 
 #endif /* _MACHINE_OFW_MACHDEP_H_ */