From a7688c6d1ec563d21fca5fbb8ba801d6af350132 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 20 Jul 2023 09:21:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=97=E5=8A=9BDS=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.bat | 20 -------------------- sane/scanner.cpp | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/build_all.bat b/build_all.bat index b27668e..ec0f739 100644 --- a/build_all.bat +++ b/build_all.bat @@ -217,32 +217,12 @@ EXIT /B 0 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 401C if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 401D - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 401E - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 401F - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 4020 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 4021 - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 4022 - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 4015 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 4016 - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 4017 - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 4018 - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% call build_ds.bat %1 %2 4019 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 401A - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 401B - if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% EXIT /B 0 diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 47f3720..aea6a83 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -572,6 +572,30 @@ bool scanner::is_belong_serial(int vid, int pid, SCANNERID serial) } return false; } + else if (vid == PRODUCT_VENDOR_DL) + { + if (GET_SCANNER_VID(serial) == PRODUCT_VENDOR_DL) + { + if (GET_SCANNER_PID(serial) == 0x401C) + { + return pid == 0x401C || pid == 0x401D || pid == 0x401E || pid == 0x401F; + } + else if (GET_SCANNER_PID(serial) == 0x4020) + { + return pid == 0x4020 || pid == 0x4021 || pid == 0x4022; + } + else if (GET_SCANNER_PID(serial) == 0x4015) + { + return pid == 0x4015 || pid == 0x4016 || pid == 0x4017 || pid == 0x4018; + } + else if (GET_SCANNER_PID(serial) == 0x4019) + { + return pid == 0x4019 || pid == 0x401A || pid == 0x401B; + } + } + return false; + } + return true; } void scanner::get_scanner_name(SCANNERID id, std::vector& names)