Adjust for some small changes in lsi64854 back-end driver.

pk · pk · commit fe6b9295a876 · 1998-08-29T21:43:00.000Z
diff --git a/sys/arch/sparc/dev/dma_obio.c b/sys/arch/sparc/dev/dma_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma_obio.c,v 1.1 1998/08/29 20:49:35 pk Exp $ */
+/*	$NetBSD: dma_obio.c,v 1.2 1998/08/29 21:43:46 pk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -89,19 +89,17 @@ dmaattach_obio(parent, self, aux)
 	union obio_attach_args *uoba = aux;
 	struct obio4_attach_args *oba = &uoba->uoba_oba4;
 	struct lsi64854_softc *sc = (void *)self;
-	bus_space_handle_t bh;
 
 	sc->sc_bustag = oba->oba_bustag;
 	sc->sc_dmatag = oba->oba_dmatag;
 
 	if (obio_bus_map(oba->oba_bustag, oba->oba_paddr,
-			 0, sizeof(struct dma_regs),
+			 0, 4 * sizeof(u_int32_t),
 			 0, 0,
-			 &bh) != 0) {
+			 &sc->sc_regs) != 0) {
 		printf("dmaattach_obio: cannot map registers\n");
 		return;
 	}
-	sc->sc_regs = bh;
 
 	lsi64854_attach(sc);
 }
diff --git a/sys/arch/sparc/dev/esp_obio.c b/sys/arch/sparc/dev/esp_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_obio.c,v 1.1 1998/08/29 20:49:37 pk Exp $	*/
+/*	$NetBSD: esp_obio.c,v 1.2 1998/08/29 21:43:46 pk Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -149,7 +149,6 @@ espattach_obio(parent, self, aux)
 	struct obio4_attach_args *oba = &uoba->uoba_oba4;
 	struct esp_softc *esc = (void *)self;
 	struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x;
-	bus_space_handle_t bh;
 
 	esc->sc_bustag = oba->oba_bustag;
 	esc->sc_dmatag = oba->oba_dmatag;
@@ -167,7 +166,7 @@ espattach_obio(parent, self, aux)
 	 * and a back pointer to us, for DMA
 	 */
 	if (esc->sc_dma)
-		esc->sc_dma->sc_ncr53c9x = sc;
+		esc->sc_dma->sc_client = sc;
 	else {
 		printf("\n");
 		panic("espattach: no dma found");
@@ -177,13 +176,11 @@ espattach_obio(parent, self, aux)
 			 0,	/* offset */
 			 16,	/* size (of ncr53c9xreg) */
 			 BUS_SPACE_MAP_LINEAR,
-			 0, &bh) != 0) {
+			 0, &esc->sc_reg) != 0) {
 		printf("%s @ obio: cannot map registers\n", self->dv_xname);
 		return;
 	}
 
-	esc->sc_reg = bh;
-
 	if (oba->oba_bp != NULL && strcmp(oba->oba_bp->name, "esp") == 0 &&
 	    oba->oba_bp->val[0] == -1 &&
 	    oba->oba_bp->val[1] == sc->sc_dev.dv_unit)
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma_sbus.c,v 1.1 1998/08/29 20:32:09 pk Exp $ */
+/*	$NetBSD: dma_sbus.c,v 1.2 1998/08/29 21:43:00 pk Exp $ */
 
 /*
  * Copyright (c) 1994 Paul Kranenburg.  All rights reserved.
@@ -133,7 +133,7 @@ dmaattach_sbus(parent, self, aux)
 	else {
 		if (sbus_bus_map(sa->sa_bustag, sa->sa_slot,
 				 sa->sa_offset,
-				 sizeof(struct dma_regs),
+				 sa->sa_size,
 				 0, 0, &bh) != 0) {
 			printf("%s: cannot map registers\n", self->dv_xname);
 			return;
@@ -164,11 +164,11 @@ dmaattach_sbus(parent, self, aux)
 		char *cabletype;
 		u_int32_t csr;
 		/*
-		 * Check to see which cable type is currently active and set the
-		 * appropriate bit in the ledma csr so that it gets used. If we
-		 * didn't netboot, the PROM won't have the "cable-selection"
-		 * property; default to TP and then the user can change it via
-		 * a "media" option to ifconfig.
+		 * Check to see which cable type is currently active and
+		 * set the appropriate bit in the ledma csr so that it
+		 * gets used. If we didn't netboot, the PROM won't have
+		 * the "cable-selection" property; default to TP and then
+		 * the user can change it via a "media" option to ifconfig.
 		 */
 		cabletype = getpropstring(node, "cable-selection");
 		csr = L64854_GCSR(sc);
