Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ec/test-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For Windows on ARM (cross-compile):
cargo build-win --release
```

Note: to use the `local` source on Windows, you must have the `ectest.sys` KMDF driver built/installed and the required ACPI entries/device instance present. See [test-win/README.md](../test-win/README.md) for the Windows driver/setup requirements.
Note: to use the `local` source on Windows, you must have the `ectest.sys` KMDF driver built/installed and the required ACPI entries/device instance present. The driver lives in [odp-windows-drivers](https://github.com/OpenDevicePartnership/odp-windows-drivers) (`drivers/acpi`); see [test-win/README.md](../test-win/README.md) for the user-mode setup requirements.

## Usage

Expand Down
2 changes: 1 addition & 1 deletion ec/test-lib/src/acpi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use windows::Win32::Foundation::*;
use windows::Win32::System::IO::*;
use windows::core::{GUID, PCWSTR};

// GUID defined in the KMDF INX file for ectest.sys
// GUID defined in the ectest.sys KMDF driver (odp-windows-drivers, drivers/acpi)
// {5362ad97-ddfe-429d-9305-31c0ad27880a}
const GUID_DEVCLASS_ECTEST: GUID = GUID::from_values(
0x5362ad97,
Expand Down
2 changes: 0 additions & 2 deletions ec/test-tui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

/.vs
/exe/.vs/ectest_app
/kmdf/.vs/ectest_kmdf
/exe/ARM64
/lib/ARM64
/lib/eclib/ARM64
/kmdf/ARM64
/rust/target
2 changes: 1 addition & 1 deletion ec/test-tui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For Windows on ARM (cross-compile):
cargo build-win --release
```

Note: to use the `local` source on Windows, you must have the `ectest.sys` KMDF driver built/installed and the required ACPI entries/device instance present. See [test-win/README.md](../test-win/README.md) for the Windows driver/setup requirements.
Note: to use the `local` source on Windows, you must have the `ectest.sys` KMDF driver built/installed and the required ACPI entries/device instance present. The driver lives in [odp-windows-drivers](https://github.com/OpenDevicePartnership/odp-windows-drivers) (`drivers/acpi`); see [test-win/README.md](../test-win/README.md) for the user-mode setup requirements.

## Usage

Expand Down
18 changes: 8 additions & 10 deletions ec/test-win/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# ec-test-win

## Overview
Windows native components for testing EC interfaces via ACPI. Includes a user-mode library, CLI test application, and a kernel-mode driver.
Windows native components for testing EC interfaces via ACPI. Includes a user-mode library and CLI test application that talk to the `ectest.sys` KMDF driver.

> The `ectest.sys` KMDF driver now lives in the [odp-windows-drivers](https://github.com/OpenDevicePartnership/odp-windows-drivers) repository (`drivers/acpi`). Build and install it from there. The IOCTL/struct contract shared with the driver is kept here in `inc/ectest.h`.

## Structure
```
exe/ - User mode CLI (ectest.exe) to call and evaluate ACPI functions
inc/ - Shared header files between user-mode and kernel-mode components
kmdf/ - Kernel mode driver (ectest.sys) that evaluates ACPI methods
inc/ - Shared header files (incl. the IOCTL contract used to talk to ectest.sys)
lib/ - User mode library (eclib) bridging user apps to the KMDF driver
dep/ - External dependencies (WIL git submodule)
```
Expand All @@ -27,23 +28,20 @@ Compile eclib.lib and eclib.dll from `lib/`:
msbuild /p:Configuration=Release /p:Platform=ARM64
```

Compile ectest.sys from `kmdf/`:
```
msbuild /p:Configuration=Release /p:Platform=ARM64
```

Compile ectest.exe from `exe/`:
```
msbuild /p:Configuration=Release /p:Platform=ARM64
```

The `ectest.sys` KMDF driver is built from the [odp-windows-drivers](https://github.com/OpenDevicePartnership/odp-windows-drivers) repository (`drivers/acpi`).

## Installing the Driver
After recompiling ACPI and booting your device, install the driver and run validation tests.
After recompiling ACPI and booting your device, install the driver and run validation tests. Build the `ectest.sys` driver from the [odp-windows-drivers](https://github.com/OpenDevicePartnership/odp-windows-drivers) repository (`drivers/acpi`).

Copy the following files to a thumbdrive or location on the target:
```
ec\test-win\exe\arm64\Debug\ectest.exe
ec\test-win\kmdf\arm64\Debug\ectest_kmdf\*
<odp-windows-drivers build output>\ectest_kmdf\*
Comment thread
kurtjd marked this conversation as resolved.
<WDKROOT>\Program Files\Windows Kits\10\Tools\10.0.26100.0\arm64\devcon.exe
```

Expand Down
117 changes: 0 additions & 117 deletions ec/test-win/kmdf/device.c

This file was deleted.

45 changes: 0 additions & 45 deletions ec/test-win/kmdf/device.h

This file was deleted.

133 changes: 0 additions & 133 deletions ec/test-win/kmdf/driver.c

This file was deleted.

Loading
Loading