From owner-p4-projects@FreeBSD.ORG  Sat Mar 13 00:37:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DCA7616A4D0; Sat, 13 Mar 2004 00:37:09 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B863216A4CE
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 00:37:09 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B2AF043D3F
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 00:37:09 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2D8b9Ge054558
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 00:37:09 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8b9wv054555
	for perforce@freebsd.org; Sat, 13 Mar 2004 00:37:09 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 13 Mar 2004 00:37:09 -0800 (PST)
Message-Id: <200403130837.i2D8b9wv054555@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48876 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Mar 2004 08:37:10 -0000

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

Change 48876 by jmallett@jmallett_oingo on 2004/03/13 00:36:14

	Interrupt?  Sure, why not.

Affected files ...

.. //depot/projects/mips/sys/mips/include/hwfunc.h#4 edit
.. //depot/projects/mips/sys/mips/mips/trap.c#17 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/hwfunc.h#4 (text+ko) ====

@@ -28,12 +28,15 @@
 #ifndef _MACHINE_HWFUNC_H_
 #define	_MACHINE_HWFUNC_H_
 
+struct trapframe;
+
 /*
  * Hooks downward into hardware functionality.
  */
 
 void platform_configure(void);
 void platform_halt(void);
+void platform_intr(struct trapframe *);
 void platform_reset(void);
 void platform_start(int, char *[]);
 

==== //depot/projects/mips/sys/mips/mips/trap.c#17 (text+ko) ====

@@ -40,6 +40,7 @@
 #include <machine/pte.h>
 #include <machine/tlb.h>
 #include <machine/trap.h>
+#include <machine/hwfunc.h>
 
 #ifdef DDB
 #include <machine/db_machdep.h>
@@ -108,6 +109,12 @@
 		tlb_modified(badvaddr);
 		platform_trap_exit();
 		return;
+	case TrInt:
+		platform_trap_exit();
+		atomic_add_int(&curthread->td_intr_nesting_level, 1);
+		platform_intr(tf);
+		atomic_subtract_int(&curthread->td_intr_nesting_level, 1);
+		return;
 	default:
 		/* Fatal! */
 		break;