@@ -181,10 +181,10 @@ dmaattach_sbus(parent, self, aux)
 			csr |= E_TP_AUI;
 		}
 		L64854_SCSR(sc, csr);
-		delay(20000);	/* manual says we need 20ms delay */
-		sc->sc_dmadev = DMA_ENET;
+		delay(20000);	/* manual says we need a 20ms delay */
+		sc->sc_channel = L64854_CHANNEL_ENET;
 	} else {
-		sc->sc_dmadev = DMA_SCSI;
+		sc->sc_channel = L64854_CHANNEL_SCSI;
 	}
 
 
@@ -224,7 +224,8 @@ dmabus_intr_establish(t, level, flags, handler, arg)
 {
 	struct lsi64854_softc *sc = t->cookie;
 
-	if (sc->sc_dmadev == DMA_ENET) { /* XXX - for now; do esp later */
+	/* XXX - for now only le; do esp later */
+	if (sc->sc_channel == L64854_CHANNEL_ENET) {
 		sc->sc_intrchain = handler;
 		sc->sc_intrchainarg = arg;
 		handler = lsi64854_enet_intr;
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_sbus.c,v 1.1 1998/08/29 20:32:10 pk Exp $	*/
+/*	$NetBSD: esp_sbus.c,v 1.2 1998/08/29 21:43:00 pk Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -178,7 +178,7 @@ espattach_sbus(parent, self, aux)
 	 * and a back pointer to us, for DMA
 	 */
 	if (esc->sc_dma)
-		esc->sc_dma->sc_ncr53c9x = sc;
+		esc->sc_dma->sc_client = sc;
 	else {
 		printf("\n");
 		panic("espattach: no dma found");
@@ -191,17 +191,15 @@ espattach_sbus(parent, self, aux)
 	if (sa->sa_npromvaddrs)
 		esc->sc_reg = (bus_space_handle_t)sa->sa_promvaddrs[0];
 	else {
-		bus_space_handle_t bh;
 		if (sbus_bus_map(sa->sa_bustag, sa->sa_slot,
 				 sa->sa_offset,
 				 sa->sa_size,
 				 BUS_SPACE_MAP_LINEAR,
-				 0, &bh) != 0) {
+				 0, &esc->sc_reg) != 0) {
 			printf("%s @ sbus: cannot map registers\n",
 				self->dv_xname);
 			return;
 		}
-		esc->sc_reg = bh;
 	}
 
 	esc->sc_pri = sa->sa_pri;
@@ -233,7 +231,7 @@ espattach_dma(parent, self, aux)
 	sc->sc_freq = getpropint(sa->sa_node, "clock-frequency", -1);
 
 	esc->sc_dma = (struct lsi64854_softc *)parent;
-	esc->sc_dma->sc_ncr53c9x = sc;
+	esc->sc_dma->sc_client = sc;
 
 	/*
 	 * Map my registers in, if they aren't already in virtual
@@ -242,18 +240,16 @@ espattach_dma(parent, self, aux)
 	if (sa->sa_npromvaddrs)
 		esc->sc_reg = (bus_space_handle_t)sa->sa_promvaddrs[0];
 	else {
-		bus_space_handle_t bh;
 		if (bus_space_map2(sa->sa_bustag,
 				   sa->sa_slot,
 				   sa->sa_offset,
 				   sa->sa_size,
 				   BUS_SPACE_MAP_LINEAR,
-				   0, &bh) != 0) {
+				   0, &esc->sc_reg) != 0) {
 			printf("%s @ dma: cannot map registers\n",
 				self->dv_xname);
 			return;
 		}
-		esc->sc_reg = bh;
 	}
 
 	/* Establish interrupt handler */
diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_ledma.c,v 1.1 1998/08/29 20:32:11 pk Exp $	*/
+/*	$NetBSD: if_le_ledma.c,v 1.2 1998/08/29 21:43:00 pk Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -359,7 +359,7 @@ leattach_ledma(parent, self, aux)
 
 	/* Establish link to `ledma' device */
 	lesc->sc_dma = lsi;
-	lesc->sc_dma->sc_le = lesc;
+	lesc->sc_dma->sc_client = lesc;
 
 	/* Map device registers */
 	if (bus_space_map2(sa->sa_bustag,
