Re: SANE 1.0.1 under DEC UNIX 4.0

Petter Reinholdtsen (pere@hungry.com)
Mon, 16 Aug 1999 19:39:39 +0200

Marian Szebenyi told me to move the close() in hp-scl.c further down
in the code. Can the hp backend maintainers check if this change is
correct.

I'm pretty sure the SCSI changes are correct, but the hp backend
change seems strange to me. I do not know how the backend works.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/external/sane/ChangeLog,v
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.4 ChangeLog
--- ChangeLog 1999/08/12 19:53:23 1.1.1.1.2.4
+++ ChangeLog 1999/08/16 17:35:23
@@ -1,3 +1,9 @@
+1999-08-16 Marian Szebenyi <dms35@cornell.edu>
+
+ * sanei/sanei_scsi.c [sanei_scsi_cmd sanei_scsi_open]
+ backend/hp-scl.c [sanei_hp_scsi_pipeout]: Digital UNIX 4.0D
+ patches.
+
1999-08-12 Petter Reinholdtsen <pere@td.org.uit.no>

* aclocal.m4 configure.in configure: Generate configure and
Index: sanei/sanei_scsi.c
===================================================================
RCS file: /cvsroot/external/sane/sanei/sanei_scsi.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sanei_scsi.c
--- sanei_scsi.c 1999/08/09 18:05:59 1.1.1.1
+++ sanei_scsi.c 1999/08/16 17:35:24
@@ -677,6 +677,7 @@
for (fd = 0; fd < num_alloced; ++fd)
if (!fd_info[fd].in_use)
break;
+ fake_fd = 1;
}
#elif USE == DOMAINOS_INTERFACE
{
@@ -1874,7 +1875,7 @@

cdb_size = CDB_SIZE (*(u_char *) src);

- memset (ccb, 0, sizeof (ccb));
+ memset (&ccb, 0, sizeof (ccb));
ccb.cam_ch.my_addr = (CCB_HEADER *) & ccb;
ccb.cam_ch.cam_ccb_len = sizeof (ccb);
ccb.cam_ch.cam_func_code = XPT_SCSI_IO;
@@ -1906,6 +1907,7 @@

memset (&hdr, 0, sizeof (hdr));
hdr.uagt_ccb = (CCB_HEADER *) & ccb;
+ hdr.uagt_ccblen = sizeof(ccb);
hdr.uagt_buffer = ccb.cam_data_ptr;
hdr.uagt_buflen = ccb.cam_dxfer_len;
hdr.uagt_snsbuf = sense;
Index: backend/hp-scl.c
===================================================================
RCS file: /cvsroot/external/sane/backend/hp-scl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 hp-scl.c
--- hp-scl.c 1999/08/09 18:05:57 1.1.1.1
+++ hp-scl.c 1999/08/16 17:35:25
@@ -906,6 +906,7 @@
return SANE_STATUS_CANCELLED;
}

+ close (outfd);
return status;
}

-- 
##>  Petter Reinholdtsen <##    | pere@td.org.uit.no
 O-  <SCRIPT Language="Javascript">window.close()</SCRIPT>
http://www.hungry.com/~pere/    | Go Mozilla, go! Go!



--
Source code, list archive, and docs: http://www.mostang.com/sane/
To unsubscribe: echo unsubscribe sane-devel | mail majordomo@mostang.com