PERFORCE change 54256 for review

[Juli Mallett]

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

Change 54256 by jmallett at jmallett_oingo on 2004/06/06 05:21:29

	Remove code I plan to factor out.

Affected files ...

.. //depot/projects/mips/sys/mips/sgimips/intr.h#4 edit
.. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#29 edit

Differences ...

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

@@ -1,7 +1,5 @@
-/*	$NetBSD: intr.h,v 1.12 2002/03/13 13:12:28 simonb Exp $	*/
-
-/*
- * Copyright (c) 2000 Soren S. Jorvang
+/*-
+ * Copyright (c) 2004 Juli Mallett <jmallett at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,90 +10,27 @@
  * 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 for the
- *          NetBSD Project.  See http://www.netbsd.org/ for
- *          information about NetBSD.
- * 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.
+ * $P4: //depot/projects/mips/sys/mips/sgimips/intr.h#4 $
  */
 
 #ifndef	_SGIMIPS_INTR_H_
 #define	_SGIMIPS_INTR_H_
 
-#define	IPL_NONE	0	/* Disable only this interrupt. */
-#define	IPL_BIO		1	/* Disable block I/O interrupts. */
-#define	IPL_NET		2	/* Disable network interrupts. */
-#define	IPL_TTY		3	/* Disable terminal interrupts. */
-#define	IPL_CLOCK	4	/* Disable clock interrupts. */
-#define	IPL_STATCLOCK	5	/* Disable profiling interrupts. */
-#ifndef __NO_SOFT_SERIAL_INTERRUPT
-#define	IPL_SERIAL	6	/* Disable serial hardware interrupts. */
-#endif
-#define	IPL_HIGH	7	/* Disable all interrupts. */
-#define NIPL		8
+/*
+ * Nothing to see here.
+ */
 
-/* Interrupt sharing types. */
-#define IST_NONE	0	/* none */
-#define IST_PULSE	1	/* pulsed */
-#define IST_EDGE	2	/* edge-triggered */
-#define IST_LEVEL	3	/* level-triggered */
-
-/* Soft interrupt numbers */
-#define	IPL_SOFTSERIAL	0	/* serial software interrupts */
-#define	IPL_SOFTNET	1	/* network software interrupts */
-#define	IPL_SOFTCLOCK	2	/* clock software interrupts */
-#define	IPL_NSOFT	3
-
-#define	IPL_SOFTNAMES {							\
-	"serial",							\
-	"net",								\
-	"clock",							\
-}
-
-#ifdef _KERNEL
-#ifndef LOCORE
-
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <machine/cpuregs.h>
-
-#define NINTR	32
-
-struct sgimips_intrhand {
-	LIST_ENTRY(sgimips_intrhand)
-		ih_q;
-	int	(*ih_fun) __P((void *));
-	void	 *ih_arg;
-	struct	sgimips_intr *ih_intrhead;
-	int	ih_pending;
-};
-
-struct sgimips_intr {
-	LIST_HEAD(,sgimips_intrhand)
-		intr_q;
-#if notyet
-	struct	evcnt ih_evcnt;
-#endif
-	unsigned long intr_ipl;
-};
-
-extern struct sgimips_intrhand intrtab[];
-
-#endif /* LOCORE */
-#endif /* !_KERNEL */
-
-#endif	/* !_SGIMIPS_INTR_H_ */
-
+#endif /* _SGIMIPS_INTR_H_ */

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

@@ -65,8 +65,6 @@
 
 struct platform platform;
 
-struct sgimips_intrhand intrtab[NINTR];
-
 void
 platform_halt(void)
 {