Adjust for changes to config.

This commit is contained in:
thorpej 1998-01-12 09:49:10 +00:00
parent 06ce220790
commit 93f26b5f40
10 changed files with 30 additions and 48 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: atapiconf.c,v 1.7 1998/01/06 17:03:15 bouyer Exp $ */
/* $NetBSD: atapiconf.c,v 1.8 1998/01/12 09:49:10 thorpej Exp $ */
/*
* Copyright (c) 1996 Manuel Bouyer. All rights reserved.
@ -69,9 +69,7 @@ struct cfattach atapibus_ca = {
sizeof(struct atapibus_softc), atapibusmatch, atapibusattach
};
struct cfdriver atapibus_cd = {
NULL, "atapibus", DV_DULL
};
extern struct cfdriver atapibus_cd;
int atapibusprint __P((void *, const char *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.108 1997/12/02 03:57:54 mikel Exp $ */
/* $NetBSD: cd.c,v 1.109 1998/01/12 09:49:11 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -116,10 +116,6 @@ int cd_read_toc __P((struct cd_softc *, int, int, void *, int));
int cd_get_parms __P((struct cd_softc *, int));
int cd_load_toc __P((struct cd_softc *, struct cd_toc *));
struct cfdriver cd_cd = {
NULL, "cd", DV_DISK
};
struct dkdriver cddkdriver = { cdstrategy };
struct scsipi_device cd_switch = {
@ -129,6 +125,8 @@ struct scsipi_device cd_switch = {
cddone, /* deal with stats at interrupt time */
};
extern struct cfdriver cd_cd;
/*
* The routine called by the low level scsi routine when it discovers
* A device suitable for this driver

View File

@ -1,4 +1,4 @@
/* $NetBSD: ch.c,v 1.31 1997/10/18 19:50:57 thorpej Exp $ */
/* $NetBSD: ch.c,v 1.32 1998/01/12 09:49:12 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Jason R. Thorpe <thorpej@and.com>
@ -105,9 +105,7 @@ struct cfattach ch_ca = {
sizeof(struct ch_softc), chmatch, chattach
};
struct cfdriver ch_cd = {
NULL, "ch", DV_DULL
};
extern struct cfdriver ch_cd;
struct scsipi_inquiry_pattern ch_patterns[] = {
{T_CHANGER, T_REMOV,

View File

@ -1,4 +1,4 @@
# $NetBSD: files.scsipi,v 1.11 1997/10/01 01:18:51 enami Exp $
# $NetBSD: files.scsipi,v 1.12 1998/01/12 09:49:13 thorpej Exp $
#
# Config file and device description for machine-independent SCSI code.
# Included by ports that need it. Ports that use it must provide
@ -12,47 +12,47 @@ file dev/scsipi/scsipi_ioctl.c scsi | atapi
file dev/scsipi/scsi_base.c scsi
file dev/scsipi/atapi_base.c atapi
device scsibus {target = -1, lun = -1}
device scsibus class dull {target = -1, lun = -1}
attach scsibus at scsi
file dev/scsipi/scsiconf.c scsibus needs-flag
device atapibus {drive = -1}
device atapibus class dull {drive = -1}
attach atapibus at atapi
file dev/scsipi/atapiconf.c atapibus needs-flag
device cd: disk
device cd class disk: disk
attach cd at scsibus with cd_scsibus
attach cd at atapibus with cd_atapibus
file dev/scsipi/cd_scsi.c cd_scsibus
file dev/scsipi/cd_atapi.c cd_atapibus
file dev/scsipi/cd.c cd | cd_scsibus | cd_atapibus needs-flag
device ch: disk
device ch class dull: disk
attach ch at scsibus
file dev/scsipi/ch.c ch needs-flag
device se: ifnet, ether, arp
device se class ifnet: ifnet, ether, arp
attach se at scsibus
file dev/scsipi/if_se.c se needs-flag
device sd: disk
device sd class disk: disk
attach sd at scsibus
file dev/scsipi/sd.c sd needs-flag
device st: tape
device st class tape: tape
attach st at scsibus
file dev/scsipi/st.c st needs-flag
device ss: tape
device ss class dull: tape
attach ss at scsibus
file dev/scsipi/ss.c ss needs-flag
file dev/scsipi/ss_mustek.c ss
file dev/scsipi/ss_scanjet.c ss
device su: disk
device su class dull: disk
attach su at scsibus
file dev/scsipi/su.c su needs-flag
device uk: disk
device uk class dull: disk
attach uk at scsibus
file dev/scsipi/uk.c uk needs-flag

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_se.c,v 1.12 1997/10/18 19:50:58 thorpej Exp $ */
/* $NetBSD: if_se.c,v 1.13 1998/01/12 09:49:14 thorpej Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au>
@ -236,9 +236,7 @@ struct cfattach se_ca = {
sizeof(struct se_softc), sematch, seattach
};
struct cfdriver se_cd = {
NULL, "se", DV_IFNET
};
extern struct cfdriver se_cd;
struct scsipi_device se_switch = {
NULL, /* Use default error handler */

