summaryrefslogtreecommitdiff
path: root/backend/pixma/pixma_common.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:24:46 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:24:46 +0100
commitecaaf250cb33ff61f37a7b441f2337584a655350 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/pixma/pixma_common.h
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parent351b7328520c16730ceb46e5acae16038c42185e (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/pixma/pixma_common.h')
-rw-r--r--backend/pixma/pixma_common.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/backend/pixma/pixma_common.h b/backend/pixma/pixma_common.h
index 3e4e5bd..5b393dc 100644
--- a/backend/pixma/pixma_common.h
+++ b/backend/pixma/pixma_common.h
@@ -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.
@@ -119,6 +117,7 @@ struct pixma_t
uint32_t events;
void *subdriver; /* can be used by model driver. */
int rec_tmo; /* receive timeout [s] */
+ pixma_paper_source_t last_source; /* used for calibrate=once */
/* private */
uint64_t cur_image_size;
@@ -162,7 +161,7 @@ struct pixma_scan_ops_t
void (*finish_scan) (pixma_t *);
/** [Optional] Wait for a user's event, e.g. button event. \a timeout is
- * in milliseconds. If an event occured before it's timed out, flags in
+ * in milliseconds. If an event occurred before it's timed out, flags in
* \a s->events should be set accordingly.
* \see PIXMA_EV_* */
void (*wait_event) (pixma_t * s, int timeout);
@@ -176,7 +175,7 @@ struct pixma_scan_ops_t
};
-/** \name Funtions for read and write big-endian integer values */
+/** \name Functions for read and write big-endian integer values */
/**@{*/
void pixma_set_be16 (uint16_t x, uint8_t * buf);
void pixma_set_be32 (uint32_t x, uint8_t * buf);
@@ -205,7 +204,9 @@ uint8_t *pixma_newcmd (pixma_cmdbuf_t *, unsigned cmd,
int pixma_exec (pixma_t *, pixma_cmdbuf_t *);
int pixma_exec_short_cmd (pixma_t *, pixma_cmdbuf_t *, unsigned cmd);
int pixma_map_status_errno (unsigned status);
+#if defined(HAVE_LIBXML2)
int pixma_parse_xml_response(const char *xml_message);
+#endif
/**@}*/
#define pixma_fill_checksum(start, end) do { \