X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=IntelFrameworkModulePkg%2FBus%2FPci%2FIdeBusDxe%2FAta.c;h=c541eb8991a91e5cd7680567838859b81d6fb9d3;hb=e38f26a2f7f62b69fec2d84e83bcc4b45ddefdc1;hp=98d9323ea7541612053318e63f23bb36eb5ebe7a;hpb=630d580d530d3154ad90eee3f3688ab00b335275;p=mirror_edk2.git

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index 98d9323ea7..c541eb8991 100644
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -1,8 +1,8 @@
 /** @file
   This file contains all helper functions on the ATA command 
   
-  Copyright (c) 2006 - 2008, Intel Corporation.<BR>
-  All rights reserved. This program and the accompanying materials
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  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
   http://opensource.org/licenses/bsd-license.php
@@ -75,12 +75,12 @@ AtaAtapi6Identify (
   //
   // 48 bit address feature set is supported, get maximum capacity
   //
-  Capacity = Atapi6IdentifyStruct->AtapiData.max_user_lba_for_48bit_addr[0];
+  Capacity = Atapi6IdentifyStruct->AtaData.maximum_lba_for_48bit_addressing[0];
   for (Index = 1; Index < 4; Index++) {
     //
     // Lower byte goes first: word[100] is the lowest word, word[103] is highest
     //
-    TmpLba = Atapi6IdentifyStruct->AtapiData.max_user_lba_for_48bit_addr[Index];
+    TmpLba = Atapi6IdentifyStruct->AtaData.maximum_lba_for_48bit_addressing[Index];
     Capacity |= LShiftU64 (TmpLba, 16 * Index);
   }
 
@@ -1281,7 +1281,7 @@ AtaPioDataInExt (
   return CheckErrorStatus (IdeDev);
 }
 /**
-  Send ATA Ext command into device with NON_DATA protocol
+  Send ATA Ext command into device with NON_DATA protocol.
 
   @param  IdeDev Standard IDE device private data structure
   @param  AtaCommand The ATA command to be sent
@@ -2027,7 +2027,7 @@ AtaReadSectorsExt (
 
   @param IdeBlkIoDevice Indicates the calling context.
   @param MediaId        The media id that the read request is for.
-  @param LBA            The starting logical block address to read from on the device.
+  @param Lba            The starting logical block address to read from on the device.
   @param BufferSize     The size of the Buffer in bytes. This must be a  multiple
                         of the intrinsic block size of the device.
 
@@ -2052,7 +2052,7 @@ EFI_STATUS
 AtaBlkIoReadBlocks (
   IN IDE_BLK_IO_DEV   *IdeBlkIoDevice,
   IN UINT32           MediaId,
-  IN EFI_LBA          LBA,
+  IN EFI_LBA          Lba,
   IN UINTN            BufferSize,
   OUT VOID            *Buffer
   )
@@ -2092,11 +2092,11 @@ AtaBlkIoReadBlocks (
     return EFI_NO_MEDIA;
   }
 
-  if (LBA > Media->LastBlock) {
+  if (Lba > Media->LastBlock) {
     return EFI_INVALID_PARAMETER;
   }
 
-  if ((LBA + NumberOfBlocks - 1) > Media->LastBlock) {
+  if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -2110,18 +2110,18 @@ AtaBlkIoReadBlocks (
     // For ATA/ATAPI-6 device(capcity > 120GB), use ATA-6 read block mechanism
     //
     if (IdeBlkIoDevice->UdmaMode.Valid) {
-      Status = AtaUdmaReadExt (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaUdmaReadExt (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     } else {
-      Status = AtaReadSectorsExt (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaReadSectorsExt (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     }
   } else {
     //
     // For ATA-3 compatible device, use ATA-3 read block mechanism
     //
     if (IdeBlkIoDevice->UdmaMode.Valid) {
-      Status = AtaUdmaRead (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaUdmaRead (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     } else {
-      Status = AtaReadSectors (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaReadSectors (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     }
   }
 
@@ -2419,7 +2419,7 @@ AtaWriteSectorsExt (
 
   @param IdeBlkIoDevice  Indicates the calling context.
   @param MediaId         The media id that the write request is for.
-  @param LBA             The starting logical block address to write onto the device.
+  @param Lba             The starting logical block address to write onto the device.
   @param BufferSize      The size of the Buffer in bytes. This must be a multiple
                          of the intrinsic block size of the device.
   @param Buffer          A pointer to the source buffer for the data.The caller
@@ -2443,7 +2443,7 @@ EFI_STATUS
 AtaBlkIoWriteBlocks (
   IN  IDE_BLK_IO_DEV   *IdeBlkIoDevice,
   IN  UINT32           MediaId,
-  IN  EFI_LBA          LBA,
+  IN  EFI_LBA          Lba,
   IN  UINTN            BufferSize,
   OUT VOID             *Buffer
   )
@@ -2479,11 +2479,11 @@ AtaBlkIoWriteBlocks (
     return EFI_BAD_BUFFER_SIZE;
   }
 
-  if (LBA > Media->LastBlock) {
+  if (Lba > Media->LastBlock) {
     return EFI_INVALID_PARAMETER;
   }
 
-  if ((LBA + NumberOfBlocks - 1) > Media->LastBlock) {
+  if ((Lba + NumberOfBlocks - 1) > Media->LastBlock) {
     return EFI_INVALID_PARAMETER;
   }
 
@@ -2497,18 +2497,18 @@ AtaBlkIoWriteBlocks (
     // For ATA/ATAPI-6 device(capcity > 120GB), use ATA-6 write block mechanism
     //
     if (IdeBlkIoDevice->UdmaMode.Valid) {
-      Status = AtaUdmaWriteExt (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaUdmaWriteExt (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     } else {
-      Status = AtaWriteSectorsExt (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaWriteSectorsExt (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     }
   } else {
     //
     // For ATA-3 compatible device, use ATA-3 write block mechanism
     //
     if (IdeBlkIoDevice->UdmaMode.Valid) {
-      Status = AtaUdmaWrite (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaUdmaWrite (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     } else {
-      Status = AtaWriteSectors (IdeBlkIoDevice, Buffer, LBA, NumberOfBlocks);
+      Status = AtaWriteSectors (IdeBlkIoDevice, Buffer, Lba, NumberOfBlocks);
     }
   }
 
@@ -2563,7 +2563,8 @@ AtaEnableLongPhysicalSector (
       //
       if ((AtaIdentifyData->alignment_logic_in_phy_blocks & 0xc000) == 0x4000) {
         IdeDev->BlkIo.Media->LowestAlignedLba =
-          (EFI_LBA) (AtaIdentifyData->alignment_logic_in_phy_blocks & 0x3fff);
+          (EFI_LBA) ((IdeDev->BlkIo.Media->LogicalBlocksPerPhysicalBlock - ((UINT32)AtaIdentifyData->alignment_logic_in_phy_blocks & 0x3fff)) %
+          IdeDev->BlkIo.Media->LogicalBlocksPerPhysicalBlock);
       }
     }
     //
@@ -2619,7 +2620,7 @@ AtaNonDataCommandIn (
   }
 
   //
-  // Select device (bit4), set LBA mode(bit6) (use 0xe0 for compatibility)
+  // Select device (bit4), set Lba mode(bit6) (use 0xe0 for compatibility)
   //
   IDEWritePortB (
     IdeDev->PciIo,