View File

@ -1,4 +1,4 @@
/* $NetBSD: scsiconf.c,v 1.93 1997/10/03 02:04:17 thorpej Exp $ */
/* $NetBSD: scsiconf.c,v 1.94 1998/01/12 09:49:15 thorpej Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -102,9 +102,7 @@ struct cfattach scsibus_ca = {
sizeof(struct scsibus_softc), scsibusmatch, scsibusattach
};
struct cfdriver scsibus_cd = {
NULL, "scsibus", DV_DULL
};
extern struct cfdriver scsibus_cd;
int scsibusprint __P((void *, const char *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: sd.c,v 1.122 1997/10/18 19:51:08 thorpej Exp $ */
/* $NetBSD: sd.c,v 1.123 1998/01/12 09:49:16 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1997 Charles M. Hannum. All rights reserved.
@ -140,9 +140,7 @@ struct cfattach sd_ca = {
sizeof(struct sd_softc), sdmatch, sdattach
};
struct cfdriver sd_cd = {
NULL, "sd", DV_DISK
};
extern struct cfdriver sd_cd;
struct dkdriver sddkdriver = { sdstrategy };

View File

@ -1,4 +1,4 @@
/* $NetBSD: ss.c,v 1.18 1997/11/19 03:03:15 augustss Exp $ */
/* $NetBSD: ss.c,v 1.19 1998/01/12 09:49:17 thorpej Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@ -75,9 +75,7 @@ struct cfattach ss_ca = {
sizeof(struct ss_softc), ssmatch, ssattach
};
struct cfdriver ss_cd = {
NULL, "ss", DV_DULL
};
extern struct cfdriver ss_cd;
void ssstrategy __P((struct buf *));
void ssstart __P((void *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: st.c,v 1.86 1997/12/28 19:25:35 is Exp $ */
/* $NetBSD: st.c,v 1.87 1998/01/12 09:49:18 thorpej Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -319,9 +319,7 @@ struct cfattach st_ca = {
sizeof(struct st_softc), stmatch, stattach
};
struct cfdriver st_cd = {
NULL, "st", DV_TAPE
};
extern struct cfdriver st_cd;
struct scsipi_device st_switch = {
st_interpret_sense,

View File

@ -1,4 +1,4 @@
/* $NetBSD: uk.c,v 1.20 1997/10/01 01:19:26 enami Exp $ */
/* $NetBSD: uk.c,v 1.21 1998/01/12 09:49:19 thorpej Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -66,9 +66,7 @@ struct cfattach uk_ca = {
sizeof(struct uk_softc), ukmatch, ukattach
};
struct cfdriver uk_cd = {
NULL, "uk", DV_DULL
};
extern struct cfdriver uk_cd;
/*
* This driver is so simple it uses all the default services