Refinements, mostly to shim/MOK support.

[refind] / refind / mok.h

diff --git a/refind/mok.h b/refind/mok.h
index 8a1967007f90fcf35da0b8d78a85c63cba7314df..c398353b52de263485177c3d5ae4aae974a63269 100644 (file)
--- a/refind/mok.h
+++ b/refind/mok.h
@@ -4,40 +4,7 @@
 #define SHIM_LOCK_GUID \
    { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
 
-//#define INTERFACE_DECL(x)
-
-// INTERFACE_DECL(_SHIM_LOCK);
-// 
-// typedef
-// EFI_STATUS
-// (*EFI_SHIM_LOCK_VERIFY) (
-//    IN VOID *buffer,
-//    IN UINT32 size
-//    );
-// 
-// typedef
-// EFI_STATUS
-// (*EFI_SHIM_LOCK_HASH) (
-//    IN char *data,
-//    IN int datasize,
-//    GNUEFI_PE_COFF_LOADER_IMAGE_CONTEXT *context,
-//    UINT8 *sha256hash,
-//    UINT8 *sha1hash
-//    );
-// 
-// typedef
-// EFI_STATUS
-// (*EFI_SHIM_LOCK_CONTEXT) (
-//    IN VOID *data,
-//    IN unsigned int datasize,
-//    GNUEFI_PE_COFF_LOADER_IMAGE_CONTEXT *context
-//    );
-// 
-// typedef struct _SHIM_LOCK {
-//    EFI_SHIM_LOCK_VERIFY Verify;
-//    EFI_SHIM_LOCK_HASH Hash;
-//    EFI_SHIM_LOCK_CONTEXT Context;
-// } SHIM_LOCK;
+#if defined(EFIX64)
 
 typedef struct _SHIM_LOCK
 {
@@ -49,5 +16,8 @@ typedef struct _SHIM_LOCK
                                                         GNUEFI_PE_COFF_LOADER_IMAGE_CONTEXT *context);
 } SHIM_LOCK;
 
+#endif
+
+BOOLEAN secure_mode (VOID);
 EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath, VOID *data, UINTN datasize,
-                       CHAR16 *Options, REFIT_VOLUME *DeviceVolume);
+                       CHAR16 *Options, REFIT_VOLUME *DeviceVolume, IN EFI_DEVICE_PATH *DevicePath);