Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1) set scsi_link channel to either the appropriate channel (if a 

multi-channel driver), or to SCSI_CHANNEL_ONLY_ONE if a
    single-channel driver.
(2) use scsiprint() rather than a locally-defined autoconfig print
    function, and kill any locally-defined print function.
This commit is contained in:
cgd 1996-08-28 18:59:15 +00:00
parent 4d62c94345
commit 71ad30d0e9
44 changed files with 135 additions and 635 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/alpha/tc/esp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp.c,v 1.10 1996/08/27 21:54:14 cgd Exp $ */
/* $NetBSD: esp.c,v 1.11 1996/08/28 18:59:15 cgd Exp $ */
/*
* Copyright (c) 1994 Peter Galbavy
@ -75,7 +75,6 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/
/*static*/ void espattach __P((struct device *, struct device *, void *));
/*static*/ int espmatch __P((struct device *, void *, void *));
/*static*/ int espprint __P((void *, const char *));
/*static*/ void espreadregs __P((struct esp_softc *));
/*static*/ void espselect __P((struct esp_softc *,
u_char, u_char, u_char *, u_char));
@ -115,16 +114,6 @@ struct scsi_device esp_dev = {
NULL, /* Use default 'done' routine */
};
int
espprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("scsibus at %s", name);
return UNCONF;
}
int
espmatch(parent, vcf, aux)
struct device *parent;
@ -376,6 +365,7 @@ espattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_id;
sc->sc_link.adapter = &esp_switch;
@ -406,7 +396,7 @@ espattach(parent, self, aux)
/*
* Now try to attach all the sub-devices
*/
config_found(self, &sc->sc_link, espprint);
config_found(self, &sc->sc_link, scsiprint);
#ifdef SPARC_DRIVER
bootpath_store(1, NULL);

19
sys/arch/amiga/dev/afsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: afsc.c,v 1.15 1996/08/27 21:54:28 cgd Exp $ */
/* $NetBSD: afsc.c,v 1.16 1996/08/28 18:59:22 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -51,7 +51,6 @@
#include <amiga/dev/siopvar.h>
#include <amiga/dev/zbusvar.h>
int afscprint __P((void *auxp, const char *));
void afscattach __P((struct device *, struct device *, void *));
int afscmatch __P((struct device *, void *, void *));
int afsc_dmaintr __P((void *));
@ -153,6 +152,7 @@ afscattach(pdp, dp, auxp)
sc->sc_ctest7 = SIOP_CTEST7_CDIS;
sc->sc_dcntl = SIOP_DCNTL_EA;
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &afsc_scsiswitch;
@ -169,20 +169,7 @@ afscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, afscprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
afscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
int

20
sys/arch/amiga/dev/ahsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ahsc.c,v 1.13 1996/08/27 21:54:29 cgd Exp $ */
/* $NetBSD: ahsc.c,v 1.14 1996/08/28 18:59:24 cgd Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -51,7 +51,6 @@
#include <amiga/dev/ahscreg.h>
#include <amiga/dev/zbusvar.h>
int ahscprint __P((void *auxp, const char *));
void ahscattach __P((struct device *, struct device *, void *));
int ahscmatch __P((struct device *, void *, void *));
@ -138,6 +137,7 @@ ahscattach(pdp, dp, auxp)
sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x41);
sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 143;
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &ahsc_scsiswitch;
@ -154,23 +154,9 @@ ahscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, ahscprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
ahscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
void
ahsc_enintr(dev)
struct sbic_softc *dev;

20
sys/arch/amiga/dev/atzsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atzsc.c,v 1.17 1996/08/27 21:54:31 cgd Exp $ */
/* $NetBSD: atzsc.c,v 1.18 1996/08/28 18:59:25 cgd Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -51,7 +51,6 @@
#include <amiga/dev/atzscreg.h>
#include <amiga/dev/zbusvar.h>
int atzscprint __P((void *auxp, const char *));
void atzscattach __P((struct device *, struct device *, void *));
int atzscmatch __P((struct device *, void *, void *));
@ -162,6 +161,7 @@ atzscattach(pdp, dp, auxp)
printf(": dmamask 0x%lx\n", ~sc->sc_dmamask);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &atzsc_scsiswitch;
@ -178,23 +178,9 @@ atzscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, atzscprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
atzscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
void
atzsc_enintr(dev)
struct sbic_softc *dev;

18
sys/arch/amiga/dev/bzsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bzsc.c,v 1.10 1996/08/27 21:54:32 cgd Exp $ */
/* $NetBSD: bzsc.c,v 1.11 1996/08/28 18:59:27 cgd Exp $ */
/*
* Copyright (c) 1995 Daniel Widenfalk
@ -57,7 +57,6 @@
#include <amiga/dev/bzscreg.h>
#include <amiga/dev/bzscvar.h>
int bzscprint __P((void *auxp, const char *));
void bzscattach __P((struct device *, struct device *, void *));
int bzscmatch __P((struct device *, void *, void *));
@ -178,6 +177,7 @@ bzscattach(pdp, dp, auxp)
sfasinitialize((struct sfas_softc *)sc);
sc->sc_softc.sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_softc.sc_link.adapter_softc = sc;
sc->sc_softc.sc_link.adapter_target = sc->sc_softc.sc_host_id;
sc->sc_softc.sc_link.adapter = &bzsc_scsiswitch;
@ -192,19 +192,7 @@ bzscattach(pdp, dp, auxp)
add_isr(&sc->sc_softc.sc_isr);
/* attach all scsi units on us */
config_found(dp, &sc->sc_softc.sc_link, bzscprint);
}
/* print diag if pnp is NULL else just extra */
int
bzscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_softc.sc_link, scsiprint);
}
int

