From: deraadt Date: Thu, 2 May 1996 13:31:42 +0000 (+0000) Subject: bizzare change in netbsd land X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a669311598333876673975e30f40cf895805c3d1;p=openbsd bizzare change in netbsd land --- 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.