merge

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

diff --git a/sys/src/9/pc/ethervt6102.c b/sys/src/9/pc/ethervt6102.c
index 2e7b65c0ae77edc6679d3b8f53127f94954e57fc..9ea47f1aee7d3140a288af1f5e98d42c26956a63 100644 (file)
--- a/sys/src/9/pc/ethervt6102.c
+++ b/sys/src/9/pc/ethervt6102.c
@@ -15,11 +15,11 @@
 #include "dat.h"
 #include "fns.h"
 #include "io.h"
+#include "../port/pci.h"
 #include "../port/error.h"
 #include "../port/netif.h"
-
-#include "etherif.h"
-#include "ethermii.h"
+#include "../port/etherif.h"
+#include "../port/ethermii.h"
 
 enum {
        Par0            = 0x00,         /* Ethernet Address */
@@ -720,7 +720,7 @@ vt6102receive(Ether* edev)
                else if(bp = iallocb(Rdbsz+3)){
                        len = ((ds->status & LengthMASK)>>LengthSHIFT)-4;
                        ds->bp->wp = ds->bp->rp+len;
-                       etheriq(edev, ds->bp, 1);
+                       etheriq(edev, ds->bp);
                        bp->rp = (uchar*)ROUNDUP((ulong)bp->rp, 4);
                        ds->addr = PCIWADDR(bp->rp);
                        ds->bp = bp;
@@ -948,7 +948,7 @@ vt6102pci(void)
 {
        Pcidev *p;
        Ctlr *ctlr;
-       int cls, port;
+       int port;
 
        p = nil;
        while(p = pcimatch(p, 0, 0)){
@@ -963,7 +963,7 @@ vt6102pci(void)
                        break;
                }
 
-               port = p->mem[0].bar & ~0x01;
+               port = p->mem[0].bar & ~3;
                if(ioalloc(port, p->mem[0].size, 0, "vt6102") < 0){
                        print("vt6102: port 0x%uX in use\n", port);
                        continue;
@@ -976,10 +976,9 @@ vt6102pci(void)
                }
                ctlr->port = port;
                ctlr->pcidev = p;
+               pcienable(p);
                ctlr->id = (p->did<<16)|p->vid;
-               if((cls = pcicfgr8(p, PciCLS)) == 0 || cls == 0xFF)
-                       cls = 0x10;
-               ctlr->cls = cls*4;
+               ctlr->cls = p->cls*4;
                ctlr->tft = Ctft64;
 
                if(vt6102reset(ctlr)){
@@ -1032,7 +1031,6 @@ vt6102pnp(Ether* edev)
         */
        edev->attach = vt6102attach;
        edev->transmit = vt6102transmit;
-       edev->interrupt = vt6102interrupt;
        edev->ifstat = vt6102ifstat;
        edev->ctl = nil;
 
@@ -1040,6 +1038,8 @@ vt6102pnp(Ether* edev)
        edev->promiscuous = vt6102promiscuous;
        edev->multicast = vt6102multicast;
 
+       intrenable(edev->irq, vt6102interrupt, edev, edev->tbdf, edev->name);
+
        return 0;
 }