Skip to content

Commit 82f301f

Browse files
committed
efi: Cleanup stubbed functions
For stubbed out functions remove debug messages and in some cases return more appropriate result than EFI_UNSUPPORTED. Signed-off-by: Rob Bradford <robert.bradford@intel.com>
1 parent bbde7f2 commit 82f301f

File tree

1 file changed

+22
-58
lines changed

1 file changed

+22
-58
lines changed

src/efi/mod.rs

Lines changed: 22 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,21 @@ static mut BLOCK_WRAPPERS: block::BlockWrappers = block::BlockWrappers {
6262

6363
#[cfg(not(test))]
6464
pub extern "win64" fn get_time(_: *mut Time, _: *mut TimeCapabilities) -> Status {
65-
crate::log!("EFI_STUB: get_time\n");
66-
Status::UNSUPPORTED
65+
Status::DEVICE_ERROR
6766
}
6867

6968
#[cfg(not(test))]
7069
pub extern "win64" fn set_time(_: *mut Time) -> Status {
71-
crate::log!("EFI_STUB: set_time\n");
72-
Status::UNSUPPORTED
70+
Status::DEVICE_ERROR
7371
}
7472

7573
#[cfg(not(test))]
7674
pub extern "win64" fn get_wakeup_time(_: *mut Boolean, _: *mut Boolean, _: *mut Time) -> Status {
77-
crate::log!("EFI_STUB: get_wakeup_time\n");
7875
Status::UNSUPPORTED
7976
}
8077

8178
#[cfg(not(test))]
8279
pub extern "win64" fn set_wakeup_time(_: Boolean, _: *mut Time) -> Status {
83-
crate::log!("EFI_STUB: set_wakeup_time\n");
8480
Status::UNSUPPORTED
8581
}
8682

@@ -106,7 +102,6 @@ pub extern "win64" fn set_virtual_address_map(
106102

107103
#[cfg(not(test))]
108104
pub extern "win64" fn convert_pointer(_: usize, _: *mut *mut c_void) -> Status {
109-
crate::log!("EFI_STUB: convert_pointer\n");
110105
Status::UNSUPPORTED
111106
}
112107

@@ -143,8 +138,7 @@ pub extern "win64" fn set_variable(
143138

144139
#[cfg(not(test))]
145140
pub extern "win64" fn get_next_high_mono_count(_: *mut u32) -> Status {
146-
crate::log!("EFI_STUB: get_next_high_mono_count\n");
147-
Status::UNSUPPORTED
141+
Status::DEVICE_ERROR
148142
}
149143

150144
#[cfg(not(test))]
@@ -158,7 +152,6 @@ pub extern "win64" fn update_capsule(
158152
_: usize,
159153
_: PhysicalAddress,
160154
) -> Status {
161-
crate::log!("EFI_STUB: update_capsule\n");
162155
Status::UNSUPPORTED
163156
}
164157

@@ -169,26 +162,31 @@ pub extern "win64" fn query_capsule_capabilities(
169162
_: *mut u64,
170163
_: *mut ResetType,
171164
) -> Status {
172-
crate::log!("EFI_STUB: query_capsule_capabilities\n");
173165
Status::UNSUPPORTED
174166
}
175167

176168
#[cfg(not(test))]
177-
pub extern "win64" fn query_variable_info(_: u32, _: *mut u64, _: *mut u64, _: *mut u64) -> Status {
178-
crate::log!("EFI_STUB: query_variable_info\n");
179-
Status::UNSUPPORTED
169+
pub extern "win64" fn query_variable_info(
170+
_: u32,
171+
max_storage: *mut u64,
172+
remaining_storage: *mut u64,
173+
max_size: *mut u64,
174+
) -> Status {
175+
unsafe {
176+
*max_storage = 0;
177+
*remaining_storage = 0;
178+
*max_size = 0;
179+
}
180+
Status::SUCCESS
180181
}
181182

182183
#[cfg(not(test))]
183184
pub extern "win64" fn raise_tpl(_: Tpl) -> Tpl {
184-
crate::log!("EFI_STUB: raise_tpl\n");
185185
0
186186
}
187187

188188
#[cfg(not(test))]
189-
pub extern "win64" fn restore_tpl(_: Tpl) {
190-
crate::log!("EFI_STUB: restore_tpl\n");
191-
}
189+
pub extern "win64" fn restore_tpl(_: Tpl) {}
192190

193191
#[cfg(not(test))]
194192
pub extern "win64" fn allocate_pages(
@@ -285,37 +283,31 @@ pub extern "win64" fn create_event(
285283
_: *mut c_void,
286284
_: *mut Event,
287285
) -> Status {
288-
crate::log!("EFI_STUB: create_event\n");
289286
Status::UNSUPPORTED
290287
}
291288

292289
#[cfg(not(test))]
293290
pub extern "win64" fn set_timer(_: Event, _: TimerDelay, _: u64) -> Status {
294-
crate::log!("EFI_STUB: set_timer\n");
295291
Status::UNSUPPORTED
296292
}
297293

298294
#[cfg(not(test))]
299295
pub extern "win64" fn wait_for_event(_: usize, _: *mut Event, _: *mut usize) -> Status {
300-
crate::log!("EFI_STUB: wait_for_event\n");
301296
Status::UNSUPPORTED
302297
}
303298

304299
#[cfg(not(test))]
305300
pub extern "win64" fn signal_event(_: Event) -> Status {
306-
crate::log!("EFI_STUB: signal_event\n");
307301
Status::UNSUPPORTED
308302
}
309303

310304
#[cfg(not(test))]
311305
pub extern "win64" fn close_event(_: Event) -> Status {
312-
crate::log!("EFI_STUB: close_event\n");
313306
Status::UNSUPPORTED
314307
}
315308

316309
#[cfg(not(test))]
317310
pub extern "win64" fn check_event(_: Event) -> Status {
318-
crate::log!("EFI_STUB: check_event\n");
319311
Status::UNSUPPORTED
320312
}
321313

@@ -350,8 +342,7 @@ pub extern "win64" fn reinstall_protocol_interface(
350342
_: *mut c_void,
351343
_: *mut c_void,
352344
) -> Status {
353-
crate::log!("EFI_STUB: reinstall_protocol_interface\n");
354-
Status::UNSUPPORTED
345+
Status::NOT_FOUND
355346
}
356347

357348
#[cfg(not(test))]
@@ -360,8 +351,7 @@ pub extern "win64" fn uninstall_protocol_interface(
360351
_: *mut Guid,
361352
_: *mut c_void,
362353
) -> Status {
363-
crate::log!("EFI_STUB: uninstall_protocol_interface\n");
364-
Status::UNSUPPORTED
354+
Status::NOT_FOUND
365355
}
366356

367357
#[cfg(not(test))]
@@ -386,7 +376,6 @@ pub extern "win64" fn register_protocol_notify(
386376
_: Event,
387377
_: *mut *mut c_void,
388378
) -> Status {
389-
crate::log!("EFI_STUB: register_protocol_notify\n");
390379
Status::UNSUPPORTED
391380
}
392381

@@ -429,14 +418,11 @@ pub extern "win64" fn locate_handle(
429418

430419
#[cfg(not(test))]
431420
pub extern "win64" fn locate_device_path(_: *mut Guid, _: *mut *mut c_void) -> Status {
432-
crate::log!("EFI_STUB: locate_device_path\n");
433-
Status::UNSUPPORTED
421+
Status::NOT_FOUND
434422
}
435423

436424
#[cfg(not(test))]
437425
pub extern "win64" fn install_configuration_table(_: *mut Guid, _: *mut c_void) -> Status {
438-
crate::log!("EFI_STUB: install_configuration_table\n");
439-
440426
Status::UNSUPPORTED
441427
}
442428

@@ -449,25 +435,21 @@ pub extern "win64" fn load_image(
449435
_: usize,
450436
_: *mut Handle,
451437
) -> Status {
452-
crate::log!("EFI_STUB: load_image\n");
453438
Status::UNSUPPORTED
454439
}
455440

456441
#[cfg(not(test))]
457442
pub extern "win64" fn start_image(_: Handle, _: *mut usize, _: *mut *mut Char16) -> Status {
458-
crate::log!("EFI_STUB: start_image\n");
459443
Status::UNSUPPORTED
460444
}
461445

462446
#[cfg(not(test))]
463447
pub extern "win64" fn exit(_: Handle, _: Status, _: usize, _: *mut Char16) -> Status {
464-
crate::log!("EFI_STUB: exit\n");
465448
Status::UNSUPPORTED
466449
}
467450

468451
#[cfg(not(test))]
469452
pub extern "win64" fn unload_image(_: Handle) -> Status {
470-
crate::log!("EFI_STUB: unload_image\n");
471453
Status::UNSUPPORTED
472454
}
473455

@@ -478,19 +460,16 @@ pub extern "win64" fn exit_boot_services(_: Handle, _: usize) -> Status {
478460

479461
#[cfg(not(test))]
480462
pub extern "win64" fn get_next_monotonic_count(_: *mut u64) -> Status {
481-
crate::log!("EFI_STUB: get_next_monotonic_count\n");
482-
Status::UNSUPPORTED
463+
Status::DEVICE_ERROR
483464
}
484465

485466
#[cfg(not(test))]
486467
pub extern "win64" fn stall(_: usize) -> Status {
487-
crate::log!("EFI_STUB: stall\n");
488468
Status::UNSUPPORTED
489469
}
490470

491471
#[cfg(not(test))]
492472
pub extern "win64" fn set_watchdog_timer(_: usize, _: u64, _: usize, _: *mut Char16) -> Status {
493-
crate::log!("EFI_STUB: set_watchdog_timer\n");
494473
Status::UNSUPPORTED
495474
}
496475

@@ -501,13 +480,11 @@ pub extern "win64" fn connect_controller(
501480
_: *mut c_void,
502481
_: Boolean,
503482
) -> Status {
504-
crate::log!("EFI_STUB: connect_controller\n");
505483
Status::UNSUPPORTED
506484
}
507485

508486
#[cfg(not(test))]
509487
pub extern "win64" fn disconnect_controller(_: Handle, _: Handle, _: Handle) -> Status {
510-
crate::log!("EFI_STUB: disconnect_controller\n");
511488
Status::UNSUPPORTED
512489
}
513490

@@ -577,7 +554,6 @@ pub extern "win64" fn open_protocol(
577554

578555
#[cfg(not(test))]
579556
pub extern "win64" fn close_protocol(_: Handle, _: *mut Guid, _: Handle, _: Handle) -> Status {
580-
crate::log!("EFI_STUB: close_protocol\n");
581557
Status::UNSUPPORTED
582558
}
583559

@@ -588,7 +564,6 @@ pub extern "win64" fn open_protocol_information(
588564
_: *mut *mut OpenProtocolInformationEntry,
589565
_: *mut usize,
590566
) -> Status {
591-
crate::log!("EFI_STUB: open_protocol_information\n");
592567
Status::UNSUPPORTED
593568
}
594569

@@ -598,7 +573,6 @@ pub extern "win64" fn protocols_per_handle(
598573
_: *mut *mut *mut Guid,
599574
_: *mut usize,
600575
) -> Status {
601-
crate::log!("EFI_STUB: protocols_per_handle\n");
602576
Status::UNSUPPORTED
603577
}
604578

@@ -610,13 +584,11 @@ pub extern "win64" fn locate_handle_buffer(
610584
_: *mut usize,
611585
_: *mut *mut Handle,
612586
) -> Status {
613-
crate::log!("EFI_STUB: locate_handle_buffer\n");
614587
Status::UNSUPPORTED
615588
}
616589

617590
#[cfg(not(test))]
618591
pub extern "win64" fn locate_protocol(_: *mut Guid, _: *mut c_void, _: *mut *mut c_void) -> Status {
619-
crate::log!("EFI_STUB: locate_protocol\n");
620592
Status::UNSUPPORTED
621593
}
622594

@@ -626,7 +598,6 @@ pub extern "win64" fn install_multiple_protocol_interfaces(
626598
_: *mut c_void,
627599
_: *mut c_void,
628600
) -> Status {
629-
crate::log!("EFI_STUB: install_multiple_protocol_interfaces\n");
630601
Status::UNSUPPORTED
631602
}
632603

@@ -636,25 +607,19 @@ pub extern "win64" fn uninstall_multiple_protocol_interfaces(
636607
_: *mut c_void,
637608
_: *mut c_void,
638609
) -> Status {
639-
crate::log!("EFI_STUB: uninstall_multiple_protocol_interfaces\n");
640610
Status::UNSUPPORTED
641611
}
642612

643613
#[cfg(not(test))]
644614
pub extern "win64" fn calculate_crc32(_: *mut c_void, _: usize, _: *mut u32) -> Status {
645-
crate::log!("EFI_STUB: calculate_crc32\n");
646615
Status::UNSUPPORTED
647616
}
648617

649618
#[cfg(not(test))]
650-
pub extern "win64" fn copy_mem(_: *mut c_void, _: *mut c_void, _: usize) {
651-
crate::log!("EFI_STUB: copy_mem\n");
652-
}
619+
pub extern "win64" fn copy_mem(_: *mut c_void, _: *mut c_void, _: usize) {}
653620

654621
#[cfg(not(test))]
655-
pub extern "win64" fn set_mem(_: *mut c_void, _: usize, _: u8) {
656-
crate::log!("EFI_STUB: set_mem\n");
657-
}
622+
pub extern "win64" fn set_mem(_: *mut c_void, _: usize, _: u8) {}
658623

659624
#[cfg(not(test))]
660625
pub extern "win64" fn create_event_ex(
@@ -665,7 +630,6 @@ pub extern "win64" fn create_event_ex(
665630
_: *const Guid,
666631
_: *mut Event,
667632
) -> Status {
668-
crate::log!("EFI_STUB: create_event_ex\n");
669633
Status::UNSUPPORTED
670634
}
671635

0 commit comments

Comments
 (0)