diff options
Diffstat (limited to 'sys/arch/hp300/stand/common')
| -rw-r--r-- | sys/arch/hp300/stand/common/ct.c | 7 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/common/hd.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/hp300/stand/common/ct.c b/sys/arch/hp300/stand/common/ct.c index bda4470b65e..181be709ef8 100644 --- a/sys/arch/hp300/stand/common/ct.c +++ b/sys/arch/hp300/stand/common/ct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct.c,v 1.3 2005/04/22 00:42:16 miod Exp $ */ +/* $OpenBSD: ct.c,v 1.4 2005/11/23 07:15:57 miod Exp $ */ /* $NetBSD: ct.c,v 1.9 1996/10/14 07:29:57 thorpej Exp $ */ /* @@ -38,6 +38,7 @@ #include <sys/param.h> #include <hp300/dev/ctreg.h> +#include "hpibvar.h" #include <lib/libsa/stand.h> @@ -104,7 +105,7 @@ int ctident(ctlr, unit) int ctlr, unit; { - struct ct_describe desc; + struct cs80_describe desc; u_char stat, cmd[3]; char name[7]; int id, i; @@ -129,7 +130,7 @@ ctident(ctlr, unit) cmd[1] = C_SVOL(0); cmd[2] = C_DESC; hpibsend(ctlr, unit, C_CMD, cmd, sizeof(cmd)); - hpibrecv(ctlr, unit, C_EXEC, &desc, 37); + hpibrecv(ctlr, unit, C_EXEC, &desc, sizeof(desc)); hpibrecv(ctlr, unit, C_QSTAT, &stat, sizeof(stat)); bzero(name, sizeof(name)); if (!stat) { diff --git a/sys/arch/hp300/stand/common/hd.c b/sys/arch/hp300/stand/common/hd.c index b1c8cc1ee54..4419b9ae611 100644 --- a/sys/arch/hp300/stand/common/hd.c +++ b/sys/arch/hp300/stand/common/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.4 2005/09/06 19:01:01 miod Exp $ */ +/* $OpenBSD: hd.c,v 1.5 2005/11/23 07:15:57 miod Exp $ */ /* $NetBSD: rd.c,v 1.11 1996/12/21 21:34:40 thorpej Exp $ */ /* @@ -50,6 +50,7 @@ #include "samachdep.h" #include <hp300/dev/hdreg.h> +#include "hpibvar.h" struct hd_iocmd hd_ioc; struct hd_rscmd hd_rsc; @@ -136,7 +137,7 @@ int hdident(ctlr, unit) register int ctlr, unit; { - struct hd_describe desc; + struct cs80_describe desc; u_char stat, cmd[3]; char name[7]; register int id, i; @@ -155,7 +156,7 @@ hdident(ctlr, unit) cmd[1] = C_SVOL(0); cmd[2] = C_DESC; hpibsend(ctlr, unit, C_CMD, cmd, sizeof(cmd)); - hpibrecv(ctlr, unit, C_EXEC, &desc, 37); + hpibrecv(ctlr, unit, C_EXEC, &desc, sizeof(desc)); hpibrecv(ctlr, unit, C_QSTAT, &stat, sizeof(stat)); bzero(name, sizeof(name)); if (!stat) { |