diff --git a/adb_client/src/device/adb_usb_device.rs b/adb_client/src/device/adb_usb_device.rs index ce33d37..30cae78 100644 --- a/adb_client/src/device/adb_usb_device.rs +++ b/adb_client/src/device/adb_usb_device.rs @@ -31,7 +31,7 @@ pub fn read_adb_private_key>(private_key_path: P) -> Result Result> { +pub fn search_adb_devices() -> Result> { let mut found_devices = vec![]; for device in rusb::devices()?.iter() { let Ok(des) = device.device_descriptor() else { @@ -57,7 +57,8 @@ fn search_adb_devices() -> Result> { } } -fn is_adb_device(device: &Device, des: &DeviceDescriptor) -> bool { +/// Check whether a device with given descriptor is an ADB device +pub fn is_adb_device(device: &Device, des: &DeviceDescriptor) -> bool { const ADB_SUBCLASS: u8 = 0x42; const ADB_PROTOCOL: u8 = 0x1; diff --git a/adb_client/src/device/mod.rs b/adb_client/src/device/mod.rs index 06560ab..a34b6a1 100644 --- a/adb_client/src/device/mod.rs +++ b/adb_client/src/device/mod.rs @@ -11,7 +11,9 @@ mod shell_message_writer; use adb_message_device::ADBMessageDevice; pub use adb_tcp_device::ADBTcpDevice; pub use adb_transport_message::{ADBTransportMessage, ADBTransportMessageHeader}; -pub use adb_usb_device::{ADBUSBDevice, get_default_adb_key_path}; +pub use adb_usb_device::{ + ADBUSBDevice, get_default_adb_key_path, is_adb_device, search_adb_devices, +}; pub use message_writer::MessageWriter; pub use models::{ADBRsaKey, MessageCommand, MessageSubcommand}; pub use shell_message_writer::ShellMessageWriter; diff --git a/adb_client/src/lib.rs b/adb_client/src/lib.rs index fa509b8..8c88387 100644 --- a/adb_client/src/lib.rs +++ b/adb_client/src/lib.rs @@ -17,7 +17,7 @@ mod transports; mod utils; pub use adb_device_ext::ADBDeviceExt; -pub use device::{ADBTcpDevice, ADBUSBDevice}; +pub use device::{ADBTcpDevice, ADBUSBDevice, is_adb_device, search_adb_devices}; pub use emulator_device::ADBEmulatorDevice; pub use error::{Result, RustADBError}; pub use mdns::*;