From 63eb104e237e82250a0c1497f2f644583d528c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=98=8A=E8=8B=8F?= Date: Fri, 6 Dec 2024 10:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0libusb;=20Signed-off?= =?UTF-8?q?-by:liuhaosu@huawei.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘昊苏 --- BUILD.gn | 9 ++------- bundle.json | 5 +++-- include/sane/config.h | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 59e34a43c..73be78a03 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -117,17 +117,12 @@ foreach(name, sanei_names) { } ohos_source_set("sanei_usb") { - sources = [ - "./sanei/sanei_usb.c", - "./sanei/usb_manager.cpp", - ] + sources = [ "./sanei/sanei_usb.c" ] external_deps = [ - "bounds_checking_function:libsec_shared", - "c_utils:utils", "hilog:libhilog", + "libusb:libusb", "libxml2:libxml2", - "usb_manager:usbsrv_client", ] public_configs = [ ":backends_public_config" ] diff --git a/bundle.json b/bundle.json index dd10fea32..e301f0f2c 100644 --- a/bundle.json +++ b/bundle.json @@ -14,7 +14,7 @@ "subsystem": "thirdparty", "syscap": [], "features": [], - "adapted_system_type": [], + "adapted_system_type": "standard", "rom": "10KB", "ram": "10KB", "deps": { @@ -23,7 +23,8 @@ "usb_manager", "bounds_checking_function", "c_utils", - "libxml2" + "libxml2", + "libusb" ] }, "build": { diff --git a/include/sane/config.h b/include/sane/config.h index 24394a763..c99202bba 100644 --- a/include/sane/config.h +++ b/include/sane/config.h @@ -207,10 +207,10 @@ #define HAVE_LIBSNMP 0 /* Define to 1 if you have libusb-1.0 */ -// #define HAVE_LIBUSB 1 +#define HAVE_LIBUSB 1 /* Define to 1 if you have usb_manager */ -#define HAVE_USB_MANAGER 1 +// #define HAVE_USB_MANAGER 1 /* Define to 1 if you have libusb-0.1 */ /* #undef HAVE_LIBUSB_LEGACY */ -- Gitee