From 0a3ddecb4767f39a2f07a2f863e20fddebc7bdce Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Fri, 17 Oct 2003 16:00:43 +0000
Subject: [PATCH] Use common PCI macro/functions for PWRMGMT.

---
 sys/dev/pci/if_vr.c    | 35 ++++++++++++++++++-----------------
 sys/dev/pci/if_vrreg.h | 29 +----------------------------
 2 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 8d86b284ae02..02ab9e6d2eb0 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vr.c,v 1.62 2003/08/23 00:14:29 dogcow Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.63 2003/10/17 16:00:43 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.62 2003/08/23 00:14:29 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.63 2003/10/17 16:00:43 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1423,7 +1423,7 @@ vr_attach(parent, self, aux)
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
 	bus_dma_segment_t seg;
 	struct vr_type *vrt;
-	u_int32_t command;
+	u_int32_t pmreg, reg;
 	struct ifnet *ifp;
 	u_char eaddr[ETHER_ADDR_LEN];
 	int i, rseg, error;
@@ -1445,38 +1445,39 @@ vr_attach(parent, self, aux)
 	 * Handle power management nonsense.
 	 */
 
-	command = PCI_CONF_READ(VR_PCI_CAPID) & 0x000000FF;
-	if (command == 0x01) {
-		command = PCI_CONF_READ(VR_PCI_PWRMGMTCTRL);
-		if (command & VR_PSTATE_MASK) {
+	if (pci_get_capability(pa->pa_pc, pa->pa_tag,
+	    PCI_CAP_PWRMGMT, &pmreg, 0)) {
+		reg = PCI_CONF_READ(pmreg + PCI_PMCSR);
+		if ((reg & PCI_PMCSR_STATE_MASK) != PCI_PMCSR_STATE_D0) {
 			u_int32_t iobase, membase, irq;
 
 			/* Save important PCI config data. */
 			iobase = PCI_CONF_READ(VR_PCI_LOIO);
 			membase = PCI_CONF_READ(VR_PCI_LOMEM);
-			irq = PCI_CONF_READ(VR_PCI_INTLINE);
+			irq = PCI_CONF_READ(PCI_INTERRUPT_REG);
 
 			/* Reset the power state. */
 			printf("%s: chip is in D%d power mode "
-				"-- setting to D0\n",
-				sc->vr_dev.dv_xname, command & VR_PSTATE_MASK);
-			command &= 0xFFFFFFFC;
-			PCI_CONF_WRITE(VR_PCI_PWRMGMTCTRL, command);
+			    "-- setting to D0\n",
+			    sc->vr_dev.dv_xname, reg & PCI_PMCSR_STATE_MASK);
+			reg = (reg & ~PCI_PMCSR_STATE_MASK) |
+			    PCI_PMCSR_STATE_D0;
+			PCI_CONF_WRITE(pmreg + PCI_PMCSR, reg);
 
 			/* Restore PCI config data. */
 			PCI_CONF_WRITE(VR_PCI_LOIO, iobase);
 			PCI_CONF_WRITE(VR_PCI_LOMEM, membase);
-			PCI_CONF_WRITE(VR_PCI_INTLINE, irq);
+			PCI_CONF_WRITE(PCI_INTERRUPT_REG, irq);
 		}
 	}
 
 	/* Make sure bus mastering is enabled. */
-	command = PCI_CONF_READ(PCI_COMMAND_STATUS_REG);
-	command |= PCI_COMMAND_MASTER_ENABLE;
-	PCI_CONF_WRITE(PCI_COMMAND_STATUS_REG, command);
+	reg = PCI_CONF_READ(PCI_COMMAND_STATUS_REG);
+	reg |= PCI_COMMAND_MASTER_ENABLE;
+	PCI_CONF_WRITE(PCI_COMMAND_STATUS_REG, reg);
 
 	/* Get revision */
-	sc->vr_revid = PCI_CONF_READ(VR_PCI_REVID) & 0x000000FF;
+	sc->vr_revid = PCI_REVISION(pa->pa_class);
 	
 	/*
 	 * Map control/status registers.
diff --git a/sys/dev/pci/if_vrreg.h b/sys/dev/pci/if_vrreg.h
index ead517414a19..d83f7b511faa 100644
--- a/sys/dev/pci/if_vrreg.h
+++ b/sys/dev/pci/if_vrreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vrreg.h,v 1.10 2003/01/03 19:01:09 lha Exp $	*/
+/*	$NetBSD: if_vrreg.h,v 1.11 2003/10/17 16:00:43 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -365,34 +365,7 @@ struct vr_desc {
  * other PCI registers.
  */
 
-#define	VR_PCI_VENDOR_ID	0x00
-#define	VR_PCI_DEVICE_ID	0x02
-#define	VR_PCI_COMMAND		0x04
-#define	VR_PCI_STATUS		0x06
-#define VR_PCI_REVID		0x08
-#define	VR_PCI_CLASSCODE	0x09
-#define	VR_PCI_LATENCY_TIMER	0x0D
-#define	VR_PCI_HEADER_TYPE	0x0E
 #define	VR_PCI_LOIO		0x10
 #define	VR_PCI_LOMEM		0x14
-#define	VR_PCI_BIOSROM		0x30
-#define	VR_PCI_INTLINE		0x3C
-#define	VR_PCI_INTPIN		0x3D
-#define	VR_PCI_MINGNT		0x3E
-#define	VR_PCI_MINLAT		0x0F
 #define	VR_PCI_RESETOPT		0x48
 #define	VR_PCI_EEPROM_DATA	0x4C
-
-/* power management registers */
-#define	VR_PCI_CAPID		0xDC /* 8 bits */
-#define	VR_PCI_NEXTPTR		0xDD /* 8 bits */
-#define	VR_PCI_PWRMGMTCAP	0xDE /* 16 bits */
-#define	VR_PCI_PWRMGMTCTRL	0xE0 /* 16 bits */
-
-#define	VR_PSTATE_MASK		0x0003
-#define	VR_PSTATE_D0		0x0000
-#define	VR_PSTATE_D1		0x0002
-#define	VR_PSTATE_D2		0x0002
-#define	VR_PSTATE_D3		0x0003
-#define	VR_PME_EN		0x0010
-#define	VR_PME_STATUS		0x8000