diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-03-25 04:23:47 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-03-25 04:23:47 +0000 |
| commit | 9443c3dcaecb492e407041a718ec747021c60dd2 (patch) | |
| tree | 0fdce4fb48e3b2883dbc072c165b31618320b991 | |
| parent | 9e2a803732f63d90c59fb3b8df45ac954da83547 (diff) | |
Support for several HP scanners; from jmartin@ugrad.cs.ualberta.ca, krw@ ok.
| -rw-r--r-- | sys/scsi/ss.c | 16 | ||||
| -rw-r--r-- | sys/scsi/ss_scanjet.c | 32 |
2 files changed, 46 insertions, 2 deletions
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c index 04ad9ab012f..e1e2dbb425e 100644 --- a/sys/scsi/ss.c +++ b/sys/scsi/ss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss.c,v 1.41 2000/06/16 21:47:19 provos Exp $ */ +/* $OpenBSD: ss.c,v 1.42 2001/03/25 04:23:45 fgsch Exp $ */ /* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */ /* @@ -275,9 +275,23 @@ struct scsi_inquiry_pattern ss_patterns[] = { {T_PROCESSOR, T_FIXED, "HP ", "C2500A ", ""}, {T_PROCESSOR, T_FIXED, + "HP ", "C2570A ", ""}, + {T_PROCESSOR, T_FIXED, + "HP ", "C2520A ", ""}, + {T_PROCESSOR, T_FIXED, "HP ", "C1130A ", ""}, {T_PROCESSOR, T_FIXED, "HP ", "C5110A ", ""}, + {T_PROCESSOR, T_FIXED, + "HP ", "C6290A ", ""}, + {T_PROCESSOR, T_FIXED, + "HP ", "C5190A ", ""}, + {T_PROCESSOR, T_FIXED, + "HP ", "C7190A ", ""}, + {T_PROCESSOR, T_FIXED, + "HP ", "C6270A ", ""}, + {T_PROCESSOR, T_FIXED, + "HP ", "C7670A ", ""}, }; int diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c index c28f57573ff..6697faaa2e3 100644 --- a/sys/scsi/ss_scanjet.c +++ b/sys/scsi/ss_scanjet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss_scanjet.c,v 1.21 1998/09/16 15:53:24 kstailey Exp $ */ +/* $OpenBSD: ss_scanjet.c,v 1.22 2001/03/25 04:23:46 fgsch Exp $ */ /* $NetBSD: ss_scanjet.c,v 1.6 1996/05/18 22:58:01 christos Exp $ */ /* @@ -118,6 +118,16 @@ scanjet_attach(ss, sa) ss->sio.scan_scanner_type = HP_SCANJET_IIC; printf("HP ScanJet IIcx"); } + /* The 3p is a grayscale-only HP SCL scanner */ + if (!bcmp(sa->sa_inqbuf->product, "C2570A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 3p"); + } + /* The 3c/4c/6100C report as the same? */ + if (!bcmp(sa->sa_inqbuf->product, "C2520A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 3c/4c/6100C"); + } if (!bcmp(sa->sa_inqbuf->product, "C1130A", 6)) { ss->sio.scan_scanner_type = HP_SCANJET_IIC; printf("HP ScanJet 4p"); @@ -126,6 +136,26 @@ scanjet_attach(ss, sa) ss->sio.scan_scanner_type = HP_SCANJET_IIC; printf("HP ScanJet 5p"); } + if (!bcmp(sa->sa_inqbuf->product, "C6290A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 4100C"); + } + if (!bcmp(sa->sa_inqbuf->product, "C5190A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 5100C"); + } + if (!bcmp(sa->sa_inqbuf->product, "C7190A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 5200C"); + } + if (!bcmp(sa->sa_inqbuf->product, "C6270A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 6200C"); + } + if (!bcmp(sa->sa_inqbuf->product, "C7670A", 6)) { + ss->sio.scan_scanner_type = HP_SCANJET_IIC; + printf("HP ScanJet 6300C"); + } SC_DEBUG(sc_link, SDEV_DB1, ("scanjet_attach: scanner_type = %d\n", ss->sio.scan_scanner_type)); |