summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
authornisimura <nisimura@NetBSD.org>2000-06-05 07:59:50 +0000
committernisimura <nisimura@NetBSD.org>2000-06-05 07:59:50 +0000
commit4371d91433fb399dbdca85ef73070bd2aa8e55bc (patch)
treedb135e12ad2851760c3eb0e1db9455f0eef1350b /sys/arch/macppc/dev
parent36a1354bc6d1c0df7bec645fe4eaf1875ec4aff5 (diff)
Have MI ncr53c9x_attach() the 2nd and 3rd arguments for scsipi_adater
and scsipi_device respectively, with size reduction of ncr53c9x_softc. Specifying NULL instructs the driver to use default adapter and default device codes. Every target port has ncr53c9x_attach(sc, NULL, NULL) anyway.
Diffstat (limited to 'sys/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/esp.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index 79d16fbd408..19b4ccd44c6 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.9 1998/11/19 21:46:41 thorpej Exp $ */
+/* $NetBSD: esp.c,v 1.10 2000/06/05 07:59:51 nisimura Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -116,13 +116,6 @@ struct cfattach esp_ca = {
sizeof(struct esp_softc), espmatch, espattach
};
-struct scsipi_device esp_dev = {
- NULL, /* Use default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* Use default 'done' routine */
-};
-
/*
* Functions and the switch for the MI code.
*/
@@ -251,16 +244,13 @@ espattach(parent, self, aux)
sc->sc_maxxfer = 64 * 1024;
/* and the interuppts */
- intr_establish(esc->sc_pri, IST_LEVEL, IPL_BIO, (void *)ncr53c9x_intr,
- sc);
+ intr_establish(esc->sc_pri, IST_LEVEL, IPL_BIO, ncr53c9x_intr, sc);
/* Reset SCSI bus when halt. */
shutdownhook_establish(esp_shutdownhook, sc);
/* Do the common parts of attachment. */
- sc->sc_adapter.scsipi_cmd = ncr53c9x_scsi_cmd;
- sc->sc_adapter.scsipi_minphys = minphys;
- ncr53c9x_attach(sc, &esp_dev);
+ ncr53c9x_attach(sc, NULL, NULL);
/* Turn on target selection using the `dma' method */
ncr53c9x_dmaselect = 1;