From a7ddec115df0929ea7e24379da564e3c44112b48 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Tue, 26 Jan 2010 05:20:49 +0000 Subject: Update in IdeBus to solve the non-backward compatibility issue by the MdePkg updates in Edk r9817. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9820 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c | 6 +++--- IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c index b627f25..c22f7a3 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c @@ -1,7 +1,7 @@ /** @file This file contains all helper functions on the ATA command - Copyright (c) 2006 - 2008, Intel Corporation.
+ Copyright (c) 2006 - 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 @@ -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); } diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.c index 588519d..2047618 100644 --- 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 driver stop. - Copyright (c) 2006 - 2009, Intel Corporation + Copyright (c) 2006 - 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 @@ -767,8 +767,8 @@ IDEBusDriverBindingStart ( // // Init driver parameters // - DriveParameters.Sector = (UINT8) IdeBlkIoDevicePtr->IdData->AtaData.sectors_per_track; - DriveParameters.Heads = (UINT8) (IdeBlkIoDevicePtr->IdData->AtaData.heads - 1); + DriveParameters.Sector = (UINT8) ((ATA5_IDENTIFY_DATA *) IdeBlkIoDevicePtr->IdData)->sectors_per_track; + DriveParameters.Heads = (UINT8) (((ATA5_IDENTIFY_DATA *) IdeBlkIoDevicePtr->IdData)->heads - 1); DriveParameters.MultipleSector = (UINT8) IdeBlkIoDevicePtr->IdData->AtaData.multi_sector_cmd_max_sct_cnt; // // Set Parameters for the device: -- cgit v1.1