SecurityPkg: Tcg2Dxe: Report correct FinalEventLog size

[mirror_edk2.git] / Omap35xxPkg / PciEmulation / PciEmulation.h

diff --git a/Omap35xxPkg/PciEmulation/PciEmulation.h b/Omap35xxPkg/PciEmulation/PciEmulation.h
index 6a8668786fa175e1c12cbd7da519df1fd169fb87..d5ee04318939c17f9b6e920815790765a15683e0 100644 (file)
--- a/Omap35xxPkg/PciEmulation/PciEmulation.h
+++ b/Omap35xxPkg/PciEmulation/PciEmulation.h
@@ -28,10 +28,10 @@
 #include <Library/PciLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UncachedMemoryAllocationLib.h>\r
+#include <Library/OmapDmaLib.h>\r
+#include <Library/DmaLib.h>\r
 \r
 #include <Protocol/EmbeddedExternalDevice.h>\r
-#include <Protocol/Cpu.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
@@ -40,7 +40,9 @@
 #include <IndustryStandard/Pci22.h>\r
 #include <IndustryStandard/Acpi.h>\r
 \r
-extern EFI_CPU_ARCH_PROTOCOL  *gCpu;\r
+#include <Omap3530/Omap3530.h>\r
+\r
+\r
 \r
 #define EFI_RESOURCE_NONEXISTENT  0xFFFFFFFFFFFFFFFFULL\r
 #define EFI_RESOURCE_LESS         0xFFFFFFFFFFFFFFFEULL\r
@@ -70,7 +72,7 @@ typedef struct {
   EFI_HANDLE                                        Handle;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL                   Io;\r
   EFI_PCI_ROOT_BRIDGE_DEVICE_PATH                   DevicePath;\r
-  \r
+\r
   UINT8   StartBus;\r
   UINT8   EndBus;\r
   UINT16  Type;\r
@@ -79,7 +81,7 @@ typedef struct {
   UINTN   IoOffset;\r
   UINT32  IoStart;\r
   UINT32  IoSize;\r
-  UINT64  PciAttributes;  \r
+  UINT64  PciAttributes;\r
 \r
   ACPI_CONFIG_INFO  *Config;\r
 \r
@@ -99,25 +101,10 @@ typedef union {
 } PTR;\r
 \r
 \r
-typedef struct {\r
-  EFI_PHYSICAL_ADDRESS                      HostAddress;\r
-  EFI_PHYSICAL_ADDRESS                      DeviceAddress;\r
-  UINTN                                     NumberOfBytes;\r
-  EFI_PCI_IO_PROTOCOL_OPERATION             Operation;\r
-  \r
-} MAP_INFO_INSTANCE;\r
-\r
-\r
-typedef struct {\r
-  EFI_PHYSICAL_ADDRESS                        HostAddress;\r
-  EFI_PHYSICAL_ADDRESS                        DeviceAddress;\r
-  UINTN                                       NumberOfBytes;\r
-  EFI_PCI_IO_PROTOCOL_OPERATION               Operation;\r
-} PCI_DMA_MAP;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
-PciRootBridgeIoPollMem ( \r
+PciRootBridgeIoPollMem (\r
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *This,\r
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH  Width,\r
   IN  UINT64                                 Address,\r
@@ -126,10 +113,10 @@ PciRootBridgeIoPollMem (
   IN  UINT64                                 Delay,\r
   OUT UINT64                                 *Result\r
   );\r
-  \r
+\r
 EFI_STATUS\r
 EFIAPI\r
-PciRootBridgeIoPollIo ( \r
+PciRootBridgeIoPollIo (\r
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL        *This,\r
   IN  EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH  Width,\r
   IN  UINT64                                 Address,\r
@@ -138,7 +125,7 @@ PciRootBridgeIoPollIo (
   IN  UINT64                                 Delay,\r
   OUT UINT64                                 *Result\r
   );\r
-  \r
+\r
 EFI_STATUS\r
 EFIAPI\r
 PciRootBridgeIoMemRead (\r
@@ -266,8 +253,8 @@ PciRootBridgeIoSetAttributes (
   IN     EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *This,\r
   IN     UINT64                           Attributes,\r
   IN OUT UINT64                           *ResourceBase,\r
-  IN OUT UINT64                           *ResourceLength \r
-  ); \r
+  IN OUT UINT64                           *ResourceLength\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r