20
sys/arch/amiga/dev/drsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: drsc.c,v 1.3 1996/08/27 21:54:34 cgd Exp $ */
/* $NetBSD: drsc.c,v 1.4 1996/08/28 18:59:28 cgd Exp $ */
/*
* Copyright (c) 1996 Ignatios Souvatzis
@ -51,7 +51,6 @@
#include <amiga/dev/siopvar.h>
#include <amiga/amiga/drcustom.h>
int drscprint __P((void *auxp, const char *));
void drscattach __P((struct device *, struct device *, void *));
int drscmatch __P((struct device *, void *, void *));
int drsc_dmaintr __P((struct siop_softc *));
@ -127,6 +126,7 @@ drscattach(pdp, dp, auxp)
alloc_sicallback();
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &drsc_scsiswitch;
@ -148,23 +148,9 @@ drscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, drscprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
drscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
/*
* Level 4 interrupt processing for the MacroSystem DraCo mainboard
* SCSI. Because the level 4 interrupt is above splbio, the

19
sys/arch/amiga/dev/empsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: empsc.c,v 1.8 1996/08/27 21:54:35 cgd Exp $ */
/* $NetBSD: empsc.c,v 1.9 1996/08/28 18:59:30 cgd Exp $ */
/*
@ -49,7 +49,6 @@
#include <amiga/dev/scivar.h>
#include <amiga/dev/zbusvar.h>
int empscprint __P((void *auxp, const char *));
void empscattach __P((struct device *, struct device *, void *));
int empscmatch __P((struct device *, void *, void *));
int empsc_intr __P((void *));
@ -139,6 +138,7 @@ empscattach(pdp, dp, auxp)
scireset(sc);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &empsc_scsiswitch;
@ -149,20 +149,7 @@ empscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, empscprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
empscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
int

18
sys/arch/amiga/dev/flsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: flsc.c,v 1.9 1996/08/27 21:54:41 cgd Exp $ */
/* $NetBSD: flsc.c,v 1.10 1996/08/28 18:59:31 cgd Exp $ */
/*
* Copyright (c) 1995 Daniel Widenfalk
@ -57,7 +57,6 @@
#include <amiga/dev/flscreg.h>
#include <amiga/dev/flscvar.h>
int flscprint __P((void *auxp, const char *));
void flscattach __P((struct device *, struct device *, void *));
int flscmatch __P((struct device *, void *, void *));
@ -173,6 +172,7 @@ flscattach(pdp, dp, auxp)
sfasinitialize((struct sfas_softc *)sc);
sc->sc_softc.sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_softc.sc_link.adapter_softc = sc;
sc->sc_softc.sc_link.adapter_target = sc->sc_softc.sc_host_id;
sc->sc_softc.sc_link.adapter = &flsc_scsiswitch;
@ -190,19 +190,7 @@ flscattach(pdp, dp, auxp)
printf("\n");
/* attach all scsi units on us */
config_found(dp, &sc->sc_softc.sc_link, flscprint);
}
/* print diag if pnp is NULL else just extra */
int
flscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_softc.sc_link, scsiprint);
}
int

