diff options
| -rw-r--r-- | sys/arch/mac68k/conf/files.mac68k | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/esp.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/files.sparc | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/esp.c | 6 | ||||
| -rw-r--r-- | sys/conf/files | 9 | ||||
| -rw-r--r-- | sys/dev/ic/ncr53c9x.c | 6 |
6 files changed, 14 insertions, 17 deletions
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k index cfcc0094a1d..509ed64cb70 100644 --- a/sys/arch/mac68k/conf/files.mac68k +++ b/sys/arch/mac68k/conf/files.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: files.mac68k,v 1.20 1999/11/08 15:36:08 mickey Exp $ +# $OpenBSD: files.mac68k,v 1.21 2000/06/12 06:10:47 fgsch Exp $ # $NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $ # mac68k-specific configuration info @@ -82,7 +82,6 @@ attach sbc at obio_scsi5380 with sbc_obio file arch/mac68k/dev/sbc_obio.c sbc_obio file arch/mac68k/dev/sbc.c sbc -device esp: scsi, ncr53c9x attach esp at obio_norm file arch/mac68k/dev/esp.c esp diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index 3fd740b8a37..7d1dea3e875 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -111,10 +111,6 @@ struct cfattach esp_ca = { sizeof(struct esp_softc), espmatch, espattach }; -struct cfdriver esp_cd = { - NULL, "esp", DV_DULL -}; - struct scsi_adapter esp_switch = { ncr53c9x_scsi_cmd, minphys, /* no max at this level; handled by DMA code */ diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc index 017626c044d..b9686ba72c0 100644 --- a/sys/arch/sparc/conf/files.sparc +++ b/sys/arch/sparc/conf/files.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc,v 1.35 1999/11/08 15:36:10 mickey Exp $ +# $OpenBSD: files.sparc,v 1.36 2000/06/12 06:10:45 fgsch Exp $ # $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $ # @(#)files.sparc 8.1 (Berkeley) 7/19/93 @@ -121,7 +121,6 @@ device hme: ifnet, ether, mii, ifmedia attach hme at sbus file arch/sparc/dev/hme.c hme -device esp: scsi, ncr53c9x attach esp at sbus, dma, obio file arch/sparc/dev/esp.c esp diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index 5dcc10ddb01..475d4e894ed 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.15 1999/02/28 19:12:33 jason Exp $ */ +/* $OpenBSD: esp.c,v 1.16 2000/06/12 06:10:46 fgsch Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -136,10 +136,6 @@ struct cfattach esp_ca = { sizeof(struct esp_softc), espmatch, espattach }; -struct cfdriver esp_cd = { - NULL, "esp", DV_DULL -}; - struct scsi_adapter esp_switch = { ncr53c9x_scsi_cmd, minphys, /* no max at this level; handled by DMA code */ diff --git a/sys/conf/files b/sys/conf/files index e559d5d0e12..4f252fd26c6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.166 2000/06/06 20:18:20 art Exp $ +# $OpenBSD: files,v 1.167 2000/06/12 06:10:43 fgsch Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -40,7 +40,6 @@ define token # of device drivers. define ncr5380sbc # NCR 5380 SCSI Bus Controller define ncr53c7xx # NCR 53c7xx SCSI Bus Controller -define ncr53c9x # NCR 53c9x or Emulex ESP SCSI Controller define pdq # DEC FDDI chipset define dp8390nic # 8390-family Ethernet controllers define rtl80x9 # RealTek 8019/8029 NE2000-compatible @@ -100,6 +99,11 @@ file dev/ic/isp_openbsd.c isp device uha: scsi file dev/ic/uha.c uha +# NCR 53c9x or Emulex ESP SCSI Controller +define ncr53c9x +device esp: scsi, ncr53c9x +file dev/ic/ncr53c9x.c ncr53c9x + # 3Com Etherlink-III Ethernet controller device ep: ether, ifnet, ifmedia, mii file dev/ic/elink3.c ep @@ -265,7 +269,6 @@ file dev/audio.c audio needs-flag file dev/ccd.c ccd needs-flag file dev/ic/ncr5380sbc.c ncr5380sbc file dev/ic/ncr53c7xx.c ncr53c7xx -file dev/ic/ncr53c9x.c ncr53c9x file dev/ic/pdq.c pdq file dev/ic/pdq_ifsubr.c pdq file dev/ic/dp8390.c dp8390nic diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index 117f833c4f5..c7eddbd1fbe 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.6 1998/05/28 22:07:52 jason Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.7 2000/06/12 06:10:45 fgsch Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.26 1998/05/26 23:17:34 thorpej Exp $ */ /* @@ -123,6 +123,10 @@ static inline int ncr53c9x_stp2cpb __P((struct ncr53c9x_softc *, int)); static inline void ncr53c9x_setsync __P((struct ncr53c9x_softc *, struct ncr53c9x_tinfo *)); +struct cfdriver esp_cd = { + NULL, "esp", DV_DULL +}; + /* * Names for the NCR53c9x variants, correspnding to the variant tags * in ncr53c9xvar.h. |