diff options
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/mpi.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/mpireg.h | 30 |
2 files changed, 19 insertions, 19 deletions
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c index bc07dbe52c5..b2ce7dc38bc 100644 --- a/sys/dev/ic/mpi.c +++ b/sys/dev/ic/mpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi.c,v 1.48 2006/06/19 21:06:22 miod Exp $ */ +/* $OpenBSD: mpi.c,v 1.49 2006/06/29 08:35:08 dlg Exp $ */ /* * Copyright (c) 2005, 2006 David Gwynne <dlg@openbsd.org> @@ -976,13 +976,13 @@ mpi_scsi_cmd(struct scsi_xfer *xs) switch (xs->flags & (SCSI_DATA_IN | SCSI_DATA_OUT)) { case SCSI_DATA_IN: - io->control = htole32(MPI_SCSIIO_DATA_DIR_READ); + io->direction = MPI_SCSIIO_DIR_READ; break; case SCSI_DATA_OUT: - io->control = htole32(MPI_SCSIIO_DATA_DIR_WRITE); + io->direction = MPI_SCSIIO_DIR_WRITE; break; default: - io->control = htole32(MPI_SCSIIO_DATA_DIR_NONE); + io->direction = MPI_SCSIIO_DIR_NONE; break; } diff --git a/sys/dev/ic/mpireg.h b/sys/dev/ic/mpireg.h index aa321081cc7..265cf6cd59b 100644 --- a/sys/dev/ic/mpireg.h +++ b/sys/dev/ic/mpireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpireg.h,v 1.18 2006/06/29 08:23:26 dlg Exp $ */ +/* $OpenBSD: mpireg.h,v 1.19 2006/06/29 08:35:08 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -619,7 +619,7 @@ struct mpi_msg_scsi_io { u_int8_t cdb_length; u_int8_t sense_buf_len; - u_int8_t reserved; + u_int8_t reserved1; u_int8_t msg_flags; #define MPI_SCSIIO_EEDP 0xf0 #define MPI_SCSIIO_CMD_DATA_DIR (1<<2) @@ -632,19 +632,19 @@ struct mpi_msg_scsi_io { u_int16_t lun[4]; - u_int32_t control; -#define MPI_SCSIIO_ADDITIONAL_CDB_LEN (0xf<<26) -#define MPI_SCSIIO_DATA_DIR (0x3<<24) -#define MPI_SCSIIO_DATA_DIR_NONE (0x0<<24) -#define MPI_SCSIIO_DATA_DIR_WRITE (0x1<<24) -#define MPI_SCSIIO_DATA_DIR_READ (0x2<<24) -#define MPI_SCSIIO_TASK_ATTR (0x7<<8) -#define MPI_SCSIIO_TASK_ATTR_SIMPLE_Q (0x0<<8) -#define MPI_SCSIIO_TASK_ATTR_HEAD_OF_Q (0x1<<8) -#define MPI_SCSIIO_TASK_ATTR_ORDERED_Q (0x2<<8) -#define MPI_SCSIIO_TASK_ATTR_ACA_Q (0x4<<8) -#define MPI_SCSIIO_TASK_ATTR_UNTAGGED (0x5<<8) -#define MPI_SCSIIO_TASK_ATTR_NO_DISCONNECT (0x7<<8) + u_int8_t reserved2; + u_int8_t tagging; +#define MPI_SCSIIO_ATTR_SIMPLE_Q (0x0) +#define MPI_SCSIIO_ATTR_HEAD_OF_Q (0x1) +#define MPI_SCSIIO_ATTR_ORDERED_Q (0x2) +#define MPI_SCSIIO_ATTR_ACA_Q (0x4) +#define MPI_SCSIIO_ATTR_UNTAGGED (0x5) +#define MPI_SCSIIO_ATTR_NO_DISCONNECT (0x7) + u_int8_t direction; +#define MPI_SCSIIO_DIR_NONE (0x0) +#define MPI_SCSIIO_DIR_WRITE (0x1) +#define MPI_SCSIIO_DIR_READ (0x2) + u_int8_t extra_cdb_len; #define MPI_CDB_LEN 16 u_int8_t cdb[MPI_CDB_LEN]; |