Hi Philippe, It is a different patch. I think this is a case where more than one developer was working in the same area.
I will review the patches from Antoine Cœur <co...@gmx.fr> to see if there are additional fixes that were missed in Sean's patch. Thanks, Mike > -----Original Message----- > From: Philippe Mathieu-Daudé <phi...@redhat.com> > Sent: Monday, October 21, 2019 6:17 AM > To: devel@edk2.groups.io; Kinney, Michael D > <michael.d.kin...@intel.com> > Cc: Sean Brogan <sean.bro...@microsoft.com>; Ni, Ray > <ray...@intel.com> > Subject: Re: [edk2-devel] [Patch] FatPkg: Fix spelling > errors > > Hi Michael, > > On 10/18/19 9:15 PM, Michael D Kinney wrote: > > From: Sean Brogan <sean.bro...@microsoft.com> > > Is a different patch than > https://edk2.groups.io/g/devel/topic/32250614 > or simply the patch author got messed up? > > It should be: Antoine Cœur <co...@gmx.fr> > > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=2264 > > > > Cc: Ray Ni <ray...@intel.com> > > Signed-off-by: Michael D Kinney > <michael.d.kin...@intel.com> > > --- > > FatPkg/EnhancedFatDxe/DirectoryManage.c | 8 ++++--- > - > > FatPkg/EnhancedFatDxe/DiskCache.c | 2 +- > > FatPkg/EnhancedFatDxe/Fat.h | 20 > ++++++++++---------- > > FatPkg/EnhancedFatDxe/FileName.c | 2 +- > > FatPkg/EnhancedFatDxe/FileSpace.c | 6 +++--- > > FatPkg/EnhancedFatDxe/Info.c | 2 +- > > FatPkg/EnhancedFatDxe/Init.c | 2 +- > > FatPkg/EnhancedFatDxe/Misc.c | 6 +++--- > > FatPkg/EnhancedFatDxe/Open.c | 2 +- > > FatPkg/FatPei/FatLiteApi.c | 6 +++--- > > FatPkg/FatPei/FatLitePeim.h | 4 ++-- > > FatPkg/FatPei/Gpt.c | 2 +- > > FatPkg/FatPei/Mbr.c | 2 +- > > 13 files changed, 32 insertions(+), 32 deletions(-) > > > > diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c > > b/FatPkg/EnhancedFatDxe/DirectoryManage.c > > index 21656883bd..93772dba09 100644 > > --- a/FatPkg/EnhancedFatDxe/DirectoryManage.c > > +++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c > > @@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2- > Clause-Patent > > @param EntryPos - The position of > the directory entry to be accessed. > > @param Entry - The directory > entry read or written. > > > > - @retval EFI_SUCCESS - Access the > directory entry sucessfully. > > + @retval EFI_SUCCESS - Access the > directory entry successfully. > > @return other - An error occurred > when reading the directory entry. > > > > **/ > > @@ -896,7 +896,7 @@ FatNewEntryPos ( > > @param Volume - FAT file system > volume. > > @param Name - The file name of > the volume. > > > > - @retval EFI_SUCCESS - Update the volume > with the directory entry sucessfully. > > + @retval EFI_SUCCESS - Update the volume > with the directory entry successfully. > > @return others - An error occurred > when getting volume label. > > > > **/ > > @@ -927,7 +927,7 @@ FatGetVolumeEntry ( > > @param Volume - FAT file system > volume. > > @param Name - The new file name of > the volume. > > > > - @retval EFI_SUCCESS - Update the Volume > sucessfully. > > + @retval EFI_SUCCESS - Update the Volume > successfully. > > @retval EFI_UNSUPPORTED - The input label is > not a valid volume label. > > @return other - An error occurred > when setting volume label. > > > > @@ -1246,7 +1246,7 @@ FatCloseDirEnt ( > > not be created either). > > @retval EFI_INVALID_PARAMETER - The parameter is > not valid. > > @retval EFI_SUCCESS - Open the file > successfully. > > - @return other - An error occured > when locating the OFile. > > + @return other - An error occurred > when locating the OFile. > > > > **/ > > EFI_STATUS > > diff --git a/FatPkg/EnhancedFatDxe/DiskCache.c > > b/FatPkg/EnhancedFatDxe/DiskCache.c > > index 2df0aa09f1..df587810fb 100644 > > --- a/FatPkg/EnhancedFatDxe/DiskCache.c > > +++ b/FatPkg/EnhancedFatDxe/DiskCache.c > > @@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2- > Clause-Patent > > are older than the contents in disk, so they are > invalid; just mark them invalid. > > > > When this function is called by read command, if > any entry in this > > range > > - is dirty, it means that the relative info directly > readed from > > media is older than > > + is dirty, it means that the relative info directly > read from media > > + is older than > > than the info in the cache; So need to update the > relative info in the Buffer. > > > > @param Volume - FAT file system > volume. > > diff --git a/FatPkg/EnhancedFatDxe/Fat.h > b/FatPkg/EnhancedFatDxe/Fat.h > > index 98ead5a0fb..46c185c3a9 100644 > > --- a/FatPkg/EnhancedFatDxe/Fat.h > > +++ b/FatPkg/EnhancedFatDxe/Fat.h > > @@ -865,7 +865,7 @@ FatCleanupVolume ( > > > > @param OFile - The open file. > > > > - @retval EFI_SUCCESS - Shrinked > sucessfully. > > + @retval EFI_SUCCESS - Shrinked > successfully. > > @retval EFI_VOLUME_CORRUPTED - There are errors > in the file's clusters. > > > > **/ > > @@ -881,7 +881,7 @@ FatShrinkEof ( > > @param OFile - The open file. > > @param NewSizeInBytes - The new size in > bytes of the open file. > > > > - @retval EFI_SUCCESS - The file is grown > sucessfully. > > + @retval EFI_SUCCESS - The file is grown > successfully. > > @retval EFI_UNSUPPORTED - The file size is > larger than 4GB. > > @retval EFI_VOLUME_CORRUPTED - There are errors > in the files' clusters. > > @retval EFI_VOLUME_FULL - The volume is full > and can not grow the file. > > @@ -969,7 +969,7 @@ FatComputeFreeInfo ( > > @param Handle - The handle of > parent device. > > @param DiskIo - The DiskIo of > parent device. > > @param DiskIo2 - The DiskIo2 of > parent device. > > - @param BlockIo - The BlockIo of > parent devicel > > + @param BlockIo - The BlockIo of > parent device. > > > > @retval EFI_SUCCESS - Allocate a new > volume successfully. > > @retval EFI_OUT_OF_RESOURCES - Can not allocate > the memory. > > @@ -1079,7 +1079,7 @@ FatDestroySubtask ( > > @param IFile - The instance of > the open file. > > @param Task - The task to be > executed. > > > > - @retval EFI_SUCCESS - The task was > executed sucessfully. > > + @retval EFI_SUCCESS - The task was > executed successfully. > > @return other - An error occurred > when executing the task. > > > > **/ > > @@ -1097,7 +1097,7 @@ FatQueueTask ( > > @param IoMode - The access mode. > > @param DirtyValue - Set the volume as > dirty or not. > > > > - @retval EFI_SUCCESS - Set the new FAT > entry value sucessfully. > > + @retval EFI_SUCCESS - Set the new FAT > entry value successfully. > > @return other - An error occurred > when operation the FAT entries. > > > > **/ > > @@ -1120,7 +1120,7 @@ FatAccessVolumeDirty ( > > @param Task point to task > instance. > > > > @retval EFI_SUCCESS - The operation is > performed successfully. > > - @retval EFI_VOLUME_CORRUPTED - The accesss is > > + @retval EFI_VOLUME_CORRUPTED - The access is > > @return Others - The status of > read/write the disk > > > > **/ > > @@ -1361,7 +1361,7 @@ FatStriCmp ( > > @retval EFI_SUCCESS - Open the file > successfully. > > @retval EFI_INVALID_PARAMETER - The open mode is > conflict with the attributes > > or the file name is not > valid. > > - @retval EFI_NOT_FOUND - Conficts between > dir intention and attribute. > > + @retval EFI_NOT_FOUND - Conflicts between > dir intention and attribute. > > @retval EFI_WRITE_PROTECTED - Can't open for > write if the volume is read only. > > @retval EFI_ACCESS_DENIED - If the file's > attribute is read only, and the > > open is for read-write > fail it. > > @@ -1710,7 +1710,7 @@ FatCloseDirEnt ( > > not be created either). > > @retval EFI_INVALID_PARAMETER - The parameter is > not valid. > > @retval EFI_SUCCESS - Open the file > successfully. > > - @return other - An error occured > when locating the OFile. > > + @return other - An error occurred > when locating the OFile. > > > > **/ > > EFI_STATUS > > @@ -1728,7 +1728,7 @@ FatLocateOFile ( > > @param Volume - FAT file system > volume. > > @param Name - The file name of > the volume. > > > > - @retval EFI_SUCCESS - Update the volume > with the directory entry sucessfully. > > + @retval EFI_SUCCESS - Update the volume > with the directory entry successfully. > > @return others - An error occurred > when getting volume label. > > > > **/ > > @@ -1745,7 +1745,7 @@ FatGetVolumeEntry ( > > @param Volume - FAT file system > volume. > > @param Name - The new file name of > the volume. > > > > - @retval EFI_SUCCESS - Update the Volume > sucessfully. > > + @retval EFI_SUCCESS - Update the Volume > successfully. > > @retval EFI_UNSUPPORTED - The input label is > not a valid volume label. > > @return other - An error occurred > when setting volume label. > > > > diff --git a/FatPkg/EnhancedFatDxe/FileName.c > > b/FatPkg/EnhancedFatDxe/FileName.c > > index bab709d964..256db30954 100644 > > --- a/FatPkg/EnhancedFatDxe/FileName.c > > +++ b/FatPkg/EnhancedFatDxe/FileName.c > > @@ -100,7 +100,7 @@ FatCheckIs8Dot3Name ( > > > > Trim the trailing blanks of fat name. > > > > - @param Name - The Char8 string > needs to be trimed. > > + @param Name - The Char8 string > needs to be trimmed. > > @param Len - The length of the > fat name. > > > > The real length of the fat name after the trailing > blanks are trimmed. > > diff --git a/FatPkg/EnhancedFatDxe/FileSpace.c > > b/FatPkg/EnhancedFatDxe/FileSpace.c > > index 6659036039..0dd66e0c53 100644 > > --- a/FatPkg/EnhancedFatDxe/FileSpace.c > > +++ b/FatPkg/EnhancedFatDxe/FileSpace.c > > @@ -129,7 +129,7 @@ FatGetFatEntry ( > > @param Index - The index of the > FAT entry of the volume. > > @param Value - The new value of > the FAT entry. > > > > - @retval EFI_SUCCESS - Set the new FAT > entry value sucessfully. > > + @retval EFI_SUCCESS - Set the new FAT > entry value successfully. > > @retval EFI_VOLUME_CORRUPTED - The FAT type of > the volume is error. > > @return other - An error occurred > when operation the FAT entries. > > > > @@ -343,7 +343,7 @@ FatSizeToClusters ( > > > > @param OFile - The open file. > > > > - @retval EFI_SUCCESS - Shrinked > sucessfully. > > + @retval EFI_SUCCESS - Shrinked > successfully. > > @retval EFI_VOLUME_CORRUPTED - There are errors > in the file's clusters. > > > > **/ > > @@ -416,7 +416,7 @@ FatShrinkEof ( > > @param OFile - The open file. > > @param NewSizeInBytes - The new size in > bytes of the open file. > > > > - @retval EFI_SUCCESS - The file is grown > sucessfully. > > + @retval EFI_SUCCESS - The file is grown > successfully. > > @retval EFI_UNSUPPORTED - The file size is > larger than 4GB. > > @retval EFI_VOLUME_CORRUPTED - There are errors > in the files' clusters. > > @retval EFI_VOLUME_FULL - The volume is full > and can not grow the file. > > diff --git a/FatPkg/EnhancedFatDxe/Info.c > > b/FatPkg/EnhancedFatDxe/Info.c index > 1c9811cad0..fd4c0278f9 100644 > > --- a/FatPkg/EnhancedFatDxe/Info.c > > +++ b/FatPkg/EnhancedFatDxe/Info.c > > @@ -407,7 +407,7 @@ FatSetFileInfo ( > > // > > if (OFile->ODir != NULL) { > > // > > - // Syncronize its dot entry > > + // Synchronize its dot entry > > // > > FatResetODirCursor (OFile); > > ASSERT (OFile->Parent != NULL); diff --git > > a/FatPkg/EnhancedFatDxe/Init.c > b/FatPkg/EnhancedFatDxe/Init.c index > > 530154bd25..4e6bd9d0fd 100644 > > --- a/FatPkg/EnhancedFatDxe/Init.c > > +++ b/FatPkg/EnhancedFatDxe/Init.c > > @@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2- > Clause-Patent > > @param Handle - The handle of > parent device. > > @param DiskIo - The DiskIo of > parent device. > > @param DiskIo2 - The DiskIo2 of > parent device. > > - @param BlockIo - The BlockIo of > parent devicel > > + @param BlockIo - The BlockIo of > parent device. > > > > @retval EFI_SUCCESS - Allocate a new > volume successfully. > > @retval EFI_OUT_OF_RESOURCES - Can not allocate > the memory. > > diff --git a/FatPkg/EnhancedFatDxe/Misc.c > > b/FatPkg/EnhancedFatDxe/Misc.c index > bc19695fc9..a005036d46 100644 > > --- a/FatPkg/EnhancedFatDxe/Misc.c > > +++ b/FatPkg/EnhancedFatDxe/Misc.c > > @@ -114,7 +114,7 @@ FatDestroySubtask ( > > @param IFile - The instance of > the open file. > > @param Task - The task to be > executed. > > > > - @retval EFI_SUCCESS - The task was > executed sucessfully. > > + @retval EFI_SUCCESS - The task was > executed successfully. > > @return other - An error occurred > when executing the task. > > > > **/ > > @@ -219,7 +219,7 @@ FatQueueTask ( > > @param IoMode - The access mode. > > @param DirtyValue - Set the volume as > dirty or not. > > > > - @retval EFI_SUCCESS - Set the new FAT > entry value sucessfully. > > + @retval EFI_SUCCESS - Set the new FAT > entry value successfully. > > @return other - An error occurred > when operation the FAT entries. > > > > **/ > > @@ -304,7 +304,7 @@ FatOnAccessComplete ( > > @param Task point to task > instance. > > > > @retval EFI_SUCCESS - The operation is > performed successfully. > > - @retval EFI_VOLUME_CORRUPTED - The accesss is > > + @retval EFI_VOLUME_CORRUPTED - The access is > > @return Others - The status of > read/write the disk > > > > **/ > > diff --git a/FatPkg/EnhancedFatDxe/Open.c > > b/FatPkg/EnhancedFatDxe/Open.c index > cfd99baf7d..1b716e0cdf 100644 > > --- a/FatPkg/EnhancedFatDxe/Open.c > > +++ b/FatPkg/EnhancedFatDxe/Open.c > > @@ -74,7 +74,7 @@ FatAllocateIFile ( > > @retval EFI_SUCCESS - Open the file > successfully. > > @retval EFI_INVALID_PARAMETER - The open mode is > conflict with the attributes > > or the file name is not > valid. > > - @retval EFI_NOT_FOUND - Conficts between > dir intention and attribute. > > + @retval EFI_NOT_FOUND - Conflicts between > dir intention and attribute. > > @retval EFI_WRITE_PROTECTED - Can't open for > write if the volume is read only. > > @retval EFI_ACCESS_DENIED - If the file's > attribute is read only, and the > > open is for read-write > fail it. > > diff --git a/FatPkg/FatPei/FatLiteApi.c > b/FatPkg/FatPei/FatLiteApi.c > > index b9f883b9e0..8c7c6e5258 100644 > > --- a/FatPkg/FatPei/FatLiteApi.c > > +++ b/FatPkg/FatPei/FatLiteApi.c > > @@ -12,7 +12,7 @@ SPDX-License-Identifier: BSD-2- > Clause-Patent > > PEI_FAT_PRIVATE_DATA *mPrivateData = NULL; > > > > /** > > - BlockIo installation nofication function. Find out > all the current > > BlockIO > > + BlockIo installation notification function. Find > out all the > > + current BlockIO > > PPIs in the system and add them into private data. > Assume there is > > > > @param PeiServices General purpose > services available to every > > @@ -256,7 +256,7 @@ FatPeimEntry ( > > > > Status = PeiServicesAllocatePages ( > > EfiBootServicesCode, > > - (sizeof (PEI_FAT_PRIVATE_DATA) - 1) / > PEI_FAT_MEMMORY_PAGE_SIZE + 1, > > + (sizeof (PEI_FAT_PRIVATE_DATA) - 1) / > > + PEI_FAT_MEMORY_PAGE_SIZE + 1, > > &Address > > ); > > if (EFI_ERROR (Status)) { > > @@ -600,7 +600,7 @@ LoadRecoveryCapsule ( > > @param FileName The recovery file > name to find. > > @param Handle The output file > handle. > > > > - @retval EFI_DEVICE_ERROR Some error occured > when operating the FAT > > + @retval EFI_DEVICE_ERROR Some error occurred > when operating the FAT > > volume. > > @retval EFI_NOT_FOUND The recovery file > was not found. > > @retval EFI_SUCCESS The recovery file > was successfully found on the > > diff --git a/FatPkg/FatPei/FatLitePeim.h > b/FatPkg/FatPei/FatLitePeim.h > > index 18534b9abb..9cacf74ace 100644 > > --- a/FatPkg/FatPei/FatLitePeim.h > > +++ b/FatPkg/FatPei/FatLitePeim.h > > @@ -40,7 +40,7 @@ SPDX-License-Identifier: BSD-2- > Clause-Patent > > #define PEI_FAT_MAX_BLOCK_IO_PPI > 32 > > #define PEI_FAT_MAX_VOLUME > 64 > > > > -#define PEI_FAT_MEMMORY_PAGE_SIZE > 0x1000 > > +#define PEI_FAT_MEMORY_PAGE_SIZE > 0x1000 > > > > // > > // Data Structures > > @@ -194,7 +194,7 @@ typedef struct { > > @param FileName The recovery file > name to find. > > @param Handle The output file > handle. > > > > - @retval EFI_DEVICE_ERROR Some error occured > when operating the FAT > > + @retval EFI_DEVICE_ERROR Some error occurred > when operating the FAT > > volume. > > @retval EFI_NOT_FOUND The recovery file > was not found. > > @retval EFI_SUCCESS The recovery file > was successfully found on the > > diff --git a/FatPkg/FatPei/Gpt.c b/FatPkg/FatPei/Gpt.c > index > > 233a66b974..4028c535f3 100644 > > --- a/FatPkg/FatPei/Gpt.c > > +++ b/FatPkg/FatPei/Gpt.c > > @@ -48,7 +48,7 @@ PartitionCheckGptHeaderCRC ( > > GptHdrCrc = PartHeader->Header.CRC32; > > > > // > > - // Set CRC field to zero when doing calcuation > > + // Set CRC field to zero when doing calculation > > // > > PartHeader->Header.CRC32 = 0; > > > > diff --git a/FatPkg/FatPei/Mbr.c b/FatPkg/FatPei/Mbr.c > index > > 0b6375af6d..5b01604c07 100644 > > --- a/FatPkg/FatPei/Mbr.c > > +++ b/FatPkg/FatPei/Mbr.c > > @@ -52,7 +52,7 @@ PartitionValidMbr ( > > if (EndingLBA > LastLba) { > > // > > // Compatability Errata: > > - // Some systems try to hide drive space with > thier INT 13h driver > > + // Some systems try to hide drive space with > their INT 13h > > + driver > > // This does not hide space from the OS > driver. This means the MBR > > // that gets created from DOS is smaller than > the MBR created from > > // a real OS (NT & Win98). This leads to > BlockIo->LastBlock > > being > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49377): https://edk2.groups.io/g/devel/message/49377 Mute This Topic: https://groups.io/mt/35084831/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
