diff options
| author | Didier Raboud <odyx@debian.org> | 2017-01-22 10:36:11 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-01-22 10:36:11 +0100 |
| commit | 7bd83d89975d166521a0b326b64b4cad80117750 (patch) | |
| tree | d303f82c5651a20c507e69d9a8bb37a845492feb /src/cups/backend_common.h | |
| parent | 54a135b87201e48d4da4894a61b81a8c6fe46d26 (diff) | |
New upstream version 5.2.12
Diffstat (limited to 'src/cups/backend_common.h')
| -rw-r--r-- | src/cups/backend_common.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cups/backend_common.h b/src/cups/backend_common.h index 2462058..fea04dc 100644 --- a/src/cups/backend_common.h +++ b/src/cups/backend_common.h @@ -95,6 +95,7 @@ enum { P_CP790, P_CP_XXX, P_CP10, + P_CP910, P_KODAK_6800, P_KODAK_6850, P_KODAK_1400_805, @@ -116,12 +117,14 @@ enum { P_MITSU_9800, P_MITSU_9800S, P_MITSU_9810, + P_MITSU_P95D, P_DNP_DS40, P_DNP_DS80, P_DNP_DS80D, P_CITIZEN_CW01, P_DNP_DSRX1, P_DNP_DS620, + P_DNP_DS820, P_FUJI_ASK300, P_END, }; @@ -138,7 +141,7 @@ struct dyesub_backend { char *name; char *version; char *uri_prefix; - void (*cmdline_usage)(void); + void (*cmdline_usage)(void); /* Optional */ void *(*init)(void); void (*attach)(void *ctx, struct libusb_device_handle *dev, uint8_t endp_up, uint8_t endp_down, uint8_t jobid); @@ -146,7 +149,7 @@ struct dyesub_backend { int (*cmdline_arg)(void *ctx, int argc, char **argv); int (*read_parse)(void *ctx, int data_fd); int (*main_loop)(void *ctx, int copies); - int (*query_serno)(struct libusb_device_handle *dev, uint8_t endp_up, uint8_t endp_down, char *buf, int buf_len); + int (*query_serno)(struct libusb_device_handle *dev, uint8_t endp_up, uint8_t endp_down, char *buf, int buf_len); /* Optional */ struct device_id devices[]; }; @@ -161,6 +164,7 @@ void print_license_blurb(void); void print_help(char *argv0, struct dyesub_backend *backend); uint16_t uint16_to_packed_bcd(uint16_t val); +uint32_t packed_bcd_to_uint32(char *in, int len); /* Global data */ extern int terminate; @@ -170,8 +174,6 @@ extern int extra_vid; extern int extra_pid; extern int extra_type; extern int copies; -extern char *use_serno; -extern int current_page; #if defined(BACKEND) extern struct dyesub_backend BACKEND; |