Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Create an MI Ether3 driver. It's derived from the arm26...



details:   https://anonhg.NetBSD.org/src/rev/3adcbfa694b6
branches:  trunk
changeset: 507511:3adcbfa694b6
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sat Mar 24 00:14:52 2001 +0000

description:
Create an MI Ether3 driver.  It's derived from the arm26 driver, which uses
my MI SEEQ 8005 driver, which is based on the arm32 ea driver.

diffstat:

 sys/arch/arm26/conf/files.arm26     |    7 +-
 sys/arch/arm26/podulebus/if_ea.c    |  157 ------------------------------------
 sys/arch/arm26/podulebus/if_eareg.h |   48 -----------
 sys/arch/arm32/conf/files.arm32     |    6 +-
 sys/dev/podulebus/files.podulebus   |    7 +-
 sys/dev/podulebus/if_ea.c           |  157 ++++++++++++++++++++++++++++++++++++
 sys/dev/podulebus/if_eareg.h        |   48 +++++++++++
 7 files changed, 213 insertions(+), 217 deletions(-)

diffs (truncated from 483 to 300 lines):

diff -r 38049b5f6c95 -r 3adcbfa694b6 sys/arch/arm26/conf/files.arm26
--- a/sys/arch/arm26/conf/files.arm26   Sat Mar 24 00:10:42 2001 +0000
+++ b/sys/arch/arm26/conf/files.arm26   Sat Mar 24 00:14:52 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm26,v 1.25 2001/03/20 00:01:37 bjh21 Exp $
+# $NetBSD: files.arm26,v 1.26 2001/03/24 00:14:53 bjh21 Exp $
 
 # Copyright (c) 1997, 1998, 2000 Ben Harris
 # All rights reserved.
@@ -170,11 +170,6 @@
 
 include "dev/podulebus/files.podulebus"
 
-# Acorn/Atomwide Ether3
-device ea: ether, ifnet, arp, seeq8005
-attach ea at podulebus
-file   arch/arm26/podulebus/if_ea.c            ea
-
 # i-cubed EtherLAN 100, 200 and 500
 device eh: ether, ifnet, arp, dp8390nic, podloader
 attach eh at podulebus
