Re: Problems with sane-scsi

From: abel deuring (a.deuring@satzbau-gmbh.de)
Date: Fri Jun 09 2000 - 03:04:28 PDT

  • Next message: Daniel James: "invalid argument?"

    Benjamin Hell wrote:
    > Hi,
    >
    > I got the patch but now compilation fails:
    >
    [...]
    > At least I found out that the first error is due
    > to a unpatched call to scsi_cmd in unit_ready which
    > is still using the parameters of the unpatched scsi_cmd
    > function. I think, this must be a solaris thing because of
    > this block of code is enclosed in #if USE == SOLARIS_INTERFACE,
    > so you won't get in touch with this under Linux or so, but I
    > should better consign the analysis to the professionals :-)

    You are right, the compiler errors are specific to Solaris, but I had to
    fiddle with all OS specific parts of sanei_scsi.c in order to get a
    flexible command length handling.

    I hope that the attached patch against the version of sanei_scsi.c that
    produced these errors compiles without errors.

    Abel

    --- sanei_scsi.c-orig Fri Jun 9 11:38:44 2000
    +++ sanei_scsi.c Fri Jun 9 11:49:43 2000
    @@ -3644,7 +3644,8 @@
       {0, 0, 0, 0, 0, 0};
       int status;
     
    - status = scsi_cmd (fd, test_unit_ready, sizeof (test_unit_ready), 0, 0, 1);
    + status = scsi_cmd (fd, test_unit_ready, sizeof (test_unit_ready),
    + 0, 0, 0, 0, 1);
       return (status == SANE_STATUS_GOOD);
     }
     
    @@ -3654,7 +3655,8 @@
     
     SANE_Status
     
    -sanei_scsi_req_enter2 (int fd, const void *src, size_t src_size,
    +sanei_scsi_req_enter2 (int fd, const void *cmd, size_t cmd_size,
    + const void *src, size_t src_size,
                           void *dst, size_t * dst_size, void **idp)
     {
       return sanei_scsi_cmd2 (fd, cmd, cmd_size, src, src_size, dst, dst_size);

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



    This archive was generated by hypermail 2b29 : Fri Jun 09 2000 - 04:44:18 PDT