PERFORCE change 73565 for review

[Juli Mallett]

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

Change 73565 by jmallett at jmallett_windward on 2005/03/20 07:51:48

	This is non-ideal, but stupid structs are just that.

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/ip22.c#12 edit
.. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#42 edit
.. //depot/projects/mips/sys/mips/sgimips/sysconf.h#4 edit

Differences ...

==== //depot/projects/mips/sys/mips/sgimips/ip22.c#12 (text+ko) ====

@@ -165,8 +165,8 @@
 	}
 
 	/* enable watchdog timer, clear it */
-	platform.watchdog = ip22_watchdog;
-	(*platform.watchdog)(1);
+	platform_watchdog = ip22_watchdog;
+	(*platform_watchdog)(1);
 	*(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00014) = 0;
 }
 

==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#42 (text+ko) ====

@@ -66,7 +66,7 @@
 static long arcsmem, availmem, lpmem;
 int mach_type, mach_subtype, mach_boardrev;
 
-struct platform platform;
+void (*platform_watchdog)(int);
 
 void
 platform_halt(void)
@@ -177,11 +177,11 @@
 void
 platform_trap_enter(void)
 {
-	(*platform.watchdog)(FALSE);
+	(*platform_watchdog)(FALSE);
 }
 
 void
 platform_trap_exit(void)
 {
-	(*platform.watchdog)(TRUE);
+	(*platform_watchdog)(TRUE);
 }

==== //depot/projects/mips/sys/mips/sgimips/sysconf.h#4 (text+ko) ====

@@ -1,7 +1,6 @@
-/*	$NetBSD: sysconf.h,v 1.3 2001/11/11 17:21:40 rafal Exp $	*/
-
-/*
- * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+/*-
+ * Copyright (c) 2005 Juli Mallett <jmallett 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
@@ -11,58 +10,25 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 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 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.
- */
-
-/*
- * Additional reworking by Matthew Jacob for NASA/Ames Research Center.
- * Copyright (c) 1997
- */
-
-/*
- * Copyright (c) 1998 Jonathan Stone.  All rights reserved.
- * Additional reworking for pmaxes.
- * Since pmax mboard support different CPU daughterboards,
- * and others are mmultiprocessors, rename from cpu_* to sys_*.
+ * $P4: //depot/projects/mips/sys/mips/sgimips/sysconf.h#4 $
  */
 
 #ifndef	_SGIMIPS_SYSCONF_H_
 #define	_SGIMIPS_SYSCONF_H_
 
-#ifdef _KERNEL
-/*
- * Platform Specific Information and Function Hooks.
- *
- * The tag iobus describes the primary iobus for the platform, primarily
- * to give a hint as to where to start configuring.
- */
+extern void (*platform_watchdog)(int);
 
-struct platform {
-	/*
-	 * Platform Specific Function Hooks
-	 *	watchdog	-	toggle watchdog
-	 */
-	void	(*watchdog)(int);
-};
-
-extern struct platform platform;
-
-#endif /* _KERNEL */
-
-#endif	/* !_SGIMIPS_SYSCONF_H_ */
+#endif /* _SGIMIPS_SYSCONF_H_ */