From owner-p4-projects@FreeBSD.ORG  Sun Feb 22 11:26:26 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 21CDB1065677; Sun, 22 Feb 2009 11:26:26 +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 D3DA61065670
	for <perforce@freebsd.org>; Sun, 22 Feb 2009 11:26:25 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C263C8FC13
	for <perforce@freebsd.org>; Sun, 22 Feb 2009 11:26:25 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MBQPuI011918
	for <perforce@freebsd.org>; Sun, 22 Feb 2009 11:26:25 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MBQPpK011916
	for perforce@freebsd.org; Sun, 22 Feb 2009 11:26:25 GMT
	(envelope-from andrew@freebsd.org)
Date: Sun, 22 Feb 2009 11:26:25 GMT
Message-Id: <200902221126.n1MBQPpK011916@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 158062 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: Sun, 22 Feb 2009 11:26:27 -0000

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

Change 158062 by andrew@andrew_bender on 2009/02/22 11:26:05

	Assign the parent uart irq not the sub irq's
	Fix an off by 1 error in arm_get_next_irq

Affected files ...

.. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#8 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#8 (text+ko) ====

@@ -193,18 +193,6 @@
 				start = S3C24X0_INT_TC;
 				end = S3C24X0_INT_ADC;
 				break;
-			case S3C24X0_INT_UART0:
-				start = S3C24X0_INT_RXD0;
-				end = S3C24X0_INT_ERR0;
-				break;
-			case S3C24X0_INT_UART1:
-				start = S3C24X0_INT_RXD1;
-				end = S3C24X0_INT_ERR1;
-				break;
-			case S3C24X0_INT_UART2:
-				start = S3C24X0_INT_RXD2;
-				end = S3C24X0_INT_ERR2;
-				break;
 			default:
 				break;
 			}
@@ -529,7 +517,7 @@
 			if (subirq == 0)
 				return (irq);
 
-			subirq = ffs(subirq);
+			subirq = ffs(subirq) - 1;
 
 			/* Clear the sub irq pending bit */
 			bus_space_write_4(&s3c2xx0_bs_tag,