svn commit: r231239 - stable/8/sys/sun4v/include
Marius Strobl
marius at FreeBSD.org
Wed Feb 8 23:57:04 UTC 2012
Author: marius
Date: Wed Feb 8 23:57:03 2012
New Revision: 231239
URL: http://svn.freebsd.org/changeset/base/231239
Log:
Given that sun4u uses sparc64/sparc64/ofw_machdep.c, use the sparc64
<machine/ofw_machdep.h> here also. This isn't exactly a clean approach
though as ofw_machdep.h also includes some prototypes for functions
that aren't actually shared between both architectures but just happen
to have the same interface. Given that the sun4v support actually is
dead and this is just to allow things to continue to compile it should
be okay though.
This is a direct commit to stable/8.
Modified:
stable/8/sys/sun4v/include/ofw_machdep.h
Modified: stable/8/sys/sun4v/include/ofw_machdep.h
==============================================================================
--- stable/8/sys/sun4v/include/ofw_machdep.h Wed Feb 8 23:51:46 2012 (r231238)
+++ stable/8/sys/sun4v/include/ofw_machdep.h Wed Feb 8 23:57:03 2012 (r231239)
@@ -1,44 +1,7 @@
/*-
- * Copyright (c) 2001 by Thomas Moestl <tmm at FreeBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * 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.
+ * This file is in the public domain.
*
* $FreeBSD$
*/
-#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 *);
-u_int OF_getscsinitid(device_t);
-void cpu_shutdown(void *);
-int ofw_entry(void *);
-void ofw_exit(void *);
-
-#endif /* _MACHINE_OFW_MACHDEP_H_ */
+#include <sparc64/ofw_machdep.h>
More information about the svn-src-stable-8
mailing list