 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iee_sbdio.c,v 1.5 2008/04/04 17:03:42 tsutsui Exp $	*/
+/*	$NetBSD: if_iee_sbdio.c,v 1.6 2009/05/05 16:38:41 tsutsui Exp $	*/
 /*
  * Copyright (c) 2003 Jochen Kunz.
  * 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.
 @@ -20,27 +20,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 JOCHEN KUNZ
  * 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_iee_sbdio.c,v 1.5 2008/04/04 17:03:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iee_sbdio.c,v 1.6 2009/05/05 16:38:41 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <mips/cache.h>
 @@ -53,28 +53,27 @@ __KERNEL_RCSID(0, "$NetBSD: if_iee_sbdio
 #include <dev/ic/i82596var.h>
 int iee_sbdio_match(device_t, cfdata_t, void *);
 void iee_sbdio_attach(device_t, device_t, void *);
 int iee_sbdio_cmd(struct iee_softc *, uint32_t);
 int iee_sbdio_reset(struct iee_softc *);
 static void iee_sbdio_channel_attention(void *);
 static void iee_sbdio_chip_reset(void *);
 static void iee_sbdio_set_scp(void *, uint32_t);
 struct iee_sbdio_softc {
 	struct iee_softc sc_iee;
-	/* CPU <-> i82589 interface */
+	volatile uint32_t *sc_port;	/* CPU <-> i82596 interface */
 	volatile uint32_t *sc_port;
 };
 CFATTACH_DECL_NEW(iee_sbdio, sizeof(struct iee_sbdio_softc),
     iee_sbdio_match, iee_sbdio_attach, NULL, NULL);
 int
 iee_sbdio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct sbdio_attach_args *sa = aux;
 	return strcmp(sa->sa_name, "iee") ? 0 : 1;
+}
 @@ -84,57 +83,56 @@ iee_sbdio_attach(device_t parent, device
 	struct iee_sbdio_softc *sc_ssc = device_private(self);
 	struct iee_softc *sc = &sc_ssc->sc_iee;
 	struct sbdio_attach_args *sa = aux;
 	uint8_t eaddr[ETHER_ADDR_LEN];
 	int media[2];
 	int rsegs;
 	sc->sc_dev = self;
 	sc_ssc->sc_port =
 	    (volatile uint32_t *)MIPS_PHYS_TO_KSEG1(sa->sa_addr1);
 	sc->sc_type = I82596_CA;
 	sc->sc_flags = IEE_NEED_SWAP;
 	/* bus_dma round the dma size to page size. */
 	sc->sc_cl_align = 1;
 	sc->sc_dmat = sa->sa_dmat;
 	if (bus_dmamem_alloc(sc->sc_dmat, IEE_SHMEM_MAX, PAGE_SIZE, 0,
-		&sc->sc_dma_segs, 1, &rsegs, BUS_DMA_NOWAIT) != 0) {
+	    &sc->sc_dma_segs, 1, &rsegs, BUS_DMA_NOWAIT) != 0) {
-		aprint_error(": iee_sbdio_attach: can't allocate %d bytes of "
+		aprint_error(": can't allocate %d bytes of DMA memory\n",
-		    "DMA memory\n", (int)IEE_SHMEM_MAX);
+		    (int)IEE_SHMEM_MAX);
 		return;
+	}
 	if (bus_dmamem_map(sc->sc_dmat, &sc->sc_dma_segs, rsegs, IEE_SHMEM_MAX,
-		(void **)sc->sc_shmem_addr, BUS_DMA_NOWAIT) != 0) {
+	    (void **)sc->sc_shmem_addr, BUS_DMA_NOWAIT) != 0) {
-		aprint_error(": iee_sbdio_attach: can't map DMA memory\n");
+		aprint_error(": can't map DMA memory\n");
 		bus_dmamem_free(sc->sc_dmat, &sc->sc_dma_segs, rsegs);
 		return;
+	}
 	if (bus_dmamap_create(sc->sc_dmat, IEE_SHMEM_MAX, rsegs,
-		IEE_SHMEM_MAX, 0, BUS_DMA_NOWAIT, &sc->sc_shmem_map) != 0) {
+	    IEE_SHMEM_MAX, 0, BUS_DMA_NOWAIT, &sc->sc_shmem_map) != 0) {
-		aprint_error(": iee_sbdio_attach: can't create DMA map\n");
+		aprint_error(": can't create DMA map\n");
 		bus_dmamem_unmap(sc->sc_dmat, sc->sc_shmem_addr, IEE_SHMEM_MAX);
 		bus_dmamem_free(sc->sc_dmat, &sc->sc_dma_segs, rsegs);
 		return;
+	}
 	if (bus_dmamap_load(sc->sc_dmat, sc->sc_shmem_map, sc->sc_shmem_addr,
-		IEE_SHMEM_MAX, NULL, BUS_DMA_NOWAIT) != 0) {
+	    IEE_SHMEM_MAX, NULL, BUS_DMA_NOWAIT) != 0) {
-		aprint_error(": iee_sbdio_attach: can't load DMA map\n");
+		aprint_error(": can't load DMA map\n");
 		bus_dmamap_destroy(sc->sc_dmat, sc->sc_shmem_map);
 		bus_dmamem_unmap(sc->sc_dmat, sc->sc_shmem_addr, IEE_SHMEM_MAX);
 		bus_dmamem_free(sc->sc_dmat, &sc->sc_dma_segs, rsegs);
 		return;
+	}
 	memset(sc->sc_shmem_addr, 0, IEE_SHMEM_MAX);
 	mips_dcache_wbinv_range((vaddr_t)sc->sc_shmem_addr, IEE_SHMEM_MAX);
 	sc->sc_shmem_addr = (void *)((vaddr_t)sc->sc_shmem_addr |
 	    MIPS_KSEG1_START);
 	/* Setup SYSBUS byte. TR2 specific? -uch */
 	SC_SCP->scp_sysbus = IEE_SYSBUS_BE | IEE_SYSBUS_INT |