xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2011-05-28 16:34:41 +00:00
parent 4c93f534ac 8e388a7037
commit c9ea2fbb77
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/aux/vga/db.c
View file

@ -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;

3
sys/src/cmd/aux/vga/nvidia.c
View file

@ -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)
{

3
sys/src/cmd/aux/vga/pci.c
View file

@ -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);

3
sys/src/cmd/aux/vga/pci.h
View file

@ -97,7 +97,8 @@ typedef struct Pcidev {
} mem[6];
uchar intl; /* interrupt line */
ushort ccru;
uchar ccru;
uchar ccrb;
Pcidev* list;
int rawfd;