Merge pull request #785 from nicholasbishop/bishop-move-memdv

uefi: Make MEMORY_DESCRIPTOR_VERSION an associated constant

Author: phip1611

CHANGELOG.md

@@ -41,6 +41,8 @@
   method has been removed; usually the `guid!` macro is a more convenient
   choice, but `new` or `from_bytes` can also be used if needed. There are also a
   number of new `Guid` methods.
+- The `MEMORY_DESCRIPTOR_VERSION` constant has been moved to
+  `MemoryDescriptor::VERSION`.
 
 ## uefi-macros - [Unreleased]
 

uefi/src/table/boot.rs

@@ -1893,9 +1893,6 @@ impl MemoryType {
     }
 }
 
-/// Memory descriptor version number
-pub const MEMORY_DESCRIPTOR_VERSION: u32 = 1;
-
 /// A structure describing a region of memory.
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
@@ -1912,6 +1909,11 @@ pub struct MemoryDescriptor {
     pub att: MemoryAttribute,
 }
 
+impl MemoryDescriptor {
+    /// Memory descriptor version number.
+    pub const VERSION: u32 = 1;
+}
+
 impl Default for MemoryDescriptor {
     fn default() -> MemoryDescriptor {
         MemoryDescriptor {

uefi/src/table/system.rs

@@ -316,7 +316,7 @@ impl SystemTable<Runtime> {
         // See https://rust-lang.github.io/unsafe-code-guidelines/layout/arrays-and-slices.html
         let map_size = core::mem::size_of_val(map);
         let entry_size = core::mem::size_of::<MemoryDescriptor>();
-        let entry_version = crate::table::boot::MEMORY_DESCRIPTOR_VERSION;
+        let entry_version = MemoryDescriptor::VERSION;
         let map_ptr = map.as_mut_ptr();
         ((*(*self.table).runtime).set_virtual_address_map)(
             map_size,