summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2005-08-05 00:31:05 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2005-08-05 00:31:05 +0000
commita0160c542295bc4ab2cc355c861c7d75cf81f237 (patch)
tree88322d1fde1d2d5a010c33b6aa80967fea5a3951 /sys/scsi
parent263ff66fff720fe9d5694d6b45d7f885950b5fc4 (diff)
READ BUFFER is a generic opcode, so dont define our own
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/safte.c6
-rw-r--r--sys/scsi/safte.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c
index 78bc87a1e6c..fe8409e3f0d 100644
--- a/sys/scsi/safte.c
+++ b/sys/scsi/safte.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: safte.c,v 1.2 2005/08/05 00:17:02 deraadt Exp $ */
+/* $OpenBSD: safte.c,v 1.3 2005/08/05 00:31:04 dlg Exp $ */
/*
* Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -270,7 +270,7 @@ safte_read_config(struct safte_softc *sc)
int flags;
memset(&cmd, 0, sizeof(cmd));
- cmd.opcode = SAFTE_RD_OPCODE;
+ cmd.opcode = READ_BUFFER;
cmd.flags |= SAFTE_RD_MODE;
cmd.bufferid = SAFTE_RD_CONFIG;
cmd.length = htobe16(sizeof(config));
@@ -311,7 +311,7 @@ safte_read_encstat(struct safte_softc *sc, int refresh)
struct sensor *s = sc->sc_sensors;
memset(&cmd, 0, sizeof(cmd));
- cmd.opcode = SAFTE_RD_OPCODE;
+ cmd.opcode = READ_BUFFER;
cmd.flags |= SAFTE_RD_MODE;
cmd.bufferid = SAFTE_RD_ENCSTAT;
cmd.length = htobe16(sc->sc_encstatlen);
diff --git a/sys/scsi/safte.h b/sys/scsi/safte.h
index f96b21b4b99..f79ad9b9d22 100644
--- a/sys/scsi/safte.h
+++ b/sys/scsi/safte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: safte.h,v 1.1 2005/08/05 00:08:58 dlg Exp $ */
+/* $OpenBSD: safte.h,v 1.2 2005/08/05 00:31:04 dlg Exp $ */
/*
* Copyright (c) 2005 Daivd Gwynne <dlg@openbsd.org>
@@ -34,8 +34,7 @@ struct safte_inq {
#define SAFTE_INQ_LEN 54
struct safte_readbuf_cmd {
- u_int8_t opcode;
-#define SAFTE_RD_OPCODE 0x3c /* READ BUFFER */
+ u_int8_t opcode; /* READ_BUFFER */
u_int8_t flags;
#define SAFTE_RD_LUNMASK 0xe0 /* the lun should always be 0 */
#define SAFTE_RD_MODEMASK 0x07