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

scsiprint() is needed even without scsibus'es, so move it to scsi_base.c .

This commit is contained in:
soren 2000-03-17 11:45:49 +00:00
parent bd1cc85c63
commit 11bd453515
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/scsipi/scsi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_base.c,v 1.71 2000/01/17 17:59:48 bouyer Exp $ */
/* $NetBSD: scsi_base.c,v 1.72 2000/03/17 11:45:50 soren Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -172,3 +172,21 @@ scsi_kill_pending(sc_link)
scsipi_done(xs);
}
}
int
scsiprint(aux, pnp)
void *aux;
const char *pnp;
{
struct scsipi_link *l = aux;
/* only "scsibus"es can attach to "scsi"s; easy. */
if (pnp)
printf("scsibus at %s", pnp);
/* don't print channel if the controller says there can be only one. */
if (l->scsipi_scsi.channel != SCSI_CHANNEL_ONLY_ONE)
printf(" channel %d", l->scsipi_scsi.channel);
return (UNCONF);
}

20
sys/dev/scsipi/scsiconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsiconf.c,v 1.135 2000/03/13 09:56:26 martin Exp $ */
/* $NetBSD: scsiconf.c,v 1.136 2000/03/17 11:45:49 soren Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -118,24 +118,6 @@ void scsibus_config_interrupts __P((struct device *));
cdev_decl(scsibus);
int
scsiprint(aux, pnp)
void *aux;
const char *pnp;
{
struct scsipi_link *l = aux;
/* only "scsibus"es can attach to "scsi"s; easy. */
if (pnp)
printf("scsibus at %s", pnp);
/* don't print channel if the controller says there can be only one. */
if (l->scsipi_scsi.channel != SCSI_CHANNEL_ONLY_ONE)
printf(" channel %d", l->scsipi_scsi.channel);
return (UNCONF);
}
int
scsibusmatch(parent, cf, aux)
struct device *parent;