 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sq.c,v 1.36 2010/04/05 07:19:31 joerg Exp $	*/
+/*	$NetBSD: if_sq.c,v 1.37 2011/01/10 13:29:29 tsutsui Exp $	*/
 /*
  * Copyright (c) 2001 Rafal K. Boni
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Portions of this code are derived from software contributed to The
  * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -23,27 +23,27 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.36 2010/04/05 07:19:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.37 2011/01/10 13:29:29 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 @@ -108,28 +108,26 @@ static void	sq_watchdog(struct ifnet *);
 static int	sq_ioctl(struct ifnet *, u_long, void *);
 static void	sq_set_filter(struct sq_softc *);
 static int	sq_intr(void *);
 static int	sq_rxintr(struct sq_softc *);
 static int	sq_txintr(struct sq_softc *);
 static void	sq_txring_hpc1(struct sq_softc *);
 static void	sq_txring_hpc3(struct sq_softc *);
 static void	sq_reset(struct sq_softc *);
 static int 	sq_add_rxbuf(struct sq_softc *, int);
 static void 	sq_dump_buffer(paddr_t addr, psize_t len);
 static void	sq_trace_dump(struct sq_softc *);
 static void	enaddr_aton(const char*, u_int8_t*);
 CFATTACH_DECL(sq, sizeof(struct sq_softc),
     sq_match, sq_attach, NULL, NULL);
 #define        ETHER_PAD_LEN (ETHER_MIN_LEN - ETHER_CRC_LEN)
 #define sq_seeq_read(sc, off) \
 	bus_space_read_1(sc->sc_regt, sc->sc_regh, off)
 #define sq_seeq_write(sc, off, val) \
 	bus_space_write_1(sc->sc_regt, sc->sc_regh, off, val)
 #define sq_hpc_read(sc, off) \
 	bus_space_read_4(sc->sc_hpct, sc->sc_hpch, off)
 #define sq_hpc_write(sc, off, val) \
 @@ -272,27 +270,27 @@ sq_attach(struct device *parent, struct
 	/*
 	 * If our mac address is bogus, obtain it from ARCBIOS. This will
 	 * be true of the onboard HPC3 on IP22, since there is no eeprom,
 	 * but rather the DS1386 RTC's battery-backed ram is used.
 	 */
 	if (sc->sc_enaddr[0] != SGI_OUI_0 || sc->sc_enaddr[1] != SGI_OUI_1 ||
 	    sc->sc_enaddr[2] != SGI_OUI_2) {
 		macaddr = ARCBIOS->GetEnvironmentVariable("eaddr");
 		if (macaddr == NULL) {
 			printf(": unable to get MAC address!\n");
 			goto fail_6;
+		}
-		enaddr_aton(macaddr, sc->sc_enaddr);
+		ether_aton_r(sc->sc_enaddr, sizeof(sc->sc_enaddr), macaddr);
+	}
 	evcnt_attach_dynamic(&sc->sq_intrcnt, EVCNT_TYPE_INTR, NULL,
 					      self->dv_xname, "intr");
 	if ((cpu_intr_establish(haa->ha_irq, IPL_NET, sq_intr, sc)) == NULL) {
 		printf(": unable to establish interrupt!\n");
 		goto fail_6;
+	}
 	/* Reset the chip to a known state. */
 	sq_reset(sc);
 @@ -1322,39 +1320,13 @@ sq_dump_buffer(paddr_t addr, psize_t len
 	if (len == 0)
 		return;
 	printf("%p: ", physaddr);
 	for (i = 0; i < len; i++) {
 		printf("%02x ", *(physaddr + i) & 0xff);
 		if ((i % 16) ==  15 && i != len - 1)
 		    printf("\n%p: ", physaddr + i);
+	}
 	printf("\n");
+}
 void
 enaddr_aton(const char* str, u_int8_t* eaddr)
 	int i;
 	char c;
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		if (*str == ':')
 			str++;
 		c = *str++;
 		if (isdigit(c)) {
 			eaddr[i] = (c - '0');
 		} else if (isxdigit(c)) {
 			eaddr[i] = (toupper(c) + 10 - 'A');
 		c = *str++;
 		if (isdigit(c)) {
 			eaddr[i] = (eaddr[i] << 4) | (c - '0');
 		} else if (isxdigit(c)) {
 			eaddr[i] = (eaddr[i] << 4) | (toupper(c) + 10 - 'A');

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_le_oioc.c,v 1.2 2010/01/19 22:06:22 pooka Exp $	*/
+/*	$NetBSD: if_le_oioc.c,v 1.3 2011/01/10 13:29:29 tsutsui Exp $	*/
 /*
  * Copyright (c) 2009 Stephen M. Rumble
  * 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. The name of the author may not 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_oioc.c,v 1.2 2010/01/19 22:06:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_oioc.c,v 1.3 2011/01/10 13:29:29 tsutsui Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>	// for uvm_pglistalloc
 #include <net/if.h>
 @@ -103,27 +103,26 @@ struct le_softc {
 static int	le_match(device_t, cfdata_t, void *);
 static void	le_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(le, sizeof(struct le_softc),
     le_match, le_attach, NULL, NULL);
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif
 static void	lewrcsr(struct lance_softc *, uint16_t, uint16_t);
 static uint16_t	lerdcsr(struct lance_softc *, uint16_t);
 static void	enaddr_aton(const char *, u_int8_t *);
 static void
 lewrcsr(struct lance_softc *sc, uint16_t port, uint16_t val)
+{
 	struct le_softc *lesc = (struct le_softc *)sc;
 	bus_space_write_2(lesc->sc_st, lesc->sc_raph, 0, port);
 	bus_space_write_2(lesc->sc_st, lesc->sc_rdph, 0, val);
+}
 static uint16_t
 lerdcsr(struct lance_softc *sc, uint16_t port)
+{
 	struct le_softc *lesc = (struct le_softc *)sc;
 @@ -148,27 +147,27 @@ le_match(device_t parent, cfdata_t cf, v
 	return (0);
+}
 void
 le_attach(device_t parent, device_t self, void *aux)
+{
 	extern paddr_t avail_start, avail_end;
 	struct le_softc *lesc = device_private(self);
 	struct lance_softc *sc = &lesc->sc_am7990.lsc;
 	struct oioc_attach_args *oa = aux;
 	struct pglist mlist;
 	const char *enaddrstr;
-	char enaddr[6];
+	char enaddr[ETHER_ADDR_LEN];
 	char pbuf[9];
 	int i, error;
 	sc->sc_dev = self;
 	lesc->sc_st = oa->oa_st;
 	enaddrstr = ARCBIOS->GetEnvironmentVariable("eaddr");
 	if (enaddrstr == NULL) {
 		aprint_error(": failed to obtain MAC address\n");
 		return;
+	}
         if ((error = bus_space_subregion(oa->oa_st, oa->oa_sh, OIOC_LANCE_RDP,
 @@ -201,27 +200,27 @@ le_attach(device_t parent, device_t self
 	/* Use IOC to map the physical memory into the Ethernet chip's space. */
 	for (i = 0; i < OIOC_LANCE_NPAGES; i++) {
 		bus_space_write_2(lesc->sc_st,lesc->sc_maph,
 		    OIOC_ENET_PGMAP_OFF(i),
 		    (VM_PAGE_TO_PHYS(mlist.tqh_first) >> PAGE_SHIFT) + i);
+	}
 	sc->sc_mem = (void *)MIPS_PHYS_TO_KSEG1(
 	    (uint32_t)VM_PAGE_TO_PHYS(mlist.tqh_first));
 	sc->sc_memsize = OIOC_LANCE_NPAGES * PAGE_SIZE;
 	sc->sc_addr = 0;
 	sc->sc_conf3 = LE_C3_BSWP;
-	enaddr_aton(enaddrstr, enaddr);
+	ether_aton_r(enaddr, sizeof(enaddr), enaddrstr);
 	memcpy(sc->sc_enaddr, enaddr, sizeof(sc->sc_enaddr));
 	if (cpu_intr_establish(oa->oa_irq, IPL_NET, am7990_intr, sc) == NULL) {
 		aprint_error(": failed to establish interrupt %d\n",oa->oa_irq);
 		goto fail_4;
+	}
 	sc->sc_copytodesc   = lance_copytobuf_contig;
 	sc->sc_copyfromdesc = lance_copyfrombuf_contig;
 	sc->sc_copytobuf    = lance_copytobuf_contig;
 	sc->sc_copyfrombuf  = lance_copyfrombuf_contig;
 	sc->sc_zerobuf      = lance_zerobuf_contig;
 @@ -238,40 +237,13 @@ le_attach(device_t parent, device_t self
 	return;
 fail_4:
 	uvm_pglistfree(&mlist);
 fail_3:
 	bus_space_unmap(oa->oa_st, oa->oa_sh, lesc->sc_maph);
 fail_2:
 	bus_space_unmap(oa->oa_st, oa->oa_sh, lesc->sc_raph);
 fail_1:
 	bus_space_unmap(oa->oa_st, oa->oa_sh, lesc->sc_rdph);
 fail_0:
 	return;
+}
 /* stolen from sgimips/hpc/if_sq.c */
 static void
 enaddr_aton(const char *str, u_int8_t *eaddr)
 	int i;
 	char c;
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		if (*str == ':')
 			str++;
 		c = *str++;
 		if (isdigit(c)) {
 			eaddr[i] = (c - '0');
 		} else if (isxdigit(c)) {
 			eaddr[i] = (toupper(c) + 10 - 'A');
 		c = *str++;
 		if (isdigit(c)) {
 			eaddr[i] = (eaddr[i] << 4) | (c - '0');
 		} else if (isxdigit(c)) {
 			eaddr[i] = (eaddr[i] << 4) | (toupper(c) + 10 - 'A');

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_mec.c,v 1.43 2010/04/05 07:19:32 joerg Exp $ */
+/* $NetBSD: if_mec.c,v 1.44 2011/01/10 13:29:29 tsutsui Exp $ */
 /*-
  * Copyright (c) 2004, 2008 Izumi Tsutsui.  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.
+ *
 @@ -51,27 +51,27 @@
  * 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.
  */
 /*
  * MACE MAC-110 Ethernet driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.43 2010/04/05 07:19:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.44 2011/01/10 13:29:29 tsutsui Exp $");
 #include "opt_ddb.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 @@ -387,28 +387,26 @@ struct mec_softc {
 /* XXX these values should be moved to <net/if_ether.h> ? */
 #define ETHER_PAD_LEN	(ETHER_MIN_LEN - ETHER_CRC_LEN)
 #define MEC_ETHER_ALIGN	2
 static int	mec_match(device_t, cfdata_t, void *);
 static void	mec_attach(device_t, device_t, void *);
 static int	mec_mii_readreg(device_t, int, int);
 static void	mec_mii_writereg(device_t, int, int, int);
 static int	mec_mii_wait(struct mec_softc *);
 static void	mec_statchg(device_t);
 static void	enaddr_aton(const char *, uint8_t *);
 static int	mec_init(struct ifnet * ifp);
 static void	mec_start(struct ifnet *);
 static void	mec_watchdog(struct ifnet *);
 static void	mec_tick(void *);
 static int	mec_ioctl(struct ifnet *, u_long, void *);
 static void	mec_reset(struct mec_softc *);
 static void	mec_setfilter(struct mec_softc *);
 static int	mec_intr(void *arg);
 static void	mec_stop(struct ifnet *, int);
 static void	mec_rxintr(struct mec_softc *);
 static void	mec_rxcsum(struct mec_softc *, struct mbuf *, uint16_t,
 		    uint32_t);
 static void	mec_txintr(struct mec_softc *, uint32_t);
 @@ -541,27 +539,27 @@ mec_attach(device_t parent, device_t sel
 					if (*netaddr >= '0' && *netaddr <= '9')
 						v = v*10 + (*netaddr - '0');
 					netaddr++;
+				}
 				ui <<= 8;
 				ui |= v;
 				if (*netaddr == '.')
 					netaddr++;
+			}
+		}
 		memcpy(sc->sc_enaddr+3, ((uint8_t *)&ui)+1, 3);
+	}
 	if (!mac_is_fake)
-		enaddr_aton(macaddr, sc->sc_enaddr);
+		ether_aton_r(sc->sc_enaddr, sizeof(sc->sc_enaddr), macaddr);
 	/* set the Ethernet address */
 	address = 0;
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		address = address << 8;
 		address |= sc->sc_enaddr[i];
+	}
 	bus_space_write_8(sc->sc_st, sc->sc_sh, MEC_STATION, address);
 	/* reset device */
 	mec_reset(sc);
 	command = bus_space_read_8(sc->sc_st, sc->sc_sh, MEC_MAC_CONTROL);
 @@ -844,56 +842,26 @@ mec_statchg(device_t self)
 	    MEC_MAC_FULL_DUPLEX | MEC_MAC_SPEED_SELECT);
 	/* must also set IPG here for duplex stuff ... */
 	if ((sc->sc_mii.mii_media_active & IFM_FDX) != 0) {
 		control |= MEC_MAC_FULL_DUPLEX;
 	} else {
 		/* set IPG */
 		control |= MEC_MAC_IPG_DEFAULT;
+	}
 	bus_space_write_8(st, sh, MEC_MAC_CONTROL, control);
+}
 /*
  * XXX
  * maybe this function should be moved to common part
  * (sgimips/machdep.c or elsewhere) for all on-board network devices.
  */
 static void
 enaddr_aton(const char *str, uint8_t *eaddr)
 	int i;
 	char c;
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		if (*str == ':')
 			str++;
 		c = *str++;
 		if (isdigit(c)) {
 			eaddr[i] = (c - '0');
 		} else if (isxdigit(c)) {
 			eaddr[i] = (toupper(c) + 10 - 'A');
 		c = *str++;
 		if (isdigit(c)) {
 			eaddr[i] = (eaddr[i] << 4) | (c - '0');
 		} else if (isxdigit(c)) {
 			eaddr[i] = (eaddr[i] << 4) | (toupper(c) + 10 - 'A');
 static int
 mec_init(struct ifnet *ifp)
+{
 	struct mec_softc *sc = ifp->if_softc;
 	bus_space_tag_t st = sc->sc_st;
 	bus_space_handle_t sh = sc->sc_sh;
 	struct mec_rxdesc *rxd;
 	int i, rc;
 	/* cancel any pending I/O */
 	mec_stop(ifp, 0);
 	/* reset device */