3
3
use core:: {
4
4
ffi:: c_void,
5
5
iter:: from_fn,
6
- ptr:: { null, null_mut, NonNull } ,
6
+ ptr:: { null, null_mut} ,
7
7
} ;
8
8
9
9
use bitflags:: bitflags;
@@ -53,7 +53,7 @@ pub struct BaseCode {
53
53
header_size : Option < & usize > ,
54
54
header_ptr : * const c_void ,
55
55
buffer_size : & usize ,
56
- buffer_ptr : NonNull < c_void > ,
56
+ buffer_ptr : * const c_void ,
57
57
) -> Status ,
58
58
udp_read : unsafe extern "efiapi" fn (
59
59
this : & Self ,
@@ -65,7 +65,7 @@ pub struct BaseCode {
65
65
header_size : Option < & usize > ,
66
66
header_ptr : * mut c_void ,
67
67
buffer_size : & mut usize ,
68
- buffer_ptr : NonNull < c_void > ,
68
+ buffer_ptr : * mut c_void ,
69
69
) -> Status ,
70
70
set_ip_filter : extern "efiapi" fn ( this : & Self , new_filter : & IpFilter ) -> Status ,
71
71
arp : extern "efiapi" fn (
@@ -101,7 +101,7 @@ pub struct BaseCode {
101
101
new_pxe_reply : Option < & Packet > ,
102
102
new_pxe_bis_reply : Option < & Packet > ,
103
103
) -> Status ,
104
- mode : NonNull < Mode > ,
104
+ mode : * const Mode ,
105
105
}
106
106
107
107
impl BaseCode {
@@ -486,7 +486,7 @@ impl BaseCode {
486
486
header_size,
487
487
header_ptr,
488
488
& buffer. len ( ) ,
489
- NonNull :: from ( & buffer[ 0 ] ) . cast ( ) ,
489
+ ( & buffer[ 0 ] as * const u8 ) . cast ( ) ,
490
490
)
491
491
}
492
492
. into ( )
@@ -525,7 +525,7 @@ impl BaseCode {
525
525
header_size,
526
526
header_ptr,
527
527
& mut buffer_size,
528
- NonNull :: from ( & buffer[ 0 ] ) . cast ( ) ,
528
+ ( & mut buffer[ 0 ] as * mut u8 ) . cast ( ) ,
529
529
)
530
530
} ;
531
531
Result :: from ( status) ?;
@@ -612,7 +612,7 @@ impl BaseCode {
612
612
613
613
/// Returns a reference to the `Mode` struct.
614
614
pub fn mode ( & self ) -> & Mode {
615
- unsafe { self . mode . as_ref ( ) }
615
+ unsafe { & * self . mode }
616
616
}
617
617
}
618
618
0 commit comments