Update in IdeBus to solve the non-backward compatibility issue by the MdePkg updates...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9820 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
index b627f2541346565c3354f4721212d3116460dd12..c22f7a3b303e48347c077fe897ada72d61059208 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c
@@ -1,7 +1,7 @@
 /** @file\r
   This file contains all helper functions on the ATA command \r
   \r
-  Copyright (c) 2006 - 2008, Intel Corporation.<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation.<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -75,12 +75,12 @@ AtaAtapi6Identify (
   //\r
   // 48 bit address feature set is supported, get maximum capacity\r
   //\r
-  Capacity = Atapi6IdentifyStruct->AtapiData.max_user_lba_for_48bit_addr[0];\r
+  Capacity = Atapi6IdentifyStruct->AtaData.maximum_lba_for_48bit_addressing[0];\r
   for (Index = 1; Index < 4; Index++) {\r
     //\r
     // Lower byte goes first: word[100] is the lowest word, word[103] is highest\r
     //\r
-    TmpLba = Atapi6IdentifyStruct->AtapiData.max_user_lba_for_48bit_addr[Index];\r
+    TmpLba = Atapi6IdentifyStruct->AtaData.maximum_lba_for_48bit_addressing[Index];\r
     Capacity |= LShiftU64 (TmpLba, 16 * Index);\r
   }\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
index 588519de0db2e2705c78fa9fbd016c5a96e96e3c..2047618a97100ec8ae5f49155e1f0fee88a976b0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c
@@ -3,7 +3,7 @@
   Child device(Disk, CDROM, etc) enumeration and child handler installation, and \r
   driver stop.\r
     \r
-  Copyright (c) 2006 - 2009, Intel Corporation\r
+  Copyright (c) 2006 - 2010, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -767,8 +767,8 @@ IDEBusDriverBindingStart (
       //\r
       // Init driver parameters\r
       //\r
-      DriveParameters.Sector          = (UINT8) IdeBlkIoDevicePtr->IdData->AtaData.sectors_per_track;\r
-      DriveParameters.Heads           = (UINT8) (IdeBlkIoDevicePtr->IdData->AtaData.heads - 1);\r
+      DriveParameters.Sector          = (UINT8) ((ATA5_IDENTIFY_DATA *) IdeBlkIoDevicePtr->IdData)->sectors_per_track;\r
+      DriveParameters.Heads           = (UINT8) (((ATA5_IDENTIFY_DATA *) IdeBlkIoDevicePtr->IdData)->heads - 1);\r
       DriveParameters.MultipleSector  = (UINT8) IdeBlkIoDevicePtr->IdData->AtaData.multi_sector_cmd_max_sct_cnt;\r
       //\r
       // Set Parameters for the device:\r