summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpk <pk@NetBSD.org>1995-09-14 20:43:09 +0000
committerpk <pk@NetBSD.org>1995-09-14 20:43:09 +0000
commit0fbf2ca04a72ab58e6aebc82d8d9d70f04ceeb2b (patch)
treee46daf734f14e64ab0ac5df26a92959eb7398868 /sys/dev
parentdb43cabe320d4f91e420794f1ae44d28d4182db0 (diff)
Make *print() a message if no scsibus was attached. Also, return something
valid.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/aic6360.c11
-rw-r--r--sys/dev/isa/aha1542.c16
-rw-r--r--sys/dev/isa/aic6360.c11
-rw-r--r--sys/dev/isa/bt742a.c16
-rw-r--r--sys/dev/isa/seagate.c14
-rw-r--r--sys/dev/isa/ultra14f.c16
6 files changed, 59 insertions, 25 deletions
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 4d3ccdf1f41..0859dd3f182 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360.c,v 1.33 1995/08/12 20:31:24 mycroft Exp $ */
+/* $NetBSD: aic6360.c,v 1.34 1995/09/14 20:43:12 pk Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@@ -574,6 +574,7 @@ 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 *, char *));
void aic_minphys __P((struct buf *));
int aicintr __P((void *));
void aic_init __P((struct aic_softc *));
@@ -729,9 +730,13 @@ aic_find(sc)
}
int
-aicprint()
+aicprint(aux, name)
+ void *aux;
+ char *name;
{
-
+ if (name != NULL)
+ printf("%s: scsibus ", name);
+ return UNCONF;
}
/*
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index a87d4570115..0d229e58e7d 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha1542.c,v 1.49 1995/08/12 23:00:43 mycroft Exp $ */
+/* $NetBSD: aha1542.c,v 1.50 1995/09/14 20:43:09 pk Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@@ -357,8 +357,9 @@ struct scsi_device aha_dev = {
NULL, /* Use default 'done' routine */
};
-int ahaprobe __P((struct device *, void *, void *));
-void ahaattach __P((struct device *, struct device *, void *));
+int ahaprobe __P((struct device *, void *, void *));
+void ahaattach __P((struct device *, struct device *, void *));
+int ahaprint __P((void *, char *));
struct cfdriver ahacd = {
NULL, "aha", ahaprobe, ahaattach, DV_DULL, sizeof(struct aha_softc)
@@ -545,9 +546,14 @@ ahaprobe(parent, match, aux)
return 1;
}
-ahaprint()
+int
+ahaprint(aux, name)
+ void *aux;
+ char *name;
{
-
+ if (name != NULL)
+ printf("%s: scsibus ", name);
+ return UNCONF;
}
/*
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index 4d3ccdf1f41..0859dd3f182 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360.c,v 1.33 1995/08/12 20:31:24 mycroft Exp $ */
+/* $NetBSD: aic6360.c,v 1.34 1995/09/14 20:43:12 pk Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@@ -574,6 +574,7 @@ 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 *, char *));
void aic_minphys __P((struct buf *));
int aicintr __P((void *));
void aic_init __P((struct aic_softc *));
@@ -729,9 +730,13 @@ aic_find(sc)
}
int
-aicprint()
+aicprint(aux, name)
+ void *aux;
+ char *name;
{
-
+ if (name != NULL)
+ printf("%s: scsibus ", name);
+ return UNCONF;
}
/*
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index 47ee2fb1a39..03eda4cdcbc 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt742a.c,v 1.46 1995/08/12 23:00:47 mycroft Exp $ */
+/* $NetBSD: bt742a.c,v 1.47 1995/09/14 20:43:14 pk Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@@ -387,8 +387,9 @@ struct scsi_device bt_dev = {
NULL, /* Use default 'done' routine */
};
-int btprobe __P((struct device *, void *, void *));
-void btattach __P((struct device *, struct device *, void *));
+int btprobe __P((struct device *, void *, void *));
+void btattach __P((struct device *, struct device *, void *));
+int btprint __P((void *, char *));
struct cfdriver btcd = {
NULL, "bt", btprobe, btattach, DV_DULL, sizeof(struct bt_softc)
@@ -572,9 +573,14 @@ btprobe(parent, match, aux)
return 1;
}
-btprint()
+int
+btprint(aux, name)
+ void *aux;
+ char *name;
{
-
+ if (name != NULL)
+ printf("%s: scsibus ", name);
+ return UNCONF;
}
/*
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index d7b5110e053..4d07a096be3 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -299,8 +299,9 @@ struct scsi_device sea_dev = {
NULL, /* Use default 'done' routine */
};
-int seaprobe __P((struct device *, void *, void *));
-void seaattach __P((struct device *, struct device *, void *));
+int seaprobe __P((struct device *, void *, void *));
+void seaattach __P((struct device *, struct device *, void *));
+int seaprint __P((void *, char *));
struct cfdriver seacd = {
NULL, "sea", seaprobe, seaattach, DV_DULL, sizeof(struct sea_softc)
@@ -400,9 +401,14 @@ seaprobe(parent, match, aux)
return 1;
}
-seaprint()
+int
+seaprint(aux, name)
+ void *aux;
+ char *name;
{
-
+ if (name != NULL)
+ printf("%s: scsibus ", name);
+ return UNCONF;
}
/*
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index f8a41734888..b55c10e8a01 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ultra14f.c,v 1.53 1995/08/12 23:00:51 mycroft Exp $ */
+/* $NetBSD: ultra14f.c,v 1.54 1995/09/14 20:43:20 pk Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@@ -324,8 +324,9 @@ struct scsi_device uha_dev = {
NULL, /* Use default 'done' routine */
};
-int uhaprobe __P((struct device *, void *, void *));
-void uhaattach __P((struct device *, struct device *, void *));
+int uhaprobe __P((struct device *, void *, void *));
+void uhaattach __P((struct device *, struct device *, void *));
+int uhaprint __P((void *, char *));
struct cfdriver uhacd = {
NULL, "uha", uhaprobe, uhaattach, DV_DULL, sizeof(struct uha_softc)
@@ -568,9 +569,14 @@ uhaprobe(parent, match, aux)
return 1;
}
-uhaprint()
+int
+uhaprint(aux, name)
+ void *aux;
+ char *name;
{
-
+ if (name != NULL)
+ printf("%s: scsibus ", name);
+ return UNCONF;
}
/*