kernel: cleanup the software mouse cursor mess

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

diff --git a/sys/src/9/pc/ethervgbe.c b/sys/src/9/pc/ethervgbe.c
index 9932653993e8012b2c65f2c582bd697aaea439e1..3249549d066037b617d21050a32ebcaa973178ed 100644 (file)
--- a/sys/src/9/pc/ethervgbe.c
+++ b/sys/src/9/pc/ethervgbe.c
@@ -30,8 +30,7 @@
 #include "../port/error.h"
 #include "../port/netif.h"
 #include "../port/etherif.h"
-
-#include "ethermii.h"
+#include "../port/ethermii.h"
 
 #define DEBUG
 
@@ -531,7 +530,7 @@ vgberxeof(Ether* edev)
                        /* plant new block, might fail if out of memory */
                        if(vgbenewrx(ctlr, i) == 0){
                                block->wp = block->rp + length;
-                               etheriq(edev, block, 1);
+                               etheriq(edev, block);
                                continue;
                        }
                }
@@ -930,9 +929,6 @@ vgbepci(void)
                        continue;
                }
 
-               pcisetbme(pdev);
-               pcisetpms(pdev, 0);
-
                port = pdev->mem[0].bar;
                size = pdev->mem[0].size;
 
@@ -1126,6 +1122,9 @@ vgbepnp(Ether* edev)
 
        if(ctlr == nil)
                return -1;
+       
+       pcienable(ctlr->pdev);
+       pcisetbme(ctlr->pdev);
 
        vgbereset(ctlr);