 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_le_ledma.c,v 1.30 2008/04/28 20:23:57 martin Exp $	*/
+/*	$NetBSD: if_le_ledma.c,v 1.30.10.1 2009/06/19 21:25:21 snj Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center; Paul Kranenburg.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.30 2008/04/28 20:23:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.30.10.1 2009/06/19 21:25:21 snj Exp $");
 #include "opt_inet.h"
 #include "bpfilter.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 <sys/malloc.h>
 #include <net/if.h>
 @@ -73,26 +73,28 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_ledma.
  * LANCE registers.
  */
 #define LEREG1_RDP	0	/* Register Data port */
 #define LEREG1_RAP	2	/* Register Address port */
 struct	le_softc {
 	struct	am7990_softc	sc_am7990;	/* glue to MI code */
 	struct	sbusdev		sc_sd;		/* sbus device */
 	bus_space_tag_t		sc_bustag;
 	bus_dmamap_t		sc_dmamap;
 	bus_space_handle_t	sc_reg;		/* LANCE registers */
 	struct	lsi64854_softc	*sc_dma;	/* pointer to my dma */
 	u_int			sc_laddr;	/* LANCE DMA address */
 	u_int			sc_lostcount;
 #define LE_LOSTTHRESH	5	/* lost carrior count to switch media */
 };
 #define MEMSIZE		(16*1024)	/* LANCE memory size */
 #define LEDMA_BOUNDARY	(16*1024*1024)	/* must not cross 16MB boundary */
 int	lematch_ledma(device_t, cfdata_t, void *);
 void	leattach_ledma(device_t, device_t, void *);
 /*
  * Media types supported by the Sun4m.
  */
 static int lemedia[] = {
 	IFM_ETHER|IFM_10_T,
 @@ -267,26 +269,32 @@ lehwinit(struct lance_softc *sc)
 		break;
 	case IFM_10_5:
 		lesetaui(sc);
 		break;
+	}
+}
 static void
 lenocarrier(struct lance_softc *sc)
+{
 	struct le_softc *lesc = (struct le_softc *)sc;
 	/* it may take a while for modern switches to set 10baseT media */
 	if (lesc->sc_lostcount++ < LE_LOSTTHRESH)
 		return;
 	lesc->sc_lostcount = 0;
 	/*
 	 * Check if the user has requested a certain cable type, and
 	 * if so, honor that request.
 	 */
 	printf("%s: lost carrier on ", device_xname(sc->sc_dev));
 	if (L64854_GCSR(lesc->sc_dma) & E_TP_AUI) {
 		printf("UTP port");
 		switch (IFM_SUBTYPE(sc->sc_media.ifm_media)) {
 		case IFM_10_5:
 		case IFM_AUTO:
 			printf(", switching to AUI port");
 			lesetaui(sc);
 @@ -369,27 +377,27 @@ leattach_ledma(device_t parent, device_t
 	/* Load DMA buffer */
 	if ((error = bus_dmamap_load(dmatag, lesc->sc_dmamap, sc->sc_mem,
 			MEMSIZE, NULL, BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) {
 		aprint_error(": DMA buffer map load error %d\n", error);
 		bus_dmamem_free(dmatag, &seg, rseg);
 		bus_dmamem_unmap(dmatag, sc->sc_mem, MEMSIZE);
 		return;
+	}
 	lesc->sc_laddr = lesc->sc_dmamap->dm_segs[0].ds_addr;
 	sc->sc_addr = lesc->sc_laddr & 0xffffff;
 	sc->sc_conf3 = LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON;
 	lesc->sc_lostcount = 0;
 	/* Assume SBus is grandparent */
 	lesc->sc_sd.sd_reset = (void *)lance_reset;
 	sbus_establish(&lesc->sc_sd, parent);
 	sc->sc_mediachange = lemediachange;
 	sc->sc_mediastatus = lemediastatus;
 	sc->sc_supmedia = lemedia;
 	sc->sc_nsupmedia = NLEMEDIA;
 	sc->sc_defaultmedia = IFM_ETHER|IFM_AUTO;
 	prom_getether(sa->sa_node, sc->sc_enaddr);