summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/scsi/ss.c4
-rw-r--r--sys/scsi/ss_scanjet.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c
index 665955f3914..03d3a5c68a0 100644
--- a/sys/scsi/ss.c
+++ b/sys/scsi/ss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ss.c,v 1.27 1997/03/11 04:00:15 kstailey Exp $ */
+/* $OpenBSD: ss.c,v 1.28 1997/03/11 12:06:48 kstailey Exp $ */
/* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */
/*
@@ -333,6 +333,8 @@ ss_identify_scanner(ss, inqbuf)
} else {
printf("\n%s: generic scanner\n", ss->sc_dev.dv_xname);
ss->sio.scan_scanner_type = GENERIC_SCSI2;
+ /* XXX fill in the rest of the scan_io struct by
+ calling compute_sizes routine */
}
}
diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c
index f74adfad9a3..21c9850f310 100644
--- a/sys/scsi/ss_scanjet.c
+++ b/sys/scsi/ss_scanjet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ss_scanjet.c,v 1.17 1997/03/11 03:40:50 kstailey Exp $ */
+/* $OpenBSD: ss_scanjet.c,v 1.18 1997/03/11 12:06:49 kstailey Exp $ */
/* $NetBSD: ss_scanjet.c,v 1.6 1996/05/18 22:58:01 christos Exp $ */
/*
@@ -122,12 +122,16 @@ scanjet_attach(ss, sa)
/* now install special handlers */
ss->special = scanjet_special;
- error = scanjet_set_window(ss, SCSI_POLL);/* XXX needed? */
-
+ /*
+ * fill in the rest of the scan_io struct by calling
+ * set_window and compute_sizes routines
+ */
+ error = scanjet_set_window(ss, SCSI_POLL);
if (error) {
printf(" set_window failed\n");
return;
}
+
error = scanjet_compute_sizes(ss, SCSI_POLL);
if (error) {
printf(" compute_sizes failed\n");