From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 11:12:00 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 415E316A4E7; Thu, 30 Oct 2003 11:12:00 -0800 (PST)
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 1058D16A4D0
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 11:12:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D374043FCB
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 11:11:58 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9UJBwXJ059263
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 11:11:58 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9UJBw2j059259
	for perforce@freebsd.org; Thu, 30 Oct 2003 11:11:58 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Thu, 30 Oct 2003 11:11:58 -0800 (PST)
Message-Id: <200310301911.h9UJBw2j059259@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40854 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: Thu, 30 Oct 2003 19:12:01 -0000

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

Change 40854 by jhb@jhb_laptop on 2003/10/30 11:11:56

	- Fix pci_resume() compile.
	- Export pci_resume() and pci_suspend().

Affected files ...

.. //depot/projects/power/sys/dev/pci/pci.c#4 edit
.. //depot/projects/power/sys/dev/pci/pci_private.h#4 edit

Differences ...

==== //depot/projects/power/sys/dev/pci/pci.c#4 (text+ko) ====

@@ -74,8 +74,6 @@
 			    device_t dev);
 static int		pci_probe(device_t dev);
 static int		pci_attach(device_t dev);
-static int		pci_suspend(device_t dev);
-static int		pci_resume(device_t dev);
 static void		pci_load_vendor_data(void);
 static int		pci_describe_parse_line(char **ptr, int *vendor, 
 			    int *device, char **desc);
@@ -933,7 +931,7 @@
 	return (bus_generic_attach(dev));
 }
 
-static int
+int
 pci_suspend(device_t dev)
 {
 	int numdevs;
@@ -957,7 +955,7 @@
 	return (bus_generic_suspend(dev));
 }
 
-static int
+int
 pci_resume(device_t dev)
 {
 	int numdevs;
@@ -1626,7 +1624,8 @@
 	pci_write_config(dev, PCIR_MINGNT, dinfo->cfg.mingnt, 1);
 	pci_write_config(dev, PCIR_MAXLAT, dinfo->cfg.maxlat, 1);
 	if (dinfo->cfg.intpin > 0 && PCI_INTERRUPT_VALID(dinfo->cfg.intline))
-		dinfo->cfg.intline = PCI_ASSIGN_INTERRUPT(dev, child);
+		dinfo->cfg.intline = PCI_ASSIGN_INTERRUPT(
+		    device_get_parent(dev), dev);
 	pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1);
 	pci_write_config(dev, PCIR_INTPIN, dinfo->cfg.intpin, 1);
 }

==== //depot/projects/power/sys/dev/pci/pci_private.h#4 (text+ko) ====

@@ -75,4 +75,5 @@
 		    char *buf, size_t buflen);
 int		pci_assign_interrupt_method(device_t dev, device_t child);
 int		pci_resume(device_t dev);
+int		pci_suspend(device_t dev);
 #endif /* _PCI_PRIVATE_H_ */