From ce8b353950fdd2e9da0590797811721e2541343b Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Tue, 21 Dec 2010 10:28:00 +0900 Subject: [PATCH] Wrap duplicate USB id entries with ifdefs Wrap scanner entries with duplicate USB ids with ifdefs so they will not be compiled. This shortens the search for new scanners because we don't try the same USB id more than once. --- backend/avision.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/backend/avision.c b/backend/avision.c index 641616813..ca1257cdd 100644 --- a/backend/avision.c +++ b/backend/avision.c @@ -858,11 +858,13 @@ static Avision_HWEntry Avision_Device_List [] = AV_INT_BUTTON,0}, /* status="untested" */ +#ifdef FAKE_ENTRIES_FOR_DESC_GENERATION { NULL, NULL, 0x040a, 0x6003, "Kodak", "i55", AV_INT_BUTTON,0}, /* status="untested" */ +#endif { NULL, NULL, 0x040a, 0x6004, @@ -870,11 +872,13 @@ static Avision_HWEntry Avision_Device_List [] = AV_INT_BUTTON,0}, /* status="untested" */ +#ifdef FAKE_ENTRIES_FOR_DESC_GENERATION { NULL, NULL, 0x040a, 0x6004, "Kodak", "i65", AV_INT_BUTTON,0}, /* status="untested" */ +#endif { NULL, NULL, 0x040a, 0x6005, @@ -979,12 +983,14 @@ static Avision_HWEntry Avision_Device_List [] = /* comment="sheetfed scanner" */ /* status="complete" */ +#ifdef FAKE_ENTRIES_FOR_DESC_GENERATION { NULL, NULL, 0x04a7, 0x048F, "Visioneer", "Patriot 470", AV_INT_BUTTON,0}, /* comment="sheetfed scanner" */ /* status="complete" */ +#endif { NULL, NULL, 0x04a7, 0x0498, @@ -1102,11 +1108,13 @@ static Avision_HWEntry Avision_Device_List [] = AV_INT_BUTTON,0}, /* status="untested" */ +#ifdef FAKE_ENTRIES_FOR_DESC_GENERATION { NULL, NULL, 0x04a7, 0x0498, "Xerox", "DocuMate632", AV_INT_BUTTON,0}, /* status="untested" */ +#endif { NULL, NULL, 0x04a7, 0x0478, @@ -1120,12 +1128,14 @@ static Avision_HWEntry Avision_Device_List [] = AV_INT_BUTTON,0}, /* status="untested" */ +#ifdef FAKE_ENTRIES_FOR_DESC_GENERATION { NULL, NULL, 0x0638, 0x0a16, "OKI", "S700 Scancopier", 0,0}, /* comment="1 pass, 600 dpi, A4" */ /* status="good" */ +#endif { "B+H", "2000F", 0, 0,