19
sys/arch/amiga/dev/gtsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gtsc.c,v 1.16 1996/08/27 21:54:59 cgd Exp $ */
/* $NetBSD: gtsc.c,v 1.17 1996/08/28 18:59:32 cgd Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -54,7 +54,6 @@
void gtscattach __P((struct device *, struct device *, void *));
int gtscmatch __P((struct device *, void *, void *));
int gtscprint __P((void *auxp, const char *));
void gtsc_enintr __P((struct sbic_softc *));
void gtsc_dmastop __P((struct sbic_softc *));
@ -187,6 +186,7 @@ gtscattach(pdp, dp, auxp)
((gap->flags & GVP_14MHZ) ? 143 : 72);
printf("sc_clkfreg: %ld.%ldMhz\n", sc->sc_clkfreq / 10, sc->sc_clkfreq % 10);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &gtsc_scsiswitch;
@ -203,20 +203,7 @@ gtscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, gtscprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
gtscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
void

19
sys/arch/amiga/dev/idesc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: idesc.c,v 1.24 1996/08/27 21:55:02 cgd Exp $ */
/* $NetBSD: idesc.c,v 1.25 1996/08/28 18:59:34 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -236,7 +236,6 @@ struct idec_softc
int ide_scsicmd __P((struct scsi_xfer *));
int idescprint __P((void *auxp, const char *));
void idescattach __P((struct device *, struct device *, void *));
int idescmatch __P((struct device *, void *, void *));
@ -405,6 +404,7 @@ idescattach(pdp, dp, auxp)
printf ("\n");
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &idesc_scsiswitch;
@ -420,20 +420,7 @@ idescattach(pdp, dp, auxp)
/*
* attach all "scsi" units on us
*/
config_found(dp, &sc->sc_link, idescprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
idescprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
/*

19
sys/arch/amiga/dev/ivsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ivsc.c,v 1.16 1996/08/27 21:55:04 cgd Exp $ */
/* $NetBSD: ivsc.c,v 1.17 1996/08/28 18:59:36 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -48,7 +48,6 @@
#include <amiga/dev/scivar.h>
#include <amiga/dev/zbusvar.h>
int ivscprint __P((void *auxp, const char *));
void ivscattach __P((struct device *, struct device *, void *));
int ivscmatch __P((struct device *, void *, void *));
@ -156,6 +155,7 @@ ivscattach(pdp, dp, auxp)
scireset(sc);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &ivsc_scsiswitch;
@ -166,20 +166,7 @@ ivscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, ivscprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
ivscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
int

19
sys/arch/amiga/dev/mgnsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mgnsc.c,v 1.19 1996/08/27 21:55:07 cgd Exp $ */
/* $NetBSD: mgnsc.c,v 1.20 1996/08/28 18:59:37 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -50,7 +50,6 @@
#include <amiga/dev/siopvar.h>
#include <amiga/dev/zbusvar.h>
int mgnscprint __P((void *auxp, const char *));
void mgnscattach __P((struct device *, struct device *, void *));
int mgnscmatch __P((struct device *, void *, void *));
int mgnsc_dmaintr __P((void *));
@ -124,6 +123,7 @@ mgnscattach(pdp, dp, auxp)
alloc_sicallback();
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &mgnsc_scsiswitch;
@ -140,20 +140,7 @@ mgnscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, mgnscprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
mgnscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
/*

20
sys/arch/amiga/dev/mlhsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlhsc.c,v 1.11 1996/08/27 21:55:09 cgd Exp $ */
/* $NetBSD: mlhsc.c,v 1.12 1996/08/28 18:59:40 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -47,7 +47,6 @@
#include <amiga/dev/scivar.h>
#include <amiga/dev/zbusvar.h>
int mlhscprint __P((void *auxp, const char *));
void mlhscattach __P((struct device *, struct device *, void *));
int mlhscmatch __P((struct device *, void *, void *));
@ -142,6 +141,7 @@ mlhscattach(pdp, dp, auxp)
scireset(sc);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &mlhsc_scsiswitch;
@ -152,23 +152,9 @@ mlhscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, mlhscprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
mlhscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
int
mlhsc_dma_xfer_in (dev, len, buf, phase)
struct sci_softc *dev;

20
sys/arch/amiga/dev/otgsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: otgsc.c,v 1.12 1996/08/27 21:55:11 cgd Exp $ */
/* $NetBSD: otgsc.c,v 1.13 1996/08/28 18:59:43 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -47,7 +47,6 @@
#include <amiga/dev/scivar.h>
#include <amiga/dev/zbusvar.h>
int otgscprint __P((void *auxp, const char *));
void otgscattach __P((struct device *, struct device *, void *));
int otgscmatch __P((struct device *, void *, void *));
@ -149,6 +148,7 @@ otgscattach(pdp, dp, auxp)
scireset(sc);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &otgsc_scsiswitch;
@ -159,23 +159,9 @@ otgscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, otgscprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
otgscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
int
otgsc_dma_xfer_in (dev, len, buf, phase)
struct sci_softc *dev;

20
sys/arch/amiga/dev/wesc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wesc.c,v 1.14 1996/08/27 21:55:12 cgd Exp $ */
/* $NetBSD: wesc.c,v 1.15 1996/08/28 18:59:45 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -50,7 +50,6 @@
#include <amiga/dev/siopvar.h>
#include <amiga/dev/zbusvar.h>
int wescprint __P((void *auxp, const char *));
void wescattach __P((struct device *, struct device *, void *));
int wescmatch __P((struct device *, void *, void *));
int wesc_dmaintr __P((void *));
@ -123,6 +122,7 @@ wescattach(pdp, dp, auxp)
sc->sc_ctest7 = SIOP_CTEST7_SC0 | SIOP_CTEST7_TT1;
sc->sc_dcntl = 0x00;
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &wesc_scsiswitch;
@ -139,23 +139,9 @@ wescattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, wescprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
wescprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
int
wesc_dmaintr(arg)
void *arg;

19
sys/arch/amiga/dev/wstsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wstsc.c,v 1.13 1996/08/27 21:55:15 cgd Exp $ */
/* $NetBSD: wstsc.c,v 1.14 1996/08/28 18:59:47 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -47,7 +47,6 @@
#include <amiga/dev/scivar.h>
#include <amiga/dev/zbusvar.h>
int wstscprint __P((void *auxp, const char *));
void wstscattach __P((struct device *, struct device *, void *));
int wstscmatch __P((struct device *, void *, void *));
@ -167,6 +166,7 @@ wstscattach(pdp, dp, auxp)
scireset(sc);
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &wstsc_scsiswitch;
@ -177,20 +177,7 @@ wstscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, wstscprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
wstscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_link, scsiprint);
}
int

20
sys/arch/amiga/dev/zssc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zssc.c,v 1.17 1996/08/27 21:55:18 cgd Exp $ */
/* $NetBSD: zssc.c,v 1.18 1996/08/28 18:59:48 cgd Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@ -50,7 +50,6 @@
#include <amiga/dev/siopvar.h>
#include <amiga/dev/zbusvar.h>
int zsscprint __P((void *auxp, const char *));
void zsscattach __P((struct device *, struct device *, void *));
int zsscmatch __P((struct device *, void *, void *));
int zssc_dmaintr __P((void *));
@ -125,6 +124,7 @@ zsscattach(pdp, dp, auxp)
alloc_sicallback();
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &zssc_scsiswitch;
@ -141,23 +141,9 @@ zsscattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, zsscprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
zsscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
/*
* Level 6 interrupt processing for the Progressive Peripherals Inc
* Zeus SCSI. Because the level 6 interrupt is above splbio, the

20
sys/arch/arm32/podulebus/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.9 1996/08/27 21:55:28 cgd Exp $ */
/* $NetBSD: asc.c,v 1.10 1996/08/28 18:59:51 cgd Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -58,7 +58,6 @@
#include <arm32/podulebus/ascreg.h>
#include <arm32/podulebus/ascvar.h>
int ascprint __P((void *auxp, const char *));
void ascattach __P((struct device *, struct device *, void *));
int ascmatch __P((struct device *, void *, void *));
@ -172,6 +171,7 @@ ascattach(pdp, dp, auxp)
sbic->sc_sbicp = (sbic_regmap_p) (sc->sc_podule->mod_base + ASC_SBIC);
sbic->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 143;
sbic->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sbic->sc_link.adapter_softc = sbic;
sbic->sc_link.adapter_target = 7;
sbic->sc_link.adapter = &asc_scsiswitch;
@ -208,23 +208,9 @@ ascattach(pdp, dp, auxp)
/*
* attach all scsi units on us
*/
config_found(dp, &sbic->sc_link, ascprint);
config_found(dp, &sbic->sc_link, scsiprint);
}
/*
* print diag if pnp is NULL else just extra
*/
int
ascprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
}
void
asc_enintr(sbicsc)
struct sbic_softc *sbicsc;

