From owner-p4-projects@FreeBSD.ORG  Wed Jul 16 19:01:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F49D1065688; Wed, 16 Jul 2008 19:01:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 433161065686
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 19:01:49 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 22F268FC1F
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 19:01:49 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6GJ1nfP000269
	for <perforce@FreeBSD.org>; Wed, 16 Jul 2008 19:01:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6GJ1nsF000267
	for perforce@freebsd.org; Wed, 16 Jul 2008 19:01:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 16 Jul 2008 19:01:49 GMT
Message-Id: <200807161901.m6GJ1nsF000267@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145340 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 16 Jul 2008 19:01:49 -0000

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

Change 145340 by gonzo@gonzo_jeeves on 2008/07/16 19:01:41

	- pass one more argument to intr_event_create
	- use intr_event_handle to handle interrupts instead of custom
	    implementation.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/adm5120/obio.c#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/adm5120/obio.c#3 (text+ko) ====

@@ -320,7 +320,7 @@
 
 	event = sc->sc_eventstab[irq];
 	if (event == NULL) {
-		error = intr_event_create(&event, (void *)irq, 0,
+		error = intr_event_create(&event, (void *)irq, 0, irq,
 		    (mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq,
 		    NULL, NULL, "obio intr%d:", irq);
 
@@ -379,9 +379,8 @@
 {
 	struct obio_softc *sc = arg;
 	struct intr_event *event;
-	struct intr_handler *ih;
 	uint32_t irqstat;
-	int irq, thread = 0;
+	int irq;
 
 	irqstat = REG_READ(ICU_FIQ_STATUS_REG);
 	irqstat |= REG_READ(ICU_STATUS_REG);
@@ -390,20 +389,12 @@
 	while (irqstat != 0) {
 		if ((irqstat & 1) == 1) {
 			event = sc->sc_eventstab[irq];
-			if (event && !TAILQ_EMPTY(&event->ie_handlers)) {
-				/* Execute fast handlers. */
-				TAILQ_FOREACH(ih, &event->ie_handlers,
-				    ih_next) {
-					if (ih->ih_filter == NULL)
-						thread = 1;
-					else
-						ih->ih_filter(ih->ih_argument);
-				}
-			}
+			if (!event || TAILQ_EMPTY(&event->ie_handlers))
+				continue;
 
-			/* Schedule thread if needed. */
-			if (thread)
-				intr_event_schedule_thread(event);
+			/* TODO: pass frame as an argument*/
+			/* TODO: log stray interrupt */
+			intr_event_handle(event, NULL);
 		}
 
 		irq++;