uefi: Use uefi-raw's file_system module

Author: nicholasbishop

uefi/src/proto/media/file/info.rs

@@ -1,7 +1,7 @@
 use super::FileAttribute;
 use crate::data_types::Align;
 use crate::table::runtime::Time;
-use crate::{guid, CStr16, Char16, Guid, Identify};
+use crate::{CStr16, Char16, Guid, Identify};
 use core::ffi::c_void;
 use core::fmt::{self, Display, Formatter};
 use core::{mem, ptr};
@@ -266,7 +266,7 @@ impl Align for FileInfo {
 }
 
 unsafe impl Identify for FileInfo {
-    const GUID: Guid = guid!("09576e92-6d3f-11d2-8e39-00a0c969723b");
+    const GUID: Guid = uefi_raw::protocol::file_system::FileInfo::ID;
 }
 
 impl InfoInternal for FileInfo {
@@ -361,7 +361,7 @@ impl Align for FileSystemInfo {
 }
 
 unsafe impl Identify for FileSystemInfo {
-    const GUID: Guid = guid!("09576e93-6d3f-11d2-8e39-00a0c969723b");
+    const GUID: Guid = uefi_raw::protocol::file_system::FileSystemInfo::ID;
 }
 
 impl InfoInternal for FileSystemInfo {
@@ -412,7 +412,7 @@ impl Align for FileSystemVolumeLabel {
 }
 
 unsafe impl Identify for FileSystemVolumeLabel {
-    const GUID: Guid = guid!("db47d7d3-fe81-11d3-9a35-0090273fc14d");
+    const GUID: Guid = uefi_raw::protocol::file_system::FileSystemVolumeLabel::ID;
 }
 
 impl InfoInternal for FileSystemVolumeLabel {

uefi/src/proto/media/file/mod.rs

@@ -11,7 +11,6 @@ mod info;
 mod regular;
 
 use crate::{CStr16, Char16, Guid, Result, Status, StatusExt};
-use bitflags::bitflags;
 use core::ffi::c_void;
 use core::fmt::Debug;
 use core::{mem, ptr};
@@ -26,6 +25,7 @@ pub use self::info::{
     FromUefi,
 };
 pub use self::regular::RegularFile;
+pub use uefi_raw::protocol::file_system::FileAttribute;
 
 /// Common interface to `FileHandle`, `RegularFile`, and `Directory`.
 ///
@@ -395,26 +395,6 @@ pub enum FileMode {
     CreateReadWrite = (1 << 63) | 2 | 1,
 }
 
-bitflags! {
-    /// Attributes describing the properties of a file on the file system.
-    #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-    #[repr(transparent)]
-    pub struct FileAttribute: u64 {
-        /// File can only be opened in [`FileMode::READ`] mode.
-        const READ_ONLY = 1;
-        /// Hidden file, not normally visible to the user.
-        const HIDDEN = 1 << 1;
-        /// System file, indicates this file is an internal operating system file.
-        const SYSTEM = 1 << 2;
-        /// This file is a directory.
-        const DIRECTORY = 1 << 4;
-        /// This file is compressed.
-        const ARCHIVE = 1 << 5;
-        /// Mask combining all the valid attributes.
-        const VALID_ATTR = 0x37;
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

uefi/src/proto/media/fs.rs

@@ -1,9 +1,10 @@
 //! File system support protocols.
 
-use super::file::{Directory, FileHandle, FileImpl};
+use super::file::{Directory, FileHandle};
 use crate::proto::unsafe_protocol;
-use crate::{Result, Status, StatusExt};
+use crate::{Result, StatusExt};
 use core::ptr;
+use uefi_raw::protocol::file_system::SimpleFileSystemProtocol;
 
 /// Allows access to a FAT-12/16/32 file system.
 ///
@@ -20,13 +21,9 @@ use core::ptr;
 /// [`BootServices::get_image_file_system`]: crate::table::boot::BootServices::get_image_file_system
 /// [`BootServices`]: crate::table::boot::BootServices#accessing-protocols
 #[derive(Debug)]
-#[repr(C)]
-#[unsafe_protocol("964e5b22-6459-11d2-8e39-00a0c969723b")]
-pub struct SimpleFileSystem {
-    revision: u64,
-    open_volume:
-        extern "efiapi" fn(this: &mut SimpleFileSystem, root: &mut *mut FileImpl) -> Status,
-}
+#[repr(transparent)]
+#[unsafe_protocol(SimpleFileSystemProtocol::GUID)]
+pub struct SimpleFileSystem(SimpleFileSystemProtocol);
 
 impl SimpleFileSystem {
     /// Open the root directory on a volume.
@@ -49,7 +46,7 @@ impl SimpleFileSystem {
     /// * [`uefi::Status::MEDIA_CHANGED`]
     pub fn open_volume(&mut self) -> Result<Directory> {
         let mut ptr = ptr::null_mut();
-        (self.open_volume)(self, &mut ptr)
-            .to_result_with_val(|| unsafe { Directory::new(FileHandle::new(ptr)) })
+        unsafe { (self.0.open_volume)(&mut self.0, &mut ptr) }
+            .to_result_with_val(|| unsafe { Directory::new(FileHandle::new(ptr.cast())) })
     }
 }