From owner-p4-projects@FreeBSD.ORG  Sun Feb 20 22:19:13 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 285B216A4DB; Sun, 20 Feb 2005 22:19:13 +0000 (GMT)
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 3CA7816A4D6
	for <perforce@freebsd.org>; Sun, 20 Feb 2005 22:19:12 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F7C343D53
	for <perforce@freebsd.org>; Sun, 20 Feb 2005 22:19:12 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1KMJCwU066917
	for <perforce@freebsd.org>; Sun, 20 Feb 2005 22:19:12 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1KMJBUv066914
	for perforce@freebsd.org; Sun, 20 Feb 2005 22:19:11 GMT
	(envelope-from cognet@freebsd.org)
Date: Sun, 20 Feb 2005 22:19:11 GMT
Message-Id: <200502202219.j1KMJBUv066914@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 71418 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: Sun, 20 Feb 2005 22:19:13 -0000

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

Change 71418 by cognet@cognet on 2005/02/20 22:19:04

	Convert the iq31244 code to the new irq api.

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321.c#2 edit
.. //depot/projects/arm/src/sys/arm/xscale/i80321/iq80321.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/i80321/i80321.c#2 (text+ko) ====

@@ -259,10 +259,13 @@
 }
 
 int
-arm_get_irqnb(void *clockframe)
+arm_get_next_irq()
 {
+	int irq;
 
-	return (i80321_iintsrc_read());
+	if ((irq = i80321_iintsrc_read()))
+		return (ffs(irq) - 1);
+	return (-1);
 }
 
 

==== //depot/projects/arm/src/sys/arm/xscale/i80321/iq80321.c#2 (text+ko) ====

@@ -265,14 +265,14 @@
 void
 arm_mask_irqs(int nb)
 {
-	intr_enabled &= ~nb;
+	intr_enabled &= ~(1 << nb);
 	i80321_set_intrmask();
 }
 
 void
 arm_unmask_irqs(int nb)
 {
-	intr_enabled |= nb;
+	intr_enabled |= (1 << nb);
 	i80321_set_intrmask();
 }