merge

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

diff --git a/sys/src/9/pc/etherdp83820.c b/sys/src/9/pc/etherdp83820.c
index a9bed75e9ba1d8bb38f427e415fa2620d24003e4..deb427fb4eaefaf563c13bd51f77409471612990 100644 (file)
--- a/sys/src/9/pc/etherdp83820.c
+++ b/sys/src/9/pc/etherdp83820.c
@@ -10,11 +10,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 {                                 /* Registers */
        Cr              = 0x00,         /* Command */
@@ -343,7 +343,7 @@ enum {
 
 typedef struct Ctlr Ctlr;
 typedef struct Ctlr {
-       int     port;
+       uvlong  port;
        Pcidev* pcidev;
        Ctlr*   next;
        int     active;
@@ -839,7 +839,7 @@ dp83820interrupt(Ureg*, void* arg)
                                        bp = desc->bp;
                                        desc->bp = nil;
                                        bp->wp += cmdsts & SizeMASK;
-                                       etheriq(edev, bp, 1);
+                                       etheriq(edev, bp);
                                }
                                else if(0 && !(cmdsts & Ok)){
                                        iprint("dp83820: rx %8.8uX:", cmdsts);
@@ -1149,6 +1149,8 @@ dp83820pci(void)
        while(p = pcimatch(p, 0, 0)){
                if(p->ccrb != Pcibcnet || p->ccru != Pciscether)
                        continue;
+               if(p->mem[1].bar & 1)
+                       continue;
 
                switch((p->did<<16)|p->vid){
                default:
@@ -1157,9 +1159,9 @@ dp83820pci(void)
                        break;
                }
 
-               mem = vmap(p->mem[1].bar & ~0x0F, p->mem[1].size);
-               if(mem == 0){
-                       print("DP83820: can't map %8.8luX\n", p->mem[1].bar);
+               mem = vmap(p->mem[1].bar & ~0xF, p->mem[1].size);
+               if(mem == nil){
+                       print("DP83820: can't map %llux\n", p->mem[1].bar & ~0xF);
                        continue;
                }
 
@@ -1168,8 +1170,9 @@ dp83820pci(void)
                        print("DP83820: can't allocate memory\n");
                        continue;
                }
-               ctlr->port = p->mem[1].bar & ~0x0F;
+               ctlr->port = p->mem[1].bar & ~0xF;
                ctlr->pcidev = p;
+               pcienable(p);
                ctlr->id = (p->did<<16)|p->vid;
 
                ctlr->nic = mem;
@@ -1232,7 +1235,6 @@ dp83820pnp(Ether* edev)
 
        edev->attach = dp83820attach;
        edev->transmit = dp83820transmit;
-       edev->interrupt = dp83820interrupt;
        edev->ifstat = dp83820ifstat;
 
        edev->arg = edev;
@@ -1240,6 +1242,8 @@ dp83820pnp(Ether* edev)
        edev->multicast = dp83820multicast;
        edev->shutdown = dp83820shutdown;
 
+       intrenable(edev->irq, dp83820interrupt, edev, edev->tbdf, edev->name);
+
        return 0;
 }