kernel: cleanup makefile for $CONF.$O target

[plan9front.git] / sys / src / 9 / pc / vgas3.c

diff --git a/sys/src/9/pc/vgas3.c b/sys/src/9/pc/vgas3.c
index bbf0345600de8501814acbf403cd6408d6ef94ea..a948b315449031339b23b7e5b472f73055a609c9 100644 (file)
--- a/sys/src/9/pc/vgas3.c
+++ b/sys/src/9/pc/vgas3.c
@@ -120,6 +120,7 @@ s3linear(VGAscr* scr, int, int)
                 * much space they would need in the first design.
                 */
                for(j=0; j<nelem(p->mem); j++){
+                       if((p->mem[j].bar&1) == 0)
                        if((p->mem[j].bar&~0x0F) != scr->paddr)
                        if(p->mem[j].size==512*1024 || p->mem[j].size==16*1024*1024){
                                mmiobase = p->mem[j].bar & ~0x0F;
@@ -306,7 +307,7 @@ s3enable(VGAscr* scr)
         * Find a place for the cursor data in display memory.
         * Must be on a 1024-byte boundary.
         */
-       storage = (scr->gscreen->width*BY2WD*scr->gscreen->r.max.y+1023)/1024;
+       storage = (scr->gscreen->width*sizeof(ulong)*scr->gscreen->r.max.y+1023)/1024;
        vgaxo(Crtx, 0x4C, storage>>8);
        vgaxo(Crtx, 0x4D, storage & 0xFF);
        storage *= 1024;
@@ -522,7 +523,6 @@ s3drawinit(VGAscr *scr)
         * above.
         */
        scr->blank = s3blank;
-       /* hwblank = 1;         not known to work well */
 
        switch(id){
        case VIRGE: