summaryrefslogtreecommitdiff
path: root/backend/p5.h
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/p5.h
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/p5.h')
-rw-r--r--backend/p5.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/backend/p5.h b/backend/p5.h
index eae62f7..14e953a 100644
--- a/backend/p5.h
+++ b/backend/p5.h
@@ -13,9 +13,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/>.
*/
@@ -140,8 +138,8 @@ typedef struct P5_Option
} P5_Option;
/**
- * Frontend session. This struct holds informations usefull for
- * the functions defined in SANE's standard. Informations closer
+ * Frontend session. This struct holds information useful for
+ * the functions defined in SANE's standard. Information closer
* to the hardware are in the P5_Device structure. There is
* as many session structure than frontends using the backend.
*/
@@ -169,7 +167,7 @@ typedef struct P5_Session
SANE_Bool scanning;
/** @brief non blocking flag
- * SANE_TRUE if sane_read are non-blocking, ie returns immediatly if there
+ * SANE_TRUE if sane_read are non-blocking, ie returns immediately if there
* is no data available from the scanning device. Modified by sane_set_io_mode()
*/
SANE_Bool non_blocking;
@@ -195,7 +193,8 @@ typedef struct P5_Session
static SANE_Status probe_p5_devices (void);
static P5_Model *probe (const char *devicename);
-static SANE_Status config_attach (SANEI_Config * config, const char *devname);
+static SANE_Status config_attach (SANEI_Config * config, const char *devname,
+ void *data);
static SANE_Status attach_p5 (const char *name, SANEI_Config * config);
static SANE_Status init_options (struct P5_Session *session);
static SANE_Status compute_parameters (struct P5_Session *session);