aux/vga ccru/ccrb parsing

4 files changed, 6 insertions, 5 deletions

diff --git a/sys/src/cmd/aux/vga/db.c b/sys/src/cmd/aux/vga/db.c
index 51361631e..e8227443e 100644
--- a/sys/src/cmd/aux/vga/db.c
+++ b/sys/src/cmd/aux/vga/db.c
@@ -142,7 +142,7 @@ dbpci(Vga *vga, Ndbtuple *tuple)
 			else if((did=atoi(td->val)) == 0)
 				continue;
 			for(pci=nil; pci=pcimatch(pci, vid, did);)
-				if((pci->ccru>>8) == 3)
+				if(pci->ccrb == 3)
 					break;
 			if(pci == nil)
 				continue;
diff --git a/sys/src/cmd/aux/vga/nvidia.c b/sys/src/cmd/aux/vga/nvidia.c
index 12bb2ca57..f3dd5cf56 100644
--- a/sys/src/cmd/aux/vga/nvidia.c
+++ b/sys/src/cmd/aux/vga/nvidia.c
@@ -138,7 +138,7 @@ snarf(Vga* vga, Ctlr* ctlr)
 
 		p = nil;
 		while((p = pcimatch(p, 0x10DE, 0)) != nil){
-			if((p->ccru>>8) == 3)
+			if(p->ccrb == 3)
 				break;
 		}
 		if(p == nil)
@@ -400,7 +400,6 @@ options(Vga*, Ctlr* ctlr)
 	ctlr->flag |= Hlinear|Foptions;
 }
 
-
 static void
 clock(Vga* vga, Ctlr* ctlr)
 {
diff --git a/sys/src/cmd/aux/vga/pci.c b/sys/src/cmd/aux/vga/pci.c
index 8bd730e63..db531b265 100644
--- a/sys/src/cmd/aux/vga/pci.c
+++ b/sys/src/cmd/aux/vga/pci.c
@@ -55,7 +55,8 @@ pcicfginit(void)
 		buf[j] = 0;
 		close(fd);
 
-		p->ccru = strtol(buf + 0, nil, 16) << 8;
+		p->ccrb = strtol(buf, nil, 16);
+		p->ccru = strtol(buf + 3, nil, 16);
 		p->vid = strtol(buf + 9, &s, 16);
 		p->did = strtol(s + 1, &s, 16);
 		p->intl = strtol(s + 1, &s, 10);
diff --git a/sys/src/cmd/aux/vga/pci.h b/sys/src/cmd/aux/vga/pci.h
index 03a11bf38..7d8fe11ea 100644
--- a/sys/src/cmd/aux/vga/pci.h
+++ b/sys/src/cmd/aux/vga/pci.h
@@ -97,7 +97,8 @@ typedef struct Pcidev {
 	} mem[6];
 
 	uchar	intl;			/* interrupt line */
-	ushort	ccru;
+	uchar	ccru;
+	uchar	ccrb;
 
 	Pcidev*	list;
 	int rawfd;