From 0d1a353568fc629d327ae6275bc2715816ca370d Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Thu, 8 Jan 1998 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1998-01-08

---
 pc/fns.h |  2 +-
 pc/pci.c | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pc/fns.h b/pc/fns.h
index b2cf2fe5374b89d6a658a824d119b5dffa001053..d5fd8321c40e51c55748aad2aa293b3cfaa6c6df 100644
--- a/pc/fns.h
+++ b/pc/fns.h
@@ -54,8 +54,8 @@ void	lidt(ushort[3]);
 void	links(void);
 void	ltr(ulong);
 void	mathinit(void);
-#define mmuflushtlb(pdb) putcr3(pdb)
 void	meminit(ulong);
+#define mmuflushtlb(pdb) putcr3(pdb)
 void	mmuinit(void);
 ulong	mmukmap(ulong, ulong, int);
 int	mmukmapsync(ulong);
diff --git a/pc/pci.c b/pc/pci.c
index e58e6db42c4df4c8a8a9986d497a55bfd0d77da0..dff67be3279332c6648100edff655b4b803c3d8c 100644
--- a/pc/pci.c
+++ b/pc/pci.c
@@ -393,21 +393,6 @@ pcimatch(Pcidev* prev, int vid, int did)
 	return prev;
 }
 
-void
-pcireset(void)
-{
-	Pcidev *p;
-	int pcr;
-
-	if(pcicfgmode == -1)
-		pcicfginit();
-
-	for(p = pcilist; p != nil; p = p->list){
-		pcr = pcicfgr16(p, PciPSR);
-		pcicfgw16(p, PciPSR, pcr & ~0x04);
-	}
-}
-
 void
 pcihinv(Pcidev* p)
 {
@@ -419,9 +404,9 @@ pcihinv(Pcidev* p)
 		print("bus dev type vid  did  memory\n");
 	}
 	for(t = p; t != nil; t = t->link) {
-		print("%d  %2d/%d %.4ux %.4ux %.4ux ",
+		print("%d  %2d/%d %.4ux %.4ux %.4ux %d ",
 			BUSBNO(t->tbdf), BUSDNO(t->tbdf), BUSFNO(t->tbdf),
-			t->ccru, t->vid, t->did);
+			t->ccru, t->vid, t->did, t->intl);
 
 		for(i = 0; i < nelem(p->mem); i++) {
 			if(t->mem[i].size == 0)
@@ -474,3 +459,18 @@ pcimemmap(int tbdf, int rno, ulong *paddr)
 	pcicfgrw32(tbdf, rno, p, 0);
 	return (void*)v;
 }
+
+void
+pcireset(void)
+{
+	Pcidev *p;
+	int pcr;
+
+	if(pcicfgmode == -1)
+		pcicfginit();
+
+	for(p = pcilist; p != nil; p = p->list){
+		pcr = pcicfgr16(p, PciPSR);
+		pcicfgw16(p, PciPSR, pcr & ~0x04);
+	}
+}