diff options
| author | Peter Jones <pjones@redhat.com> | 2017-09-28 14:11:51 -0400 |
|---|---|---|
| committer | Peter Jones <pmjones@gmail.com> | 2018-03-12 16:21:43 -0400 |
| commit | 9fdca5bbe11e384198372b86a6b81d5d9e79fa16 (patch) | |
| tree | fd270546473ce1869fd315d29dc984dcd793d928 /include | |
| parent | 1c2376338d57c900fbc1c2fe6d9c30cfe20e44be (diff) | |
| download | efi-boot-shim-9fdca5bbe11e384198372b86a6b81d5d9e79fa16.tar.gz efi-boot-shim-9fdca5bbe11e384198372b86a6b81d5d9e79fa16.zip | |
Don't use uefi_call_wrapper(), ever.
I'm pretty done with typing uefi_call_wrapper() and counting arguments
every time. Instead, just make the compiler error if we don't have
ms_abi. Also, make it so nothing can use uefi_call_wrapper() directly.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hexdump.h | 4 | ||||
| -rw-r--r-- | include/replacements.h | 2 | ||||
| -rw-r--r-- | include/simple_file.h | 2 | ||||
| -rw-r--r-- | include/tpm.h | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/hexdump.h b/include/hexdump.h index c4ffcaec..df3a17a4 100644 --- a/include/hexdump.h +++ b/include/hexdump.h @@ -90,11 +90,11 @@ hexdump(UINT8 *data, UINTN size) sz = format_hex(data+offset, size-offset, hexbuf); if (sz == 0) return; - uefi_call_wrapper(BS->Stall, 1, 200000); + msleep(200000); format_text(data+offset, size-offset, txtbuf); Print(L"%08x %s %s\n", display_offset, hexbuf, txtbuf); - uefi_call_wrapper(BS->Stall, 1, 200000); + msleep(200000); display_offset += sz; offset += sz; diff --git a/include/replacements.h b/include/replacements.h index 5873a720..ab2a5a58 100644 --- a/include/replacements.h +++ b/include/replacements.h @@ -29,6 +29,8 @@ #ifndef SHIM_REPLACEMENTS_H #define SHIM_REPLACEMENTS_H +extern EFI_SYSTEM_TABLE *get_active_systab(void); + typedef enum { VERIFIED_BY_NOTHING, VERIFIED_BY_CERT, diff --git a/include/simple_file.h b/include/simple_file.h index 8d25a761..7b019654 100644 --- a/include/simple_file.h +++ b/include/simple_file.h @@ -9,8 +9,6 @@ EFI_STATUS simple_file_read_all(EFI_FILE *file, UINTN *size, void **buffer); EFI_STATUS simple_file_write_all(EFI_FILE *file, UINTN size, void *buffer); -void -simple_file_close(EFI_FILE *file); EFI_STATUS simple_dir_read_all(EFI_HANDLE image, CHAR16 *name, EFI_FILE_INFO **Entries, int *count); diff --git a/include/tpm.h b/include/tpm.h index 38642390..746e871f 100644 --- a/include/tpm.h +++ b/include/tpm.h @@ -188,3 +188,4 @@ typedef UINT32 TCG_EVENTTYPE; #define PE_COFF_IMAGE 0x0000000000000010 #endif /* SHIM_TPM_H */ +// vim:fenc=utf-8:tw=75 |