Merge pull request #1962 from rust-osdev/ai-spec-fixes

uefi-raw: various spec fixes

Author: nicholasbishop

uefi-raw/src/firmware_storage.rs

@@ -74,7 +74,7 @@ bitflags! {
         const ALIGNMENT_64 = 0x0006_0000;
         const ALIGNMENT_128 = 0x0007_0000;
         const ALIGNMENT_256 = 0x0008_0000;
-        const ALIGNMENT_512 = 0x0008_0000;
+        const ALIGNMENT_512 = 0x0009_0000;
         const ALIGNMENT_1K = 0x000a_0000;
         const ALIGNMENT_2K = 0x000b_0000;
         const ALIGNMENT_4K = 0x000c_0000;

uefi-raw/src/net.rs

@@ -261,7 +261,7 @@ impl MacAddress {
     #[must_use]
     pub fn into_ethernet_addr(self) -> [u8; 6] {
         let mut buffer = [0; 6];
-        buffer.copy_from_slice(&self.octets()[6..]);
+        buffer.copy_from_slice(&self.octets()[..6]);
         buffer
     }
 }
@@ -328,6 +328,29 @@ mod tests {
         assert_eq!(unsafe { uefi_addr.v6.0 }, TEST_IPV6);
     }
 
+    /// Test conversions between `MacAddress` and octet arrays.
+    #[test]
+    fn test_mac_addr_conversion() {
+        let ethernet_octets = [0, 1, 2, 3, 4, 5];
+        let mut padded_octets = [0; 32];
+        padded_octets[..6].copy_from_slice(&ethernet_octets);
+
+        let efi_mac_addr = MacAddress::from(ethernet_octets);
+        assert_eq!(efi_mac_addr.octets(), padded_octets);
+        assert_eq!(<[u8; 6]>::from(efi_mac_addr), ethernet_octets);
+        assert_eq!(efi_mac_addr.into_ethernet_addr(), ethernet_octets);
+
+        let efi_octets = [
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+            24, 25, 26, 27, 28, 29, 30, 31,
+        ];
+
+        let efi_mac_addr = MacAddress::from(efi_octets);
+        assert_eq!(efi_mac_addr.octets(), efi_octets);
+        assert_eq!(<[u8; 6]>::from(efi_mac_addr), ethernet_octets);
+        assert_eq!(efi_mac_addr.into_ethernet_addr(), ethernet_octets);
+    }
+
     // Ensure that our IpAddress type can be put into a packed struct,
     // even when it is normally 4 byte aligned.
     #[test]

uefi-raw/src/protocol/console.rs

@@ -184,8 +184,8 @@ pub struct SimplePointerMode {
     pub resolution_x: u64,
     pub resolution_y: u64,
     pub resolution_z: u64,
-    pub left_button: u8,
-    pub right_button: u8,
+    pub left_button: Boolean,
+    pub right_button: Boolean,
 }
 
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]

uefi-raw/src/protocol/hii/config.rs

@@ -172,7 +172,7 @@ pub struct HiiConfigRoutingProtocol {
     pub config_to_block: unsafe extern "efiapi" fn(
         this: *const Self,
         config_resp: *const Char16,
-        block: *mut *const u8,
+        block: *mut u8,
         block_size: *mut usize,
         progress: *mut *const Char16,
     ) -> Status,

uefi-raw/src/protocol/hii/string.rs

@@ -24,7 +24,7 @@ pub struct HiiStringProtocol {
         language: *const Char8,
         package_list: HiiHandle,
         string_id: StringId,
-        string: *mut *mut Char16,
+        string: *mut Char16,
         string_size: *mut usize,
         string_font_info: *mut *mut FontInfo,
     ) -> Status,

uefi-raw/src/protocol/network/snp.rs

@@ -403,6 +403,6 @@ newtype_enum! {
         /// The interface has been initialized
         INITIALIZED = 2,
         /// No state can have a number higher than this
-        MAX_STATE = 4,
+        MAX_STATE = 3,
     }
 }

uefi-raw/src/protocol/shell.rs

@@ -29,7 +29,7 @@ pub struct ShellFileInfo {
     pub full_name: *mut Char16,
     pub file_name: *mut Char16,
     pub handle: ShellFileHandle,
-    pub info: FileInfo,
+    pub info: *mut FileInfo,
 }
 
 bitflags! {

uefi-raw/src/protocol/tcg/v2.rs

@@ -13,7 +13,7 @@
 //! [TPM]: https://en.wikipedia.org/wiki/Trusted_Platform_Module
 
 use super::EventType;
-use crate::{Guid, PhysicalAddress, Status, guid};
+use crate::{Boolean, Guid, PhysicalAddress, Status, guid};
 use bitflags::bitflags;
 use core::ffi::c_void;
 
@@ -151,7 +151,7 @@ pub struct Tcg2Protocol {
         event_log_format: Tcg2EventLogFormat,
         event_log_location: *mut PhysicalAddress,
         event_log_last_entry: *mut PhysicalAddress,
-        event_log_truncated: *mut u8,
+        event_log_truncated: *mut Boolean,
     ) -> Status,
 
     pub hash_log_extend_event: unsafe extern "efiapi" fn(

uefi-raw/src/protocol/usb/host_controller.rs

@@ -111,6 +111,11 @@ pub struct Usb2HostControllerProtocol {
         this: *const Self,
         max_speed: *mut Speed,
         port_number: *mut u8,
+        // [`Boolean::TRUE`] if the controller supports 64-bit memory
+        // addressing, [`Boolean::false`] otherwise.
+        //
+        // Effectively this is treated like a [`Boolean`] but the spec types it
+        // as `u8`.
         is_64_bit_capable: *mut u8,
     ) -> Status,
     pub reset: unsafe extern "efiapi" fn(this: *mut Self, attributes: ResetAttributes) -> Status,

uefi-raw/src/table/header.rs

@@ -12,7 +12,7 @@ pub struct Header {
     pub revision: Revision,
     /// The size in bytes of the entire table.
     pub size: u32,
-    /// 32-bit CRC-32-Castagnoli of the entire table,
+    /// 32-bit CRC of the entire table using polynomial `0x04c11db7`,
     /// calculated with this field set to 0.
     pub crc: u32,
     /// Reserved field that must be set to 0.