From ce8bd86e8f49f17fd2b11e14bbc3b3e816d82c1b Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 21 Mar 2007 01:27:01 +0000 Subject: 1. Removed #ifdef EDK_RELEASE_VERSION from all c files for all modules 2. Removed #ifdef EFI_SPECIFICATION_VERSION from all c files for all modules 3. Added comments for file VariableWorker.c git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2495 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c | 21 ++- .../Bus/Pci/PciBus/Dxe/PciDriverOverride.c | 143 ++------------------- 2 files changed, 20 insertions(+), 144 deletions(-) (limited to 'EdkModulePkg/Bus') diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c index 382c0691ba..1d01ba798f 100644 --- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c +++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c @@ -594,13 +594,8 @@ CheckErrorStatus ( ) { UINT8 StatusRegister; - -//#ifdef EFI_DEBUG - UINT8 ErrorRegister; -//#endif - StatusRegister = IDEReadPortB (IdeDev->PciIo, IdeDev->IoPort->Reg.Status); DEBUG_CODE_BEGIN (); @@ -2221,7 +2216,7 @@ AtaUdmaWrite ( /** Perform an ATA Udma operation (Read, ReadExt, Write, WriteExt). - + @param[in] *IdeDev pointer pointing to IDE_BLK_IO_DEV data structure, used to record all the information of the IDE device. @@ -2235,7 +2230,7 @@ AtaUdmaWrite ( @param[in] NumberOfBlocks The number of transfer data blocks. - + @param[in] UdmaOp The perform operations could be AtaUdmaReadOp, AtaUdmaReadExOp, AtaUdmaWriteOp, AtaUdmaWriteExOp @@ -2368,7 +2363,7 @@ DoAtaUdma ( return EFI_OUT_OF_RESOURCES; } ZeroMem ((VOID *) ((UINTN) MemPage), EFI_PAGES_TO_SIZE (PageCount)); - + PrdAddr = (IDE_DMA_PRD *) ((UINTN) MemPage); // // To make sure PRD is allocated in one 64K page @@ -2387,17 +2382,17 @@ DoAtaUdma ( // Build the PRD table // Status = IdeDev->PciIo->Map ( - IdeDev->PciIo, - PciIoProtocolOp, - DataBuffer, - &ByteCount, + IdeDev->PciIo, + PciIoProtocolOp, + DataBuffer, + &ByteCount, &DeviceAddress, &Map ); if (EFI_ERROR (Status)) { IdeDev->PciIo->FreeBuffer (IdeDev->PciIo, PageCount, MemPage); return EFI_OUT_OF_RESOURCES; - } + } PrdBuffer = (VOID *) ((UINTN) DeviceAddress); TempPrdAddr = UsedPrdAddr; while (TRUE) { diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c index 70ad48b5ec..7643fc87e2 100644 --- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c +++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciDriverOverride.c @@ -1,18 +1,18 @@ /*++ -Copyright (c) 2006, 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006 - 2007, 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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: PciDriverOverride.c - + Abstract: PCI Bus Driver @@ -34,7 +34,7 @@ Routine Description: Initializes a PCI Driver Override Instance Arguments: - + Returns: None @@ -60,7 +60,7 @@ Routine Description: Get a overriding driver image Arguments: - + Returns: None @@ -124,7 +124,7 @@ Routine Description: Add a overriding driver image Arguments: - + Returns: None @@ -143,16 +143,6 @@ Returns: EFI_IMAGE_NT_HEADERS *PeHdr; EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; PCI_DRIVER_OVERRIDE_LIST *Node; -#if (EFI_SPECIFICATION_VERSION < 0x00020000) - EFI_DRIVER_OS_HANDOFF_HEADER *DriverOsHandoffHeader; - EFI_DRIVER_OS_HANDOFF_HEADER *NewDriverOsHandoffHeader; - EFI_DRIVER_OS_HANDOFF *DriverOsHandoff; - EFI_DEVICE_PATH_PROTOCOL *DevicePath; - EFI_HANDLE DeviceHandle; - UINTN NumberOfEntries; - UINTN Size; - UINTN Index; -#endif Status = gBS->HandleProtocol (DriverImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &LoadedImage); if (EFI_ERROR (Status)) { @@ -181,114 +171,5 @@ Returns: if (PeHdr->FileHeader.Machine != EFI_IMAGE_MACHINE_EBC) { return EFI_SUCCESS; } - -#if (EFI_SPECIFICATION_VERSION < 0x00020000) - DriverOsHandoffHeader = NULL; - Status = EfiGetSystemConfigurationTable (&gEfiUgaIoProtocolGuid, (VOID **) &DriverOsHandoffHeader); - if (!EFI_ERROR (Status) && DriverOsHandoffHeader != NULL) { - for (Index = 0; Index < DriverOsHandoffHeader->NumberOfEntries; Index++) { - DriverOsHandoff = (EFI_DRIVER_OS_HANDOFF *)((UINTN)(DriverOsHandoffHeader) + - DriverOsHandoffHeader->HeaderSize + - Index * DriverOsHandoffHeader->SizeOfEntries); - DevicePath = DriverOsHandoff->DevicePath; - Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &DevicePath, &DeviceHandle); - if (!EFI_ERROR (Status) && DeviceHandle != NULL && IsDevicePathEnd (DevicePath)) { - if (DeviceHandle == PciIoDevice->Handle) { - return EFI_SUCCESS; - } - } - } - - NumberOfEntries = DriverOsHandoffHeader->NumberOfEntries + 1; - } else { - NumberOfEntries = 1; - } - - Status = gBS->AllocatePool ( - EfiRuntimeServicesData, - sizeof (EFI_DRIVER_OS_HANDOFF_HEADER) + NumberOfEntries * sizeof (EFI_DRIVER_OS_HANDOFF), - (VOID **) &NewDriverOsHandoffHeader - ); - if (EFI_ERROR (Status)) { - return Status; - } - - if (DriverOsHandoffHeader == NULL) { - NewDriverOsHandoffHeader->Version = 0; - NewDriverOsHandoffHeader->HeaderSize = sizeof (EFI_DRIVER_OS_HANDOFF_HEADER); - NewDriverOsHandoffHeader->SizeOfEntries = sizeof (EFI_DRIVER_OS_HANDOFF); - NewDriverOsHandoffHeader->NumberOfEntries = (UINT32) NumberOfEntries; - } else { - gBS->CopyMem ( - NewDriverOsHandoffHeader, - DriverOsHandoffHeader, - DriverOsHandoffHeader->HeaderSize + (NumberOfEntries - 1) * DriverOsHandoffHeader->SizeOfEntries - ); - NewDriverOsHandoffHeader->NumberOfEntries = (UINT32) NumberOfEntries; - } - - DriverOsHandoff = (EFI_DRIVER_OS_HANDOFF *)((UINTN)NewDriverOsHandoffHeader + - NewDriverOsHandoffHeader->HeaderSize + - (NumberOfEntries - 1) * NewDriverOsHandoffHeader->SizeOfEntries); - - // - // Fill in the EFI_DRIVER_OS_HANDOFF structure - // - DriverOsHandoff->Type = EfiUgaDriverFromPciRom; - - // - // Compute the size of the device path - // - Size = GetDevicePathSize (PciIoDevice->DevicePath); - if (Size == 0) { - DriverOsHandoff->DevicePath = NULL; - } else { - - // - // Allocate space for duplicate device path - // - Status = gBS->AllocatePool ( - EfiRuntimeServicesData, - Size, - (VOID **) &DriverOsHandoff->DevicePath - ); - if (EFI_ERROR (Status)) { - gBS->FreePool (NewDriverOsHandoffHeader); - return Status; - } - - // - // Make copy of device path - // - CopyMem (DriverOsHandoff->DevicePath, PciIoDevice->DevicePath, Size); - } - - DriverOsHandoff->PciRomSize = (UINT64) PciIoDevice->PciIo.RomSize; - Status = gBS->AllocatePool ( - EfiRuntimeServicesData, - (UINTN) DriverOsHandoff->PciRomSize, - (VOID **) &DriverOsHandoff->PciRomImage - ); - if (EFI_ERROR (Status)) { - gBS->FreePool (NewDriverOsHandoffHeader); - return Status; - } - - gBS->CopyMem ( - DriverOsHandoff->PciRomImage, - PciIoDevice->PciIo.RomImage, - (UINTN) DriverOsHandoff->PciRomSize - ); - - Status = gBS->InstallConfigurationTable (&gEfiUgaIoProtocolGuid, NewDriverOsHandoffHeader); - if (EFI_ERROR (Status)) { - return Status; - } - - if (DriverOsHandoffHeader != NULL) { - gBS->FreePool (DriverOsHandoffHeader); - } -#endif - return EFI_SUCCESS; } -- cgit v1.2.3