summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/stand/common/hd.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-11-23 07:15:59 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-11-23 07:15:59 +0000
commit2609c36d428c78eda3c28cef167ca0374334ebe7 (patch)
tree51f8af6dbf8d71286ae33fcbc8fd877e80f351ef /sys/arch/hp300/stand/common/hd.c
parentd770c0144b052d846889a0e2bf14814e788fce8a (diff)
Pick HP-IB describe structures changes from main kernel code here as well.
Diffstat (limited to 'sys/arch/hp300/stand/common/hd.c')
-rw-r--r--sys/arch/hp300/stand/common/hd.c7
1 files changed, 4 insertions, 3 deletions
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) {