15
sys/arch/arm32/podulebus/oak.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oak.c,v 1.5 1996/08/27 21:55:30 cgd Exp $ */
/* $NetBSD: oak.c,v 1.6 1996/08/28 18:59:52 cgd Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson 1996.
@ -91,7 +91,6 @@ struct oak_softc {
int oakprobe __P(( struct device *, void *, void * ));
void oakattach __P(( struct device *, struct device *, void * ));
int oakprint __P(( void *, const char * ));
void oakminphys __P(( struct buf * ));
#ifdef USE_OWN_PIO_ROUTINES
@ -149,6 +148,7 @@ oakattach(parent, self, aux)
printf(" 16-bit");
ncr_sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = 7;
ncr_sc->sc_link.adapter = &oak_adapter;
@ -192,19 +192,10 @@ oakattach(parent, self, aux)
printf(" UNDER DEVELOPMENT\n");
config_found(self, &(ncr_sc->sc_link), oakprint);
config_found(self, &(ncr_sc->sc_link), scsiprint);
}
int
oakprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
void
oakminphys(bp)
struct buf *bp;

18
sys/arch/arm32/podulebus/ptsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptsc.c,v 1.7 1996/08/27 21:55:33 cgd Exp $ */
/* $NetBSD: ptsc.c,v 1.8 1996/08/28 18:59:54 cgd Exp $ */
/*
* Copyright (c) 1995 Scott Stevens
@ -59,7 +59,6 @@
#include <arm32/podulebus/ptscreg.h>
#include <arm32/podulebus/ptscvar.h>
int ptscprint __P((void *auxp, const char *));
void ptscattach __P((struct device *, struct device *, void *));
int ptscmatch __P((struct device *, void *, void *));
int ptsc_scsicmd __P((struct scsi_xfer *));
@ -175,6 +174,7 @@ ptscattach(pdp, dp, auxp)
sfasinitialize((struct sfas_softc *)sc);
sc->sc_softc.sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_softc.sc_link.adapter_softc = sc;
sc->sc_softc.sc_link.adapter_target = sc->sc_softc.sc_host_id;
sc->sc_softc.sc_link.adapter = &ptsc_scsiswitch;
@ -202,19 +202,7 @@ ptscattach(pdp, dp, auxp)
printf("\n");
/* attach all scsi units on us */
config_found(dp, &sc->sc_softc.sc_link, ptscprint);
}
/* print diag if pnp is NULL else just extra */
int
ptscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
if (pnp == NULL)
return(UNCONF);
return(QUIET);
config_found(dp, &sc->sc_softc.sc_link, scsiprint);
}
int

18
sys/arch/atari/dev/ncr5380.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr5380.c,v 1.22 1996/08/27 21:55:48 cgd Exp $ */
/* $NetBSD: ncr5380.c,v 1.23 1996/08/28 18:59:58 cgd Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@ -199,7 +199,6 @@ extern __inline__ void finish_req(SC_REQ *reqp)
/*
* Auto config stuff....
*/
int ncr_cprint __P((void *auxp, const char *));
void ncr_attach __P((struct device *, struct device *, void *));
int ncr_match __P((struct device *, void *, void *));
@ -236,6 +235,7 @@ void *auxp;
sc = (struct ncr_softc *)dp;
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &ncr5380_switch;
@ -276,21 +276,9 @@ void *auxp;
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, ncr_cprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if name is NULL else just extra
*/
int
ncr_cprint(auxp, name)
void *auxp;
const char *name;
{
if (name == NULL)
return (UNCONF);
return (QUIET);
}
/*
* End of auto config stuff....
*/

18
sys/arch/mac68k/dev/ncr5380.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr5380.c,v 1.32 1996/08/27 21:56:04 cgd Exp $ */
/* $NetBSD: ncr5380.c,v 1.33 1996/08/28 19:00:04 cgd Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@ -201,7 +201,6 @@ extern __inline__ void finish_req(SC_REQ *reqp)
/*
* Auto config stuff....
*/
int ncr_cprint __P((void *auxp, const char *));
void ncr_attach __P((struct device *, struct device *, void *));
int ncr_match __P((struct device *, void *, void *));
@ -238,6 +237,7 @@ void *auxp;
sc = (struct ncr_softc *)dp;
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &ncr5380_switch;
@ -278,21 +278,9 @@ void *auxp;
/*
* attach all scsi units on us
*/
config_found(dp, &sc->sc_link, ncr_cprint);
config_found(dp, &sc->sc_link, scsiprint);
}
/*
* print diag if name is NULL else just extra
*/
int
ncr_cprint(auxp, name)
void *auxp;
const char *name;
{
if (name == NULL)
return (UNCONF);
return (QUIET);
}
/*
* End of auto config stuff....
*/

16
sys/arch/mac68k/dev/sbc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbc.c,v 1.10 1996/08/27 21:56:08 cgd Exp $ */
/* $NetBSD: sbc.c,v 1.11 1996/08/28 19:00:12 cgd Exp $ */
/*
* Copyright (c) 1996 Scott Reynolds
@ -162,7 +162,6 @@ int sbc_options = SBC_PDMA;
static int sbc_match __P((struct device *, void *, void *));
static void sbc_attach __P((struct device *, struct device *, void *));
static int sbc_print __P((void *, const char *));
static void sbc_minphys __P((struct buf *bp));
static int sbc_wait_busy __P((struct ncr5380_softc *));
@ -261,6 +260,7 @@ sbc_attach(parent, self, args)
/*
* Fill in the prototype scsi_link.
*/
ncr_sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = 7;
ncr_sc->sc_link.adapter = &sbc_ops;
@ -346,17 +346,7 @@ sbc_attach(parent, self, args)
*/
ncr5380_init(ncr_sc);
ncr5380_reset_scsibus(ncr_sc);
config_found(self, &(ncr_sc->sc_link), sbc_print);
}
static int
sbc_print(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
config_found(self, &(ncr_sc->sc_link), scsiprint);
}
static void

