From e67857c6053c254b9eb6e416cd670db9821f9dff Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 28 Mar 2003 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2003-03-28

---
 pc/devarch.c   | 2 ++
 pc/vganvidia.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pc/devarch.c b/pc/devarch.c
index f6cb972240fec65ac386ed56fabb808f937b9983..cad297e7e81f77df396242da3c797a11b4e73fb6 100644
--- a/pc/devarch.c
+++ b/pc/devarch.c
@@ -608,6 +608,8 @@ static X86type x86amd[] =
 static X86type x86winchip[] =
 {
 	{5,	4,	23,	"Winchip",},	/* guesswork */
+	{6,	7,	23,	"Via C3 Samuel 2 or Ezra",},
+	{6,	8,	23,	"Via C3 Ezra-T",},
 	{ -1,	-1,	23,	"unknown", },	/* total default */
 };
 
diff --git a/pc/vganvidia.c b/pc/vganvidia.c
index a87aee6b001bfdd8cbae33d11ea002ae31b82093..b6d2bf24c5af946a7fbb52cbc23e08ade30390e1 100644
--- a/pc/vganvidia.c
+++ b/pc/vganvidia.c
@@ -29,12 +29,12 @@ static Pcidev*
 nvidiapci(void)
 {
 	Pcidev *p;
-	ushort *did;
 
 	p = nil;
-	while((p = pcimatch(p, 0x10DE, 0)) != nil)
-		if(p->did > 0x20 && p->ccrp == 3)	/* video card */
+	while((p = pcimatch(p, 0x10DE, 0)) != nil){
+		if(p->did > 0x20 && p->ccrb == 3)	/* video card */
 			return p;
+	}
 	return nil;
 }