uefi: Convert uses of MtftpInfo to PxeBaseCodeMtftpInfo in pxe::BaseCode

This is an intermediate step towards using the uefi-raw definition of the
protocol.

Author: nicholasbishop

uefi/src/proto/network/pxe.rs

@@ -14,7 +14,9 @@ use core::iter::from_fn;
 use core::mem::MaybeUninit;
 use core::ptr::{self, null, null_mut};
 use ptr_meta::Pointee;
-use uefi_raw::protocol::network::pxe::{PxeBaseCodePacket, PxeBaseCodeTftpOpcode};
+use uefi_raw::protocol::network::pxe::{
+    PxeBaseCodeMtftpInfo, PxeBaseCodePacket, PxeBaseCodeTftpOpcode,
+};
 use uefi_raw::{Boolean, Char8};
 
 pub use uefi_raw::protocol::network::pxe::{
@@ -48,7 +50,7 @@ pub struct BaseCode {
         block_size: Option<&usize>,
         server_ip: *const uefi_raw::IpAddress,
         filename: *const Char8,
-        info: Option<&MtftpInfo>,
+        info: *const PxeBaseCodeMtftpInfo,
         dont_use_buffer: Boolean,
     ) -> Status,
     udp_write: unsafe extern "efiapi" fn(
@@ -163,7 +165,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 cstr8_to_ptr(filename),
-                None,
+                null(),
                 Boolean::FALSE,
             )
         };
@@ -194,7 +196,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 cstr8_to_ptr(filename),
-                None,
+                null(),
                 dont_use_buffer,
             )
         };
@@ -222,7 +224,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 cstr8_to_ptr(filename),
-                None,
+                null(),
                 Boolean::FALSE,
             )
         }
@@ -250,7 +252,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 cstr8_to_ptr(directory_name),
-                None,
+                null(),
                 Boolean::FALSE,
             )
         };
@@ -323,7 +325,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 cstr8_to_ptr(filename),
-                Some(info),
+                info.as_raw_ptr(),
                 Boolean::FALSE,
             )
         };
@@ -355,7 +357,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 cstr8_to_ptr(filename),
-                Some(info),
+                info.as_raw_ptr(),
                 dont_use_buffer,
             )
         };
@@ -383,7 +385,7 @@ impl BaseCode {
                 None,
                 server_ip.as_raw_ptr(),
                 null_mut(),
-                Some(info),
+                info.as_raw_ptr(),
                 Boolean::FALSE,
             )
         };
@@ -829,6 +831,12 @@ pub struct MtftpInfo {
     pub transmit_timeout: u16,
 }
 
+impl MtftpInfo {
+    const fn as_raw_ptr(&self) -> *const PxeBaseCodeMtftpInfo {
+        ptr::from_ref(self).cast()
+    }
+}
+
 /// IP receive filter settings
 ///
 /// Corresponds to the `EFI_PXE_BASE_CODE_IP_FILTER` type in the C API.