15
sys/arch/mac68k/dev/scsi96.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi96.c,v 1.18 1996/08/27 21:56:11 cgd Exp $ */
/* $NetBSD: scsi96.c,v 1.19 1996/08/28 19:00:15 cgd Exp $ */
/*
* Copyright (C) 1994 Allen K. Briggs
@ -110,16 +110,6 @@ struct cfdriver ncr96scsi_cd = {
NULL, "ncr96scsi", DV_DULL, NULL, 0
};
static int ncr96_print __P((void *, const char *));
static int
ncr96_print(aux, name)
void *aux;
const char *name;
{
/* printf("%s: (sc_link = 0x%x)", name, (int) aux); return UNCONF; */
return UNCONF;
}
static int
ncr96probe(parent, match, aux)
struct device *parent;
@ -150,6 +140,7 @@ ncr96attach(parent, dev, aux)
ncr53c96 = (struct ncr53c96_softc *) dev;
ncr53c96->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr53c96->sc_link.scsibus = unit;
ncr53c96->sc_link.adapter_target = 7;
ncr53c96->sc_link.adapter = &ncr53c96_switch;
@ -161,7 +152,7 @@ ncr96attach(parent, dev, aux)
printf("\n");
config_found(dev, &(ncr53c96->sc_link), ncr96_print);
config_found(dev, &(ncr53c96->sc_link), scsiprint);
/*
* Enable IRQ and DRQ interrupts.

23
sys/arch/mvme68k/dev/wdsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdsc.c,v 1.4 1996/08/27 21:56:21 cgd Exp $ */
/* $NetBSD: wdsc.c,v 1.5 1996/08/28 19:00:21 cgd Exp $ */
/*
* Copyright (c) 1996 Steve Woodford
@ -53,7 +53,6 @@
#include <mvme68k/dev/sbicvar.h>
#include <mvme68k/dev/wdscreg.h>
int wdscprint __P((void *auxp, const char *));
void wdsc_pcc_attach __P((struct device *, struct device *, void *));
int wdsc_pcc_match __P((struct device *, void *, void *));
@ -135,6 +134,7 @@ wdsc_pcc_attach(pdp, dp, auxp)
sc->sc_dmastop = wdsc_dmastop;
sc->sc_dmacmd = 0;
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &wdsc_scsiswitch;
@ -183,27 +183,10 @@ wdsc_pcc_attach(pdp, dp, auxp)
tmp = bootpart;
if (PCC_PADDR(pa->pa_offset) != bootaddr)
bootpart = -1; /* invalid flag to dk_establish */
(void)config_found(dp, &sc->sc_link, wdscprint);
(void)config_found(dp, &sc->sc_link, scsiprint);
bootpart = tmp; /* restore old value */
}
/*
* print diag if pnp is NULL else just extra
*/
int
wdscprint(auxp, pnp)
void *auxp;
const char *pnp;
{
/* Only scsibusses can attach to wdscs...easy. */
if (pnp)
printf("scsibus at %s", pnp);
return (UNCONF);
}
/*
* Enable DMA interrupts
*/

14
sys/arch/pc532/dev/ncr.c
View File

@ -48,7 +48,6 @@ static int ncr_pdma_in __P((struct ncr5380_softc *, int, int, u_char *));
static int ncr_pdma_out __P((struct ncr5380_softc *, int, int, u_char *));
static void ncr_minphys __P((struct buf *bp));
static void ncr_intr __P((void *));
static int ncr_print __P((void *, const char *));
static void ncr_attach __P((struct device *, struct device *, void *));
static int ncr_match __P((struct device *, void *, void *));
@ -127,6 +126,7 @@ ncr_attach(parent, self, aux)
/*
* Fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = 7;
sc->sc_link.adapter = &ncr_switch;
@ -170,17 +170,7 @@ ncr_attach(parent, self, aux)
*/
ncr5380_init(sc);
ncr5380_reset_scsibus(sc);
config_found(self, &(sc->sc_link), ncr_print);
}
static int
ncr_print(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
config_found(self, &(sc->sc_link), scsiprint);
}
static void ncr_intr(p)

5
sys/arch/pc532/dev/oldncr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oldncr.c,v 1.3 1996/03/17 01:39:01 thorpej Exp $ */
/* $NetBSD: oldncr.c,v 1.4 1996/08/28 19:00:27 cgd Exp $ */
/*
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@ -211,6 +211,7 @@ ncrattach(parent, self, aux)
struct ncr5380_softc *ncr5380 = (void *)self;
int r;
ncr5380->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr5380->sc_link.adapter_softc = ncr5380;
/* ncr5380->sc_link.scsibus = 0; */
ncr5380->sc_link.adapter_target = 7;
@ -220,7 +221,7 @@ ncrattach(parent, self, aux)
printf("\n");
config_found(self, &(ncr5380->sc_link), NULL);
config_found(self, &(ncr5380->sc_link), scsiprint);
}
#define MIN_PHYS 65536 /*BARF!!!!*/

14
sys/arch/pica/dev/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.4 1996/08/27 21:56:35 cgd Exp $ */
/* $NetBSD: asc.c,v 1.5 1996/08/28 19:00:30 cgd Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -439,7 +439,6 @@ typedef struct asc_softc *asc_softc_t;
*/
int ascmatch __P((struct device *, void *, void *));
void ascattach __P((struct device *, struct device *, void *));
int ascprint(void *, const char *);
int asc_doprobe __P((void *, int, int, struct device *));
@ -591,6 +590,7 @@ ascattach(parent, self, aux)
/*
* Fill in the prototype scsi link.
*/
asc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
asc->sc_link.adapter_softc = asc;
asc->sc_link.adapter_target = asc->sc_id;
asc->sc_link.adapter = &asc_switch;
@ -600,15 +600,7 @@ ascattach(parent, self, aux)
/*
* Now try to attach all the sub devices.
*/
config_found(self, &asc->sc_link, ascprint);
}
int
ascprint(aux, name)
void *aux;
const char *name;
{
return -1;
config_found(self, &asc->sc_link, scsiprint);
}
/*

16
sys/arch/sparc/dev/esp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp.c,v 1.52 1996/08/27 21:57:05 cgd Exp $ */
/* $NetBSD: esp.c,v 1.53 1996/08/28 19:00:35 cgd Exp $ */
/*
* Copyright (c) 1994 Peter Galbavy
@ -68,7 +68,6 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/
/*static*/ void espattach __P((struct device *, struct device *, void *));
/*static*/ int espmatch __P((struct device *, void *, void *));
/*static*/ int espprint __P((void *, const char *));
/*static*/ u_int esp_adapter_info __P((struct esp_softc *));
/*static*/ void espreadregs __P((struct esp_softc *));
/*static*/ void espselect __P((struct esp_softc *,
@ -111,16 +110,6 @@ struct scsi_device esp_dev = {
NULL, /* Use default 'done' routine */
};
int
espprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
int
espmatch(parent, vcf, aux)
struct device *parent;
@ -327,6 +316,7 @@ espattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_id;
sc->sc_link.adapter = &esp_switch;
@ -355,7 +345,7 @@ espattach(parent, self, aux)
/*
* Now try to attach all the sub-devices
*/
config_found(self, &sc->sc_link, espprint);
config_found(self, &sc->sc_link, scsiprint);
bootpath_store(1, NULL);
}

16
sys/arch/sparc/dev/si.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: si.c,v 1.25 1996/08/27 21:57:21 cgd Exp $ */
/* $NetBSD: si.c,v 1.26 1996/08/28 19:00:38 cgd Exp $ */
/*
* Copyright (c) 1995 Jason R. Thorpe
@ -201,7 +201,6 @@ static void si_attach __P((struct device *, struct device *, void *));
static int si_intr __P((void *));
static void si_reset_adapter __P((struct ncr5380_softc *));
static void si_minphys __P((struct buf *));
static int si_print __P((void *, const char *));
void si_dma_alloc __P((struct ncr5380_softc *));
void si_dma_free __P((struct ncr5380_softc *));
@ -258,16 +257,6 @@ struct cfdriver sw_cd = {
NULL, "sw", DV_DULL
};
static int
si_print(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
static int
si_match(parent, vcf, args)
struct device *parent;
@ -356,6 +345,7 @@ si_attach(parent, self, args)
/*
* Fill in the prototype scsi_link.
*/
ncr_sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = 7;
ncr_sc->sc_link.adapter = &si_ops;
@ -494,7 +484,7 @@ si_attach(parent, self, args)
bootpath_store(1, bp + 1);
/* Configure sub-devices */
config_found(self, &(ncr_sc->sc_link), si_print);
config_found(self, &(ncr_sc->sc_link), scsiprint);
bootpath_store(1, NULL);
}

