common: Fix test_mode 2, add enums.
This commit is contained in:
parent
33699d70ba
commit
f76196b32a
|
@ -697,7 +697,7 @@ static int find_and_enumerate(struct libusb_context *ctx,
|
|||
int found = -1;
|
||||
const char *prefix = NULL;
|
||||
|
||||
if (test_mode > 1) {
|
||||
if (test_mode >= TEST_MODE_NOATTACH) {
|
||||
found = 1;
|
||||
*r_endp_up = 0x82;
|
||||
*r_endp_down = 0x01;
|
||||
|
@ -985,7 +985,7 @@ int main (int argc, char **argv)
|
|||
if (getenv("TEST_MODE"))
|
||||
test_mode = atoi(getenv("TEST_MODE"));
|
||||
|
||||
if (test_mode > 1 && (extra_vid == -1 || extra_pid == -1 || extra_type == -1)) {
|
||||
if (test_mode >= TEST_MODE_NOATTACH && (extra_vid == -1 || extra_pid == -1 || extra_type == -1)) {
|
||||
ERROR("Must specify EXTRA_VID, EXTRA_PID, EXTRA_TYPE in test mode > 1!\n");
|
||||
exit(1);
|
||||
}
|
||||
|
@ -1106,7 +1106,7 @@ int main (int argc, char **argv)
|
|||
|
||||
if (test_mode) {
|
||||
WARNING("**** TEST MODE %d!\n", test_mode);
|
||||
if (test_mode > 1)
|
||||
if (test_mode >= TEST_MODE_NOATTACH)
|
||||
goto bypass;
|
||||
}
|
||||
|
||||
|
@ -1152,7 +1152,7 @@ bypass:
|
|||
backend->name, backend->version);
|
||||
backend_ctx = backend->init();
|
||||
|
||||
if (test_mode < 2) {
|
||||
if (test_mode < TEST_MODE_NOATTACH) {
|
||||
struct libusb_device *device;
|
||||
struct libusb_device_descriptor desc;
|
||||
|
||||
|
@ -1249,16 +1249,14 @@ newpage:
|
|||
|
||||
INFO("Printing page %d\n", ++current_page);
|
||||
|
||||
if (test_mode) {
|
||||
if (test_mode >= TEST_MODE_NOPRINT ) {
|
||||
WARNING("**** TEST MODE, bypassing printing!\n");
|
||||
goto bypass2;
|
||||
} else {
|
||||
ret = backend->main_loop(backend_ctx, copies);
|
||||
if (ret)
|
||||
goto done_claimed;
|
||||
}
|
||||
|
||||
ret = backend->main_loop(backend_ctx, copies);
|
||||
if (ret)
|
||||
goto done_claimed;
|
||||
bypass2:
|
||||
|
||||
/* Log the completed page */
|
||||
if (!uri)
|
||||
PAGE("%d %d\n", current_page, copies);
|
||||
|
@ -1282,10 +1280,12 @@ done_multiple:
|
|||
ret = CUPS_BACKEND_OK;
|
||||
|
||||
done_claimed:
|
||||
libusb_release_interface(dev, iface);
|
||||
if (test_mode < TEST_MODE_NOATTACH)
|
||||
libusb_release_interface(dev, iface);
|
||||
|
||||
done_close:
|
||||
libusb_close(dev);
|
||||
if (test_mode < TEST_MODE_NOATTACH)
|
||||
libusb_close(dev);
|
||||
done:
|
||||
|
||||
if (backend && backend_ctx) {
|
||||
|
|
|
@ -190,6 +190,14 @@ extern int extra_vid;
|
|||
extern int extra_pid;
|
||||
extern int extra_type;
|
||||
extern int copies;
|
||||
extern int test_mode;
|
||||
|
||||
enum {
|
||||
TEST_MODE_NONE = 0,
|
||||
TEST_MODE_NOPRINT,
|
||||
TEST_MODE_NOATTACH,
|
||||
TEST_MODE_MAX,
|
||||
};
|
||||
|
||||
#if defined(BACKEND)
|
||||
extern struct dyesub_backend BACKEND;
|
||||
|
|
Loading…
Reference in a new issue