diff options
| -rw-r--r-- | sys/dev/ic/siop.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/siop_common.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/siopvar_common.h | 32 |
3 files changed, 20 insertions, 20 deletions
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index 504a9deed3c..5393b229d2a 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.15 2001/10/26 02:20:22 krw Exp $ */ +/* $OpenBSD: siop.c,v 1.16 2001/10/30 00:02:55 krw Exp $ */ /* $NetBSD: siop.c,v 1.39 2001/02/11 18:04:49 bouyer Exp $ */ /* @@ -905,7 +905,7 @@ scintr: if (offset < SIOP_NSG) { bcopy(&siop_cmd->siop_tables.data[offset], &siop_cmd->siop_tables.data[0], - (SIOP_NSG - offset) * sizeof(scr_table_t)); + (SIOP_NSG - offset) * sizeof(struct scr_table)); siop_table_sync(siop_cmd, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c index 17b330e4161..80e60568ce7 100644 --- a/sys/dev/ic/siop_common.c +++ b/sys/dev/ic/siop_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_common.c,v 1.11 2001/10/08 01:25:07 krw Exp $ */ +/* $OpenBSD: siop_common.c,v 1.12 2001/10/30 00:02:55 krw Exp $ */ /* $NetBSD: siop_common.c,v 1.12 2001/02/11 18:04:50 bouyer Exp $ */ /* @@ -560,7 +560,7 @@ siop_sdp(siop_cmd) /* save data pointer. Handle async only for now */ int offset, dbc, sstat; struct siop_softc *sc = siop_cmd->siop_sc; - scr_table_t *table; /* table to patch */ + struct scr_table *table; /* table to patch */ if ((siop_cmd->xs->flags & (SCSI_DATA_OUT | SCSI_DATA_IN)) == 0) diff --git a/sys/dev/ic/siopvar_common.h b/sys/dev/ic/siopvar_common.h index da286cd0926..a3cb9f9d86a 100644 --- a/sys/dev/ic/siopvar_common.h +++ b/sys/dev/ic/siopvar_common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siopvar_common.h,v 1.7 2001/08/26 02:39:05 krw Exp $ */ +/* $OpenBSD: siopvar_common.h,v 1.8 2001/10/30 00:02:55 krw Exp $ */ /* $NetBSD: siopvar_common.h,v 1.10 2001/01/26 21:58:56 bouyer Exp $ */ /* @@ -38,10 +38,10 @@ #endif /* tables used by SCRIPT */ -typedef struct scr_table { +struct scr_table { u_int32_t count; u_int32_t addr; -} scr_table_t ; +} __attribute__((__packed__)); /* Number of scatter/gather entries */ #define SIOP_NSG (MAXPHYS/NBPG + 1) /* XXX NBPG */ @@ -57,19 +57,19 @@ typedef struct scr_table { * transfer. */ struct siop_xfer_common { - u_int8_t msg_out[16]; /* 0 */ - u_int8_t msg_in[16]; /* 16 */ - u_int32_t status; /* 32 */ - u_int32_t pad1; /* 36 */ - u_int32_t id; /* 40 */ - u_int32_t pad2; /* 44 */ - scr_table_t t_msgin; /* 48 */ - scr_table_t t_extmsgin; /* 56 */ - scr_table_t t_extmsgdata; /* 64 */ - scr_table_t t_msgout; /* 72 */ - scr_table_t cmd; /* 80 */ - scr_table_t t_status; /* 88 */ - scr_table_t data[SIOP_NSG]; /* 96 */ + u_int8_t msg_out[16]; /* 0 */ + u_int8_t msg_in[16]; /* 16 */ + u_int32_t status; /* 32 */ + u_int32_t pad1; /* 36 */ + u_int32_t id; /* 40 */ + u_int32_t pad2; /* 44 */ + struct scr_table t_msgin; /* 48 */ + struct scr_table t_extmsgin; /* 56 */ + struct scr_table t_extmsgdata; /* 64 */ + struct scr_table t_msgout; /* 72 */ + struct scr_table cmd; /* 80 */ + struct scr_table t_status; /* 88 */ + struct scr_table data[SIOP_NSG]; /* 96 */ } __attribute__((__packed__)); /* status can hold the SCSI_* status values, and 2 additional values: */ |