From c9009f1930bd4ee264b04112b51bf440033ad63c Mon Sep 17 00:00:00 2001 From: Babis Chalios Date: Wed, 23 Oct 2024 12:32:17 +0200 Subject: [PATCH] fix: naming of types in acpi-tables We were calling stuff "Cachable" instead of "Cacheable". Signed-off-by: Babis Chalios --- src/acpi-tables/src/aml.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/acpi-tables/src/aml.rs b/src/acpi-tables/src/aml.rs index 040bde4496f..c2b4e85451d 100644 --- a/src/acpi-tables/src/aml.rs +++ b/src/acpi-tables/src/aml.rs @@ -406,7 +406,7 @@ enum AddressSpaceType { } #[derive(Copy, Clone)] -pub enum AddressSpaceCachable { +pub enum AddressSpaceCacheable { NotCacheable, Cacheable, WriteCombining, @@ -421,7 +421,7 @@ pub struct AddressSpace { } impl AddressSpace { - pub fn new_memory(cacheable: AddressSpaceCachable, read_write: bool, min: T, max: T) -> Self { + pub fn new_memory(cacheable: AddressSpaceCacheable, read_write: bool, min: T, max: T) -> Self { AddressSpace { r#type: AddressSpaceType::Memory, min, @@ -1384,13 +1384,13 @@ mod tests { "_CRS".try_into().unwrap(), &ResourceTemplate::new(vec![ &AddressSpace::new_memory( - AddressSpaceCachable::Cacheable, + AddressSpaceCacheable::Cacheable, true, 0xa_0000u32, 0xb_ffffu32 ), &AddressSpace::new_memory( - AddressSpaceCachable::NotCacheable, + AddressSpaceCacheable::NotCacheable, true, 0xc000_0000u32, 0xfebf_ffffu32 @@ -1416,7 +1416,7 @@ mod tests { Name::new( "_CRS".try_into().unwrap(), &ResourceTemplate::new(vec![&AddressSpace::new_memory( - AddressSpaceCachable::Cacheable, + AddressSpaceCacheable::Cacheable, true, 0x8_0000_0000u64, 0xf_ffff_ffffu64 @@ -1984,7 +1984,7 @@ mod tests { &Name::new( "MR64".try_into().unwrap(), &ResourceTemplate::new(vec![&AddressSpace::new_memory( - AddressSpaceCachable::Cacheable, + AddressSpaceCacheable::Cacheable, true, 0x0000_0000_0000_0000u64, 0xFFFF_FFFF_FFFF_FFFEu64