# HG changeset patch
# User Erik Quanstrom <quanstro@quanstro.net>
# Date 1328727172 0
# Node ID d2175c0b7b6ce3b0ec36457f2c05086ab40ad692
# Parent  95bdc02b7f609ab2878f7729f6ab4417418addfe
devpci: remove ecam support

remove ecam (extended pci space access) support
without prejudice.  this should be added back in
(as charles notes in pci.c) later, when it works.

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

Committer: John Floren <john@jfloren.net>

diff -r 95bdc02b7f60 -r d2175c0b7b6c sys/src/nix/port/devpci.c
--- a/sys/src/nix/port/devpci.c	Wed Feb 08 10:40:42 2012 -0800
+++ b/sys/src/nix/port/devpci.c	Wed Feb 08 18:52:52 2012 +0000
@@ -123,59 +123,6 @@
 {
 }
 
-static uchar *pcibase;
-
-static void
-pcireset0(void)
-{
-	pcibase = vmap(0xff00000000000000llu, 256*1024*1024);
-print("***** PCIBASE %#p\n", pcibase);
-	if(pcibase == nil)
-		pcibase = vmap(0xe0000000, 32*1024*1024);
-print("***** PCIBASE %#p\n", pcibase);
-}
-
-static long
-xread(int tbdf, void *va, long n, vlong offset)
-{
-	uchar *a, *o;
-	int i, r;
-	ulong x;
-	static int once;
-	static uchar *p;
-
-	if(once == 0){
-		once = 1;
-		p = pcibase; // vmap(0xe0000000, 256*1024*1024);
-	}
-
-	if(p == nil)
-		error("can't vmap");
-	a = va;
-	o = p + (BUSBNO(tbdf)<<20 + BUSDNO(tbdf)<<15 | BUSFNO(tbdf)<<12);
-
-	if(n+offset > 4096)
-		n = 4096-offset;
-	r = offset;
-	if(!(r & 3) && n == 4){
-		x = *(u32int*)(o+r);
-		PBIT32(a, x);
-		return 4;
-	}
-	if(!(r & 1) && n == 2){
-		x = *(u16int*)(o+r);
-		PBIT16(a, x);
-		return 2;
-	}
-	for(i = 0; i <  n; i++){
-		x = *(u8int*)(o+r);
-		PBIT8(a, x);
-		a++;
-		r++;
-	}
-	return i;
-}
-
 static long
 pciread(Chan *c, void *va, long n, vlong offset)
 {
@@ -211,12 +158,9 @@
 		if(p == nil)
 			error(Egreg);
 		if(n+offset > 256)
-{
-return xread(tbdf, va, n, offset);
+			n = 256-offset;
+		if(n < 0)
 			return 0;
-}
-		if(n+offset > 256)
-			n = 256-offset;
 		r = offset;
 		if(!(r & 3) && n == 4){
 			x = pcicfgr32(p, r);
@@ -294,7 +238,7 @@
 	'$',
 	"pci",
 
-	pcireset0,	/* arrg ... bad planning */
+	devreset,
 	devinit,
 	devshutdown,
 	pciattach,