summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2003-10-14 22:37:49 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2003-10-14 22:37:49 +0000
commitdaaa211269aea7a6b2c4c09a0b149a40f11a24e7 (patch)
treeeb8b156bed8ece66a176de1a069bcc29e3c951fa /sys/dev
parent3df66bba755ebbcb5f2248104fc8f98fa8611d19 (diff)
Align siop_xfer on 128 byte boundary for all architectures now that 3.4 is out.
ok (and from) mickey@.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/siopvar.h8
-rw-r--r--sys/dev/ic/siopvar_common.h8
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/dev/ic/siopvar.h b/sys/dev/ic/siopvar.h
index 25f74aa6fb2..99d7497c05d 100644
--- a/sys/dev/ic/siopvar.h
+++ b/sys/dev/ic/siopvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: siopvar.h,v 1.7 2003/09/06 22:24:14 krw Exp $ */
+/* $OpenBSD: siopvar.h,v 1.8 2003/10/14 22:37:48 krw Exp $ */
/* $NetBSD: siopvar.h,v 1.18 2002/04/23 20:41:15 bouyer Exp $ */
/*
@@ -43,12 +43,8 @@
struct siop_xfer {
struct siop_common_xfer siop_tables;
/* u_int32_t resel[sizeof(load_dsa) / sizeof(load_dsa[0])]; */
-#ifdef __hppa__
- /* XXX Add some entries to make size 384 bytes (256+128) */
+ /* Add some entries to make size 384 bytes (256+128) */
u_int32_t resel[36];
-#else
- u_int32_t resel[25];
-#endif
} __attribute__((__packed__));
/*
diff --git a/sys/dev/ic/siopvar_common.h b/sys/dev/ic/siopvar_common.h
index 9a281de76a5..36fc6f74fb3 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.15 2003/09/06 22:24:14 krw Exp $ */
+/* $OpenBSD: siopvar_common.h,v 1.16 2003/10/14 22:37:48 krw Exp $ */
/* $NetBSD: siopvar_common.h,v 1.22 2002/10/23 02:32:36 christos Exp $ */
/*
@@ -44,12 +44,8 @@ typedef struct scr_table {
} scr_table_t __attribute__((__packed__));
/* Number of scatter/gather entries */
-#ifdef __hppa__
-/* XXX Ensure alignment of siop_xfer's. For hppa only at the moment. */
+/* XXX Ensure alignment of siop_xfer's. */
#define SIOP_NSG 17 /* XXX (MAXPHYS/NBPG + 1) */
-#else
-#define SIOP_NSG (MAXPHYS/NBPG + 1) /* XXX NBPG */
-#endif
/*
* This structure interfaces the SCRIPT with the driver; it describes a full