diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-05-18 16:06:36 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-05-18 16:06:36 +0000 |
| commit | a6eac17e9d9201cd216709ab136557b78bb17c16 (patch) | |
| tree | 97200fa9884b9072a8a70fc77253c4753bbd9bd1 /sys/scsi/ss.c | |
| parent | 0104529bd466688238c5b5bc13cc1adcf0a5a682 (diff) | |
constify the quirck tables and fix the scsi_inqmatch() proto accordingly; krw@ ok
Diffstat (limited to 'sys/scsi/ss.c')
| -rw-r--r-- | sys/scsi/ss.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c index 0b5e6cb4188..5f8a97b03b6 100644 --- a/sys/scsi/ss.c +++ b/sys/scsi/ss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss.c,v 1.47 2002/12/30 21:50:29 grange Exp $ */ +/* $OpenBSD: ss.c,v 1.48 2003/05/18 16:06:35 mickey Exp $ */ /* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */ /* @@ -142,7 +142,7 @@ void get_buffer_status(struct ss_softc *, struct buf *); * Fujitsu M3096G wants 40 <= x <= 248 (tested OK at 40 & 64.) */ -struct ss_quirk_inquiry_pattern ss_quirk_patterns[] = { +const struct ss_quirk_inquiry_pattern ss_quirk_patterns[] = { {{T_SCANNER, T_FIXED, "ULTIMA ", "AT3 1.60 ", " "}, { "Ultima AT3", @@ -263,7 +263,7 @@ struct scsi_device ss_switch = { NULL, }; -struct scsi_inquiry_pattern ss_patterns[] = { +const struct scsi_inquiry_pattern ss_patterns[] = { {T_SCANNER, T_FIXED, "", "", ""}, {T_SCANNER, T_REMOV, @@ -303,7 +303,7 @@ ssmatch(parent, match, aux) int priority; (void)scsi_inqmatch(sa->sa_inqbuf, - (caddr_t)ss_patterns, sizeof(ss_patterns)/sizeof(ss_patterns[0]), + ss_patterns, sizeof(ss_patterns)/sizeof(ss_patterns[0]), sizeof(ss_patterns[0]), &priority); return (priority); } @@ -370,14 +370,14 @@ ss_identify_scanner(ss, inqbuf) struct ss_softc *ss; struct scsi_inquiry_data *inqbuf; { - struct ss_quirk_inquiry_pattern *finger; + const struct ss_quirk_inquiry_pattern *finger; int priority; /* * look for non-standard scanners with help of the quirk table * and install functions for special handling */ - finger = (struct ss_quirk_inquiry_pattern *)scsi_inqmatch(inqbuf, - (caddr_t)ss_quirk_patterns, + finger = (const struct ss_quirk_inquiry_pattern *)scsi_inqmatch(inqbuf, + ss_quirk_patterns, sizeof(ss_quirk_patterns)/sizeof(ss_quirk_patterns[0]), sizeof(ss_quirk_patterns[0]), &priority); if (priority != 0) { |