From owner-svn-src-all@FreeBSD.ORG  Thu Jun 24 05:49:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49D9D1065670;
	Thu, 24 Jun 2010 05:49:59 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 371B98FC1E;
	Thu, 24 Jun 2010 05:49:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5O5nxx2096349;
	Thu, 24 Jun 2010 05:49:59 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5O5nxI5096348;
	Thu, 24 Jun 2010 05:49:59 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201006240549.o5O5nxI5096348@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 24 Jun 2010 05:49:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209496 - head/sys/powerpc/mpc85xx
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jun 2010 05:49:59 -0000

Author: marcel
Date: Thu Jun 24 05:49:58 2010
New Revision: 209496
URL: http://svn.freebsd.org/changeset/base/209496

Log:
  Assign PCI intline values for ISA interrupts using the new INTR_VEC()
  macro.

Modified:
  head/sys/powerpc/mpc85xx/pci_ocp.c

Modified: head/sys/powerpc/mpc85xx/pci_ocp.c
==============================================================================
--- head/sys/powerpc/mpc85xx/pci_ocp.c	Thu Jun 24 05:47:00 2010	(r209495)
+++ head/sys/powerpc/mpc85xx/pci_ocp.c	Thu Jun 24 05:49:58 2010	(r209496)
@@ -470,11 +470,11 @@ pci_ocp_route_int(struct pci_ocp_softc *
 
 	devfn = DEVFN(bus, slot, func);
 	if (devfn == sc->sc_devfn_via_ide)
-		intline = 14;
+		intline = INTR_VEC(ATPIC_ID, 14);
 	else if (devfn == sc->sc_devfn_via_ide + 1)
-		intline = 10;
+		intline = INTR_VEC(ATPIC_ID, 10);
 	else if (devfn == sc->sc_devfn_via_ide + 2)
-		intline = 10;
+		intline = INTR_VEC(ATPIC_ID, 10);
 	else {
 		if (intpin != 0) {
 			intline = intpin - 1;