merge
This commit is contained in:
commit
480d8a19b1
2 changed files with 4 additions and 1 deletions
|
@ -222,6 +222,9 @@ snarf(Vga* vga, Ctlr* ctlr)
|
|||
* Unlock
|
||||
*/
|
||||
vgaxo(Crtx, 0x1F, 0x57);
|
||||
outportb(Crtx, 0x11);
|
||||
outportb(Crtx+1, inportb(Crtx+1) & ~0x80);
|
||||
trace("nvidia: Unlocked\n");
|
||||
|
||||
if (nv->pextdev[0] & 0x40)
|
||||
nv->crystalfreq = RefFreq;
|
||||
|
|
|
@ -55,7 +55,7 @@ pcicfginit(void)
|
|||
buf[j] = 0;
|
||||
close(fd);
|
||||
|
||||
p->ccru = strtol(buf + 3, nil, 16);
|
||||
p->ccru = strtol(buf + 0, nil, 16) << 8;
|
||||
p->vid = strtol(buf + 9, &s, 16);
|
||||
p->did = strtol(s + 1, &s, 16);
|
||||
p->intl = strtol(s + 1, &s, 10);
|
||||
|
|
Loading…
Reference in a new issue