add uba mem configuration entry, get mem addr from flags

[unix-history] / usr / src / sys / vax / if / if_ec.c

diff --git a/usr/src/sys/vax/if/if_ec.c b/usr/src/sys/vax/if/if_ec.c
index 9b79389..3dd2800 100644 (file)
--- a/usr/src/sys/vax/if/if_ec.c
+++ b/usr/src/sys/vax/if/if_ec.c
@@ -1,47 +1,51 @@
-/*     if_ec.c 4.16    82/06/13        */
+/*     if_ec.c 6.6     85/02/15        */

 
 #include "ec.h"
 
 /*
  * 3Com Ethernet Controller interface
  */
 
 #include "ec.h"
 
 /*
  * 3Com Ethernet Controller interface
  */

+#include "../machine/pte.h"
+
+#include "param.h"
+#include "systm.h"
+#include "mbuf.h"
+#include "buf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "vmmac.h"
+#include "ioctl.h"
+#include "errno.h"

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mbuf.h"
-#include "../h/pte.h"
-#include "../h/buf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/ubareg.h"
-#include "../h/ubavar.h"
-#include "../h/ecreg.h"
-#include "../h/cpu.h"
-#include "../h/mtpr.h"
-#include "../h/vmmac.h"
-#include "../net/in.h"
-#include "../net/in_systm.h"

 #include "../net/if.h"
 #include "../net/if.h"

-#include "../net/if_ec.h"
-#include "../net/if_uba.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/pup.h"
+#include "../net/netisr.h"

 #include "../net/route.h"
 #include "../net/route.h"

-#include <errno.h>
-
-#define        ECMTU   1500
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/ip.h"
+#include "../netinet/ip_var.h"
+#include "../netinet/if_ether.h"
+#include "../netpup/pup.h"
+
+#include "../vax/cpu.h"
+#include "../vax/mtpr.h"
+#include "if_ecreg.h"
+#include "if_uba.h"
+#include "../vaxuba/ubareg.h"
+#include "../vaxuba/ubavar.h"
+
+#if CLSIZE == 2
+#define ECBUFSIZE      32              /* on-board memory, clusters */
+#endif

 
 

-int    ecprobe(), ecattach(), ecrint(), ecxint(), eccollide();
+int    ecubamem(), ecprobe(), ecattach(), ecrint(), ecxint(), eccollide();

 struct uba_device *ecinfo[NEC];
 u_short ecstd[] = { 0 };
 struct uba_driver ecdriver =
 struct uba_device *ecinfo[NEC];
 u_short ecstd[] = { 0 };
 struct uba_driver ecdriver =

-       { ecprobe, 0, ecattach, 0, ecstd, "ec", ecinfo };
-u_char ec_iltop[3] = { 0x02, 0x07, 0x01 };
-#define        ECUNIT(x)       minor(x)
+       { ecprobe, 0, ecattach, 0, ecstd, "ec", ecinfo, 0, 0, 0, ecubamem };

 
 

-int    ecinit(),ecoutput(),ecreset();
-struct mbuf *ecget();
+int    ecinit(),ecioctl(),ecoutput(),ecreset();
+struct mbuf *ecget();

 
 extern struct ifnet loif;
 
 
 extern struct ifnet loif;
 