diff -r 38049b5f6c95 -r 3adcbfa694b6 sys/arch/arm26/podulebus/if_ea.c
--- a/sys/arch/arm26/podulebus/if_ea.c  Sat Mar 24 00:10:42 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/* $NetBSD: if_ea.c,v 1.26 2001/03/18 15:56:04 bjh21 Exp $ */
-
-/*
- * Copyright (c) 2000 Ben Harris
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Mark Brinicombe.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * if_ea.c - Ether3 device driver
- */
-
-#include <sys/param.h>
-
-__RCSID("$NetBSD: if_ea.c,v 1.26 2001/03/18 15:56:04 bjh21 Exp $");
-
-#include <sys/device.h>
-#include <sys/socket.h>
-#include <sys/systm.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/irq.h>
-
-#include <net/if.h>
-#include <net/if_ether.h>
-
-#include <arm26/podulebus/podulebus.h>
-#include <dev/podulebus/podules.h>
-
-#include <arm26/podulebus/if_eareg.h>
-#include <dev/ic/seeq8005var.h>
-
-/*
- * per-line info and status
- */
-
-struct ea_softc {
-       struct seeq8005_softc   sc_8005;
-       void    *sc_ih;
-       struct evcnt sc_intrcnt;
-};
-
-/*
- * prototypes
- */
-
-int eaprobe(struct device *, struct cfdata *, void *);
-void eaattach(struct device *, struct device *, void *);
-
-/* driver structure for autoconf */
-
-struct cfattach ea_ca = {
-       sizeof(struct ea_softc), eaprobe, eaattach
-};
-
-/*
- * Probe routine.
- */
-
-/*
- * Probe for the ether3 podule.
- */
-
-int
-eaprobe(struct device *parent, struct cfdata *cf, void *aux)
-{
-       struct podulebus_attach_args *pa = aux;
-       
-       if ((matchpodule(pa, MANUFACTURER_ATOMWIDE,
-                        PODULE_ATOMWIDE_ETHER3, -1) == 0)
-           && (matchpodule(pa, MANUFACTURER_ACORN,
-                           PODULE_ACORN_ETHER3XXX, -1) == 0)
-           && (matchpodule(pa, MANUFACTURER_ANT, PODULE_ANT_ETHER3, -1) == 0))
-               return 0;
-
-       return 1;
-}
-
-
-/*
- * Attach podule.
- */
-
-void
-eaattach(struct device *parent, struct device *self, void *aux)
-{
-       struct ea_softc *sc = (void *)self;
-       struct podulebus_attach_args *pa = aux;
-       u_int8_t myaddr[ETHER_ADDR_LEN];
-       char *ptr;
-       int i;
-       
-/*     dprintf(("Attaching %s...\n", sc->sc_dev.dv_xname));*/
-
-       /* Set the address of the controller for easy access */
-       bus_space_shift(pa->pa_mod_t, pa->pa_mod_h, EA_8005_SHIFT,
-                       &sc->sc_8005.sc_iot, &sc->sc_8005.sc_ioh);
-
-       /* Get the Ethernet address from the device description string. */
-       if (pa->pa_descr == NULL) {
-               printf(": No description for Ethernet address\n");
-               return;
-       }
-       ptr = strchr(pa->pa_descr, '(');
-       if (ptr == NULL) {
-               printf(": Ethernet address not found in description\n");
-               return;
-       }
-       ptr++;
-       for (i = 0; i < ETHER_ADDR_LEN; i++) {
-               myaddr[i] = strtoul(ptr, &ptr, 16);
-               if (*ptr++ != (i == ETHER_ADDR_LEN - 1 ? ')' : ':')) {
-                       printf(": Bad Ethernet address found in "
-                              "description\n");
-                       return;
-               }
-       }
-
-       printf(":");
-       seeq8005_attach(&sc->sc_8005, myaddr);
-
-       /* Claim a podule interrupt */
-
-       evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
-           self->dv_xname, "intr");
-       sc->sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_NET, seeq8005intr,
-           sc, &sc->sc_intrcnt);
-}
-
-/* End of if_ea.c */
diff -r 38049b5f6c95 -r 3adcbfa694b6 sys/arch/arm26/podulebus/if_eareg.h
--- a/sys/arch/arm26/podulebus/if_eareg.h       Sat Mar 24 00:10:42 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/* $NetBSD: if_eareg.h,v 1.5 2000/09/18 20:51:16 bjh21 Exp $ */
-
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Mark Brinicombe.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * if_eareg.h - Ether3 device driver
- */
-
-/*
- * SEEQ 8005 Register Definitions
- */
-
-#define EA_8005_BASE   0x000
-#define EA_8005_SHIFT  5
-
-#define EA_TX_BUFFER_SIZE      0x4000
-#define EA_RX_BUFFER_SIZE      0xC000
-
-/* End of if_eareg.h */
diff -r 38049b5f6c95 -r 3adcbfa694b6 sys/arch/arm32/conf/files.arm32
--- a/sys/arch/arm32/conf/files.arm32   Sat Mar 24 00:10:42 2001 +0000
+++ b/sys/arch/arm32/conf/files.arm32   Sat Mar 24 00:14:52 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.arm32,v 1.103 2001/03/20 18:20:54 reinoud Exp $
+#      $NetBSD: files.arm32,v 1.104 2001/03/24 00:14:54 bjh21 Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -227,10 +227,6 @@
 attach ne at podulebus with ne_pbus
 file   arch/arm32/podulebus/if_ne_pbus.c       ne_pbus
 
-device ea: ether, ifnet, arp
-attach ea at podulebus
-file   arch/arm32/podulebus/if_ea.c            ea
-
 device eb: ether, ifnet, arp
 attach eb at podulebus
 file   arch/arm32/podulebus/if_eb.c            eb
diff -r 38049b5f6c95 -r 3adcbfa694b6 sys/dev/podulebus/files.podulebus
--- a/sys/dev/podulebus/files.podulebus Sat Mar 24 00:10:42 2001 +0000
+++ b/sys/dev/podulebus/files.podulebus Sat Mar 24 00:14:52 2001 +0000
@@ -1,6 +1,11 @@
-# $NetBSD: files.podulebus,v 1.1 2001/03/19 23:58:12 bjh21 Exp $
+# $NetBSD: files.podulebus,v 1.2 2001/03/24 00:14:52 bjh21 Exp $
 
 # Acorn Ether1
 device ei: ether, ifnet, arp, i82586
 attach ei at podulebus
 file   dev/podulebus/if_ei.c                   ei
+
+# Acorn/Atomwide Ether3
+device ea: ether, ifnet, arp, seeq8005
+attach ea at podulebus
+file   dev/podulebus/if_ea.c                   ea
diff -r 38049b5f6c95 -r 3adcbfa694b6 sys/dev/podulebus/if_ea.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/podulebus/if_ea.c Sat Mar 24 00:14:52 2001 +0000
@@ -0,0 +1,157 @@
+/* $NetBSD: if_ea.c,v 1.1 2001/03/24 00:14:53 bjh21 Exp $ */
+
+/*
+ * Copyright (c) 2000, 2001 Ben Harris
+ * Copyright (c) 1995 Mark Brinicombe
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by Mark Brinicombe.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,



Home | Main Index | Thread Index | Old Index