diff options
| -rw-r--r-- | sys/scsi/ss.c | 15 | ||||
| -rw-r--r-- | sys/sys/scanio.h | 5 |
2 files changed, 15 insertions, 5 deletions
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c index 9fcf60980c1..0a944917e3b 100644 --- a/sys/scsi/ss.c +++ b/sys/scsi/ss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss.c,v 1.31 1997/04/05 22:59:13 kstailey Exp $ */ +/* $OpenBSD: ss.c,v 1.32 1997/04/05 23:34:20 kstailey Exp $ */ /* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */ /* @@ -78,7 +78,7 @@ struct quirkdata { #define SS_Q_REV_CONTRAST 0x0040 /* reverse contrast control in s/w */ #define SS_Q_HALFTONE 0x0080 /* uses non-zero halftone */ #define SS_Q_SET_RIF 0x0100 /* set RIF bit */ -#define SS_Q_PADDING_TYPE 0x0200 /* does not pad to byte boundary */ +#define SS_Q_PADDING_TYPE 0x0200 /* does not truncate to byte boundary */ #define SS_Q_BIT_ORDERING 0x0400 /* needs non-zero bit ordering */ long window_descriptor_length; u_int8_t brightness; @@ -142,6 +142,15 @@ void get_buffer_status __P((struct ss_softc *, struct buf *)); struct ss_quirk_inquiry_pattern ss_quirk_patterns[] = { {{T_SCANNER, T_FIXED, + "ULTIMA ", "A6000C PLUS ", " "}, { + "Ultima A6000C", + SS_Q_HALFTONE | + SS_Q_PADDING_TYPE, + 0, 0, 0, 0, { 3, 0 }, 0, 0, + ULTIMA_AC6000C, + NULL, NULL, NULL + }}, + {{T_SCANNER, T_FIXED, "RICOH ", "IS50 ", " "}, { "Ricoh IS-50", SS_Q_WINDOW_DESC_LEN | @@ -800,7 +809,7 @@ ss_set_window(ss, sio) if (ss->quirkdata->quirks & SS_Q_PADDING_TYPE) window_data.pad_type = ss->quirkdata->pad_type; else - window_data.pad_type = 3; /* 3 = pad to byte boundary */ + window_data.pad_type = 3; /* 3 = truncate to byte boundary */ if (ss->quirkdata->quirks & SS_Q_BIT_ORDERING) _lto2l(ss->quirkdata->bit_ordering, window_data.bit_ordering); diff --git a/sys/sys/scanio.h b/sys/sys/scanio.h index 959c1f01088..4ff92eedef9 100644 --- a/sys/sys/scanio.h +++ b/sys/sys/scanio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scanio.h,v 1.5 1997/03/11 03:53:55 kstailey Exp $ */ +/* $OpenBSD: scanio.h,v 1.6 1997/04/05 23:34:18 kstailey Exp $ */ /* $NetBSD: scanio.h,v 1.1 1996/02/18 20:33:18 mycroft Exp $ */ /* @@ -98,7 +98,7 @@ struct scan_io { #define RICOH_IS410 1 /* Ricoh IS-410 */ #define FUJITSU_M3096G 2 /* Fujitsu M3096G */ -#define HP_SCANJET_IIC 3 /* HP ScanJet IIc */ +#define HP_SCANJET_IIC 3 /* HP SCL scanners (ScanJet IIc, IIcx, ...) */ #define RICOH_FS1 4 /* Ricoh FS1 */ #define SHARP_JX600 5 /* Sharp JX600 */ #define RICOH_IS50 6 /* Ricoh IS-50 */ @@ -109,5 +109,6 @@ struct scan_io { #define MUSTEK_12000CX 11 /* Mustek MFS12000CX */ #define EPSON_ES300C 12 /* epson es300c */ #define GENERIC_SCSI2 13 /* good luck 8c{)] */ +#define ULTIMA_AC6000C 14 /* Ultima A6000C */ #endif /* _SYS_SCANIO_H */ |