diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/siop_common.c | 3 | ||||
| -rw-r--r-- | sys/dev/ic/siopreg.h | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c index 9967ab53853..e4058bf0b86 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.28 2005/11/25 16:33:19 krw Exp $ */ +/* $OpenBSD: siop_common.c,v 1.29 2006/03/16 22:11:24 miod Exp $ */ /* $NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $ */ /* @@ -48,6 +48,7 @@ #include <scsi/scsi_message.h> #include <scsi/scsiconf.h> +#define SIOP_NEEDS_PERIOD_TABLES #include <dev/ic/siopreg.h> #include <dev/ic/siopvar_common.h> #include <dev/ic/siopvar.h> diff --git a/sys/dev/ic/siopreg.h b/sys/dev/ic/siopreg.h index bf7ffb58bd2..ad138f756d7 100644 --- a/sys/dev/ic/siopreg.h +++ b/sys/dev/ic/siopreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siopreg.h,v 1.9 2005/10/08 16:17:57 krw Exp $ */ +/* $OpenBSD: siopreg.h,v 1.10 2006/03/16 22:11:24 miod Exp $ */ /* $NetBSD: siopreg.h,v 1.16 2005/02/27 00:27:02 perry Exp $ */ /* @@ -81,7 +81,8 @@ struct scf_period { int scf; /* scf value to use */ }; -static const struct scf_period scf_period[] __attribute__((__unused__)) = { +#ifdef SIOP_NEEDS_PERIOD_TABLES +static const struct scf_period scf_period[] = { {250, 25, 1}, /* 10.0 MHz */ {250, 37, 2}, /* 6.67 MHz */ {250, 50, 3}, /* 5.00 MHz */ @@ -97,13 +98,14 @@ static const struct scf_period scf_period[] __attribute__((__unused__)) = { { 62, 25, 5}, /* 10.0 MHz */ }; -static const struct scf_period dt_scf_period[] __attribute__((__unused__)) = { +static const struct scf_period dt_scf_period[] = { { 62, 9, 1}, /* 80.0 MHz */ { 62, 10, 3}, /* 40.0 MHz */ { 62, 12, 5}, /* 20.0 MHz */ { 62, 18, 6}, /* 13.3 MHz */ { 62, 25, 7}, /* 10.0 MHz */ }; +#endif #define SIOP_SCID 0x04 /* SCSI chip ID R/W */ #define SCID_RRE 0x40 @@ -498,6 +500,7 @@ struct nvram_symbios { #define SIOP_NVRAM_TEK_93c46_ADDRESS 0 #define SIOP_NVRAM_TEK_24c16_ADDRESS 0x40 +#if 0 static const u_int8_t tekram_sync_table[16] __attribute__((__unused__)) = { 25, 31, 37, 43, 50, 62, 75, 125, @@ -532,3 +535,4 @@ struct nvram_tekram { #define NVRAM_TEK_F_F2_F6_ENABLED 0x0001 u_int16_t spare[29]; } __packed; +#endif |