mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-09 03:57:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aml: Update OpRegion to take Aml as offset and length

Browse source 
ACPI Machine Language (AML) Specification defines both RegionOffset and
RegionLen as Term.

BUG=b:194390621
TEST=tools/presubmit

Change-Id: Ib9d09fab3069566e9fc84c823b6d9f644ac975a0
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3845277
Tested-by: Victor Ding <victording@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Victor Ding <victording@chromium.org>
Auto-Submit: Victor Ding <victording@chromium.org>
This commit is contained in:
Victor Ding 2022-08-17 15:58:59 +00:00 committed by crosvm LUCI
parent cb243d3ef0
commit 53298c039d
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
acpi_tables/src/aml.rs
View file

@ -884,16 +884,16 @@ pub enum OpRegionSpace {
}
/// OperationRegion object with region name, region space type, its offset and length.
pub struct OpRegion {
pub struct OpRegion<'a> {
path: Path,
space: OpRegionSpace,
offset: usize,
length: usize,
offset: &'a dyn Aml,
length: &'a dyn Aml,
}
impl OpRegion {
impl<'a> OpRegion<'a> {
/// Create OperationRegion object.
pub fn new(path: Path, space: OpRegionSpace, offset: usize, length: usize) -> Self {
pub fn new(path: Path, space: OpRegionSpace, offset: &'a dyn Aml, length: &'a dyn Aml) -> Self {
OpRegion {
path,
space,
@ -903,7 +903,7 @@ impl OpRegion {
}
}
impl Aml for OpRegion {
impl<'a> Aml for OpRegion<'a> {
fn to_aml_bytes(&self, aml: &mut Vec<u8>) {
let mut bytes = Vec::new();
self.path.to_aml_bytes(&mut bytes);
@ -1829,7 +1829,13 @@ mod tests {
];
let mut aml = Vec::new();
OpRegion::new("PRST".into(), OpRegionSpace::SystemIO, 0xcd8, 0xc).to_aml_bytes(&mut aml);
OpRegion::new(
"PRST".into(),
OpRegionSpace::SystemIO,
&0xcd8_usize,
&0xc_usize,
)
.to_aml_bytes(&mut aml);
assert_eq!(aml, &op_region_data[..]);
}