16
sys/arch/sun3/dev/si.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: si.c,v 1.26 1996/08/27 21:57:41 cgd Exp $ */
/* $NetBSD: si.c,v 1.27 1996/08/28 19:00:44 cgd Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@ -108,7 +108,6 @@ static int si_link_flags = 0 /* | SDEV_DB2 */ ;
int si_dma_intr_timo = 500; /* ticks (sec. X 100) */
static void si_minphys __P((struct buf *));
static int si_print __P((void *, const char *));
static struct scsi_adapter si_ops = {
ncr5380_scsi_cmd, /* scsi_cmd() */
@ -147,6 +146,7 @@ si_attach(sc)
/*
* Fill in the prototype scsi_link.
*/
ncr_sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = 7;
ncr_sc->sc_link.adapter = &si_ops;
@ -187,17 +187,7 @@ si_attach(sc)
si_reset_adapter(ncr_sc);
ncr5380_init(ncr_sc);
ncr5380_reset_scsibus(ncr_sc);
config_found(&(ncr_sc->sc_dev), &(ncr_sc->sc_link), si_print);
}
static int
si_print(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
config_found(&(ncr_sc->sc_dev), &(ncr_sc->sc_link), scsiprint);
}
static void

15
sys/arch/vax/vsa/ncr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.2 1996/08/27 21:58:48 cgd Exp $ */
/* $NetBSD: ncr.c,v 1.3 1996/08/28 19:00:47 cgd Exp $ */
/* #define DEBUG /* */
/* #define TRACE /* */
@ -281,16 +281,6 @@ struct cfattach ncr_ca = {
sizeof(struct si_softc), si_match, si_attach,
};
integrate int
si_print(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
void
dk_establish(p,q)
struct disk *p;
@ -395,6 +385,7 @@ si_attach(parent, self, aux)
/*
* Fill in the prototype scsi_link.
*/
ncr_sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
ncr_sc->sc_link.adapter_softc = sc;
ncr_sc->sc_link.adapter_target = ca->ca_idval;
ncr_sc->sc_link.adapter = &si_ops;
@ -461,7 +452,7 @@ si_attach(parent, self, aux)
si_reset_adapter(ncr_sc);
ncr5380_init(ncr_sc);
ncr5380_reset_scsibus(ncr_sc);
config_found(self, &(ncr_sc->sc_link), si_print);
config_found(self, &(ncr_sc->sc_link), scsiprint);
/*
* Now ready for interrupts.

15
sys/arch/x68k/dev/spc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: spc.c,v 1.4 1996/08/27 21:59:02 cgd Exp $ */
/* $NetBSD: spc.c,v 1.5 1996/08/28 19:00:50 cgd Exp $ */
#define integrate static inline
@ -442,16 +442,6 @@ spc_find(unit)
return addr;
}
int
spcprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
*/
void
@ -469,6 +459,7 @@ spcattach(parent, self, aux)
/*
* Fill in the prototype scsi_link
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_initiator;
sc->sc_link.adapter = &spc_switch;
@ -477,7 +468,7 @@ spcattach(parent, self, aux)
printf("\n");
config_found(self, &sc->sc_link, spcprint);
config_found(self, &sc->sc_link, scsiprint);
}
void

10
sys/dev/eisa/aha1742.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */
/* $NetBSD: aha1742.c,v 1.62 1996/08/28 19:00:54 cgd Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -453,11 +453,6 @@ ahbmatch(parent, match, aux)
return (rv);
}
ahbprint()
{
}
/*
* Attach all the sub-devices we can find
*/
@ -489,6 +484,7 @@ ahbattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->ahb_scsi_dev;
sc->sc_link.adapter = &ahb_switch;
@ -530,7 +526,7 @@ ahbattach(parent, self, aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &sc->sc_link, ahbprint);
config_found(self, &sc->sc_link, scsiprint);
}
/*

16
sys/dev/ic/aic6360.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.48 1996/08/27 21:59:20 cgd Exp $ */
/* $NetBSD: aic6360.c,v 1.49 1996/08/28 19:01:12 cgd Exp $ */
#ifdef DDB
#define integrate
@ -585,7 +585,6 @@ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */
int aicprobe __P((struct device *, void *, void *));
void aicattach __P((struct device *, struct device *, void *));
int aicprint __P((void *, const char *));
void aic_minphys __P((struct buf *));
int aicintr __P((void *));
void aic_init __P((struct aic_softc *));
@ -756,16 +755,6 @@ aic_find(sc)
return 0;
}
int
aicprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach the AIC6360, fill out some high and low level data structures
*/
@ -784,6 +773,7 @@ aicattach(parent, self, aux)
/*
* Fill in the prototype scsi_link
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_initiator;
sc->sc_link.adapter = &aic_switch;
@ -798,7 +788,7 @@ aicattach(parent, self, aux)
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
IPL_BIO, aicintr, sc);
config_found(self, &sc->sc_link, aicprint);
config_found(self, &sc->sc_link, scsiprint);
}

31
sys/dev/ic/aic7xxx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aic7xxx.c,v 1.11 1996/08/27 21:59:12 cgd Exp $ */
/* $NetBSD: aic7xxx.c,v 1.12 1996/08/28 19:00:58 cgd Exp $ */
/*
* Generic driver for the aic7xxx based adaptec SCSI controllers
@ -577,19 +577,6 @@ ahc_scsirate(ahc, scsirate, period, offset, channel, target )
}
}
#if defined(__NetBSD__)
int
ahcprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
#endif
/*
* Attach all the sub-devices we can find
*/
@ -612,6 +599,7 @@ ahc_attach(ahc)
ahc->sc_link.fordriver = 0;
#elif defined(__NetBSD__)
ahc->sc_link.adapter_target = ahc->our_id;
ahc->sc_link.channel = 0;
#endif
ahc->sc_link.adapter_softc = ahc;
ahc->sc_link.adapter = &ahc_switch;
@ -628,6 +616,7 @@ ahc_attach(ahc)
ahc->sc_link_b.fordriver = (void *)SELBUSB;
#elif defined(__NetBSD__)
ahc->sc_link_b.adapter_target = ahc->our_id_b;
ahc->sc_link_b.channel = 1;
#endif
}
@ -683,13 +672,9 @@ ahc_attach(ahc)
/* make IS_SCSIBUS_B() == false, while probing channel A */
ahc->sc_link_b.scsibus = 0xff;
config_found((void *)ahc, &ahc->sc_link, scsiprint);
if (ahc->type & AHC_TWIN)
printf("%s: Probing channel A\n", ahc_name(ahc));
config_found((void *)ahc, &ahc->sc_link, ahcprint);
if (ahc->type & AHC_TWIN) {
printf("%s: Probing channel B\n", ahc_name(ahc));
config_found((void *)ahc, &ahc->sc_link_b, ahcprint);
}
config_found((void *)ahc, &ahc->sc_link_b, scsiprint);
} else {
/*
* if implementation of IS_SCSIBUS_B() is changed to use
@ -698,10 +683,8 @@ ahc_attach(ahc)
*/
/* assert(ahc->type & AHC_TWIN); */
printf("%s: Probing channel B\n", ahc_name(ahc));
config_found((void *)ahc, &ahc->sc_link_b, ahcprint);
printf("%s: Probing channel A\n", ahc_name(ahc));
config_found((void *)ahc, &ahc->sc_link, ahcprint);
config_found((void *)ahc, &ahc->sc_link_b, scsiprint);
config_found((void *)ahc, &ahc->sc_link, scsiprint);
}
#endif
return 1;

