From f648e29d050cab362cc660c1a5c5109182028768 Mon Sep 17 00:00:00 2001 From: kavsrf Date: Mon, 23 Jan 2017 15:30:22 +0300 Subject: DcsInfo added DcsBoot is driver now (to support DriverOrder list) --- DcsBoot/DcsBoot.c | 8 ++++++++ DcsBoot/DcsBoot.inf | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'DcsBoot') diff --git a/DcsBoot/DcsBoot.c b/DcsBoot/DcsBoot.c index bccf216..60c8eed 100644 --- a/DcsBoot/DcsBoot.c +++ b/DcsBoot/DcsBoot.c @@ -16,6 +16,7 @@ https://opensource.org/licenses/LGPL-3.0 #include #include #include +#include "DcsConfig.h" EFI_GUID ImagePartGuid; EFI_GUID *gEfiExecPartGuid = &ImagePartGuid; @@ -41,12 +42,19 @@ DcsBootMain( EFI_STATUS res; UINTN len; UINT32 attr; + int drvInst; InitBio(); res = InitFS(); if (EFI_ERROR(res)) { ERR_PRINT(L"InitFS %r\n", res); } + drvInst = ConfigReadInt("DcsDriver", 0); + + if (!FileExist(NULL, L"\\EFI\\VeraCrypt\\PlatformInfo") && + !FileExist(NULL, L"\\EFI\\VeraCrypt\\DcsInfo.dcs")) { + res = EfiExec(NULL, L"\\EFI\\VeraCrypt\\DcsInfo.dcs"); + } // Load all drivers res = EfiExec(NULL, L"\\EFI\\VeraCrypt\\LegacySpeaker.dcs"); diff --git a/DcsBoot/DcsBoot.inf b/DcsBoot/DcsBoot.inf index 9459e92..14d8d0d 100644 --- a/DcsBoot/DcsBoot.inf +++ b/DcsBoot/DcsBoot.inf @@ -16,7 +16,7 @@ INF_VERSION = 0x00010006 BASE_NAME = DcsBoot FILE_GUID = DE8AB4B2-EB47-44E1-A4D7-1001E5E9F0A5 - MODULE_TYPE = UEFI_APPLICATION + MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 ENTRY_POINT = DcsBootMain @@ -36,11 +36,12 @@ DcsPkg/DcsPkg.dec [LibraryClasses] - UefiApplicationEntryPoint + UefiDriverEntryPoint UefiLib BaseLib MemoryAllocationLib CommonLib + VeraCryptLib [Guids] gEfiGlobalVariableGuid -- cgit v1.2.3