# HG changeset patch
# User Erik Quanstrom <quanstro@quanstro.net>
# Date 1330331630 -3600
# Node ID 2b47161ec6f00392f8e237d9ad669ed18f31bff4
# Parent  877e1ea171e24e11ea29811acb1b143295bff4d4
pci: remove cached power management stuff

synchronise with pci capabilities

R=nixiedev, nemo.mbox
CC=nix-dev
http://codereview.appspot.com/5684059

Committer: Francisco J Ballesteros <nemo.mbox@gmail.com>

diff -r 877e1ea171e2 -r 2b47161ec6f0 sys/src/nix/386/pci.c
--- a/sys/src/nix/386/pci.c	Sun Feb 26 22:53:32 2012 +0100
+++ b/sys/src/nix/386/pci.c	Mon Feb 27 09:33:50 2012 +0100
@@ -1282,20 +1282,12 @@
 	return -1;
 }
 
-static int
-pcigetpmrb(Pcidev* p)
-{
-	if(p->pmrb != 0)
-		return p->pmrb;
-	return p->pmrb = pcicap(p, PciCapPMG);
-}
-
 int
 pcigetpms(Pcidev* p)
 {
 	int pmcsr, ptr;
 
-	if((ptr = pcigetpmrb(p)) == -1)
+	if((ptr = pcicap(p, PciCapPMG)) == -1)
 		return -1;
 
 	/*
@@ -1317,7 +1309,7 @@
 {
 	int ostate, pmc, pmcsr, ptr;
 
-	if((ptr = pcigetpmrb(p)) == -1)
+	if((ptr = pcicap(p, PciCapPMG)) == -1)
 		return -1;
 
 	pmc = pcicfgr16(p, ptr+2);
diff -r 877e1ea171e2 -r 2b47161ec6f0 sys/src/nix/k10/io.h
--- a/sys/src/nix/k10/io.h	Sun Feb 26 22:53:32 2012 +0100
+++ b/sys/src/nix/k10/io.h	Mon Feb 27 09:33:50 2012 +0100
@@ -250,11 +250,11 @@
 		ulong	bar;
 		int	size;
 	} ioa, mema;
-
-	int	pmrb;			/* power management register block */
 };
 
 #define PCIWINDOW	0
 #define PCIWADDR(va)	(PADDR(va)+PCIWINDOW)
 #define ISAWINDOW	0
 #define ISAWADDR(va)	(PADDR(va)+ISAWINDOW)
+
+#pragma	varargck	type	"T"	int