@@ -58,52 +62,98 @@ extern struct ifnet loif;
  * efficiently.
  */
 struct ec_softc {
  * efficiently.
  */
 struct ec_softc {

-       struct  ifnet es_if;            /* network-visible interface */
+       struct  arpcom es_ac;           /* common Ethernet structures */
+#define        es_if   es_ac.ac_if             /* network-visible interface */
+#define        es_addr es_ac.ac_enaddr         /* hardware Ethernet address */

        struct  ifuba es_ifuba;         /* UNIBUS resources */
        short   es_mask;                /* mask for current output delay */
        short   es_oactive;             /* is output active? */
        struct  ifuba es_ifuba;         /* UNIBUS resources */
        short   es_mask;                /* mask for current output delay */
        short   es_oactive;             /* is output active? */

-       caddr_t es_buf[16];             /* virtual addresses of buffers */
-       u_char  es_enaddr[6];           /* board's ethernet address */
+       u_char  *es_buf[16];            /* virtual addresses of buffers */

 } ec_softc[NEC];
 
 /*
 } ec_softc[NEC];
 
 /*

- * Do output DMA to determine interface presence and
- * interrupt vector.  DMA is too short to disturb other hosts.
+ * Configure on-board memory for an interface.
+ * Called from autoconfig and after a uba reset.
+ * The address of the memory on the uba is supplied in the device flags.

  */
  */

-ecprobe(reg)
-       caddr_t reg;
+ecubamem(ui, uban)
+       register struct uba_device *ui;

 {
 {

-       register int br, cvec;          /* r11, r10 value-result */
-       register struct ecdevice *addr = (struct ecdevice *)reg;
-       register caddr_t ecbuf = (caddr_t) &umem[0][0600000];
+       register caddr_t ecbuf = (caddr_t) &umem[uban][ui->ui_flags];
+       register struct ecdevice *addr = (struct ecdevice *)ui->ui_addr;

 
 

-COUNT(ECPROBE);
-#ifdef lint
-       br = 0; cvec = br; br = cvec;
-       ecrint(0); ecxint(0); eccollide(0);
+       /*
+        * Make sure csr is there (we run before ecprobe).
+        */
+       if (badaddr((caddr_t)addr, 2))
+               return (-1);
+#if VAX780
+       if (cpu == VAX_780 && uba_hd[uban].uh_uba->uba_sr) {
+               uba_hd[uban].uh_uba->uba_sr = uba_hd[uban].uh_uba->uba_sr;
+               return (-1);
+       }

 #endif
        /*
         * Make sure memory is turned on
         */
        addr->ec_rcr = EC_AROM;
 #endif
        /*
         * Make sure memory is turned on
         */
        addr->ec_rcr = EC_AROM;

+       /*
+        * Tell the system that the board has memory here, so it won't
+        * attempt to allocate the addresses later.
+        */
+       if (ubamem(uban, ui->ui_flags, ECBUFSIZE*CLSIZE, 1) == 0) {
+               printf("ec%d: cannot reserve uba addresses\n", ui->ui_unit);
+               addr->ec_rcr = EC_MDISAB;       /* disable memory */
+               return (-1);
+       }

        /*
         * Check for existence of buffers on Unibus.
        /*
         * Check for existence of buffers on Unibus.

-        * This won't work on a 780 until more work is done.

         */
         */

-       if (badaddr((caddr_t) ecbuf, 2)) {
-               printf("ec: buffer mem not found");
-               return (0);
+       if (badaddr((caddr_t)ecbuf, 2)) {
+bad:
+               printf("ec%d: buffer mem not found\n", ui->ui_unit);
+               (void) ubamem(uban, ui->ui_flags, ECBUFSIZE*2, 0);
+               addr->ec_rcr = EC_MDISAB;       /* disable memory */
+               return (-1);
+       }
+#if VAX780
+       if (cpu == VAX_780 && uba_hd[uban].uh_uba->uba_sr) {
+               uba_hd[uban].uh_uba->uba_sr = uba_hd[uban].uh_uba->uba_sr;
+               goto bad;

        }
        }

+#endif
+       if (ui->ui_alive == 0)          /* Only printf from autoconfig */
+               printf("ec%d: mem %x-%x\n", ui->ui_unit,
+                       ui->ui_flags, ui->ui_flags + ECBUFSIZE*CLBYTES - 1);
+       ui->ui_type = 1;                /* Memory on, allocated */
+       return (0);
+}
+
+/*
+ * Do output DMA to determine interface presence and
+ * interrupt vector.  DMA is too short to disturb other hosts.
+ */
+ecprobe(reg, ui)
+       caddr_t reg;
+       struct uba_device *ui;
+{
+       register int br, cvec;          /* r11, r10 value-result */
+       register struct ecdevice *addr = (struct ecdevice *)reg;
+       register caddr_t ecbuf = (caddr_t) &umem[ui->ui_ubanum][ui->ui_flags];
+
+#ifdef lint
+       br = 0; cvec = br; br = cvec;
+       ecrint(0); ecxint(0); eccollide(0);
+#endif

 
        /*
 
        /*

-        * Tell the system that the board has memory here, so it won't
-        * attempt to allocate the addresses later.
+        * Check that buffer memory was found and enabled.

         */
         */

-       ubamem(0, 0600000, 32*2);
-
+       if (ui->ui_type == 0)
+               return(0);

        /*
         * Make a one byte packet in what should be buffer #0.
        /*
         * Make a one byte packet in what should be buffer #0.

-        * Submit it for sending.  This whould cause an xmit interrupt.
+        * Submit it for sending.  This should cause an xmit interrupt.

         * The xmit interrupt vector is 8 bytes after the receive vector,
         * so adjust for this before returning.
         */
         * The xmit interrupt vector is 8 bytes after the receive vector,
         * so adjust for this before returning.
         */


@@ -112,9 +162,15 @@ COUNT(ECPROBE);
        addr->ec_xcr = EC_XINTEN|EC_XWBN;
        DELAY(100000);
        addr->ec_xcr = EC_XCLR;
        addr->ec_xcr = EC_XINTEN|EC_XWBN;
        DELAY(100000);
        addr->ec_xcr = EC_XCLR;

-       if (cvec > 0 && cvec != 0x200)
-               cvec -= 010;
-               br += 2;
+       if (cvec > 0 && cvec != 0x200) {
+               if (cvec & 04) {        /* collision interrupt */
+                       cvec -= 04;
+                       br += 1;                /* rcv is collision + 1 */
+               } else {                /* xmit interrupt */
+                       cvec -= 010;
+                       br += 2;                /* rcv is xmit + 2 */
+               }
+       }

        return (1);
 }
 
        return (1);
 }
 


@@ -126,61 +182,42 @@ COUNT(ECPROBE);
 ecattach(ui)
        struct uba_device *ui;
 {
 ecattach(ui)
        struct uba_device *ui;
 {

-       register struct ec_softc *es = &ec_softc[ui->ui_unit];
-       register struct sockaddr_in *sin;
+       struct ec_softc *es = &ec_softc[ui->ui_unit];
+       register struct ifnet *ifp = &es->es_if;

        register struct ecdevice *addr = (struct ecdevice *)ui->ui_addr;
        register struct ecdevice *addr = (struct ecdevice *)ui->ui_addr;

-       register int i, j;
-       register u_char *cp;
-COUNT(ECATTACH);
+       struct sockaddr_in *sin;
+       int i, j;
+       u_char *cp;

 
 

-       es->es_if.if_unit = ui->ui_unit;
-       es->es_if.if_name = "ec";
-       es->es_if.if_mtu = ECMTU;
-       es->es_if.if_net = ui->ui_flags;
+       ifp->if_unit = ui->ui_unit;
+       ifp->if_name = "ec";
+       ifp->if_mtu = ETHERMTU;

 
        /*
 
        /*

-        * Read the ethernet address off the board,
-        * one nibble at a time!
+        * Read the ethernet address off the board, one nibble at a time.

         */
        addr->ec_xcr = EC_UECLR;
        addr->ec_rcr = EC_AROM;
         */
        addr->ec_xcr = EC_UECLR;
        addr->ec_rcr = EC_AROM;

-       cp = es->es_enaddr;
-       for (i=0; i<6; i++) {
+       cp = (u_char *) &es->es_addr;
+#define        NEXTBIT addr->ec_rcr = EC_AROM|EC_ASTEP; addr->ec_rcr = EC_AROM
+       for (i=0; i < sizeof (es->es_addr); i++) {

                *cp = 0;
                for (j=0; j<=4; j+=4) {
                        *cp |= ((addr->ec_rcr >> 8) & 0xf) << j;
                *cp = 0;
                for (j=0; j<=4; j+=4) {
                        *cp |= ((addr->ec_rcr >> 8) & 0xf) << j;

-                       addr->ec_rcr = EC_AROM|EC_ASTEP;
-                       addr->ec_rcr = EC_AROM;
-                       addr->ec_rcr = EC_AROM|EC_ASTEP;
-                       addr->ec_rcr = EC_AROM;
-                       addr->ec_rcr = EC_AROM|EC_ASTEP;
-                       addr->ec_rcr = EC_AROM;
-                       addr->ec_rcr = EC_AROM|EC_ASTEP;
-                       addr->ec_rcr = EC_AROM;
+                       NEXTBIT; NEXTBIT; NEXTBIT; NEXTBIT;

                }
                cp++;
        }
                }
                cp++;
        }

-       printf("ec%d: addr=%x:%x:%x:%x:%x:%x\n", ui->ui_unit,
-               es->es_enaddr[0]&0xff, es->es_enaddr[1]&0xff,
-               es->es_enaddr[2]&0xff, es->es_enaddr[3]&0xff,
-               es->es_enaddr[4]&0xff, es->es_enaddr[5]&0xff);
-       es->es_if.if_host[0] = ((es->es_enaddr[3]&0xff)<<16) |
-           ((es->es_enaddr[4]&0xff)<<8) | (es->es_enaddr[5]&0xff);

        sin = (struct sockaddr_in *)&es->es_if.if_addr;
        sin->sin_family = AF_INET;
        sin = (struct sockaddr_in *)&es->es_if.if_addr;
        sin->sin_family = AF_INET;

-       sin->sin_addr = if_makeaddr(es->es_if.if_net, es->es_if.if_host[0]);
-
-       sin = (struct sockaddr_in *)&es->es_if.if_broadaddr;
-       sin->sin_family = AF_INET;
-       sin->sin_addr = if_makeaddr(es->es_if.if_net, 0);
-       es->es_if.if_flags = IFF_BROADCAST;
-
-       es->es_if.if_init = ecinit;
-       es->es_if.if_output = ecoutput;
-       es->es_if.if_ubareset = ecreset;
+       ifp->if_init = ecinit;
+       ifp->if_ioctl = ecioctl;
+       ifp->if_output = ecoutput;
+       ifp->if_reset = ecreset;

        for (i=0; i<16; i++)
        for (i=0; i<16; i++)

-               es->es_buf[i] = &umem[ui->ui_ubanum][0600000+2048*i];
-       if_attach(&es->es_if);
+               es->es_buf[i] 
+                   = (u_char *)&umem[ui->ui_ubanum][ui->ui_flags + 2048*i];
+       if_attach(ifp);

 }
 
 /*
 }
 
 /*


@@ -191,12 +228,12 @@ ecreset(unit, uban)
        int unit, uban;
 {
        register struct uba_device *ui;
        int unit, uban;
 {
        register struct uba_device *ui;

-COUNT(ECRESET);

 
        if (unit >= NEC || (ui = ecinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
                return;
        printf(" ec%d", unit);
 
        if (unit >= NEC || (ui = ecinfo[unit]) == 0 || ui->ui_alive == 0 ||
            ui->ui_ubanum != uban)
                return;
        printf(" ec%d", unit);

+       ec_softc[unit].es_if.if_flags &= ~IFF_RUNNING;

        ecinit(unit);
 }
 
        ecinit(unit);
 }
 


@@ -207,28 +244,35 @@ COUNT(ECRESET);
 ecinit(unit)
        int unit;
 {
 ecinit(unit)
        int unit;
 {

-       register struct ec_softc *es = &ec_softc[unit];
-       register struct uba_device *ui = ecinfo[unit];
-       register struct ecdevice *addr;
-       register i;
-       int s;
+       struct ec_softc *es = &ec_softc[unit];
+       struct ecdevice *addr;
+       register struct ifnet *ifp = &es->es_if;
+       register struct sockaddr_in *sin;
+       int i, s;

 
 

-       addr = (struct ecdevice *)ui->ui_addr;
+       sin = (struct sockaddr_in *)&ifp->if_addr;
+       if (sin->sin_addr.s_addr == 0)          /* address still unknown */
+               return;

 
        /*
 
        /*

-        * Hang receive buffers and start any pending
-        * writes by faking a transmit complete.
+        * Hang receive buffers and start any pending writes.

         * Writing into the rcr also makes sure the memory
         * is turned on.
         */
         * Writing into the rcr also makes sure the memory
         * is turned on.
         */

-       s = splimp();
-       for (i=ECRHBF; i>=ECRLBF; i--)
-               addr->ec_rcr = EC_READ|i;
-       es->es_oactive = 1;
-       es->es_if.if_flags |= IFF_UP;
-       ecxint(unit);
-       splx(s);
+       if ((es->es_if.if_flags & IFF_RUNNING) == 0) {
+               addr = (struct ecdevice *)ecinfo[unit]->ui_addr;
+               s = splimp();
+               for (i = ECRHBF; i >= ECRLBF; i--)
+                       addr->ec_rcr = EC_READ | i;
+               es->es_oactive = 0;
+               es->es_mask = ~0;
+               es->es_if.if_flags |= IFF_UP|IFF_RUNNING;
+               if (es->es_if.if_snd.ifq_head)
+                       ecstart(unit);
+               splx(s);
+       }

        if_rtinit(&es->es_if, RTF_UP);
        if_rtinit(&es->es_if, RTF_UP);

+       arpwhohas(&es->es_ac, &sin->sin_addr);

 }
 
 /*
 }
 
 /*


@@ -239,26 +283,15 @@ ecinit(unit)
  * to send off of the interface queue, and map it to the interface
  * before starting the output.
  */
  * to send off of the interface queue, and map it to the interface
  * before starting the output.
  */

-ecstart(dev)
-       dev_t dev;
+ecstart(unit)

 {
 {

-        int unit = ECUNIT(dev);
-       struct uba_device *ui = ecinfo[unit];
-       register struct ec_softc *es = &ec_softc[unit];
-       register struct ecdevice *addr;
+       struct ec_softc *es = &ec_softc[unit];
+       struct ecdevice *addr;

        struct mbuf *m;
        struct mbuf *m;

-       caddr_t ecbuf;
-       int dest;
-COUNT(ECSTART);

 
        if (es->es_oactive)
                goto restart;
 
 
        if (es->es_oactive)
                goto restart;
 

-       /*
-        * Not already active: dequeue another request
-        * and copy it into the buffer.  If no more requests,
-        * just return.
-        */

        IF_DEQUEUE(&es->es_if.if_snd, m);
        if (m == 0) {
                es->es_oactive = 0;
        IF_DEQUEUE(&es->es_if.if_snd, m);
        if (m == 0) {
                es->es_oactive = 0;


@@ -267,10 +300,7 @@ COUNT(ECSTART);
        ecput(es->es_buf[ECTBF], m);
 
 restart:
        ecput(es->es_buf[ECTBF], m);
 
 restart:

-       /*
-        * Start the output.
-        */
-       addr = (struct ecdevice *)ui->ui_addr;
+       addr = (struct ecdevice *)ecinfo[unit]->ui_addr;

        addr->ec_xcr = EC_WRITE|ECTBF;
        es->es_oactive = 1;
 }
        addr->ec_xcr = EC_WRITE|ECTBF;
        es->es_oactive = 1;
 }


@@ -282,30 +312,25 @@ restart:
 ecxint(unit)
        int unit;
 {
 ecxint(unit)
        int unit;
 {

-       register struct uba_device *ui = ecinfo[unit];

        register struct ec_softc *es = &ec_softc[unit];
        register struct ec_softc *es = &ec_softc[unit];

-       register struct ecdevice *addr = (struct ecdevice *)ui->ui_addr;
-COUNT(ECXINT);
+       register struct ecdevice *addr =
+               (struct ecdevice *)ecinfo[unit]->ui_addr;

 
        if (es->es_oactive == 0)
                return;
 
        if (es->es_oactive == 0)
                return;

-       if (addr->ec_xcr&EC_XDONE == 0 || addr->ec_xcr&EC_XBN != ECTBF)
-               printf("ec%d: strange xmit interrupt!\n", unit);
+       if ((addr->ec_xcr&EC_XDONE) == 0 || (addr->ec_xcr&EC_XBN) != ECTBF) {
+               printf("ec%d: stray xmit interrupt, xcr=%b\n", unit,
+                       addr->ec_xcr, EC_XBITS);
+               es->es_oactive = 0;
+               addr->ec_xcr = EC_XCLR;
+               return;
+       }

        es->es_if.if_opackets++;
        es->es_oactive = 0;
        es->es_mask = ~0;
        addr->ec_xcr = EC_XCLR;
        es->es_if.if_opackets++;
        es->es_oactive = 0;
        es->es_mask = ~0;
        addr->ec_xcr = EC_XCLR;

-       /*
-        * There shouldn't ever be any mbuf's to free, but just in case...
-        */
-       if (es->es_ifuba.ifu_xtofree) {
-               m_freem(es->es_ifuba.ifu_xtofree);
-               es->es_ifuba.ifu_xtofree = 0;
-       }
-       if (es->es_if.if_snd.ifq_head == 0) {
-               return;
-       }
-       ecstart(unit);
+       if (es->es_if.if_snd.ifq_head)
+               ecstart(unit);

 }
 
 /*
 }
 
 /*


@@ -317,13 +342,10 @@ eccollide(unit)
        int unit;
 {
        struct ec_softc *es = &ec_softc[unit];
        int unit;
 {
        struct ec_softc *es = &ec_softc[unit];

-COUNT(ECCOLLIDE);

 
 

-       printf("ec%d: collision\n", unit);

        es->es_if.if_collisions++;
        es->es_if.if_collisions++;

-       if (es->es_oactive == 0)
-               return;
-       ecdocoll(unit);
+       if (es->es_oactive)
+               ecdocoll(unit);

 }
 
 ecdocoll(unit)
 }
 
 ecdocoll(unit)


@@ -373,7 +395,7 @@ ecdocoll(unit)
        /*
         * Clear the controller's collision flag, thus enabling retransmit.
         */
        /*
         * Clear the controller's collision flag, thus enabling retransmit.
         */

-       addr->ec_xcr = EC_JINTEN|EC_XINTEN|EC_JCLR;
+       addr->ec_xcr = EC_CLEAR;

 }
 
 /*
 }
 
 /*


@@ -389,7 +411,6 @@ ecrint(unit)
        int unit;
 {
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;
        int unit;
 {
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;

-COUNT(ECRINT);

 
        while (addr->ec_rcr & EC_RDONE)
                ecread(unit);
 
        while (addr->ec_rcr & EC_RDONE)
                ecread(unit);


@@ -400,20 +421,17 @@ ecread(unit)
 {
        register struct ec_softc *es = &ec_softc[unit];
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;
 {
        register struct ec_softc *es = &ec_softc[unit];
        struct ecdevice *addr = (struct ecdevice *)ecinfo[unit]->ui_addr;

-       register struct ec_header *ec;
+       register struct ether_header *ec;

        struct mbuf *m;
        struct mbuf *m;

-       int len, off, resid;
+       int len, off, resid, ecoff, rbuf;

        register struct ifqueue *inq;
        register struct ifqueue *inq;

-       caddr_t ecbuf;
-       int ecoff;
-       int buf;
-COUNT(ECREAD);
+       u_char *ecbuf;

 
        es->es_if.if_ipackets++;
 
        es->es_if.if_ipackets++;

-       buf = addr->ec_rcr & EC_RBN;
-       if (buf < ECRLBF || buf > ECRHBF)
+       rbuf = addr->ec_rcr & EC_RBN;
+       if (rbuf < ECRLBF || rbuf > ECRHBF)

                panic("ecrint");
                panic("ecrint");

-       ecbuf = es->es_buf[buf];
+       ecbuf = es->es_buf[rbuf];

        ecoff = *(short *)ecbuf;
        if (ecoff <= ECRDOFF || ecoff > 2046) {
                es->es_if.if_ierrors++;
        ecoff = *(short *)ecbuf;
        if (ecoff <= ECRDOFF || ecoff > 2046) {
                es->es_if.if_ierrors++;


@@ -421,7 +439,6 @@ COUNT(ECREAD);
                if (es->es_if.if_ierrors % 100 == 0)
                        printf("ec%d: += 100 input errors\n", unit);
 #endif
                if (es->es_if.if_ierrors % 100 == 0)
                        printf("ec%d: += 100 input errors\n", unit);
 #endif

-               printf("ec%d: input error (offset=%d)\n", unit, ecoff);

                goto setup;
        }
 
                goto setup;
        }
 


@@ -432,16 +449,17 @@ COUNT(ECREAD);
         * get true type from first 16-bit word past data.
         * Remember that type was trailer by setting off.
         */
         * get true type from first 16-bit word past data.
         * Remember that type was trailer by setting off.
         */

-       len = ecoff - ECRDOFF - sizeof (struct ec_header);
-       ec = (struct ec_header *)(ecbuf + ECRDOFF);
+       len = ecoff - ECRDOFF - sizeof (struct ether_header);
+       ec = (struct ether_header *)(ecbuf + ECRDOFF);
+       ec->ether_type = ntohs((u_short)ec->ether_type);

 #define        ecdataaddr(ec, off, type)       ((type)(((caddr_t)((ec)+1)+(off))))
 #define        ecdataaddr(ec, off, type)       ((type)(((caddr_t)((ec)+1)+(off))))

-       if (ec->ec_type >= ECPUP_TRAIL &&
-           ec->ec_type < ECPUP_TRAIL+ECPUP_NTRAILER) {
-               off = (ec->ec_type - ECPUP_TRAIL) * 512;
-               if (off >= ECMTU)
+       if (ec->ether_type >= ETHERPUP_TRAIL &&
+           ec->ether_type < ETHERPUP_TRAIL+ETHERPUP_NTRAILER) {
+               off = (ec->ether_type - ETHERPUP_TRAIL) * 512;
+               if (off >= ETHERMTU)

                        goto setup;             /* sanity */
                        goto setup;             /* sanity */

-               ec->ec_type = *ecdataaddr(ec, off, u_short *);
-               resid = *(ecdataaddr(ec, off+2, u_short *));
+               ec->ether_type = ntohs(*ecdataaddr(ec, off, u_short *));
+               resid = ntohs(*(ecdataaddr(ec, off+2, u_short *)));

                if (off + resid > len)
                        goto setup;             /* sanity */
                len = off + resid;
                if (off + resid > len)
                        goto setup;             /* sanity */
                len = off + resid;


@@ -463,13 +481,17 @@ COUNT(ECREAD);
                m->m_off += 2 * sizeof (u_short);
                m->m_len -= 2 * sizeof (u_short);
        }
                m->m_off += 2 * sizeof (u_short);
                m->m_len -= 2 * sizeof (u_short);
        }

-       switch (ec->ec_type) {
+       switch (ec->ether_type) {

 
 #ifdef INET
 
 #ifdef INET

-       case ECPUP_IPTYPE:
+       case ETHERPUP_IPTYPE:

                schednetisr(NETISR_IP);
                inq = &ipintrq;
                break;
                schednetisr(NETISR_IP);
                inq = &ipintrq;
                break;

+
+       case ETHERPUP_ARPTYPE:
+               arpinput(&es->es_ac, m);
+               goto setup;

 #endif
        default:
                m_freem(m);
 #endif
        default:
                m_freem(m);


@@ -479,14 +501,15 @@ COUNT(ECREAD);
        if (IF_QFULL(inq)) {
                IF_DROP(inq);
                m_freem(m);
        if (IF_QFULL(inq)) {
                IF_DROP(inq);
                m_freem(m);

-       } else
-               IF_ENQUEUE(inq, m);
+               goto setup;
+       }
+       IF_ENQUEUE(inq, m);

 
 setup:
        /*
         * Reset for next packet.
         */
 
 setup:
        /*
         * Reset for next packet.
         */

-       addr->ec_rcr = EC_READ|EC_RCLR|buf;
+       addr->ec_rcr = EC_READ|EC_RCLR|rbuf;

 }
 
 /*
 }
 
 /*


@@ -503,42 +526,47 @@ ecoutput(ifp, m0, dst)
        struct mbuf *m0;
        struct sockaddr *dst;
 {
        struct mbuf *m0;
        struct sockaddr *dst;
 {

-       int type, dest, s, error;
+       int type, s, error;
+       struct ether_addr edst;
+       struct in_addr idst;

        register struct ec_softc *es = &ec_softc[ifp->if_unit];
        register struct mbuf *m = m0;
        register struct ec_softc *es = &ec_softc[ifp->if_unit];
        register struct mbuf *m = m0;

-       register struct ec_header *ec;
+       register struct ether_header *ec;

        register int off;
        register int off;

-       register int i;
-       struct mbuf *mcopy = (struct mbuf *) 0;         /* Null */
+       struct mbuf *mcopy = (struct mbuf *)0;

 
 

-COUNT(ECOUTPUT);

        switch (dst->sa_family) {
 
 #ifdef INET
        case AF_INET:
        switch (dst->sa_family) {
 
 #ifdef INET
        case AF_INET:

-               dest = ((struct sockaddr_in *)dst)->sin_addr.s_addr;
-               if ((dest &~ 0xff) == 0)
-                       mcopy = m_copy(m, 0, M_COPYALL);
-               else if (dest == ((struct sockaddr_in *)&es->es_if.if_addr)->
-                   sin_addr.s_addr) {
-                       mcopy = m;
-                       goto gotlocal;
-               }
+               idst = ((struct sockaddr_in *)dst)->sin_addr;
+               if (!arpresolve(&es->es_ac, m, &idst, &edst))
+                       return (0);     /* if not yet resolved */
+               if (in_lnaof(idst) == INADDR_ANY)
+                       mcopy = m_copy(m, 0, (int)M_COPYALL);

                off = ntohs((u_short)mtod(m, struct ip *)->ip_len) - m->m_len;
                off = ntohs((u_short)mtod(m, struct ip *)->ip_len) - m->m_len;

+               /* need per host negotiation */
+               if ((ifp->if_flags & IFF_NOTRAILERS) == 0)

                if (off > 0 && (off & 0x1ff) == 0 &&
                    m->m_off >= MMINOFF + 2 * sizeof (u_short)) {
                if (off > 0 && (off & 0x1ff) == 0 &&
                    m->m_off >= MMINOFF + 2 * sizeof (u_short)) {

-                       type = ECPUP_TRAIL + (off>>9);
+                       type = ETHERPUP_TRAIL + (off>>9);

                        m->m_off -= 2 * sizeof (u_short);
                        m->m_len += 2 * sizeof (u_short);
                        m->m_off -= 2 * sizeof (u_short);
                        m->m_len += 2 * sizeof (u_short);

-                       *mtod(m, u_short *) = ECPUP_IPTYPE;
-                       *(mtod(m, u_short *) + 1) = m->m_len;
+                       *mtod(m, u_short *) = ntohs((u_short)ETHERPUP_IPTYPE);
+                       *(mtod(m, u_short *) + 1) = ntohs((u_short)m->m_len);

                        goto gottrailertype;
                }
                        goto gottrailertype;
                }

-               type = ECPUP_IPTYPE;
+               type = ETHERPUP_IPTYPE;

                off = 0;
                goto gottype;
 #endif
 
                off = 0;
                goto gottype;
 #endif
 

+       case AF_UNSPEC:
+               ec = (struct ether_header *)dst->sa_data;
+               edst = ec->ether_dhost;
+               type = ec->ether_type;
+               goto gottype;
+

        default:
                printf("ec%d: can't handle af%d\n", ifp->if_unit,
                        dst->sa_family);
        default:
                printf("ec%d: can't handle af%d\n", ifp->if_unit,
                        dst->sa_family);


@@ -564,40 +592,23 @@ gottype:
         * allocate another.
         */
        if (m->m_off > MMAXOFF ||
         * allocate another.
         */
        if (m->m_off > MMAXOFF ||

-           MMINOFF + sizeof (struct ec_header) > m->m_off) {
-               m = m_get(M_DONTWAIT);
+           MMINOFF + sizeof (struct ether_header) > m->m_off) {
+               m = m_get(M_DONTWAIT, MT_HEADER);

                if (m == 0) {
                        error = ENOBUFS;
                        goto bad;
                }
                m->m_next = m0;
                m->m_off = MMINOFF;
                if (m == 0) {
                        error = ENOBUFS;
                        goto bad;
                }
                m->m_next = m0;
                m->m_off = MMINOFF;

-               m->m_len = sizeof (struct ec_header);
+               m->m_len = sizeof (struct ether_header);

        } else {
        } else {

-               m->m_off -= sizeof (struct ec_header);
-               m->m_len += sizeof (struct ec_header);
+               m->m_off -= sizeof (struct ether_header);
+               m->m_len += sizeof (struct ether_header);

        }
        }

-       ec = mtod(m, struct ec_header *);
-       for (i=0; i<6; i++)
-               ec->ec_shost[i] = es->es_enaddr[i];
-       if ((dest &~ 0xff) == 0)
-               for (i=0; i<6; i++)
-                       ec->ec_dhost[i] = 0xff;
-       else {
-               if (dest & 0x8000) {
-                       ec->ec_dhost[0] = ec_iltop[0];
-                       ec->ec_dhost[1] = ec_iltop[1];
-                       ec->ec_dhost[2] = ec_iltop[2];
-               } else {
-                       ec->ec_dhost[0] = es->es_enaddr[0];
-                       ec->ec_dhost[1] = es->es_enaddr[1];
-                       ec->ec_dhost[2] = es->es_enaddr[2];
-               }
-               ec->ec_dhost[3] = (dest>>8) & 0x7f;
-               ec->ec_dhost[4] = (dest>>16) & 0xff;
-               ec->ec_dhost[5] = (dest>>24) & 0xff;
-       }
-       ec->ec_type = type;
+       ec = mtod(m, struct ether_header *);
+       ec->ether_dhost = edst;
+       ec->ether_shost = es->es_addr;
+       ec->ether_type = htons((u_short)type);

 
        /*
         * Queue message on interface, and start output if interface
 
        /*
         * Queue message on interface, and start output if interface


@@ -613,58 +624,65 @@ gottype:
        if (es->es_oactive == 0)
                ecstart(ifp->if_unit);
        splx(s);
        if (es->es_oactive == 0)
                ecstart(ifp->if_unit);
        splx(s);

-gotlocal:
-       if (mcopy)                              /* Kludge, but it works! */
-               return(looutput(&loif, mcopy, dst));
-       else
-               return (0);
+       return (mcopy ? looutput(&loif, mcopy, dst) : 0);
+

 qfull:
        m0 = m;
        splx(s);
 bad:
        m_freem(m0);
 qfull:
        m0 = m;
        splx(s);
 bad:
        m_freem(m0);

-       return(error);
+       if (mcopy)
+               m_freem(mcopy);
+       return (error);

 }
 
 /*
 }
 
 /*

- * Routine to copy from mbufs to UNIBUS memory.
- * Similar in spirit to if_wubaput.
+ * Routine to copy from mbuf chain to transmit
+ * buffer in UNIBUS memory.
+ * If packet size is less than the minimum legal size,
+ * the buffer is expanded.  We probably should zero out the extra
+ * bytes for security, but that would slow things down.

  */
 ecput(ecbuf, m)
  */
 ecput(ecbuf, m)

-       char *ecbuf;
+       u_char *ecbuf;

        struct mbuf *m;
 {
        struct mbuf *m;
 {

-       register int len;

        register struct mbuf *mp;
        register struct mbuf *mp;

-       register char *bp, *mcp;
-       register int i;
-
-COUNT(ECPUT);
-       len = 0;
-       for (mp=m; mp; mp=mp->m_next)
-               len += mp->m_len;
-       *(u_short *)ecbuf = 2048 - len;
-       bp = ecbuf + 2048 - len;
-       mp = m;
-       while (mp) {
-               mcp = mtod(mp, char *);
-               i = 0;
-               if ((int)bp&1) {
+       register int off;
+       u_char *bp;
+
+       for (off = 2048, mp = m; mp; mp = mp->m_next)
+               off -= mp->m_len;
+       if (2048 - off < ETHERMIN + sizeof (struct ether_header))
+               off = 2048 - ETHERMIN - sizeof (struct ether_header);
+       *(u_short *)ecbuf = off;
+       bp = (u_char *)(ecbuf + off);
+       for (mp = m; mp; mp = mp->m_next) {
+               register unsigned len = mp->m_len;
+               u_char *mcp;
+
+               if (len == 0)
+                       continue;
+               mcp = mtod(mp, u_char *);
+               if ((unsigned)bp & 01) {

                        *bp++ = *mcp++;
                        *bp++ = *mcp++;

-                       i++;
+                       len--;

                }
                }

-               while (i < mp->m_len) {
-                       *(short *)bp = *(short *)mcp;
-                       bp += 2;
-                       mcp += 2;
-                       i += 2;
+               if (off = (len >> 1)) {
+                       register u_short *to, *from;
+
+                       to = (u_short *)bp;
+                       from = (u_short *)mcp;
+                       do
+                               *to++ = *from++;
+                       while (--off > 0);
+                       bp = (u_char *)to,
+                       mcp = (u_char *)from;

                }
                }

-               if (mp->m_len&1)
+               if (len & 01)

                        *bp++ = *mcp++;
                        *bp++ = *mcp++;

-               mp = m_free(mp);

        }
        }

-       if (bp != ecbuf+2048)
-               printf("ec: bad ecput!\n");
+       m_freem(m);

 }
 
 /*
 }
 
 /*


@@ -676,26 +694,26 @@ COUNT(ECPUT);
  */
 struct mbuf *
 ecget(ecbuf, totlen, off0)
  */
 struct mbuf *
 ecget(ecbuf, totlen, off0)

-       char *ecbuf;
+       u_char *ecbuf;

        int totlen, off0;
 {
        int totlen, off0;
 {

-       struct mbuf *top, **mp, *m;
-       int off = off0;
-       int len;
-       register char *cp = ecbuf + ECRDOFF + sizeof (struct ec_header);
-       register char *mcp;
-       register int i;
-
-COUNT(ECGET);
-       top = 0;
-       mp = &top;
+       register struct mbuf *m;
+       struct mbuf *top = 0, **mp = &top;
+       register int off = off0, len;
+       u_char *cp;
+
+       cp = ecbuf + ECRDOFF + sizeof (struct ether_header);

        while (totlen > 0) {
        while (totlen > 0) {

-               MGET(m, 0);
+               register int words;
+               u_char *mcp;
+
+               MGET(m, M_DONTWAIT, MT_DATA);

                if (m == 0)
                        goto bad;
                if (off) {
                        len = totlen - off;
                if (m == 0)
                        goto bad;
                if (off) {
                        len = totlen - off;

-                       cp = ecbuf + ECRDOFF + sizeof (struct ec_header) + off;
+                       cp = ecbuf + ECRDOFF +
+                               sizeof (struct ether_header) + off;

                } else
                        len = totlen;
                if (len >= CLBYTES) {
                } else
                        len = totlen;
                if (len >= CLBYTES) {


@@ -713,29 +731,76 @@ COUNT(ECGET);
                        m->m_len = len = MIN(MLEN, len);
                        m->m_off = MMINOFF;
                }
                        m->m_len = len = MIN(MLEN, len);
                        m->m_off = MMINOFF;
                }

-               mcp = mtod(m, char *);
-               for (i=0; i<len; i+=2) {
-                       *(short *)mcp = *(short *)cp;
-                       mcp += 2;
-                       cp += 2;
+               mcp = mtod(m, u_char *);
+               if (words = (len >> 1)) {
+                       register u_short *to, *from;
+
+                       to = (u_short *)mcp;
+                       from = (u_short *)cp;
+                       do
+                               *to++ = *from++;
+                       while (--words > 0);
+                       mcp = (u_char *)to;
+                       cp = (u_char *)from;

                }
                }

-               if (len&1)
+               if (len & 01)

                        *mcp++ = *cp++;
                *mp = m;
                mp = &m->m_next;
                        *mcp++ = *cp++;
                *mp = m;
                mp = &m->m_next;

-               if (off) {
-                       off += len;
-                       if (off == totlen) {
-                               cp = ecbuf + ECRDOFF +
-                                   sizeof (struct ec_header);
-                               off = 0;
-                               totlen = off0;
-                       }
-               } else
+               if (off == 0) {

                        totlen -= len;
                        totlen -= len;

+                       continue;
+               }
+               off += len;
+               if (off == totlen) {
+                       cp = ecbuf + ECRDOFF + sizeof (struct ether_header);
+                       off = 0;
+                       totlen = off0;
+               }

        }
        return (top);
 bad:
        m_freem(top);
        return (0);
 }
        }
        return (top);
 bad:
        m_freem(top);
        return (0);
 }

+
+/*
+ * Process an ioctl request.
+ */
+ecioctl(ifp, cmd, data)
+       register struct ifnet *ifp;
+       int cmd;
+       caddr_t data;
+{
+       register struct ifreq *ifr = (struct ifreq *)data;
+       int s = splimp(), error = 0;
+
+       switch (cmd) {
+
+       case SIOCSIFADDR:
+               if (ifp->if_flags & IFF_RUNNING)
+                       if_rtinit(ifp, -1);     /* delete previous route */
+               ecsetaddr(ifp, (struct sockaddr_in *)&ifr->ifr_addr);
+               ecinit(ifp->if_unit);
+               break;
+
+       default:
+               error = EINVAL;
+       }
+       splx(s);
+       return (error);
+}
+
+ecsetaddr(ifp, sin)
+       register struct ifnet *ifp;
+       register struct sockaddr_in *sin;
+{
+
+       ifp->if_addr = *(struct sockaddr *)sin;
+       ifp->if_net = in_netof(sin->sin_addr);
+       ifp->if_host[0] = in_lnaof(sin->sin_addr);
+       sin = (struct sockaddr_in *)&ifp->if_broadaddr;
+       sin->sin_family = AF_INET;
+       sin->sin_addr = if_makeaddr(ifp->if_net, INADDR_ANY);
+       ifp->if_flags |= IFF_BROADCAST;
+}