Ray,
On 09/16/15 04:57, Laszlo Ersek wrote:
> Cc: Alexander Graf <[email protected]>
> Cc: Reza Jelveh <[email protected]>
> Cc: Jordan Justen <[email protected]>
> Cc: Ruiyu Ni <[email protected]>
> Cc: Hannes Reinecke <[email protected]>
> Cc: Gabriel L. Somlo <[email protected]>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Laszlo Ersek <[email protected]>
> ---
> DuetPkg/SataControllerDxe/SataController.h | 2 +-
> DuetPkg/SataControllerDxe/SataController.c | 22 ++++++++++----------
> 2 files changed, 12 insertions(+), 12 deletions(-)
can you please check this patch and the next one? They're quite simple.
If you don't have time for them, I can do the same just in the OvmfPkg
copy -- I just didn't want to start with leaving DuetPkg behind, so I
figured I'd fix up the origin before the copy.
Thanks
Laszlo
> diff --git a/DuetPkg/SataControllerDxe/SataController.h
> b/DuetPkg/SataControllerDxe/SataController.h
> index d2a929f..a6c6c16 100644
> --- a/DuetPkg/SataControllerDxe/SataController.h
> +++ b/DuetPkg/SataControllerDxe/SataController.h
> @@ -95,7 +95,7 @@ typedef struct _EFI_SATA_CONTROLLER_PRIVATE_DATA {
> // From ATA/ATAPI spec, if a mode is not supported,
> // the modes higher than it is also not supported
> //
> - EFI_ATA_COLLECTIVE_MODE *DisqulifiedModes;
> + EFI_ATA_COLLECTIVE_MODE *DisqualifiedModes;
>
> //
> // A copy of EFI_IDENTIFY_DATA data for each attached SATA device and its
> flag
> diff --git a/DuetPkg/SataControllerDxe/SataController.c
> b/DuetPkg/SataControllerDxe/SataController.c
> index 1807c88..e78915a 100644
> --- a/DuetPkg/SataControllerDxe/SataController.c
> +++ b/DuetPkg/SataControllerDxe/SataController.c
> @@ -464,8 +464,8 @@ SataControllerStart (
> }
>
> ChannelDeviceCount = (UINTN) (SataPrivateData->IdeInit.ChannelCount) *
> (UINTN) (SataPrivateData->DeviceCount);
> - SataPrivateData->DisqulifiedModes = AllocateZeroPool ((sizeof
> (EFI_ATA_COLLECTIVE_MODE)) * ChannelDeviceCount);
> - if (SataPrivateData->DisqulifiedModes == NULL) {
> + SataPrivateData->DisqualifiedModes = AllocateZeroPool ((sizeof
> (EFI_ATA_COLLECTIVE_MODE)) * ChannelDeviceCount);
> + if (SataPrivateData->DisqualifiedModes == NULL) {
> Status = EFI_OUT_OF_RESOURCES;
> goto Done;
> }
> @@ -502,8 +502,8 @@ Done:
> Controller
> );
> if (SataPrivateData != NULL) {
> - if (SataPrivateData->DisqulifiedModes != NULL) {
> - FreePool (SataPrivateData->DisqulifiedModes);
> + if (SataPrivateData->DisqualifiedModes != NULL) {
> + FreePool (SataPrivateData->DisqualifiedModes);
> }
> if (SataPrivateData->IdentifyData != NULL) {
> FreePool (SataPrivateData->IdentifyData);
> @@ -577,8 +577,8 @@ SataControllerStop (
> }
>
> if (SataPrivateData != NULL) {
> - if (SataPrivateData->DisqulifiedModes != NULL) {
> - FreePool (SataPrivateData->DisqulifiedModes);
> + if (SataPrivateData->DisqualifiedModes != NULL) {
> + FreePool (SataPrivateData->DisqualifiedModes);
> }
> if (SataPrivateData->IdentifyData != NULL) {
> FreePool (SataPrivateData->IdentifyData);
> @@ -833,7 +833,7 @@ IdeInitDisqualifyMode (
> // if a mode is not supported, the modes higher than it is also not
> supported.
> //
> CopyMem (
> - &(SataPrivateData->DisqulifiedModes[Channel * Device]),
> + &(SataPrivateData->DisqualifiedModes[Channel * Device]),
> BadModes,
> sizeof (EFI_ATA_COLLECTIVE_MODE)
> );
> @@ -907,7 +907,7 @@ IdeInitCalculateMode (
> EFI_SATA_CONTROLLER_PRIVATE_DATA *SataPrivateData;
> EFI_IDENTIFY_DATA *IdentifyData;
> BOOLEAN IdentifyValid;
> - EFI_ATA_COLLECTIVE_MODE *DisqulifiedModes;
> + EFI_ATA_COLLECTIVE_MODE *DisqualifiedModes;
> UINT16 SelectedMode;
> EFI_STATUS Status;
>
> @@ -926,7 +926,7 @@ IdeInitCalculateMode (
>
> IdentifyData = &(SataPrivateData->IdentifyData[Channel * Device]);
> IdentifyValid = SataPrivateData->IdentifyValid[Channel * Device];
> - DisqulifiedModes = &(SataPrivateData->DisqulifiedModes[Channel * Device]);
> + DisqualifiedModes = &(SataPrivateData->DisqualifiedModes[Channel *
> Device]);
>
> //
> // Make sure we've got the valid identify data of the device from
> SubmitData()
> @@ -938,7 +938,7 @@ IdeInitCalculateMode (
>
> Status = CalculateBestPioMode (
> IdentifyData,
> - (DisqulifiedModes->PioMode.Valid ? ((UINT16 *)
> &(DisqulifiedModes->PioMode.Mode)) : NULL),
> + (DisqualifiedModes->PioMode.Valid ? ((UINT16 *)
> &(DisqualifiedModes->PioMode.Mode)) : NULL),
> &SelectedMode
> );
> if (!EFI_ERROR (Status)) {
> @@ -952,7 +952,7 @@ IdeInitCalculateMode (
>
> Status = CalculateBestUdmaMode (
> IdentifyData,
> - (DisqulifiedModes->UdmaMode.Valid ? ((UINT16 *)
> &(DisqulifiedModes->UdmaMode.Mode)) : NULL),
> + (DisqualifiedModes->UdmaMode.Valid ? ((UINT16 *)
> &(DisqualifiedModes->UdmaMode.Mode)) : NULL),
> &SelectedMode
> );
>
>
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
