Merge branch 'master' into 'master'

drop CVS keywords

See merge request sane-project/backends!547
escl-fix-sleep-mode
Olaf Meeuwissen 2020-11-30 11:07:40 +00:00
commit f1154375f5
57 zmienionych plików z 51 dodań i 167 usunięć

Wyświetl plik

@ -43,8 +43,6 @@
This file is part of the canon_pp backend, supporting Canon CanoScan
Parallel scanners and also distributed as part of the stand-alone driver.
canon_pp-dev.c: $Revision$
Misc constants for Canon CanoScan Parallel scanners and high-level scan
functions.
@ -84,11 +82,6 @@ static void DBG(int level, const char *format, ...)
}
#else
/* Definitions which only apply to SANE compiles */
#ifndef VERSION
#define VERSION "$Revision$"
#endif
#define DEBUG_DECLARE_ONLY
#include "canon_pp.h"
#include "../include/sane/sanei_config.h"

Wyświetl plik

@ -40,8 +40,6 @@
-----
canon_pp-dev.h: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners and also part of the stand-alone driver.

Wyświetl plik

@ -43,8 +43,6 @@
This file is part of the canon_pp backend, supporting Canon CanoScan
Parallel scanners and also distributed as part of the stand-alone driver.
canon_pp-io.c: $Revision$
Low Level Function library for Canon CanoScan Parallel Scanners by
Simon Krix <kinsei@users.sourceforge.net>
*/
@ -74,11 +72,6 @@ static void DBG(int level, const char *format, ...)
}
#else
/* Definitions which only apply to SANE compiles */
#ifndef VERSION
#define VERSION "$Revision$"
#endif
/* Fix problem with DBG macro definition having a - in the name */
#define DEBUG_DECLARE_ONLY
#include "canon_pp.h"

Wyświetl plik

@ -40,8 +40,6 @@
-----
canon_pp-io.h: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners and also distributed as part of the stand-alone
driver.

Wyświetl plik

@ -40,8 +40,6 @@
-----
canon_pp.c: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners
*/
@ -60,10 +58,6 @@
#include "../include/sane/config.h"
#endif
#ifndef VERSION
#define VERSION "$Revision$"
#endif
#include <string.h>
#include <math.h>
#include <unistd.h>

Wyświetl plik

@ -40,8 +40,6 @@
-----
canon_pp.h: $Revision$
This file is part of the canon_pp backend, supporting Canon FBX30P
and NX40P scanners

Wyświetl plik