17
sys/dev/isa/aha.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aha.c,v 1.13 1996/08/27 21:59:16 cgd Exp $ */
/* $NetBSD: aha.c,v 1.14 1996/08/28 19:01:07 cgd Exp $ */
#undef AHADIAG
#ifdef DDB
@ -165,7 +165,6 @@ struct scsi_device aha_dev = {
int ahaprobe __P((struct device *, void *, void *));
void ahaattach __P((struct device *, struct device *, void *));
int ahaprint __P((void *, const char *));
struct cfattach aha_ca = {
sizeof(struct aha_softc), ahaprobe, ahaattach
@ -337,17 +336,6 @@ ahaprobe(parent, match, aux)
return 1;
}
int
ahaprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach all the sub-devices we can find
*/
@ -374,6 +362,7 @@ ahaattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_scsi_dev;
sc->sc_link.adapter = &aha_switch;
@ -389,7 +378,7 @@ ahaattach(parent, self, aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &sc->sc_link, ahaprint);
config_found(self, &sc->sc_link, scsiprint);
}
integrate void

16
sys/dev/isa/aic6360.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.48 1996/08/27 21:59:20 cgd Exp $ */
/* $NetBSD: aic6360.c,v 1.49 1996/08/28 19:01:12 cgd Exp $ */
#ifdef DDB
#define integrate
@ -585,7 +585,6 @@ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */
int aicprobe __P((struct device *, void *, void *));
void aicattach __P((struct device *, struct device *, void *));
int aicprint __P((void *, const char *));
void aic_minphys __P((struct buf *));
int aicintr __P((void *));
void aic_init __P((struct aic_softc *));
@ -756,16 +755,6 @@ aic_find(sc)
return 0;
}
int
aicprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach the AIC6360, fill out some high and low level data structures
*/
@ -784,6 +773,7 @@ aicattach(parent, self, aux)
/*
* Fill in the prototype scsi_link
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_initiator;
sc->sc_link.adapter = &aic_switch;
@ -798,7 +788,7 @@ aicattach(parent, self, aux)
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
IPL_BIO, aicintr, sc);
config_found(self, &sc->sc_link, aicprint);
config_found(self, &sc->sc_link, scsiprint);
}

17
sys/dev/isa/bt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bt.c,v 1.12 1996/08/27 21:59:26 cgd Exp $ */
/* $NetBSD: bt.c,v 1.13 1996/08/28 19:01:18 cgd Exp $ */
#undef BTDIAG
#ifdef DDB
@ -165,7 +165,6 @@ struct scsi_device bt_dev = {
int btprobe __P((struct device *, void *, void *));
void btattach __P((struct device *, struct device *, void *));
int btprint __P((void *, const char *));
struct cfattach bt_ca = {
sizeof(struct bt_softc), btprobe, btattach
@ -337,17 +336,6 @@ btprobe(parent, match, aux)
return 1;
}
int
btprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach all the sub-devices we can find
*/
@ -374,6 +362,7 @@ btattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_scsi_dev;
sc->sc_link.adapter = &bt_switch;
@ -389,7 +378,7 @@ btattach(parent, self, aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &sc->sc_link, btprint);
config_found(self, &sc->sc_link, scsiprint);
}
integrate void

