diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/canon_pp-io.h | |
parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/canon_pp-io.h')
-rw-r--r-- | backend/canon_pp-io.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/canon_pp-io.h b/backend/canon_pp-io.h index 376af8a..ad04180 100644 --- a/backend/canon_pp-io.h +++ b/backend/canon_pp-io.h @@ -42,7 +42,7 @@ canon_pp-io.h: $Revision$ - This file is part of the canon_pp backend, supporting Canon FBX30P + 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. @@ -50,14 +50,14 @@ */ #ifndef CANON_PP_IO_H -#define CANON_PP_IO_H +#define CANON_PP_IO_H /* Actual Interface */ void sanei_canon_pp_set_ieee1284_mode(int m); int sanei_canon_pp_wake_scanner(struct parport *port, int mode); -int sanei_canon_pp_write(struct parport *port, int length, +int sanei_canon_pp_write(struct parport *port, int length, unsigned char *data); -int sanei_canon_pp_read(struct parport *port, int length, +int sanei_canon_pp_read(struct parport *port, int length, unsigned char *data); int sanei_canon_pp_check_status(struct parport *port); int sanei_canon_pp_scanner_init(struct parport *port); |