@ -3,8 +3,6 @@
dc25.c
$Id$
This file (C) 1998 Peter Fales
This file is part of the SANE package.
@ -1841,8 +1839,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
fp = sanei_config_open (DC25_CONFIG_FILE);
DBG (127,
"sane_init() $Id$\n");
DBG (127, "sane_init()\n");
if (!fp)
{

Wyświetl plik

@ -44,8 +44,6 @@
This file implements a SANE backend for the Polaroid Digital
Microscope Camera. */
/* $Id$ */
#include "../include/sane/config.h"
#include <limits.h>

Wyświetl plik

@ -38,8 +38,6 @@
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice. */
/* $Id$ */
#ifndef polaroid_dmc_h
#define polaroid_dmc_h

Wyświetl plik

@ -671,8 +671,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
DBG_INIT ();
DBG (1,
"GPHOTO2 Backend $Id$\n");
DBG (1, "GPHOTO2 Backend\n");
if (getenv ("GP_DEBUG"))
{

Wyświetl plik

@ -43,14 +43,11 @@
*/
/*
$Log$
Revision 1.13 2005/04/13 12:50:07 ellert-guest
Add missing SANE_I18N, Regenerate .po files accordingly, Update Swedish translations
Revision 1.12 2003/10/09 19:32:50 kig-guest
Bug #300241: fix inverse image on 3c/4c/6100C at 10 bit depth
*/
/* pwd.h not available ? */

Wyświetl plik

@ -42,9 +42,6 @@
HP Scanner Control Language (SCL).
*/
/*
$Id$
*/
#ifndef HP_OPTION_H_INCLUDED
#define HP_OPTION_H_INCLUDED
#include "hp.h"

Wyświetl plik

@ -43,7 +43,6 @@
*/
/*
$Log$
Revision 1.15 2008/03/28 14:37:36 kitno-guest
add usleep to improve usb performance, from jim a t meyering d o t net
@ -56,8 +55,6 @@
Revision 1.12 2003/10/09 19:34:57 kig-guest
Redo when TEST UNIT READY failed
Redo when read returns with 0 bytes (non-SCSI only)
*/
/*

Wyświetl plik

@ -44,11 +44,9 @@
*/
static char *hp_backend_version = "1.06";
static char *hp_backend_revision = "$Revision$";
/* Changes:
V 1.06:
$Log$
Revision 1.22 2008/11/26 21:21:25 kitno-guest
* backend/ *.[ch]: nearly every backend used V_MAJOR
instead of SANE_CURRENT_MAJOR in sane_init()
@ -654,8 +652,8 @@ hp_read_config (void)
is_df_config = 1;
cu_device[0] = '\0';
DBG(1, "hp_read_config: hp backend v%s/%s starts reading config file\n",
hp_backend_version, hp_backend_revision);
DBG(1, "hp_read_config: hp backend v%s starts reading config file\n",
hp_backend_version);
if ((fp = sanei_config_open(HP_CONFIG_FILE)) != 0)
{

Wyświetl plik

@ -43,8 +43,6 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice.
$Id$
*/

Wyświetl plik

@ -42,7 +42,6 @@
*/
/*
$Id$
Across FS-1130
*/

Wyświetl plik

@ -41,10 +41,6 @@
If you do not wish that, delete this exception notice.
*/
/*
$Id$
*/
/* Commands supported by the scanner. */
#define SCSI_TEST_UNIT_READY 0x00
#define SCSI_INQUIRY 0x12

Wyświetl plik

@ -43,7 +43,6 @@
*/
/*
$Id$
Matsushita/Panasonic KV-SS25, KV-SS50, KV-SS55, KV-SS50EX,
KV-SS55EX, KV-SS850, KV-SS855 SCSI scanners.

Wyświetl plik

@ -40,10 +40,6 @@
If you do not wish that, delete this exception notice.
*/
/*
$Id$
*/
/* Commands supported by the KV-SS 25 scanner. */
#define SCSI_TEST_UNIT_READY 0x00
#define SCSI_INQUIRY 0x12

Wyświetl plik

@ -14,8 +14,6 @@
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.
$Id$
*/
/*

Wyświetl plik

@ -14,8 +14,6 @@
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.
$Id$
*/
/*

Wyświetl plik

@ -14,8 +14,6 @@
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.
$Id$
*/
/*

Wyświetl plik

@ -14,8 +14,6 @@
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.
$Id$
*/
/*

Wyświetl plik

@ -14,8 +14,6 @@
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.
$Id$
*/
/*

Wyświetl plik

@ -37,15 +37,12 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice. */
/*
$Id$
This file implements the low-level scsi-commands.
If you do not wish that, delete this exception notice.
*/
/*
This file implements the low-level scsi-commands.
*/
/* SCSI commands that the Ricoh scanners understand: */
#define RICOH_SCSI_TEST_UNIT_READY 0x00

Wyświetl plik

@ -40,7 +40,6 @@
*/
/*
$Id$
This file implements a SANE backend for Ricoh flatbed scanners.
*/

Wyświetl plik

@ -36,10 +36,7 @@
If you write modifications of your own for SANE, it is your choice
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice. */
/*
$Id$
If you do not wish that, delete this exception notice.
*/
#ifndef ricoh_h

Wyświetl plik

@ -43,7 +43,6 @@
*/
/*
$Id$
Sceptre S1200 SCSI scanner (sometimes also called S120)
*/

Wyświetl plik

@ -40,10 +40,6 @@
If you do not wish that, delete this exception notice.
*/
/*
$Id$
*/
/* Commands supported by the Sceptre S1200 scanner. */
#define SCSI_TEST_UNIT_READY 0x00
#define SCSI_GET_STATUS 0x02

Wyświetl plik

@ -43,8 +43,6 @@
Userspace scan tool for the Microtek 3600 scanner
$Id$
====================================================================== */
#include "sm3600-scantool.h"

Wyświetl plik

@ -43,8 +43,6 @@
Userspace scan tool for the Microtek 3600 scanner
$Id$
(C) Marian Eichholz 2001
26.4.2001: Added an abstraction layer for TransferControlMsg.

Wyświetl plik

@ -43,8 +43,6 @@
Userspace scan tool for the Microtek 3600 scanner
$Id$
====================================================================== */
#include <unistd.h>

Wyświetl plik

@ -43,11 +43,11 @@
This file contains static calibration data for the Benq 5150C scanner.
Once it is known how calibration for this scanner works this file
becomes obsolete.
*/
*/
/* $Id$
SANE SnapScan backend */
/*
SANE SnapScan backend
*/
static const SANE_Byte calibration_data_5150[] =
{

Wyświetl plik

@ -44,10 +44,12 @@
If you do not wish that, delete this exception notice.
This file is a component of the implementation of a backend for many
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
*/
/* $Id$
SANE SnapScan backend */
/*
SANE SnapScan backend
*/
/* default option values */
@ -1805,7 +1807,6 @@ SANE_Status sane_control_option (SANE_Handle h,
}
/*
* $Log$
* Revision 1.35 2006/01/06 20:59:17 oliver-guest
* Some fixes for the Epson Stylus CX 1500
*

Wyświetl plik

@ -44,11 +44,12 @@
If you do not wish that, delete this exception notice.
This file is a component of the implementation of a backend for many
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
*/
/* $Id$
SnapScan backend scsi command functions */
/*
SnapScan backend scsi command functions
*/
/* scanner scsi commands */
@ -1710,7 +1711,6 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
}
/*
* $Log$
* Revision 1.58 2006/09/03 10:00:11 oliver-guest
* Bugfix for firmware download by Paul Smedley
*

Wyświetl plik

@ -44,11 +44,12 @@
If you do not wish that, delete this exception notice.
This file is a component of the implementation of a backend for many
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
*/
/* $Id$
SnapScan backend data sources (implementation) */
/*
SnapScan backend data sources (implementation)
*/
/**************************************************************************************
If you get confused from all the structs (like I did when I first saw them),
@ -1261,7 +1262,6 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
}
/*
* $Log$
* Revision 1.21 2005/12/02 19:12:54 oliver-guest
* Another fix for lineart mode for the Epson 3490 @ 3200 DPI
*

Wyświetl plik

@ -44,11 +44,12 @@
If you do not wish that, delete this exception notice.
This file is a component of the implementation of a backend for many
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
*/
/* $Id$
SnapScan backend scan data sources */
/*
SnapScan backend scan data sources
*/
#ifndef SNAPSCAN_SOURCES_H
#define SNAPSCAN_SOURCES_H
@ -87,7 +88,6 @@ static SANE_Status Source_init (Source *pself,
#endif
/*
* $Log$
* Revision 1.5 2001/12/17 22:51:50 oliverschwartz
* Update to snapscan-20011212 (snapscan 1.4.3)
*

Wyświetl plik

@ -68,8 +68,9 @@
So far this strategy has worked flawlessly. Thanks Dmitri!
*/
/* $Id$
SnapScan backend scan data sources */
/*
SnapScan backend scan data sources
*/
#include "snapscan-usb.h"
#include "snapscan-mutex.c"
@ -579,7 +580,6 @@ static void snapscani_usb_shm_exit(void)
}
#endif
/*
* $Log$
* Revision 1.22 2006/01/26 17:42:30 hmg-guest
* Added #defines for SHM_R/W for cygwin (patch from Philip Aston <philipa@mail.com>).
*

Wyświetl plik

@ -45,8 +45,9 @@
backend.
*/
/* $Id$
SnapScan backend scan data sources */
/*
SnapScan backend scan data sources
*/
#ifndef snapscan_usb_h
#define snapscan_usb_h
@ -104,7 +105,6 @@ static SANE_Status usb_cmd(int fd, const void *src, size_t src_size,
#endif
/*
* $Log$
* Revision 1.6 2003/07/26 17:16:55 oliverschwartz
* Changed licence to GPL + SANE exception for snapscan-usb.[ch]
*

Wyświetl plik

@ -45,11 +45,12 @@
If you do not wish that, delete this exception notice.
This file is a component of the implementation of a backend for many
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
*/
/* $Id$
SANE SnapScan backend */
/*
SANE SnapScan backend
*/
#include "../include/sane/config.h"
@ -1977,7 +1978,6 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
}
/*
* $Log$
* Revision 1.73 2008/11/26 21:21:29 kitno-guest
* * backend/ *.[ch]: nearly every backend used V_MAJOR
* instead of SANE_CURRENT_MAJOR in sane_init()

Wyświetl plik

@ -44,10 +44,12 @@
If you do not wish that, delete this exception notice.
This file is a component of the implementation of a backend for many
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */
of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners.
*/
/* $Id$
SANE SnapScan backend */
/*
SANE SnapScan backend
*/
#ifndef snapscan_h
#define snapscan_h
@ -437,7 +439,6 @@ struct snapscan_scanner
#endif
/*
* $Log$
* Revision 1.42 2008/05/15 12:50:24 ellert-guest
* Fix for bug #306751: sanei-thread with pthreads on 64 bit
*

Wyświetl plik

@ -47,7 +47,6 @@
/* ------------------------------------------------------------------------- */
/*
* $Log$
* Revision 1.6 2005/09/19 19:57:48 fzago-guest
* Replaced __unused__ with __sane_unused__ to avoid a namespace conflict.
*

Wyświetl plik

@ -43,7 +43,6 @@
Written by Randolph Bentson <bentson@holmsjoen.com> */
/*
* $Log$
* Revision 1.17 2008/11/26 21:21:30 kitno-guest
* * backend/ *.[ch]: nearly every backend used V_MAJOR
* instead of SANE_CURRENT_MAJOR in sane_init()

Wyświetl plik

@ -47,7 +47,6 @@
/* ------------------------------------------------------------------------- */
/*
* $Log$
* Revision 1.8 2008/05/15 12:50:24 ellert-guest
* Fix for bug #306751: sanei-thread with pthreads on 64 bit
*

Wyświetl plik

@ -36,8 +36,7 @@
------------------------------------------------------------------
*/
/* $Id$
/*
stv680 vidcam driver Gerard Klaver
*/

Wyświetl plik

@ -36,10 +36,6 @@
---------------------------------------------------------------------
*/
/*
$Id$
update 20-04-2006*/
/* Commands supported by the vidcam. */
/*--------------------------------------------------------------------------*/

Wyświetl plik

@ -42,7 +42,6 @@
*/
/*
$Id$
Some Relisys scanners AVEC and RELI series
*/

Wyświetl plik

@ -41,10 +41,6 @@
If you do not wish that, delete this exception notice.
*/
/*
$Id$
*/
/* Commands supported by the scanner. */
#define SCSI_TEST_UNIT_READY 0x00
#define SCSI_REQUEST_SENSE 0x03

Wyświetl plik

@ -43,7 +43,6 @@
*/
/*
$Id$
TECO scanner VM3575, VM656A, VM6575, VM6586, VM356A, VM3564
update 2003/02/14, Patch for VM356A Gerard Klaver
update 2003/03/19, traces, tests VM356A Gerard Klaver, Michael Hoeller

Wyświetl plik

@ -42,10 +42,6 @@
If you do not wish that, delete this exception notice.
*/
/*
$Id$
*/
/* Commands supported by the scanner. */
#define SCSI_TEST_UNIT_READY 0x00
#define SCSI_REQUEST_SENSE 0x03

Wyświetl plik

@ -42,7 +42,6 @@
*/
/*
$Id$
VM3552 (and maybe VM4552 and VM6552)
*/

Wyświetl plik

@ -41,10 +41,6 @@
If you do not wish that, delete this exception notice.
*/
/*
$Id$
*/
/* Commands supported by the scanner. */
#define SCSI_TEST_UNIT_READY 0x00
#define SCSI_REQUEST_SENSE 0x03

Wyświetl plik

@ -1,5 +1,3 @@
; $Id$
;
; SANE Backend specification file (Matto Marjanovic's format)
;
; It's basically emacs-lisp --- so ";" indicates comment to end of line.

Wyświetl plik

@ -1,4 +1,3 @@
; $Id$
; SANE Backend specification file
;
; It's basically emacs-lisp --- so ";" indicates comment to end of line.

Wyświetl plik

@ -1,5 +1,3 @@
; $Id$
;
; SANE Backend specification file (Matto Marjanovic's format)
;
; It's basically emacs-lisp --- so ";" indicates comment to end of line.

Wyświetl plik

@ -1,4 +1,3 @@
.\" $Id$
.TH sane\-niash 5 "14 Jul 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-niash

Wyświetl plik

@ -1919,7 +1919,6 @@
:devicetype :meta
:desc "Dynamic loading of shared-library backends."
; $Id$
;
; SANE Backend specification file (Matto Marjanovic's format)
;
@ -7593,7 +7592,7 @@
:devicetype :meta
:desc "Network access to saned servers"
:comment "Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6."
; $Id$
; SANE Backend specification file
;
; It's basically emacs-lisp --- so ";" indicates comment to end of line.
@ -9383,9 +9382,6 @@
; :status specifier is optional after :model and at the top-level
; $Id$
;
; SANE Backend specification file (Matto Marjanovic's format)
;
; It's basically emacs-lisp --- so ";" indicates comment to end of line.