From 827c6965c56bcda20705f5845e87ba67c9ddd123 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 14 Jul 2016 21:41:14 -0400 Subject: [PATCH] Common: Get rid of the -S, -V, -P, -T options. They won't work until after we attach to the backend, but we need them before we attach. Rely on the environment variables instead. --- README | 43 ++++++++++++++++++------------------------- backend_common.c | 4 +--- backend_common.h | 16 ++-------------- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/README b/README index cd3f040..cee7c8d 100644 --- a/README +++ b/README @@ -143,10 +143,6 @@ -D Increment debug level [1] -G Display GPL text -f Enable fast return mode if possible [2] - -S serno Use SerialNum 'serno' [3] - -V extra_vid [4] - -P extra_pid [4] - -T extra_type [4] -d numcopies Print 'numcopies' of the supplied job [1] This argument can be repeated to increase the debug level. @@ -164,33 +160,30 @@ when using this backend with CUPS. Not all backends support fast return. - [3] If you have multiple models of the same printer family connected - simultaneously, the backend will choose the first one it finds. - If you wish to target a specific device, you may specify its - serial number with this switch, or using the 'SERIAL' environment - variable. For example, these are equivalent: + If you have multiple models of the same printer family connected + simultaneously, the backend will choose the first one it finds. + If you wish to target a specific device, you may specify its + serial number using the 'SERIAL' environment variable. For example: - SERIAL=N782 backend filename [ arguments ] - backend -S N782 filename [ arguments ] + SERIAL=N782 backend filename [ arguments ] - [4] All backends support an additional operational mode, to test out - unknown models. To use this mode, specify the VID, PID and its - internal device type as arguments or environment variables: + All backends support an additional operational mode, to test out + unknown models. To use this mode, specify the VID, PID and its + internal device type as environment variables: - EXTRA_VID=04a9 EXTRA_PID=3ab1 EXTRA_TYPE=7 backend filename - backend -V 04a9 -P 3ab1 -T 7 filename + EXTRA_VID=04a9 EXTRA_PID=3ab1 EXTRA_TYPE=7 backend filename - The VID and PID are specified in hexidecimal, and the TYPE is - the P_XXX enumeration defined in backend_common.h. The '7' in this - example corresponds to most Canon SELPHY CP models, and is what you - would use if you were trying to get the backend to detect an - otherwise unrecognized SELPHY CP model. + The VID and PID are specified in hexidecimal, and the TYPE is + the P_XXX enumeration defined in backend_common.h. The '7' in this + example corresponds to most Canon SELPHY CP models, and is what you + would use if you were trying to get the backend to detect an + otherwise unrecognized SELPHY CP model. - If you are able to successfuly print using this technique, - please let us know so we can add the apppriate entry to the - internal database. + If you are able to successfuly print using this technique, + please let us know so we can add the apppriate entry to the + internal database. - Finally, some backends support additional arguments; see below: + Finally, some backends support additional arguments; see below: *************************************************************************** BACKEND=canonselphy diff --git a/backend_common.c b/backend_common.c index fc83294..ccd4ec9 100644 --- a/backend_common.c +++ b/backend_common.c @@ -27,7 +27,7 @@ #include "backend_common.h" -#define BACKEND_VERSION "0.63" +#define BACKEND_VERSION "0.64" #ifndef URI_PREFIX #error "Must Define URI_PREFIX" #endif @@ -692,8 +692,6 @@ void print_help(char *argv0, struct dyesub_backend *backend) DEBUG("Standalone Usage:\n"); DEBUG("\t%s\n", URI_PREFIX); DEBUG(" [ -D ] [ -G ] [ -f ]\n"); - DEBUG(" [ -S serialnum ] \n"); - DEBUG(" [ -V extra_vid ] [ -P extra_pid ] [ -T extra_type ] \n"); DEBUG(" [ backend_specific_args ] \n"); DEBUG(" [ -d copies ] \n"); DEBUG(" [ - | infile ] \n"); diff --git a/backend_common.h b/backend_common.h index b5d5173..928c32d 100644 --- a/backend_common.h +++ b/backend_common.h @@ -184,7 +184,7 @@ extern struct dyesub_backend BACKEND; #define CUPS_BACKEND_RETRY_CURRENT 7 /* Retry immediately */ /* Argument processing */ -#define GETOPT_LIST_GLOBAL "d:DfGhP:S:T:V:" +#define GETOPT_LIST_GLOBAL "d:DfGh" #define GETOPT_PROCESS_GLOBAL \ case 'd': \ copies = atoi(optarg); \ @@ -200,18 +200,6 @@ extern struct dyesub_backend BACKEND; exit(0); \ case 'h': \ print_help(argv[0], &BACKEND); \ - exit(0); \ - case 'P': \ - extra_pid = strtol(optarg, NULL, 16); \ - break; \ - case 'S': \ - use_serno = optarg; \ - break; \ - case 'T': \ - extra_type = atoi(optarg); \ - break; \ - case 'V': \ - extra_pid = strtol(optarg, NULL, 16); \ - break; + exit(0); #endif /* __BACKEND_COMMON_H */