tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up AtaBus driver to not depend on PI IdeControllerInit Protocol definitions

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9821 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2010-01-26 05:21:52 +00:00
parent a7ddec115d
commit 6ea8e37bfa
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.h
View File

@ -4,7 +4,7 @@
This file defines common data structures, macro definitions and some module This file defines common data structures, macro definitions and some module
internal function header files. internal function header files.
Copyright (c) 2009 Intel Corporation. <BR> Copyright (c) 2009 - 2010 Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -24,7 +24,6 @@
#include <Protocol/BlockIo.h> #include <Protocol/BlockIo.h>
#include <Protocol/DiskInfo.h> #include <Protocol/DiskInfo.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
#include <Protocol/IdeControllerInit.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/UefiDriverEntryPoint.h> #include <Library/UefiDriverEntryPoint.h>
@ -109,7 +108,7 @@ typedef struct {
// //
// Cached data for ATA identify data // Cached data for ATA identify data
// //
EFI_IDENTIFY_DATA *IdentifyData; ATA_IDENTIFY_DATA *IdentifyData;
EFI_UNICODE_STRING_TABLE *ControllerNameTable; EFI_UNICODE_STRING_TABLE *ControllerNameTable;
CHAR16 ModelName[MAX_MODEL_NAME_LEN + 1]; CHAR16 ModelName[MAX_MODEL_NAME_LEN + 1];

16
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
View File

@ -5,7 +5,7 @@
It transforms the high level identity, read/write, reset command to ATA pass It transforms the high level identity, read/write, reset command to ATA pass
through command and protocol. through command and protocol.
Copyright (c) 2009 Intel Corporation. <BR> Copyright (c) 2009 - 2010 Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -164,7 +164,7 @@ PrintAtaModelName (
CHAR8 *Source; CHAR8 *Source;
CHAR16 *Destination; CHAR16 *Destination;
Source = AtaDevice->IdentifyData->AtaData.ModelName; Source = AtaDevice->IdentifyData->ModelName;
Destination = AtaDevice->ModelName; Destination = AtaDevice->ModelName;
// //
@ -198,10 +198,10 @@ GetAtapi6Capacity (
EFI_LBA Capacity; EFI_LBA Capacity;
EFI_LBA TmpLba; EFI_LBA TmpLba;
UINTN Index; UINTN Index;
ATAPI_IDENTIFY_DATA *IdentifyData; ATA_IDENTIFY_DATA *IdentifyData;
IdentifyData = (ATAPI_IDENTIFY_DATA *) AtaDevice->IdentifyData; IdentifyData = AtaDevice->IdentifyData;
if ((IdentifyData->cmd_set_support_83 & BIT10) == 0) { if ((IdentifyData->command_set_supported_83 & BIT10) == 0) {
// //
// The device doesn't support 48 bit addressing // The device doesn't support 48 bit addressing
// //
@ -216,7 +216,7 @@ GetAtapi6Capacity (
// //
// Lower byte goes first: word[100] is the lowest word, word[103] is highest // Lower byte goes first: word[100] is the lowest word, word[103] is highest
// //
TmpLba = IdentifyData->max_user_lba_for_48bit_addr[Index]; TmpLba = IdentifyData->maximum_lba_for_48bit_addressing[Index];
Capacity |= LShiftU64 (TmpLba, 16 * Index); Capacity |= LShiftU64 (TmpLba, 16 * Index);
} }
@ -242,13 +242,13 @@ IdentifyAtaDevice (
IN OUT ATA_DEVICE *AtaDevice IN OUT ATA_DEVICE *AtaDevice
) )
{ {
EFI_ATA_IDENTIFY_DATA *IdentifyData; ATA_IDENTIFY_DATA *IdentifyData;
EFI_BLOCK_IO_MEDIA *BlockMedia; EFI_BLOCK_IO_MEDIA *BlockMedia;
EFI_LBA Capacity; EFI_LBA Capacity;
UINT16 PhyLogicSectorSupport; UINT16 PhyLogicSectorSupport;
UINT16 UdmaMode; UINT16 UdmaMode;
IdentifyData = &AtaDevice->IdentifyData->AtaData; IdentifyData = AtaDevice->IdentifyData;
if ((IdentifyData->config & BIT15) != 0) { if ((IdentifyData->config & BIT15) != 0) {
// //