kernel: remove trailing white space from etherigbe changes
[rsc] --rw-rw-r-- M 1575046 jmk sys 44814 Feb 22 08:46 sys/src/9/pc/etherigbe.c
[diffs elided - too long]
[diff -c /n/sourcesdump/2006/0222/plan9/sys/src/9/pc/etherigbe.c /n/sourcesdump/2006/0223/plan9/sys/src/9/pc/etherigbe.c]
aux/vga: initialize nvidia mmio before calling getpcixdid
[rsc] --rw-rw-r-- M 1575046 glenda sys 31488 Feb 22 08:46 sys/src/cmd/aux/vga/nvidia.c
/n/sourcesdump/2006/0222/plan9/sys/src/cmd/aux/vga/nvidia.c:145,150 -
/n/sourcesdump/2006/0223/plan9/sys/src/cmd/aux/vga/nvidia.c:145,171
if(p == nil)
error("%s: not found\n", ctlr->name);
+ vgactlw("type", ctlr->name);
+
+ mmio = segattach(0, "nvidiammio", 0, p->mem[0].size);
+ if(mmio == (void*)-1)
+ error("%s: segattach nvidiammio, size %d: %r\n",
+ ctlr->name, p->mem[0].size);
+
+ nv->pci = p;
+ nv->mmio = mmio;
+
+ nv->pfb = mmio+0x00100000/4;
+ nv->pramdac = mmio+0x00680000/4;
+ nv->pextdev = mmio+0x00101000/4;
+ nv->pmc = mmio+0x00000000/4;
+ nv->ptimer = mmio+0x00009000/4;
+ nv->pfifo = mmio+0x00002000/4;
+ nv->pramin = mmio+0x00710000/4;
+ nv->pgraph = mmio+0x00400000/4;
+ nv->fifo = mmio+0x00800000/4;
+ nv->pcrtc= mmio+0x00600000/4;
+
nv->did = p->did;
if ((nv->did & 0xfff0) == 0x00f0)
getpcixdid(nv);
/n/sourcesdump/2006/0222/plan9/sys/src/cmd/aux/vga/nvidia.c:190,215 -
/n/sourcesdump/2006/0223/plan9/sys/src/cmd/aux/vga/nvidia.c:211,216
error("%s: DID %4.4uX unsupported\n", ctlr->name, nv->did);
break;
}
- vgactlw("type", ctlr->name);
-
- mmio = segattach(0, "nvidiammio", 0, p->mem[0].size);
- if(mmio == (void*)-1)
- error("%s: segattach nvidiammio, size %d: %r\n",
- ctlr->name, p->mem[0].size);
-
- nv->pci = p;
- nv->mmio = mmio;
-
- nv->pfb = mmio+0x00100000/4;
- nv->pramdac = mmio+0x00680000/4;
- nv->pextdev = mmio+0x00101000/4;
- nv->pmc = mmio+0x00000000/4;
- nv->ptimer = mmio+0x00009000/4;
- nv->pfifo = mmio+0x00002000/4;
- nv->pramin = mmio+0x00710000/4;
- nv->pgraph = mmio+0x00400000/4;
- nv->fifo = mmio+0x00800000/4;
- nv->pcrtc= mmio+0x00600000/4;
}
nv = vga->private;
implementation = nv->did & 0x0ff0;
|