From owner-p4-projects Mon Aug 26 15:12:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1DD337B406; Mon, 26 Aug 2002 15:12:29 -0700 (PDT) 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 ADE5A37B400 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A4DB43EAF for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QMCSJU035535 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QMCSxS035530 for perforce@freebsd.org; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Date: Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Message-Id: <200208262212.g7QMCSxS035530@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16607 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16607 Change 16607 by peter@peter_mckinley on 2002/08/26 15:11:31 TIGER4 option OBE Affected files ... .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#8 edit Differences ... ==== //depot/projects/ia64/sys/dev/pci/pci_pci.c#8 (text+ko) ==== @@ -47,7 +47,6 @@ #include "pcib_if.h" #include "opt_pci.h" -#include "opt_tiger4.h" static int pcib_probe(device_t dev); static int pcib_attach(device_t dev); @@ -407,51 +406,6 @@ int parent_intpin; int intnum; -#ifdef TIGER4 -int childslot = pci_get_slot(dev); -int childpin = pin - 1; -int childbus = pci_get_bus(dev); -intnum = 255; -#if 0 /* XXX need to hack this at acpi level */ - if (childbus == 1 && childslot == 29 && childpin == 0) - intnum = 50; /* usb */ - if (childbus == 1 && childslot == 29 && childpin == 1) - intnum = 49; /* usb */ -#endif - if (childbus == 1 && childslot == 0 && childpin == 0) - intnum = 18; /* em 51 */ - if (childbus == 3 && childslot == 2 && childpin == 0) - intnum = 52; /* fxp0 63 */ - if (childbus == 5 && childslot == 1 && childpin == 0) - intnum = 24; /* fxp1 52 */ - if (childbus == 10 && childslot == 2 && childpin == 0) - intnum = 76; /* isp0 72 */ - if (childbus == 13 && childslot == 1 && childpin == 0) - intnum = 16; /* fxp2 86 */ -#if 0 - if (childbus == 3 && childslot == 31 && childpin == 0) - intnum = 67; /* hotplug */ - if (childbus == 5 && childslot == 2 && childpin == 0) - intnum = 56; /* mpt0 */ - if (childbus == 5 && childslot == 2 && childpin == 1) - intnum = 57; /* mpt1 */ - if (childbus == 5 && childslot == 31 && childpin == 0) - intnum = 58; /* hotplug */ - if (childbus == 8 && childslot == 31 && childpin == 0) - intnum = 80; /* hotplug */ - if (childbus == 10 && childslot == 31 && childpin == 0) - intnum = 75; /* hotplug */ - if (childbus == 13 && childslot == 31 && childpin == 0) - intnum = 90; /* hotplug */ - if (childbus == 14 && childslot == 31 && childpin == 0) - intnum = 85; /* hotplug */ -#endif -if (intnum != 255) { -device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d - Hardwiring to IRQ %d\n", childbus, childslot, childpin, intnum); -return intnum; -} -#endif - /* * * The PCI standard defines a swizzle of the child-side device/intpin to To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message