summaryrefslogtreecommitdiff
path: root/backend/umax.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/umax.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/umax.c')
-rw-r--r--backend/umax.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/backend/umax.c b/backend/umax.c
index 94f8aa4..9cefc08 100644
--- a/backend/umax.c
+++ b/backend/umax.c
@@ -19,9 +19,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.
@@ -64,11 +62,11 @@
. . - 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)
in ADF mode this is done often:
- . . - sane_start() : start image aquisition
+ . . - sane_start() : start image acquisition
. . - sane_get_parameters() : returns actual scan-parameters
. . - sane_read() : read image-data (from pipe)
@@ -1986,7 +1984,7 @@ static SANE_Status umax_queue_read_image_data_req(Umax_Device *dev, unsigned int
set_R_datatype_code(sread.cmd, R_datatype_imagedata); /* set datatype */
dev->length_queued[bufnr] = length; /* set length request */
- dev->length_read[bufnr] = length; /* set length request, can be changed asyncronous by umax_scsi_req_enter */
+ dev->length_read[bufnr] = length; /* set length request, can be changed asynchronous by umax_scsi_req_enter */
status = umax_scsi_req_enter(dev, sread.cmd, sread.size, dev->buffer[bufnr], &(dev->length_read[bufnr]), &(dev->queue_id[bufnr]));
if (status)
@@ -3219,7 +3217,7 @@ static int umax_identify_scanner(Umax_Device *dev)
memcpy(dev->buffer[0]+0x24, inq_data.inquiry, inq_data.inquiry_len-0x24);
/* correct variables */
- set_inquiry_sc_uta(dev->buffer[0], get_inquiry_transavail(dev->buffer[0])); /* transparancy available ? */
+ set_inquiry_sc_uta(dev->buffer[0], get_inquiry_transavail(dev->buffer[0])); /* transparency available ? */
set_inquiry_sc_adf(dev->buffer[0], get_inquiry_scanmode(dev->buffer[0])); /* automatic document feeder available ? */
set_inquiry_length(dev->buffer[0], inq_data.inquiry_len);
@@ -3934,7 +3932,7 @@ static int umax_check_values(Umax_Device *dev)
{
if ( (dev->colormode != RGB) || (dev->three_pass != 0) )
{
- dev->do_color_ordering = 0; /* color ordering not necessery */
+ dev->do_color_ordering = 0; /* color ordering not necessary */
}
}
@@ -7946,7 +7944,7 @@ SANE_Status sane_start(SANE_Handle handle)
umax_set_window_param(scanner->device);
status = umax_start_scan(scanner->device);
- if (status) /* errror */
+ if (status) /* error */
{
umax_give_scanner(scanner->device); /* reposition and release scanner */
return status;
@@ -7967,13 +7965,13 @@ SANE_Status sane_start(SANE_Handle handle)
}
status = umax_do_calibration(scanner->device);
- if (status) /* errror */
+ if (status) /* error */
{
umax_give_scanner(scanner->device); /* reposition and release scanner */
return status;
}
- if (scanner->device->pause_after_calibration) /* may be usefull */
+ if (scanner->device->pause_after_calibration) /* may be useful */
{
DBG(DBG_info2,"pause after calibration %d msec ...\n", scanner->device->pause_after_calibration);
usleep(((long) scanner->device->pause_after_calibration) * 1000); /* time in ms */