Skip to content

windows: Don't panic if driver not installed #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

windows: Don't panic if driver not installed #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions framework_lib/src/chromium_ec/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,40 @@ lazy_static! {
static ref DEVICE: Arc<Mutex<Option<DevHandle>>> = Arc::new(Mutex::new(None));
}

fn init() {
fn init() -> bool {
let mut device = DEVICE.lock().unwrap();
if (*device).is_some() {
return;
return true;
}

let path = w!(r"\\.\GLOBALROOT\Device\CrosEC");
unsafe {
*device = Some(DevHandle(
CreateFileW(
path,
FILE_GENERIC_READ.0 | FILE_GENERIC_WRITE.0,
FILE_SHARE_READ | FILE_SHARE_WRITE,
None,
OPEN_EXISTING,
FILE_FLAGS_AND_ATTRIBUTES(0),
None,
)
.unwrap(),
));
}
let res = unsafe {
CreateFileW(
path,
FILE_GENERIC_READ.0 | FILE_GENERIC_WRITE.0,
FILE_SHARE_READ | FILE_SHARE_WRITE,
None,
OPEN_EXISTING,
FILE_FLAGS_AND_ATTRIBUTES(0),
None,
)
};
let handle = match res {
Ok(h) => h,
Err(err) => {
error!("Failed to find Windows driver. {:?}", err);
return false;
}
};

*device = Some(DevHandle(handle));
true
}

pub fn read_memory(offset: u16, length: u16) -> EcResult<Vec<u8>> {
init();
if !init() {
return Err(EcError::DeviceError("Failed to initialize".to_string()));
}
let mut rm = CrosEcReadMem {
offset: offset as u32,
bytes: length as u32,
Expand Down
3 changes: 2 additions & 1 deletion framework_lib/src/commandline/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,8 @@ fn selftest(ec: &CrosEc) -> Option<()> {
if let Some(mem) = ec.dump_mem_region() {
util::print_multiline_buffer(&mem, 0);
} else {
println!(" Failed to read EC memory region")
println!(" Failed to read EC memory region");
return None;
}

println!(" Checking EC memory mapped magic bytes");
Expand Down