dsg/nusb
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Troy Neubauer 2024-09-07 12:49:05 -07:00
parent 6b5f2deb42
commit 76fc011d1c
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -13,6 +13,7 @@ rust-version = "1.76" # keep in sync with .github/workflows/rust.yml
[dependencies]
atomic-waker = "1.1.2"
futures-core = "0.3.29"
libc = "0.2.155"
log = "0.4.20"
once_cell = "1.18.0"
slab = "0.4.9"

17
src/platform/linux_usbfs/device.rs
View file

@ -1,4 +1,4 @@
use std::ffi::OsString;
use std::ffi::{CStr, OsString};
use std::io::ErrorKind;
use std::os::unix::ffi::OsStringExt;
use std::{ffi::c_void, time::Duration};
@ -80,12 +80,19 @@ impl LinuxDevice {
let proc_path = PathBuf::from(format!("/proc/self/fd/{}", fd.as_raw_fd()));
log::info!("reading link: {}", proc_path.to_string_lossy());
let fd_path = rustix::fs::readlink(&proc_path, vec![]).expect("failed to read fd link");
if fd_path.is_empty() {
//let mut dst = [0u8; 256];
//let path = libc::readlink(CStr::from(proc_Path).unwrap(), dst.as_mut_ptr(), dst.len());
let fd_path = std::fs::read_link(&proc_path).expect("Failed to read link");
log::info!("sysfs path: {:?}", fd_path.to_string_lossy());
//let fd_path = rustix::fs::readlink(&proc_path, vec![]).expect("failed to read fd link");
if fd_path.as_path().to_str().unwrap().is_empty() {
log::error!("empty path??");
return Err(ErrorKind::Other.into());
}
log::info!("sysfs path: {:?}", fd_path.to_string_lossy());
let sysfs = SysfsPath(PathBuf::from(OsString::from_vec(fd_path.into_bytes())));
let sysfs = SysfsPath(fd_path);
// TODO: should we parse from path or just read directly?
let active_config = sysfs.read_attr("bConfigurationValue")?;