tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a migration bug in Fat driver as the value of lock has been changed from EDK library to EDKII library 

(based on FatPkg commit c243d2ce08e76bfaefc0a3e9256603993a3b5ebe)

[jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD]
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Mark Doran <mark.doran@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Qing Huang 2010-03-18 01:56:21 +00:00 committed by Jordan Justen
parent e8e7878f0d
commit 25ce9b1f06
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FatPkg/EnhancedFatDxe/Fat.h
View File

@ -1,6 +1,6 @@
/*++
Copyright (c) 2005 - 2009, Intel Corporation
Copyright (c) 2005 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
@ -783,8 +783,8 @@ FatReleaseLock (
VOID
);
BOOLEAN
FatIsLocked (
EFI_STATUS
FatAcquireLockOrFail (
VOID
);

10
FatPkg/EnhancedFatDxe/Init.c
View File

@ -1,6 +1,6 @@
/*++
Copyright (c) 2005 - 2007, Intel Corporation
Copyright (c) 2005 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
@ -64,8 +64,8 @@ Returns:
// Acquire the lock.
// If caller has already acquired the lock, cannot lock it again.
//
if (!FatIsLocked ()) {
FatAcquireLock ();
Status = FatAcquireLockOrFail ();
if (!EFI_ERROR (Status)) {
LockedByMe = TRUE;
}
//
@ -180,9 +180,9 @@ Returns:
// means we are in the process of some Fat operation),
// we can not acquire again.
//
if (!FatIsLocked ()) {
Status = FatAcquireLockOrFail ();
if (!EFI_ERROR (Status)) {
LockedByMe = TRUE;
FatAcquireLock ();
}
//
// The volume is still being used. Hence, set error flag for all OFiles still in

16
FatPkg/EnhancedFatDxe/Misc.c
View File

@ -1,6 +1,6 @@
/*++
Copyright (c) 2005, Intel Corporation
Copyright (c) 2005 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
@ -140,15 +140,17 @@ Returns:
EfiAcquireLock (&FatFsLock);
}
BOOLEAN
FatIsLocked (
EFI_STATUS
FatAcquireLockOrFail (
VOID
)
/*++
Routine Description:
Get the locking status of the volume.
Lock the volume.
If the lock is already in the acquired state, then EFI_ACCESS_DENIED is returned.
Otherwise, EFI_SUCCESS is returned.
Arguments:
@ -156,12 +158,12 @@ Arguments:
Returns:
TRUE - The volume is locked.
FALSE - The volume is not locked.
EFI_SUCCESS - The volume is locked.
EFI_ACCESS_DENIED - The volume could not be locked because it is already locked.
--*/
{
return (BOOLEAN) (FatFsLock.Lock);
return EfiAcquireLockOrFail (&FatFsLock);
}
VOID