X-Git-Url: https://code.delx.au/refind/blobdiff_plain/4677259a82b13dd1ab9fb6696d0ffe8976aeae34..feac8e01e8dd381f6d3713cee73c8865561c96d5:/filesystems/fsw_efi.c diff --git a/filesystems/fsw_efi.c b/filesystems/fsw_efi.c index 30982c3..f2cb4fe 100644 --- a/filesystems/fsw_efi.c +++ b/filesystems/fsw_efi.c @@ -1,23 +1,9 @@ -/* $Id: fsw_efi.c 29125 2010-05-06 09:43:05Z vboxsync $ */ -/** @file - * fsw_efi.c - EFI host environment code. - */ - -/* - * Copyright (C) 2010 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +/** + * \file fsw_efi.c + * EFI host environment code. */ /*- - * This code is based on: - * * Copyright (c) 2006 Christoph Pfisterer * * Redistribution and use in source and binary forms, with or without @@ -48,6 +34,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Changes by Roderick Smith are licensed under the preceding terms. + */ #include "fsw_efi.h" #include "fsw_core.h" @@ -60,17 +49,8 @@ #define DEBUG_LEVEL 0 #ifndef FSTYPE -#error FSTYPE must be defined! -#endif - -#define DEBUG_VBFS 1 - -#if DEBUG_VBFS==2 -#define DBG(x...) AsciiPrint(x) -#elif DEBUG_VBFS==1 -#define DBG(x...) BootLog(x) -#else -#define DBG(x...) +/** The file system type name to use. */ +#define FSTYPE ext2 #endif #ifdef __MAKEWITH_GNUEFI @@ -87,18 +67,18 @@ EFI_GUID gEfiDriverBindingProtocolGuid = EFI_DRIVER_BINDING_PROTOCOL_GUID; EFI_GUID gEfiComponentNameProtocolGuid = EFI_COMPONENT_NAME_PROTOCOL_GUID; -EFI_GUID gEfiDiskIoProtocolGuid = EFI_DISK_IO_PROTOCOL_GUID; -EFI_GUID gEfiBlockIoProtocolGuid = EFI_BLOCK_IO_PROTOCOL_GUID; +extern EFI_GUID gEfiDiskIoProtocolGuid = EFI_DISK_IO_PROTOCOL_GUID; +extern EFI_GUID gEfiBlockIoProtocolGuid = EFI_BLOCK_IO_PROTOCOL_GUID; EFI_GUID gEfiFileInfoGuid = EFI_FILE_INFO_ID; EFI_GUID gEfiFileSystemInfoGuid = EFI_FILE_SYSTEM_INFO_ID; EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid = EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID; -#define SimpleFileSystemProtocol FileSystemProtocol +#define gEfiSimpleFileSystemProtocolGuid FileSystemProtocol #endif /** Helper macro for stringification. */ #define FSW_EFI_STRINGIFY(x) #x /** Expands to the EFI driver name given the file system type name. */ -#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.7.8 " FSW_EFI_STRINGIFY(t) L" File System Driver" +#define FSW_EFI_DRIVER_NAME(t) L"rEFInd 0.8.4 " FSW_EFI_STRINGIFY(t) L" File System Driver" // function prototypes @@ -214,7 +194,6 @@ struct fsw_host_table fsw_efi_host_table = { extern struct fsw_fstype_table FSW_FSTYPE_TABLE_NAME(FSTYPE); -//#include "OverrideFunctions-kabyl.edk2.c.include" static VOID EFIAPI fsw_efi_clear_cache(VOID) { int i; @@ -302,7 +281,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Supported(IN EFI_DRIVER_BINDING_PROTOCOL // first, open DiskIO Status = refit_call6_wrapper(BS->OpenProtocol, ControllerHandle, - &PROTO_NAME(DiskIoProtocol), + &gEfiDiskIoProtocolGuid, (VOID **) &DiskIo, This->DriverBindingHandle, ControllerHandle, @@ -312,13 +291,13 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Supported(IN EFI_DRIVER_BINDING_PROTOCOL // we were just checking, close it again refit_call4_wrapper(BS->CloseProtocol, ControllerHandle, - &PROTO_NAME(DiskIoProtocol), + &gEfiDiskIoProtocolGuid, This->DriverBindingHandle, ControllerHandle); // next, check BlockIO without actually opening it Status = refit_call6_wrapper(BS->OpenProtocol, ControllerHandle, - &PROTO_NAME(BlockIoProtocol), + &gEfiBlockIoProtocolGuid, NULL, This->DriverBindingHandle, ControllerHandle, @@ -354,7 +333,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Start(IN EFI_DRIVER_BINDING_PROTOCOL *T // open consumed protocols Status = refit_call6_wrapper(BS->OpenProtocol, ControllerHandle, - &PROTO_NAME(BlockIoProtocol), + &gEfiBlockIoProtocolGuid, (VOID **) &BlockIo, This->DriverBindingHandle, ControllerHandle, @@ -365,12 +344,13 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Start(IN EFI_DRIVER_BINDING_PROTOCOL *T } Status = refit_call6_wrapper(BS->OpenProtocol, ControllerHandle, - &PROTO_NAME(DiskIoProtocol), + &gEfiDiskIoProtocolGuid, (VOID **) &DiskIo, This->DriverBindingHandle, ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER); if (EFI_ERROR(Status)) { + Print(L"Fsw ERROR: OpenProtocol(DiskIo) returned %x\n", Status); return Status; } @@ -392,7 +372,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Start(IN EFI_DRIVER_BINDING_PROTOCOL *T Volume->FileSystem.Revision = EFI_FILE_IO_INTERFACE_REVISION; Volume->FileSystem.OpenVolume = fsw_efi_FileSystem_OpenVolume; Status = refit_call4_wrapper(BS->InstallMultipleProtocolInterfaces, &ControllerHandle, - &PROTO_NAME(SimpleFileSystemProtocol), + &gEfiSimpleFileSystemProtocolGuid, &Volume->FileSystem, NULL); if (EFI_ERROR(Status)) { @@ -407,7 +387,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Start(IN EFI_DRIVER_BINDING_PROTOCOL *T FreePool(Volume); refit_call4_wrapper(BS->CloseProtocol, ControllerHandle, - &PROTO_NAME(DiskIoProtocol), + &gEfiDiskIoProtocolGuid, This->DriverBindingHandle, ControllerHandle); } @@ -440,7 +420,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Stop(IN EFI_DRIVER_BINDING_PROTOCOL *T // get the installed SimpleFileSystem interface Status = refit_call6_wrapper(BS->OpenProtocol, ControllerHandle, - &PROTO_NAME(SimpleFileSystemProtocol), + &gEfiSimpleFileSystemProtocolGuid, (VOID **) &FileSystem, This->DriverBindingHandle, ControllerHandle, @@ -453,7 +433,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Stop(IN EFI_DRIVER_BINDING_PROTOCOL *T // uninstall Simple File System protocol Status = refit_call4_wrapper(BS->UninstallMultipleProtocolInterfaces, ControllerHandle, - &PROTO_NAME(SimpleFileSystemProtocol), &Volume->FileSystem, + &gEfiSimpleFileSystemProtocolGuid, &Volume->FileSystem, NULL); if (EFI_ERROR(Status)) { // Print(L"Fsw ERROR: UninstallMultipleProtocolInterfaces returned %x\n", Status); @@ -470,7 +450,7 @@ EFI_STATUS EFIAPI fsw_efi_DriverBinding_Stop(IN EFI_DRIVER_BINDING_PROTOCOL *T // close the consumed protocols Status = refit_call4_wrapper(BS->CloseProtocol, ControllerHandle, - &PROTO_NAME(DiskIoProtocol), + &gEfiDiskIoProtocolGuid, This->DriverBindingHandle, ControllerHandle); @@ -556,6 +536,7 @@ fsw_status_t fsw_efi_read_block(struct fsw_volume *vol, fsw_u64 phys_bno, void * i = 0; do { if ((Caches[i].Volume == Volume) && + (Caches[i].CacheValid == TRUE) && (StartRead >= Caches[i].CacheStart) && ((StartRead + vol->phys_blocksize) <= (Caches[i].CacheStart + CACHE_SIZE))) { ReadCache = i; @@ -568,6 +549,7 @@ fsw_status_t fsw_efi_read_block(struct fsw_volume *vol, fsw_u64 phys_bno, void * if (LastRead == -1) LastRead = 1; ReadCache = 1 - LastRead; // NOTE: If NUM_CACHES > 2, this must become more complex + Caches[ReadCache].CacheValid = FALSE; if (Caches[ReadCache].Cache == NULL) Caches[ReadCache].Cache = AllocatePool(CACHE_SIZE); if (Caches[ReadCache].Cache != NULL) { @@ -586,7 +568,7 @@ fsw_status_t fsw_efi_read_block(struct fsw_volume *vol, fsw_u64 phys_bno, void * } // if cache memory allocated } // if (ReadCache < 0) - if (Caches[ReadCache].Cache != NULL) { + if (Caches[ReadCache].Cache != NULL && Caches[ReadCache].CacheValid == TRUE) { CopyMem(buffer, &Caches[ReadCache].Cache[StartRead - Caches[ReadCache].CacheStart], vol->phys_blocksize); } else { ReadOneBlock = TRUE;