14
sys/dev/isa/seagate.c
View File

@ -304,7 +304,6 @@ struct scsi_device sea_dev = {
int seaprobe __P((struct device *, void *, void *));
void seaattach __P((struct device *, struct device *, void *));
int seaprint __P((void *, const char *));
struct cfattach sea_ca = {
sizeof(struct sea_softc), seaprobe, seaattach
@ -408,16 +407,6 @@ seaprobe(parent, match, aux)
return 1;
}
int
seaprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach all sub-devices we can find
*/
@ -434,6 +423,7 @@ seaattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sea->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sea->sc_link.adapter_softc = sea;
sea->sc_link.adapter_target = sea->our_id;
sea->sc_link.adapter = &sea_switch;
@ -451,7 +441,7 @@ seaattach(parent, self, aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &sea->sc_link, seaprint);
config_found(self, &sea->sc_link, scsiprint);
}
/*

16
sys/dev/isa/ultra14f.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ultra14f.c,v 1.67 1996/08/27 21:59:34 cgd Exp $ */
/* $NetBSD: ultra14f.c,v 1.68 1996/08/28 19:01:22 cgd Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -329,7 +329,6 @@ struct scsi_device uha_dev = {
int uhaprobe __P((struct device *, void *, void *));
void uhaattach __P((struct device *, struct device *, void *));
int uhaprint __P((void *, const char *));
struct cfattach uha_ca = {
sizeof(struct uha_softc), uhaprobe, uhaattach
@ -574,16 +573,6 @@ uhaprobe(parent, match, aux)
return 1;
}
int
uhaprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach all the sub-devices we can find
*/
@ -604,6 +593,7 @@ uhaattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
uha->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
uha->sc_link.adapter_softc = uha;
uha->sc_link.adapter_target = uha->uha_scsi_dev;
uha->sc_link.adapter = &uha_switch;
@ -621,7 +611,7 @@ uhaattach(parent, self, aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &uha->sc_link, uhaprint);
config_found(self, &uha->sc_link, scsiprint);
}
/*

17
sys/dev/isa/wds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wds.c,v 1.9 1996/08/27 21:59:41 cgd Exp $ */
/* $NetBSD: wds.c,v 1.10 1996/08/28 19:01:25 cgd Exp $ */
#undef WDSDIAG
#ifdef DDB
@ -180,7 +180,6 @@ struct scsi_device wds_dev = {
int wdsprobe __P((struct device *, void *, void *));
void wdsattach __P((struct device *, struct device *, void *));
int wdsprint __P((void *, const char *));
struct cfattach wds_ca = {
sizeof(struct wds_softc), wdsprobe, wdsattach
@ -251,17 +250,6 @@ wdsprobe(parent, match, aux)
return 1;
}
int
wdsprint(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
/*
* Attach all available units.
*/
@ -288,6 +276,7 @@ wdsattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_scsi_dev;
sc->sc_link.adapter = &wds_switch;
@ -306,7 +295,7 @@ wdsattach(parent, self, aux)
/*
* ask the adapter what subunits are present
*/
config_found(self, &sc->sc_link, wdsprint);
config_found(self, &sc->sc_link, scsiprint);
}
integrate void

21
sys/dev/pci/ncr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.40 1996/08/27 21:59:46 cgd Exp $ */
/* $NetBSD: ncr.c,v 1.41 1996/08/28 19:01:29 cgd Exp $ */
/**************************************************************************
**
@ -1332,7 +1332,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0
static char ident[] =
"\n$NetBSD: ncr.c,v 1.40 1996/08/27 21:59:46 cgd Exp $\n";
"\n$NetBSD: ncr.c,v 1.41 1996/08/28 19:01:29 cgd Exp $\n";
#endif
u_long ncr_version = NCR_VERSION * 11
@ -3343,20 +3343,6 @@ static char* ncr_probe (pcici_t tag, pcidi_t type)
#define MIN_SYNC_PD 20
#ifdef __NetBSD__
int ncr_print __P((void *, const char *));
int
ncr_print(aux, name)
void *aux;
const char *name;
{
if (name != NULL)
printf("%s: scsibus ", name);
return UNCONF;
}
void
ncr_attach(parent, self, aux)
struct device *parent, *self;
@ -3626,13 +3612,14 @@ static void ncr_attach (pcici_t config_id, int unit)
np->sc_link.adapter_unit = unit;
np->sc_link.adapter_targ = np->myaddr;
np->sc_link.fordriver = 0;
np->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
#endif /* !__NetBSD__ */
np->sc_link.adapter = &ncr_switch;
np->sc_link.device = &ncr_dev;
np->sc_link.flags = 0;
#ifdef __NetBSD__
config_found(self, &np->sc_link, ncr_print);
config_found(self, &np->sc_link, scsiprint);
#else /* !__NetBSD__ */
#if (__FreeBSD__ >= 2)
scbus = scsi_alloc_bus();

16
sys/dev/tc/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.26 1996/08/27 21:59:56 cgd Exp $ */
/* $NetBSD: asc.c,v 1.27 1996/08/28 19:01:36 cgd Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -461,7 +461,6 @@ extern u_long asc_iomem;
*/
int ascmatch __P((struct device * parent, void *cfdata, void *aux));
void ascattach __P((struct device *parent, struct device *self, void *aux));
int ascprint(void*, const char*);
struct cfattach asc_ca = {
sizeof(struct asc_softc), ascmatch, ascattach
@ -672,6 +671,7 @@ ascattach(parent, self, aux)
/*
* fill in the prototype scsi_link.
*/
asc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
asc->sc_link.adapter_softc = asc;
asc->sc_link.adapter_target = asc->sc_id;
asc->sc_link.adapter = &asc_switch;
@ -681,21 +681,11 @@ ascattach(parent, self, aux)
/*
* Now try to attach all the sub-devices.
*/
config_found(self, &asc->sc_link, ascprint);
config_found(self, &asc->sc_link, scsiprint);
#endif /* USE_NEW_SCSI */
}
/*
* Does anyone actually use this, and what for ?
*/
int
ascprint(aux, name)
void *aux;
const char *name;
{
return -1;
}
/*
* Per Fogelstrom's SCSI Driver breaks down request transfer size.
*/