Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/pcivar.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/pcivar.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.74
retrieving revision 1.74.14.4
diff -u -p -r1.74 -r1.74.14.4
--- src/sys/dev/pci/pcivar.h	2007/03/04 06:02:25	1.74
+++ src/sys/dev/pci/pcivar.h	2007/10/26 15:46:49	1.74.14.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcivar.h,v 1.74 2007/03/04 06:02:25 christos Exp $	*/
+/*	$NetBSD: pcivar.h,v 1.74.14.4 2007/10/26 15:46:49 joerg Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -42,7 +42,8 @@
  */
 
 #include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/pnp.h>
+#include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 
 /*
@@ -169,7 +170,6 @@ struct pci_softc {
 	/* accounting of child devices */
 	struct device *sc_devices[32*8];
 #define PCI_SC_DEVICESC(d, f) sc_devices[(d) * 8 + (f)]
-	void *sc_powerhook;
 };
 
 struct pci_conf_state {
@@ -178,6 +178,8 @@ struct pci_conf_state {
 
 extern struct cfdriver pci_cd;
 
+struct ifnet;
+
 int pcibusprint(void *, const char *);
 
 /*
@@ -246,6 +248,26 @@ int	pci_set_powerstate(pci_chipset_tag_t
 int	pci_activate(pci_chipset_tag_t, pcitag_t, void *,
     int (*)(pci_chipset_tag_t, pcitag_t, void *, pcireg_t));
 int	pci_activate_null(pci_chipset_tag_t, pcitag_t, void *, pcireg_t);
+void	pci_disable_retry(pci_chipset_tag_t, pcitag_t);
+
+/*
+ * Device power management
+ */
+pnp_state_t	pci_pnp_powerstate(pcireg_t);
+pnp_state_t	pci_pnp_capabilities(pcireg_t);
+
+pnp_status_t	pci_generic_power_register(device_t dv,
+					   pci_chipset_tag_t, pcitag_t,
+					   void (*)(device_t),
+					   void (*)(device_t));
+void		pci_generic_power_deregister(device_t);
+
+pnp_status_t	pci_net_generic_power_register(device_t,
+					       pci_chipset_tag_t, pcitag_t,
+					       struct ifnet *,
+					       void (*)(device_t),
+					       void (*)(device_t));
+void		pci_net_generic_power_deregister(device_t);
 
 #endif /* _KERNEL */