summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-05-02 13:31:45 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-05-02 13:31:45 +0000
commit3f70f3d7638d9dc8369ea3c91215d6adeee0b2c1 (patch)
tree71dd860ef425b8b9e5e998bdc5be218c49211fb9 /sys/dev/isa
parent49e4cf6f1d19848afb270bbb5a50778630f578aa (diff)
bizzare change in netbsd land
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/aha.c8
-rw-r--r--sys/dev/isa/bt.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 9c005b75993..633ea29ecd4 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: aha.c,v 1.15 1996/04/22 20:03:02 hannken Exp $ */
-/* $NetBSD: aha.c,v 1.7 1996/04/11 22:27:59 cgd Exp $ */
+/* $OpenBSD: aha.c,v 1.16 1996/05/02 13:31:42 deraadt Exp $ */
+/* $NetBSD: aha.c,v 1.8 1996/04/25 18:54:45 is Exp $ */
#define AHADIAG
#define integrate
@@ -211,10 +211,10 @@ aha_cmd(iobase, sc, icnt, ibuf, ocnt, obuf)
u_char sts;
u_char opcode = ibuf[0];
- if (sc == NULL)
+ if (sc != NULL)
name = sc->sc_dev.dv_xname;
else
- name = "(probe)";
+ name = "(aha probe)";
/*
* Calculate a reasonable timeout for the command.
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index 1875d60eb93..20672f11cf0 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt.c,v 1.7 1996/04/11 22:28:25 cgd Exp $ */
+/* $NetBSD: bt.c,v 1.8 1996/04/25 18:54:47 is Exp $ */
#define BTDIAG
#define integrate
@@ -200,10 +200,10 @@ bt_cmd(iobase, sc, icnt, ibuf, ocnt, obuf)
u_char sts;
u_char opcode = ibuf[0];
- if (sc == NULL)
+ if (sc != NULL)
name = sc->sc_dev.dv_xname;
else
- name = "(probe)";
+ name = "(bt probe)";
/*
* Calculate a reasonable timeout for the command.