diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
| commit | ecaaf250cb33ff61f37a7b441f2337584a655350 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /backend/hs2p.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | 351b7328520c16730ceb46e5acae16038c42185e (diff) | |
Update upstream source from tag 'upstream/1.0.32'
Update to upstream version '1.0.32'
with Debian dir 2c1111c59d9d68bcbf479a4a4de7697fe2de127f
Diffstat (limited to 'backend/hs2p.c')
| -rw-r--r-- | backend/hs2p.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/backend/hs2p.c b/backend/hs2p.c index deee3b0..ec9eec9 100644 --- a/backend/hs2p.c +++ b/backend/hs2p.c @@ -16,9 +16,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + along with this program. If not, see <https://www.gnu.org/licenses/>. As a special exception, the authors of SANE give permission for additional uses of the libraries contained in this release of SANE. @@ -51,10 +49,10 @@ . . . init_options : initialize SANE_OPTIONS array . . - sane_set_io_mode : set blocking-mode . . - sane_get_select_fd : get scanner-fd - . . - sane_get_option_descriptor() : get option informations + . . - sane_get_option_descriptor() : get option information . . - sane_control_option() : change option values . . - . . - sane_start() : start image aquisition + . . - sane_start() : start image acquisition . . - sane_get_parameters() : returns actual scan-parameters . . - sane_read() : read image-data (from pipe) . . @@ -1535,7 +1533,7 @@ do_cancel (HS2P_Scanner * s) object_position (s->fd, OBJECT_POSITION_UNLOAD)) != SANE_STATUS_GOOD) { - DBG (DBG_error, "cancel: OBJECT POSTITION failed\n"); + DBG (DBG_error, "cancel: OBJECT POSITION failed\n"); } sanei_scsi_req_flush_all (); release_unit (s->fd); @@ -1588,7 +1586,7 @@ sane_init (SANE_Int * version_code, } #if 0 - /* avision.c: search for all supported scanners on all scsi busses & channels */ + /* avision.c: search for all supported scanners on all scsi buses & channels */ for (hw = &HS2P_Device_List[0]; hw->mfg != NULL; hw++) { sanei_scsi_find_devices (hw->mfg, /*vendor */ @@ -3252,7 +3250,7 @@ pad: /* * If status != SANE_STATUS_GOOD, then sense_handler() has already * been called and the sanei_* functions have already gotten the - * sense data buffer (which apparently clears the error conditionn) + * sense data buffer (which apparently clears the error condition) * so the following doesn't work: get_sense_data (s->fd, &(s->hw->sense_data)); print_sense_data (&(s->hw->sense_data)); |