diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2018-02-11 18:08:03 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2018-02-11 18:08:03 +0100 |
| commit | d6e0e9c402e215dc5659ad525e3e652501f76810 (patch) | |
| tree | d3157154f97516235da7c473e962b3410be46359 /sys/src/9/xen | |
| parent | debb786fea3d6ea8018c3d83cdedfdbff0703441 (diff) | |
kernel: move devether and wifi to port/
the only architecture dependence of devether was enabling interrupts,
which is now done at the end of the driver's reset() function now.
the wifi stack and dummy ethersink also go to port/.
do the IRQ2->IRQ9 hack for pc kernels in intrenabale(), so not
every caller of intrenable() has to be aware of it.
Diffstat (limited to 'sys/src/9/xen')
| -rw-r--r-- | sys/src/9/xen/etherxen.c | 6 | ||||
| -rw-r--r-- | sys/src/9/xen/mkfile | 4 | ||||
| -rw-r--r-- | sys/src/9/xen/xenpcf | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/src/9/xen/etherxen.c b/sys/src/9/xen/etherxen.c index 0f4f2d2c5..62d5e5de5 100644 --- a/sys/src/9/xen/etherxen.c +++ b/sys/src/9/xen/etherxen.c @@ -10,7 +10,7 @@ #include "io.h" #include "../port/error.h" #include "../port/netif.h" -#include "etherif.h" +#include "../port/etherif.h" #define LOG(a) @@ -478,12 +478,14 @@ pnp(Ether* ether) ether->transmit = etherxentransmit; ether->irq = -1; ether->tbdf = BUSUNKNOWN; - ether->interrupt = etherxenintr; ether->ifstat = ifstat; ether->ctl = etherxenctl; ether->promiscuous = nil; ether->multicast = etherxenmulticast; ether->arg = ether; + + intrenable(ether->irq, etherxenintr, ether, ether->tbdf, ether->name); + return 0; } diff --git a/sys/src/9/xen/mkfile b/sys/src/9/xen/mkfile index 3d83df4fb..e7bbe9503 100644 --- a/sys/src/9/xen/mkfile +++ b/sys/src/9/xen/mkfile @@ -114,7 +114,7 @@ install:V: $p$CONF $p$CONF.gz # import lookout / /n/lookout && cp $p$CONF $p$CONF.gz /n/lookout/$objtype/ # copies generated by the rule below -PCHEADERS=uncached.h etherif.h ethermii.h mp.h io.h +PCHEADERS=uncached.h ethermii.h mp.h io.h REPCH=`{echo $PCHEADERS | sed 's/\.h//g; s/ /|/g'} ^($REPCH)\.h:R: '../pc/\1.h' @@ -132,7 +132,7 @@ ptclbsum386.$O: ../pc/ptclbsum386.s $AS $AFLAGS ../pc/ptclbsum386.s # we inherited these.. revisit. -$ETHER: etherif.h ../port/netif.h +$ETHER: ../port/etherif.h ../port/netif.h $SDEV: ../port/sd.h main.$O: init.h reboot.h trap.$O: /sys/include/tos.h diff --git a/sys/src/9/xen/xenpcf b/sys/src/9/xen/xenpcf index 479729163..b6de0768d 100644 --- a/sys/src/9/xen/xenpcf +++ b/sys/src/9/xen/xenpcf @@ -20,7 +20,7 @@ dev xenstore ether netif - ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum386 inferno + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum386 inferno sd |