kernel: cleanup the software mouse cursor mess

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

diff --git a/sys/src/9/pc/vgamga4xx.c b/sys/src/9/pc/vgamga4xx.c
old mode 100755 (executable)
new mode 100644 (file)
index d0a9028..0bc8019
--- a/sys/src/9/pc/vgamga4xx.c
+++ b/sys/src/9/pc/vgamga4xx.c
@@ -77,20 +77,6 @@ enum {
        FILL_OPERAND    = 0x800c7804,
 };
 
-static Pcidev *
-mgapcimatch(void)
-{
-       Pcidev *p;
-       
-       p = pcimatch(nil, MATROX, MGA4xx);
-       if(p == nil)
-               p = pcimatch(nil, MATROX, MGA550);
-       if(p == nil)
-               p = pcimatch(nil, MATROX, MGA200);
-       return p;
-}
-
-
 static void
 mgawrite8(VGAscr *scr, int index, uchar val)
 {
@@ -129,7 +115,7 @@ mga4xxenable(VGAscr* scr)
        if(scr->mmio)
                return;
 
-       pci = mgapcimatch();
+       pci = scr->pci;
        if(pci == nil)
                return;
 
@@ -316,7 +302,7 @@ dac4xxenable(VGAscr *scr)
         * Load, locate and enable the
         * 64x64 cursor in X11 mode.
         */
-       dac4xxload(scr, &arrow);
+       dac4xxload(scr, &cursor);
        dac4xxmove(scr, ZP);
 }