diff options
| -rw-r--r-- | sys/arch/hp300/dev/mb89352.c | 6 | ||||
| -rw-r--r-- | sys/arch/luna88k/dev/mb89352.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/mesh.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/aic6360.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ncr5380sbc.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ncr53c9x.c | 6 | ||||
| -rw-r--r-- | sys/scsi/scsi_message.h | 6 |
7 files changed, 11 insertions, 31 deletions
diff --git a/sys/arch/hp300/dev/mb89352.c b/sys/arch/hp300/dev/mb89352.c index 6b8d0816ee3..58f54a6660c 100644 --- a/sys/arch/hp300/dev/mb89352.c +++ b/sys/arch/hp300/dev/mb89352.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352.c,v 1.19 2009/09/18 19:16:59 miod Exp $ */ +/* $OpenBSD: mb89352.c,v 1.20 2009/11/01 23:06:03 fgsch Exp $ */ /* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */ /* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */ @@ -798,10 +798,6 @@ spc_dequeue(struct spc_softc *sc, struct spc_acb *acb) * INTERRUPT/PROTOCOL ENGINE */ -#define IS1BYTEMSG(m) (((m) != 0x01 && (m) < 0x20) || (m) >= 0x80) -#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) -#define ISEXTMSG(m) ((m) == 0x01) - /* * Precondition: * The SCSI bus is already in the MSGI phase and there is a message byte diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c index 623f8b00f64..a0c12c1a3a9 100644 --- a/sys/arch/luna88k/dev/mb89352.c +++ b/sys/arch/luna88k/dev/mb89352.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mb89352.c,v 1.9 2009/09/18 19:17:00 miod Exp $ */ +/* $OpenBSD: mb89352.c,v 1.10 2009/11/01 23:06:03 fgsch Exp $ */ /* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */ /* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */ @@ -851,10 +851,6 @@ spc_dequeue(sc, acb) * INTERRUPT/PROTOCOL ENGINE */ -#define IS1BYTEMSG(m) (((m) != 0x01 && (m) < 0x20) || (m) >= 0x80) -#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) -#define ISEXTMSG(m) ((m) == 0x01) - /* * Precondition: * The SCSI bus is already in the MSGI phase and there is a message byte diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c index 7e6a1a76b5d..a80ef0cf6a9 100644 --- a/sys/arch/macppc/dev/mesh.c +++ b/sys/arch/macppc/dev/mesh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mesh.c,v 1.22 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: mesh.c,v 1.23 2009/11/01 23:06:03 fgsch Exp $ */ /* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */ /*- @@ -744,10 +744,6 @@ mesh_status(struct mesh_softc *sc, struct mesh_scb *scb) sc->sc_nextstate = MESH_MSGIN; } -#define IS1BYTEMSG(m) (((m) != 1 && (m) < 0x20) || (m) & 0x80) -#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) -#define ISEXTMSG(m) ((m) == 1) - void mesh_msgin(struct mesh_softc *sc, struct mesh_scb *scb) { diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c index 03103b11e23..bf1dc008b4d 100644 --- a/sys/dev/ic/aic6360.c +++ b/sys/dev/ic/aic6360.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6360.c,v 1.19 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: aic6360.c,v 1.20 2009/11/01 23:06:03 fgsch Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ #ifdef DDB @@ -890,10 +890,6 @@ aic_dequeue(struct aic_softc *sc, struct aic_acb *acb) * INTERRUPT/PROTOCOL ENGINE */ -#define IS1BYTEMSG(m) (((m) != 0x01 && (m) < 0x20) || (m) >= 0x80) -#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) -#define ISEXTMSG(m) ((m) == 0x01) - /* * Precondition: * The SCSI bus is already in the MSGI phase and there is a message byte diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c index 1483af28065..57750b4e413 100644 --- a/sys/dev/ic/ncr5380sbc.c +++ b/sys/dev/ic/ncr5380sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380sbc.c,v 1.21 2008/11/24 00:31:35 krw Exp $ */ +/* $OpenBSD: ncr5380sbc.c,v 1.22 2009/11/01 23:06:03 fgsch Exp $ */ /* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */ /* @@ -1530,10 +1530,6 @@ success: * NOOP if nothing else fits the bill ... */ -#define IS1BYTEMSG(m) (((m) != 0x01 && (m) < 0x20) || (m) >= 0x80) -#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) -#define ISEXTMSG(m) ((m) == 0x01) - /* * Precondition: * The SCSI bus is already in the MSGI phase and there is a message byte diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index b546220c1f1..c96390e3029 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.40 2008/11/24 00:31:35 krw Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.41 2009/11/01 23:06:03 fgsch Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -1413,10 +1413,6 @@ abort: return (1); } -#define IS1BYTEMSG(m) (((m) != 1 && (m) < 0x20) || (m) & 0x80) -#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) -#define ISEXTMSG(m) ((m) == 1) - static inline int __verify_msg_format(u_char *p, int len) { diff --git a/sys/scsi/scsi_message.h b/sys/scsi/scsi_message.h index 0bb8a2c958a..6c49879eb21 100644 --- a/sys/scsi/scsi_message.h +++ b/sys/scsi/scsi_message.h @@ -1,4 +1,8 @@ -/* $OpenBSD: scsi_message.h,v 1.8 2006/05/11 00:45:59 krw Exp $ */ +/* $OpenBSD: scsi_message.h,v 1.9 2009/11/01 23:06:03 fgsch Exp $ */ + +#define IS1BYTEMSG(m) (((m) != 0x01 && (m) < 0x20) || (m) >= 0x80) +#define IS2BYTEMSG(m) (((m) & 0xf0) == 0x20) +#define ISEXTMSG(m) ((m) == 0x01) /* Messages (1 byte) */ /* I/T (M)andatory or (O)ptional */ #define MSG_CMDCOMPLETE 0x00 /* M/M */ |